Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 16179)
+++ applications/editors/josm/i18n/po/ja.po	(revision 16407)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-27 14:26+0200\n"
-"PO-Revision-Date: 2009-06-23 06:12+0000\n"
-"Last-Translator: MAPconcierge <taichi@mapconcierge.jp>\n"
+"POT-Creation-Date: 2009-07-09 10:40+0200\n"
+"PO-Revision-Date: 2009-07-02 03:36+0000\n"
+"Last-Translator: Mage Whopper <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-06-27 12:19+0000\n"
+"X-Launchpad-Export-Date: 2009-07-09 07:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:189
+#: ../core/src/org/openstreetmap/josm/Main.java:192
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
@@ -25,6 +25,6 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:198
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
@@ -32,31 +32,32 @@
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:261
-msgid "The projection could not be read from preferences. Using Mercator"
+#: ../core/src/org/openstreetmap/josm/Main.java:281
+#, fuzzy, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "投影法が設定から読み取れません。メルカトル図法を使います。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:349
+#: ../core/src/org/openstreetmap/josm/Main.java:394
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:350
+#: ../core/src/org/openstreetmap/josm/Main.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:351
+#: ../core/src/org/openstreetmap/josm/Main.java:396
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "保存されていない変更があります。変更分を破棄して継続しますか？"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Save and Exit"
 msgstr "保存して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 msgid "Discard and Exit"
 msgstr "変更を破棄して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:352
+#: ../core/src/org/openstreetmap/josm/Main.java:397
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -69,12 +70,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
@@ -88,7 +89,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -99,32 +100,32 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:378
+#: ../core/src/org/openstreetmap/josm/Main.java:424
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "不正な形式のURLの\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:391
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "About"
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Display the about screen."
 msgstr "情報を表示する。"
@@ -132,10 +133,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,25 +144,26 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
 msgstr "バージョン{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #, java-format
 msgid "Last change at {0}"
 msgstr "{0}の最後の変更"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Bug Reports"
 msgstr "バグ報告"
@@ -171,5 +173,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -177,27 +179,27 @@
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Readme"
 msgstr "はじめにお読みください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
 msgid "Revision"
 msgstr "リビジョン"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Contribution"
 msgstr "貢献"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
 msgid "About JOSM..."
 msgstr "JOSMについて"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
 msgid "File could not be found."
 msgstr "ファイルは存在しませんでした。"
@@ -211,12 +213,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
-#, fuzzy
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "少なくとも1つはノードかウェイを選んでください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
 msgid "Warning"
 msgstr "警告"
@@ -271,5 +272,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:81
 msgid "Latitude"
 msgstr "緯度"
@@ -278,5 +279,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:84
 msgid "Longitude"
 msgstr "経度"
@@ -284,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:246
 msgid "Align Nodes in Circle"
 msgstr "ノードを円形に配列"
@@ -295,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -363,7 +364,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-#, fuzzy
 msgid "API initialization failed"
-msgstr "初期化されていません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -382,7 +382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
-#, fuzzy
 msgid "Precondition Violation"
-msgstr "競合中のリレーション"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
@@ -391,37 +390,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "データ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "layer"
 msgstr "レイヤ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "selection"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "download"
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0}へズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "{0}のビューへズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -431,9 +430,9 @@
 msgstr "表示: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "Nothing selected to zoom to."
 msgstr "ズームする選択がありませｎ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
 msgid "No conflicts to zoom to"
 msgstr "ズームの対象になる競合はありません"
@@ -524,39 +523,43 @@
 msgstr "コピーするものを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
 msgid "Create Circle"
 msgstr "円形を作成します"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 msgid "Create a circle from three selected nodes."
 msgstr "3つのノードから円形を作成します"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
+msgid "Those nodes are not in a circle."
+msgstr "円形内にそのノードはありません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#, fuzzy
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
 msgstr ""
 "３つだけノードを選択するか、３つだけのノードを持つ１つのウェイを選択してくだ"
 "さい。"
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:121
-msgid "Those nodes are not in a circle."
-msgstr "円形内にそのノードはありません。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:332
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Delete"
 msgstr "削除"
@@ -606,5 +609,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 #, java-format
 msgid "File: {0}"
@@ -713,11 +716,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:563
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:763
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -728,5 +732,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:356
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "エラー"
@@ -736,30 +740,30 @@
 msgstr "事前定義のライセンスを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
 msgid "JOSM Online Help"
 msgstr "JOSMオンラインヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "ブラウザで開く"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:507
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:569
 msgid "Edit"
 msgstr "編集"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -767,19 +771,19 @@
 msgstr "再読込"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "JOSMオンラインヘルプからのページのみ編集できます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "ページ{0}を読み込む際にエラーが発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
 #, java-format
 msgid ""
@@ -794,18 +798,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-#, fuzzy
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "OSMノードやウエイに関する履歴情報の表示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-#, fuzzy
 msgid "Info about Element"
-msgstr "要素の履歴"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-#, fuzzy
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "OSMノードやウエイに関する履歴情報の表示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -865,5 +866,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
 msgid "Mirror"
 msgstr "鏡像"
@@ -902,10 +903,10 @@
 msgstr "右"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "移動 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
@@ -913,5 +914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
 msgid "Cannot move objects outside of the world."
 msgstr "オブジェクトを世界の外に移動できません。"
@@ -1106,5 +1107,5 @@
 msgstr "ファイル {0}は存在します。上書きしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1114,26 +1115,25 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:85
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
 msgid "No document open so nothing to save."
 msgstr "一つも開かれたデータがありませんんで、保存されません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Empty document"
 msgstr "空の文書"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "The document contains no data."
 msgstr "文書にデータが含まれない"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Save anyway"
 msgstr "それでも保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "Conflicts"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:98
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1143,36 +1143,36 @@
 "れます。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid "Reject Conflicts and Save"
 msgstr "競合を否定して保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save OSM file"
 msgstr "OSMファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Save GPX file"
 msgstr "GPXファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save Layer"
 msgstr "レイヤーを保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:122
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Could not back up file."
 msgstr "ファイルをバックアップできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
 msgid "Unknown file extension."
 msgstr "ファイルの拡張子が不明です"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:191
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
 msgid "An error occurred while saving."
 msgstr "保存中にエラー発生"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:201
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:243
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
 msgid "An error occurred while restoring backup file."
 msgstr "バックアップファイルから復元するときに、エラーになりました。"
@@ -1224,6 +1224,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Close"
 msgstr "閉じる"
@@ -1292,12 +1293,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
-#, fuzzy
 msgid ""
 "A relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-"リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし"
-"た。\n"
-"確認して、必要なら訂正してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
@@ -1481,68 +1478,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
 msgid "Upload to OSM..."
 msgstr "OSMにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
 msgid "Upload all changes to the OSM server."
 msgstr "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "アップロードする変更の概略コメントを入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
 msgid "Upload these changes?"
 msgstr "この変更をアップロードしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "未解決の競合があります。まずこれらの競合を解決してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
 msgid "Uploading"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
 #, java-format
 msgid ""
@@ -1556,17 +1553,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
 #, java-format
 msgid ""
@@ -1577,10 +1574,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
 #, java-format
 msgid ""
@@ -1590,9 +1587,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
 #, java-format
 msgid ""
@@ -1602,18 +1599,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
 msgid "Primitive already deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:546
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:559
 #, java-format
 msgid ""
@@ -1718,24 +1715,15 @@
 msgstr "生のGPSデータ"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:46
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Downloading data"
 msgstr "データをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
 msgid "No data imported."
 msgstr "データーはインポートされませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:71
-#, java-format
-msgid "Data Layer {0}"
-msgstr "データーレイヤー {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:88
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMapデータ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
-msgid "Data Layer"
-msgstr "データレイヤー"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
@@ -1777,5 +1765,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
 #, java-format
@@ -1877,5 +1865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
@@ -1886,5 +1874,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:481
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
 msgid "Release the mouse button to stop rotating."
 msgstr "回転を止めるには、マウスボタンを放します。"
@@ -1902,7 +1890,7 @@
 "を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
@@ -1910,9 +1898,9 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
 msgid "Select, move and rotate objects"
 msgstr "オブジェクトの選択、移動および回転"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -1920,5 +1908,28 @@
 msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:479
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
+#, fuzzy
+msgid "Move elements"
+msgstr "左へ移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Move them"
+msgstr "左へ移動"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
+#, fuzzy
+msgid "Undo move"
+msgstr "取り消し"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -1927,5 +1938,5 @@
 "マージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -1944,5 +1955,5 @@
 msgstr "ズームと地図の移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid ""
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
@@ -2215,35 +2226,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
-msgid "Add"
-msgstr "追加"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:45
-msgid "Change"
-msgstr "更新"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:96
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
+#, fuzzy, java-format
+msgid "Add {0} {1}"
+msgstr "削除 {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
+#, fuzzy, java-format
+msgid "Change {0} {1}"
+msgstr "{0}このオブジェクトを変更"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
 #, java-format
 msgid "Remove \"{0}\" for {1} ''{2}''"
 msgstr "Remove \"{0}\" for {1} ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
 msgstr "Set {0}={1} for {2} ''{3}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
@@ -2252,19 +2255,26 @@
 msgstr[0] "オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Remove \"{0}\" for {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
 msgstr "Set {0}={1} for {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
-msgid "ChangeRelationMemberRole"
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
+#, fuzzy, java-format
+msgid "ChangeRelationMemberRole {0} {1}"
 msgstr "ChangeRelationMemberRole"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -2272,25 +2282,25 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
 #, java-format
 msgid "Delete {1} {0}"
 msgstr "削除 {1} {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:97
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
 #, java-format
 msgid "Delete {0} {1}"
 msgstr "削除 {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
 msgid "Conflicting relation"
 msgstr "競合中のリレーション"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
 #, java-format
 msgid ""
@@ -2301,11 +2311,11 @@
 "関連から削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid ""
@@ -2316,10 +2326,10 @@
 "関連から削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:366
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
 msgid "Split way segment"
 msgstr "ウェイのセグメントを分割"
 
 #. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:385
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2331,20 +2341,20 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "移動"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:154
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "node"
@@ -2369,43 +2379,49 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
 #, fuzzy, java-format
-msgid "removing reference from relation {0}"
-msgstr "セレクションの削除"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-msgid "RemoveRelationMember"
+msgid "RemoveRelationMember {0} {1}"
 msgstr "RemoveRelationMember"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
-msgid "Rotate"
-msgstr "回転"
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:88
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, fuzzy, java-format
+msgid "Rotate {0} {1}"
+msgstr "削除 {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
 msgid "Sequence"
 msgstr "シーケンス"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
 #, java-format
 msgid "Resolve {0} tag conflicts in {1} {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
 #, java-format
 msgid "Undelete {0} primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
 #, java-format
 msgid "Resolve version conflicts for {0} {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
 #, java-format
 msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
+msgid "Main.ds doesn't include node {0}"
 msgstr ""
 
@@ -2504,25 +2520,51 @@
 msgstr "サーバから設定をロードできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../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/gui/conflict/properties/PropertiesMergeModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
 msgid "Decimal Degrees"
 msgstr "十進経緯度"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
 msgid "Degrees Minutes Seconds"
 msgstr "度分秒"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "S"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
 msgid "N"
 msgstr "北"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "W"
 msgstr "西"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:69
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
 msgid "E"
 msgstr "東"
@@ -2533,5 +2575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:150
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
@@ -2556,5 +2598,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:483
 msgid "way"
@@ -2649,17 +2691,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
-msgid "Didn't find an historized primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
 #, java-format
@@ -2667,16 +2705,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
-#: ../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/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 msgstr ""
@@ -2688,127 +2715,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
 msgid "Area style way is not closed."
 msgstr "領域を指定するウエイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:442
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:540
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
 msgid "Empty member in relation."
 msgstr "リレーションに登録すべきものがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:793
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "メンバー \"{0}\"を関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "ウエイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:570
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "No \"via\" node or way found."
 msgstr "経由地かウエイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:615
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:753
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:813
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:824
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:959
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "ウエイ \"{0}\"と\"{1}\"の交差する点"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "内部のウェイ ''{0}''が外側にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1021
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1046
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1243
+msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
 msgid "untagged"
 msgstr "タグ付いていない"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1244
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
 msgid "text"
 msgstr "テキスト"
@@ -2816,5 +2843,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:234
 #, java-format
 msgid ""
@@ -2842,6 +2869,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
 msgid "background"
 msgstr "背景"
@@ -2851,24 +2878,9 @@
 msgstr "ハイライト"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
-msgid "EPSG:4326"
-msgstr "EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 46.1° and 57° only.\n"
-"Use another projection system if you are not using\n"
-"a French WMS server.\n"
-"Do not upload any data after this message."
-msgstr ""
-"投影法\"{0}\"は、緯度が46.1°から57°の\n"
-"間で使われるように設計されています。\n"
-"フランスのWMSサーバをつかうのではなければ、\n"
-"ほかの投影法を使用してください。\n"
-"本メッセージ後は、データのアップロードはやめてください。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+msgid "WGS84 Geographisch"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2884,36 +2896,24 @@
 "新しいレイヤーを新しいゾーンで開始してください。"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
 msgid "Lambert Zone (France)"
 msgstr "ランベルトゾーン（フランス）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
 msgid "Lambert Zone (Estonia)"
 msgstr "ランベルトゾーン（エストニア）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
 msgid "Mercator"
 msgstr "メルカトル"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:45
-#, java-format
-msgid ""
-"The projection \"{0}\" is designed for\n"
-"latitudes between 45.7° and 47.9°\n"
-"and longitutes between 5.7° and 10.6° only.\n"
-"Use another projection system if you are not working\n"
-"on a data set of Switzerland or Liechtenstein.\n"
-"Do not upload any data after this message."
-msgstr ""
-"投影法 \"{0}\" は、\n"
-"緯度 45.7°から 47.9°で\n"
-"経度  5.7°から 10.6°まで用です。\n"
-"スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n"
-"違う投影系を使ってください。\n"
-"このメッセージ以降のデータはアップロードしないでください。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:138
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
 msgstr "スイスグリッド (スイス)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#, fuzzy, java-format
+msgid "UTM Zone {0}"
+msgstr "移動 {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2925,14 +2925,14 @@
 msgstr "ブックマークを書き込みできません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
 msgid "Message of the day not available"
 msgstr "今日のメッセージはありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
 #, java-format
 msgid "- running version is {0}"
 msgstr "- 起動中のバージョンは {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
 msgid "Downloading \"Message of the day\""
 msgstr "\"今日のメッセージ\"をダウンロード"
@@ -3125,5 +3125,4 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
 #, java-format
 msgid "Menu: {0}"
@@ -3185,5 +3184,5 @@
 msgstr "ズームアウト"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:47
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "拡大・縮小"
@@ -3217,8 +3216,13 @@
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:239
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
 msgid "layer not in list."
 msgstr "レイヤーがリストにありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
+#, java-format
+msgid "Layer {0} must be in list of layers"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
@@ -3226,9 +3230,9 @@
 msgstr "OSMサーバに接続…"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:105
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
 msgid "Error while parsing"
 msgstr "解析中にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:108
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
 msgid "File not found"
 msgstr "ファイルが見つかりません"
@@ -3288,4 +3292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
@@ -3295,4 +3300,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
 msgstr ""
@@ -3300,5 +3307,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "メンバー"
@@ -3494,7 +3502,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:304
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3574,4 +3582,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
 msgid "parameter '{0}' must not be null"
@@ -3579,4 +3590,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
 msgid ""
@@ -3586,4 +3598,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
 msgid "adjustable {0} not registered yet"
@@ -3612,7 +3625,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
-#, fuzzy
 msgid "Communication with server failed"
-msgstr "接続に失敗しました。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
@@ -3700,7 +3712,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
-#, fuzzy
 msgid "Keep a clone of the local version"
-msgstr "場所の名称を入力してください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
@@ -3742,7 +3753,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
-#, fuzzy
 msgid "No, abort"
-msgstr "日付なし"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
@@ -3774,7 +3784,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
-#, fuzzy
 msgid "Remove from dataset"
-msgstr "セレクションの削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
@@ -3785,9 +3794,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
 msgstr "役割"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
@@ -3805,4 +3816,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr ""
@@ -3826,8 +3839,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3838,7 +3851,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3894,5 +3908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
 msgid "Command Stack"
 msgstr "指示の集積"
@@ -3903,6 +3917,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
@@ -3913,5 +3927,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
@@ -3920,10 +3934,27 @@
 msgstr "トグル: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
 #, java-format
 msgid "Command Stack: {0}"
 msgstr "指示の集積: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+msgid "Conflict"
+msgstr "競合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+msgid "Merging conflicts."
+msgstr "競合点の統合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "解決"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "上記リストの全てのアイテムを結合するダイアログを開く"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
@@ -3932,26 +3963,4 @@
 msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
-msgid "Resolve"
-msgstr "解決"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "上記リストの全てのアイテムを結合するダイアログを開く"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
-msgid "Conflict"
-msgstr "競合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
-msgid "Merging conflicts."
-msgstr "競合点の統合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
-#, java-format
-msgid "Conflicts: {0}"
-msgstr "競合: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
 msgid "Resolve conflicts"
@@ -3987,45 +3996,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
-msgid "Click Reload to refresh list"
-msgstr "リストを更新するために再読込のクリック"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
 msgid "History"
 msgstr "履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
 msgid "Display the history of all selected items."
 msgstr "選択したアイテムすべての履歴の表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Object"
-msgstr "オブジェクト"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:103
-msgid "Date"
-msgstr "日付"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#, java-format
+msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+#, java-format
+msgid "Loading history for {0} with id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "現在選択しているオブジェクトを再読み込みし、リストを再作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-msgid "Revert"
-msgstr "取り消す"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへ"
-"と戻します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:181
-msgid "Not implemented yet."
-msgstr "まだ実装されていません。"
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgid "Display the history of the selected primitive"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
@@ -4156,4 +4168,18 @@
 msgid "Add Properties"
 msgstr "プロパティの追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Add"
+msgstr "追加"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
@@ -4264,9 +4290,9 @@
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4275,5 +4301,5 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -4303,179 +4329,102 @@
 
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:72
 msgid "Apply Changes"
 msgstr "変更の適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:147
 msgid "Basic"
 msgstr "基本"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "Occupied By"
 msgstr "次によって占められる;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:193
 msgid "linked"
 msgstr "継げられた"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:232
 msgid "Tags (empty value deletes tag)"
 msgstr "タグ（空の値でタグ自身を削除）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move Up"
 msgstr "上に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:277
 msgid "Add Selected"
 msgstr "選択したものを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:278
 msgid "Add all currently selected objects as members"
 msgstr "現在選択されている全てのオブジェクトをメンバーとして追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:284
 msgid "Remove Selected"
 msgstr "選択の削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:285
 msgid "Remove all currently selected objects from relation"
 msgstr "現在選択されている全てのオブジェクトを関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Sort"
+msgstr "スポーツ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#, fuzzy
+msgid "Sort the selected relation members or the whole list"
+msgstr "リストから選択した情報源を削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move Down"
 msgstr "下に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:305
 msgid "Remove the member in the current table row from this relation"
 msgstr "この関連から現在の行のメンバーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:319
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "この関連の全ての未完成のウェイとノードをダウンロード"
 
-#. end of section to determine linkedness.
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
-#. item "Ways/Track" combo "Access"
-#. 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 "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
-#. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Fee"
-#. item "Health/Pharmacy" combo "Dispensing"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:1368
-#: build/trans_presets.java:2309 build/trans_presets.java:2573
-msgid "yes"
-msgstr "はい"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
-#: build/trans_presets.java:312 build/trans_presets.java:313
-#: build/trans_presets.java:314 build/trans_presets.java:315
-#: build/trans_presets.java:316 build/trans_presets.java:317
-#: build/trans_presets.java:318 build/trans_presets.java:319
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:516
-#: build/trans_presets.java:517 build/trans_presets.java:518
-#: build/trans_presets.java:537 build/trans_presets.java:538
-#: build/trans_presets.java:539 build/trans_presets.java:558
-#: build/trans_presets.java:559 build/trans_presets.java:560
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:600
-#: build/trans_presets.java:601 build/trans_presets.java:602
-#: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:638
-#: build/trans_presets.java:639 build/trans_presets.java:640
-#: build/trans_presets.java:641 build/trans_presets.java:758
-#: build/trans_presets.java:773 build/trans_presets.java:1306
-#: build/trans_presets.java:1368 build/trans_presets.java:2309
-#: build/trans_presets.java:2573
-msgid "no"
-msgstr "いいえ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
-#, java-format
-msgid "Members: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+#, fuzzy, java-format
+msgid "Members: {0} (linked: {1})"
 msgstr "メンバー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "関連の編集者:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
 msgid "There were conflicts during import."
 msgstr "インポート中に競合を発見しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:762
 msgid "Error parsing server response."
 msgstr "サーバからの応答内容が不正です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:765
 msgid "Cannot connect to server."
 msgstr "サーバに接続できません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
 msgid "Error when communicating with server."
 msgstr ""
@@ -4510,21 +4459,21 @@
 msgstr "最初にブックマークを選択してください、"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "min lon"
 msgstr "最小経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
 msgid "max lon"
 msgstr "最大経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -4534,5 +4483,5 @@
 "ることができます。）"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
 msgid "Bounding Box"
 msgstr "境界囲み"
@@ -4681,670 +4630,41 @@
 msgstr "タイル数"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} のイメージ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-msgid "Read GPX..."
-msgstr "GPXの読み込み…"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "地点 {0} x {1}に時刻がありません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
-msgid "No images with readable timestamps found."
-msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0}を読み込んでいます ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
-msgid "Geotagged Images"
-msgstr "ジオタグのついた画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS開始: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS終了: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
-#, java-format
-msgid "current delta: {0}s"
-msgstr "現在の差分: {0} 秒"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
-msgid "timezone difference: "
-msgstr "タイムゾーンの違い: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
-msgid "image"
-msgid_plural "images"
-msgstr[0] "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#, java-format
-msgid "{0} within the track."
-msgstr "トラック内に {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
-msgid "Sync clock"
-msgstr "時計の同期"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
-msgid "JPEG images (*.jpg)"
-msgstr "JPEGイメージ(*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "ファイル \"{0}\"中の日付が取得できません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
-msgid "Image"
-msgstr "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
-msgid "Synchronize Time with GPS Unit"
-msgstr "時刻をGPSユニットと同期する"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-msgid "Time entered could not be parsed."
-msgstr "入力した時刻は、解釈できません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
-msgid "gps point"
-msgstr "GPSポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
-msgid "Customize line drawing"
-msgstr "線描画のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
-msgid "Use global settings."
-msgstr "全体設定を使用"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
-msgid "Draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引く。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-msgid "Do not draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引かない。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Select line drawing options"
-msgstr "線描画オプションの選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-msgid "Customize Color"
-msgstr "配色のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "既定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "色選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
-msgid "Markers From Named Points"
-msgstr "名前のついた地点からのマーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} からの名前付きトラックポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
-msgid "Import Audio"
-msgstr "音声のインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
-msgid "Wave Audio files (*.wav)"
-msgstr "WAV音声ファイル(*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} からの音声マーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
-msgid "Import images"
-msgstr "イメージのインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} トラック "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0}ルート, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} ウェイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#, java-format
-msgid "Name: {0}"
-msgstr "名前: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#, java-format
-msgid "Description: {0}"
-msgstr "記述: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
-msgid "Length: "
-msgstr "長さ: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid "Convert to data layer"
-msgstr "データレイヤーへ変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-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:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
-#, java-format
-msgid "Converted from: {0}"
-msgstr "{0}からのコンバート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
-msgid "Download from OSM along this track"
-msgstr "このトラックに沿ってOSMからダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
-msgid "Download everything within:"
-msgstr "次の範囲内の全てをダウンロード:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:724
-#, java-format
-msgid "{0} meters"
-msgstr "{0} メータ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:727
-msgid "Maximum area per request:"
-msgstr "リクエストあたりの最大面積："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:730
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} 平方キロメートル"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
-#, 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:896
-msgid "No GPX track available in layer to associate audio with."
-msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1043
-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:1047
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
-"外します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:148
-msgid "outside downloaded area"
-msgstr "ダウンロード領域の外"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:226
-#, java-format
-msgid "version {0}"
-msgstr "バージョン {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0}は次からなります:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0}は削除されました)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-msgid "unset"
-msgstr "設定解除"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
-#, java-format
-msgid "API version: {0}"
-msgstr "APIバージョン: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
-msgid "Convert to GPX layer"
-msgstr "GPXレイヤーの変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1837 build/trans_presets.java:1843
-#: build/trans_presets.java:1849 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1891
-#: build/trans_presets.java:1897 build/trans_presets.java:1903
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: build/trans_presets.java:1937 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1957
-#: build/trans_presets.java:1963 build/trans_presets.java:1969
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1987 build/trans_presets.java:1993
-#: build/trans_presets.java:1999 build/trans_presets.java:2005
-#: build/trans_presets.java:2011 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2035 build/trans_presets.java:2041
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] "トラック"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
-msgid "point"
-msgid_plural "points"
-msgstr[0] "ポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "{0}ポイントをもつトラック"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{1}トラックを含む {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} ポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
-msgid "gps marker"
-msgstr "GPSマーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
-msgid "marker"
-msgid_plural "markers"
-msgstr[0] "マーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
-#, java-format
-msgid "{0} consists of {1} marker"
-msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0}は、{1}マーカーからなる"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
-msgid "Synchronize Audio"
-msgstr "音声の同期"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要がありま"
-"す。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr "地点 {0}で音声同期をとります"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
-msgid "Unable to synchronize in layer being played."
-msgstr "再生されているレイヤーと同期させることができません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-msgid "Make Audio Marker at Play Head"
-msgstr "再生の最初に音声マーカーを作成します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
-msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
-msgid "No existing audio markers in this layer to offset from."
-msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。"
-
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
-msgid ""
-"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トラックの近くにドラッ"
-"グする必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
-msgstr ""
-"SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイ"
-"ントの上に持ってくる必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
-msgid "Unable to create new audio marker."
-msgstr "新しいオーディオマーカーを生成できません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-msgid "There was an error while trying to display the URL for this marker"
-msgstr "このマーカーのURLを表示するときにエラーが発生しました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-msgid "(URL was: "
-msgstr "(URLは： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-msgid "Error displaying URL"
-msgstr "URL を表示する際にエラー"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:43
-msgid "Advanced Preferences"
-msgstr "高度な設定"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:44
-msgid "Setting Preference entries directly. Use with caution!"
-msgstr "設定項目を直接変更。利用に注意！"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:47
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-msgid "Search: "
-msgstr "検索: "
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:83
-msgid "Current value is default."
-msgstr "現在の値は既定値です。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:85
-#, java-format
-msgid "Default value is ''{0}''."
-msgstr "既定値は \"{0}\"です。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:88
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "不明なときの既定値(設定はまだ使われません）"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:195
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:526
-msgid "Please select the row to edit."
-msgstr "編集する列を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:198
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
-#, java-format
-msgid "New value for {0}"
-msgstr "新しい値は{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:207
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
-msgid "Please select the row to delete."
-msgstr "削除する列を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
-msgid "Enter a new key/value pair"
-msgstr "新しいキー/値の組を入力"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:26
-msgid "Display the Audio menu."
-msgstr "オーディオメニューの表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:27
-msgid "Label audio (and image and web) markers."
-msgstr "音声 (画像やウェブ) マーカーにラベルをつける"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:28
-msgid "Display live audio trace."
-msgstr "ライブ音声トレースの表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
-msgid "Create non-audio markers when reading GPX."
-msgstr "GPXを読み込むときにマーカー(オーディオではない)を作成"
-
-#. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
-msgid "Explicit waypoints with valid timestamps."
-msgstr "有効なタイムスタンプによる明示的なウエイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "トラック位置から時間推定による明示的なウエイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
-msgid "Named trackpoints."
-msgstr "名前付きトラックポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
-msgid "Modified times (time stamps) of audio files."
-msgstr "音声ファイルの修正時刻(タイムスタンプ)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Start of track (will always do this if no other markers available)."
-msgstr "追跡開始（有効なマーカーがないときには常に行う）"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:46
-msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "メインメニューバーでのオーディオメニューの表示・非表示の切り替え"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:51
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
-msgstr ""
-"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン"
-"を動かして表示する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
-msgstr ""
-"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ"
-"ベルを付与する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:61
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウエイポイントから作成す"
-"る。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:64
-msgid "When importing audio, make markers from..."
-msgstr "オーディオをインポート時、次からマーカーを作成..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:73
-msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"オーディオのインポート時に、GPXレイヤーのウェイポイントに対して、適用する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:88
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"（explicitウエイポイントではなく）自動的にトラックポイントからオーディオマー"
-"カーを作成し、名前と説明を付加する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:83
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
-"ラックの位置にオーディオマーカーを作成してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr "対応するボタンを押したときに何秒分進む・戻るのか。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
-msgid "Forward/back time (seconds)"
-msgstr "時刻を進める/戻す(秒)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:97
-msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "早回しの時に何倍速にするのか。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
-msgid "Fast forward multiplier"
-msgstr "高速再生の倍率"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か"
-"ら開始する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
-msgid "Lead-in time (seconds)"
-msgstr "Lead-in 時間(秒)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:107
-msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "音声録音の残り時間と実際の残り時間の割合"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
-msgid "Voice recorder calibration"
-msgstr "ボイスレコーダの調整"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
-msgid "Color"
-msgstr "色"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
+#, java-format
+msgid "History for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+msgid "history not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#, java-format
+msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#, java-format
+msgid "failed to set reference. reference version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+msgid "history not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#, java-format
+msgid "failed to set current. current version {0} not available in history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#, java-format
+msgid "Node {0}"
+msgstr ""
 
 #. item "Streets/Motorway" text "Reference"
@@ -6054,5 +5374,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:56 build/trans_presets.java:92
 #: build/trans_presets.java:132 build/trans_presets.java:169
@@ -6203,40 +5524,730 @@
 msgstr "名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} のイメージ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+msgid "Read GPX..."
+msgstr "GPXの読み込み…"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "地点 {0} x {1}に時刻がありません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+msgid "No images with readable timestamps found."
+msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0}を読み込んでいます ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+msgid "Geotagged Images"
+msgstr "ジオタグのついた画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS開始: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS終了: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#, java-format
+msgid "current delta: {0}s"
+msgstr "現在の差分: {0} 秒"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+msgid "timezone difference: "
+msgstr "タイムゾーンの違い: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+msgid "image"
+msgid_plural "images"
+msgstr[0] "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#, java-format
+msgid "{0} within the track."
+msgstr "トラック内に {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+msgid "Sync clock"
+msgstr "時計の同期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
+msgid "JPEG images (*.jpg)"
+msgstr "JPEGイメージ(*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "ファイル \"{0}\"中の日付が取得できません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+msgid "Image"
+msgstr "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+msgid "Synchronize Time with GPS Unit"
+msgstr "時刻をGPSユニットと同期する"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+msgid "Time entered could not be parsed."
+msgstr "入力した時刻は、解釈できません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+msgid "gps point"
+msgstr "GPSポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+msgid "Customize line drawing"
+msgstr "線描画のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Use global settings."
+msgstr "全体設定を使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+msgid "Draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引く。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+msgid "Do not draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引かない。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Select line drawing options"
+msgstr "線描画オプションの選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+msgid "Customize Color"
+msgstr "配色のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "既定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "色選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+msgid "Markers From Named Points"
+msgstr "名前のついた地点からのマーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} からの名前付きトラックポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+msgid "Import Audio"
+msgstr "音声のインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+msgid "Wave Audio files (*.wav)"
+msgstr "WAV音声ファイル(*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} からの音声マーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+msgid "Import images"
+msgstr "イメージのインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} トラック "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0}ルート, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} ウェイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#, java-format
+msgid "Name: {0}"
+msgstr "名前: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#, java-format
+msgid "Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+msgid "Timespan: "
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+msgid "Length: "
+msgstr "長さ: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid "Convert to data layer"
+msgstr "データレイヤーへ変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+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:669
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#, java-format
+msgid "Converted from: {0}"
+msgstr "{0}からのコンバート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+msgid "Download from OSM along this track"
+msgstr "このトラックに沿ってOSMからダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+msgid "Download everything within:"
+msgstr "次の範囲内の全てをダウンロード:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#, java-format
+msgid "{0} meters"
+msgstr "{0} メータ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+msgid "Maximum area per request:"
+msgstr "リクエストあたりの最大面積："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} 平方キロメートル"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#, 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:888
+msgid "No GPX track available in layer to associate audio with."
+msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+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:1037
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
+"外します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#, java-format
+msgid "Data Layer {0}"
+msgstr "データーレイヤー {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid "outside downloaded area"
+msgstr "ダウンロード領域の外"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#, java-format
+msgid "version {0}"
+msgstr "バージョン {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "インポートした内容には {0} の競合があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0}は次からなります:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0}は削除されました)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgid "unset"
+msgstr "設定解除"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#, java-format
+msgid "API version: {0}"
+msgstr "APIバージョン: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+msgid "Convert to GPX layer"
+msgstr "GPXレイヤーの変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: build/trans_presets.java:1837 build/trans_presets.java:1843
+#: build/trans_presets.java:1849 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1891
+#: build/trans_presets.java:1897 build/trans_presets.java:1903
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1937 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: build/trans_presets.java:1963 build/trans_presets.java:1969
+#: build/trans_presets.java:1975 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:1993
+#: build/trans_presets.java:1999 build/trans_presets.java:2005
+#: build/trans_presets.java:2011 build/trans_presets.java:2017
+#: build/trans_presets.java:2023 build/trans_presets.java:2029
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "トラック"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+msgid "point"
+msgid_plural "points"
+msgstr[0] "ポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "{0}ポイントをもつトラック"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{1}トラックを含む {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} ポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+msgid "gps marker"
+msgstr "GPSマーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "マーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0}は、{1}マーカーからなる"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+msgid "Synchronize Audio"
+msgstr "音声の同期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要がありま"
+"す。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "地点 {0}で音声同期をとります"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+msgid "Unable to synchronize in layer being played."
+msgstr "再生されているレイヤーと同期させることができません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+msgid "Make Audio Marker at Play Head"
+msgstr "再生の最初に音声マーカーを作成します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+msgid "No existing audio markers in this layer to offset from."
+msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。"
+
+#. Not close enough to track, or no audio marker found for some other reason
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+msgid ""
+"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トラックの近くにドラッ"
+"グする必要があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイ"
+"ントの上に持ってくる必要があります。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+msgid "Unable to create new audio marker."
+msgstr "新しいオーディオマーカーを生成できません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "このマーカーのURLを表示するときにエラーが発生しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URLは： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "URL を表示する際にエラー"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "高度な設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "設定項目を直接変更。利用に注意！"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
+msgid "Search: "
+msgstr "検索: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+msgid "Current value is default."
+msgstr "現在の値は既定値です。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "既定値は \"{0}\"です。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "不明なときの既定値(設定はまだ使われません）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:588
+msgid "Please select the row to edit."
+msgstr "編集する列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#, java-format
+msgid "New value for {0}"
+msgstr "新しい値は{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+msgid "Please select the row to delete."
+msgstr "削除する列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+msgid "Enter a new key/value pair"
+msgstr "新しいキー/値の組を入力"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "オーディオメニューの表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "音声 (画像やウェブ) マーカーにラベルをつける"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "ライブ音声トレースの表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "GPXを読み込むときにマーカー(オーディオではない)を作成"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "有効なタイムスタンプによる明示的なウエイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "トラック位置から時間推定による明示的なウエイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "名前付きトラックポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "音声ファイルの修正時刻(タイムスタンプ)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "追跡開始（有効なマーカーがないときには常に行う）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "メインメニューバーでのオーディオメニューの表示・非表示の切り替え"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン"
+"を動かして表示する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ"
+"ベルを付与する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウエイポイントから作成す"
+"る。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "オーディオをインポート時、次からマーカーを作成..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "オーディオをインポートする際に、GPXレイヤーのウェイポイントとして扱う"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"（explicitウエイポイントではなく）自動的にトラックポイントからオーディオマー"
+"カーを作成し、名前と説明を付加する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
+"ラックの位置にオーディオマーカーを作成してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr "対応するボタンを押したときに何秒分進む・戻るのか。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "時刻を進める/戻す(秒)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "早回しの時に何倍速にするのか。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "高速再生の倍率"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か"
+"ら開始する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Lead-in 時間(秒)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "音声録音の残り時間と実際の残り時間の割合"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "ボイスレコーダの調整"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+msgid "Color"
+msgstr "色"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "塗りつぶしスタイル{0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 #, java-format
 msgid "Layer: {0}"
 msgstr "レイヤ{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "{0}の色を選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
 msgid "Set to default"
 msgstr "既定値に設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
 msgid "Set all to default"
 msgstr "全てを既定値に設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
 msgid "Colors used by different objects in JOSM."
 msgstr "JOSMの異なるオブジェクトが使う配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
 msgid "Colors"
 msgstr "色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -6245,29 +6256,29 @@
 msgstr "全て"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "ローカル・ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率(赤=高い、緑=低い, 可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -6275,5 +6286,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1350
 msgid "Car"
@@ -6294,5 +6305,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:313 build/trans_presets.java:639
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -6330,5 +6341,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:314 build/trans_presets.java:641
 #: build/trans_presets.java:841 build/trans_presets.java:860
@@ -6341,50 +6352,50 @@
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw Direction Arrows"
 msgstr "進行方向を矢印表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "必要なときだけ方向ヒントを表示(例：一方通行の時）"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "不活性のレイヤーを他色で描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチアライアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
 msgid "Draw lines between raw GPS points"
 msgstr "GPS生データのポイント間にラインを引いて下さい"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -6392,34 +6403,34 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。'-1'にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決めて描画する。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -6427,13 +6438,13 @@
 msgstr "少なくともこの距離を超える移動がなかった場合には、矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -6443,9 +6454,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -6455,54 +6466,54 @@
 "う。使用しているGPS機器がこの情報を記録している必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:208
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの変更が容易になるように、選択モードで仮想ノードを描く。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
 msgid "Draw the inactive data layers in a different color."
 msgstr "異なった色で、不活性になっているデータレイヤーを描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "OSM Data"
 msgstr "OSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
 msgid "Keep backup files"
 msgstr "バックアップファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
 msgid "When saving, keep backup files ending with a ~"
 msgstr ""
@@ -6510,82 +6521,103 @@
 
 #. Show splash screen on startup
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:32
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
 msgid "Show splash screen at startup"
 msgstr "起動時にスプラッシュ・スクリーンを表示する"
 
 #. Show ID in selection
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:33
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
 msgid "Show object ID in selection lists"
 msgstr "選択リストにオブジェクトIDを表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
 msgid "Draw rubber-band helper line"
 msgstr "マウスアイコンへの補助線を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 msgid "Modeless working (Potlatch style)"
 msgstr "モードなし作業（Potlatchスタイル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "モード切替が不要（potlatchスタイルの作業方法)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 msgid "Look and Feel"
 msgstr "ルック＆フィール"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
 msgstr "既定（自動判定）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
 msgid "Language"
 msgstr "言語"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Enable built-in defaults"
+msgstr "ビルトインのデフォルトを有効"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#, fuzzy
+msgid "Enable built-in icon defaults"
+msgstr "ビルトインのデフォルトを有効"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54
+#, fuzzy
+msgid "Used style"
+msgstr "ゲレンデのタイプ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61
+msgid "Map Paint Styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
 msgid "Configure available plugins."
 msgstr "利用可能なプラグインを設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Download List"
 msgstr "リストをダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 msgid "Update"
 msgstr "アップデート"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
 msgid "Configure Sites..."
 msgstr "サイトの設定..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
 msgid "Add JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
+msgstr "JOSM プラグイン情報のURLの追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
 msgid "Please select an entry."
 msgstr "エントリーを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Edit JOSM Plugin description URL."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+msgstr "JOSM プラグイン情報のURLを編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
 msgid "Configure Plugin Sites"
 msgstr "プラグインサイトを設定"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Display Settings"
 msgstr "表示設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6593,98 +6625,98 @@
 msgstr "プログラム全体の見た目に影響する各種設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Connection Settings for the OSM server."
 msgstr "OSMサーバへの接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Map Settings"
 msgstr "マップ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Settings for the map projection and data interpretation."
 msgstr "地図投影法とデータ解釈の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Audio Settings"
 msgstr "オーディオ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the audio player and audio markers."
 msgstr "オーディオプレイヤーと音声マークの設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+msgid "Display coordinates as"
+msgstr "座標を次の単位で表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+msgid "Projection method"
+msgstr "投影法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
 msgid "Map Projection"
 msgstr "地図投影法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:46
-msgid "Projection method"
-msgstr "投影法"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:49
-msgid "Display coordinates as"
-msgstr "座標を次の単位で表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
 msgid "Enable proxy server"
 msgstr "プロキシーサーバを有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
 msgid "Proxy Settings"
 msgstr "プロキシー設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
 msgid "Proxy server host"
 msgstr "プロキシーサーバのホスト名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
 msgid "Proxy server port"
 msgstr "プロキシーサーバのポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
 msgid "Proxy server username"
 msgstr "プロキシーのユーザ名"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
 msgid "Proxy server password"
 msgstr "プロキシーのパスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSMサーバのベースURL（REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid "Base Server URL"
 msgstr "サーバのベースURL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
 msgid "OSM password"
 msgstr "OSMパスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -6699,77 +6731,108 @@
 #. icon original size: 128x128
 #. modifications: icon was cropped, then resized
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:24
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
 msgstr "ショートカット設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
 msgid "Changing keyboard shortcuts manually."
 msgstr "キーボードショートカットを手動で変更"
 
 #. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Action"
 msgstr "アクション"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "Short Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#, fuzzy, java-format
+msgid "URL: {0}"
+msgstr "レイヤ{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#, fuzzy, java-format
+msgid "Author: {0}"
+msgstr "作者: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+#, fuzzy, java-format
+msgid "Webpage: {0}"
+msgstr "ヘルプ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+#, fuzzy, java-format
+msgid "Version: {0}"
+msgstr "バージョン{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+#, fuzzy
+msgid "Copy defaults"
+msgstr "既定のコピー"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+msgid "Please select the row to copy."
+msgstr "コピーする列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#, java-format
+msgid "The XML source (URL or filename) for {0} definition files."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+#, fuzzy
+msgid "Add a new XML source to the list."
+msgstr "新しいソースをリストに追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:616
+msgid "Delete the selected source from the list."
+msgstr "リストから選択した情報源を削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+msgid "Defaults (See tooltip for detailed information)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
 msgid "Sort presets menu"
 msgstr "プリセットメニューの並び替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
-msgid "Enable built-in defaults"
-msgstr "ビルトインのデフォルトを有効"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
-msgid "Tagging preset source"
-msgstr "事前に設定した情報源をタグ付け"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
-msgstr ""
-"タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳しく"
-"は、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid "Add a new tagging preset source to the list."
-msgstr "新しいタグプリセット源をリストに追加する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:554
-msgid "Delete the selected source from the list."
-msgstr "リストから選択した情報源を削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
 msgstr "事前設定のタグ付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
-msgid "Tagging preset sources"
-msgstr "事前設定の情報源をタグ付け"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:204
 msgid "Separator"
 msgstr "区切り"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:301
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:350
 msgid "Toolbar"
 msgstr "ツールバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:305
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:354
 msgid "Available"
 msgstr "Available"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:393
 msgid "Toolbar customization"
 msgstr "ツールバーのカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:394
 msgid "Customize the elements on the toolbar."
 msgstr "ツールバーの要素をカスタマイズ"
@@ -6844,4 +6907,6 @@
 "</p>"
 msgstr ""
+"<p>擬似変更 'disabled' は、次に起こったときにショートカットを無効にします。</"
+"p>"
 
 #. scroll up
@@ -7024,6 +7089,6 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
 #, java-format
 msgid "Markers from {0}"
@@ -7032,7 +7097,7 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
-#, fuzzy, java-format
+#, java-format
 msgid "File \"{0}\" does not exist"
-msgstr "ファイル {0}は存在します。上書きしますか?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -7090,9 +7155,9 @@
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
 msgid "NMEA import success"
-msgstr "NMEAインポートの成功"
+msgstr "NMEAのインポートに成功しました。"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51
 msgid "NMEA import faliure!"
-msgstr "NMEAインポートの失敗！"
+msgstr "NMEAのインポートに失敗しました。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
@@ -7348,5 +7413,5 @@
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not handle them. Ignoring changesets."
+"use changesets, but API is not able to handle them. Ignoring changesets."
 msgstr ""
 
@@ -7356,15 +7421,15 @@
 msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
 msgid "Update Plugins"
 msgstr "プラグインのアップデート"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:47
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
 msgid "Download Plugins"
 msgstr "ダウンロードプラグイン"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:59
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
 #, java-format
 msgid ""
@@ -7377,30 +7442,30 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
 msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+"{0} 個のプラグインのダウロードに成功しました。JOSMを再起動してください。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
 #, java-format
 msgid "Downloading Plugin {0}..."
+msgstr "プラグイン {0} をダウンロードしています..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgid "Skip download"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
-msgid "Skip download"
-msgstr ""
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "プラグイン {1} には JOSMのバージョン {0} が必要です。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
-#, java-format
-msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
 msgid "Download Plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:119
+msgstr "プラグインをダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
 msgid "Skip Download"
 msgstr ""
@@ -7409,5 +7474,5 @@
 #, java-format
 msgid "An error occurred in plugin {0}"
-msgstr "プラグイン {0}でエラーが発生しました。"
+msgstr "プラグイン {0} でエラーが発生しました。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65
@@ -7424,4 +7489,6 @@
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
+"プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要がありま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
@@ -7439,5 +7506,5 @@
 #, java-format
 msgid "Last plugin update more than {0} days ago."
-msgstr "プラグインの更新が最後に行われてから{0}日以上経過しました。"
+msgstr "プラグインが最後に更新されてから{0}日以上経過しました。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119
@@ -7446,11 +7513,11 @@
 "setting the config option 'pluginmanager.warntime'.)"
 msgstr ""
-"(設定オプションの'pluginmanager.warntime'を編集することで、<br>この警告が何日"
-"たつと出るか、変更できます。)"
+"（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
+"warntime'を編集することで変更できます）"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 msgid "Disable plugin"
 msgstr "このプラグインを使用不可にする"
@@ -7465,5 +7532,5 @@
 msgstr "プラグインを継続"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:191
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7473,16 +7540,16 @@
 "上書きできる権限があるかどうか、確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:248
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
 #, java-format
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "\"{0}\"プラグインで、予期せぬ例外が発生しました。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:251
+msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "このプラグインから得られる情報では、作者は {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7491,9 +7558,9 @@
 "い。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
 msgid "Should the plugin be disabled?"
 msgstr "このプラグインを使用不可にしますか?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7503,5 +7570,5 @@
 "再起動してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:273
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -7510,19 +7577,19 @@
 "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:298
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
 msgid "Information"
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:134
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:135
 msgid "no description available"
 msgstr "説明がありません"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:136
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:137
 msgid "More details"
 msgstr "もっと詳細"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7530,13 +7597,13 @@
 msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "プラグイン情報が見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
 msgid "All installed plugins are up to date."
 msgstr "インストールされた全てのプラグインは最新です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:86
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 #, java-format
 msgid ""
@@ -7549,9 +7616,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Download missing plugins"
 msgstr "不足するプラグインをダウンロードします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #, java-format
 msgid ""
@@ -7564,6 +7631,6 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:171
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
 #: build/trans_presets.java:312 build/trans_presets.java:313
 #: build/trans_presets.java:314 build/trans_presets.java:315
@@ -7586,14 +7653,14 @@
 msgstr "不明な"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:191
 msgid "Plugin bundled with JOSM"
 msgstr "JOSMに付属のプラグイン"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -7704,4 +7771,6 @@
 "in common"
 msgstr ""
+"既存の複数ノードもつ2つのウェイとその交点に基づき、ノードを碁盤の目として、格"
+"子状のウエイ構造をつくります。"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
@@ -7806,5 +7875,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr "AgPifoj - ジオタグされた写真"
+msgstr "ジオタグのある写真"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -7852,45 +7921,45 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:103
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIFからGPS位置を取得"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "ディレクトリ走査の開始"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
 msgid "One of the selected files was null !!!"
 msgstr "選択したファイルはのひとつは null でした !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
 msgid "Read photos..."
 msgstr "写真を取り込む"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:175
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "ディレクトリ {0} を走査"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:192
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:195
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
 msgid "Correlate to GPX"
 msgstr "GPXに関連づける"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8102,20 +8171,20 @@
 msgstr "秒: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(時差 {0} 日)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8123,13 +8192,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
 msgid "Matching photos to track failed"
 msgstr "トラックへのフォトマッチに失敗しました。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
 msgid "Adjust timezone and offset"
 msgstr "タイムゾーンとオフセットを調整してください。"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
 msgid "Default Values"
 msgstr "デフォルトの値"
@@ -8151,5 +8220,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:355
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
@@ -8362,4 +8431,6 @@
 "building import size is limited to 1 km2 max."
 msgstr ""
+"WMSのオーバーロードを防ぐため、\n"
+"インポートする範囲を1 km2 以下で作成してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
@@ -8489,5 +8560,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Blank Layer"
 msgstr "ブランクのレイヤー"
@@ -8590,17 +8661,19 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+msgid "Format errors: "
+msgstr ""
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+msgid "TangoGPS import success"
+msgstr "TangoGPS のインポートに成功しました。"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+msgid "TangoGPS import faliure!"
+msgstr "TangoGPS のインポートに失敗しました。"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 #, fuzzy
-msgid "Format errors: "
-msgstr "ファイルフォーマットエラー"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
-#, fuzzy
-msgid "TangoGPS import success"
-msgstr "NMEAインポートの成功"
-
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-#, fuzzy
-msgid "TangoGPS import faliure!"
-msgstr "NMEAインポートの失敗！"
+msgid "TCX Files (*.tcx)"
+msgstr "GPXファイル(*.gpx *.gpx.gz)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8625,5 +8698,5 @@
 msgstr "複製したウェイの作成"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr "GPSトラックを編集するためのレイヤーです。"
@@ -8644,11 +8717,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
 msgid "Import path from GPX layer"
 msgstr "GPXレイヤーからパスをインポート"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
 msgid "Drop existing path"
 msgstr "今あるパスをドロップ"
@@ -8657,6 +8730,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:135
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
 msgid "No GPX data layer found."
 msgstr "GPXデータのレイヤーがありません"
@@ -8719,6 +8792,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
 msgid "Refresh"
 msgstr "リフレッシュ"
@@ -8754,5 +8827,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
 msgid "Importing data from DG100..."
-msgstr "DG100からデータのインポート"
+msgstr "DG100からデータのインポートしています..."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
@@ -9028,7 +9101,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:947 build/trans_style.java:964
-#: build/trans_style.java:980 build/trans_style.java:3333
-#: build/trans_style.java:3341
+#: build/trans_style.java:952 build/trans_style.java:969
+#: build/trans_style.java:985 build/trans_style.java:3344
+#: build/trans_style.java:3352
 msgid "water"
 msgstr "水域(湖沼)"
@@ -9111,4 +9184,6 @@
 "lines). Default 50000."
 msgstr ""
+"データを間引く前（つまり、ラインを単純化する前）に、生成させるノードの最大"
+"数。デフォルト値は50000。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
@@ -9153,5 +9228,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Which WMS layer to use for tracing against. Default is IR1."
-msgstr ""
+msgstr "軌跡をたどるのにどのWMSレイヤを使用しますか。デフォルトは IR1です。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
@@ -9361,14 +9436,14 @@
 "ん。"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugsを開く"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -9498,19 +9573,21 @@
 msgstr "許可されたアクション"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:114
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要"
+"求されました。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #, java-format
 msgid "Request details: {0}"
 msgstr "リクエストの詳細: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
 msgid "Confirm Remote Control action"
@@ -9569,5 +9646,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
 msgid "Reverse route"
-msgstr ""
+msgstr "ルートの逆転"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
@@ -9593,5 +9670,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
 msgid "Weight"
-msgstr ""
+msgstr "重み付け"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -9636,7 +9713,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
-#, fuzzy
 msgid "image loading..."
-msgstr "アップロード中..."
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9771,5 +9847,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
 msgid "<multiple>"
-msgstr ""
+msgstr "<multiple>"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
@@ -9824,14 +9900,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
-msgstr ""
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:38
-msgid "Import TCX File..."
-msgstr "TCXファイルをインポート"
-
-#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
-msgid "Import TCX file as GPS track"
-msgstr "TCXファイルをTCXファイルとしてインポート"
+msgstr "まず、設定情報にある現在のソースのタグを指定してください。"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10018,5 +10085,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "エリアの結合：　短いウェイの削除"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -10040,34 +10107,34 @@
 msgstr "特定の場所へジャンプできるダイアログを開始"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:53
 msgid "Enter Lat/Lon to jump to position."
 msgstr "移動する位置の緯度経度を入力"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "www.openstreetmap.orgから、URLを貼り付けることもできます。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:87
 msgid "Zoom (in metres)"
 msgstr "ズーム（メートル単位）"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:90
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
 msgid "Jump there"
 msgstr "そこへジャンプ"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:100
 msgid "Jump to Position"
 msgstr "ジャンプ先は"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
 "緯度、経度、ズームを解析することができませんでした。確認をしてください。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Unable to parse Lon/Lat"
 msgstr "緯度経度を解釈できません"
@@ -10136,5 +10203,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use the error layer to display problematic elements."
-msgstr ""
+msgstr "疑わしい要素を表示するために、エラーレイヤを使用"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
@@ -10375,23 +10442,23 @@
 msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:148
 msgid "Properties checker :"
 msgstr "プロパティチェッカー："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "This plugin checks for errors in property keys and values."
 msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:267
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "タグチェッカーライン - {0}: {1}　が不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:280
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "スペルチェック行 {0}が不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:291
 #, java-format
 msgid ""
@@ -10402,5 +10469,5 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:381
 msgid "Illegal tag/value combinations"
 msgstr "不正なタグ/値の組み合わせです"
@@ -10408,78 +10475,78 @@
 #. 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:345
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:394
 msgid "Painting problem"
 msgstr "色つけに問題発生"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:354
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:403
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "キー ''{0}''は不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:359
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Tags with empty values"
 msgstr "値のないタグ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:365
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:414
 msgid "Invalid property key"
 msgstr "プロパティキーが不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:420
 msgid "Invalid white space in property key"
 msgstr "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "Property values start or end with white space"
 msgstr "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:407
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:459
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "キー ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:460
 msgid "Presets do not contain property key"
 msgstr "プリセットはプロパティキーを含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "値 ''{0}'' キー ''{1}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
 msgid "Presets do not contain property value"
 msgstr "プリセットは属性値を含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
 msgid "Check property keys."
 msgstr "プロパティのキーをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 msgid "Use complex property checker."
 msgstr "高度なプロパティチェッカーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:562
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:582
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "TagChecker source"
 msgstr "タグチェッカーのソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:613
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10487,74 +10554,84 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Add a new source to the list."
 msgstr "新しいソースをリストに追加"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:553
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Edit the selected source."
 msgstr "選択したソースの編集"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
 msgid "Data sources"
 msgstr "データソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:638
 msgid "Check property values."
 msgstr "プロパティの値をチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Check for FIXMES."
 msgstr "FIXMEをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
 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:592
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 msgid "Use default data file."
 msgstr "既定のデータファイルを使用。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Use the default data file (recommended)."
 msgstr "既定のデータファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:666
+#, fuzzy
+msgid "Use default tag ignore file."
+msgstr "既定のデータファイルを使用。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+#, fuzzy
+msgid "Use the default tag ignore file (recommended)."
+msgstr "既定のデータファイルを使用(推奨)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:670
 msgid "Use default spellcheck file."
 msgstr "既定のスペルチェックファイルを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
 msgid "Use the default spellcheck file (recommended)."
 msgstr "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Fix properties"
 msgstr "プロパティを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:879
 msgid "Could not find element type"
 msgstr "要素タイプを見つけられませんでした。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:896
 msgid "Could not find warning level"
 msgstr "警告レベルを見つけられませんでした"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:905
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不正な表現\"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:837
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:909
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10699,7 +10776,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4068 build/trans_style.java:4075
-#: build/trans_style.java:4082 build/trans_style.java:4089
-#: build/trans_style.java:4096
+#: build/trans_style.java:4079 build/trans_style.java:4086
+#: build/trans_style.java:4093 build/trans_style.java:4100
+#: build/trans_style.java:4107
 msgid "building"
 msgstr "ビル"
@@ -10713,5 +10790,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4103
+#: build/trans_style.java:4114
 msgid "area"
 msgstr "領域"
@@ -10721,25 +10798,25 @@
 msgstr "閉じていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
 msgid "Unconnected ways."
 msgstr "つながっていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
 msgid "Way end node near other highway"
 msgstr "ウエイは他の高速道路の近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
 msgid "Way end node near other way"
 msgstr "ウェイは他のウェイの近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
 msgid "Way node near other way"
 msgstr "ほかのウェイに近いウェイのノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
 msgid "Connected way end node near other way"
 msgstr ""
@@ -10762,17 +10839,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:88
 msgid "Unnamed ways"
 msgstr "名前のないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#, fuzzy
+msgid "Unnamed Junction"
+msgstr "ジャンクションの編集"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:97
 msgid "Untagged ways"
 msgstr "タグ付いていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:102
 msgid "Empty ways"
 msgstr "空のウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
 msgid "One node ways"
 msgstr "ノードが一つのウェイ"
@@ -10792,9 +10874,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
 msgid "Reversed water: land not on left side"
-msgstr ""
+msgstr "水域の反転： 陸地は左側にない"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
 msgid "Reversed land: land not on left side"
-msgstr ""
+msgstr "陸地の反転：　陸地は左側にない"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
@@ -10810,14 +10892,14 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:149
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:156
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
 msgid "Reached a junction"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
 msgid "Exception occurred"
 msgstr "例外が発生しました"
@@ -10915,5 +10997,5 @@
 msgstr "選択されたWMSレイヤーの位置を調整してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
 #, java-format
 msgid ""
@@ -10926,15 +11008,15 @@
 msgstr "自動ダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -10942,102 +11024,91 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:229
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:250
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:272
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:295
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:334
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:335
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "WMS Plugin Preferences"
 msgstr "WMSプラグイン設定"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "WMSプラグインメニューに表示されるWMS サーバのリストを変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
 msgid "Menu Name"
 msgstr "メニューの名前"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "Menu Name (Default)"
 msgstr "メニュー名(既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
 msgid "WMS URL (Default)"
 msgstr "WMS URL (既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "メニュー名とWMS URLを入力"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Copy Default"
 msgstr "既定のコピー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:108
-msgid "Please select the row to copy."
-msgstr "コピーする列を選択してください。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
-msgid "% of lat:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
-msgid "% of lon:"
-msgstr ""
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#, fuzzy
+msgid "Downloader:"
+msgstr "ダウンロード"
 
 #. *
@@ -11088,4 +11159,6 @@
 "import EXIF geotagged pictures."
 msgstr ""
+"標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれたジ"
+"オタグを関連づけします。"
 
 #. Plugin cadastre-fr
@@ -11119,4 +11192,5 @@
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
+"様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
 
 #. Plugin DirectUpload
@@ -11162,5 +11236,5 @@
 #: build/trans_plugins.java:27
 msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "WMS イメージのベクトル化を支援する"
 
 #. Plugin livegps
@@ -11177,4 +11251,6 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを"
+"追加します。"
 
 #. Plugin nearclick
@@ -11195,4 +11271,6 @@
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
+"OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにしま"
+"す。"
 
 #. Plugin openvisible
@@ -11207,4 +11285,6 @@
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
+"現在表示されているスクリーンを、きれいなSVG画像として表示されるように、"
+"Firefoxを起動する。"
 
 #. Plugin PicLayer
@@ -11245,5 +11325,5 @@
 #: build/trans_plugins.java:55
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
@@ -11255,16 +11335,11 @@
 msgstr ""
 
-#. Plugin tcx-support
+#. Plugin terracer
 #: build/trans_plugins.java:59
-msgid "Directly load TCX files from JOSM."
-msgstr "直接JOSMからのTCXファイルをロードしてください。"
-
-#. Plugin terracer
+msgid "Make terraced houses out of single blocks."
+msgstr "一つのブロックからテラスハウスを作成する"
+
+#. Plugin usertools
 #: build/trans_plugins.java:61
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:63
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11273,5 +11348,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:63
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11280,5 +11355,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:65
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11287,10 +11362,10 @@
 
 #. Plugin waydownloader
+#: build/trans_plugins.java:67
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wmsplugin
 #: build/trans_plugins.java:69
-msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-
-#. Plugin wmsplugin
-#: build/trans_plugins.java:71
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -12014,5 +12089,5 @@
 #: build/trans_presets.java:261
 msgid "alley"
-msgstr ""
+msgstr "裏通り・路地"
 
 #: build/trans_presets.java:261
@@ -12086,4 +12161,64 @@
 msgid "Access"
 msgstr "アクセス"
+
+#. item "Streets/Road Restrictions" combo "Access"
+#. item "Streets/Road Restrictions" combo "Bicycle"
+#. item "Streets/Road Restrictions" combo "Foot"
+#. item "Streets/Road Restrictions" combo "Goods"
+#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Streets/Road Restrictions" combo "Horse"
+#. item "Streets/Road Restrictions" combo "Motorcycle"
+#. item "Streets/Road Restrictions" combo "Motorcar"
+#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Streets/Road Restrictions" combo "Motorboat"
+#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Ways/Track" combo "Access"
+#. 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 "Motorcar"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:1368
+#: build/trans_presets.java:2309 build/trans_presets.java:2573
+msgid "yes"
+msgstr "はい"
 
 #. color permissive
@@ -12108,5 +12243,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:188
+#: build/trans_presets.java:623 build/trans_style.java:192
 msgid "private"
 msgstr "私道"
@@ -12154,5 +12289,5 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:195
+#: build/trans_presets.java:623 build/trans_style.java:199
 msgid "destination"
 msgstr "行き先"
@@ -12189,7 +12324,7 @@
 #: build/trans_presets.java:601 build/trans_presets.java:602
 #: build/trans_presets.java:621 build/trans_presets.java:622
-#: build/trans_presets.java:623 build/trans_style.java:181
+#: build/trans_presets.java:623 build/trans_style.java:185
 msgid "permissive"
-msgstr ""
+msgstr "関係車両のみ可"
 
 #: build/trans_presets.java:312 build/trans_presets.java:316
@@ -12207,7 +12342,31 @@
 msgstr "農業の"
 
+#: build/trans_presets.java:312 build/trans_presets.java:313
+#: build/trans_presets.java:314 build/trans_presets.java:315
+#: build/trans_presets.java:316 build/trans_presets.java:317
+#: build/trans_presets.java:318 build/trans_presets.java:319
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:516
+#: build/trans_presets.java:517 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:538
+#: build/trans_presets.java:539 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:560
+#: build/trans_presets.java:579 build/trans_presets.java:580
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:601 build/trans_presets.java:602
+#: build/trans_presets.java:621 build/trans_presets.java:622
+#: build/trans_presets.java:623 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:638
+#: build/trans_presets.java:639 build/trans_presets.java:640
+#: build/trans_presets.java:641 build/trans_presets.java:758
+#: build/trans_presets.java:773 build/trans_presets.java:1306
+#: build/trans_presets.java:1368 build/trans_presets.java:2309
+#: build/trans_presets.java:2573
+msgid "no"
+msgstr "いいえ"
+
 #: build/trans_presets.java:315
 msgid "Goods"
-msgstr ""
+msgstr "貨物トラック"
 
 #: build/trans_presets.java:316
@@ -12419,6 +12578,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:512
-#: build/trans_style.java:520
+#: build/trans_presets.java:338 build/trans_style.java:516
+#: build/trans_style.java:524
 msgid "motorway"
 msgstr "高速道路"
@@ -12444,6 +12603,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:528
-#: build/trans_style.java:536
+#: build/trans_presets.java:338 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "trunk"
 msgstr "国道"
@@ -12469,6 +12628,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:544
-#: build/trans_style.java:552
+#: build/trans_presets.java:338 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "primary"
 msgstr "都道府県道"
@@ -12494,6 +12653,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:338 build/trans_style.java:560
-#: build/trans_style.java:568
+#: build/trans_presets.java:338 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "secondary"
 msgstr "主要道路"
@@ -12507,5 +12666,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:338 build/trans_style.java:576
+#: build/trans_presets.java:338 build/trans_style.java:580
 msgid "tertiary"
 msgstr "敷地内道路"
@@ -12523,5 +12682,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:338 build/trans_style.java:3084
+#: build/trans_presets.java:338 build/trans_style.java:3095
 msgid "residential"
 msgstr "敷地内道路"
@@ -12539,5 +12698,22 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:338 build/trans_style.java:632
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <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:338 build/trans_style.java:636
+#: build/trans_style.java:4172
 msgid "service"
 msgstr "サービス"
@@ -12564,6 +12740,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:338 build/trans_style.java:834
-#: build/trans_style.java:3149 build/trans_style.java:3150
+#: build/trans_presets.java:338 build/trans_style.java:839
+#: build/trans_style.java:3160 build/trans_style.java:3161
 msgid "construction"
 msgstr "工事中"
@@ -12613,5 +12789,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:400 build/trans_style.java:852
+#: build/trans_presets.java:400 build/trans_style.java:857
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -12724,5 +12900,5 @@
 #: build/trans_presets.java:619
 msgid "sand"
-msgstr ""
+msgstr "砂地"
 
 #. item "Ways/Track" text "Width (meters)"
@@ -13282,10 +13458,10 @@
 #: build/trans_presets.java:868
 msgid "Spikes"
-msgstr ""
+msgstr "車止めのとげ"
 
 #. item
 #: build/trans_presets.java:869
 msgid "Edit Spikes"
-msgstr ""
+msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
@@ -13593,5 +13769,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1111 build/trans_style.java:3325
+#: build/trans_presets.java:1111 build/trans_style.java:3336
 msgid "marsh"
 msgstr "沼地、湿地"
@@ -15322,27 +15498,27 @@
 #: build/trans_presets.java:1792 build/trans_presets.java:1801
 #: build/trans_presets.java:1810 build/trans_presets.java:1819
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
-#: build/trans_style.java:3569 build/trans_style.java:3577
-#: build/trans_style.java:3585 build/trans_style.java:3593
-#: build/trans_style.java:3601 build/trans_style.java:3609
-#: build/trans_style.java:3617 build/trans_style.java:3625
-#: build/trans_style.java:3633 build/trans_style.java:3641
-#: build/trans_style.java:3649 build/trans_style.java:3657
-#: build/trans_style.java:3665 build/trans_style.java:3673
-#: build/trans_style.java:3681 build/trans_style.java:3689
-#: build/trans_style.java:3697 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:3516 build/trans_style.java:3524
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868
 msgid "sport"
 msgstr "スポーツ"
@@ -18181,8 +18357,8 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2994 build/trans_style.java:209
-#: build/trans_style.java:648 build/trans_style.java:863
-#: build/trans_style.java:871 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
+#: build/trans_presets.java:2994 build/trans_style.java:213
+#: build/trans_style.java:652 build/trans_style.java:868
+#: build/trans_style.java:876 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
 msgid "bicycle"
 msgstr "自転車"
@@ -18251,8 +18427,8 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2994 build/trans_style.java:223
-#: build/trans_style.java:656 build/trans_style.java:664
-#: build/trans_style.java:672 build/trans_style.java:673
-#: build/trans_style.java:681
+#: build/trans_presets.java:2994 build/trans_style.java:227
+#: build/trans_style.java:660 build/trans_style.java:668
+#: build/trans_style.java:676 build/trans_style.java:677
+#: build/trans_style.java:685
 msgid "foot"
 msgstr "徒歩"
@@ -18278,5 +18454,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2994 build/trans_style.java:1163
+#: build/trans_presets.java:2994 build/trans_style.java:1168
 msgid "subway"
 msgstr "地下鉄"
@@ -18300,5 +18476,5 @@
 #: build/trans_presets.java:3002
 msgid "alternate"
-msgstr ""
+msgstr "代替路"
 
 #: build/trans_presets.java:3002
@@ -18339,10 +18515,10 @@
 #: build/trans_presets.java:3010
 msgid "forward halt point"
-msgstr ""
+msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
 #: build/trans_presets.java:3011
 msgid "backward halt point"
-msgstr ""
+msgstr "後方の停止点"
 
 #. <!--
@@ -18406,4 +18582,5 @@
 #. <condition k="restriction" v="no_left_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18412,4 +18589,5 @@
 #. <condition k="restriction" v="no_right_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18418,4 +18596,5 @@
 #. <condition k="restriction" v="no_straight_on"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18424,4 +18603,5 @@
 #. <condition k="restriction" v="no_u_turn"/>
 #. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -18485,7 +18665,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:108 build/trans_style.java:122
-#: build/trans_style.java:129 build/trans_style.java:136
-#: build/trans_style.java:143
+#: build/trans_style.java:112 build/trans_style.java:126
+#: build/trans_style.java:133 build/trans_style.java:140
+#: build/trans_style.java:147
 msgid "bridge"
 msgstr "橋"
@@ -18543,4 +18723,5 @@
 #. <condition k="highway" v="mini_roundabout"/>
 #. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18666,7 +18847,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color address
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color service
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -18749,15 +18930,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:115 build/trans_style.java:150
-#: build/trans_style.java:157 build/trans_style.java:164
-#: build/trans_style.java:592 build/trans_style.java:788
-#: build/trans_style.java:1113 build/trans_style.java:2364
-#: build/trans_style.java:3316 build/trans_style.java:3317
-#: build/trans_style.java:3871 build/trans_style.java:4155
-#: build/trans_style.java:4164 build/trans_style.java:4173
-#: build/trans_style.java:4182 build/trans_style.java:4191
-#: build/trans_style.java:4200 build/trans_style.java:4209
-#: build/trans_style.java:4210 build/trans_style.java:4219
-#: build/trans_style.java:4228
+#: build/trans_style.java:119 build/trans_style.java:154
+#: build/trans_style.java:161 build/trans_style.java:168
+#: build/trans_style.java:596 build/trans_style.java:793
+#: build/trans_style.java:1118 build/trans_style.java:2375
+#: build/trans_style.java:3327 build/trans_style.java:3328
+#: build/trans_style.java:3882 build/trans_style.java:4182
+#: build/trans_style.java:4191 build/trans_style.java:4200
+#: build/trans_style.java:4209 build/trans_style.java:4218
+#: build/trans_style.java:4227 build/trans_style.java:4236
+#: build/trans_style.java:4237 build/trans_style.java:4246
+#: build/trans_style.java:4255
 msgid "deprecated"
 msgstr "破棄された"
@@ -18799,5 +18980,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:251 build/trans_style.java:640
+#: build/trans_style.java:255 build/trans_style.java:644
 msgid "horse"
 msgstr "馬"
@@ -19007,11 +19188,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:358 build/trans_style.java:371
-#: build/trans_style.java:372 build/trans_style.java:385
-#: build/trans_style.java:386 build/trans_style.java:405
-#: build/trans_style.java:406 build/trans_style.java:413
-#: build/trans_style.java:426 build/trans_style.java:427
-#: build/trans_style.java:440 build/trans_style.java:441
-#: build/trans_style.java:454 build/trans_style.java:455
+#: build/trans_style.java:362 build/trans_style.java:375
+#: build/trans_style.java:376 build/trans_style.java:389
+#: build/trans_style.java:390 build/trans_style.java:409
+#: build/trans_style.java:410 build/trans_style.java:417
+#: build/trans_style.java:430 build/trans_style.java:431
+#: build/trans_style.java:444 build/trans_style.java:445
+#: build/trans_style.java:458 build/trans_style.java:459
 msgid "barrier"
 msgstr ""
@@ -19049,6 +19230,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:584 build/trans_style.java:600
-#: build/trans_style.java:616 build/trans_style.java:624
+#: build/trans_style.java:588 build/trans_style.java:604
+#: build/trans_style.java:620 build/trans_style.java:628
 msgid "street"
 msgstr "ストリート"
@@ -19104,7 +19285,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:608 build/trans_style.java:905
-#: build/trans_style.java:913 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
+#: build/trans_style.java:612 build/trans_style.java:910
+#: build/trans_style.java:918 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
 msgid "highway_track"
 msgstr "車線"
@@ -19160,8 +19341,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:689 build/trans_style.java:1137
-#: build/trans_style.java:1195 build/trans_style.java:1203
-#: build/trans_style.java:1212 build/trans_style.java:1220
-#: build/trans_style.java:1221
+#: build/trans_style.java:693 build/trans_style.java:1142
+#: build/trans_style.java:1206 build/trans_style.java:1214
+#: build/trans_style.java:1223 build/trans_style.java:1231
+#: build/trans_style.java:1232
 msgid "rail"
 msgstr "線路"
@@ -19182,5 +19363,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:803
+#: build/trans_style.java:808
 msgid "services"
 msgstr ""
@@ -19194,5 +19375,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:811
+#: build/trans_style.java:816
 msgid "ford"
 msgstr ""
@@ -19213,5 +19394,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:826
+#: build/trans_style.java:831
 msgid "turningcircle"
 msgstr "転回所"
@@ -19226,5 +19407,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:843
+#: build/trans_style.java:848
 msgid "emergency_access_point"
 msgstr ""
@@ -19239,5 +19420,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:955 build/trans_style.java:956
+#: build/trans_style.java:960 build/trans_style.java:961
 msgid "riverbank"
 msgstr "川岸"
@@ -19251,5 +19432,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:972
+#: build/trans_style.java:977
 msgid "stream"
 msgstr "小川"
@@ -19263,5 +19444,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "dock"
 msgstr "ドック"
@@ -19289,5 +19470,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1010
+#: build/trans_style.java:1015
 msgid "aqueduct"
 msgstr "水道"
@@ -19455,13 +19636,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1019 build/trans_style.java:1048
-#: build/trans_style.java:1056 build/trans_style.java:1057
-#: build/trans_style.java:1065 build/trans_style.java:1499
-#: build/trans_style.java:1506 build/trans_style.java:1515
-#: build/trans_style.java:1523 build/trans_style.java:1548
-#: build/trans_style.java:1556 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1579
-#: build/trans_style.java:1588 build/trans_style.java:1596
-#: build/trans_style.java:1604 build/trans_style.java:1612
+#: build/trans_style.java:1024 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1062
+#: build/trans_style.java:1070 build/trans_style.java:1510
+#: build/trans_style.java:1517 build/trans_style.java:1526
+#: build/trans_style.java:1534 build/trans_style.java:1559
+#: build/trans_style.java:1567 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1590
+#: build/trans_style.java:1599 build/trans_style.java:1607
+#: build/trans_style.java:1615 build/trans_style.java:1623
 msgid "manmade"
 msgstr "人工物"
@@ -19523,7 +19704,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1075 build/trans_style.java:1090
-#: build/trans_style.java:1105 build/trans_style.java:1121
-#: build/trans_style.java:1129
+#: build/trans_style.java:1080 build/trans_style.java:1095
+#: build/trans_style.java:1110 build/trans_style.java:1126
+#: build/trans_style.java:1134
 msgid "railwaypoint"
 msgstr ""
@@ -19546,10 +19727,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1146 build/trans_style.java:1155
+#: build/trans_style.java:1151 build/trans_style.java:1160
 msgid "otherrail"
 msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1147
+#: build/trans_style.java:1152
 msgid "railover"
 msgstr ""
@@ -19569,7 +19750,10 @@
 #. </rule>
 #.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="disused"/>
 #. color oldrail
+#. color oldrail
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -19577,8 +19761,12 @@
 #. </rule>
 #.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1171 build/trans_style.java:1179
-#: build/trans_style.java:1187
+#. color oldrail
+#: build/trans_style.java:1176 build/trans_style.java:1186
+#: build/trans_style.java:1187 build/trans_style.java:1197
+#: build/trans_style.java:1198
 msgid "oldrail"
 msgstr "古い軌道"
@@ -19623,6 +19811,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1251 build/trans_style.java:1252
-#: build/trans_style.java:1284
+#: build/trans_style.java:1262 build/trans_style.java:1263
+#: build/trans_style.java:1295
 msgid "aeroway"
 msgstr "空路"
@@ -19636,5 +19824,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1260
+#: build/trans_style.java:1271
 msgid "terminal"
 msgstr "駅"
@@ -19656,5 +19844,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1268 build/trans_style.java:1276
+#: build/trans_style.java:1279 build/trans_style.java:1287
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -19668,5 +19856,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1292
+#: build/trans_style.java:1303
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -19714,7 +19902,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1302 build/trans_style.java:1310
-#: build/trans_style.java:1318 build/trans_style.java:1326
-#: build/trans_style.java:1334
+#: build/trans_style.java:1313 build/trans_style.java:1321
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345
 msgid "aerialway"
 msgstr "リフト"
@@ -19731,5 +19919,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1344 build/trans_style.java:1345
+#: build/trans_style.java:1355 build/trans_style.java:1356
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -19744,5 +19932,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1353 build/trans_style.java:1354
+#: build/trans_style.java:1364 build/trans_style.java:1365
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -19757,5 +19945,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1362 build/trans_style.java:1363
+#: build/trans_style.java:1373 build/trans_style.java:1374
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -19770,5 +19958,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1382 build/trans_style.java:1383
 msgid "piste_expert"
 msgstr "熟練者用のゲレンデ"
@@ -19783,5 +19971,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1391 build/trans_style.java:1392
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -19796,5 +19984,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1400 build/trans_style.java:1401
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -19899,10 +20087,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1401 build/trans_style.java:1408
-#: build/trans_style.java:1417 build/trans_style.java:1425
-#: build/trans_style.java:1433 build/trans_style.java:1441
-#: build/trans_style.java:1449 build/trans_style.java:1457
-#: build/trans_style.java:1465 build/trans_style.java:1473
-#: build/trans_style.java:1481 build/trans_style.java:1489
+#: build/trans_style.java:1412 build/trans_style.java:1419
+#: build/trans_style.java:1428 build/trans_style.java:1436
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
 msgid "power"
 msgstr "電力"
@@ -19916,5 +20104,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1530 build/trans_style.java:1531
+#: build/trans_style.java:1541 build/trans_style.java:1542
 msgid "pier"
 msgstr "桟橋"
@@ -19928,5 +20116,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1539
+#: build/trans_style.java:1550
 msgid "pipeline"
 msgstr "パイプライン"
@@ -20054,12 +20242,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1622 build/trans_style.java:1630
-#: build/trans_style.java:1638 build/trans_style.java:1646
-#: build/trans_style.java:1654 build/trans_style.java:1662
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: 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:1633 build/trans_style.java:1641
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1689 build/trans_style.java:1697
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753
 msgid "leisure"
 msgstr "レジャー"
@@ -20073,5 +20261,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1670
+#: build/trans_style.java:1681
 msgid "marina"
 msgstr "マリーナ"
@@ -20143,8 +20331,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1752 build/trans_style.java:1760
-#: build/trans_style.java:1768 build/trans_style.java:1776
-#: build/trans_style.java:1784 build/trans_style.java:1792
-#: build/trans_style.java:1800 build/trans_style.java:1808
+#: build/trans_style.java:1763 build/trans_style.java:1771
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
 msgid "amenity"
 msgstr "アメニティ"
@@ -20246,10 +20434,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1816 build/trans_style.java:1824
-#: build/trans_style.java:1832 build/trans_style.java:1840
-#: build/trans_style.java:1848 build/trans_style.java:1856
-#: build/trans_style.java:1864 build/trans_style.java:1872
-#: build/trans_style.java:1880 build/trans_style.java:1887
-#: build/trans_style.java:1896 build/trans_style.java:1904
+#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1898
+#: build/trans_style.java:1907 build/trans_style.java:1915
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -20635,22 +20823,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:2083 build/trans_style.java:2091
-#: build/trans_style.java:2098 build/trans_style.java:2107
-#: build/trans_style.java:2115 build/trans_style.java:2123
-#: build/trans_style.java:2131 build/trans_style.java:2139
-#: build/trans_style.java:2147 build/trans_style.java:2155
-#: build/trans_style.java:2218 build/trans_style.java:2226
-#: build/trans_style.java:2234 build/trans_style.java:2243
-#: build/trans_style.java:2251 build/trans_style.java:2258
-#: build/trans_style.java:2266 build/trans_style.java:2274
-#: build/trans_style.java:2282 build/trans_style.java:2290
-#: build/trans_style.java:2298 build/trans_style.java:2306
-#: build/trans_style.java:2314 build/trans_style.java:2322
-#: build/trans_style.java:2330 build/trans_style.java:2338
-#: build/trans_style.java:2347 build/trans_style.java:2355
+#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:2094 build/trans_style.java:2102
+#: build/trans_style.java:2109 build/trans_style.java:2118
+#: build/trans_style.java:2126 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2229 build/trans_style.java:2237
+#: build/trans_style.java:2245 build/trans_style.java:2254
+#: build/trans_style.java:2262 build/trans_style.java:2269
+#: build/trans_style.java:2277 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2358 build/trans_style.java:2366
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -20682,6 +20870,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:3235
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:3246
 msgid "light_water"
 msgstr "信号_水域"
@@ -20742,8 +20930,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2162 build/trans_style.java:2170
-#: build/trans_style.java:2178 build/trans_style.java:2187
-#: build/trans_style.java:2194 build/trans_style.java:2202
-#: build/trans_style.java:2210
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2189 build/trans_style.java:2198
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:2221
 msgid "health"
 msgstr "健康"
@@ -21096,26 +21284,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2374 build/trans_style.java:2382
-#: build/trans_style.java:2390 build/trans_style.java:2398
-#: build/trans_style.java:2406 build/trans_style.java:2414
-#: build/trans_style.java:2422 build/trans_style.java:2430
-#: 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:2542
-#: build/trans_style.java:2550 build/trans_style.java:2558
-#: build/trans_style.java:2566 build/trans_style.java:2574
-#: build/trans_style.java:2582 build/trans_style.java:2590
-#: build/trans_style.java:2598 build/trans_style.java:2606
-#: build/trans_style.java:2614 build/trans_style.java:2622
-#: build/trans_style.java:2630 build/trans_style.java:2638
-#: build/trans_style.java:2646 build/trans_style.java:2654
-#: build/trans_style.java:2662 build/trans_style.java:2670
-#: build/trans_style.java:2678 build/trans_style.java:2686
-#: build/trans_style.java:2694 build/trans_style.java:2702
-#: build/trans_style.java:2711
+#: build/trans_style.java:2385 build/trans_style.java:2393
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2722
 msgid "shop"
 msgstr "店"
@@ -21187,8 +21375,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: 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:2732 build/trans_style.java:2740
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
 msgid "hotel"
 msgstr "ホテル"
@@ -21338,9 +21526,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: 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:2826 build/trans_style.java:2834
-#: build/trans_style.java:2850 build/trans_style.java:2921
+#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2837 build/trans_style.java:2845
+#: build/trans_style.java:2861 build/trans_style.java:2932
 msgid "tourism"
 msgstr "旅行関係"
@@ -21412,8 +21600,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: 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
-#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
 msgid "historic"
 msgstr "史跡"
@@ -21484,8 +21672,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3068 build/trans_style.java:3076
-#: build/trans_style.java:3174 build/trans_style.java:3182
+#: build/trans_style.java:3007 build/trans_style.java:3015
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3185 build/trans_style.java:3193
 msgid "green"
 msgstr "緑"
@@ -21499,5 +21687,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3028
+#: build/trans_style.java:3039
 msgid "quarry"
 msgstr "石切り場"
@@ -21511,5 +21699,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3047
 msgid "landfill"
 msgstr "埋め立て地"
@@ -21531,5 +21719,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3055 build/trans_style.java:3063
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -21543,5 +21731,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3071
 msgid "forest"
 msgstr "森"
@@ -21555,5 +21743,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3103
 msgid "farmyard"
 msgstr "農地"
@@ -21576,5 +21764,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3101 build/trans_style.java:3109
+#: build/trans_style.java:3112 build/trans_style.java:3120
 msgid "retail"
 msgstr "小売りの商用地"
@@ -21588,5 +21776,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3117
+#: build/trans_style.java:3128
 msgid "industrial"
 msgstr "工業地"
@@ -21600,5 +21788,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3125
+#: build/trans_style.java:3136
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -21612,5 +21800,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3133
+#: build/trans_style.java:3144
 msgid "greenfield"
 msgstr "緑地"
@@ -21624,5 +21812,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3141
+#: build/trans_style.java:3152
 msgid "railland"
 msgstr "鉄道公園"
@@ -21679,7 +21867,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3158 build/trans_style.java:3193
-#: build/trans_style.java:3201 build/trans_style.java:3209
-#: build/trans_style.java:3217 build/trans_style.java:3225
+#: build/trans_style.java:3169 build/trans_style.java:3204
+#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
 msgid "military"
 msgstr "軍用地"
@@ -21693,5 +21881,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3166
+#: build/trans_style.java:3177
 msgid "cemetery"
 msgstr "墓地"
@@ -21704,5 +21892,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3242
+#: build/trans_style.java:3253
 msgid "peak"
 msgstr "山頂"
@@ -21717,5 +21905,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3251
+#: build/trans_style.java:3262
 msgid "glacier"
 msgstr "氷河"
@@ -21729,5 +21917,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3259
+#: build/trans_style.java:3270
 msgid "volcano"
 msgstr "火山"
@@ -21782,8 +21970,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3267 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3292
-#: build/trans_style.java:3365 build/trans_style.java:3373
-#: build/trans_style.java:3381
+#: build/trans_style.java:3278 build/trans_style.java:3279
+#: build/trans_style.java:3287 build/trans_style.java:3303
+#: build/trans_style.java:3376 build/trans_style.java:3384
+#: build/trans_style.java:3392
 msgid "natural"
 msgstr "自然"
@@ -21797,5 +21985,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3284
+#: build/trans_style.java:3295
 msgid "scrub"
 msgstr "低木"
@@ -21809,5 +21997,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3300
+#: build/trans_style.java:3311
 msgid "heath"
 msgstr "荒地"
@@ -21821,5 +22009,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3308
+#: build/trans_style.java:3319
 msgid "wood"
 msgstr "森"
@@ -21833,5 +22021,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3349
+#: build/trans_style.java:3360
 msgid "mud"
 msgstr "泥"
@@ -21845,5 +22033,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3357
+#: build/trans_style.java:3368
 msgid "beach"
 msgstr "砂浜"
@@ -21921,8 +22109,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3397 build/trans_style.java:3405
-#: build/trans_style.java:3413 build/trans_style.java:3421
-#: build/trans_style.java:3429 build/trans_style.java:3437
-#: build/trans_style.java:3445 build/trans_style.java:3453
+#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
 msgid "route"
 msgstr "ルート"
@@ -21970,7 +22158,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3463 build/trans_style.java:3471
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495
+#: build/trans_style.java:3474 build/trans_style.java:3482
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506
 msgid "boundary"
 msgstr "行政区境"
@@ -22112,10 +22300,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3919 build/trans_style.java:3927
-#: build/trans_style.java:3935 build/trans_style.java:3943
-#: build/trans_style.java:3951 build/trans_style.java:3959
-#: build/trans_style.java:3967 build/trans_style.java:3975
-#: build/trans_style.java:3983 build/trans_style.java:3991
-#: build/trans_style.java:3999 build/trans_style.java:4007
+#: 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
 msgid "place"
 msgstr "場所"
@@ -22163,6 +22351,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4124 build/trans_style.java:4131
-#: build/trans_style.java:4138 build/trans_style.java:4145
+#: build/trans_style.java:4135 build/trans_style.java:4142
+#: build/trans_style.java:4149 build/trans_style.java:4156
 msgid "address"
 msgstr "住所"
@@ -22393,10 +22581,10 @@
 msgstr "ランドサット"
 
-#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
 msgstr "オープンエアリアルマップ"
 
-#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
 #. fails with division by zero error
 #: build/trans_wms.java:8
@@ -22404,5 +22592,5 @@
 msgstr "NPEマップ"
 
-#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:9
 msgid "NPE Maps (Tim)"
@@ -22410,62 +22598,136 @@
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#. different forms for Yahoo
-#. must be yahoo://<commandline>
-#. The {0} in the commandline is for the URL
-#. output must be on stdout
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:13
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
-msgid "YAHOO (GNOME)"
-msgstr "YAHOO (GNOME)"
-
-#. yahoo://gnome-web-photo --mode=photo --format=png {0} /dev/stdout
+#, fuzzy
+msgid "OpenStreetMap"
+msgstr "OpenStreetMapデータ"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
-msgid "YAHOO (GNOME Fix)"
-msgstr "米Yahoo (GNOME Fix)"
-
-#. yahoo://gnome-web-photo-fixed {0}
+#, fuzzy
+msgid "OpenCycleMap"
+msgstr "自転車道"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
-msgid "YAHOO (WebKit)"
-msgstr "YAHOO (WebKit)"
-
-#. yahoo://webkit-image {0}
-#: build/trans_wms.java:17
-msgid "YAHOO (WebKit GTK)"
-msgstr "米Yahoo (WebKit GTK)"
-
-#. yahoo://webkit-image-gtk {0}
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
 #. only for Germany
-#: build/trans_wms.java:19
-msgid "Oberpfalz Geofabrik.de"
-msgstr "Oberpfalz Geofabrik.de"
-
-#. http://oberpfalz.geofabrik.de/wms4josm?
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
 msgstr "Streets NRW Geofabrik.de"
 
-#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
-#. Terraserver USCG- High resolution maps
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#. Terraserver USCG - High resolution maps
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
 msgstr ""
 
-#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
 msgstr ""
 
+#~ msgid "Data Layer"
+#~ msgstr "データレイヤー"
+
+#~ msgid "Change"
+#~ msgstr "更新"
+
+#~ msgid "Rotate"
+#~ msgstr "回転"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 46.1° and 57° only.\n"
+#~ "Use another projection system if you are not using\n"
+#~ "a French WMS server.\n"
+#~ "Do not upload any data after this message."
 #~ msgstr ""
-#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ"
-#~ "ロードされた要素だけに遍歴があります。"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。"
+#~ "投影法\"{0}\"は、緯度が46.1°から57°の\n"
+#~ "間で使われるように設計されています。\n"
+#~ "フランスのWMSサーバをつかうのではなければ、\n"
+#~ "ほかの投影法を使用してください。\n"
+#~ "本メッセージ後は、データのアップロードはやめてください。"
+
+#~ msgid ""
+#~ "The projection \"{0}\" is designed for\n"
+#~ "latitudes between 45.7° and 47.9°\n"
+#~ "and longitutes between 5.7° and 10.6° only.\n"
+#~ "Use another projection system if you are not working\n"
+#~ "on a data set of Switzerland or Liechtenstein.\n"
+#~ "Do not upload any data after this message."
+#~ msgstr ""
+#~ "投影法 \"{0}\" は、\n"
+#~ "緯度 45.7°から 47.9°で\n"
+#~ "経度  5.7°から 10.6°まで用です。\n"
+#~ "スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n"
+#~ "違う投影系を使ってください。\n"
+#~ "このメッセージ以降のデータはアップロードしないでください。"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "競合: {0}"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "事前に設定した情報源をタグ付け"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し"
+#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "新しいタグプリセット源をリストに追加する。"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "事前設定の情報源をタグ付け"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "TCXファイルをインポート"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "TCXファイルをTCXファイルとしてインポート"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "直接JOSMからのTCXファイルをロードしてください。"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "米Yahoo (GNOME Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "米Yahoo (WebKit GTK)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
 
 #~ msgid "Uploading data"
 #~ msgstr "アップロードするデータ"
 
+#~ msgid "Not implemented yet."
+#~ msgstr "まだ実装されていません。"
+
 #~ msgid "Email"
 #~ msgstr "Email"
@@ -22473,4 +22735,7 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "競合の解決"
+
+#~ msgid "Object"
+#~ msgstr "オブジェクト"
 
 #~ msgid "{0} object has conflicts:"
@@ -22510,4 +22775,20 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{1}個のオブジェクト中の{0}個の競合を解決"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "リストを更新するために再読込のクリック"
+
+#~ msgid "Revert"
+#~ msgstr "取り消す"
+
+#~ msgid "Date"
+#~ msgstr "日付"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン"
+#~ "へと戻します。"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -22628,4 +22909,11 @@
 
 #~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ"
+#~ "ロードされた要素だけに遍歴があります。"
+
+#~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
@@ -22672,2 +22960,5 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "不明な理由でデータのアップロードに失敗しました。"
+
+#~ msgid "Image with path {0} does not exist or is not readable."
+#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。"
