Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 14252)
+++ applications/editors/josm/i18n/po/ja.po	(revision 14372)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-24 16:37+0100\n"
-"PO-Revision-Date: 2009-03-24 08:38+0000\n"
-"Last-Translator: Ikiya <Unknown>\n"
+"POT-Creation-Date: 2009-03-31 16:58+0200\n"
+"PO-Revision-Date: 2009-03-27 20:55+0000\n"
+"Last-Translator: MAPconcierge <taichi@mapconcierge.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-03-24 15:24+0000\n"
+"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26,5 +26,5 @@
 #. FIXME why is help not a JosmAction?
 #: ../core/src/org/openstreetmap/josm/Main.java:195
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296
@@ -80,5 +80,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
@@ -93,6 +93,7 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
 msgid "Cancel"
@@ -209,9 +210,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -272,4 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -280,5 +282,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
@@ -405,6 +407,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
 msgid "Enter values for all conflicts."
 msgstr "すべての競合に値を入力してください。"
@@ -412,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
@@ -433,14 +435,14 @@
 "ん）"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
 msgid "Copy"
 msgstr "コピー"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
 msgid "Copy selected objects to paste buffer."
 msgstr "選択したオブジェクトをペースト用バッファにコピーします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:133
 msgid "Please select something to copy."
 msgstr "コピーするものを選択してください。"
@@ -477,4 +479,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
 #: ../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:216
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:538
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
@@ -667,11 +671,11 @@
 msgstr "JOSMオンラインヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
 msgid "Open in Browser"
 msgstr "ブラウザで開く"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:145
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
@@ -680,10 +684,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../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
 msgid "Edit"
 msgstr "編集"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
+#: ../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/gui/dialogs/SelectionListDialog.java:134
@@ -692,19 +698,20 @@
 msgstr "再読込"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "JOSMオンラインヘルプからのページのみ編集できます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:189
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "ページ{0}を読み込む際にエラーが発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:207
 #, java-format
 msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:210
+"ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
 #, java-format
 msgid ""
@@ -712,4 +719,6 @@
 "\">your language</A>."
 msgstr ""
+"ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">あ"
+"なたの母国語</A>でそれを作成してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:25
@@ -980,11 +989,11 @@
 msgstr "貼り付けバッファの内容を貼り付け"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:80
 msgid "Paste Tags"
 msgstr "タグの貼り付け"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1242,5 +1251,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
 msgid "Draw lines between raw gps points."
 msgstr "元gpsポイント間に線を描画"
@@ -1607,29 +1615,29 @@
 msgstr "選択済の"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:335
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336
 msgid "Cannot add a node outside of the world."
 msgstr "世界の外にノードを追加できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
 msgid "Add node"
 msgstr "ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:491
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
 msgid "Add node into way"
 msgstr "ノードでウェイに追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:496
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Connect existing way to node"
 msgstr "既存のウェイをノードとつなぎます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:498
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
 msgid "Add a new node to an existing way"
 msgstr "既存のウェイに新しいノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
 msgid "Add node into way and connect"
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:879
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
 msgid "Create new node."
 msgstr "新規ノードの作成"
@@ -1637,6 +1645,6 @@
 #. We already know oldHighlights is not empty, but shift is pressed.
 #. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:883
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:891
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
 msgid "Insert new node into way."
@@ -1644,14 +1652,14 @@
 msgstr[0] "新規ノードを {0}このウエイに追加します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:889
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
 msgid "Select node under cursor."
 msgstr "カーソルの下のノードを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:900
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Start new way from last node."
 msgstr "新規ウエイを最後に操作したノードから開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903
 msgid "Continue way from last node."
 msgstr "最後に操作したノードからウエイを継続"
@@ -1665,5 +1673,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
 msgid "Extrude"
-msgstr ""
+msgstr "押し出し"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
@@ -1678,9 +1686,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr ""
+msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr ""
+msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
@@ -1715,6 +1723,5 @@
 msgid "Add and move a virtual new node to way"
 msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
@@ -1743,4 +1750,6 @@
 "move zoom with right button"
 msgstr ""
+"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら"
+"移動; 右ドラッグによるズーム"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
@@ -1788,8 +1797,10 @@
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
+"<b>ベイカー・ストリート</b> - どんなキーや名前の 'ベイカー' と 'ストリート'。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
+"<b>\"ベイカー・ストリート\"</b> - どんなキーや名前の 'ベイカー・ストリート'。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
@@ -1853,5 +1864,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr ""
+msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
@@ -1885,10 +1896,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid "CS"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "CI"
 msgstr "CI"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid "CS"
-msgstr "CS"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
@@ -1946,4 +1957,6 @@
 #: ../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:273
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:61
@@ -2330,13 +2343,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
-msgstr ""
+msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr ""
+msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr ""
+msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
@@ -2358,5 +2371,5 @@
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
-msgstr ""
+msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
@@ -2373,5 +2386,5 @@
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr ""
+msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
@@ -2484,4 +2497,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:95
+#: ../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
 msgid "Key"
 msgstr "キー"
@@ -2493,4 +2508,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
 msgid "Value"
 msgstr "値"
@@ -2521,5 +2539,5 @@
 #, java-format
 msgid "- running version is {0}"
-msgstr ""
+msgstr "- 起動中のバージョンは {0} です。"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
@@ -2645,5 +2663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Launch in maximized mode"
-msgstr ""
+msgstr "最大モードで起動"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
@@ -2698,4 +2716,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
 msgid "Presets"
 msgstr "プリセット"
@@ -2726,5 +2745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
 msgid "Toggle Full Screen view"
-msgstr ""
+msgstr "フルスクリーン表示のトグル"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283
@@ -2858,4 +2877,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3181,4 +3201,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:65
 msgid "Remove"
 msgstr "削除"
@@ -3611,5 +3632,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:436
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:245
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
 msgid "JPEG images (*.jpg)"
@@ -3647,5 +3668,5 @@
 msgstr "入力した時刻は、解釈できません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:109
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217
@@ -3653,30 +3674,30 @@
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
 msgid "Draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 msgid "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
@@ -3684,13 +3705,14 @@
 msgstr "配色のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
@@ -3699,5 +3721,5 @@
 msgstr "既定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -3706,31 +3728,31 @@
 msgstr "色選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} からの名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Import Audio"
 msgstr "音声のインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202
 msgid "Wave Audio files (*.wav)"
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302
 #, java-format
 msgid "{0} track, "
@@ -3738,5 +3760,5 @@
 msgstr[0] "{0} トラック "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
 #, java-format
 msgid "{0} route, "
@@ -3744,5 +3766,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
 #, java-format
 msgid "{0} waypoint"
@@ -3750,28 +3772,28 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308
 #, java-format
 msgid "Name: {0}"
 msgstr "名前: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
 #, java-format
 msgid "Description: {0}"
 msgstr "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:328
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
 msgid "Timespan: "
 msgstr "Timespan: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:342
 msgid "Length: "
 msgstr "長さ: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:653
 #: ../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:650
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 msgid ""
@@ -3783,10 +3805,10 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:658
 #: ../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:671
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
@@ -3797,29 +3819,29 @@
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:803
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:701
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:697
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
 #, java-format
 msgid ""
@@ -3830,9 +3852,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:873
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1013
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -3840,5 +3862,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1024
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -4021,4 +4043,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
 #: ../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:85
@@ -4028,4 +4051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156
 #: ../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."
@@ -4033,4 +4057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:159
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
 #, java-format
 msgid "New value for {0}"
@@ -4043,5 +4068,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:30
 msgid "Label audio (and image and web) markers."
-msgstr ""
+msgstr "音声 (画像やウェブ) マーカーにラベルをつける"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:31
@@ -4068,5 +4093,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Modified times (time stamps) of audio files."
-msgstr ""
+msgstr "音声ファイルの修正時刻(タイムスタンプ)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
@@ -4126,4 +4151,6 @@
 "modified time of each audio WAV file imported."
 msgstr ""
+"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
+"ラックの位置にオーディオマーカーを作成してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:150
@@ -5049,21 +5076,38 @@
 msgstr "色"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../plugins/terracer/src/terracer/TerracerAction.java:422
+#: ../plugins/terracer/src/terracer/TerracerAction.java:440
+#: ../plugins/terracer/src/terracer/TerracerAction.java:504
+msgid "All"
+msgstr "全て"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+#, fuzzy
+msgid "Local files"
+msgstr "全てのタイルをロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#, fuzzy
+msgid "None"
+msgstr "Zone"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率(赤=高い、緑=低い, 可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -5071,5 +5115,5 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:1353
 msgid "Car"
@@ -5091,5 +5135,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
 #: build/trans_presets.java:836 build/trans_presets.java:845
@@ -5130,5 +5174,5 @@
 #. item "Barriers/Entrance" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
 #: build/trans_presets.java:835 build/trans_presets.java:844
@@ -5142,78 +5186,76 @@
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw Direction Arrows"
 msgstr "進行方向を矢印表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 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:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw inactive layers in other color"
 msgstr "不活性のレイヤーを他色で描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチアライアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
-msgid ""
-"If your gps device draws too few lines, select this to draw lines along your "
-"way."
-msgstr ""
-"これを選択すると、gpsデバイスが線を引かない場合、ウェイに沿って線を描画する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
+#, fuzzy
+msgid "Draw lines between raw GPS points"
+msgstr "元gpsポイント間に線を描画"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
 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:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決めて描画する。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -5221,13 +5263,13 @@
 msgstr "少なくともこの距離を超える移動がなかった場合には、矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:132
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -5237,9 +5279,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:160
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -5249,46 +5291,46 @@
 "う。使用しているGPS機器がこの情報を記録している必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:166
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:215
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:230
 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:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:235
 msgid "Draw the inactive data layers in a different color."
 msgstr "異なった色で、不活性になっているデータレイヤーを描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "OSM Data"
 msgstr "OSMデータ"
@@ -5734,4 +5776,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:558
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -6041,5 +6086,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
 msgid "Keep plugin"
-msgstr ""
+msgstr "プラグインを継続"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -6300,4 +6345,28 @@
 msgstr "(ヒント:設定でショートカットキーを選べます。)"
 
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#, fuzzy
+msgid "Create grid of ways"
+msgstr "エリアの作成"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+msgid ""
+"Forms a grid of ways in base to two existing that have various nodes and one "
+"in common"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
+msgid "Select two ways with a node in common"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
+msgid "Select two ways with alone a node in common"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
+#, fuzzy
+msgid "Create a grid of ways"
+msgstr "エリアの作成"
+
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
 msgid "Upload Trace"
@@ -6329,4 +6398,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229
 msgid "Tags"
 msgstr "タグ"
@@ -6359,10 +6429,10 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263
 msgid "Upload failed. Server returned the following message: "
-msgstr ""
+msgstr "アップロードに失敗しました。サーバは以下のメッセージを返しました： "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr ""
+msgstr "GPSトラックをアップロード中：{0}% ({1} of {2})"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:337
@@ -6389,5 +6459,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 msgid "Uploads traces to openstreetmap.org"
-msgstr ""
+msgstr "openstreetmap.org へトレースをアップロード"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -6449,5 +6519,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
 msgid "One of the selected files was null !!!"
-msgstr ""
+msgstr "選択したファイルはのひとつは null でした !!!"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
@@ -6482,5 +6552,5 @@
 #, java-format
 msgid "{0} were found to be gps tagged."
-msgstr ""
+msgstr "{0} は gps タグがつけられていることがわかりました。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
@@ -6491,5 +6561,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
 msgid "Load set of images as a new layer."
-msgstr ""
+msgstr "新規レイヤとして画像セットを読み込む."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
@@ -6603,5 +6673,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Auto-Guess"
-msgstr ""
+msgstr "自動推測"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569
@@ -6652,5 +6722,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676
 msgid "Photos don't contain time information"
-msgstr ""
+msgstr "写真は時間情報を含んでいません。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
@@ -6658,8 +6728,10 @@
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
+"選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択"
+"してください。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
 msgid "GPX Track has no time information"
-msgstr ""
+msgstr "GPXトラックは、時間情報を持っていません。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
@@ -6671,10 +6743,10 @@
 #, java-format
 msgid "Minutes: {0}"
-msgstr ""
+msgstr "分: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761
 #, java-format
 msgid "Seconds: {0}"
-msgstr ""
+msgstr "秒: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
@@ -6698,4 +6770,6 @@
 "adjust the sliders to manually match the photos."
 msgstr ""
+"GPXトラックに写真を合わせようとしているときにエラーが起きました。スライダーを"
+"調整して、手動で写真に合わせることができます。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
@@ -6705,5 +6779,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid "Adjust timezone and offset"
-msgstr ""
+msgstr "タイムゾーンとオフセットを調整してください。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
@@ -6711,15 +6785,15 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:428
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
 msgid "No image"
 msgstr "画像なし"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:438
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443
 #, java-format
 msgid "Loading {0}"
 msgstr "{0} 読み込み中です"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:440
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:467
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:445
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:472
 #, java-format
 msgid "Error on file {0}"
@@ -6783,10 +6857,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163
 msgid "Invalid projection"
-msgstr ""
+msgstr "投影法が無効"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164
 #, java-format
 msgid "Change the projection to {0} first."
-msgstr ""
+msgstr "最初に投影法を {0} に変えてください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168
@@ -6795,4 +6869,6 @@
 "the JOSM projection to Lambert and restart"
 msgstr ""
+"土地台帳WMSプラグインを可能にするために、JOSMの座標系をランバート投影法に変え"
+"て、再起動してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
@@ -6802,5 +6878,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
 msgid "Reverse grey colors (for black backgrounds)."
-msgstr ""
+msgstr "グレーカラーの反転 (黒い背景用)."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
@@ -6854,8 +6930,9 @@
 "Useful for texts on dark backgrounds."
 msgstr ""
+"元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
 msgid "Allows multiple layers stacking"
-msgstr ""
+msgstr "複数レイヤの重ね合わせを許可します。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
@@ -6875,13 +6952,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125
 msgid "Grab smaller images (higher quality but use more memory)"
-msgstr ""
+msgstr "より小さい画像を指定してください。(より高品質だがメモリ)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
 msgid "Fixed size square (default is 100m)"
-msgstr ""
+msgstr "固定サイズ正方形（初期値は100メートル）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Fixed size (from 25 to 1000 meters)"
-msgstr ""
+msgstr "固定サイズ（25～1000メートル）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
@@ -6891,5 +6968,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
 msgid "Auto-tag source added:"
-msgstr ""
+msgstr "自動タグのソースを追加しました。:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
@@ -6931,5 +7008,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
 msgid "Extract best fitting boundary..."
-msgstr ""
+msgstr "境界に最もフィットする抽出..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
@@ -6974,5 +7051,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
 msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgstr "キャッシュから位置を読み込む(もしキャッシュが可能な場合)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
@@ -6982,5 +7059,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
-msgstr ""
+msgstr "次のリクエスト用に、新規の位置をセットしてください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
@@ -7012,5 +7089,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Get a new cookie (session timeout)"
-msgstr ""
+msgstr "新しい cookie を入手してください(セッションがタイムアウトしました)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
@@ -7041,4 +7118,6 @@
 "Select one of them first, then retry"
 msgstr ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81
@@ -7064,5 +7143,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is vectorized."
-msgstr ""
+msgstr "ベクタライズされました。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
@@ -7085,5 +7164,5 @@
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
+msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323
@@ -7156,5 +7235,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
 msgid "Can't duplicate unordered way."
-msgstr ""
+msgstr "順不同の道をコピーできません。"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
@@ -7168,17 +7247,17 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
 msgid "Layer for editing GPX tracks"
-msgstr ""
+msgstr "GPSトラックを編集するためのレイヤーです。"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:217
 msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "匿名時間も含めたGPXレイヤへのコンバート"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
 msgid "edit gpx tracks"
-msgstr ""
+msgstr "gpxトラックを編集してください。"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
 msgid "EditGpx"
-msgstr ""
+msgstr "Gpx編集"
 
 #. TODO what is icon at the end?
@@ -7213,5 +7292,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
 msgid "Position, Time, Date, Speed, Altitude"
-msgstr ""
+msgstr "位置, 時刻, 年月日, 速度, 高さ"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
@@ -7357,5 +7436,5 @@
 #: ../plugins/grid/src/grid/GridPlugin.java:27
 msgid "Add grid"
-msgstr ""
+msgstr "グリッドの追加"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -7406,5 +7485,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "ジオタグのない写真を表示"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
@@ -7426,5 +7505,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108
 msgid "The starting location was not within the bbox"
-msgstr ""
+msgstr "bboxの中に、開始位置がありませんでした。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
@@ -7590,5 +7669,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum gray value to count as water (0-255)"
-msgstr ""
+msgstr "水域として判断したグレーの最大閾値(0-255)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
@@ -7661,5 +7740,5 @@
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
-msgstr ""
+msgstr "ピクセル/度 単位のランドサットタイルの解像度。デフォルトは 4000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
@@ -7701,5 +7780,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr ""
+msgstr "ランドサット画像上での水域トレース用プラグイン"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
@@ -7809,5 +7888,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:75
 msgid "Reset current measurement results and delete measurement path."
-msgstr ""
+msgstr "現在の測定結果をリセットして、測定経路を削除してください。"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:81
@@ -7846,25 +7925,4 @@
 msgid "Measurements"
 msgstr "測定"
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
-msgid "Navigate"
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Navigator"
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
-msgid "Set start/end for routing. Middle mouse button to reset."
-msgstr ""
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:41
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:45
-msgid "Navigation"
-msgstr "ナビゲーション"
-
-#: ../plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:48
-msgid "Reset Graph"
-msgstr "グラフリセット"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -7893,5 +7951,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
-msgstr ""
+msgstr "新しいバグを作成できませんでした。結果： {0}"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
@@ -8050,4 +8108,102 @@
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
+"リモートコントロールは以下のURLからデータをインポートするように確認されまし"
+"た。:"
+
+#. Add routing layer
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
+msgid "Navigation"
+msgstr "ナビゲーション"
+
+#. TODO Use constructor with shortcut
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#, fuzzy
+msgid "Routing"
+msgstr "何もしない"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+#, fuzzy
+msgid "Click to add route nodes."
+msgstr "クリックして新規ノードを挿入します。"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+#, fuzzy
+msgid "Click and drag to move route nodes."
+msgstr "クリックして新規ノードを挿入します。"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+#, fuzzy
+msgid "Remove route nodes"
+msgstr "重複したノードの削除中…"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
+#, fuzzy
+msgid "Open a list of routing nodes"
+msgstr "全てのリレーションのリストを開く"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
+#, fuzzy
+msgid "Start routing"
+msgstr "駅"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
+#, fuzzy
+msgid "Criteria"
+msgstr "中級"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
+#, fuzzy
+msgid "Shortest"
+msgstr "靴店"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
+#, fuzzy
+msgid "Fastest"
+msgstr "もっと速く"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
+#, fuzzy
+msgid "Reverse route"
+msgstr "テラスを反転"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
+#, fuzzy
+msgid "Clear route"
+msgstr "フェリー航路"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#, fuzzy
+msgid "Routing Plugin Preferences"
+msgstr "WMSプラグイン設定"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#, fuzzy
+msgid "Configure routing preferences."
+msgstr "プラグインサイトを設定"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#, fuzzy
+msgid "Highway type"
+msgstr "道路の出口"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#, fuzzy
+msgid "Speed (Km/h)"
+msgstr "最高速度（km/h）"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#, fuzzy
+msgid "Weight"
+msgstr "高さ"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+msgid "Enter weight values"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
@@ -8085,18 +8241,18 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
 msgid "autozoom"
-msgstr ""
+msgstr "自動ズーム"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
 msgid "autoload tiles"
-msgstr ""
+msgstr "タイルの自動読み込み"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "SlippyMap"
-msgstr ""
+msgstr "スリッピーマップ"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "Settings for the SlippyMap plugin."
-msgstr ""
+msgstr "スリッピマップ プラグイン用設定"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
@@ -8106,17 +8262,17 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
 msgid "Auto zoom: "
-msgstr ""
+msgstr "自動ズーム: "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Autoload Tiles: "
-msgstr ""
+msgstr "タイルの自動読み込み "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
-msgstr ""
+msgstr "最大ズーム lvl: "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
 msgid "Fade background: "
-msgstr ""
+msgstr "Fade background: "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
@@ -8155,5 +8311,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr ""
+msgstr "ボタン '{0}' ホットキーの複製  - ボタンは無視されます!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
@@ -8164,5 +8320,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr ""
+msgstr "調査者..."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -8173,5 +8329,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
-msgstr ""
+msgstr "調査者"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
@@ -8193,4 +8349,74 @@
 msgid "end"
 msgstr "終了"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
+#, fuzzy
+msgid "Edit tags"
+msgstr "州(state)の編集"
+
+#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:63
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
+msgid "Launches the tag editor dialog"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+msgid "JOSM Tag Editor Plugin"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
+#, fuzzy
+msgid "(none)"
+msgstr "なし"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
+#, fuzzy
+msgid "Highlight"
+msgstr "ハイライト"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
+#, fuzzy
+msgid "<multiple>"
+msgstr "多目的"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
+#, fuzzy, java-format
+msgid "Remove old keys from up to {0} object"
+msgid_plural "Remove old keys from up to {0} objects"
+msgstr[0] "{0}このオブジェクトのプロパティーの変更"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
+#, fuzzy, java-format
+msgid "Updating properties of up to {0} object"
+msgid_plural "Updating properties of up to {0} objects"
+msgstr[0] "{0}このオブジェクトのプロパティーの変更"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
+#, fuzzy
+msgid "Group"
+msgstr "ルート"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
+#, fuzzy
+msgid "Item"
+msgstr "小川"
+
+#: ../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
+#, fuzzy
+msgid "Search: "
+msgstr "検索"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+#, fuzzy
+msgid "Filter"
+msgstr "ファイル"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
+#, fuzzy
+msgid "Clear"
+msgstr "自動車"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8232,10 +8458,10 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
 msgid "Reverse Terrace"
-msgstr ""
+msgstr "テラスを反転"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
 msgid "Terrace a building"
-msgstr ""
+msgstr "建物のテラス"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
@@ -8251,18 +8477,12 @@
 msgstr "テラスハウス"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:422
-#: ../plugins/terracer/src/terracer/TerracerAction.java:440
-#: ../plugins/terracer/src/terracer/TerracerAction.java:504
-msgid "All"
-msgstr "全て"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:423
 #: ../plugins/terracer/src/terracer/TerracerAction.java:447
 msgid "Even"
-msgstr ""
+msgstr "偶数"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:424
 msgid "Odd"
-msgstr ""
+msgstr "奇数"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
@@ -8286,5 +8506,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
 msgid "Optional"
-msgstr ""
+msgstr "オプション"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
@@ -8311,5 +8531,5 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
 msgid "Replaces Selection with Users data"
-msgstr ""
+msgstr "ユーザデータを選択したものに置き替えます。"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148
@@ -8319,36 +8539,36 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152
 msgid "Please choose a user using the author panel"
-msgstr ""
+msgstr "著作者パネルを使用してユーザを選んでください。"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165
 msgid "Sorry, doesn't work with anonymous users"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
+msgstr "申し訳ありません。匿名のユーザでは利用できません。"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
 msgid "Join overlapping Areas"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:113
+msgstr "オーバーラップ領域を接続する。"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
 msgid "Joins areas that overlap each other"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
+msgstr "お互いのオーバラップ範囲を接続する。"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
 msgid "Continue anyway"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:147
+msgstr "とりあえず続ける"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
 msgid "Only up to two areas can be joined at the moment."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:169
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
 msgid ""
@@ -8358,18 +8578,41 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
 msgid "Please abort if you are not sure"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:186
+msgstr "確信していないならば、中止して下さい。"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
 msgid "Please select at least one closed way the should be joined."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:194
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
 msgid "No intersections found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
+msgid "Added node on all intersections"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
+msgid "Delete Ways that are not part of an inner multipolygon"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
+#, fuzzy
+msgid "Fix relations"
+msgstr "関連"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
+#, fuzzy
+msgid "Joined self-overlapping area"
+msgstr "オーバーラップ領域を接続する。"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
+#, fuzzy
+msgid "Joined overlapping areas"
+msgstr "オーバーラップ領域を接続する。"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -8377,4 +8620,33 @@
 msgstr ""
 
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
+#, fuzzy
+msgid "Fix tag conflicts"
+msgstr "競合点の統合"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
+#, fuzzy
+msgid "Removed Element from Relations"
+msgstr "関連から削除"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
+msgid "Join Areas: Remove Short Ways"
+msgstr ""
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
+#, fuzzy
+msgid "Closed Way"
+msgstr "閉じていないウェイ"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
+#, fuzzy
+msgid "Remove tags from inner ways"
+msgstr "レイヤーから写真を削除しますか？"
+
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
+#, fuzzy
+msgid "Join Areas Function"
+msgstr "高速道路のジャンクション"
+
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
 msgid "Jump To Position"
@@ -8412,4 +8684,5 @@
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
+"緯度、経度、ズームを解析することができませんでした。確認をしてください。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
@@ -8423,5 +8696,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
 msgid "Delete unnecessary nodes from a way."
-msgstr ""
+msgstr "ウエイから不要なノードを削除してください。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
@@ -8484,5 +8757,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "Show informational level on upload."
-msgstr ""
+msgstr "アップロードの情報レベルを示してください。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
@@ -8594,5 +8867,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193
 msgid "Ignore whole group or individual elements?"
-msgstr ""
+msgstr "全体のグループか個々の要素を無視しますか?"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194
@@ -8677,13 +8950,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
 msgid "Overlapping highways (with area)"
-msgstr ""
+msgstr "高速道路の重なり(エリアも含む)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
 msgid "Overlapping railways (with area)"
-msgstr ""
+msgstr "鉄道の重なり(エリアも含む)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
 msgid "Overlapping ways (with area)"
-msgstr ""
+msgstr "ウェイの重なり(エリアも含む)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
@@ -8784,18 +9057,18 @@
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr ""
+msgstr "キー ''{0}'' はプリセットにはありません。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Presets do not contain property key"
-msgstr ""
+msgstr "プリセットはプロパティキーを含みません。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
+msgstr "値 ''{0}'' キー ''{1}'' はプリセットにはありません。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
 msgid "Presets do not contain property value"
-msgstr ""
+msgstr "プリセットは属性値を含みません。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
@@ -9204,5 +9477,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
 msgid "Adjust the position of the selected WMS layer"
-msgstr ""
+msgstr "選択されたWMSレイヤーの位置を調整してください。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
@@ -9246,5 +9519,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
 msgid "Alpha channel"
-msgstr ""
+msgstr "アルファチャンネル"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:132
@@ -9345,6 +9618,12 @@
 msgstr ""
 
+#. Plugin Create_grid_of_ways
+#: build/trans_plugins.java:9
+#, fuzzy
+msgid "Create a grid of ways."
+msgstr "エリアの作成"
+
 #. Plugin DirectUpload
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -9353,10 +9632,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid ""
 "The main feature of the plugin is the possibility to delete points of the "
@@ -9366,15 +9645,15 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Provide a background layer that displays a map grid"
-msgstr ""
+msgstr "地図グリッドを表示する背景レイヤーを提供します。"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -9384,10 +9663,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -9395,14 +9674,9 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
 "segments, area surrounded by a (simple) closed way and create measurement "
 "paths (which also can be imported from a gps layer)."
-msgstr ""
-
-#. Plugin navigator
-#: build/trans_plugins.java:27
-msgid "Provides navigation/autorouting functionality"
 msgstr ""
 
@@ -9447,6 +9721,11 @@
 msgstr ""
 
+#. Plugin routing
+#: build/trans_plugins.java:43
+msgid "Provides routing capabilities."
+msgstr ""
+
 #. Plugin slippymap
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9455,10 +9734,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
+#. Plugin tageditor
+#: build/trans_plugins.java:49
+msgid "Provides a dialog for editing tags in a tabular grid."
+msgstr ""
+
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:51
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9468,15 +9752,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:53
 msgid "Directly load TCX files from JOSM."
-msgstr ""
+msgstr "直接JOSMからのTCXファイルをロードしてください。"
 
 #. Plugin terracer
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:55
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:57
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9485,5 +9769,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:59
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9492,5 +9776,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:61
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9499,5 +9783,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:63
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10965,5 +11249,5 @@
 #. <condition k="highway" v="construction"/>
 #. color railland
-#. <icon src="transport/railway.png"/>
+#. <icon src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13110,10 +13394,10 @@
 #: build/trans_presets.java:1677
 msgid "Guidepost (Hiking)"
-msgstr ""
+msgstr "ガイドポスト(ハイキング)"
 
 #. item "Tourism/Map" text "Name"
 #: build/trans_presets.java:1686
 msgid "Map Type"
-msgstr ""
+msgstr "マップタイプ"
 
 #. item "Tourism/Map" combo "Map Type"
@@ -15026,5 +15310,5 @@
 #: build/trans_presets.java:2263
 msgid "coal"
-msgstr ""
+msgstr "石炭"
 
 #: build/trans_presets.java:2263
@@ -15361,5 +15645,5 @@
 #: build/trans_presets.java:2396
 msgid "public_transport_tickets"
-msgstr ""
+msgstr "公共_交通_チケット"
 
 #: build/trans_presets.java:2396
@@ -16013,5 +16297,5 @@
 #: build/trans_presets.java:2721
 msgid "Political"
-msgstr ""
+msgstr "地点名"
 
 #. item
@@ -16647,5 +16931,5 @@
 #: build/trans_presets.java:2981
 msgid "tram"
-msgstr ""
+msgstr "トラム"
 
 #: build/trans_presets.java:2981
@@ -16668,5 +16952,5 @@
 #: build/trans_presets.java:2984
 msgid "Symbol description"
-msgstr ""
+msgstr "シンボルの説明"
 
 #. item "Relations/Route" text "Description"
@@ -16674,5 +16958,5 @@
 #: build/trans_presets.java:2987
 msgid "Network"
-msgstr ""
+msgstr "ネットワーク"
 
 #. item "Relations/Route" combo "State"
@@ -16687,13 +16971,13 @@
 #: build/trans_presets.java:2989
 msgid "temporary"
-msgstr ""
+msgstr "一時的"
 
 #: build/trans_presets.java:2989
 msgid "connection"
-msgstr ""
+msgstr "接続"
 
 #: build/trans_presets.java:2990
 msgid "Color (hex)"
-msgstr ""
+msgstr "色 (16進法)"
 
 #. item "Relations/Route" text "Color (hex)"
@@ -16702,10 +16986,10 @@
 #: build/trans_presets.java:2993
 msgid "route segment"
-msgstr ""
+msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
 #: build/trans_presets.java:2994
 msgid "forward segment"
-msgstr ""
+msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
@@ -17588,5 +17872,5 @@
 #. <condition k="railway" v="station"/>
 #. color railwaypoint
-#. <icon annotate="true" src="transport/railway.png"/>
+#. <icon annotate="true" src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17603,5 +17887,5 @@
 #. <condition k="railway" v="tram_station"/>
 #. color railwaypoint
-#. <icon annotate="true" src="transport/railway.png"/>
+#. <icon annotate="true" src="transport/railway_station.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18302,5 +18586,5 @@
 #: build/trans_style.java:1719
 msgid "amenity_traffic"
-msgstr ""
+msgstr "アメニティ_交通"
 
 #. color amenity_traffic
@@ -18375,5 +18659,5 @@
 #. <rule>
 #. <condition k="religion" v="bahai"/>
-#. <icon annotate="true" src="religion/church/bahai.png"/>
+#. <icon annotate="true" src="religion/bahai.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18382,5 +18666,5 @@
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
-#. <icon annotate="true" src="religion/church/buddhism.png"/>
+#. <icon annotate="true" src="religion/buddhism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18396,5 +18680,5 @@
 #. <rule>
 #. <condition k="religion" v="hindu"/>
-#. <icon annotate="true" src="religion/church/hinduism.png"/>
+#. <icon annotate="true" src="religion/hinduism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18403,5 +18687,5 @@
 #. <rule>
 #. <condition k="religion" v="jain"/>
-#. <icon annotate="true" src="religion/church/jainism.png"/>
+#. <icon annotate="true" src="religion/jainism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18410,5 +18694,5 @@
 #. <rule>
 #. <condition k="religion" v="jewish"/>
-#. <icon annotate="true" src="religion/church/synagogue.png"/>
+#. <icon annotate="true" src="religion/jewish.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18417,5 +18701,5 @@
 #. <rule>
 #. <condition k="religion" v="muslim"/>
-#. <icon annotate="true" src="religion/church/mosque.png"/>
+#. <icon annotate="true" src="religion/muslim.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18424,5 +18708,5 @@
 #. <rule>
 #. <condition k="religion" v="sikh"/>
-#. <icon annotate="true" src="religion/church/sikhism.png"/>
+#. <icon annotate="true" src="religion/sikhism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18431,5 +18715,5 @@
 #. <rule>
 #. <condition k="religion" v="shinto"/>
-#. <icon annotate="true" src="religion/church/shinto.png"/>
+#. <icon annotate="true" src="religion/shinto.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18438,5 +18722,5 @@
 #. <rule>
 #. <condition k="religion" v="taoist"/>
-#. <icon annotate="true" src="religion/church/taoism.png"/>
+#. <icon annotate="true" src="religion/taoism.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18453,5 +18737,5 @@
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
-#. <icon annotate="true" src="religion/cemetery.png"/>
+#. <icon annotate="true" src="rendering/landuse/cemetery.png"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -18682,5 +18966,5 @@
 #: build/trans_style.java:2133 build/trans_style.java:2141
 msgid "amenity_light"
-msgstr ""
+msgstr "アメニティ_信号"
 
 #. color amenity_light
@@ -18713,5 +18997,5 @@
 #: build/trans_style.java:2988
 msgid "light_water"
-msgstr ""
+msgstr "信号_水域"
 
 #. color amenity_light
@@ -19453,5 +19737,5 @@
 #. <condition k="landuse" v="grass"/>
 #. color cemetery
-#. <icon src="religion/cemetery.png"/>
+#. <icon src="rendering/landuse/cemetery.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19476,5 +19760,5 @@
 
 #. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19485,5 +19769,5 @@
 #: build/trans_style.java:2781
 msgid "quarry"
-msgstr ""
+msgstr "石切り場"
 
 #. color quarry
@@ -19497,5 +19781,5 @@
 #: build/trans_style.java:2789
 msgid "landfill"
-msgstr ""
+msgstr "埋め立て地"
 
 #. color landfill
@@ -19541,5 +19825,5 @@
 #: build/trans_style.java:2845
 msgid "farmyard"
-msgstr ""
+msgstr "農地"
 
 #. color farmyard
@@ -19679,5 +19963,5 @@
 #: build/trans_style.java:2919
 msgid "cemetery"
-msgstr ""
+msgstr "墓地"
 
 #. color light_water
@@ -19690,5 +19974,5 @@
 #: build/trans_style.java:2995
 msgid "peak"
-msgstr ""
+msgstr "頂上"
 
 #. color peak
@@ -19703,5 +19987,5 @@
 #: build/trans_style.java:3004
 msgid "glacier"
-msgstr ""
+msgstr "氷河"
 
 #. color glacier
@@ -19781,5 +20065,5 @@
 #: build/trans_style.java:3036
 msgid "scrub"
-msgstr ""
+msgstr "低木"
 
 #. color natural
@@ -19793,5 +20077,5 @@
 #: build/trans_style.java:3052
 msgid "heath"
-msgstr ""
+msgstr "荒地"
 
 #. color heath
@@ -19817,5 +20101,5 @@
 #: build/trans_style.java:3092
 msgid "mud"
-msgstr ""
+msgstr "泥"
 
 #. color mud
@@ -20141,5 +20425,5 @@
 #: build/trans_style.java:3867
 msgid "address"
-msgstr ""
+msgstr "住所"
 
 #. <?xml version="1.0"?>
@@ -20334,10 +20618,10 @@
 #: build/trans_validator.java:64
 msgid "street name contains ss"
-msgstr ""
+msgstr "ストリート名は ss を含んでいます。"
 
 #. *    : I : name == /.*Strasse.*/i
 #: build/trans_validator.java:65
 msgid "abbreviated street name"
-msgstr ""
+msgstr "簡略化されたストリート名"
 
 #. *    : W : name == /.*Str\.?/i
@@ -20419,4 +20703,14 @@
 msgstr "Streets NRW Geofabrik.de"
 
+#~ msgid ""
+#~ "If your gps device draws too few lines, select this to draw lines along "
+#~ "your way."
+#~ msgstr ""
+#~ "これを選択すると、gpsデバイスが線を引かない場合、ウェイに沿って線を描画す"
+#~ "る。"
+
+#~ msgid "Reset Graph"
+#~ msgstr "グラフリセット"
+
 #~ msgid "Please select something from the conflict list."
 #~ msgstr "競合リストからどれか選択してください。"
@@ -20433,7 +20727,4 @@
 #~ msgid "Click to make a connection to the existing node."
 #~ msgstr "クリックして既存のノードとつなぎます。"
-
-#~ msgid "Click to insert a new node."
-#~ msgstr "クリックして新規ノードを挿入します。"
 
 #~ msgid "Upload this trace..."
@@ -20480,7 +20771,4 @@
 #~ msgstr "地点の速度によって、軌跡の色彩を変える配色を行う。"
 
-#~ msgid "Highway Exit"
-#~ msgstr "道路の出口"
-
 #~ msgid "Edit an Exit"
 #~ msgstr "出口の編集"
