Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 17946)
+++ applications/editors/josm/i18n/po/ja.po	(revision 18191)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-02 22:03+0200\n"
-"PO-Revision-Date: 2009-09-30 12:02+0000\n"
+"POT-Creation-Date: 2009-10-17 15:06+0200\n"
+"PO-Revision-Date: 2009-10-17 06:26+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,36 +16,117 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n"
+"X-Launchpad-Export-Date: 2009-10-17 12:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:190
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/Main.java:192
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:200
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:318
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:34
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:23
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:293
-#, java-format
-msgid "The projection {0} could not be activated. Using Mercator"
-msgstr "投影法 {0} は、有効化できませんでした。メルカトル図法を使います。"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:294
-#: ../core/src/org/openstreetmap/josm/Main.java:460
-#: ../core/src/org/openstreetmap/josm/Main.java:468
-#: ../core/src/org/openstreetmap/josm/Main.java:492
-#: ../core/src/org/openstreetmap/josm/Main.java:500
+#: ../core/src/org/openstreetmap/josm/Main.java:416
+#, java-format
+msgid "Ignoring malformed URL: \"{0}\""
+msgstr "不正な形式のURLの\"{0}\"を無視します。"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:417
+#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:78
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137
+msgid "Warning"
+msgstr "警告"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:435
+#, java-format
+msgid "Ignoring malformed file URL: \"{0}\""
+msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:448
+#: ../core/src/org/openstreetmap/josm/Main.java:456
+#: ../core/src/org/openstreetmap/josm/Main.java:480
+#: ../core/src/org/openstreetmap/josm/Main.java:488
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#, java-format
+msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
+msgstr ""
+"<html>ファイル ''{0}'' が読み込めません。<br> エラー内容: <br>{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:449
+#: ../core/src/org/openstreetmap/josm/Main.java:457
+#: ../core/src/org/openstreetmap/josm/Main.java:481
+#: ../core/src/org/openstreetmap/josm/Main.java:489
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -66,4 +147,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
@@ -75,7 +157,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:650
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:658
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -83,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:162
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
@@ -108,89 +191,10 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
 msgid "Error"
 msgstr "エラー"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:427
-#, java-format
-msgid "Ignoring malformed URL: \"{0}\""
-msgstr "不正な形式のURLの\"{0}\"を無視します。"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:428
-#: ../core/src/org/openstreetmap/josm/Main.java:447
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:144
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137
-msgid "Warning"
-msgstr "警告"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:459
-#: ../core/src/org/openstreetmap/josm/Main.java:467
-#: ../core/src/org/openstreetmap/josm/Main.java:491
-#: ../core/src/org/openstreetmap/josm/Main.java:499
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
-#, java-format
-msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
-"<html>ファイル ''{0}'' が読み込めません。<br> エラー内容: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -215,6 +219,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
@@ -226,5 +230,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
@@ -277,5 +280,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "プラグイン"
@@ -289,5 +292,5 @@
 msgstr "ファイルは存在しませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
 #, java-format
 msgid ""
@@ -298,5 +301,5 @@
 "ジにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #, java-format
 msgid ""
@@ -307,45 +310,31 @@
 "すると、おそらく失敗します。API ベース URL は \"{0}\" です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
-msgid "Please select at least one already uploaded node, way, or relation."
-msgstr ""
-"少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してくだ"
-"さい。"
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105
-#, java-format
-msgid ""
-"WARNING: launching browser windows for the first {0} of {1} selected "
-"primitives only"
-msgstr ""
-"警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初の"
-"{0}だけです。"
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
-msgid "Please select the target layer."
-msgstr "対象のレイヤーを選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-msgid "Select target layer"
-msgstr "対象のレイヤーを選択する。"
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
-msgid "Merge"
-msgstr "マージ"
-
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82
+#, java-format
+msgid ""
+"You''re about to launch {0} browser windows.<br>This may both clutter your "
+"screen with browser windows<br>and take some time to finish."
+msgstr ""
+"{0} ブラウザウィンドウを起動しようとしています。<br>画面がブラウザウィンドウ"
+"で散らかり<br>終わらせるのに少し時間が掛かります。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+msgid "Continue"
+msgstr "続ける"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
@@ -353,5 +342,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
@@ -359,12 +348,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:506
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
@@ -383,4 +373,24 @@
 msgstr "キャンセル"
 
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118
+msgid "Please select at least one already uploaded node, way, or relation."
+msgstr ""
+"少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してくだ"
+"さい。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+msgid "Please select the target layer."
+msgstr "対象のレイヤーを選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+msgid "Select target layer"
+msgstr "対象のレイヤーを選択する。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
+msgid "Merge"
+msgstr "マージ"
+
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
 #, java-format
@@ -408,8 +418,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
@@ -469,5 +479,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
@@ -480,4 +491,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -502,12 +514,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
@@ -518,6 +527,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
@@ -557,5 +566,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "競合"
@@ -586,5 +595,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
 msgid "Nothing selected to zoom to."
-msgstr "ズームする選択がありませｎ"
+msgstr "ズームする対象が選択されていません。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
@@ -606,8 +615,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 #, java-format
 msgid "File: {0}"
@@ -666,5 +675,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
 msgid "Please select at least two ways to combine."
-msgstr "結合する少なくとも二つのウェイを選択してください。"
+msgstr "結合するウェイを少なくとも二つ選択してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
@@ -677,5 +686,5 @@
 msgstr "選択したオブジェクトをペースト用バッファにコピーします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:137
 msgid "Please select something to copy."
 msgstr "コピーするものを選択してください。"
@@ -689,5 +698,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 msgid "Create a circle from three selected nodes."
-msgstr "3つのノードから円形を作成します"
+msgstr "選ばれた3つのノードから円形を作成します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
@@ -700,9 +709,9 @@
 "three nodes."
 msgstr ""
-"２つないしは３つのノード、または２つないしは３つのノードをもつ一つのウェイだ"
-"け、を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
+"正確に２つないしは３つのノード、または正確に２つないしは３つのノードを持つ一"
+"つのウェイ、を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
@@ -724,5 +733,5 @@
 msgstr "削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 msgid "Delete selected objects."
 msgstr "選択したオブジェクトを削除します"
@@ -756,5 +765,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
-msgstr "OSMからダウンロード"
+msgstr "OSMからダウンロード..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
@@ -768,6 +777,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -785,6 +796,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
-msgid "Download referrers from OSM..."
-msgstr "OSMから参照をダウンロードします。"
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+msgid "Download parent ways/relations..."
+msgstr "親のウェイ/リレーションをダウンロード..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
@@ -793,9 +805,5 @@
 "選択したプリミティブの一つを参照しているプリミティブをダウンロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-msgid "Download referrers..."
-msgstr "参照をダウンロード..."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:124
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
@@ -806,20 +814,20 @@
 msgstr "インポートした内容には {0} の競合があります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:127
 msgid "Conflicts during download"
 msgstr "ダウンロード中に競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:147
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
 msgstr "({0}/{1}) プリミティブ {2} の親要素をロード中"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "複製"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "コピー後すぐに貼り付けで複製"
@@ -839,5 +847,5 @@
 msgstr "アプリケーションを終了します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
 msgid "All Formats"
 msgstr "全てのフォーマット"
@@ -847,5 +855,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
-msgstr "GPXにエクスポート"
+msgstr "GPXにエクスポート..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -856,5 +864,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Nothing to export. Get some data first."
-msgstr "エクスポートできません。最初にデータを取得してください。"
+msgstr "エクスポートするものがありません。最初にデータを取得してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
@@ -867,5 +875,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:395
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:456
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -897,5 +905,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:314
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
@@ -910,17 +918,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:145
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:157
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:169
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:243
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
@@ -941,5 +949,5 @@
 #, java-format
 msgid "Parameter ''{0}'' must not be null."
-msgstr "パラメータ ''{0}'' はヌルでなければなりません"
+msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
@@ -955,16 +963,2850 @@
 msgstr "GPX ファイルをエクスポート"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
-msgid "JOSM Online Help"
-msgstr "JOSMオンラインヘルプ"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
-msgid "Open in Browser"
-msgstr "ブラウザで開く"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#, fuzzy
+msgid "Object history"
+msgstr "履歴があるオブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+msgid "Display history information about OSM ways, nodes, or relations."
+msgstr "OSM ウェイ、ノードまたはリレーションについて履歴情報を表示"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+msgid "Info about Element"
+msgstr "要素についての情報"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+msgid "Display object information about OSM nodes, ways, or relations."
+msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+msgid "Join Node to Way"
+msgstr "ノードをウェイに参加させる"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+msgid "Join a node into the nearest way segments"
+msgstr "ノードを一番近いセグメントに接続します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+msgid "Join Node and Line"
+msgstr "ノードと線をつなぐ"
+
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
+msgid "No Shortcut"
+msgstr "ショートカットなし"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+msgid "Merge layer"
+msgstr "レイヤーを結合"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+msgid "Merge the current layer into another layer"
+msgstr "現在のレイヤーを他のレイヤーに結合"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+msgid "Merge Nodes"
+msgstr "ノードの結合"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+msgid "Merge nodes into the oldest one."
+msgstr "一番古いものにノードをマージします。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+msgid "Please select at least two nodes to merge."
+msgstr "結合する少なくとも二つのウェイを選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+msgid "Cannot merge nodes: Would have to delete a way that is still used."
+msgstr ""
+"ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "{0}ノードを結合する"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+msgid "Merge selection"
+msgstr "選択を結合"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+msgid "Merge the currently selected primitives into another layer"
+msgstr "現在選択されたプリミティブを他のレイヤーに結合"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+msgid "Mirror"
+msgstr "鏡像"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+msgid "Mirror selected nodes and ways."
+msgstr "選択したノードやウェイの鏡像を作ります。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgid "Please select at least one node or way."
+msgstr "少なくとも1つはノードかウェイを選んでください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+msgid "up"
+msgstr "上"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#, java-format
+msgid "Move objects {0}"
+msgstr "オブジェクト{0}を移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+msgid "down"
+msgstr "下"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+msgid "left"
+msgstr "左"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+msgid "right"
+msgstr "右"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr "{0} を移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "オブジェクトの移動 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+msgid "Cannot move objects outside of the world."
+msgstr "オブジェクトを世界の外に移動できません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+msgid "New"
+msgstr "新規"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+msgid "Create a new map."
+msgstr "新しい地図を作成します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+msgid "Open..."
+msgstr "開く..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+msgid "Open a file."
+msgstr "ファイルを開く"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+msgid "Opening files"
+msgstr "ファイルを開いています"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr "ファイル ''{0}''を開いています ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+msgid "Open Location..."
+msgstr "場所を開く..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+msgid "Open an URL."
+msgstr "URL を開く。"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+msgid "Separate Layer"
+msgstr "レイヤーに分ける"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+msgid "Select if the data should be downloaded in a new layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgid "Enter URL to download:"
+msgstr "ダウンロードするURLの入力:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+msgid "Enter an URL from where data should be downloaded"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+msgid "Download Location"
+msgstr "ダウンロード先"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+msgid "Download URL"
+msgstr "ダウンロードURL"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#, fuzzy
+msgid "Start downloading data"
+msgstr "データをダウンロード中"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgid "Close dialog and cancel downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+msgid "Orthogonalize Shape"
+msgstr "直交した形状"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#, fuzzy
+msgid "Orthogonalize Shape / Undo"
+msgstr "直交した形状"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+msgid "Undo orthogonalization for certain nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#, fuzzy
+msgid "Orthogonalize / Undo"
+msgstr "垂直化"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+msgid ""
+"Orthogonalize Shape / Undo\n"
+"Please select nodes that were moved by the previous Orthogonalize Shape "
+"action!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#, fuzzy
+msgid "Undo Orthogonalize Shape"
+msgstr "直交した形状"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+"<html>今、EPSG:4326 投影法を使っています。これは、長方形整列を行うと<br>望ま"
+"しくない結果を引き起こすかもしれません。<br>この警告を消すには、投影法を変え"
+"て見てください。<br>続けますか?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#, fuzzy
+msgid "Usage"
+msgstr "使用法"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+msgid "Orthogonalize"
+msgstr "垂直化"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+msgid "Paste"
+msgstr "貼り付け"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+msgid "Paste contents of paste buffer."
+msgstr "貼り付けバッファの内容を貼り付け"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+msgid "Paste Tags"
+msgstr "タグの貼り付け"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr ""
+"クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] "{0} タグを貼り付けています"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] "{0} プリミテブまで"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Preferences..."
+msgstr "設定..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Open a preferences page for global settings."
+msgstr "全体の設定のページを開きます。"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+msgid "Preferences"
+msgstr "設定"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo"
+msgstr "やり直し"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "最後に取り消した操作を再度行います。"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+msgid "Rename layer"
+msgstr "レイヤーの名前変更"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+msgid "Also rename the file"
+msgstr "ファイル名も変える"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr "ファイル ''{0}'' をリネームできません"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "ウェイ方向反転"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "選択したウェイ全ての方向を反転します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+msgid "Please select at least one way."
+msgstr "少なくとも１つのウェイを選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+msgid "Reverse ways"
+msgstr "ウェイ方向反転"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
+msgid "Save"
+msgstr "保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
+msgid "Save the current data."
+msgstr "最新データを保存します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "ファイル {0}は存在します。上書きしますか?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr "エクスポーターが見つかりません! 何も保存されませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "空の文書"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "それでも保存する"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "文書にデータが含まれない"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "競合"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "競合を否定して保存する"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱わ"
+"れます。続けますか？"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "OSMファイルの保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "GPXファイルの保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "レイヤーを保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
+msgid "Save As..."
+msgstr "名前をつけて保存..."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
+msgid "Save the current data to a new file."
+msgstr "現在のデータを新規ファイルに保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid "Select All"
+msgstr "すべて選択"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ"
+"ジェクトも選択します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "状況報告を見る"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr "バグに添付できる有用な情報と一緒にステータスレポートを表示する"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr "ヘルプ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+msgid "Status Report"
+msgstr "状況報告"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+msgid "Copy to clipboard and close"
+msgstr "クリップボードにコピーして閉じる"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
+msgid "Close"
+msgstr "閉じる"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+msgid "Split Way"
+msgstr "ウェイを分割"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+msgid "Split a way at the selected node."
+msgstr "選択したノードでウェイを分割"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+msgid "The current selection cannot be used for splitting."
+msgstr "現在の選択は分割できません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+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:137
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] ""
+"一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択し"
+"てください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+msgid "The selected nodes do not share the same way."
+msgstr "選択したノードは同じウェイで共有されていません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+msgid "You must select two or more nodes to split a circular way."
+msgstr ""
+"円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr ""
+"ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択"
+"する）"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>リレーションのメンバーであるロールは、全ての新しいウェイにコピーされま"
+"した。<br>これらを確認して必要なら訂正してください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これ"
+"らを確認して必要なら訂正してください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "ウェイ{0}を{1}こに分割"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Toggle GPX Lines"
+msgstr "GPXラインのトグル"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+msgid "Draw lines between raw gps points."
+msgstr "生gpsポイント間に線を描画"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr "グローバル設定 \"{0}\"　のトグル"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+msgid "UnGlue Ways"
+msgstr "ウェイを引き離す"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "複数のウェイに使われているノードを複製します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgid "This node is not glued to anything else."
+msgstr "このノードは、他のどれとも接着していません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+msgid "None of these nodes are glued to anything else."
+msgstr "どのノードも接着していません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+msgid "None of this way's nodes are glued to anything else."
+msgstr "どのウェイも接着していません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "The current selection cannot be used for unglueing."
+msgstr "現在の選択は引き離せません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "Select either:"
+msgstr "ほかを選択："
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid "* One tagged node, or"
+msgstr "* 1つのタグのついたノード、または"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid "* One node that is used by more than one way, or"
+msgstr "* 1つ以上のウェイに使われている1つのノード, または"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr ""
+"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr ""
+"* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくら"
+"れます。\n"
+"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身"
+"の\n"
+"コピーが作られ、全てのノードが選択状態になります。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+msgid "Unglued Node"
+msgstr "ノードを引き離す"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr "{0}ノードと見なす"
+
+#. only one changeCommand for a way, else garbage will happen
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#, java-format
+msgid "Dupe {0} nodes into {1} nodes"
+msgstr "{0}ノードを{1}ノードと見なす"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo"
+msgstr "取り消し"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "最後の操作を取り消します"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+msgid "Unselect All"
+msgstr "選択なし"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect all objects."
+msgstr "全てのオブジェクトで選択解除"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+msgid "Unselect All (Focus)"
+msgstr "全てを選択解除(Focus)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+msgid "Unselect All (Escape)"
+msgstr "全てを選択解除（Escape)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+msgid "Update data"
+msgstr "データを更新"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
+msgid "Updates the objects in the current data layer from the server."
+msgstr "サーバから現在のデータレイヤーのオブジェクトを更新します。"
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
+msgid "Updating data"
+msgstr "データ更新中"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+msgid "No current dataset found"
+msgstr "現在のデータセットが見つかりません"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#, fuzzy, java-format
+msgid "Didn''t find an object with id {0} in the current dataset"
+msgstr "現在のデータセット中には ID {0} のプリミティブが見つかりません"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+msgid "Update selections"
+msgstr "選択を更新"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+msgid ""
+"Updates the currently selected objects from the server (re-downloads data)"
+msgstr ""
+"サーバから（再ダウンロードデータ）現在選択されたオブジェクトを更新します"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+msgid "Update Selection"
+msgstr "選択を更新"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+msgid "There are no selected primitives to update."
+msgstr "更新用に選択されたプリミティブがありません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+msgid "Selection empty"
+msgstr "選択は空です"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
+msgid "Upload data"
+msgstr "データをアップロード"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+msgid "Upload all changes in the current data layer to the OSM server"
+msgstr "現在のデータレイヤーの変更を全てOSM サーバにアップロード"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#, java-format
+msgid ""
+"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+"resolve them first.</html>"
+msgstr ""
+"<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決してくだ"
+"さい。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+msgid "No changes to upload."
+msgstr "アップロードする変更はありません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+msgid "Nothing to upload. Get some data first."
+msgstr "アップロードするものがありません。最初にデータを取得してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#, fuzzy, java-format
+msgid "Synchronize node {0} only"
+msgstr "{0} {1} だけを同期"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#, fuzzy, java-format
+msgid "Synchronize way {0} only"
+msgstr "{0} {1} だけを同期"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#, fuzzy, java-format
+msgid "Synchronize relation {0} only"
+msgstr "{0} {1} だけを同期"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+msgid "Synchronize entire dataset"
+msgstr "データセット全体を同期"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>アップロード<strong>失敗</strong>: サーバーはあなたのノード・ウェイ・リ"
+"レーションのどれかに、<br>もっと新しいバージョンのものを持っているようです。"
+"<br>この競合は、id <strong>{1}</strong> の <strong>{0}</strong> でおきまし"
+"た。<br>サーバーにあるバージョンは {2} で、あなたのは {3} です。<br><br>競合"
+"したプリミティブのみを同期させるには、<strong>{4}</strong>をクリックしてくだ"
+"さい。 <br>全ローカルセットを同期させるには、<strong>{5}</strong> をクリック"
+"してください。<br>中止して編集を継続するには、<strong>{6}</strong> をクリック"
+"してください。<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+msgid "Conflicts detected"
+msgstr "競合が検出されました"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>アップロード<strong>失敗</strong>: サーバーはあなたのノード・ウェイ・リ"
+"レーションのどれかに、<br>もっと新しいバージョンのものを持っているようです。"
+"<br>全ローカルセットを同期させるには、<strong>{0}</strong> をクリックしてくだ"
+"さい。<br>中止して編集を継続するには、<strong>{1}</strong> をクリックしてくだ"
+"さい。<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+"<html>アップロード <strong>失敗</strong>: あなたが<br>チェンジセット {0} を使"
+"用しています。それはすでに {1} に閉じられましたので、<br>もう一度新規または既"
+"に開いている変更セットをアップロードしてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+msgid "Changeset closed"
+msgstr "変更セットは閉じられました"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
+#, java-format
+msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:458
+msgid "Upload to OSM API failed"
+msgstr "OSM API へのアップロード失敗"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:481
+msgid "Updating primitive"
+msgstr "プリミティブ更新中"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:538
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "レイヤー ''{0}'' へデータをアップロード中"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:569
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
+"ティブをスキップし、アップロードを再試行します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+msgid "Upload selection"
+msgstr "選択をアップロード"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#, fuzzy
+msgid "Upload all changes in the current selection to the OSM server."
+msgstr "現在の選択の変更を全てOSM サーバにアップロード。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "パラメータの ''{0}'' はヌルではいけません"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
+msgid "Checking parents for deleted objects"
+msgstr "親の削除済みオブジェクトをチェック中"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318
+#, java-format
+msgid "Reading parents of ''{0}''"
+msgstr "''{0}'' の親を読み込み中"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324
+msgid "Checking for deleted parents in the local dataset"
+msgstr "ローカルデータセット内の削除済みの親をチェック中"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+msgid "Zoom In"
+msgstr "拡大"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+msgid "Zoom Out"
+msgstr "ズームアウト"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgid "Back"
+msgstr "戻る"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+msgid "Jump back."
+msgstr "前へ戻ります"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#, java-format
+msgid "Audio: {0}"
+msgstr "オーディオ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgid "Faster"
+msgstr "もっと速く"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+msgid "Faster Forward"
+msgstr "早回し"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgid "Forward"
+msgstr "進む"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+msgid "Jump forward"
+msgstr "次にジャンプ"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgid "Next Marker"
+msgstr "次のマーカー"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgid "Play next marker."
+msgstr "次のマーカーを再生。"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/Pause"
+msgstr "再生/一時停止"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "音声を再生/一時停止"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgid "Previous Marker"
+msgstr "前のマーカー"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgid "Play previous marker."
+msgstr "一つ前のマーカーを再生。"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgid "Slower"
+msgstr "遅く"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgid "Slower Forward"
+msgstr "ゆっくり再生"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+msgid "Downloading GPS data"
+msgstr "GPSデータをダウンロード中"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+msgid "Downloaded GPX Data"
+msgstr "ダウンロードされたGPXデータ"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
+msgid "Raw GPS data"
+msgstr "生のGPSデータ"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+msgid "Downloading data"
+msgstr "データをダウンロード中"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+msgid "No data found in this area."
+msgstr "この範囲ではデータは見つかりません"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMapデータ"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "ダウンロード {1}のうち{0} (残り {2})"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
+#, java-format
+msgid "The following errors occurred during mass download:{0}"
+msgstr "次のエラーが一括ダウンロード中に発生しました: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
+msgid "Errors during Download"
+msgstr "ダウンロード中にエラーです。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them the "
+"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
+msgstr ""
+"<html>あなたのローカルセットにある{0} 個のプリミティブが、<br>おそらくサー"
+"バーでは削除されています。これらをあとで削除したり、更新しようとすると、サー"
+"バーは<br>競合<br>と報告するでしょう。<br>サーバー上のこれらのプリミティブの"
+"状態を確認するには<br><strong>{1}</strong>をクリックしてください。 <br>無視す"
+"るには、<strong>{2}</strong>をクリックしてください。<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+msgid "Deleted or moved primitives"
+msgstr "削除または移動されたプリミティブ"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+msgid "Delete Mode"
+msgstr "削除モード"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
+msgid "Delete nodes or ways."
+msgstr "ノードまたはウェイを削除します"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+#, java-format
+msgid "Mode: {0}"
+msgstr "モード: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに"
+"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
+msgid "Draw"
+msgstr "描画"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+msgid "Draw nodes"
+msgstr "ノードを描画"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
+msgid "Mode: Draw Focus"
+msgstr "モード: フォーカスを描画"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+msgid "selected"
+msgstr "選択済の"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+msgid "Cannot add a node outside of the world."
+msgstr "世界の外にノードを追加できません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+msgid "Add node"
+msgstr "ノードを追加"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+msgid "Add node into way"
+msgstr "ノードでウェイに追加"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+msgid "Connect existing way to node"
+msgstr "既存のウェイをノードとつなぎます。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+msgid "Add a new node to an existing way"
+msgstr "既存のウェイに新しいノードを追加"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+msgid "Add node into way and connect"
+msgstr "ウェイのノードを追加して接続"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+msgid "Create new node."
+msgstr "新規ノードの作成"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+msgid "Select node under cursor."
+msgstr "カーソルの下のノードを選択"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "新規ノードを {0}このウェイに追加します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+msgid "Start new way from last node."
+msgstr "新規ウェイを最後に操作したノードから開始"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+msgid "Continue way from last node."
+msgstr "最後に操作したノードからウェイを継続"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+msgid "Finish drawing."
+msgstr "描画の完了"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+msgid "Extrude"
+msgstr "押し出し"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+msgid "Create areas"
+msgstr "エリアの作成"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+msgid "Extrude Way"
+msgstr "ウェイを押し出す"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "回転を止めるには、マウスボタンを放します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
+msgid "Drag a way segment to make a rectangle."
+msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+msgid ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー"
+"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
+msgid "Select"
+msgstr "選択"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+msgid "Select, move and rotate objects"
+msgstr "オブジェクトの選択、移動および回転"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
+#, java-format
+msgid "Add and move a virtual new node to way"
+msgid_plural "Add and move a virtual new node to {0} ways"
+msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
+msgid "Move elements"
+msgstr "要素を移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+msgid "Move them"
+msgstr "これらを移動する。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+msgid "Undo move"
+msgstr "移動を取り消す"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
+#, java-format
+msgid ""
+"You moved more than {0} elements. Moving a large number of elements is often "
+"an error.\n"
+"Really move them?"
+msgstr ""
+"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間"
+"違いでしょう。\n"
+"本当に移動しますか？"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
+msgid "Always move and don't show dialog again"
+msgstr "常に移動し、ダイアログ表示は不要"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと"
+"マージします。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
+msgid ""
+"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
+"Ctrl to rotate selected; or change selection"
+msgstr ""
+"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替"
+"え);Shft-Ctrlで選択を回転。;選択を変更。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+msgid "Zoom"
+msgstr "ズーム"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+msgid "Zoom and move map"
+msgstr "ズームと地図の移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+msgid ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
+msgstr ""
+"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら"
+"移動; 右ドラッグによるズーム"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
+msgid "Search..."
+msgstr "検索..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
+msgid "Search for objects."
+msgstr "オブジェクトを検索する。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
+msgid "Can't search because there is no loaded data."
+msgstr "データがロードされていないので検索できません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+msgid "Please enter a filter string."
+msgstr "フィルター文字列を入力してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+msgid "Please enter a search string."
+msgstr "検索文字列を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
+msgid "replace selection"
+msgstr "セレクションを置換"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76
+msgid "add to selection"
+msgstr "セレクションに加える"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+msgid "remove from selection"
+msgstr "セレクションの削除"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+msgid "find in selection"
+msgstr "選択範囲の中から見つける"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+msgid "case sensitive"
+msgstr "大/小文字を区別する"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+msgid "regular expression"
+msgstr "正規表現検索"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
+msgstr ""
+"<b>ベイカー ストリート</b> - 任意のキーや名前の 'ベイカー' と 'ストリート'。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
+msgstr ""
+"<b>\"ベイカー ストリート\"</b> - 任意のキーや名前の 'ベイカー ストリート'。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
+msgstr "<b>name:Bak</b> - 'Bak' その名前のどこか。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
+msgstr "<b>type=route</b> -  正確に 'route'の値を持つキー 'type'です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+msgid ""
+"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr ""
+"<b>type=*</b> - キー 'type' はどんな値でも良い。 また <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>もできます。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+msgid "<b>-name:Bak</b> - not 'Bak' in the name."
+msgstr "<b>-name:Bak</b> - その名前の内 'Bak' でない。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr "<b>foot:</b> - key=任意の値を入力してください."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+msgid "<u>Special targets:</u>"
+msgstr "<u>特殊なターゲット:</u>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
+"<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+msgid "<b>user:</b>... - all objects changed by user"
+msgstr "<b>user:</b>... - 該当ユーザに変更された全オブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+msgstr "<b>id:</b>... - オブジェクトに与えられた ID (0 は新しいオブジェクト)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
+msgid "<b>nodes:</b>... - object with given number of nodes"
+msgstr "<b>nodes:</b>... - 指定されたノード番号のオブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid "<b>modified</b> - all changed objects"
+msgstr "<b>変更済み</b> - 変更されたオブジェクトすべて"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgid "<b>selected</b> - all selected objects"
+msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr "<b>不完全</b> - すべての不完全なオブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+msgid "<b>untagged</b> - all untagged objects"
+msgstr "<b>タグなし</b> - すべてのタグなしオブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
+msgstr "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+msgid "Use <b>(</b> and <b>)</b> to group expressions"
+msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "フィルター"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
+msgid "Search"
+msgstr "検索"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+msgid "Submit filter"
+msgstr "フィルターを登録"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+msgid "Start Search"
+msgstr "検索開始"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, java-format
+msgid "No match found for ''{0}''"
+msgstr "\"{0}\"にマッチするものが見つからない"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#, java-format
+msgid "Nothing added to selection by searching for ''{0}''"
+msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#, java-format
+msgid "Nothing removed from selection by searching for ''{0}''"
+msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#, java-format
+msgid "Nothing found in selection by searching for ''{0}''"
+msgstr "''{0}'' を探しましたがセレクションの中には見つかりませんでした"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#, java-format
+msgid "Found {0} matches"
+msgstr "{0} の一致が見つかりました"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+msgid "CS"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+msgid "CI"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+msgid "RX"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
+"\n"
+"{2}"
+msgstr ""
+"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ"
+"セージは:\n"
+"\n"
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176
+msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
+msgstr ""
+"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく"
+"ださい: key=value"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
+#, java-format
+msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358
+#, java-format
+msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr ""
+"不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして "
+"\"relation\"です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#, java-format
+msgid "Unexpected token: {0}"
+msgstr "予想外のトークン: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+msgid "Missing arguments for or."
+msgstr "orに引数がありません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+msgid "Missing argument for not."
+msgstr "not に引数がありません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+msgid "Expected closing parenthesis."
+msgstr "閉じ括弧があるはずです。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+msgid "Wrong number of parameters for nodes operator."
+msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#, java-format
+msgid ""
+"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+"nodes or range, for example nodes:10-20"
+msgstr ""
+"不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくださ"
+"い、例えば ノード: 10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#, java-format
+msgid "Incorrect value of id operator: {0}. Number is expected."
+msgstr "不正なid演算子の値: {0}。数字を入力してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
+msgid "Load Selection"
+msgstr "セレクションのロード"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#, java-format
+msgid "Contact {0}..."
+msgstr "連絡先 {0} ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47
+msgid "Downloading..."
+msgstr "ダウンロード…"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80
+#, java-format
+msgid "Could not read from URL: \"{0}\""
+msgstr "URL: \"{0}\"から読み込むことができません"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83
+#, java-format
+msgid "Parsing error in URL: \"{0}\""
+msgstr "URL: \"{0}\"の走査エラー"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
+msgid "Error while communicating with server."
+msgstr "サーバとの通信中にエラー。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "API機能違反"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"警告：削除されたプリミティブ {1} のタグ\"{0}\"の値が、自動的に切り詰められま"
+"す。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}"
+"です。値の長さは{3}です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "前提条件違反"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "リレーション間の循環依存:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。"
+"<br>JOSM はこれをアップロードできません。リレーションを編集して相互依存を解消"
+"してください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "リレーション ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "... リレーションを参照"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "循環依存"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
+#, java-format
+msgid "Add node {0}"
+msgstr "ノード {0} を追加"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#, java-format
+msgid "Add way {0}"
+msgstr "ウェイ {0} を追加"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
+#, java-format
+msgid "Add relation {0}"
+msgstr "リレーション {0} を追加"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
+#, java-format
+msgid "Change node {0}"
+msgstr "ノード {0} を変更"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
+#, java-format
+msgid "Change way {0}"
+msgstr "ウェイ {0} を変更"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
+#, java-format
+msgid "Change relation {0}"
+msgstr "リレーション {0} を変更"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#, java-format
+msgid "Remove \"{0}\" for node ''{1}''"
+msgstr "ノード \"{1}\" の \"{0}\" を削除"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr "ウェイ \"{1}\" の \"{0}\" を削除"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr "リレーション \"{1}\" の \"{0}\" を削除"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#, java-format
+msgid "Set {0}={1} for node ''{2}''"
+msgstr "ノード ''{2}''に {0}={1} を設定"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#, java-format
+msgid "Set {0}={1} for way ''{2}''"
+msgstr "ウェイ ''{2}''に {0}={1} を設定"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr "リレーション ''{2}''に {0}={1} を設定"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "オブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#, java-format
+msgid "Remove \"{0}\" for {1} {2}"
+msgstr "Remove \"{0}\" for {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
+#, java-format
+msgid "Set {0}={1} for {2} {3}"
+msgstr "Set {0}={1} for {2} {3}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70
+#, java-format
+msgid "Change relation member role for {0} {1}"
+msgstr "リレーションのメンバー{0}のロールを {1} に変更"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+"conflict can't be added.</html>"
+msgstr ""
+"<html>レイヤー ''{0}'' は、既にプリミティブ<br>''{1}''<br>で、競合していま"
+"す。この競合は加えることができません。</html>"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
+msgid "Double conflict"
+msgstr "二重の競合"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
+#, java-format
+msgid ""
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr ""
+"警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けま"
+"せん。"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
+#, java-format
+msgid "Add conflict for ''{0}''"
+msgstr "''{0}'' に競合を追加"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215
+#, java-format
+msgid ""
+"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr ""
+"コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないから"
+"です。"
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr "{0} 内の座標の競合を解決"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
+msgid "Cannot resolve undecided conflict."
+msgstr "未決の競合を解決できません"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
+#, java-format
+msgid "Delete {0} object"
+msgid_plural "Delete {0} objects"
+msgstr[0] "{0} のオブジェクトを削除"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
+#, java-format
+msgid "Delete {0} node"
+msgid_plural "Delete {0} nodes"
+msgstr[0] "{0} のノードを削除"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
+#, java-format
+msgid "Delete {0} way"
+msgid_plural "Delete {0} ways"
+msgstr[0] "{0} のウェイを削除"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
+#, java-format
+msgid "Delete {0} relation"
+msgid_plural "Delete {0} relations"
+msgstr[0] "{0} のリレーションを削除"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+msgid "Conflicting relation"
+msgstr "競合中のリレーション"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
+msgid "Delete from relation"
+msgstr "関連から削除"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203
+#, java-format
+msgid ""
+"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
+"from relation?</html>"
+msgstr ""
+"<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されています。"
+"<br>リレーションから削除しますか?</html>"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
+#, java-format
+msgid ""
+"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
+"</html>"
+msgstr ""
+"<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレーショ"
+"ンから削除しますか？</html>"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+msgid "Split way segment"
+msgstr "ウェイのセグメントを分割"
+
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+"ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見て"
+"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き"
+"起こします。<br>本当に削除しますか？"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+msgid "Delete confirmation"
+msgstr "削除確認"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "{0} 内の削除済み状態の競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
+#, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "{0} のノードを移動"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "オブジェクト ''{0}'' を取り除いた。"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
+#, java-format
+msgid "Purged {0} objects"
+msgstr "{0} 個のオブジェクトを取り除いた。"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+"警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、"
+"{1} です。"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
+#, java-format
+msgid "Removing reference from relation {0}"
+msgstr "リレーション {0} からリファレンスを削除する"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "リレーション {0} のメンバーリスト内の競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
+msgid ""
+"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr ""
+"コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
+#, java-format
+msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
+msgstr "ノード ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
+#, java-format
+msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
+msgstr "ウェイ ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
+#, java-format
+msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
+msgstr "リレーション ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
+#, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "{0} のノードを回転"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "シーケンス"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
+#, java-format
+msgid "Resolve {0} tag conflicts in node {1}"
+msgstr "ノード {1} の {0} タグ競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
+#, java-format
+msgid "Resolve {0} tag conflicts in way {1}"
+msgstr "ウェイ {1} の {0} タグ競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
+#, java-format
+msgid "Resolve {0} tag conflicts in relation {1}"
+msgstr "リレーション {1} の {0} タグ競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "{0} のプリミティブを復活"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#, java-format
+msgid "Resolve version conflicts for node {0}"
+msgstr "ノード {0} のバージョン競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
+#, java-format
+msgid "Resolve version conflicts for way {0}"
+msgstr "ウェイ {0} のバージョン競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
+#, java-format
+msgid "Resolve version conflicts for relation {0}"
+msgstr "リレーション {0} のバージョン競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of way {0}"
+msgstr "ウェイ {0} のノードリスト中の競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "主データセットはノード {0} を含んでいません"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "適用しますか?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ"
+"ロパティーに対する以下の変更が推奨されます。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
+msgid "Relation"
+msgstr "関連"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Old role"
+msgstr "古いロール"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "New role"
+msgstr "新しいロール"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "古いキー"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "古い値"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "新しいキー"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
+msgid "New value"
+msgstr "新しい値"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Apply selected changes"
+msgstr "選択した変更を適用します"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
+msgid "Don't apply changes"
+msgstr "変更を適用しません"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85
+msgid "Please select which property changes you want to apply."
+msgstr "適用したいプロパティの変更を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97
+msgid "Properties of "
+msgstr "プロパティ "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123
+msgid "Roles in relations referring to"
+msgstr "次を参照する関連中のロール"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
+msgid "Automatic tag correction"
+msgstr "自動タグ修正"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#, java-format
+msgid "Warning: failed to persist preferences to ''{0}''"
+msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "不正な設定がファイルの{0}行目にあります。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
+"isn't a directory."
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリでは"
+"ありません。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
+"isn't a directory.</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレクトリ"
+"ではありません。</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Failed to create missing "
+"preference directory: {0}"
+msgstr ""
+"警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to create missing "
+"preference directory: {0}</html>"
+msgstr ""
+"<html>設定を初期化するのに失敗しました。<br>作成に失敗した設定ディレクトリ: "
+"{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#, java-format
+msgid ""
+"Warning: Missing preference file ''{0}''. Creating a default preference file."
+msgstr ""
+"警告: 設定ファイル ''{0}'' がありません。デフォルトの設定ファイルを作成しま"
+"す。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#, java-format
+msgid ""
+"Warning: Replacing existing preference file ''{0}'' with default preference "
+"file."
+msgstr ""
+"警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to reset preference file "
+"to default: {0}</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>設定ファイルをデフォルト: {0} にリセッ"
+"トできません</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#, java-format
+msgid ""
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+"<html>設定ファイルにはエラーがあります。<br>古いもののバックアップを<br>{0}"
+"<br>に取って、新しい初期設定ファイルを作ります。</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences.Failed to reset preference file to "
+"default: {0}"
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット"
+"に失敗"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "設定は{0}に保存"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "設定をアップロードできませんでした。理由: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+msgid "Could not load preferences from server."
+msgstr "サーバから設定をロードできませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外"
+"の内容: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "Already registered a conflict for primitive ''{0}''."
+msgstr "プリミティブ ''{0}'' には既に競合が登録されています"
+
+#. *
+#. * the decimal format 999.999
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
+msgid "Decimal Degrees"
+msgstr "十進経緯度"
+
+#. *
+#. * the minutes/seconds format 99" 99'
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
+msgid "Degrees Minutes Seconds"
+msgstr "度分秒"
+
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+msgid "S"
+msgstr "南"
+
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "北"
+
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+msgid "W"
+msgstr "西"
+
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+msgid "E"
+msgstr "東"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
+#, java-format
+msgid "Changeset {0}"
+msgstr "変更セット {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:454
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr "東"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
+msgid "H"
+msgstr "H"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
+msgid "Text"
+msgstr "テキスト"
+
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
+msgid "C"
+msgstr "C"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
+msgid "I"
+msgstr "I"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
+msgid "M"
+msgstr "M"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
+msgid "R"
+msgstr "R"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
+msgid "A"
+msgstr "A"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
+msgid "D"
+msgstr "D"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
+msgid "F"
+msgstr "F"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#, java-format
+msgid "Error: {0}"
+msgstr "Error: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164
+#, java-format
+msgid "Expected ID >= 0. Got {0}."
+msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:319
+msgid "A primitive with ID = 0 can't be invisible."
+msgstr "id=0 のプリミティブは非表示にできません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:375
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
+#, java-format
+msgid "ID > 0 expected. Got {0}."
+msgstr "ID > 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:377
+#, java-format
+msgid "Version > 0 expected. Got {0}."
+msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
+#, java-format
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+msgstr ""
+"パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
+#, java-format
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+msgstr ""
+"パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取り"
+"ました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
+msgid ""
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
+msgstr ""
+"タグコレクションをプリミティブに適用できません。複数の値を持つキーがありま"
+"す。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
+msgstr "ノード {0} を不完全なウェイ {1} に追加できません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
+msgid "There's no primitive with version {0} in this history."
+msgstr "この履歴にはバージョン {0} のプリミティブはありません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:165
+msgid "There's no version valid at date ''{0}'' in this history."
+msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:176
+#, java-format
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+msgstr ""
+"パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
+msgid "No earliest version found. History is empty."
+msgstr "前のバージョンがありません。履歴は空です。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
+msgid "No latest version found. History is empty."
+msgstr "最新のバージョンがありません。履歴は空です。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
+msgid "No type found. History is empty."
+msgstr "種別が見つかりません。履歴は空です。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
+msgid "Didn't find an primitive with id {0} in this dataset"
+msgstr "このデータセットには id {0} のプリミティブはありません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84
+msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+msgstr "このデータセットには id {0} バージョン {1} のプリミティブはありません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:105
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#, java-format
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
+msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:250
+msgid "Area style way is not closed."
+msgstr "領域を指定するウェイが閉じていません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:487
+#, java-format
+msgid "multipolygon way ''{0}'' is not closed."
+msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr "メンバー \"{0}\"を関連から削除"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:866
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+msgid "More than one \"from\" way found."
+msgstr "二つ以上の\"from\"ウェイがあります。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+msgid "More than one \"to\" way found."
+msgstr "二つ以上の\"to\"ウェイがあります。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632
+msgid "More than one \"via\" found."
+msgstr "経由地が複数有ります。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr "不明なロール\"{0}\"です。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr "{0}のメンバーのタイプが不明"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:646
+msgid "No \"from\" way found."
+msgstr "\"from\"ウェイが見つかりません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:650
+msgid "No \"to\" way found."
+msgstr "\"to\"ウェイが見つかりません"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:654
+msgid "No \"via\" node or way found."
+msgstr "経由地かウェイが見つかりません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:663
+msgid "The \"from\" way doesn't start or end at a \"via\" node."
+msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:667
+msgid "The \"to\" way doesn't start or end at a \"via\" node."
+msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:694
+msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:698
+msgid "The \"to\" way doesn't start or end at the \"via\" way."
+msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:821
+#, java-format
+msgid "Style for restriction {0} not found."
+msgstr "制約条件{0}のスタイルがありません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:875
+#, java-format
+msgid "No useful role ''{0}'' for Way ''{1}''."
+msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:887
+#, java-format
+msgid "Non-Way ''{0}'' in multipolygon."
+msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:945
+#, java-format
+msgid "No outer way for multipolygon ''{0}''."
+msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1034
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "内部のウェイ ''{0}''が外側にあります。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1099
+#, java-format
+msgid "Style for inner way ''{0}'' equals multipolygon."
+msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1125
+#, java-format
+msgid "Style for outer way ''{0}'' mismatches."
+msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1329
+msgid "untagged"
+msgstr "タグ付いていない"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1330
+msgid "text"
+msgstr "テキスト"
+
+#. should not happen
+#.
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
+#, java-format
+msgid ""
+"My primitive with id {0} and version {1} is visible although their primitive "
+"with lower version {2} is not visible. Can't deal with this inconsistency. "
+"Keeping my primitive. "
+msgstr ""
+"ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョン "
+"{2} の相手のプリミティブは表示されません。この不整合を解決できません。自分の"
+"プリミティブを残します。 "
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
+msgid "inactive"
+msgstr "停止中"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "ノード"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "ウェイ"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
+msgid "relation"
+msgid_plural "relations"
+msgstr[0] "関連"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
+msgid "untagged way"
+msgstr "タグ付いていないウェイ"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
+msgid "incomplete way"
+msgstr "不完全なウェイ"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+msgid "background"
+msgstr "背景"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
+msgid "highlight"
+msgstr "ハイライト"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
+msgid "WGS84 Geographic"
+msgstr "WGS84測地系 緯度経度座標"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
+msgstr "ガウス-ラボルド会議1947"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
+msgid ""
+"IMPORTANT : data positioned far away from\n"
+"the current Lambert zone limits.\n"
+"Do not upload any data after this message.\n"
+"Undo your last action, save your work\n"
+"and start a new layer on the new zone."
+msgstr ""
+"重要：データは、現在のランベルト図法のゾーン制限\n"
+"の外にあります。\n"
+"このメッセージ以降、データのアップロードを中止します。\n"
+"最後に行った操作を取り消して、作業内容を保存し、\n"
+"新しいレイヤーを新しいゾーンで開始してください。"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
+msgid "Lambert Zone (France)"
+msgstr "ランベルトゾーン（フランス）"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+msgid "Lambert Zone (Estonia)"
+msgstr "ランベルトゾーン（エストニア）"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
+msgid "Mercator"
+msgstr "メルカトル"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90
+msgid "Swiss Grid (Switzerland)"
+msgstr "スイスグリッド (スイス)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350
+msgid "UTM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391
+#, fuzzy
+msgid "UTM Zone"
+msgstr "UTM ゾーン {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr "UTM20N (仏領)グアドループ海外県 Sainte-Anne 市 1948"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr "UTM20N (仏領)マルティニーク海外県 Fort Desaix 市 1952"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#, java-format
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#, java-format
+msgid "<html>Could not write bookmark.<br>{0}</html>"
+msgstr "<html>ブックマークを書き込めません。<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+msgid "Do not show again"
+msgstr "今後は表示しない"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
+#, java-format
+msgid " [id: {0}]"
+msgstr " [id: {0}]"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
+msgid "incomplete"
+msgstr "不完全"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+msgid "highway"
+msgstr "道路"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3180
+msgid "railway"
+msgstr "鉄道"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+msgid "waterway"
+msgstr "水路"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+msgid "landuse"
+msgstr "土地利用"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0}ノード"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#, java-format
+msgid "{0} member"
+msgid_plural "{0} members"
+msgstr[0] "{0} メンバー"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+msgid "Precondition violation"
+msgstr "前提条件違反"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+msgid "Security exception"
+msgstr "セキュリティ例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+msgid "Network exception"
+msgstr "ネットワーク例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+msgid "IO Exception"
+msgstr "IO 例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+msgid "Internal Server Error"
+msgstr "サーバの内部エラー"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+msgid "Bad Request"
+msgstr "不正な要求"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+msgid "Not Found"
+msgstr "見つかりません"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
+msgid "Conflict"
+msgstr "競合"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+msgid "Unknown host"
+msgstr "不明なホスト"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+msgid "Object deleted"
+msgstr "オブジェクトは削除されました"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:101
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:22
+#, fuzzy
+msgid "Show help information"
+msgstr "プラグイン情報"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
+msgid "Message of the day not available"
+msgstr "今日のメッセージはありません"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
+msgid "Downloading \"Message of the day\""
+msgstr "\"今日のメッセージ\"をダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+msgid "Upload Preferences"
+msgstr "アップロード設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+msgid "Upload the current preferences to the server"
+msgstr "サーバに現在の設定をアップロードします"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+msgid "string"
+msgstr "文字列"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+msgid "Name of the user."
+msgstr "ユーザの名前"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+msgid "OSM Password."
+msgstr "OSMのパスワード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr "指定された位置でアプレットのサイズ変更（指定フォーマットは、幅x高さ）"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+msgid "string;string;..."
+msgstr "文字列：文字列：…"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
+"それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイ"
+"ル名を指定できます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURL"
+"かファイル名で指定できます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"URL which returns osm-xml"
+msgstr ""
+"それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返"
+"すURLで指定できます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid "any"
+msgstr "任意"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid "If specified, reset the configuration instead of reading it."
+msgstr "もし指定されると、読み込む代わりに設定をリセットします。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+msgid "Username"
+msgstr "ユーザ名"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+msgid "Password"
+msgstr "パスワード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+msgid "usage"
+msgstr "使用法"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+msgid "options"
+msgstr "オプション"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+msgid "Show this help"
+msgstr "このヘルプの表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+msgid "Standard unix geometry argument"
+msgstr "標準のunix配置引数"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+msgid "Download the bounding box"
+msgstr "bounding boxをダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+msgid "Open file (as raw gps, if .gpx)"
+msgstr "ファイルを開く（.gpxの場合生のGPSとして)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+msgid "Download the bounding box as raw gps"
+msgstr "bounding boxを生GPSとしてダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+msgid "Select with the given search"
+msgstr "検索から選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+msgid "Launch in maximized mode"
+msgstr "最大モードで起動"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+msgid "Reset the preferences to default"
+msgstr "設定を既定に戻します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+msgid "Set the language."
+msgstr "言語の変更"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+msgid "options provided as Java system properties"
+msgstr "Javaシステムのプロパティとして提供されるオプション"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgid "/PATH/TO/JOSM/FOLDER/         "
+msgstr "/PATH/TO/JOSM/FOLDER/         "
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgid "Change the folder for all user settings"
+msgstr "全てのユーザ設定用フォルダを変更"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+msgid ""
+"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
+"the following\n"
+"      Java option to increase the maximum size of allocated memory"
+msgstr ""
+"通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必要で"
+"す\n"
+"     Javaの使用メモリ最大サイズを増やすオプション"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+msgid "examples"
+msgstr "例"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"指定された順番で設定が読み込まれます。一部のデータがselection以前に\n"
+"読み込まれることにご注意ください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "Activating updated plugins"
+msgstr "アップデートしたプラグインの活性化"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Loading early plugins"
+msgstr "早期読み込みプラグインのロード中"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+msgid "Setting defaults"
+msgstr "デフォルト設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+msgid "Loading plugins"
+msgstr "プラグインのロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr "設定 {0} はもう使われていないので、除かれました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
+msgid "File"
+msgstr "ファイル"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
@@ -981,2797 +3823,19 @@
 msgstr "編集"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
-msgid "Reload"
-msgstr "再読込"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:114
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "JOSMオンラインヘルプからのページのみ編集できます。"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:199
-#, java-format
-msgid "Error while loading page {0}"
-msgstr "ページ{0}を読み込む際にエラーが発生しました。"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218
-#, java-format
-msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-msgstr "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223
-#, java-format
-msgid ""
-"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
-"\">your language</A>."
-msgstr ""
-"ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">あ"
-"なたの言語</A>で作成してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
-msgid "History of Element"
-msgstr "要素の履歴"
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "OSM ウェイ、ノードまたはリレーションについて履歴情報を表示"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Info about Element"
-msgstr "要素についての情報"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-msgid "Join Node to Way"
-msgstr "ノードをウェイに参加させる"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
-msgid "Join a node into the nearest way segments"
-msgstr "ノードを一番近いセグメントに接続します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
-msgid "Join Node and Line"
-msgstr "ノードと線をつなぐ"
-
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
-msgid "No Shortcut"
-msgstr "ショートカットなし"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-msgid "Merge layer"
-msgstr "レイヤーを結合"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-msgid "Merge the current layer into another layer"
-msgstr "現在のレイヤーを他のレイヤーに結合"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-msgid "Merge Nodes"
-msgstr "ノードの結合"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-msgid "Merge nodes into the oldest one."
-msgstr "一番古いものにノードをマージします。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-msgid "Please select at least two nodes to merge."
-msgstr "結合する少なくとも二つのウェイを選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr ""
-"ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
-#, java-format
-msgid "Merge {0} nodes"
-msgstr "{0}ノードを結合する"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-msgid "Merge selection"
-msgstr "選択を結合"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-msgid "Merge the currently selected primitives into another layer"
-msgstr "現在選択されたプリミティブを他のレイヤーに結合"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
-msgid "Mirror"
-msgstr "鏡像"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-msgid "Mirror selected nodes and ways."
-msgstr "選択したノードやウェイの鏡像を作ります。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
-msgid "Please select at least one node or way."
-msgstr "少なくとも1つはノードかウェイを選んでください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
-msgid "up"
-msgstr "上"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, java-format
-msgid "Move objects {0}"
-msgstr "オブジェクト{0}を移動"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr "下"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr "左"
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-msgid "right"
-msgstr "右"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
-#, java-format
-msgid "Move {0}"
-msgstr "{0} を移動"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Moves Objects {0}"
-msgstr "オブジェクトの移動 {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
-msgid "Cannot move objects outside of the world."
-msgstr "オブジェクトを世界の外に移動できません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-msgid "New"
-msgstr "新規"
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-msgid "Create a new map."
-msgstr "新しい地図を作成します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-msgid "Open..."
-msgstr "開く..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-msgid "Open a file."
-msgstr "ファイルを開く"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
-msgid "Opening files"
-msgstr "ファイルを開いています"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
-#, java-format
-msgid "Opening file ''{0}'' ..."
-msgstr "ファイル ''{0}''を開いています ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-msgid "Open Location..."
-msgstr "場所を開く..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-msgid "Open an URL."
-msgstr "URL を開く。"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
-msgid "Separate Layer"
-msgstr "レイヤーに分ける"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
-msgid "Enter URL to download:"
-msgstr "ダウンロードするURLの入力:"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
-msgid "Download Location"
-msgstr "ダウンロード先"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-msgid "Download URL"
-msgstr "ダウンロードURL"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Orthogonalize Shape"
-msgstr "直交した形状"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
-msgid "Only two nodes allowed"
-msgstr "二つだけのノード選択が許されています"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
-msgid "Selection must consist only of ways."
-msgstr "ウェイだけを選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
-msgid "Please select one or more closed ways of at least four nodes."
-msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?</html>"
-msgstr ""
-"<html>今、EPSG:4326 投影法を使っています。これは、長方形整列を行うと<br>の望"
-"まない結果を引き起こすかもしれません。<br>この警告にしたがって、投影法を変え"
-"て見てください。<br>続けますか?</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
-msgid "Only one node selected"
-msgstr "ただ一つだけのノードが選択されています。"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
-msgid "Orthogonalize"
-msgstr "垂直化"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
-msgid "Paste"
-msgstr "貼り付け"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-msgid "Paste contents of paste buffer."
-msgstr "貼り付けバッファの内容を貼り付け"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
-msgid "Paste Tags"
-msgstr "タグの貼り付け"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
-msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr ""
-"クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
-#, java-format
-msgid "Pasting {0} tag"
-msgid_plural "Pasting {0} tags"
-msgstr[0] "{0} タグを貼り付けています"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
-#, java-format
-msgid "to {0} primitive"
-msgid_plural "to {0} primtives"
-msgstr[0] "{0} プリミテブまで"
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Preferences..."
-msgstr "設定..."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Open a preferences page for global settings."
-msgstr "全体の設定のページを開きます。"
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
-msgid "Preferences"
-msgstr "設定"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-msgid "Redo"
-msgstr "やり直し"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "最後に取り消した操作を再度行います。"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
-msgid "Rename layer"
-msgstr "レイヤーの名前変更"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
-msgid "Also rename the file"
-msgstr "ファイル名も変える"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
-#, java-format
-msgid "Could not rename file ''{0}''"
-msgstr "ファイル ''{0}'' をリネームできません"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-msgid "Reverse Ways"
-msgstr "ウェイ方向反転"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-msgid "Reverse the direction of all selected ways."
-msgstr "選択したウェイ全ての方向を反転します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
-msgid "Please select at least one way."
-msgstr "少なくとも１つのウェイを選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
-msgid "Reverse ways"
-msgstr "ウェイ方向反転"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
-msgid "Save"
-msgstr "保存"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
-msgid "Save the current data."
-msgstr "最新データを保存します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
-#, java-format
-msgid "File {0} exists. Overwrite?"
-msgstr "ファイル {0}は存在します。上書きしますか?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-msgid "No Exporter found! Nothing saved."
-msgstr "エクスポーターが見つかりません! 何も保存されませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
-msgid "Empty document"
-msgstr "空の文書"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-msgid "Save anyway"
-msgstr "それでも保存する"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-msgid "The document contains no data."
-msgstr "文書にデータが含まれない"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
-msgid "Conflicts"
-msgstr "競合"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-msgid "Reject Conflicts and Save"
-msgstr "競合を否定して保存する"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱わ"
-"れます。続けますか？"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
-msgid "Save OSM file"
-msgstr "OSMファイルの保存"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
-msgid "Save GPX file"
-msgstr "GPXファイルの保存"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
-msgid "Save Layer"
-msgstr "レイヤーを保存"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
-msgid "Save As..."
-msgstr "名前をつけて保存…"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
-msgid "Save the current data to a new file."
-msgstr "現在のデータを新規ファイルに保存"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid "Select All"
-msgstr "すべて選択"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ"
-"ジェクトも選択します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr "状況報告を見る"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-msgid "Show status report with useful information that can be attached to bugs"
-msgstr ""
-"バグに添付されているであろう有用な情報と一緒にステータスレポートを表示する。"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
-#, java-format
-msgid "Help: {0}"
-msgstr "ヘルプ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
-msgid "Status Report"
-msgstr "状況報告"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-msgid "Copy to clipboard and close"
-msgstr "クリップボードにコピーして閉じる"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
-msgid "Close"
-msgstr "閉じる"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-msgid "Split Way"
-msgstr "ウェイを分割"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-msgid "Split a way at the selected node."
-msgstr "選択したノードでウェイを分割"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
-msgid "The current selection cannot be used for splitting."
-msgstr "現在の選択は分割できません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
-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:137
-msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
-msgstr[0] ""
-"一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択し"
-"てください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
-msgid "The selected nodes do not share the same way."
-msgstr "選択したノードは同じウェイで共有されていません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
-msgid "You must select two or more nodes to split a circular way."
-msgstr ""
-"円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
-msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr ""
-"ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択"
-"する）"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
-msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-"<html>リレーションのメンバーであるロールは、全ての新しいウェイにコピーされま"
-"した。<br>これらを確認して必要なら訂正してください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これ"
-"らを確認して必要なら訂正してください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
-#, java-format
-msgid "Split way {0} into {1} parts"
-msgstr "ウェイ{0}を{1}こに分割"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-msgid "Toggle GPX Lines"
-msgstr "GPXラインのトグル"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-msgid "Draw lines between raw gps points."
-msgstr "生gpsポイント間に線を描画"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, java-format
-msgid "Toggles the global setting ''{0}''."
-msgstr "グローバル設定 \"{0}\"　のトグル"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-msgid "UnGlue Ways"
-msgstr "ウェイを引き離す"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-msgid "Duplicate nodes that are used by multiple ways."
-msgstr "複数のウェイに使われているノードを複製します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
-msgid "This node is not glued to anything else."
-msgstr "このノードは、何とも結合していません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
-msgid "None of these nodes are glued to anything else."
-msgstr "どのノードも結合していません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
-msgid "None of this way's nodes are glued to anything else."
-msgstr "どのウェイも結合していません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid "The current selection cannot be used for unglueing."
-msgstr "現在の選択は引き離せません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "Select either:"
-msgstr "ほかを選択："
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
-msgid "* One tagged node, or"
-msgstr "* 1つのタグのついたノード、または"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "* One node that is used by more than one way, or"
-msgstr "* 1つ以上のウェイに使われている1つのノード, または"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr ""
-"* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
-"own copy and all nodes will be selected."
-msgstr ""
-"備考：ウェイが選択されていれば、グルーされていないノードのあたらしいコピーが"
-"つくられます。\n"
-"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身"
-"の\n"
-"コピーが作られ、全てのノードが選択状態になります。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
-msgid "Unglued Node"
-msgstr "ノードを引き離す"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
-#, java-format
-msgid "Dupe into {0} nodes"
-msgstr "{0}ノードと見なす"
-
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "{0}ノードを{1}ノードと見なす"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-msgid "Undo"
-msgstr "取り消し"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "最後の操作を取り消します"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
-msgid "Unselect All"
-msgstr "選択なし"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-msgid "Unselect all objects."
-msgstr "全てのオブジェクトで選択解除"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-msgid "Unselect All (Focus)"
-msgstr "全てを非選択(Focus)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-msgid "Unselect All (Escape)"
-msgstr "全てを非選択（Escape)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
-msgid "Update Data"
-msgstr "データの更新"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
-"サーバーからの新しいデータで、データレイヤーのデーターを更新する。(データの再"
-"ダウンロード)"
-
-#. bounds defined? => use the bbox downloader
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "データ更新中"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-msgid "No current dataset found"
-msgstr "現在のデータセットが見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "現在のデータセット中には id {0} のプリミティブが見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
-msgid "Update Selection"
-msgstr "選択を更新"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Updates the currently selected primitives from the server"
-msgstr "サーバから現在選択されたプリミティブを更新"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
-msgid "There are no selected primitives to update."
-msgstr "更新用に"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
-msgid "Selection empty"
-msgstr "選択は空です"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
-msgid "Upload to OSM..."
-msgstr "OSMにアップロード"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
-msgid "Upload all changes to the OSM server."
-msgstr "OSMサーバにすべての変更をアップロードします。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
-#, java-format
-msgid ""
-"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-"resolve them first.</html>"
-msgstr ""
-"<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決してくだ"
-"さい。</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160
-msgid "Nothing to upload. Get some data first."
-msgstr "アップロードするものがありません。最初にデータを取得してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171
-msgid "No changes to upload."
-msgstr "アップロードする変更はありません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr "{0} {1} だけを同期"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-msgid "Synchronize entire dataset"
-msgstr "データセット全体を同期"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>アップロード中。<strong>失敗</strong>: サーバーはあなたのノード・ウェ"
-"イ・リレーションのどれかに、<br>もっと新しいバージョンのものを持っているよう"
-"です。<br>この競合は、id <strong>{1}</strong> の <strong>{0}</strong> でおき"
-"ました。<br>サーバーにあるバージョンは {2} で、あなたのは {3} です。<br><br>"
-"競合したプリミティブのみを同期させるには、<strong>{4}</strong>をクリックして"
-"ください。 <br>全ローカルセットを同期させるには、<strong>{5}</strong> をク"
-"リックしてください。<br>中止して編集を継続するには、<strong>{6}</strong> をク"
-"リックしてください。<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283
-msgid "Conflict detected"
-msgstr "競合が検出されました"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#, java-format
-msgid "Unexpected return value. Got {0}."
-msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>アップロード中。<strong>失敗</strong>: サーバーはあなたのノード・ウェ"
-"イ・リレーションのどれかに、<br>もっと新しいバージョンのものを持っているよう"
-"です。<br>全ローカルセットを同期させるには、<strong>{0}</strong> をクリックし"
-"てください。<br>中止して編集を継続するには、<strong>{1}</strong> をクリックし"
-"てください。<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because you''ve been "
-"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset.</html>"
-msgstr ""
-"<html>アップロードが <strong>失敗しました。</strong> なぜならば、あなたが<br>"
-"チェンジセット {0} を使用しています。それはすでに {1} に閉じられましたので、"
-"<br>もう一度新規か既に開いているチェンジセットをアップロードしてください。</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314
-msgid "Changeset closed"
-msgstr "変更セットは閉じられました"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
-#, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434
-msgid "Upload to OSM API failed"
-msgstr "OSM API へのアップロード失敗"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
-msgid "Updating primitive"
-msgstr "プリミティブ更新中"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr "レイヤー ''{0}'' へデータをアップロード中"
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-"警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
-"ティブをスキップし、アップロードを再試行します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-msgid "Zoom In"
-msgstr "拡大"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-msgid "Zoom Out"
-msgstr "ズームアウト"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-msgid "Back"
-msgstr "戻る"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-msgid "Jump back."
-msgstr "前へ戻ります"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-#, java-format
-msgid "Audio: {0}"
-msgstr "オーディオ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-msgid "Faster"
-msgstr "もっと速く"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-msgid "Faster Forward"
-msgstr "早回し"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-msgid "Forward"
-msgstr "進む"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-msgid "Jump forward"
-msgstr "次にジャンプ"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-msgid "Next Marker"
-msgstr "次のマーカー"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-msgid "Play next marker."
-msgstr "次のマーカーを再生。"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-msgid "Play/Pause"
-msgstr "再生/一時停止"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-msgid "Play/pause audio."
-msgstr "音声を再生/一時停止"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-msgid "Previous Marker"
-msgstr "前のマーカー"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-msgid "Play previous marker."
-msgstr "一つ前のマーカーを再生。"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-msgid "Slower"
-msgstr "遅く"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-msgid "Slower Forward"
-msgstr "ゆっくり再生"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
-msgid "Downloading GPS data"
-msgstr "GPSデータをダウンロード中"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
-msgid "Downloaded GPX Data"
-msgstr "ダウンロードされたGPXデータ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "生のGPSデータ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
-msgid "Downloading data"
-msgstr "データをダウンロード中"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data found in this area."
-msgstr "この範囲ではデータは見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMapデータ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
-#, java-format
-msgid "Download {0} of {1} ({2} left)"
-msgstr "ダウンロード {1}のうち{0} (残り {2})"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "次のエラーが一括ダウンロード中に発生しました: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "ダウンロード中にエラーです。"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
-#, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-"<html>あなたのローカルセットにある{0} 個のプリミティブが、<br>おそらくサー"
-"バーでは削除されています。これらをあとで削除したり、更新しようとすると、サー"
-"バーは<br>競合<br>と報告するでしょう。<br>サーバー上のこれらのプリミティブの"
-"状態を確認するには<br><strong>{1}</strong>をクリックしてください。 <br>無視す"
-"るには、<strong>{2}</strong>をクリックしてください。<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
-msgid "Deleted or moved primitives"
-msgstr "削除または移動されたプリミティブ"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
-msgid "Delete Mode"
-msgstr "削除モード"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
-msgid "Delete nodes or ways."
-msgstr "ノードまたはウェイを削除します"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
-#, java-format
-msgid "Mode: {0}"
-msgstr "モード: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに"
-"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
-msgid "Draw"
-msgstr "描画"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-msgid "Draw nodes"
-msgstr "ノードを描画"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
-msgid "Mode: Draw Focus"
-msgstr "モード: フォーカスを描画"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
-msgid "selected"
-msgstr "選択済の"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:358
-msgid "Cannot add a node outside of the world."
-msgstr "世界の外にノードを追加できません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
-msgid "Add node"
-msgstr "ノードを追加"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:532
-msgid "Add node into way"
-msgstr "ノードでウェイに追加"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
-msgid "Connect existing way to node"
-msgstr "既存のウェイをノードとつなぎます。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
-msgid "Add a new node to an existing way"
-msgstr "既存のウェイに新しいノードを追加"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:544
-msgid "Add node into way and connect"
-msgstr "ウェイのノードを追加して接続"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
-msgid "Create new node."
-msgstr "新規ノードの作成"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-msgid "Select node under cursor."
-msgstr "カーソルの下のノードを選択"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] "新規ノードを {0}このウェイに追加します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
-msgid "Start new way from last node."
-msgstr "新規ウェイを最後に操作したノードから開始"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
-msgid "Continue way from last node."
-msgstr "最後に操作したノードからウェイを継続"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
-msgid "Finish drawing."
-msgstr "描画の完了"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-msgid "Extrude"
-msgstr "押し出し"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-msgid "Create areas"
-msgstr "エリアの作成"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
-msgid "Extrude Way"
-msgstr "ウェイの延長"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
-msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
-msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
-msgid "Release the mouse button to stop rotating."
-msgstr "回転を止めるには、マウスボタンを放します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
-msgid "Drag a way segment to make a rectangle."
-msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
-msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
-msgstr ""
-"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー"
-"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
-msgid "Select"
-msgstr "選択"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-msgid "Select, move and rotate objects"
-msgstr "オブジェクトの選択、移動および回転"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
-#, java-format
-msgid "Add and move a virtual new node to way"
-msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
-msgid "Move elements"
-msgstr "要素を移動"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-msgid "Move them"
-msgstr "これらを移動する。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-msgid "Undo move"
-msgstr "移動を取り消す"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
-#, java-format
-msgid ""
-"You moved more than {0} elements. Moving a large number of elements is often "
-"an error.\n"
-"Really move them?"
-msgstr ""
-"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間"
-"違いでしょう。\n"
-"本当に移動しますか？"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
-msgid "Always move and don't show dialog again"
-msgstr "常に移動し、ダイアログ表示は不要"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと"
-"マージします。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
-msgid ""
-"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
-"Ctrl to rotate selected; or change selection"
-msgstr ""
-"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替"
-"え);Shft-Ctrlで選択を回転。;選択を変更。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-msgid "Zoom"
-msgstr "ズーム"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-msgid "Zoom and move map"
-msgstr "ズームと地図の移動"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
-msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
-"move zoom with right button"
-msgstr ""
-"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら"
-"移動; 右ドラッグによるズーム"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
-msgid "Search..."
-msgstr "検索…"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
-msgid "Search for objects."
-msgstr "オブジェクトを検索する。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-msgid "Can't search because there is no loaded data."
-msgstr "データがロードされていないので検索できません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
-msgid "Please enter a filter string."
-msgstr "フィルター文字列を入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
-msgid "Please enter a search string."
-msgstr "検索文字列を入力してください"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
-msgid "replace selection"
-msgstr "セレクションを置換"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
-msgid "add to selection"
-msgstr "セレクションに加える"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
-msgid "remove from selection"
-msgstr "セレクションの削除"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76
-msgid "find in selection"
-msgstr "選択範囲の中から見つける"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
-msgid "case sensitive"
-msgstr "大/小文字を区別する"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
-msgid "regular expression"
-msgstr "正規表現検索"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
-msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-msgstr ""
-"<b>ベイカー・ストリート</b> - どんなキーや名前の 'ベイカー' と 'ストリート'。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
-msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr ""
-"<b>\"ベイカー・ストリート\"</b> - どんなキーや名前の 'ベイカー・ストリート'。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
-msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr "<b>name:Bak</b> - 'Bak' その名前のどこか。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
-msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr "<b>type=route</b> -  正確に 'route'の値を持つキー 'type'です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
-msgid ""
-"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>type=*</b> - キー 'type' はどんな値でも良い。 また <b>*=value</b>, "
-"<b>type=</b>, <b>*=*</b>, <b>*=</b>もできます。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
-msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr "<b>-name:Bak</b> - その名前の内 'Bak' でない。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
-msgid "<b>foot:</b> - key=foot set to any value."
-msgstr "<b>foot:</b> - key=任意の値を入力してください."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
-msgid "<u>Special targets:</u>"
-msgstr "<u>特殊なターゲット:</u>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - 該当ユーザに変更された全オブジェクト"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - オブジェクトに与えられた ID (0 は新しいオブジェクト)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
-msgid "<b>nodes:</b>... - object with given number of nodes"
-msgstr "<b>nodes:</b>... - 指定されたノード番号のオブジェクト"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>変更済み</b> - 変更されたオブジェクトすべて"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>不完全</b> - すべての不完全なオブジェクト"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>タグなし</b> - すべてのタグなしオブジェクト"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "フィルター"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
-msgid "Search"
-msgstr "検索"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
-msgid "Submit filter"
-msgstr "フィルターを登録"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
-msgid "Start Search"
-msgstr "検索開始"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
-#, java-format
-msgid "No match found for ''{0}''"
-msgstr "\"{0}\"にマッチするものが見つからない"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
-#, java-format
-msgid "Nothing added to selection by searching for ''{0}''"
-msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
-#, java-format
-msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
-#, fuzzy, java-format
-msgid "Nothing found in selection by searching for ''{0}''"
-msgstr "''{0}'' を探した結果何も見つからなかった"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
-#, java-format
-msgid "Found {0} matches"
-msgstr "{0} の一致が見つかりました"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
-msgid "CS"
-msgstr "CS"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
-msgid "CI"
-msgstr "CI"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
-msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
-#, java-format
-msgid ""
-"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
-"\n"
-"{2}"
-msgstr ""
-"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ"
-"セージは:\n"
-"\n"
-"{2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176
-msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく"
-"ださい: key=value"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358
-#, java-format
-msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-"不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして "
-"\"relation\"です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512
-#, java-format
-msgid "Unexpected token: {0}"
-msgstr "予想外のトークン: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532
-msgid "Missing arguments for or."
-msgstr "orに引数がありません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542
-msgid "Missing argument for not."
-msgstr "not に引数がありません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552
-msgid "Expected closing parenthesis."
-msgstr "閉じ括弧があるはずです。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
-msgid "Wrong number of parameters for nodes operator."
-msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616
-#, java-format
-msgid ""
-"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-"nodes or range, for example nodes:10-20"
-msgstr ""
-"不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくださ"
-"い、例えば ノード: 10-20"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
-#, java-format
-msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr "不正なid演算子の値: {0}。数字を入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
-msgid "Load Selection"
-msgstr "セレクションのロード"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
-#, java-format
-msgid "Contact {0}..."
-msgstr "連絡先 {0} ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47
-msgid "Downloading..."
-msgstr "ダウンロード…"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80
-#, java-format
-msgid "Could not read from URL: \"{0}\""
-msgstr "URL: \"{0}\"から読み込むことができません"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83
-#, java-format
-msgid "Parsing error in URL: \"{0}\""
-msgstr "URL: \"{0}\"の走査エラー"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
-msgid "Error while communicating with server."
-msgstr "サーバとの通信中にエラー。"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
-msgid "API Capabilities Violation"
-msgstr "API機能違反"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"警告：削除されたプリミティブ {1} のタグ\"{0}\"の値が、自動的に切り詰められま"
-"す。"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}"
-"です。値の長さは{3}です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
-msgid "Precondition Violation"
-msgstr "前提条件違反"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
-msgid "Cyclic dependency between relations:"
-msgstr "リレーション間の循環依存:"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
-#, java-format
-msgid ""
-"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
-"can''t upload them. Please edit the relations and remove the cyclic "
-"dependency.</html>"
-msgstr ""
-"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。"
-"<br>JOSM はこれをアップロードできません。リレーションを編集して相互依存を解消"
-"してください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
-msgid "Relation ..."
-msgstr "リレーション ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
-msgid "... refers to relation"
-msgstr "... リレーションを参照"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
-msgid "Cycling dependencies"
-msgstr "循環依存"
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
-#, java-format
-msgid "Add node {0}"
-msgstr "ノード {0} を追加"
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#, java-format
-msgid "Add way {0}"
-msgstr "ウェイ {0} を追加"
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
-#, java-format
-msgid "Add relation {0}"
-msgstr "リレーション {0} を追加"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
-#, java-format
-msgid "Change node {0}"
-msgstr "ノード {0} を変更"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
-#, java-format
-msgid "Change way {0}"
-msgstr "ウェイ {0} を変更"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
-#, java-format
-msgid "Change relation {0}"
-msgstr "リレーション {0} を変更"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#, java-format
-msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "ノード \"{1}\" の \"{0}\" を削除"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
-msgstr "ウェイ \"{1}\" の \"{0}\" を削除"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
-#, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "リレーション \"{1}\" の \"{0}\" を削除"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr "ノード ''{2}''に {0}={1} を設定"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, java-format
-msgid "Set {0}={1} for way ''{2}''"
-msgstr "ウェイ ''{2}''に {0}={1} を設定"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
-#, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr "リレーション ''{2}''に {0}={1} を設定"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "オブジェクト"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, java-format
-msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Remove \"{0}\" for {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, java-format
-msgid "Set {0}={1} for {2} {3}"
-msgstr "Set {0}={1} for {2} {3}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70
-#, java-format
-msgid "Change relation member role for {0} {1}"
-msgstr "リレーションのメンバー{0}のロールを {1} に変更"
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
-"conflict can't be added.</html>"
-msgstr ""
-"<html>レイヤー ''{0}'' は、既にプリミティブ<br>''{1}''<br>で、競合していま"
-"す。この競合は加えることができません。</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
-msgid "Double conflict"
-msgstr "二重の競合"
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
-#, java-format
-msgid ""
-"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitive ''{1}''."
-msgstr ""
-"警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けま"
-"せん。"
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
-#, java-format
-msgid "Add conflict for ''{0}''"
-msgstr "''{0}'' に競合を追加"
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215
-#, java-format
-msgid ""
-"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-"コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないから"
-"です。"
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr "{0} 内の座標の競合を解決"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "Cannot resolve undecided conflict."
-msgstr "未決の競合を解決できません"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
-#, java-format
-msgid "Delete {0} object"
-msgid_plural "Delete {0} objects"
-msgstr[0] "{0} のオブジェクトを削除"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
-#, java-format
-msgid "Delete {0} node"
-msgid_plural "Delete {0} nodes"
-msgstr[0] "{0} のノードを削除"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
-#, java-format
-msgid "Delete {0} way"
-msgid_plural "Delete {0} ways"
-msgstr[0] "{0} のウェイを削除"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
-#, java-format
-msgid "Delete {0} relation"
-msgid_plural "Delete {0} relations"
-msgstr[0] "{0} のリレーションを削除"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
-msgid "Conflicting relation"
-msgstr "競合中のリレーション"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "関連から削除"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されています。"
-"<br>リレーションから削除しますか?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレーショ"
-"ンから削除しますか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
-msgid "Split way segment"
-msgstr "ウェイのセグメントを分割"
-
-#. leave message in one tr() as there is a grammatical
-#. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
-msgstr ""
-"ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見て"
-"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き"
-"起こします。<br>本当に削除しますか？"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
-msgid "Delete confirmation"
-msgstr "削除確認"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr "{0} 内の削除済み状態の競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
-#, java-format
-msgid "Move {0} node"
-msgid_plural "Move {0} nodes"
-msgstr[0] "{0} のノードを移動"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "オブジェクト ''{0}'' を取り除いた。"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
-#, java-format
-msgid "Purged {0} objects"
-msgstr "{0} 個のオブジェクトを取り除いた。"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-"警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、"
-"{1} です。"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
-#, java-format
-msgid "Removing reference from relation {0}"
-msgstr "リレーション {0} からリファレンスを削除する"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "リレーション {0} のメンバーリスト内の競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
-msgid ""
-"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-"コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
-#, java-format
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "ノード ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
-#, java-format
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "ウェイ ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
-#, java-format
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "リレーション ''{0}'' をポジション {1} でリレーション ''{2}'' から削除"
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
-#, java-format
-msgid "Rotate {0} node"
-msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} のノードを回転"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "シーケンス"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
-#, java-format
-msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "ノード {1} の {0} タグ競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
-#, java-format
-msgid "Resolve {0} tag conflicts in way {1}"
-msgstr "ウェイ {1} の {0} タグ競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
-#, java-format
-msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "リレーション {1} の {0} タグ競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "{0} のプリミティブを復活"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, java-format
-msgid "Resolve version conflicts for node {0}"
-msgstr "ノード {0} のバージョン競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, java-format
-msgid "Resolve version conflicts for way {0}"
-msgstr "ウェイ {0} のバージョン競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, java-format
-msgid "Resolve version conflicts for relation {0}"
-msgstr "リレーション {0} のバージョン競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of way {0}"
-msgstr "ウェイ {0} のノードリスト中の競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr "主データセットはノード {0} を含んでいません"
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "適用しますか?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ"
-"ロパティーに対する以下の変更が推奨されます。"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
-msgid "Relation"
-msgstr "関連"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Old role"
-msgstr "古いロール"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "New role"
-msgstr "新しいロール"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "古いキー"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
-msgid "Old value"
-msgstr "古い値"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "新しいキー"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
-msgid "New value"
-msgstr "新しい値"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Apply selected changes"
-msgstr "選択した変更を適用します"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
-msgid "Don't apply changes"
-msgstr "変更を適用しません"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85
-msgid "Please select which property changes you want to apply."
-msgstr "適用したいプロパティの変更を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97
-msgid "Properties of "
-msgstr "プロパティ "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123
-msgid "Roles in relations referring to"
-msgstr "次を参照する関連中のロール"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
-msgid "Automatic tag correction"
-msgstr "自動タグ修正"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
-#, java-format
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "不正な設定がファイルの{0}行目にあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
-#, java-format
-msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-"isn't a directory."
-msgstr ""
-"警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリでは"
-"ありません。"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
-#, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-"isn't a directory.</html>"
-msgstr ""
-"<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレクトリ"
-"ではありません。</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
-#, java-format
-msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
-msgstr ""
-"警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
-#, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Failed to create missing "
-"preference directory: {0}</html>"
-msgstr ""
-"<html>設定を初期化するのに失敗しました。<br>作成に失敗した設定ディレクトリ: "
-"{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
-#, java-format
-msgid ""
-"Warning: Missing preference file ''{0}''. Creating a default preference file."
-msgstr ""
-"警告: 設定ファイル ''{0}'' がありません。デフォルトの設定ファイルを作成しま"
-"す。"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
-#, java-format
-msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
-msgstr ""
-"警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
-#, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Failed to reset preference file "
-"to default: {0}</html>"
-msgstr ""
-"<html>設定の初期化に失敗しました。<br>設定ファイルをデフォルト: {0} にリセッ"
-"トできません</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
-#, java-format
-msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>設定ファイルにはエラーがあります。<br>古いもののバックアップを<br>{0}"
-"<br>に取って、新しい初期設定ファイルを作ります。</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
-#, java-format
-msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット"
-"に失敗"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "設定は{0}に保存"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "設定をアップロードできませんでした。理由: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
-msgid "Could not load preferences from server."
-msgstr "サーバから設定をロードできませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外"
-"の内容: {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "Already registered a conflict for primitive ''{0}''."
-msgstr "プリミティブ ''{0}'' には既に競合が登録されています"
-
-#. *
-#. * the decimal format 999.999
-#.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
-msgid "Decimal Degrees"
-msgstr "十進経緯度"
-
-#. *
-#. * the minutes/seconds format 99" 99'
-#.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "度分秒"
-
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
-msgid "S"
-msgstr "南"
-
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "北"
-
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
-msgid "W"
-msgstr "西"
-
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
-msgid "E"
-msgstr "東"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
-#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
-#, java-format
-msgid "Changeset {0}"
-msgstr "変更セット {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
-
-#. translators notes must be in front
-#. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-msgctxt "filter"
-msgid "E"
-msgstr "東"
-
-#. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
-msgid "H"
-msgstr "H"
-
-#. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-msgid "Text"
-msgstr "テキスト"
-
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-msgid "C"
-msgstr "C"
-
-#. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-msgid "I"
-msgstr "I"
-
-#. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
-msgid "M"
-msgstr "M"
-
-#. translators notes must be in front
-#. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
-msgid "R"
-msgstr "R"
-
-#. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
-msgid "A"
-msgstr "A"
-
-#. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
-msgid "D"
-msgstr "D"
-
-#. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
-msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100
-#, java-format
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warning: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163
-#, java-format
-msgid "Expected ID >= 0. Got {0}."
-msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307
-msgid "A primitive with ID = 0 can't be invisible."
-msgstr "id=0 のプリミティブは非表示にできません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "ID > 0 expected. Got {0}."
-msgstr "ID > 0 である必要があります。 {0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349
-#, java-format
-msgid "Version > 0 expected. Got {0}."
-msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
-#, java-format
-msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-msgstr ""
-"パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
-#, java-format
-msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-msgstr ""
-"パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取り"
-"ました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
-msgid ""
-"Tag collection can't be applied to a primitive because there are keys with "
-"multiple values."
-msgstr ""
-"タグコレクションをプリミティブに適用できません。複数の値を持つキーがありま"
-"す。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244
-#, java-format
-msgid "Cannot add node {0} to incomplete way {1}."
-msgstr "ノード {0} を不完全なウェイ {1} に追加できません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history."
-msgstr "この履歴にはバージョン {0} のプリミティブはありません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history."
-msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
-#, java-format
-msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-msgstr ""
-"パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "No earliest version found. History is empty."
-msgstr "前のバージョンがありません。履歴は空です。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "No latest version found. History is empty."
-msgstr "最新のバージョンがありません。履歴は空です。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr "このデータセットには id {0} のプリミティブはありません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84
-msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-msgstr "このデータセットには id {0} バージョン {1} のプリミティブはありません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
-#, java-format
-msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
-msgid "Area style way is not closed."
-msgstr "領域を指定するウェイが閉じていません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
-#, java-format
-msgid "multipolygon way ''{0}'' is not closed."
-msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
-msgstr "メンバー \"{0}\"を関連から削除"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
-msgid "More than one \"from\" way found."
-msgstr "二つ以上の\"from\"ウェイがあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607
-msgid "More than one \"to\" way found."
-msgstr "二つ以上の\"to\"ウェイがあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
-msgid "More than one \"via\" found."
-msgstr "経由地が複数有ります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "不明なロール\"{0}\"です。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr "{0}のメンバーのタイプが不明"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641
-msgid "No \"from\" way found."
-msgstr "\"from\"ウェイが見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
-msgid "No \"to\" way found."
-msgstr "\"to\"ウェイが見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649
-msgid "No \"via\" node or way found."
-msgstr "経由地かウェイが見つかりません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662
-msgid "The \"to\" way doesn't start or end at a \"via\" node."
-msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
-msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
-#, java-format
-msgid "Style for restriction {0} not found."
-msgstr "制約条件{0}のスタイルがありません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870
-#, java-format
-msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882
-#, java-format
-msgid "Non-Way ''{0}'' in multipolygon."
-msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940
-#, java-format
-msgid "No outer way for multipolygon ''{0}''."
-msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "内部のウェイ ''{0}''が外側にあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094
-#, java-format
-msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120
-#, java-format
-msgid "Style for outer way ''{0}'' mismatches."
-msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324
-msgid "untagged"
-msgstr "タグ付いていない"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325
-msgid "text"
-msgstr "テキスト"
-
-#. should not happen
-#.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
-#, java-format
-msgid ""
-"My primitive with id {0} and version {1} is visible although their primitive "
-"with lower version {2} is not visible. Can't deal with this inconsistency. "
-"Keeping my primitive. "
-msgstr ""
-"ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョン "
-"{2} の相手のプリミティブは表示されません。この不整合を解決できません。自分の"
-"プリミティブを残します。 "
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
-msgid "inactive"
-msgstr "停止中"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "ノード"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "ウェイ"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
-msgid "relation"
-msgid_plural "relations"
-msgstr[0] "関連"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
-msgid "untagged way"
-msgstr "タグ付いていないウェイ"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
-msgid "incomplete way"
-msgstr "不完全なウェイ"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169
-msgid "background"
-msgstr "背景"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
-msgid "highlight"
-msgstr "ハイライト"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
-msgid "WGS84 Geographic"
-msgstr "WGS84測地系 緯度経度座標"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
-msgid "Gauss-Laborde Réunion 1947"
-msgstr "ガウス-ラボルド会議1947"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-msgid ""
-"IMPORTANT : data positioned far away from\n"
-"the current Lambert zone limits.\n"
-"Do not upload any data after this message.\n"
-"Undo your last action, save your work\n"
-"and start a new layer on the new zone."
-msgstr ""
-"重要：データは、現在のランベルト図法のゾーン制限\n"
-"の外にあります。\n"
-"このメッセージ以降、データのアップロードを中止します。\n"
-"最後に行った操作を取り消して、作業内容を保存し、\n"
-"新しいレイヤーを新しいゾーンで開始してください。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-msgid "Lambert Zone (France)"
-msgstr "ランベルトゾーン（フランス）"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
-msgid "Lambert Zone (Estonia)"
-msgstr "ランベルトゾーン（エストニア）"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
-msgid "Mercator"
-msgstr "メルカトル"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90
-msgid "Swiss Grid (Switzerland)"
-msgstr "スイスグリッド (スイス)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338
-#, java-format
-msgid "UTM Zone {0}"
-msgstr "UTM ゾーン {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
-msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
-msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr "UTM20N (仏領)グアドループ海外県 Sainte-Anne 市 1948"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
-msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr "UTM20N (仏領)マルティニーク海外県 Fort Desaix 市 1952"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>ブックマークを書き込めません。<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
-msgid "Do not show again"
-msgstr "今後は表示しない"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
-#, java-format
-msgid " [id: {0}]"
-msgstr " [id: {0}]"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
-msgid "incomplete"
-msgstr "不完全"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-msgid "highway"
-msgstr "道路"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3168
-msgid "railway"
-msgstr "鉄道"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
-msgid "waterway"
-msgstr "水路"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
-msgid "landuse"
-msgstr "土地利用"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0}ノード"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
-#, java-format
-msgid "{0} member"
-msgid_plural "{0} members"
-msgstr[0] "{0} メンバー"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
-msgid "Precondition violation"
-msgstr "前提条件違反"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
-msgid "Security exception"
-msgstr "セキュリティ例外"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
-msgid "Network exception"
-msgstr "ネットワーク例外"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
-msgid "IO Exception"
-msgstr "IO 例外"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
-msgid "Internal Server Error"
-msgstr "サーバの内部エラー"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-msgid "Bad Request"
-msgstr "不正な要求"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
-msgid "Not Found"
-msgstr "見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155
-msgid "Unknown host"
-msgstr "不明なホスト"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247
-msgid "Primitive already deleted"
-msgstr "プリミティブは削除済み"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
-msgid "Message of the day not available"
-msgstr "今日のメッセージはありません"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
-msgid "Downloading \"Message of the day\""
-msgstr "\"今日のメッセージ\"をダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid "Upload Preferences"
-msgstr "アップロード設定"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
-msgid "Upload the current preferences to the server"
-msgstr "サーバに現在の設定をアップロードします"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-msgid "string"
-msgstr "文字列"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
-msgid "Name of the user."
-msgstr "ユーザの名前"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
-msgid "OSM Password."
-msgstr "OSMのパスワード"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "指定された位置でアプレットのサイズ変更（指定フォーマットは、幅x高さ）"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
-msgid "string;string;..."
-msgstr "文字列：文字列：…"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
-"filename"
-msgstr ""
-"それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイ"
-"ル名を指定できます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
-"lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURL"
-"かファイル名で指定できます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
-msgid ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"URL which returns osm-xml"
-msgstr ""
-"それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返"
-"すURLで指定できます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
-msgid "any"
-msgstr "任意"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
-msgid "If specified, reset the configuration instead of reading it."
-msgstr "もし指定されると、読み込む代わりに設定をリセットします。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
-msgid "Username"
-msgstr "ユーザ名"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
-msgid "Password"
-msgstr "パスワード"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-msgid "usage"
-msgstr "使用法"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
-msgid "options"
-msgstr "オプション"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
-msgid "Show this help"
-msgstr "このヘルプの表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
-msgid "Standard unix geometry argument"
-msgstr "標準のunix配置引数"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
-msgid "Download the bounding box"
-msgstr "bounding boxをダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
-msgid "Open file (as raw gps, if .gpx)"
-msgstr "ファイルを開く（.gpxの場合生のGPSとして)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
-msgid "Download the bounding box as raw gps"
-msgstr "bounding boxを生GPSとしてダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
-msgid "Select with the given search"
-msgstr "検索から選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
-msgid "Launch in maximized mode"
-msgstr "最大モードで起動"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
-msgid "Reset the preferences to default"
-msgstr "設定を既定に戻します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-msgid "Set the language."
-msgstr "言語の変更"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
-msgid "options provided as Java system properties"
-msgstr "Javaシステムのプロパティとして提供されるオプション"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/PATH/TO/JOSM/FOLDER/         "
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
-msgid "Change the folder for all user settings"
-msgstr "全てのユーザ設定用フォルダを変更"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
-msgid ""
-"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-"the following\n"
-"      Java option to increase the maximum size of allocated memory"
-msgstr ""
-"通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必要で"
-"す\n"
-"     Javaの使用メモリ最大サイズを増やすオプション"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
-msgid "examples"
-msgstr "例"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
-msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection"
-msgstr ""
-"指定された順番で設定が読み込まれます。一部のデータがselection以前に\n"
-"読み込まれることにご注意ください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-msgid "Activating updated plugins"
-msgstr "アップデートしたプラグインの活性化"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Loading early plugins"
-msgstr "早期読み込みプラグインのロード中"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
-msgid "Setting defaults"
-msgstr "デフォルト設定"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
-msgid "Loading plugins"
-msgstr "プラグインのロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185
-#, java-format
-msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr "設定 {0} はもう使われていないので、除かれました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158
-msgid "File"
-msgstr "ファイル"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
 msgid "View"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24
 msgid "Tools"
 msgstr "ツール"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "プリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
@@ -3783,21 +3847,21 @@
 
 #. TODO move code to an "action" like the others?
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:234
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:240
 msgid "Wireframe View"
 msgstr "ワイヤー・フレーム表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242
 msgid "Toggle Wireframe view"
 msgstr "ワイヤー・フレーム表示切り替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:268
 msgid "Full Screen"
 msgstr "全画面表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:270
 msgid "Toggle Full Screen view"
 msgstr "フルスクリーン表示のトグル"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:311
 msgid "Audio"
 msgstr "音声"
@@ -3873,9 +3937,9 @@
 "ウスでこの表から直接選べます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
 msgid "(no object)"
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
 msgid "User:"
 msgstr "ユーザ:"
@@ -3955,5 +4019,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
@@ -3962,5 +4026,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:138
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
@@ -3970,5 +4034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
 msgstr "メンバー"
@@ -4267,5 +4331,5 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:180
 #, java-format
 msgid "Unexpected column index. Got {0}."
@@ -4607,5 +4671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
@@ -4618,5 +4682,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "all"
 msgstr "全て"
@@ -4627,7 +4691,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
-#, fuzzy
 msgid "Please decide which values to keep"
-msgstr "どちらの値を残すか決定してください"
+msgstr "どちらの値を残すか決めてください"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
@@ -4707,5 +4770,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #, java-format
 msgid "{0} way"
@@ -4714,5 +4777,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
 #, java-format
 msgid "{0} relation"
@@ -4751,23 +4814,23 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "ロール:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
 msgid "Tag modified relations with   "
 msgstr "タグは、次のものでリレーションを変更しました:   "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+msgctxt "tag"
 msgid "Key:"
 msgstr "キー:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
 msgid "Value:"
 msgstr "値:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
 msgid "Apply this role to all members"
 msgstr "全てのメンバーにこのロールを適用"
@@ -4786,12 +4849,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42
-#, fuzzy
 msgid "<html>Please select the values to keep for the following tags.</html>"
-msgstr "<html>閉じる変更セットを選んでください</html>"
+msgstr "<html>次のタグに残す値を選択してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47
-#, fuzzy
 msgid "Show tags with conflicts only"
-msgstr "ノード(競合あり)"
+msgstr "競合のあるタグだけを表示"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4806,7 +4867,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
@@ -4829,22 +4890,18 @@
 msgstr "指示の集積: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
-msgid "Conflict"
-msgstr "競合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
-msgid "Merging conflicts."
-msgstr "競合点の統合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+#, fuzzy
+msgid "Resolve conflicts."
+msgstr "競合を解決"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332
 msgid "Resolve"
 msgstr "解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "上記リストの全てのアイテムを結合するダイアログを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
@@ -4853,25 +4910,25 @@
 msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170
 msgid "Cancel conflict resolution and close the dialog"
 msgstr "競合の解決をキャンセルしてダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
 msgid "Apply resolved conflicts and close the dialog"
 msgstr "解決済みの競合を適用してダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205
 msgid "Apply Resolution"
 msgstr "解決を適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217
 msgid "Close anyway"
 msgstr "強制的に閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218
 msgid "Continue resolving"
 msgstr "解決を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220
 #, java-format
 msgid ""
@@ -4883,13 +4940,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228
 msgid "Conflict not resolved completely"
 msgstr "競合は完全には解決されていません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265
 msgid "Resolve conflicts"
 msgstr "競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
@@ -4956,53 +5013,35 @@
 msgstr "フィルターモード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 msgid "History"
 msgstr "履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
 msgid "Display the history of all selected items."
 msgstr "選択したアイテムすべての履歴の表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "Index out of bounds. Got {0}."
-msgstr "範囲外のインデックス。{0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "ノード {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "ウェイ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "リレーション {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "履歴アイテム"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:234
+msgid "Object with history"
+msgstr "履歴があるオブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
+msgid "Reload"
+msgstr "再読込"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "現在選択しているオブジェクトを再読み込みし、リストを再作成します。"
 
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
 msgid "Show"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive."
-msgstr "選択されたプリミティブの履歴を表示"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:292
+msgid "Display the history of the selected objects."
+msgstr "選択したオブジェクトの履歴を表示。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
@@ -5072,5 +5111,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:110
 msgid "<different>"
 msgstr "<差異あり>"
@@ -5160,5 +5199,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3145
 msgid "Relations"
 msgstr "リレーション"
@@ -5207,18 +5246,14 @@
 msgstr "選択した要素にズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
-msgid "Refresh the selection list."
-msgstr "選択したリストを更新する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
 msgid "Zoom to selection"
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5226,14 +5261,14 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:339
 #, java-format
 msgid "Selection: {0}"
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5242,5 +5277,5 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -5774,5 +5809,5 @@
 #. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2783
 msgid "Places"
 msgstr "地名"
@@ -5819,21 +5854,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 build/trans_presets.java:2052
+#: build/trans_presets.java:2058 build/trans_presets.java:2064
+#: build/trans_presets.java:2070 build/trans_presets.java:2076
+#: build/trans_presets.java:2082 build/trans_presets.java:2088
+#: build/trans_presets.java:2094 build/trans_presets.java:2100
+#: build/trans_presets.java:2106 build/trans_presets.java:2112
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2142 build/trans_presets.java:2148
 msgid "type"
 msgstr "タイプ"
@@ -5884,4 +5919,86 @@
 msgstr "タイル数"
 
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:102
+#, fuzzy, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:166
+msgid "JOSM Help Browser"
+msgstr "JOSM ヘルプブラウザ"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:195
+#, java-format
+msgid "Error while loading page {0}"
+msgstr "ページ{0}を読み込む際にエラーが発生しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:223
+#, java-format
+msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+msgstr "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:226
+#, java-format
+msgid ""
+"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
+"\">your language</A>."
+msgstr ""
+"ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">あ"
+"なたの言語</A>で作成してください。"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:241
+msgid "Open the current help page in an external browser"
+msgstr "現在のヘルプページを外部ブラウザで開く"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:253
+msgid "Edit the current help page"
+msgstr "現在のヘルプページを編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:261
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr "JOSMオンラインヘルプからのみヘルプページを編集できます。"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:274
+msgid "Reload the current help page"
+msgstr "現在のヘルプページを再ロード"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:289
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:309
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:325
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:70
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "緯度 : "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "経度 : "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "座標"
+
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
 #, java-format
@@ -5907,11 +6024,11 @@
 msgstr "履歴をサーバからリロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:182
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
 msgid ""
@@ -5919,5 +6036,5 @@
 msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
 #, java-format
 msgid ""
@@ -5925,9 +6042,9 @@
 msgstr "参照のセットに失敗しました。参照バージョン {0} は履歴で利用できません"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
 #, java-format
 msgid ""
@@ -5937,52 +6054,73 @@
 "現在のプリミティブの設定に失敗。現在のバージョン {0} は履歴で使用できません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
 msgid "Load history"
 msgstr "履歴をロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, fuzzy, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
 #, java-format
 msgid "Loading history for node {0}"
 msgstr "ノード {0} の履歴をロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
 #, java-format
 msgid "Loading history for way {0}"
 msgstr "ウェイ {0} の履歴をロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
 #, java-format
 msgid "Loading history for relation {0}"
 msgstr "リレーション {0} の履歴をロード中"
 
-#. item "Streets/Motorway" text "Reference"
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "ノード {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "ウェイ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "リレーション {0}"
+
+#. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
-#. item "Streets/Trunk" text "Reference"
+#. item "Highways/Streets/Trunk" text "Reference"
 #. <optional>
-#. item "Streets/Primary" text "Reference"
+#. item "Highways/Streets/Primary" text "Reference"
 #. <optional>
-#. item "Streets/Secondary" text "Reference"
+#. item "Highways/Streets/Secondary" text "Reference"
 #. <optional>
-#. item "Streets/Tertiary" text "Reference"
+#. item "Highways/Streets/Tertiary" text "Reference"
 #. <optional>
-#. item "Streets/Unclassified" label "Edit Unclassified Road"
+#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
 #. <space />
 #. <key key="highway" value="unclassified" />
 #. <optional>
-#. item "Streets/Residential" label "Edit Residential Street"
+#. item "Highways/Streets/Residential" label "Edit Residential Street"
 #. <space />
 #. <key key="highway" value="residential" />
-#. item "Streets/Living Street" label "Edit Living Street"
+#. item "Highways/Streets/Living Street" label "Edit Living Street"
 #. <space />
 #. <key key="highway" value="living_street" />
-#. item "Streets/Road (Unknown Type)" label "Edit Road of unknown type"
+#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #. <space />
 #. <key key="highway" value="road" />
 #. <optional>
-#. item "Streets/Bridge" label "Edit Bridge"
+#. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
 #. <key key="bridge" value="yes" />
 #. <optional>
-#. item "Streets/Tunnel" label "Edit Tunnel"
+#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -6100,55 +6238,55 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Spring" label "Edit Spring"
+#. item "Water/Water/Spring" label "Edit Spring"
 #. <key key="natural" value="spring" />
-#. item "Water/Drain" label "Edit Drain"
+#. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
 #. <key key="waterway" value="drain" />
-#. item "Water/Stream" label "Edit Stream"
+#. item "Water/Water/Stream" label "Edit Stream"
 #. <space />
 #. <key key="waterway" value="stream" />
-#. item "Water/Canal" label "Edit Canal"
+#. item "Water/Water/Canal" label "Edit Canal"
 #. <space />
 #. <key key="waterway" value="canal" />
-#. item "Water/River" label "Edit River"
+#. item "Water/Water/River" label "Edit River"
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water" label "Edit Water"
+#. item "Water/Water/Water" label "Edit Water"
 #. <key key="natural" value="water" />
-#. item "Water/Land" label "Edit Land"
+#. item "Water/Water/Land" label "Edit Land"
 #. <key key="natural" value="land" />
-#. item "Water/Basin" label "Edit Basin Landuse"
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
 #. <key key="landuse" value="basin" />
-#. item "Water/Reservoir" label "Edit Reservoir Landuse"
+#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
 #. <space />
 #. <key key="landuse" value="reservoir" />
-#. item "Water/Covered Reservoir" label "Edit Covered Reservoir"
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
-#. item "Water/Riverbank" label "Edit Riverbank"
+#. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
-#. item "Water/Wetland" label "Edit Wetland"
+#. item "Water/Water/Wetland" label "Edit Wetland"
 #. <key key="natural" value="wetland" />
-#. item "Water/Mud" label "Edit Mud"
+#. item "Water/Water/Mud" label "Edit Mud"
 #. <key key="natural" value="mud" />
-#. item "Water/Beach" label "Edit Beach"
+#. item "Water/Water/Beach" label "Edit Beach"
 #. <key key="natural" value="beach" />
-#. item "Water/Bay" label "Edit Bay"
+#. item "Water/Water/Bay" label "Edit Bay"
 #. <key key="natural" value="bay" />
-#. item "Water/Cliff" label "Edit Cliff"
+#. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Coastline" label "Edit Coastline"
+#. item "Water/Water/Coastline" label "Edit Coastline"
 #. <key key="natural" value="coastline" />
-#. item "Water/Ferry Route" label "Edit Ferry"
+#. item "Water/Water/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Boatyard" label "Edit Boatyard"
+#. item "Water/Water/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Dock" label "Edit Dock"
+#. item "Water/Water/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Dam" label "Edit Dam"
+#. item "Water/Water/Dam" label "Edit Dam"
 #. <space />
 #. <key key="waterway" value="dam" />
@@ -6167,5 +6305,5 @@
 #. item "Waterway Point/Slipway" label "Edit Slipway"
 #. <key key="leisure" value="slipway" />
-#. item "Railway/Bus Guideway" label "Edit Bus Guideway"
+#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
 #. <key key="highway" value="bus_guideway" />
@@ -6228,19 +6366,19 @@
 #. item "Public Transport/Airport" label "Edit Airport"
 #. <key key="aeroway" value="aerodrome" />
-#. item "Accomodation/Hotel" label "Edit Hotel"
+#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
 #. <key key="tourism" value="hotel" />
-#. item "Accomodation/Motel" label "Edit Motel"
+#. item "Travel/Accomodation/Motel" label "Edit Motel"
 #. <key key="tourism" value="motel" />
-#. item "Accomodation/Guest House" label "Edit Guest House"
+#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
 #. <key key="tourism" value="guest_house" />
-#. item "Accomodation/Chalet" label "Edit Chalet"
+#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
 #. <key key="tourism" value="chalet" />
-#. item "Accomodation/Hostel" label "Edit Hostel"
+#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
 #. <key key="tourism" value="hostel" />
-#. item "Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
 #. <key key="tourism" value="alpine_hut" />
-#. item "Accomodation/Caravan Site" label "Edit Caravan Site"
+#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
 #. <key key="tourism" value="caravan_site" />
-#. item "Accomodation/Camping Site" label "Edit Camping Site"
+#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
 #. <key key="tourism" value="camp_site" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
@@ -6270,29 +6408,29 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
-#. item
+#. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="office" />
-#. item
+#. item "Tourism/Map"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="map" />
-#. item
+#. item "Tourism/Information Board"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="board" />
-#. item
+#. item "Tourism/Guidepost"
 #. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="guidepost" />
-#. item
+#. item "Tourism/Information Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="terminal" />
-#. item
+#. item "Tourism/Audioguide"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="audioguide" />
-#. item
+#. item "Tourism/Other Information Points"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
@@ -6325,15 +6463,15 @@
 #. item "Leisure/Fishing" label "Edit Fishing"
 #. <key key="leisure" value="fishing" />
-#. item "Sport Facilities/Stadium" label "Edit Stadium"
+#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
 #. <key key="leisure" value="stadium" />
-#. item "Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
 #. <key key="leisure" value="sports_centre" />
-#. item "Sport Facilities/Pitch" label "Edit Pitch"
+#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
 #. <key key="leisure" value="pitch" />
-#. item "Sport Facilities/Racetrack" label "Edit Racetrack"
+#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
 #. <key key="leisure" value="track" />
-#. item "Sport Facilities/Golf Course" label "Edit Golf Course"
+#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
 #. <key key="leisure" value="golf_course" />
-#. item "Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
 #. <key key="leisure" value="miniature_golf" />
 #. item "Sport/Multi" label "Edit Multi"
@@ -6405,37 +6543,37 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
-#. item "Buildings/Public Building" label "Edit Public Building"
+#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
-#. item "Buildings/Town hall" label "Edit Town hall"
+#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
 #. <key key="amenity" value="townhall" />
-#. item "Buildings/Embassy" label "Edit Embassy"
+#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
 #. <key key="amenity" value="embassy" />
-#. item "Buildings/Courthouse" label "Edit Courthouse"
+#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
 #. <key key="amenity" value="courthouse" />
-#. item "Buildings/Prison" label "Edit Prison"
+#. item "Man-Made/Buildings/Prison" label "Edit Prison"
 #. <key key="amenity" value="prison" />
-#. item "Buildings/Police" label "Edit Police"
+#. item "Man-Made/Buildings/Police" label "Edit Police"
 #. <key key="amenity" value="police" />
-#. item "Buildings/Fire Station" label "Edit Fire Station"
+#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
 #. <key key="amenity" value="fire_station" />
-#. item "Buildings/Post Office" label "Edit Post Office"
+#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
 #. <key key="amenity" value="post_office" />
-#. item "Buildings/Kindergarten" label "Edit Kindergarten"
+#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
 #. <key key="amenity" value="kindergarten" />
-#. item "Buildings/School" label "Edit School"
+#. item "Man-Made/Buildings/School" label "Edit School"
 #. <key key="amenity" value="school" />
-#. item "Buildings/University" label "Edit University"
+#. item "Man-Made/Buildings/University" label "Edit University"
 #. <key key="amenity" value="university" />
-#. item "Buildings/College" label "Edit College"
+#. item "Man-Made/Buildings/College" label "Edit College"
 #. <key key="amenity" value="college" />
-#. item "Buildings/Cinema" label "Edit Cinema"
+#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
 #. <key key="amenity" value="cinema" />
-#. item "Buildings/Library" label "Edit Library"
+#. item "Man-Made/Buildings/Library" label "Edit Library"
 #. <key key="amenity" value="library" />
-#. item "Buildings/Arts Centre" label "Edit Arts Centre"
+#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
 #. <key key="amenity" value="arts_centre" />
-#. item "Buildings/Theatre" label "Edit Theatre"
+#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
 #. <key key="amenity" value="theatre" />
-#. item "Buildings/Place of Worship" label "Edit Place of Worship"
+#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
 #. <key key="amenity" value="place_of_worship" />
 #. item "Man Made/Works" label "Edit Works"
@@ -6537,50 +6675,50 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Places/Continent" label "Edit Continent"
+#. item "Geography/Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Places/Country" label "Edit Country"
+#. item "Geography/Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Places/State" label "Edit State"
+#. item "Geography/Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Places/Region" label "Edit Region"
+#. item "Geography/Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Places/County" label "Edit County"
+#. item "Geography/Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Places/City" label "Edit City"
+#. item "Geography/Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Places/Town" label "Edit Town"
+#. item "Geography/Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Places/Suburb" label "Edit Suburb"
+#. item "Geography/Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Places/Village" label "Edit Village"
+#. item "Geography/Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Places/Hamlet" label "Edit Hamlet"
+#. item "Geography/Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Places/Locality" label "Edit Locality"
+#. item "Geography/Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Places/Island" label "Edit Island"
+#. item "Geography/Places/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Places/Islet" label "Edit Islet"
+#. item "Geography/Places/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Places/Cave Entrance" label "Edit Cave Entrance"
+#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
 #. <key key="natural" value="cave_entrance" />
-#. item "Places/Peak" label "Edit Peak"
+#. item "Geography/Places/Peak" label "Edit Peak"
 #. <key key="natural" value="peak" />
-#. item "Places/Glacier" label "Edit Glacier"
+#. item "Geography/Places/Glacier" label "Edit Glacier"
 #. <key key="natural" value="glacier" />
-#. item "Places/Volcano" label "Edit Volcano"
+#. item "Geography/Places/Volcano" label "Edit Volcano"
 #. <key key="natural" value="volcano" />
 #. item "Boundaries/National" label "Edit National Boundary"
@@ -6690,163 +6828,169 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
-#: build/trans_presets.java:67 build/trans_presets.java:103
-#: build/trans_presets.java:143 build/trans_presets.java:180
-#: build/trans_presets.java:200 build/trans_presets.java:218
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:273 build/trans_presets.java:306
-#: build/trans_presets.java:352 build/trans_presets.java:372
-#: build/trans_presets.java:387 build/trans_presets.java:404
-#: build/trans_presets.java:424 build/trans_presets.java:444
-#: build/trans_presets.java:464 build/trans_presets.java:483
-#: build/trans_presets.java:503 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:659
-#: build/trans_presets.java:680 build/trans_presets.java:693
-#: build/trans_presets.java:706 build/trans_presets.java:719
-#: build/trans_presets.java:732 build/trans_presets.java:745
-#: build/trans_presets.java:756 build/trans_presets.java:765
-#: build/trans_presets.java:812 build/trans_presets.java:833
-#: build/trans_presets.java:842 build/trans_presets.java:902
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1087 build/trans_presets.java:1095
-#: build/trans_presets.java:1100 build/trans_presets.java:1107
-#: build/trans_presets.java:1114 build/trans_presets.java:1119
-#: build/trans_presets.java:1127 build/trans_presets.java:1136
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:78 build/trans_presets.java:114
+#: build/trans_presets.java:154 build/trans_presets.java:191
+#: build/trans_presets.java:211 build/trans_presets.java:229
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:284 build/trans_presets.java:317
+#: build/trans_presets.java:363 build/trans_presets.java:383
+#: build/trans_presets.java:398 build/trans_presets.java:415
+#: build/trans_presets.java:435 build/trans_presets.java:455
+#: build/trans_presets.java:475 build/trans_presets.java:494
+#: build/trans_presets.java:514 build/trans_presets.java:534
+#: build/trans_presets.java:555 build/trans_presets.java:576
+#: build/trans_presets.java:597 build/trans_presets.java:618
+#: build/trans_presets.java:639 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:704
+#: build/trans_presets.java:717 build/trans_presets.java:730
+#: build/trans_presets.java:743 build/trans_presets.java:756
+#: build/trans_presets.java:767 build/trans_presets.java:776
+#: build/trans_presets.java:823 build/trans_presets.java:844
+#: build/trans_presets.java:853 build/trans_presets.java:913
+#: build/trans_presets.java:1064 build/trans_presets.java:1072
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1098 build/trans_presets.java:1106
+#: build/trans_presets.java:1111 build/trans_presets.java:1118
+#: build/trans_presets.java:1125 build/trans_presets.java:1130
+#: build/trans_presets.java:1138 build/trans_presets.java:1147
 #: build/trans_presets.java:1153 build/trans_presets.java:1159
-#: build/trans_presets.java:1165 build/trans_presets.java:1174
-#: build/trans_presets.java:1183 build/trans_presets.java:1190
-#: build/trans_presets.java:1198 build/trans_presets.java:1211
-#: build/trans_presets.java:1217 build/trans_presets.java:1226
-#: build/trans_presets.java:1232 build/trans_presets.java:1238
-#: build/trans_presets.java:1246 build/trans_presets.java:1302
-#: build/trans_presets.java:1349 build/trans_presets.java:1355
-#: build/trans_presets.java:1361 build/trans_presets.java:1367
-#: build/trans_presets.java:1373 build/trans_presets.java:1384
-#: build/trans_presets.java:1393 build/trans_presets.java:1408
-#: build/trans_presets.java:1415 build/trans_presets.java:1421
-#: build/trans_presets.java:1429 build/trans_presets.java:1436
-#: build/trans_presets.java:1445 build/trans_presets.java:1453
-#: build/trans_presets.java:1460 build/trans_presets.java:1471
-#: build/trans_presets.java:1481 build/trans_presets.java:1491
-#: build/trans_presets.java:1511 build/trans_presets.java:1523
-#: build/trans_presets.java:1534 build/trans_presets.java:1551
-#: build/trans_presets.java:1558 build/trans_presets.java:1574
-#: build/trans_presets.java:1581 build/trans_presets.java:1586
-#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1164 build/trans_presets.java:1170
+#: build/trans_presets.java:1176 build/trans_presets.java:1185
+#: build/trans_presets.java:1194 build/trans_presets.java:1201
+#: build/trans_presets.java:1209 build/trans_presets.java:1222
+#: build/trans_presets.java:1228 build/trans_presets.java:1237
+#: build/trans_presets.java:1243 build/trans_presets.java:1249
+#: build/trans_presets.java:1257 build/trans_presets.java:1313
+#: build/trans_presets.java:1360 build/trans_presets.java:1366
+#: build/trans_presets.java:1372 build/trans_presets.java:1378
+#: build/trans_presets.java:1384 build/trans_presets.java:1395
+#: build/trans_presets.java:1404 build/trans_presets.java:1419
+#: build/trans_presets.java:1426 build/trans_presets.java:1432
+#: build/trans_presets.java:1440 build/trans_presets.java:1447
+#: build/trans_presets.java:1456 build/trans_presets.java:1464
+#: build/trans_presets.java:1471 build/trans_presets.java:1482
+#: build/trans_presets.java:1492 build/trans_presets.java:1502
+#: build/trans_presets.java:1522 build/trans_presets.java:1534
+#: build/trans_presets.java:1545 build/trans_presets.java:1562
+#: build/trans_presets.java:1569 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
 #: build/trans_presets.java:1603 build/trans_presets.java:1609
-#: build/trans_presets.java:1615 build/trans_presets.java:1623
-#: build/trans_presets.java:1631 build/trans_presets.java:1639
-#: build/trans_presets.java:1646 build/trans_presets.java:1652
-#: build/trans_presets.java:1659 build/trans_presets.java:1666
-#: build/trans_presets.java:1674 build/trans_presets.java:1681
-#: build/trans_presets.java:1689 build/trans_presets.java:1696
-#: build/trans_presets.java:1702 build/trans_presets.java:1709
-#: build/trans_presets.java:1716 build/trans_presets.java:1723
-#: build/trans_presets.java:1740 build/trans_presets.java:1748
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:1785 build/trans_presets.java:1792
-#: build/trans_presets.java:1798 build/trans_presets.java:1808
-#: build/trans_presets.java:1813 build/trans_presets.java:1821
-#: build/trans_presets.java:1828 build/trans_presets.java:1834
-#: build/trans_presets.java:1840 build/trans_presets.java:1845
-#: build/trans_presets.java:1850 build/trans_presets.java:1855
-#: build/trans_presets.java:1862 build/trans_presets.java:1868
-#: build/trans_presets.java:1873 build/trans_presets.java:1882
-#: build/trans_presets.java:1891 build/trans_presets.java:1900
-#: build/trans_presets.java:1909 build/trans_presets.java:1918
-#: build/trans_presets.java:1924 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2040 build/trans_presets.java:2046
-#: build/trans_presets.java:2052 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2150
-#: build/trans_presets.java:2156 build/trans_presets.java:2162
-#: build/trans_presets.java:2169 build/trans_presets.java:2176
-#: build/trans_presets.java:2184 build/trans_presets.java:2191
-#: build/trans_presets.java:2197 build/trans_presets.java:2203
-#: build/trans_presets.java:2209 build/trans_presets.java:2215
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2243
-#: build/trans_presets.java:2250 build/trans_presets.java:2258
-#: build/trans_presets.java:2290 build/trans_presets.java:2295
-#: build/trans_presets.java:2305 build/trans_presets.java:2310
-#: build/trans_presets.java:2316 build/trans_presets.java:2322
-#: build/trans_presets.java:2339 build/trans_presets.java:2345
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1856
+#: build/trans_presets.java:1861 build/trans_presets.java:1866
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
+#: build/trans_presets.java:1920 build/trans_presets.java:1929
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2161
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2180 build/trans_presets.java:2187
+#: build/trans_presets.java:2195 build/trans_presets.java:2202
+#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2241
+#: build/trans_presets.java:2248 build/trans_presets.java:2255
+#: build/trans_presets.java:2262 build/trans_presets.java:2270
+#: build/trans_presets.java:2302 build/trans_presets.java:2307
+#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
 #: build/trans_presets.java:2351 build/trans_presets.java:2357
-#: build/trans_presets.java:2363 build/trans_presets.java:2373
-#: build/trans_presets.java:2380 build/trans_presets.java:2474
-#: build/trans_presets.java:2481 build/trans_presets.java:2495
-#: build/trans_presets.java:2501 build/trans_presets.java:2508
-#: build/trans_presets.java:2515 build/trans_presets.java:2521
-#: build/trans_presets.java:2527 build/trans_presets.java:2549
-#: build/trans_presets.java:2556 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2576
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2486
+#: build/trans_presets.java:2493 build/trans_presets.java:2507
+#: build/trans_presets.java:2513 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2561
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
-#: build/trans_presets.java:2606 build/trans_presets.java:2613
-#: build/trans_presets.java:2620 build/trans_presets.java:2627
-#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2606 build/trans_presets.java:2612
+#: build/trans_presets.java:2618 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
-#: build/trans_presets.java:2657 build/trans_presets.java:2664
-#: build/trans_presets.java:2671 build/trans_presets.java:2678
-#: build/trans_presets.java:2684 build/trans_presets.java:2690
-#: build/trans_presets.java:2700 build/trans_presets.java:2709
-#: build/trans_presets.java:2724 build/trans_presets.java:2730
-#: build/trans_presets.java:2738 build/trans_presets.java:2745
-#: build/trans_presets.java:2765 build/trans_presets.java:2776
-#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2657 build/trans_presets.java:2663
+#: build/trans_presets.java:2669 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2696 build/trans_presets.java:2702
+#: build/trans_presets.java:2712 build/trans_presets.java:2721
+#: build/trans_presets.java:2736 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2757
+#: build/trans_presets.java:2777 build/trans_presets.java:2788
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:2807 build/trans_presets.java:2814
-#: build/trans_presets.java:2821 build/trans_presets.java:2827
-#: build/trans_presets.java:2833 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:2882
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2806 build/trans_presets.java:2812
+#: build/trans_presets.java:2819 build/trans_presets.java:2826
+#: build/trans_presets.java:2833 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
 #: build/trans_presets.java:2903 build/trans_presets.java:2909
-#: build/trans_presets.java:2915 build/trans_presets.java:2924
-#: build/trans_presets.java:2934 build/trans_presets.java:2943
-#: build/trans_presets.java:2949 build/trans_presets.java:2955
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2915 build/trans_presets.java:2921
+#: build/trans_presets.java:2927 build/trans_presets.java:2936
+#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2972 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2993
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3035 build/trans_presets.java:3042
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
-#: build/trans_presets.java:3064 build/trans_presets.java:3072
-#: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3091 build/trans_presets.java:3097
-#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3047 build/trans_presets.java:3054
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3090 build/trans_presets.java:3096
+#: build/trans_presets.java:3103 build/trans_presets.java:3109
 #: build/trans_presets.java:3116 build/trans_presets.java:3122
-#: build/trans_presets.java:3128 build/trans_presets.java:3141
-#: build/trans_presets.java:3155 build/trans_presets.java:3169
+#: build/trans_presets.java:3128 build/trans_presets.java:3134
+#: build/trans_presets.java:3140 build/trans_presets.java:3153
+#: build/trans_presets.java:3167 build/trans_presets.java:3181
 msgid "Name"
 msgstr "名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-msgstr ""
-"<html>バージョン <strong>{0}</strong> は変更セット <strong>{3}</strong> の "
-"<strong>{2}</strong> によって <strong>{1}</strong> 上で作成された</html>"
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+msgid "User"
+msgstr "ユーザ"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+msgid "Changeset"
+msgstr "変更セット"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgstr ""
+"<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -6863,5 +7007,10 @@
 msgstr "変更セット {0} を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:62
+#, java-format
+msgid "Version {0}, {1} (by {2})"
+msgstr "バージョン {0}, {1} (by {2})"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:78
 #, java-format
 msgid "Version {0} created on {1} by {2}"
@@ -7107,27 +7256,27 @@
 msgstr "不完全なアップロードと保存"
 
-#. item "Streets/Motorway" text "Name"
-#. item "Streets/Motorway Link" label "Edit Motorway Link"
+#. item "Highways/Streets/Motorway" text "Name"
+#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
 #. <space />
 #. <key key="highway" value="motorway_link" />
 #. <optional>
-#. item "Streets/Trunk" text "Name"
-#. item "Streets/Trunk Link" text "Reference"
+#. item "Highways/Streets/Trunk" text "Name"
+#. item "Highways/Streets/Trunk Link" text "Reference"
 #. <optional>
-#. item "Streets/Primary" text "Name"
-#. item "Streets/Primary Link" label "Edit Primary Link"
+#. item "Highways/Streets/Primary" text "Name"
+#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
 #. <space />
 #. <key key="highway" value="primary_link" />
 #. <optional>
-#. item "Streets/Secondary" text "Name"
-#. item "Streets/Tertiary" text "Name"
-#. item "Streets/Unclassified" check "Embankment"
-#. item "Streets/Residential" check "Embankment"
-#. item "Streets/Living Street" check "Embankment"
-#. item "Streets/Service" check "Embankment"
-#. item "Streets/Road (Unknown Type)" check "Embankment"
-#. item "Streets/Roundabout" check "Embankment"
-#. item "Streets/Bridge" text "Name"
-#. item "Streets/Tunnel" text "Name"
+#. item "Highways/Streets/Secondary" text "Name"
+#. item "Highways/Streets/Tertiary" text "Name"
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Residential" check "Embankment"
+#. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Roundabout" check "Embankment"
+#. item "Highways/Streets/Bridge" text "Name"
+#. item "Highways/Streets/Tunnel" text "Name"
 #. item "Ways/Construction" check "Embankment"
 #. item "Ways/Bridleway" check "Embankment"
@@ -7135,27 +7284,27 @@
 #. item "Ways/Steps" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Water/Drain" text "Name"
-#. item "Water/Stream" text "Name"
-#. item "Water/Canal" text "Name"
-#. item "Water/River" text "Name"
-#. item "Railway/Bus Guideway" check "Embankment"
+#. item "Water/Water/Drain" 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"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:242
-#: build/trans_presets.java:260 build/trans_presets.java:279
-#: build/trans_presets.java:312 build/trans_presets.java:358
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:410 build/trans_presets.java:430
-#: build/trans_presets.java:451 build/trans_presets.java:471
-#: build/trans_presets.java:490 build/trans_presets.java:509
-#: build/trans_presets.java:529 build/trans_presets.java:550
-#: build/trans_presets.java:571 build/trans_presets.java:592
-#: build/trans_presets.java:613 build/trans_presets.java:634
-#: build/trans_presets.java:665 build/trans_presets.java:1062
-#: build/trans_presets.java:1070 build/trans_presets.java:1078
-#: build/trans_presets.java:1088 build/trans_presets.java:1308
+#: build/trans_presets.java:79 build/trans_presets.java:96
+#: build/trans_presets.java:115 build/trans_presets.java:134
+#: build/trans_presets.java:155 build/trans_presets.java:171
+#: build/trans_presets.java:192 build/trans_presets.java:212
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:290
+#: build/trans_presets.java:323 build/trans_presets.java:369
+#: build/trans_presets.java:384 build/trans_presets.java:399
+#: build/trans_presets.java:421 build/trans_presets.java:441
+#: build/trans_presets.java:462 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:645
+#: build/trans_presets.java:676 build/trans_presets.java:1073
+#: build/trans_presets.java:1081 build/trans_presets.java:1089
+#: build/trans_presets.java:1099 build/trans_presets.java:1319
 msgid "Layer"
 msgstr "レイヤー"
@@ -7174,32 +7323,41 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204
 msgid "Upload"
 msgstr "アップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152
 msgid "Settings"
 msgstr "設定"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+msgid "Decide how to upload the data and which changeset to use"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
 msgid "Tags of new changeset"
 msgstr "新しい変更セットのタグ"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
+#, fuzzy
+msgid "Apply tags to the changeset data is uploaded to"
+msgstr "アップロード後に変更セットを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272
 #, java-format
 msgid "{0} object to add:"
@@ -7207,5 +7365,5 @@
 msgstr[0] "{0} 個のオブジェクトを加えてください:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7213,5 +7371,5 @@
 msgstr[0] "{0}個のオブジェクトを変更:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290
 #, java-format
 msgid "{0} object to delete:"
@@ -7219,29 +7377,29 @@
 msgstr[0] "{0} 個のオブジェクトを削除:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:473
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:475
 msgid "Upload the changed primitives"
 msgstr "変更されたプリミティブをアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:482
 msgid "Illegal upload comment"
 msgstr "不正なアップロードコメント"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:508
 msgid "Cancel the upload and resume editing"
 msgstr "アップロードをキャンセルして編集に戻る"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
 msgid "Upload all changes in one request"
 msgstr "ひとつのリクエストで全ての変更をアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:616
 msgid ""
 "Enable to upload all changes in one request, disable to use one request per "
@@ -7251,34 +7409,39 @@
 "ティブごとにリクエストするには、無効にする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:626
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "アップロードする変更の概略コメントを入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:628
+#, fuzzy
+msgid "Enter an upload comment (min. 3 characters)"
+msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
 msgid "Open a new changeset"
 msgstr "新しい変更セットを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:687
 msgid "Open a new changeset and use it in the next upload"
 msgstr "新しい変更セットを開き、次回アップロードで使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
 msgid "Use an open changeset"
 msgstr "開かれた変更セットを使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
 msgid "Upload data to an already opened changeset"
 msgstr "既に開かれた変更セットにデータをアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
 msgid "Close changeset after upload"
 msgstr "アップロード後に変更セットを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:736
 msgid "Select to close the changeset after the next upload"
 msgstr "次回アップロード後に閉じる「変更セット」を選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, java-format
 msgid "Tags of changeset {0}"
@@ -7286,13 +7449,13 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:967
 msgid "Load the list of your open changesets from the server"
 msgstr "自分の開いた変更セットのリストをサーバからロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
 msgid "Close the currently selected open changeset"
 msgstr "現在選択済みの開かれた変更セットを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1033
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
@@ -7305,4 +7468,32 @@
 msgid "Preparing primitives to upload ..."
 msgstr "プリミティブアップロード準備中"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
+msgid ""
+"<html>Mark modified objects <strong>from the current selection</strong> to "
+"be uploaded to the server.</html>"
+msgstr ""
+"<html><strong>現在の選択から</strong>修正されたオブジェクトをマークしてサーバ"
+"にアップロード。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73
+msgid ""
+"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
+"server.</html>"
+msgstr ""
+"<html><strong>ローカルで削除されたオブジェクト</strong>をマークしてサーバから"
+"削除。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
+msgid "Select objects to upload"
+msgstr "アップロードするオブジェクトを選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
+msgid "Cancel uploading"
+msgstr "アップロードをキャンセル"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
+msgid "Continue uploading"
+msgstr "アップロードを続ける"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
@@ -7509,5 +7700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3184
 msgid "Description"
 msgstr "説明"
@@ -7562,5 +7753,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7627,23 +7818,23 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
 #, java-format
 msgid "Data Layer {0}"
 msgstr "データレイヤー {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
 #, java-format
 msgid "version {0}"
 msgstr "バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7651,5 +7842,5 @@
 msgstr[0] "検出された競合が {0} 個あります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid ""
@@ -7663,28 +7854,28 @@
 "ら放棄されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345
-msgid "Conflicts detected"
-msgstr "競合が検出されました"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
+msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
+msgstr "競合リストダイアログを見て<br>手動で解決してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は次からなります:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0}は削除されました)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 msgid "unset"
 msgstr "設定解除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "API version: {0}"
 msgstr "APIバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -7910,5 +8101,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
-msgstr "追跡開始（有効なマーカーがないときには常に行う）"
+msgstr "トラック開始（有効なマーカーがないときには常に行う）"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
@@ -8089,5 +8280,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1377
+#: build/trans_presets.java:1388
 msgid "Car"
 msgstr "自動車"
@@ -8109,13 +8300,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:325 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:877
-#: build/trans_presets.java:891 build/trans_presets.java:913
-#: build/trans_presets.java:950 build/trans_presets.java:963
-#: build/trans_presets.java:975 build/trans_presets.java:987
-#: build/trans_presets.java:999 build/trans_presets.java:1011
-#: build/trans_presets.java:1021 build/trans_presets.java:1030
-#: build/trans_presets.java:1039 build/trans_presets.java:1440
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:336 build/trans_presets.java:662
+#: build/trans_presets.java:869 build/trans_presets.java:888
+#: build/trans_presets.java:902 build/trans_presets.java:924
+#: build/trans_presets.java:961 build/trans_presets.java:974
+#: build/trans_presets.java:986 build/trans_presets.java:998
+#: build/trans_presets.java:1010 build/trans_presets.java:1022
+#: build/trans_presets.java:1032 build/trans_presets.java:1041
+#: build/trans_presets.java:1050 build/trans_presets.java:1451
+#: build/trans_presets.java:1524
 msgid "Bicycle"
 msgstr "自転車"
@@ -8149,12 +8340,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:326 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:337 build/trans_presets.java:661
+#: build/trans_presets.java:868 build/trans_presets.java:887
+#: build/trans_presets.java:901 build/trans_presets.java:923
+#: build/trans_presets.java:960 build/trans_presets.java:973
+#: build/trans_presets.java:985 build/trans_presets.java:997
+#: build/trans_presets.java:1009 build/trans_presets.java:1021
+#: build/trans_presets.java:1031 build/trans_presets.java:1040
+#: build/trans_presets.java:1049
 msgid "Foot"
 msgstr "徒歩"
@@ -8477,15 +8668,30 @@
 msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80
 msgid "Display coordinates as"
 msgstr "座標を次の単位で表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83
 msgid "Projection method"
 msgstr "投影法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86
+#, fuzzy
+msgid "Projection code"
+msgstr "投影法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89
+#, fuzzy
+msgid "Bounds"
+msgstr "境界線"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:94
 msgid "Map Projection"
 msgstr "地図投影法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr "投影法 {0} は、有効化できませんでした。メルカトル図法を使います。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
@@ -8729,4 +8935,8 @@
 msgstr "無効にする"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+msgid "Key:"
+msgstr "キー:"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
@@ -8746,5 +8956,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:326
 msgid "Primary modifier:"
-msgstr "都道府県道の修飾："
+msgstr "主要地方道の修飾："
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:263
@@ -8753,5 +8963,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:332
 msgid "Secondary modifier:"
-msgstr "主要道路の修飾："
+msgstr "一般地方道の修飾："
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:269
@@ -8760,5 +8970,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:338
 msgid "Tertiary modifier:"
-msgstr "主要道路(Tertiary)の修飾:"
+msgstr "一般道(2車線以上)の修飾:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:277
@@ -8798,5 +9008,5 @@
 msgstr "タグテーブルの選択を削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
 msgid "More information about this feature"
@@ -8804,28 +9014,28 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:521
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:522
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "プリセット \"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
 msgid "closedway"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:649
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8836,15 +9046,15 @@
 msgstr "タグの事前設定ソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:657
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8853,18 +9063,18 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:816
 msgid "Change Properties"
 msgstr "プロパティを変更する"
@@ -8979,8 +9189,8 @@
 msgstr "事前定義のライセンスを選択"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:57
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:59
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:86
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:83
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -8988,10 +9198,10 @@
 msgstr "{0}　のマーカー"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:73
 #, java-format
 msgid "File \"{0}\" does not exist"
 msgstr "ファイル \"{0}\" はありません"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:76
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -9071,5 +9281,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
 msgid "Coordinates imported: "
 msgstr "座標をインポートしました。 "
@@ -9228,8 +9438,8 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
 #, java-format
@@ -9378,5 +9588,6 @@
 msgstr "OSMサーバファイルがgzip 圧縮されました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
 msgid ""
@@ -9384,5 +9595,6 @@
 msgstr "long 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
 #, java-format
 msgid ""
@@ -9391,16 +9603,11 @@
 msgstr "long 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
-#, java-format
-msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
-#, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
-msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:108
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
+msgstr "ダブル型の必須属性 ''{0}'' に不正な値。入力値: ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
 #, java-format
 msgid ""
@@ -9408,5 +9615,9 @@
 msgstr "boolean 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
+msgid "<anonymous>"
+msgstr "<匿名>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
 #, java-format
 msgid ""
@@ -9416,5 +9627,5 @@
 "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
 msgid "Parsing OSM history data ..."
 msgstr "OSM 履歴データ解析中 ..."
@@ -9678,9 +9889,4 @@
 msgstr "ひとつのリクエストでアップロード開始..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "パラメータの ''{0}'' はヌルではいけません"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 msgid "Uploading data ..."
@@ -9759,5 +9965,5 @@
 msgstr "プラグイン {0} でエラーが発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:77
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -9766,5 +9972,13 @@
 "ん。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86
+#, java-format
+msgid ""
+"<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
+"developed and very likely will produce errors.<br>It should be disabled."
+"<br>Delete from preferences?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
@@ -9773,5 +9987,12 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126
+#, java-format
+msgid ""
+"Plugin {0} version {1} found but for this version of JOSM is at least "
+"version {2} required. Please update the plugin."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:146
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -9779,15 +10000,15 @@
 "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "プラグインが見つかりません： {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "プラグインが最後に更新されてから{0}日以上経過しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:142
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -9797,21 +10018,21 @@
 "warntime'を編集することで変更できます）"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "プラグイン {0} を読み込めません。設定から削除しますか？"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "このプラグインを使用不可にする"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "プラグインを継続"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "プラグイン {0} を読み込めません。設定から削除しますか？"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9821,9 +10042,9 @@
 "上書きできる権限があるかどうか、確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9831,10 +10052,10 @@
 msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "このプラグインから得られる情報では、作者は {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9843,9 +10064,9 @@
 "い。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "このプラグインを使用不可にしますか?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9855,13 +10076,13 @@
 "再起動してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "プラグイン情報"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -9921,28 +10142,28 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:331
-#: build/trans_presets.java:332 build/trans_presets.java:333
-#: build/trans_presets.java:334 build/trans_presets.java:450
-#: build/trans_presets.java:470 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:1333
-#: build/trans_presets.java:1400 build/trans_presets.java:1401
-#: build/trans_presets.java:1402 build/trans_presets.java:2465
-#: build/trans_presets.java:2466 build/trans_presets.java:2467
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:461
+#: build/trans_presets.java:481 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:785
+#: build/trans_presets.java:800 build/trans_presets.java:1344
+#: build/trans_presets.java:1411 build/trans_presets.java:1412
+#: build/trans_presets.java:1413 build/trans_presets.java:2477
+#: build/trans_presets.java:2478 build/trans_presets.java:2479
 msgid "unknown"
 msgstr "不明な"
@@ -10020,5 +10241,5 @@
 msgstr "(テキストはクリップボードにコピーされています。)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:32
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -10029,5 +10250,5 @@
 "ンターネット接続をチェックしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
 #, java-format
 msgid ""
@@ -10038,5 +10259,16 @@
 "変更セットはタイムアウト後にサーバによって自動的に閉じられます。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#, java-format
+msgid ""
+"<html><strong>Failed</strong> to delete <strong>relation {0}</strong>. It is "
+"still referred to by relation {1}.<br>Please load relation {1}, remove the "
+"reference to relation {0}, and upload again.</html>"
+msgstr ""
+"<html><strong>リレーション {0}</strong>の削除に<strong>失敗</strong>。リレー"
+"ション {1} がまだ参照しています。<br>リレーション {1} をロードし、リレーショ"
+"ン {0} への参照を削除し、再度アップロードしてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
 #, java-format
 msgid ""
@@ -10048,5 +10280,37 @@
 "タセットは前提条件に違反しています。<br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#, java-format
+msgid "Failed to parse date ''{0}'' replied by server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#, fuzzy, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
+"already been closed.</html>"
+msgstr ""
+"<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を完了</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
+"already been closed on {1}.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#, java-format
+msgid ""
+"<html>The server reported that it has detected a conflict.<br>Error message "
+"(untranslated):<br>{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+msgid "<html>The server reported that it has detected a conflict.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
 #, java-format
 msgid ""
@@ -10059,5 +10323,5 @@
 "ドしていないためだと思われます。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
 #, java-format
 msgid ""
@@ -10068,5 +10332,5 @@
 "チェックしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
 #, java-format
 msgid ""
@@ -10078,5 +10342,5 @@
 "失敗しました。<br>詳細(原文): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
 #, java-format
 msgid ""
@@ -10087,10 +10351,10 @@
 "おそらく一時的な問題です。後ほどやり直してみてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "OSM サーバ ''{0}'' より不正リクエストの報告がありました。<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10102,19 +10366,19 @@
 "ポートファイルを使用してください。"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>エラーメッセージ(未訳): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182
-#, java-format
-msgid ""
-"The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#, java-format
+msgid ""
+"The OSM server ''{0}'' doesn''t know about an object<br>you tried to read, "
 "update, or delete. Either the respective object<br>doesn''t exist on the "
 "server or you''re using an invalid URL to access<br>it. Please carefully "
-"check the servers address ''{1}'' for typos."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209
+"check the servers address ''{0}'' for typos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
 #, java-format
 msgid ""
@@ -10127,15 +10391,18 @@
 "てください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because a primitive you tried "
-"to<br>delete on the server is already deleted.<br><br>The error message is:"
-"<br>{0}</html>"
-msgstr ""
-"<html>アップロード <strong>失敗</strong> サーバから削除しようとしたプリミティ"
-"ブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#, java-format
+msgid ""
+"<html>The server reports that an object is deleted.<br><strong>Uploading "
+"failed</strong> if you tried to update or delete this object.<br> "
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+"<html>サーバからオブジェクト削除の報告がありました。<br>このオブジェクトを更"
+"新または削除しようとしたのであれば<strong>アップロードは失敗</strong>です。"
+"<br> このオブジェクトをダウンロードしようとしたのであれば<strong>ダウンロード"
+"は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10289,5 +10556,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
-msgstr "トラッカブル (指定のポイントとタイムスタンプを匿名で共有する)"
+msgstr "トラック可能 (指定のポイントとタイムスタンプを匿名で共有する)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
@@ -10393,9 +10660,9 @@
 msgstr "openstreetmap.org へトレースをアップロード"
 
-#. item "Buildings/Addresses" text "Country code"
+#. item "Man-Made/Buildings/Addresses" text "Country code"
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2290
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -10505,7 +10772,6 @@
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
-#, fuzzy
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません"
+msgstr "開始および終了番号はアルファベットアドレスが同じでなければなりません"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
@@ -11293,5 +11559,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2343
 msgid "Location"
 msgstr "ロケーション"
@@ -11317,5 +11583,10 @@
 msgstr "新しい cookie を入手してください(セッションがタイムアウトしました)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#, fuzzy
+msgid "PNG files (*.png)"
+msgstr "JPEGイメージ(*.jpg)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
 msgid "Export as PNG format (only raster images)"
 msgstr "PNG 形式でエクスポート(ラスター画像のみ)"
@@ -11445,21 +11716,21 @@
 "分割の前にエリアをリレーションから削除してください。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS ファイル (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
 msgid "Format errors: "
 msgstr "フォーマットエラー: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "TangoGPS import success"
 msgstr "TangoGPS のインポートに成功しました。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
 msgid "TangoGPS import failure!"
 msgstr "TangoGPS のインポートに失敗しました。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:66
 msgid "TCX Files (*.tcx)"
 msgstr "TCX ファイル (*.tcx)"
@@ -11480,4 +11751,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
 msgid "No data loaded."
 msgstr "データが読み込まれていません。"
@@ -11887,5 +12159,5 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2330 build/trans_style.java:990
+#: build/trans_presets.java:2342 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
 #: build/trans_style.java:3400 build/trans_style.java:3408
@@ -12190,41 +12462,51 @@
 msgstr "左折禁止をアサインする4 または5のウェイを選んでください。"
 
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
-#, java-format
-msgid "{0} extrem nodes."
-msgstr "{0} 極値ノード。"
-
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
-#, java-format
-msgid "Via node {0}, {1}"
-msgstr "経由ノード {0}, {1}"
-
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
-#, java-format
-msgid "{0} via nodes."
-msgstr "{0} 経由ノード。"
-
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65
+#, fuzzy
+msgid "Please select 4 ways that form a closed relation."
+msgstr "少なくとも４つのノードを選択してください。"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
+#, fuzzy
+msgid "Unable to order the ways. Please verify their directions"
+msgstr "経由ノードが見つかりません。選択をチェックしてください"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:106
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:183
+msgid "Create Michigan left turn restriction"
+msgstr "ミシガン左折制限を作成"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:140
 msgid "Unable to find via nodes. Please check your selection"
 msgstr "経由ノードが見つかりません。選択をチェックしてください"
 
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
-#, java-format
-msgid "MIddle way: {0}"
-msgstr "中間のウェイ: {0}"
-
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
-msgid "Create Michigan left turn restriction"
-msgstr "ミシガン左折制限を作成"
-
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
-#, java-format
-msgid "Processing {0}"
-msgstr "{0} 実行中"
-
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
-#, java-format
-msgid "Relation: from {0} to {1} via {2}"
-msgstr "リレーション: {0} から {1} まで {2} 経由"
+#. Commit
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
+#, fuzzy
+msgid "Create multipolygon"
+msgstr "マルチポリゴンを編集"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#, fuzzy
+msgid "Create multipolygon."
+msgstr "マルチポリゴンを編集"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#, fuzzy
+msgid "One of the selected ways is already part of another multipolygon."
+msgstr "内側のマルチポリゴンの一部ではないウェイを削除"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#, fuzzy
+msgid "Multipolygon must consist only of closed ways."
+msgstr "ウェイだけを選択してください。"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#, fuzzy
+msgid "You must select at least two ways."
+msgstr "少なくともウェイを一つ選択しなければなりません"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -12240,5 +12522,5 @@
 msgstr "OpenStreetBugsに報告された問題点を表示"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:91
 msgid ""
 "<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
@@ -12250,5 +12532,5 @@
 "すか？ (強く推奨)</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
 msgid "Switch to new openstreetbugs server?"
 msgstr "新しいopenstreetbugs サーバに切り換えますか？"
@@ -12359,9 +12641,9 @@
 msgstr "ファイルの拡張子が不明です: {0}"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:39
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:41
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:93
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:95
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -12371,9 +12653,9 @@
 "を設定してください。"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126
 msgid "osmarender options"
 msgstr "osmarenderオプション"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:127
 msgid "Firefox executable"
 msgstr "Firefoxの実行ファイル"
@@ -12803,7 +13085,7 @@
 msgstr "補間"
 
-#. item "Buildings/Addresses" text "House name"
+#. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2284
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -12985,10 +13267,10 @@
 msgstr "妥当性検証エラー"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168
 msgid "Grid"
 msgstr "グリッド"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #, java-format
 msgid ""
@@ -13070,5 +13352,5 @@
 msgstr "その他を検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:109
 #, java-format
 msgid "Running test {0}"
@@ -13195,18 +13477,18 @@
 msgstr "交差するウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
 msgid "Duplicated nodes"
 msgstr "ノードの複製"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "このテストは全く同じ位置にノードがないことをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
 msgid "Nodes at same position"
 msgstr "同位置のノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
 msgid "Confirmation"
 msgstr "確認"
@@ -13239,10 +13521,30 @@
 msgstr "ウェイのノードの複製"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
+#, fuzzy
+msgid "Missing name:* translation."
+msgstr "not に引数がありません。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
+msgid ""
+"This test finds multilingual objects whose 'name' attribute is not equal to "
+"some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., "
+"Italia - Italien - Italy."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:46
+msgid "A name:* translation is missing."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:73
+msgid "A name is missing, even though name:* exists."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:57
 msgid "Nodes with same name"
 msgstr "同じ名前のノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:25
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "このテストは同じ名前のノードを探します（重複の可能性）。"
@@ -13508,48 +13810,48 @@
 msgstr "不正な正規表現： \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:34
 msgid "Unclosed Ways."
 msgstr "閉じていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:34
 msgid "This tests if ways which should be circular are closed."
 msgstr "これは循環しているべきウェイが閉じられているかチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80
 #, java-format
 msgid "natural type {0}"
 msgstr "自然のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83
 #, java-format
 msgid "landuse type {0}"
 msgstr "土地利用のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86
 #, java-format
 msgid "amenities type {0}"
 msgstr "アメニティのタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89
 #, java-format
 msgid "sport type {0}"
 msgstr "スポーツのタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92
 #, java-format
 msgid "tourism type {0}"
 msgstr "旅行関係のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95
 #, java-format
 msgid "shop type {0}"
 msgstr "店のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98
 #, java-format
 msgid "leisure type {0}"
 msgstr "レジャーのタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
 #, java-format
 msgid "waterway type {0}"
@@ -13645,5 +13947,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13659,10 +13961,10 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:107
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "領域"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:126
 msgid "Unclosed way"
 msgstr "閉じていないウェイ"
@@ -13782,17 +14084,17 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
 msgid "Select a starting node on the end of a way"
 msgstr "ウェイ終端の開始ノードを選択"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
 msgid "Reached the end of the line"
 msgstr "ラインの終端に到達"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
 msgid "Reached a junction"
 msgstr "ジャンクションに到達"
@@ -14293,6 +14595,13 @@
 msgstr "4 または5のウェイのセットに左折禁止を追加"
 
+#. Plugin multipoly
+#: build/trans_plugins.java:39
+msgid ""
+"Create multipolygons by one click, much easier than standard way with "
+"relation editor."
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14305,10 +14614,10 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -14317,5 +14626,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14323,5 +14632,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14331,5 +14640,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14340,15 +14649,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14360,10 +14669,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14374,15 +14683,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPSポジションで、マーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14395,10 +14704,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "一つのブロックからテラスハウスを作成する"
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14409,5 +14718,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14418,5 +14727,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14427,10 +14736,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:79
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14468,4 +14777,6 @@
 #. text: fixed label to display
 #. values: comma seperated list of values
+#. display_values: comma seperated list of values to be displayed instead of the
+#. database values, order and number must be equal to values
 #. default: default string to display
 #. delete_if_empty: true/false
@@ -14483,47 +14794,54 @@
 #. - The fields description, shortdescription and link may also be localized (e.g. de.link)
 #. See also http://josm.openstreetmap.de/wiki/TaggingPresets.
+#. 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"
+#. 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
+#. no specific translation has been given in XML file. When no "display_values"
+#. are supplied, then "values" will be treated as "display_values" and translated instead.
 #. -->
 #. <annotations>
-#: build/trans_presets.java:57
+#: build/trans_presets.java:68
 msgid "Highways"
 msgstr "道路"
 
 #. group "Highways"
-#: build/trans_presets.java:58
+#: build/trans_presets.java:69
 msgid "Streets"
 msgstr "ストリート"
 
-#. group "Streets"
+#. group "Highways/Streets"
 #. <button label="Exit" hotkey="E">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:59 build/trans_surveyor.java:72
+#: build/trans_presets.java:70 build/trans_surveyor.java:72
 msgid "Motorway"
-msgstr "高速道路・有料道路"
-
-#. item
+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" />
-#: build/trans_presets.java:62
+#: build/trans_presets.java:73
 msgid "Edit Motorway"
-msgstr "高速道路の編集"
-
-#. item "Streets/Motorway" label "Edit Motorway"
+msgstr "自動車専用道路の編集"
+
+#. item "Highways/Streets/Motorway" label "Edit Motorway"
 #. <space />
 #. <key key="highway" value="motorway" />
-#. item "Streets/Trunk" label "Edit Trunk"
+#. item "Highways/Streets/Trunk" label "Edit Trunk"
 #. <space />
 #. <key key="highway" value="trunk" />
-#. item "Streets/Trunk Link" label "Edit Trunk Link"
+#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
 #. <space />
 #. <key key="highway" value="trunk_link" />
-#. item "Streets/Primary" label "Edit Primary Road"
+#. item "Highways/Streets/Primary" label "Edit Primary Road"
 #. <space />
 #. <key key="highway" value="primary" />
-#. item "Streets/Secondary" label "Edit Secondary Road"
+#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
 #. <space />
 #. <key key="highway" value="secondary" />
-#. item "Streets/Tertiary" label "Edit Tertiary Road"
+#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
 #. <space />
 #. <key key="highway" value="tertiary" />
@@ -14532,74 +14850,74 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:65 build/trans_presets.java:101
-#: build/trans_presets.java:121 build/trans_presets.java:141
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:1560 build/trans_presets.java:2382
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:76 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:152
+#: build/trans_presets.java:189 build/trans_presets.java:209
+#: build/trans_presets.java:1571 build/trans_presets.java:2394
+#: build/trans_presets.java:3182
 msgid "Reference"
 msgstr "道路番号"
 
-#. item "Streets/Motorway" combo "Layer"
-#. item "Streets/Motorway Link" combo "Layer"
-#. item "Streets/Trunk" combo "Layer"
-#. item "Streets/Trunk Link" combo "Layer"
-#. item "Streets/Primary" combo "Layer"
-#. item "Streets/Primary Link" combo "Layer"
-#. item "Streets/Secondary" combo "Layer"
-#. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:359
+#. 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:80 build/trans_presets.java:97
+#: build/trans_presets.java:116 build/trans_presets.java:135
+#: build/trans_presets.java:156 build/trans_presets.java:172
+#: build/trans_presets.java:193 build/trans_presets.java:370
 msgid "Lanes"
 msgstr "車線数"
 
-#. item "Streets/Motorway" combo "Lanes"
-#. item "Streets/Motorway Link" combo "Lanes"
-#. item "Streets/Trunk" combo "Lanes"
-#. item "Streets/Trunk Link" combo "Lanes"
-#. item "Streets/Primary" combo "Lanes"
-#. item "Streets/Primary Link" combo "Lanes"
-#. item "Streets/Secondary" combo "Lanes"
-#. item "Streets/Tertiary" combo "Layer"
-#. item "Streets/Unclassified" combo "Layer"
-#. item "Streets/Bridge" combo "Layer"
-#. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:225 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:335
-#: build/trans_presets.java:374 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:511 build/trans_presets.java:667
-#: build/trans_presets.java:1310
+#. item "Highways/Streets/Motorway" combo "Lanes"
+#. item "Highways/Streets/Motorway Link" combo "Lanes"
+#. item "Highways/Streets/Trunk" combo "Lanes"
+#. item "Highways/Streets/Trunk Link" combo "Lanes"
+#. item "Highways/Streets/Primary" combo "Lanes"
+#. 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"
+#: build/trans_presets.java:81 build/trans_presets.java:98
+#: build/trans_presets.java:117 build/trans_presets.java:136
+#: build/trans_presets.java:157 build/trans_presets.java:173
+#: build/trans_presets.java:194 build/trans_presets.java:213
+#: build/trans_presets.java:236 build/trans_presets.java:292
+#: build/trans_presets.java:325 build/trans_presets.java:346
+#: build/trans_presets.java:385 build/trans_presets.java:400
+#: build/trans_presets.java:424 build/trans_presets.java:443
+#: build/trans_presets.java:464 build/trans_presets.java:484
+#: build/trans_presets.java:522 build/trans_presets.java:678
+#: build/trans_presets.java:1321
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
 
-#. item "Streets/Motorway" text "Max. speed (km/h)"
-#. item "Streets/Motorway Link" text "Max. speed (km/h)"
-#. item "Streets/Trunk" text "Max. speed (km/h)"
-#. item "Streets/Trunk Link" text "Max. speed (km/h)"
-#. item "Streets/Primary" text "Max. speed (km/h)"
-#. item "Streets/Primary Link" text "Max. speed (km/h)"
-#. item "Streets/Secondary" text "Max. speed (km/h)"
-#. item "Streets/Tertiary" text "Max. speed (km/h)"
-#. item "Streets/Unclassified" text "Name"
-#. item "Streets/Residential" text "Name"
+#. 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"
 #. <optional>
-#. item "Streets/Living Street" text "Name"
+#. item "Highways/Streets/Living Street" text "Name"
 #. <optional>
-#. item "Streets/Service" text "Name"
-#. item "Streets/Parking Aisle" label "Edit Parking Aisle"
+#. item "Highways/Streets/Service" text "Name"
+#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
 #. <space />
 #. <key key="highway" value="service" />
 #. <key key="service" value="parking_aisle" />
 #. <optional>
-#. item "Streets/Road (Unknown Type)" text "Name"
-#. item "Streets/Road Restrictions" label "Edit Road Restrictions"
-#. item "Streets/Roundabout" text "Name"
+#. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
+#. item "Highways/Streets/Roundabout" text "Name"
 #. item "Ways/Construction" text "Name"
 #. item "Ways/Bridleway" text "Name"
@@ -14610,35 +14928,35 @@
 #. item "Ways/Steps" text "Name"
 #. item "Ways/Path" text "Name"
-#. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:294 build/trans_presets.java:307
-#: build/trans_presets.java:321 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:465
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:660 build/trans_presets.java:1303
+#. item "Transport/Railway/Bus Guideway" text "Name"
+#: build/trans_presets.java:82 build/trans_presets.java:99
+#: build/trans_presets.java:118 build/trans_presets.java:137
+#: build/trans_presets.java:158 build/trans_presets.java:174
+#: build/trans_presets.java:195 build/trans_presets.java:214
+#: build/trans_presets.java:230 build/trans_presets.java:248
+#: build/trans_presets.java:266 build/trans_presets.java:285
+#: build/trans_presets.java:305 build/trans_presets.java:318
+#: build/trans_presets.java:332 build/trans_presets.java:364
+#: build/trans_presets.java:416 build/trans_presets.java:436
+#: build/trans_presets.java:456 build/trans_presets.java:476
+#: build/trans_presets.java:496 build/trans_presets.java:515
+#: build/trans_presets.java:671 build/trans_presets.java:1314
 msgid "Oneway"
 msgstr "一方通行"
 
-#. item "Streets/Motorway" check "Oneway"
-#. item "Streets/Motorway Link" check "Oneway"
-#. item "Streets/Trunk" check "Motorroad"
-#. item "Streets/Trunk Link" check "Motorroad"
-#. item "Streets/Primary" check "Motorroad"
-#. item "Streets/Primary Link" check "Motorroad"
-#. item "Streets/Secondary" check "Oneway"
-#. item "Streets/Tertiary" check "Oneway"
-#. item "Streets/Unclassified" check "Oneway"
-#. item "Streets/Residential" check "Oneway"
-#. item "Streets/Living Street" check "Oneway"
-#. item "Streets/Service" check "Oneway"
-#. item "Streets/Road (Unknown Type)" check "Oneway"
-#. item "Streets/Roundabout" check "Oneway"
-#. item "Streets/Roundabout" text "Width (meters)"
+#. 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/Service" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Roundabout" check "Oneway"
+#. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
 #. item "Ways/Construction" check "Oneway"
@@ -14655,5 +14973,5 @@
 #. item "Ways/Track Grade 5" text "Name"
 #. item "Ways/Path" check "Oneway"
-#. item "Railway/Bus Guideway" 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"/>
@@ -14662,37 +14980,37 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:363 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1304 build/trans_surveyor.java:12
+#: build/trans_presets.java:83 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:139
+#: build/trans_presets.java:160 build/trans_presets.java:176
+#: build/trans_presets.java:196 build/trans_presets.java:215
+#: build/trans_presets.java:231 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:286
+#: build/trans_presets.java:319 build/trans_presets.java:365
+#: build/trans_presets.java:374 build/trans_presets.java:417
+#: build/trans_presets.java:437 build/trans_presets.java:457
+#: build/trans_presets.java:477 build/trans_presets.java:497
+#: build/trans_presets.java:516 build/trans_presets.java:535
+#: build/trans_presets.java:556 build/trans_presets.java:577
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:640 build/trans_presets.java:672
+#: build/trans_presets.java:1315 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
 
-#. item "Streets/Motorway" check "Bridge"
-#. item "Streets/Motorway Link" check "Bridge"
-#. item "Streets/Trunk" check "Bridge"
-#. item "Streets/Trunk Link" check "Bridge"
-#. item "Streets/Primary" check "Bridge"
-#. item "Streets/Primary Link" check "Bridge"
-#. item "Streets/Secondary" check "Bridge"
-#. item "Streets/Tertiary" check "Bridge"
-#. item "Streets/Unclassified" check "Bridge"
-#. item "Streets/Residential" check "Bridge"
-#. item "Streets/Living Street" check "Bridge"
-#. item "Streets/Service" check "Bridge"
-#. item "Streets/Road (Unknown Type)" check "Bridge"
-#. item "Streets/Roundabout" check "Bridge"
-#. item "Streets/Bridge" text "Width (meters)"
+#. item "Highways/Streets/Motorway" check "Bridge"
+#. item "Highways/Streets/Motorway Link" check "Bridge"
+#. item "Highways/Streets/Trunk" check "Bridge"
+#. item "Highways/Streets/Trunk Link" check "Bridge"
+#. item "Highways/Streets/Primary" check "Bridge"
+#. item "Highways/Streets/Primary Link" check "Bridge"
+#. item "Highways/Streets/Secondary" check "Bridge"
+#. item "Highways/Streets/Tertiary" check "Bridge"
+#. item "Highways/Streets/Unclassified" check "Bridge"
+#. item "Highways/Streets/Residential" check "Bridge"
+#. item "Highways/Streets/Living Street" check "Bridge"
+#. item "Highways/Streets/Service" check "Bridge"
+#. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Roundabout" check "Bridge"
+#. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
 #. item "Ways/Construction" check "Bridge"
@@ -14709,37 +15027,37 @@
 #. item "Ways/Track Grade 5" check "Bridge"
 #. item "Ways/Path" check "Bridge"
-#. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:379 build/trans_presets.java:407
-#: build/trans_presets.java:427 build/trans_presets.java:447
-#: build/trans_presets.java:467 build/trans_presets.java:487
-#: build/trans_presets.java:506 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:662
-#: build/trans_presets.java:1305
+#. item "Transport/Railway/Bus Guideway" check "Bridge"
+#: build/trans_presets.java:84 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:140
+#: build/trans_presets.java:161 build/trans_presets.java:177
+#: build/trans_presets.java:197 build/trans_presets.java:216
+#: build/trans_presets.java:232 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:287
+#: build/trans_presets.java:320 build/trans_presets.java:366
+#: build/trans_presets.java:390 build/trans_presets.java:418
+#: build/trans_presets.java:438 build/trans_presets.java:458
+#: build/trans_presets.java:478 build/trans_presets.java:498
+#: build/trans_presets.java:517 build/trans_presets.java:536
+#: build/trans_presets.java:557 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:620
+#: build/trans_presets.java:641 build/trans_presets.java:673
+#: build/trans_presets.java:1316
 msgid "Tunnel"
 msgstr "トンネル"
 
-#. item "Streets/Motorway" check "Tunnel"
-#. item "Streets/Motorway Link" check "Tunnel"
-#. item "Streets/Trunk" check "Tunnel"
-#. item "Streets/Trunk Link" check "Tunnel"
-#. item "Streets/Primary" check "Tunnel"
-#. item "Streets/Primary Link" check "Tunnel"
-#. item "Streets/Secondary" check "Tunnel"
-#. item "Streets/Tertiary" check "Tunnel"
-#. item "Streets/Unclassified" check "Tunnel"
-#. item "Streets/Residential" check "Tunnel"
-#. item "Streets/Living Street" check "Tunnel"
-#. item "Streets/Service" check "Tunnel"
-#. item "Streets/Road (Unknown Type)" check "Tunnel"
-#. item "Streets/Roundabout" check "Tunnel"
+#. item "Highways/Streets/Motorway" check "Tunnel"
+#. item "Highways/Streets/Motorway Link" check "Tunnel"
+#. item "Highways/Streets/Trunk" check "Tunnel"
+#. item "Highways/Streets/Trunk Link" check "Tunnel"
+#. item "Highways/Streets/Primary" check "Tunnel"
+#. item "Highways/Streets/Primary Link" check "Tunnel"
+#. item "Highways/Streets/Secondary" check "Tunnel"
+#. item "Highways/Streets/Tertiary" check "Tunnel"
+#. item "Highways/Streets/Unclassified" check "Tunnel"
+#. item "Highways/Streets/Residential" check "Tunnel"
+#. item "Highways/Streets/Living Street" check "Tunnel"
+#. item "Highways/Streets/Service" check "Tunnel"
+#. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Roundabout" check "Tunnel"
 #. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Bridleway" check "Tunnel"
@@ -14755,36 +15073,36 @@
 #. item "Ways/Track Grade 5" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
-#. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1306
+#. item "Transport/Railway/Bus Guideway" check "Tunnel"
+#: build/trans_presets.java:85 build/trans_presets.java:102
+#: build/trans_presets.java:122 build/trans_presets.java:141
+#: build/trans_presets.java:162 build/trans_presets.java:178
+#: build/trans_presets.java:198 build/trans_presets.java:217
+#: build/trans_presets.java:233 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:288
+#: build/trans_presets.java:321 build/trans_presets.java:367
+#: build/trans_presets.java:419 build/trans_presets.java:439
+#: build/trans_presets.java:459 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:558
+#: build/trans_presets.java:579 build/trans_presets.java:600
+#: build/trans_presets.java:621 build/trans_presets.java:642
+#: build/trans_presets.java:674 build/trans_presets.java:1317
 msgid "Cutting"
 msgstr "切り通し"
 
-#. item "Streets/Motorway" check "Cutting"
-#. item "Streets/Motorway Link" check "Cutting"
-#. item "Streets/Trunk" check "Cutting"
-#. item "Streets/Trunk Link" check "Cutting"
-#. item "Streets/Primary" check "Cutting"
-#. item "Streets/Primary Link" check "Cutting"
-#. item "Streets/Secondary" check "Cutting"
-#. item "Streets/Tertiary" check "Cutting"
-#. item "Streets/Unclassified" check "Cutting"
-#. item "Streets/Residential" check "Cutting"
-#. item "Streets/Living Street" check "Cutting"
-#. item "Streets/Service" check "Cutting"
-#. item "Streets/Road (Unknown Type)" check "Cutting"
-#. item "Streets/Roundabout" check "Cutting"
+#. item "Highways/Streets/Motorway" check "Cutting"
+#. item "Highways/Streets/Motorway Link" check "Cutting"
+#. item "Highways/Streets/Trunk" check "Cutting"
+#. item "Highways/Streets/Trunk Link" check "Cutting"
+#. item "Highways/Streets/Primary" check "Cutting"
+#. item "Highways/Streets/Primary Link" check "Cutting"
+#. item "Highways/Streets/Secondary" check "Cutting"
+#. item "Highways/Streets/Tertiary" check "Cutting"
+#. item "Highways/Streets/Unclassified" check "Cutting"
+#. item "Highways/Streets/Residential" check "Cutting"
+#. item "Highways/Streets/Living Street" check "Cutting"
+#. item "Highways/Streets/Service" check "Cutting"
+#. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Roundabout" check "Cutting"
 #. item "Ways/Construction" check "Cutting"
 #. item "Ways/Bridleway" check "Cutting"
@@ -14800,71 +15118,71 @@
 #. item "Ways/Track Grade 5" check "Cutting"
 #. item "Ways/Path" check "Cutting"
-#. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:75 build/trans_presets.java:92
-#: build/trans_presets.java:112 build/trans_presets.java:131
-#: build/trans_presets.java:152 build/trans_presets.java:168
-#: build/trans_presets.java:188 build/trans_presets.java:207
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:469
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:664 build/trans_presets.java:1307
+#. item "Transport/Railway/Bus Guideway" check "Cutting"
+#: build/trans_presets.java:86 build/trans_presets.java:103
+#: build/trans_presets.java:123 build/trans_presets.java:142
+#: build/trans_presets.java:163 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:289
+#: build/trans_presets.java:322 build/trans_presets.java:368
+#: build/trans_presets.java:420 build/trans_presets.java:440
+#: build/trans_presets.java:460 build/trans_presets.java:480
+#: build/trans_presets.java:500 build/trans_presets.java:519
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:580 build/trans_presets.java:601
+#: build/trans_presets.java:622 build/trans_presets.java:643
+#: build/trans_presets.java:675 build/trans_presets.java:1318
 msgid "Embankment"
 msgstr "土手"
 
-#. item "Streets/Motorway" check "Embankment"
+#. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:78
+#: build/trans_presets.java:89
 msgid "Motorway Link"
-msgstr "高速道路の連絡路"
-
-#. item
+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" />
-#: build/trans_presets.java:81
+#: build/trans_presets.java:92
 msgid "Edit Motorway Link"
-msgstr "高速道路の連絡路の編集"
-
-#. item "Streets/Motorway Link" check "Embankment"
+msgstr "自動車専用道路の連絡路の編集"
+
+#. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:95
+#: build/trans_presets.java:106
 msgid "Trunk"
 msgstr "国道"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:98
+#: build/trans_presets.java:109
 msgid "Edit Trunk"
 msgstr "国道の編集"
 
-#. item "Streets/Trunk" check "Oneway"
-#. item "Streets/Trunk Link" check "Oneway"
-#. item "Streets/Primary" check "Oneway"
-#. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
+#. 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"
+#: build/trans_presets.java:119 build/trans_presets.java:138
+#: build/trans_presets.java:159 build/trans_presets.java:175
 msgid "Motorroad"
 msgstr "車道"
 
-#. item "Streets/Trunk" check "Embankment"
+#. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:126
 msgid "Trunk Link"
 msgstr "国道の連絡路"
 
-#. item
+#. 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"/>
-#: build/trans_presets.java:118
+#: build/trans_presets.java:129
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
 
-#. item "Streets/Trunk Link" check "Embankment"
+#. item "Highways/Streets/Trunk Link" check "Embankment"
 #. </optional>
 #. <separator/>
@@ -14873,27 +15191,27 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:135 build/trans_surveyor.java:76
+#: build/trans_presets.java:146 build/trans_surveyor.java:76
 msgid "Primary"
-msgstr "都道府県道"
-
-#. item
+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" />
-#: build/trans_presets.java:138
+#: build/trans_presets.java:149
 msgid "Edit Primary Road"
-msgstr "都道府県道を編集"
-
-#. item "Streets/Primary" check "Embankment"
+msgstr "主要地方道を編集"
+
+#. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:155
+#: build/trans_presets.java:166
 msgid "Primary Link"
-msgstr "都道府県道の連絡路"
-
-#. item
-#: build/trans_presets.java:156
+msgstr "主要地方道の連絡路"
+
+#. item "Highways/Streets/Primary Link"
+#: build/trans_presets.java:167
 msgid "Edit Primary Link"
-msgstr "都道府県道の連絡路の編集"
-
-#. item "Streets/Primary Link" check "Embankment"
+msgstr "主要地方道の連絡路の編集"
+
+#. item "Highways/Streets/Primary Link" check "Embankment"
 #. </optional>
 #. <button label="Primary" hotkey="2">
@@ -14901,31 +15219,31 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:171 build/trans_surveyor.java:80
+#: build/trans_presets.java:182 build/trans_surveyor.java:80
 msgid "Secondary"
-msgstr "主要道路"
-
-#. item
+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" />
-#: build/trans_presets.java:175
+#: build/trans_presets.java:186
 msgid "Edit Secondary Road"
-msgstr "主要道路の編集"
-
-#. item "Streets/Secondary" check "Embankment"
+msgstr "一般地方道の編集"
+
+#. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:191
+#: build/trans_presets.java:202
 msgid "Tertiary"
-msgstr "主要道路(Tertiary)"
-
-#. item
+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" />
-#: build/trans_presets.java:195
+#: build/trans_presets.java:206
 msgid "Edit Tertiary Road"
-msgstr "主要道路(Tertiary)の編集"
-
-#. item "Streets/Tertiary" check "Embankment"
+msgstr "一般道(2車線以上)の編集"
+
+#. item "Highways/Streets/Tertiary" check "Embankment"
 #. </optional>
 #. <button label="Secondary" hotkey="3">
@@ -14933,22 +15251,22 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:210 build/trans_surveyor.java:84
+#: build/trans_presets.java:221 build/trans_surveyor.java:84
 msgid "Unclassified"
-msgstr "１車線道"
-
-#. item
+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" />
-#: build/trans_presets.java:214
+#: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
-msgstr "分類なし道路の編集"
-
-#. item "Streets/Unclassified" text "Max. speed (km/h)"
-#. item "Streets/Service" text "Max. speed (km/h)"
-#. item "Streets/Road (Unknown Type)" text "Max. speed (km/h)"
-#. item "Streets/Roundabout" combo "Lanes"
-#. item "Streets/Bridge" text "Max. weight (tonnes)"
-#. item "Streets/Tunnel" text "Max. speed (km/h)"
+msgstr "一般道(2車線未満)の編集"
+
+#. 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/Roundabout" combo "Lanes"
+#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
 #. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Bridleway" text "Max. speed (km/h)"
@@ -14963,26 +15281,26 @@
 #. item "Ways/Demanding Alpine Hiking" text "Name"
 #. item "Ways/Difficult Alpine Hiking" text "Name"
-#. item "Railway/Bus Guideway" text "Max. speed (km/h)"
+#. 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)"
-#: build/trans_presets.java:226 build/trans_presets.java:244
-#: build/trans_presets.java:262 build/trans_presets.java:282
-#: build/trans_presets.java:315 build/trans_presets.java:360
-#: build/trans_presets.java:376 build/trans_presets.java:390
-#: build/trans_presets.java:414 build/trans_presets.java:433
-#: build/trans_presets.java:454 build/trans_presets.java:474
-#: build/trans_presets.java:492 build/trans_presets.java:512
-#: build/trans_presets.java:533 build/trans_presets.java:554
-#: build/trans_presets.java:575 build/trans_presets.java:596
-#: build/trans_presets.java:617 build/trans_presets.java:638
-#: build/trans_presets.java:668 build/trans_presets.java:681
-#: build/trans_presets.java:694 build/trans_presets.java:707
-#: build/trans_presets.java:720 build/trans_presets.java:733
-#: build/trans_presets.java:746 build/trans_presets.java:1311
-#: build/trans_presets.java:1501 build/trans_presets.java:1543
+#: build/trans_presets.java:237 build/trans_presets.java:255
+#: build/trans_presets.java:273 build/trans_presets.java:293
+#: build/trans_presets.java:326 build/trans_presets.java:371
+#: build/trans_presets.java:387 build/trans_presets.java:401
+#: build/trans_presets.java:425 build/trans_presets.java:444
+#: build/trans_presets.java:465 build/trans_presets.java:485
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:649
+#: build/trans_presets.java:679 build/trans_presets.java:692
+#: build/trans_presets.java:705 build/trans_presets.java:718
+#: build/trans_presets.java:731 build/trans_presets.java:744
+#: build/trans_presets.java:757 build/trans_presets.java:1322
+#: build/trans_presets.java:1512 build/trans_presets.java:1554
 msgid "Width (meters)"
 msgstr "幅(m)"
 
-#. item "Streets/Unclassified" text "Width (meters)"
+#. item "Highways/Streets/Unclassified" text "Width (meters)"
 #. </optional>
 #. <button label="Unclassified" hotkey="4">
@@ -14990,20 +15308,20 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:229 build/trans_surveyor.java:88
+#: build/trans_presets.java:240 build/trans_surveyor.java:88
 msgid "Residential"
-msgstr "敷地内道路"
-
-#. item
+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" />
-#: build/trans_presets.java:232
+#: build/trans_presets.java:243
 msgid "Edit Residential Street"
-msgstr "敷地内道路の編集"
-
-#. item "Streets/Residential" combo "Layer"
-#. item "Streets/Living Street" combo "Layer"
-#. item "Streets/Service" combo "Layer"
-#. item "Streets/Parking Aisle" check "Oneway"
-#. item "Streets/Road (Unknown Type)" combo "Layer"
+msgstr "居住区域内道路の編集"
+
+#. item "Highways/Streets/Residential" combo "Layer"
+#. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Service" combo "Layer"
+#. item "Highways/Streets/Parking Aisle" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
 #. item "Ways/Construction" combo "Layer"
 #. item "Ways/Bridleway" combo "Layer"
@@ -15019,23 +15337,23 @@
 #. item "Ways/Track Grade 5" check "Embankment"
 #. item "Ways/Path" combo "Layer"
-#. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:549 build/trans_presets.java:570
-#: build/trans_presets.java:591 build/trans_presets.java:612
-#: build/trans_presets.java:633 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#. item "Transport/Railway/Bus Guideway" combo "Layer"
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:581
+#: build/trans_presets.java:602 build/trans_presets.java:623
+#: build/trans_presets.java:644 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "Surface"
 msgstr "表面"
 
-#. item "Streets/Residential" combo "Surface"
-#. item "Streets/Living Street" combo "Surface"
-#. item "Streets/Service" combo "Surface"
-#. item "Streets/Parking Aisle" combo "Surface"
-#. item "Streets/Road (Unknown Type)" combo "Surface"
+#. item "Highways/Streets/Residential" combo "Surface"
+#. item "Highways/Streets/Living Street" combo "Surface"
+#. item "Highways/Streets/Service" combo "Surface"
+#. item "Highways/Streets/Parking Aisle" combo "Surface"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
 #. item "Ways/Construction" combo "Surface"
 #. item "Ways/Bridleway" combo "Surface"
@@ -15047,54 +15365,54 @@
 #. item "Ways/Track Grade 1" combo "Surface"
 #. item "Ways/Path" combo "Surface"
-#. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:549 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#. item "Transport/Railway/Bus Guideway" combo "Surface"
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "paved"
 msgstr "舗装"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "unpaved"
 msgstr "未舗装"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "asphalt"
 msgstr "アスファルト"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:549 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "concrete"
 msgstr "コンクリート"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309 build/trans_presets.java:2457
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320 build/trans_presets.java:2469
 msgid "metal"
 msgstr "金属"
@@ -15108,22 +15426,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309 build/trans_presets.java:2457
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320 build/trans_presets.java:2469
 #: build/trans_style.java:3375
 msgid "wood"
 msgstr "森"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "paving_stones"
 msgstr "敷石"
@@ -15131,77 +15449,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:549 build/trans_presets.java:570
-#: build/trans_presets.java:591 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:581
+#: build/trans_presets.java:602 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "cobblestone"
 msgstr "敷石"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:666 build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "gravel"
 msgstr "砂利道"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "pebblestone"
 msgstr "小石"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "compacted"
 msgstr "圧縮"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "grass_paver"
 msgstr "敷石混じりの芝"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:666 build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:623 build/trans_presets.java:644
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:666 build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:623 build/trans_presets.java:644
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "sand"
 msgstr "砂地"
@@ -15209,74 +15527,74 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 build/trans_presets.java:452
-#: build/trans_presets.java:472 build/trans_presets.java:491
-#: build/trans_presets.java:510 build/trans_presets.java:528
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:666 build/trans_presets.java:1309
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:623 build/trans_presets.java:644
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "ground"
 msgstr "地表"
 
-#. item "Streets/Residential" text "Width (meters)"
+#. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:247
+#: build/trans_presets.java:258
 msgid "Living Street"
 msgstr "私道"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:250
+#: build/trans_presets.java:261
 msgid "Edit Living Street"
 msgstr "私道の編集"
 
-#. item "Streets/Living Street" text "Width (meters)"
+#. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:265
+#: build/trans_presets.java:276
 msgid "Service"
-msgstr "サービス"
-
-#. item
+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" />
-#: build/trans_presets.java:268
+#: build/trans_presets.java:279
 msgid "Edit Serviceway"
-msgstr "サービス道路の編集"
-
-#. item "Streets/Service" label "Edit Serviceway"
+msgstr "敷地内道路の編集"
+
+#. item "Highways/Streets/Service" label "Edit Serviceway"
 #. <space />
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:272
+#: build/trans_presets.java:283
 msgid "Serviceway type"
-msgstr "サービス路のタイプ"
-
-#. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:272
+msgstr "敷地内道路のタイプ"
+
+#. item "Highways/Streets/Service" combo "Serviceway type"
+#: build/trans_presets.java:283
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:272
+#: build/trans_presets.java:283
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:272
+#: build/trans_presets.java:283
 msgid "parking_aisle"
 msgstr "駐車場の通路"
 
-#. item "Streets/Service" text "Width (meters)"
+#. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:285
+#: build/trans_presets.java:296
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:289
+#: build/trans_presets.java:300
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
@@ -15284,38 +15602,38 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:299
+#: build/trans_presets.java:310
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:302
+#: build/trans_presets.java:313
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
 
-#. item "Streets/Road (Unknown Type)" text "Width (meters)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:319
+#: build/trans_presets.java:330
 msgid "Road Restrictions"
 msgstr "通行制限"
 
-#. item
-#: build/trans_presets.java:320
+#. item "Highways/Streets/Road Restrictions"
+#: build/trans_presets.java:331
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
-#. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:322
+#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#: build/trans_presets.java:333
 msgid "Toll"
 msgstr "料金"
 
-#. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:323
+#. item "Highways/Streets/Road Restrictions" check "Toll"
+#: build/trans_presets.java:334
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
 
-#. item "Streets/Road Restrictions" check "No exit (cul-de-sac)"
+#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
 #. item "Ways/Track Grade 1" combo "Layer"
@@ -15324,22 +15642,22 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:324 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635
+#: build/trans_presets.java:335 build/trans_presets.java:541
+#: build/trans_presets.java:562 build/trans_presets.java:583
+#: build/trans_presets.java:604 build/trans_presets.java:625
+#: build/trans_presets.java:646
 msgid "Access"
 msgstr "アクセス"
 
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Highways/Streets/Road Restrictions" combo "Access"
+#. 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 "Highways/Streets/Road Restrictions" combo "Motorboat"
+#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -15379,29 +15697,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:331
-#: build/trans_presets.java:332 build/trans_presets.java:333
-#: build/trans_presets.java:334 build/trans_presets.java:450
-#: build/trans_presets.java:470 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:650
-#: build/trans_presets.java:651 build/trans_presets.java:652
-#: build/trans_presets.java:653 build/trans_presets.java:654
-#: build/trans_presets.java:655 build/trans_presets.java:1396
-#: build/trans_presets.java:1397 build/trans_presets.java:1400
-#: build/trans_presets.java:1401 build/trans_presets.java:1402
-#: build/trans_presets.java:1767 build/trans_presets.java:1777
-#: build/trans_presets.java:2420 build/trans_presets.java:2456
-#: build/trans_presets.java:2465 build/trans_presets.java:2466
-#: build/trans_presets.java:2467 build/trans_presets.java:2737
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:461
+#: build/trans_presets.java:481 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:662 build/trans_presets.java:663
+#: build/trans_presets.java:664 build/trans_presets.java:665
+#: build/trans_presets.java:666 build/trans_presets.java:1407
+#: build/trans_presets.java:1408 build/trans_presets.java:1411
+#: build/trans_presets.java:1412 build/trans_presets.java:1413
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2432 build/trans_presets.java:2468
+#: build/trans_presets.java:2477 build/trans_presets.java:2478
+#: build/trans_presets.java:2479 build/trans_presets.java:2749
 msgid "yes"
 msgstr "はい"
@@ -15414,40 +15732,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:331
-#: build/trans_presets.java:332 build/trans_presets.java:333
-#: build/trans_presets.java:334 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_style.java:212
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_style.java:212
 msgid "private"
 msgstr "私道"
 
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:331
-#: build/trans_presets.java:332 build/trans_presets.java:333
-#: build/trans_presets.java:334 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:650
-#: build/trans_presets.java:651 build/trans_presets.java:652
-#: build/trans_presets.java:653 build/trans_presets.java:654
-#: build/trans_presets.java:655
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:662 build/trans_presets.java:663
+#: build/trans_presets.java:664 build/trans_presets.java:665
+#: build/trans_presets.java:666
 msgid "designated"
 msgstr "指定済み"
@@ -15460,19 +15778,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:331
-#: build/trans_presets.java:332 build/trans_presets.java:333
-#: build/trans_presets.java:334 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_style.java:219
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_style.java:219
 msgid "destination"
 msgstr "行き先"
@@ -15495,71 +15813,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:331
-#: build/trans_presets.java:332 build/trans_presets.java:333
-#: build/trans_presets.java:334 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_style.java:205
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_style.java:205
 msgid "permissive"
 msgstr "関係車両のみ可"
 
-#: build/trans_presets.java:324 build/trans_presets.java:328
-#: build/trans_presets.java:331 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637
+#: build/trans_presets.java:335 build/trans_presets.java:339
+#: build/trans_presets.java:342 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648
 msgid "agricultural"
 msgstr "農業の"
 
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:331
-#: build/trans_presets.java:332 build/trans_presets.java:333
-#: build/trans_presets.java:334 build/trans_presets.java:450
-#: build/trans_presets.java:470 build/trans_presets.java:530
-#: build/trans_presets.java:531 build/trans_presets.java:532
-#: build/trans_presets.java:551 build/trans_presets.java:552
-#: build/trans_presets.java:553 build/trans_presets.java:572
-#: build/trans_presets.java:573 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:594
-#: build/trans_presets.java:595 build/trans_presets.java:614
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:650
-#: build/trans_presets.java:651 build/trans_presets.java:652
-#: build/trans_presets.java:653 build/trans_presets.java:654
-#: build/trans_presets.java:655 build/trans_presets.java:774
-#: build/trans_presets.java:789 build/trans_presets.java:1333
-#: build/trans_presets.java:1396 build/trans_presets.java:1397
-#: build/trans_presets.java:1400 build/trans_presets.java:1401
-#: build/trans_presets.java:1402 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2420
-#: build/trans_presets.java:2456 build/trans_presets.java:2465
-#: build/trans_presets.java:2466 build/trans_presets.java:2467
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:461
+#: build/trans_presets.java:481 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:662 build/trans_presets.java:663
+#: build/trans_presets.java:664 build/trans_presets.java:665
+#: build/trans_presets.java:666 build/trans_presets.java:785
+#: build/trans_presets.java:800 build/trans_presets.java:1344
+#: build/trans_presets.java:1407 build/trans_presets.java:1408
+#: build/trans_presets.java:1411 build/trans_presets.java:1412
+#: build/trans_presets.java:1413 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:2468 build/trans_presets.java:2477
+#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:2749
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:338
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:339
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -15574,10 +15892,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:329 build/trans_presets.java:652
-#: build/trans_presets.java:859 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:340 build/trans_presets.java:663
+#: build/trans_presets.java:870 build/trans_presets.java:903
+#: build/trans_presets.java:925 build/trans_presets.java:962
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1051
 msgid "Horse"
 msgstr "馬"
@@ -15593,13 +15911,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:860
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:341 build/trans_presets.java:542
+#: build/trans_presets.java:563 build/trans_presets.java:584
+#: build/trans_presets.java:605 build/trans_presets.java:626
+#: build/trans_presets.java:647 build/trans_presets.java:871
+#: build/trans_presets.java:889 build/trans_presets.java:904
+#: build/trans_presets.java:926 build/trans_presets.java:963
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:1000 build/trans_presets.java:1012
+#: build/trans_presets.java:1052
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -15614,69 +15932,69 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:331 build/trans_presets.java:532
-#: build/trans_presets.java:553 build/trans_presets.java:574
-#: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:637 build/trans_presets.java:655
-#: build/trans_presets.java:879 build/trans_presets.java:894
-#: build/trans_presets.java:916 build/trans_presets.java:953
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:342 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:648 build/trans_presets.java:666
+#: build/trans_presets.java:890 build/trans_presets.java:905
+#: build/trans_presets.java:927 build/trans_presets.java:964
+#: build/trans_presets.java:977 build/trans_presets.java:989
+#: build/trans_presets.java:1001 build/trans_presets.java:1013
+#: build/trans_presets.java:1053
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:343
 msgid "Public Service Vehicles (psv)"
 msgstr "公共交通機関(psv)"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:344
 msgid "Motorboat"
 msgstr "モーターボート"
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:345
 msgid "Boat"
 msgstr "ボート"
 
-#. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:336
+#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#: build/trans_presets.java:347
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
 
-#. item "Streets/Road Restrictions" text "Min. speed (km/h)"
-#. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:337 build/trans_presets.java:375
+#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
+#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#: build/trans_presets.java:348 build/trans_presets.java:386
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
-#. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:338
+#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#: build/trans_presets.java:349
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
-#. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:339
+#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
+#: build/trans_presets.java:350
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
-#. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:340
+#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
+#: build/trans_presets.java:351
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
-#. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:342
+#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
+#: build/trans_presets.java:353
 msgid "Roundabout"
 msgstr "ロータリー交差点"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:347
+#: build/trans_presets.java:358
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
 
-#. item "Streets/Roundabout" label "Edit Junction"
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
 #. <key key="junction" value="roundabout" />
@@ -15687,5 +16005,5 @@
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
-#. item "Water/Wetland" text "Name"
+#. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
 #. item "Man Made/Pipeline" text "Operator"
@@ -15696,14 +16014,14 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:350 build/trans_presets.java:649
-#: build/trans_presets.java:789 build/trans_presets.java:1137
-#: build/trans_presets.java:1395 build/trans_presets.java:2330
-#: build/trans_presets.java:2372 build/trans_presets.java:2398
-#: build/trans_presets.java:2925 build/trans_presets.java:2935
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2342
+#: build/trans_presets.java:2384 build/trans_presets.java:2410
+#: build/trans_presets.java:2937 build/trans_presets.java:2947
+#: build/trans_presets.java:2956
 msgid "Type"
 msgstr "タイプ"
 
-#. item "Streets/Roundabout" combo "Type"
+#. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
 #. </rule>
@@ -15719,12 +16037,12 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:547
+#: build/trans_presets.java:361 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
-msgstr "高速道路"
-
-#: build/trans_presets.java:350
+msgstr "自動車専用道路"
+
+#: build/trans_presets.java:361
 msgid "motorway_link"
-msgstr "高速道路のランプ"
+msgstr "自動車専用道路の連結路"
 
 #. color motorway
@@ -15744,10 +16062,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:563
+#: build/trans_presets.java:361 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:350
+#: build/trans_presets.java:361
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -15769,12 +16087,12 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:579
+#: build/trans_presets.java:361 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
-msgstr "都道府県道"
-
-#: build/trans_presets.java:350
+msgstr "主要地方道"
+
+#: build/trans_presets.java:361
 msgid "primary_link"
-msgstr "都道府県道の連絡路"
+msgstr "主要地方道の連絡路"
 
 #. color primary
@@ -15794,8 +16112,8 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:595
+#: build/trans_presets.java:361 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
-msgstr "主要道路"
+msgstr "一般地方道"
 
 #. color secondary
@@ -15807,11 +16125,11 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:350 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:611
 msgid "tertiary"
-msgstr "敷地内道路"
-
-#: build/trans_presets.java:350
+msgstr "一般道(2車線以上)"
+
+#: build/trans_presets.java:361
 msgid "unclassified"
-msgstr "１車線道"
+msgstr "一般道(2車線未満)"
 
 #. color green
@@ -15823,9 +16141,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:350 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3151
 msgid "residential"
-msgstr "敷地内道路"
-
-#: build/trans_presets.java:350
+msgstr "居住区域内道路"
+
+#: build/trans_presets.java:361
 msgid "living_street"
 msgstr "私道"
@@ -15855,10 +16173,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_presets.java:361 build/trans_style.java:667
 #: build/trans_style.java:4252
 msgid "service"
-msgstr "サービス"
-
-#: build/trans_presets.java:350
+msgstr "敷地内道路"
+
+#: build/trans_presets.java:361
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -15888,40 +16206,40 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_presets.java:361 build/trans_style.java:877
 #: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "工事中"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:368
+#: build/trans_presets.java:379
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
-#. item
-#: build/trans_presets.java:380
+#. item "Highways/Streets/Tunnel"
+#: build/trans_presets.java:391
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
 
-#. item "Streets/Tunnel" text "Width (meters)"
+#. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:394
+#: build/trans_presets.java:405
 msgid "Ways"
 msgstr "ウェイ"
 
 #. group "Ways"
-#: build/trans_presets.java:395
+#: build/trans_presets.java:406
 msgid "Construction"
 msgstr "工事中"
 
-#. item
-#: build/trans_presets.java:396
+#. item "Ways/Construction"
+#: build/trans_presets.java:407
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:412
+#: build/trans_presets.java:423
 msgid "Junction"
 msgstr "ジャンクション"
@@ -15937,5 +16255,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:412 build/trans_style.java:895
+#: build/trans_presets.java:423 build/trans_style.java:895
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -15944,11 +16262,11 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:418
+#: build/trans_presets.java:429
 msgid "Bridleway"
 msgstr "馬道"
 
-#. item
+#. item "Ways/Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:420
+#: build/trans_presets.java:431
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -15956,36 +16274,36 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:436
+#: build/trans_presets.java:447
 msgid "Cycleway"
 msgstr "自転車道"
 
-#. item
+#. item "Ways/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" />
-#: build/trans_presets.java:440
+#: build/trans_presets.java:451
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:450
+#: build/trans_presets.java:461
 msgid "Pedestrians"
-msgstr "歩行者"
+msgstr "歩行者専用道路"
 
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:457
+#: build/trans_presets.java:468
 msgid "Footway"
-msgstr "歩道"
-
-#. item
+msgstr "遊歩道"
+
+#. item "Ways/Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:460
+#: build/trans_presets.java:471
 msgid "Edit Footway"
-msgstr "歩道の編集"
+msgstr "遊歩道の編集"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:470
+#: build/trans_presets.java:481
 msgid "Bikes"
 msgstr "自転車"
@@ -15993,26 +16311,26 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:477
+#: build/trans_presets.java:488
 msgid "Pedestrian"
-msgstr "ペデストリアン・歩行者用市街道路"
-
-#. item
+msgstr "歩行者専用道路"
+
+#. item "Ways/Pedestrian"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:480
+#: build/trans_presets.java:491
 msgid "Edit Pedestrian Street"
-msgstr "ペデストリアンデッキ、歩行者専用道路の編集"
+msgstr "歩行者専用道路の編集"
 
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:495
+#: build/trans_presets.java:506
 msgid "Steps"
 msgstr "階段"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:499
+#: build/trans_presets.java:510
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
@@ -16021,12 +16339,12 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:516
+#: build/trans_presets.java:527
 msgid "Track"
 msgstr "トラック"
 
-#. item
+#. item "Ways/Track"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:519
+#: build/trans_presets.java:530
 msgid "Edit Track"
 msgstr "トラックの編集"
@@ -16034,12 +16352,12 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:536
+#: build/trans_presets.java:547
 msgid "Track Grade 1"
 msgstr "トラック グレード 1"
 
-#. item
+#. item "Ways/Track Grade 1"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:539
+#: build/trans_presets.java:550
 msgid "Edit Track of grade 1"
 msgstr "トラック グレード 1　の編集"
@@ -16047,12 +16365,12 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:557
+#: build/trans_presets.java:568
 msgid "Track Grade 2"
 msgstr "トラック グレード 2"
 
-#. item
+#. item "Ways/Track Grade 2"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:560
+#: build/trans_presets.java:571
 msgid "Edit Track of grade 2"
 msgstr "トラック グレード 2の編集"
@@ -16060,12 +16378,12 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:578
+#: build/trans_presets.java:589
 msgid "Track Grade 3"
 msgstr "トラック グレード 3"
 
-#. item
+#. item "Ways/Track Grade 3"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:581
+#: build/trans_presets.java:592
 msgid "Edit Track of grade 3"
 msgstr "トラック グレード 3　の編集"
@@ -16073,12 +16391,12 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:599
+#: build/trans_presets.java:610
 msgid "Track Grade 4"
 msgstr "トラック グレード 4"
 
-#. item
+#. item "Ways/Track Grade 4"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:602
+#: build/trans_presets.java:613
 msgid "Edit Track of grade 4"
 msgstr "トラック グレード 4　の編集"
@@ -16086,12 +16404,12 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:620
+#: build/trans_presets.java:631
 msgid "Track Grade 5"
 msgstr "トラック グレード 5"
 
-#. item
+#. item "Ways/Track Grade 5"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:623
+#: build/trans_presets.java:634
 msgid "Edit Track of grade 5"
 msgstr "トラック グレード 5 の編集"
@@ -16100,20 +16418,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:653
 msgid "Path"
 msgstr "小道"
 
-#. item
+#. item "Ways/Path"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:645
+#: build/trans_presets.java:656
 msgid "Edit Path"
 msgstr "小道の編集"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:664
 msgid "Ski"
 msgstr "スキー"
 
-#: build/trans_presets.java:654
+#: build/trans_presets.java:665
 msgid "Snowmobile"
 msgstr "スノーモービル"
@@ -16123,14 +16441,14 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:671 build/trans_presets.java:1729
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:682 build/trans_presets.java:1740
+#: build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "ハイキング"
 
-#. item
+#. item "Ways/Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:675
+#: build/trans_presets.java:686
 msgid "Edit Hiking"
 msgstr "ハイキングの編集"
@@ -16138,13 +16456,13 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:684
+#: build/trans_presets.java:695
 msgid "Mountain Hiking"
 msgstr "山岳ハイキング"
 
-#. item
+#. item "Ways/Mountain Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:699
 msgid "Edit Mountain Hiking"
 msgstr "山岳ハイキングの編集"
@@ -16152,13 +16470,13 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:697
+#: build/trans_presets.java:708
 msgid "Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキング"
 
-#. item
+#. item "Ways/Demanding Mountain Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:701
+#: build/trans_presets.java:712
 msgid "Edit Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキングの編集"
@@ -16166,13 +16484,13 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:710
+#: build/trans_presets.java:721
 msgid "Alpine Hiking"
 msgstr "高山ハイキング"
 
-#. item
+#. item "Ways/Alpine Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:725
 msgid "Edit Alpine Hiking"
 msgstr "高山ハイキングの編集"
@@ -16180,13 +16498,13 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:723
+#: build/trans_presets.java:734
 msgid "Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキング"
 
-#. item
+#. item "Ways/Demanding Alpine Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:727
+#: build/trans_presets.java:738
 msgid "Edit Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキングの編集"
@@ -16194,13 +16512,13 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:736
+#: build/trans_presets.java:747
 msgid "Difficult Alpine Hiking"
 msgstr "困難な高山ハイキング"
 
-#. item
+#. item "Ways/Difficult Alpine Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:740
+#: build/trans_presets.java:751
 msgid "Edit Difficult Alpine Hiking"
 msgstr "困難な高山ハイキングの編集"
@@ -16208,32 +16526,32 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:750
+#: build/trans_presets.java:761
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
 #. group "Waypoints"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:762
 msgid "Motorway Junction"
-msgstr "高速道路のジャンクション"
-
-#. item
+msgstr "自動車専用道路のジャンクション"
+
+#. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:764
 msgid "Edit Motorway Junction"
-msgstr "高速道路ジャンクションの編集"
+msgstr "自動車専用道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:768
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:759
+#: build/trans_presets.java:770
 msgid "Services"
-msgstr "サービス"
-
-#. item
+msgstr "敷地内道路"
+
+#. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:761
+#: build/trans_presets.java:772
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -16249,4 +16567,5 @@
 #. 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"
@@ -16255,9 +16574,9 @@
 #. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
 #. <key key="power" value="sub_station" />
-#. item
+#. item "Amenities/Toilets"
 #. <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
+#. item "Amenities/Post Box"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
 #. <key key="amenity" value="post_box" />
@@ -16271,16 +16590,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:766 build/trans_presets.java:903
-#: build/trans_presets.java:1385 build/trans_presets.java:1409
-#: build/trans_presets.java:1416 build/trans_presets.java:1422
-#: build/trans_presets.java:1430 build/trans_presets.java:1437
-#: build/trans_presets.java:1765 build/trans_presets.java:1775
-#: build/trans_presets.java:2299 build/trans_presets.java:2329
-#: build/trans_presets.java:2381 build/trans_presets.java:2389
-#: build/trans_presets.java:2406 build/trans_presets.java:2418
-#: build/trans_presets.java:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2487 build/trans_presets.java:2535
-#: build/trans_presets.java:2701 build/trans_presets.java:2716
-#: build/trans_presets.java:2755 build/trans_presets.java:3175
+#: build/trans_presets.java:777 build/trans_presets.java:914
+#: build/trans_presets.java:1396 build/trans_presets.java:1420
+#: build/trans_presets.java:1427 build/trans_presets.java:1433
+#: build/trans_presets.java:1441 build/trans_presets.java:1448
+#: build/trans_presets.java:1776 build/trans_presets.java:1786
+#: build/trans_presets.java:2209 build/trans_presets.java:2311
+#: build/trans_presets.java:2341 build/trans_presets.java:2393
+#: build/trans_presets.java:2401 build/trans_presets.java:2418
+#: build/trans_presets.java:2430 build/trans_presets.java:2438
+#: build/trans_presets.java:2445 build/trans_presets.java:2499
+#: build/trans_presets.java:2547 build/trans_presets.java:2713
+#: build/trans_presets.java:2728 build/trans_presets.java:2767
+#: build/trans_presets.java:3187
 msgid "Operator"
 msgstr "操作員"
@@ -16289,13 +16609,13 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:770
+#: build/trans_presets.java:781
 msgid "Traffic Signal"
 msgstr "信号機"
 
-#. item
+#. item "Waypoints/Traffic Signal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:774
+#: build/trans_presets.java:785
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -16303,35 +16623,35 @@
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
-#. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#. item "Transport/Railway/Crossing" combo "Crossing type"
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:775 build/trans_presets.java:791
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:786 build/trans_presets.java:802
+#: build/trans_presets.java:1345
 msgid "Cross on horseback"
 msgstr "馬用横断道"
 
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
-#. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:776 build/trans_presets.java:790
-#: build/trans_presets.java:1335
+#. item "Transport/Railway/Crossing" check "Cross on horseback"
+#: build/trans_presets.java:787 build/trans_presets.java:801
+#: build/trans_presets.java:1346
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -16339,12 +16659,12 @@
 #. item "Waypoints/Traffic Signal" check "Cross by bicycle"
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
-#. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:777 build/trans_presets.java:792
-#: build/trans_presets.java:1336
+#. item "Transport/Railway/Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:788 build/trans_presets.java:803
+#: build/trans_presets.java:1347
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:778
+#: build/trans_presets.java:789
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -16352,123 +16672,123 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:781
+#: build/trans_presets.java:792
 msgid "Stop"
 msgstr "停止"
 
-#. item
+#. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:784
+#: build/trans_presets.java:795
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
 
-#. item
+#. item "Waypoints/Pedestrian Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:787
+#: build/trans_presets.java:798
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:793
+#: build/trans_presets.java:804
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:795
+#: build/trans_presets.java:806
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:800
+#: build/trans_presets.java:811
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:800
+#: build/trans_presets.java:811
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:802
+#: build/trans_presets.java:813
 msgid "Turning Circle"
 msgstr "転回場"
 
-#. item
+#. 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" />
-#: build/trans_presets.java:807
+#: build/trans_presets.java:818
 msgid "City Limit"
 msgstr "市境界標識"
 
-#. item
-#: build/trans_presets.java:808
+#. item "Waypoints/City Limit"
+#: build/trans_presets.java:819
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:813
+#: build/trans_presets.java:824
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:826
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
 
-#. item
+#. item "Waypoints/Speed Camera"
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:818
+#: build/trans_presets.java:829
 msgid "Emergency Phone"
 msgstr "緊急電話"
 
-#. item
+#. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:821
+#: build/trans_presets.java:832
 msgid "Incline"
 msgstr "坂"
 
-#. item
+#. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:824
+#: build/trans_presets.java:835
 msgid "Incline Steep"
 msgstr "急な坂"
 
-#. item
+#. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:839
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
-#. item
-#: build/trans_presets.java:829
+#. item "Waypoints/Ford"
+#: build/trans_presets.java:840
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -16476,23 +16796,23 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:836
+#: build/trans_presets.java:847
 msgid "Mountain Pass"
 msgstr "峠道"
 
-#. item
+#. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:838
+#: build/trans_presets.java:849
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Places/Peak" text "Name"
-#. item "Places/Glacier" text "Name"
-#. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:843 build/trans_presets.java:1604
-#: build/trans_presets.java:1749 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
+#. item "Geography/Places/Peak" text "Name"
+#. item "Geography/Places/Glacier" text "Name"
+#. item "Geography/Places/Volcano" text "Name"
+#: build/trans_presets.java:854 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2881
+#: build/trans_presets.java:2888 build/trans_presets.java:2895
 msgid "Elevation"
 msgstr "高度"
@@ -16500,5 +16820,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:847
+#: build/trans_presets.java:858
 msgid "Barriers"
 msgstr "ゲート等"
@@ -16506,11 +16826,11 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:850
+#: build/trans_presets.java:861
 msgid "Bollard"
 msgstr "車止め杭"
 
-#. item
+#. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:852
+#: build/trans_presets.java:863
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -16555,36 +16875,36 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:855 build/trans_presets.java:874
-#: build/trans_presets.java:888 build/trans_presets.java:910
-#: build/trans_presets.java:947 build/trans_presets.java:960
-#: build/trans_presets.java:972 build/trans_presets.java:984
-#: build/trans_presets.java:996 build/trans_presets.java:1008
-#: build/trans_presets.java:1018 build/trans_presets.java:1027
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:866 build/trans_presets.java:885
+#: build/trans_presets.java:899 build/trans_presets.java:921
+#: build/trans_presets.java:958 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1007 build/trans_presets.java:1019
+#: build/trans_presets.java:1029 build/trans_presets.java:1038
+#: build/trans_presets.java:1047
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:873
 msgid "Cycle Barrier"
 msgstr "自転車止め"
 
-#. item
+#. item "Barriers/Cycle Barrier"
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:866
+#: build/trans_presets.java:877
 msgid "Block"
 msgstr "ブロック"
 
 # http://en.wikipedia.org/wiki/Cattle_grid
-#. item
+#. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:869
+#: build/trans_presets.java:880
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
 
-#. item
+#. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:871
+#: build/trans_presets.java:882
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -16592,27 +16912,27 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:892
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
 
-#. item
+#. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:884
+#: build/trans_presets.java:895
 msgid "Spikes"
 msgstr "車止めのとげ"
 
-#. item
-#: build/trans_presets.java:885
+#. item "Barriers/Spikes"
+#: build/trans_presets.java:896
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:907
 msgid "Toll Booth"
 msgstr "料金所"
 
-#. item
+#. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:898
+#: build/trans_presets.java:909
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -16620,10 +16940,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:906
+#: build/trans_presets.java:917
 msgid "Border Control"
 msgstr "国境検査所"
 
-#. item
-#: build/trans_presets.java:907
+#. item "Barriers/Border Control"
+#: build/trans_presets.java:918
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -16633,36 +16953,36 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:921
+#: build/trans_presets.java:932
 msgid "Hedge"
 msgstr "生け垣"
 
-#. item
+#. item "Barriers/Hedge"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:925
+#: build/trans_presets.java:936
 msgid "Fence"
 msgstr "フェンス"
 
-#. item
+#. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:929
+#: build/trans_presets.java:940
 msgid "Wall"
 msgstr "壁"
 
-#. item
+#. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:932
+#: build/trans_presets.java:943
 msgid "City Wall"
 msgstr "城壁"
 
-#. item
+#. 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:936
+#: build/trans_presets.java:947
 msgid "Retaining Wall"
 msgstr "擁壁"
 
-#. item
+#. item "Barriers/Retaining Wall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
 #. <key key="barrier" value="retaining_wall" />
@@ -16670,92 +16990,92 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:943
+#: build/trans_presets.java:954
 msgid "Entrance"
 msgstr "入口"
 
-#. item
-#: build/trans_presets.java:944
+#. item "Barriers/Entrance"
+#: build/trans_presets.java:955
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:955
+#: build/trans_presets.java:966
 msgid "Gate"
 msgstr "ゲート"
 
-#. item
+#. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:957
+#: build/trans_presets.java:968
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:979
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
-#. item
-#: build/trans_presets.java:969
+#. item "Barriers/Lift Gate"
+#: build/trans_presets.java:980
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:980
+#: build/trans_presets.java:991
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
-#. item
-#: build/trans_presets.java:981
+#. item "Barriers/Hampshire Gate"
+#: build/trans_presets.java:992
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:992
+#: build/trans_presets.java:1003
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
-#. item
-#: build/trans_presets.java:993
+#. item "Barriers/Bump Gate"
+#: build/trans_presets.java:1004
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1015
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
-#. item
-#: build/trans_presets.java:1005
+#. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:1016
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1024
 msgid "Stile"
 msgstr "踏み越し段"
 
-#. item
+#. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1026
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1034
 msgid "Turnstile"
 msgstr "回転式木戸"
 
-#. item
-#: build/trans_presets.java:1024
+#. item "Barriers/Turnstile"
+#: build/trans_presets.java:1035
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1043
 msgid "Sally Port"
 msgstr "城の出撃路"
 
-#. item
-#: build/trans_presets.java:1033
+#. item "Barriers/Sally Port"
+#: build/trans_presets.java:1044
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -16764,151 +17084,151 @@
 #.
 #. group "Water"
-#. item "Water/River" combo "Layer"
+#. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1047 build/trans_presets.java:1048
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1058 build/trans_presets.java:1059
+#: build/trans_presets.java:1102
 msgid "Water"
 msgstr "水域(湖沼)"
 
-#. group "Water"
-#: build/trans_presets.java:1049
+#. group "Water/Water"
+#: build/trans_presets.java:1060
 msgid "Spring"
 msgstr "泉"
 
-#. item
+#. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1062
 msgid "Edit Spring"
 msgstr "泉の編集"
 
-#. item "Water/Spring" text "Name"
+#. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Drain"
 msgstr "側溝"
 
-#. item
+#. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1069
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
-#. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1064
+#. item "Water/Water/Drain" combo "Layer"
+#: build/trans_presets.java:1075
 msgid "Stream"
 msgstr "小川"
 
-#. item
+#. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit Stream"
 msgstr "小川の編集"
 
-#. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1072
+#. item "Water/Water/Stream" combo "Layer"
+#: build/trans_presets.java:1083
 msgid "Canal"
 msgstr "運河"
 
-#. item
+#. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1085
 msgid "Edit Canal"
 msgstr "運河の編集"
 
-#. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1080
+#. item "Water/Water/Canal" combo "Layer"
+#: build/trans_presets.java:1091
 msgid "River"
 msgstr "川"
 
-#. item
+#. 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:1084
+#: build/trans_presets.java:1095
 msgid "Edit River"
 msgstr "河川の編集"
 
-#. item
+#. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Water"
 msgstr "水域の編集"
 
-#. item "Water/Water" text "Name"
-#: build/trans_presets.java:1097
+#. item "Water/Water/Water" text "Name"
+#: build/trans_presets.java:1108
 msgid "Land"
 msgstr "陸地"
 
-#. item
-#: build/trans_presets.java:1098
+#. item "Water/Water/Land"
+#: build/trans_presets.java:1109
 msgid "Edit Land"
 msgstr "陸地の編集"
 
-#. item "Water/Land" text "Name"
+#. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1114
 msgid "Basin"
 msgstr "水たまり、窪地"
 
 # 水たまりになるような土地
-#. item
-#: build/trans_presets.java:1104
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1115
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
-#. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1109
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1120
 msgid "Reservoir"
 msgstr "ため池"
 
-#. item
+#. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
-#. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1116
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1127
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
-#. item
-#: build/trans_presets.java:1117
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1128
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
 
-#. item "Water/Covered Reservoir" text "Name"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Riverbank"
 msgstr "川岸"
 
-#. item
+#. 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:1125
+#: build/trans_presets.java:1136
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
-#. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1129
+#. item "Water/Water/Riverbank" text "Name"
+#: build/trans_presets.java:1140
 msgid "Wetland"
 msgstr "湿地帯"
 
-#. item
+#. 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:1134
+#: build/trans_presets.java:1145
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
-#. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1137
+#. item "Water/Water/Wetland" combo "Type"
+#: build/trans_presets.java:1148
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "bog"
 msgstr "湿地"
@@ -16922,475 +17242,473 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1137 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3392
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Mud"
 msgstr "泥地"
 
-#. item
-#: build/trans_presets.java:1140
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1151
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
-#. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1144
+#. item "Water/Water/Mud" text "Name"
+#: build/trans_presets.java:1155
 msgid "Beach"
 msgstr "砂浜"
 
-#. item
+#. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1157
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
-#. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1150
+#. item "Water/Water/Beach" text "Name"
+#: build/trans_presets.java:1161
 msgid "Bay"
 msgstr "湾"
 
-#. item
-#: build/trans_presets.java:1151
+#. item "Water/Water/Bay"
+#: build/trans_presets.java:1162
 msgid "Edit Bay"
 msgstr "湾の編集"
 
-#. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1155
+#. item "Water/Water/Bay" text "Name"
+#: build/trans_presets.java:1166
 msgid "Cliff"
 msgstr "崖"
 
-#. item
+#. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1157
+#: build/trans_presets.java:1168
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
-#. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1161
+#. item "Water/Water/Cliff" text "Name"
+#: build/trans_presets.java:1172
 msgid "Coastline"
 msgstr "海岸線"
 
-#. item
+#. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1163
+#: build/trans_presets.java:1174
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
 
-#. item "Water/Coastline" text "Name"
+#. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1179
 msgid "Ferry Route"
 msgstr "フェリー航路"
 
-#. item
+#. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1181
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
 
-#. item "Water/Ferry Route" text "Name"
+#. item "Water/Water/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1189
 msgid "Boatyard"
 msgstr "ボートヤード(陸上の船置き場)"
 
-#. item
+#. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1191
 msgid "Edit Boatyard"
 msgstr "ボートヤードの編集"
 
-#. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1185
+#. item "Water/Water/Boatyard" text "Name"
+#: build/trans_presets.java:1196
 msgid "Dock"
 msgstr "ドック"
 
-#. item
+#. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1198
 msgid "Edit Dock"
 msgstr "ドックの編集"
 
-#. item "Water/Dock" text "Name"
+#. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1204
 msgid "Dam"
 msgstr "ダム"
 
-#. item
+#. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
-#. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1201
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1212
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1213
 msgid "Lock Gate"
 msgstr "ロックゲート"
 
-#. item
+#. item "Waterway Point/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Weir"
 msgstr "堰"
 
-#. item
+#. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1219
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1224
 msgid "Waterfall"
 msgstr "滝"
 
-#. item
-#: build/trans_presets.java:1214
+#. item "Waterway Point/Waterfall"
+#: build/trans_presets.java:1225
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1230
 msgid "Turning Point"
 msgstr "転回地点"
 
-#. item
+#. item "Waterway Point/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1234
 msgid "Marina"
 msgstr "マリーナ"
 
-#. item
-#: build/trans_presets.java:1224
+#. item "Waterway Point/Marina"
+#: build/trans_presets.java:1235
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1239
 msgid "Pier"
 msgstr "桟橋"
 
-#. item
+#. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1241
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1245
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
 
-#. item
+#. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1247
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
 
-#. item
+#. item "Waterway Point/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:1244
+#: build/trans_presets.java:1255
 msgid "Edit Slipway"
 msgstr "スリップウェイの編集"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1261
 msgid "Transport"
 msgstr "輸送"
 
 #. group "Transport"
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1262
 msgid "Railway"
 msgstr "鉄道"
 
-#. group "Railway"
-#: build/trans_presets.java:1252
+#. group "Transport/Railway"
+#: build/trans_presets.java:1263
 msgid "Rail"
 msgstr "線路"
 
-#. item
+#. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Rail"
 msgstr "線路の編集"
 
-#. item "Railway/Rail" label "Edit Rail"
+#. item "Transport/Railway/Rail" label "Edit Rail"
 #. <space />
 #. <key key="railway" value="rail" />
-#. item "Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
-#. item "Railway/Monorail" label "Edit Monorail"
+#. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Railway/Preserved" label "Edit Preserved Railway"
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
 #. <space />
 #. <key key="railway" value="preserved" />
-#. item "Railway/Light Rail" label "Edit Light Rail"
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
 #. <space />
 #. <key key="railway" value="light_rail" />
-#. item "Railway/Subway" label "Edit Subway"
+#. item "Transport/Railway/Subway" label "Edit Subway"
 #. <space />
 #. <key key="railway" value="subway" />
-#. item "Railway/Tram" label "Edit Tram"
+#. item "Transport/Railway/Tram" label "Edit Tram"
 #. <space />
 #. <key key="railway" value="tram" />
-#. item "Railway/Disused Rail" label "Edit Disused Railway"
+#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1257 build/trans_presets.java:1263
-#: build/trans_presets.java:1270 build/trans_presets.java:1276
-#: build/trans_presets.java:1282 build/trans_presets.java:1288
-#: build/trans_presets.java:1294 build/trans_presets.java:1319
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "Optional Types"
 msgstr "追加のタイプ"
 
-#. item "Railway/Rail" combo "Optional Types"
-#. item "Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Railway/Monorail" combo "Optional Types"
-#. item "Railway/Preserved" combo "Optional Types"
-#. item "Railway/Light Rail" combo "Optional Types"
-#. item "Railway/Subway" combo "Optional Types"
-#. item "Railway/Tram" combo "Optional Types"
-#. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1257 build/trans_presets.java:1263
-#: build/trans_presets.java:1270 build/trans_presets.java:1276
-#: build/trans_presets.java:1282 build/trans_presets.java:1288
-#: build/trans_presets.java:1294 build/trans_presets.java:1319
+#. item "Transport/Railway/Rail" combo "Optional Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
+#. item "Transport/Railway/Monorail" combo "Optional Types"
+#. item "Transport/Railway/Preserved" combo "Optional Types"
+#. item "Transport/Railway/Light Rail" combo "Optional Types"
+#. item "Transport/Railway/Subway" combo "Optional Types"
+#. item "Transport/Railway/Tram" combo "Optional Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1257 build/trans_presets.java:1263
-#: build/trans_presets.java:1270 build/trans_presets.java:1276
-#: build/trans_presets.java:1282 build/trans_presets.java:1288
-#: build/trans_presets.java:1294 build/trans_presets.java:1319
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1257 build/trans_presets.java:1263
-#: build/trans_presets.java:1270 build/trans_presets.java:1276
-#: build/trans_presets.java:1282 build/trans_presets.java:1288
-#: build/trans_presets.java:1294 build/trans_presets.java:1319
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
-#. item
-#: build/trans_presets.java:1260
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1271
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Monorail"
 msgstr "モノレール"
 
-#. item
+#. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1278
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Preserved"
 msgstr "保存鉄道"
 
-#. item
-#: build/trans_presets.java:1273
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1284
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1289
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
-#. item
-#: build/trans_presets.java:1279
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1290
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1295
 msgid "Subway"
 msgstr "地下鉄"
 
-#. item
-#: build/trans_presets.java:1285
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1296
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1301
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
-#. item
-#: build/trans_presets.java:1291
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1302
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Bus Guideway"
 msgstr "バスレーン"
 
-#. item
+#. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1309
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
 
-#. item "Railway/Bus Guideway" text "Width (meters)"
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:1326
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
-#. item
-#: build/trans_presets.java:1316
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1327
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1332
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
 
-#. item
+#. item "Transport/Railway/Abandoned Rail"
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Level Crossing"
 msgstr "踏切"
 
-#. item
+#. 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:1329
+#: build/trans_presets.java:1340
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
 
-#. item
+#. item "Transport/Railway/Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1344
 msgid "Crossing type"
 msgstr "踏切のタイプ"
 
-#. item "Railway/Crossing" check "Crossing attendant"
+#. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1350
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
 
-#. item
+#. item "Transport/Railway/Turntable"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1356
 msgid "Chair Lift"
 msgstr "いすリフト"
 
-#. item
+#. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1358
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1362
 msgid "Drag Lift"
 msgstr "Tバーリフト"
 
-#. item
+#. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1364
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1368
 msgid "Cable Car"
 msgstr "ケーブルカー"
 
-#. item
+#. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Gondola"
 msgstr "ゴンドラ"
 
-#. item
+#. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1376
 msgid "Edit Gondola"
 msgstr "ゴンドラを編集"
 
 #. item "Aerialway/Gondola" text "Name"
-#. group "Public Transport"
-#: build/trans_presets.java:1369 build/trans_presets.java:1464
+#: build/trans_presets.java:1380
+msgctxt "aerialway"
 msgid "Station"
 msgstr "駅"
 
-#. item
+#. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1371 build/trans_presets.java:1467
+#: build/trans_presets.java:1382
+msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "駅の編集"
 
 #. group "Car"
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1389
 msgid "Fuel"
 msgstr "ガソリンスタンド"
 
-#. item
+#. 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:1382
+#: build/trans_presets.java:1393
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -17409,7 +17727,7 @@
 #. item "Historic Places/Ruins" text "Name"
 #. item "Historic Places/Archaeological Site" text "Name"
-#. item "Sport Facilities/Golf Course" text "Name"
-#. item "Sport Facilities/Miniature Golf" text "Name"
-#. item "Buildings/Library" 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 "Amenities/Baby Hatch" text "Operator"
 #. item "Shops/Supermarket" text "Name"
@@ -17448,32 +17766,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1386 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1690 build/trans_presets.java:1703
-#: build/trans_presets.java:1717 build/trans_presets.java:1814
-#: build/trans_presets.java:1822 build/trans_presets.java:1919
-#: build/trans_presets.java:1925 build/trans_presets.java:2237
-#: build/trans_presets.java:2261 build/trans_presets.java:2488
-#: build/trans_presets.java:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1930
+#: build/trans_presets.java:1936 build/trans_presets.java:2249
+#: build/trans_presets.java:2273 build/trans_presets.java:2500
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -17493,8 +17811,8 @@
 #. item "Historic Places/Ruins" combo "Opening Hours"
 #. item "Historic Places/Archaeological Site" combo "Opening Hours"
-#. item "Sport Facilities/Golf Course" combo "Opening Hours"
-#. item "Sport Facilities/Miniature Golf" combo "Opening Hours"
-#. item "Buildings/Library" combo "Opening Hours"
-#. item "Buildings/Place of Worship" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours"
+#. item "Man-Made/Buildings/Library" combo "Opening Hours"
+#. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
 #. item "Shops/Supermarket" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
@@ -17532,91 +17850,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1386 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:2237 build/trans_presets.java:2261
-#: build/trans_presets.java:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1930 build/trans_presets.java:1936
+#: build/trans_presets.java:2249 build/trans_presets.java:2273
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1386 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:2237 build/trans_presets.java:2261
-#: build/trans_presets.java:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1930 build/trans_presets.java:1936
+#: build/trans_presets.java:2249 build/trans_presets.java:2273
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1386 build/trans_presets.java:1625
-#: build/trans_presets.java:1633 build/trans_presets.java:1640
-#: build/trans_presets.java:1647 build/trans_presets.java:1653
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1682 build/trans_presets.java:1690
-#: build/trans_presets.java:1703 build/trans_presets.java:1717
-#: build/trans_presets.java:1814 build/trans_presets.java:1822
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:2237 build/trans_presets.java:2261
-#: build/trans_presets.java:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1930 build/trans_presets.java:1936
+#: build/trans_presets.java:2249 build/trans_presets.java:2273
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "火-日 08:00-15:00; 土 08:00-12:00"
@@ -17631,13 +17949,13 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1388 build/trans_presets.java:1441
+#: build/trans_presets.java:1399 build/trans_presets.java:1452
 #: build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "駐車場"
 
-#. item
+#. 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:1391
+#: build/trans_presets.java:1402
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -17648,25 +17966,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1394 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:2419
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:1405 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2431
+#: build/trans_presets.java:2548
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1406
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1406
 msgid "surface"
 msgstr "表面"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1395 build/trans_presets.java:2331
+#: build/trans_presets.java:1406 build/trans_presets.java:2343
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1407
 msgid "Park and Ride"
 msgstr "パークアンドライド"
@@ -17675,38 +17993,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1397 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2420
+#: build/trans_presets.java:1408 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2432
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1410
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1411
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1413
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1414
 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:1405
+#: build/trans_presets.java:1416
 msgid "Wash"
 msgstr "洗車場"
 
-#. item
-#: build/trans_presets.java:1406
+#. item "Car/Wash"
+#: build/trans_presets.java:1417
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -17714,21 +18032,21 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1411 build/trans_presets.java:1455
+#: build/trans_presets.java:1422 build/trans_presets.java:1466
 msgid "Shop"
 msgstr "自動車パーツショップ"
 
-#. item
+#. item "Car/Shop"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1424
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:1429
 msgid "Repair"
 msgstr "自動車修理"
 
-#. item
-#: build/trans_presets.java:1419
+#. item "Car/Repair"
+#: build/trans_presets.java:1430
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -17736,58 +18054,72 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1424 build/trans_presets.java:1448
+#: build/trans_presets.java:1435 build/trans_presets.java:1459
 msgid "Rental"
 msgstr "レンタル"
 
-#. item
+#. 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:1427
+#: build/trans_presets.java:1438
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Sharing"
 msgstr "自家用車共有"
 
-#. item
+#. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1445
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
 
-#. item
+#. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1454
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "Capacity"
 msgstr "収容台数"
 
-#. item
+#. 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:1451
+#: build/trans_presets.java:1462
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
 
-#. item
+#. item "Bicycle/Shop"
 #. <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:1458
+#: build/trans_presets.java:1469
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1474
 msgid "Public Transport"
 msgstr "公共交通機関"
 
+#. group "Public Transport"
+#: build/trans_presets.java:1475
+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:1478
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "駅の編集"
+
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1483
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -17795,11 +18127,11 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1475
+#: build/trans_presets.java:1486
 msgid "Railway Halt"
 msgstr "停車場"
 
-#. item
+#. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1477
+#: build/trans_presets.java:1488
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -17807,12 +18139,12 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1495
 msgid "Tram Stop"
 msgstr "トラム停車場"
 
-#. item
+#. 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:1487
+#: build/trans_presets.java:1498
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -17820,12 +18152,12 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
 
-#. item
+#. 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:1497
+#: build/trans_presets.java:1508
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -17837,5 +18169,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1500 build/trans_presets.java:1542
+#: build/trans_presets.java:1511 build/trans_presets.java:1553
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -17843,22 +18175,22 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1502 build/trans_presets.java:1544
+#: build/trans_presets.java:1513 build/trans_presets.java:1555
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
 
-#. item
+#. 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:1507
+#: build/trans_presets.java:1518
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Wheelchair"
 msgstr "車いす"
@@ -17867,12 +18199,12 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1528
 msgid "Bus Station"
 msgstr "バスターミナル"
 
-#. item
+#. 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:1520
+#: build/trans_presets.java:1531
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -17880,13 +18212,13 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1537
 msgid "Bus Stop"
 msgstr "バス停"
 
-#. item
+#. 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:1530
+#: build/trans_presets.java:1541
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -17895,6 +18227,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1535 build/trans_presets.java:1789
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:1546 build/trans_presets.java:1800
+#: build/trans_presets.java:2477
 msgid "Shelter"
 msgstr "避難所"
@@ -17902,10 +18234,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1549
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
-#. item
-#: build/trans_presets.java:1539
+#. item "Public Transport/Bus Platform"
+#: build/trans_presets.java:1550
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -17913,11 +18245,11 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1558
 msgid "Taxi"
 msgstr "タクシー"
 
-#. item
+#. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1560
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -17925,21 +18257,21 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1565
 msgid "Airport"
 msgstr "空港"
 
-#. item
+#. item "Public Transport/Airport"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Edit Airport"
 msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1573
 msgid "ICAO"
 msgstr "ICAO"
@@ -17947,14 +18279,14 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "旅行"
 
 #. group "Travel"
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "宿泊施設"
 
-#. group "Accomodation"
+#. group "Travel/Accomodation"
 #. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
@@ -17962,96 +18294,96 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1569 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
 
-#. item
+#. 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:1572
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
-#. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1575
+#. item "Travel/Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "星の数"
 
-#. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1577
+#. item "Travel/Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "モーテル"
 
-#. item
+#. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
-#. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1583
+#. item "Travel/Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "ゲストハウス"
 
-#. item
-#: build/trans_presets.java:1584
+#. item "Travel/Accomodation/Guest House"
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
-#. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1588
+#. item "Travel/Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
 
-#. item
+#. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
-#. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1594
+#. item "Travel/Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "ホステル"
 
-#. item
+#. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
-#. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1600
+#. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "山小屋"
 
-#. item
-#: build/trans_presets.java:1601
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
-#. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1606
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
-#. item
-#: build/trans_presets.java:1607
+#. item "Travel/Accomodation/Caravan Site"
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
-#. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1611
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "キャンプ場"
 
-#. item
+#. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
-#. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1618
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -18062,11 +18394,11 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1619 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
 
-#. item
+#. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -18074,5 +18406,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -18080,187 +18412,187 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "ファーストフード"
 
-#. item
+#. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "カフェ"
 
-#. item
+#. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "パブ、居酒屋"
 
-#. item
+#. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
-#. item
-#: build/trans_presets.java:1650
+#. item "Food+Drinks/Biergarten"
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "バー"
 
-#. item
+#. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "ナイトクラブ"
 
-#. item
+#. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "アトラクション"
 
-#. item
-#: build/trans_presets.java:1672
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "博物館"
 
-#. item
+#. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "動物園"
 
-#. item
+#. 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:1687
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "観覧台"
 
-#. item
+#. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "テーマパーク"
 
-#. item
-#: build/trans_presets.java:1700
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "美術館"
 
-#. item
+#. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -18268,19 +18600,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "地形"
@@ -18318,5 +18650,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
+#: build/trans_presets.java:1735 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -18324,28 +18656,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1726 build/trans_presets.java:1742
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -18355,5 +18687,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -18361,6 +18693,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1976
 msgid "Cycling"
 msgstr "サイクリング"
@@ -18368,5 +18700,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1731 build/trans_presets.java:1754
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -18374,6 +18706,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1732 build/trans_presets.java:1755
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2030
 msgid "Skiing"
 msgstr "スキー"
@@ -18381,5 +18713,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1733 build/trans_presets.java:1756
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "乗馬"
@@ -18387,46 +18719,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1734 build/trans_presets.java:1757
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -18434,29 +18766,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1764 build/trans_presets.java:1774
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
-#. item
-#: build/trans_presets.java:1790
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -18464,194 +18796,194 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1793 build/trans_presets.java:1799
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
-#. item
-#: build/trans_presets.java:1796
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "城"
 
-#. item
+#. 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:1806
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "遺跡"
 
-#. item
-#: build/trans_presets.java:1811
+#. item "Historic Places/Ruins"
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
 
-#. item
+#. 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:1819
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1835
 msgid "Battlefield"
-msgstr "戦場"
-
-#. item
+msgstr "戦場跡"
+
+#. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
-msgstr "戦場の編集"
+msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1842
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
-#. item
-#: build/trans_presets.java:1832
+#. item "Historic Places/Monument"
+#: build/trans_presets.java:1843
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1836
+#: build/trans_presets.java:1847
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
 
-#. item
+#. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1849
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
-#. item
-#: build/trans_presets.java:1843
+#. item "Historic Places/Wayside Cross"
+#: build/trans_presets.java:1854
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
-#. item
-#: build/trans_presets.java:1848
+#. item "Historic Places/Wayside Shrine"
+#: build/trans_presets.java:1859
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1863
 msgid "Boundary Stone"
 msgstr "境界石"
 
-#. item
-#: build/trans_presets.java:1853
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:1864
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1869
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Water Park"
 msgstr "遊泳用プール"
 
-#. item
-#: build/trans_presets.java:1860
+#. item "Leisure/Water Park"
+#: build/trans_presets.java:1871
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1875
 msgid "Playground"
 msgstr "遊び場"
 
-#. item
+#. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1881
 msgid "Fishing"
 msgstr "つり"
 
-#. item
-#: build/trans_presets.java:1871
+#. item "Leisure/Fishing"
+#: build/trans_presets.java:1882
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1877 build/trans_presets.java:2681
+#: build/trans_presets.java:1888 build/trans_presets.java:2693
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
-#. group "Sport Facilities"
-#: build/trans_presets.java:1879
+#. group "Sports/Sport Facilities"
+#: build/trans_presets.java:1890
 msgid "Stadium"
 msgstr "スタジアム"
 
-#. item
-#: build/trans_presets.java:1880
+#. item "Sports/Sport Facilities/Stadium"
+#: build/trans_presets.java:1891
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
 
-#. item "Sport Facilities/Stadium" text "Name"
+#. item "Sports/Sport Facilities/Stadium" text "Name"
 #. <space />
-#. item "Sport Facilities/Sports Centre" text "Name"
+#. item "Sports/Sport Facilities/Sports Centre" text "Name"
 #. <space />
-#. item "Sport Facilities/Pitch" text "Name"
+#. item "Sports/Sport Facilities/Pitch" text "Name"
 #. <space />
-#. item "Sport Facilities/Racetrack" text "Name"
+#. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
+#: build/trans_presets.java:1895 build/trans_presets.java:1904
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
 msgid "select sport:"
 msgstr "スポーツ選択："
 
-#. item "Sport Facilities/Stadium" label "select sport:"
+#. item "Sports/Sport Facilities/Stadium" label "select sport:"
 #. <space />
-#. item "Sport Facilities/Sports Centre" label "select sport:"
+#. item "Sports/Sport Facilities/Sports Centre" label "select sport:"
 #. <space />
-#. item "Sport Facilities/Pitch" label "select sport:"
+#. item "Sports/Sport Facilities/Pitch" label "select sport:"
 #. <space />
-#. item "Sport Facilities/Racetrack" label "select sport:"
+#. item "Sports/Sport Facilities/Racetrack" label "select sport:"
 #. <space />
 #. color boundary
@@ -19033,6 +19365,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 #: build/trans_style.java:3572 build/trans_style.java:3580
 #: build/trans_style.java:3588 build/trans_style.java:3596
@@ -19062,229 +19394,229 @@
 msgstr "スポーツ"
 
-#. item "Sport Facilities/Stadium" combo "sport"
-#. item "Sport Facilities/Sports Centre" combo "sport"
-#. item "Sport Facilities/Pitch" combo "sport"
-#. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#. 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:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1899
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
-#. item
-#: build/trans_presets.java:1889
+#. item "Sports/Sport Facilities/Sports Centre"
+#: build/trans_presets.java:1900
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1908
 msgid "Pitch"
 msgstr "運動場"
 
-#. item
-#: build/trans_presets.java:1898
+#. item "Sports/Sport Facilities/Pitch"
+#: build/trans_presets.java:1909
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1917
 msgid "Racetrack"
 msgstr "競技トラック"
 
-#. item
-#: build/trans_presets.java:1907
+#. item "Sports/Sport Facilities/Racetrack"
+#: build/trans_presets.java:1918
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1926
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
-#. item
-#: build/trans_presets.java:1916
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:1927
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1932
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
-#. item
-#: build/trans_presets.java:1922
+#. item "Sports/Sport Facilities/Miniature Golf"
+#: build/trans_presets.java:1933
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1939
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1940
 msgid "Multi"
 msgstr "多目的"
 
-#. item
-#: build/trans_presets.java:1930
+#. item "Sport/Multi"
+#: build/trans_presets.java:1941
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -19323,904 +19655,904 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 build/trans_presets.java:2052
+#: build/trans_presets.java:2058 build/trans_presets.java:2064
+#: build/trans_presets.java:2070 build/trans_presets.java:2076
+#: build/trans_presets.java:2082 build/trans_presets.java:2088
+#: build/trans_presets.java:2094 build/trans_presets.java:2100
+#: build/trans_presets.java:2106 build/trans_presets.java:2112
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2142 build/trans_presets.java:2148
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 build/trans_presets.java:2052
+#: build/trans_presets.java:2058 build/trans_presets.java:2064
+#: build/trans_presets.java:2070 build/trans_presets.java:2076
+#: build/trans_presets.java:2082 build/trans_presets.java:2088
+#: build/trans_presets.java:2094 build/trans_presets.java:2100
+#: build/trans_presets.java:2106 build/trans_presets.java:2112
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2142 build/trans_presets.java:2148
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 build/trans_presets.java:2052
+#: build/trans_presets.java:2058 build/trans_presets.java:2064
+#: build/trans_presets.java:2070 build/trans_presets.java:2076
+#: build/trans_presets.java:2082 build/trans_presets.java:2088
+#: build/trans_presets.java:2094 build/trans_presets.java:2100
+#: build/trans_presets.java:2106 build/trans_presets.java:2112
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2142 build/trans_presets.java:2148
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 build/trans_presets.java:2052
+#: build/trans_presets.java:2058 build/trans_presets.java:2064
+#: build/trans_presets.java:2070 build/trans_presets.java:2076
+#: build/trans_presets.java:2082 build/trans_presets.java:2088
+#: build/trans_presets.java:2094 build/trans_presets.java:2100
+#: build/trans_presets.java:2106 build/trans_presets.java:2112
+#: build/trans_presets.java:2118 build/trans_presets.java:2124
+#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:2142 build/trans_presets.java:2148
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:1946
 msgid "10pin"
 msgstr "テンピンズ"
 
-#. item
-#: build/trans_presets.java:1936
+#. item "Sport/10pin"
+#: build/trans_presets.java:1947
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1952
 msgid "Athletics"
 msgstr "アスレチック"
 
-#. item
-#: build/trans_presets.java:1942
+#. item "Sport/Athletics"
+#: build/trans_presets.java:1953
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1958
 msgid "Archery"
 msgstr "アーチェリー"
 
-#. item
-#: build/trans_presets.java:1948
+#. item "Sport/Archery"
+#: build/trans_presets.java:1959
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1964
 msgid "Climbing"
 msgstr "登山"
 
-#. item
-#: build/trans_presets.java:1954
+#. item "Sport/Climbing"
+#: build/trans_presets.java:1965
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1970
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
-#. item
-#: build/trans_presets.java:1960
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1971
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
-#. item
-#: build/trans_presets.java:1966
+#. item "Sport/Cycling"
+#: build/trans_presets.java:1977
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1982
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
-#. item
-#: build/trans_presets.java:1972
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1983
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1988
 msgid "Equestrian"
 msgstr "乗馬"
 
-#. item
-#: build/trans_presets.java:1978
+#. item "Sport/Equestrian"
+#: build/trans_presets.java:1989
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "Horse Racing"
 msgstr "競馬"
 
-#. item
-#: build/trans_presets.java:1984
+#. item "Sport/Horse Racing"
+#: build/trans_presets.java:1995
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2000
 msgid "Gymnastics"
 msgstr "体操"
 
-#. item
-#: build/trans_presets.java:1990
+#. item "Sport/Gymnastics"
+#: build/trans_presets.java:2001
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2006
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
-#. item
-#: build/trans_presets.java:1996
+#. item "Sport/Motor Sports"
+#: build/trans_presets.java:2007
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2012
 msgid "Skating"
 msgstr "スケート"
 
-#. item
-#: build/trans_presets.java:2002
+#. item "Sport/Skating"
+#: build/trans_presets.java:2013
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2018
 msgid "Skateboard"
 msgstr "スケートボード"
 
-#. item
-#: build/trans_presets.java:2008
+#. item "Sport/Skateboard"
+#: build/trans_presets.java:2019
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2024
 msgid "Swimming"
 msgstr "水泳"
 
-#. item
-#: build/trans_presets.java:2014
+#. item "Sport/Swimming"
+#: build/trans_presets.java:2025
 msgid "Edit Swimming"
 msgstr "水泳の編集"
 
-#. item
+#. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "intermediate"
 msgstr "中間"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Shooting"
 msgstr "射撃"
 
-#. item
+#. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2041
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2047
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2048
 msgid "Soccer"
 msgstr "サッカー"
 
-#. item
-#: build/trans_presets.java:2038
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2049
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2054
 msgid "Football"
 msgstr "フットボール"
 
-#. item
-#: build/trans_presets.java:2044
+#. item "Sport (Ball)/Football"
+#: build/trans_presets.java:2055
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2060
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
-#. item
-#: build/trans_presets.java:2050
+#. item "Sport (Ball)/Australian Football"
+#: build/trans_presets.java:2061
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2066
 msgid "Baseball"
 msgstr "野球"
 
-#. item
-#: build/trans_presets.java:2056
+#. item "Sport (Ball)/Baseball"
+#: build/trans_presets.java:2067
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2072
 msgid "Basketball"
 msgstr "バスケットボール"
 
-#. item
-#: build/trans_presets.java:2062
+#. item "Sport (Ball)/Basketball"
+#: build/trans_presets.java:2073
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2078
 msgid "Golf"
 msgstr "ゴルフ"
 
-#. item
-#: build/trans_presets.java:2068
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2079
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2084
 msgid "Boule"
 msgstr "ペタンク"
 
-#. item
-#: build/trans_presets.java:2074
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2085
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2090
 msgid "Bowls"
 msgstr "ボーリング"
 
-#. item
-#: build/trans_presets.java:2080
+#. item "Sport (Ball)/Bowls"
+#: build/trans_presets.java:2091
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Cricket"
 msgstr "クリケット"
 
-#. item
-#: build/trans_presets.java:2086
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2097
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2102
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
-#. item
-#: build/trans_presets.java:2092
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2103
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Croquet"
 msgstr "クロッケー"
 
-#. item
-#: build/trans_presets.java:2098
+#. item "Sport (Ball)/Croquet"
+#: build/trans_presets.java:2109
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2114
 msgid "Hockey"
 msgstr "ホッケー"
 
-#. item
-#: build/trans_presets.java:2104
+#. item "Sport (Ball)/Hockey"
+#: build/trans_presets.java:2115
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2120
 msgid "Pelota"
 msgstr "ペロタ"
 
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
-#. item
-#: build/trans_presets.java:2110
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2121
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2126
 msgid "Racquet"
 msgstr "ラケットボール"
 
-#. item
-#: build/trans_presets.java:2116
+#. item "Sport (Ball)/Racquet"
+#: build/trans_presets.java:2127
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2132
 msgid "Rugby"
 msgstr "ラグビー"
 
-#. item
-#: build/trans_presets.java:2122
+#. item "Sport (Ball)/Rugby"
+#: build/trans_presets.java:2133
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2138
 msgid "Table Tennis"
 msgstr "卓球"
 
-#. item
-#: build/trans_presets.java:2128
+#. item "Sport (Ball)/Table Tennis"
+#: build/trans_presets.java:2139
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2144
 msgid "Tennis"
 msgstr "テニス"
 
-#. item
-#: build/trans_presets.java:2134
+#. item "Sport (Ball)/Tennis"
+#: build/trans_presets.java:2145
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Buildings"
 msgstr "建物"
 
-#. group "Buildings"
-#: build/trans_presets.java:2143
+#. group "Man-Made/Buildings"
+#: build/trans_presets.java:2154
 msgid "Building"
 msgstr "建物"
 
-#. item
+#. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2157
 msgid "Public Building"
 msgstr "公共の建物"
 
-#. item
+#. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2159
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
-#. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2152
+#. item "Man-Made/Buildings/Public Building" text "Name"
+#: build/trans_presets.java:2163
 msgid "Town hall"
 msgstr "役場"
 
-#. item
+#. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2165
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
-#. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2158
+#. item "Man-Made/Buildings/Town hall" text "Name"
+#: build/trans_presets.java:2169
 msgid "Embassy"
 msgstr "大使館"
 
-#. item
+#. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
-#. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2164
+#. item "Man-Made/Buildings/Embassy" text "Name"
+#: build/trans_presets.java:2175
 msgid "Courthouse"
 msgstr "裁判所"
 
-#. item
+#. 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:2167
+#: build/trans_presets.java:2178
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
-#. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2171
+#. item "Man-Made/Buildings/Courthouse" text "Name"
+#: build/trans_presets.java:2182
 msgid "Prison"
 msgstr "刑務所"
 
-#. item
+#. 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:2174
+#: build/trans_presets.java:2185
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
-#. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2178
+#. item "Man-Made/Buildings/Prison" text "Name"
+#: build/trans_presets.java:2189
 msgid "Police"
 msgstr "警察"
 
-#. item
+#. 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:2182
+#: build/trans_presets.java:2193
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
-#. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2186
+#. item "Man-Made/Buildings/Police" text "Name"
+#: build/trans_presets.java:2197
 msgid "Fire Station"
 msgstr "消防署"
 
-#. item
+#. 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:2189
+#: build/trans_presets.java:2200
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
-#. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2193
+#. item "Man-Made/Buildings/Fire Station" text "Name"
+#: build/trans_presets.java:2204
 msgid "Post Office"
 msgstr "郵便局"
 
-#. item
+#. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
 
-#. item "Buildings/Post Office" text "Name"
+#. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2212
 msgid "Kindergarten"
 msgstr "幼稚園"
 
-#. item
-#: build/trans_presets.java:2201
+#. item "Man-Made/Buildings/Kindergarten"
+#: build/trans_presets.java:2213
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
-#. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2205
+#. item "Man-Made/Buildings/Kindergarten" text "Name"
+#: build/trans_presets.java:2217
 msgid "School"
 msgstr "学校"
 
-#. item
+#. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2219
 msgid "Edit School"
 msgstr "学校の編集"
 
-#. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2211
+#. item "Man-Made/Buildings/School" text "Name"
+#: build/trans_presets.java:2223
 msgid "University"
 msgstr "大学"
 
-#. item
+#. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2225
 msgid "Edit University"
 msgstr "大学の編集"
 
-#. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2217
+#. item "Man-Made/Buildings/University" text "Name"
+#: build/trans_presets.java:2229
 msgid "College"
 msgstr "短大"
 
-#. item
+#. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2231
 msgid "Edit College"
 msgstr "短大の編集"
 
-#. item "Buildings/College" text "Name"
+#. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2236
 msgid "Cinema"
 msgstr "映画館"
 
-#. item
+#. 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:2227
+#: build/trans_presets.java:2239
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
-#. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2231
+#. item "Man-Made/Buildings/Cinema" text "Name"
+#: build/trans_presets.java:2243
 msgid "Library"
 msgstr "図書館"
 
-#. item
+#. 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:2234
+#: build/trans_presets.java:2246
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2251
 msgid "Arts Centre"
 msgstr "美術館"
 
-#. item
+#. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2253
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
-#. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2245
+#. item "Man-Made/Buildings/Arts Centre" text "Name"
+#: build/trans_presets.java:2257
 msgid "Theatre"
 msgstr "劇場"
 
-#. item
+#. 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:2248
+#: build/trans_presets.java:2260
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
-#. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2252
+#. item "Man-Made/Buildings/Theatre" text "Name"
+#: build/trans_presets.java:2264
 msgid "Place of Worship"
 msgstr "礼拝所"
 
-#. item
+#. 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:2256
+#: build/trans_presets.java:2268
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
 
-#. item "Buildings/Place of Worship" text "Name"
+#. 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:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "Religion"
 msgstr "宗教"
 
-#. item "Buildings/Place of Worship" combo "Religion"
+#. 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:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "Denomination"
 msgstr "宗派"
 
-#. item "Buildings/Place of Worship" combo "Denomination"
+#. 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:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2276
 msgid "Addresses"
 msgstr "住所"
 
-#. item
+#. item "Man-Made/Buildings/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:2267
+#: build/trans_presets.java:2279
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
 
-#. item "Buildings/Addresses" label "Edit Address Information"
+#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2281
 msgid "House number"
 msgstr "番地"
 
-#. item "Buildings/Addresses" text "House number"
+#. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2283
 msgid "House name"
 msgstr "家の名前"
 
-#. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2273
+#. item "Man-Made/Buildings/Addresses" text "Street name"
+#: build/trans_presets.java:2285
 msgid "City name"
 msgstr "都市名"
 
-#. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2274
+#. item "Man-Made/Buildings/Addresses" text "City name"
+#: build/trans_presets.java:2286
 msgid "Post code"
 msgstr "郵便番号"
 
-#. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2275
+#. item "Man-Made/Buildings/Addresses" text "Post code"
+#: build/trans_presets.java:2287
 msgid "Country code"
 msgstr "国コード"
 
-#. item
+#. item "Man-Made/Buildings/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:2281
+#: build/trans_presets.java:2293
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
 
-#. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
+#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
-#. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2283
+#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2295
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2298
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2299
 msgid "Works"
 msgstr "工場"
 
-#. item
-#: build/trans_presets.java:2288
+#. item "Man Made/Works"
+#: build/trans_presets.java:2300
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2304
 msgid "Tower"
 msgstr "タワー"
 
-#. item
-#: build/trans_presets.java:2293
+#. item "Man Made/Tower"
+#: build/trans_presets.java:2305
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2308
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2308
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2308
 msgid "observation"
-msgstr ""
+msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2310
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -20228,138 +20560,138 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2314
 msgid "Water Tower"
 msgstr "水道塔"
 
-#. item
-#: build/trans_presets.java:2303
+#. item "Man Made/Water Tower"
+#: build/trans_presets.java:2315
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2319
 msgid "Gasometer"
 msgstr "ガスタンク"
 
-#. item
-#: build/trans_presets.java:2308
+#. item "Man Made/Gasometer"
+#: build/trans_presets.java:2320
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2324
 msgid "Lighthouse"
 msgstr "灯台"
 
-#. item
+#. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2326
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2330
 msgid "Windmill"
 msgstr "風車"
 
-#. item
+#. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2332
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2336
 msgid "Pipeline"
 msgstr "パイプライン"
 
-#. item
+#. 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:2327
+#: build/trans_presets.java:2339
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2330 build/trans_presets.java:2372
+#: build/trans_presets.java:2342 build/trans_presets.java:2384
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "any substance"
-msgstr ""
-
-#: build/trans_presets.java:2331
+msgstr "どれかの実体"
+
+#: build/trans_presets.java:2343
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2343
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2345
 msgid "Wastewater Plant"
 msgstr "下水処理場"
 
-#. item
+#. 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:2337
+#: build/trans_presets.java:2349
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2353
 msgid "Crane"
 msgstr "クレーン"
 
-#. item
+#. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2355
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2359
 msgid "Beacon"
 msgstr "ビーコン"
 
-#. item
+#. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2361
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2365
 msgid "Survey Point"
 msgstr "調査ポイント"
 
-#. item
+#. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2367
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2371
 msgid "Surveillance"
 msgstr "監視カメラ"
 
-#. item
+#. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2373
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -20367,62 +20699,62 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2378
 msgid "Power Generator"
 msgstr "発電機"
 
-#. item
+#. 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:2370
+#: build/trans_presets.java:2382
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2387
 msgid "Power Station"
 msgstr "変電所"
 
-#. item
+#. 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:2378
+#: build/trans_presets.java:2390
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2396
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
 
-#. item
+#. 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:2387
+#: build/trans_presets.java:2399
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -20430,121 +20762,121 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2390 build/trans_presets.java:2407
+#: build/trans_presets.java:2402 build/trans_presets.java:2419
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2404
 msgid "Power Tower"
 msgstr "送電塔"
 
-#. item
+#. 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:2397
+#: build/trans_presets.java:2409
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2410
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2410
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2411
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2413
 msgid "Power Line"
 msgstr "送電線"
 
-#. item
+#. 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:2404
+#: build/trans_presets.java:2416
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2417
 msgid "Line type"
-msgstr ""
+msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2417
 msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2405
+msgstr "線"
+
+#: build/trans_presets.java:2417
 msgid "minor_line"
 msgstr "細い線"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2420
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2421
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2422
 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:2410
+#: build/trans_presets.java:2422
 msgid "single"
-msgstr ""
-
-#: build/trans_presets.java:2410
+msgstr "シングル"
+
+#: build/trans_presets.java:2422
 msgid "double"
-msgstr ""
-
-#: build/trans_presets.java:2410
+msgstr "ダブル"
+
+#: build/trans_presets.java:2422
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2422
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2425
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2426
 msgid "Toilets"
 msgstr "トイレ"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2421 build/trans_presets.java:2537
+#: build/trans_presets.java:2433 build/trans_presets.java:2549
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2435
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2440
 msgid "Telephone"
 msgstr "電話"
 
-#. item
+#. 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:2431
+#: build/trans_presets.java:2443
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -20552,5 +20884,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2434 build/trans_presets.java:2538
+#: build/trans_presets.java:2446 build/trans_presets.java:2550
 msgid "Coins"
 msgstr "コイン"
@@ -20558,5 +20890,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2435 build/trans_presets.java:2539
+#: build/trans_presets.java:2447 build/trans_presets.java:2551
 msgid "Notes"
 msgstr "備考"
@@ -20564,5 +20896,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2436 build/trans_presets.java:2540
+#: build/trans_presets.java:2448 build/trans_presets.java:2552
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -20570,5 +20902,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2437 build/trans_presets.java:2541
+#: build/trans_presets.java:2449 build/trans_presets.java:2553
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -20576,22 +20908,22 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2438 build/trans_presets.java:2542
+#: build/trans_presets.java:2450 build/trans_presets.java:2554
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2451
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2453
 msgid "Recycling"
 msgstr "リサイクル"
 
-#. item
+#. 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:2444
+#: build/trans_presets.java:2456
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -20599,68 +20931,68 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2458
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2459
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2460
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2461
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2462
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2463
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2465
 msgid "Bench"
 msgstr "ベンチ"
 
-#. item
+#. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2468
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2469
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2469
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2469
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "brown"
 msgstr "茶"
@@ -20731,5 +21063,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2458 build/trans_style.java:3063
+#: build/trans_presets.java:2470 build/trans_style.java:3063
 #: build/trans_style.java:3071 build/trans_style.java:3079
 #: build/trans_style.java:3087 build/trans_style.java:3135
@@ -20739,27 +21071,27 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2471
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2473
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
-#. item
-#: build/trans_presets.java:2462
+#. item "Amenities/Hunting Stand"
+#: build/trans_presets.java:2474
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -20768,132 +21100,132 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2464 build/trans_presets.java:2926
+#: build/trans_presets.java:2476 build/trans_presets.java:2938
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2476
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2476
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2476
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2478
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2479
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2481
 msgid "Fountain"
 msgstr "噴水"
 
-#. item
+#. 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:2472
+#: build/trans_presets.java:2484
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2488
 msgid "Drinking Water"
 msgstr "飲料水"
 
-#. item
+#. 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:2479
+#: build/trans_presets.java:2491
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2495
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
 
-#. item
+#. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2497
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2503
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2504
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
-#. item
-#: build/trans_presets.java:2493
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2505
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2510
 msgid "Chemist"
 msgstr "薬品屋"
 
-#. item
-#: build/trans_presets.java:2499
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2511
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2516
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
 
-#. item
+#. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2518
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2523
 msgid "Kiosk"
 msgstr "キオスク"
 
-#. item
+#. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2525
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2530
 msgid "Book Store"
 msgstr "本屋"
 
-#. item
-#: build/trans_presets.java:2519
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2531
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2536
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
-#. item
-#: build/trans_presets.java:2525
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:2537
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2542
 msgid "Vending machine"
 msgstr "自動販売機"
 
-#. item
+#. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2544
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -20901,368 +21233,368 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "excrement_bags"
-msgstr "どうしようもないバグ"
+msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2555
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2557
 msgid "Butcher"
 msgstr "精肉店"
 
-#. item
+#. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2559
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2564
 msgid "Baker"
 msgstr "パン屋"
 
-#. item
+#. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2566
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2571
 msgid "Florist"
 msgstr "生花店"
 
-#. item
+#. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2573
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2578
 msgid "Organic"
 msgstr "オーガニック"
 
-#. item
-#: build/trans_presets.java:2567
+#. item "Shops/Organic"
+#: build/trans_presets.java:2579
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2584
 msgid "Alcohol"
 msgstr "酒屋"
 
-#. item
+#. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2586
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2591
 msgid "Beverages"
 msgstr "飲料店"
 
-#. item
-#: build/trans_presets.java:2580
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2592
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2597
 msgid "Computer"
 msgstr "コンピュータ店"
 
-#. item
-#: build/trans_presets.java:2586
+#. item "Shops/Computer"
+#: build/trans_presets.java:2598
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2603
 msgid "Electronics"
 msgstr "家電店"
 
-#. item
-#: build/trans_presets.java:2592
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2604
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2609
 msgid "Hifi"
 msgstr "オーディオショップ"
 
-#. item
-#: build/trans_presets.java:2598
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2610
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2615
 msgid "Furniture"
 msgstr "家具店"
 
-#. item
-#: build/trans_presets.java:2604
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2616
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2621
 msgid "Garden Centre"
 msgstr "園芸用品店"
 
-#. item
+#. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2623
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2628
 msgid "Hardware"
 msgstr "金物屋"
 
-#. item
+#. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2630
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2635
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
 
-#. item
+#. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2637
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2642
 msgid "Stationery"
 msgstr "文具店"
 
-#. item
-#: build/trans_presets.java:2631
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2643
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2648
 msgid "Hairdresser"
 msgstr "美容院"
 
-#. item
-#: build/trans_presets.java:2637
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2649
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2654
 msgid "Shoes"
 msgstr "靴店"
 
-#. item
-#: build/trans_presets.java:2643
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2655
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2660
 msgid "Toys"
 msgstr "おもちゃ屋"
 
-#. item
-#: build/trans_presets.java:2649
+#. item "Shops/Toys"
+#: build/trans_presets.java:2661
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2666
 msgid "Video"
 msgstr "ビデオ"
 
-#. item
-#: build/trans_presets.java:2655
+#. item "Shops/Video"
+#: build/trans_presets.java:2667
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2672
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
 
-#. item
+#. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2674
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2679
 msgid "Laundry"
 msgstr "ランドリー"
 
-#. item
+#. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2681
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2686
 msgid "Outdoor"
 msgstr "アウトドア店"
 
-#. item
+#. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2688
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
-#. item
-#: build/trans_presets.java:2682
+#. item "Shops/Sports"
+#: build/trans_presets.java:2694
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2699
 msgid "Optician"
 msgstr "メガネ屋"
 
-#. item
-#: build/trans_presets.java:2688
+#. item "Shops/Optician"
+#: build/trans_presets.java:2700
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2707
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2708
 msgid "Bank"
 msgstr "銀行"
 
-#. item
+#. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2710
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2715 build/trans_presets.java:2724
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2717
 msgid "Money Exchange"
 msgstr "両替"
 
-#. item
+#. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2719
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
 
-#. item
+#. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2726
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2731
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2732
 msgid "Doctors"
 msgstr "医院"
 
-#. item
+#. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2734
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2739
 msgid "Dentist"
 msgstr "歯科医院"
 
-#. item
-#: build/trans_presets.java:2728
+#. item "Health/Dentist"
+#: build/trans_presets.java:2740
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2745
 msgid "Pharmacy"
 msgstr "薬局"
 
-#. item
+#. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2747
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -21270,27 +21602,27 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2749
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2753
 msgid "Hospital"
 msgstr "病院"
 
-#. item
+#. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2755
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
 
-#. item
+#. 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:2750
+#: build/trans_presets.java:2762
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -21299,20 +21631,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2765
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2768
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2769
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -21320,287 +21652,287 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "Veterinary"
 msgstr "動物病院"
 
-#. item
+#. 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:2763
+#: build/trans_presets.java:2775
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2782
 msgid "Geography"
 msgstr "地理学"
 
-#. group "Places"
-#: build/trans_presets.java:2772
+#. group "Geography/Places"
+#: build/trans_presets.java:2784
 msgid "Continent"
 msgstr "大陸"
 
-#. item
-#: build/trans_presets.java:2773
+#. item "Geography/Places/Continent"
+#: build/trans_presets.java:2785
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
-#. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2778
+#. item "Geography/Places/Continent" text "Name"
+#: build/trans_presets.java:2790
 msgid "Country"
 msgstr "国(country)"
 
-#. item
-#: build/trans_presets.java:2779
+#. item "Geography/Places/Country"
+#: build/trans_presets.java:2791
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
-#. item "Places/Country" text "Name"
-#: build/trans_presets.java:2784
+#. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2796
 msgid "State"
 msgstr "州(state)"
 
-#. item
-#: build/trans_presets.java:2785
+#. item "Geography/Places/State"
+#: build/trans_presets.java:2797
 msgid "Edit State"
 msgstr "州(state)の編集"
 
-#. item "Places/State" text "Name"
-#: build/trans_presets.java:2790
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2802
 msgid "Region"
 msgstr "地方"
 
-#. item
-#: build/trans_presets.java:2791
+#. item "Geography/Places/Region"
+#: build/trans_presets.java:2803
 msgid "Edit Region"
 msgstr "地方の編集"
 
-#. item "Places/Region" text "Name"
-#: build/trans_presets.java:2796
+#. item "Geography/Places/Region" text "Name"
+#: build/trans_presets.java:2808
 msgid "County"
 msgstr "郡"
 
-#. item
-#: build/trans_presets.java:2797
+#. item "Geography/Places/County"
+#: build/trans_presets.java:2809
 msgid "Edit County"
 msgstr "郡の編集"
 
-#. item "Places/County" text "Name"
+#. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2815
 msgid "City"
 msgstr "市区"
 
-#. item
-#: build/trans_presets.java:2804
+#. item "Geography/Places/City"
+#: build/trans_presets.java:2816
 msgid "Edit City"
 msgstr "市区の編集"
 
-#. item "Places/City" text "Name"
-#: build/trans_presets.java:2809
+#. item "Geography/Places/City" text "Name"
+#: build/trans_presets.java:2821
 msgid "Town"
 msgstr "町"
 
-#. item
+#. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2823
 msgid "Edit Town"
 msgstr "町の編集"
 
-#. item "Places/Town" text "Name"
-#: build/trans_presets.java:2816
+#. item "Geography/Places/Town" text "Name"
+#: build/trans_presets.java:2828
 msgid "Suburb"
 msgstr "近郊住宅地"
 
-#. item
+#. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2830
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
-#. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2823
+#. item "Geography/Places/Suburb" text "Name"
+#: build/trans_presets.java:2835
 msgid "Village"
 msgstr "村"
 
-#. item
-#: build/trans_presets.java:2824
+#. item "Geography/Places/Village"
+#: build/trans_presets.java:2836
 msgid "Edit Village"
 msgstr "村の編集"
 
-#. item "Places/Village" text "Name"
-#: build/trans_presets.java:2829
+#. item "Geography/Places/Village" text "Name"
+#: build/trans_presets.java:2841
 msgid "Hamlet"
 msgstr "小村落"
 
-#. item
-#: build/trans_presets.java:2830
+#. item "Geography/Places/Hamlet"
+#: build/trans_presets.java:2842
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
 
-#. item "Places/Hamlet" text "Name"
+#. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Locality"
 msgstr "地域"
 
-#. item
+#. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2850
 msgid "Edit Locality"
 msgstr "地域の編集"
 
-#. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2843
+#. item "Geography/Places/Locality" text "Name"
+#: build/trans_presets.java:2855
 msgid "Island"
 msgstr "島"
 
-#. item
+#. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2857
 msgid "Edit Island"
 msgstr "島の編集"
 
-#. item "Places/Island" text "Name"
-#: build/trans_presets.java:2850
+#. item "Geography/Places/Island" text "Name"
+#: build/trans_presets.java:2862
 msgid "Islet"
 msgstr "小島"
 
-#. item
+#. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2864
 msgid "Edit Islet"
 msgstr "小島を編集"
 
-#. item "Places/Islet" text "Name"
+#. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2870
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
 
-#. item
+#. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2872
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
-#. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2864
+#. item "Geography/Places/Cave Entrance" text "Name"
+#: build/trans_presets.java:2876
 msgid "Peak"
 msgstr "山頂"
 
-#. item
+#. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2878
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
-#. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2871
+#. item "Geography/Places/Peak" text "Elevation"
+#: build/trans_presets.java:2883
 msgid "Glacier"
 msgstr "氷河"
 
-#. item
+#. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2885
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
-#. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2878
+#. item "Geography/Places/Glacier" text "Elevation"
+#: build/trans_presets.java:2890
 msgid "Volcano"
 msgstr "火山"
 
-#. item
+#. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2892
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
-#. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2886
+#. item "Geography/Places/Volcano" text "Elevation"
+#: build/trans_presets.java:2898
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National"
 msgstr "国境"
 
-#. item
-#: build/trans_presets.java:2888
+#. item "Boundaries/National"
+#: build/trans_presets.java:2900
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2905
 msgid "Administrative"
 msgstr "行政区画"
 
-#. item
-#: build/trans_presets.java:2894
+#. item "Boundaries/Administrative"
+#: build/trans_presets.java:2906
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2911
 msgid "Civil"
 msgstr "Civil境界"
 
-#. item
-#: build/trans_presets.java:2900
+#. item "Boundaries/Civil"
+#: build/trans_presets.java:2912
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Political"
 msgstr "地点名"
 
-#. item
-#: build/trans_presets.java:2906
+#. item "Boundaries/Political"
+#: build/trans_presets.java:2918
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2923
 msgid "National park"
 msgstr "国立公園"
 
-#. item
-#: build/trans_presets.java:2912
+#. item "Boundaries/National park"
+#: build/trans_presets.java:2924
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2930
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2931
 msgid "Tree"
 msgstr "樹木・林"
 
-#. item
+#. item "Land use/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:2922
+#: build/trans_presets.java:2934
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2939
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Wood"
 msgstr "森"
 
-#. item
+#. item "Land use/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:2932
+#: build/trans_presets.java:2944
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -21608,33 +21940,33 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
+#: build/trans_presets.java:2947 build/trans_presets.java:2956
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
+#: build/trans_presets.java:2947 build/trans_presets.java:2956
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
+#: build/trans_presets.java:2947 build/trans_presets.java:2956
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2949
 msgid "Forest"
 msgstr "森"
 
-#. item
+#. item "Land use/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:2940
+#: build/trans_presets.java:2952
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
-#. item
-#: build/trans_presets.java:2947
+#. item "Land use/Nature Reserve"
+#: build/trans_presets.java:2959
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -21642,42 +21974,42 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2964
 msgid "Scree"
 msgstr "ガレ場"
 
-#. item
-#: build/trans_presets.java:2953
+#. item "Land use/Scree"
+#: build/trans_presets.java:2965
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2969
 msgid "Scrub"
 msgstr "低木林"
 
-#. item
-#: build/trans_presets.java:2958
+#. item "Land use/Scrub"
+#: build/trans_presets.java:2970
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2974
 msgid "Fell"
 msgstr "山(Fell)"
 
-#. item
+#. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2976
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2980
 msgid "Heath"
 msgstr "荒れ地"
 
-#. item
+#. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2982
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -21685,52 +22017,52 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2987
 msgid "Farmyard"
 msgstr "農家の庭"
 
-#. item
+#. 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:2978
+#: build/trans_presets.java:2990
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2995
 msgid "Farmland"
 msgstr "農地"
 
-#. item
-#: build/trans_presets.java:2984
+#. item "Land use/Farmland"
+#: build/trans_presets.java:2996
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Meadow"
 msgstr "牧草地"
 
-#. item
-#: build/trans_presets.java:2990
+#. item "Land use/Meadow"
+#: build/trans_presets.java:3002
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Vineyard"
 msgstr "ぶどう園"
 
-#. item
-#: build/trans_presets.java:2996
+#. item "Land use/Vineyard"
+#: build/trans_presets.java:3008
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3013
 msgid "Allotments"
 msgstr "貸し農園"
 
-#. item
-#: build/trans_presets.java:3002
+#. item "Land use/Allotments"
+#: build/trans_presets.java:3014
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -21738,63 +22070,63 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Garden"
 msgstr "庭園"
 
-#. item
-#: build/trans_presets.java:3009
+#. item "Land use/Garden"
+#: build/trans_presets.java:3021
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Grass"
 msgstr "草地"
 
-#. item
-#: build/trans_presets.java:3014
+#. item "Land use/Grass"
+#: build/trans_presets.java:3026
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3031
 msgid "Village Green"
 msgstr "里山"
 
-#. item
+#. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3038
 msgid "Common"
 msgstr "共有地"
 
-#. item
+#. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3040
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3044
 msgid "Park"
 msgstr "公園"
 
-#. item
-#: build/trans_presets.java:3033
+#. item "Land use/Park"
+#: build/trans_presets.java:3045
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
 
-#. item
+#. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3051
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -21802,81 +22134,81 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Residential area"
 msgstr "住宅エリア"
 
-#. item
-#: build/trans_presets.java:3046
+#. item "Land use/Residential area"
+#: build/trans_presets.java:3058
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Graveyard"
 msgstr "墓所"
 
-#. item
+#. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3065
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3071
 msgid "Cemetery"
 msgstr "共同墓地"
 
-#. item
+#. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3073
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3080
 msgid "Retail"
 msgstr "小売り商業"
 
-#. item
-#: build/trans_presets.java:3069
+#. item "Land use/Retail"
+#: build/trans_presets.java:3081
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3086
 msgid "Commercial"
 msgstr "商用"
 
-#. item
-#: build/trans_presets.java:3075
+#. item "Land use/Commercial"
+#: build/trans_presets.java:3087
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3092
 msgid "Industrial"
 msgstr "工業"
 
-#. item
-#: build/trans_presets.java:3081
+#. item "Land use/Industrial"
+#: build/trans_presets.java:3093
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3098
 msgid "Railway land"
 msgstr "鉄道用地"
 
-#. item
+#. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3105
 msgid "Military"
 msgstr "軍用"
 
-#. item
-#: build/trans_presets.java:3094
+#. item "Land use/Military"
+#: build/trans_presets.java:3106
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -21884,63 +22216,63 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Construction area"
 msgstr "工事中エリア"
 
-#. item
-#: build/trans_presets.java:3101
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3113
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3118
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
-#. item
-#: build/trans_presets.java:3107
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3119
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3124
 msgid "Greenfield"
 msgstr "未開発工業地"
 
-#. item
-#: build/trans_presets.java:3113
+#. item "Land use/Greenfield"
+#: build/trans_presets.java:3125
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3130
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
-#. item
-#: build/trans_presets.java:3119
+#. item "Land use/Landfill"
+#: build/trans_presets.java:3131
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Quarry"
 msgstr "採石場"
 
-#. item
-#: build/trans_presets.java:3125
+#. item "Land use/Quarry"
+#: build/trans_presets.java:3137
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Relations"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
 
-#. item
+#. 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:3138
+#: build/trans_presets.java:3150
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -21949,10 +22281,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3157
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -21960,12 +22292,12 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3160
 msgid "Turn restriction"
 msgstr "右左折制限"
 
-#. item
+#. 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:3151
+#: build/trans_presets.java:3163
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -21973,34 +22305,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -22009,15 +22341,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "to way"
 msgstr "ウェイへ"
@@ -22025,12 +22357,12 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3175
 msgid "Route"
 msgstr "ルート"
 
-#. item
+#. 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:3166
+#: build/trans_presets.java:3178
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -22038,5 +22370,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "Route type"
 msgstr "ルート種類"
@@ -22108,5 +22440,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3168 build/trans_style.java:233
+#: build/trans_presets.java:3180 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22115,17 +22447,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "ski"
 msgstr "スキー"
@@ -22178,5 +22510,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3168 build/trans_style.java:247
+#: build/trans_presets.java:3180 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22185,13 +22517,13 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "detour"
 msgstr "迂回路"
@@ -22205,10 +22537,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3168 build/trans_style.java:1206
+#: build/trans_presets.java:3180 build/trans_style.java:1206
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3183
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -22216,31 +22548,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3186
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3189
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -22249,30 +22581,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3192
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3193
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3194
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3195
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3196
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3185
+#: build/trans_presets.java:3197
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -23179,5 +23511,5 @@
 #: build/trans_style.java:839
 msgid "services"
-msgstr "サービス"
+msgstr "敷地内道路"
 
 #. color services
@@ -25500,5 +25832,5 @@
 #: build/trans_style.java:3159
 msgid "farmyard"
-msgstr "農地"
+msgstr "農家の庭"
 
 #. color farmyard
@@ -25638,5 +25970,5 @@
 #: build/trans_style.java:3233
 msgid "cemetery"
-msgstr "墓地"
+msgstr "共同墓地"
 
 #. color light_water
@@ -26252,5 +26584,5 @@
 #: build/trans_validator.java:47
 msgid "Unnamed unclassified highway"
-msgstr "Unnamed unclassified highway"
+msgstr "名前のない一般道(2車線未満)"
 
 #. way  : W : highway == unclassified && name != *
@@ -26283,5 +26615,5 @@
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
-msgstr "footタグつきの歩道"
+msgstr "footタグつきの遊歩道"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -26302,5 +26634,5 @@
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
-msgstr "歩行者通路に最大速度が指定"
+msgstr "遊歩道に最大速度が指定"
 
 #. way  : I : highway == steps && maxspeed == *
@@ -26410,4 +26742,41 @@
 msgstr "チェコ UHUL:ORTOFOTO"
 
+#~ msgid "History of Element"
+#~ msgstr "要素の履歴"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "二つだけのノード選択が許されています"
+
+#~ msgid "Please select one or more closed ways of at least four nodes."
+#~ msgstr ""
+#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
+
+#~ msgid "Only one node selected"
+#~ msgstr "ただ一つだけのノードが選択されています。"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "競合点の統合"
+
+#~ msgid "Open in Browser"
+#~ msgstr "ブラウザで開く"
+
+#~ msgid "{0} extrem nodes."
+#~ msgstr "{0} 極値ノード。"
+
+#~ msgid "Via node {0}, {1}"
+#~ msgstr "経由ノード {0}, {1}"
+
+#~ msgid "{0} via nodes."
+#~ msgstr "{0} 経由ノード。"
+
+#~ msgid "MIddle way: {0}"
+#~ msgstr "中間のウェイ: {0}"
+
+#~ msgid "Processing {0}"
+#~ msgstr "{0} 実行中"
+
+#~ msgid "Relation: from {0} to {1} via {2}"
+#~ msgstr "リレーション: {0} から {1} まで {2} 経由"
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -26431,4 +26800,7 @@
 #~ msgstr "リストを更新するために再読込のクリック"
 
+#~ msgid "Refresh the selection list."
+#~ msgstr "選択したリストを更新する。"
+
 #~ msgid "Commit comment"
 #~ msgstr "コメントを反映します"
@@ -26442,4 +26814,7 @@
 #~ msgid "Unsaved Changes"
 #~ msgstr "保存されていない変更"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSMオンラインヘルプ"
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -26572,7 +26947,4 @@
 #~ msgstr "公開"
 
-#~ msgid "User"
-#~ msgstr "ユーザ"
-
 #~ msgid "Show Author Panel"
 #~ msgstr "作者パネルを表示"
@@ -26609,4 +26981,10 @@
 #~ msgid "Portcullis"
 #~ msgstr "城の格子戸"
+
+#~ msgid "Station"
+#~ msgstr "駅"
+
+#~ msgid "Edit Station"
+#~ msgstr "駅の編集"
 
 #~ msgid "map"
@@ -26794,4 +27172,7 @@
 #~ msgstr "ノードの一部は（ほぼ）一直線上にある"
 
+#~ msgid "Update Data"
+#~ msgstr "データの更新"
+
 # http://en.wikipedia.org/wiki/Draw_bridge
 #~ msgid "Edit Drawbridge"
@@ -26841,4 +27222,7 @@
 #~ "continue?"
 #~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？"
+
+#~ msgid "Upload to OSM..."
+#~ msgstr "OSMにアップロード"
 
 #~ msgid "Sorry, doesn't work with anonymous users"
@@ -26926,4 +27310,14 @@
 
 #~ msgid ""
+#~ "WARNING: launching browser windows for the first {0} of {1} selected "
+#~ "primitives only"
+#~ msgstr ""
+#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初"
+#~ "の{0}だけです。"
+
+#~ msgid "Download referrers..."
+#~ msgstr "参照をダウンロード..."
+
+#~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
 #~ msgid_plural ""
@@ -26993,6 +27387,26 @@
 #~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません"
 
+#~ msgid "Updates the currently selected primitives from the server"
+#~ msgstr "サーバから現在選択されたプリミティブを更新"
+
+#~ msgid "Conflict detected"
+#~ msgstr "競合が検出されました"
+
+#~ msgid "Primitive already deleted"
+#~ msgstr "プリミティブは削除済み"
+
+#~ msgid ""
+#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
+#~ "to<br>delete on the server is already deleted.<br><br>The error message "
+#~ "is:<br>{0}</html>"
+#~ msgstr ""
+#~ "<html>アップロード <strong>失敗</strong> サーバから削除しようとしたプリミ"
+#~ "ティブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
+
 #~ msgid "not yet decided"
 #~ msgstr "未決定です"
+
+#~ msgid "History item"
+#~ msgstr "履歴アイテム"
 
 #~ msgid "parameter '{0}' must not be null"
@@ -27037,2 +27451,32 @@
 #~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
 #~ "あなたの母国語</A>でそれを作成してください。"
+
+#~ msgid "Unexpected return value. Got {0}."
+#~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
+
+#~ msgid "Index out of bounds. Got {0}."
+#~ msgstr "範囲外のインデックス。{0} を受け取りました"
+
+#~ msgid "Display the history of the selected primitive."
+#~ msgstr "選択されたプリミティブの履歴を表示"
+
+#~ msgid ""
+#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
+#~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+
+#~ msgid ""
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
+#~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+
+#~ msgid "longitude"
+#~ msgstr "経度"
+
+#~ msgid "latitude"
+#~ msgstr "緯度"
+
+#~ msgid "Coordinate"
+#~ msgstr "座標"
+
+#~ msgid "Download referrers from OSM..."
+#~ msgstr "OSMから参照をダウンロードします..."
