Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 19496)
+++ applications/editors/josm/i18n/po/ja.po	(revision 19552)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 18:28+0100\n"
-"PO-Revision-Date: 2010-01-13 12:04+0000\n"
+"POT-Creation-Date: 2010-01-18 14:14-0500\n"
+"PO-Revision-Date: 2010-01-18 11:05-0500\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -20,5 +20,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:206
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,17 +31,17 @@
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:384
+#: ../core/src/org/openstreetmap/josm/Main.java:378
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:385
-#: ../core/src/org/openstreetmap/josm/Main.java:418
-#: ../core/src/org/openstreetmap/josm/Main.java:486
+#: ../core/src/org/openstreetmap/josm/Main.java:379
+#: ../core/src/org/openstreetmap/josm/Main.java:412
+#: ../core/src/org/openstreetmap/josm/Main.java:480
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126
@@ -60,15 +60,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129
 #: ../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
+#: ../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:357
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:160
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:240
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:454
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:497
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
@@ -92,9 +92,10 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
+#: ../core/src/org/openstreetmap/josm/Main.java:411
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr "パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:485
+msgstr ""
+"パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:479
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -115,8 +116,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:721
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:723
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:732
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:734
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMapエディタ"
@@ -124,5 +125,5 @@
 #. Add the version number
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:69
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
 #, java-format
 msgid "Version {0}"
@@ -188,6 +189,6 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のページにリダイレクトすると、おそらく失敗します。API ベース "
-"URL は \"{0}\" です。"
+"警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のペー"
+"ジにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -197,14 +198,15 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"警告: 予想外のAPI ベースURLのフォーマット。OSM ユーザーのページにリダイレクトすると、おそらく失敗します。API ベース URL は "
-"\"{0}\" です。"
+"警告: 予想外のAPI ベースURLのフォーマット。OSM ユーザーのページにリダイレクト"
+"すると、おそらく失敗します。API ベース URL は \"{0}\" です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
 #, java-format
 msgid ""
-"You''re about to launch {0} browser windows.<br>This may both clutter your "
+"You are 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>終わらせるのに少し時間が掛かります。"
+"{0} ブラウザウィンドウを起動しようとしています。<br>画面がブラウザウィンドウ"
+"で散らかり<br>終わらせるのに少し時間が掛かります。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
@@ -224,5 +226,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -232,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:158
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -240,7 +242,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112
@@ -254,13 +256,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
@@ -280,5 +281,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してください。"
+msgstr ""
+"少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してくだ"
+"さい。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -292,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
 msgid "Merge"
 msgstr "マージ"
@@ -299,7 +302,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr "<html>統合元のレイヤー<br>''{0}''<br>を、統合する先のレイヤーがありません。</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>統合元のレイヤー<br>''{0}''<br>を、統合する先のレイヤーがありません。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
@@ -383,9 +388,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
@@ -403,5 +408,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
-msgid "Close the dialog, don't create a new node"
+msgid "Close the dialog, do not create a new node"
 msgstr "ダイアログを閉じて、新しいノードを作成しない"
 
@@ -421,8 +426,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
@@ -431,5 +436,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -445,5 +450,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
 #: ../plugins/terracer/src/terracer/TerracerAction.java:55
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
 msgid "Tool: {0}"
@@ -463,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
@@ -470,8 +475,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:754
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -562,5 +567,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:399
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:394
 msgid "Close open changesets"
 msgstr "開いた変更セットを閉じる"
@@ -573,5 +578,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43
@@ -585,10 +590,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
 msgid "There are no open changesets"
 msgstr "開かれた変更セットはありません"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:83
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
 msgid "No open changesets"
 msgstr "開かれた変更セットはありません"
@@ -626,5 +631,6 @@
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
-msgstr "ウェイを結合できません（これらをノードの一列として統合することができません）"
+msgstr ""
+"ウェイを結合できません（これらをノードの一列として統合することができません）"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
@@ -668,22 +674,24 @@
 "Please select exactly two or three nodes or one way with exactly two or "
 "three nodes."
-msgstr "正確に２つないしは３つのノード、または正確に２つないしは３つのノードを持つ一つのウェイ、を選択してください。"
+msgstr ""
+"正確に２つないしは３つのノード、または正確に２つないしは３つのノードを持つ一"
+"つのウェイ、を選択してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -728,65 +736,27 @@
 msgstr "地図データをOSMサーバからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 msgid "Download parent ways/relations..."
 msgstr "親のウェイ/リレーションをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
 msgid "Download primitives referring to one of the selected primitives"
-msgstr "選択したプリミティブの一つを参照しているプリミティブをダウンロードします。"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "ID > 0 が必須です。入力値 {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:236
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:71
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:51
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:111
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1038
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:179
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:20
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:32
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:45
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr "パラメータの ''{0}'' はヌルではいけません"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr "インポートした内容には {0} の競合があります。"
+msgstr ""
+"選択したプリミティブの一つを参照しているプリミティブをダウンロードします。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
+#, fuzzy, java-format
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "インポートした内容には {0} の競合があります。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-msgid "Conflicts during download"
-msgstr "ダウンロード中に競合"
+#, fuzzy
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "ダウンロード中に競合"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -807,5 +777,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
 msgstr "複製"
@@ -842,107 +812,20 @@
 msgstr "全画面ビューを切り替え"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269
 msgid "Export to GPX..."
 msgstr "GPXにエクスポート..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268
 msgid "Export the data to GPX file."
 msgstr "データをGPXファイルにエクスポートします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 msgid "Nothing to export. Get some data first."
 msgstr "エクスポートするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:39
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:110
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:112
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:124
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:314
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:426
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:96
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:112
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:126
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:141
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:158
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:121
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:123
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:59
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61
-#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:135
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:341
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:54
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
-#, java-format
-msgid "Parameter ''{0}'' must not be null."
-msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
-#, java-format
-msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: ''{0}''。"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "GPX ファイルをエクスポート"
@@ -966,100 +849,109 @@
 msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 msgid "Join overlapping Areas"
 msgstr "オーバーラップ領域を接続する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 msgid "Joins areas that overlap each other"
 msgstr "お互いのオーバラップ範囲を接続する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
 msgstr "結合するクローズドウェイを少なくともひとつ選んでください"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
 msgid "Only up to two areas can be joined at the moment."
 msgstr "現在最大2つまでのエリアのみ結合できます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138
-#, java-format
-msgid "\"{0}\" is not closed and therefore can't be joined."
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:139
+#, java-format
+msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" は閉じられていないので連結できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.\n"
-"This can lead to nodes being deleted accidentally.\n"
-"Are you really sure to continue?"
-msgstr ""
-"選択されたウェイにはダウンロードされたデータ領域の外側にノードがあります。\n"
-"これはノードを誤って削除する可能性があります。\n"
-"本当に続けますか？"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154
+#, fuzzy
+msgid "The selected way has nodes outside of the downloaded data region."
+msgid_plural ""
+"The selected ways have nodes outside of the downloaded data region."
+msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
+msgid "This can lead to nodes being deleted accidentally."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
+msgid "Are you really sure to continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:70
 msgid "Please abort if you are not sure"
 msgstr "確信していないならば、中止して下さい。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
 msgid "No intersection found. Nothing was changed."
 msgstr "交差点がみつかりません。何も変更されませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
 msgid "Added node on all intersections"
 msgstr "すべての交差点にノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "内側のマルチポリゴンの一部ではないウェイを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Fix relations"
 msgstr "リレーションの修正"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Joined self-overlapping area"
 msgstr "結合された自己重複エリア"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
 msgid "Joined overlapping areas"
 msgstr "結合されたオーバーラップエリア"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
 "verify no errors have been introduced."
-msgstr "修正したリレーションにいくつかのウェイが含まれています。エラーが出ないことを確認してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294
+msgstr ""
+"修正したリレーションにいくつかのウェイが含まれています。エラーが出ないことを"
+"確認してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
 msgid "Enter values for all conflicts."
 msgstr "すべての競合に値を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
 msgid "Fix tag conflicts"
 msgstr "タグの競合を修正"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
 msgid "Removed Element from Relations"
 msgstr "リレーションから要素を削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
 msgid "Join Areas: Remove Short Ways"
 msgstr "エリアの結合：　短いウェイの削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
 msgid "Closed Way"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
 msgid "Remove tags from inner ways"
 msgstr "内部のウェイからタグを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
 msgid "Join Areas Function"
 msgstr "エリア結合機能"
@@ -1103,5 +995,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "URL"
 msgstr "URL"
@@ -1117,5 +1009,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr "緯度、経度、ズームを解析することができませんでした。確認をしてください。"
+msgstr ""
+"緯度、経度、ズームを解析することができませんでした。確認をしてください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
@@ -1131,32 +1024,34 @@
 msgstr "現在のレイヤーを他のレイヤーに結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "ノードの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "一番古いものにノードをマージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "結合する少なくとも二つのウェイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:127
 msgid "Abort Merging"
 msgstr "マージを中断"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:129
 msgid "Click to abort merging nodes"
 msgstr "クリックしてノードのマージを中断"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:136
 #, java-format
 msgid ""
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
-msgstr "ノードをマージできません：おそらく使用中のウェイ ''{0}'' を削除する必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:230
+msgstr ""
+"ノードをマージできません：おそらく使用中のウェイ ''{0}'' を削除する必要があり"
+"ます。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:229
 #, java-format
 msgid "Merge {0} nodes"
@@ -1252,5 +1147,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
 msgid "<html>Cannot open directory.<br>Please select a file!"
-msgstr "<html>ディレクトリをオープンできません。<br>ファイルを選択してください！"
+msgstr ""
+"<html>ディレクトリをオープンできません。<br>ファイルを選択してください！"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
@@ -1258,14 +1154,15 @@
 msgstr "ファイルを開く"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
 msgid "Opening 1 file..."
 msgstr "1 ファイルを開いています"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:163
-#, java-format
-msgid "Opening {0} files..."
-msgstr "{0} ファイルを開いています..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
+#, fuzzy, java-format
+msgid "Opening {0} file..."
+msgid_plural "Opening {0} files..."
+msgstr[0] "{0} ファイルを開いています..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1286,5 +1183,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-msgid "Select if the data should be downloaded in a new layer"
+msgid "Select if the data should be downloaded into a new layer"
 msgstr "新しいレイヤーにデータをダウンロードするなら選択"
 
@@ -1316,4 +1213,13 @@
 msgid "Download Data"
 msgstr "データをダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+msgid ""
+"When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes.(Afterwards, you "
+"can undo the movement for certain nodes:<br>Select them and press the "
+"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1357,7 +1263,7 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>今、EPSG:4326 "
-"投影法を使っています。これは、長方形整列を行うと<br>望ましくない結果を引き起こすかもしれません。<br>この警告を消すには、投影法を変えて見てください"
-"。<br>続けますか?</html>"
+"<html>今、EPSG:4326 投影法を使っています。これは、長方形整列を行うと<br>望ま"
+"しくない結果を引き起こすかもしれません。<br>この警告を消すには、投影法を変え"
+"て見てください。<br>続けますか?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1407,5 +1313,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。"
+msgstr ""
+"クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
@@ -1458,6 +1365,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1468,11 +1375,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
@@ -1488,12 +1395,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:74
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:216
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:721
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
@@ -1515,6 +1421,5 @@
 #: ../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:283
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:290
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
@@ -1585,5 +1490,7 @@
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
 "if you rejected all. Continue?"
-msgstr "未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱われます。続けますか？"
+msgstr ""
+"未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱わ"
+"れます。続けますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
@@ -1619,5 +1526,7 @@
 "Select all undeleted objects in the data layer. This selects incomplete "
 "objects too."
-msgstr "データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブジェクトも選択します。"
+msgstr ""
+"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ"
+"ジェクトも選択します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
@@ -1627,6 +1536,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid ""
-"Show status report with useful information that can be attached to bugs"
+msgid "Show status report with useful information that can be attached to bugs"
 msgstr "バグに添付できる有用な情報と一緒にステータスレポートを表示する"
 
@@ -1648,5 +1556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1661,9 +1569,9 @@
 msgstr "ウェイから不要なノードを削除してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 msgid "Please select at least one way to simplify."
 msgstr "簡略化には、少なくとも一つのウェイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89
 #, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
@@ -1672,9 +1580,9 @@
 msgstr[0] "選択には {0} ウェイが含まれます。本当に簡略化しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:92
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:139
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66
 #, java-format
@@ -1708,5 +1616,7 @@
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
-msgstr[0] "一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択してください。"
+msgstr[0] ""
+"一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択し"
+"てください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:172
@@ -1722,5 +1632,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid "You must select two or more nodes to split a circular way."
-msgstr "円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
+msgstr ""
+"円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:279
@@ -1728,5 +1639,7 @@
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
 "middle of the way.)"
-msgstr "ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択する）"
+msgstr ""
+"ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択"
+"する）"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
@@ -1735,5 +1648,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>リレーションのメンバーであるロールは、全ての新しいウェイにコピーされました。<br>これらを確認して必要なら訂正してください。</html>"
+"<html>リレーションのメンバーであるロールは、全ての新しいウェイにコピーされま"
+"した。<br>これらを確認して必要なら訂正してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
@@ -1742,5 +1656,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これらを確認して必要なら訂正してください。</html>"
+"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これ"
+"らを確認して必要なら訂正してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
@@ -1763,57 +1678,58 @@
 msgstr "グローバル設定 \"{0}\"　のトグル"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 msgid "UnGlue Ways"
 msgstr "ウェイを引き離す"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "複数のウェイに使われているノードを複製します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:81
+#: ../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:103
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
 msgid "None of these nodes are glued to anything else."
 msgstr "どのノードも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
-msgid "None of this way's nodes are glued to anything else."
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+msgid "None of this way''s nodes are glued to anything else."
 msgstr "どのウェイも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
 msgid "The current selection cannot be used for unglueing."
 msgstr "現在の選択は引き離せません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "Select either:"
 msgstr "ほかを選択："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One tagged node, or"
 msgstr "* 1つのタグのついたノード、または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way, or"
 msgstr "* 1つ以上のウェイに使われている1つのノード, または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
-msgid ""
-"* One node that is used by more than one way and one of those ways, or"
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+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:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 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:121
+msgstr ""
+"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 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:123
+msgstr ""
+"* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1822,22 +1738,24 @@
 "own copy and all nodes will be selected."
 msgstr ""
-"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくられます。\n"
-"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身の\n"
+"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくら"
+"れます。\n"
+"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身"
+"の\n"
 "コピーが作られ、全てのノードが選択状態になります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
 msgid "Unglued Node"
 msgstr "ノードを引き離す"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
 #, 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:392
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr "{0}ノードを{1}ノードと見なす"
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#, fuzzy, java-format
+msgid "Dupe {0} node into {1} nodes"
+msgid_plural "Dupe {0} nodes into {1} nodes"
+msgstr[0] "{0}ノードを{1}ノードと見なす"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1879,7 +1797,7 @@
 
 #. bounds defined? => use the bbox downloader
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:971
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
 msgid "Download data"
 msgstr "データのダウンロード"
@@ -1901,5 +1819,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 #, java-format
-msgid "Didn''t find an object with id {0} in the current dataset"
+msgid "Did not find an object with id {0} in the current dataset"
 msgstr "現在のデータセットには ID {0} のオブジェクトがありません"
 
@@ -1936,9 +1854,11 @@
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
-msgstr "<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決してください。</html>"
+msgstr ""
+"<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決してくだ"
+"さい。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
@@ -1948,9 +1868,9 @@
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "選択をアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "選択しているオブジェクトの変更を全てアップロード"
@@ -1997,50 +1917,56 @@
 msgstr "ズームアウト"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+msgctxt "audio"
 msgid "Back"
 msgstr "戻る"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgctxt "audio"
 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/AudioBackAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
 #: ../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
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+msgctxt "audio"
 msgid "Faster"
 msgstr "もっと速く"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgctxt "audio"
 msgid "Faster Forward"
 msgstr "早回し"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+msgctxt "audio"
 msgid "Forward"
 msgstr "進む"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgctxt "audio"
 msgid "Jump forward"
 msgstr "一つ進む"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
+msgctxt "audio"
 msgid "Next Marker"
 msgstr "次のマーカー"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgctxt "audio"
 msgid "Play next marker."
 msgstr "次のマーカーを再生"
@@ -2048,4 +1974,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgctxt "audio"
 msgid "Play/Pause"
 msgstr "再生/一時停止"
@@ -2055,19 +1982,23 @@
 msgstr "再生と一時停止"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+msgctxt "audio"
 msgid "Previous Marker"
 msgstr "前のマーカー"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgctxt "audio"
 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
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
+msgctxt "audio"
 msgid "Slower"
 msgstr "遅く"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgctxt "audio"
 msgid "Slower Forward"
 msgstr "ゆっくり再生"
@@ -2112,5 +2043,7 @@
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
-msgstr "クリックしてあなたのローカルデータセット中の天気オブジェクトがサーバから削除されているかどうかチェック"
+msgstr ""
+"クリックしてあなたのローカルデータセット中の天気オブジェクトがサーバから削除"
+"されているかどうかチェック"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2129,11 +2062,12 @@
 "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>"
+"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:183
@@ -2155,13 +2089,13 @@
 msgstr "ダウンロード中にエラー"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete Mode"
 msgstr "削除モード"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
 msgid "Delete nodes or ways."
 msgstr "ノードまたはウェイを削除します"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
@@ -2173,10 +2107,11 @@
 msgstr "モード: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:245
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:246
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときにノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
+"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに"
+"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
@@ -2271,5 +2206,7 @@
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
 "its normal."
-msgstr "ウェイセグメントをドラッグして長方形を作成。Ctrl+ドラッグで垂線に沿ってセグメントを移動。"
+msgstr ""
+"ウェイセグメントをドラッグして長方形を作成。Ctrl+ドラッグで垂線に沿ってセグメ"
+"ントを移動。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
@@ -2279,16 +2216,16 @@
 #: ../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キーを押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
+"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:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:304
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
 msgid "Select"
@@ -2324,5 +2261,6 @@
 "Really move them?"
 msgstr ""
-"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間違いでしょう。\n"
+"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間"
+"違いでしょう。\n"
 "本当に移動しますか？"
 
@@ -2334,5 +2272,7 @@
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr "移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードとマージします。"
+msgstr ""
+"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと"
+"マージします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
@@ -2345,5 +2285,6 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
-"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替え);Shft-Ctrlで選択を回転。;選択を変更。"
+"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替"
+"え);Shft-Ctrlで選択を回転。;選択を変更。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2361,12 +2302,51 @@
 "move zoom with right button"
 msgstr ""
-"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら移動; 右ドラッグによるズーム"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら"
+"移動; 右ドラッグによるズーム"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+#, fuzzy
+msgid "<not>"
+msgstr "北"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+msgid "<or>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
+msgid "<left parent>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+#, fuzzy
+msgid "<right parent>"
+msgstr "右括弧がありません"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+msgid "<colon>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
+msgid "<equals>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<key>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<question mark>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
+msgid "<end-of-file>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
 msgid "Search..."
 msgstr "検索..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search for objects."
@@ -2374,175 +2354,200 @@
 
 #. -- prepare the combo box with the search expressions
-#. 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#.
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
 msgid "Please enter a filter string."
 msgstr "フィルター文字列を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
 msgid "Please enter a search string."
 msgstr "検索文字列を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "Enter the search expression"
 msgstr "検索表現を入力"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
 msgid "replace selection"
 msgstr "セレクションを置換"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "add to selection"
 msgstr "セレクションに加える"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 msgid "remove from selection"
 msgstr "セレクションの削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "find in selection"
 msgstr "選択範囲の中から見つける"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "case sensitive"
 msgstr "大/小文字を区別する"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "regular expression"
 msgstr "正規表現検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
-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:118
-msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr "<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に 'ベイカー ストリート' を含むもの。"
+#, fuzzy
+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:119
-msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
+#, fuzzy
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr ""
+"<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に 'ベイカー ストリート' を"
+"含むもの。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#, fuzzy
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - nameタグに 'Bak' を含むもの"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
-msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#, fuzzy
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> -  キー 'type' の値が 'route' であるもの"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
-msgid ""
-"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#, fuzzy
+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:122
-msgid "<b>-name:Bak</b> - not 'Bak' in the name."
+"<b>type=*</b> -  'type' というキーを持つもの全て。* は任意の文字列を意味しま"
+"す。<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#, fuzzy
+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:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=任意の値を入力してください."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 msgid "<u>Special targets:</u>"
 msgstr "<u>特殊なターゲット:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 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:126
+msgstr ""
+"<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - 該当ユーザに変更された全オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>ユーザ:匿名</b> - 匿名ユーザによって変更された全てのオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 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:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
 "assigned version)"
-msgstr "<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョンを指定しないと何も検索されません）"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+msgstr ""
+"<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョンを指定し"
+"ないと何も検索されません）"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
 "assigned changeset)"
-msgstr "<b>変更セット:</b>... - 与えられた変更セットIDのオブジェクト(割り当てられた変更セットの無いオブジェクトは0)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+msgstr ""
+"<b>変更セット:</b>... - 与えられた変更セットIDのオブジェクト(割り当てられた変"
+"更セットの無いオブジェクトは0)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>ノード:</b>... - 指定されたノード数のオブジェクト (nodes:count または "
 "nodes:min-max)"
-msgstr "<b>ノード:</b>... - 指定されたノード数のオブジェクト (nodes:count または nodes:min-max)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
 "max)"
-msgstr "<b>tags:</b>... - 与えられた数値のタグのオブジェクト (tags:件数 または tags:最小値-最大値)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+msgstr ""
+"<b>tags:</b>... - 与えられた数値のタグのオブジェクト (tags:件数 または tags:"
+"最小値-最大値)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
-"<b>タイムスタンプ:</b>... - このタイムスタンプのオブジェクト (<b>2009-11-12T14:51:09Z</b>, <b>2009-"
-"11-12</b> or <b>T14:51</b> ...)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+"<b>タイムスタンプ:</b>... - このタイムスタンプのオブジェクト (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>変更済み</b> - 変更されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>不完全</b> - すべての不完全なオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>タグなし</b> - すべてのタグなしオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
 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:139
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 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:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
 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:141
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "演算子を引用する場合には<b>\"</b> を使ってください(例. キーが<b>:</b>を含む場合)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
+msgstr ""
+"演算子を引用する場合には<b>\"</b> を使ってください(例. キーが<b>:</b>を含む場"
+"合)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"引用文字列に<b>\"</b> 及び <b>\\</b> がある場合には、その前に<b>\\</b>文字を付けてエスケープしてください (例. <b>\\"
-"\"</b> 及び <b>\\\\</b>)。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
+"引用文字列に<b>\"</b> 及び <b>\\</b> がある場合には、その前に<b>\\</b>文字を"
+"付けてエスケープしてください (例. <b>\\\"</b> 及び <b>\\\\</b>)。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../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
@@ -2550,51 +2555,60 @@
 msgstr "フィルター"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
 msgid "Search"
 msgstr "検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Submit filter"
 msgstr "フィルターを登録"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Start Search"
 msgstr "検索開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "\"{0}\"にマッチするものが見つからない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "''{0}'' を探しましたがセレクションの中には見つかりませんでした"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:293
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} の一致が見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321
+#. case sensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
+#, fuzzy
+msgctxt "search"
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:321
+#. case insensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#, fuzzy
+msgctxt "search"
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:322
+#. regex search
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#, fuzzy
+msgctxt "search"
 msgid "RX"
 msgstr "RX"
@@ -2607,72 +2621,82 @@
 "{2}"
 msgstr ""
-"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッセージは:\n"
+"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ"
+"セージは:\n"
 "\n"
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:234
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
 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:276
+msgstr ""
+"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく"
+"ださい: key=value"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:422
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:440
 #, 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:610
+msgstr ""
+"不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして "
+"\"relation\"です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "予想外のトークン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:634
 msgid "Missing parameter for OR"
 msgstr "ORのパラメータが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:643
-msgid "Missing right parenthesis"
-msgstr "右括弧がありません"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#, fuzzy, java-format
+msgid "Unexpected token. Expected {0}, found {1}"
+msgstr "予想外のトークン: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 msgid "Missing operator for NOT"
 msgstr "NOTに対する演算子が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Wrong number of parameters for tags operator."
 msgstr "tags演算子用のパラメータ数値誤り。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 #, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
-msgstr "tags演算子の不正な値: {0}。 tags 演算子はタグ数または範囲が期待されています、例 tags:1 または tags:2-5"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+msgstr ""
+"tags演算子の不正な値: {0}。 tags 演算子はタグ数または範囲が期待されています、"
+"例 tags:1 または tags:2-5"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
 msgid "Wrong number of parameters for nodes operator."
 msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:724
 #, 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:716
+msgstr ""
+"不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくださ"
+"い、例えば ノード: 10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
 msgstr "不正なid演算子の値: {0}。数字を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:737
 #, java-format
 msgid "Incorrect value of changeset operator: {0}. Number is expected."
 msgstr "変更セット演算子の不正な値: {0}。 数値が期待されています。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:729
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:744
 #, java-format
 msgid "Incorrect value of version operator: {0}. Number is expected."
@@ -2683,5 +2707,6 @@
 msgid ""
 "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr "警告: 削除されたオブジェクト {1} のタグ ''{0}'' を自動的に切り捨てています"
+msgstr ""
+"警告: 削除されたオブジェクト {1} のタグ ''{0}'' を自動的に切り捨てています"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
@@ -2690,5 +2715,7 @@
 "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
 "length {2}. Values length is {3}."
-msgstr "オブジェクト {1} にあるタグ ''{0}'' の値の長さが最大で許可された長さ {2} を超えています。値の長さは {3} です。"
+msgstr ""
+"オブジェクト {1} にあるタグ ''{0}'' の値の長さが最大で許可された長さ {2} を超"
+"えています。値の長さは {3} です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
@@ -2699,5 +2726,6 @@
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
+msgstr ""
+"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
@@ -2713,9 +2741,10 @@
 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 "
+"cannot upload them. Please edit the relations and remove the cyclic "
 "dependency.</html>"
 msgstr ""
-"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。<br>JOSM "
-"はこれをアップロードできません。リレーションを編集して相互依存を解消してください。</html>"
+"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。"
+"<br>JOSM はこれをアップロードできません。リレーションを編集して相互依存を解消"
+"してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -2747,7 +2776,8 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, java-format
-msgid "Added {0} objects"
-msgstr "{0} オブジェクトを追加しました"
+#, fuzzy, java-format
+msgid "Added {0} object"
+msgid_plural "Added {0} objects"
+msgstr[0] "{0} オブジェクトを追加しました"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2797,19 +2827,11 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#, fuzzy, java-format
+msgid "Remove \"{0}\" for {1} objects"
+msgstr "Remove \"{0}\" for {1} {2}"
+
 #: ../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}"
+#, fuzzy, java-format
+msgid "Set {0}={1} for {2} objects"
 msgstr "Set {0}={1} for {2} {3}"
 
@@ -2823,11 +2845,11 @@
 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>"
+"conflict cannot 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:1111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
 msgid "Double conflict"
 msgstr "二重の競合"
@@ -2836,7 +2858,9 @@
 #, java-format
 msgid ""
-"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
 "primitive ''{1}''."
-msgstr "警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けません。"
+msgstr ""
+"警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けま"
+"せん。"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2846,10 +2870,11 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:204
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
 #, java-format
 msgid ""
-"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないからです。"
+"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr ""
+"コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
@@ -2864,14 +2889,25 @@
 msgstr "未決の競合を解決できません"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103
-#, java-format
-msgid "Parameter ''{0}'' must not be empty"
-msgstr "パラメータ ''{0}'' は空ではダメです"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105
 msgid "At least one object to delete required, got empty collection"
-msgstr "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取りました"
+msgstr ""
+"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り"
+"ました"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
+#, fuzzy, java-format
+msgid "Delete node {0}"
+msgstr "削除モード"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
+#, fuzzy, java-format
+msgid "Delete way {0}"
+msgstr "{0} のウェイを削除"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
+#, fuzzy, java-format
+msgid "Delete relation {0}"
+msgstr "{0} のリレーションを削除"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2901,15 +2937,15 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
-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:444
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:435
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
+msgstr ""
+"ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見て"
+"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き"
+"起こします。<br>本当に削除しますか？"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
 msgid "Delete confirmation"
 msgstr "削除確認"
@@ -2921,16 +2957,16 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41
-#, java-format
-msgid "Set the 'modified' flag for node {0}"
+#, fuzzy, java-format
+msgid "Set the ''modified'' flag for node {0}"
 msgstr "ノード {0} 用に'変更された'フラグをセット"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
-#, java-format
-msgid "Set the 'modified' flag for way {0}"
+#, fuzzy, java-format
+msgid "Set the ''modified'' flag for way {0}"
 msgstr "ウェイ {0} 用に'変更された'フラグをセット"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
-#, java-format
-msgid "Set the 'modified' flag for relation {0}"
+#, fuzzy, java-format
+msgid "Set the ''modified'' flag for relation {0}"
 msgstr "リレーション {0} 用に'変更された'フラグをセット"
 
@@ -2941,22 +2977,25 @@
 msgstr[0] "{0} のノードを移動"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:102
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr "オブジェクト ''{0}'' を取り除いた。"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
-#, java-format
-msgid "Purged {0} objects"
-msgstr "{0} 個のオブジェクトを取り除いた。"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
+#, fuzzy, java-format
+msgid "Purged {0} object"
+msgid_plural "Purged {0} objects"
+msgstr[0] "{0} 個のオブジェクトを取り除いた。"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
 #, 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:163
+msgstr ""
+"警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、"
+"{1} です。"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -2994,21 +3033,22 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "{0} のプリミティブを復活"
+#, fuzzy, java-format
+msgid "Undelete {0} primitive"
+msgid_plural "Undelete {0} primitives"
+msgstr[0] "{0} のプリミティブを復活"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, java-format
-msgid "Resolve version conflicts for node {0}"
+#, fuzzy, java-format
+msgid "Resolve version conflict for node {0}"
 msgstr "ノード {0} のバージョン競合を解決"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, java-format
-msgid "Resolve version conflicts for way {0}"
+#, fuzzy, java-format
+msgid "Resolve version conflict for way {0}"
 msgstr "ウェイ {0} のバージョン競合を解決"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, java-format
-msgid "Resolve version conflicts for relation {0}"
+#, fuzzy, java-format
+msgid "Resolve version conflict for relation {0}"
 msgstr "リレーション {0} のバージョン競合を解決"
 
@@ -3031,5 +3071,7 @@
 "When reversing this way, the following changes to properties of the way and "
 "its nodes are suggested in order to maintain data consistency."
-msgstr "このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプロパティーに対する以下の変更が推奨されます。"
+msgstr ""
+"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ"
+"ロパティーに対する以下の変更が推奨されます。"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
@@ -3067,5 +3109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-msgid "Don't apply changes"
+msgid "Do not apply changes"
 msgstr "変更を適用しません"
 
@@ -3086,19 +3128,4 @@
 msgstr "自動タグ修正"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:53
-#, java-format
-msgid "Expected array of length 4, got {0}"
-msgstr "長さ4の配列が期待されています、入力値{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:65
-#, java-format
-msgid "Exactly four doubles excpected in string, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:71
-#, java-format
-msgid "Illegal double value ''{0}''"
-msgstr "不正なダブル値 ''{0}''"
-
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:79
@@ -3113,10 +3140,4 @@
 msgstr "不正な経度の値 ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:113
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:115
-#, java-format
-msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-msgstr "パラメータ ''{0}'' > 0.0 が期待されています。入力値 {1}"
-
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
@@ -3132,14 +3153,18 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-"isn't a directory."
-msgstr "警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリではありません。"
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
+"not a directory."
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリでは"
+"ありません。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
 #, java-format
 msgid ""
-"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-"isn't a directory.</html>"
-msgstr "<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレクトリではありません。</html>"
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
+"not a directory.</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレクトリ"
+"ではありません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
@@ -3148,5 +3173,6 @@
 "Warning: Failed to initialize preferences. Failed to create missing "
 "preference directory: {0}"
-msgstr "警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
@@ -3155,5 +3181,7 @@
 "<html>Failed to initialize preferences.<br>Failed to create missing "
 "preference directory: {0}</html>"
-msgstr "<html>設定の初期化に失敗しました。<br>作成に失敗した設定ディレクトリ: {0}</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>作成に失敗した設定ディレクトリ: {0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
@@ -3161,5 +3189,7 @@
 msgid ""
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
-msgstr "警告: 初期設定ファイル ''{0}'' がありません。デフォルトの初期設定ファイルを作成します。"
+msgstr ""
+"警告: 初期設定ファイル ''{0}'' がありません。デフォルトの初期設定ファイルを作"
+"成します。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3168,5 +3198,6 @@
 "Warning: Replacing existing preference file ''{0}'' with default preference "
 "file."
-msgstr "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
+msgstr ""
+"警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -3175,14 +3206,16 @@
 "<html>Failed to initialize preferences.<br>Failed to reset preference file "
 "to default: {0}</html>"
-msgstr "<html>設定の初期化に失敗しました。<br>設定ファイルをデフォルト: {0} にリセットできません</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>設定ファイルをデフォルト: {0} にリセッ"
+"トできません</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
 #, 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>に取って、新しい初期設定ファイルを作ります。</htm"
-"l>"
+"<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:509
@@ -3191,5 +3224,7 @@
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr "警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセットに失敗"
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット"
+"に失敗"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
@@ -3202,5 +3237,6 @@
 msgid ""
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr "エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
+msgstr ""
+"エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3228,5 +3264,6 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
 "server"
-msgstr "エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 ''{0}''"
+msgstr ""
+"エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
@@ -3235,5 +3272,7 @@
 "Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
 "{1}"
-msgstr "''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外の内容: {1}"
+msgstr ""
+"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外"
+"の内容: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
@@ -3254,8 +3293,8 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
-msgid "Warning: the revision file '/REVISION' is missing."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3264,5 +3303,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3271,5 +3310,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3277,20 +3316,24 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:85
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+msgctxt "compass"
 msgid "S"
 msgstr "南"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+msgctxt "compass"
 msgid "N"
 msgstr "北"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:99
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+msgctxt "compass"
 msgid "W"
 msgstr "西"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+msgctxt "compass"
 msgid "E"
 msgstr "東"
@@ -3299,5 +3342,5 @@
 #, java-format
 msgid ""
-"Unable to add primitive {0} to the dataset because it's already included"
+"Unable to add primitive {0} to the dataset because it is already included"
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
@@ -3305,10 +3348,11 @@
 #, java-format
 msgid ""
-"JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 "Please report this  at http://josm.openstreetmap.de . This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSMはデータセット中にプリミティブ [{0} {1}] があることを期待していますが、見つかりませんでした。このことを "
-"http://josm.openstreetmap.de に報告してください。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
+"JOSMはデータセット中にプリミティブ [{0} {1}] があることを期待していますが、見"
+"つかりませんでした。このことを http://josm.openstreetmap.de に報告してくださ"
+"い。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
@@ -3340,10 +3384,10 @@
 
 #. should not happen
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278
 #, java-format
 msgid ""
 "Target object with id {0} and version {1} is visible although source object "
-"with lower version {2} is not visible. Can''t deal with this inconsistency. "
+"with lower version {2} is not visible. Cannot deal with this inconsistency. "
 "Keeping target object. "
 msgstr ""
@@ -3358,4 +3402,6 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+#, fuzzy
+msgctxt "filter"
 msgid "H"
 msgstr "H"
@@ -3363,4 +3409,5 @@
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
+msgctxt "filter"
 msgid "Text"
 msgstr "テキスト"
@@ -3368,4 +3415,6 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
+#, fuzzy
+msgctxt "filter"
 msgid "C"
 msgstr "C"
@@ -3373,4 +3422,6 @@
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
+#, fuzzy
+msgctxt "filter"
 msgid "I"
 msgstr "I"
@@ -3378,4 +3429,6 @@
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
+#, fuzzy
+msgctxt "filter"
 msgid "M"
 msgstr "M"
@@ -3384,4 +3437,6 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
+#, fuzzy
+msgctxt "filter"
 msgid "R"
 msgstr "R"
@@ -3389,4 +3444,6 @@
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
+#, fuzzy
+msgctxt "filter"
 msgid "A"
 msgstr "A"
@@ -3394,4 +3451,6 @@
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
+#, fuzzy
+msgctxt "filter"
 msgid "D"
 msgstr "D"
@@ -3399,60 +3458,44 @@
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
+#, fuzzy
+msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:264
-#, java-format
-msgid "Expected ID >= 0. Got {0}."
-msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:401
-msgid "A primitive with ID = 0 can't be invisible."
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:652
-#, java-format
-msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-msgstr "パラメータ ''{0}'' >= 0 が期待されています、入力値 {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
-#, java-format
-msgid ""
-"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is "
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#, java-format
+msgid ""
+"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
 "{0}"
-msgstr "変更セットID > 0 は新しいプリミティブには割り当てられません。変更セットの値は {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
-msgid ""
-"Can't merge because either of the participating primitives is new and the "
+msgstr ""
+"変更セットID > 0 は新しいプリミティブには割り当てられません。変更セットの値"
+"は {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+msgid ""
+"Cannot merge because either of the participating primitives is new and the "
 "other is not"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1042
-#, java-format
-msgid ""
-"Can''t merge primitives with different ids. This id is {0}, the other is {1}"
-msgstr "異なるIDのプリミティブはマージできません。こちらのIDは{0}です、相手は {1}です"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
-#, 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:48
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:55
-#, java-format
-msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-msgstr "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取りました"
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#, java-format
+msgid ""
+"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
+msgstr ""
+"異なるIDのプリミティブはマージできません。こちらのIDは{0}です、相手は {1}です"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
@@ -3461,7 +3504,9 @@
 #: ../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 "
+"Tag collection cannot be applied to a primitive because there are keys with "
 "multiple values."
-msgstr "タグコレクションをプリミティブに適用できません。複数の値を持つキーがあります。"
+msgstr ""
+"タグコレクションをプリミティブに適用できません。複数の値を持つキーがありま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
@@ -3471,32 +3516,9 @@
 msgstr "ノード {0} を不完全なウェイ {1} に追加できません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected, got {1}"
-msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
-#, 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/HistoryOsmPrimitive.java:34
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:88
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:115
-#, java-format
-msgid ""
-"Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#, java-format
+msgid "Cannot 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
@@ -3545,17 +3567,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
+msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-msgid "The \"to\" way doesn't start or end at a \"via\" node."
+msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
-msgid "The \"to\" way doesn't start or end at the \"via\" way."
+msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
@@ -3630,5 +3652,5 @@
 #. darker blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
@@ -3666,5 +3688,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。NTF<->RGF93 グリッドを読み込めません。"
+"警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。"
+"NTF<->RGF93 グリッドを読み込めません。"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -3761,7 +3784,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
+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:78
@@ -3795,5 +3818,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "railway"
 msgstr "鉄道"
@@ -3812,5 +3835,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
@@ -3837,33 +3860,33 @@
 msgstr "変更セット {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:75
 msgid "Precondition violation"
 msgstr "前提条件違反"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 msgid "Security exception"
 msgstr "セキュリティ例外"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:127
 msgid "Network exception"
 msgstr "ネットワーク例外"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:145
 msgid "IO Exception"
 msgstr "IO 例外"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:178
 msgid "Internal Server Error"
 msgstr "サーバの内部エラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:194
 msgid "Bad Request"
 msgstr "不正な要求"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:210
 msgid "Not Found"
 msgstr "見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
@@ -3871,17 +3894,22 @@
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249
 msgid "Authentication Failed"
 msgstr "認証に失敗しました"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
 msgid "Authorisation Failed"
 msgstr "認証失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:282
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
+#, fuzzy
+msgid "Authenticationi failed"
+msgstr "認証に失敗しました"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299
 msgid "Unknown host"
 msgstr "不明なホスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:385
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:407
 msgid "Object deleted"
 msgstr "オブジェクトは削除されました"
@@ -3906,9 +3934,9 @@
 msgstr "クリックしてダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:84
-#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:102
+#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr "パラメータ \"{0}\" は空白を想定していますが、現在 \"{1}\" になっています。"
+msgstr ""
+"パラメータ \"{0}\" は空白を想定していますが、現在 \"{1}\" になっています。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3949,5 +3977,7 @@
 "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か、ファイル名を指定できます。"
+msgstr ""
+"それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイ"
+"ル名を指定できます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -3956,5 +3986,6 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURLかファイル名で指定できます。"
+"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURL"
+"かファイル名で指定できます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -3962,5 +3993,7 @@
 "Add each to the initial selection. Can be a google-like search string or an "
 "URL which returns osm-xml"
-msgstr "それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返すURLで指定できます。"
+msgstr ""
+"それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返"
+"すURLで指定できます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
@@ -4053,5 +4086,6 @@
 "megabytes"
 msgstr ""
-"お知らせ: いくつかの作業で、JOSM は大量のメモリを消費します。JOSM起動時に以下のJavaオプションを使用して\n"
+"お知らせ: いくつかの作業で、JOSM は大量のメモリを消費します。JOSM起動時に以下"
+"のJavaオプションを使用して\n"
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
@@ -4062,5 +4096,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
-"Parameters --download, --downloadgps and --selection are processed in this "
+"Parameters --download, --downloadgps, and --selection are processed in this "
 "order."
 msgstr ""
@@ -4070,34 +4104,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "初期化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:224
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4110,14 +4144,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
 msgid "Edit"
 msgstr "編集"
@@ -4188,49 +4222,51 @@
 msgstr "拡大・縮小"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The geographic longitude at the mouse pointer."
 msgstr "マウスポインターで示される地理経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The name of the object at the mouse pointer."
 msgstr "マウスポインターで示されるオブジェクトの名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The geographic latitude at the mouse pointer."
 msgstr "マウスポインターで示される地理緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The angle between the previous and the current way segment."
 msgstr "これより前のウェイセグメントとこのウェイセグメントの間の角度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "描かれている線分の(コンパスの)向き"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr "描きたい新規ウェイセグメントの長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
 "this list with the mouse.<hr>"
-msgstr "繰り返すには再び真中をクリックしてください。<br> CTRL キーを押しつづけるとマウスでこの表から直接選べます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
+msgstr ""
+"繰り返すには再び真中をクリックしてください。<br> CTRL キーを押しつづけるとマ"
+"ウスでこの表から直接選べます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
 msgid "(no object)"
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
 msgstr "ユーザ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:371
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:376
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:393
 msgid "Layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:619
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:628
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4263,6 +4299,6 @@
 "relation</strong>.</html>"
 msgstr ""
-"<html><strong>1 オブジェクト</strong> を<strong>1 リレーション</strong> "
-"から削除して良いか確認してください。</html>"
+"<html><strong>1 オブジェクト</strong> を<strong>1 リレーション</strong> から"
+"削除して良いか確認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
@@ -4273,6 +4309,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html><strong>1 オブジェクト</strong> を<strong>{0} リレーション</strong> "
-"から削除して良いか確認してください。</html>"
+"<html><strong>1 オブジェクト</strong> を<strong>{0} リレーション</strong> か"
+"ら削除して良いか確認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4311,5 +4347,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4327,5 +4363,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4334,5 +4370,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
@@ -4341,5 +4377,5 @@
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
@@ -4351,14 +4387,14 @@
 msgstr "ロール {0} は比較ペア {1} に参加していません"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr "プロパティ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4366,6 +4402,6 @@
 msgstr "タグ"
 
-#: ../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/conflict/pair/ConflictResolver.java:112
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:243
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4373,116 +4409,116 @@
 msgstr "ノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:166
 msgid "No pending tag conflicts to be resolved"
 msgstr "解決が必要な保留中のタグ競合はありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
-#, java-format
-msgid "Tags({0} conflicts)"
-msgstr "タグ({0} 競合)"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, java-format
-msgid "{0} pending tag conflicts to be resolved"
-msgstr "解決待ちの保留中タグ競合 {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
+#, fuzzy, java-format
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "タグ({0} 競合)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
+#, fuzzy, java-format
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "解決待ちの保留中タグ競合 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid "Nodes(resolved)"
 msgstr "ノード(解決済み)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr "結合されたノードリストを固定しました。このウェイのノードリストには保留中の競合はありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
+msgstr ""
+"結合されたノードリストを固定しました。このウェイのノードリストには保留中の競"
+"合はありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Nodes(with conflicts)"
 msgstr "ノード(競合あり)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:182
 msgid "Pending conflicts in the node list of this way"
 msgstr "このウェイのノードリスト内の保留中競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid "Members(resolved)"
 msgstr "メンバー(解決済み)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
 "relation"
-msgstr "結合されたメンバーリストを固定しました。このリレーションのメンバーリストには保留中の競合はありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
+msgstr ""
+"結合されたメンバーリストを固定しました。このリレーションのメンバーリストには"
+"保留中の競合はありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Members(with conflicts)"
 msgstr "メンバー(競合あり)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
 msgid "Pending conflicts in the member list of this relation"
 msgstr "このリレーションのメンバーリスト内の保留中競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
 msgid "No pending property conflicts"
 msgstr "保留中のプロパティ競合はありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Properties(with conflicts)"
 msgstr "プロパティ(競合あり)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:203
 msgid "Pending property conflicts to be resolved"
 msgstr "解決が必要な保留中競合プロパティ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "競合の解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:374
-#, java-format
-msgid "Parameter current out of range. Got {0}."
-msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:610
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "ロール {0} のリストは現在比較ペアに参加していません"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
 #, java-format
 msgid "Item {0} not found in list."
 msgstr "アイテム {0} はリストに見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
 msgid "lock scrolling"
 msgstr "スクロールをロック"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
 msgid "Compare "
 msgstr "比較 "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
 msgid "My version"
 msgstr "自分のバージョン"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "自分のデータセットの要素リスト、例：ローカルデータセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
@@ -4490,88 +4526,93 @@
 msgstr "結合したバージョン"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
 "decisions are applied."
-msgstr "結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられるでしょう。"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272
+msgstr ""
+"結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられ"
+"るでしょう。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
 msgid "Their version"
 msgstr "相手のバージョン"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "相手のデータセットの要素リスト、例：サーバデータセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
 msgid "> top"
 msgstr "> 先頭"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "選択したノードを結合されたノードリストの先頭にコピー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
 msgid "> bottom"
 msgstr "> 最後"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
 msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "選択した要素を結合された要素リストの最後にコピー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
 "merged elements."
-msgstr "選択した要素を、結合された要素リストから選択している最初の要素の前にコピー"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495
+msgstr ""
+"選択した要素を、結合された要素リストから選択している最初の要素の前にコピー"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
 "merged elements."
-msgstr "選択した要素を、結合された要素リストから選択している最初の要素の後にコピー"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524
+msgstr ""
+"選択した要素を、結合された要素リストから選択している最初の要素の後にコピー"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
 msgstr "相手の選択した要素を、結合された要素リストの先頭にコピー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr "相手の選択した要素を、結合された要素リストの最後にコピー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
 msgid ""
 "Copy their selected elements before the first selected element in the list "
 "of merged elements."
-msgstr "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597
+msgstr ""
+"相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
 msgid ""
 "Copy their selected element after the first selected element in the list of "
 "merged elements"
-msgstr "相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624
+msgstr ""
+"相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Up"
 msgstr "上"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
 msgid "Move up the selected elements by one position."
 msgstr "同じ位置で選択した要素を上に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Down"
 msgstr "下"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
 msgid "Move down the selected entries by one position."
 msgstr "同じ位置で選択したエントリを下に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
@@ -4582,41 +4623,45 @@
 msgstr "削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
 msgid "Remove the selected entries from the list of merged elements."
 msgstr "結合された要素のリストから選択したエントリを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
 msgid "Freeze"
 msgstr "固定"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
 msgid "Freeze the current list of merged elements."
 msgstr "結合された要素の現在のリストを固定"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
 msgid "Unfreeze"
 msgstr "固定解除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
 msgid "Unfreeze the list of merged elements and start merging."
 msgstr "結合された要素のリスト固定を解除して結合をはじめる"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778
-#, java-format
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
-msgstr "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783
-#, java-format
-msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を完了</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:779
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
+msgstr ""
+"<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:784
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr ""
+"<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を完了</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:802
 #, java-format
 msgid "My version ({0} entry)"
@@ -4624,5 +4669,5 @@
 msgstr[0] "自分のバージョン ({0} エントリ)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:805
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4630,5 +4675,5 @@
 msgstr[0] "結合したバージョン ({0} エントリ)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:808
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4636,13 +4681,14 @@
 msgstr[0] "相手のバージョン ({0} エントリ)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:871
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
 #, java-format
 msgid ""
-"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
 "adjustment."
-msgstr "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887
+msgstr ""
+"調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:886
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
 #, java-format
@@ -4654,19 +4700,13 @@
 msgstr "ノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70
-msgid "Merged nodes not frozen yet. Can't build resolution command."
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "結合したノードがまだ固定されていません。解決コマンドをビルドできません"
 
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:180
-#, java-format
-msgid "Unexpected column index. Got {0}."
-msgstr "予期せぬカラムインデックス。入力値: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr "<html>サーバとの通信中にエラー発生<br>詳細: {0}</html>"
 
@@ -4676,37 +4716,42 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
 msgid "Yes, undelete them too"
 msgstr "はい、これも削除を取り消します"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:500
 msgid "No, cancel operation"
 msgstr "いいえ、操作をキャンセルします"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, java-format
-msgid ""
-"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
-"the server.<br><br>Do you want to undelete these nodes too?</html>"
-msgstr ""
-"<html>サーバーから削除されたウェイ{1}に<br>付加された {0} "
-"個のノードがあります。<br><br>これらのノードも復活させたいですか?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475
+#, fuzzy, java-format
+msgid ""
+"There is {0} additional node used by way {1}<br>which is deleted on the "
+"server.<br><br>Do you want to undelete this node too?"
+msgid_plural ""
+"There are {0} additional nodes used by way {1}<br>which are deleted on the "
+"server.<br><br>Do you want to undelete these nodes too?"
+msgstr[0] ""
+"<html>サーバーから削除されたウェイ{1}に<br>付加された {0} 個のノードがありま"
+"す。<br><br>これらのノードも復活させたいですか?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
 msgid "Undelete additional nodes?"
 msgstr "追加のノードの削除を取り消しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
-#, java-format
-msgid ""
-"<html>There are {0} additional primitives referred to by relation "
-"{1}<br>which are deleted on the server.<br><br>Do you want to undelete them "
-"too?</html>"
-msgstr ""
-"<html>サーバーから削除されたリレーション{1}に<br>参照されていた {0} "
-"個のプリミティブがあります。<br><br>これらも復活させたいですか?</html>"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
+#, fuzzy, java-format
+msgid ""
+"There is {0} additional primitive referred to by relation {1}<br>which is "
+"deleted on the server.<br><br>Do you want to undelete this too?"
+msgid_plural ""
+"There are {0} additional primitives referred to by relation {1}<br>which are "
+"deleted on the server.<br><br>Do you want to undelete these too?"
+msgstr[0] ""
+"<html>サーバーから削除されたリレーション{1}に<br>参照されていた {0} 個のプリ"
+"ミティブがあります。<br><br>これらも復活させたいですか?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
 msgid "Undelete dependent primitives?"
 msgstr "依存するプリミティブの削除を取り消しますか？"
@@ -4720,5 +4765,7 @@
 "Properties in the merged element. They will replace properties in my "
 "elements when merge decisions are applied."
-msgstr "結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプロパティを置換します。"
+msgstr ""
+"結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプ"
+"ロパティを置換します。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
@@ -4816,6 +4863,7 @@
 "yo agree?</html>"
 msgstr ""
-"<html>あなたのローカルバージョンを残すために、JOSMは<br>プリミティブ {0} のID "
-"を0にリセットしなければなりません。<br>次回のアップロード時にサーバが新しいidを割り当てます。<br>よろしいですか？</html>"
+"<html>あなたのローカルバージョンを残すために、JOSMは<br>プリミティブ {0} の"
+"ID を0にリセットしなければなりません。<br>次回のアップロード時にサーバが新し"
+"いidを割り当てます。<br>よろしいですか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
@@ -4837,6 +4885,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM はid {0} "
-"のあなたのローカルプリミティブをデータセットから<br>削除しなければなりません。<br>よろしいですか？</html>"
+"<html>JOSM はid {0} のあなたのローカルプリミティブをデータセットから<br>削除"
+"しなければなりません。<br>よろしいですか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
@@ -4853,6 +4901,6 @@
 msgstr "プリミティブ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr "結合したノードはまだ固定されていません。解決コマンドをビルドできません"
 
@@ -4885,6 +4933,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4898,6 +4946,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4910,13 +4958,7 @@
 msgstr "値"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99
 msgid "Cannot apply undecided tag merge item."
 msgstr "未決のタグ結合アイテムを適用できません"
-
-#. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
-#, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}."
-msgstr "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
@@ -4927,9 +4969,4 @@
 msgid "Their version (server dataset)"
 msgstr "相手のバージョン (サーバデータセット)"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284
-msgid ">"
-msgstr ">"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
@@ -4986,10 +5023,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
 msgid "Apply"
 msgstr "適用"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
@@ -4997,5 +5034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "all"
 msgstr "全て"
@@ -5024,22 +5061,13 @@
 msgstr "''{0}'' として連結された値は全てキー ''{1}'' に適用されます"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
-#, java-format
-msgid "Parameter ''{0}'' must not be empty."
-msgstr "パラメータ ''{0}'' は空以外でなければなりません"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
-#, java-format
-msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-msgstr "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されています。 {1} を受けとりました。"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "Tag collection doesn't include the selected value ''{0}''."
+#, java-format
+msgid "Tag collection does not include the selected value ''{0}''."
 msgstr "タグコレクションには選択された値 ''{0}'' が含まれていません"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:250
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
 msgid "Not decided yet."
 msgstr "未決定です"
@@ -5083,5 +5111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
@@ -5092,5 +5120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
@@ -5140,5 +5168,7 @@
 "<html>Select to enable entering a tag which will be applied<br>to all "
 "modified relations.</html>"
-msgstr "<html>選択してタグの入力を有効化。全ての変更されたリレーションに<br>適用されます。</html>"
+msgstr ""
+"<html>選択してタグの入力を有効化。全ての変更されたリレーションに<br>適用され"
+"ます。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
@@ -5149,5 +5179,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5158,5 +5189,7 @@
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
-msgstr "<html>タグの値を入力してください、例）<strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>タグの値を入力してください、例）<strong><tt>check members</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5204,30 +5237,31 @@
 msgstr "複数の値を持つタグのみを表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
 msgid "For selected objects only"
 msgstr "選択したオブジェクトのみ表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:167
-msgid ""
-"<html>Select to show changesets for the currently selected objects "
-"only.<br>Unselect to show all changesets for objects in the current data "
-"layer.</html>"
-msgstr ""
-"<html>選択して現在選択中のオブジェクトだけを表示。<br>選択解除して現在のデータレイヤ内のオブジェクトに対する変更セットを表示。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
+msgid ""
+"<html>Select to show changesets for the currently selected objects only."
+"<br>Unselect to show all changesets for objects in the current data layer.</"
+"html>"
+msgstr ""
+"<html>選択して現在選択中のオブジェクトだけを表示。<br>選択解除して現在のデー"
+"タレイヤ内のオブジェクトに対する変更セットを表示。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
 msgstr "変更セット"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
 msgid "Open the list of changesets in the current layer."
 msgstr "現在のレイヤーにある変更セット一覧を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr "現在選択された変更セットに割り当てられている全てのオブジェクトを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
@@ -5235,27 +5269,26 @@
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:365
-msgid ""
-"Download information about the selected changesets from the OSM server"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360
+msgid "Download information about the selected changesets from the OSM server"
 msgstr "OSMサーバから選択された変更セットについての情報をダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:400
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395
 msgid "Closes the selected open changesets"
 msgstr "選択されたオープン済み変更セットを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:431
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:426
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180
 msgid "Show info"
 msgstr "情報を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427
 msgid "Open a web page for each selected changeset"
 msgstr "選択された変更セットそれぞれにウェブページを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:466
 msgid "Details"
 msgstr "詳細"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr "変更セットマネージャを開く"
@@ -5273,11 +5306,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5299,13 +5332,13 @@
 msgstr "競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
 msgid "Resolve"
 msgstr "解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "上記リストの全てのアイテムを結合するダイアログを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
@@ -5337,10 +5370,9 @@
 #, java-format
 msgid ""
-"<html>You didn''t finish to merge the differences in this "
-"conflict.<br>Conflict resolutions won't be applied unless all "
-"differences<br>are resolved.Click <strong>{0}</strong> to close "
-"anyway.<strong>Already<br>resolved differences won't be "
-"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
-"conflicts.</html>"
+"<html>You did not finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
 
@@ -5358,17 +5390,17 @@
 msgstr "''{0}'' の競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
 msgid "Filter objects and hide/disable them."
 msgstr "オブジェクトにフィルターをかけ、非表示/無効にします。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5415,18 +5447,18 @@
 msgstr "フィルターモード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 msgid "History"
 msgstr "履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
 msgid "Display the history of all selected items."
 msgstr "選択したアイテムすべての履歴の表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
 msgid "Object with history"
 msgstr "履歴があるオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
@@ -5436,59 +5468,55 @@
 msgstr "再読込"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "現在選択しているオブジェクトを再読み込みし、リストを再作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
 msgid "Show"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
 msgid "Display the history of the selected objects."
 msgstr "選択したオブジェクトの履歴を表示。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してください"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
 msgid "Layers"
 msgstr "レイヤー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Open a list of all loaded layers."
 msgstr "全ての読み込んだレイヤーのリストを開きます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
 msgid "Delete the selected layers."
 msgstr "選択したレイヤーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
 msgid "Show/Hide"
 msgstr "表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
 msgid "Toggle visible state of the selected layer."
 msgstr "選択したレイヤーの表示状態を切り替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
 msgid "Activate the selected layer"
 msgstr "選択されたレイヤーを有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
 msgid "Merge this layer into another layer"
 msgstr "このレイヤーを他のレイヤーに結合"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:536
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
@@ -5503,5 +5531,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3016
 msgid "Relations"
 msgstr "リレーション"
@@ -5529,5 +5557,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
@@ -5570,30 +5598,32 @@
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
 #, java-format
 msgid "Selection: {0}"
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:357
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr "このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:372
+msgstr ""
+"このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができ"
+"ます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:382
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -5601,5 +5631,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:143
 msgid "Authors"
 msgstr "作者"
@@ -5609,5 +5639,5 @@
 msgstr "選択したオブジェクトで作業した人たちのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
 #, java-format
 msgid "{0} Author"
@@ -5615,38 +5645,41 @@
 msgstr[0] "{0} 作者"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:150
 msgid "Select primitives submitted by this user"
 msgstr "このユーザが登録したプリミティブを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 msgid "Launches a browser with information about the user"
 msgstr "ユーザについての情報付きでブラウザを起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:193
 #, java-format
 msgid ""
 "Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr "警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:212
+msgstr ""
+"警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
 #, java-format
 msgid ""
 "<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
 "this system.</html>"
-msgstr "<html>URLの生成に失敗しました。指定したエンコーディング ''{0}''<br>はこの環境では利用できません。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
+msgstr ""
+"<html>URLの生成に失敗しました。指定したエンコーディング ''{0}''<br>はこの環境"
+"では利用できません。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:218
 msgid "Missing encoding"
 msgstr "エンコーディングがありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:268
 msgid "<new object>"
 msgstr "<新しいオブジェクト>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
 msgid "Author"
 msgstr "作者"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
 msgid "# Objects"
 msgstr "# オブジェクト"
@@ -5722,10 +5755,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
 msgid ""
-"<html>JOSM is currently running with an anonymous user. It can't "
+"<html>JOSM is currently running with an anonymous user. It cannot "
 "download<br>your changesets from the OSM server unless you enter your OSM "
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
-"<html>現在 JOSM "
-"は匿名ユーザで起動しています。<br>環境設定でOSMのユーザ名を設定しないとあなたの変更セットをダウンロードすることはできません。</html>"
+"<html>現在 JOSM は匿名ユーザで起動しています。<br>環境設定でOSMのユーザ名を設"
+"定しないとあなたの変更セットをダウンロードすることはできません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -5735,10 +5768,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
-msgctxt "changeset.open"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
+msgctxt "changeset.state"
 msgid "Open"
 msgstr "開く"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
-msgctxt "changeset.open"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
+msgctxt "changeset.state"
 msgid "Closed"
 msgstr ""
@@ -5746,5 +5781,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:154
 msgid "anonymous"
 msgstr "匿名"
@@ -5759,5 +5794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
 msgid "User"
 msgstr "ユーザ"
@@ -5771,24 +5806,18 @@
 msgstr "保存日時"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:109
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179
 msgid "Downloading changeset content"
 msgstr "変更セットをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:96
-#, java-format
-msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-msgstr "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
 msgstr "変更セット {2} をダウンロード中。({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
@@ -5841,10 +5870,12 @@
 #, java-format
 msgid ""
-"<html>The selected object isn''t available in the current<br>edit layer "
+"<html>The selected object is not available in the current<br>edit layer "
 "''{0}''.</html>"
 msgid_plural ""
 "<html>None of the selected objects is available in the current<br>edit layer "
 "''{0}''.</html>"
-msgstr[0] "<html>選択したオブジェクトは現在の編集レイヤー  ''{0}' 上にありません。</html>"
+msgstr[0] ""
+"<html>選択したオブジェクトは現在の編集レイヤー  ''{0}' 上にありません。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5915,4 +5946,7 @@
 #. <space />
 #. <key key="highway" value="living_street" />
+#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
+#. <space />
+#. <key key="highway" value="pedestrian" />
 #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #. <space />
@@ -5938,81 +5972,41 @@
 #. <key key="highway" value="construction" />
 #. <optional>
-#. item "Ways/Bridleway" label "Edit Bridleway"
-#. <space />
-#. <key key="highway" value="bridleway" />
-#. <optional>
-#. item "Ways/Cycleway" label "Edit Cycleway"
-#. <space />
-#. <key key="highway" value="cycleway" />
-#. <optional>
-#. item "Ways/Footway" label "Edit Footway"
-#. <space />
-#. <key key="highway" value="footway" />
-#. <optional>
-#. item "Ways/Pedestrian" label "Edit Pedestrian Street"
-#. <space />
-#. <key key="highway" value="pedestrian" />
-#. item "Ways/Steps" label "Edit Flight of Steps"
-#. <space />
-#. <key key="highway" value="steps" />
-#. <optional>
 #. item "Ways/Track" label "Edit Track"
 #. <space />
 #. <key key="highway" value="track" />
 #. <optional>
-#. item "Ways/Track Grade 1" label "Edit Track of grade 1"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade1" />
-#. <optional>
-#. item "Ways/Track Grade 2" label "Edit Track of grade 2"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade2" />
-#. <optional>
-#. item "Ways/Track Grade 3" label "Edit Track of grade 3"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade3" />
-#. <optional>
-#. item "Ways/Track Grade 4" label "Edit Track of grade 4"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade4" />
-#. <optional>
-#. item "Ways/Track Grade 5" label "Edit Track of grade 5"
-#. <space />
-#. <key key="highway" value="track" />
-#. <key key="tracktype" value="grade5" />
-#. <optional>
-#. item "Ways/Hiking" label "Edit Hiking"
+#. item "Ways/Path" label "Edit Path"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="hiking" />
 #. <optional>
-#. item "Ways/Mountain Hiking" label "Edit Mountain Hiking"
+#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
+#. <space />
+#. <key key="highway" value="bridleway" />
+#. <optional>
+#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="cycleway" />
+#. <optional>
+#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="mountain_hiking" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="yes" />
 #. <optional>
-#. item "Ways/Demanding Mountain Hiking" label "Edit Demanding Mountain Hiking"
+#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
 #. <space />
 #. <key key="highway" value="path" />
-#. <key key="sac_scale" value="demanding_mountain_hiking" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="no" />
 #. <optional>
-#. item "Ways/Alpine Hiking" label "Edit Alpine Hiking"
+#. item "Ways/Dedicated Footway" label "Edit Footway"
 #. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="alpine_hiking" />
+#. <key key="highway" value="footway" />
 #. <optional>
-#. item "Ways/Demanding Alpine Hiking" label "Edit Demanding Alpine Hiking"
+#. item "Ways/Steps" label "Edit Flight of Steps"
 #. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="demanding_alpine_hiking" />
-#. <optional>
-#. item "Ways/Difficult Alpine Hiking" label "Edit Difficult Alpine Hiking"
-#. <space />
-#. <key key="highway" value="path" />
-#. <key key="sac_scale" value="difficult_alpine_hiking" />
+#. <key key="highway" value="steps" />
 #. <optional>
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
@@ -6631,5 +6625,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6637,149 +6631,144 @@
 #: 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: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:1425 build/trans_presets.java:1433
-#: build/trans_presets.java:1440 build/trans_presets.java:1449
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 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: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:1846
-#: build/trans_presets.java:1851 build/trans_presets.java:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1868
-#: build/trans_presets.java:1874 build/trans_presets.java:1879
-#: build/trans_presets.java:1888 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1930
-#: 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:2022 build/trans_presets.java:2029
-#: build/trans_presets.java:2038 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:2142
-#: build/trans_presets.java:2156 build/trans_presets.java:2162
-#: build/trans_presets.java:2168 build/trans_presets.java:2175
-#: build/trans_presets.java:2182 build/trans_presets.java:2190
-#: build/trans_presets.java:2197 build/trans_presets.java:2203
-#: build/trans_presets.java:2210 build/trans_presets.java:2216
-#: build/trans_presets.java:2222 build/trans_presets.java:2228
-#: build/trans_presets.java:2236 build/trans_presets.java:2243
-#: build/trans_presets.java:2250 build/trans_presets.java:2257
-#: build/trans_presets.java:2265 build/trans_presets.java:2297
-#: build/trans_presets.java:2302 build/trans_presets.java:2312
-#: build/trans_presets.java:2317 build/trans_presets.java:2323
-#: build/trans_presets.java:2329 build/trans_presets.java:2346
-#: build/trans_presets.java:2352 build/trans_presets.java:2358
-#: build/trans_presets.java:2364 build/trans_presets.java:2370
-#: build/trans_presets.java:2380 build/trans_presets.java:2387
-#: build/trans_presets.java:2482 build/trans_presets.java:2489
-#: build/trans_presets.java:2504 build/trans_presets.java:2512
-#: build/trans_presets.java:2517 build/trans_presets.java:2523
-#: build/trans_presets.java:2530 build/trans_presets.java:2537
-#: build/trans_presets.java:2543 build/trans_presets.java:2549
-#: build/trans_presets.java:2571 build/trans_presets.java:2578
-#: build/trans_presets.java:2585 build/trans_presets.java:2591
-#: build/trans_presets.java:2598 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2616
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2642
-#: build/trans_presets.java:2649 build/trans_presets.java:2655
-#: build/trans_presets.java:2661 build/trans_presets.java:2667
-#: build/trans_presets.java:2673 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2693
-#: build/trans_presets.java:2700 build/trans_presets.java:2706
-#: build/trans_presets.java:2712 build/trans_presets.java:2722
-#: build/trans_presets.java:2731 build/trans_presets.java:2746
-#: build/trans_presets.java:2752 build/trans_presets.java:2760
-#: build/trans_presets.java:2767 build/trans_presets.java:2787
-#: build/trans_presets.java:2798 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2816
-#: build/trans_presets.java:2822 build/trans_presets.java:2829
-#: build/trans_presets.java:2836 build/trans_presets.java:2843
-#: build/trans_presets.java:2849 build/trans_presets.java:2855
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2877 build/trans_presets.java:2884
-#: build/trans_presets.java:2890 build/trans_presets.java:2897
-#: build/trans_presets.java:2904 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2937
-#: build/trans_presets.java:2946 build/trans_presets.java:2956
-#: build/trans_presets.java:2965 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3003 build/trans_presets.java:3009
-#: build/trans_presets.java:3015 build/trans_presets.java:3021
-#: build/trans_presets.java:3027 build/trans_presets.java:3033
-#: build/trans_presets.java:3039 build/trans_presets.java:3046
-#: build/trans_presets.java:3052 build/trans_presets.java:3057
-#: build/trans_presets.java:3064 build/trans_presets.java:3071
-#: build/trans_presets.java:3077 build/trans_presets.java:3086
-#: build/trans_presets.java:3094 build/trans_presets.java:3100
-#: build/trans_presets.java:3106 build/trans_presets.java:3113
-#: build/trans_presets.java:3119 build/trans_presets.java:3126
-#: build/trans_presets.java:3132 build/trans_presets.java:3138
-#: build/trans_presets.java:3144 build/trans_presets.java:3150
-#: build/trans_presets.java:3163 build/trans_presets.java:3177
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:282 build/trans_presets.java:302
+#: build/trans_presets.java:335 build/trans_presets.java:381
+#: build/trans_presets.java:401 build/trans_presets.java:416
+#: build/trans_presets.java:433 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:548
+#: build/trans_presets.java:570 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:628
+#: build/trans_presets.java:637 build/trans_presets.java:684
+#: build/trans_presets.java:705 build/trans_presets.java:714
+#: build/trans_presets.java:774 build/trans_presets.java:925
+#: build/trans_presets.java:933 build/trans_presets.java:941
+#: build/trans_presets.java:949 build/trans_presets.java:959
+#: build/trans_presets.java:967 build/trans_presets.java:972
+#: build/trans_presets.java:979 build/trans_presets.java:986
+#: build/trans_presets.java:991 build/trans_presets.java:999
+#: build/trans_presets.java:1008 build/trans_presets.java:1014
+#: build/trans_presets.java:1020 build/trans_presets.java:1025
+#: build/trans_presets.java:1031 build/trans_presets.java:1037
+#: build/trans_presets.java:1046 build/trans_presets.java:1055
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1083 build/trans_presets.java:1089
+#: build/trans_presets.java:1098 build/trans_presets.java:1104
+#: build/trans_presets.java:1110 build/trans_presets.java:1118
+#: build/trans_presets.java:1174 build/trans_presets.java:1221
+#: build/trans_presets.java:1227 build/trans_presets.java:1233
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1256 build/trans_presets.java:1265
+#: build/trans_presets.java:1280 build/trans_presets.java:1286
+#: build/trans_presets.java:1294 build/trans_presets.java:1301
+#: build/trans_presets.java:1310 build/trans_presets.java:1318
+#: build/trans_presets.java:1329 build/trans_presets.java:1339
+#: build/trans_presets.java:1349 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_presets.java:1392
+#: build/trans_presets.java:1412 build/trans_presets.java:1419
+#: build/trans_presets.java:1435 build/trans_presets.java:1442
+#: build/trans_presets.java:1447 build/trans_presets.java:1453
+#: build/trans_presets.java:1459 build/trans_presets.java:1464
+#: build/trans_presets.java:1470 build/trans_presets.java:1476
+#: build/trans_presets.java:1484 build/trans_presets.java:1492
+#: build/trans_presets.java:1500 build/trans_presets.java:1507
+#: build/trans_presets.java:1513 build/trans_presets.java:1520
+#: build/trans_presets.java:1527 build/trans_presets.java:1535
+#: build/trans_presets.java:1542 build/trans_presets.java:1550
+#: build/trans_presets.java:1557 build/trans_presets.java:1563
+#: build/trans_presets.java:1570 build/trans_presets.java:1577
+#: build/trans_presets.java:1584 build/trans_presets.java:1601
+#: build/trans_presets.java:1609 build/trans_presets.java:1624
+#: build/trans_presets.java:1634 build/trans_presets.java:1646
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1669 build/trans_presets.java:1674
+#: build/trans_presets.java:1682 build/trans_presets.java:1689
+#: build/trans_presets.java:1695 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1712
+#: build/trans_presets.java:1717 build/trans_presets.java:1722
+#: build/trans_presets.java:1729 build/trans_presets.java:1735
+#: build/trans_presets.java:1740 build/trans_presets.java:1749
+#: build/trans_presets.java:1758 build/trans_presets.java:1767
+#: build/trans_presets.java:1776 build/trans_presets.java:1785
+#: build/trans_presets.java:1791 build/trans_presets.java:1799
+#: build/trans_presets.java:1805 build/trans_presets.java:1811
+#: build/trans_presets.java:1817 build/trans_presets.java:1823
+#: build/trans_presets.java:1829 build/trans_presets.java:1835
+#: build/trans_presets.java:1841 build/trans_presets.java:1847
+#: build/trans_presets.java:1853 build/trans_presets.java:1859
+#: build/trans_presets.java:1865 build/trans_presets.java:1871
+#: build/trans_presets.java:1877 build/trans_presets.java:1883
+#: build/trans_presets.java:1890 build/trans_presets.java:1899
+#: build/trans_presets.java:1907 build/trans_presets.java:1913
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:1931 build/trans_presets.java:1937
+#: 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:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2036 build/trans_presets.java:2043
+#: build/trans_presets.java:2051 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2097
+#: build/trans_presets.java:2104 build/trans_presets.java:2111
+#: build/trans_presets.java:2118 build/trans_presets.java:2126
+#: build/trans_presets.java:2158 build/trans_presets.java:2163
+#: build/trans_presets.java:2173 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2190
+#: build/trans_presets.java:2207 build/trans_presets.java:2213
+#: build/trans_presets.java:2219 build/trans_presets.java:2225
+#: build/trans_presets.java:2231 build/trans_presets.java:2241
+#: build/trans_presets.java:2248 build/trans_presets.java:2343
+#: build/trans_presets.java:2350 build/trans_presets.java:2365
+#: build/trans_presets.java:2373 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2391
+#: build/trans_presets.java:2398 build/trans_presets.java:2404
+#: build/trans_presets.java:2410 build/trans_presets.java:2432
+#: build/trans_presets.java:2439 build/trans_presets.java:2446
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2465 build/trans_presets.java:2471
+#: build/trans_presets.java:2477 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2510
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2528 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2583 build/trans_presets.java:2592
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2621 build/trans_presets.java:2628
+#: build/trans_presets.java:2648 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2677 build/trans_presets.java:2683
+#: build/trans_presets.java:2690 build/trans_presets.java:2697
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2724
+#: build/trans_presets.java:2731 build/trans_presets.java:2738
+#: build/trans_presets.java:2745 build/trans_presets.java:2751
+#: build/trans_presets.java:2758 build/trans_presets.java:2765
+#: build/trans_presets.java:2774 build/trans_presets.java:2780
+#: build/trans_presets.java:2786 build/trans_presets.java:2792
+#: build/trans_presets.java:2798 build/trans_presets.java:2807
+#: build/trans_presets.java:2817 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2843 build/trans_presets.java:2849
+#: build/trans_presets.java:2855 build/trans_presets.java:2864
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2882 build/trans_presets.java:2888
+#: build/trans_presets.java:2894 build/trans_presets.java:2900
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2932 build/trans_presets.java:2938
+#: build/trans_presets.java:2947 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2974 build/trans_presets.java:2980
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3011 build/trans_presets.java:3024
+#: build/trans_presets.java:3038 build/trans_presets.java:3052
 msgid "Name"
 msgstr "名前"
@@ -6808,14 +6797,4 @@
 msgid "Closed on:"
 msgstr "保存日時:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
-msgctxt "changeset.state"
-msgid "Open"
-msgstr "開く"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
-msgctxt "changeset.state"
-msgid "Closed"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
@@ -6881,5 +6860,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
 msgid ""
-"The current value isn't a valid changeset ID. Please enter an integer value "
+"The current value is not a valid changeset ID. Please enter an integer value "
 "> 0"
 msgstr "変更セットIDが無効な値です。1以上の整数を入力してください。"
@@ -6941,17 +6920,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
-"Can't restrict changeset query to the current user because the current user "
+"Cannot restrict changeset query to the current user because the current user "
 "is anonymous"
-msgstr "現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
+msgstr ""
+"現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
-msgid "Current value ''{0}'' for user ID isn''t valid"
+msgid "Current value ''{0}'' for user ID is not valid"
 msgstr "ユーザID \"{0}\" は不正な値です。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
-#, java-format
-msgid "Can''t restrict the changeset query to the user name ''{0}''"
-msgstr ""
+#, fuzzy, java-format
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
@@ -6998,6 +6979,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
-"Can't build changeset query with time based restrictions. Input isn't valid."
-msgstr "入力に間違いはありませんが、時間に基づいた変更セットクエリは生成できません。"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"入力に間違いはありませんが、時間に基づいた変更セットクエリは生成できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
@@ -7012,8 +6995,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
-msgid ""
-"Can't restrict the changeset query to a specific bounding box. The input is "
+#, fuzzy
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
 "invalid."
-msgstr ""
+msgstr "指定した境界囲みに関連する変更セットだけを選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -7030,12 +7014,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
-"The current value isn't a valid user ID. Please enter an integer value > 0"
+"The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr "不正なユーザIDが入力されています。1以上の整数を入力してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
-"<html>The  current value isn't a valid user name.<br>Please enter an non-"
+"<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
-msgstr "<html>不正なユーザ名です。<br>ユーザ名は空白以外を指定してください。</html>"
+msgstr ""
+"<html>不正なユーザ名です。<br>ユーザ名は空白以外を指定してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
@@ -7046,7 +7031,9 @@
 #, java-format
 msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr "普段使用する日付の書式で記入してください。br>例: {0}<br>例: {1}<br>例: {2}<br>例: {3}<br>"
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"普段使用する日付の書式で記入してください。br>例: {0}<br>例: {1}<br>例: {2}"
+"<br>例: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
@@ -7075,5 +7062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:174
 msgid "Basic"
 msgstr "基本"
@@ -7150,5 +7137,7 @@
 "Note that changeset queries are currently always submitted to ''{0}'', "
 "regardless of the host, port and path of the URL entered below."
-msgstr "変更セットクエリは現状では常に \"{0}\" に投稿されます。以下のURLに含まれるホスト、ポート、パスは無視されます。"
+msgstr ""
+"変更セットクエリは現状では常に \"{0}\" に投稿されます。以下のURLに含まれるホ"
+"スト、ポート、パスは無視されます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
@@ -7156,5 +7145,5 @@
 msgstr "不正な変更セットクエリURLです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 #, java-format
 msgid "This will change {0} object."
@@ -7162,22 +7151,22 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
 msgid "An empty value deletes the tag."
 msgstr "空の値でタグを削除します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:363
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:296
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7185,5 +7174,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 #, java-format
 msgid "This will change up to {0} object."
@@ -7191,110 +7180,110 @@
 msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:437
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
 msgid "Properties for selected objects."
 msgstr "選択したオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:564
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:566
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation in main selection."
 msgstr "メインの選択肢から条件を選んでください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
 msgid "Download all child relations (recursively)"
 msgstr "全ての子リレーションをダウンロード(再帰的)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
 msgid "Download All Children"
 msgstr "全ての子をダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
 msgid "Download selected relations"
 msgstr "選択したリレーションをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
 msgid "Download Selected Children"
 msgstr "選択した子をダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:449
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:40
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:47
@@ -7302,30 +7291,34 @@
 msgstr "リレーションメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
-msgid "Conflicts in data"
-msgstr "データ内の競合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
-#, java-format
-msgid ""
-"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
+#, fuzzy
+msgid "Conflict in data"
+msgid_plural "Conflicts in data"
+msgstr[0] "データ中に競合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
 "loaded"
-msgstr "<html>子リレーション<br>{0}<br>はサーバ上から削除されました。ロードできません"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
+msgstr ""
+"<html>子リレーション<br>{0}<br>はサーバ上から削除されました。ロードできません"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:354
 msgid "Relation is deleted"
 msgstr "リレーションは削除されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:522
 #, java-format
 msgid "Downloading relation {0}"
 msgstr "リレーション {0} をダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:532
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:110
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:110
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7336,69 +7329,72 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "リレーション \"{1}\" に含まれる {0} 個のオブジェクトをダウンロード中"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
+msgstr[0] ""
+"リレーション \"{1}\" に含まれる {0} 個のオブジェクトをダウンロード中"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
 msgid "Download relations"
 msgstr "リレーションをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
 #, java-format
 msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "リレーション \"{2}\" をダウンロード中 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
 msgid "Tags and Members"
 msgstr "タグとメンバ－"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
 msgid "Parent Relations"
 msgstr "親リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
 msgid "Child Relations"
 msgstr "子リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
 msgid "Apply Role:"
 msgstr "ロールを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
 msgid "Enter a role and apply it to the selected relation members"
 msgstr "ロールを入力して選択されたリレーションメンバーに適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
-msgstr ""
-"<html>このリレーションの少なくともひとつメンバーは、<br>自身のリレーションを参照しています。<br>これは循環参照を引き起こすため、推奨されませ"
-"ん。<br>循環参照をどうしますか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>このリレーションの少なくともひとつメンバーは、<br>自身のリレーションを"
+"参照しています。<br>これは循環参照を引き起こすため、推奨されません。<br>循環"
+"参照をどうしますか？</html>"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
 msgid "Remove them, clean up relation"
 msgstr "削除し、リレーションをクリーンナップ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
 msgid "Ignore them, leave relation as is"
 msgstr "無視し、リレーションはそのまま"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
 #, java-format
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
-msgstr ""
-"<html>このリレーションには既にひとつ以上の<br>プリミティブ ''{0}'' "
-"<br>を参照しているメンバーがあります。<br>本当に他のリレーションメンバーを追加しますか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+"<html>このリレーションには既にひとつ以上の<br>プリミティブ ''{0}'' <br>を参照"
+"しているメンバーがあります。<br>本当に他のリレーションメンバーを追加します"
+"か？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
 msgid "Multiple members referring to same primitive"
 msgstr "複数のメンバーが同じプリミティブを参照しています"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
 #, java-format
 msgid ""
@@ -7407,215 +7403,222 @@
 "''{0}''.</html>"
 msgstr ""
-"<html>リレーション自身に追加しようとしています。<br><br>これは循環参照を引き起こすので薦められません。<br>リレーション ''{0}'' "
-"をスキップします。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
+"<html>リレーション自身に追加しようとしています。<br><br>これは循環参照を引き"
+"起こすので薦められません。<br>リレーション ''{0}'' をスキップします。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
-msgstr "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
-msgstr "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
 "member"
-msgstr "現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの前に追加"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの前"
+"に追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
 "member"
-msgstr "現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの後に追加"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの後"
+"に追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
 msgid "Relation Editor: Remove Selected"
 msgstr "リレーション編集画面: 削除が選択されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
 #, java-format
 msgid ""
 "Select relation members which refer to {0} primitives in the current "
 "selection"
-msgstr "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
+msgstr ""
+"現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
 msgid "Select primitives for selected relation members"
 msgstr "選択されたリレーションメンバーのプリミティブを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
 msgid "Sort the relation members"
 msgstr "リレーションメンバーをソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Sort"
 msgstr "並べ替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
 msgid "Relation Editor: Sort"
 msgstr "リレーション編集画面: ソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Reverse the order of the relation members"
 msgstr "リレーションメンバーの表示順序を反転する"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Reverse"
 msgstr "逆順"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Relation Editor: Reverse"
 msgstr "リレーションエディタ:反転"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
 msgid "Relation Editor: Move Up"
 msgstr "リレーション編集画面: 上へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
 msgid "Relation Editor: Move Down"
 msgstr "リレーション編集画面: 下へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
 msgid "Remove the currently selected members from this relation"
 msgstr "このリレーションから現在選択されたメンバーを削除"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 msgid "Relation Editor: Remove"
 msgstr "リレーション編集画面: 削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
 msgid "Delete the currently edited relation"
 msgstr "現在編集されたリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074
 msgid "Yes, create a conflict and close"
 msgstr "はい、競合を作成して閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 msgid "Click to create a conflict and close this relation editor"
 msgstr "クリックして競合を作成し、このリレーションエディタを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
 msgid "No, continue editing"
 msgstr "いいえ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
-msgid ""
-"<html>This relation has been changed outside of the editor.<br>You can't "
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You cannot "
 "apply your changes and continue editing.<br><br>Do you want to create a "
 "conflict and close the editor?</html>"
 msgstr ""
-"<html>このリレーションは編集画面以外で変更されています。<br>変更を適用して編集を続けることはできません<br><br>競合を作成してエディタを閉"
-"じますか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
-msgid "Conflict in data"
-msgstr "データ中に競合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-"<html>レイヤー ''{0}''には既にプリミティブ ''{1}'' "
-"<br>に競合があります。<br>最初にこの競合を解決してからやり直してください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+"<html>このリレーションは編集画面以外で変更されています。<br>変更を適用して編"
+"集を続けることはできません<br><br>競合を作成してエディタを閉じますか？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>レイヤー ''{0}''には既にプリミティブ ''{1}'' <br>に競合があります。<br>"
+"最初にこの競合を解決してからやり直してください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
 msgid "Apply the current updates"
 msgstr "現在の更新を適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
 msgid "Apply the updates and close the dialog"
 msgstr "更新を適用してダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Cancel the updates and close the dialog"
 msgstr "更新をキャンセルしてダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1204
 msgid "Add an empty tag"
 msgstr "空のタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
 msgstr "全ての不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Relation Editor: Download Members"
 msgstr "リレーション編集画面: メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
 msgid "Download selected incomplete members"
 msgstr "選択された不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291
 msgid "Sets a role for the selected members"
 msgstr "選択されたメンバーにロールをセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
 msgid "Apply Role"
 msgstr "ロールを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
-#, java-format
-msgid ""
-"<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-"deleting the roles of these primitives.<br>Do you really want to apply the "
-"new role?</html>"
-msgstr ""
-"<html>空のロールを {0} "
-"プリミティブにセットしようとしています。<br>これはロールを削除することになります。<br>新しいロールを本当に適用しますか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307
+#, java-format
+msgid "You are setting an empty role on {0} primitive."
+msgid_plural "You are setting an empty role on {0} primitives."
+msgstr[0] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+msgid "This is equal to deleting the roles of these primitives."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
+#, fuzzy
+msgid "Do you really want to apply the new role?"
+msgstr "本当にこれを許可してよろしいですか？"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
 msgid "Yes, apply it"
 msgstr "はい、適用します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
-msgid "No, don't apply"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
+msgid "No, do not apply"
 msgstr "いいえ、適用しません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
 msgid "Confirm empty role"
 msgstr "空のロールを確認"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集"
@@ -7642,14 +7645,14 @@
 msgstr "参照先"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
 msgstr "参照リレーションをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
-#, java-format
-msgid "Value of child.getId() > 0 expected. Got {1}."
-msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:187
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "インポートした内容には {0} の競合があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:195
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -7672,5 +7675,5 @@
 msgstr "現在選択されているリレーションを編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 msgid "Apply Changes"
 msgstr "変更を適用"
@@ -7696,6 +7699,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: "
+#, fuzzy, java-format
+msgid ""
+"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr "警告: タスクがキャンセルされたので例外を無視。例外: "
 
@@ -7730,6 +7734,6 @@
 "maxlon): {0}, {1}, {2}, {3}</html>"
 msgstr ""
-"<html><strong>現在のダウンロードエリア</strong> (最小緯度, 最小経度, 最大緯度, 最大経度): {0}, {1}, {2}, "
-"{3}</html>"
+"<html><strong>現在のダウンロードエリア</strong> (最小緯度, 最小経度, 最大緯"
+"度, 最大経度): {0}, {1}, {2}, {3}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
@@ -7744,5 +7748,7 @@
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
-msgstr "現在はダウンロードエリアが選択されていません。最初にエリアを選択してください。"
+msgstr ""
+"現在はダウンロードエリアが選択されていません。最初にエリアを選択してくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
@@ -7784,5 +7790,7 @@
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
 "area)"
-msgstr "www.openstreetmap.orgからのURL（ダウンロードしたいエリアのURLをここに貼り付けることができます。）"
+msgstr ""
+"www.openstreetmap.orgからのURL（ダウンロードしたいエリアのURLをここに貼り付け"
+"ることができます。）"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
@@ -7795,5 +7803,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
 #, java-format
-msgid "The string ''{0}'' isn''t a valid double value."
+msgid "The string ''{0}'' is not a valid double value."
 msgstr "文字列 ''{0}'' は正しいダブル値ではありません。"
 
@@ -7843,5 +7851,6 @@
 "into the currently active data layer.</html>"
 msgstr ""
-"<html>選択して新しいデータレイヤーにデータをダウンロード。<br>選択解除して現在の有効なデータレイヤーにダウンロード。</html>"
+"<html>選択して新しいデータレイヤーにデータをダウンロード。<br>選択解除して現"
+"在の有効なデータレイヤーにダウンロード。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:124
@@ -7876,7 +7885,6 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
 
@@ -7939,8 +7947,4 @@
 #. <space />
 #. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
@@ -7955,45 +7959,38 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: 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:2337
-#: build/trans_presets.java:2379 build/trans_presets.java:2405
-#: build/trans_presets.java:2947 build/trans_presets.java:2957
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:379 build/trans_presets.java:661
+#: build/trans_presets.java:1009 build/trans_presets.java:1267
+#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2266 build/trans_presets.java:2808
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "Type"
 msgstr "タイプ"
 
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
+#. item "Ways/Path" combo "Wheelchairs"
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
+#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:58
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:139
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: 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:2473
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:489 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:646
+#: build/trans_presets.java:661 build/trans_presets.java:1205
+#: build/trans_presets.java:1272 build/trans_presets.java:1273
+#: build/trans_presets.java:1274 build/trans_presets.java:2334
+#: build/trans_presets.java:2335 build/trans_presets.java:2336
 msgid "unknown"
 msgstr "不明な"
@@ -8005,6 +8002,7 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マップを移動:</b> "
-"右クリックしたままマウスを移動またはカーソルキーを使用。<b>選択:</b> 左クリックしたままフレームをドロー。"
+"<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マップ"
+"を移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>選択:"
+"</b> 左クリックしたままフレームをドロー。"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -8052,6 +8050,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information.You can both edit the <a href=\"{2}\">help topic in your "
-"local language ({1})</a> and the <a href=\"{3}\">help topic in "
-"english</a>.</p></html>"
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
 msgstr ""
 
@@ -8061,10 +8059,10 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is "
-"(untranslated):<br><tt>{1}</tt></p></html>"
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
 msgstr ""
 "<html><p class=\"error-header\">ヘルプ情報参照中にエラー</p><p class=\"error-"
-"body\">ヘルプトピック用コンテンツ<strong>{0}</strong> がロードできません。エラーメッセージ "
-"(未翻訳):<br><tt>{1}</tt></p></html>"
+"body\">ヘルプトピック用コンテンツ<strong>{0}</strong> がロードできません。エ"
+"ラーメッセージ (未翻訳):<br><tt>{1}</tt></p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
@@ -8117,5 +8115,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-msgid "Warning: bad location in HTML document. Exception was: "
+#, fuzzy, java-format
+msgid "Warning: bad location in HTML document. Exception was: {0}"
 msgstr "警告: HTMLドキュメント中に不正な位置。例外コード: "
 
@@ -8159,10 +8158,11 @@
 msgstr "履歴をサーバからリロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311
+msgstr ""
+"履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306
 #, java-format
 msgid ""
@@ -8170,5 +8170,5 @@
 msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279
 #, java-format
 msgid ""
@@ -8176,46 +8176,33 @@
 msgstr "参照の設定に失敗しました。参照バージョン {0} は履歴で使用できません"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
 "Failed to set current primitive. Current version {0} not available in "
 "history."
-msgstr "現在のプリミティブの設定に失敗しました。現在のバージョン {0} は履歴で使用できません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:54
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
+msgstr ""
+"現在のプリミティブの設定に失敗しました。現在のバージョン {0} は履歴で使用でき"
+"ません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 msgid "Load history"
 msgstr "履歴をロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:80
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
-#, java-format
-msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-msgstr "パラメータ ''{0}'' 中のID > 0 が期待されています、入力値 {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:195
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
 #, java-format
 msgid "Loading history for node {0}"
 msgstr "ノード {0} の履歴をロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
 msgstr "ウェイ {0} の履歴をロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:197
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
@@ -8255,19 +8242,21 @@
 msgstr "存在しません"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55
 msgid "Changeset"
 msgstr "変更セット"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
 #, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
-msgstr "<html>レイヤー ''{1}'' で編集しているバージョン <strong>{0}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
+msgstr ""
+"<html>レイヤー ''{1}'' で編集しているバージョン <strong>{0}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
-msgstr "<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+msgstr ""
+"<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
@@ -8316,12 +8305,16 @@
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
-msgstr "編集レイヤーに何も含まれていないため、ID {0} のプリミティブ更新に失敗しました。"
+msgstr ""
+"編集レイヤーに何も含まれていないため、ID {0} のプリミティブ更新に失敗しまし"
+"た。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
-#, java-format
-msgid ""
-"Failed to update primitive with id {0} because current edit layer doesn't "
+#, fuzzy, java-format
+msgid ""
+"Failed to update primitive with id {0} because current edit layer does not "
 "include such a primitive"
 msgstr ""
+"編集レイヤーに何も含まれていないため、ID {0} のプリミティブ更新に失敗しまし"
+"た。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
@@ -8351,16 +8344,17 @@
 "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>"
+"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/gui/io/AbstractUploadTask.java:132
@@ -8374,23 +8368,24 @@
 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>"
+"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/gui/io/AbstractUploadTask.java:194
 #, java-format
 msgid ""
-"<html>Uploading <strong>failed</strong> because you''ve been "
+"<html>Uploading <strong>failed</strong> because you have 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>"
+"<html>アップロード <strong>失敗</strong>: あなたが<br>チェンジセット {0} を使"
+"用しています。それはすでに {1} に閉じられましたので、<br>もう一度新規または既"
+"に開いている変更セットをアップロードしてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
@@ -8419,7 +8414,8 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-"<html>アップロード <strong>失敗</strong> ウェイ {1} が使用中のノード {0} "
-"を削除しようとしました。<br><br><strong>{2}</strong> をクリックしてノード {0} "
-"の全ての親ウェイをダウンロードしてください。<br>必要ならJOSM は競合解決ダイアログで解決できる競合として作成します。</html>"
+"<html>アップロード <strong>失敗</strong> ウェイ {1} が使用中のノード {0} を削"
+"除しようとしました。<br><br><strong>{2}</strong> をクリックしてノード {0} の"
+"全ての親ウェイをダウンロードしてください。<br>必要ならJOSM は競合解決ダイアロ"
+"グで解決できる競合として作成します。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -8552,9 +8548,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
-#, java-format
-msgid ""
-"<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-"username and a valid password.</html>"
-msgstr "<html>OSM APIの認証 ''{0}'' に失敗しました。正しいユーザ名とパスワードを入力してください。</html>"
+#, fuzzy, java-format
+msgid ""
+"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
+"and a valid password."
+msgstr ""
+"<html>OSM APIの認証 ''{0}'' に失敗しました。正しいユーザ名とパスワードを入力"
+"してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8571,15 +8569,20 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
-#, java-format
-msgid ""
-"<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
-"username and a valid password.</html>"
-msgstr "<html>HTTPプロキシ ''{0}'' の認証に失敗しました。有効なユーザー名とパスワードを入力してください。</html>"
+#, fuzzy, java-format
+msgid ""
+"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
+"username and a valid password."
+msgstr ""
+"<html>HTTPプロキシ ''{0}'' の認証に失敗しました。有効なユーザー名とパスワード"
+"を入力してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
-msgid ""
-"<html>Warning: depending on the authentication method the proxy server uses "
-"the password may be transferred unencrypted.</html>"
-msgstr "<html>警告: プロキシサーバへのログイン用ユーザー名とパスワードは暗号化されずに送信される可能性があります。</html>"
+#, fuzzy
+msgid ""
+"Warning: depending on the authentication method the proxy server uses the "
+"password may be transferred unencrypted."
+msgstr ""
+"<html>警告: プロキシサーバへのログイン用ユーザー名とパスワードは暗号化されず"
+"に送信される可能性があります。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -8597,15 +8600,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
 msgid ""
-"<html>Could not retrieve the list of your open changesets because<br>JOSM "
-"doesn't know your identity.<br>You've either chosen to work anonymously or "
-"you are not entitled<br>to know the identity of the user on whose behalf you "
-"are working.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:69
+"Could not retrieve the list of your open changesets because<br>JOSM does not "
+"know your identity.<br>You have either chosen to work anonymously or you are "
+"not entitled<br>to know the identity of the user on whose behalf you are "
+"working."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
 msgid "Missing user identity"
 msgstr "ユーザ認証に失敗しました"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:122
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:121
 #, java-format
 msgid ""
@@ -8635,7 +8638,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be uploaded to the server."
-msgstr "レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。"
+msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgstr ""
+"レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
@@ -8649,5 +8652,6 @@
 "Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
-msgstr "レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき修正があります。"
+msgstr ""
+"レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき修正があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
@@ -8672,5 +8676,6 @@
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr "ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。"
+msgstr ""
+"ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -8706,5 +8711,6 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
-"<html>{0} レイヤーに未解決の競合があります。<br>最初に解決するか修正を破棄してください。<br>競合のあるレイヤー:</html>"
+"<html>{0} レイヤーに未解決の競合があります。<br>最初に解決するか修正を破棄し"
+"てください。<br>競合のあるレイヤー:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
@@ -8719,10 +8725,10 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a "
-"file:</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
 msgstr[0] ""
-"<html>{0} "
-"レイヤーは保存が必要ですが関連するファイルがありません。<br>このレイヤー用のファイルを選択するか変更を破棄してください。<br>ファイルの無いレイヤー"
-":</html>"
+"<html>{0} レイヤーは保存が必要ですが関連するファイルがありません。<br>このレ"
+"イヤー用のファイルを選択するか変更を破棄してください。<br>ファイルの無いレイ"
+"ヤー:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
@@ -8731,17 +8737,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, java-format
-msgid ""
-"<html>{0} layer needs saving but has an associated file<br>which can't be "
-"written.<br>Either select another file for this layer or discard the "
-"changes.<br>Layer with a non-writable file:</html>"
+#, fuzzy, java-format
+msgid ""
+"<html>{0} layer needs saving but has an associated file<br>which cannot be "
+"written.<br>Either select another file for this layer or discard the changes."
+"<br>Layer with a non-writable file:</html>"
 msgid_plural ""
-"<html>{0} layers need saving but have associated files<br>which can't be "
+"<html>{0} layers need saving but have associated files<br>which cannot be "
 "written.<br>Either select another file for each of them or discard the "
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>{0} "
-"レイヤーは保存が必要ですが<br>書き込み不可の<br>関連するファイルがあります。<br>このレイヤー用の他のファイルを選択するか変更を破棄してください"
-"。<br>書き込み不可のファイルのあるレイヤー:</html>"
+"<html>{0} レイヤーは保存が必要ですが<br>書き込み不可の<br>関連するファイルが"
+"あります。<br>このレイヤー用の他のファイルを選択するか変更を破棄してくださ"
+"い。<br>書き込み不可のファイルのあるレイヤー:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8791,8 +8797,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
+#, fuzzy, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
 "cancelled or has failed.</html>"
-msgstr "<html>変更したレイヤのアップロードまたは保存の作業は<br>キャンセルされたか失敗しました。</html>"
+msgid_plural ""
+"<html>Upload and/or save operations of {0} layers with modifications<br>were "
+"cancelled or have failed.</html>"
+msgstr[0] ""
+"<html>変更したレイヤのアップロードまたは保存の作業は<br>キャンセルされたか失"
+"敗しました。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8818,4 +8830,5 @@
 #. item "Highways/Streets/Residential" check "Embankment"
 #. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Pedestrian" check "Embankment"
 #. item "Highways/Streets/Service" check "Embankment"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
@@ -8824,8 +8837,8 @@
 #. item "Highways/Streets/Tunnel" text "Name"
 #. item "Ways/Construction" check "Embankment"
-#. item "Ways/Bridleway" check "Embankment"
-#. item "Ways/Pedestrian" check "Embankment"
+#. item "Ways/Dedicated Bridleway" check "Embankment"
+#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Steps" check "Embankment"
-#. item "Ways/Path" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
 #. item "Water/Water/Stream" text "Name"
@@ -8839,16 +8852,15 @@
 #: 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
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:387 build/trans_presets.java:402
+#: build/trans_presets.java:417 build/trans_presets.java:439
+#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:511 build/trans_presets.java:532
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:934 build/trans_presets.java:942
+#: build/trans_presets.java:950 build/trans_presets.java:960
+#: build/trans_presets.java:1180
 msgid "Layer"
 msgstr "レイヤー"
@@ -8952,13 +8964,15 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, 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/gui/io/UploadLayerTask.java:109
+msgstr ""
+"警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
+"ティブをスキップし、アップロードを再試行します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing primitives to upload ..."
 msgstr "プリミティブアップロード準備中"
@@ -8966,5 +8980,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr "オブジェクトは<strong>新しい変更セット</strong>にアップロードされました。"
+msgstr ""
+"オブジェクトは<strong>新しい変更セット</strong>にアップロードされました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -8974,9 +8989,9 @@
 "comment ''{1}''."
 msgstr ""
-"オブジェクトはアップロードコメント''{1}'' 付きで<strong>オープン済み変更セット</strong> {0} にアップロードされました。"
+"オブジェクトはアップロードコメント''{1}'' 付きで<strong>オープン済み変更セッ"
+"ト</strong> {0} にアップロードされました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
-msgid ""
-"The changeset is going to be <strong>closed</strong> after this upload"
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
 msgstr "変更セットはこのアップロード後に<strong>クローズ</strong>されます"
 
@@ -9031,6 +9046,6 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple "
-"changesets</strong> using <strong>{1} requests</strong>"
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
 msgstr ""
 
@@ -9072,6 +9087,7 @@
 "on the server ''{1}''."
 msgstr ""
-"サーバより、編集中の変更セットがクローズしたと通知されました。<br>おそらく、変更セットのサイズが上限を超えています。<br>{0} "
-"個のオブジェクトがサーバにあります。\"{1}\"。"
+"サーバより、編集中の変更セットがクローズしたと通知されました。<br>おそらく、"
+"変更セットのサイズが上限を超えています。<br>{0} 個のオブジェクトがサーバにあ"
+"ります。\"{1}\"。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
@@ -9085,7 +9101,7 @@
 msgid ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
-"map editing.<br>"
+"changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
+"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
+"editing.<br>"
 msgstr ""
 
@@ -9095,5 +9111,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193
 #, java-format
@@ -9101,10 +9117,14 @@
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
-msgstr "警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェクトをスキップしてもう一度アップロードします。"
+msgstr ""
+"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク"
+"トをスキップしてもう一度アップロードします。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr "オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをスキップします。"
+msgstr ""
+"オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをス"
+"キップします。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
@@ -9113,8 +9133,7 @@
 msgstr "{0} オブジェクトをアップロード中 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
-#, java-format
-msgid ""
-"Ignoring caught exception because upload is canceled. Exception is: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}"
 
@@ -9123,5 +9142,7 @@
 "<html>Mark modified objects <strong>from the current selection</strong> to "
 "be uploaded to the server.</html>"
-msgstr "<html><strong>現在の選択から</strong>修正されたオブジェクトをマークしてサーバにアップロード。</html>"
+msgstr ""
+"<html><strong>現在の選択から</strong>修正されたオブジェクトをマークしてサーバ"
+"にアップロード。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73
@@ -9129,5 +9150,7 @@
 "<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
 "server.</html>"
-msgstr "<html><strong>ローカルで削除されたオブジェクト</strong>をマークしてサーバから削除。</html>"
+msgstr ""
+"<html><strong>ローカルで削除されたオブジェクト</strong>をマークしてサーバから"
+"削除。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
@@ -9183,5 +9206,5 @@
 #, java-format
 msgid ""
-"<html>Can''t upload {0} objects in one request because the<br>max. changeset "
+"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
@@ -9264,5 +9287,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "GPSポイント"
@@ -9329,13 +9351,13 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with audio data.</html>"
-msgstr ""
-"<html>選択したGPXレイヤー ''{0}'' "
-"はサーバからダウンロードしたものです。<br>タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
+"タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
 msgid "Import not possible"
 msgstr ""
@@ -9350,19 +9372,19 @@
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with images.</html>"
-msgstr ""
-"<html>選択したGPXレイヤー ''{0}'' "
-"はサーバからダウンロードしたものです。<br>タイムスタンプの情報が無いため、写真との同期はできません。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
+"タイムスタンプの情報が無いため、写真との同期はできません。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9370,5 +9392,5 @@
 msgstr "名前: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9376,5 +9398,5 @@
 msgstr "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
 #, java-format
 msgid "{0} track"
@@ -9383,23 +9405,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3055
 msgid "Description"
 msgstr "説明"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 msgid "Timespan"
 msgstr "時間間隔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Length"
 msgstr "長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
 msgid "Length: "
 msgstr "長さ: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:436
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
 #, java-format
 msgid "{0} route, "
@@ -9407,5 +9429,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} waypoint"
@@ -9413,23 +9435,24 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有害だと考えられています。<br>もしトレースをアップロードしたいなら"
-"ば、ここを見てください："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有"
+"害だと考えられています。<br>もしトレースをアップロードしたいならば、ここを見"
+"てください："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
@@ -9440,50 +9463,56 @@
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:959
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:952
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
 #, java-format
 msgid ""
 "<html>This action will require {0} individual<br>download requests. Do you "
 "wish<br>to continue?</html>"
-msgstr "<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けますか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1063
+msgstr ""
+"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
+"すか？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1232
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
 "the end were omitted or moved to the start."
-msgstr "トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点に変更又は移動されました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1239
+msgstr ""
+"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
+"に変更又は移動されました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
 "time were omitted."
-msgstr "ウェイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除外します。"
+msgstr ""
+"ウェイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
+"外します。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
@@ -9579,9 +9608,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:</html>"
-msgstr ""
-"<html>処理していない GPS "
-"データを地図データとしてアップロードすることは有害だと考えられる。<br>もし、トレースデータをアップロードしたいなら、コチラを見よ :</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>処理していない GPS データを地図データとしてアップロードすることは有害だ"
+"と考えられる。<br>もし、トレースデータをアップロードしたいなら、コチラを見"
+"よ :</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
@@ -9614,4 +9644,9 @@
 msgstr[0] "{0} ポイント"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#, fuzzy
+msgid "GPS point"
+msgstr "GPSポイント"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -9635,10 +9670,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html> 使用しているGPSレシーバーの、時刻を表示しているところの写真をとります。<br>その写真をここに表示してください。<br> "
-"そして写真に表示されている時刻を読み取って、タイムゾーンを選択します。<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html> 使用しているGPSレシーバーの、時刻を表示しているところの写真をとりま"
+"す。<br>その写真をここに表示してください。<br> そして写真に表示されている時刻"
+"を読み取って、タイムゾーンを選択します。<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
@@ -9655,5 +9691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
-msgid "I'm in the timezone of: "
+msgid "I am in the timezone of: "
 msgstr "タイムゾーンの選択: "
 
@@ -9664,5 +9700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
-msgid "Open an other photo"
+msgid "Open another photo"
 msgstr "他の写真を開く"
 
@@ -9740,48 +9776,50 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
 #, java-format
-msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:669
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
+msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
+msgid_plural ""
+"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgstr[0] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
 msgid "Correlate images with GPX track"
 msgstr "GPXトラックに画像を関連づけます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:670
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
 msgid "Correlate"
 msgstr "関連付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:697
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
 msgid "Invalid timezone"
 msgstr "不正なタイムゾーン"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
 msgid "Invalid offset"
 msgstr "不正なオフセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
 #, java-format
 msgid "Timezone: {0}"
 msgstr "タイムゾーン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:864
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9790,44 +9828,49 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
-msgstr "GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照合できます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+msgstr ""
+"GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照"
+"合できます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
 msgid "Matching photos to track failed"
 msgstr "トラックへのフォトマッチに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:928
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
 msgid "Adjust timezone and offset"
 msgstr "タイムゾーンとオフセットを調整してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
-msgid "The selected photos don't contain time information."
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+msgid "The selected photos do not contain time information."
 msgstr "選択した写真には時間情報がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
-msgid "Photos don't contain time information"
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgid "Photos do not contain time information"
 msgstr "写真は時間情報を含んでいません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:977
-msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
-msgstr "選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:978
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+msgid ""
+"The selected GPX track does not contain timestamps. Please select another "
+"one."
+msgstr ""
+"選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択"
+"してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid "GPX Track has no time information"
 msgstr "GPXトラックは、時間情報を持っていません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
 msgid "You should select a GPX track"
 msgstr "GPXトラックを選択しなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1074
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "No selected GPX track"
 msgstr "GPXトラックの選択がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
 #, java-format
 msgid ""
@@ -9838,5 +9881,5 @@
 "期待する形式: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1317
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
 #, java-format
 msgid ""
@@ -9899,12 +9942,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-msgid "image"
-msgid_plural "images"
-msgstr[0] "画像"
+#, fuzzy, java-format
+msgid "{0} image loaded."
+msgid_plural "{0} images loaded."
+msgstr[0] "{0} 経由ノード。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, java-format
-msgid "{0} were found to be gps tagged."
-msgstr "{0} は gps タグがつけられていることがわかりました。"
+#, fuzzy, java-format
+msgid "{0} was found to be GPS tagged."
+msgid_plural "{0} were found to be GPS tagged."
+msgstr[0] "{0} は gps タグがつけられていることがわかりました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
@@ -10033,5 +10078,7 @@
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
-msgstr "あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要があります。"
+msgstr ""
+"あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要がありま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -10072,5 +10119,7 @@
 "You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing (after the first marker)."
-msgstr "再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッグする必要があります。"
+msgstr ""
+"再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッ"
+"グする必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -10078,5 +10127,7 @@
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
-msgstr "SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイントの上に持ってくる必要があります。"
+msgstr ""
+"SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイ"
+"ントの上に持ってくる必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
@@ -10105,17 +10156,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, java-format
-msgid ""
-"Warning: failed to load Mappaint-Styles from ''{0}''. Exception was: {1}"
-msgstr ""
+#, fuzzy, java-format
+msgid ""
+"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, java-format
-msgid ""
-"Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}"
-msgstr ""
+#, fuzzy, java-format
+msgid ""
+"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:68
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
 msgid "Access Token Key:"
@@ -10123,5 +10174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:82
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
 msgid "Access Token Secret:"
@@ -10159,5 +10210,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
 msgid "Authorise URL:"
 msgstr ""
@@ -10181,25 +10232,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
 msgid "Fully automatic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
 msgid "Semi-automatic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
 msgid "Manual"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
 msgid ""
 "<html>Run a fully automatic procedure to get an access token from the OSM "
 "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-"fully<br>automatically authorises the user and retrieves an Access "
-"Token.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
 msgid ""
 "<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -10210,5 +10261,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
 msgid ""
 "<html>Enter an Access Token manually if it was generated and retrieved "
@@ -10216,56 +10267,61 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:112
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
 msgid "Username: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:127
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
 msgid "Password: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175
 msgid "Granted rights"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176
 msgid "Advanced OAuth properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:357
 msgid "Accept Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
-#, java-format
-msgid ""
-"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237
+#, java-format
+msgid ""
+"<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
 "website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
 msgid "Authorise now"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
 msgid "Click to redirect you to the authorisation form on the JOSM web site"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274
+msgid "Back"
+msgstr "戻る"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366
 msgid "Run the automatic authorisation steps again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:231
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:436
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
 msgid "Test Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:409
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
@@ -10273,24 +10329,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:411
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
-msgid "The user name can't be empty. Please enter your OSM user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:430
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
 msgid "Please enter your OSM password"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
-msgid "The password can't be empty. Please enter your OSM password"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:432
+msgid "The password cannot be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442
 msgid "Authorise JOSM to access the OSM API"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10299,28 +10355,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
 msgid "OAuth authorisation failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
+#, java-format
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"OSM server failed because JOSM was not able to build<br>a valid login URL "
 "from the OAuth Authorise Endpoint URL ''{0}''.<br><br>Please check your "
 "advanced setting and try again.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496
 #, java-format
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user "
-"{1}.<br><br>Please check username and password and try again.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
+#, java-format
+msgid ""
+"Please enter an OAuth Access Token which is authorised to access the OSM "
+"server ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
+msgid "Advanced OAuth parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
 #, java-format
 msgid ""
@@ -10329,38 +10412,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
-msgid "Save Access Token to preferences"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
-msgid "Access Token"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
-msgid "Advanced OAuth parameters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
-msgid "Enter the OAuth Access Token"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
-msgid "Enter advanced OAuth properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
 msgid ""
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
 msgid ""
 "The Access Token Secret must not be empty. Please enter an Access Token "
@@ -10368,78 +10431,77 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
 msgid "Please select an authorisation procedure: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
 #, java-format
 msgid "Get an Access Token for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
 msgid "Close the dialog and cancel authorisation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
 msgid "Close the dialog and accept the Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:105
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:129
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:162
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
-#, java-format
-msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
-#, java-format
-msgid ""
-"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:299
+#, java-format
+msgid "OSM website did not return a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437
 #, java-format
 msgid "Failed to authorise OAuth request  ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484
 #, java-format
 msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:492
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
 #, java-format
 msgid "Authorising request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -10511,15 +10573,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
 msgid "Display Advanced OAuth Parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
 msgid "Retrieve Request Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
 #, java-format
 msgid ""
@@ -10528,57 +10590,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
 msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
-#, java-format
-msgid ""
-"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
-"launching an authorisation page in an external browser. Please login with "
-"your OSM username and password and follow the instructions to authorise the "
-"Request Token. Then switch back to this dialog and click on "
-"<strong>{0}</strong><br><br>If launching the external browser fails you can "
-"copy the following authorise URL and paste it into the address field of your "
-"browser."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
+#, java-format
+msgid ""
+"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
+"authorisation page in an external browser. Please login with your OSM "
+"username and password and follow the instructions to authorise the Request "
+"Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
-msgid ""
-"<html><body>JOSM has successfully retrieved an Access Token. You can now "
-"accept this token. JOSM will used it the future for authentication and "
-"authorisation at the OSM server.<br><br>The access token is: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
+msgid ""
+"<html>JOSM has successfully retrieved an Access Token. You can now accept "
+"this token. JOSM will use it in the future for authentication and "
+"authorisation to the OSM server.<br><br>The access token is: </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
 msgid "Restart"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
 msgid "Click to retrieve a Request Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
 msgstr ""
@@ -10595,5 +10657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
 #, java-format
-msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
 msgstr ""
 
@@ -10602,5 +10664,5 @@
 msgid ""
 "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
-"at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with id "
+"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
 "''{3}''.</html>"
 msgstr ""
@@ -10629,9 +10691,9 @@
 #, java-format
 msgid ""
-"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
-"test to retrieve the user details for this token failed, "
-"though.<br>Depending on what rights are granted to this token you may "
-"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
-"other protected resources.</html>"
+"<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
 msgstr ""
 
@@ -10643,5 +10705,5 @@
 #, java-format
 msgid ""
-"<html>Failed to retrieve information about the current userfrom the OSM "
+"<html>Failed to retrieve information about the current user from the OSM "
 "server ''{0}''.<br>This is probably not a problem caused by the tested "
 "Access Token, but<br>rather a problem with the server configuration. "
@@ -10657,9 +10719,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-msgid ""
-"<html>The test failed because the server responded with an internal "
-"error.<br>JOSM couldn''t decide whether the token is valid. Please try again "
-"later.</html>"
-msgstr ""
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM could not decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>OSM サーバ<br>''{0}''<br>からサーバの内部エラーの連絡がありました。<br>"
+"おそらく一時的な問題です。後ほどやり直してみてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -10696,5 +10761,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
 msgid "Please select the row to edit."
 msgstr "編集する列を選択してください。"
@@ -10708,5 +10773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10762,5 +10827,7 @@
 "Display a moving icon representing the point on the synchronized track where "
 "the audio currently playing was recorded."
-msgstr "現在再生されているオーディオが記録された場所と同期して、その点を示すアイコンを動かして表示する。"
+msgstr ""
+"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン"
+"を動かして表示する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
@@ -10768,5 +10835,7 @@
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
-msgstr "ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラベルを付与する。"
+msgstr ""
+"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ"
+"ベルを付与する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
@@ -10774,5 +10843,7 @@
 "Automatically make a marker layer from any waypoints when opening a GPX "
 "layer."
-msgstr "自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成する。"
+msgstr ""
+"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成す"
+"る。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
@@ -10790,5 +10861,7 @@
 "Automatically create audio markers from trackpoints (rather than explicit "
 "waypoints) with names or descriptions."
-msgstr "（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマーカーを作成し、名前と説明を付加する。"
+msgstr ""
+"（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマー"
+"カーを作成し、名前と説明を付加する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
@@ -10796,5 +10869,7 @@
 "Create audio markers at the position on the track corresponding to the "
 "modified time of each audio WAV file imported."
-msgstr "インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したトラックの位置にオーディオマーカーを作成してください。"
+msgstr ""
+"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
+"ラックの位置にオーディオマーカーを作成してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
@@ -10820,5 +10895,7 @@
 "Playback starts this number of seconds before (or after, if negative) the "
 "audio track position requested"
-msgstr "再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置から開始する。"
+msgstr ""
+"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か"
+"ら開始する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
@@ -10916,5 +10993,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1249
 msgid "Car"
 msgstr "自動車"
@@ -10936,17 +11013,16 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: 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:1444
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:354 build/trans_presets.java:487
+#: build/trans_presets.java:730 build/trans_presets.java:749
+#: build/trans_presets.java:763 build/trans_presets.java:785
+#: build/trans_presets.java:822 build/trans_presets.java:835
+#: build/trans_presets.java:847 build/trans_presets.java:859
+#: build/trans_presets.java:871 build/trans_presets.java:883
+#: build/trans_presets.java:893 build/trans_presets.java:902
+#: build/trans_presets.java:911 build/trans_presets.java:1305
+#: build/trans_presets.java:1371
 msgid "Bicycle"
 msgstr "自転車"
 
-#. item "Ways/Path" label "Type"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -10976,12 +11052,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: 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
+#: build/trans_presets.java:355 build/trans_presets.java:486
+#: build/trans_presets.java:729 build/trans_presets.java:748
+#: build/trans_presets.java:762 build/trans_presets.java:784
+#: build/trans_presets.java:821 build/trans_presets.java:834
+#: build/trans_presets.java:846 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:892 build/trans_presets.java:901
+#: build/trans_presets.java:910
 msgid "Foot"
 msgstr "徒歩"
@@ -11033,6 +11109,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-msgid ""
-"Maximum length (in meters) to draw lines for local files. Set to '-1' to "
+#, fuzzy
+msgid ""
+"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr "ローカルファイルに線を描くの最大長(m)。'-1'にすると全てに線を描く。"
@@ -11043,6 +11120,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
-msgid ""
-"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+#, fuzzy
+msgid ""
+"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。"
 
@@ -11063,6 +11141,5 @@
 #. drawGpsArrowsFast
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
-msgid ""
-"Draw the direction arrows using table lookups instead of complex math."
+msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
@@ -11070,5 +11147,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
-"Don't draw arrows if they are not at least this distance away from the last "
+"Do not draw arrows if they are not at least this distance away from the last "
 "one."
 msgstr "これより短いウェイでは方向の矢印を描画しない。"
@@ -11086,5 +11163,7 @@
 "All points and track segments will have the same color. Can be customized in "
 "Layer Manager."
-msgstr "全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ可能です。"
+msgstr ""
+"全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ"
+"可能です。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
@@ -11097,5 +11176,6 @@
 "capture device needs to logs that information."
 msgstr ""
-"位置精度低下 (HDOP) によって、点とトラックセグメントの配色をおこなう。使用しているGPS機器がこの情報を記録している必要があります。"
+"位置精度低下 (HDOP) によって、点とトラックセグメントの配色をおこなう。使用し"
+"ているGPS機器がこの情報を記録している必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
@@ -11122,6 +11202,5 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
-msgid ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
@@ -11209,13 +11288,12 @@
 msgstr "地図塗りつぶしスタイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
-#, java-format
-msgid ""
-"The following plugin has been downloaded <strong>successfully</strong>:"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68
+#, java-format
+msgid "The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural "The following {0} plugins have been downloaded successfully:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
 #, java-format
 msgid "Downloading the following plugin has <strong>failed</strong>:"
@@ -11225,64 +11303,65 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
 msgid "Enter a search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:166
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
 msgid "Add JOSM Plugin description URL."
 msgstr "JOSM プラグイン情報のURLの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185
 msgid "Enter URL"
 msgstr "URL入力"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221
 msgid "Please select an entry."
 msgstr "エントリーを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:206
 msgid "Edit JOSM Plugin description URL."
 msgstr "JOSM プラグイン情報のURLを編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:207
 msgid "JOSM Plugin description URL"
 msgstr "JOSMプラグイン説明URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:228
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:234
 msgid "Configure Plugin Sites"
 msgstr "プラグインサイトを設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:281
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:310
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:328
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:340
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:540
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:356
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
 msgid "Update plugins"
 msgstr "プラグインを更新"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:311
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:363
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
 msgid "Configure sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:364
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
 msgid "Configure the list of sites where plugins are downloaded from"
 msgstr ""
@@ -11305,5 +11384,6 @@
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 msgstr ""
-"<p>ショートカットキーを変更した場合、JOSMの<b>再起動</b>が必要となります。再起動するまで変更しても反映されません。</p><br>"
+"<p>ショートカットキーを変更した場合、JOSMの<b>再起動</b>が必要となります。再"
+"起動するまで変更しても反映されません。</p><br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
@@ -11312,32 +11392,37 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes "
-"here.</p>"
-msgstr ""
-"<p>また、ショートカットの割り当ては、アプリケーション起動時に各メニューのアクションが読み込まれる際にだけ行われるため、ここで変更した物を反映したとして"
-"も、再起動しないと機能しなかったり、変更前の設定と衝突してしまうことがあります。ここで変更を行った際には必ずJOSMを再起動するようにしてください。</p"
-">"
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
+msgstr ""
+"<p>また、ショートカットの割り当ては、アプリケーション起動時に各メニューのアク"
+"ションが読み込まれる際にだけ行われるため、ここで変更した物を反映したとして"
+"も、再起動しないと機能しなかったり、変更前の設定と衝突してしまうことがありま"
+"す。ここで変更を行った際には必ずJOSMを再起動するようにしてください。</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
 "keys that exist on all kinds of keyboards Java knows about, not just those "
 "keys that exist on your keyboard. Please use only those values that "
-"correspond to a real key on your keyboard. So if your keyboard has no 'Copy' "
-"key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
-"there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key "
-"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
+"correspond to a real key on your keyboard. So if your keyboard has no "
+"''Copy'' key (PC keyboard do not have them, Sun keyboards do), the do not "
+"use it. Also there will be ''keys'' listed that correspond to a shortcut on "
+"your keyboard (e.g. '':''/Colon). Please also do not use them, use the base "
+"key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) "
 "instead. Not doing so may result in conflicts, as there is no way for JOSM "
 "to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
 "keyboard...</p>"
 msgstr ""
-"<p>次ページのキー選択一覧は全種類のJava "
-"が知りうるあらゆるキーボードをリストしており、あなたのキーボード上にあるキーではないことにご注意ください。あなたのキーボード上にある実際のキーに対応する値"
-"だけを使用してください。もしあなたのキーボードに 'Copy' キーが無い場合 (PC キーボードにはありません、Sun "
-"のキーボードにはあります)、使用しないでください。 また、あなたのキーボード上のショーツカットに対応するリストされた'key' もあります。(例： "
-"':'/Colon)。これも同様に使わないでください。代わりにベースキー(US キーボードの';'/Semicolon 、ドイツキーボードの "
-"'.'/Period 、...) を使ってください。そうしないと競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and "
-"Ctrl+: がUS キーボードでは実際には同じことだと知る手立てが無いのです...</p>"
+"<p>次ページのキー選択一覧は全種類のJava が知りうるあらゆるキーボードをリスト"
+"しており、あなたのキーボード上にあるキーではないことにご注意ください。あなた"
+"のキーボード上にある実際のキーに対応する値だけを使用してください。もしあなた"
+"のキーボードに 'Copy' キーが無い場合 (PC キーボードにはありません、Sun のキー"
+"ボードにはあります)、使用しないでください。 また、あなたのキーボード上の"
+"ショーツカットに対応するリストされた'key' もあります。(例： ':'/Colon)。これ"
+"も同様に使わないでください。代わりにベースキー(US キーボードの';'/"
+"Semicolon 、ドイツキーボードの '.'/Period 、...) を使ってください。そうしない"
+"と競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and Ctrl+: がUS キー"
+"ボードでは実際には同じことだと知る手立てが無いのです...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11357,13 +11442,18 @@
 "already taken, it will assign a random shortcut instead.</p>"
 msgstr ""
-"<p>最終ページはJOSM が自動的にショートカットに割り当てる修飾を一覧表示しています。4種のショートカットごとに3つの代替案があります。JOSM "
-"は競合を管理する際、リスト順にこれらの代替案を試します。全ての代替案が既に割り当てられたショートカットになった場合、代わりにランダムなショートカットを割り"
-"当てます。</p>"
+"<p>最終ページはJOSM が自動的にショートカットに割り当てる修飾を一覧表示してい"
+"ます。4種のショートカットごとに3つの代替案があります。JOSM は競合を管理する"
+"際、リスト順にこれらの代替案を試します。全ての代替案が既に割り当てられた"
+"ショートカットになった場合、代わりにランダムなショートカットを割り当てます。"
+"</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
-msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
+#, fuzzy
+msgid ""
+"<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
 "encountered.</p>"
-msgstr "<p>擬似変更 'disabled' は、次に起こったときにショートカットを無効にします。</p>"
+msgstr ""
+"<p>擬似変更 'disabled' は、次に起こったときにショートカットを無効にします。</"
+"p>"
 
 #. scroll up
@@ -11635,6 +11725,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 
@@ -11697,5 +11787,5 @@
 #, java-format
 msgid ""
-"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
 "validate again.</html>"
 msgstr ""
@@ -11709,6 +11799,6 @@
 #, java-format
 msgid ""
-"<html>Failed to build URL ''{0}'' for validating the OSM API "
-"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -11730,6 +11820,6 @@
 msgid ""
 "<html>Failed to retrieve a list of changesets from the OSM API server "
-"at<br>''{1}''. The server responded with the return code {0} instead of "
-"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -11737,6 +11827,6 @@
 #, java-format
 msgid ""
-"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
-"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
+"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
@@ -11772,5 +11862,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
 msgid "When saving, keep backup files ending with a ~"
-msgstr "保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
+msgstr ""
+"保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
@@ -11807,6 +11898,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -11817,11 +11907,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
 msgid ""
-"You don't have an Access Token yet to access the OSM server using OAuth. "
+"You do not have an Access Token yet to access the OSM server using OAuth. "
 "Please authorise first."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
-msgid ""
-"You already have an Access Token to access the OSM server using OAuth."
+msgid "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -11878,5 +11967,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
-msgid "The current value isn't a valid URL"
+msgid "The current value is not a valid URL"
 msgstr ""
 
@@ -11899,5 +11988,7 @@
 msgid ""
 "Please enter a username and a password if your proxy requires authentication."
-msgstr "使用するプロキシサーバに必要なときは、ユーザー名とパスワードを入力してください。"
+msgstr ""
+"使用するプロキシサーバに必要なときは、ユーザー名とパスワードを入力してくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -11915,9 +12006,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
 msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-"
-"Djava.net.useSystemProxies=true</tt> to enable)"
-msgstr ""
-"標準のシステム設定を使用（無効、変更できるようにするには <tt>-"
-"Djava.net.useSystemProxies=true</tt>で起動してください）"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"標準のシステム設定を使用（無効、変更できるようにするには <tt>-Djava.net."
+"useSystemProxies=true</tt>で起動してください）"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -11932,5 +12023,5 @@
 msgid ""
 "Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to 'No proxy'"
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
 
@@ -12055,6 +12146,6 @@
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:60
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
@@ -12068,11 +12159,12 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-msgid ""
-"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}"
-msgstr ""
+#, fuzzy, java-format
+msgid ""
+"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}''"
+msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -12086,38 +12178,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:126
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:128
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:132
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:129
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:133
 #, java-format
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:130
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
 #, java-format
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:293
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:298
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:300
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:307
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:313
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:318
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:324
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:329
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:340
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:347
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:299
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:301
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:308
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:314
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:319
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:325
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:330
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:341
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:348
 #, java-format
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:361
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:365
-msgid ""
-"Can't create a changeset query including both the query parameters 'uid' and "
-"'display_name'"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:390
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366
+msgid ""
+"Cannot create a changeset query including both the query parameters ''uid'' "
+"and ''display_name''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
@@ -12153,5 +12245,7 @@
 "Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
 "use no proxy."
-msgstr "警告: 環境設定 ''{0}'' が異常な値になっています。プロキシを使用しないときには ''{1}'' を設定してください。"
+msgstr ""
+"警告: 環境設定 ''{0}'' が異常な値になっています。プロキシを使用しないときに"
+"は ''{1}'' を設定してください。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:120
@@ -12160,5 +12254,7 @@
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
 "''{1}''."
-msgstr "警告: HTTPプロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' に設定されています。"
+msgstr ""
+"警告: HTTPプロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' "
+"に設定されています。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:132
@@ -12167,20 +12263,23 @@
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
 "''{1}''."
-msgstr "警告: SOCKS プロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' に設定されています。"
+msgstr ""
+"警告: SOCKS プロキシに異常な値が設定されてます。ホスト: ''{0}'' ポー"
+"ト:''{1}'' に設定されています。"
 
 #. Just log something. The network stack will also throw an exception which will be caught
 #. somewhere else
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:143
 #, java-format
 msgid ""
 "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr "エラー: プロキシ ''{0}'' URI:''{1}'' への接続に失敗しました。例外内容: {2}"
+msgstr ""
+"エラー: プロキシ ''{0}'' URI:''{1}'' への接続に失敗しました。例外内容: {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:152
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property 'java.net.useSystemProxies' was missing at startup "
-"time. Won't use a proxy."
+"settings. The property ''java.net.useSystemProxies'' was missing at startup "
+"time.  Will not use a proxy."
 msgstr ""
 
@@ -12199,31 +12298,34 @@
 msgstr "\"{0}\" をエクスポートできません"
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:38
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
 #, java-format
 msgid "Could not import ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:45
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
 msgid "Could not import files."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:59
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
 #, 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/io/FileImporter.java:73
+msgstr ""
+"<html>ファイル ''{0}'' が読み込めません。<br> エラー内容: <br>{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
 #, java-format
 msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
 "tracks."
-msgstr "備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているトラックをアップロードしないでください。"
-
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:25
+msgstr ""
+"備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているト"
+"ラックをアップロードしないでください。"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:26
 msgid "GPX Files"
 msgstr "GPXファイル"
@@ -12282,8 +12384,8 @@
 msgstr "事前定義のライセンスを選択"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:86
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:83
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12291,5 +12393,5 @@
 msgstr "{0}　のマーカー"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:67
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
 #, java-format
 msgid ""
@@ -12298,10 +12400,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:78
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
 #, java-format
 msgid "File \"{0}\" does not exist"
 msgstr "ファイル \"{0}\" はありません"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:81
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -12317,13 +12419,18 @@
 msgstr "不明なモード {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "Image Files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "folder"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:39
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
+#, fuzzy
+msgid "Looking for image files"
+msgstr "岸を検索中…"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
 msgid "No image files found."
 msgstr ""
@@ -12335,13 +12442,14 @@
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, java-format
-msgid ""
-"No primitive with id {0} in local dataset. Can't infer primitive type."
-msgstr "id {0} のプリミティブはローカルデータセットにはありません。プリミティブタイプ不明"
+#, fuzzy, java-format
+msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgstr ""
+"id {0} のプリミティブはローカルデータセットにはありません。プリミティブタイプ"
+"不明"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97
@@ -12388,5 +12496,7 @@
 "Server replied with response code 404, retrying with an individual request "
 "for each primitive."
-msgstr "サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試行中"
+msgstr ""
+"サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試"
+"行中"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
@@ -12396,47 +12506,47 @@
 msgstr[0] "\"{1}\" から {0} 個のオブジェクトをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
 msgid "NMEA-0183 Files"
 msgstr "NMEA-0183ファイル"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Coordinates imported: "
 msgstr "座標をインポートしました。 "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 msgid "Malformed sentences: "
 msgstr "不正なセンテンス: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
 msgid "Checksum errors: "
 msgstr "チェックサムエラー "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
 msgid "Unknown sentences: "
 msgstr "不明なセンテンス: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
 msgid "Zero coordinates: "
 msgstr "ゼロ座標: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
 msgid "NMEA import success"
 msgstr "NMEAのインポートに成功しました。"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
 msgid "NMEA import failure!"
 msgstr "NMEAのインポートに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:85
 #, java-format
 msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr "このバージョンのJOSMは、設定されたサーバーと互換性がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
 #, java-format
 msgid ""
@@ -12445,10 +12555,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:169
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
 msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:256
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319
 #, java-format
@@ -12456,9 +12566,11 @@
 msgstr "予想外の形式のID がサーバから返されました。入力値: ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:277
 #, java-format
 msgid ""
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
-msgstr "変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: ''{1}''"
+msgstr ""
+"変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: "
+"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:311
@@ -12471,70 +12583,71 @@
 msgstr "変更セット {0} を開きました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:662
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:661
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
 msgstr "変更セットID > 0 であるべきです。入力値: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
 msgid "Updating changeset..."
 msgstr "変更セットを更新中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "変更セット {0} を更新中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "変更した設定を閉じています..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
 msgid "No changeset present for diff upload."
 msgstr "diffアップロードのための変更セットを用意できませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
 msgid "Preparing upload request..."
 msgstr ""
 
-#. Upload to the server
-#. 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} objects..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
+#, fuzzy, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "{0} オブジェクトをアップロード中 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
 msgid "Waiting 10 seconds ... "
 msgstr "10秒待機中 ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "{2} 秒で {1} 分の {0} 回の再試行を開始 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:456
 msgid "OK - trying again."
 msgstr "OK - やり直しています。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:538
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:537
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "{1} 分の {0} 回の再試行を開始。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:633
 msgid "Current changeset is null. Cannot upload data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:635
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:664
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:663
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
-msgstr "開かれた変更セットであるべきです。ID {0} の閉じられた変更セットを受け取りました。"
+msgstr ""
+"開かれた変更セットであるべきです。ID {0} の閉じられた変更セットを受け取りまし"
+"た。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
@@ -12550,10 +12663,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
 msgstr "bzip2圧縮したOSMファイル"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:29
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30
 msgid "Invalid bz2 file."
 msgstr "不正なbz2 ファイル。"
@@ -12573,12 +12686,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:164
 #: ../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:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -12629,5 +12742,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
 "''{1}''."
-msgstr "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+msgstr ""
+"OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
@@ -12641,5 +12755,5 @@
 msgid ""
 "Illegal document structure. Found node, way, or relation outside of "
-"'create', 'modify', or 'delete'."
+"''create'', ''modify'', or ''delete''."
 msgstr ""
 
@@ -12655,61 +12769,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:129
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:135
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:145
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:151
 #, java-format
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に不正な値。入力値: ''{1}''。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:82
 #, java-format
 msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に不正な数値。入力値: ''{1}''。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:116
 #, java-format
 msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に不正なブール値。入力値: ''{1}''。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr "XML 要素 {1} の必須属性 ''{0}'' が見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 #, java-format
 msgid "Unsupported version: {0}"
 msgstr "サポートされないバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:177
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr "入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:216
+msgstr ""
+"入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:217
 msgid "Parsing list of changesets..."
 msgstr "変更セットのリストを解析中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
-msgid ""
-"Failed to add an OAuth authentication header. There is currently no OAuth "
-"Access Token configured."
-msgstr "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していません。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:125
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:136
 #, java-format
 msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
@@ -12722,27 +12825,24 @@
 msgstr "(場所: 行 {0}, カラム {1})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
 msgid "OSM Server Files"
 msgstr "OSMサーバファイル"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45
-#, java-format
-msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
 #, java-format
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr "<html>保存中にエラー発生。<br>エラー: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98
-#, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr "<html>バックアップファイルのレストア中にエラー発生。<br>エラー: <br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>バックアップファイルのレストア中にエラー発生。<br>エラー: <br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
@@ -12750,5 +12850,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
 msgstr "gzip圧縮したOSMファイル"
@@ -12758,80 +12858,82 @@
 msgstr "OSM 履歴データ解析中 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
 #, java-format
 msgid "File ''{0}'' does not exist."
 msgstr "ファイル \"{0}\" はありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:112
 #, java-format
 msgid ""
 "Warning: ignoring changeset id {0} for new object with external id {1} and "
 "internal id {2}"
-msgstr "警告: 新しい外部ID{1}と内部ID{2} があるため、変更セットID {0} を無視します。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, java-format
-msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"要素 ''bounds'' に必要な属性がありません。入力値: "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244
+msgstr ""
+"警告: 新しい外部ID{1}と内部ID{2} があるため、変更セットID {0} を無視します。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
+"要素 ''bounds'' に必要な属性がありません。入力値: minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "<way> 要素を直接引き継いでない XML 要素の <nd> が見つかった。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "ウェイ {1} の<nd>上に必要な属性 ''{0}'' がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "要素 <nd> の属性 ''ref'' に不正な値。入力値: {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 msgid "Found XML element <member> not as direct child of element <relation>."
-msgstr "要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278
+msgstr ""
+"要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:280
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
-#, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:285
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:289
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:292
 #, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
+msgstr ""
+"リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:299
 msgid "Incomplete <member> specification with ref=0"
 msgstr "ref=0の不完全な<member>指定です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
 msgid "Illegal object with ID=0."
 msgstr "id=0の禁じられたオブジェクトです"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:365
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
 #, java-format
 msgid ""
@@ -12841,21 +12943,23 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:371
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
 #, java-format
 msgid ""
 "WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
 "API version is ''{3}''. Got {1}."
-msgstr "要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは ''{3}''。入力値: {1}。"
+msgstr ""
+"要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは "
+"''{3}''。入力値: {1}。"
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:384
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
@@ -12863,6 +12967,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:420
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:430
 #, java-format
 msgid ""
@@ -12872,94 +12976,95 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:424
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "必要な属性 ''{0}'' がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470
 #, java-format
 msgid ""
 "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr "外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486
+msgstr ""
+"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
 "Marked way {0} with {1} nodes incomplete because at least one node was "
 "missing in the loaded data and is therefore incomplete too."
-msgstr "{1} ノードのウェイ {0} は不完全です。ロードされたデータに少なくとひとつのノードが見つからないため、不完全です。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+msgstr ""
+"{1} ノードのウェイ {0} は不完全です。ロードされたデータに少なくとひとつのノー"
+"ドが見つからないため、不完全です。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
 #, java-format
 msgid ""
 "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-msgstr "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+msgstr ""
+"外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546
 #, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to a missing primitive with "
 "external id ''{1}''."
-msgstr "外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参照しています。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+msgstr ""
+"外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参照"
+"しています。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:594
 msgid "Parsing OSM data..."
 msgstr "OSMデータ解析中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:599
 msgid "Preparing data set..."
 msgstr "データセット準備中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55
-#, java-format
-msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
 msgid "Downloading from OSM Server..."
 msgstr "OSMサーバからダウンロード中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
 msgstr "参照ウェイをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
 msgid "Downloading referring relations ..."
 msgstr "参照リレーションをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
 msgid "Reading changesets..."
 msgstr "変更セットを読み込んでいます..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:65
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
 msgid "Downloading changesets ..."
 msgstr "変更セットをダウンロード中 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
 #, java-format
 msgid "Reading changeset {0} ..."
 msgstr "変更セット {0} を読み込んでいます ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:99
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
 #, java-format
 msgid "Downloading changeset {0} ..."
 msgstr "変更セット {0} をダウンロード中 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:129
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130
 #, java-format
 msgid "Downloading {0} changeset ..."
@@ -12967,25 +13072,15 @@
 msgstr[0] "{0} 個の変更セットをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:173
-#, java-format
-msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:184
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
 #, java-format
 msgid "Downloading content for changeset {0} ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
-#, java-format
-msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
 msgid "Downloading history..."
 msgstr "履歴をダウンロード中..."
@@ -12995,10 +13090,4 @@
 msgstr "サーバに接続中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62
-#, java-format
-msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
@@ -13008,5 +13097,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86
 msgid ""
-"Couldn't connect to the OSM server. Please check your internet connection."
+"Could not connect to the OSM server. Please check your internet connection."
 msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。"
 
@@ -13035,42 +13124,44 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79
 msgid "Starting to upload with one request per primitive ..."
 msgstr "プリミティブ単位にひとつのリクエストでアップロードを開始 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), 残り {3} 。ノード ''{4}'' をアップロード中(ID: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), 残り {3} 。ウェイ ''{4}'' をアップロード中(ID: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:119
+msgstr ""
+"{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:121
 msgid "Starting to upload in one request ..."
 msgstr "ひとつのリクエストでアップロード開始..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 #, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:143
 msgid "Starting to upload in chunks..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156
-#, java-format
-msgid "({0}/{1}) Uploading {2} objects..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:182
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
+#, fuzzy, java-format
+msgid "({0}/{1}) Uploading {2} object..."
+msgid_plural "({0}/{1}) Uploading {2} objects..."
+msgstr[0] "{0} オブジェクトをアップロード中 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
 msgstr "データアップロード中 ..."
@@ -13100,5 +13191,5 @@
 #, java-format
 msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link isn''t known. "
+"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
 "Skipping download."
 msgstr ""
@@ -13107,5 +13198,5 @@
 #, java-format
 msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' isn''t a "
+"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
 "valid URL. Skipping download."
 msgstr ""
@@ -13127,5 +13218,5 @@
 msgstr "プラグイン {0} でエラーが発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
 msgid "The following plugin is no longer necessary and has been deactivated:"
 msgid_plural ""
@@ -13134,68 +13225,80 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:133
-#, 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 "
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#, fuzzy, java-format
+msgid ""
+"<html>Loading of the plugin \"{0}\" 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 ""
-"<html>プラグイン {0} "
-"が読み込まれました。<br>このプラグインは開発を終了していて、問題を起こす可能性があります。<br>無効にしてください。<br>使用をやめますか？</h"
-"tml>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
-msgid ""
-"<html>You updated your JOSM software.<br>To prevent problems the plugins "
-"should be updated as well.<br><br>Update plugins now?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:170
+"<html>プラグイン {0} が読み込まれました。<br>このプラグインは開発を終了してい"
+"て、問題を起こす可能性があります。<br>無効にしてください。<br>使用をやめます"
+"か？</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
+msgid ""
+"You updated your JOSM software.<br>To prevent problems the plugins should be "
+"updated as well.<br><br>Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "プラグインが最後に更新されてから{0}日以上経過しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
+#, fuzzy
+msgid "Click to update the activated plugins"
+msgstr "クリックしてダイアログを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
 msgid "Skip update"
 msgstr "更新をスキップ"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:202
-#, java-format
-msgid ""
-"A required plugin for plugin {0} was not found. The required plugin is:"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+msgid "Click to skip updating the activated plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
+#, fuzzy, java-format
+msgid ""
+"Plugin {0} requires a plugin which was not found. The missing plugin is:"
 msgid_plural ""
-"{1} required plugins for plugin {0} were not found. The required plugins are:"
+"Plugin {0} requires {1} plugins which were not found. The missing plugins "
+"are:"
 msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, java-format
-msgid "Plugin {0} requires JOSM update to version {1}."
-msgstr "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+"プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
+#, java-format
+msgid ""
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
 #, java-format
 msgid "loading plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "プラグイン {0} を読み込めません。設定から削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:330
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:345
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13203,5 +13306,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:447
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13209,17 +13312,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:472
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:478
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:480
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524
 msgid "Removing umaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:504
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13227,32 +13330,46 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:514
-msgid ""
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
+msgid ""
+"Please open the Preference Dialog after JOSM has started and try to update "
+"it manually."
+msgid_plural ""
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:519
+msgstr[0] ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:574
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:688
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:689
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
 msgid "Disable plugin"
 msgstr "このプラグインを使用不可にする"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:576
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
+#, fuzzy, java-format
+msgid "Click to delete the plugin ''{0}''"
+msgstr "クリックしてダイアログを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
 msgid "Keep plugin"
 msgstr "プラグインを継続"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:637
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724
+#, java-format
+msgid "Click to keep the plugin ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
 #, java-format
 msgid ""
@@ -13261,5 +13378,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:643
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
 #, java-format
 msgid ""
@@ -13268,9 +13385,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:693
-msgid "<html>"
-msgstr "<html>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:694
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
+#, fuzzy, java-format
+msgid "Click to disable the plugin ''{0}''"
+msgstr "クリックしてダイアログを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
 #, java-format
 msgid ""
@@ -13278,41 +13396,46 @@
 msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:697
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "このプラグインから得られる情報では、作者は {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:737
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
-msgstr "バグレポートをする前に、最新バージョンのプラグインにアップデートしてください。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:702
+msgstr ""
+"バグレポートをする前に、最新バージョンのプラグインにアップデートしてくださ"
+"い。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
 msgid "Should the plugin be disabled?"
 msgstr "このプラグインを使用不可にしますか?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:714
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
 "unload the plugin."
-msgstr "プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを再起動してください。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:720
-msgid "The plugin could not be removed. Probably it was already disabled"
-msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:766
+msgstr ""
+"プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを"
+"再起動してください。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:853
 msgid "Plugin information"
 msgstr "プラグイン情報"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:771
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:858
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:179
 msgid "no description available"
 msgstr "説明がありません"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
+#, fuzzy
+msgid "Do not check and ask again at startup (remembers choice)"
+msgstr "次回から表示しない"
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, java-format
-msgid "The plugin file ''{0}'' doesn't include a Manifest."
-msgstr ""
+#, fuzzy, java-format
+msgid "The plugin file ''{0}'' does not include a Manifest."
+msgstr "ファイル \"{0}\" はありません"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13344,6 +13467,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119
 #, java-format
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -13399,29 +13521,32 @@
 msgstr "サウンドの再生でエラーが発生しています"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56
+#. Then ask for submitting a bug report, for exceptions thrown from a plugin too
+#.
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
 msgid "Do nothing"
 msgstr "何もしない"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
 msgid "Report Bug"
 msgstr "バグを報告する"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57
-msgid ""
-"An unexpected exception occurred.\n"
-"\n"
-"This is always a coding error. If you are running the latest\n"
-"version of JOSM, please consider being kind and file a bug report."
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+#, fuzzy
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
 msgstr ""
 "予想外の例外が発生しました。\n"
 "\n"
-"これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合には、\n"
+"これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合に"
+"は、\n"
 "大目にみて、ぜひバグレポートをぜひお願いします。"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid "Unexpected Exception"
 msgstr "予想外の例外"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:103
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
 "You have encountered an error in JOSM. Before you file a bug reportmake sure "
@@ -13429,5 +13554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:107
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
 "You should also update your plugins. If neither of those help pleasefile a "
@@ -13435,5 +13560,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:111
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 msgid ""
 "There the error information provided below should already befilled in for "
@@ -13442,34 +13567,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:115
-msgid ""
-"Alternatively, if that doesn't work you can manually fill in the "
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
 "informationbelow at this URL:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:122
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:136
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(テキストはクリップボードにコピーされています。)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:137
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:151
 msgid "You have encountered a bug in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:22
-#, java-format
-msgid "Expected unique id > 0 for primitive id, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:27
-#, java-format
-msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:47
-#, java-format
-msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:41
 #, java-format
 msgid ""
@@ -13477,7 +13587,17 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>OSM サーバ {0} との通信の初期化に失敗しました。<br>設定のサーバURLとインターネット接続をチェックしてください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
+"<html>OSM サーバ {0} との通信の初期化に失敗しました。<br>設定のサーバURLとイ"
+"ンターネット接続をチェックしてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#, java-format
+msgid ""
+"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
+"OAuth to authenticate but currently there is no<br>OAuth Access Token "
+"configured.<br>Please open the Preferences Dialog and generate or enter an "
+"Access Token.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:77
 #, java-format
 msgid ""
@@ -13486,50 +13606,53 @@
 "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:84
+"<html><strong>リレーション {0}</strong>の削除に<strong>失敗</strong>。リレー"
+"ション {1} がまだ参照しています。<br>リレーション {1} をロードし、リレーショ"
+"ン {0} への参照を削除し、再度アップロードしてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:104
 #, java-format
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
-msgstr ""
-"<html>サーバへのアップロードは<strong>失敗しました。</strong> "
-"現在の<br>データセットは前提条件に違反しています。<br>エラーメッセージ:<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
-#, java-format
-msgid ""
-"<html>Authentication at the OSM server with the username ''{0}'' "
-"failed.<br>Please check the username and the password in the JOSM "
-"preferences.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
-#, java-format
-msgid ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
-"token.</html>"
-msgstr ""
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>サーバへのアップロードは<strong>失敗しました。</strong> 現在の<br>デー"
+"タセットは前提条件に違反しています。<br>エラーメッセージ:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
 #, java-format
 msgid ""
-"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>The token is not authorised to access the protected "
-"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
-"another OAuth token.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:122
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
 #, java-format
 msgid ""
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
 "already been closed.</html>"
-msgstr "<html>変更セット<strong>{0}</strong>を閉じることができません。<br>既に閉じられています。</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
+msgstr ""
+"<html>変更セット<strong>{0}</strong>を閉じることができません。<br>既に閉じら"
+"れています。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
 #, java-format
 msgid ""
@@ -13537,7 +13660,8 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>変更セット<strong>{0}</strong>を閉じることができません。<br> {1} で既に閉じられています。</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
+"<html>変更セット<strong>{0}</strong>を閉じることができません。<br> {1} で既に"
+"閉じられています。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:183
 #, java-format
 msgid ""
@@ -13546,9 +13670,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:189
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>サーバから競合検出の連絡がありました。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
 #, java-format
 msgid ""
@@ -13556,24 +13680,28 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>変更セットのアップロードに失敗しました。<strong>{0}</strong><br>既に閉じられています {1}。<html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+"<html>変更セットのアップロードに失敗しました。<strong>{0}</strong><br>既に閉"
+"じられています {1}。<html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244
 #, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
 "security reasons. This is most likely because you are running<br>in an "
-"applet and because you didn''t load your applet from ''{1}''.</html>"
-msgstr ""
-"<html>リモートサーバ<br>''{0}''<br>への接続にセキュリティ上の理由で接続を開けませんでした。おそらくアプレットを実行しているがアプレッ"
-"トを ''{1}' からロードしていないためだと思われます。</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+"applet and because you did not load your applet from ''{1}''.</html>"
+msgstr ""
+"<html>リモートサーバ<br>''{0}''<br>への接続にセキュリティ上の理由で接続を開け"
+"ませんでした。おそらくアプレットを実行しているがアプレットを ''{1}' からロー"
+"ドしていないためだと思われます。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
 #, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "<html>リモートサーバ ''{0}' への接続が開けません。<br>インターネット接続をチェックしてください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+msgstr ""
+"<html>リモートサーバ ''{0}' への接続が開けません。<br>インターネット接続を"
+"チェックしてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:277
 #, java-format
 msgid ""
@@ -13581,68 +13709,68 @@
 "problem with transferring data.<br>Details(untranslated): {1}</html>"
 msgstr ""
-"<html>データのアップロード先またはダウンロード元<br>''{0}''<br>で、データ転送中に問題が発生したために処理が失敗しました。<br>詳細"
-"（原文）: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
-#, java-format
-msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server "
-"error.<br>This is most likely a temporary problem. Please try again "
-"later.</html>"
-msgstr ""
-"<html>OSM "
-"サーバ<br>''{0}''<br>からサーバの内部エラーの連絡がありました。<br>おそらく一時的な問題です。後ほどやり直してみてください。</html"
-">"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
+"<html>データのアップロード先またはダウンロード元<br>''{0}''<br>で、データ転送"
+"中に問題が発生したために処理が失敗しました。<br>詳細（原文）: {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>OSM サーバ<br>''{0}''<br>からサーバの内部エラーの連絡がありました。<br>"
+"おそらく一時的な問題です。後ほどやり直してみてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "OSM サーバ ''{0}'' より不正リクエストの報告がありました。<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
-msgid ""
-"The area you tried to download is too big or your request was too "
-"large.<br>Either request a smaller area or use an export file provided by "
-"the OSM community."
-msgstr ""
-"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。<br>もっと小さいエリアでリクエストするか、OSM "
-"コミュニティから提供されたエクスポートファイルを使用してください。"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:310
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
+msgstr ""
+"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。<br>"
+"もっと小さいエリアでリクエストするか、OSM コミュニティから提供されたエクス"
+"ポートファイルを使用してください。"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>エラーメッセージ(未訳): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
-#, 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 ''{0}'' for typos."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
+#, java-format
+msgid ""
+"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
+"update, or delete. Either the respective object<br>does not exist on the "
+"server or you are using an invalid URL to access<br>it. Please carefully "
+"check the server''s address ''{0}'' for typos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
 #, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>リモートサーバ<br>''{0}''.<br>への接続を開けませんでした。ホスト名 ''{1}'' を解決できません。<br>設定のAPI "
-"URL とインターネット接続をチェックしてください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
+"<html>リモートサーバ<br>''{0}''.<br>への接続を開けませんでした。ホスト名 "
+"''{1}'' を解決できません。<br>設定のAPI URL とインターネット接続をチェックし"
+"てください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426
 #, 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>"
+"<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:348
@@ -13657,5 +13785,7 @@
 "Warning: failed to acccess directory ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr "警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例外: {1}"
+msgstr ""
+"警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例"
+"外: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
@@ -13664,5 +13794,7 @@
 "Fatal: failed to locate image ''{0}''. This is a serious configuration "
 "problem. JOSM will stop working."
-msgstr "Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻な構成の問題です。JOSM は動作停止します。"
+msgstr ""
+"Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻な構成の問題です。JOSM は"
+"動作停止します。"
 
 #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
@@ -13686,5 +13818,6 @@
 "\n"
 msgstr ""
-"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられているために\n"
+"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられて"
+"いるために\n"
 "アクション\"{1}\"({2})への割り当てに失敗しました。\n"
 "\n"
@@ -13724,12 +13857,15 @@
 "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr "警告: セキュリティ上の理由で ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
+msgstr ""
+"警告: セキュリティ上の理由で ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
 #, java-format
 msgid ""
-"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
-msgstr "キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry を復元できません。"
+msgstr ""
+"キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry を復"
+"元できません。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
@@ -13737,8 +13873,8 @@
 msgid ""
 "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
-"{2}. Can''t restore window geometry from preferences."
-msgstr ""
-"キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定から window geometry "
-"を復元できません。"
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定か"
+"ら window geometry を復元できません。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
@@ -13746,15 +13882,17 @@
 msgid ""
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
-"{2}. Can''t restore window geometry from preferences."
-msgstr ""
-"キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コード: {2}。設定から window geometry "
-"を復元できません。"
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コード: "
+"{2}。設定から window geometry を復元できません。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
 #, java-format
 msgid ""
-"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
-msgstr "キー ''{0}'' の設定が存在しません。設定から window geometry を復元できません。"
+msgstr ""
+"キー ''{0}'' の設定が存在しません。設定から window geometry を復元できませ"
+"ん。"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -13796,5 +13934,7 @@
 "Identifiable (shown in trace list and as identifiable, ordered points with "
 "timestamps)"
-msgstr "識別公開 (トレースリストの指定ポイントとタイムスタンプを自身によるものとして公開する)"
+msgstr ""
+"識別公開 (トレースリストの指定ポイントとタイムスタンプを自身によるものとして"
+"公開する)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
@@ -13897,5 +14037,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2146
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -14171,5 +14311,7 @@
 msgid ""
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
-msgstr "警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外コード: {0}"
+msgstr ""
+"警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外"
+"コード: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -14204,18 +14346,16 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
-msgstr ""
-"フランス cadastre wms (www.cadastre.gouv.fr) "
-"の特別なハンドラ<BR><BR>このプラグインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んでください (フランス語): "
-"<br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a>"
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
+msgstr ""
+"フランス cadastre wms (www.cadastre.gouv.fr) の特別なハンドラ<BR><BR>このプラ"
+"グインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んで"
+"ください (フランス語): <br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
@@ -14242,5 +14382,6 @@
 "Invert the original black and white colors (and all intermediate greys). "
 "Useful for texts on dark backgrounds."
-msgstr "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。"
+msgstr ""
+"元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
@@ -14321,5 +14462,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr "自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください"
+msgstr ""
+"自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
@@ -14481,5 +14623,7 @@
 msgid ""
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
-msgstr "選択されたファイル {0} はこのプラグインからのキャッシュファイルではありません(不正なエクステンション)"
+msgstr ""
+"選択されたファイル {0} はこのプラグインからのキャッシュファイルではありません"
+"(不正なエクステンション)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
@@ -14501,5 +14645,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "Location"
 msgstr "ロケーション"
@@ -14510,6 +14654,6 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
-"<html>町、村または市区の名前を入力してください。<br>文法や句読点はwww.cadastre.gouv.fr "
-"に従ってください。(フランス語の場合)</html>"
+"<html>町、村または市区の名前を入力してください。<br>文法や句読点はwww."
+"cadastre.gouv.fr に従ってください。(フランス語の場合)</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:61
@@ -14596,5 +14740,7 @@
 "Unsupported cache file version; found {0}, expected {1}\n"
 "Create a new one."
-msgstr "サポートされないキャッシュファイルのバージョン; {0} が見つかりましたが、 {1} であるべきです"
+msgstr ""
+"サポートされないキャッシュファイルのバージョン; {0} が見つかりましたが、 {1} "
+"であるべきです"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
@@ -14605,5 +14751,6 @@
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
+msgstr ""
+"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448
@@ -14662,21 +14809,21 @@
 "分割の前にエリアをリレーションから削除してください。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS ファイル (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Format errors: "
 msgstr "フォーマットエラー: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
 msgid "TangoGPS import success"
 msgstr "TangoGPS のインポートに成功しました。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
 msgid "TangoGPS import failure!"
 msgstr "TangoGPS のインポートに失敗しました。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:66
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
 msgid "TCX Files (*.tcx)"
 msgstr "TCX ファイル (*.tcx)"
@@ -14862,7 +15009,7 @@
 "plugin/"
 msgstr ""
-"rxtxSerialライブラリ からロードすることができません。もし、それをインストールするためのサポートが必要であれば、Globalsat "
-"ホームページ（ http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/ "
-"）を試してください。"
+"rxtxSerialライブラリ からロードすることができません。もし、それをインストール"
+"するためのサポートが必要であれば、Globalsat ホームページ（ http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/ ）を試してください。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -14873,5 +15020,6 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:108
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート"
+msgstr ""
+"グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:115
@@ -15009,5 +15157,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -15069,7 +15217,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15079,5 +15227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15087,5 +15235,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
+#. <rule>
+#. <condition k="waterway" v="ditch"/>
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="waterway" v="drain"/>
@@ -15094,5 +15249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15102,12 +15257,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2337 build/trans_style.java:993
+#: build/trans_presets.java:2198 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
-#: build/trans_style.java:3461 build/trans_style.java:3469
+#: build/trans_style.java:1033 build/trans_style.java:3492
+#: build/trans_style.java:3500
 msgid "water"
 msgstr "水域(湖沼)"
@@ -15178,6 +15334,5 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "各生成されたウェイで許されるセグメントの最大数。既定値は250"
 
@@ -15186,5 +15341,7 @@
 "Maximum number of nodes to generate before bailing out (before simplifying "
 "lines). Default 50000."
-msgstr "データを間引く前（ラインを単純化する前）に生成するノードの最大数。（デフォルト50000）"
+msgstr ""
+"データを間引く前（ラインを単純化する前）に生成するノードの最大数。（デフォル"
+"ト50000）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -15192,12 +15349,15 @@
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
 "in the range 0-255. Default 90."
-msgstr "水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲にである．デフォルトは90。"
+msgstr ""
+"水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲に"
+"である．デフォルトは90。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in "
-"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
-"0.0003."
-msgstr "ダグラス・ポイカーフィルタ（ライン簡素化）の精度。<br>小さいほど細かく描画を行います。 既定値 0.0003。"
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"ダグラス・ポイカーフィルタ（ライン簡素化）の精度。<br>小さいほど細かく描画を"
+"行います。 既定値 0.0003。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
@@ -15464,6 +15624,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>openstreetbugs プラグインは appspot.com の古いサーバを使用しています。<br>schokokeks.org "
-"の新しいサーバが利用できます。<br>新しいサーバに切り換えますか？ (強く推奨)</html>"
+"<html>openstreetbugs プラグインは appspot.com の古いサーバを使用しています。"
+"<br>schokokeks.org の新しいサーバが利用できます。<br>新しいサーバに切り換えま"
+"すか？ (強く推奨)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
@@ -15476,6 +15637,6 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
-"<html>選択されたデータはOpenStreetBugs "
-"のデータを含んでいます。<br>このデータはアップロードできません。違うレイヤーを選択したようですね？"
+"<html>選択されたデータはOpenStreetBugs のデータを含んでいます。<br>このデータ"
+"はアップロードできません。違うレイヤーを選択したようですね？"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -15490,7 +15651,8 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr "ヘッダが複数の値を含んでいるため、一つのストリングに描画することができません。"
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr ""
+"ヘッダが複数の値を含んでいるため、一つのストリングに描画することができませ"
+"ん。"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
@@ -15515,5 +15677,7 @@
 "The visible area is either too small or too big to download data from "
 "OpenStreetBugs"
-msgstr "表示エリアはOpenStreetBugs からデータをダウンロードするには小さすぎるか大きすぎます"
+msgstr ""
+"表示エリアはOpenStreetBugs からデータをダウンロードするには小さすぎるか大きす"
+"ぎます"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:177
@@ -15559,5 +15723,7 @@
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
 "comment:</html>"
-msgstr "<html>この件を本当に''完了''としてマークしますか？<br><br>コメントを追加できます:</html>"
+msgstr ""
+"<html>この件を本当に''完了''としてマークしますか？<br><br>コメントを追加でき"
+"ます:</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
@@ -15599,6 +15765,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid ""
-"You have unsaved changes in your queue. Do you want to submit them now?"
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -15634,5 +15799,7 @@
 "Firefox not found. Please set firefox executable in the Map Settings page of "
 "the preferences."
-msgstr "Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置を設定してください。"
+msgstr ""
+"Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置"
+"を設定してください。"
 
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
@@ -15682,6 +15849,6 @@
 "talking to the plugin."
 msgstr ""
-"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと会話をするほかのアプリケーションが参照するので、ポート番号は変更"
-"できません。"
+"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと"
+"会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
@@ -15691,5 +15858,7 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
-msgstr "APIを通じて、リモートコントロールプラグインによって、データをロードするよう要求されました。"
+msgstr ""
+"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要"
+"求されました。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
@@ -15716,5 +15885,7 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244
 msgid "Remote Control has been asked to import data from the following URL:"
-msgstr "リモートコントロールは以下のURLからデータをインポートするように確認されました。:"
+msgstr ""
+"リモートコントロールは以下のURLからデータをインポートするように確認されまし"
+"た。:"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16025,5 +16196,6 @@
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
-msgstr "タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。"
+msgstr ""
+"タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
@@ -16113,10 +16285,9 @@
 msgstr "妥当性検証エラー"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168
 msgid "Grid"
 msgstr "グリッド"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
 #, java-format
 msgid ""
@@ -16163,5 +16334,7 @@
 "An OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr "OSM データ妥当性検証はユーザや編集プログラムによる一般的なエラーをチェックします。"
+msgstr ""
+"OSM データ妥当性検証はユーザや編集プログラムによる一般的なエラーをチェックし"
+"ます。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
@@ -16201,23 +16374,23 @@
 msgstr "テスト {0} 実行中"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "妥当性検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
 msgid "Performs the data validation"
 msgstr "データの妥当性を検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:120
 msgid "Validating"
 msgstr "検証中"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:161
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
 msgstr "テスト {0}/{1}:  {2} 開始"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:170
 msgid "Updating ignored errors ..."
 msgstr "無視されたエラーを更新中 ..."
@@ -16285,4 +16458,10 @@
 msgstr "\"{0}\" を \"{1}\" で置き換える。"
 
+#: ../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] "オブジェクト"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
@@ -16313,5 +16492,7 @@
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
-msgstr "このテストではふたつの道路、鉄道、水路あるいは建物が同じレイヤーでクロスはしているがノードで接続されていないことをチェックします。"
+msgstr ""
+"このテストではふたつの道路、鉄道、水路あるいは建物が同じレイヤーでクロスはし"
+"ているがノードで接続されていないことをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
@@ -16332,4 +16513,14 @@
 msgstr "このテストは全く同じ位置にノードがないことをチェックします。"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+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>本当に削除しますか？"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
 msgid "Confirmation"
@@ -16369,5 +16560,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3017
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -16437,5 +16628,7 @@
 "This test checks that a connection between two nodes is not used by more "
 "than one way."
-msgstr "このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないかチェックします。"
+msgstr ""
+"このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないか"
+"チェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
@@ -16495,15 +16688,15 @@
 msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:283
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "タグチェッカーライン - {0}: {1}　が不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:296
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "スペルチェック行 {0}が不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:307
 #, java-format
 msgid ""
@@ -16514,7 +16707,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:428
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:438
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
 msgid "Illegal tag/value combinations"
 msgstr "不正なタグ/値の組み合わせです"
@@ -16522,171 +16715,169 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:453
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
 msgid "Painting problem"
 msgstr "色つけに問題発生"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:463
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "キー ''{0}''は不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
 msgid "Tags with empty values"
 msgstr "値のないタグ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
 msgid "Invalid property key"
 msgstr "プロパティキーが不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid "Invalid white space in property key"
 msgstr "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
 msgid "Property values start or end with white space"
 msgstr "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "キー ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
 msgid "Presets do not contain property key"
 msgstr "プリセットはプロパティキーを含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
 msgid "Presets do not contain property value"
 msgstr "プリセットは属性値を含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:555
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Check property keys."
 msgstr "プロパティのキーをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "ワードのリストをチェックしてプロパティキーが正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
 msgid "Use complex property checker."
 msgstr "高度なプロパティチェッカーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
 msgid "Validate property values and tags using complex rules."
 msgstr "混合ルールを使用しているプロパティの値とタグを検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:632
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
 msgid "TagChecker source"
 msgstr "タグチェッカーのソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:695
-msgid ""
-"The sources (URL or filename) of spell check (see "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
-"data files."
-msgstr ""
-"スペルチェックのソース(URL "
-"またはファイル名)(http://wiki.openstreetmap.org/index.php/User:JLS/speller 参照) "
-"またはタグをチェックするデータファイル。"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+msgid ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"スペルチェックのソース(URL またはファイル名)(http://wiki.openstreetmap.org/"
+"index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "Add a new source to the list."
 msgstr "新しいソースをリストに追加"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
 msgid "Edit the selected source."
 msgstr "選択したソースの編集"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid "Delete the selected source from the list."
 msgstr "リストから選択した情報源を削除"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Data sources"
 msgstr "データソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check property values."
 msgstr "プロパティの値をチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Validate that property values are valid checking against presets."
 msgstr "プリセットをチェックしてプロパティの値が正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for FIXMES."
 msgstr "FIXMEをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "プロパティの値としてFIXMEをもつノードやウェイを検索"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Check if map painting found data errors."
 msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default data file."
 msgstr "既定のデータファイルを使用。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default data file (recommended)."
 msgstr "既定のデータファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use default tag ignore file."
 msgstr "デフォルトタグを使用、ファイルを無視。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
 msgid "Use the default tag ignore file (recommended)."
 msgstr "デフォルトタグを使用、ファイルを無視（推奨）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use default spellcheck file."
 msgstr "既定のスペルチェックファイルを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
 msgid "Use the default spellcheck file (recommended)."
 msgstr "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:847
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
 msgid "Fix properties"
 msgstr "プロパティを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:968
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
 msgid "Could not find element type"
 msgstr "要素タイプを見つけられませんでした。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
 msgid "Could not find warning level"
 msgstr "警告レベルを見つけられませんでした"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:994
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不正な表現\"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16745,5 +16936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -16751,5 +16942,5 @@
 #. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -16759,5 +16950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -16766,5 +16957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -16773,5 +16964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -16780,5 +16971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -16787,5 +16978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -16794,14 +16985,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4261
+#: build/trans_style.java:4292
 msgid "building"
 msgstr "建物"
@@ -16811,9 +17002,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4268
+#: build/trans_style.java:4299
 msgid "area"
 msgstr "領域"
@@ -16829,5 +17020,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
-msgstr "このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェックしています。"
+msgstr ""
+"このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェッ"
+"クしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
@@ -16854,5 +17047,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
+msgstr ""
+"このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
@@ -16862,5 +17056,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
-msgstr "このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。"
+msgstr ""
+"このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
@@ -16960,10 +17155,12 @@
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:107
 msgid "<html>Could not find a unique node to start downloading from.</html>"
-msgstr "<html>ダウンロードを開始するユニークなノードを見つけられませんでした。</html>"
+msgstr ""
+"<html>ダウンロードを開始するユニークなノードを見つけられませんでした。</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
 #, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr "<html>ノード ''{0}'' に接続されたウェイはありません。異常終了します。</html>"
+msgstr ""
+"<html>ノード ''{0}'' に接続されたウェイはありません。異常終了します。</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
@@ -17048,5 +17245,7 @@
 "Couldn't match the entered link or id to the selected service. Please try "
 "again."
-msgstr "入力されたリンクまたはID を選択されたサービスにマッチさせることができませんでした。もう一度試してください。"
+msgstr ""
+"入力されたリンクまたはID を選択されたサービスにマッチさせることができませんで"
+"した。もう一度試してください。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:202
@@ -17083,5 +17282,7 @@
 "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
 "or a trailing '?'."
-msgstr "警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありません。"
+msgstr ""
+"警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありませ"
+"ん。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
@@ -17137,6 +17338,6 @@
 msgstr ""
 "<html>このWMS レイヤー用のベースURL<br>''{0}''<br>の終わりに ''&'' や ''?'' "
-"を付けてはなりません。<br>そうすると不正なWMSリクエストとなる場合があります。設定を<br>チェックしてください。<br>強制的にWMS "
-"タイルを取得しますか？"
+"を付けてはなりません。<br>そうすると不正なWMSリクエストとなる場合があります。"
+"設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
@@ -17151,5 +17352,6 @@
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
-msgstr "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
+msgstr ""
+"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
@@ -17272,5 +17474,5 @@
 #. This file can be used to add some special messages to the translation,
 #. which are not part of the programm texts, but should be translated nevertheless.
-#. 
+#.
 #: build/specialmessages.java:6
 msgid ""
@@ -17278,5 +17480,6 @@
 "area, or use planet.osm"
 msgstr ""
-"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリアで要求し直すか、planet.osmを使用してください。"
+"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリア"
+"で要求し直すか、planet.osmを使用してください。"
 
 #. OSM server message
@@ -17290,5 +17493,7 @@
 "The maximum bbox size is 0.25, and your request was too large. Either "
 "request a smaller area, or use planet.osm"
-msgstr "bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求するか、planet.osm を使用して下さい。"
+msgstr ""
+"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す"
+"るか、planet.osm を使用して下さい。"
 
 #. OSM server message
@@ -17305,5 +17510,6 @@
 #: build/specialmessages.java:11
 msgid "You must make your edits public to upload new data"
-msgstr "新しいデータをアップロードするには編集をパブリックにしなければなりません"
+msgstr ""
+"新しいデータをアップロードするには編集をパブリックにしなければなりません"
 
 #. Plugin AddrInterpolation
@@ -17328,6 +17534,8 @@
 "true :-)"
 msgstr ""
-"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しいスキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の白"
-"い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと 'Map Settings' を参照してください(奇妙ですが本当です :-)"
+"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しい"
+"スキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の"
+"白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと 'Map "
+"Settings' を参照してください(奇妙ですが本当です :-)"
 
 #. Plugin Create_grid_of_ways
@@ -17340,10 +17548,12 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr "チェコ共和国内のアドレスノードと建物を作成、編集するためのプラグインです。"
+msgstr ""
+"チェコ共和国内のアドレスノードと建物を作成、編集するためのプラグインです。"
 
 #. Plugin dataimport
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr "様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
+msgstr ""
+"様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
 
 #. Plugin DirectUpload
@@ -17352,5 +17562,7 @@
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
 "openstreetmap.org."
-msgstr "このプラグインは現在アクティブなJOSMレイヤーのGPSトラックをopenstreetmap.orgへ直接アップロードします。"
+msgstr ""
+"このプラグインは現在アクティブなJOSMレイヤーのGPSトラックをopenstreetmap.org"
+"へ直接アップロードします。"
 
 #. Plugin Duplicate-Way
@@ -17364,10 +17576,11 @@
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
-msgstr "ユーザにタイムスタンプの匿名化と広大なGPX トラックの部分的な高速削除を許可する。"
+msgstr ""
+"ユーザにタイムスタンプの匿名化と広大なGPX トラックの部分的な高速削除を許可す"
+"る。"
 
 #. Plugin globalsat
 #: build/trans_plugins.java:21
-msgid ""
-"Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード"
 
@@ -17389,6 +17602,7 @@
 "the filename of an image."
 msgstr ""
-"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポイントタグの 'name', 'cmt' または 'desc' "
-"属性が画像のファイル名と一致したときに行われます。"
+"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポ"
+"イントタグの 'name', 'cmt' または 'desc' 属性が画像のファイル名と一致したとき"
+"に行われます。"
 
 #. Plugin lakewalker
@@ -17409,5 +17623,7 @@
 "segments, area surrounded by a (simple) closed way and create measurement "
 "paths (which also can be imported from a gps layer)."
-msgstr "選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを追加します。"
+msgstr ""
+"選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを"
+"追加します。"
 
 #. Plugin michigan_left
@@ -17421,5 +17637,7 @@
 "Create multipolygons by one click, much easier than standard way with "
 "relation editor."
-msgstr "マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方よりはるかに簡単です。"
+msgstr ""
+"マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方"
+"よりはるかに簡単です。"
 
 #. Plugin nearclick
@@ -17430,6 +17648,7 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
-"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用していて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちます。"
-"（一般的な Java - タブレット問題）"
+"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用して"
+"いて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちま"
+"す。（一般的な Java - タブレット問題）"
 
 #. Plugin openlayers
@@ -17441,5 +17660,7 @@
 #: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
-msgstr "OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにします。"
+msgstr ""
+"OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにしま"
+"す。"
 
 #. Plugin openvisible
@@ -17453,5 +17674,7 @@
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr "現在表示されているスクリーンを、きれいなSVG画像として表示されるように、Firefoxを起動する。"
+msgstr ""
+"現在表示されているスクリーンを、きれいなSVG画像として表示されるように、"
+"Firefoxを起動する。"
 
 #. Plugin PicLayer
@@ -17460,5 +17683,7 @@
 "This plugin allows to display any picture as a background in the editor and "
 "align it with the map."
-msgstr "このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることができます。"
+msgstr ""
+"このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることが"
+"できます。"
 
 #. Plugin plastic_laf
@@ -17478,6 +17703,7 @@
 "defined in routes.xml file in plugin directory"
 msgstr ""
-"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートのタイプはplugin ディレクトリのroute.xml "
-"ファイルに定義されていなければなりません"
+"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートの"
+"タイプはplugin ディレクトリのroute.xml ファイルに定義されていなければなりませ"
+"ん"
 
 #. Plugin routing
@@ -17491,5 +17717,7 @@
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
 "background and request updates."
-msgstr "JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景としてロードし、更新を要求できます。"
+msgstr ""
+"JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景として"
+"ロードし、更新を要求できます。"
 
 #. Plugin surveyor
@@ -17510,6 +17738,7 @@
 "the jar-file as standalone as well."
 msgstr ""
-"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリセットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar"
-" ファイルも同様にスタンドアロンとして起動できます。"
+"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリ"
+"セットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar "
+"ファイルも同様にスタンドアロンとして起動できます。"
 
 #. Plugin terracer
@@ -17523,5 +17752,7 @@
 "An OSM data validator. It checks for problems in data, and provides fixes "
 "for the common ones. Spellcheck integrated for tag names."
-msgstr "OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供します。タグ名用にスペルチェック機能が統合されています。"
+msgstr ""
+"OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供しま"
+"す。タグ名用にスペルチェック機能が統合されています。"
 
 #. Plugin walkingpapers
@@ -17531,6 +17762,6 @@
 "plugin is still under early development and may be buggy."
 msgstr ""
-"walking-papers.org "
-"からスキャンされた地図のタイルのダウンロードをサポートします。まだ開発初期段階ですので、バグを含んでいるかもしれません。"
+"walking-papers.org からスキャンされた地図のタイルのダウンロードをサポートしま"
+"す。まだ開発初期段階ですので、バグを含んでいるかもしれません。"
 
 #. Plugin waydownloader
@@ -17547,5 +17778,5 @@
 #. <!--
 #. Pics have been derived from
-#. http://commons.wikipedia.org (german street sign SVGs)
+#. http://de.wikipedia.org/wiki/Bildtafel_der_Verkehrszeichen_in_Deutschland (german street sign SVGs)
 #. http://commons.wikimedia.org/wiki/Image:National_Park_Service_sample_pictographs.svg (various monochrome pictograms)
 #. http://www.kde.org
@@ -17652,6 +17883,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1560 build/trans_presets.java:2389
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:1421 build/trans_presets.java:2250
+#: build/trans_presets.java:3053
 msgid "Reference"
 msgstr "道路番号"
@@ -17668,5 +17899,5 @@
 #: 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
+#: build/trans_presets.java:193 build/trans_presets.java:388
 msgid "Lanes"
 msgstr "車線数"
@@ -17683,15 +17914,15 @@
 #. item "Highways/Streets/Bridge" combo "Layer"
 #. item "Highways/Streets/Tunnel" combo "Layer"
+#. item "Ways/Path" 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
+#: build/trans_presets.java:236 build/trans_presets.java:310
+#: build/trans_presets.java:343 build/trans_presets.java:364
+#: build/trans_presets.java:403 build/trans_presets.java:418
+#: build/trans_presets.java:442 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:597
+#: build/trans_presets.java:617 build/trans_presets.java:1182
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -17710,4 +17941,6 @@
 #. item "Highways/Streets/Living Street" text "Name"
 #. <optional>
+#. item "Highways/Streets/Pedestrian" text "Name"
+#. <optional>
 #. item "Highways/Streets/Service" text "Name"
 #. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
@@ -17720,11 +17953,12 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. item "Ways/Construction" text "Name"
-#. item "Ways/Bridleway" text "Name"
-#. item "Ways/Cycleway" text "Name"
-#. item "Ways/Footway" text "Name"
-#. item "Ways/Pedestrian" text "Name"
-#. <optional>
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
 #. item "Ways/Steps" text "Name"
-#. item "Ways/Path" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -17733,11 +17967,13 @@
 #: 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
+#: build/trans_presets.java:266 build/trans_presets.java:284
+#: build/trans_presets.java:303 build/trans_presets.java:323
+#: build/trans_presets.java:336 build/trans_presets.java:350
+#: build/trans_presets.java:382 build/trans_presets.java:434
+#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:506 build/trans_presets.java:526
+#: build/trans_presets.java:549 build/trans_presets.java:571
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:1175
 msgid "Oneway"
 msgstr "一方通行"
@@ -17754,4 +17990,5 @@
 #. item "Highways/Streets/Residential" check "Oneway"
 #. item "Highways/Streets/Living Street" check "Oneway"
+#. item "Highways/Streets/Pedestrian" check "Oneway"
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
@@ -17760,16 +17997,12 @@
 #. </optional>
 #. item "Ways/Construction" check "Oneway"
-#. item "Ways/Bridleway" check "Oneway"
-#. item "Ways/Cycleway" check "Oneway"
-#. item "Ways/Footway" check "Oneway"
-#. item "Ways/Pedestrian" check "Oneway"
+#. item "Ways/Track" text "Name"
+#. item "Ways/Path" text "Name"
+#. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Dedicated Cycleway" check "Oneway"
+#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
+#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
+#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Track Grade 1" text "Name"
-#. item "Ways/Track Grade 2" text "Name"
-#. item "Ways/Track Grade 3" text "Name"
-#. item "Ways/Track Grade 4" text "Name"
-#. item "Ways/Track Grade 5" text "Name"
-#. item "Ways/Path" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
 #. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
@@ -17784,14 +18017,13 @@
 #: 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
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:337
+#: build/trans_presets.java:383 build/trans_presets.java:392
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -17808,4 +18040,5 @@
 #. item "Highways/Streets/Residential" check "Bridge"
 #. item "Highways/Streets/Living Street" check "Bridge"
+#. item "Highways/Streets/Pedestrian" check "Bridge"
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
@@ -17814,16 +18047,12 @@
 #. </optional>
 #. item "Ways/Construction" check "Bridge"
-#. item "Ways/Bridleway" check "Bridge"
-#. item "Ways/Cycleway" check "Bridge"
-#. item "Ways/Footway" check "Bridge"
-#. item "Ways/Pedestrian" check "Bridge"
+#. item "Ways/Track" check "Bridge"
+#. item "Ways/Path" check "Bridge"
+#. item "Ways/Dedicated Bridleway" check "Bridge"
+#. item "Ways/Dedicated Cycleway" check "Bridge"
+#. item "Ways/Segregated Foot- and Cycleway" check "Bridge"
+#. item "Ways/Combined Foot- and Cycleway" check "Bridge"
+#. item "Ways/Dedicated Footway" check "Bridge"
 #. item "Ways/Steps" check "Bridge"
-#. item "Ways/Track" check "Bridge"
-#. item "Ways/Track Grade 1" check "Bridge"
-#. item "Ways/Track Grade 2" check "Bridge"
-#. item "Ways/Track Grade 3" check "Bridge"
-#. item "Ways/Track Grade 4" check "Bridge"
-#. item "Ways/Track Grade 5" check "Bridge"
-#. item "Ways/Path" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
 #: build/trans_presets.java:84 build/trans_presets.java:101
@@ -17832,14 +18061,12 @@
 #: 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
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:384 build/trans_presets.java:408
+#: build/trans_presets.java:436 build/trans_presets.java:455
+#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:528 build/trans_presets.java:551
+#: build/trans_presets.java:573 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:1177
 msgid "Tunnel"
 msgstr "トンネル"
@@ -17856,20 +18083,17 @@
 #. item "Highways/Streets/Residential" check "Tunnel"
 #. item "Highways/Streets/Living Street" check "Tunnel"
+#. item "Highways/Streets/Pedestrian" 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"
-#. item "Ways/Cycleway" check "Tunnel"
-#. item "Ways/Footway" check "Tunnel"
-#. item "Ways/Pedestrian" check "Tunnel"
+#. item "Ways/Track" check "Tunnel"
+#. item "Ways/Path" check "Tunnel"
+#. item "Ways/Dedicated Bridleway" check "Tunnel"
+#. item "Ways/Dedicated Cycleway" check "Tunnel"
+#. item "Ways/Segregated Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Combined Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Dedicated Footway" check "Tunnel"
 #. item "Ways/Steps" check "Tunnel"
-#. item "Ways/Track" check "Tunnel"
-#. item "Ways/Track Grade 1" check "Tunnel"
-#. item "Ways/Track Grade 2" check "Tunnel"
-#. item "Ways/Track Grade 3" check "Tunnel"
-#. item "Ways/Track Grade 4" check "Tunnel"
-#. item "Ways/Track Grade 5" check "Tunnel"
-#. item "Ways/Path" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
 #: build/trans_presets.java:85 build/trans_presets.java:102
@@ -17878,13 +18102,12 @@
 #: 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
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:385 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:509 build/trans_presets.java:529
+#: build/trans_presets.java:552 build/trans_presets.java:574
+#: build/trans_presets.java:592 build/trans_presets.java:613
+#: build/trans_presets.java:1178
 msgid "Cutting"
 msgstr "切り通し"
@@ -17901,20 +18124,17 @@
 #. item "Highways/Streets/Residential" check "Cutting"
 #. item "Highways/Streets/Living Street" check "Cutting"
+#. item "Highways/Streets/Pedestrian" 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"
-#. item "Ways/Cycleway" check "Cutting"
-#. item "Ways/Footway" check "Cutting"
-#. item "Ways/Pedestrian" check "Cutting"
+#. item "Ways/Track" check "Cutting"
+#. item "Ways/Path" check "Cutting"
+#. item "Ways/Dedicated Bridleway" check "Cutting"
+#. item "Ways/Dedicated Cycleway" check "Cutting"
+#. item "Ways/Segregated Foot- and Cycleway" check "Cutting"
+#. item "Ways/Combined Foot- and Cycleway" check "Cutting"
+#. item "Ways/Dedicated Footway" check "Cutting"
 #. item "Ways/Steps" check "Cutting"
-#. item "Ways/Track" check "Cutting"
-#. item "Ways/Track Grade 1" check "Cutting"
-#. item "Ways/Track Grade 2" check "Cutting"
-#. item "Ways/Track Grade 3" check "Cutting"
-#. item "Ways/Track Grade 4" check "Cutting"
-#. item "Ways/Track Grade 5" check "Cutting"
-#. item "Ways/Path" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
 #: build/trans_presets.java:86 build/trans_presets.java:103
@@ -17923,13 +18143,12 @@
 #: 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
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:386 build/trans_presets.java:438
+#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:510 build/trans_presets.java:530
+#: build/trans_presets.java:553 build/trans_presets.java:575
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:1179
 msgid "Embankment"
 msgstr "土手"
@@ -18069,33 +18288,22 @@
 #. 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)"
-#. item "Ways/Cycleway" text "Max. speed (km/h)"
-#. item "Ways/Footway" text "Max. speed (km/h)"
+#. item "Ways/Path" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
 #. item "Ways/Steps" text "Max. speed (km/h)"
-#. item "Ways/Path" text "Max. speed (km/h)"
-#. item "Ways/Hiking" text "Name"
-#. item "Ways/Mountain Hiking" text "Name"
-#. item "Ways/Demanding Mountain Hiking" text "Name"
-#. item "Ways/Alpine Hiking" text "Name"
-#. item "Ways/Demanding Alpine Hiking" text "Name"
-#. item "Ways/Difficult Alpine Hiking" text "Name"
 #. 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: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:1498 build/trans_presets.java:1543
+#: build/trans_presets.java:273 build/trans_presets.java:291
+#: build/trans_presets.java:311 build/trans_presets.java:344
+#: build/trans_presets.java:389 build/trans_presets.java:405
+#: build/trans_presets.java:419 build/trans_presets.java:443
+#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:578
+#: build/trans_presets.java:598 build/trans_presets.java:618
+#: build/trans_presets.java:1183 build/trans_presets.java:1359
+#: build/trans_presets.java:1404
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -18120,31 +18328,26 @@
 #. item "Highways/Streets/Residential" combo "Layer"
 #. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Pedestrian" combo "Layer"
 #. item "Highways/Streets/Service" combo "Layer"
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
 #. item "Ways/Construction" combo "Layer"
-#. item "Ways/Bridleway" combo "Layer"
-#. item "Ways/Cycleway" combo "Layer"
-#. item "Ways/Footway" combo "Layer"
-#. item "Ways/Pedestrian" combo "Layer"
+#. item "Ways/Track" check "Oneway"
+#. item "Ways/Path" check "Oneway"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
-#. item "Ways/Track" check "Embankment"
-#. item "Ways/Track Grade 1" check "Embankment"
-#. item "Ways/Track Grade 2" check "Embankment"
-#. item "Ways/Track Grade 3" check "Embankment"
-#. item "Ways/Track Grade 4" check "Embankment"
-#. item "Ways/Track Grade 5" check "Embankment"
-#. item "Ways/Path" combo "Layer"
 #. 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
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "Surface"
 msgstr "表面"
@@ -18152,178 +18355,180 @@
 #. item "Highways/Streets/Residential" combo "Surface"
 #. item "Highways/Streets/Living Street" combo "Surface"
+#. item "Highways/Streets/Pedestrian" 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"
-#. item "Ways/Cycleway" combo "Surface"
-#. item "Ways/Footway" combo "Surface"
-#. item "Ways/Pedestrian" combo "Surface"
+#. item "Ways/Track" combo "Surface"
+#. item "Ways/Path" combo "Surface"
+#. item "Ways/Dedicated Bridleway" combo "Surface"
+#. item "Ways/Dedicated Cycleway" combo "Surface"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface"
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface"
+#. item "Ways/Dedicated Footway" combo "Surface"
 #. item "Ways/Steps" combo "Surface"
-#. item "Ways/Track" combo "Surface"
-#. item "Ways/Track Grade 1" combo "Surface"
-#. item "Ways/Path" combo "Surface"
 #. 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
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "paved"
 msgstr "舗装"
 
 #: 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:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "unpaved"
 msgstr "未舗装"
 
 #: 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:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "asphalt"
 msgstr "アスファルト"
 
 #: 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
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "concrete"
 msgstr "コンクリート"
 
 #: 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:2465
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181 build/trans_presets.java:2326
 msgid "metal"
 msgstr "金属"
 
 #: 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:2465
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181 build/trans_presets.java:2326
 msgid "wood"
 msgstr "森"
 
 #: 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:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "paving_stones"
 msgstr "敷石"
 
-#. item "Ways/Track Grade 2" combo "Surface"
-#. item "Ways/Track Grade 3" 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:581
-#: build/trans_presets.java:602 build/trans_presets.java:677
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "cobblestone"
 msgstr "敷石"
 
 #: 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
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "gravel"
 msgstr "砂利道"
 
 #: 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:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "pebblestone"
 msgstr "小石"
 
 #: 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:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "compacted"
 msgstr "圧縮"
 
 #: 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:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:512 build/trans_presets.java:533
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:596 build/trans_presets.java:616
+#: build/trans_presets.java:1181
 msgid "grass_paver"
 msgstr "敷石混じりの芝"
 
 #: 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
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "grass"
 msgstr "草地"
 
 #: 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
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "sand"
 msgstr "砂地"
 
-#. item "Ways/Track Grade 4" combo "Surface"
-#. item "Ways/Track Grade 5" 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: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
+#: build/trans_presets.java:290 build/trans_presets.java:309
+#: build/trans_presets.java:324 build/trans_presets.java:342
+#: build/trans_presets.java:440 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:555
+#: build/trans_presets.java:577 build/trans_presets.java:596
+#: build/trans_presets.java:616 build/trans_presets.java:1181
 msgid "ground"
 msgstr "地表"
@@ -18345,4 +18550,17 @@
 #. </optional>
 #: build/trans_presets.java:276
+msgid "Pedestrian"
+msgstr "歩行者専用道路"
+
+#. item "Highways/Streets/Pedestrian"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+#: build/trans_presets.java:279
+msgid "Edit Pedestrian Street"
+msgstr "歩行者専用道路の編集"
+
+#. item "Highways/Streets/Pedestrian" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:294
 msgid "Service"
 msgstr "敷地内道路"
@@ -18351,5 +18569,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:279
+#: build/trans_presets.java:297
 msgid "Edit Serviceway"
 msgstr "敷地内道路の編集"
@@ -18359,18 +18577,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "Serviceway type"
 msgstr "敷地内道路のタイプ"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:283
+#: build/trans_presets.java:301
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -18378,5 +18596,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:314
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -18386,5 +18604,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:300
+#: build/trans_presets.java:318
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
@@ -18392,5 +18610,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:310
+#: build/trans_presets.java:328
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -18399,5 +18617,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:313
+#: build/trans_presets.java:331
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -18406,20 +18624,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:348
 msgid "Road Restrictions"
 msgstr "通行制限"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:331
+#: build/trans_presets.java:349
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:333
+#: build/trans_presets.java:351
 msgid "Toll"
 msgstr "料金"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:352
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -18427,13 +18645,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#. item "Ways/Track Grade 1" combo "Layer"
-#. item "Ways/Track Grade 2" combo "Layer"
-#. item "Ways/Track Grade 3" combo "Layer"
-#. item "Ways/Track Grade 4" combo "Layer"
-#. item "Ways/Track Grade 5" combo "Layer"
-#: 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
+#: build/trans_presets.java:353 build/trans_presets.java:464
 msgid "Access"
 msgstr "アクセス"
@@ -18453,19 +18663,4 @@
 #. item "Ways/Track" combo "Motorcycle"
 #. item "Ways/Track" combo "Motorcar"
-#. item "Ways/Track Grade 1" combo "Access"
-#. item "Ways/Track Grade 1" combo "Motorcycle"
-#. item "Ways/Track Grade 1" combo "Motorcar"
-#. item "Ways/Track Grade 2" combo "Access"
-#. item "Ways/Track Grade 2" combo "Motorcycle"
-#. item "Ways/Track Grade 2" combo "Motorcar"
-#. item "Ways/Track Grade 3" combo "Access"
-#. item "Ways/Track Grade 3" combo "Motorcycle"
-#. item "Ways/Track Grade 3" combo "Motorcar"
-#. item "Ways/Track Grade 4" combo "Access"
-#. item "Ways/Track Grade 4" combo "Motorcycle"
-#. item "Ways/Track Grade 4" combo "Motorcar"
-#. item "Ways/Track Grade 5" combo "Access"
-#. item "Ways/Track Grade 5" combo "Motorcycle"
-#. item "Ways/Track Grade 5" combo "Motorcar"
 #. item "Ways/Path" combo "Foot"
 #. item "Ways/Path" combo "Bicycle"
@@ -18490,31 +18685,24 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: 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:1532 build/trans_presets.java:1533
-#: build/trans_presets.java:1534 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2427
-#: build/trans_presets.java:2428 build/trans_presets.java:2464
-#: build/trans_presets.java:2473 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2759
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:1268
+#: build/trans_presets.java:1269 build/trans_presets.java:1272
+#: build/trans_presets.java:1273 build/trans_presets.java:1274
+#: build/trans_presets.java:1393 build/trans_presets.java:1394
+#: build/trans_presets.java:1395 build/trans_presets.java:1628
+#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:2289 build/trans_presets.java:2325
+#: build/trans_presets.java:2334 build/trans_presets.java:2335
+#: build/trans_presets.java:2336 build/trans_presets.java:2620
 msgid "yes"
 msgstr "はい"
@@ -18527,40 +18715,25 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: 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
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:212
 msgid "private"
 msgstr "私道"
 
-#: 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
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "designated"
 msgstr "指定済み"
@@ -18573,19 +18746,12 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: 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
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:219
 msgid "destination"
 msgstr "行き先"
@@ -18596,8 +18762,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#. 
+#.
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -18608,74 +18774,52 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: 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
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:205
 msgid "permissive"
 msgstr "関係車両のみ可"
 
-#: 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
+#: build/trans_presets.java:353 build/trans_presets.java:357
+#: build/trans_presets.java:360 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "農業の"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: 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:1532
-#: build/trans_presets.java:1533 build/trans_presets.java:1534
-#: build/trans_presets.java:1767 build/trans_presets.java:1777
-#: build/trans_presets.java:2427 build/trans_presets.java:2428
-#: build/trans_presets.java:2464 build/trans_presets.java:2473
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:353 build/trans_presets.java:354
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:486 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:531
+#: build/trans_presets.java:594 build/trans_presets.java:646
+#: build/trans_presets.java:661 build/trans_presets.java:1205
+#: build/trans_presets.java:1268 build/trans_presets.java:1269
+#: build/trans_presets.java:1272 build/trans_presets.java:1273
+#: build/trans_presets.java:1274 build/trans_presets.java:1393
+#: build/trans_presets.java:1394 build/trans_presets.java:1395
+#: build/trans_presets.java:1628 build/trans_presets.java:1638
+#: build/trans_presets.java:2288 build/trans_presets.java:2289
+#: build/trans_presets.java:2325 build/trans_presets.java:2334
+#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:2620
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:338
+#: build/trans_presets.java:356
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:339
+#: build/trans_presets.java:357
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -18690,10 +18834,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: 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
+#: build/trans_presets.java:358 build/trans_presets.java:488
+#: build/trans_presets.java:731 build/trans_presets.java:764
+#: build/trans_presets.java:786 build/trans_presets.java:823
+#: build/trans_presets.java:836 build/trans_presets.java:848
+#: build/trans_presets.java:860 build/trans_presets.java:872
+#: build/trans_presets.java:912
 msgid "Horse"
 msgstr "馬"
@@ -18709,13 +18853,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: 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
+#: build/trans_presets.java:359 build/trans_presets.java:465
+#: build/trans_presets.java:732 build/trans_presets.java:750
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:824 build/trans_presets.java:837
+#: build/trans_presets.java:849 build/trans_presets.java:861
+#: build/trans_presets.java:873 build/trans_presets.java:913
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -18730,30 +18871,27 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: 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
+#: build/trans_presets.java:360 build/trans_presets.java:466
+#: build/trans_presets.java:492 build/trans_presets.java:751
+#: build/trans_presets.java:766 build/trans_presets.java:788
+#: build/trans_presets.java:825 build/trans_presets.java:838
+#: build/trans_presets.java:850 build/trans_presets.java:862
+#: build/trans_presets.java:874 build/trans_presets.java:914
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:343
+#: build/trans_presets.java:361
 msgid "Public Service Vehicles (psv)"
 msgstr "公共交通機関(psv)"
 
-#: build/trans_presets.java:344
+#: build/trans_presets.java:362
 msgid "Motorboat"
 msgstr "モーターボート"
 
-#: build/trans_presets.java:345
+#: build/trans_presets.java:363
 msgid "Boat"
 msgstr "ボート"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:347
+#: build/trans_presets.java:365
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -18761,25 +18899,25 @@
 #. 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
+#: build/trans_presets.java:366 build/trans_presets.java:404
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:367
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:350
+#: build/trans_presets.java:368
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:369
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:353
+#: build/trans_presets.java:371
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -18790,5 +18928,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:358
+#: build/trans_presets.java:376
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -18797,5 +18935,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -18805,13 +18943,13 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_presets.java:379 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "自動車専用道路"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "motorway_link"
 msgstr "自動車専用道路の連結路"
@@ -18822,5 +18960,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -18830,13 +18968,13 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_presets.java:379 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -18847,5 +18985,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -18855,13 +18993,13 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_presets.java:379 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "主要地方道"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "primary_link"
 msgstr "主要地方道の連絡路"
@@ -18872,5 +19010,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -18880,8 +19018,8 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_presets.java:379 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18893,12 +19031,12 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:617
+#: build/trans_presets.java:379 build/trans_style.java:617
 msgid "tertiary"
 msgstr "一般道(2車線以上)"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "unclassified"
 msgstr "一般道(2車線未満)"
@@ -18909,12 +19047,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3221
+#: build/trans_presets.java:379 build/trans_style.java:3252
 msgid "residential"
 msgstr "居住区域内道路"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "living_street"
 msgstr "私道"
@@ -18925,5 +19063,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -18932,5 +19070,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -18940,14 +19078,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:673
-#: build/trans_style.java:4326
+#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_style.java:4357
 msgid "service"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:379
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -18958,5 +19096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -18965,5 +19103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -18973,10 +19111,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:880
-#: build/trans_style.java:3286 build/trans_style.java:3287
+#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
 msgstr "工事中"
@@ -18987,10 +19125,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:379
+#: build/trans_presets.java:397
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:409
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -18998,19 +19136,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:405
+#: build/trans_presets.java:423
 msgid "Ways"
 msgstr "ウェイ"
 
 #. group "Ways"
-#: build/trans_presets.java:406
+#: build/trans_presets.java:424
 msgid "Construction"
 msgstr "工事中"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:407
+#: build/trans_presets.java:425
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:423
+#: build/trans_presets.java:441
 msgid "Junction"
 msgstr "ジャンクション"
@@ -19021,10 +19159,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- junction tag -->
-#. 
+#.
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:898
+#: build/trans_presets.java:441 build/trans_style.java:898
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -19032,68 +19170,192 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:446
+msgid "Track"
+msgstr "トラック"
+
+#. item "Ways/Track"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+#: build/trans_presets.java:449
+msgid "Edit Track"
+msgstr "トラックの編集"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "Tracktype"
+msgstr "トラック"
+
+#. item "Ways/Track" combo "Tracktype"
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade1"
+msgstr "砂利道"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade2"
+msgstr "砂利道"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade3"
+msgstr "砂利道"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade4"
+msgstr "砂利道"
+
+#: build/trans_presets.java:460
+#, fuzzy
+msgid "grade5"
+msgstr "砂利道"
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
+msgid "MTB Scale"
+msgstr ""
+
+#. item "Ways/Track" combo "MTB Scale"
+#. item "Ways/Path" combo "MTB Scale"
+#: build/trans_presets.java:462 build/trans_presets.java:485
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Track" combo "SAC Scale"
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:3051
+msgid "hiking"
+msgstr "ハイキング"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "mountain_hiking"
+msgstr "マウンテンバイク"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "demanding_mountain_hiking"
+msgstr "厳しい山岳ハイキング"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "alpine_hiking"
+msgstr "高山ハイキング"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "demanding_alpine_hiking"
+msgstr "厳しい高山ハイキング"
+
+#: build/trans_presets.java:462 build/trans_presets.java:485
+#, fuzzy
+msgid "difficult_alpine_hiking"
+msgstr "困難な高山ハイキング"
+
+#. item "Ways/Track" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:470
+msgid "Path"
+msgstr "小道"
+
+#. item "Ways/Path"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+#: build/trans_presets.java:473
+msgid "Edit Path"
+msgstr "小道の編集"
+
+#: build/trans_presets.java:489
+#, fuzzy
+msgid "Wheelchairs"
+msgstr "車いす"
+
+#: build/trans_presets.java:490
+msgid "Ski"
+msgstr "スキー"
+
+#: build/trans_presets.java:491
+msgid "Snowmobile"
+msgstr "スノーモービル"
+
+#. item "Ways/Path" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:429
-msgid "Bridleway"
-msgstr "馬道"
-
-#. item "Ways/Bridleway"
+#: build/trans_presets.java:499
+#, fuzzy
+msgid "Dedicated Bridleway"
+msgstr "馬道の編集"
+
+#. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:431
+#: build/trans_presets.java:501
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
 
-#. item "Ways/Bridleway" text "Width (meters)"
+#. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:447
-msgid "Cycleway"
-msgstr "自転車道"
-
-#. item "Ways/Cycleway"
+#: build/trans_presets.java:517
+#, fuzzy
+msgid "Dedicated Cycleway"
+msgstr "自転車道の編集"
+
+#. item "Ways/Dedicated Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:451
+#. item "Ways/Segregated Foot- and Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Combined Foot- and Cycleway"
+#. <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:521 build/trans_presets.java:541
+#: build/trans_presets.java:563
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
 
-#. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:461
+#. item "Ways/Dedicated Cycleway" check "Embankment"
+#: build/trans_presets.java:531
 msgid "Pedestrians"
 msgstr "歩行者専用道路"
 
-#. item "Ways/Cycleway" text "Width (meters)"
+#. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:468
-msgid "Footway"
-msgstr "遊歩道"
-
-#. item "Ways/Footway"
+#: build/trans_presets.java:537
+msgid "Segregated Foot- and Cycleway"
+msgstr ""
+
+#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:559
+#, fuzzy
+msgid "Combined Foot- and Cycleway"
+msgstr "強制的に連結。"
+
+#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:581
+#, fuzzy
+msgid "Dedicated Footway"
+msgstr "遊歩道の編集"
+
+#. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:471
+#: build/trans_presets.java:584
 msgid "Edit Footway"
 msgstr "遊歩道の編集"
 
-#. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:481
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:594
 msgid "Bikes"
 msgstr "自転車"
 
-#. item "Ways/Footway" text "Width (meters)"
+#. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:488
-msgid "Pedestrian"
-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:491
-msgid "Edit Pedestrian Street"
-msgstr "歩行者専用道路の編集"
-
-#. item "Ways/Pedestrian" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:506
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "階段"
@@ -19103,5 +19365,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:510
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
@@ -19109,198 +19371,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:527
-msgid "Track"
-msgstr "トラック"
-
-#. item "Ways/Track"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:530
-msgid "Edit Track"
-msgstr "トラックの編集"
-
-#. item "Ways/Track" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:547
-msgid "Track Grade 1"
-msgstr "トラック グレード 1"
-
-#. 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:550
-msgid "Edit Track of grade 1"
-msgstr "トラック グレード 1　の編集"
-
-#. item "Ways/Track Grade 1" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:568
-msgid "Track Grade 2"
-msgstr "トラック グレード 2"
-
-#. 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:571
-msgid "Edit Track of grade 2"
-msgstr "トラック グレード 2の編集"
-
-#. item "Ways/Track Grade 2" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:589
-msgid "Track Grade 3"
-msgstr "トラック グレード 3"
-
-#. 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:592
-msgid "Edit Track of grade 3"
-msgstr "トラック グレード 3　の編集"
-
-#. item "Ways/Track Grade 3" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:610
-msgid "Track Grade 4"
-msgstr "トラック グレード 4"
-
-#. 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:613
-msgid "Edit Track of grade 4"
-msgstr "トラック グレード 4　の編集"
-
-#. item "Ways/Track Grade 4" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:631
-msgid "Track Grade 5"
-msgstr "トラック グレード 5"
-
-#. 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:634
-msgid "Edit Track of grade 5"
-msgstr "トラック グレード 5 の編集"
-
-#. item "Ways/Track Grade 5" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:653
-msgid "Path"
-msgstr "小道"
-
-#. item "Ways/Path"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:656
-msgid "Edit Path"
-msgstr "小道の編集"
-
-#: build/trans_presets.java:664
-msgid "Ski"
-msgstr "スキー"
-
-#: build/trans_presets.java:665
-msgid "Snowmobile"
-msgstr "スノーモービル"
-
-#. item "Ways/Path" text "Width (meters)"
-#. </optional>
-#. item "Tourism/Map" label "Routes shown for:"
-#. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:682 build/trans_presets.java:1729
-#: build/trans_presets.java:1752
-msgid "Hiking"
-msgstr "ハイキング"
-
-#. 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:686
-msgid "Edit Hiking"
-msgstr "ハイキングの編集"
-
-#. item "Ways/Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:695
-msgid "Mountain Hiking"
-msgstr "山岳ハイキング"
-
-#. 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:699
-msgid "Edit Mountain Hiking"
-msgstr "山岳ハイキングの編集"
-
-#. item "Ways/Mountain Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:708
-msgid "Demanding Mountain Hiking"
-msgstr "厳しい山岳ハイキング"
-
-#. 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:712
-msgid "Edit Demanding Mountain Hiking"
-msgstr "厳しい山岳ハイキングの編集"
-
-#. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:721
-msgid "Alpine Hiking"
-msgstr "高山ハイキング"
-
-#. 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:725
-msgid "Edit Alpine Hiking"
-msgstr "高山ハイキングの編集"
-
-#. item "Ways/Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:734
-msgid "Demanding Alpine Hiking"
-msgstr "厳しい高山ハイキング"
-
-#. 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:738
-msgid "Edit Demanding Alpine Hiking"
-msgstr "厳しい高山ハイキングの編集"
-
-#. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:747
-msgid "Difficult Alpine Hiking"
-msgstr "困難な高山ハイキング"
-
-#. 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:751
-msgid "Edit Difficult Alpine Hiking"
-msgstr "困難な高山ハイキングの編集"
-
-#. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:761
+#: build/trans_presets.java:622
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
 #. group "Waypoints"
-#: build/trans_presets.java:762
+#: build/trans_presets.java:623
 msgid "Motorway Junction"
 msgstr "自動車専用道路のジャンクション"
@@ -19308,15 +19382,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:764
+#: build/trans_presets.java:625
 msgid "Edit Motorway Junction"
 msgstr "自動車専用道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:629
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:631
 msgid "Services"
 msgstr "敷地内道路"
@@ -19324,5 +19398,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:772
+#: build/trans_presets.java:633
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -19361,17 +19435,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:777 build/trans_presets.java:914
-#: build/trans_presets.java:1396 build/trans_presets.java:1420
-#: build/trans_presets.java:1426 build/trans_presets.java:1434
-#: build/trans_presets.java:1441 build/trans_presets.java:1765
-#: build/trans_presets.java:1775 build/trans_presets.java:2204
-#: build/trans_presets.java:2306 build/trans_presets.java:2336
-#: build/trans_presets.java:2388 build/trans_presets.java:2396
-#: build/trans_presets.java:2413 build/trans_presets.java:2425
-#: build/trans_presets.java:2434 build/trans_presets.java:2441
-#: build/trans_presets.java:2495 build/trans_presets.java:2505
-#: build/trans_presets.java:2557 build/trans_presets.java:2723
-#: build/trans_presets.java:2738 build/trans_presets.java:2777
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:638 build/trans_presets.java:775
+#: build/trans_presets.java:1257 build/trans_presets.java:1281
+#: build/trans_presets.java:1287 build/trans_presets.java:1295
+#: build/trans_presets.java:1302 build/trans_presets.java:1626
+#: build/trans_presets.java:1636 build/trans_presets.java:2065
+#: build/trans_presets.java:2167 build/trans_presets.java:2197
+#: build/trans_presets.java:2249 build/trans_presets.java:2257
+#: build/trans_presets.java:2274 build/trans_presets.java:2286
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2356 build/trans_presets.java:2366
+#: build/trans_presets.java:2418 build/trans_presets.java:2584
+#: build/trans_presets.java:2599 build/trans_presets.java:2638
+#: build/trans_presets.java:3058
 msgid "Operator"
 msgstr "操作員"
@@ -19380,5 +19454,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:781
+#: build/trans_presets.java:642
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -19388,5 +19462,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:785
+#: build/trans_presets.java:646
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -19395,27 +19469,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:785 build/trans_presets.java:800
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:646 build/trans_presets.java:661
+#: build/trans_presets.java:1205
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:786 build/trans_presets.java:802
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:647 build/trans_presets.java:663
+#: build/trans_presets.java:1206
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -19423,6 +19497,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:787 build/trans_presets.java:801
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:648 build/trans_presets.java:662
+#: build/trans_presets.java:1207
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -19431,11 +19505,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:788 build/trans_presets.java:803
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:649 build/trans_presets.java:664
+#: build/trans_presets.java:1208
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:789
+#: build/trans_presets.java:650
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -19443,30 +19517,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:789 build/trans_presets.java:804
+#: build/trans_presets.java:650 build/trans_presets.java:665
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:792
+#: build/trans_presets.java:653
 msgid "Stop"
 msgstr "停止"
@@ -19474,5 +19548,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:795
+#: build/trans_presets.java:656
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -19481,14 +19555,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:798
+#: build/trans_presets.java:659
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:804
+#: build/trans_presets.java:665
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:806
+#: build/trans_presets.java:667
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -19499,14 +19573,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:811
+#: build/trans_presets.java:672
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:811
+#: build/trans_presets.java:672
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:813
+#: build/trans_presets.java:674
 msgid "Turning Circle"
 msgstr "転回場"
@@ -19516,20 +19590,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:818
+#: build/trans_presets.java:679
 msgid "City Limit"
 msgstr "市境界標識"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:819
+#: build/trans_presets.java:680
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:824
+#: build/trans_presets.java:685
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:826
+#: build/trans_presets.java:687
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -19537,5 +19611,5 @@
 #. item "Waypoints/Speed Camera"
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:690
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -19543,5 +19617,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:693
 msgid "Incline"
 msgstr "坂"
@@ -19549,5 +19623,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:835
+#: build/trans_presets.java:696
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -19556,10 +19630,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:700
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:701
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -19567,5 +19641,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:847
+#: build/trans_presets.java:708
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -19573,5 +19647,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:849
+#: build/trans_presets.java:710
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -19583,7 +19657,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:854 build/trans_presets.java:1604
-#: build/trans_presets.java:1749 build/trans_presets.java:2891
-#: build/trans_presets.java:2898 build/trans_presets.java:2905
+#: build/trans_presets.java:715 build/trans_presets.java:1465
+#: build/trans_presets.java:1610 build/trans_presets.java:2752
+#: build/trans_presets.java:2759 build/trans_presets.java:2766
 msgid "Elevation"
 msgstr "高度"
@@ -19591,5 +19665,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:858
+#: build/trans_presets.java:719
 msgid "Barriers"
 msgstr "ゲート等"
@@ -19597,5 +19671,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:861
+#: build/trans_presets.java:722
 msgid "Bollard"
 msgstr "車止め杭"
@@ -19603,5 +19677,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:724
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -19646,16 +19720,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: 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
+#: build/trans_presets.java:727 build/trans_presets.java:746
+#: build/trans_presets.java:760 build/trans_presets.java:782
+#: build/trans_presets.java:819 build/trans_presets.java:832
+#: build/trans_presets.java:844 build/trans_presets.java:856
+#: build/trans_presets.java:868 build/trans_presets.java:880
+#: build/trans_presets.java:890 build/trans_presets.java:899
+#: build/trans_presets.java:908
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:734
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -19664,5 +19738,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:877
+#: build/trans_presets.java:738
 msgid "Block"
 msgstr "ブロック"
@@ -19671,5 +19745,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:880
+#: build/trans_presets.java:741
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -19677,5 +19751,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:882
+#: build/trans_presets.java:743
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -19683,5 +19757,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:892
+#: build/trans_presets.java:753
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -19689,15 +19763,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:895
+#: build/trans_presets.java:756
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:757
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:768
 msgid "Toll Booth"
 msgstr "料金所"
@@ -19705,5 +19779,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:770
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -19711,10 +19785,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:917
+#: build/trans_presets.java:778
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:779
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -19722,7 +19796,7 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#. 
+#.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:932
+#: build/trans_presets.java:793
 msgid "Hedge"
 msgstr "生け垣"
@@ -19731,5 +19805,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:936
+#: build/trans_presets.java:797
 msgid "Fence"
 msgstr "フェンス"
@@ -19738,5 +19812,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:940
+#: build/trans_presets.java:801
 msgid "Wall"
 msgstr "壁"
@@ -19744,5 +19818,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:943
+#: build/trans_presets.java:804
 msgid "City Wall"
 msgstr "城壁"
@@ -19751,5 +19825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:947
+#: build/trans_presets.java:808
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -19759,17 +19833,17 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#. 
+#.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:954
+#: build/trans_presets.java:815
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:955
+#: build/trans_presets.java:816
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:827
 msgid "Gate"
 msgstr "ゲート"
@@ -19777,50 +19851,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:829
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:840
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:980
+#: build/trans_presets.java:841
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:852
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:992
+#: build/trans_presets.java:853
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:864
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:865
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:876
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:877
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:885
 msgid "Stile"
 msgstr "踏み越し段"
@@ -19828,40 +19902,40 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:887
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:895
 msgid "Turnstile"
 msgstr "回転式木戸"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:896
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:904
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:905
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#. 
+#.
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1058 build/trans_presets.java:1059
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:919 build/trans_presets.java:920
+#: build/trans_presets.java:963
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water/Water"
-#: build/trans_presets.java:1060
+#: build/trans_presets.java:921
 msgid "Spring"
 msgstr "泉"
@@ -19869,5 +19943,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:923
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -19875,5 +19949,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:928
 msgid "Drain"
 msgstr "側溝"
@@ -19881,10 +19955,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1069
+#: build/trans_presets.java:930
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:936
 msgid "Stream"
 msgstr "小川"
@@ -19892,10 +19966,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:938
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:1083
+#: build/trans_presets.java:944
 msgid "Canal"
 msgstr "運河"
@@ -19903,10 +19977,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:946
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:952
 msgid "River"
 msgstr "川"
@@ -19916,5 +19990,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:956
 msgid "Edit River"
 msgstr "河川の編集"
@@ -19922,15 +19996,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:965
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:969
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:970
 msgid "Edit Land"
 msgstr "陸地の編集"
@@ -19938,5 +20012,5 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:975
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -19944,10 +20018,10 @@
 # 水たまりになるような土地
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:976
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:981
 msgid "Reservoir"
 msgstr "ため池"
@@ -19955,15 +20029,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:983
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:988
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:989
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -19971,5 +20045,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:994
 msgid "Riverbank"
 msgstr "川岸"
@@ -19978,10 +20052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:997
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1001
 msgid "Wetland"
 msgstr "湿地帯"
@@ -19992,14 +20066,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1006
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "bog"
 msgstr "湿地"
@@ -20009,39 +20083,39 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3453
+#: build/trans_presets.java:1009 build/trans_style.java:3484
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1009
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1011
 msgid "Mud"
 msgstr "泥地"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1151
+#: build/trans_presets.java:1012
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1016
 msgid "Beach"
 msgstr "砂浜"
@@ -20049,20 +20123,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1157
+#: build/trans_presets.java:1018
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1022
 msgid "Bay"
 msgstr "湾"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1023
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1027
 msgid "Cliff"
 msgstr "崖"
@@ -20070,10 +20144,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1029
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1172
+#: build/trans_presets.java:1033
 msgid "Coastline"
 msgstr "海岸線"
@@ -20081,5 +20155,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1035
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -20087,5 +20161,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1040
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -20093,5 +20167,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1042
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -20100,5 +20174,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1189
+#: build/trans_presets.java:1050
 msgid "Boatyard"
 msgstr "ボートヤード(陸上の船置き場)"
@@ -20106,10 +20180,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1052
 msgid "Edit Boatyard"
 msgstr "ボートヤードの編集"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1057
 msgid "Dock"
 msgstr "ドック"
@@ -20117,5 +20191,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1059
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -20123,5 +20197,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1065
 msgid "Dam"
 msgstr "ダム"
@@ -20129,15 +20203,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1067
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1073
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1074
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -20146,5 +20220,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1078
 msgid "Weir"
 msgstr "堰"
@@ -20152,20 +20226,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1080
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1085
 msgid "Waterfall"
 msgstr "滝"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1086
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1091
 msgid "Turning Point"
 msgstr "転回地点"
@@ -20174,15 +20248,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1095
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1096
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1100
 msgid "Pier"
 msgstr "桟橋"
@@ -20190,10 +20264,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1102
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1106
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -20201,10 +20275,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:1108
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1112
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
@@ -20214,20 +20288,20 @@
 #. 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:1255
+#: build/trans_presets.java:1116
 msgid "Edit Slipway"
 msgstr "スリップウェイの編集"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1122
 msgid "Transport"
 msgstr "輸送"
 
 #. group "Transport"
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1123
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1124
 msgid "Rail"
 msgstr "線路"
@@ -20235,5 +20309,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1126
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -20263,8 +20337,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: 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
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "Optional Types"
 msgstr "追加のタイプ"
@@ -20278,35 +20352,35 @@
 #. 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
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "yard"
 msgstr "中庭"
 
-#: 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
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "siding"
 msgstr "待避線"
 
-#: 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
+#: build/trans_presets.java:1129 build/trans_presets.java:1135
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1154 build/trans_presets.java:1160
+#: build/trans_presets.java:1166 build/trans_presets.java:1191
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1131
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1132
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1137
 msgid "Monorail"
 msgstr "モノレール"
@@ -20314,45 +20388,45 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1139
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1144
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1145
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1289
+#: build/trans_presets.java:1150
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1151
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1156
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1157
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1162
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1163
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:1168
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -20360,5 +20434,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1309
+#: build/trans_presets.java:1170
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -20367,14 +20441,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1187
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1188
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1193
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -20383,5 +20457,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1197
 msgid "Level Crossing"
 msgstr "踏切"
@@ -20390,5 +20464,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1201
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -20398,5 +20472,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1205
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -20404,5 +20478,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1211
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -20411,10 +20485,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1216
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1217
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -20422,10 +20496,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1219
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1223
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -20433,10 +20507,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1225
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1229
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -20444,10 +20518,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1231
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1235
 msgid "Gondola"
 msgstr "ゴンドラ"
@@ -20455,10 +20529,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1237
 msgid "Edit Gondola"
 msgstr "ゴンドラを編集"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1241
 msgctxt "aerialway"
 msgid "Station"
@@ -20467,5 +20541,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1243
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -20473,5 +20547,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1389
+#: build/trans_presets.java:1250
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -20481,5 +20555,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1254
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -20537,32 +20611,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1397 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:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:2244
-#: build/trans_presets.java:2268 build/trans_presets.java:2496
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1536 build/trans_presets.java:1543
+#: build/trans_presets.java:1551 build/trans_presets.java:1564
+#: build/trans_presets.java:1578 build/trans_presets.java:1675
+#: build/trans_presets.java:1683 build/trans_presets.java:1786
+#: build/trans_presets.java:1792 build/trans_presets.java:2105
+#: build/trans_presets.java:2129 build/trans_presets.java:2357
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -20621,91 +20695,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1397 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:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1397 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:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1397 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:1925 build/trans_presets.java:1931
-#: build/trans_presets.java:2244 build/trans_presets.java:2268
-#: build/trans_presets.java:2518 build/trans_presets.java:2524
-#: build/trans_presets.java:2531 build/trans_presets.java:2538
-#: build/trans_presets.java:2544 build/trans_presets.java:2550
-#: build/trans_presets.java:2572 build/trans_presets.java:2579
-#: build/trans_presets.java:2586 build/trans_presets.java:2592
-#: build/trans_presets.java:2599 build/trans_presets.java:2605
-#: build/trans_presets.java:2611 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2643
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2694
-#: build/trans_presets.java:2701 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2724
-#: build/trans_presets.java:2732 build/trans_presets.java:2747
-#: build/trans_presets.java:2753 build/trans_presets.java:2761
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:1258 build/trans_presets.java:1486
+#: build/trans_presets.java:1494 build/trans_presets.java:1501
+#: build/trans_presets.java:1508 build/trans_presets.java:1514
+#: build/trans_presets.java:1521 build/trans_presets.java:1528
+#: build/trans_presets.java:1543 build/trans_presets.java:1551
+#: build/trans_presets.java:1564 build/trans_presets.java:1578
+#: build/trans_presets.java:1675 build/trans_presets.java:1683
+#: build/trans_presets.java:1786 build/trans_presets.java:1792
+#: build/trans_presets.java:2105 build/trans_presets.java:2129
+#: build/trans_presets.java:2379 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2405 build/trans_presets.java:2411
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2447 build/trans_presets.java:2453
+#: build/trans_presets.java:2460 build/trans_presets.java:2466
+#: build/trans_presets.java:2472 build/trans_presets.java:2478
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2548 build/trans_presets.java:2555
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2585
+#: build/trans_presets.java:2593 build/trans_presets.java:2608
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2649
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "火-日 08:00-15:00; 土 08:00-12:00"
@@ -20720,5 +20794,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1399 build/trans_presets.java:1445
+#: build/trans_presets.java:1260 build/trans_presets.java:1306
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20728,5 +20802,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1263
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -20737,25 +20811,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1405 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:2426
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:1266 build/trans_presets.java:1627
+#: build/trans_presets.java:1637 build/trans_presets.java:2287
+#: build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1267
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1267
 msgid "surface"
 msgstr "表面"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2338
+#: build/trans_presets.java:1267 build/trans_presets.java:2199
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1268
 msgid "Park and Ride"
 msgstr "パークアンドライド"
@@ -20764,48 +20838,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1408 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2427
+#: build/trans_presets.java:1269 build/trans_presets.java:1628
+#: build/trans_presets.java:1638 build/trans_presets.java:2288
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1271
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1411
+#: build/trans_presets.java:1272
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1273
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1274
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1275
 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:1416
+#: build/trans_presets.java:1277
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1278
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1283
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1284
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -20813,5 +20887,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1428 build/trans_presets.java:1452
+#: build/trans_presets.java:1289 build/trans_presets.java:1313
 msgid "Rental"
 msgstr "レンタル"
@@ -20820,10 +20894,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1292
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1297
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -20831,5 +20905,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1299
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -20837,10 +20911,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1447
+#: build/trans_presets.java:1308
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1311
 msgid "Capacity"
 msgstr "収容台数"
@@ -20849,15 +20923,15 @@
 #. <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:1455
+#: build/trans_presets.java:1316
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1321
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1322
 msgctxt "railway"
 msgid "Station"
@@ -20867,5 +20941,5 @@
 #. <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:1464
+#: build/trans_presets.java:1325
 msgctxt "railway"
 msgid "Edit Station"
@@ -20873,5 +20947,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1330
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -20879,5 +20953,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1333
 msgid "Railway Halt"
 msgstr "停車場"
@@ -20885,5 +20959,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1335
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -20891,5 +20965,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1342
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -20898,5 +20972,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1345
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -20904,5 +20978,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1352
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -20911,5 +20985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1355
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -20921,5 +20995,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1542
+#: build/trans_presets.java:1358 build/trans_presets.java:1403
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -20927,10 +21001,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1544
+#: build/trans_presets.java:1360 build/trans_presets.java:1405
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1362
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -20939,10 +21013,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1365
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509 build/trans_presets.java:2428
+#: build/trans_presets.java:1370 build/trans_presets.java:2289
 msgid "Wheelchair"
 msgstr "車いす"
@@ -20951,5 +21025,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1375
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -20958,5 +21032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1378
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -20964,5 +21038,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1384
 msgid "Bus Stop"
 msgstr "バス停"
@@ -20972,5 +21046,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1388
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -20979,25 +21053,25 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1789
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:1393 build/trans_presets.java:1650
+#: build/trans_presets.java:2334
 msgid "Shelter"
 msgstr "避難所"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1533 build/trans_presets.java:2461
+#: build/trans_presets.java:1394 build/trans_presets.java:2322
 msgid "Bench"
 msgstr "ベンチ"
 
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1395
 msgid "Tactile Paving"
 msgstr "点字ブロック"
 
 #. </optional>
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1399
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1400
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -21005,5 +21079,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1408
 msgid "Taxi"
 msgstr "タクシー"
@@ -21011,5 +21085,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1410
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -21017,5 +21091,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1415
 msgid "Airport"
 msgstr "空港"
@@ -21023,15 +21097,15 @@
 #. item "Public Transport/Airport"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1417
 msgid "Edit Airport"
 msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1422
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1423
 msgid "ICAO"
 msgstr "ICAO"
@@ -21039,10 +21113,10 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1428
 msgid "Travel"
 msgstr "旅行"
 
 #. group "Travel"
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1429
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -21054,5 +21128,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1569 build/trans_surveyor.java:43
+#: build/trans_presets.java:1430 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -21061,15 +21135,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1433
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1436
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1577
+#: build/trans_presets.java:1438
 msgid "Motel"
 msgstr "モーテル"
@@ -21077,20 +21151,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1440
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1583
+#: build/trans_presets.java:1444
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1445
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1449
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -21098,10 +21172,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1451
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1455
 msgid "Hostel"
 msgstr "ホステル"
@@ -21109,30 +21183,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1457
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1461
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1462
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1467
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1468
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1472
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -21140,10 +21214,10 @@
 #. 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:1474
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1479
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -21154,5 +21228,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1619 build/trans_surveyor.java:47
+#: build/trans_presets.java:1480 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -21160,5 +21234,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1482
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -21166,5 +21240,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:1485 build/trans_presets.java:1493
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -21172,61 +21246,61 @@
 #. 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:1485 build/trans_presets.java:1493
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1485 build/trans_presets.java:1493
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1488
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -21234,9 +21308,9 @@
 #. 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:1490
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1496
 msgid "Cafe"
 msgstr "カフェ"
@@ -21244,9 +21318,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1498
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1503
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -21254,18 +21328,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1505
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1510
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1511
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1516
 msgid "Bar"
 msgstr "バー"
@@ -21273,9 +21347,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1518
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1523
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -21283,24 +21357,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1525
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1531
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1532
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1533
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1538
 msgid "Museum"
 msgstr "博物館"
@@ -21308,9 +21382,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1540
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1545
 msgid "Zoo"
 msgstr "動物園"
@@ -21319,9 +21393,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1548
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1553
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -21329,24 +21403,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1555
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1558
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1560
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1561
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1566
 msgid "Artwork"
 msgstr "美術館"
@@ -21354,5 +21428,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1568
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -21360,19 +21434,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1573
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1580
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "topo"
 msgstr "地形"
@@ -21383,5 +21457,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -21391,5 +21465,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -21399,5 +21473,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -21407,8 +21481,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_presets.java:1585 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21416,28 +21490,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1585
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1586
 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:1587 build/trans_presets.java:1603
+#: build/trans_presets.java:1647
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -21447,12 +21521,18 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
+#: build/trans_presets.java:1589 build/trans_presets.java:1612
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
 
+#. item "Tourism/Map" label "Routes shown for:"
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:1590 build/trans_presets.java:1613
+msgid "Hiking"
+msgstr "ハイキング"
+
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1591 build/trans_presets.java:1614
+#: build/trans_presets.java:1832
 msgid "Cycling"
 msgstr "サイクリング"
@@ -21460,5 +21540,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:1592 build/trans_presets.java:1615
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -21466,6 +21546,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:2025
+#: build/trans_presets.java:1593 build/trans_presets.java:1616
+#: build/trans_presets.java:1886
 msgid "Skiing"
 msgstr "スキー"
@@ -21473,5 +21553,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:1594 build/trans_presets.java:1617
 msgid "Riding"
 msgstr "乗馬"
@@ -21479,46 +21559,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:1595 build/trans_presets.java:1618
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1597
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1602
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1605
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1620
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -21526,29 +21606,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:1625 build/trans_presets.java:1635
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1630
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1640
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1641
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1643
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1651
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -21556,25 +21636,25 @@
 #. 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:1654 build/trans_presets.java:1660
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1656
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1657
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1663
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1664
 msgid "Castle"
 msgstr "城"
@@ -21583,19 +21663,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1667
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1671
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1672
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1677
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -21604,9 +21684,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1680
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1685
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -21614,10 +21694,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1687
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1691
 msgid "Palaeontological Site"
 msgstr "住居跡"
@@ -21625,5 +21705,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1693
 msgid "Edit Palaeontological Site"
 msgstr "住居跡の編集"
@@ -21631,15 +21711,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1698
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1699
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1703
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -21647,55 +21727,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1705
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1709
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1710
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1714
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1715
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1719
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1720
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1725
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1726
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1727
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1731
 msgid "Playground"
 msgstr "遊び場"
@@ -21703,35 +21783,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1733
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1737
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1738
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1883 build/trans_presets.java:2703
+#: build/trans_presets.java:1744 build/trans_presets.java:2564
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1745
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1746
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1747
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -21745,6 +21825,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1751 build/trans_presets.java:1760
+#: build/trans_presets.java:1769 build/trans_presets.java:1778
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -21763,7 +21843,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -21773,5 +21853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -21781,5 +21861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -21789,5 +21869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -21797,5 +21877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -21805,5 +21885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -21813,5 +21893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -21821,5 +21901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -21829,5 +21909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -21837,5 +21917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -21845,5 +21925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -21853,5 +21933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -21861,5 +21941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -21869,5 +21949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -21877,5 +21957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -21885,5 +21965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -21893,5 +21973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -21901,5 +21981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -21909,5 +21989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -21917,5 +21997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -21925,5 +22005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -21933,5 +22013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -21941,5 +22021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -21949,5 +22029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -21957,5 +22037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -21965,5 +22045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -21973,5 +22053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -21981,5 +22061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -21989,5 +22069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -21997,5 +22077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -22005,5 +22085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -22013,5 +22093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -22021,5 +22101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -22029,5 +22109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -22037,5 +22117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -22045,5 +22125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -22053,5 +22133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -22061,5 +22141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -22069,5 +22149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -22077,5 +22157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -22085,5 +22165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -22093,5 +22173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -22101,5 +22181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -22109,5 +22189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -22117,5 +22197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -22125,5 +22205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -22133,33 +22213,33 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3674 build/trans_style.java:3682
-#: build/trans_style.java:3690 build/trans_style.java:3698
-#: build/trans_style.java:3706 build/trans_style.java:3714
-#: build/trans_style.java:3722 build/trans_style.java:3730
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_style.java:3705 build/trans_style.java:3713
+#: build/trans_style.java:3721 build/trans_style.java:3729
+#: build/trans_style.java:3737 build/trans_style.java:3745
+#: build/trans_style.java:3753 build/trans_style.java:3761
+#: build/trans_style.java:3769 build/trans_style.java:3777
+#: build/trans_style.java:3785 build/trans_style.java:3793
+#: build/trans_style.java:3801 build/trans_style.java:3809
+#: build/trans_style.java:3817 build/trans_style.java:3825
+#: build/trans_style.java:3833 build/trans_style.java:3841
+#: build/trans_style.java:3849 build/trans_style.java:3857
+#: build/trans_style.java:3865 build/trans_style.java:3873
+#: build/trans_style.java:3881 build/trans_style.java:3889
+#: build/trans_style.java:3897 build/trans_style.java:3905
+#: build/trans_style.java:3913 build/trans_style.java:3921
+#: build/trans_style.java:3929 build/trans_style.java:3937
+#: build/trans_style.java:3945 build/trans_style.java:3953
+#: build/trans_style.java:3961 build/trans_style.java:3969
+#: build/trans_style.java:3977 build/trans_style.java:3985
+#: build/trans_style.java:3993 build/trans_style.java:4001
+#: build/trans_style.java:4009 build/trans_style.java:4017
+#: build/trans_style.java:4025 build/trans_style.java:4033
+#: build/trans_style.java:4041 build/trans_style.java:4049
+#: build/trans_style.java:4057 build/trans_style.java:4065
+#: build/trans_style.java:4073
 msgid "sport"
 msgstr "スポーツ"
@@ -22169,225 +22249,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_presets.java:1753 build/trans_presets.java:1762
+#: build/trans_presets.java:1771 build/trans_presets.java:1780
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1755
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1756
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1764
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1765
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1773
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1774
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1782
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1783
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1788
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1789
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1795
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:1796
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1797
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -22426,21 +22506,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 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:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 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
 msgid "type"
 msgstr "タイプ"
@@ -22479,203 +22559,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 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:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 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
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 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:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 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
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 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:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 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
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1939 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2032
-#: build/trans_presets.java:2039 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:2143
+#: build/trans_presets.java:1800 build/trans_presets.java:1806
+#: build/trans_presets.java:1812 build/trans_presets.java:1818
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1842
+#: build/trans_presets.java:1848 build/trans_presets.java:1854
+#: build/trans_presets.java:1860 build/trans_presets.java:1866
+#: build/trans_presets.java:1872 build/trans_presets.java:1878
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1900 build/trans_presets.java:1908
+#: build/trans_presets.java:1914 build/trans_presets.java:1920
+#: build/trans_presets.java:1926 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
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1802
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1803
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1808
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1809
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1814
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1815
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1820
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1821
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1826
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1827
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1833
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1838
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1839
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1844
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1845
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1850
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1851
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1856
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1857
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1862
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1863
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:1868
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:1869
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:1874
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:1875
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:1880
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:1881
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -22683,56 +22763,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:1888
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:1891
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "intermediate"
 msgstr "中間"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:1892
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:1895
 msgid "Shooting"
 msgstr "射撃"
@@ -22740,127 +22820,127 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:1897
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:1903
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1904
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:1905
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:1910
 msgid "Football"
 msgstr "フットボール"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:1911
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:1916
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:1917
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1922
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:1923
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:1928
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:1929
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:1934
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:1935
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:1938
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:1940
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:1941
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:1946
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:1947
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:1952
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:1953
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:1958
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:1959
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:1964
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:1965
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:1970
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:1971
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:1976
 msgid "Pelota"
 msgstr "ペロタ"
@@ -22868,55 +22948,55 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:1977
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:1982
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:1983
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:1988
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:1989
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:1994
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:1995
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2000
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2001
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2008
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2009
 msgid "Buildings"
 msgstr "建物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2010
 msgid "Building"
 msgstr "建物"
@@ -22924,5 +23004,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2013
 msgid "Public Building"
 msgstr "公共の建物"
@@ -22930,10 +23010,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2015
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2019
 msgid "Town hall"
 msgstr "役場"
@@ -22941,10 +23021,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2021
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2025
 msgid "Embassy"
 msgstr "大使館"
@@ -22952,10 +23032,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2027
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2031
 msgid "Courthouse"
 msgstr "裁判所"
@@ -22964,10 +23044,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2034
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2038
 msgid "Prison"
 msgstr "刑務所"
@@ -22976,10 +23056,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2041
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2045
 msgid "Police"
 msgstr "警察"
@@ -22989,10 +23069,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2049
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2053
 msgid "Fire Station"
 msgstr "消防署"
@@ -23001,10 +23081,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2056
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2060
 msgid "Post Office"
 msgstr "郵便局"
@@ -23012,5 +23092,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2062
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -23018,15 +23098,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2068
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2069
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2073
 msgid "School"
 msgstr "学校"
@@ -23034,10 +23114,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2075
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2079
 msgid "University"
 msgstr "大学"
@@ -23045,10 +23125,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2081
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2085
 msgid "College"
 msgstr "短大"
@@ -23056,5 +23136,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2087
 msgid "Edit College"
 msgstr "短大の編集"
@@ -23062,5 +23142,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2092
 msgid "Cinema"
 msgstr "映画館"
@@ -23069,10 +23149,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2095
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2099
 msgid "Library"
 msgstr "図書館"
@@ -23081,9 +23161,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2102
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2107
 msgid "Arts Centre"
 msgstr "美術館"
@@ -23091,10 +23171,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2109
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2113
 msgid "Theatre"
 msgstr "劇場"
@@ -23103,10 +23183,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2116
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2120
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -23116,5 +23196,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2124
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -23123,6 +23203,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "Religion"
 msgstr "宗教"
@@ -23131,66 +23211,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2266 build/trans_presets.java:3078
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:2127 build/trans_presets.java:2939
+#: build/trans_presets.java:2948
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "Denomination"
 msgstr "宗派"
@@ -23199,81 +23279,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2267 build/trans_presets.java:3079
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:2128 build/trans_presets.java:2940
+#: build/trans_presets.java:2949
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2132
 msgid "Addresses"
 msgstr "住所"
@@ -23282,5 +23362,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2135
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -23288,5 +23368,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2137
 msgid "House number"
 msgstr "番地"
@@ -23294,25 +23374,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2139
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2140
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2141
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2142
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2143
 msgid "Country code"
 msgstr "国コード"
@@ -23321,5 +23401,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2288
+#: build/trans_presets.java:2149
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -23327,61 +23407,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2151
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2154
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2155
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2156
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2160
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2161
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2164
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2166
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -23389,25 +23469,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2170
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2171
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2175
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2176
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2180
 msgid "Lighthouse"
 msgstr "灯台"
@@ -23415,10 +23495,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2182
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2186
 msgid "Windmill"
 msgstr "風車"
@@ -23426,10 +23506,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2188
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2192
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -23438,37 +23518,37 @@
 #. <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:2334
+#: build/trans_presets.java:2195
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2337 build/trans_presets.java:2379
+#: build/trans_presets.java:2198 build/trans_presets.java:2240
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2198
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2199
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2201
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -23478,10 +23558,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2205
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2209
 msgid "Crane"
 msgstr "クレーン"
@@ -23489,10 +23569,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2211
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2215
 msgid "Beacon"
 msgstr "ビーコン"
@@ -23500,10 +23580,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2217
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2221
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -23511,10 +23591,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2223
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2227
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -23522,5 +23602,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2229
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -23528,5 +23608,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2234
 msgid "Power Generator"
 msgstr "発電機"
@@ -23536,35 +23616,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2238
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2240
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2243
 msgid "Power Station"
 msgstr "変電所"
@@ -23573,10 +23653,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2246
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2252
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -23585,5 +23665,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2255
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -23591,10 +23671,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2397 build/trans_presets.java:2414
+#: build/trans_presets.java:2258 build/trans_presets.java:2275
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2260
 msgid "Power Tower"
 msgstr "送電塔"
@@ -23605,23 +23685,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2265
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2266
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2266
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2267
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2269
 msgid "Power Line"
 msgstr "送電線"
@@ -23630,79 +23710,79 @@
 #. <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:2411
+#: build/trans_presets.java:2272
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "line"
 msgstr "線"
 
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2273
 msgid "minor_line"
 msgstr "細い線"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2276
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2277
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 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:2417
+#: build/trans_presets.java:2278
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2278
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2281
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2282
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2289
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2429 build/trans_presets.java:2559
+#: build/trans_presets.java:2290 build/trans_presets.java:2420
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2292
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2297
 msgid "Telephone"
 msgstr "電話"
@@ -23711,5 +23791,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2300
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -23717,5 +23797,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2442 build/trans_presets.java:2560
+#: build/trans_presets.java:2303 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "コイン"
@@ -23723,5 +23803,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2443 build/trans_presets.java:2561
+#: build/trans_presets.java:2304 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "備考"
@@ -23729,5 +23809,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2444 build/trans_presets.java:2562
+#: build/trans_presets.java:2305 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -23735,5 +23815,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2445 build/trans_presets.java:2563
+#: build/trans_presets.java:2306 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -23741,15 +23821,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2446 build/trans_presets.java:2564
+#: build/trans_presets.java:2307 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2308
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2310
 msgid "Recycling"
 msgstr "リサイクル"
@@ -23758,5 +23838,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2313
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -23764,30 +23844,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2315
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2316
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2317
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2318
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2319
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2320
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
@@ -23796,31 +23876,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2325
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2326
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "brown"
 msgstr "茶"
@@ -23830,7 +23910,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -23840,5 +23920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -23848,5 +23928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -23856,5 +23936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -23864,5 +23944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -23872,5 +23952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -23880,5 +23960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -23888,5 +23968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -23896,42 +23976,42 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2466 build/trans_style.java:3126
-#: build/trans_style.java:3134 build/trans_style.java:3142
-#: build/trans_style.java:3150 build/trans_style.java:3158
-#: build/trans_style.java:3205 build/trans_style.java:3213
-#: build/trans_style.java:3311 build/trans_style.java:3319
+#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_style.java:3165 build/trans_style.java:3173
+#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3236 build/trans_style.java:3244
+#: build/trans_style.java:3342 build/trans_style.java:3350
 msgid "green"
 msgstr "緑"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2327
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2328
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2330
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2331
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -23940,30 +24020,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2472 build/trans_presets.java:2948
+#: build/trans_presets.java:2333 build/trans_presets.java:2809
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2333
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2335
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2336
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2338
 msgid "Fountain"
 msgstr "噴水"
@@ -23972,10 +24052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2341
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2345
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -23984,10 +24064,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2348
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2352
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -23995,15 +24075,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2354
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2360
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2361
 msgid "Car Dealer"
 msgstr ""
@@ -24011,10 +24091,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2363
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2368
 msgid "Bike Dealer"
 msgstr ""
@@ -24023,28 +24103,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2371
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2375
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2376
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2381
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2382
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2387
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -24052,9 +24132,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2389
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2394
 msgid "Kiosk"
 msgstr "キオスク"
@@ -24062,27 +24142,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2396
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2401
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2402
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2407
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2408
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -24090,5 +24170,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -24096,88 +24176,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "精肉店"
@@ -24185,9 +24265,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2435
 msgid "Baker"
 msgstr "パン屋"
@@ -24195,9 +24275,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2437
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2442
 msgid "Florist"
 msgstr "生花店"
@@ -24205,18 +24285,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2444
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2449
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2450
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2594
+#: build/trans_presets.java:2455
 msgid "Alcohol"
 msgstr "酒屋"
@@ -24224,54 +24304,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2457
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2601
+#: build/trans_presets.java:2462
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2463
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2468
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2469
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2474
 msgid "Electronics"
 msgstr "家電店"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2475
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2480
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2481
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2486
 msgid "Furniture"
 msgstr "家具店"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2487
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2492
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -24279,9 +24359,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2494
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2499
 msgid "Hardware"
 msgstr "金物屋"
@@ -24289,9 +24369,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2501
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2506
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -24299,54 +24379,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2508
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2513
 msgid "Stationery"
 msgstr "文具店"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2514
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2519
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2520
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2525
 msgid "Shoes"
 msgstr "靴店"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2526
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2531
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2532
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2537
 msgid "Video"
 msgstr "ビデオ"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2538
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2543
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -24354,9 +24434,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2545
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2550
 msgid "Laundry"
 msgstr "ランドリー"
@@ -24364,9 +24444,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2552
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2557
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -24374,28 +24454,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2559
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2565
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2570
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2571
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2578
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2579
 msgid "Bank"
 msgstr "銀行"
@@ -24403,14 +24483,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2581
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2725 build/trans_presets.java:2734
+#: build/trans_presets.java:2586 build/trans_presets.java:2595
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2588
 msgid "Money Exchange"
 msgstr "両替"
@@ -24418,5 +24498,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2590
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -24424,15 +24504,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2597
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2602
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2603
 msgid "Doctors"
 msgstr "医院"
@@ -24440,18 +24520,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2605
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2610
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2611
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2616
 msgid "Pharmacy"
 msgstr "薬局"
@@ -24459,5 +24539,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2618
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -24465,9 +24545,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2620
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2624
 msgid "Hospital"
 msgstr "病院"
@@ -24475,10 +24555,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2626
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2630
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -24487,5 +24567,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2633
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -24494,20 +24574,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2636
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2637
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2639
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2640
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -24515,5 +24595,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2643
 msgid "Veterinary"
 msgstr "動物病院"
@@ -24522,64 +24602,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2646
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2653
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2654
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2655
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2656
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2661
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2662
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2667
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2668
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2673
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2674
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2679
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2680
 msgid "Edit County"
 msgstr "郡の編集"
@@ -24587,15 +24667,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2686
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2687
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2692
 msgid "Town"
 msgstr "町"
@@ -24603,10 +24683,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2694
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2699
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -24614,25 +24694,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2701
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2706
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2707
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2712
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2713
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -24640,5 +24720,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2719
 msgid "Locality"
 msgstr "地域"
@@ -24646,10 +24726,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2721
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2726
 msgid "Island"
 msgstr "島"
@@ -24657,10 +24737,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2728
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2733
 msgid "Islet"
 msgstr "小島"
@@ -24668,5 +24748,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2735
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -24674,5 +24754,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2741
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -24680,10 +24760,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2743
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2747
 msgid "Peak"
 msgstr "山頂"
@@ -24691,10 +24771,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2749
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2754
 msgid "Glacier"
 msgstr "氷河"
@@ -24702,10 +24782,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2756
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2761
 msgid "Volcano"
 msgstr "火山"
@@ -24713,70 +24793,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2763
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2769
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2770
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2771
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2776
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:2777
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2921
+#: build/trans_presets.java:2782
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2783
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2788
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2789
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2794
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2795
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2801
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2802
 msgid "Tree"
 msgstr "樹木・林"
@@ -24785,15 +24865,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2805
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2810
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2812
 msgid "Wood"
 msgstr "森"
@@ -24802,5 +24882,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2815
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -24808,17 +24888,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2957 build/trans_presets.java:2966
+#: build/trans_presets.java:2818 build/trans_presets.java:2827
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2820
 msgid "Forest"
 msgstr "森"
@@ -24827,14 +24907,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2823
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2829
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2830
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -24842,25 +24922,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2835
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2836
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2840
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2841
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2845
 msgid "Fell"
 msgstr "山(Fell)"
@@ -24868,10 +24948,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2847
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2851
 msgid "Heath"
 msgstr "荒れ地"
@@ -24879,5 +24959,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2853
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -24885,5 +24965,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2858
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -24892,45 +24972,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2861
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2866
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2867
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:2872
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:2873
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:2878
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2879
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:2884
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2885
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -24938,25 +25018,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3030
+#: build/trans_presets.java:2891
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:2892
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:2896
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:2897
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2902
 msgid "Village Green"
 msgstr "里山"
@@ -24964,10 +25044,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:2904
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:2909
 msgid "Common"
 msgstr "共有地"
@@ -24975,20 +25055,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:2911
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2915
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:2916
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:2920
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -24996,5 +25076,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:2922
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -25002,15 +25082,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:2928
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:2929
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:2934
 msgid "Graveyard"
 msgstr "墓所"
@@ -25018,9 +25098,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:2936
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:2942
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -25028,39 +25108,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2944
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:2951
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:2952
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3096
+#: build/trans_presets.java:2957
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:2958
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:2963
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3103
+#: build/trans_presets.java:2964
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:2969
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -25068,15 +25148,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:2971
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:2976
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3116
+#: build/trans_presets.java:2977
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -25084,50 +25164,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2983
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3123
+#: build/trans_presets.java:2984
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:2989
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:2990
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:2995
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:2996
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:3001
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3002
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3007
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3008
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
@@ -25137,5 +25217,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3021
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -25144,10 +25224,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3027
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3028
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -25155,5 +25235,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3031
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -25162,5 +25242,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3034
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -25168,34 +25248,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3036
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -25204,15 +25284,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3041
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3042
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3043
 msgid "to way"
 msgstr "ウェイへ"
@@ -25220,5 +25300,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3185
+#: build/trans_presets.java:3046
 msgid "Route"
 msgstr "ルート"
@@ -25227,5 +25307,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3049
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -25233,5 +25313,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "Route type"
 msgstr "ルート種類"
@@ -25243,5 +25323,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -25257,5 +25337,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -25265,5 +25345,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -25274,5 +25354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -25285,7 +25365,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -25295,5 +25375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -25303,5 +25383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -25311,5 +25391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -25319,8 +25399,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3190 build/trans_style.java:233
+#: build/trans_presets.java:3051 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25330,17 +25410,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "ski"
 msgstr "スキー"
@@ -25351,5 +25431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -25365,5 +25445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -25373,5 +25453,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -25380,5 +25460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -25388,5 +25468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -25397,8 +25477,8 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3190 build/trans_style.java:247
+#: build/trans_presets.java:3051 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25407,13 +25487,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3190
-msgid "hiking"
-msgstr "ハイキング"
-
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3051
 msgid "detour"
 msgstr "迂回路"
@@ -25424,13 +25500,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3190 build/trans_style.java:1193
+#: build/trans_presets.java:3051 build/trans_style.java:1208
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3054
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -25438,31 +25514,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3057
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3059
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3060
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -25471,30 +25547,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3202
+#: build/trans_presets.java:3063
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3064
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3065
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3066
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3067
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3068
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -25537,9 +25613,9 @@
 #. 7. scale_min / scale_max
 #. - zoom scale for display
-#. 
+#.
 #. Using both area and line attributes for the same key/value pair does work. For areas
 #. first the best matching area rule is searched and the best matching line rule is
 #. connected with it. They need not have the same key/value pair.
-#. 
+#.
 #. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
 #. If both are given, the color name is introduced in preferences with that value. If only
@@ -25547,5 +25623,5 @@
 #. modified preferences or previous value is used. The 6 hex digit color code can also
 #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#. 
+#.
 #. Linemod's are drawn over or under the line they are associated with and modify the
 #. appearance. There can be multiple linemod's for one way (contrary to line styles,
@@ -25555,8 +25631,8 @@
 #. on the sides of the way or the waystyles itself must use alpha channel (which may
 #. look strange).
-#. 
+#.
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
 #. in case they have same priority! Using priority settings helps to solve conflicts.
-#. 
+#.
 #. For external files the <rules> should have following elements:
 #. - author           the author of the style
@@ -25570,5 +25646,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -25576,5 +25652,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -25623,6 +25699,6 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
 #. <rule>
@@ -25702,5 +25778,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -25710,16 +25786,16 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--abutters tags -->
-#. 
+#.
 #. <!--accessories tags -->
-#. 
+#.
 #. <!--properties tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4056
+#: build/trans_style.java:633 build/trans_style.java:4087
 msgid "deprecated"
 msgstr "破棄された"
@@ -25730,5 +25806,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -25737,5 +25813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -25744,5 +25820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -25758,5 +25834,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -25770,5 +25846,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -25777,5 +25853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -25784,5 +25860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -25791,5 +25867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -25798,5 +25874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -25805,5 +25881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -25812,5 +25888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -25819,5 +25895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -25826,5 +25902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -25833,5 +25909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -25840,5 +25916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -25847,5 +25923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -25854,5 +25930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -25861,5 +25937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -25868,5 +25944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -26043,7 +26119,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -26057,5 +26133,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -26065,7 +26141,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -26075,5 +26151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -26083,5 +26159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -26091,5 +26167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -26099,5 +26175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -26113,5 +26189,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -26121,5 +26197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -26129,5 +26205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -26137,5 +26213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -26145,5 +26221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -26153,5 +26229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -26161,5 +26237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -26170,12 +26246,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:756 build/trans_style.java:1167
-#: build/trans_style.java:1231 build/trans_style.java:1239
-#: build/trans_style.java:1248 build/trans_style.java:1256
-#: build/trans_style.java:1264 build/trans_style.java:1265
-#: build/trans_style.java:1272
+#: build/trans_style.java:756 build/trans_style.java:1182
+#: build/trans_style.java:1246 build/trans_style.java:1254
+#: build/trans_style.java:1263 build/trans_style.java:1271
+#: build/trans_style.java:1279 build/trans_style.java:1280
+#: build/trans_style.java:1287
 msgid "rail"
 msgstr "線路"
@@ -26186,5 +26262,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -26193,5 +26269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -26201,5 +26277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -26208,5 +26284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -26215,5 +26291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -26222,5 +26298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -26229,5 +26305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -26236,5 +26312,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -26243,5 +26319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -26250,5 +26326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -26257,5 +26333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -26264,5 +26340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -26276,5 +26352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -26288,5 +26364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -26295,5 +26371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -26307,5 +26383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -26320,5 +26396,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -26333,5 +26409,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -26345,8 +26421,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1034
+#: build/trans_style.java:1041
 msgid "dock"
 msgstr "ドック"
@@ -26357,5 +26433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -26364,5 +26440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -26371,5 +26447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -26379,5 +26455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -26386,5 +26462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -26393,5 +26469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -26400,13 +26476,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
 #. <icon annotate="true" src="nautical/weir.png"/>
-#. color manmade
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. 
+#. color rapids
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -26417,5 +26493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -26425,7 +26501,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -26435,5 +26511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -26443,5 +26519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -26451,5 +26527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -26460,5 +26536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -26467,5 +26543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -26475,5 +26551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -26483,5 +26559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -26491,5 +26567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -26499,5 +26575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -26507,5 +26583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -26515,5 +26591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -26523,5 +26599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -26531,28 +26607,50 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1057 build/trans_style.java:1086
-#: build/trans_style.java:1094 build/trans_style.java:1095
-#: build/trans_style.java:1103 build/trans_style.java:1580
-#: build/trans_style.java:1587 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1636
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1667
-#: build/trans_style.java:1676 build/trans_style.java:1684
-#: build/trans_style.java:1692 build/trans_style.java:1700
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_works"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1064 build/trans_style.java:1093
+#: build/trans_style.java:1109 build/trans_style.java:1110
+#: build/trans_style.java:1118 build/trans_style.java:1603
+#: build/trans_style.java:1610 build/trans_style.java:1619
+#: build/trans_style.java:1627 build/trans_style.java:1659
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1690
+#: build/trans_style.java:1699 build/trans_style.java:1707
+#: build/trans_style.java:1715 build/trans_style.java:1723
+#: build/trans_style.java:1731
 msgid "manmade"
 msgstr "人工物"
 
 #. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="rapids"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1101
+#, fuzzy
+msgid "rapids"
+msgstr "バプチスト"
+
+#. color manmade
 #. <!-- it's not possible to have both line and area, line seems more likely -->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -26562,5 +26660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -26569,5 +26667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -26577,5 +26675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -26584,5 +26682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -26592,5 +26690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -26600,10 +26698,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1113 build/trans_style.java:1128
-#: build/trans_style.java:1143 build/trans_style.java:1151
-#: build/trans_style.java:1159
+#: build/trans_style.java:1128 build/trans_style.java:1143
+#: build/trans_style.java:1158 build/trans_style.java:1166
+#: build/trans_style.java:1174
 msgid "railwaypoint"
 msgstr "鉄道ポイント"
@@ -26614,5 +26712,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -26623,13 +26721,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1176 build/trans_style.java:1185
+#: build/trans_style.java:1191 build/trans_style.java:1200
 msgid "otherrail"
 msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1177
+#: build/trans_style.java:1192
 msgid "railover"
 msgstr "高架鉄道"
@@ -26640,5 +26738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -26648,5 +26746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -26659,5 +26757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -26665,7 +26763,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1201 build/trans_style.java:1211
-#: build/trans_style.java:1212 build/trans_style.java:1222
-#: build/trans_style.java:1223
+#: build/trans_style.java:1216 build/trans_style.java:1226
+#: build/trans_style.java:1227 build/trans_style.java:1237
+#: build/trans_style.java:1238
 msgid "oldrail"
 msgstr "古い軌道"
@@ -26676,5 +26774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -26683,5 +26781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -26690,5 +26788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -26697,7 +26795,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -26708,9 +26806,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1303 build/trans_style.java:1304
-#: build/trans_style.java:1336
+#: build/trans_style.java:1318 build/trans_style.java:1319
+#: build/trans_style.java:1351
 msgid "aeroway"
 msgstr "空路"
@@ -26721,8 +26819,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1327
 msgid "terminal"
 msgstr "駅"
@@ -26733,5 +26831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -26741,8 +26839,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1320 build/trans_style.java:1328
+#: build/trans_style.java:1335 build/trans_style.java:1343
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -26753,8 +26851,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1344
+#: build/trans_style.java:1359
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -26765,5 +26863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -26772,5 +26870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -26779,7 +26877,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -26789,5 +26887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -26797,5 +26895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -26805,5 +26903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -26813,25 +26911,33 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1368 build/trans_style.java:1376
-#: build/trans_style.java:1384 build/trans_style.java:1392
-#: build/trans_style.java:1400
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="pylon"/>
+#: build/trans_style.java:1383 build/trans_style.java:1391
+#: build/trans_style.java:1399 build/trans_style.java:1407
+#: build/trans_style.java:1415 build/trans_style.java:1423
 msgid "aerialway"
 msgstr "リフト"
 
 #. color aerialway
-#. <icon annotate="true" src="transport/aerialway/station.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. 
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- piste tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1410 build/trans_style.java:1411
+#: build/trans_style.java:1433 build/trans_style.java:1434
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -26842,9 +26948,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1419 build/trans_style.java:1420
+#: build/trans_style.java:1442 build/trans_style.java:1443
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -26855,9 +26961,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1428 build/trans_style.java:1429
+#: build/trans_style.java:1451 build/trans_style.java:1452
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -26868,9 +26974,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1437 build/trans_style.java:1438
+#: build/trans_style.java:1460 build/trans_style.java:1461
 msgid "piste_expert"
 msgstr "熟練者用のゲレンデ"
@@ -26881,9 +26987,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1446 build/trans_style.java:1447
+#: build/trans_style.java:1469 build/trans_style.java:1470
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -26894,9 +27000,9 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1455 build/trans_style.java:1456
+#: build/trans_style.java:1478 build/trans_style.java:1479
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -26907,7 +27013,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -26917,5 +27023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -26924,5 +27030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -26932,5 +27038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -26940,5 +27046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -26948,5 +27054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -26956,5 +27062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -26964,5 +27070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -26972,5 +27078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -26980,5 +27086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -26988,5 +27094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -26996,5 +27102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -27004,5 +27110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -27012,15 +27118,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1467 build/trans_style.java:1481
-#: build/trans_style.java:1489 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538 build/trans_style.java:1546
-#: build/trans_style.java:1554 build/trans_style.java:1562
-#: build/trans_style.java:1570
+#: build/trans_style.java:1490 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1521
+#: build/trans_style.java:1529 build/trans_style.java:1537
+#: build/trans_style.java:1545 build/trans_style.java:1553
+#: build/trans_style.java:1561 build/trans_style.java:1569
+#: build/trans_style.java:1577 build/trans_style.java:1585
+#: build/trans_style.java:1593
 msgid "power"
 msgstr "電力"
@@ -27030,9 +27136,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1611 build/trans_style.java:1612
+#: build/trans_style.java:1634 build/trans_style.java:1635
 msgid "pier"
 msgstr "桟橋"
@@ -27043,8 +27149,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1620
+#: build/trans_style.java:1643
 msgid "pipeline"
 msgstr "パイプライン"
@@ -27054,7 +27160,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -27064,5 +27170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -27072,5 +27178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -27080,5 +27186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -27088,5 +27194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -27096,5 +27202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -27104,5 +27210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -27112,5 +27218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -27120,5 +27226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -27128,5 +27234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -27136,5 +27242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -27144,5 +27250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -27152,5 +27258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -27160,5 +27266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -27168,5 +27274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -27176,5 +27282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -27184,17 +27290,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1726 build/trans_style.java:1734
-#: build/trans_style.java:1742 build/trans_style.java:1750
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1830 build/trans_style.java:1838
-#: build/trans_style.java:1846
+#: build/trans_style.java:1741 build/trans_style.java:1749
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1797 build/trans_style.java:1805
+#: build/trans_style.java:1813 build/trans_style.java:1821
+#: build/trans_style.java:1829 build/trans_style.java:1837
+#: build/trans_style.java:1845 build/trans_style.java:1853
+#: build/trans_style.java:1861 build/trans_style.java:1869
+#: build/trans_style.java:1877
 msgid "leisure"
 msgstr "レジャー"
@@ -27204,9 +27310,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1758
+#: build/trans_style.java:1789
 msgid "marina"
 msgstr "マリーナ"
@@ -27216,7 +27322,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -27226,5 +27332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -27234,5 +27340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -27242,5 +27348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -27250,5 +27356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -27258,5 +27364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -27266,5 +27372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -27274,5 +27380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -27282,5 +27388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -27290,5 +27396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -27298,14 +27404,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904 build/trans_style.java:1912
-#: build/trans_style.java:1920 build/trans_style.java:1928
-#: build/trans_style.java:1936
+#: build/trans_style.java:1887 build/trans_style.java:1895
+#: build/trans_style.java:1903 build/trans_style.java:1911
+#: build/trans_style.java:1919 build/trans_style.java:1927
+#: build/trans_style.java:1935 build/trans_style.java:1943
+#: build/trans_style.java:1951 build/trans_style.java:1959
+#: build/trans_style.java:1967
 msgid "amenity"
 msgstr "アメニティ"
@@ -27315,5 +27421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -27323,5 +27429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -27331,5 +27437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -27339,5 +27445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -27347,5 +27453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -27355,5 +27461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -27363,5 +27469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -27371,5 +27477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -27379,5 +27485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -27387,5 +27493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -27395,5 +27501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -27403,14 +27509,14 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008 build/trans_style.java:2015
-#: build/trans_style.java:2024 build/trans_style.java:2032
+#: build/trans_style.java:1975 build/trans_style.java:1983
+#: build/trans_style.java:1991 build/trans_style.java:1999
+#: build/trans_style.java:2007 build/trans_style.java:2015
+#: build/trans_style.java:2023 build/trans_style.java:2031
+#: build/trans_style.java:2039 build/trans_style.java:2046
+#: build/trans_style.java:2055 build/trans_style.java:2063
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -27420,5 +27526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -27427,5 +27533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -27435,5 +27541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -27442,5 +27548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -27450,5 +27556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -27458,5 +27564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -27466,5 +27572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -27473,5 +27579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -27481,5 +27587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -27489,5 +27595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -27497,5 +27603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -27505,5 +27611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -27512,5 +27618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -27519,5 +27625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -27526,5 +27632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -27533,5 +27639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -27540,5 +27646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -27547,5 +27653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -27554,5 +27660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -27561,5 +27667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -27568,5 +27674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -27575,5 +27681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -27582,5 +27688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -27589,5 +27695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -27596,5 +27702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -27604,5 +27710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -27612,5 +27718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -27620,5 +27726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -27628,5 +27734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -27636,5 +27742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -27644,5 +27750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -27652,5 +27758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -27660,5 +27766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -27668,5 +27774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -27677,5 +27783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -27685,5 +27791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -27693,5 +27799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -27701,5 +27807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -27709,5 +27815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -27717,5 +27823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -27725,5 +27831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -27733,5 +27839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -27741,5 +27847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -27749,5 +27855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -27757,5 +27863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -27765,5 +27871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -27773,5 +27879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -27781,5 +27887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -27789,5 +27895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -27797,5 +27903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -27805,5 +27911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -27813,5 +27919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -27821,5 +27927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -27829,5 +27935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -27836,27 +27942,27 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2047 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2093 build/trans_style.java:2101
-#: build/trans_style.java:2109 build/trans_style.java:2117
-#: build/trans_style.java:2232 build/trans_style.java:2240
-#: build/trans_style.java:2247 build/trans_style.java:2256
-#: build/trans_style.java:2264 build/trans_style.java:2272
-#: build/trans_style.java:2280 build/trans_style.java:2288
-#: build/trans_style.java:2296 build/trans_style.java:2304
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2407
-#: build/trans_style.java:2415 build/trans_style.java:2423
-#: build/trans_style.java:2431 build/trans_style.java:2439
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2471
-#: build/trans_style.java:2479 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2512 build/trans_style.java:2527
+#: build/trans_style.java:2078 build/trans_style.java:2093
+#: build/trans_style.java:2101 build/trans_style.java:2109
+#: build/trans_style.java:2124 build/trans_style.java:2132
+#: build/trans_style.java:2140 build/trans_style.java:2148
+#: build/trans_style.java:2263 build/trans_style.java:2271
+#: build/trans_style.java:2278 build/trans_style.java:2287
+#: build/trans_style.java:2295 build/trans_style.java:2303
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2335
+#: build/trans_style.java:2398 build/trans_style.java:2406
+#: build/trans_style.java:2414 build/trans_style.java:2423
+#: build/trans_style.java:2431 build/trans_style.java:2438
+#: build/trans_style.java:2446 build/trans_style.java:2454
+#: build/trans_style.java:2462 build/trans_style.java:2470
+#: build/trans_style.java:2478 build/trans_style.java:2486
+#: build/trans_style.java:2494 build/trans_style.java:2502
+#: build/trans_style.java:2510 build/trans_style.java:2518
+#: build/trans_style.java:2526 build/trans_style.java:2534
+#: build/trans_style.java:2543 build/trans_style.java:2558
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -27866,5 +27972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -27874,5 +27980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -27882,12 +27988,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--natural tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2125 build/trans_style.java:2133
-#: build/trans_style.java:3372
+#: build/trans_style.java:2156 build/trans_style.java:2164
+#: build/trans_style.java:3403
 msgid "light_water"
 msgstr "信号_水域"
@@ -27897,5 +28003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -27905,5 +28011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -27913,5 +28019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -27921,5 +28027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -27929,5 +28035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -27937,5 +28043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -27945,11 +28051,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2311 build/trans_style.java:2319
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2343 build/trans_style.java:2351
-#: build/trans_style.java:2359
+#: build/trans_style.java:2342 build/trans_style.java:2350
+#: build/trans_style.java:2358 build/trans_style.java:2367
+#: build/trans_style.java:2374 build/trans_style.java:2382
+#: build/trans_style.java:2390
 msgid "health"
 msgstr "健康"
@@ -27959,7 +28065,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -27969,5 +28075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -27977,5 +28083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -27985,5 +28091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -27993,5 +28099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -28001,5 +28107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -28009,5 +28115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -28017,5 +28123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -28025,5 +28131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -28033,5 +28139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -28041,5 +28147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -28049,5 +28155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -28057,5 +28163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -28065,5 +28171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -28073,5 +28179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -28081,5 +28187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -28089,5 +28195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -28097,5 +28203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -28105,5 +28211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -28113,5 +28219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -28121,5 +28227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -28129,5 +28235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -28137,5 +28243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -28145,5 +28251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -28153,5 +28259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -28161,5 +28267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -28169,5 +28275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -28177,5 +28283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -28185,5 +28291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -28193,5 +28299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -28201,5 +28307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -28209,5 +28315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -28217,5 +28323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -28225,5 +28331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -28233,5 +28339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -28241,5 +28347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -28249,5 +28355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -28257,5 +28363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -28265,5 +28371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -28273,5 +28379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -28281,5 +28387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -28289,5 +28395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -28297,31 +28403,31 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2537 build/trans_style.java:2545
-#: build/trans_style.java:2553 build/trans_style.java:2561
-#: build/trans_style.java:2569 build/trans_style.java:2577
-#: build/trans_style.java:2585 build/trans_style.java:2593
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 build/trans_style.java:2625
-#: build/trans_style.java:2633 build/trans_style.java:2641
-#: build/trans_style.java:2649 build/trans_style.java:2657
-#: build/trans_style.java:2665 build/trans_style.java:2673
-#: build/trans_style.java:2681 build/trans_style.java:2689
-#: build/trans_style.java:2697 build/trans_style.java:2705
-#: build/trans_style.java:2713 build/trans_style.java:2721
-#: build/trans_style.java:2729 build/trans_style.java:2737
-#: build/trans_style.java:2745 build/trans_style.java:2753
-#: build/trans_style.java:2761 build/trans_style.java:2769
-#: build/trans_style.java:2777 build/trans_style.java:2785
-#: build/trans_style.java:2793 build/trans_style.java:2801
-#: build/trans_style.java:2809 build/trans_style.java:2817
-#: build/trans_style.java:2825 build/trans_style.java:2833
-#: build/trans_style.java:2841 build/trans_style.java:2849
-#: build/trans_style.java:2857 build/trans_style.java:2865
-#: build/trans_style.java:2874
+#: build/trans_style.java:2568 build/trans_style.java:2576
+#: build/trans_style.java:2584 build/trans_style.java:2592
+#: build/trans_style.java:2600 build/trans_style.java:2608
+#: build/trans_style.java:2616 build/trans_style.java:2624
+#: build/trans_style.java:2632 build/trans_style.java:2640
+#: build/trans_style.java:2648 build/trans_style.java:2656
+#: build/trans_style.java:2664 build/trans_style.java:2672
+#: build/trans_style.java:2680 build/trans_style.java:2688
+#: build/trans_style.java:2696 build/trans_style.java:2704
+#: build/trans_style.java:2712 build/trans_style.java:2720
+#: build/trans_style.java:2728 build/trans_style.java:2736
+#: build/trans_style.java:2744 build/trans_style.java:2752
+#: build/trans_style.java:2760 build/trans_style.java:2768
+#: build/trans_style.java:2776 build/trans_style.java:2784
+#: build/trans_style.java:2792 build/trans_style.java:2800
+#: build/trans_style.java:2808 build/trans_style.java:2816
+#: build/trans_style.java:2824 build/trans_style.java:2832
+#: build/trans_style.java:2840 build/trans_style.java:2848
+#: build/trans_style.java:2856 build/trans_style.java:2864
+#: build/trans_style.java:2872 build/trans_style.java:2880
+#: build/trans_style.java:2888 build/trans_style.java:2896
+#: build/trans_style.java:2905
 msgid "shop"
 msgstr "店"
@@ -28331,7 +28437,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -28341,5 +28447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -28349,5 +28455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -28357,5 +28463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -28365,5 +28471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -28373,5 +28479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -28381,5 +28487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -28389,12 +28495,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2884 build/trans_style.java:2892
-#: build/trans_style.java:2900 build/trans_style.java:2908
-#: build/trans_style.java:2916 build/trans_style.java:2924
-#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2915 build/trans_style.java:2923
+#: build/trans_style.java:2931 build/trans_style.java:2939
+#: build/trans_style.java:2947 build/trans_style.java:2955
+#: build/trans_style.java:2963 build/trans_style.java:2971
 msgid "hotel"
 msgstr "ホテル"
@@ -28404,5 +28510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -28412,5 +28518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -28420,5 +28526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -28428,5 +28534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -28436,5 +28542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -28444,5 +28550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -28453,5 +28559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -28461,5 +28567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -28469,5 +28575,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -28477,5 +28583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -28484,5 +28590,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -28491,13 +28597,13 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2989 build/trans_style.java:2997
-#: build/trans_style.java:3013 build/trans_style.java:3035
+#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2995 build/trans_style.java:3003
+#: build/trans_style.java:3011 build/trans_style.java:3019
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3044 build/trans_style.java:3066
 msgid "tourism"
 msgstr "旅行関係"
@@ -28507,7 +28613,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -28517,5 +28623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -28525,5 +28631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -28533,5 +28639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -28541,5 +28647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -28549,5 +28655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -28557,5 +28663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -28565,5 +28671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -28573,5 +28679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -28581,13 +28687,13 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3045 build/trans_style.java:3053
-#: build/trans_style.java:3061 build/trans_style.java:3069
-#: build/trans_style.java:3077 build/trans_style.java:3085
-#: build/trans_style.java:3093 build/trans_style.java:3101
-#: build/trans_style.java:3109 build/trans_style.java:3117
+#: build/trans_style.java:3076 build/trans_style.java:3084
+#: build/trans_style.java:3092 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3140 build/trans_style.java:3148
 msgid "historic"
 msgstr "史跡"
@@ -28597,8 +28703,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3165
+#: build/trans_style.java:3196
 msgid "quarry"
 msgstr "石切り場"
@@ -28609,8 +28715,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3173
+#: build/trans_style.java:3204
 msgid "landfill"
 msgstr "埋め立て地"
@@ -28621,5 +28727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -28629,8 +28735,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -28641,8 +28747,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3197
+#: build/trans_style.java:3228
 msgid "forest"
 msgstr "森"
@@ -28653,8 +28759,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3260
 msgid "farmyard"
 msgstr "農家の庭"
@@ -28665,6 +28771,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -28674,8 +28780,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3238 build/trans_style.java:3246
+#: build/trans_style.java:3269 build/trans_style.java:3277
 msgid "retail"
 msgstr "小売りの商用地"
@@ -28686,8 +28792,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3254
+#: build/trans_style.java:3285
 msgid "industrial"
 msgstr "工業地"
@@ -28698,8 +28804,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3262
+#: build/trans_style.java:3293
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -28710,8 +28816,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3270
+#: build/trans_style.java:3301
 msgid "greenfield"
 msgstr "緑地"
@@ -28722,8 +28828,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3309
 msgid "railland"
 msgstr "鉄道公園"
@@ -28734,5 +28840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -28742,7 +28848,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -28752,5 +28858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -28760,5 +28866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -28768,5 +28874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -28776,11 +28882,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3295 build/trans_style.java:3330
-#: build/trans_style.java:3338 build/trans_style.java:3346
-#: build/trans_style.java:3354 build/trans_style.java:3362
+#: build/trans_style.java:3326 build/trans_style.java:3361
+#: build/trans_style.java:3369 build/trans_style.java:3377
+#: build/trans_style.java:3385 build/trans_style.java:3393
 msgid "military"
 msgstr "軍用地"
@@ -28791,8 +28897,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3303
+#: build/trans_style.java:3334
 msgid "cemetery"
 msgstr "共同墓地"
@@ -28802,8 +28908,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3379
+#: build/trans_style.java:3410
 msgid "peak"
 msgstr "山頂"
@@ -28814,9 +28920,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3388
+#: build/trans_style.java:3419
 msgid "glacier"
 msgstr "氷河"
@@ -28826,9 +28932,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3396
+#: build/trans_style.java:3427
 msgid "volcano"
 msgstr "火山"
@@ -28838,5 +28944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -28847,5 +28953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -28855,5 +28961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -28863,5 +28969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -28871,5 +28977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -28879,12 +28985,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3404 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3429
-#: build/trans_style.java:3493 build/trans_style.java:3501
-#: build/trans_style.java:3509
+#: build/trans_style.java:3435 build/trans_style.java:3436
+#: build/trans_style.java:3444 build/trans_style.java:3460
+#: build/trans_style.java:3524 build/trans_style.java:3532
+#: build/trans_style.java:3540
 msgid "natural"
 msgstr "自然"
@@ -28894,9 +29000,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3421
+#: build/trans_style.java:3452
 msgid "scrub"
 msgstr "低木"
@@ -28906,9 +29012,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3437
+#: build/trans_style.java:3468
 msgid "heath"
 msgstr "荒地"
@@ -28918,9 +29024,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3445
+#: build/trans_style.java:3476
 msgid "woodarea"
 msgstr "森林エリア"
@@ -28930,9 +29036,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3477
+#: build/trans_style.java:3508
 msgid "mud"
 msgstr "泥"
@@ -28942,9 +29048,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3516
 msgid "beach"
 msgstr "砂浜"
@@ -28954,5 +29060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -28961,7 +29067,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -28971,5 +29077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -28979,5 +29085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -28987,5 +29093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -28995,5 +29101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -29003,5 +29109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -29011,5 +29117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -29019,11 +29125,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3525 build/trans_style.java:3533
-#: build/trans_style.java:3541 build/trans_style.java:3549
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573 build/trans_style.java:3581
+#: build/trans_style.java:3556 build/trans_style.java:3564
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
 msgid "route"
 msgstr "ルート"
@@ -29034,7 +29140,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -29044,5 +29150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -29085,5 +29191,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -29093,5 +29199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -29101,5 +29207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -29109,15 +29215,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3591 build/trans_style.java:3599
-#: build/trans_style.java:3603 build/trans_style.java:3607
-#: build/trans_style.java:3611 build/trans_style.java:3615
-#: build/trans_style.java:3619 build/trans_style.java:3623
-#: build/trans_style.java:3627 build/trans_style.java:3631
-#: build/trans_style.java:3635 build/trans_style.java:3640
-#: build/trans_style.java:3648 build/trans_style.java:3656
-#: build/trans_style.java:3664
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3634 build/trans_style.java:3638
+#: build/trans_style.java:3642 build/trans_style.java:3646
+#: build/trans_style.java:3650 build/trans_style.java:3654
+#: build/trans_style.java:3658 build/trans_style.java:3662
+#: build/trans_style.java:3666 build/trans_style.java:3671
+#: build/trans_style.java:3679 build/trans_style.java:3687
+#: build/trans_style.java:3695
 msgid "boundary"
 msgstr "行政区境"
@@ -29128,5 +29234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 #. XXX - maybe it's possible to use linemod's here?
@@ -29152,5 +29258,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -29161,11 +29267,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -29175,5 +29281,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -29183,5 +29289,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -29191,5 +29297,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -29199,5 +29305,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -29207,5 +29313,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -29215,5 +29321,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -29223,5 +29329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -29231,5 +29337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -29239,5 +29345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -29247,5 +29353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -29255,5 +29361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -29263,15 +29369,15 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4104 build/trans_style.java:4112
-#: build/trans_style.java:4120 build/trans_style.java:4128
-#: build/trans_style.java:4136 build/trans_style.java:4144
-#: build/trans_style.java:4152 build/trans_style.java:4160
-#: build/trans_style.java:4168 build/trans_style.java:4176
-#: build/trans_style.java:4184 build/trans_style.java:4192
-#: build/trans_style.java:4200
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231
 msgid "place"
 msgstr "場所"
@@ -29281,5 +29387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -29288,5 +29394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -29295,5 +29401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -29302,5 +29408,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -29309,5 +29415,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -29316,9 +29422,9 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4289 build/trans_style.java:4296
-#: build/trans_style.java:4303 build/trans_style.java:4310
+#: build/trans_style.java:4320 build/trans_style.java:4327
+#: build/trans_style.java:4334 build/trans_style.java:4341
 msgid "address"
 msgstr "住所"
@@ -29409,5 +29515,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -29415,28 +29521,28 @@
 #. relation    - a relation
 #. *           - all data types
-#. 
+#.
 #. Message type can be:
 #. E            - an error
 #. W            - a warning
 #. I            - an low priority informational warning
-#. 
+#.
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
 #. ends with // signs. If an 'i' is appended, the regular expression is
 #. case insensitive.
-#. 
+#.
 #. The * sign indicates any string.
 #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
 #. handling for boolean values (yes, true, 0, false, no, ...).
-#. 
+#.
 #. Expression can be:
 #. !=          - the key/value combination does not match
 #. ==          - the key/value combination does match
-#. 
+#.
 #. To have more complicated expressions, multiple elements can be grouped together
 #. with an logical and (&&).
-#. 
+#.
 #. The comment at the end of a rule is displayed in validator description
-#. 
+#.
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
@@ -29551,5 +29657,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -29562,5 +29668,5 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#. 
+#.
 #. different forms for web access
 #. must be html:<url>
@@ -29585,6 +29691,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -29593,6 +29699,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -29607,6 +29713,6 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#. 
-#. 
+#.
+#.
 #. only for Czech Republic
 #: build/trans_wms.java:27
@@ -29620,6 +29726,6 @@
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#. 
-#. 
+#.
+#.
 #. only for GB
 #. fails with division by zero error
@@ -29639,6 +29745,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -29662,6 +29768,6 @@
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#. 
-#. 
+#.
+#.
 #. only for Italy
 #: build/trans_wms.java:46
@@ -29674,4 +29780,225 @@
 msgstr ""
 
+#~ msgid ""
+#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
+#~ "Access Token configured."
+#~ msgstr ""
+#~ "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していませ"
+#~ "ん。"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
+
+#~ msgid "Bridleway"
+#~ msgstr "馬道"
+
+#~ msgid "Cycleway"
+#~ msgstr "自転車道"
+
+#~ msgid "Footway"
+#~ msgstr "遊歩道"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "トラック グレード 1"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "トラック グレード 1　の編集"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "トラック グレード 2"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "トラック グレード 2の編集"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "トラック グレード 3"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "トラック グレード 3　の編集"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "トラック グレード 4"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "トラック グレード 4　の編集"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "トラック グレード 5"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "トラック グレード 5 の編集"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "ハイキングの編集"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "山岳ハイキング"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "山岳ハイキングの編集"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "厳しい山岳ハイキングの編集"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "高山ハイキングの編集"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "厳しい高山ハイキングの編集"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "困難な高山ハイキングの編集"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "ID > 0 が必須です。入力値 {0}"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "パラメータの ''{0}'' はヌルではいけません"
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr ""
+#~ "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: "
+#~ "''{0}''。"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがありま"
+#~ "す。\n"
+#~ "これはノードを誤って削除する可能性があります。\n"
+#~ "本当に続けますか？"
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないか"
+#~ "らです。"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "パラメータ ''{0}'' は空ではダメです"
+
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "長さ4の配列が期待されています、入力値{0}"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "不正なダブル値 ''{0}''"
+
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "パラメータ ''{0}'' > 0.0 が期待されています。入力値 {1}"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "パラメータ ''{0}'' >= 0 が期待されています、入力値 {1}"
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr ""
+#~ "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りまし"
+#~ "た"
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr ""
+#~ "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取"
+#~ "りました"
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}"
+
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr ""
+#~ "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りまし"
+#~ "た"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "予期せぬカラムインデックス。入力値: {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr ""
+#~ "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
+
+#~ msgid ">"
+#~ msgstr ">"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "パラメータ ''{0}'' は空以外でなければなりません"
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr ""
+#~ "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されていま"
+#~ "す。 {1} を受けとりました。"
+
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr ""
+#~ "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してく"
+#~ "ださい"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "開く"
+
+#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgstr ""
+#~ "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
+
+#~ msgid "Conflicts in data"
+#~ msgstr "データ内の競合"
+
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>空のロールを {0} プリミティブにセットしようとしています。<br>これは"
+#~ "ロールを削除することになります。<br>新しいロールを本当に適用しますか？</"
+#~ "html>"
+
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
+
+#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+#~ msgstr "パラメータ ''{0}'' 中のID > 0 が期待されています、入力値 {1}."
+
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "画像"
+
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
+
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
+
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr ""
+#~ "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があ"
+#~ "ります。"
+
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -29743,5 +30070,4 @@
 #~ msgstr "JOSMオンラインヘルプ"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -29753,15 +30079,15 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。"
-
-#, java-format
+#~ msgstr[0] ""
+#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。"
+
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
-#~ msgstr "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。"
-
-#, java-format
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。"
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "{1}からプラグイン: {0}をダウンロードできません"
@@ -29770,16 +30096,16 @@
 #~ msgstr "正しくないパスワードかユーザ名です。"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "プラグインが見つかりません： {0}"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
-#~ msgstr "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをしてください。"
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをして"
+#~ "ください。"
 
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
@@ -29795,10 +30121,11 @@
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
 #~ "some time."
-#~ msgstr "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小して試してください。"
+#~ msgstr ""
+#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し"
+#~ "て試してください。"
 
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "<member>要素がリレーション以外に見つかりました"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n"
@@ -29811,5 +30138,7 @@
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。"
+#~ msgstr ""
+#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま"
+#~ "す。"
 
 #~ msgid "Please enter a search string"
@@ -29828,5 +30157,4 @@
 #~ msgstr "取り消す"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "レイヤー：{0}"
@@ -29838,9 +30166,7 @@
 #~ msgstr "OSMサーバに接続…"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "作者: {0}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "{0} のイメージ"
@@ -29849,9 +30175,7 @@
 #~ msgstr "GPXの読み込み…"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "地点 {0} x {1}に時刻がありません"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
@@ -29860,13 +30184,10 @@
 #~ msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS開始: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS終了: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "現在の差分: {0} 秒"
@@ -29875,5 +30196,4 @@
 #~ msgstr "タイムゾーンの違い: "
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "トラック内に {0}"
@@ -29928,5 +30248,4 @@
 #~ msgstr "不足するプラグインをダウンロードします。"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -29935,5 +30254,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダウンロードしますか？\n"
+#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ"
+#~ "ウンロードしますか？\n"
 #~ "{0}"
 
@@ -29959,5 +30279,4 @@
 #~ msgstr "差異"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "情報ディレクトリを読み取れません: {0}"
@@ -29969,5 +30288,4 @@
 #~ msgstr "リレーションに登録すべきものがありません。"
 
-#, java-format
 #~ msgid "Deleted member ''{0}'' in relation."
 #~ msgstr "メンバー \"{0}\"を関連から削除"
@@ -29982,5 +30300,4 @@
 #~ msgstr "セレクションのロード"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "連絡先 {0} ..."
@@ -30004,5 +30321,4 @@
 #~ msgstr "メタデータの読み込みエラー"
 
-#, java-format
 #~ msgid "requested: {0}"
 #~ msgstr "要求: {0}"
@@ -30128,9 +30444,10 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
-#~ msgstr "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへと戻します。"
-
-#, java-format
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン"
+#~ "へと戻します。"
+
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "ファイル \"{0}\"中の日付が取得できません。"
@@ -30154,9 +30471,7 @@
 #~ msgstr "解決したバージョン:"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "URL: \"{0}\"から読み込むことができません"
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "URL: \"{0}\"の走査エラー"
@@ -30183,9 +30498,7 @@
 #~ msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "{0}でトラブルチケットを報告してください。"
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "内部のウェイ ''{0}''が外側にあります。"
@@ -30194,13 +30507,10 @@
 #~ msgstr "要素の履歴"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "ページ{0}を読み込む際にエラーが発生しました。"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "プリセット \"{0}\"を使います"
@@ -30209,16 +30519,10 @@
 #~ msgstr "選択の削除"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "修正子 ID={0}"
 
-#, java-format
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
 #~ msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
-
-#, java-format
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。"
 
 #~ msgid ""
@@ -30257,26 +30561,26 @@
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
-#~ "overwrite the existing ones."
-#~ msgstr "アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグインに上書きできる権限があるかどうか、確認してください。"
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグイン"
+#~ "に上書きできる権限があるかどうか、確認してください。"
 
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
 #~ "about the problem."
-#~ msgstr "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。"
-
-#, java-format
+#~ msgstr ""
+#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ"
+#~ "い。"
+
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -30293,7 +30597,9 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
-#~ msgstr "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しますか？"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま"
+#~ "すか？"
 
 #~ msgid "Combine ways with different memberships?"
@@ -30307,5 +30613,6 @@
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
+#~ msgstr ""
+#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
@@ -30323,19 +30630,21 @@
 #~ msgid ""
 #~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded in "
-#~ "the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ "file.<br>The password is transfered in plain text to the server, encoded "
+#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
 #~ msgstr ""
-#~ "<html>警告：パスワードは平文で設定ファイルに格納されます。<br>パスワードは、URLに付加されて平文でサーバに送信されます。<br><b>他で使用"
-#~ "しているパスワードは使用しないでください。</b></html>"
+#~ "<html>警告：パスワードは平文で設定ファイルに格納されます。<br>パスワード"
+#~ "は、URLに付加されて平文でサーバに送信されます。<br><b>他で使用しているパス"
+#~ "ワードは使用しないでください。</b></html>"
 
 #~ msgid ""
 #~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
 #~ "move mouse.   Select: Click."
-#~ msgstr "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押した状態で移動させる。選択：クリック。"
+#~ msgstr ""
+#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押"
+#~ "した状態で移動させる。選択：クリック。"
 
 #~ msgid "Login"
 #~ msgstr "ログイン"
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
@@ -30354,9 +30663,7 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "タグ付けのソース(URL "
-#~ "やファイル名)が、定義ファイルに設定してあります。詳しくは、http://josm.openstreetmap.de/wiki/TaggingPreset"
-#~ "s を見てください。"
-
-#, java-format
+#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し"
+#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
+
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -30372,5 +30679,4 @@
 #~ msgstr "競合点の統合"
 
-#, java-format
 #~ msgid "Conflicts: {0}"
 #~ msgstr "競合: {0}"
@@ -30379,5 +30685,4 @@
 #~ msgstr "下に移動"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "関連の編集者:{0}"
@@ -30393,5 +30698,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -30413,7 +30719,8 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
-#~ msgstr "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -30421,10 +30728,9 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
-#~ msgstr "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告してください。"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "強制的に連結。"
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告"
+#~ "してください。"
 
 #~ msgid "Please select ways with almost right angles to orthogonalize."
@@ -30434,11 +30740,15 @@
 #~ "Please select at least one node, way or relation. Only already uploaded "
 #~ "elements have a history."
-#~ msgstr "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップロードされた要素だけに遍歴があります。"
+#~ msgstr ""
+#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ"
+#~ "ロードされた要素だけに遍歴があります。"
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
-#~ msgstr "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いているか、ダウンロードしましたか？"
-
-#, java-format
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている"
+#~ "か、ダウンロードしましたか？"
+
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -30452,5 +30762,4 @@
 #~ msgstr "補間"
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
@@ -30474,5 +30783,4 @@
 #~ msgstr "とりあえず続ける"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "最初に投影法を {0} に変えてください。"
@@ -30485,7 +30793,9 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
-#~ msgstr "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライダーを調整して、手動で写真に合わせることができます。"
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ"
+#~ "ダーを調整して、手動で写真に合わせることができます。"
 
 #~ msgid "Map Type"
@@ -30505,14 +30815,13 @@
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード"
+#~ msgstr ""
+#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード"
 
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒"
@@ -30520,5 +30829,7 @@
 #~ msgid ""
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr "<html>私のGPSレシーバーは写真を撮ることができます。<br>これは使えますか。</html>"
+#~ msgstr ""
+#~ "<html>私のGPSレシーバーは写真を撮ることができます。<br>これは使えますか。"
+#~ "</html>"
 
 #~ msgid "YAHOO (WebKit GTK)"
@@ -30531,9 +30842,7 @@
 #~ msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "パス {0} にあるイメージは存在しないか、読めません。"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -30572,32 +30881,38 @@
 #~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
 #~ "import EXIF geotagged pictures."
-#~ msgstr "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれたジオタグを関連づけします。"
+#~ msgstr ""
+#~ "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれた"
+#~ "ジオタグを関連づけします。"
 
 #~ msgid ""
 #~ "(You can change the number of days after which this warning appears<br>by "
 #~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager.warntime'を編集することで変更できます）"
-
-#, java-format
+#~ msgstr ""
+#~ "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
+#~ "warntime'を編集することで変更できます）"
+
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
-#~ msgstr "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。"
-
-#, java-format
+#~ msgstr ""
+#~ "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}で"
+#~ "す。"
+
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
 #~ "primitives only"
-#~ msgstr "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初の{0}だけです。"
+#~ msgstr ""
+#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初"
+#~ "の{0}だけです。"
 
 #~ msgid "Download referrers..."
 #~ msgstr "参照をダウンロード..."
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
 #~ msgid_plural ""
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
+#~ msgstr[0] ""
+#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
 
 #~ msgid "Close current changeset"
@@ -30607,33 +30922,33 @@
 #~ msgstr "新しい変更セットを使用して閉じる"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
 #~ "after this upload"
-#~ msgstr "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セットを閉じる"
-
-#, java-format
+#~ msgstr ""
+#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ"
+#~ "トを閉じる"
+
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr "既存の変更セット {0} を使用し開いたままにしておく"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
 #~ "open for further uploads"
-#~ msgstr "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするために変更セットを開いておく"
-
-#, java-format
+#~ msgstr ""
+#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた"
+#~ "めに変更セットを開いておく"
+
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</html>"
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
 #~ msgstr ""
-#~ "<html>OSM サーバ ''{1}'' 上の変更セット ''{0}'' "
-#~ "を閉じられませんでした。<br>変更セットはタイムアウト後にサーバによって自動的に閉じられます。</html>"
-
-#, java-format
+#~ "<html>OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。"
+#~ "<br>変更セットはタイムアウト後にサーバによって自動的に閉じられます。</"
+#~ "html>"
+
 #~ msgid "Changeset {0} is unchanged. Skipping update."
 #~ msgstr "変更セット {0} は変更されていません。更新をスキップします。"
@@ -30642,19 +30957,20 @@
 #~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..."
 
-#, java-format
 #~ msgid "Reusing existing changeset {0}"
 #~ msgstr "既存の変更セット {0} を再利用しています"
 
 #~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a new "
-#~ "one."
-#~ msgstr "警告: 要求された既存の変更セットを再利用できません。新しく開いています。"
+#~ "Warning: could not reuse an existing changeset as requested. Opening a "
+#~ "new one."
+#~ msgstr ""
+#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。"
 
 #~ msgid ""
-#~ "Failed to update changeset. Either there is no current changeset or the id "
-#~ "of the current changeset is 0"
-#~ msgstr "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更セットのIDが 0 です。"
-
-#, java-format
+#~ "Failed to update changeset. Either there is no current changeset or the "
+#~ "id of the current changeset is 0"
+#~ msgstr ""
+#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更"
+#~ "セットのIDが 0 です。"
+
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません"
@@ -30684,23 +31000,25 @@
 #~ msgstr "競合が検出されました"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレーションから削除しますか？</html>"
+#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレー"
+#~ "ションから削除しますか？</html>"
 
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "このデータセットには id {0} バージョン {1} のプリミティブはありません"
+#~ msgstr ""
+#~ "このデータセットには id {0} バージョン {1} のプリミティブはありません"
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
-#~ msgstr "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリミティブごとにリクエストするには、無効にする。"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
+#~ msgstr ""
+#~ "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリ"
+#~ "ミティブごとにリクエストするには、無効にする。"
 
 #~ msgid "Primitive already deleted"
 #~ msgstr "プリミティブは削除済み"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -30708,6 +31026,6 @@
 #~ "is:<br>{0}</html>"
 #~ msgstr ""
-#~ "<html>アップロード <strong>失敗</strong> "
-#~ "サーバから削除しようとしたプリミティブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
+#~ "<html>アップロード <strong>失敗</strong> サーバから削除しようとしたプリミ"
+#~ "ティブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
 
 #~ msgid "not yet decided"
@@ -30738,12 +31056,13 @@
 #~ msgstr "OSM ユーザ名 (e-mail)"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "{0} という名前のプラグインは利用できません。更新はスキップされました。"
-
-#, java-format
+#~ msgstr ""
+#~ "{0} という名前のプラグインは利用できません。更新はスキップされました。"
+
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありません。"
+#~ msgstr ""
+#~ "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありま"
+#~ "せん。"
 
 #~ msgid "Reached the end of the line"
@@ -30753,42 +31072,38 @@
 #~ msgstr "1 つのプリミティブを破棄"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール "
-#~ "{2}で使用されています。<br>リレーションから削除しますか?</html>"
-
-#, java-format
+#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま"
+#~ "す。<br>リレーションから削除しますか?</html>"
+
 #~ msgid "removing reference from way {0}"
 #~ msgstr "ウェイ {0}から、参照を取り除く"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
 #~ "missing on this system.</html>"
-#~ msgstr "<html>URL の作成に失敗しました。エンコーディング ''{0}''は<br>このシステムにはありません。</html>"
-
-#, java-format
+#~ msgstr ""
+#~ "<html>URL の作成に失敗しました。エンコーディング ''{0}''は<br>このシステム"
+#~ "にはありません。</html>"
+
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りました。"
+#~ msgstr ""
+#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし"
+#~ "た。"
 
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "ウェイ終端の開始ノードを選択"
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
 
-#, java-format
 #~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
 #~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''"
 
-#, java-format
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "パラメータ''{0}'' はヌルでなければなりません"
 
-#, java-format
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "必要な属性 ''{0}'' がありません"
@@ -30800,20 +31115,18 @@
 #~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
 #~ "found."
-#~ msgstr "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が見つかりません。"
-
-#, java-format
+#~ msgstr ""
+#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が"
+#~ "見つかりません。"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
-
-#, java-format
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
+
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "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>で作成してください。"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">"
+#~ "あなたの言語</A>で作成してください。"
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -30821,12 +31134,14 @@
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してください。"
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
+#~ "い。"
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage 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>でそれを作成してください。"
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
+#~ "あなたの母国語</A>でそれを作成してください。"
 
 #~ msgid "Use an open changeset"
@@ -30840,9 +31155,10 @@
 
 #~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to version "
-#~ "0.6"
-#~ msgstr "警告: アップロードするデータにAPIバージョンが定義されていません。バージョン0.6 にフォールバックします。"
-
-#, java-format
+#~ "WARNING: no API version defined for data to upload. Falling back to "
+#~ "version 0.6"
+#~ msgstr ""
+#~ "警告: アップロードするデータにAPIバージョンが定義されていません。バージョ"
+#~ "ン0.6 にフォールバックします。"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
@@ -30860,5 +31176,4 @@
 #~ msgstr "最新のバージョンがありません。履歴は空です。"
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "範囲外のインデックス。{0} を受け取りました"
@@ -30867,43 +31182,42 @@
 #~ msgstr "選択されたプリミティブの履歴を表示"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "\"{0}\"を読み込めません。"
 
-#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 #~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff upload."
+#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
+#~ "upload."
 #~ msgstr ""
-#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アップロードの使用が必須ですが、API "
-#~ "は取扱えません。差分アップロードを無視します。"
-
-#, java-format
+#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アッ"
+#~ "プロードの使用が必須ですが、API は取扱えません。差分アップロードを無視しま"
+#~ "す。"
+
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-#~ "default geometry. Details: {1}"
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
 #~ msgstr ""
-#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトのgeometry にフォールバックします。詳細: {1}"
+#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの"
+#~ "geometry にフォールバックします。詳細: {1}"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "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"
+#~ "通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必"
+#~ "要です\n"
 #~ "     Javaの使用メモリ最大サイズを増やすオプション"
 
@@ -30911,11 +31225,10 @@
 #~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)"
 
-#, java-format
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "リレーション: {0} から {1} まで {2} 経由"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -30931,6 +31244,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -30939,5 +31252,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メニューに表示されます。\n"
+#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ"
+#~ "ニューに表示されます。\n"
 #~ "\n"
 #~ "高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\n"
@@ -30950,26 +31264,24 @@
 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 #~ "\n"
-#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連する 'id' "
-#~ "を入力するだけです。\n"
-#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のようなURL を生成してください、73 "
-#~ "のところはあなたの画像ID に置き換えます:\n"
+#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連す"
+#~ "る 'id' を入力するだけです。\n"
+#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のよう"
+#~ "なURL を生成してください、73 のところはあなたの画像ID に置き換えます:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでください。"
+#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでくださ"
+#~ "い。"
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
-#~ msgstr "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エリア結合、ポジションへのジャンプ"
-
-#, java-format
-#~ msgid "{0} via nodes."
-#~ msgstr "{0} 経由ノード。"
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
+#~ msgstr ""
+#~ "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エ"
+#~ "リア結合、ポジションへのジャンプ"
 
 #~ msgid "error requesting update: not zoom-level 12"
 #~ msgstr "更新要求中にエラー: ズームレベル12 ではありません"
 
-#, java-format
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "経由ノード {0}, {1}"
@@ -30979,19 +31291,16 @@
 
 #~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
-
-#, java-format
+#~ msgstr ""
+#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
+
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点"
 
-#, java-format
 #~ msgid "MIddle way: {0}"
 #~ msgstr "中間のウェイ: {0}"
 
-#, java-format
 #~ msgid "{0} extrem nodes."
 #~ msgstr "{0} 極値ノード。"
@@ -31028,5 +31337,7 @@
 
 #~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取りました"
+#~ msgstr ""
+#~ "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取"
+#~ "りました"
 
 #~ msgid "User with the same uid but different name found"
@@ -31042,5 +31353,4 @@
 #~ msgstr "利用可能な翻訳を探しています ..."
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -31050,5 +31360,4 @@
 #~ msgstr "JOSMを再起動してください。"
 
-#, java-format
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "リソース ''{0}''のロードに失敗しました。エラー内容 {1}"
