diff --git a/ja/kicad.po b/ja/kicad.po
index 58395977ff..5d06c2865f 100755
--- a/ja/kicad.po
+++ b/ja/kicad.po
@@ -2,122 +2,125 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 15:30+0900\n"
-"PO-Revision-Date: 2016-06-15 18:05+0900\n"
-"Last-Translator: kinichiro <kinichiro.inoguchi@gmail.com>\n"
+"POT-Creation-Date: 2016-07-30 17:54+0900\n"
+"PO-Revision-Date: 2016-07-30 22:21+0900\n"
+"Last-Translator: starfort-jp <starfort@nifty.com>\n"
 "Language-Team: kicad_jp <kaoruzen@gmail.com>\n"
 "Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-Basepath: ../../../../../../../Source/kicad-4.0.0\n"
-"X-Generator: Poedit 1.8.6\n"
-"X-Poedit-SearchPath-0: 3d-viewer\n"
-"X-Poedit-SearchPath-1: bitmap2component\n"
-"X-Poedit-SearchPath-2: common\n"
-"X-Poedit-SearchPath-3: cvpcb\n"
-"X-Poedit-SearchPath-4: eeschema\n"
-"X-Poedit-SearchPath-5: gerbview\n"
-"X-Poedit-SearchPath-6: include\n"
-"X-Poedit-SearchPath-7: kicad\n"
-"X-Poedit-SearchPath-8: lib_dxf\n"
-"X-Poedit-SearchPath-9: new\n"
-"X-Poedit-SearchPath-10: pagelayout_editor\n"
-"X-Poedit-SearchPath-11: patches\n"
-"X-Poedit-SearchPath-12: pcb_calculator\n"
-"X-Poedit-SearchPath-13: pcbnew\n"
-"X-Poedit-SearchPath-14: polygon\n"
-"X-Poedit-SearchPath-15: potrace\n"
-"X-Poedit-SearchPath-16: scripting\n"
-"X-Poedit-SearchPath-17: scripts\n"
-"X-Poedit-SearchPath-18: tools\n"
-"X-Poedit-SearchPath-19: utils/idftools\n"
+"X-Poedit-KeywordsList: _;_HKI\n"
+"X-Poedit-Basepath: Source\n"
+"X-Generator: Poedit 1.8.8\n"
+"X-Poedit-SearchPath-0: kicad-6297\n"
+"X-Poedit-SearchPath-1: kicad-6996\n"
 
-# Nov.30,2015 : Release for KiCad 4.0.0.
-#: 3d-viewer/3d_canvas.cpp:389
+#: kicad-6297/3d-viewer/3d_canvas.cpp:399
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:600
 msgid "Zoom +"
 msgstr "ズーム イン"
 
-#: 3d-viewer/3d_canvas.cpp:393
+#: kicad-6297/3d-viewer/3d_canvas.cpp:403
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:604
 msgid "Zoom -"
 msgstr "ズーム アウト"
 
-#: 3d-viewer/3d_canvas.cpp:398
+#: kicad-6297/3d-viewer/3d_canvas.cpp:408
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:609
 msgid "Top View"
 msgstr "上から見る"
 
-#: 3d-viewer/3d_canvas.cpp:402
+#: kicad-6297/3d-viewer/3d_canvas.cpp:412
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:613
 msgid "Bottom View"
 msgstr "下から見る"
 
-#: 3d-viewer/3d_canvas.cpp:407
+#: kicad-6297/3d-viewer/3d_canvas.cpp:417
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:618
 msgid "Right View"
 msgstr "右から見る"
 
-#: 3d-viewer/3d_canvas.cpp:411
+#: kicad-6297/3d-viewer/3d_canvas.cpp:421
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:622
 msgid "Left View"
 msgstr "左から見る"
 
-#: 3d-viewer/3d_canvas.cpp:416
+#: kicad-6297/3d-viewer/3d_canvas.cpp:426
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:627
 msgid "Front View"
 msgstr "前から見る"
 
-#: 3d-viewer/3d_canvas.cpp:420
+#: kicad-6297/3d-viewer/3d_canvas.cpp:430
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:631
 msgid "Back View"
 msgstr "後ろから見る"
 
-#: 3d-viewer/3d_canvas.cpp:425
+#: kicad-6297/3d-viewer/3d_canvas.cpp:435
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:636
 msgid "Move left <-"
 msgstr "左へ移動 ←"
 
-#: 3d-viewer/3d_canvas.cpp:429
+#: kicad-6297/3d-viewer/3d_canvas.cpp:439
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:640
 msgid "Move right ->"
 msgstr "右へ移動 →"
 
-#: 3d-viewer/3d_canvas.cpp:433
+#: kicad-6297/3d-viewer/3d_canvas.cpp:443
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:644
 msgid "Move Up ^"
 msgstr "上へ移動 ↑"
 
-#: 3d-viewer/3d_canvas.cpp:437 cvpcb/dialogs/dialog_config_equfiles_base.cpp:47
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:151
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:72
+#: kicad-6297/3d-viewer/3d_canvas.cpp:447
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:72
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:113
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:648
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:72
 msgid "Move Down"
 msgstr "下へ移動"
 
-#: 3d-viewer/3d_canvas.cpp:517
+#: kicad-6297/3d-viewer/3d_canvas.cpp:527
 #, c-format
 msgid "Zoom: %3.1f"
 msgstr "ズーム: %3.1f"
 
-#: 3d-viewer/3d_canvas.cpp:653
+#: kicad-6297/3d-viewer/3d_canvas.cpp:662
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:922
 msgid "3D Image File Name:"
 msgstr "3D 画像ファイル名:"
 
-#: 3d-viewer/3d_canvas.cpp:709
+#: kicad-6297/3d-viewer/3d_canvas.cpp:718
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:958
 msgid "Failed to copy image to clipboard"
 msgstr "クリップボードからイメージをコピーできませんでした"
 
-#: 3d-viewer/3d_canvas.cpp:722
+#: kicad-6297/3d-viewer/3d_canvas.cpp:731
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:969
 msgid "Can't save file"
 msgstr "ファイルを保存できません"
 
-#: 3d-viewer/3d_draw.cpp:618
+#: kicad-6297/3d-viewer/3d_draw.cpp:618
 #, c-format
 msgid "Build time %.3f s"
 msgstr "ビルド時間 %.3f 秒"
 
-#: 3d-viewer/3d_draw.cpp:661 3d-viewer/3d_draw_board_body.cpp:218
-#: 3d-viewer/3d_draw_board_body.cpp:505
+#: kicad-6297/3d-viewer/3d_draw.cpp:661
+#: kicad-6297/3d-viewer/3d_draw_board_body.cpp:218
+#: kicad-6297/3d-viewer/3d_draw_board_body.cpp:505
 #, c-format
 msgid "Build layer %s"
 msgstr "ビルド レイヤ %s"
 
-#: 3d-viewer/3d_draw.cpp:987
+#: kicad-6297/3d-viewer/3d_draw.cpp:987
 msgid "Load 3D Shapes"
 msgstr "3Dシェイプの読み込み"
 
-#: 3d-viewer/3d_draw_board_body.cpp:194 3d-viewer/3d_draw_board_body.cpp:471
+#: kicad-6297/3d-viewer/3d_draw_board_body.cpp:194
+#: kicad-6297/3d-viewer/3d_draw_board_body.cpp:471
 msgid ""
 "Unable to calculate the board outlines.\n"
 "Therefore use the board boundary box."
@@ -125,167 +128,256 @@ msgstr ""
 "基板の外形を計算できません;\n"
 "そのためバウンダリボックスを使用します."
 
-#: 3d-viewer/3d_draw_board_body.cpp:369
+#: kicad-6297/3d-viewer/3d_draw_board_body.cpp:369
+#: kicad-6996/3d-viewer/3d_canvas/cinfo3d_visu.cpp:447
 msgid "Build board body"
 msgstr "基板本体をビルド"
 
-#: 3d-viewer/3d_frame.cpp:539
+#: kicad-6297/3d-viewer/3d_frame.cpp:546
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:343
 msgid "Background Color, Bottom"
 msgstr "背景色, 下層"
 
-#: 3d-viewer/3d_frame.cpp:544
+#: kicad-6297/3d-viewer/3d_frame.cpp:551
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:348
 msgid "Background Color, Top"
 msgstr "背景色, 上層"
 
-#: 3d-viewer/3d_frame.cpp:793
+#: kicad-6297/3d-viewer/3d_frame.cpp:801
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1035
 msgid "Silk Screen Color"
 msgstr "シルクの色"
 
-#: 3d-viewer/3d_frame.cpp:817 3d-viewer/3d_toolbar.cpp:216
+#: kicad-6297/3d-viewer/3d_frame.cpp:823
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:222
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:295
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1071
 msgid "Solder Mask Color"
 msgstr "ハンダマスクの色"
 
-#: 3d-viewer/3d_frame.cpp:840
+#: kicad-6297/3d-viewer/3d_frame.cpp:844
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1097
 msgid "Copper Color"
 msgstr "導体の色"
 
-#: 3d-viewer/3d_frame.cpp:866 3d-viewer/3d_toolbar.cpp:225
+#: kicad-6297/3d-viewer/3d_frame.cpp:868
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:231
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:304
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1127
 msgid "Board Body Color"
 msgstr "基板本体の色"
 
-#: 3d-viewer/3d_frame.cpp:887 3d-viewer/3d_toolbar.cpp:219
+#: kicad-6297/3d-viewer/3d_frame.cpp:887
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:225
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:298
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1152
 msgid "Solder Paste Color"
 msgstr "ハンダ ペーストの色"
 
-#: 3d-viewer/3d_toolbar.cpp:52
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:52
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:55
 msgid "Reload board"
 msgstr "ボードを再読み込み"
 
-#: 3d-viewer/3d_toolbar.cpp:58
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:58
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:61
 msgid "Copy 3D image to clipboard"
 msgstr "3D 画像をクリップボードへコピー"
 
-#: 3d-viewer/3d_toolbar.cpp:64
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:64
 msgid "Set display options, and some layers visibility"
 msgstr "ディスプレイ オプションを設定してレイヤを可視化"
 
-#: 3d-viewer/3d_toolbar.cpp:68 common/zoom.cpp:248 eeschema/tool_viewlib.cpp:75
-#: gerbview/toolbars_gerber.cpp:77 pagelayout_editor/toolbars_pl_editor.cpp:78
-#: pcbnew/footprint_wizard_frame.cpp:593 pcbnew/tool_modedit.cpp:123
-#: pcbnew/tool_modview.cpp:79 eeschema/help_common_strings.h:43
-#: pcbnew/help_common_strings.h:19
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:68 kicad-6297/common/zoom.cpp:248
+#: kicad-6297/eeschema/tool_viewlib.cpp:75
+#: kicad-6297/gerbview/toolbars_gerber.cpp:77
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:78
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:593
+#: kicad-6297/pcbnew/tool_modedit.cpp:123 kicad-6297/pcbnew/tool_modview.cpp:79
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:72
+#: kicad-6996/common/zoom.cpp:248 kicad-6996/eeschema/tool_viewlib.cpp:75
+#: kicad-6996/gerbview/toolbars_gerber.cpp:77
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:79
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:610
+#: kicad-6996/pcbnew/tool_modedit.cpp:123 kicad-6996/pcbnew/tool_modview.cpp:79
+#: kicad-6297/eeschema/help_common_strings.h:43
+#: kicad-6297/pcbnew/help_common_strings.h:19
+#: kicad-6996/eeschema/help_common_strings.h:43
+#: kicad-6996/pcbnew/help_common_strings.h:19
 msgid "Zoom in"
 msgstr "ズーム イン"
 
-#: 3d-viewer/3d_toolbar.cpp:71 common/zoom.cpp:250 eeschema/tool_viewlib.cpp:80
-#: gerbview/toolbars_gerber.cpp:80 pagelayout_editor/toolbars_pl_editor.cpp:81
-#: pcbnew/footprint_wizard_frame.cpp:598 pcbnew/tool_modedit.cpp:126
-#: pcbnew/tool_modview.cpp:84 eeschema/help_common_strings.h:44
-#: pcbnew/help_common_strings.h:20
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:71 kicad-6297/common/zoom.cpp:250
+#: kicad-6297/eeschema/tool_viewlib.cpp:80
+#: kicad-6297/gerbview/toolbars_gerber.cpp:80
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:81
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:598
+#: kicad-6297/pcbnew/tool_modedit.cpp:126 kicad-6297/pcbnew/tool_modview.cpp:84
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:75
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1181
+#: kicad-6996/common/zoom.cpp:250 kicad-6996/eeschema/tool_viewlib.cpp:80
+#: kicad-6996/gerbview/toolbars_gerber.cpp:80
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:82
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:615
+#: kicad-6996/pcbnew/tool_modedit.cpp:126 kicad-6996/pcbnew/tool_modview.cpp:84
+#: kicad-6297/eeschema/help_common_strings.h:44
+#: kicad-6297/pcbnew/help_common_strings.h:20
+#: kicad-6996/eeschema/help_common_strings.h:44
+#: kicad-6996/pcbnew/help_common_strings.h:20
 msgid "Zoom out"
 msgstr "ズーム アウト"
 
-#: 3d-viewer/3d_toolbar.cpp:75 common/zoom.cpp:252 eeschema/tool_viewlib.cpp:85
-#: gerbview/toolbars_gerber.cpp:83 pagelayout_editor/toolbars_pl_editor.cpp:84
-#: pcbnew/footprint_wizard_frame.cpp:603 pcbnew/tool_modedit.cpp:129
-#: pcbnew/tool_modview.cpp:89
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:75 kicad-6297/common/zoom.cpp:252
+#: kicad-6297/eeschema/tool_viewlib.cpp:85
+#: kicad-6297/gerbview/toolbars_gerber.cpp:83
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:84
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:603
+#: kicad-6297/pcbnew/tool_modedit.cpp:129 kicad-6297/pcbnew/tool_modview.cpp:89
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:79
+#: kicad-6996/common/zoom.cpp:252 kicad-6996/eeschema/tool_viewlib.cpp:85
+#: kicad-6996/gerbview/toolbars_gerber.cpp:83
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:85
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:620
+#: kicad-6996/pcbnew/tool_modedit.cpp:129 kicad-6996/pcbnew/tool_modview.cpp:89
 msgid "Redraw view"
 msgstr "ビューの再描画"
 
-#: 3d-viewer/3d_toolbar.cpp:78
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:78
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:82
 msgid "Fit in page"
 msgstr "ページに合わせる"
 
-#: 3d-viewer/3d_toolbar.cpp:83
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:83
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:87
 msgid "Rotate X <-"
 msgstr "X回転 ←"
 
-#: 3d-viewer/3d_toolbar.cpp:87
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:87
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:91
 msgid "Rotate X ->"
 msgstr "X回転 →"
 
-#: 3d-viewer/3d_toolbar.cpp:92
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:92
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:96
 msgid "Rotate Y <-"
 msgstr "Y回転 ←"
 
-#: 3d-viewer/3d_toolbar.cpp:96
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:96
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:100
 msgid "Rotate Y ->"
 msgstr "Y回転 →"
 
-#: 3d-viewer/3d_toolbar.cpp:101
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:101
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:105
 msgid "Rotate Z <-"
 msgstr "Z回転 ←"
 
-#: 3d-viewer/3d_toolbar.cpp:105
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:105
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:109
 msgid "Rotate Z ->"
 msgstr "Z回転 →"
 
-#: 3d-viewer/3d_toolbar.cpp:109
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:109
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:113
 msgid "Move left"
 msgstr "左へ移動 ←"
 
-#: 3d-viewer/3d_toolbar.cpp:112
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:112
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:116
 msgid "Move right"
 msgstr "右へ移動 →"
 
-#: 3d-viewer/3d_toolbar.cpp:115
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:115
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:119
 msgid "Move up"
 msgstr "上へ移動↑"
 
-#: 3d-viewer/3d_toolbar.cpp:118
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:118
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:122
 msgid "Move down"
 msgstr "下へ移動↓"
 
-#: 3d-viewer/3d_toolbar.cpp:122
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:122
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:126
 msgid "Enable/Disable orthographic projection"
 msgstr "正投影を有効化/無効化する"
 
-#: 3d-viewer/3d_toolbar.cpp:135 cvpcb/menubar.cpp:141 eeschema/menubar.cpp:506
-#: eeschema/menubar_libedit.cpp:283 eeschema/tool_viewlib.cpp:267
-#: gerbview/menubar.cpp:245 kicad/menubar.cpp:426
-#: pagelayout_editor/menubar.cpp:172 pcbnew/menubar_modedit.cpp:358
-#: pcbnew/menubar_pcbframe.cpp:664 pcbnew/tool_modview.cpp:206
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:135 kicad-6297/cvpcb/menubar.cpp:141
+#: kicad-6297/eeschema/menubar.cpp:506
+#: kicad-6297/eeschema/menubar_libedit.cpp:283
+#: kicad-6297/eeschema/tool_viewlib.cpp:267 kicad-6297/gerbview/menubar.cpp:245
+#: kicad-6297/kicad/menubar.cpp:426
+#: kicad-6297/pagelayout_editor/menubar.cpp:172
+#: kicad-6297/pcbnew/menubar_modedit.cpp:358
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:664
+#: kicad-6297/pcbnew/tool_modview.cpp:206
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:142
+#: kicad-6996/eeschema/menubar.cpp:524
+#: kicad-6996/eeschema/menubar_libedit.cpp:279
+#: kicad-6996/eeschema/tool_viewlib.cpp:264 kicad-6996/gerbview/menubar.cpp:248
+#: kicad-6996/kicad/menubar.cpp:432
+#: kicad-6996/pagelayout_editor/menubar.cpp:175
+#: kicad-6996/pcbnew/menubar_modedit.cpp:359
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:661
+#: kicad-6996/pcbnew/tool_modview.cpp:203
 msgid "&File"
 msgstr "ファイル(&F)"
 
-#: 3d-viewer/3d_toolbar.cpp:138
-msgid "Create Image (png format)"
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:138
+msgid "Create Image (PNG format)"
 msgstr "PNG形式で画像保存"
 
-#: 3d-viewer/3d_toolbar.cpp:141
-msgid "Create Image (jpeg format)"
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:141
+msgid "Create Image (JPEG format)"
 msgstr "JPEG形式で画像保存"
 
-#: 3d-viewer/3d_toolbar.cpp:146
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:146
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:154
 msgid "Copy 3D Image to Clipboard"
 msgstr "クリップボードへ画像をコピー"
 
-#: 3d-viewer/3d_toolbar.cpp:151
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:151
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:159
 msgid "&Exit"
 msgstr "終了(&E)"
 
-#: 3d-viewer/3d_toolbar.cpp:154 cvpcb/menubar.cpp:142 gerbview/menubar.cpp:246
-#: kicad/menubar.cpp:428 pagelayout_editor/menubar.cpp:173
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:154 kicad-6297/cvpcb/menubar.cpp:142
+#: kicad-6297/gerbview/menubar.cpp:246 kicad-6297/kicad/menubar.cpp:428
+#: kicad-6297/pagelayout_editor/menubar.cpp:173
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:162
+#: kicad-6996/cvpcb/menubar.cpp:132 kicad-6996/gerbview/menubar.cpp:249
+#: kicad-6996/kicad/menubar.cpp:434
+#: kicad-6996/pagelayout_editor/menubar.cpp:176
 msgid "&Preferences"
 msgstr "設定(&P)"
 
-#: 3d-viewer/3d_toolbar.cpp:157
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:157
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:165
+msgid "Use Touchpad to Pan"
+msgstr "画面のパンにタッチパッドを使用"
+
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:163
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:171
 msgid "Realistic Mode"
 msgstr "リアルモード"
 
-#: 3d-viewer/3d_toolbar.cpp:162
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:168
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:194
 msgid "Render Options"
 msgstr "レンダオプション"
 
-#: 3d-viewer/3d_toolbar.cpp:165
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:171
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:242
 msgid "Render Shadows"
 msgstr "影の表示"
 
-#: 3d-viewer/3d_toolbar.cpp:169
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:175
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:197
 msgid "Show Holes in Zones"
 msgstr "ゾーン中に穴を表示"
 
-#: 3d-viewer/3d_toolbar.cpp:170
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:176
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:198
 msgid ""
 "Holes inside a copper layer copper zones are shown, but the calculation time "
 "is longer"
@@ -293,293 +385,396 @@ msgstr ""
 "導体レイヤ、導体ゾーンの内部にある穴が表示されていますが、計算時間は長くなり"
 "ます"
 
-#: 3d-viewer/3d_toolbar.cpp:175
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:181
 msgid "Render Textures"
 msgstr "テクスチャの表示"
 
-#: 3d-viewer/3d_toolbar.cpp:176
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:182
 msgid "Apply a grid/cloud textures to board, solder mask and silk screen"
 msgstr "grid/cloud テクスチャを基板、ハンダマスク、シルクスクリーンへ適用"
 
-#: 3d-viewer/3d_toolbar.cpp:180
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:186
 msgid "Render Smooth Normals"
 msgstr "ノーマル表示でスムーズに描画"
 
-#: 3d-viewer/3d_toolbar.cpp:184
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:190
 msgid "Use Model Normals"
 msgstr "モデルをノーマル表示で使用"
 
-#: 3d-viewer/3d_toolbar.cpp:188
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:194
 msgid "Render Material Properties"
 msgstr "マテリアル(材質)の描画"
 
-#: 3d-viewer/3d_toolbar.cpp:192
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:198
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:231
 msgid "Show Model Bounding Boxes"
 msgstr "モデルをバウンディングボックスで表示"
 
-#: 3d-viewer/3d_toolbar.cpp:200
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:206
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:279
 msgid "Choose Colors"
 msgstr "色の選択"
 
-#: 3d-viewer/3d_toolbar.cpp:204 eeschema/dialogs/dialog_color_config.cpp:193
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:210
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:193
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:283
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:193
 msgid "Background Color"
 msgstr "背景色"
 
-#: 3d-viewer/3d_toolbar.cpp:207
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:213
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:286
 msgid "Background Top Color"
 msgstr "背景上面色"
 
-#: 3d-viewer/3d_toolbar.cpp:210
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:216
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:289
 msgid "Background Bottom Color"
 msgstr "背景下面色"
 
-#: 3d-viewer/3d_toolbar.cpp:213
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:219
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:292
 msgid "Silkscreen Color"
 msgstr "シルクの色"
 
-#: 3d-viewer/3d_toolbar.cpp:222
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:228
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:301
 msgid "Copper/Surface Finish Color"
 msgstr "導体/表面の仕上がり色"
 
-#: 3d-viewer/3d_toolbar.cpp:228
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:234
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:307
 msgid "Show 3D &Axis"
 msgstr "3Dと軸の表示"
 
-#: 3d-viewer/3d_toolbar.cpp:233
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:239
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:315
 msgid "3D Grid"
 msgstr "3Dグリッド"
 
-#: 3d-viewer/3d_toolbar.cpp:234
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:240
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:316
 msgid "No 3D Grid"
 msgstr "3Dグリッド無し"
 
-#: 3d-viewer/3d_toolbar.cpp:235
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:241
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:317
 msgid "3D Grid 10 mm"
 msgstr "3Dグリッド 10mm"
 
-#: 3d-viewer/3d_toolbar.cpp:236
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:242
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:318
 msgid "3D Grid 5 mm"
 msgstr "3Dグリッド 5mm"
 
-#: 3d-viewer/3d_toolbar.cpp:237
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:243
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:319
 msgid "3D Grid 2.5 mm"
 msgstr "3Dグリッド 2.5mm"
 
-#: 3d-viewer/3d_toolbar.cpp:238
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:244
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:320
 msgid "3D Grid 1 mm"
 msgstr "3Dグリッド 1mm"
 
-#: 3d-viewer/3d_toolbar.cpp:254
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:260
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:339
 msgid "Show Board Bod&y"
 msgstr "基板の表示(&Y)"
 
-#: 3d-viewer/3d_toolbar.cpp:257
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:263
 msgid "Show Copper &Thickness"
 msgstr "銅箔の厚みを表示(&T)"
 
-#: 3d-viewer/3d_toolbar.cpp:260
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:266
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:346
 msgid "Show 3D M&odels"
 msgstr "3D モデルを表示(&o)"
 
-#: 3d-viewer/3d_toolbar.cpp:263
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:269
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:342
 msgid "Show Zone &Filling"
 msgstr "ゾーン塗りつぶしを表示"
 
-#: 3d-viewer/3d_toolbar.cpp:269
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:275
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:365
 msgid "Show &Layers"
 msgstr "レイヤの表示(&L)"
 
-#: 3d-viewer/3d_toolbar.cpp:272
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:278
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:368
 msgid "Show &Adhesive Layers"
 msgstr "接着剤(Adhesive)レイヤの表示(&A)"
 
-#: 3d-viewer/3d_toolbar.cpp:275
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:281
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:371
 msgid "Show &Silkscreen Layers"
 msgstr "シルクスクリーン レイヤを表示(&S)"
 
-#: 3d-viewer/3d_toolbar.cpp:278
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:284
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:374
 msgid "Show Solder &Mask Layers"
 msgstr "半田マスクレイヤの表示(&M)"
 
-#: 3d-viewer/3d_toolbar.cpp:281
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:287
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:377
 msgid "Show Solder &Paste Layers"
 msgstr "半田ペーストレイヤの表示(&P)"
 
-#: 3d-viewer/3d_toolbar.cpp:286
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:292
 msgid "Show &Comments and Drawing Layers"
 msgstr "コメント/図形レイヤを表示(&C)"
 
-#: 3d-viewer/3d_toolbar.cpp:289
+#: kicad-6297/3d-viewer/3d_toolbar.cpp:295
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:385
 msgid "Show &Eco Layers"
 msgstr "ECOレイヤの表示(&E)"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:30
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:30
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:30
 msgid "Realistic mode"
 msgstr "リアルモード"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:36
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:36
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:36
 msgid "Show copper thickness"
 msgstr "銅箔の厚みを表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:42
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:42
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:42
 msgid "Show 3D Models"
 msgstr "3D モデルを表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:48 pcbnew/tool_pcb.cpp:366
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:48
+#: kicad-6297/pcbnew/tool_pcb.cpp:366
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:48
+#: kicad-6996/pcbnew/tool_pcb.cpp:365
 msgid "Show filled areas in zones"
 msgstr "ゾーンの塗りつぶし領域を表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:54
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:54
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:54
 msgid "Show silkscreen layers"
 msgstr "シルクレイヤを表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:60
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:60
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:60
 msgid "Show solder mask layers"
 msgstr "半田マスクレイヤの表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:66
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:66
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:66
 msgid "Show solder paste layers"
 msgstr "半田ペーストレイヤ"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:72
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:72
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:72
 msgid "Show adhesive layers"
 msgstr "接着剤(Adhesive)レイヤの表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:78
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:78
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:78
 msgid "Show comments and drawings layers"
 msgstr "コメント/図面描画レイヤの表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:84
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:84
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:84
 msgid "Show ECO layers"
 msgstr "ECOレイヤの表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:93
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:93
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:93
 msgid "Show All"
 msgstr "全てを表示"
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.cpp:96
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.cpp:96
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:96
 msgid "Show None"
 msgstr "全てを非表示"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:270 eeschema/edit_bitmap.cpp:103
-#: pagelayout_editor/pl_editor_frame.cpp:635
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:270
+#: kicad-6297/eeschema/edit_bitmap.cpp:103
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:635
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:270
+#: kicad-6996/eeschema/edit_bitmap.cpp:103
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:636
 msgid "Choose Image"
 msgstr "イメージの選択"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:271 eeschema/edit_bitmap.cpp:104
-#: pagelayout_editor/pl_editor_frame.cpp:636
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:271
+#: kicad-6297/eeschema/edit_bitmap.cpp:104
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:636
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:271
+#: kicad-6996/eeschema/edit_bitmap.cpp:104
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:637
 msgid "Image Files "
 msgstr "画像ファイル"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:486
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:486
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:486
 msgid "Create a logo file"
 msgstr "ロゴファイルの作成"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:505
-#: bitmap2component/bitmap2cmp_gui.cpp:543
-#: bitmap2component/bitmap2cmp_gui.cpp:580
-#: bitmap2component/bitmap2cmp_gui.cpp:617
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:505
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:543
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:580
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:617
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:505
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:543
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:580
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:617
 #, c-format
 msgid "File '%s' could not be created."
 msgstr "ファイル '%s' を作成できませんでした。"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:523
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:523
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:523
 msgid "Create a Postscript file"
 msgstr "Postscriptファイルの作成"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:561
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:561
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:561
 msgid "Create a component library file for Eeschema"
 msgstr "Eeschema のコンポーネント ライブラリ ファイルを作成"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:598
+#: kicad-6297/bitmap2component/bitmap2cmp_gui.cpp:598
+#: kicad-6996/bitmap2component/bitmap2cmp_gui.cpp:598
 msgid "Create a footprint file for Pcbnew"
 msgstr "Pcbnew のフットプリント ファイルを作成"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:24
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:24
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:24
 msgid "Original Picture"
 msgstr "オリジナルの画像"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:29
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:29
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:29
 msgid "Greyscale Picture"
 msgstr "グレースケール画像"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:32
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:32
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:32
 msgid "Black&&White Picture"
 msgstr "モノクロ画像(&W)"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:41
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:41
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:41
 msgid "Bitmap Info:"
 msgstr "ビットマップ情報:"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:50
-#: bitmap2component/bitmap2cmp_gui_base.cpp:66
-#: common/dialogs/dialog_page_settings_base.cpp:32 include/wxunittext.h:50
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:50
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:66
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:32
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:50
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:66
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:32
+#: kicad-6297/include/wxunittext.h:50 kicad-6996/include/wxunittext.h:50
 msgid "Size:"
 msgstr "サイズ:"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:54
-#: bitmap2component/bitmap2cmp_gui_base.cpp:58
-#: bitmap2component/bitmap2cmp_gui_base.cpp:70
-#: bitmap2component/bitmap2cmp_gui_base.cpp:74
-#: bitmap2component/bitmap2cmp_gui_base.cpp:86
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:54
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:58
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:70
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:74
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:86
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:54
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:58
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:70
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:74
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:86
 msgid "0000"
 msgstr "0000"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:62
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:62
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:62
 msgid "pixels"
 msgstr "ピクセル"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:78 common/common.cpp:144
-#: common/common.cpp:202 common/dialogs/dialog_page_settings.cpp:466
-#: common/draw_frame.cpp:485
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:45
-#: pagelayout_editor/pl_editor_frame.cpp:467 pcb_calculator/UnitSelector.cpp:38
-#: pcbnew/dialogs/dialog_create_array_base.cpp:50
-#: pcbnew/dialogs/dialog_create_array_base.cpp:61
-#: pcbnew/dialogs/dialog_create_array_base.cpp:72
-#: pcbnew/dialogs/dialog_create_array_base.cpp:83
-#: pcbnew/dialogs/dialog_create_array_base.cpp:187
-#: pcbnew/dialogs/dialog_create_array_base.cpp:198
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:46
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:64
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:98
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:55
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:35
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:49
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:90
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:78
+#: kicad-6297/common/common.cpp:156 kicad-6297/common/common.cpp:214
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:469
+#: kicad-6297/common/draw_frame.cpp:485
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:44
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:467
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:72
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:189
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:200
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:64
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:49
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:90
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:78
+#: kicad-6996/common/common.cpp:148 kicad-6996/common/common.cpp:206
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:471
+#: kicad-6996/common/draw_frame.cpp:510
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:44
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:468
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:38
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:72
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:188
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:199
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:49
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:90
 msgid "mm"
 msgstr "mm"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:82
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:82
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:82
 msgid "BPP:"
 msgstr "Bit/Pixel:"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:90
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:90
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:90
 msgid "bits"
 msgstr "ビット"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:97
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:97
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:97
 msgid "Resolution:"
 msgstr "解像度:"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:101
-#: bitmap2component/bitmap2cmp_gui_base.cpp:106
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:101
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:106
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:101
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:106
 msgid "300"
 msgstr "300"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:111
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:111
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:111
 msgid "DPI"
 msgstr "DPI"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:121
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:121
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:121
 msgid "Load Bitmap"
 msgstr "ビットマップの読み込み"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:124 eeschema/libeditframe.cpp:1155
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:124
+#: kicad-6297/eeschema/libeditframe.cpp:1155
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:124
+#: kicad-6996/eeschema/libeditframe.cpp:1157
 msgid "Export"
 msgstr "エクスポート"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:125
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:125
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:125
 msgid ""
 "Create a library file for Eeschema\n"
 "This library contains only one component: logo"
@@ -587,97 +782,154 @@ msgstr ""
 "Eeschema のライブラリファイルを作成する\n"
 "このライブラリは一つだけのコンポーネントロゴが含まれます。"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:129
 msgid "Eeschema (.lib file)"
 msgstr "Eeschema (.libファイル)"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:129
 msgid "Pcbnew (.kicad_mod file)"
 msgstr "Pcbnew (.kicad_modファイル)"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:129
 msgid "Postscript (.ps file)"
 msgstr "PostScript (.ps ファイル)"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:129
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:129
 msgid "Logo for title block (.kicad_wks file)"
 msgstr "タイトルブロック用のロゴ (.kicad_wksファイル)"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:131
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:90
-#: pcbnew/dialogs/dialog_plot_base.cpp:247
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:187
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:131
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:90
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:247
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:187
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:131
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:245
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:187
 msgid "Format"
 msgstr "フォーマット"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:135 common/eda_text.cpp:377
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
-#: eeschema/dialogs/dialog_edit_label_base.cpp:76
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:92
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:97 eeschema/libedit.cpp:498
-#: eeschema/onrightclick.cpp:381 eeschema/sch_text.cpp:758
-#: gerbview/class_GERBER.cpp:359 gerbview/class_GERBER.cpp:363
-#: gerbview/class_GERBER.cpp:366 pcbnew/class_module.cpp:609
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:83
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:140
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:98
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:104
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:70
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:100 pcbnew/muonde.cpp:813
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:135
+#: kicad-6297/common/eda_text.cpp:383
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:97
+#: kicad-6297/eeschema/libedit.cpp:498 kicad-6297/eeschema/onrightclick.cpp:381
+#: kicad-6297/eeschema/sch_text.cpp:758
+#: kicad-6297/gerbview/class_GERBER.cpp:359
+#: kicad-6297/gerbview/class_GERBER.cpp:363
+#: kicad-6297/gerbview/class_GERBER.cpp:366
+#: kicad-6297/pcbnew/class_module.cpp:609
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:100
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:70
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:100
+#: kicad-6297/pcbnew/muonde.cpp:813
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:348
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:135
+#: kicad-6996/common/eda_text.cpp:423
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:95
+#: kicad-6996/eeschema/libedit.cpp:498 kicad-6996/eeschema/onrightclick.cpp:381
+#: kicad-6996/eeschema/sch_text.cpp:764
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:342
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:346
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:349
+#: kicad-6996/pcbnew/class_module.cpp:576
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:77
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:109
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:71
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:99
+#: kicad-6996/pcbnew/muonde.cpp:859
 msgid "Normal"
 msgstr "標準"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:135 gerbview/class_GERBER.cpp:359
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:135
+#: kicad-6297/gerbview/class_GERBER.cpp:359
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:135
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:342
 msgid "Negative"
 msgstr "ネガ"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:137
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:112
-#: eeschema/dialogs/dialog_erc_base.cpp:123
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:77
-#: pcbnew/dialogs/dialog_block_options_base.cpp:20
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:48
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:209
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:98
-#: pcbnew/dialogs/dialog_plot_base.cpp:82
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:26
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:137
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:112
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:123
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:77
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:20
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:209
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:82
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:26
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:137
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:112
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:147
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:75
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:20
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:209
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:91
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:26
 msgid "Options"
 msgstr "オプション"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:141
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:141
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:141
 msgid "Threshold Value:"
 msgstr "しきい値:"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:146
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:146
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:146
 msgid ""
 "Adjust the level to convert the greyscale picture to a black and white "
 "picture."
 msgstr "グレースケール画像をモノクロ画像に変換する際のしきい値の調整"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:150
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:348
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:348
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:349
 msgid "Front silk screen"
 msgstr "表面層のシルク"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:150
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:354
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:354
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:355
 msgid "Front solder mask"
 msgstr "表面層のレジスト"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:150
 msgid "User layer Eco1"
 msgstr "Eco1 ユーザーレイヤ"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:150
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:150
 msgid "User Layer Eco2"
 msgstr "Eco2 ユーザーレイヤ"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:152
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:152
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:152
 msgid "Board Layer for Outline:"
 msgstr "使用するレイヤ:"
 
-#: bitmap2component/bitmap2cmp_gui_base.cpp:154
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.cpp:154
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.cpp:154
 msgid ""
 "Choose the board layer to place the outline.\n"
 "The 2 invisible fields reference and value are always placed on the silk "
@@ -686,41 +938,42 @@ msgstr ""
 "外形を配置する基板のレイヤを選択する.\n"
 "２つの不可視フィールド リファレンスと定数は常にシルク レイヤへ置かれます."
 
-#: common/base_screen.cpp:188
+#: kicad-6297/common/base_screen.cpp:188 kicad-6996/common/base_screen.cpp:188
 msgid "User Grid"
 msgstr "ユーザ グリッド"
 
-#: common/base_screen.cpp:194
+#: kicad-6297/common/base_screen.cpp:194 kicad-6996/common/base_screen.cpp:194
 #, c-format
 msgid "Grid: %.4f mm (%.2f mils)"
 msgstr "グリッド: %.4f mm (%.2f mils)"
 
-#: common/base_screen.cpp:197
+#: kicad-6297/common/base_screen.cpp:197 kicad-6996/common/base_screen.cpp:197
 #, c-format
 msgid "Grid: %.2f mils (%.4f mm)"
 msgstr "グリッド: %.2f mils (%.4f mm)"
 
-#: common/base_units.cpp:160
+#: kicad-6297/common/base_units.cpp:160 kicad-6996/common/base_units.cpp:160
 msgid " mils"
 msgstr " mils"
 
-#: common/base_units.cpp:160
+#: kicad-6297/common/base_units.cpp:160 kicad-6996/common/base_units.cpp:160
 msgid " in"
 msgstr " inch"
 
-#: common/base_units.cpp:162 common/base_units.cpp:249
+#: kicad-6297/common/base_units.cpp:162 kicad-6297/common/base_units.cpp:249
+#: kicad-6996/common/base_units.cpp:162 kicad-6996/common/base_units.cpp:249
 msgid " mm"
 msgstr " mm"
 
-#: common/base_units.cpp:245
+#: kicad-6297/common/base_units.cpp:245 kicad-6996/common/base_units.cpp:245
 msgid " \""
 msgstr " inch"
 
-#: common/base_units.cpp:253
+#: kicad-6297/common/base_units.cpp:253 kicad-6996/common/base_units.cpp:253
 msgid " deg"
 msgstr " 度"
 
-#: common/basicframe.cpp:140
+#: kicad-6297/common/basicframe.cpp:141 kicad-6996/common/basicframe.cpp:137
 msgid ""
 "The program cannot be closed\n"
 "A quasi-modal dialog window is currently open, please close it first."
@@ -728,7 +981,7 @@ msgstr ""
 "プログラムを終了することができませんでした\n"
 "現在表示されている他のダイアログを先に閉じてください。"
 
-#: common/basicframe.cpp:427
+#: kicad-6297/common/basicframe.cpp:442 kicad-6996/common/basicframe.cpp:438
 #, c-format
 msgid ""
 "Html or pdf help file \n"
@@ -741,57 +994,50 @@ msgstr ""
 " または\n"
 "'%s' が見つかりませんでした。"
 
-#: common/basicframe.cpp:444
+#: kicad-6297/common/basicframe.cpp:459 kicad-6996/common/basicframe.cpp:455
 #, c-format
 msgid "Help file '%s' could not be found."
 msgstr "ヘルプファイル '%s' が見つかりません"
 
-#: common/basicframe.cpp:465
-#, c-format
-msgid "Executable file (%s)|%s"
-msgstr "実行ファイル (%s)|%s"
-
-#: common/basicframe.cpp:468
-msgid "Select Preferred Editor"
-msgstr "好みのエディタの選択"
-
-#: common/basicframe.cpp:494
+#: kicad-6297/common/basicframe.cpp:501
 msgid "Copy &Version Information"
 msgstr "バージョン情報をコピー(&V)"
 
-#: common/basicframe.cpp:495
+#: kicad-6297/common/basicframe.cpp:502
 msgid "Copy the version string to clipboard to send with bug reports"
 msgstr "バグレポートを送るためにクリップボードにバージョン文字列をコピーする"
 
-#: common/basicframe.cpp:548
+#: kicad-6297/common/basicframe.cpp:555
+#: kicad-6996/common/dialog_about/dialog_about.cpp:437
 msgid "Could not open clipboard to write version information."
 msgstr "バージョン情報を書き込むためのクリップボードが開けません"
 
-#: common/basicframe.cpp:549
+#: kicad-6297/common/basicframe.cpp:556
+#: kicad-6996/common/dialog_about/dialog_about.cpp:438
 msgid "Clipboard Error"
 msgstr "クリップボードのエラー"
 
-#: common/basicframe.cpp:623
+#: kicad-6297/common/basicframe.cpp:630
 msgid "Version Information (copied to the clipboard)"
 msgstr "バージョン情報をクリップボードにコピー"
 
-#: common/basicframe.cpp:647
+#: kicad-6297/common/basicframe.cpp:654 kicad-6996/common/basicframe.cpp:511
 #, c-format
 msgid "You do not have write permissions to folder <%s>."
 msgstr "フォルダー <%s> への書き込み権限がありません。"
 
-#: common/basicframe.cpp:652
+#: kicad-6297/common/basicframe.cpp:659 kicad-6996/common/basicframe.cpp:516
 #, c-format
 msgid "You do not have write permissions to save file <%s> to folder <%s>."
 msgstr ""
 "ファイル <%s> をフォルダ <%s>に保存するための書き込み権限がありません。"
 
-#: common/basicframe.cpp:657
+#: kicad-6297/common/basicframe.cpp:664 kicad-6996/common/basicframe.cpp:521
 #, c-format
 msgid "You do not have write permissions to save file <%s>."
 msgstr "ファイル <%s> を保存するための書き込み権限がありません。"
 
-#: common/basicframe.cpp:689
+#: kicad-6297/common/basicframe.cpp:696 kicad-6996/common/basicframe.cpp:553
 #, c-format
 msgid ""
 "Well this is potentially embarrassing!\n"
@@ -806,141 +1052,317 @@ msgstr ""
 "を修正した際に正しく保存されなかったようです。最後に行った編集内容を復元した"
 "いですか？"
 
-#: common/basicframe.cpp:717
+#: kicad-6297/common/basicframe.cpp:724 kicad-6996/common/basicframe.cpp:581
 #, c-format
 msgid "Could not create backup file <%s>"
 msgstr "バックアップファイル <%s> が作成できませんでした"
 
-#: common/basicframe.cpp:725
+#: kicad-6297/common/basicframe.cpp:732 kicad-6996/common/basicframe.cpp:589
 msgid "The auto save file could not be renamed to the board file name."
 msgstr "オートセーブファイルをボードファイル名にリネームできませんでした。"
 
-#: common/block_commande.cpp:68
+#: kicad-6297/common/block_commande.cpp:68
+#: kicad-6996/common/block_commande.cpp:68
 msgid "Block Move"
 msgstr "ブロックを移動"
 
-#: common/block_commande.cpp:72
+#: kicad-6297/common/block_commande.cpp:72
+#: kicad-6996/common/block_commande.cpp:72
 msgid "Block Drag"
 msgstr "ブロックをドラッグ"
 
-#: common/block_commande.cpp:76
+#: kicad-6297/common/block_commande.cpp:76
+#: kicad-6996/common/block_commande.cpp:76
 msgid "Drag item"
 msgstr "アイテムをドラッグ"
 
-#: common/block_commande.cpp:80
+#: kicad-6297/common/block_commande.cpp:80
+#: kicad-6996/common/block_commande.cpp:80
 msgid "Block Copy"
 msgstr "ブロックをコピー"
 
-#: common/block_commande.cpp:84
+#: kicad-6297/common/block_commande.cpp:84
+#: kicad-6996/common/block_commande.cpp:84
 msgid "Block Delete"
 msgstr "ブロックを削除"
 
-#: common/block_commande.cpp:88
+#: kicad-6297/common/block_commande.cpp:88
+#: kicad-6996/common/block_commande.cpp:88
 msgid "Block Save"
 msgstr "ブロックを保存"
 
-#: common/block_commande.cpp:92
+#: kicad-6297/common/block_commande.cpp:92
+#: kicad-6996/common/block_commande.cpp:92
 msgid "Block Paste"
 msgstr "ブロックを貼り付け"
 
-#: common/block_commande.cpp:96
+#: kicad-6297/common/block_commande.cpp:96
+#: kicad-6996/common/block_commande.cpp:96
 msgid "Win Zoom"
 msgstr "選択範囲の拡大"
 
-#: common/block_commande.cpp:100
+#: kicad-6297/common/block_commande.cpp:100
+#: kicad-6996/common/block_commande.cpp:100
 msgid "Block Rotate"
 msgstr "ブロックを回転"
 
-#: common/block_commande.cpp:104
+#: kicad-6297/common/block_commande.cpp:104
+#: kicad-6996/common/block_commande.cpp:104
 msgid "Block Flip"
 msgstr "ブロックを裏返し"
 
-#: common/block_commande.cpp:109
+#: kicad-6297/common/block_commande.cpp:109
+#: kicad-6996/common/block_commande.cpp:109
 msgid "Block Mirror"
 msgstr "ブロックをミラー反転"
 
-#: common/class_marker_base.cpp:203
+#: kicad-6297/common/class_marker_base.cpp:203
+#: kicad-6996/common/class_marker_base.cpp:203
 msgid "Marker Info"
 msgstr "マーカーの情報"
 
-#: common/common.cpp:140
+#: kicad-6297/common/colors.cpp:39
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:192
+#: kicad-6996/common/colors.cpp:39
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:192
+msgid "Black"
+msgstr "黒"
+
+#: kicad-6297/common/colors.cpp:40 kicad-6996/common/colors.cpp:40
+msgid "Gray 1"
+msgstr "灰色 1"
+
+#: kicad-6297/common/colors.cpp:41 kicad-6996/common/colors.cpp:41
+msgid "Gray 2"
+msgstr "灰色 2"
+
+#: kicad-6297/common/colors.cpp:42 kicad-6996/common/colors.cpp:42
+msgid "Gray 3"
+msgstr "灰色 3"
+
+#: kicad-6297/common/colors.cpp:43
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:191
+#: kicad-6996/common/colors.cpp:43
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:191
+msgid "White"
+msgstr "白"
+
+#: kicad-6297/common/colors.cpp:44 kicad-6996/common/colors.cpp:44
+msgid "L.Yellow"
+msgstr "淡黄色"
+
+#: kicad-6297/common/colors.cpp:45 kicad-6996/common/colors.cpp:45
+msgid "Blue 1"
+msgstr "青色 1"
+
+#: kicad-6297/common/colors.cpp:46 kicad-6996/common/colors.cpp:46
+msgid "Green 1"
+msgstr "緑色 1"
+
+#: kicad-6297/common/colors.cpp:47 kicad-6996/common/colors.cpp:47
+msgid "Cyan 1"
+msgstr "シアン 1"
+
+#: kicad-6297/common/colors.cpp:48 kicad-6996/common/colors.cpp:48
+msgid "Red 1"
+msgstr "赤色 1"
+
+#: kicad-6297/common/colors.cpp:49 kicad-6996/common/colors.cpp:49
+msgid "Magenta 1"
+msgstr "マゼンタ 1"
+
+#: kicad-6297/common/colors.cpp:50 kicad-6996/common/colors.cpp:50
+msgid "Brown 1"
+msgstr "茶色 1"
+
+#: kicad-6297/common/colors.cpp:51 kicad-6996/common/colors.cpp:51
+msgid "Blue 2"
+msgstr "青色 2"
+
+#: kicad-6297/common/colors.cpp:52 kicad-6996/common/colors.cpp:52
+msgid "Green 2"
+msgstr "緑色 2"
+
+#: kicad-6297/common/colors.cpp:53 kicad-6996/common/colors.cpp:53
+msgid "Cyan 2"
+msgstr "シアン 2"
+
+#: kicad-6297/common/colors.cpp:54 kicad-6996/common/colors.cpp:54
+msgid "Red 2"
+msgstr "赤色 2"
+
+#: kicad-6297/common/colors.cpp:55 kicad-6996/common/colors.cpp:55
+msgid "Magenta 2"
+msgstr "マゼンタ 2"
+
+#: kicad-6297/common/colors.cpp:56 kicad-6996/common/colors.cpp:56
+msgid "Brown 2"
+msgstr "茶色 2"
+
+#: kicad-6297/common/colors.cpp:57 kicad-6996/common/colors.cpp:57
+msgid "Blue 3"
+msgstr "青色 3"
+
+#: kicad-6297/common/colors.cpp:58 kicad-6996/common/colors.cpp:58
+msgid "Green 3"
+msgstr "緑色 3"
+
+#: kicad-6297/common/colors.cpp:59 kicad-6996/common/colors.cpp:59
+msgid "Cyan 3"
+msgstr "シアン 3"
+
+#: kicad-6297/common/colors.cpp:60 kicad-6996/common/colors.cpp:60
+msgid "Red 3"
+msgstr "赤色 3"
+
+#: kicad-6297/common/colors.cpp:61 kicad-6996/common/colors.cpp:61
+msgid "Magenta 3"
+msgstr "マゼンタ 3"
+
+#: kicad-6297/common/colors.cpp:62 kicad-6996/common/colors.cpp:62
+msgid "Yellow 3"
+msgstr "黄色 3"
+
+#: kicad-6297/common/colors.cpp:63 kicad-6996/common/colors.cpp:63
+msgid "Blue 4"
+msgstr "青色 4"
+
+#: kicad-6297/common/colors.cpp:64 kicad-6996/common/colors.cpp:64
+msgid "Green 4"
+msgstr "緑色 4"
+
+#: kicad-6297/common/colors.cpp:65 kicad-6996/common/colors.cpp:65
+msgid "Cyan 4"
+msgstr "シアン 4"
+
+#: kicad-6297/common/colors.cpp:66 kicad-6996/common/colors.cpp:66
+msgid "Red 4"
+msgstr "赤色 4"
+
+#: kicad-6297/common/colors.cpp:67 kicad-6996/common/colors.cpp:67
+msgid "Magenta 4"
+msgstr "マゼンタ 4"
+
+#: kicad-6297/common/colors.cpp:68 kicad-6996/common/colors.cpp:68
+msgid "Yellow 4"
+msgstr "黄色 4"
+
+#: kicad-6297/common/common.cpp:152 kicad-6996/common/common.cpp:144
 msgid "\""
 msgstr "inch"
 
-#: common/common.cpp:171 common/dialogs/dialog_page_settings.cpp:466
-#: pagelayout_editor/pl_editor_frame.cpp:463
+#: kicad-6297/common/common.cpp:183
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:469
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:463
+#: kicad-6996/common/common.cpp:175
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:471
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:464
 msgid "inches"
 msgstr "inch"
 
-#: common/common.cpp:175
+#: kicad-6297/common/common.cpp:187 kicad-6996/common/common.cpp:179
 msgid "millimeters"
 msgstr "mm"
 
-#: common/common.cpp:179 eeschema/dialogs/dialog_edit_label_base.cpp:57
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:125
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:137
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:149
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:47
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:59
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:49
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:72
+#: kicad-6297/common/common.cpp:191
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:57
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:125
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:137
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:149
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:47
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:59
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:49
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:72
+#: kicad-6996/common/common.cpp:183
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:57
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:127
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:139
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:151
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:47
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:59
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:49
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:72
 msgid "units"
 msgstr "単位"
 
-#: common/common.cpp:198
+#: kicad-6297/common/common.cpp:210 kicad-6996/common/common.cpp:202
 msgid "in"
 msgstr "inch"
 
-#: common/common.cpp:209 pcbnew/dialogs/dialog_create_array_base.cpp:219
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:63
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:141
+#: kicad-6297/common/common.cpp:221
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:221
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:141
+#: kicad-6996/common/common.cpp:213
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:220
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:145
 msgid "deg"
 msgstr "度"
 
-#: common/common.cpp:414
+#: kicad-6297/common/common.cpp:426 kicad-6996/common/common.cpp:418
 #, c-format
 msgid "Cannot make path '%s' absolute with respect to '%s'."
 msgstr "絶対パス '%s' を '%s' について設定できません."
 
-#: common/common.cpp:432
+#: kicad-6297/common/common.cpp:444 kicad-6996/common/common.cpp:436
 #, c-format
 msgid "Output directory '%s' created.\n"
 msgstr "出力ディレクトリ '%s' が生成されました。\n"
 
-#: common/common.cpp:441
+#: kicad-6297/common/common.cpp:453 kicad-6996/common/common.cpp:445
 #, c-format
 msgid "Cannot create output directory '%s'.\n"
 msgstr "出力ディレクトリが作成できませんでした！ '%s'.\n"
 
-#: common/confirm.cpp:75 common/pgm_base.cpp:827
-#: eeschema/dialogs/dialog_color_config.cpp:277 eeschema/symbedit.cpp:111
+#: kicad-6297/common/confirm.cpp:75 kicad-6297/common/pgm_base.cpp:875
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:277
+#: kicad-6297/eeschema/symbedit.cpp:111 kicad-6996/common/confirm.cpp:74
+#: kicad-6996/common/pgm_base.cpp:890 kicad-6996/eeschema/symbedit.cpp:109
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:277
 msgid "Warning"
 msgstr "警告"
 
-#: common/confirm.cpp:80 kicad/prjconfig.cpp:143
-#: pcbnew/router/length_tuner_tool.cpp:171
+#: kicad-6297/common/confirm.cpp:80 kicad-6297/kicad/prjconfig.cpp:143
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:171
+#: kicad-6996/common/confirm.cpp:79 kicad-6996/kicad/prjconfig.cpp:140
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:170
 msgid "Error"
 msgstr "エラー"
 
-#: common/confirm.cpp:94
+#: kicad-6297/common/confirm.cpp:94 kicad-6996/common/confirm.cpp:93
 msgid "Info"
 msgstr "情報"
 
-#: common/confirm.cpp:114
+#: kicad-6297/common/confirm.cpp:114 kicad-6996/common/confirm.cpp:113
 msgid "Confirmation"
 msgstr "確認"
 
-#: common/dialog_about/AboutDialog_main.cpp:131
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:117
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:163
-#: eeschema/libedit.cpp:508 eeschema/sch_component.cpp:1539
-#: eeschema/viewlibs.cpp:308
-#: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:35
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:210 pcbnew/librairi.cpp:775
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:131
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:117
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:163
+#: kicad-6297/eeschema/libedit.cpp:508
+#: kicad-6297/eeschema/sch_component.cpp:1539
+#: kicad-6297/eeschema/viewlibs.cpp:308
+#: kicad-6297/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:210
+#: kicad-6297/pcbnew/librairi.cpp:823
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:83
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:129
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:117
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:163
+#: kicad-6996/eeschema/libedit.cpp:508
+#: kicad-6996/eeschema/sch_component.cpp:1563
+#: kicad-6996/eeschema/viewlibs.cpp:308
+#: kicad-6996/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:210
+#: kicad-6996/pcbnew/librairi.cpp:823
 msgid "Description"
 msgstr "説明"
 
-#: common/dialog_about/AboutDialog_main.cpp:135
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:135
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:133
 msgid ""
 "The KiCad EDA Suite is a set of open source applications for the creation of "
 "electronic schematics and to design printed circuit boards."
@@ -948,135 +1370,213 @@ msgstr ""
 "The KiCad EDA Suite は電気回路図作成及びプリント基板設計のための、オープン・"
 "ソース アプリケーション セットです。"
 
-#: common/dialog_about/AboutDialog_main.cpp:144
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:144
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:141
 msgid "KiCad on the web"
 msgstr "web上のKiCad"
 
-#: common/dialog_about/AboutDialog_main.cpp:151
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:151
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:148
 msgid "The official KiCad site"
 msgstr "KiCad オフィシャル サイト"
 
-#: common/dialog_about/AboutDialog_main.cpp:155
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:155
 msgid "The original site of the KiCad project founder"
 msgstr "KiCad 創始者のオリジナル サイト"
 
-#: common/dialog_about/AboutDialog_main.cpp:159
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:159
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:152
 msgid "Developer's website on Launchpad"
 msgstr "Launchpad 上の開発者向けサイト"
 
-#: common/dialog_about/AboutDialog_main.cpp:163
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:163
 msgid "Repository with additional component libraries"
 msgstr "追加のコンポーネント ライブラリのリポジトリ"
 
-#: common/dialog_about/AboutDialog_main.cpp:170
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:170
 msgid "Contribute to KiCad"
 msgstr "Kicadに貢献"
 
-#: common/dialog_about/AboutDialog_main.cpp:177
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:177
 msgid "Report bugs if you found any"
 msgstr "どんなバグでも見つけたらレポートしてください"
 
-#: common/dialog_about/AboutDialog_main.cpp:181
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:181
 msgid "File an idea for improvement"
 msgstr "改善のためのアイデアのファイル"
 
-#: common/dialog_about/AboutDialog_main.cpp:185
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:185
 msgid "KiCad links to user groups, tutorials and much more"
 msgstr "KiCadユーザグループへのリンク、チュートリアルなど"
 
-#: common/dialog_about/AboutDialog_main.cpp:199
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:199
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:210
 msgid "The complete KiCad EDA Suite is released under the"
 msgstr "KiCad EDAソフトウエアは、下記のラインセンスのもと提供されています："
 
-#: common/dialog_about/AboutDialog_main.cpp:201
+#: kicad-6297/common/dialog_about/AboutDialog_main.cpp:201
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:212
 msgid "GNU General Public License (GPL) version 3 or any later version"
 msgstr "GNU General Public License (GPL) のバージョン3 以降の全てのバージョン"
 
-#: common/dialog_about/dialog_about.cpp:84
+#: kicad-6297/common/dialog_about/dialog_about.cpp:84
+#: kicad-6996/common/dialog_about/dialog_about.cpp:116
 msgid "Information"
 msgstr "情報"
 
-#: common/dialog_about/dialog_about.cpp:87
+#: kicad-6297/common/dialog_about/dialog_about.cpp:87
+#: kicad-6996/common/dialog_about/dialog_about.cpp:119
 msgid "Developers"
 msgstr "開発者"
 
-#: common/dialog_about/dialog_about.cpp:88
+#: kicad-6297/common/dialog_about/dialog_about.cpp:88
+#: kicad-6996/common/dialog_about/dialog_about.cpp:120
 msgid "Doc Writers"
 msgstr "ドキュメント作成者"
 
-#: common/dialog_about/dialog_about.cpp:90
+#: kicad-6297/common/dialog_about/dialog_about.cpp:90
+#: kicad-6996/common/dialog_about/dialog_about.cpp:122
 msgid "Artists"
 msgstr "アーティスト"
 
-#: common/dialog_about/dialog_about.cpp:91
+#: kicad-6297/common/dialog_about/dialog_about.cpp:91
+#: kicad-6996/common/dialog_about/dialog_about.cpp:123
 msgid "Translators"
 msgstr "翻訳者"
 
-#: common/dialog_about/dialog_about.cpp:93
+#: kicad-6297/common/dialog_about/dialog_about.cpp:93
+#: kicad-6996/common/dialog_about/dialog_about.cpp:125
 msgid "Packagers"
 msgstr "パッケージャー"
 
-#: common/dialog_about/dialog_about.cpp:96
+#: kicad-6297/common/dialog_about/dialog_about.cpp:96
+#: kicad-6996/common/dialog_about/dialog_about.cpp:128
 msgid "License"
 msgstr "ライセンス"
 
-#: common/dialog_about/dialog_about_base.cpp:31
+#: kicad-6297/common/dialog_about/dialog_about_base.cpp:31
+#: kicad-6996/common/dialog_about/dialog_about_base.cpp:31
 msgid "App Title"
 msgstr "アプリケーション タイトル"
 
-#: common/dialog_about/dialog_about_base.cpp:37
+#: kicad-6297/common/dialog_about/dialog_about_base.cpp:37
+#: kicad-6996/common/dialog_about/dialog_about_base.cpp:37
 msgid "Copyright Info"
 msgstr "著作権情報"
 
-#: common/dialog_about/dialog_about_base.cpp:41
+#: kicad-6297/common/dialog_about/dialog_about_base.cpp:41
+#: kicad-6996/common/dialog_about/dialog_about_base.cpp:41
 msgid "Build Version Info"
 msgstr "ビルド バージョン情報"
 
-#: common/dialog_about/dialog_about_base.cpp:45
+#: kicad-6297/common/dialog_about/dialog_about_base.cpp:45
+#: kicad-6996/common/dialog_about/dialog_about_base.cpp:45
 msgid "Lib Version Info"
 msgstr "ライブラリ バージョン情報"
 
-#: common/dialogs/dialog_display_info_HTML_base.cpp:22 common/zoom.cpp:300
-#: eeschema/dialogs/dialog_annotate_base.cpp:212
-#: eeschema/dialogs/dialog_bom_base.cpp:62
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:134
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:53
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:125
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:109
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:113
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:107
-#: pcbnew/dialogs/dialog_find_base.cpp:45
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:186
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:95
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:58
-#: pcbnew/dialogs/dialog_plot_base.cpp:386
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:57
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:144
+#: kicad-6297/common/dialog_shim.cpp:125
+#: kicad-6297/common/dialogs/dialog_exit_base.cpp:69
+#: kicad-6297/common/dialogs/dialog_get_component_base.cpp:52
+#: kicad-6297/common/selcolor.cpp:237
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:49
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:133
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:70
+#: kicad-6297/eeschema/onrightclick.cpp:153
+#: kicad-6297/eeschema/onrightclick.cpp:186
+#: kicad-6297/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:182
+#: kicad-6297/gerbview/onrightclick.cpp:59
+#: kicad-6297/gerbview/onrightclick.cpp:81
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:115
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:55
+#: kicad-6297/pcbnew/modedit_onclick.cpp:229
+#: kicad-6297/pcbnew/modedit_onclick.cpp:272 kicad-6297/pcbnew/muonde.cpp:804
+#: kicad-6297/pcbnew/onrightclick.cpp:81 kicad-6297/pcbnew/onrightclick.cpp:97
+#: kicad-6996/common/dialog_shim.cpp:125
+#: kicad-6996/common/dialogs/dialog_exit_base.cpp:69
+#: kicad-6996/common/selcolor.cpp:176
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:49
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:133
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:70
+#: kicad-6996/eeschema/onrightclick.cpp:153
+#: kicad-6996/eeschema/onrightclick.cpp:186
+#: kicad-6996/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:182
+#: kicad-6996/gerbview/onrightclick.cpp:59
+#: kicad-6996/gerbview/onrightclick.cpp:81
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:115
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:55
+#: kicad-6996/pcbnew/modedit_onclick.cpp:228
+#: kicad-6996/pcbnew/modedit_onclick.cpp:271 kicad-6996/pcbnew/muonde.cpp:850
+#: kicad-6996/pcbnew/onrightclick.cpp:81 kicad-6996/pcbnew/onrightclick.cpp:97
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: kicad-6297/common/dialogs/dialog_display_info_HTML_base.cpp:22
+#: kicad-6297/common/zoom.cpp:300
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:212
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:134
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:53
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:125
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:109
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:107
+#: kicad-6297/pcbnew/dialogs/dialog_find_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:186
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:95
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:386
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:144
+#: kicad-6996/common/dialogs/dialog_display_info_HTML_base.cpp:22
+#: kicad-6996/common/zoom.cpp:300
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:212
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:101
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:128
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:53
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:125
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:107
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:129
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:107
+#: kicad-6996/pcbnew/dialogs/dialog_find_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:186
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:95
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:364
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:159
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb.cpp:127
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb_base.cpp:56
 msgid "Close"
 msgstr "閉じる"
 
-#: common/dialogs/dialog_env_var_config.cpp:105
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:105
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:105
 msgid "Invalid Input"
 msgstr "不正な入力"
 
-#: common/dialogs/dialog_env_var_config.cpp:119
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:119
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:119
 msgid "Environment variable name cannot be empty."
 msgstr "環境変数名は空欄にできません。"
 
-#: common/dialogs/dialog_env_var_config.cpp:129
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:129
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:129
 msgid "Environment variable value cannot be empty."
 msgstr "環境変数値は空欄にできません。"
 
-#: common/dialogs/dialog_env_var_config.cpp:140
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:140
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:140
 msgid ""
 "The first character of an environment variable name cannot be a digit (0-9)."
 msgstr "環境変数名の最初の文字に数字 (0-9) は使用できません。"
 
-#: common/dialogs/dialog_env_var_config.cpp:152
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:152
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:152
 msgid "Cannot have duplicate environment variable names."
 msgstr "重複した環境変数名を持つことはできません。"
 
-#: common/dialogs/dialog_env_var_config.cpp:255
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:255
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:255
 msgid ""
 "Enter the name and path for each environment variable.  Grey entries are "
 "names that have been defined externally at the system or user level.  "
@@ -1089,7 +1589,8 @@ msgstr ""
 "た環境変数は、このテーブルの定義に優先します。これは、このテーブルの定義が無"
 "視されることを意味します。"
 
-#: common/dialogs/dialog_env_var_config.cpp:261
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:261
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:261
 msgid ""
 "To ensure environment variable names are valid on all platforms, the name "
 "field will only accept upper case letters, digits, and the underscore "
@@ -1098,7 +1599,8 @@ msgstr ""
 "全てのプラットフォームで有効な環境変数名とするため、名前フィールドは大文字、"
 "数字、アンダースコアだけを受け付けます。"
 
-#: common/dialogs/dialog_env_var_config.cpp:264
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:264
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:264
 msgid ""
 "<b>KIGITHUB</b> is used by KiCad to define the URL of the repository of the "
 "official KiCad libraries."
@@ -1106,7 +1608,8 @@ msgstr ""
 "<b>KIGITHUB</b> は 、公式 KiCad ライブラリのリポジトリの URL を定義するために"
 "KiCad で使用されます。"
 
-#: common/dialogs/dialog_env_var_config.cpp:267
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:267
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:267
 msgid ""
 "<b>KISYS3DMOD</b> is the base path of system footprint 3D shapes (.3Dshapes "
 "folders)."
@@ -1114,7 +1617,8 @@ msgstr ""
 "<b>KISYS3DMOD</b> は、フットプリント 3D シェイプ用のシステムの基本パスです "
 "(.3Dshapes フォルダ)。"
 
-#: common/dialogs/dialog_env_var_config.cpp:270
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:270
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:270
 msgid ""
 "<b>KISYSMOD</b> is the base path of locally installed system footprint "
 "libraries (.pretty folders)."
@@ -1122,7 +1626,8 @@ msgstr ""
 "<b>KISYSMOD</b> は、フットプリント ライブラリ用にローカルでインストールされた"
 "システムの基本パスです (.pretty フォルダ)。"
 
-#: common/dialogs/dialog_env_var_config.cpp:273
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:273
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:273
 msgid ""
 "<b>KIPRJMOD</b> is internally defined by KiCad (cannot be edited) and is set "
 "to the absolute path of the currently loaded project file.  This environment "
@@ -1138,7 +1643,8 @@ msgstr ""
 "けられたプロジェクト固有のフットプリント ライブラリを含むフォルダとして定義で"
 "きます。"
 
-#: common/dialogs/dialog_env_var_config.cpp:279
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:279
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:279
 msgid ""
 "<b>KICAD_PTEMPLATES</b> is optional and can be defined if you want to create "
 "your own project templates folder."
@@ -1146,129 +1652,175 @@ msgstr ""
 "<b>KICAD_PTEMPLATES</b> は、オプションです。独自のプロジェクト・テンプレー"
 "ト・フォルダを作りたい場合に定義します。"
 
-#: common/dialogs/dialog_env_var_config.cpp:282
+#: kicad-6297/common/dialogs/dialog_env_var_config.cpp:282
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:379
+#: kicad-6996/common/dialogs/dialog_env_var_config.cpp:282
 msgid "Environment Variable Help"
 msgstr "環境変数に関するヘルプ"
 
-#: common/dialogs/dialog_env_var_config_base.cpp:38
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:82
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:183
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:181
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:151 eeschema/lib_pin.cpp:1977
-#: eeschema/libedit.cpp:477
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:26
-#: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:34
-#: pcbnew/dialogs/dialog_layers_setup.cpp:342
+#: kicad-6297/common/dialogs/dialog_env_var_config_base.cpp:38
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:197
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:184
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:151
+#: kicad-6297/eeschema/lib_pin.cpp:1977 kicad-6297/eeschema/libedit.cpp:477
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:26
+#: kicad-6297/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup.cpp:342
+#: kicad-6996/common/dialogs/dialog_env_var_config_base.cpp:38
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:200
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:184
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:316
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:319
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:182
+#: kicad-6996/eeschema/lib_pin.cpp:1990 kicad-6996/eeschema/libedit.cpp:477
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:26
+#: kicad-6996/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup.cpp:342
 msgid "Name"
 msgstr "名前"
 
-#: common/dialogs/dialog_env_var_config_base.cpp:39
+#: kicad-6297/common/dialogs/dialog_env_var_config_base.cpp:39
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:36
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:82
+#: kicad-6996/common/dialogs/dialog_env_var_config_base.cpp:39
 msgid "Path"
 msgstr "パス"
 
-#: common/dialogs/dialog_env_var_config_base.cpp:59
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:36
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:186
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:225
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:38
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:87
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:73
+#: kicad-6297/common/dialogs/dialog_env_var_config_base.cpp:59
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:36
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:186
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:225
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:38
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:73
+#: kicad-6996/common/dialogs/dialog_env_var_config_base.cpp:59
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:36
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:186
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:225
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:38
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:73
 msgid "Add"
 msgstr "追加"
 
-#: common/dialogs/dialog_env_var_config_base.cpp:60
+#: kicad-6297/common/dialogs/dialog_env_var_config_base.cpp:60
+#: kicad-6996/common/dialogs/dialog_env_var_config_base.cpp:60
 msgid "Add a new entry to the table."
 msgstr "テーブルへ項目を新規追加"
 
-#: common/dialogs/dialog_env_var_config_base.cpp:64
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:189
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:231
-#: pagelayout_editor/events_functions.cpp:573
-#: pagelayout_editor/onrightclick.cpp:103
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:62
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:55
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:63
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:71 pcbnew/onrightclick.cpp:650
-#: pcbnew/onrightclick.cpp:967 pcbnew/onrightclick.cpp:1019
+#: kicad-6297/common/dialogs/dialog_env_var_config_base.cpp:64
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:189
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:231
+#: kicad-6297/pagelayout_editor/events_functions.cpp:573
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:62
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:71
+#: kicad-6297/pcbnew/onrightclick.cpp:645
+#: kicad-6297/pcbnew/onrightclick.cpp:962
+#: kicad-6297/pcbnew/onrightclick.cpp:1014
+#: kicad-6996/common/dialogs/dialog_env_var_config_base.cpp:64
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:189
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:231
+#: kicad-6996/pagelayout_editor/events_functions.cpp:583
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:62
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:71
+#: kicad-6996/pcbnew/onrightclick.cpp:641
+#: kicad-6996/pcbnew/onrightclick.cpp:958
+#: kicad-6996/pcbnew/onrightclick.cpp:1010
 msgid "Delete"
 msgstr "削除"
 
-#: common/dialogs/dialog_env_var_config_base.cpp:65
-msgid "Remove the selectect entry from the table."
+#: kicad-6297/common/dialogs/dialog_env_var_config_base.cpp:65
+#: kicad-6996/common/dialogs/dialog_env_var_config_base.cpp:65
+msgid "Remove the selected entry from the table."
 msgstr "一覧より選択した項目を削除します。"
 
-#: common/dialogs/dialog_exit_base.cpp:34
+#: kicad-6297/common/dialogs/dialog_exit_base.cpp:34
+#: kicad-6996/common/dialogs/dialog_exit_base.cpp:34
 msgid "Save the changes before closing?"
 msgstr "閉じる前に変更を保存しますか？"
 
-#: common/dialogs/dialog_exit_base.cpp:43
+#: kicad-6297/common/dialogs/dialog_exit_base.cpp:43
+#: kicad-6996/common/dialogs/dialog_exit_base.cpp:43
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "保存しない場合、変更はすべて失われます．"
 
-#: common/dialogs/dialog_exit_base.cpp:62
+#: kicad-6297/common/dialogs/dialog_exit_base.cpp:62
+#: kicad-6996/common/dialogs/dialog_exit_base.cpp:62
 msgid "Save and Exit"
 msgstr "保存して終了"
 
-#: common/dialogs/dialog_exit_base.cpp:66
+#: kicad-6297/common/dialogs/dialog_exit_base.cpp:66
+#: kicad-6996/common/dialogs/dialog_exit_base.cpp:66
 msgid "Exit without Save"
 msgstr "保存しないで終了"
 
-#: common/dialogs/dialog_exit_base.cpp:69
-#: common/dialogs/dialog_get_component_base.cpp:52 common/selcolor.cpp:237
-#: eeschema/dialogs/dialog_netlist_base.cpp:49
-#: eeschema/dialogs/dialog_netlist_base.cpp:133
-#: eeschema/libedit_onrightclick.cpp:70 eeschema/onrightclick.cpp:153
-#: eeschema/onrightclick.cpp:186
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:182
-#: gerbview/onrightclick.cpp:59 gerbview/onrightclick.cpp:81
-#: pagelayout_editor/onrightclick.cpp:115
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:55
-#: pcbnew/modedit_onclick.cpp:229 pcbnew/modedit_onclick.cpp:272
-#: pcbnew/muonde.cpp:804 pcbnew/onrightclick.cpp:81 pcbnew/onrightclick.cpp:97
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: common/dialogs/dialog_get_component_base.cpp:22
-#: eeschema/dialogs/dialog_bom_base.cpp:44
-#: eeschema/dialogs/dialog_netlist_base.cpp:115
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:28
-#: pcbnew/librairi.cpp:608
+#: kicad-6297/common/dialogs/dialog_get_component_base.cpp:22
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:44
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:115
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:28
+#: kicad-6297/pcbnew/librairi.cpp:656
+#: kicad-6996/common/dialogs/dialog_get_component_base.cpp:25
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:45
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:115
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:28
+#: kicad-6996/pcbnew/librairi.cpp:656
 msgid "Name:"
 msgstr "名前:"
 
-#: common/dialogs/dialog_get_component_base.cpp:30
+#: kicad-6297/common/dialogs/dialog_get_component_base.cpp:30
+#: kicad-6996/common/dialogs/dialog_get_component_base.cpp:33
 msgid "History list:"
 msgstr "履歴リスト:"
 
-#: common/dialogs/dialog_get_component_base.cpp:45
-#: eeschema/dialogs/dialog_netlist_base.cpp:129
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:178
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:54
-#: pcbnew/dialogs/wizard_add_fplib.cpp:841 pcbnew/muonde.cpp:801
+#: kicad-6297/common/dialogs/dialog_get_component_base.cpp:45
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:129
+#: kicad-6297/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:178
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:841
+#: kicad-6297/pcbnew/muonde.cpp:801
+#: kicad-6996/common/dialog_about/dialog_about_base.cpp:73
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:129
+#: kicad-6996/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:178
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:841
+#: kicad-6996/pcbnew/muonde.cpp:847
 msgid "OK"
 msgstr "OK"
 
-#: common/dialogs/dialog_get_component_base.cpp:49
+#: kicad-6297/common/dialogs/dialog_get_component_base.cpp:49
+#: kicad-6996/common/dialogs/dialog_get_component_base.cpp:48
 msgid "Search by Keyword"
 msgstr "キーワードで検索"
 
-#: common/dialogs/dialog_get_component_base.cpp:55
+#: kicad-6297/common/dialogs/dialog_get_component_base.cpp:55
+#: kicad-6996/common/dialogs/dialog_get_component_base.cpp:51
 msgid "List All"
 msgstr "全てのリスト"
 
-#: common/dialogs/dialog_get_component_base.cpp:58
+#: kicad-6297/common/dialogs/dialog_get_component_base.cpp:58
+#: kicad-6996/common/dialogs/dialog_get_component_base.cpp:54
 msgid "Select by Browser"
 msgstr "ブラウザーで選択"
 
-#: common/dialogs/dialog_hotkeys_editor.cpp:45
+#: kicad-6297/common/dialogs/dialog_hotkeys_editor.cpp:45
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:564
 msgid "Command"
 msgstr "コマンド"
 
-#: common/dialogs/dialog_hotkeys_editor.cpp:46
+#: kicad-6297/common/dialogs/dialog_hotkeys_editor.cpp:46
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:565
 msgid "Hotkey"
 msgstr "ホットキー"
 
-#: common/dialogs/dialog_hotkeys_editor.cpp:370
+#: kicad-6297/common/dialogs/dialog_hotkeys_editor.cpp:370
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:535
 #, c-format
 msgid ""
 "<%s> is already assigned to \"%s\" in section \"%s\". Are you sure you want "
@@ -1277,70 +1829,100 @@ msgstr ""
 "<%s>は既に \"%s\" のセクション \"%s\" へ割り当てられています。本当に現在の割"
 "り当てを変更してもよろしいですか？"
 
-#: common/dialogs/dialog_hotkeys_editor.cpp:375
+#: kicad-6297/common/dialogs/dialog_hotkeys_editor.cpp:375
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:540
 msgid "Confirm change"
 msgstr "変更の確認"
 
-#: common/dialogs/dialog_hotkeys_editor_base.cpp:19
+#: kicad-6297/common/dialogs/dialog_hotkeys_editor_base.cpp:19
 msgid "Select a row and press a new key combination to alter the binding."
 msgstr "項目を選択し、新しいキーを押して割り当てを変更してください。"
 
-#: common/dialogs/dialog_hotkeys_editor_base.cpp:39
+#: kicad-6297/common/dialogs/dialog_hotkeys_editor_base.cpp:39
+#: kicad-6297/eeschema/hotkeys.cpp:124
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:89
+#: kicad-6297/pcbnew/hotkeys.cpp:193 kicad-6996/eeschema/hotkeys.cpp:124
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:92
+#: kicad-6996/pcbnew/hotkeys.cpp:194
 msgid "Undo"
 msgstr "元に戻す"
 
-#: common/dialogs/dialog_image_editor.cpp:130
+#: kicad-6297/common/dialogs/dialog_image_editor.cpp:130
+#: kicad-6996/common/dialogs/dialog_image_editor.cpp:139
 msgid "Incorrect scale number"
 msgstr "無効な倍率です"
 
-#: common/dialogs/dialog_image_editor.cpp:138
+#: kicad-6297/common/dialogs/dialog_image_editor.cpp:138
+#: kicad-6996/common/dialogs/dialog_image_editor.cpp:148
 msgid "Scale is too small for this image"
 msgstr "このイメージに対してスケール値が小さすぎます。"
 
-#: common/dialogs/dialog_image_editor.cpp:143
+#: kicad-6297/common/dialogs/dialog_image_editor.cpp:143
+#: kicad-6996/common/dialogs/dialog_image_editor.cpp:154
 msgid "Scale is too large for this image"
 msgstr "このイメージに対してスケール値が大きすぎます。"
 
-#: common/dialogs/dialog_image_editor_base.cpp:33
+#: kicad-6297/common/dialogs/dialog_image_editor_base.cpp:33
+#: kicad-6297/eeschema/hotkeys.cpp:168
+#: kicad-6996/common/dialogs/dialog_image_editor_base.cpp:33
+#: kicad-6996/eeschema/hotkeys.cpp:168
 msgid "Mirror X"
 msgstr "X軸で反転"
 
-#: common/dialogs/dialog_image_editor_base.cpp:36
+#: kicad-6297/common/dialogs/dialog_image_editor_base.cpp:36
+#: kicad-6297/eeschema/hotkeys.cpp:166
+#: kicad-6996/common/dialogs/dialog_image_editor_base.cpp:36
+#: kicad-6996/eeschema/hotkeys.cpp:166
 msgid "Mirror Y"
 msgstr "Y軸で反転"
 
-#: common/dialogs/dialog_image_editor_base.cpp:39
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:173
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:84
-#: pcbnew/modedit_onclick.cpp:290 pcbnew/onrightclick.cpp:1007
-#: pcbnew/tools/common_actions.cpp:121
+#: kicad-6297/common/dialogs/dialog_image_editor_base.cpp:39
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:173
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:82
+#: kicad-6297/pcbnew/modedit_onclick.cpp:290
+#: kicad-6297/pcbnew/onrightclick.cpp:1002
+#: kicad-6297/pcbnew/tools/common_actions.cpp:121
+#: kicad-6996/common/dialogs/dialog_image_editor_base.cpp:39
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:173
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:82
+#: kicad-6996/pcbnew/modedit_onclick.cpp:289
+#: kicad-6996/pcbnew/onrightclick.cpp:998
+#: kicad-6996/pcbnew/tools/common_actions.cpp:122
 msgid "Rotate"
 msgstr "回転"
 
-#: common/dialogs/dialog_image_editor_base.cpp:42
+#: kicad-6297/common/dialogs/dialog_image_editor_base.cpp:42
+#: kicad-6996/common/dialogs/dialog_image_editor_base.cpp:42
 msgid "Grey"
 msgstr "グレースケール"
 
-#: common/dialogs/dialog_image_editor_base.cpp:45
+#: kicad-6297/common/dialogs/dialog_image_editor_base.cpp:45
+#: kicad-6996/common/dialogs/dialog_image_editor_base.cpp:45
 msgid "Half Size"
 msgstr "半分のサイズ"
 
-#: common/dialogs/dialog_image_editor_base.cpp:49
+#: kicad-6297/common/dialogs/dialog_image_editor_base.cpp:49
+#: kicad-6996/common/dialogs/dialog_image_editor_base.cpp:49
 msgid "Undo Last"
 msgstr "一つ前のコマンドを元に戻す"
 
-#: common/dialogs/dialog_image_editor_base.cpp:52
+#: kicad-6297/common/dialogs/dialog_image_editor_base.cpp:52
+#: kicad-6996/common/dialogs/dialog_image_editor_base.cpp:52
 msgid "Image Scale:"
 msgstr "画像の倍率:"
 
-#: common/dialogs/dialog_list_selector_base.cpp:19
-#: common/dialogs/wx_html_report_panel_base.cpp:34
-#: eeschema/dialogs/dialog_choose_component_base.cpp:22
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:31
+#: kicad-6297/common/dialogs/dialog_list_selector_base.cpp:19
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:34
+#: kicad-6297/eeschema/dialogs/dialog_choose_component_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:31
+#: kicad-6996/common/dialogs/dialog_list_selector_base.cpp:19
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:34
+#: kicad-6996/eeschema/dialogs/dialog_choose_component_base.cpp:22
 msgid "Filter:"
 msgstr "フィルター: "
 
-#: common/dialogs/dialog_list_selector_base.cpp:21
+#: kicad-6297/common/dialogs/dialog_list_selector_base.cpp:21
+#: kicad-6996/common/dialogs/dialog_list_selector_base.cpp:21
 msgid ""
 "Enter a string to filter items.\n"
 "Only names containing this string will be listed"
@@ -1348,89 +1930,116 @@ msgstr ""
 "アイテムを抽出するために文字列を入力してください．\n"
 "入力した文字列を含む名前だけがリストされます．"
 
-#: common/dialogs/dialog_list_selector_base.cpp:28
+#: kicad-6297/common/dialogs/dialog_list_selector_base.cpp:28
+#: kicad-6996/common/dialogs/dialog_list_selector_base.cpp:28
 msgid "Items:"
 msgstr "アイテム: "
 
-#: common/dialogs/dialog_list_selector_base.cpp:37
-#: common/dialogs/wx_html_report_panel_base.cpp:14
-#: eeschema/dialogs/dialog_erc_base.cpp:68
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:146
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1172
-#: pcbnew/dialogs/dialog_drc_base.cpp:109
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:89
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:196
+#: kicad-6297/common/dialogs/dialog_list_selector_base.cpp:37
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:14
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:68
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:146
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1172
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:125
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:196
+#: kicad-6996/common/dialogs/dialog_list_selector_base.cpp:37
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:14
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:71
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1151
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:125
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:196
 msgid "Messages:"
 msgstr "メッセージ: "
 
-#: common/dialogs/dialog_page_settings.cpp:61
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:63
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:63
 msgid "A4 210x297mm"
 msgstr "A4 210x297mm"
 
-#: common/dialogs/dialog_page_settings.cpp:62
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:64
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:64
 msgid "A3 297x420mm"
 msgstr "A3 297x420mm"
 
-#: common/dialogs/dialog_page_settings.cpp:63
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:65
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:65
 msgid "A2 420x594mm"
 msgstr "A2 420x594mm"
 
-#: common/dialogs/dialog_page_settings.cpp:64
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:66
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:66
 msgid "A1 594x841mm"
 msgstr "A1 594x841mm"
 
-#: common/dialogs/dialog_page_settings.cpp:65
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:67
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:67
 msgid "A0 841x1189mm"
 msgstr "A0 841x1189mm"
 
-#: common/dialogs/dialog_page_settings.cpp:66
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:68
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:68
 msgid "A 8.5x11in"
 msgstr "A 8.5x11in"
 
-#: common/dialogs/dialog_page_settings.cpp:67
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:69
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:69
 msgid "B 11x17in"
 msgstr "B 11x17in"
 
-#: common/dialogs/dialog_page_settings.cpp:68
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:70
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:70
 msgid "C 17x22in"
 msgstr "C 17x22in"
 
-#: common/dialogs/dialog_page_settings.cpp:69
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:71
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:71
 msgid "D 22x34in"
 msgstr "D 22x34in"
 
-#: common/dialogs/dialog_page_settings.cpp:70
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:72
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:72
 msgid "E 34x44in"
 msgstr "E 34x44in"
 
-#: common/dialogs/dialog_page_settings.cpp:71
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:73
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:73
 msgid "USLetter 8.5x11in"
 msgstr "USLetter 8.5x11in"
 
-#: common/dialogs/dialog_page_settings.cpp:72
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:74
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:74
 msgid "USLegal 8.5x14in"
 msgstr "USLegal 8.5x14in"
 
-#: common/dialogs/dialog_page_settings.cpp:73
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:75
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:75
 msgid "USLedger 11x17in"
 msgstr "USLedger 11x17in"
 
-#: common/dialogs/dialog_page_settings.cpp:74
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:76
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:76
 msgid "User (Custom)"
-msgstr "ユーザ設定 (カスタム)"
+msgstr "ユーザー (カスタム)"
 
-#: common/dialogs/dialog_page_settings.cpp:267
-#: common/dialogs/dialog_page_settings.cpp:713
-#: common/dialogs/dialog_page_settings_base.cpp:46
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:270
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:716
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:46
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:272
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:718
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:46
 msgid "Portrait"
 msgstr "縦向き"
 
-#: common/dialogs/dialog_page_settings.cpp:431
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:434
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:436
 #, c-format
 msgid "Page layout description file <%s> not found. Abort"
 msgstr "図枠ファイル <%s> が見つかりませんでした。中断します。"
 
-#: common/dialogs/dialog_page_settings.cpp:462
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:465
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:467
 #, c-format
 msgid ""
 "Selected custom paper size\n"
@@ -1443,20 +2052,25 @@ msgstr ""
 "%.1f - %.1f %s!\n"
 "他の用紙サイズを選択しますか？"
 
-#: common/dialogs/dialog_page_settings.cpp:468
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:471
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:473
 msgid "Warning!"
 msgstr "警告!"
 
-#: common/dialogs/dialog_page_settings.cpp:715
-#: common/dialogs/dialog_page_settings_base.cpp:46
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:718
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:46
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:720
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:46
 msgid "Landscape"
 msgstr "横向き"
 
-#: common/dialogs/dialog_page_settings.cpp:801
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:804
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:806
 msgid "Select Page Layout Descr File"
 msgstr "図枠ファイルの選択"
 
-#: common/dialogs/dialog_page_settings.cpp:819
+#: kicad-6297/common/dialogs/dialog_page_settings.cpp:822
+#: kicad-6996/common/dialogs/dialog_page_settings.cpp:824
 #, c-format
 msgid ""
 "The page layout descr filename has changed.\n"
@@ -1471,329 +2085,444 @@ msgstr ""
 "(以下に代わって) \n"
 "'%s'"
 
-#: common/dialogs/dialog_page_settings_base.cpp:25
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:25
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:25
 msgid "Paper"
 msgstr "紙"
 
-#: common/dialogs/dialog_page_settings_base.cpp:36
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:36
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:36
 msgid "dummy text"
 msgstr "ダミーテキスト"
 
-#: common/dialogs/dialog_page_settings_base.cpp:42
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:22
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:131
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:131
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:125
 msgid "Orientation:"
 msgstr "角度:"
 
-#: common/dialogs/dialog_page_settings_base.cpp:52
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:52
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:52
 msgid "Custom Size:"
 msgstr "カスタムサイズ:"
 
-#: common/dialogs/dialog_page_settings_base.cpp:62
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:77
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:76
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:62
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:77
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:76
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:62
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:75
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:77
 msgid "Height:"
 msgstr "高さ:"
 
-#: common/dialogs/dialog_page_settings_base.cpp:68
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:68
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:68
 msgid "Custom paper height."
 msgstr "カスタム用紙の高さ"
 
-#: common/dialogs/dialog_page_settings_base.cpp:78
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:65
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:43
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:25
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:86
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:78
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:82
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:78
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:82
 msgid "Width:"
 msgstr "幅:"
 
-#: common/dialogs/dialog_page_settings_base.cpp:84
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:84
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:84
 msgid "Custom paper width."
 msgstr "カスタム用紙の幅"
 
-#: common/dialogs/dialog_page_settings_base.cpp:94
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:94
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:94
 msgid "Layout Preview"
 msgstr "レイアウトプレビュー"
 
-#: common/dialogs/dialog_page_settings_base.cpp:113
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:113
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:113
 msgid "Title Block Parameters"
 msgstr "図枠の設定"
 
-#: common/dialogs/dialog_page_settings_base.cpp:123
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:123
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:123
 #, c-format
 msgid "Number of sheets: %d"
 msgstr "シートの数: %d"
 
-#: common/dialogs/dialog_page_settings_base.cpp:130
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:130
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:130
 #, c-format
 msgid "Sheet number: %d"
 msgstr "シート番号: %d"
 
-#: common/dialogs/dialog_page_settings_base.cpp:140
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:140
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:140
 msgid "Issue Date"
 msgstr "変更日"
 
-#: common/dialogs/dialog_page_settings_base.cpp:153
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:112
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:153
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:112
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:153
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:112
 msgid "<<<"
 msgstr "<<<"
 
-#: common/dialogs/dialog_page_settings_base.cpp:159
-#: common/dialogs/dialog_page_settings_base.cpp:184
-#: common/dialogs/dialog_page_settings_base.cpp:209
-#: common/dialogs/dialog_page_settings_base.cpp:234
-#: common/dialogs/dialog_page_settings_base.cpp:259
-#: common/dialogs/dialog_page_settings_base.cpp:284
-#: common/dialogs/dialog_page_settings_base.cpp:309
-#: common/dialogs/dialog_page_settings_base.cpp:334
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:159
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:184
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:209
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:234
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:259
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:284
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:309
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:334
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:159
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:184
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:209
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:234
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:259
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:284
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:309
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:334
 msgid "Export to other sheets"
 msgstr "他のシートへエクスポート"
 
-#: common/dialogs/dialog_page_settings_base.cpp:171
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:171
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:171
 msgid "Revision"
 msgstr "リビジョン"
 
-#: common/dialogs/dialog_page_settings_base.cpp:196
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:196
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:196
 msgid "Title"
 msgstr "タイトル"
 
-#: common/dialogs/dialog_page_settings_base.cpp:221
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:221
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:221
 msgid "Company"
 msgstr "会社名"
 
-#: common/dialogs/dialog_page_settings_base.cpp:246
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:246
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:246
 msgid "Comment1"
 msgstr "コメント1"
 
-#: common/dialogs/dialog_page_settings_base.cpp:271
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:271
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:271
 msgid "Comment2"
 msgstr "コメント2"
 
-#: common/dialogs/dialog_page_settings_base.cpp:296
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:296
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:296
 msgid "Comment3"
 msgstr "コメント3"
 
-#: common/dialogs/dialog_page_settings_base.cpp:321
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:321
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:321
 msgid "Comment4"
 msgstr "コメント4"
 
-#: common/dialogs/dialog_page_settings_base.cpp:346
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:346
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:346
 msgid "Page layout description file"
 msgstr "図枠ファイル"
 
-#: common/dialogs/dialog_page_settings_base.cpp:356
-#: kicad/dialogs/dialog_template_selector_base.cpp:36
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:210
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:29
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:152
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:69
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:73
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:33
+#: kicad-6297/common/dialogs/dialog_page_settings_base.cpp:356
+#: kicad-6297/kicad/dialogs/dialog_template_selector_base.cpp:36
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:210
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:152
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:69
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:73
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:33
+#: kicad-6996/common/dialogs/dialog_page_settings_base.cpp:356
+#: kicad-6996/kicad/dialogs/dialog_template_selector_base.cpp:36
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:204
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:152
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:69
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:73
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:33
 msgid "Browse"
 msgstr "参照"
 
-#: common/dialogs/wx_html_report_panel.cpp:130
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:137
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:137
 msgid "<b>Error: </b></font><font size=2>"
 msgstr "<b>エラー: </b></font><font size=2>"
 
-#: common/dialogs/wx_html_report_panel.cpp:132
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:139
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:139
 msgid "<b>Warning: </b></font><font size=2>"
 msgstr "<b>警告: </b></font><font size=2>"
 
-#: common/dialogs/wx_html_report_panel.cpp:134
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:141
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:141
 msgid "<b>Info: </b>"
 msgstr "<b>情報: </b>"
 
-#: common/dialogs/wx_html_report_panel.cpp:148
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:155
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:155
 msgid "Error: "
 msgstr "エラー:"
 
-#: common/dialogs/wx_html_report_panel.cpp:150
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:157
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:157
 msgid "Warning: "
 msgstr "警告: "
 
-#: common/dialogs/wx_html_report_panel.cpp:152
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:159
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:159
 msgid "Info: "
 msgstr "情報: "
 
-#: common/dialogs/wx_html_report_panel.cpp:233
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:240
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:240
 msgid "Save report to file"
 msgstr "レポートをファイルに保存"
 
-#: common/dialogs/wx_html_report_panel.cpp:250
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:257
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:257
 #, c-format
 msgid "Cannot write report to file '%s'."
 msgstr "レポートをファイル '%s' へ書き出すことが出来ませんでした."
 
-#: common/dialogs/wx_html_report_panel.cpp:252
+#: kicad-6297/common/dialogs/wx_html_report_panel.cpp:259
+#: kicad-6996/common/dialogs/wx_html_report_panel.cpp:259
 msgid "File save error"
 msgstr "ファイル保存エラー"
 
-#: common/dialogs/wx_html_report_panel_base.cpp:38
-#: eeschema/lib_draw_item.cpp:68 eeschema/lib_draw_item.cpp:75
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:38
+#: kicad-6297/eeschema/lib_draw_item.cpp:68
+#: kicad-6297/eeschema/lib_draw_item.cpp:75
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:38
+#: kicad-6996/eeschema/lib_draw_item.cpp:68
+#: kicad-6996/eeschema/lib_draw_item.cpp:75
 msgid "All"
 msgstr "全て"
 
-#: common/dialogs/wx_html_report_panel_base.cpp:42
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:42
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:42
 msgid "Warnings"
 msgstr "警告"
 
-#: common/dialogs/wx_html_report_panel_base.cpp:47 gerbview/readgerb.cpp:182
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:47
+#: kicad-6297/gerbview/readgerb.cpp:182
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:47
+#: kicad-6996/gerbview/readgerb.cpp:66
 msgid "Errors"
 msgstr "エラー"
 
-#: common/dialogs/wx_html_report_panel_base.cpp:52
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:52
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:52
 msgid "Infos"
 msgstr "情報"
 
-#: common/dialogs/wx_html_report_panel_base.cpp:57
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:57
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:57
 msgid "Actions"
 msgstr "動作"
 
-#: common/dialogs/wx_html_report_panel_base.cpp:62
+#: kicad-6297/common/dialogs/wx_html_report_panel_base.cpp:62
+#: kicad-6996/common/dialogs/wx_html_report_panel_base.cpp:62
 msgid "Save report to file..."
 msgstr "レポートをファイルに保存..."
 
-#: common/draw_frame.cpp:164 common/draw_frame.cpp:481
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:31
-#: pagelayout_editor/pl_editor_frame.cpp:117
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:55
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:44
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:33
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:25
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:79
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:91
+#: kicad-6297/common/draw_frame.cpp:164 kicad-6297/common/draw_frame.cpp:481
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:31
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:117
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:76
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:87
+#: kicad-6996/common/draw_frame.cpp:189 kicad-6996/common/draw_frame.cpp:506
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:31
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:76
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:87
 msgid "Inches"
 msgstr "inch"
 
-#: common/draw_frame.cpp:322 cvpcb/class_DisplayFootprintsFrame.cpp:176
-#: pcbnew/tool_modedit.cpp:208 pcbnew/tool_pcb.cpp:335
+#: kicad-6297/common/draw_frame.cpp:322
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:176
+#: kicad-6297/pcbnew/tool_modedit.cpp:208 kicad-6297/pcbnew/tool_pcb.cpp:335
+#: kicad-6996/common/draw_frame.cpp:347
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:178
+#: kicad-6996/pcbnew/tool_modedit.cpp:211 kicad-6996/pcbnew/tool_pcb.cpp:335
 msgid "Hide grid"
 msgstr "グリッドを非表示"
 
-#: common/draw_frame.cpp:322
+#: kicad-6297/common/draw_frame.cpp:322 kicad-6996/common/draw_frame.cpp:347
 msgid "Show grid"
 msgstr "グリッドの表示"
 
-#: common/draw_frame.cpp:489
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:33
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:35
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:27
-#: pcbnew/footprint_wizard_frame.cpp:270
+#: kicad-6297/common/draw_frame.cpp:489
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:27
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:270
+#: kicad-6996/common/draw_frame.cpp:514
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:27
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:283
 msgid "Units"
 msgstr "単位"
 
-#: common/dsnlexer.cpp:39
+#: kicad-6297/common/dsnlexer.cpp:39 kicad-6996/common/dsnlexer.cpp:39
 msgid "clipboard"
 msgstr "クリップボード"
 
-#: common/dsnlexer.cpp:360 common/dsnlexer.cpp:368
+#: kicad-6297/common/dsnlexer.cpp:360 kicad-6297/common/dsnlexer.cpp:368
+#: kicad-6996/common/dsnlexer.cpp:360 kicad-6996/common/dsnlexer.cpp:368
 #, c-format
 msgid "Expecting '%s'"
 msgstr "例外 '%s'"
 
-#: common/dsnlexer.cpp:376 common/dsnlexer.cpp:392
+#: kicad-6297/common/dsnlexer.cpp:376 kicad-6297/common/dsnlexer.cpp:392
+#: kicad-6996/common/dsnlexer.cpp:376 kicad-6996/common/dsnlexer.cpp:392
 #, c-format
 msgid "Unexpected '%s'"
 msgstr "例外 '%s'"
 
-#: common/dsnlexer.cpp:384
+#: kicad-6297/common/dsnlexer.cpp:384 kicad-6996/common/dsnlexer.cpp:384
 #, c-format
 msgid "%s is a duplicate"
 msgstr "%s は重複しています"
 
-#: common/dsnlexer.cpp:437
+#: kicad-6297/common/dsnlexer.cpp:437 kicad-6996/common/dsnlexer.cpp:437
 #, c-format
 msgid "need a NUMBER for '%s'"
 msgstr "'%s'　のための番号が必要です"
 
-#: common/dsnlexer.cpp:709 common/dsnlexer.cpp:769
+#: kicad-6297/common/dsnlexer.cpp:709 kicad-6297/common/dsnlexer.cpp:769
+#: kicad-6996/common/dsnlexer.cpp:709 kicad-6996/common/dsnlexer.cpp:769
 msgid "Un-terminated delimited string"
 msgstr "区切り文字で囲まれていません"
 
-#: common/dsnlexer.cpp:731
+#: kicad-6297/common/dsnlexer.cpp:731 kicad-6996/common/dsnlexer.cpp:731
 msgid "String delimiter must be a single character of ', \", or $"
 msgstr "区切り文字は', \", か $の1文字にしてください"
 
-#: common/eda_doc.cpp:145 eeschema/dialogs/dialog_edit_component_in_lib.cpp:456
+#: kicad-6297/common/eda_doc.cpp:145
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:458
+#: kicad-6996/common/eda_doc.cpp:145
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:459
 msgid "Doc Files"
 msgstr "ドキュメント ファイル"
 
-#: common/eda_doc.cpp:160
+#: kicad-6297/common/eda_doc.cpp:160 kicad-6996/common/eda_doc.cpp:160
 #, c-format
 msgid "Doc File '%s' not found"
 msgstr "ドキュメントファイル '%s' が見つかりません"
 
-#: common/eda_doc.cpp:203
+#: kicad-6297/common/eda_doc.cpp:203 kicad-6996/common/eda_doc.cpp:203
 #, c-format
 msgid "Unknown MIME type for doc file <%s>"
 msgstr "ドキュメント ファイル <%s> の不明なMIMEタイプ"
 
-#: common/eda_text.cpp:378
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
-#: eeschema/dialogs/dialog_edit_label_base.cpp:76
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:92
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:97 eeschema/sch_text.cpp:758
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:109
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:104
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:100
+#: kicad-6297/common/eda_text.cpp:384
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:97
+#: kicad-6297/eeschema/sch_text.cpp:758
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:109
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:100
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:100
+#: kicad-6996/common/eda_text.cpp:424
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:95
+#: kicad-6996/eeschema/sch_text.cpp:764
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:109
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:109
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:99
 msgid "Italic"
 msgstr "斜体字"
 
-#: common/eda_text.cpp:379
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
-#: eeschema/dialogs/dialog_edit_label_base.cpp:76
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:92
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:97 eeschema/sch_text.cpp:758
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:90
+#: kicad-6297/common/eda_text.cpp:385
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:97
+#: kicad-6297/eeschema/sch_text.cpp:758
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:90
+#: kicad-6996/common/eda_text.cpp:425
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:95
+#: kicad-6996/eeschema/sch_text.cpp:764
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:90
 msgid "Bold"
 msgstr "太字"
 
-#: common/eda_text.cpp:380
+#: kicad-6297/common/eda_text.cpp:386 kicad-6996/common/eda_text.cpp:426
 msgid "Bold+Italic"
 msgstr "<b><i>斜太字</i></b>"
 
-#: common/footprint_info.cpp:324 common/footprint_info.cpp:345
-msgid "Errors were encountered loading footprints"
-msgstr "フットプリント読み込み中にエラーが発生しました"
-
-#: common/footprint_info.cpp:343
+#: kicad-6297/common/footprint_info.cpp:307
+#: kicad-6996/common/footprint_info.cpp:301
 msgid "Load Error"
 msgstr "読込みエラー"
 
-#: common/fp_lib_table.cpp:373
+#: kicad-6297/common/footprint_info.cpp:309
+#: kicad-6996/common/footprint_info.cpp:303
+msgid "Errors were encountered loading footprints:"
+msgstr "フットプリント読み込み中にエラーが発生しました:"
+
+#: kicad-6297/common/fp_lib_table.cpp:373
+#: kicad-6996/common/fp_lib_table.cpp:374
 #, c-format
 msgid "'%s' is a duplicate footprint library nickName"
 msgstr "フットプリント ライブラリのニックネーム<%s>は重複しています"
 
-#: common/fp_lib_table.cpp:620
+#: kicad-6297/common/fp_lib_table.cpp:620
+#: kicad-6996/common/fp_lib_table.cpp:621
 #, c-format
 msgid "fp-lib-table files contain no lib with nickname '%s'"
 msgstr "fp-lib-table ファイルは別名 '%s' のライブラリを含んでいません"
 
-#: common/fp_lib_table.cpp:716
+#: kicad-6297/common/fp_lib_table.cpp:716
+#: kicad-6996/common/fp_lib_table.cpp:717
 #, c-format
 msgid "Cannot create global library table path '%s'."
 msgstr "グローバル ライブラリ テーブルのパス '%s' が生成できません."
 
-#: common/fpid.cpp:185 common/fpid.cpp:202
+#: kicad-6297/common/fpid.cpp:185 kicad-6297/common/fpid.cpp:202
+#: kicad-6996/common/fpid.cpp:185 kicad-6996/common/fpid.cpp:202
 msgid "Illegal character found in FPID string"
 msgstr "FPID文字列中に不正な文字があります"
 
-#: common/fpid.cpp:306
+#: kicad-6297/common/fpid.cpp:306 kicad-6996/common/fpid.cpp:306
 msgid "Illegal character found in logical library name"
 msgstr "論理的なライブラリ名の中に不正な文字があります"
 
-#: common/fpid.cpp:323 new/sch_lpid.cpp:440
+#: kicad-6297/common/fpid.cpp:323 kicad-6297/new/sch_lpid.cpp:440
+#: kicad-6996/common/fpid.cpp:323 kicad-6996/new/sch_lpid.cpp:440
 msgid "Illegal character found in revision"
 msgstr "リビジョン中に不正な文字があります"
 
-#: common/gestfich.cpp:238
+#: kicad-6297/common/gestfich.cpp:233 kicad-6996/common/gestfich.cpp:233
 #, c-format
 msgid "Command <%s> could not found"
 msgstr "コマンド <%s> は見つかりません"
 
-#: common/gestfich.cpp:433
+#: kicad-6297/common/gestfich.cpp:376 kicad-6996/common/gestfich.cpp:376
 #, c-format
 msgid ""
 "Problem while running the PDF viewer\n"
@@ -1802,217 +2531,256 @@ msgstr ""
 "PDFビューア実行中に問題が発生しました\n"
 "コマンド: '%s'"
 
-#: common/gestfich.cpp:441
+#: kicad-6297/common/gestfich.cpp:384 kicad-6996/common/gestfich.cpp:384
 #, c-format
 msgid "Unable to find a PDF viewer for <%s>"
 msgstr "<%s> を開くためのPDFビューアが見つかりませんでした"
 
-#: common/grid_tricks.cpp:113
+#: kicad-6297/common/grid_tricks.cpp:113 kicad-6996/common/grid_tricks.cpp:115
 msgid "Cut\tCTRL+X"
 msgstr "切り取り\tCTRL+X"
 
-#: common/grid_tricks.cpp:113
+#: kicad-6297/common/grid_tricks.cpp:113 kicad-6996/common/grid_tricks.cpp:115
 msgid "Clear selected cells pasting original contents to clipboard"
 msgstr "クリップボードへ元の内容を保存して、選択したセルをクリア"
 
-#: common/grid_tricks.cpp:114
+#: kicad-6297/common/grid_tricks.cpp:114 kicad-6996/common/grid_tricks.cpp:116
 msgid "Copy\tCTRL+C"
 msgstr "コピー\tCTRL+C"
 
-#: common/grid_tricks.cpp:114
+#: kicad-6297/common/grid_tricks.cpp:114 kicad-6996/common/grid_tricks.cpp:116
 msgid "Copy selected cells to clipboard"
 msgstr "選択範囲をコピー"
 
-#: common/grid_tricks.cpp:115
+#: kicad-6297/common/grid_tricks.cpp:115 kicad-6996/common/grid_tricks.cpp:117
 msgid "Paste\tCTRL+V"
 msgstr "ペースト\tCTRL+V"
 
-#: common/grid_tricks.cpp:115
+#: kicad-6297/common/grid_tricks.cpp:115 kicad-6996/common/grid_tricks.cpp:117
 msgid "Paste clipboard cells to matrix at current cell"
 msgstr "現在のセル位置へ、クリップボードの内容を貼り付け"
 
-#: common/grid_tricks.cpp:116
+#: kicad-6297/common/grid_tricks.cpp:116 kicad-6996/common/grid_tricks.cpp:118
 msgid "Select All\tCTRL+A"
 msgstr "全て選択\tCtrl+A"
 
-#: common/grid_tricks.cpp:116
+#: kicad-6297/common/grid_tricks.cpp:116 kicad-6996/common/grid_tricks.cpp:118
 msgid "Select all cells"
 msgstr "すべてのセルを洗濯"
 
-#: common/hotkeys_basic.cpp:464 common/hotkeys_basic.cpp:493
-#: common/hotkeys_basic.cpp:497
+#: kicad-6297/common/hotkeys_basic.cpp:464
+#: kicad-6297/common/hotkeys_basic.cpp:493
+#: kicad-6297/common/hotkeys_basic.cpp:497
+#: kicad-6996/common/hotkeys_basic.cpp:458
+#: kicad-6996/common/hotkeys_basic.cpp:487
+#: kicad-6996/common/hotkeys_basic.cpp:491
 msgid "Hotkeys List"
 msgstr "ホットキーの一覧"
 
-#: common/hotkeys_basic.cpp:757
+#: kicad-6297/common/hotkeys_basic.cpp:757
+#: kicad-6996/common/hotkeys_basic.cpp:751
 msgid "Read Hotkey Configuration File:"
 msgstr "ホットキー設定ファイルの読込み:"
 
-#: common/hotkeys_basic.cpp:788
+#: kicad-6297/common/hotkeys_basic.cpp:788
+#: kicad-6996/common/hotkeys_basic.cpp:782
 msgid "Write Hotkey Configuration File:"
 msgstr "ホットキー設定ファイルの保存:"
 
-#: common/hotkeys_basic.cpp:817
+#: kicad-6297/common/hotkeys_basic.cpp:817
 msgid "&List Current Keys"
 msgstr "現在のキー設定の一覧(&L)"
 
-#: common/hotkeys_basic.cpp:818
+#: kicad-6297/common/hotkeys_basic.cpp:818
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:401
+#: kicad-6996/eeschema/menubar.cpp:513
+#: kicad-6996/eeschema/menubar_libedit.cpp:266
+#: kicad-6996/gerbview/menubar.cpp:234 kicad-6996/kicad/menubar.cpp:419
+#: kicad-6996/pagelayout_editor/menubar.cpp:161
+#: kicad-6996/pcbnew/menubar_modedit.cpp:348
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:651
 msgid "Displays the current hotkeys list and corresponding commands"
 msgstr "現在のホットキーリストと割り付けコマンドの表示"
 
-#: common/hotkeys_basic.cpp:823
+#: kicad-6297/common/hotkeys_basic.cpp:823
+#: kicad-6996/common/hotkeys_basic.cpp:810
 msgid "&Edit Hotkeys"
 msgstr "ホットキーの編集(&E)"
 
-#: common/hotkeys_basic.cpp:824
+#: kicad-6297/common/hotkeys_basic.cpp:824
+#: kicad-6996/common/hotkeys_basic.cpp:811
 msgid "Call the hotkeys editor"
 msgstr "ホットキーエディタの呼び出し"
 
-#: common/hotkeys_basic.cpp:831
+#: kicad-6297/common/hotkeys_basic.cpp:831
+#: kicad-6996/common/hotkeys_basic.cpp:818 kicad-6996/eeschema/menubar.cpp:409
 msgid "E&xport Hotkeys"
 msgstr "ホットキー設定のエクスポート(&X)"
 
-#: common/hotkeys_basic.cpp:832
+#: kicad-6297/common/hotkeys_basic.cpp:832
+#: kicad-6996/common/hotkeys_basic.cpp:819 kicad-6996/eeschema/menubar.cpp:410
 msgid "Create a hotkey configuration file to export the current hotkeys"
 msgstr ""
 "現在のホットキー構成をエクスポートするため、ホットキー設定ファイルを作成"
 
-#: common/hotkeys_basic.cpp:837
+#: kicad-6297/common/hotkeys_basic.cpp:837
+#: kicad-6996/common/hotkeys_basic.cpp:824 kicad-6996/eeschema/menubar.cpp:415
 msgid "&Import Hotkeys"
 msgstr "ホットキー設定のインポート(&I)"
 
-#: common/hotkeys_basic.cpp:838
+#: kicad-6297/common/hotkeys_basic.cpp:838
+#: kicad-6996/common/hotkeys_basic.cpp:825 kicad-6996/eeschema/menubar.cpp:416
 msgid "Load an existing hotkey configuration file"
 msgstr "既存のホットキー構成ファイルを読込む"
 
-#: common/hotkeys_basic.cpp:843
+#: kicad-6297/common/hotkeys_basic.cpp:843
+#: kicad-6996/common/hotkeys_basic.cpp:830
 msgid "&Hotkeys"
 msgstr "ホットキー(&H)"
 
-#: common/hotkeys_basic.cpp:844
+#: kicad-6297/common/hotkeys_basic.cpp:844
+#: kicad-6996/common/hotkeys_basic.cpp:831
 msgid "Hotkeys configuration and preferences"
 msgstr "ホットキーの設定と詳細"
 
-#: common/page_layout/page_layout_reader.cpp:820
+#: kicad-6297/common/page_layout/page_layout_reader.cpp:852
+#: kicad-6996/common/page_layout/page_layout_reader.cpp:853
 #, c-format
 msgid "The file <%s> was not fully read"
 msgstr "ファイル <%s> が最後まで読み込めませんでした"
 
-#: common/pcbcommon.cpp:47
+#: kicad-6297/common/pcbcommon.cpp:47 kicad-6996/common/pcbcommon.cpp:46
 msgid "No layers"
 msgstr "レイヤがありません"
 
-#: common/pcbcommon.cpp:67
+#: kicad-6297/common/pcbcommon.cpp:67 kicad-6996/common/pcbcommon.cpp:66
 msgid "Internal"
 msgstr "内層"
 
-#: common/pcbcommon.cpp:70
+#: kicad-6297/common/pcbcommon.cpp:70 kicad-6996/common/pcbcommon.cpp:69
 msgid "Non-copper"
 msgstr "非導体層"
 
-#: common/pgm_base.cpp:109 pcbnew/dialogs/dialog_design_rules_base.cpp:59
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:102
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:116
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:126
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:136
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:148
+#: kicad-6297/common/pgm_base.cpp:109
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:59
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:102
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:116
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:126
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:148
+#: kicad-6996/common/pgm_base.cpp:108
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:388
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:59
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:102
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:116
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:148
 msgid "Default"
 msgstr "標準"
 
-#: common/pgm_base.cpp:126
+#: kicad-6297/common/pgm_base.cpp:126 kicad-6996/common/pgm_base.cpp:125
 msgid "French"
 msgstr "フランス語"
 
-#: common/pgm_base.cpp:134
+#: kicad-6297/common/pgm_base.cpp:134 kicad-6996/common/pgm_base.cpp:133
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: common/pgm_base.cpp:142
+#: kicad-6297/common/pgm_base.cpp:142 kicad-6996/common/pgm_base.cpp:141
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: common/pgm_base.cpp:150
+#: kicad-6297/common/pgm_base.cpp:150 kicad-6996/common/pgm_base.cpp:149
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: common/pgm_base.cpp:158
+#: kicad-6297/common/pgm_base.cpp:158 kicad-6996/common/pgm_base.cpp:157
 msgid "Italian"
 msgstr "イタリア語"
 
-#: common/pgm_base.cpp:166
+#: kicad-6297/common/pgm_base.cpp:166 kicad-6996/common/pgm_base.cpp:165
 msgid "German"
 msgstr "ドイツ語"
 
-#: common/pgm_base.cpp:174
+#: kicad-6297/common/pgm_base.cpp:174 kicad-6996/common/pgm_base.cpp:173
 msgid "Greek"
 msgstr "ギリシャ語"
 
-#: common/pgm_base.cpp:182
+#: kicad-6297/common/pgm_base.cpp:182 kicad-6996/common/pgm_base.cpp:181
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: common/pgm_base.cpp:190
+#: kicad-6297/common/pgm_base.cpp:190 kicad-6996/common/pgm_base.cpp:197
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: common/pgm_base.cpp:198
+#: kicad-6297/common/pgm_base.cpp:198 kicad-6996/common/pgm_base.cpp:205
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: common/pgm_base.cpp:206
+#: kicad-6297/common/pgm_base.cpp:206 kicad-6996/common/pgm_base.cpp:213
 msgid "Czech"
 msgstr "チェコスロバキア語"
 
-#: common/pgm_base.cpp:214
+#: kicad-6297/common/pgm_base.cpp:214 kicad-6996/common/pgm_base.cpp:221
 msgid "Russian"
 msgstr "ロシア語"
 
-#: common/pgm_base.cpp:222
+#: kicad-6297/common/pgm_base.cpp:222 kicad-6996/common/pgm_base.cpp:229
 msgid "Korean"
 msgstr "韓国語"
 
-#: common/pgm_base.cpp:230
+#: kicad-6297/common/pgm_base.cpp:230 kicad-6996/common/pgm_base.cpp:237
 msgid "Chinese simplified"
 msgstr "簡体中国語"
 
-#: common/pgm_base.cpp:238
+#: kicad-6297/common/pgm_base.cpp:238 kicad-6996/common/pgm_base.cpp:245
 msgid "Catalan"
 msgstr "カタロニア語"
 
-#: common/pgm_base.cpp:246
+#: kicad-6297/common/pgm_base.cpp:246 kicad-6996/common/pgm_base.cpp:253
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: common/pgm_base.cpp:254
+#: kicad-6297/common/pgm_base.cpp:254 kicad-6996/common/pgm_base.cpp:261
 msgid "Japanese"
 msgstr "日本語"
 
-#: common/pgm_base.cpp:262
+#: kicad-6297/common/pgm_base.cpp:262 kicad-6996/common/pgm_base.cpp:269
 msgid "Bulgarian"
 msgstr "ブルガリア語"
 
-#: common/pgm_base.cpp:332
+#: kicad-6297/common/pgm_base.cpp:332 kicad-6996/common/pgm_base.cpp:347
 msgid "No default editor found, you must choose it"
 msgstr "デフォルトのエディタが指定されていません。エディタを指定して下さい。"
 
-#: common/pgm_base.cpp:339
-msgid "Preferred Editor:"
-msgstr "エディタの指定:"
+#: kicad-6297/common/pgm_base.cpp:352 kicad-6996/common/pgm_base.cpp:367
+msgid "Executable file (*.exe)|*.exe"
+msgstr "実行ファイル (*.exe)|*.exe"
 
-#: common/pgm_base.cpp:368
+#: kicad-6297/common/pgm_base.cpp:354 kicad-6996/common/pgm_base.cpp:369
+msgid "Executable file (*)|*"
+msgstr "実行ファイル (*)|*"
+
+#: kicad-6297/common/pgm_base.cpp:364 kicad-6996/common/pgm_base.cpp:379
+msgid "Select Preferred Editor"
+msgstr "好みのエディタの選択"
+
+#: kicad-6297/common/pgm_base.cpp:385 kicad-6996/common/pgm_base.cpp:400
 #, c-format
 msgid "%s is already running, Continue?"
 msgstr "%s は既に実行中です。続けますか？"
 
-#: common/pgm_base.cpp:744
+#: kicad-6297/common/pgm_base.cpp:792 kicad-6996/common/pgm_base.cpp:807
 msgid "Language"
 msgstr "言語"
 
-#: common/pgm_base.cpp:745
+#: kicad-6297/common/pgm_base.cpp:793 kicad-6996/common/pgm_base.cpp:808
 msgid "Select application language (only for testing!)"
 msgstr "アプリケーション言語の設定 (テスト用)"
 
-#: common/pgm_base.cpp:820
+#: kicad-6297/common/pgm_base.cpp:868 kicad-6996/common/pgm_base.cpp:883
 msgid ""
 "Warning!  Some of paths you have configured have been defined \n"
 "externally to the running process and will be temporarily overwritten."
@@ -2020,7 +2788,7 @@ msgstr ""
 "警告！ あなたが設定したいくつかのパスは、実行中のプロセスへ\n"
 "外部から定義され、現在のものを上書きします."
 
-#: common/pgm_base.cpp:822
+#: kicad-6297/common/pgm_base.cpp:870 kicad-6996/common/pgm_base.cpp:885
 msgid ""
 "The next time KiCad is launched, any paths that have already\n"
 "been defined are honored and any settings defined in the path\n"
@@ -2034,248 +2802,304 @@ msgstr ""
 "あれば、衝突している項目をリネームし、システム\n"
 "の環境変数定義を削除して下さい。"
 
-#: common/pgm_base.cpp:829
+#: kicad-6297/common/pgm_base.cpp:877 kicad-6996/common/pgm_base.cpp:892
 msgid "Do not show this message again."
 msgstr "二度とこのメッセージを表示しない"
 
-#: common/project.cpp:247
+#: kicad-6297/common/project.cpp:247 kicad-6996/common/project.cpp:247
 #, c-format
 msgid "Unable to find '%s' template config file."
 msgstr "'%s' テンプレート設定ファイルが見つかりませんでした。"
 
-#: common/project.cpp:270
+#: kicad-6297/common/project.cpp:270 kicad-6996/common/project.cpp:270
 #, c-format
 msgid "Cannot create prj file '%s' (Directory not writable)"
 msgstr ""
 "プロジェクトファイル '%s' を作成できません (ディレクトリは書き込み禁止)"
 
-#: common/richio.cpp:197
+#: kicad-6297/common/richio.cpp:191 kicad-6996/common/richio.cpp:200
 #, c-format
 msgid "Unable to open filename '%s' for reading"
 msgstr "読み込み用にファイル '%s' を開けません。"
 
-#: common/richio.cpp:241 common/richio.cpp:338
+#: kicad-6297/common/richio.cpp:235 kicad-6297/common/richio.cpp:332
+#: kicad-6996/common/richio.cpp:236 kicad-6996/common/richio.cpp:333
 msgid "Maximum line length exceeded"
 msgstr "ライン長が超過しています。"
 
-#: common/richio.cpp:303
+#: kicad-6297/common/richio.cpp:297 kicad-6996/common/richio.cpp:298
 msgid "Line length exceeded"
 msgstr "ライン長が超過しています。"
 
-#: common/richio.cpp:569
+#: kicad-6297/common/richio.cpp:563 kicad-6996/common/richio.cpp:564
 #, c-format
 msgid "cannot open or save file '%s'"
 msgstr "ファイル \"%s\" を読み込み、または保存できません"
 
-#: common/richio.cpp:588 pcbnew/legacy_plugin.cpp:3268
+#: kicad-6297/common/richio.cpp:582 kicad-6297/pcbnew/legacy_plugin.cpp:3269
+#: kicad-6996/common/richio.cpp:583
 #, c-format
 msgid "error writing to file '%s'"
 msgstr "'%s' ファイルの書き込み中のエラー"
 
-#: common/richio.cpp:609
+#: kicad-6297/common/richio.cpp:603 kicad-6996/common/richio.cpp:604
 msgid "OUTPUTSTREAM_OUTPUTFORMATTER write error"
 msgstr "OUTPUTSTREAM_OUTPUTFORMATTER 書き出しエラー"
 
-#: common/selcolor.cpp:85
+#: kicad-6297/common/selcolor.cpp:85 kicad-6996/common/selcolor.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:290
 msgid "Colors"
 msgstr "カラー"
 
-#: common/wildcards_and_files_ext.cpp:70
+#: kicad-6297/common/wildcards_and_files_ext.cpp:70
+#: kicad-6996/common/wildcards_and_files_ext.cpp:70
 msgid "KiCad drawing symbol file (*.sym)|*.sym"
 msgstr "Kicad図形シンボル ファイル (*.sym)|*.sym"
 
-#: common/wildcards_and_files_ext.cpp:71
+#: kicad-6297/common/wildcards_and_files_ext.cpp:71
+#: kicad-6996/common/wildcards_and_files_ext.cpp:71
 msgid "KiCad component library file (*.lib)|*.lib"
 msgstr "Kicadコンポーネント ライブラリ ファイル (*.lib)|*.lib"
 
-#: common/wildcards_and_files_ext.cpp:72
+#: kicad-6297/common/wildcards_and_files_ext.cpp:72
+#: kicad-6996/common/wildcards_and_files_ext.cpp:72
 msgid "KiCad project files (*.pro)|*.pro"
 msgstr "KiCad プロジェクト ファイル (*.pro)|*.pro"
 
-#: common/wildcards_and_files_ext.cpp:73
+#: kicad-6297/common/wildcards_and_files_ext.cpp:73
+#: kicad-6996/common/wildcards_and_files_ext.cpp:73
 msgid "KiCad schematic files (*.sch)|*.sch"
 msgstr "KiCad 回路図ファイル (*.sch)|*.sch"
 
-#: common/wildcards_and_files_ext.cpp:74
+#: kicad-6297/common/wildcards_and_files_ext.cpp:74
+#: kicad-6996/common/wildcards_and_files_ext.cpp:74
 msgid "KiCad netlist files (*.net)|*.net"
 msgstr "KiCad ネットリスト ファイル (*.net)|*.net"
 
-#: common/wildcards_and_files_ext.cpp:75
+#: kicad-6297/common/wildcards_and_files_ext.cpp:75
+#: kicad-6996/common/wildcards_and_files_ext.cpp:75
 msgid "Gerber files (*.pho)|*.pho"
 msgstr "ガーバー ファイル (.pho)|*.pho)"
 
-#: common/wildcards_and_files_ext.cpp:76
+#: kicad-6297/common/wildcards_and_files_ext.cpp:76
+#: kicad-6996/common/wildcards_and_files_ext.cpp:76
 msgid "KiCad printed circuit board files (*.brd)|*.brd"
 msgstr "KiCad プリント基板ファイル (*.brd)|*.brd"
 
-#: common/wildcards_and_files_ext.cpp:77
+#: kicad-6297/common/wildcards_and_files_ext.cpp:77
+#: kicad-6996/common/wildcards_and_files_ext.cpp:77
 msgid "Eagle ver. 6.x XML PCB files (*.brd)|*.brd"
 msgstr "Eagle ver. 6.x XML PCBファイル (*.brd)|*.brd"
 
-#: common/wildcards_and_files_ext.cpp:78
+#: kicad-6297/common/wildcards_and_files_ext.cpp:78
+#: kicad-6996/common/wildcards_and_files_ext.cpp:78
 msgid "P-Cad 200x ASCII PCB files (*.pcb)|*.pcb"
 msgstr "P-Cad 200x ASCII PCBファイル (*.pcb)|*.pcb"
 
-#: common/wildcards_and_files_ext.cpp:79
+#: kicad-6297/common/wildcards_and_files_ext.cpp:79
+#: kicad-6996/common/wildcards_and_files_ext.cpp:79
 msgid "KiCad s-expr printed circuit board files (*.kicad_pcb)|*.kicad_pcb"
 msgstr "KiCad Ｓ式プリント基板ファイル (*.kicad_pcb)|*.kicad_pcb"
 
-#: common/wildcards_and_files_ext.cpp:80
+#: kicad-6297/common/wildcards_and_files_ext.cpp:80
+#: kicad-6996/common/wildcards_and_files_ext.cpp:80
 msgid "KiCad footprint s-expre file (*.kicad_mod)|*.kicad_mod"
 msgstr "Kicad フットプリント Ｓ式ライブラリ ファイル (*.kicad_mod)|*.kicad_mod"
 
-#: common/wildcards_and_files_ext.cpp:81
+#: kicad-6297/common/wildcards_and_files_ext.cpp:81
+#: kicad-6996/common/wildcards_and_files_ext.cpp:81
 msgid "KiCad footprint s-expre library path (*.pretty)|*.pretty"
 msgstr "Kicad フットプリント Ｓ式ライブラリ パス  (*.pretty)|*.pretty"
 
-#: common/wildcards_and_files_ext.cpp:82
+#: kicad-6297/common/wildcards_and_files_ext.cpp:82
+#: kicad-6996/common/wildcards_and_files_ext.cpp:82
 msgid "Legacy footprint library file (*.mod)|*.mod"
 msgstr "レガシー フットプリント ライブラリ ファイル (*.mod)|*.mod"
 
-#: common/wildcards_and_files_ext.cpp:83
+#: kicad-6297/common/wildcards_and_files_ext.cpp:83
+#: kicad-6996/common/wildcards_and_files_ext.cpp:83
 msgid "Eagle ver. 6.x XML library files (*.lbr)|*.lbr"
 msgstr "Eagle ver. 6.x XML ライブラリファイル (*.lbr)|*.lbr"
 
-#: common/wildcards_and_files_ext.cpp:84
+#: kicad-6297/common/wildcards_and_files_ext.cpp:84
+#: kicad-6996/common/wildcards_and_files_ext.cpp:84
 msgid "Geda PCB footprint library file (*.fp)|*.fp"
 msgstr "Geda PCB フットプリント ライブラリ ファイル (*.fp)|*.fp"
 
-#: common/wildcards_and_files_ext.cpp:85
+#: kicad-6297/common/wildcards_and_files_ext.cpp:85
 msgid "KiCad recorded macros (*.mcr)|*.mcr"
 msgstr "KiCad マクロ記録 (*.mcr)|*.mcr"
 
-#: common/wildcards_and_files_ext.cpp:86
+#: kicad-6297/common/wildcards_and_files_ext.cpp:86
+#: kicad-6996/common/wildcards_and_files_ext.cpp:85
 msgid "Component-footprint link file (*.cmp)|*cmp"
 msgstr "コンポーネント-フットプリント関連付けファイル (*.cmp)|*.cmp"
 
-#: common/wildcards_and_files_ext.cpp:87
+#: kicad-6297/common/wildcards_and_files_ext.cpp:87
+#: kicad-6996/common/wildcards_and_files_ext.cpp:86
 msgid "Page layout descr file (*.kicad_wks)|*kicad_wks"
 msgstr "図枠ファイル (*.kicad_wks)|*kicad_wks"
 
-#: common/wildcards_and_files_ext.cpp:89
+#: kicad-6297/common/wildcards_and_files_ext.cpp:89
+#: kicad-6996/common/wildcards_and_files_ext.cpp:88
 msgid "All files (*)|*"
 msgstr "全てのファイル (*)|*"
 
-#: common/wildcards_and_files_ext.cpp:92
+#: kicad-6297/common/wildcards_and_files_ext.cpp:92
+#: kicad-6996/common/wildcards_and_files_ext.cpp:91
 msgid "KiCad cmp/footprint link files (*.cmp)|*.cmp"
 msgstr "Kicad コンポーネント-フットプリント関連付けファイル (*.cmp)|*.cmp"
 
-#: common/wildcards_and_files_ext.cpp:95
+#: kicad-6297/common/wildcards_and_files_ext.cpp:95
+#: kicad-6996/common/wildcards_and_files_ext.cpp:94
 msgid "Drill files (*.drl)|*.drl;*.DRL"
 msgstr "ドリル ファイル (*.drl)|*.drl"
 
-#: common/wildcards_and_files_ext.cpp:96
+#: kicad-6297/common/wildcards_and_files_ext.cpp:96
+#: kicad-6996/common/wildcards_and_files_ext.cpp:95
 msgid "SVG files (*.svg)|*.svg;*.SVG"
 msgstr "SVGファイル (*.svg)|*.svg;*.SVG"
 
-#: common/wildcards_and_files_ext.cpp:97
+#: kicad-6297/common/wildcards_and_files_ext.cpp:97
+#: kicad-6996/common/wildcards_and_files_ext.cpp:96
 msgid "HTML files (*.html)|*.htm;*.html"
 msgstr "HTML ファイル (*.html)|*.htm;*.html"
 
-#: common/wildcards_and_files_ext.cpp:98
+#: kicad-6297/common/wildcards_and_files_ext.cpp:98
+#: kicad-6996/common/wildcards_and_files_ext.cpp:97
 msgid "Portable document format files (*.pdf)|*.pdf"
 msgstr "PDFファイル (*.pdf)|*.pdf"
 
-#: common/wildcards_and_files_ext.cpp:99
+#: kicad-6297/common/wildcards_and_files_ext.cpp:99
+#: kicad-6996/common/wildcards_and_files_ext.cpp:98
 msgid "PostScript files (.ps)|*.ps"
 msgstr "PostScript ファイル (.ps)|*.ps"
 
-#: common/wildcards_and_files_ext.cpp:100
+#: kicad-6297/common/wildcards_and_files_ext.cpp:100
+#: kicad-6996/common/wildcards_and_files_ext.cpp:99
 msgid "Report files (*.rpt)|*.rpt"
 msgstr "レポートファイル (.rpt)|*.rpt"
 
-#: common/wildcards_and_files_ext.cpp:101
+#: kicad-6297/common/wildcards_and_files_ext.cpp:101
+#: kicad-6996/common/wildcards_and_files_ext.cpp:100
 msgid "Footprint place files (*.pos)|*.pos"
 msgstr "Footprint配置情報 (*.pos)|*.pos"
 
-#: common/wildcards_and_files_ext.cpp:102
+#: kicad-6297/common/wildcards_and_files_ext.cpp:102
+#: kicad-6996/common/wildcards_and_files_ext.cpp:101
 msgid "Vrml and x3d files (*.wrl *.x3d)|*.wrl;*.x3d"
 msgstr "Vrml / x3d ファイル (*.wrl *.x3d)|*.wrl;*.x3d"
 
-#: common/wildcards_and_files_ext.cpp:103
+#: kicad-6297/common/wildcards_and_files_ext.cpp:103
+#: kicad-6996/common/wildcards_and_files_ext.cpp:102
 msgid "IDFv3 component files (*.idf)|*.idf"
 msgstr "IDFv3 コンポーネントファイル (*.idf)|*.idf"
 
-#: common/wildcards_and_files_ext.cpp:104
+#: kicad-6297/common/wildcards_and_files_ext.cpp:104
+#: kicad-6996/common/wildcards_and_files_ext.cpp:103
 msgid "Text files (*.txt)|*.txt"
 msgstr "テキストファイル (*.txt)|*.txt"
 
-#: common/wxunittext.cpp:195
+#: kicad-6297/common/wxunittext.cpp:195 kicad-6996/common/wxunittext.cpp:142
 msgid "default "
 msgstr "標準"
 
-#: common/wxwineda.cpp:61
+#: kicad-6297/common/wxwineda.cpp:61 kicad-6996/common/wxwineda.cpp:61
 #, c-format
 msgid "Size%s"
 msgstr "サイズ %s"
 
-#: common/wxwineda.cpp:166 common/wxwineda.cpp:180
+#: kicad-6297/common/wxwineda.cpp:166 kicad-6297/common/wxwineda.cpp:180
+#: kicad-6996/common/wxwineda.cpp:166 kicad-6996/common/wxwineda.cpp:180
 msgid "Pos "
 msgstr "座標"
 
-#: common/wxwineda.cpp:170
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:90
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:54
+#: kicad-6297/common/wxwineda.cpp:170
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:90
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.cpp:54
+#: kicad-6996/common/wxwineda.cpp:170
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.cpp:54
 msgid "X"
 msgstr "X"
 
-#: common/wxwineda.cpp:183
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:102
+#: kicad-6297/common/wxwineda.cpp:183
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:102
+#: kicad-6996/common/wxwineda.cpp:183
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:98
 msgid "Y"
 msgstr "Y"
 
-#: common/zoom.cpp:246
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:54
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:62
-#: gerbview/class_GERBER.cpp:363 gerbview/class_GERBER.cpp:366
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:84
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:103
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:106
-#: pcbnew/tools/common_actions.cpp:206
+#: kicad-6297/common/zoom.cpp:246
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:52
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:60
+#: kicad-6297/gerbview/class_GERBER.cpp:363
+#: kicad-6297/gerbview/class_GERBER.cpp:366
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:84
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:106
+#: kicad-6297/pcbnew/tools/common_actions.cpp:206
+#: kicad-6996/common/zoom.cpp:246
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:52
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:60
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:346
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:349
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:84
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:105
+#: kicad-6996/pcbnew/tools/common_actions.cpp:207
 msgid "Center"
 msgstr "中央"
 
-#: common/zoom.cpp:254 eeschema/tool_viewlib.cpp:90
-#: gerbview/toolbars_gerber.cpp:86 pagelayout_editor/toolbars_pl_editor.cpp:87
-#: pcbnew/footprint_wizard_frame.cpp:608 pcbnew/tool_modedit.cpp:133
-#: pcbnew/tool_modview.cpp:94
+#: kicad-6297/common/zoom.cpp:254 kicad-6297/eeschema/tool_viewlib.cpp:90
+#: kicad-6297/gerbview/toolbars_gerber.cpp:86
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:87
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:608
+#: kicad-6297/pcbnew/tool_modedit.cpp:133 kicad-6297/pcbnew/tool_modview.cpp:94
+#: kicad-6996/common/zoom.cpp:254 kicad-6996/eeschema/tool_viewlib.cpp:90
+#: kicad-6996/gerbview/toolbars_gerber.cpp:86
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:88
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:625
+#: kicad-6996/pcbnew/tool_modedit.cpp:133 kicad-6996/pcbnew/tool_modview.cpp:94
 msgid "Zoom auto"
 msgstr "自動ズーム"
 
-#: common/zoom.cpp:260
+#: kicad-6297/common/zoom.cpp:260 kicad-6996/common/zoom.cpp:260
 msgid "Zoom select"
 msgstr "ズームの選択"
 
-#: common/zoom.cpp:273
+#: kicad-6297/common/zoom.cpp:273 kicad-6996/common/zoom.cpp:273
 msgid "Zoom: "
 msgstr "ズーム:"
 
-#: common/zoom.cpp:284
+#: kicad-6297/common/zoom.cpp:284 kicad-6996/common/zoom.cpp:284
 msgid "Grid Select"
 msgstr "グリッドの選択:"
 
-#: cvpcb/autosel.cpp:107
+#: kicad-6297/cvpcb/autosel.cpp:107 kicad-6996/cvpcb/autosel.cpp:107
 #, c-format
 msgid "Equivalence file '%s' could not be found in the default search paths."
 msgstr "等価ファイル '%s' は、デフォルトの検索パスに見つかりませんでした。"
 
-#: cvpcb/autosel.cpp:128
+#: kicad-6297/cvpcb/autosel.cpp:128 kicad-6996/cvpcb/autosel.cpp:128
 #, c-format
 msgid "Error opening equivalence file '%s'."
 msgstr "等価ファイル '%s' の読込みエラー"
 
-#: cvpcb/autosel.cpp:180
+#: kicad-6297/cvpcb/autosel.cpp:180 kicad-6996/cvpcb/autosel.cpp:180
 msgid "Equivalence File Load Error"
 msgstr "等価ファイルの読込みエラー"
 
-#: cvpcb/autosel.cpp:188
+#: kicad-6297/cvpcb/autosel.cpp:188 kicad-6996/cvpcb/autosel.cpp:188
 #, c-format
 msgid "%lu footprint/cmp equivalences found."
 msgstr "%lu 等価なフットプリント/コンポーネント が見つかりました。"
 
-#: cvpcb/autosel.cpp:254
+#: kicad-6297/cvpcb/autosel.cpp:254 kicad-6996/cvpcb/autosel.cpp:254
 #, c-format
 msgid ""
 "Component %s: footprint %s not found in any of the project footprint "
@@ -2284,120 +3108,160 @@ msgstr ""
 "コンポーネント %s: フットプリント %s は、どのプロジェクト フットプリント ライ"
 "ブラリにも存在しません。"
 
-#: cvpcb/autosel.cpp:288
+#: kicad-6297/cvpcb/autosel.cpp:288 kicad-6996/cvpcb/autosel.cpp:288
 msgid "CvPcb Warning"
 msgstr "CvPcb 警告"
 
-#: cvpcb/cfg.cpp:79 cvpcb/dialogs/dialog_config_equfiles.cpp:52
+#: kicad-6297/cvpcb/cfg.cpp:79
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles.cpp:52
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles.cpp:52
 #, c-format
 msgid "Project file: '%s'"
 msgstr "プロジェクトファイル: '%s'"
 
-#: cvpcb/cfg.cpp:84
+#: kicad-6297/cvpcb/cfg.cpp:84 kicad-6996/cvpcb/cfg.cpp:77
 #, c-format
 msgid "Project file '%s' is not writable"
 msgstr "プロジェクトファイル '%s' は書き込み禁止されています"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:75
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:75
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:75
 msgid "Footprint Viewer"
 msgstr "フットプリント ビューア"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:180 pcbnew/basepcbframe.cpp:466
-#: pcbnew/tool_pcb.cpp:338
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:180
+#: kicad-6297/pcbnew/basepcbframe.cpp:466 kicad-6297/pcbnew/tool_pcb.cpp:338
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:182
+#: kicad-6996/pcbnew/basepcbframe.cpp:472 kicad-6996/pcbnew/tool_pcb.cpp:338
 msgid "Display polar coordinates"
 msgstr "極座標表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:184 eeschema/tool_lib.cpp:232
-#: pcbnew/tool_modedit.cpp:216 pcbnew/tool_pcb.cpp:341
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:184
+#: kicad-6297/eeschema/tool_lib.cpp:232 kicad-6297/pcbnew/tool_modedit.cpp:216
+#: kicad-6297/pcbnew/tool_pcb.cpp:341
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:186
+#: kicad-6996/eeschema/tool_lib.cpp:235 kicad-6996/pcbnew/tool_modedit.cpp:219
+#: kicad-6996/pcbnew/tool_pcb.cpp:341
 msgid "Units in inches"
 msgstr "inch 単位"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:188 eeschema/tool_lib.cpp:236
-#: pcbnew/tool_modedit.cpp:220 pcbnew/tool_pcb.cpp:344
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:188
+#: kicad-6297/eeschema/tool_lib.cpp:236 kicad-6297/pcbnew/tool_modedit.cpp:220
+#: kicad-6297/pcbnew/tool_pcb.cpp:344
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:190
+#: kicad-6996/eeschema/tool_lib.cpp:239 kicad-6996/pcbnew/tool_modedit.cpp:223
+#: kicad-6996/pcbnew/tool_pcb.cpp:344
 msgid "Units in millimeters"
 msgstr "mm 単位"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:192 eeschema/tool_lib.cpp:240
-#: eeschema/tool_sch.cpp:285 gerbview/toolbars_gerber.cpp:167
-#: pcbnew/tool_pcb.cpp:347
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:192
+#: kicad-6297/eeschema/tool_lib.cpp:240 kicad-6297/eeschema/tool_sch.cpp:285
+#: kicad-6297/gerbview/toolbars_gerber.cpp:167
+#: kicad-6297/pcbnew/tool_pcb.cpp:347
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:195
+#: kicad-6996/eeschema/tool_lib.cpp:244 kicad-6996/eeschema/tool_sch.cpp:289
+#: kicad-6996/gerbview/toolbars_gerber.cpp:179
+#: kicad-6996/pcbnew/tool_pcb.cpp:349
 msgid "Change cursor shape"
 msgstr "カーソルの形状を変更"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:197 pcbnew/basepcbframe.cpp:476
-#: pcbnew/tool_pcb.cpp:377
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:197
+#: kicad-6297/pcbnew/basepcbframe.cpp:476 kicad-6297/pcbnew/tool_pcb.cpp:377
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:201
+#: kicad-6996/pcbnew/basepcbframe.cpp:482 kicad-6996/pcbnew/tool_pcb.cpp:376
 msgid "Show pads in outline mode"
 msgstr "アウトライン モードでパッドを表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:201
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:201
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:205
 msgid "Show texts in line mode"
 msgstr "テキストをラインモードで表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:205
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:205
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:209
 msgid "Show outlines in line mode"
 msgstr "外形をラインモードで表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:220
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:220
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:224
 msgid "Display options"
 msgstr "表示オプション"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:225
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:225
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:229
 msgid "Zoom in (F1)"
 msgstr "ズーム イン (F1)"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:228
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:228
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:232
 msgid "Zoom out (F2)"
 msgstr "ズーム アウト (F2)"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:231
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:231
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:235
 msgid "Redraw view (F3)"
 msgstr "ビューの再描画 (F3)"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:234
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:234
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:238
 msgid "Zoom auto (Home)"
 msgstr "自動ズーム (Home)"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:238
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:238
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:242
 msgid "3D Display (Alt+3)"
 msgstr "3D表示 (Alt+3)"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:250
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:250
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:254
 msgid "Show texts in filled mode"
 msgstr "塗りつぶしモードでテキストを表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:251
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:251
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:255
 msgid "Show texts in sketch mode"
 msgstr "スケッチモードでテキストを表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:265
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:265
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:269
 msgid "Show outlines in filled mode"
 msgstr "塗りつぶしモードで外形を表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:266
-#: pcbnew/dialogs/dialog_display_options_base.cpp:70
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:266
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:70
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:270
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:62
 msgid "Show outlines in sketch mode"
 msgstr "スケッチモードで外形を表示"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:401 pcbnew/moduleframe.cpp:691
-#: pcbnew/pcbframe.cpp:656
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:401
+#: kicad-6297/pcbnew/hotkeys.cpp:187 kicad-6297/pcbnew/moduleframe.cpp:691
+#: kicad-6297/pcbnew/pcbframe.cpp:656
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:408
+#: kicad-6996/pcbnew/hotkeys.cpp:188 kicad-6996/pcbnew/moduleframe.cpp:696
+#: kicad-6996/pcbnew/pcbframe.cpp:654
 msgid "3D Viewer"
 msgstr "3Dビューア"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:473
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:473
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:480
 #, c-format
 msgid "Footprint '%s' not found"
 msgstr "フットプリント '%s' が見つかりません。"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:489
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:489
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:496
 #, c-format
 msgid "Footprint: %s"
 msgstr "フットプリント: %s"
 
-#: cvpcb/class_DisplayFootprintsFrame.cpp:501
+#: kicad-6297/cvpcb/class_DisplayFootprintsFrame.cpp:501
+#: kicad-6996/cvpcb/class_DisplayFootprintsFrame.cpp:509
 #, c-format
 msgid "Lib: %s"
 msgstr "ライブラリ: %s"
 
-#: cvpcb/cvframe.cpp:246
+#: kicad-6297/cvpcb/cvframe.cpp:246 kicad-6996/cvpcb/cvpcb_mainframe.cpp:249
 msgid ""
 "Component to Footprint links modified.\n"
 "Save before exit ?"
@@ -2405,11 +3269,11 @@ msgstr ""
 "コンポーネントとフットプリントとの関連付けが変更されています。。\n"
 "終了前に保存しますか？"
 
-#: cvpcb/cvframe.cpp:373
+#: kicad-6297/cvpcb/cvframe.cpp:373 kicad-6996/cvpcb/cvpcb_mainframe.cpp:376
 msgid "Delete selections"
 msgstr "選択の削除"
 
-#: cvpcb/cvframe.cpp:453
+#: kicad-6297/cvpcb/cvframe.cpp:453 kicad-6996/cvpcb/cvpcb_mainframe.cpp:426
 #, c-format
 msgid ""
 "Error occurred saving the global footprint library table:\n"
@@ -2421,13 +3285,19 @@ msgstr ""
 "'%s'\n"
 "%s"
 
-#: cvpcb/cvframe.cpp:457 cvpcb/cvframe.cpp:477 pcbnew/moduleframe.cpp:864
-#: pcbnew/moduleframe.cpp:884 pcbnew/pcbnew_config.cpp:142
-#: pcbnew/pcbnew_config.cpp:164
+#: kicad-6297/cvpcb/cvframe.cpp:457 kicad-6297/cvpcb/cvframe.cpp:477
+#: kicad-6297/pcbnew/moduleframe.cpp:864 kicad-6297/pcbnew/moduleframe.cpp:884
+#: kicad-6297/pcbnew/pcbnew_config.cpp:142
+#: kicad-6297/pcbnew/pcbnew_config.cpp:164
+#: kicad-6996/cvpcb/cvpcb_mainframe.cpp:430
+#: kicad-6996/cvpcb/cvpcb_mainframe.cpp:450
+#: kicad-6996/pcbnew/moduleframe.cpp:871 kicad-6996/pcbnew/moduleframe.cpp:891
+#: kicad-6996/pcbnew/pcbnew_config.cpp:142
+#: kicad-6996/pcbnew/pcbnew_config.cpp:164
 msgid "File Save Error"
 msgstr "ファイル保存エラー"
 
-#: cvpcb/cvframe.cpp:473
+#: kicad-6297/cvpcb/cvframe.cpp:473 kicad-6996/cvpcb/cvpcb_mainframe.cpp:446
 #, c-format
 msgid ""
 "Error occurred saving the project footprint library table:\n"
@@ -2439,70 +3309,76 @@ msgstr ""
 "'%s'\n"
 "%s"
 
-#: cvpcb/cvframe.cpp:605
+#: kicad-6297/cvpcb/cvframe.cpp:606 kicad-6996/cvpcb/cvpcb_mainframe.cpp:639
 #, c-format
 msgid "Components: %d, unassigned: %d"
 msgstr "コンポーネント: %d  (未割付: %d)"
 
-#: cvpcb/cvframe.cpp:623
+#: kicad-6297/cvpcb/cvframe.cpp:624 kicad-6996/cvpcb/cvpcb_mainframe.cpp:657
 msgid "Filter list: "
 msgstr "フィルター: "
 
-#: cvpcb/cvframe.cpp:636 pcbnew/loadcmp.cpp:479
+#: kicad-6297/cvpcb/cvframe.cpp:637 kicad-6297/pcbnew/loadcmp.cpp:479
+#: kicad-6996/cvpcb/cvpcb_mainframe.cpp:670 kicad-6996/pcbnew/loadcmp.cpp:477
 msgid "Description: "
 msgstr "説明:"
 
-#: cvpcb/cvframe.cpp:639
+#: kicad-6297/cvpcb/cvframe.cpp:640 kicad-6996/cvpcb/cvpcb_mainframe.cpp:673
 msgid "Key words: "
 msgstr "キーワード: "
 
-#: cvpcb/cvframe.cpp:650
+#: kicad-6297/cvpcb/cvframe.cpp:651 kicad-6996/cvpcb/cvpcb_mainframe.cpp:684
 msgid "key words"
 msgstr "キーワード"
 
-#: cvpcb/cvframe.cpp:657
+#: kicad-6297/cvpcb/cvframe.cpp:658 kicad-6996/cvpcb/cvpcb_mainframe.cpp:691
 msgid "pin count"
 msgstr "ピン数"
 
-#: cvpcb/cvframe.cpp:665
+#: kicad-6297/cvpcb/cvframe.cpp:666 kicad-6996/cvpcb/cvpcb_mainframe.cpp:699
 msgid "library"
 msgstr "ライブラリ"
 
-#: cvpcb/cvframe.cpp:669
+#: kicad-6297/cvpcb/cvframe.cpp:670 kicad-6996/cvpcb/cvpcb_mainframe.cpp:711
 msgid "No filtering"
 msgstr "絞り込みなし"
 
-#: cvpcb/cvframe.cpp:671
+#: kicad-6297/cvpcb/cvframe.cpp:672 kicad-6996/cvpcb/cvpcb_mainframe.cpp:713
 #, c-format
 msgid "Filtered by %s"
 msgstr "フィルター: %s"
 
-#: cvpcb/cvframe.cpp:687
+#: kicad-6297/cvpcb/cvframe.cpp:688 kicad-6996/cvpcb/cvpcb_mainframe.cpp:729
 msgid ""
 "No PCB footprint libraries are listed in the current footprint library table."
 msgstr ""
 "現在の フットプリント ライブラリ テーブルには、 PCB フットプリント ライブラリ"
 "がありません。"
 
-#: cvpcb/cvframe.cpp:688
+#: kicad-6297/cvpcb/cvframe.cpp:689 kicad-6996/cvpcb/cvpcb_mainframe.cpp:730
 msgid "Configuration Error"
 msgstr "構成エラー"
 
-#: cvpcb/cvframe.cpp:711
+#: kicad-6297/cvpcb/cvframe.cpp:716 kicad-6996/cvpcb/cvpcb_mainframe.cpp:757
 #, c-format
 msgid "Project: '%s'"
 msgstr "プロジェクト: '%s'"
 
-#: cvpcb/cvframe.cpp:716 eeschema/libedit.cpp:61 eeschema/schframe.cpp:1312
-#: kicad/prjconfig.cpp:335 pcbnew/moduleframe.cpp:764 pcbnew/pcbframe.cpp:972
+#: kicad-6297/cvpcb/cvframe.cpp:721 kicad-6297/eeschema/libedit.cpp:61
+#: kicad-6297/eeschema/schframe.cpp:1312 kicad-6297/kicad/prjconfig.cpp:335
+#: kicad-6297/pcbnew/moduleframe.cpp:764 kicad-6297/pcbnew/pcbframe.cpp:984
+#: kicad-6996/cvpcb/cvpcb_mainframe.cpp:762 kicad-6996/eeschema/libedit.cpp:61
+#: kicad-6996/eeschema/schframe.cpp:1366 kicad-6996/kicad/prjconfig.cpp:334
+#: kicad-6996/pcbnew/moduleframe.cpp:771 kicad-6996/pcbnew/pcbframe.cpp:984
 msgid " [Read Only]"
 msgstr " [読み取り専用]"
 
-#: cvpcb/cvframe.cpp:719
+#: kicad-6297/cvpcb/cvframe.cpp:724 kicad-6996/cvpcb/cvpcb_mainframe.cpp:765
 msgid "[no project]"
 msgstr "[プロジェクトなし]"
 
-#: cvpcb/cvframe.cpp:762 pcbnew/netlist.cpp:93
+#: kicad-6297/cvpcb/cvframe.cpp:767 kicad-6297/pcbnew/netlist.cpp:93
+#: kicad-6996/cvpcb/cvpcb_mainframe.cpp:808 kicad-6996/pcbnew/netlist.cpp:99
 #, c-format
 msgid ""
 "Error loading netlist.\n"
@@ -2511,16 +3387,19 @@ msgstr ""
 "ネットリスト読み込み中のエラーです。\n"
 "%s"
 
-#: cvpcb/cvframe.cpp:763 pcbnew/dialogs/dialog_netlist.cpp:431
-#: pcbnew/netlist.cpp:94
+#: kicad-6297/cvpcb/cvframe.cpp:768
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:437
+#: kicad-6297/pcbnew/netlist.cpp:94 kicad-6996/cvpcb/cvpcb_mainframe.cpp:809
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:433
+#: kicad-6996/pcbnew/netlist.cpp:100
 msgid "Netlist Load Error"
 msgstr "ネットリストの読み込みエラー"
 
-#: cvpcb/cvpcb.cpp:57
+#: kicad-6297/cvpcb/cvpcb.cpp:57 kicad-6996/cvpcb/cvpcb.cpp:56
 msgid "Component/footprint equ files (*.equ)|*.equ"
 msgstr "コンポーネント/フットプリントのequファイル (*.equ)|*.equ"
 
-#: cvpcb/cvpcb.cpp:170
+#: kicad-6297/cvpcb/cvpcb.cpp:170 kicad-6996/cvpcb/cvpcb.cpp:168
 msgid ""
 "You have run CvPcb for the first time using the new footprint library table "
 "method for finding footprints.  CvPcb has either copied the default table or "
@@ -2536,7 +3415,8 @@ msgstr ""
 "ん。詳細は CvPcb マニュアルの \"フットプリント ライブラリ テーブル\" の章を参"
 "照して下さい。"
 
-#: cvpcb/cvpcb.cpp:184 pcbnew/pcbnew.cpp:360
+#: kicad-6297/cvpcb/cvpcb.cpp:184 kicad-6297/pcbnew/pcbnew.cpp:360
+#: kicad-6996/cvpcb/cvpcb.cpp:182 kicad-6996/pcbnew/pcbnew.cpp:350
 #, c-format
 msgid ""
 "An error occurred attempting to load the global footprint library table:\n"
@@ -2548,178 +3428,253 @@ msgstr ""
 "\n"
 "%s"
 
-#: cvpcb/dialogs/dialog_config_equfiles.cpp:99
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles.cpp:99
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles.cpp:99
 msgid "No editor defined in Kicad. Please chose it"
 msgstr "エディタが設定されていません。一つ選択してください。"
 
-#: cvpcb/dialogs/dialog_config_equfiles.cpp:259
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles.cpp:259
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles.cpp:253
 msgid "Equ files:"
 msgstr "Equファイル:"
 
-#: cvpcb/dialogs/dialog_config_equfiles.cpp:304
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles.cpp:304
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles.cpp:298
 #, c-format
 msgid "File '%s' already exists in list"
 msgstr "ファイル '%s' は既にリスト中に存在します"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:20
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:20
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:20
 msgid "Footprint/Component equ files (.equ files)"
 msgstr "フットプリント/コンポーネントequファイル(.equ ファイル)"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:39
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:48
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:93
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:78
-#: pcbnew/tools/common_actions.cpp:129
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:39
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:48
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:93
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:78
+#: kicad-6297/pcbnew/tools/common_actions.cpp:129
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:39
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:48
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:78
+#: kicad-6996/pcbnew/tools/common_actions.cpp:130
 msgid "Remove"
 msgstr "削除"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:40
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:49
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:40
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:49
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:40
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:49
 msgid "Unload the selected library"
 msgstr "選択したライブラリを削除"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:44
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:133
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:40
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:83
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:146
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:67
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:44
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:133
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:67
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:110
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:44
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:133
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:67
 msgid "Move Up"
 msgstr "上に移動"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:50
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:50
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:50
 msgid "Edit Equ File"
 msgstr "Equファイルの編集"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:65
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:65
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:65
 msgid "Available environment variables for relative paths:"
 msgstr "相対パス用の有効な環境変数:"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:83
-#: eeschema/dialogs/dialog_color_config.cpp:79
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:186
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:184
-#: eeschema/dialogs/dialog_rescue_each.cpp:108 eeschema/lib_field.cpp:581
-#: eeschema/lib_field.cpp:759 eeschema/onrightclick.cpp:423
-#: eeschema/sch_component.cpp:1518 eeschema/template_fieldnames.cpp:42
-#: pcbnew/class_edge_mod.cpp:261 pcbnew/class_text_mod.cpp:365
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:43
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:59
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:40
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:31
-#: pcbnew/footprint_wizard_frame.cpp:269
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:83
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:79
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:200
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:187
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:111
+#: kicad-6297/eeschema/lib_field.cpp:592 kicad-6297/eeschema/lib_field.cpp:770
+#: kicad-6297/eeschema/onrightclick.cpp:423
+#: kicad-6297/eeschema/sch_component.cpp:1518
+#: kicad-6297/eeschema/template_fieldnames.cpp:42
+#: kicad-6297/pcbnew/class_edge_mod.cpp:261
+#: kicad-6297/pcbnew/class_text_mod.cpp:365
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:59
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:31
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:269
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:83
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:203
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:187
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:110
+#: kicad-6996/eeschema/lib_field.cpp:592 kicad-6996/eeschema/lib_field.cpp:770
+#: kicad-6996/eeschema/onrightclick.cpp:426
+#: kicad-6996/eeschema/sch_component.cpp:1542
+#: kicad-6996/eeschema/template_fieldnames.cpp:42
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:79
+#: kicad-6996/pcbnew/class_edge_mod.cpp:261
+#: kicad-6996/pcbnew/class_text_mod.cpp:342
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:31
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:282
 msgid "Value"
 msgstr "定数"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:101
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:101
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:101
 msgid "Absolute path"
 msgstr "絶対パス"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:101
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:101
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:101
 msgid "Relative path"
 msgstr "相対パス"
 
-#: cvpcb/dialogs/dialog_config_equfiles_base.cpp:103
+#: kicad-6297/cvpcb/dialogs/dialog_config_equfiles_base.cpp:103
+#: kicad-6996/cvpcb/dialogs/dialog_config_equfiles_base.cpp:103
 msgid "Path option:"
 msgstr "環境変数の設定:"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:23
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:23
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:23
 msgid "Draw options"
 msgstr "表示オプション"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:25
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:25
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:25
 msgid "Graphic items sketch mode"
 msgstr "スケッチモードで図形アイテムを表示"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:28
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:28
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:28
 msgid "Texts sketch mode"
 msgstr "スケッチモードでテキストを表示"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:31
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:31
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:31
 msgid "Pad sketch mode"
 msgstr "スケッチモードでパッドを描画"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:34
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:34
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:34
 msgid "Show pad &number"
 msgstr "パッド番号を表示(&N)"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:41
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:84
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:163
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:41
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:163
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:41
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:151
 msgid "Pan and Zoom"
-msgstr "拡大縮小"
+msgstr "パンと拡大縮小"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:43
-msgid "Do not center and warp cusor on zoom"
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:43
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:86
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:43
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:86
+msgid "Do not center and warp cursor on zoom"
 msgstr "拡大縮小時にカーソルを中心へ移動させない"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:44
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:194
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:87
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:167
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:44
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:194
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:166
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.cpp:44
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:259
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:154
 msgid "Keep the cursor at its current location when zooming"
 msgstr "拡大縮小時に現在のカーソル位置を保持する"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:48
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:91
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:48
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:91
 msgid "Use middle mouse button to pan"
 msgstr "画面のパンにマウスの中ボタンを使う"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:51
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:94
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.cpp:51
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:94
 msgid "Limit panning to scroll size"
 msgstr "パン可能な領域を、スクロールバーサイズ範囲内に制限する"
 
-#: cvpcb/dialogs/fp_conflict_assignment_selector.cpp:37
+#: kicad-6297/cvpcb/dialogs/fp_conflict_assignment_selector.cpp:37
+#: kicad-6996/cvpcb/dialogs/fp_conflict_assignment_selector.cpp:37
 msgid "Ref"
 msgstr "リファレンス"
 
-#: cvpcb/dialogs/fp_conflict_assignment_selector.cpp:38
+#: kicad-6297/cvpcb/dialogs/fp_conflict_assignment_selector.cpp:38
+#: kicad-6996/cvpcb/dialogs/fp_conflict_assignment_selector.cpp:38
 msgid "Schematic assignment"
 msgstr "回路図の割り当て"
 
-#: cvpcb/dialogs/fp_conflict_assignment_selector.cpp:41
+#: kicad-6297/cvpcb/dialogs/fp_conflict_assignment_selector.cpp:41
+#: kicad-6996/cvpcb/dialogs/fp_conflict_assignment_selector.cpp:41
 msgid "Cmp file assignment"
 msgstr "Cmpファイルの割り当て"
 
-#: cvpcb/menubar.cpp:69
+#: kicad-6297/cvpcb/menubar.cpp:69
 msgid "&Save Edits\tCtrl+S"
 msgstr "編集を保存(&S)\tCtrl+S"
 
-#: cvpcb/menubar.cpp:76 eeschema/dialogs/dialog_erc_base.cpp:98
-#: eeschema/menubar.cpp:170 gerbview/menubar.cpp:145 kicad/menubar.cpp:279
-#: pagelayout_editor/menubar.cpp:111 pcbnew/menubar_pcbframe.cpp:274
+#: kicad-6297/cvpcb/menubar.cpp:76
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:98
+#: kicad-6297/eeschema/menubar.cpp:170 kicad-6297/gerbview/menubar.cpp:145
+#: kicad-6297/kicad/menubar.cpp:279
+#: kicad-6297/pagelayout_editor/menubar.cpp:111
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:274 kicad-6996/cvpcb/menubar.cpp:74
+#: kicad-6996/eeschema/menubar.cpp:168 kicad-6996/gerbview/menubar.cpp:145
+#: kicad-6996/kicad/menubar.cpp:282
+#: kicad-6996/pagelayout_editor/menubar.cpp:112
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:278
 msgid "&Close"
 msgstr "閉じる(&C)"
 
-#: cvpcb/menubar.cpp:76
+#: kicad-6297/cvpcb/menubar.cpp:76 kicad-6996/cvpcb/menubar.cpp:74
 msgid "Close CvPcb"
 msgstr "CvPcb の終了"
 
-#: cvpcb/menubar.cpp:83
+#: kicad-6297/cvpcb/menubar.cpp:83 kicad-6996/cvpcb/menubar.cpp:81
 msgid "Footprint Li&braries"
 msgstr "フットプリント ライブラリ(&B)"
 
-#: cvpcb/menubar.cpp:83 pcbnew/menubar_modedit.cpp:312
-#: pcbnew/menubar_pcbframe.cpp:489
+#: kicad-6297/cvpcb/menubar.cpp:83 kicad-6297/pcbnew/menubar_modedit.cpp:312
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:489 kicad-6996/cvpcb/menubar.cpp:81
+#: kicad-6996/pcbnew/menubar_modedit.cpp:311
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:493
 msgid "Configure footprint libraries"
 msgstr "フットプリント ライブラリの設定"
 
-#: cvpcb/menubar.cpp:89 kicad/menubar.cpp:306 pcbnew/menubar_modedit.cpp:318
-#: pcbnew/menubar_pcbframe.cpp:495
+#: kicad-6297/cvpcb/menubar.cpp:89 kicad-6297/kicad/menubar.cpp:306
+#: kicad-6297/pcbnew/menubar_modedit.cpp:318
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:495 kicad-6996/cvpcb/menubar.cpp:87
+#: kicad-6996/kicad/menubar.cpp:309 kicad-6996/pcbnew/menubar_modedit.cpp:317
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:499
 msgid "Configure Pa&ths"
 msgstr "環境変数の設定(&T)"
 
-#: cvpcb/menubar.cpp:90 kicad/menubar.cpp:307 pcbnew/menubar_modedit.cpp:319
-#: pcbnew/menubar_pcbframe.cpp:496
+#: kicad-6297/cvpcb/menubar.cpp:90 kicad-6297/kicad/menubar.cpp:307
+#: kicad-6297/pcbnew/menubar_modedit.cpp:319
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:496 kicad-6996/cvpcb/menubar.cpp:88
+#: kicad-6996/kicad/menubar.cpp:310 kicad-6996/pcbnew/menubar_modedit.cpp:318
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:500
 msgid "Edit path configuration environment variables"
 msgstr "環境変数の設定"
 
-#: cvpcb/menubar.cpp:94
+#: kicad-6297/cvpcb/menubar.cpp:94 kicad-6996/cvpcb/menubar.cpp:93
 msgid "Edit &Equ Files List"
 msgstr "Equファイルリストの編集(&E)"
 
-#: cvpcb/menubar.cpp:95
+#: kicad-6297/cvpcb/menubar.cpp:95 kicad-6996/cvpcb/menubar.cpp:94
 msgid ""
 "Setup equ files list (.equ files)\n"
 "They are files which give the footprint name from the component value"
@@ -2727,64 +3682,100 @@ msgstr ""
 "等価ファイル (.equ ファイル) のセットアップ\n"
 "これはコンポーネントの定数からフットプリント名を割り当てるためのファイルです"
 
-#: cvpcb/menubar.cpp:104
+#: kicad-6297/cvpcb/menubar.cpp:104 kicad-6996/cvpcb/menubar.cpp:105
 msgid "&Keep Open On Save"
 msgstr "保存後に終了しない(&K)"
 
-#: cvpcb/menubar.cpp:105
+#: kicad-6297/cvpcb/menubar.cpp:105 kicad-6996/cvpcb/menubar.cpp:106
 msgid "Prevent CvPcb from exiting after saving netlist file"
 msgstr "ネットリストファイル保存後もCvPcbを継続"
 
-#: cvpcb/menubar.cpp:113
+#: kicad-6297/cvpcb/menubar.cpp:113
 msgid "&Save Project File"
 msgstr "プロジェクトへ設定を保存(&S)"
 
-#: cvpcb/menubar.cpp:114
+#: kicad-6297/cvpcb/menubar.cpp:114
 msgid "Save changes to the project configuration file"
 msgstr "プロジェクト設定ファイルの変更を保存"
 
-#: cvpcb/menubar.cpp:124
+#: kicad-6297/cvpcb/menubar.cpp:124 kicad-6996/cvpcb/menubar.cpp:114
 msgid "CvPcb &Manual"
 msgstr "CvPcb マニュアル(&M)"
 
-#: cvpcb/menubar.cpp:125
+#: kicad-6297/cvpcb/menubar.cpp:125 kicad-6996/cvpcb/menubar.cpp:115
 msgid "Open CvPcb Manual"
 msgstr "CvPcb マニュアルを開く"
 
-#: cvpcb/menubar.cpp:130 eeschema/menubar.cpp:494
-#: eeschema/menubar_libedit.cpp:269 eeschema/tool_viewlib.cpp:255
-#: gerbview/menubar.cpp:230 kicad/menubar.cpp:412
-#: pagelayout_editor/menubar.cpp:157 pcbnew/menubar_modedit.cpp:346
-#: pcbnew/menubar_pcbframe.cpp:653 pcbnew/tool_modview.cpp:194
+#: kicad-6297/cvpcb/menubar.cpp:130 kicad-6297/eeschema/menubar.cpp:494
+#: kicad-6297/eeschema/menubar_libedit.cpp:269
+#: kicad-6297/eeschema/tool_viewlib.cpp:255 kicad-6297/gerbview/menubar.cpp:230
+#: kicad-6297/kicad/menubar.cpp:412
+#: kicad-6297/pagelayout_editor/menubar.cpp:157
+#: kicad-6297/pcbnew/menubar_modedit.cpp:346
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:653
+#: kicad-6297/pcbnew/tool_modview.cpp:194 kicad-6996/cvpcb/menubar.cpp:120
+#: kicad-6996/eeschema/menubar.cpp:506
+#: kicad-6996/eeschema/menubar_libedit.cpp:259
+#: kicad-6996/eeschema/tool_viewlib.cpp:252 kicad-6996/gerbview/menubar.cpp:227
+#: kicad-6996/kicad/menubar.cpp:412
+#: kicad-6996/pagelayout_editor/menubar.cpp:155
+#: kicad-6996/pcbnew/menubar_modedit.cpp:342
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:645
+#: kicad-6996/pcbnew/tool_modview.cpp:191
 msgid "&Getting Started in KiCad"
 msgstr "KiCad ことはじめ(&G)"
 
-#: cvpcb/menubar.cpp:131 eeschema/menubar.cpp:495 gerbview/menubar.cpp:231
-#: kicad/menubar.cpp:413 pagelayout_editor/menubar.cpp:158
+#: kicad-6297/cvpcb/menubar.cpp:131 kicad-6297/eeschema/menubar.cpp:495
+#: kicad-6297/gerbview/menubar.cpp:231 kicad-6297/kicad/menubar.cpp:413
+#: kicad-6297/pagelayout_editor/menubar.cpp:158
+#: kicad-6996/cvpcb/menubar.cpp:121 kicad-6996/eeschema/menubar.cpp:507
+#: kicad-6996/gerbview/menubar.cpp:228 kicad-6996/kicad/menubar.cpp:413
+#: kicad-6996/pagelayout_editor/menubar.cpp:156
 msgid "Open \"Getting Started in KiCad\" guide for beginners"
 msgstr "チュートリアル\"KiCad ことはじめ\"を開く"
 
-#: cvpcb/menubar.cpp:136 gerbview/menubar.cpp:240
-#: pagelayout_editor/menubar.cpp:167
+#: kicad-6297/cvpcb/menubar.cpp:136 kicad-6297/gerbview/menubar.cpp:240
+#: kicad-6297/pagelayout_editor/menubar.cpp:167
+#: kicad-6996/cvpcb/menubar.cpp:126 kicad-6996/gerbview/menubar.cpp:243
+#: kicad-6996/pagelayout_editor/menubar.cpp:170
 msgid "&About Kicad"
 msgstr "Kicad について(&A)"
 
-#: cvpcb/menubar.cpp:137 eeschema/menubar.cpp:502
-#: eeschema/menubar_libedit.cpp:279 gerbview/menubar.cpp:241
-#: kicad/menubar.cpp:422 pagelayout_editor/menubar.cpp:168
-#: pcbnew/menubar_modedit.cpp:354
+#: kicad-6297/cvpcb/menubar.cpp:137 kicad-6297/eeschema/menubar.cpp:502
+#: kicad-6297/eeschema/menubar_libedit.cpp:279
+#: kicad-6297/gerbview/menubar.cpp:241 kicad-6297/kicad/menubar.cpp:422
+#: kicad-6297/pagelayout_editor/menubar.cpp:168
+#: kicad-6297/pcbnew/menubar_modedit.cpp:354 kicad-6996/cvpcb/menubar.cpp:127
+#: kicad-6996/eeschema/menubar.cpp:520
+#: kicad-6996/eeschema/menubar_libedit.cpp:275
+#: kicad-6996/gerbview/menubar.cpp:244 kicad-6996/kicad/menubar.cpp:428
+#: kicad-6996/pagelayout_editor/menubar.cpp:171
+#: kicad-6996/pcbnew/menubar_modedit.cpp:355
 msgid "About KiCad"
 msgstr "KiCad について"
 
-#: cvpcb/menubar.cpp:143 eeschema/menubar.cpp:512
-#: eeschema/menubar_libedit.cpp:288 eeschema/tool_viewlib.cpp:270
-#: gerbview/menubar.cpp:248 kicad/menubar.cpp:430
-#: pagelayout_editor/menubar.cpp:174 pcbnew/menubar_modedit.cpp:364
-#: pcbnew/menubar_pcbframe.cpp:673 pcbnew/tool_modview.cpp:209
+#: kicad-6297/cvpcb/menubar.cpp:143 kicad-6297/eeschema/menubar.cpp:512
+#: kicad-6297/eeschema/menubar_libedit.cpp:288
+#: kicad-6297/eeschema/tool_viewlib.cpp:270 kicad-6297/gerbview/menubar.cpp:248
+#: kicad-6297/kicad/menubar.cpp:430
+#: kicad-6297/pagelayout_editor/menubar.cpp:174
+#: kicad-6297/pcbnew/menubar_modedit.cpp:364
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:673
+#: kicad-6297/pcbnew/tool_modview.cpp:209
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:397
+#: kicad-6996/cvpcb/menubar.cpp:133 kicad-6996/eeschema/menubar.cpp:530
+#: kicad-6996/eeschema/menubar_libedit.cpp:284
+#: kicad-6996/eeschema/tool_viewlib.cpp:267 kicad-6996/gerbview/menubar.cpp:251
+#: kicad-6996/kicad/menubar.cpp:436
+#: kicad-6996/pagelayout_editor/menubar.cpp:177
+#: kicad-6996/pcbnew/menubar_modedit.cpp:365
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:670
+#: kicad-6996/pcbnew/tool_modview.cpp:206
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: cvpcb/readwrite_dlgs.cpp:196
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:196
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:196
 msgid ""
 "Some of the assigned footprints are legacy entries (are missing lib "
 "nicknames). Would you like CvPcb to attempt to convert them to the new "
@@ -2796,29 +3787,34 @@ msgstr ""
 "択した場合、これらの配置は消去され、各々のフットプリントを手動で再配置する必"
 "要があります.)"
 
-#: cvpcb/readwrite_dlgs.cpp:229
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:229
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:229
 #, c-format
 msgid "Component '%s' footprint '%s' was <b>not found</b> in any library.\n"
 msgstr ""
 "コンポーネント '%s' フットプリント '%s' がどのライブラリからも<b>見つかりませ"
 "んでした</b>\n"
 
-#: cvpcb/readwrite_dlgs.cpp:237
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:237
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:237
 #, c-format
 msgid "Component '%s' footprint '%s' was found in <b>multiple</b> libraries.\n"
 msgstr ""
 "コンポーネント '%s' フットプリント '%s' が<b>複数のライブラリから</b>見つかり"
 "ました\n"
 
-#: cvpcb/readwrite_dlgs.cpp:250
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:250
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:250
 msgid "First check your footprint library table entries."
 msgstr "最初にフットプリント ライブラリ一覧の内容を確認して下さい。"
 
-#: cvpcb/readwrite_dlgs.cpp:252
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:252
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:252
 msgid "Problematic Footprint Library Tables"
 msgstr "フットプリント ライブラリのエラー"
 
-#: cvpcb/readwrite_dlgs.cpp:260
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:260
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:260
 msgid ""
 "The following errors occurred attempting to convert the footprint "
 "assignments:\n"
@@ -2827,7 +3823,8 @@ msgstr ""
 "フットプリントの割り当て処理中に下記のエラーが発生しました:\n"
 "\n"
 
-#: cvpcb/readwrite_dlgs.cpp:263
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:263
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:263
 msgid ""
 "\n"
 "You will need to reassign them manually if you want them to be updated "
@@ -2837,91 +3834,92 @@ msgstr ""
 "次回 Pcbnew にネットリストをインポートする時に正しくアップデートされているた"
 "めには、手動で再配置する必要があります"
 
-#: cvpcb/readwrite_dlgs.cpp:379
+#: kicad-6297/cvpcb/readwrite_dlgs.cpp:379
 msgid "Edits sent to Eeschema"
 msgstr "Eeschema へ編集内容を送る"
 
-#: cvpcb/tool_cvpcb.cpp:57
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:57 kicad-6996/cvpcb/tool_cvpcb.cpp:55
 msgid "Edit footprint library table"
 msgstr "フットプリント ライブラリ一覧の編集"
 
-#: cvpcb/tool_cvpcb.cpp:62
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:62 kicad-6996/cvpcb/tool_cvpcb.cpp:60
 msgid "View selected footprint"
 msgstr "選択したフットプリントを見る"
 
-#: cvpcb/tool_cvpcb.cpp:67
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:67 kicad-6996/cvpcb/tool_cvpcb.cpp:65
 msgid "Select previous unlinked component"
 msgstr "前の関連付けの無いコンポーネントを選択"
 
-#: cvpcb/tool_cvpcb.cpp:71
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:71 kicad-6996/cvpcb/tool_cvpcb.cpp:69
 msgid "Select next unlinked component"
 msgstr "次の関連付けの無いコンポーネントを選択"
 
-#: cvpcb/tool_cvpcb.cpp:76
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:76 kicad-6996/cvpcb/tool_cvpcb.cpp:74
 msgid "Perform automatic footprint association"
 msgstr "フットプリントの関連付けを自動実行する"
 
 # what is associations
-#: cvpcb/tool_cvpcb.cpp:80
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:80 kicad-6996/cvpcb/tool_cvpcb.cpp:78
 msgid "Delete all associations (links)"
 msgstr "全ての関連付けを削除"
 
-#: cvpcb/tool_cvpcb.cpp:85
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:85 kicad-6996/cvpcb/tool_cvpcb.cpp:83
 msgid "Display footprint documentation"
 msgstr "フットプリントのドキュメントを表示"
 
-#: cvpcb/tool_cvpcb.cpp:92
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:92
 msgid "Filter footprint list by keywords"
 msgstr "キーワードでフットプリントを絞込み"
 
-#: cvpcb/tool_cvpcb.cpp:99
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:99 kicad-6996/cvpcb/tool_cvpcb.cpp:97
 msgid "Filter footprint list by pin count"
 msgstr "ピン数でフットプリントを絞込み"
 
-#: cvpcb/tool_cvpcb.cpp:105
+#: kicad-6297/cvpcb/tool_cvpcb.cpp:105 kicad-6996/cvpcb/tool_cvpcb.cpp:103
 msgid "Filter footprint list by library"
 msgstr "ライブラリでフットプリントを絞込み"
 
-#: eeschema/annotate.cpp:87
+#: kicad-6297/eeschema/annotate.cpp:87 kicad-6996/eeschema/annotate.cpp:87
 #, c-format
 msgid "%d duplicate time stamps were found and replaced."
 msgstr "%d 重複したタイムスタンプが見つかり、置き換えられました。"
 
-#: eeschema/backanno.cpp:225
+#: kicad-6297/eeschema/backanno.cpp:225 kicad-6996/eeschema/backanno.cpp:225
 msgid "Load Component Footprint Link File"
 msgstr "コンポーネントとフットプリントの関連付けファイルの読み込み"
 
-#: eeschema/backanno.cpp:239
+#: kicad-6297/eeschema/backanno.cpp:239 kicad-6996/eeschema/backanno.cpp:239
 msgid "Keep existing footprint field visibility"
 msgstr "既存フットプリントのフィールドの表示設定を変更しない"
 
-#: eeschema/backanno.cpp:240
+#: kicad-6297/eeschema/backanno.cpp:240 kicad-6996/eeschema/backanno.cpp:240
 msgid "Show all footprint fields"
 msgstr "全てのフットプリント フィールドを表示"
 
-#: eeschema/backanno.cpp:241
+#: kicad-6297/eeschema/backanno.cpp:241 kicad-6996/eeschema/backanno.cpp:241
 msgid "Hide all footprint fields"
 msgstr "全てのフットプリント フィールドを隠す"
 
-#: eeschema/backanno.cpp:243
+#: kicad-6297/eeschema/backanno.cpp:243 kicad-6996/eeschema/backanno.cpp:243
 msgid "Select the footprint field visibility setting."
 msgstr "フットプリントのフィールドの表示設定を選択する."
 
-#: eeschema/backanno.cpp:244
+#: kicad-6297/eeschema/backanno.cpp:244 kicad-6996/eeschema/backanno.cpp:244
 msgid "Change Visibility"
 msgstr "表示設定の変更"
 
-#: eeschema/backanno.cpp:255
+#: kicad-6297/eeschema/backanno.cpp:255 kicad-6996/eeschema/backanno.cpp:255
 #, c-format
 msgid "Failed to open component-footprint link file '%s'"
 msgstr ""
 "コンポーネントとフットプリントの関連付けファイル '%s' が開けませんでした"
 
-#: eeschema/block.cpp:455
+#: kicad-6297/eeschema/block.cpp:455 kicad-6996/eeschema/block.cpp:455
 msgid "No item to paste."
 msgstr "ペーストするアイテムがありません！"
 
-#: eeschema/block.cpp:485 eeschema/sheet.cpp:248
+#: kicad-6297/eeschema/block.cpp:485 kicad-6297/eeschema/sheet.cpp:248
+#: kicad-6996/eeschema/block.cpp:485 kicad-6996/eeschema/sheet.cpp:248
 #, c-format
 msgid ""
 "The sheet changes cannot be made because the destination sheet already has "
@@ -2931,49 +3929,62 @@ msgstr ""
 "シートの変更ができません。保存先のシートは、既にシート <%s> を持っているか、"
 "階層のどこかで親シートとしてサブシートの一つに持っています."
 
-#: eeschema/class_drc_erc_item.cpp:40
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:40
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:40
 msgid "ERC err unspecified"
 msgstr "不明なERCエラー"
 
-#: eeschema/class_drc_erc_item.cpp:42
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:42
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:42
 msgid "Duplicate sheet names within a given sheet"
 msgstr "与えられたシートの中でシート名が重複しています"
 
-#: eeschema/class_drc_erc_item.cpp:44
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:44
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:44
 msgid "Pin not connected (and no connect symbol found on this pin)"
 msgstr ""
 "ピンは接続されていません (そして、このピンに接続するシンボルが見つかりません)"
 
-#: eeschema/class_drc_erc_item.cpp:46
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:46
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:46
 msgid "Pin connected to some others pins but no pin to drive it"
 msgstr "ピンは他のピンと接続されていますが、このピンを駆動するピンがありません"
 
-#: eeschema/class_drc_erc_item.cpp:48
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:48
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:48
 msgid "Conflict problem between pins. Severity: warning"
 msgstr "ピン間の衝突問題。　重大度: 警告"
 
-#: eeschema/class_drc_erc_item.cpp:50
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:50
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:50
 msgid "Conflict problem between pins. Severity: error"
 msgstr "ピン間の衝突問題。　重大度: エラー"
 
-#: eeschema/class_drc_erc_item.cpp:52
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:52
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:52
 msgid "Mismatch between hierarchical labels and pins sheets"
 msgstr "階層ラベルとピンシート間のミスマッチ"
 
-#: eeschema/class_drc_erc_item.cpp:54
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:54
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:54
 msgid "A no connect symbol is connected to more than 1 pin"
 msgstr "未接続シンボルが1つ以上のピンと接続しています"
 
-#: eeschema/class_drc_erc_item.cpp:56
+#: kicad-6297/eeschema/class_drc_erc_item.cpp:56
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:56
 msgid "Global label not connected to any other global label"
 msgstr ""
 "グローバル ラベルは、他のいかなるグローバル ラベルにも接続されていません。"
 
-#: eeschema/class_libentry.cpp:108 eeschema/class_libentry.cpp:268
+#: kicad-6297/eeschema/class_libentry.cpp:108
+#: kicad-6297/eeschema/class_libentry.cpp:268
+#: kicad-6996/eeschema/class_libentry.cpp:107
+#: kicad-6996/eeschema/class_libentry.cpp:267
 msgid "none"
 msgstr "なし"
 
-#: eeschema/class_libentry.cpp:531
+#: kicad-6297/eeschema/class_libentry.cpp:531
+#: kicad-6996/eeschema/class_libentry.cpp:530
 #, c-format
 msgid ""
 "An attempt was made to remove the %s field from component %s in library %s."
@@ -2981,7 +3992,8 @@ msgstr ""
 "フィールド %s を コンポーネント %s  (ライブラリ %s ) から削除しようとしまし"
 "た。"
 
-#: eeschema/class_library.cpp:52
+#: kicad-6297/eeschema/class_library.cpp:52
+#: kicad-6996/eeschema/class_library.cpp:50
 #, c-format
 msgid ""
 "Library '%s' has duplicate entry name '%s'.\n"
@@ -2991,62 +4003,75 @@ msgstr ""
 "ライブラリ '%s' は重複するエントリ名 '%s' を持っています。\n"
 "回路図にコンポーネントを読み込む際に予期せぬ動作が発生する可能性があります。"
 
-#: eeschema/class_library.cpp:299
+#: kicad-6297/eeschema/class_library.cpp:299
+#: kicad-6996/eeschema/class_library.cpp:213
 #, c-format
 msgid "Cannot add duplicate alias '%s' to library '%s'."
 msgstr "重複したエイリアス '%s' は ライブラリ '%s' に追加できません。"
 
-#: eeschema/class_library.cpp:466
+#: kicad-6297/eeschema/class_library.cpp:466
+#: kicad-6996/eeschema/class_library.cpp:376
 msgid "The component library file name is not set."
 msgstr "コンポーネント ライブラリ ファイル名がセットされていません。"
 
-#: eeschema/class_library.cpp:474
+#: kicad-6297/eeschema/class_library.cpp:474
+#: kicad-6996/eeschema/class_library.cpp:384
 msgid "The file could not be opened."
 msgstr "そのファイルは開けません。"
 
-#: eeschema/class_library.cpp:482
+#: kicad-6297/eeschema/class_library.cpp:482
+#: kicad-6996/eeschema/class_library.cpp:392
 msgid "The file is empty!"
 msgstr "ファイルが空です！"
 
-#: eeschema/class_library.cpp:505
+#: kicad-6297/eeschema/class_library.cpp:505
+#: kicad-6996/eeschema/class_library.cpp:415
 msgid "The file is NOT an Eeschema library!"
 msgstr "このファイルは Eeschema ライブラリではありません"
 
-#: eeschema/class_library.cpp:511
+#: kicad-6297/eeschema/class_library.cpp:511
+#: kicad-6996/eeschema/class_library.cpp:421
 msgid "The file header is missing version and time stamp information."
 msgstr "ファイルのヘッダからバージョンとタイムスタンプの情報が失われています。"
 
-#: eeschema/class_library.cpp:555
+#: kicad-6297/eeschema/class_library.cpp:555
+#: kicad-6996/eeschema/class_library.cpp:465
 msgid "An error occurred attempting to read the header."
 msgstr "ヘッダの読込み中にエラーが発生しました。"
 
-#: eeschema/class_library.cpp:584
+#: kicad-6297/eeschema/class_library.cpp:584
+#: kicad-6996/eeschema/class_library.cpp:494
 #, c-format
 msgid "Library '%s' component load error %s."
 msgstr "ライブラリ '%s' コンポーネント読込みエラー %s。"
 
-#: eeschema/class_library.cpp:656
+#: kicad-6297/eeschema/class_library.cpp:656
+#: kicad-6996/eeschema/class_library.cpp:564
 #, c-format
 msgid "Could not open component document library file '%s'."
 msgstr "コンポーネント ドキュメント ライブラリ ファイル '%s' を開けません."
 
-#: eeschema/class_library.cpp:663
+#: kicad-6297/eeschema/class_library.cpp:663
+#: kicad-6996/eeschema/class_library.cpp:571
 #, c-format
 msgid "Part document library file '%s' is empty."
 msgstr "コンポーネントのドキュメント ライブラリ ファイル '%s' が空です。"
 
-#: eeschema/class_library.cpp:671
+#: kicad-6297/eeschema/class_library.cpp:671
+#: kicad-6996/eeschema/class_library.cpp:579
 #, c-format
 msgid "File '%s' is not a valid component library document file."
 msgstr ""
 "ファイル '%s' は不正なコンポーネント ライブラリ ドキュメント ファイルです。"
 
-#: eeschema/class_library.cpp:1068
+#: kicad-6297/eeschema/class_library.cpp:1068
+#: kicad-6996/eeschema/class_library.cpp:954
 #, c-format
 msgid "Unable to load project's '%s' file"
 msgstr "プロジェクト '%s' をロードできません"
 
-#: eeschema/class_library.cpp:1159
+#: kicad-6297/eeschema/class_library.cpp:1159
+#: kicad-6996/eeschema/class_library.cpp:1045
 #, c-format
 msgid ""
 "Part library '%s' failed to load. Error:\n"
@@ -3055,7 +4080,8 @@ msgstr ""
 "パーツライブラリ '%s' の読み込みに失敗しました。エラー:\n"
 "%s"
 
-#: eeschema/class_library.cpp:1184
+#: kicad-6297/eeschema/class_library.cpp:1184
+#: kicad-6996/eeschema/class_library.cpp:1070
 #, c-format
 msgid ""
 "Part library '%s' failed to load.\n"
@@ -3064,95 +4090,132 @@ msgstr ""
 "パーツライブラリ '%s' の読み込みに失敗しました。エラー:\n"
 "エラー: %s"
 
-#: eeschema/component_references_lister.cpp:521
+#: kicad-6297/eeschema/component_references_lister.cpp:521
+#: kicad-6996/eeschema/component_references_lister.cpp:519
 #, c-format
 msgid "Item not annotated: %s%s (unit %d)\n"
 msgstr "次のアイテムがアノテートされませんでした: %s%s (ユニット %d)\n"
 
-#: eeschema/component_references_lister.cpp:528
+#: kicad-6297/eeschema/component_references_lister.cpp:528
+#: kicad-6996/eeschema/component_references_lister.cpp:526
 #, c-format
 msgid "Item not annotated: %s%s\n"
 msgstr "次のアイテムがアノテートされませんでした: %s%s\n"
 
-#: eeschema/component_references_lister.cpp:551
+#: kicad-6297/eeschema/component_references_lister.cpp:551
+#: kicad-6996/eeschema/component_references_lister.cpp:549
 #, c-format
 msgid "Error item %s%s unit %d and no more than %d parts\n"
 msgstr "エラー : アイテム %s%s ユニット %d は %d パーツしかありません\n"
 
-#: eeschema/component_references_lister.cpp:591
-#: eeschema/component_references_lister.cpp:623
+#: kicad-6297/eeschema/component_references_lister.cpp:591
+#: kicad-6297/eeschema/component_references_lister.cpp:623
+#: kicad-6996/eeschema/component_references_lister.cpp:589
+#: kicad-6996/eeschema/component_references_lister.cpp:621
 #, c-format
 msgid "Multiple item %s%s (unit %d)\n"
 msgstr "複数のアイテム %s%s (ユニット %d)\n"
 
-#: eeschema/component_references_lister.cpp:598
-#: eeschema/component_references_lister.cpp:630
+#: kicad-6297/eeschema/component_references_lister.cpp:598
+#: kicad-6297/eeschema/component_references_lister.cpp:630
+#: kicad-6996/eeschema/component_references_lister.cpp:596
+#: kicad-6996/eeschema/component_references_lister.cpp:628
 #, c-format
 msgid "Multiple item %s%s\n"
 msgstr "複数のアイテム %s%s\n"
 
-#: eeschema/component_references_lister.cpp:646
+#: kicad-6297/eeschema/component_references_lister.cpp:646
+#: kicad-6996/eeschema/component_references_lister.cpp:644
 #, c-format
 msgid "Different values for %s%d%s (%s) and %s%d%s (%s)"
 msgstr "定数に相違があります %s%d%s (%s) :: %s%d%s (%s)"
 
-#: eeschema/component_references_lister.cpp:681
+#: kicad-6297/eeschema/component_references_lister.cpp:681
+#: kicad-6996/eeschema/component_references_lister.cpp:679
 #, c-format
 msgid "Duplicate time stamp (%s) for %s%d and %s%d"
 msgstr "重複するタイムスタンプ - (%s) %s%d と %s%d のもの"
 
-#: eeschema/component_tree_search_container.cpp:203
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:25
-#: eeschema/lib_draw_item.cpp:72 eeschema/libedit.cpp:493
-#: eeschema/onrightclick.cpp:465
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:38
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:50
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:62
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:74
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:113
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:125
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:70
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:35
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:47
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:59
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:71
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:94
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:138
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:150
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:173
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:185
+#: kicad-6297/eeschema/component_tree_search_container.cpp:203
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:25
+#: kicad-6297/eeschema/lib_draw_item.cpp:72 kicad-6297/eeschema/libedit.cpp:493
+#: kicad-6297/eeschema/onrightclick.cpp:465
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:62
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:125
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:70
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:132
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:143
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:165
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:176
+#: kicad-6996/eeschema/component_tree_search_container.cpp:205
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:25
+#: kicad-6996/eeschema/lib_draw_item.cpp:72 kicad-6996/eeschema/libedit.cpp:493
+#: kicad-6996/eeschema/onrightclick.cpp:468
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:59
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:107
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:132
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:143
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:165
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:176
 msgid "Unit"
 msgstr "ユニット"
 
-#: eeschema/controle.cpp:164 eeschema/libeditframe.cpp:1251
+#: kicad-6297/eeschema/controle.cpp:164
+#: kicad-6297/eeschema/libeditframe.cpp:1251
+#: kicad-6996/eeschema/controle.cpp:164
+#: kicad-6996/eeschema/libeditframe.cpp:1278
 msgid "Clarify Selection"
 msgstr "明示的な選択:"
 
-#: eeschema/dialogs/dialog_annotate.cpp:195
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:195
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:195
 msgid "Clear and annotate all of the components on the entire schematic?"
 msgstr ""
 "全回路図の全てコンポーネントについて、アノテーションをクリアしてやり直します"
 "か？"
 
-#: eeschema/dialogs/dialog_annotate.cpp:197
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:197
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:197
 msgid "Clear and annotate all of the components on the current sheet?"
 msgstr ""
 "現在のシートの全てコンポーネントについて、アノテーションをクリアしてやり直し"
 "ますか？"
 
-#: eeschema/dialogs/dialog_annotate.cpp:203
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:203
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:203
 msgid "Annotate only the unannotated components on the entire schematic?"
 msgstr ""
 "全回路図のアノテートされていないコンポーネントに対してのみ、アノテーションを"
 "実行しますか？"
 
-#: eeschema/dialogs/dialog_annotate.cpp:205
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:205
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:205
 msgid "Annotate only the unannotated components on the current sheet?"
 msgstr ""
 "現在のシートのアノテートされていないコンポーネントに対してのみ、アノテーショ"
 "ンを実行しますか？"
 
-#: eeschema/dialogs/dialog_annotate.cpp:208
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:208
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:208
 msgid ""
 "\n"
 "\n"
@@ -3162,15 +4225,18 @@ msgstr ""
 "\n"
 "この操作は現在のアノテーションを変更し、取り消すことができません。"
 
-#: eeschema/dialogs/dialog_annotate.cpp:248
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:248
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:248
 msgid "Clear the existing annotation for the entire schematic?"
 msgstr "全回路図の既存のアノテーションを削除しますか？"
 
-#: eeschema/dialogs/dialog_annotate.cpp:250
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:250
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:250
 msgid "Clear the existing annotation for the current sheet?"
 msgstr "現在のシートの既存のアノテーションを削除しますか？"
 
-#: eeschema/dialogs/dialog_annotate.cpp:252
+#: kicad-6297/eeschema/dialogs/dialog_annotate.cpp:252
+#: kicad-6996/eeschema/dialogs/dialog_annotate.cpp:252
 msgid ""
 "\n"
 "\n"
@@ -3180,294 +4246,386 @@ msgstr ""
 "\n"
 "この操作は既存のアノテーションをクリアし、取り消すことができません。"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:28
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:28
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:28
 msgid "Scope"
 msgstr "実行範囲"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:37
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:37
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:37
 msgid "Use the &entire schematic"
 msgstr "全ての回路図、階層を使用(&E)"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:40
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:40
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:40
 msgid "Use the current &page only"
 msgstr "現在のページのみを使用(&P)"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:46
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:46
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:46
 msgid "&Keep existing annotation"
 msgstr "既存のアノテーションをキープ(&K)"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:49
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:49
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:49
 msgid "&Reset existing annotation"
 msgstr "既存のアノテーションをリセット(&R)"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:52
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:52
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:52
 msgid "R&eset, but do not swap any annotated multi-unit parts"
 msgstr ""
 "既存のアノテーションをリセット、ただし複数ユニットを持つ部品はキープ(&E)"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:61
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:61
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:61
 msgid "Annotation Order"
 msgstr "アノテーションの順番"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:73
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:73
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:73
 msgid "Sort components by &X position"
 msgstr "コンポーネントを X位置でソート(&X)"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:88
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:88
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:88
 msgid "Sort components by &Y position"
 msgstr "コンポーネントを Y位置でソート(&Y)"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:109
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:109
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:109
 msgid "Annotation Choice"
 msgstr "アノテーションの選択"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:121
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:121
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:121
 msgid "Use first free number in schematic"
 msgstr "回路図中の最初の空き番号から使用"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:133
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:133
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:133
 msgid "Start to  sheet number*100 and use first free number"
 msgstr "シートのRef番号 *100 から開始し、最初の空き番号から使用"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:145
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:145
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:145
 msgid "Start to  sheet number*1000 and use first free number"
 msgstr "シートのRef番号 *1000 から開始し、最初の空き番号から使用"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:166
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:166
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:166
 msgid "Dialog"
 msgstr "ダイアログ"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:178
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:178
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:178
 msgid "Keep this dialog open"
 msgstr "ダイアログを自動的に閉じない"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:190
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:190
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:190
 msgid "Always ask for confirmation"
 msgstr "常に確認ダイアログを表示する"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:215
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:215
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:215
 msgid "Clear Annotation"
 msgstr "アノテーション クリア"
 
-#: eeschema/dialogs/dialog_annotate_base.cpp:218
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.cpp:218
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.cpp:218
 msgid "Annotate"
 msgstr "アノテーション"
 
-#: eeschema/dialogs/dialog_bom.cpp:321
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:323
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:358
 #, c-format
 msgid "Failed to open file '%s'"
 msgstr "ファイル '%s' が開けませんでした"
 
-#: eeschema/dialogs/dialog_bom.cpp:447
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:449
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:491
 msgid "Plugin name in plugin list"
 msgstr "プラグイン リストにあるプラグイン名"
 
-#: eeschema/dialogs/dialog_bom.cpp:448
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:450
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:492
 msgid "Plugin name"
 msgstr "プラグイン名"
 
-#: eeschema/dialogs/dialog_bom.cpp:458
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:460
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:502
 msgid "This name already exists. Abort"
 msgstr "このファイル名は既に使用されています。中止しました。"
 
-#: eeschema/dialogs/dialog_bom.cpp:486 eeschema/dialogs/dialog_netlist.cpp:840
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:488
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:842
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:531
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:842
 msgid "Plugin files:"
 msgstr "プラグイン ファイル:"
 
-#: eeschema/dialogs/dialog_bom.cpp:577
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:579
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:632
 msgid "Plugin file name not found. Cannot edit plugin file"
 msgstr ""
 "プラグインファイル名が見つかりませんでした。プラグインファイルの編集はできま"
 "せん。"
 
-#: eeschema/dialogs/dialog_bom.cpp:587
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:589
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:642
 msgid "No text editor selected in KiCad. Please choose it"
 msgstr "エディタが設定されていません。一つ選択してください。"
 
-#: eeschema/dialogs/dialog_bom.cpp:592
+#: kicad-6297/eeschema/dialogs/dialog_bom.cpp:594
+#: kicad-6996/eeschema/dialogs/dialog_bom.cpp:647
 msgid "Bom Generation Help"
 msgstr "部品表生成に関するヘルプ"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:37
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:37
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:38
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:58
-#: eeschema/dialogs/dialog_netlist_base.cpp:46
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:58
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:46
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:58
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:46
 msgid "Generate"
 msgstr "生成"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:65
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:65
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:65
 msgid "Help"
 msgstr "ヘルプ"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:71
-#: eeschema/dialogs/dialog_netlist_base.cpp:52
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:71
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:52
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:71
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:52
 msgid "Add Plugin"
 msgstr "プラグインを追加"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:74
-#: eeschema/dialogs/dialog_netlist_base.cpp:55
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:74
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:55
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:74
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:55
 msgid "Remove Plugin"
 msgstr "プラグインを削除"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:77
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:77
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:77
 msgid "Edit Plugin File"
 msgstr "プラグインファイルを編集"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:89
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:89
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:89
 msgid "Command line:"
 msgstr "コマンドライン:"
 
-#: eeschema/dialogs/dialog_bom_base.cpp:102
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.cpp:102
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:107
 msgid "Plugin Info:"
 msgstr "プラグイン情報:"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:250
+#: kicad-6297/eeschema/dialogs/dialog_choose_component.cpp:251
+#: kicad-6996/eeschema/dialogs/dialog_choose_component.cpp:251
 msgid "Description\n"
 msgstr "説明\n"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:263
+#: kicad-6297/eeschema/dialogs/dialog_choose_component.cpp:264
+#: kicad-6996/eeschema/dialogs/dialog_choose_component.cpp:264
 msgid "Keywords\n"
 msgstr "キーワード\n"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:271 pcbnew/class_module.cpp:571
+#: kicad-6297/eeschema/dialogs/dialog_choose_component.cpp:272
+#: kicad-6297/pcbnew/class_module.cpp:571
+#: kicad-6996/eeschema/dialogs/dialog_choose_component.cpp:272
+#: kicad-6996/pcbnew/class_module.cpp:536
 msgid "Unknown"
 msgstr "不明"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:277
+#: kicad-6297/eeschema/dialogs/dialog_choose_component.cpp:278
+#: kicad-6996/eeschema/dialogs/dialog_choose_component.cpp:278
 msgid "Alias of "
 msgstr "エイリアス: "
 
-#: eeschema/dialogs/dialog_color_config.cpp:61
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:61
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:61
 msgid "Wire"
 msgstr "ワイヤ"
 
-#: eeschema/dialogs/dialog_color_config.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:62
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:62
 msgid "Bus"
 msgstr "バス"
 
-#: eeschema/dialogs/dialog_color_config.cpp:63 eeschema/sch_junction.h:86
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:63
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:63
+#: kicad-6297/eeschema/sch_junction.h:86 kicad-6996/eeschema/sch_junction.h:86
 msgid "Junction"
 msgstr "ジャンクション (接続点)"
 
-#: eeschema/dialogs/dialog_color_config.cpp:64 eeschema/sch_text.cpp:712
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:64
+#: kicad-6297/eeschema/sch_text.cpp:712 kicad-6996/eeschema/sch_text.cpp:718
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:64
 msgid "Label"
 msgstr "ラベル"
 
-#: eeschema/dialogs/dialog_color_config.cpp:65
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:65
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:65
 msgid "Global label"
 msgstr "グローバル ラベル"
 
-#: eeschema/dialogs/dialog_color_config.cpp:66
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:66
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_select_net_from_list_base.cpp:54
 msgid "Net name"
 msgstr "ネット名"
 
-#: eeschema/dialogs/dialog_color_config.cpp:67
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:67
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:67
 msgid "Notes"
 msgstr "注釈"
 
-#: eeschema/dialogs/dialog_color_config.cpp:68
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:68
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:68
 msgid "No connect symbol"
 msgstr "未接続シンボル"
 
-#: eeschema/dialogs/dialog_color_config.cpp:73 eeschema/libedit.cpp:500
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:73
+#: kicad-6297/eeschema/libedit.cpp:500 kicad-6996/eeschema/libedit.cpp:500
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:73
 msgid "Body"
 msgstr "ボディ形状"
 
-#: eeschema/dialogs/dialog_color_config.cpp:74
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:74
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:74
 msgid "Body background"
 msgstr "ボディ背景色"
 
-#: eeschema/dialogs/dialog_color_config.cpp:75 eeschema/lib_pin.cpp:255
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:75
+#: kicad-6297/eeschema/lib_pin.cpp:255 kicad-6996/eeschema/lib_pin.cpp:156
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:75
 msgid "Pin"
 msgstr "ピン"
 
-#: eeschema/dialogs/dialog_color_config.cpp:76
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:76
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:76
 msgid "Pin number"
 msgstr "ピン ナンバー"
 
-#: eeschema/dialogs/dialog_color_config.cpp:77
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:77
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:77
 msgid "Pin name"
 msgstr "ピン名"
 
-#: eeschema/dialogs/dialog_color_config.cpp:78
-#: eeschema/dialogs/dialog_rescue_each.cpp:107 eeschema/lib_field.cpp:574
-#: eeschema/onrightclick.cpp:428 eeschema/sch_component.cpp:1514
-#: eeschema/template_fieldnames.cpp:39
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:26
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:42
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:33
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:78
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:110
+#: kicad-6297/eeschema/lib_field.cpp:585
+#: kicad-6297/eeschema/onrightclick.cpp:428
+#: kicad-6297/eeschema/sch_component.cpp:1514
+#: kicad-6297/eeschema/template_fieldnames.cpp:39
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:26
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:33
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:109
+#: kicad-6996/eeschema/lib_field.cpp:585
+#: kicad-6996/eeschema/onrightclick.cpp:431
+#: kicad-6996/eeschema/sch_component.cpp:1538
+#: kicad-6996/eeschema/template_fieldnames.cpp:39
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:78
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:26
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb_base.cpp:30
 msgid "Reference"
 msgstr "リファレンス"
 
-#: eeschema/dialogs/dialog_color_config.cpp:80
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:113
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:24
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:80
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:24
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:113
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:80
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:24
 msgid "Fields"
 msgstr "フィールド"
 
-#: eeschema/dialogs/dialog_color_config.cpp:85
-#: eeschema/dialogs/dialog_color_config.cpp:104
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:85
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:104
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:85
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:104
 msgid "Sheet"
 msgstr "シート"
 
-#: eeschema/dialogs/dialog_color_config.cpp:86
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:86
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:86
 msgid "Sheet file name"
 msgstr "シート ファイル名"
 
-#: eeschema/dialogs/dialog_color_config.cpp:87
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:87
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:87
 msgid "Sheet name"
 msgstr "シート名"
 
-#: eeschema/dialogs/dialog_color_config.cpp:88
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:88
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:88
 msgid "Sheet label"
 msgstr "シート ラベル"
 
-#: eeschema/dialogs/dialog_color_config.cpp:89
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:89
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:89
 msgid "Hierarchical label"
 msgstr "階層ラベル"
 
-#: eeschema/dialogs/dialog_color_config.cpp:94
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:94
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:94
 msgid "ERC warning"
 msgstr "ERC 警告"
 
-#: eeschema/dialogs/dialog_color_config.cpp:95
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:95
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:95
 msgid "ERC error"
 msgstr "ERC エラー"
 
-#: eeschema/dialogs/dialog_color_config.cpp:96
-#: gerbview/class_gerbview_layer_widget.cpp:110
-#: pcbnew/class_pcb_layer_widget.cpp:74 pcbnew/tools/selection_tool.cpp:116
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:96
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:110
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:74
+#: kicad-6297/pcbnew/tools/selection_tool.cpp:116
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:96
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:109
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:74
+#: kicad-6996/pcbnew/tools/selection_tool.cpp:115
 msgid "Grid"
 msgstr "グリッド"
 
-#: eeschema/dialogs/dialog_color_config.cpp:102
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:28
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:22
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:382
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:102
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:28
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:382
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:28
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:22
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:102
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:414
 msgid "General"
 msgstr "一般設定"
 
-#: eeschema/dialogs/dialog_color_config.cpp:103
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:23
-#: eeschema/sch_component.cpp:1523
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:23
+#: kicad-6297/eeschema/sch_component.cpp:1523
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:23
+#: kicad-6996/eeschema/sch_component.cpp:1547
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:103
 msgid "Component"
 msgstr "コンポーネント"
 
-#: eeschema/dialogs/dialog_color_config.cpp:105
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:105
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:105
 msgid "Miscellaneous"
 msgstr "その他"
 
-#: eeschema/dialogs/dialog_color_config.cpp:191
-msgid "White"
-msgstr "白"
-
-#: eeschema/dialogs/dialog_color_config.cpp:192
-msgid "Black"
-msgstr "黒"
-
-#: eeschema/dialogs/dialog_color_config.cpp:274
+#: kicad-6297/eeschema/dialogs/dialog_color_config.cpp:274
+#: kicad-6996/eeschema/widgets/widget_eeschema_color_config.cpp:274
 msgid ""
 "Some items have the same color as the background\n"
 "and they will not be seen on the screen.  Are you\n"
@@ -3477,125 +4635,154 @@ msgstr ""
 "画面上で見えなくなります。本当に\n"
 "これらの色を使用してもよろしいですか？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:72
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.h:114
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:74
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:75
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.h:114
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.h:114
 msgid "Library Component Properties"
 msgstr "ライブラリ コンポーネントのプロパティ"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:81
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:83
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:84
 #, c-format
 msgid "Properties for %s (alias of %s)"
 msgstr "%s のプロパティ( %s のエイリアス)"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:86
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:88
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:89
 #, c-format
 msgid "Properties for %s"
 msgstr "%s のプロパティ"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:165
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:167
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:168
 #, c-format
 msgid "Number of Units (max allowed %d)"
 msgstr "ユニット数(最大値は %d)"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:299
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:375
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:301
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:377
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:302
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:378
 #, c-format
 msgid "Alias <%s> cannot be removed while it is being edited!"
 msgstr "エイリアス <%s> は編集中に削除できません！"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:305
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:307
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:308
 msgid "Remove all aliases from list?"
 msgstr "リストから全てのエイリアスを削除しますか？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:326
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:328
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:329
 msgid "New alias:"
 msgstr "新規エイリアス:"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:326
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:328
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:329
 msgid "Component Alias"
 msgstr "コンポーネント エイリアス"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:340
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:342
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:343
 #, c-format
 msgid "Alias or component name <%s> already in use."
 msgstr "エイリアス又はコンポーネント名 <%s> は既に使用中です。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:349
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:351
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:352
 #, c-format
 msgid "Alias or component name <%s> already exists in library <%s>."
 msgstr ""
 "エイリアスかコンポーネント名 <%s> は既にライブラリ <%s> 中に存在します。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:406
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:408
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:409
 msgid "Delete extra parts from component?"
 msgstr "コンポーネントから余計なパーツを削除しますか？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:426
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:428
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:429
 msgid "Add new pins for alternate body style ( DeMorgan ) to component?"
 msgstr ""
 "(ド・モルガン) 代替ボディスタイル用にコンポーネントに新しいピンを追加します"
 "か？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:431
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:433
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:434
 msgid "Delete alternate body style (DeMorgan) draw items from component?"
 msgstr ""
 "(ド・モルガン) 代替ボディスタイル用の図形アイテムをコンポーネントから削除しま"
 "すか？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:492
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:494
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:495
 msgid "OK to delete the footprint filter list ?"
 msgstr "フットプリント フィルタの一覧を削除しますか?"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:513
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:515
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:516
 msgid "Add Footprint Filter"
 msgstr "フットプリント フィルタの追加"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:513
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:244
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:515
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:244
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:516
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:244
 msgid "Footprint Filter"
 msgstr "フットプリント フィルター"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:530
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:532
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:533
 #, c-format
 msgid "Foot print filter <%s> is already defined."
 msgstr "フットプリント フィルタ <%s> は既に定義されています。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:566
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib.cpp:568
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib.cpp:569
 msgid "Edit footprint filter"
 msgstr "フットプリント フィルタの編集"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:30
 msgid "Has alternate symbol (DeMorgan)"
 msgstr "(ド・モルガン)代替ボディスタイルが存在します"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:31
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:31
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:31
 msgid ""
 "Check this option if the component has an alternate body style (De Morgan)"
 msgstr ""
 "コンポーネントが代替表示形式(ド・モルガン)を持っている場合に、チェックを入れ"
 "て下さい"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:35
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:35
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:35
 msgid "Show pin number"
 msgstr "ピン番号の表示"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:37
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:37
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:37
 msgid "Show or hide pin numbers"
 msgstr "ピン番号を表示/非表示"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:41
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:41
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:41
 msgid "Show pin name"
 msgstr "ピン名を表示"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:43
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:43
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:43
 msgid "Show or hide pin names"
 msgstr "ピン名の表示/非表示"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:47
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:47
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:47
 msgid "Place pin names inside"
 msgstr "ピン名を内側に配置"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:49
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:49
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:49
 msgid ""
 "Check this option to have pin names inside the body and pin number outside.\n"
 "If not checked pins names and pins numbers are outside."
@@ -3604,22 +4791,26 @@ msgstr ""
 "い。\n"
 "チェックがない場合、ピン名とピン番号は外側に表示されます。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:65
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:65
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:65
 msgid "Number of Units"
 msgstr "ユニット数"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:67
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:67
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:67
 msgid ""
 "Enter the number of units for a component that contains more than one unit"
 msgstr ""
 "1つのコンポーネントが複数の部品を保つ場合、いくつの部品を持つか数を入力して下"
 "さい"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:80
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:80
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:80
 msgid "Pin Name Position Offset"
 msgstr "ピン名の位置オフセット"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:82
 msgid ""
 "Margin (in 0.001 inches) between a pin name position and the component "
 "body.\n"
@@ -3628,20 +4819,24 @@ msgstr ""
 "ピン名とコンポーネントのボディ間の余白 (0.001 inch 単位指定) \n"
 "通常は10～40を推奨します。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:98
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:98
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:98
 msgid "Define as power symbol"
 msgstr "電源シンボルとして定義"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:99
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:99
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:99
 msgid "Check this option when the component is a power symbol"
 msgstr ""
 "電源シンボルとしてコンポーネントを作成するとき、このオプションをチェック"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:103
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:103
 msgid "All units are not interchangeable"
 msgstr "複数ユニットでのユニット交換不可"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:104
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:104
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:104
 msgid ""
 "Check this option when creating multiple unit components and all units are "
 "not interchangeable"
@@ -3649,7 +4844,8 @@ msgstr ""
 "複数ユニットから成るコンポーネントの場合、ユニットの入れ替えを許可しない場合"
 "にチェックを入れて下さい。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:119
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:119
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:119
 msgid ""
 "A short description that is displayed in Eeschema.\n"
 "Can be a very good help when selecting components in libraries components "
@@ -3659,12 +4855,15 @@ msgstr ""
 "ライブラリコンポーネントリストからコンポーネントを選択する際の助けになりま"
 "す。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:127
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:34
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:127
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:34
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:127
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:33
 msgid "Keywords"
 msgstr "キーワード"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:129
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:129
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:129
 msgid ""
 "Enter key words that can be used to select this component.\n"
 "Key words cannot have spaces and are separated by a space."
@@ -3672,30 +4871,36 @@ msgstr ""
 "コンポーネントを選択するのに使うキーワードの入力。\n"
 "キーワードはスペース区切りで入力できます。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:137
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:137
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:137
 msgid "Documentation File Name"
 msgstr "ドキュメントファイル名"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:139
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:139
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:139
 msgid ""
 "Enter the documentation file (a .pdf document) associated to the component."
 msgstr ""
 "コンポーネントに関連付けるドキュメントファイル (1つのpdfドキュメント) を入力"
 "します。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:150
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:150
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:150
 msgid "Copy Document from Parent"
 msgstr "親要素からドキュメント情報をコピー"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:153
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:153
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:153
 msgid "Browse Files"
 msgstr "ファイルを開く"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:171
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:171
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:171
 msgid "Alias List"
 msgstr "エイリアスの一覧"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:173
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:173
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:173
 msgid ""
 "An alias is a component that uses the body of its root component.\n"
 "It has its own documentation and keywords.\n"
@@ -3707,22 +4912,30 @@ msgstr ""
 "キーワードを持ちます。\n"
 "同じコンポーネント形状を用いてライブラリを拡張する早い方法です。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:192
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:234
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:192
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:234
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:192
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:234
 msgid "Delete All"
 msgstr "全て削除"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:202
-#: eeschema/libedit.cpp:488 eeschema/viewlibs.cpp:307
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:202
+#: kicad-6297/eeschema/libedit.cpp:488 kicad-6297/eeschema/viewlibs.cpp:307
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:81
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:202
+#: kicad-6996/eeschema/libedit.cpp:488 kicad-6996/eeschema/viewlibs.cpp:307
 msgid "Alias"
 msgstr "エイリアス"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:210
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:37
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:210
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:37
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:210
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:37
 msgid "Footprints"
 msgstr "フットプリント"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:212
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:212
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:212
 msgid ""
 "A list of footprints names that can be used for this component.\n"
 "Footprints names can used jockers.\n"
@@ -3732,49 +4945,66 @@ msgstr ""
 "フットプリント名にはワイルドカードを使用できます。\n"
 "(sm で始まる全てのフットプリント名を許可するには sm* のように)"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:228
-#: eeschema/onrightclick.cpp:418
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:37
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:54
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:53
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:70
-#: pcbnew/modedit_onclick.cpp:418 pcbnew/onrightclick.cpp:1011
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:228
+#: kicad-6297/eeschema/onrightclick.cpp:418
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:70
+#: kicad-6297/pcbnew/modedit_onclick.cpp:418
+#: kicad-6297/pcbnew/onrightclick.cpp:1006
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:228
+#: kicad-6996/eeschema/onrightclick.cpp:421
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:66
+#: kicad-6996/pcbnew/modedit_onclick.cpp:417
+#: kicad-6996/pcbnew/onrightclick.cpp:1002
 msgid "Edit"
 msgstr "編集"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:220
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:234
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:237
 #, c-format
 msgid "Component '%s' found in library '%s'"
 msgstr "コンポーネント '%s' はライブラリ '%s' 中に見つかりました"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:226
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:240
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:243
 #, c-format
 msgid "Component '%s' not found in any library"
 msgstr "コンポーネント '%s' がどのライブラリにも見つかりませんでした"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:242
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:256
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:259
 msgid "However, some candidates are found:"
 msgstr "他のいくつかの候補が見つかりました:"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:248
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:262
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:265
 #, c-format
 msgid "'%s' found in library '%s'"
 msgstr "'%s' はライブラリ '%s' から見つかりました"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:310
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:324
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:327
 msgid "No Component Name!"
 msgstr "コンポーネント名がありません。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:319
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:333
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:336
 #, c-format
 msgid "Component '%s' not found!"
 msgstr "コンポーネント '%s' が見つかりません!"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:393
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:407
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:410
 msgid "Illegal reference. A reference must start with a letter"
 msgstr "無効なリファレンスです。リファレンスは英字で始める必要があります。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:419
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:433
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:436
 #, c-format
 msgid ""
 "The field name <%s> does not have a value and is not defined in the field "
@@ -3785,113 +5015,173 @@ msgstr ""
 "れていません。空のフィールド値は無効であり、コンポーネントから削除されます。"
 "これと残りの未定義フィールド全てを削除しますか？"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:426
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:440
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:443
 msgid "Remove Fields"
 msgstr "フィールドを削除"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:845
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:213
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:697
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:124
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:862
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:213
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:685
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:122
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:213
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:122
 msgid "Show in Browser"
 msgstr "ブラウザ内に表示"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:847
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:699
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:864
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:687
 msgid "Assign Footprint"
 msgstr "フットプリントの割り当て"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:982
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:41
-#: eeschema/lib_pin.cpp:2000 gerbview/class_gerber_draw_item.cpp:572
-#: gerbview/class_gerber_draw_item.cpp:573 pcbnew/class_pcb_text.cpp:145
-#: pcbnew/class_text_mod.cpp:380
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:1004
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:41
+#: kicad-6297/eeschema/lib_pin.cpp:2000
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:572
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:573
+#: kicad-6297/pcbnew/class_pcb_text.cpp:145
+#: kicad-6297/pcbnew/class_text_mod.cpp:380
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:1020
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:41
+#: kicad-6996/eeschema/lib_pin.cpp:2008
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:512
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:513
+#: kicad-6996/pcbnew/class_pcb_text.cpp:145
+#: kicad-6996/pcbnew/class_text_mod.cpp:357
 msgid "Yes"
 msgstr "はい"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:984
-#: eeschema/lib_pin.cpp:2002 gerbview/class_gerber_draw_item.cpp:572
-#: gerbview/class_gerber_draw_item.cpp:573 pcbnew/class_pcb_text.cpp:143
-#: pcbnew/class_text_mod.cpp:378
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:1006
+#: kicad-6297/eeschema/lib_pin.cpp:2002
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:572
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:573
+#: kicad-6297/pcbnew/class_pcb_text.cpp:143
+#: kicad-6297/pcbnew/class_text_mod.cpp:378
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:1022
+#: kicad-6996/eeschema/lib_pin.cpp:2010
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:512
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:513
+#: kicad-6996/pcbnew/class_pcb_text.cpp:143
+#: kicad-6996/pcbnew/class_text_mod.cpp:355
 msgid "No"
 msgstr "いいえ"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:37
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:37
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:37
 msgid "Units are interchangeable:"
 msgstr "変換可能なユニット:"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
-#: pcbnew/dialogs/dialog_create_array_base.cpp:69
-#: pcbnew/dialogs/dialog_create_array_base.cpp:80
-#: pcbnew/dialogs/dialog_create_array_base.cpp:184
-#: pcbnew/dialogs/dialog_create_array_base.cpp:195
-#: pcbnew/dialogs/dialog_create_array_base.cpp:214
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:62
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:76
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:74
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:82
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:32
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:46
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:60
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:135
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:237
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:69
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:80
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:186
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:197
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:216
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:62
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:82
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:237
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:69
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:80
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:185
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:196
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:215
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:62
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:82
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:129
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:389
 msgid "0"
 msgstr "0"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
 msgid "+90"
 msgstr "+90"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:129
 msgid "180"
 msgstr "180"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:129
 msgid "-90"
 msgstr "-90"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:50
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:50
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:50
 msgid "Orientation (Degrees)"
 msgstr "角度 (度)"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:52
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:58
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:52
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:56
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:52
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:56
 msgid "Select if the component is to be rotated when drawn"
 msgstr "描画時にコンポーネントを回転する場合に選択"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
 msgid "Mirror ---"
 msgstr "横軸ミラー"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:56
 msgid "Mirror |"
 msgstr "縦軸ミラー"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:58
-#: gerbview/class_gerber_draw_item.cpp:574
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:79
-#: pcbnew/class_pcb_text.cpp:143 pcbnew/class_pcb_text.cpp:145
-#: pcbnew/class_text_mod.cpp:392
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:83
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:100
-#: pcbnew/modedit_onclick.cpp:292
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:58
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:574
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:79
+#: kicad-6297/pcbnew/class_pcb_text.cpp:143
+#: kicad-6297/pcbnew/class_pcb_text.cpp:145
+#: kicad-6297/pcbnew/class_text_mod.cpp:392
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:100
+#: kicad-6297/pcbnew/modedit_onclick.cpp:292
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:58
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:514
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:77
+#: kicad-6996/pcbnew/class_pcb_text.cpp:143
+#: kicad-6996/pcbnew/class_pcb_text.cpp:145
+#: kicad-6996/pcbnew/class_text_mod.cpp:369
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:77
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:115
+#: kicad-6996/pcbnew/modedit_onclick.cpp:291
 msgid "Mirror"
 msgstr "ミラー"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:60
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:66
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:60
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:64
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:60
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:64
 msgid ""
 "Pick the graphical transformation to be used when displaying the component, "
 "if any"
 msgstr "コンポーネントを表示する際に使用するグラフィック変換を指定します。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:64
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:64
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:64
 msgid "Converted Shape"
 msgstr "変換された形状"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:65
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:65
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:65
 msgid ""
 "Use the alternate shape of this component.\n"
 "For gates, this is the \"De Morgan\" conversion"
@@ -3899,31 +5189,42 @@ msgstr ""
 "ゲート用にコンポーネントの代替シェイプを使う\n"
 "\"ド・モルガン\"変換を行います。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:70
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:670
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:70
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:657
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:70
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:657
 msgid "Chip Name"
 msgstr "シンボル名"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:73
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:73
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:73
 msgid "The name of the symbol in the library from which this component came"
 msgstr "このコンポーネントを持ってきたライブラリ中のシンボル名です。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:80
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:80
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:80
 msgid "Test"
 msgstr "テスト"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:83
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:41
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:83
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:41
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:83
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:40
 msgid "Select"
 msgstr "選択"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:92
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:33
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:92
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:33
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:92
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb_base.cpp:33
 msgid "Timestamp"
 msgstr "タイムスタンプ"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:97
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:122
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:97
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:122
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:97
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:117
 msgid ""
 "An unique ID (a time stamp) to identify the component.\n"
 "This is an alternate identifier to the reference."
@@ -3931,11 +5232,13 @@ msgstr ""
 "コンポーネントを識別するために、固有ID (タイムスタンプ情報) を使用します。\n"
 "これはリファレンスを管理する際に使用される情報です。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:104
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:104
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:104
 msgid "Reset to Library Defaults"
 msgstr "ライブラリのデフォルト値にリセット"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:105
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:105
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:105
 msgid ""
 "Set position and style of fields and component orientation  to default lib "
 "value.\n"
@@ -3945,118 +5248,174 @@ msgstr ""
 "にセット。\n"
 "フィールド文字は修正されません。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:123
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:123
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:28
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:123
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:28
 msgid "Add Field"
 msgstr "フィールドを追加"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:124
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:31
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:124
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:29
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:124
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:29
 msgid "Add a new custom field"
 msgstr "フィールドを新規追加"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:128
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:35
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:128
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:33
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:128
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:33
 msgid "Delete Field"
 msgstr "フィールドを削除"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:129
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:36
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:129
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:34
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:129
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:34
 msgid "Delete one of the optional fields"
 msgstr "選択したフィールドを削除"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:134
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:41
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:134
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:39
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:134
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:39
 msgid "Move the selected optional fields up one position"
 msgstr "選択したオプションフィールドを一つ上と入れ替え"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
-#: eeschema/dialogs/dialog_edit_label_base.cpp:70
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:54
-#: eeschema/lib_pin.cpp:167
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:84
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:106
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:52
+#: kicad-6297/eeschema/lib_pin.cpp:167
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:106
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:52
+#: kicad-6996/eeschema/lib_pin.cpp:115
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:105
 msgid "Left"
 msgstr "左"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
-#: eeschema/dialogs/dialog_edit_label_base.cpp:70
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:54
-#: eeschema/lib_pin.cpp:166
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:84
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:106
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:52
+#: kicad-6297/eeschema/lib_pin.cpp:166
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:106
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:147
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:52
+#: kicad-6996/eeschema/lib_pin.cpp:114
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:105
 msgid "Right"
 msgstr "右"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:149
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:56
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:149
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:54
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:149
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:54
 msgid "Horiz. Justify"
 msgstr "水平に整列"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:62
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:60
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:103
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:60
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:103
 msgid "Bottom"
 msgstr "下"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:62
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:60
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:103
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:153
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:60
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:103
 msgid "Top"
 msgstr "上"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:155
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:64
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:155
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:155
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:62
 msgid "Vert. Justify"
 msgstr "垂直に整列"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:166
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:77
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:125
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:154
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:166
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:75
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:125
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:154
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:166
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:75
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:121
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:150
 msgid "Visibility"
 msgstr "表示"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:168
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:79
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:168
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:77
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:168
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:77
 msgid "Show"
 msgstr "表示する"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:169
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:80
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:78
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:78
 msgid "Check if you want this field visible"
 msgstr "このフィールドを可視化するならチェック"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:174
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:85
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:174
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:83
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:174
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:83
 msgid "Check if you want this field's text rotated 90 degrees"
 msgstr "このフィールドのテキストを90度回転させたいならチェック"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
-#: eeschema/dialogs/dialog_edit_label_base.cpp:76
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:92
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:97 eeschema/sch_text.cpp:758
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:97
+#: kicad-6297/eeschema/sch_text.cpp:758
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:181
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:76
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:90
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:95
+#: kicad-6996/eeschema/sch_text.cpp:764
 msgid "Bold Italic"
 msgstr "斜太字"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:183
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:94
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:84
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:183
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:92
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:84
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:183
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:92
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:85
 msgid "Style:"
 msgstr "スタイル:"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:185
-msgid "The style of the currently selected field's text in the schemati"
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:185
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:185
+msgid "The style of the currently selected field's text in the schematic"
 msgstr "選択中のフィールドの文字書式"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:195
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:104
-#: eeschema/dialogs/dialog_eeschema_options.cpp:47
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:195
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:102
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options.cpp:44
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:195
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:102
 msgid "Field Name"
 msgstr "フィールド名"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:200
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:209
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:200
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:209
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:200
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:209
 msgid ""
 "The name of the currently selected field\n"
 "Some fixed fields names are not editable"
@@ -4064,12 +5423,15 @@ msgstr ""
 "現在選択中のフォールドの名前\n"
 "いくつかの固定フィールド名は編集不可"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:204
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:114
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:204
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:112
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:204
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:112
 msgid "Field Value"
 msgstr "フィールドの値"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:214
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:214
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:214
 msgid ""
 "If your datasheet is an http:// link or a complete file path, then it may "
 "show in your browser by pressing this button."
@@ -4078,166 +5440,250 @@ msgstr ""
 "イルパスであった場合、このボタンをクリックすることでブラウザで表示させること"
 "ができます。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:227
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:138
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:53 eeschema/sch_text.cpp:790
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:28 pcbnew/muonde.cpp:822
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:227
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:136
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:53
+#: kicad-6297/eeschema/sch_text.cpp:790
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.cpp:28
+#: kicad-6297/pcbnew/muonde.cpp:822
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:227
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:136
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:52
+#: kicad-6996/eeschema/sch_text.cpp:796
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.cpp:28
+#: kicad-6996/pcbnew/muonde.cpp:868
 msgid "Size"
 msgstr "サイズ"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:232
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:232
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:232
 msgid "The size of the currently selected field's text in the schematic"
 msgstr "選択中のフィールドの文字サイズ"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:236
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:249
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:262
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:148
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:160
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:174
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:98
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:110
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:234
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:257
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:271
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:73
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:85
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:97
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:42
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:54
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:66
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:78
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:74
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:103
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:114
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:125
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:35
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:46
-#: pcbnew/dialogs/dialog_track_via_size_base.cpp:32
-#: pcbnew/dialogs/dialog_track_via_size_base.cpp:43
-#: pcbnew/dialogs/dialog_track_via_size_base.cpp:54
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:236
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:249
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:262
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:146
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:158
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:172
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:72
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:110
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:234
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:257
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:271
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:97
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:78
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:114
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:125
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size_base.cpp:54
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:236
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:249
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:262
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:146
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:158
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:172
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:72
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:105
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:228
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:250
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:263
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:71
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:82
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:41
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:251
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:114
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:125
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size_base.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size_base.cpp:54
 msgid "unit"
 msgstr "単位"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:240
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:152
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:240
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:240
 msgid "PosX"
 msgstr "X座標"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:245
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:245
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:245
 msgid "The X coordinate of the text relative to the component"
 msgstr "コンポーネントからテキストの相対X位置"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:253
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:164
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:253
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:253
 msgid "PosY"
 msgstr "Y座標"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:258
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:170
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:258
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:168
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp:258
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:168
 msgid "The Y coordinate of the text relative to the component"
 msgstr "コンポーネントからテキストの相対Y位置"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:151
+#: kicad-6297/eeschema/dialogs/dialog_edit_label.cpp:149
+#: kicad-6996/eeschema/dialogs/dialog_edit_label.cpp:149
 msgid "Global Label Properties"
 msgstr "グローバルラベルのプロパティ"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:155
+#: kicad-6297/eeschema/dialogs/dialog_edit_label.cpp:153
+#: kicad-6996/eeschema/dialogs/dialog_edit_label.cpp:153
 msgid "Hierarchical Label Properties"
 msgstr "階層ラベルのプロパティ"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:159
+#: kicad-6297/eeschema/dialogs/dialog_edit_label.cpp:157
+#: kicad-6996/eeschema/dialogs/dialog_edit_label.cpp:157
 msgid "Label Properties"
 msgstr "ラベルのプロパティ"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:163
+#: kicad-6297/eeschema/dialogs/dialog_edit_label.cpp:161
+#: kicad-6996/eeschema/dialogs/dialog_edit_label.cpp:161
 msgid "Hierarchical Sheet Pin Properties."
 msgstr "階層シートピンのプロパティ"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:167
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.h:76
+#: kicad-6297/eeschema/dialogs/dialog_edit_label.cpp:165
+#: kicad-6996/eeschema/dialogs/dialog_edit_label.cpp:165
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.h:76
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.h:76
 msgid "Text Properties"
 msgstr "テキストのプロパティ"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:228
+#: kicad-6297/eeschema/dialogs/dialog_edit_label.cpp:223
+#: kicad-6996/eeschema/dialogs/dialog_edit_label.cpp:223
 #, c-format
 msgid "H%s x W%s"
 msgstr "高さ%s x 幅%s"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:294
+#: kicad-6297/eeschema/dialogs/dialog_edit_label.cpp:289
+#: kicad-6996/eeschema/dialogs/dialog_edit_label.cpp:289
 msgid "Empty Text!"
 msgstr "空のテキスト !"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:25
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:25
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:25
 msgid "&Text:"
 msgstr "テキスト(&T):"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:27
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:27
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:27
 msgid "Enter the text to be used within the schematic"
 msgstr "回路図内で使用されるテキストの入力"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:47
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:64
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:47
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:64
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:47
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:64
 msgid "&Size:"
 msgstr "サイズ(&S):"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:70
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:53 eeschema/lib_pin.cpp:168
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:53
+#: kicad-6297/eeschema/lib_pin.cpp:168
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:53
+#: kicad-6996/eeschema/lib_pin.cpp:116
 msgid "Up"
 msgstr "上へ"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:70
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:56 eeschema/lib_pin.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:56
+#: kicad-6297/eeschema/lib_pin.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:70
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:56
+#: kicad-6996/eeschema/lib_pin.cpp:117
 msgid "Down"
 msgstr "下へ"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:72
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:72
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:72
 msgid "O&rientation"
 msgstr "角度(&R)"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:78
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:78
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:78
 msgid "St&yle"
 msgstr "スタイル(&Y)"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:82
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:30 eeschema/lib_pin.cpp:183
-#: eeschema/sch_text.cpp:777
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:30
+#: kicad-6297/eeschema/lib_pin.cpp:183 kicad-6297/eeschema/sch_text.cpp:777
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:30
+#: kicad-6996/eeschema/pin_type.cpp:38 kicad-6996/eeschema/sch_text.cpp:783
 msgid "Input"
 msgstr "入力"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:82
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:31 eeschema/lib_pin.cpp:184
-#: eeschema/sch_text.cpp:778
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:31
+#: kicad-6297/eeschema/lib_pin.cpp:184 kicad-6297/eeschema/sch_text.cpp:778
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:31
+#: kicad-6996/eeschema/pin_type.cpp:41 kicad-6996/eeschema/sch_text.cpp:784
 msgid "Output"
 msgstr "出力"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:82
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:32 eeschema/lib_pin.cpp:185
-#: eeschema/sch_text.cpp:779
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:32
+#: kicad-6297/eeschema/lib_pin.cpp:185 kicad-6297/eeschema/sch_text.cpp:779
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:32
+#: kicad-6996/eeschema/pin_type.cpp:44 kicad-6996/eeschema/sch_text.cpp:785
 msgid "Bidirectional"
 msgstr "双方向"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:82 eeschema/sch_text.cpp:780
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6297/eeschema/sch_text.cpp:780
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6996/eeschema/sch_text.cpp:786
 msgid "Tri-State"
 msgstr "トライステート"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:82
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:34 eeschema/lib_pin.cpp:187
-#: eeschema/sch_text.cpp:781
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:34
+#: kicad-6297/eeschema/lib_pin.cpp:187 kicad-6297/eeschema/sch_text.cpp:781
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:34
+#: kicad-6996/eeschema/pin_type.cpp:50 kicad-6996/eeschema/sch_text.cpp:787
 msgid "Passive"
 msgstr "パッシブ"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:84
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.cpp:84
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.cpp:84
 msgid "S&hape"
 msgstr "シェイプ(&H)"
 
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:243
-msgid "Illegal reference prefix. A reference must start by a letter"
-msgstr ""
-"無効なリファレンス接頭字です。リファレンスはアルファベット文字で始まる必要が"
-"あります。"
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:251
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:251
+msgid "Illegal reference.  References must start with a letter."
+msgstr "無効なリファレンスです。リファレンスは英字で始める必要があります。"
 
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:259
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:267
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:267
 #, c-format
 msgid ""
 "A new name is entered for this component\n"
@@ -4248,12 +5694,17 @@ msgstr ""
 "エイリアス %s は既に存在します！\n"
 "コンポーネントを更新できません"
 
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:110
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:120
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:108
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:118
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:108
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:118
 msgid "The text (or value) of the currently selected field"
 msgstr "現在選択中のフィールドのテキスト (または値)"
 
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:125
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:123
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:868
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:688
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:123
 msgid ""
 "If your datasheet is given as an http:// link, then pressing this button "
 "should bring it up in your webbrowser."
@@ -4261,59 +5712,73 @@ msgstr ""
 "もし設定されているデータシートのパスが、http://から始まるリンクであった場合、"
 "このボタンをクリックすることでブラウザで表示させることができます。"
 
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:144
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:142
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:142
 msgid ""
 "The vertical height of the currently selected field's text in the schematic"
 msgstr "選択中のフィールドの文字の文字高さ"
 
-#: eeschema/dialogs/dialog_edit_one_field.cpp:172
-#, c-format
-msgid ""
-"Whitespace is not permitted inside references or values (symbol names in "
-"lib).\n"
-"The text you entered has been converted to use underscores: %s"
-msgstr ""
-"空白文字の使用は、リファレンスと定数(ライブラリ内のシンボル名)の内部で許され"
-"ていません.\n"
-"入力された文字列内の空白文字はアンダースコアへ変換されます(: %s )"
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:150
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:150
+msgid "X Position"
+msgstr "X 位置"
 
-#: eeschema/dialogs/dialog_eeschema_config.cpp:137
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:162
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp:162
+msgid "Y Position"
+msgstr "Y 位置"
+
+#: kicad-6297/eeschema/dialogs/dialog_edit_one_field.cpp:193
+#: kicad-6996/eeschema/dialogs/dialog_edit_one_field.cpp:193
+msgid "Illegal reference field value!"
+msgstr "無効なリファレンス値です! "
+
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config.cpp:137
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config.cpp:137
 #, c-format
 msgid "Project '%s'"
 msgstr "プロジェクト '%s'"
 
-#: eeschema/dialogs/dialog_eeschema_config.cpp:315
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config.cpp:315
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config.cpp:315
 msgid "Library files:"
 msgstr "ライブラリ ファイル:"
 
-#: eeschema/dialogs/dialog_eeschema_config.cpp:375
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config.cpp:375
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config.cpp:375
 #, c-format
 msgid "'%s' : library already in use"
 msgstr "ライブラリ '%s' は使用中です"
 
-#: eeschema/dialogs/dialog_eeschema_config.cpp:390
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config.cpp:390
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config.cpp:390
 msgid "Default Path for Libraries"
 msgstr "ライブラリのデフォルト パス"
 
-#: eeschema/dialogs/dialog_eeschema_config.cpp:417
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config.cpp:417
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config.cpp:417
 msgid "Use a relative path?"
 msgstr "相対パスを使用しますか？"
 
-#: eeschema/dialogs/dialog_eeschema_config.cpp:417
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:509
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:380
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config.cpp:417
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:512
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:383
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config.cpp:417
 msgid "Path type"
 msgstr "パスのタイプ"
 
-#: eeschema/dialogs/dialog_eeschema_config.cpp:437
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config.cpp:437
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config.cpp:437
 msgid "Path already in use"
 msgstr "パスは既に使用中です"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:22
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:22
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:22
 msgid "Component library files"
 msgstr "コンポーネント ライブラリ ファイル:"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:30
 msgid ""
 "List of active library files.\n"
 "Only library files in this list are loaded by Eeschema.\n"
@@ -4325,25 +5790,32 @@ msgstr ""
 "このリストの順番は重要です。\n"
 "Eeschema はこのリストの優先順序でフットプリントを検索します。"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:39
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:39
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:39
 msgid "Add a new library after the selected library, and load it"
 msgstr "指定したライブラリを一覧の最後に追加"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:43
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:90
-#: pcbnew/class_module.cpp:613
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:43
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:90
+#: kicad-6297/pcbnew/class_module.cpp:613
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:43
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:90
+#: kicad-6996/pcbnew/class_module.cpp:580
 msgid "Insert"
 msgstr "挿入"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:44
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:44
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:44
 msgid "Add a new library before the selected library, and load it"
 msgstr "選択した項目の前に、指定したライブラリを追加"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:71
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:71
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:71
 msgid "User defined search path"
 msgstr "ユーザ定義の検索パス"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:79
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:79
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:79
 msgid ""
 "Additional paths used in this project. The priority is higher than default "
 "KiCad paths."
@@ -4351,11 +5823,13 @@ msgstr ""
 "このプロジェクトに追加するパスを記述します。これらはデフォルトのKicadパスより"
 "も高い優先度となります。"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:108
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:108
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:108
 msgid "Current search path list"
 msgstr "現在の検索パスのリスト"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:113
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:113
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:113
 msgid ""
 "System and user paths used to search and load library files and component "
 "doc files.\n"
@@ -4365,467 +5839,637 @@ msgstr ""
 "するシステムパスとユーザパスです。\n"
 "これは降順の優先度でソートされます。"
 
-#: eeschema/dialogs/dialog_eeschema_config_fbp.cpp:120
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:120
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_config_fbp.cpp:120
 msgid "Check for cache/library conflicts when loading schematic"
 msgstr "回路図を読み込む時に キャッシュ/ライブラリ の衝突を判定"
 
-#: eeschema/dialogs/dialog_eeschema_options.cpp:51
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options.cpp:48
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:317
 msgid "Default Value"
 msgstr "標準値"
 
-#: eeschema/dialogs/dialog_eeschema_options.cpp:55
-#: eeschema/dialogs/dialog_eeschema_options.cpp:192 eeschema/lib_pin.cpp:2004
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:116
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:129
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:158
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options.cpp:52
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options.cpp:194
+#: kicad-6297/eeschema/lib_pin.cpp:2004
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:112
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:129
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:158
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:318
+#: kicad-6996/eeschema/lib_pin.cpp:2012
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:125
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:154
 msgid "Visible"
 msgstr "表示"
 
-#: eeschema/dialogs/dialog_eeschema_options.cpp:192
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options.cpp:194
 msgid "Hidden"
 msgstr "非表示"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:53
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:53
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:132
 msgid "&Measurement units:"
 msgstr "計測単位(&M):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:65
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:36
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:65
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:36
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:42
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:36
 msgid "&Grid size:"
 msgstr "グリッド サイズ(&G):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:74
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:85
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:96
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:107
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:118
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:129
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:45
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:56
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:67
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:78
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:89
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:100
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:111
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:125
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:74
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:85
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:96
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:107
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:118
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:129
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:45
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:56
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:67
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:78
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:89
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:100
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:111
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:125
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:51
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:73
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:151
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:162
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:183
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:45
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:56
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:67
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:78
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:89
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:100
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:111
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:125
 msgid "mils"
 msgstr "mil"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:78
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:78
 msgid "&Default bus thickness:"
 msgstr "デフォルトのバス線幅(&D):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:89
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:89
 msgid "D&efault line thickness:"
 msgstr "デフォルトの線幅(&e):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:100
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:100
 msgid "De&fault text size:"
 msgstr "デフォルトのテキストサイズ(&f):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:111
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:93
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:111
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:93
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:144
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:93
 msgid "&Horizontal pitch of repeated items:"
 msgstr "繰り返し配置の水平間隔(&H):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:122
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:104
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:122
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:104
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:155
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:104
 msgid "&Vertical pitch of repeated items:"
 msgstr "繰り返し配置の垂直間隔(&V):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:133
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:129
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:133
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:129
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:166
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:129
 msgid "&Increment of repeated labels:"
 msgstr "繰り返しラベルの増分値(&I):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:143
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:143
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:187
 msgid "&Auto-save time interval"
 msgstr "自動保存の時間間隔(&A)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:150
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:150
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:194
 msgid "minutes"
 msgstr "分"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:154
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:139
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:182
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:154
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:139
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:182
 msgid "Ma&ximum undo items (0 = unlimited):"
 msgstr "最大 undo アイテム数 (&x) (0 = 制限なし):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:161
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:146
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:189
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:161
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:189
 msgid "actions"
 msgstr "アクション"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:165
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:165
 msgid "&Part id notation:"
 msgstr "部品IDの表記方法(&P):"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:169
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:276
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:276
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:81
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:271
 msgid "A"
 msgstr "A"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:81
 msgid ".A"
 msgstr ".A"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:81
 msgid "-A"
 msgstr "-A"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:81
 msgid "_A"
 msgstr "_A"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:81
 msgid ".1"
 msgstr ".1"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:81
 msgid "-1"
 msgstr "-1"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:169
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:81
 msgid "_1"
 msgstr "_1"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:187
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:159
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:187
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:159
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:99
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:148
 msgid "&Show grid"
 msgstr "グリッドの表示(&S)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:190
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:190
 msgid "Sho&w hidden pins"
 msgstr "非表示ピンを表示(&w)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:193
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:165
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:193
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:165
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:153
 msgid "Ce&nter and warp cursor on zoom"
 msgstr "拡大縮小時にカーソルを中心へ移動(&n)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:198
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:198
 msgid "&Use middle mouse button to pan"
 msgstr "画面のパンにマウスの中ボタンを使用(&U)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:199
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:172
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:199
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:171
 msgid "Use middle mouse button dragging to pan"
 msgstr "画面のパンにマウスの中ボタンのドラッグを使用"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:203
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:203
 msgid "&Limit panning to scroll size"
 msgstr "パン可能な領域をスクロールバーサイズ範囲内に制限"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:204
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:177
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:204
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:176
 msgid "Middle mouse button panning limited by current scrollbar size"
 msgstr ""
 "マウス中ボタンによる画面パン時、移動領域サイズを現在のスクロールバーサイズに"
 "制限"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:208
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:208
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:263
+msgid "Use touchpa&d to pan"
+msgstr "画面のパンにタッチパッドを使用(&d)"
+
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:209
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:181
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:264
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:92
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:159
+msgid "Use touchpad to pan canvas"
+msgstr "描画キャンバスのパンにタッチパッドを使用"
+
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:213
 msgid "Pan while moving ob&ject"
 msgstr "オブジェクト移動時に表示領域を移動(&J)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:211
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:216
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:102
 msgid "&Restrict buses and wires to H and V orientation"
 msgstr "バス、配線を90度入力に制限(&R)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:214
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:219
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:108
 msgid "Show page limi&ts"
 msgstr "ページの境界を表示(&t)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:227
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:95
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:617
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:232
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:95
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:617
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:89
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:617
 msgid "General Options"
 msgstr "全般 オプション"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:229
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:234
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:292
 msgid "User defined field names for schematic components. "
 msgstr "回路図コンポーネントに定義されたフィールド名を使用"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:240
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:245
 msgid "Field Settings"
 msgstr "フィールドの設定"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:242
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:247
 msgid "&Name"
 msgstr "名前(&N)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:249
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:254
 msgid "D&efault Value"
 msgstr "デフォルト値(&e)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:256
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:95
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:261
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:95
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:97
 msgid "&Visible"
 msgstr "可視化(&V)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:262
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:267
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:340
 msgid "&Add"
 msgstr "追加(&A)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:265
-#: eeschema/menubar.cpp:190 eeschema/menubar_libedit.cpp:140
-#: pcbnew/menubar_modedit.cpp:171 pcbnew/menubar_pcbframe.cpp:286
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:270
+#: kicad-6297/eeschema/menubar.cpp:190
+#: kicad-6297/eeschema/menubar_libedit.cpp:140
+#: kicad-6297/pcbnew/menubar_modedit.cpp:171
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:286
+#: kicad-6996/eeschema/menubar.cpp:188
+#: kicad-6996/eeschema/menubar_libedit.cpp:140
+#: kicad-6996/pcbnew/menubar_modedit.cpp:170
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:290
 msgid "&Delete"
 msgstr "削除(&D)"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.cpp:272
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.cpp:277
 msgid "Template Field Names"
 msgstr "フィールド名のテンプレート"
 
-#: eeschema/dialogs/dialog_erc.cpp:213
+#: kicad-6297/eeschema/dialogs/dialog_erc.cpp:215
+#: kicad-6996/eeschema/dialogs/dialog_erc.cpp:232
 msgid "Marker not found"
 msgstr "マーカーが見つかりません"
 
-#: eeschema/dialogs/dialog_erc.cpp:337
+#: kicad-6297/eeschema/dialogs/dialog_erc.cpp:339
+#: kicad-6996/eeschema/dialogs/dialog_erc.cpp:356
 msgid "No error or warning"
 msgstr "エラー/警告無し"
 
-#: eeschema/dialogs/dialog_erc.cpp:342
+#: kicad-6297/eeschema/dialogs/dialog_erc.cpp:344
+#: kicad-6996/eeschema/dialogs/dialog_erc.cpp:361
 msgid "Generate warning"
 msgstr "警告を生成"
 
-#: eeschema/dialogs/dialog_erc.cpp:347
+#: kicad-6297/eeschema/dialogs/dialog_erc.cpp:349
+#: kicad-6996/eeschema/dialogs/dialog_erc.cpp:366
 msgid "Generate error"
 msgstr "エラーを生成"
 
-#: eeschema/dialogs/dialog_erc.cpp:451
+#: kicad-6297/eeschema/dialogs/dialog_erc.cpp:453
+#: kicad-6996/eeschema/dialogs/dialog_erc.cpp:468
 msgid "Annotation required!"
 msgstr "アノテーションの実行が必要です！"
 
-#: eeschema/dialogs/dialog_erc.cpp:556
+#: kicad-6297/eeschema/dialogs/dialog_erc.cpp:558
+#: kicad-6996/eeschema/dialogs/dialog_erc.cpp:601
 msgid "ERC File"
 msgstr "ERC ファイル"
 
-#: eeschema/dialogs/dialog_erc.cpp:557
+#: kicad-6297/eeschema/dialogs/dialog_erc.cpp:559
+#: kicad-6996/eeschema/dialogs/dialog_erc.cpp:602
 msgid "Electronic rule check file (.erc)|*.erc"
 msgstr "エレクトリカル ルール チェック ファイル (.erc)|*.erc"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:30
 msgid "ERC Report:"
 msgstr "ERC レポート:"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:35
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:35
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:35
 msgid "Total:"
 msgstr "合計:"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:42
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:42
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:42
 msgid "Warnings:"
 msgstr "警告:"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:49
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:49
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:49
 msgid "Errors:"
 msgstr "エラー:"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:59
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:59
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:62
 msgid "Create ERC file report"
 msgstr "ERC レポート ファイルの生成"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:81
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:81
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:84
 msgid "Error list:"
 msgstr "エラー 一覧:"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:91
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:91
 msgid "&Delete Markers"
 msgstr "マーカーを削除(&D)"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:94
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:94
 msgid "&Run"
 msgstr "実行(&R)"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:108
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:108
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:111
 msgid "ERC"
 msgstr "ERC"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:113
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.cpp:113
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:116
 msgid "Initialize to Default"
 msgstr "デフォルトへ初期化"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:34
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:34
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:34
 msgid "&Width:"
 msgstr "幅(&W):"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:52
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:81
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:51
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:81
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:51
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:83
 msgid "Sharing"
 msgstr "共有"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:64
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:83
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:63
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:83
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:63
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:85
 msgid "Common to all &units in component"
 msgstr "コンポーネント内のすべてのパーツで共通化(&u)"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:76
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:86
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:75
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:86
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:75
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:88
 msgid "Common to all body &styles (DeMorgan)"
 msgstr "全てのボディスタイル(ド・モルガン)で共有する(&S)"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:85
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:84
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:84
 msgid "Fill Style"
 msgstr "塗りつぶしのスタイル"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:100
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:99
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:99
 msgid "Do &not fill"
 msgstr "塗りつぶし無し(&N)"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:104
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:103
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:103
 msgid "Fill &foreground"
 msgstr "前面色で塗りつぶし(&F)"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:107
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:106
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:106
 msgid "Fill &background"
 msgstr "背景色で塗りつぶし(&B)"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:33
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:33
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:35
 msgid "Pin &name:"
 msgstr "ピン名(&N):"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:41
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:41
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:43
 msgid "Pin n&umber:"
 msgstr "ピン番号(&U)"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:43
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:43
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:45
 msgid "Pin number: 1 to 4 ASCII letters and/or digits"
 msgstr "ピン番号: 1から4文字のASCII文字および数字"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:51
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:51
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:53
 msgid "&Orientation:"
 msgstr "角度(&O):"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:58
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:58
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:60
 msgid "&Electrical type:"
 msgstr "エレクトリック タイプ(&E):"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:60
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:60
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:62
 msgid "Used by the ERC."
 msgstr "ERCで使用"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:67
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:67
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:69
 msgid "Graphic &Style:"
 msgstr "グラフィック スタイル(&S):"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:93
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:93
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:95
 msgid "Schematic Properties"
 msgstr "回路図上のプロパティ"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:117
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:117
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:119
 msgid "N&ame text size:"
 msgstr "ピン名の文字サイズ(&A):"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:129
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:129
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:131
 msgid "Number te&xt size:"
 msgstr "ピン番号の文字サイズ(&X):"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:141
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:141
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.cpp:143
 msgid "&Length:"
 msgstr "長さ(&L):"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:144 eeschema/lib_pin.cpp:1984
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:144
+#: kicad-6297/eeschema/lib_pin.cpp:1984
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:175
+#: kicad-6996/eeschema/lib_pin.cpp:1997
 msgid "Number"
 msgstr "ピン番号"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:158
-#: eeschema/lib_draw_item.cpp:65 eeschema/lib_pin.cpp:1986
-#: eeschema/libedit.cpp:507 eeschema/sch_text.cpp:785
-#: gerbview/class_gerber_draw_item.cpp:549
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:29
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:47
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:168
-#: pcbnew/class_drawsegment.cpp:364 pcbnew/class_marker_pcb.cpp:97
-#: pcbnew/class_text_mod.cpp:375 pcbnew/class_track.cpp:1142
-#: pcbnew/class_track.cpp:1169 pcbnew/class_track.cpp:1218
-#: pcbnew/class_zone.cpp:582 pcbnew/dialogs/dialog_layers_setup.cpp:346
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:158
+#: kicad-6297/eeschema/lib_draw_item.cpp:65
+#: kicad-6297/eeschema/lib_pin.cpp:1986 kicad-6297/eeschema/libedit.cpp:507
+#: kicad-6297/eeschema/sch_text.cpp:785
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:549
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:29
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:47
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:168
+#: kicad-6297/pcbnew/class_drawsegment.cpp:366
+#: kicad-6297/pcbnew/class_marker_pcb.cpp:97
+#: kicad-6297/pcbnew/class_text_mod.cpp:375
+#: kicad-6297/pcbnew/class_track.cpp:1154
+#: kicad-6297/pcbnew/class_track.cpp:1181
+#: kicad-6297/pcbnew/class_track.cpp:1230 kicad-6297/pcbnew/class_zone.cpp:582
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup.cpp:346
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:189
+#: kicad-6996/eeschema/lib_draw_item.cpp:65
+#: kicad-6996/eeschema/lib_pin.cpp:1999 kicad-6996/eeschema/libedit.cpp:507
+#: kicad-6996/eeschema/sch_text.cpp:791
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:489
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:29
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:47
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:163
+#: kicad-6996/pcbnew/class_drawsegment.cpp:366
+#: kicad-6996/pcbnew/class_marker_pcb.cpp:97
+#: kicad-6996/pcbnew/class_text_mod.cpp:352
+#: kicad-6996/pcbnew/class_track.cpp:1128
+#: kicad-6996/pcbnew/class_track.cpp:1155
+#: kicad-6996/pcbnew/class_track.cpp:1204 kicad-6996/pcbnew/class_zone.cpp:582
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup.cpp:346
 msgid "Type"
 msgstr "タイプ"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:165 pcbnew/class_pad.cpp:685
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:80
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:165
+#: kicad-6297/pcbnew/class_pad.cpp:667
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:80
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_table.cpp:196
+#: kicad-6996/pcbnew/class_pad.cpp:683
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:77
 msgid "Position"
 msgstr "ポジション"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:28 eeschema/lib_text.cpp:51
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:113
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:67
-#: pcbnew/class_text_mod.cpp:365 pcbnew/class_text_mod.cpp:372
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:21
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:28
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:28
+#: kicad-6297/eeschema/lib_text.cpp:51
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:113
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:67
+#: kicad-6297/pcbnew/class_text_mod.cpp:365
+#: kicad-6297/pcbnew/class_text_mod.cpp:372
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:21
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:28
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:28
+#: kicad-6996/eeschema/lib_text.cpp:51
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:113
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:67
+#: kicad-6996/pcbnew/class_text_mod.cpp:342
+#: kicad-6996/pcbnew/class_text_mod.cpp:349
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:21
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:28
 msgid "Text"
 msgstr "テキスト"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:67
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:67
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:65
 msgid "Power component value text cannot be modified!"
 msgstr "電源コンポーネントの定数テキストは変更できません！"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:79
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:110
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:79
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:106
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:77
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:208
 msgid "Vertical"
 msgstr "垂直"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:85
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:85
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:83
 msgid "Common to all units"
 msgstr "全てのユニットで統一化"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:88
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:88
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:86
 msgid "Common to all body styles"
 msgstr "全てのボディスタイルで統一化"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:91
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:116
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:129
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:158
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:91
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:112
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:129
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:158
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:125
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:154
 msgid "Invisible"
 msgstr "非表示"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:99 eeschema/lib_field.cpp:746
-#: eeschema/lib_pin.cpp:1997 eeschema/sch_text.cpp:767
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:106
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:99
+#: kicad-6297/eeschema/lib_field.cpp:757 kicad-6297/eeschema/lib_pin.cpp:1997
+#: kicad-6297/eeschema/sch_text.cpp:767
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:102
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:97
+#: kicad-6996/eeschema/lib_field.cpp:757 kicad-6996/eeschema/lib_pin.cpp:2005
+#: kicad-6996/eeschema/sch_text.cpp:773
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:111
 msgid "Style"
 msgstr "スタイル"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:103
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:101
 msgid "Align left"
 msgstr "左寄せ"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:103
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:101
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:107
 msgid "Align center"
 msgstr "中央寄せ"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:103
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:101
 msgid "Align right"
 msgstr "右寄せ"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:105
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:105
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:103
 msgid "Horizontal Justify"
 msgstr "水平に整列"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:107
 msgid "Align bottom"
 msgstr "下寄せ"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:107
 msgid "Align top"
 msgstr "上寄せ"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:111
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.cpp:111
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
 msgid "Vertical Justify"
 msgstr "垂直に整列"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:22
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.h:97
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:22
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h:98
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h:89
 msgid "General Settings"
 msgstr "一般設定"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:34
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:34
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:34
 msgid "Component &name:"
 msgstr "コンポーネント名(&N):"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:36
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:36
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:36
 msgid ""
 "This is the component name in library,\n"
 "and also the default component value when loaded in the schematic."
@@ -4833,172 +6477,223 @@ msgstr ""
 "これはライブラリ中のコンポーネント名であり、\n"
 "回路図に読込む際のデフォルトのコンポーネントの定数でもあります。"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:44
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:44
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:43
 msgid "Default reference designator:"
 msgstr "デフォルトのリファレンス記号:"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:48
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:48
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:47
 msgid "U"
 msgstr "U"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:51
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:51
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:50
 msgid "Number of units per package:"
 msgstr "パッケージ内のユニット数:"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:64
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:64
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:63
 msgid "Create component with alternate body style (DeMorgan)"
 msgstr "(ド・モルガン) 代替ボディスタイルを使ってコンポーネントを作成"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:67
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:67
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:66
 msgid "Create component as power symbol"
 msgstr "電源シンボルとしてコンポーネントを作成"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:70
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:70
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:69
 msgid "Units are not interchangeable"
 msgstr "ユニットは交換不可"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:85
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:85
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:84
 msgid "General Pin Settings"
 msgstr "一般ピン設定"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:96
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:96
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:95
 msgid "Pin text position offset:"
 msgstr "ピンテキストの位置オフセット"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:109
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:109
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:108
 msgid "Show pin number text"
 msgstr "ピン番号のテキストの表示"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:113
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:113
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:112
 msgid "Show pin name text"
 msgstr "ピン名テキストの表示"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:117
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.cpp:117
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.cpp:116
 msgid "Pin name inside"
 msgstr "ピン名を内側に配置"
 
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:49
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:49
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:49
 msgid "&Default line width:"
 msgstr "デフォルトの線幅(&D):"
 
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:60
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:60
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:60
 msgid "D&efault pin length:"
 msgstr "デフォルトのピンの長さ(&e): "
 
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:71
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:71
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:71
 msgid "De&fault pin number size:"
 msgstr "デフォルトのピン番号サイズ(&f): "
 
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:82
 msgid "Def&ault pin name size:"
 msgstr "デフォルトのピン名サイズ(&a):"
 
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:115
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:115
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:115
 msgid "&Pitch of repeated pins:"
 msgstr "繰り返しピンのピッチ(&P):"
 
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:119
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:119
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:119
 msgid "100"
 msgstr "100"
 
-#: eeschema/dialogs/dialog_libedit_options_base.cpp:119
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.cpp:119
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.cpp:119
 msgid "50"
 msgstr "50"
 
-#: eeschema/dialogs/dialog_netlist.cpp:295
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:77
-#: pcbnew/dialogs/dialog_drc_base.cpp:25
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:82
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:295
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:77
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:82
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:295
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:75
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:98
 msgid "Options:"
 msgstr "オプション:"
 
-#: eeschema/dialogs/dialog_netlist.cpp:299
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:299
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:299
 msgid "Default format"
 msgstr "デフォルトの出力形式に設定"
 
 # NET作成して動作確認済み
-#: eeschema/dialogs/dialog_netlist.cpp:381
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:383
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:383
 msgid "Prefix references 'U' and 'IC' with 'X'"
 msgstr "リファレンス 'U' と 'IC' の前に接頭字 'X' を付ける"
 
-#: eeschema/dialogs/dialog_netlist.cpp:386
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:388
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:388
 msgid "Use net number as net name"
 msgstr "ネット名にネット番号を使用"
 
-#: eeschema/dialogs/dialog_netlist.cpp:390
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:392
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:392
 msgid "Simulator command:"
 msgstr "シミュレータ コマンド:"
 
-#: eeschema/dialogs/dialog_netlist.cpp:403
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:405
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:405
 msgid "&Run Simulator"
 msgstr "シミュレータの実行(&R)"
 
-#: eeschema/dialogs/dialog_netlist.cpp:443
-#: eeschema/dialogs/dialog_netlist_base.cpp:105
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:445
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:105
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:445
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:105
 msgid "Netlist command:"
 msgstr "ネットリスト コマンド:"
 
-#: eeschema/dialogs/dialog_netlist.cpp:456
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:458
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:458
 msgid "Title:"
 msgstr "タイトル:"
 
-#: eeschema/dialogs/dialog_netlist.cpp:536
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:538
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:538
 msgid "Save Netlist File"
 msgstr "ネットリスト ファイルの保存"
 
-#: eeschema/dialogs/dialog_netlist.cpp:571
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:573
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:573
 #, c-format
 msgid "%s Export"
 msgstr "エクスポート %s"
 
-#: eeschema/dialogs/dialog_netlist.cpp:622
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:624
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:624
 msgid "SPICE netlist file (.cir)|*.cir"
 msgstr "SPICEネットリスト ファイル (.cir)|*.cir"
 
-#: eeschema/dialogs/dialog_netlist.cpp:627
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:629
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:629
 msgid "CadStar netlist file (.frp)|*.frp"
 msgstr "CadStarネットリスト ファイル (.frp)|*.frp"
 
-#: eeschema/dialogs/dialog_netlist.cpp:783
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:785
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:785
 msgid "This plugin already exists. Abort"
 msgstr "このプラグインは既に存在するため、中止します。"
 
-#: eeschema/dialogs/dialog_netlist.cpp:810
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:812
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:812
 msgid "Error. You must provide a command String"
 msgstr "エラー: コマンド文字列を設定する必要があります"
 
-#: eeschema/dialogs/dialog_netlist.cpp:816
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:818
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:818
 msgid "Error. You must provide a Title"
 msgstr "エラー タイトルを設定してください"
 
-#: eeschema/dialogs/dialog_netlist.cpp:874
+#: kicad-6297/eeschema/dialogs/dialog_netlist.cpp:876
+#: kicad-6996/eeschema/dialogs/dialog_netlist.cpp:876
 msgid "Do not forget to choose a title for this netlist control page"
 msgstr ""
 "このネットリストのコントロールページからタイトルを選択することを忘れないでく"
 "ださい"
 
-#: eeschema/dialogs/dialog_netlist_base.cpp:61
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:61
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:61
 msgid "Use default netname"
 msgstr "デフォルトのネット名を使用"
 
-#: eeschema/dialogs/dialog_netlist_base.cpp:70
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:70
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:70
 msgid "Default Netlist Filename:"
 msgstr "デフォルトのネットリスト ファイル名:"
 
-#: eeschema/dialogs/dialog_netlist_base.cpp:136
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.cpp:136
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.cpp:136
 msgid "Browse Plugins"
 msgstr "プラグインの参照"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:171
-#: pcbnew/dialogs/dialog_SVG_print.cpp:215
-#: pcbnew/dialogs/dialog_gendrill.cpp:295 pcbnew/dialogs/dialog_plot.cpp:310
-#: pcbnew/exporters/gen_modules_placefile.cpp:176
-#: pcbnew/exporters/gen_modules_placefile.cpp:565
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic.cpp:172
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:215
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:295
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:310
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:175
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:543
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic.cpp:173
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:214
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:295
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:304
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:180
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:610
 msgid "Select Output Directory"
 msgstr "出力するディレクトリの選択"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:183
-#: pcbnew/dialogs/dialog_plot.cpp:320
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic.cpp:184
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:320
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic.cpp:185
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:305
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:314
 #, c-format
 msgid ""
 "Do you want to use a path relative to\n"
@@ -5007,40 +6702,62 @@ msgstr ""
 "下記の相対パスを使用しますか?\n"
 "'%s'"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:186
-#: eeschema/dialogs/dialog_plot_schematic.cpp:194
-#: pcbnew/dialogs/dialog_SVG_print.cpp:223
-#: pcbnew/dialogs/dialog_SVG_print.cpp:234
-#: pcbnew/dialogs/dialog_gendrill.cpp:303
-#: pcbnew/dialogs/dialog_gendrill.cpp:314 pcbnew/dialogs/dialog_plot.cpp:323
-#: pcbnew/dialogs/dialog_plot.cpp:330
-#: pcbnew/exporters/gen_modules_placefile.cpp:184
-#: pcbnew/exporters/gen_modules_placefile.cpp:193
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic.cpp:187
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic.cpp:195
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:223
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:234
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:303
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:314
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:323
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:330
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:183
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:192
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic.cpp:188
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic.cpp:196
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:222
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:233
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:308
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:315
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:317
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:324
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:188
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:197
 msgid "Plot Output Directory"
 msgstr "出力するディレクトリの選択"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:193
-#: pcbnew/dialogs/dialog_plot.cpp:329
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic.cpp:194
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:329
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic.cpp:195
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:314
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:323
 msgid "Cannot make path relative (target volume different from file volume)!"
 msgstr ""
 "パスの関連付けを作成できません (ターゲットボリュームがボードファイルのボ"
 "リュームと異なります"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:348
-#: pcbnew/dialogs/dialog_SVG_print.cpp:275
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic.cpp:349
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:275
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic.cpp:350
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:274
 #, c-format
 msgid "Could not write plot files to folder '%s'."
 msgstr "フォルダ '%s' へプロットファイルを生成できませんでした。"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:24
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:21
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:26
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:23
-#: pcbnew/dialogs/dialog_plot_base.cpp:42
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:24
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:21
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:26
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:42
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:24
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:21
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:26
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:42
 msgid "Output directory:"
 msgstr "出力ディレクトリ:"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:33
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:33
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:30
 msgid ""
 "Target directory for plot files. Can be absolute or relative to the "
 "schematic main file location."
@@ -5048,167 +6765,231 @@ msgstr ""
 "出図ファイルのターゲットディレクトリです。ボードファイルの位置に絶対パス、ま"
 "たは相対パスが使用できます。"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:37
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:35
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:40
-#: pcbnew/dialogs/dialog_plot_base.cpp:55
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:55
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:54
 msgid "Browse..."
 msgstr "参照..."
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:48
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:48
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:48
 msgid "Paper Options"
 msgstr "用紙設定"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:50
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:50
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:50
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Schematic size"
 msgstr "回路図の大きさ"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:50
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:50
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:50
 msgid "Force size A4"
 msgstr "サイズを強制的にA4へ"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:50
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:50
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:50
 msgid "Force size A"
 msgstr "サイズを強制的にAへ"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:52
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:58
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:52
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:58
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:52
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:58
 msgid "Page Size:"
 msgstr "ページ サイズ:"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:56
-#: pcbnew/dialogs/dialog_plot_base.cpp:256
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:256
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:254
 msgid "HPGL Options"
 msgstr "HPGL オプション"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size A4"
 msgstr "ページ サイズ A4"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size A3"
 msgstr "ページ サイズ A3"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size A2"
 msgstr "ページ サイズ A2"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size A1"
 msgstr "ページ サイズ A1"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size A0"
 msgstr "ページ サイズ A0"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size A"
 msgstr "ページ サイズ A"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size B"
 msgstr "ページ サイズ B"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size C"
 msgstr "ページ サイズ C"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size D"
 msgstr "ページ サイズ D"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:62
 msgid "Page size E"
 msgstr "ページ サイズ E"
 
 # orペア下層
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:68
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:68
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:68
 msgid "Bottom left corner"
 msgstr "左下の角"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:68
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:68
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:68
 msgid "Center of the page"
 msgstr "ページ中央"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:70
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:48
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:92
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:247
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:302
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:63
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:70
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:48
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:92
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:247
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:302
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:61
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:70
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:48
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:92
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:247
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:302
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:61
 msgid "Origin"
 msgstr "原点"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:74
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:74
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:74
 msgid "Pen width"
 msgstr "ペン幅"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:88
-#: pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:30
 msgid "Postscript"
 msgstr "PostScript"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:88
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:74
-#: pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:30
 msgid "PDF"
 msgstr "PDF"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:88
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:74
-#: pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:30
 msgid "SVG"
 msgstr "SVG"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:88
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:74
-#: pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:30
 msgid "DXF"
 msgstr "DXF"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:88
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:74
-#: pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:30
 msgid "HPGL"
 msgstr "HPGL"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:97
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:97
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:91
 msgid "Default line thickness"
 msgstr "標準の線幅"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:103
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:103
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:97
 msgid ""
 "Selection of the default pen thickness used to draw items, when their "
 "thickness is set to 0."
 msgstr ""
 "太さが０にセットされているアイテムを描画する時の、デフォルトのペン太さを選択"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:107
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:85
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:73
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:34
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:112
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:107
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:112
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:101
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:127
 msgid "Color"
 msgstr "カラー"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:107
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:85
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:73
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:34
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:112
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:107
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:112
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:101
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:127
 msgid "Black and white"
 msgstr "モノクロ"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:109
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:21
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:109
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:21
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:21
 msgid "Mode"
 msgstr "モード"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:111
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:77
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:38
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:116
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:111
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:77
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:116
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:105
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:131
 msgid ""
 "Choose if you want to draw the sheet like it appears on screen,\n"
 "or in black and white mode, better to print it when using  black and white "
@@ -5217,81 +6998,113 @@ msgstr ""
 "スクリーン表示のような作画や、モノクロモードで\n"
 "モノクロのプリンター使用時に良い印刷をしたい場合に選択"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:115
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:115
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:109
 msgid "Plot border and title block"
 msgstr "シートの図枠を印刷"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:117
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:30
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:96
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:117
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:30
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:96
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:111
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:30
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:111
 msgid "Print (or not) the Frame references."
 msgstr "図枠 リファレンスの印刷設定"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:126
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:126
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:120
 msgid "Plot Current Page"
 msgstr "現在のページをプロット"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.cpp:130
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.cpp:130
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.cpp:124
 msgid "Plot All Pages"
 msgstr "全てのページをプロット"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:247
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:47
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:102
-#: pagelayout_editor/dialogs/dialogs_for_printing.cpp:237
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:51
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:138
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer.cpp:247
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:47
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:102
+#: kicad-6297/pagelayout_editor/dialogs/dialogs_for_printing.cpp:237
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:51
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:138
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer.cpp:249
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:47
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:100
+#: kicad-6996/pagelayout_editor/dialogs/dialogs_for_printing.cpp:237
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:51
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:153
 msgid "Preview"
 msgstr "プレビュー"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:299
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer.cpp:299
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer.cpp:301
 msgid "Print Schematic"
 msgstr "回路図の印刷"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:304
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer.cpp:304
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer.cpp:306
 msgid "An error occurred attempting to print the schematic."
 msgstr "回路図の印刷中にエラーが発生しました。"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:305
-#: pagelayout_editor/dialogs/dialogs_for_printing.cpp:225
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer.cpp:305
+#: kicad-6297/pagelayout_editor/dialogs/dialogs_for_printing.cpp:225
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer.cpp:307
+#: kicad-6996/pagelayout_editor/dialogs/dialogs_for_printing.cpp:225
 msgid "Printing"
 msgstr "印刷中"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:317
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer.cpp:317
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer.cpp:327
 #, c-format
 msgid "Print page %d"
 msgstr "印刷 (ページ:%d)"
 
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:22
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:22
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:22
 msgid "Print options:"
 msgstr "印刷設定:"
 
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:28
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:28
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:28
 msgid "Print sheet &reference and title block"
 msgstr "シートのリファレンスと図枠の印刷(&R)"
 
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:34
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:34
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:34
 msgid "Print in &black and white only"
 msgstr "モノクロ印刷(&B)"
 
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:44
 msgid "Page Setup"
 msgstr "用紙設定"
 
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:50
-#: gerbview/dialogs/dialog_print_using_printer.cpp:390
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:105
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:54
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:504
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:141
-#: eeschema/dialogs/dialog_print_using_printer_base.h:56
-#: gerbview/dialogs/dialog_print_using_printer_base.h:73
-#: pcbnew/dialogs/dialog_print_for_modedit_base.h:61
-#: pcbnew/dialogs/dialog_print_using_printer_base.h:81
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.cpp:50
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:390
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:105
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:504
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:141
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.cpp:50
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:404
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:495
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:156
+#: kicad-6297/eeschema/dialogs/dialog_print_using_printer_base.h:56
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.h:73
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.h:61
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.h:81
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer_base.h:56
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.h:73
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.h:61
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.h:85
 msgid "Print"
 msgstr "印刷"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:85
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:85
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:84
 msgid ""
 "It looks like this project was made using older schematic component "
 "libraries.\n"
@@ -5310,21 +7123,27 @@ msgstr ""
 "\n"
 "次の変更はプロジェクトをアップデートするために推奨されるものです。"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:104
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:192
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:609
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:107
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:192
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:609
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:106
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:192
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:609
 msgid "Accept"
 msgstr "適用"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:105
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:108
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:107
 msgid "Symbol"
 msgstr "シンボル"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:106
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:109
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:108
 msgid "Action"
 msgstr "アクション"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:280
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:283
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:282
 msgid ""
 "Stop showing this tool?\n"
 "No changes will be made.\n"
@@ -5338,325 +7157,371 @@ msgstr ""
 "この設定は \"コンポーネント ライブラリ\" ダイアログから変更でき, \n"
 "ツールは \"ツール\" メニューから実行できます."
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:284
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each.cpp:287
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each.cpp:286
 msgid "Rescue Components"
 msgstr "レスキュー コンポーネント"
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:23
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each_base.cpp:23
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each_base.cpp:23
 msgid "Symbols to update:"
 msgstr "シンボルの更新"
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:32
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each_base.cpp:32
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each_base.cpp:32
 msgid "Instances of this symbol:"
 msgstr "このシンボルのインスタンス"
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:47
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each_base.cpp:47
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each_base.cpp:47
 msgid "Cached Part:"
 msgstr "キャッシュされた部品:"
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:64
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each_base.cpp:64
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each_base.cpp:64
 msgid "Library Part:"
 msgstr "ライブラリの部品:"
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:84
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each_base.cpp:84
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each_base.cpp:84
 msgid "Never Show Again"
 msgstr "再表示しない"
 
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:33 eeschema/lib_pin.cpp:186
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:33
+#: kicad-6297/eeschema/lib_pin.cpp:186
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:33
+#: kicad-6996/eeschema/pin_type.cpp:47
 msgid "Tri-state"
 msgstr "トライステート"
 
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:39
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:49
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:87
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:39
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:80
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:80
 msgid "Text height:"
 msgstr "テキスト高さ:"
 
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:51
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:57
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:95
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:51
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:87
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:51
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:53
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:87
 msgid "Text width:"
 msgstr "テキスト幅:"
 
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:63
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:63
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:63
 msgid "Connection type:"
 msgstr "接続のタイプ:"
 
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:28
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:28
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:28
 msgid "&File name:"
 msgstr "ファイル名(&F):"
 
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:41
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:41
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:41
 msgid "Si&ze:"
 msgstr "サイズ(&Z):"
 
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:53
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:53
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:53
 msgid "&Sheet name:"
 msgstr "シート名(&S):"
 
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:94
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:94
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.cpp:94
 msgid "Unique timestamp:"
 msgstr "固有のタイムスタンプ:"
 
-#: eeschema/dialogs/dialog_schematic_find.cpp:39
-#: eeschema/dialogs/dialog_schematic_find_base.h:76
-#: pcbnew/dialogs/dialog_find_base.h:54
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find.cpp:39
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find.cpp:39
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.h:76
+#: kicad-6297/pcbnew/dialogs/dialog_find_base.h:54
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.h:77
+#: kicad-6996/pcbnew/dialogs/dialog_find_base.h:54
 msgid "Find"
 msgstr "検索"
 
-#: eeschema/dialogs/dialog_schematic_find.cpp:48
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find.cpp:48
+#: kicad-6297/eeschema/hotkeys.cpp:207
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find.cpp:48
+#: kicad-6996/eeschema/hotkeys.cpp:207
 msgid "Find and Replace"
 msgstr "検索と置換"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:28
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:28
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:28
 msgid "&Search for:"
 msgstr "検索(&S):"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:33
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:33
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:33
 msgid "Text with optional wildcards"
 msgstr "検索文字列"
 
 # 置換か
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:38
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:38
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:38
 msgid "Replace &with:"
 msgstr "交換(&W):"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:49
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:49
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:49
 msgid "Direction:"
 msgstr "向き:"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:58
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:58
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:58
 msgid "F&orward"
 msgstr "前へ(&O)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:63
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:63
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:63
 msgid "&Backward"
 msgstr "後へ(&B)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:74
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:74
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:74
 msgid "Match whole wor&d"
 msgstr "全体一致のみ(&D)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:78
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:78
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:78
 msgid "&Match case"
 msgstr "大文字/小文字を区別(&M)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:81
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:81
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:81
 msgid "Search &using simple wildcard matching"
 msgstr "ワイルドカードを使用(&U)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:84
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:84
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:84
 msgid "Wrap around &end of search list"
 msgstr "先頭から検索(&E)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:88
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:88
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:88
 msgid "Search all com&ponent fields"
 msgstr "全てのコンポーネントフィールドを検索(&P)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:91
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:91
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:91
 msgid "Search all pin &names and numbers"
 msgstr "全てのピン名と番号を検索(&N)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:94
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:94
 msgid "Search the current &sheet onl&y"
 msgstr "現在のシートのみを検索(&S)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:97
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:97
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:97
 msgid "Replace componen&t reference designators"
 msgstr "コンポーネントのリファレンス記号の置換(&t)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:102
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:102
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:102
 msgid "D&o not warp cursor to found item"
 msgstr "検索したアイテムにカーソルを移動しない(&O)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:111 eeschema/menubar.cpp:195
-#: pcbnew/menubar_pcbframe.cpp:291
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:111
+#: kicad-6297/eeschema/menubar.cpp:195
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:291
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:111
+#: kicad-6996/eeschema/menubar.cpp:193
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:295
 msgid "&Find"
 msgstr "検索(&F)"
 
 # 置換か
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:115
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:115
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:115
 msgid "&Replace"
 msgstr "入れ替え(&R)"
 
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:120
+#: kicad-6297/eeschema/dialogs/dialog_schematic_find_base.cpp:120
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:120
 msgid "Replace &All"
 msgstr "全て置換(&A)"
 
-#: eeschema/edit_bitmap.cpp:115 eeschema/edit_bitmap.cpp:125
-#: pagelayout_editor/pl_editor_frame.cpp:646
-#: pagelayout_editor/pl_editor_frame.cpp:653
+#: kicad-6297/eeschema/edit_bitmap.cpp:115
+#: kicad-6297/eeschema/edit_bitmap.cpp:125
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:646
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:653
+#: kicad-6996/eeschema/edit_bitmap.cpp:115
+#: kicad-6996/eeschema/edit_bitmap.cpp:125
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:647
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:654
 #, c-format
 msgid "Couldn't load image from <%s>"
 msgstr "<%s> からイメージを読み込むことが出来ません。"
 
-#: eeschema/edit_component_in_schematic.cpp:73
+#: kicad-6297/eeschema/edit_component_in_schematic.cpp:69
+#: kicad-6996/eeschema/edit_component_in_schematic.cpp:69
 #, c-format
 msgid "Edit %s Field"
 msgstr "フィールド %s の編集"
 
-#: eeschema/edit_component_in_schematic.cpp:108
-msgid "Illegal reference string!  No change"
-msgstr "無効なリファレンス文字です! 変更されません"
-
-#: eeschema/edit_component_in_schematic.cpp:117
-msgid "The reference field cannot be empty!  No change"
-msgstr "リファレンス フィールドは空にできません! 変更されません"
-
-#: eeschema/edit_component_in_schematic.cpp:127
-msgid "The value field cannot be empty!  No change"
-msgstr "定数のフィールドは空にできません。"
-
-#: eeschema/eeschema_config.cpp:261 pcbnew/pcbnew_config.cpp:217
+#: kicad-6297/eeschema/eeschema_config.cpp:261
+#: kicad-6297/pcbnew/pcbnew_config.cpp:217
+#: kicad-6996/eeschema/eeschema_config.cpp:245
+#: kicad-6996/pcbnew/pcbnew_config.cpp:217
 msgid "Read Project File"
 msgstr "プロジェクトファイルの読込み"
 
-#: eeschema/eeschema_config.cpp:492 pcbnew/pcbnew_config.cpp:300
+#: kicad-6297/eeschema/eeschema_config.cpp:494
+#: kicad-6297/pcbnew/pcbnew_config.cpp:300
+#: kicad-6996/eeschema/eeschema_config.cpp:480
+#: kicad-6996/pcbnew/pcbnew_config.cpp:291
 msgid "Save Project File"
 msgstr "プロジェクト ファイルの保存"
 
-#: eeschema/erc.cpp:89
+#: kicad-6297/eeschema/erc.cpp:89 kicad-6996/eeschema/erc.cpp:89
 msgid "Input Pin.........."
 msgstr "入力ピン・・・・・・・・"
 
-#: eeschema/erc.cpp:90
+#: kicad-6297/eeschema/erc.cpp:90 kicad-6996/eeschema/erc.cpp:90
 msgid "Output Pin........."
 msgstr "出力ピン・・・・・・・・"
 
-#: eeschema/erc.cpp:91
+#: kicad-6297/eeschema/erc.cpp:91 kicad-6996/eeschema/erc.cpp:91
 msgid "Bidirectional Pin.."
 msgstr "双方向ピン・・・・・・"
 
-#: eeschema/erc.cpp:92
+#: kicad-6297/eeschema/erc.cpp:92 kicad-6996/eeschema/erc.cpp:92
 msgid "Tri-State Pin......"
 msgstr "トライステートピン・・"
 
-#: eeschema/erc.cpp:93
+#: kicad-6297/eeschema/erc.cpp:93 kicad-6996/eeschema/erc.cpp:93
 msgid "Passive Pin........"
 msgstr "パッシブピン・・・・・・"
 
-#: eeschema/erc.cpp:94
+#: kicad-6297/eeschema/erc.cpp:94 kicad-6996/eeschema/erc.cpp:94
 msgid "Unspecified Pin...."
 msgstr "未指定ピン・・・・・・"
 
-#: eeschema/erc.cpp:95
+#: kicad-6297/eeschema/erc.cpp:95 kicad-6996/eeschema/erc.cpp:95
 msgid "Power Input Pin...."
 msgstr "電源入力ピン・・・・"
 
-#: eeschema/erc.cpp:96
+#: kicad-6297/eeschema/erc.cpp:96 kicad-6996/eeschema/erc.cpp:96
 msgid "Power Output Pin..."
 msgstr "電源出力ピン・・・・"
 
-#: eeschema/erc.cpp:97
+#: kicad-6297/eeschema/erc.cpp:97 kicad-6996/eeschema/erc.cpp:97
 msgid "Open Collector....."
 msgstr "オープンコレクタ・・・"
 
-#: eeschema/erc.cpp:98
+#: kicad-6297/eeschema/erc.cpp:98 kicad-6996/eeschema/erc.cpp:98
 msgid "Open Emitter......."
 msgstr "オープンエミッタ・・・"
 
-#: eeschema/erc.cpp:99
+#: kicad-6297/eeschema/erc.cpp:99 kicad-6996/eeschema/erc.cpp:99
 msgid "No Connection......"
 msgstr "未接続・・・・・・・・"
 
-#: eeschema/erc.cpp:105
+#: kicad-6297/eeschema/erc.cpp:105 kicad-6996/eeschema/erc.cpp:105
 msgid "Input Pin"
 msgstr "入力ピン"
 
-#: eeschema/erc.cpp:106
+#: kicad-6297/eeschema/erc.cpp:106 kicad-6996/eeschema/erc.cpp:106
 msgid "Output Pin"
 msgstr "出力ピン"
 
-#: eeschema/erc.cpp:107
+#: kicad-6297/eeschema/erc.cpp:107 kicad-6996/eeschema/erc.cpp:107
 msgid "Bidirectional Pin"
 msgstr "双方向ピン"
 
-#: eeschema/erc.cpp:108
+#: kicad-6297/eeschema/erc.cpp:108 kicad-6996/eeschema/erc.cpp:108
 msgid "Tri-State Pin"
 msgstr "トライステートピン"
 
-#: eeschema/erc.cpp:109
+#: kicad-6297/eeschema/erc.cpp:109 kicad-6996/eeschema/erc.cpp:109
 msgid "Passive Pin"
 msgstr "パッシブピン"
 
-#: eeschema/erc.cpp:110
+#: kicad-6297/eeschema/erc.cpp:110 kicad-6996/eeschema/erc.cpp:110
 msgid "Unspecified Pin"
 msgstr "未指定ピン"
 
-#: eeschema/erc.cpp:111
+#: kicad-6297/eeschema/erc.cpp:111 kicad-6996/eeschema/erc.cpp:111
 msgid "Power Input Pin"
 msgstr "電源入力ピン"
 
-#: eeschema/erc.cpp:112
+#: kicad-6297/eeschema/erc.cpp:112 kicad-6996/eeschema/erc.cpp:112
 msgid "Power Output Pin"
 msgstr "電源出力ピン"
 
-#: eeschema/erc.cpp:113
+#: kicad-6297/eeschema/erc.cpp:113 kicad-6996/eeschema/erc.cpp:113
 msgid "Open Collector"
 msgstr "オープンコレクタ"
 
-#: eeschema/erc.cpp:114
+#: kicad-6297/eeschema/erc.cpp:114 kicad-6996/eeschema/erc.cpp:114
 msgid "Open Emitter"
 msgstr "オープンエミッタ"
 
-#: eeschema/erc.cpp:115
+#: kicad-6297/eeschema/erc.cpp:115 kicad-6996/eeschema/erc.cpp:115
 msgid "No Connection"
 msgstr "未接続"
 
-#: eeschema/erc.cpp:209
+#: kicad-6297/eeschema/erc.cpp:209 kicad-6996/eeschema/erc.cpp:211
 msgid "Duplicate sheet name"
 msgstr "シート名の重複"
 
-#: eeschema/erc.cpp:252
+#: kicad-6297/eeschema/erc.cpp:252 kicad-6996/eeschema/erc.cpp:253
 #, c-format
 msgid "Hierarchical label %s is not connected to a sheet label."
 msgstr "階層ラベル %s がシートラベルに接続されていません"
 
-#: eeschema/erc.cpp:261
+#: kicad-6297/eeschema/erc.cpp:261 kicad-6996/eeschema/erc.cpp:262
 #, c-format
 msgid "Global label %s is not connected to any other global label."
 msgstr ""
 "グローバル ラベル %s は、他のいかなるグローバル ラベルにも接続されていませ"
 "ん。"
 
-#: eeschema/erc.cpp:270
+#: kicad-6297/eeschema/erc.cpp:270 kicad-6996/eeschema/erc.cpp:271
 #, c-format
 msgid "Sheet label %s is not connected to a hierarchical label."
 msgstr "シートラベル %s が階層ラベルに接続されていません。"
 
-#: eeschema/erc.cpp:297
+#: kicad-6297/eeschema/erc.cpp:297 kicad-6996/eeschema/erc.cpp:298
 #, c-format
 msgid "Pin %s (%s) of component %s is unconnected."
 msgstr "ピン %s (%s) (コンポーネント %s) が接続されていません。"
 
-#: eeschema/erc.cpp:314
+#: kicad-6297/eeschema/erc.cpp:314 kicad-6996/eeschema/erc.cpp:315
 #, c-format
 msgid "Pin %s (%s) of component %s is not driven (Net %d)."
 msgstr "ピン %s (%s) (コンポーネント %s) は駆動されていません。(Net %d)"
 
-#: eeschema/erc.cpp:328
+#: kicad-6297/eeschema/erc.cpp:328 kicad-6996/eeschema/erc.cpp:329
 msgid "More than 1 pin connected to an UnConnect symbol."
 msgstr "1つ以上のピンが空き端子フラグに接続しています"
 
-#: eeschema/erc.cpp:356
+#: kicad-6297/eeschema/erc.cpp:356 kicad-6996/eeschema/erc.cpp:357
 #, c-format
 msgid "Pin %s (%s) of component %s is connected to "
 msgstr "ピン %s (%s) (コンポーネント %s) が次に接続されています。"
 
-#: eeschema/erc.cpp:361
+#: kicad-6297/eeschema/erc.cpp:361 kicad-6996/eeschema/erc.cpp:362
 #, c-format
 msgid "pin %s (%s) of component %s (net %d)."
 msgstr "ピン %s (%s) コンポーネント %s (ネット %d)."
 
-#: eeschema/erc.cpp:534
+#: kicad-6297/eeschema/erc.cpp:534 kicad-6996/eeschema/erc.cpp:534
 msgid "ERC report"
 msgstr "ERC レポート"
 
-#: eeschema/erc.cpp:536
+#: kicad-6297/eeschema/erc.cpp:536 kicad-6996/eeschema/erc.cpp:536
 msgid "Encoding UTF8"
 msgstr "UTF8 でエンコード"
 
-#: eeschema/erc.cpp:546
+#: kicad-6297/eeschema/erc.cpp:546 kicad-6996/eeschema/erc.cpp:545
 #, c-format
 msgid ""
 "\n"
@@ -5665,7 +7530,7 @@ msgstr ""
 "\n"
 "***** シート %s\n"
 
-#: eeschema/erc.cpp:571
+#: kicad-6297/eeschema/erc.cpp:571 kicad-6996/eeschema/erc.cpp:570
 #, c-format
 msgid ""
 "\n"
@@ -5674,56 +7539,62 @@ msgstr ""
 "\n"
 " ** ERC メッセージ: %d  エラー %d  警告 %d\n"
 
-#: eeschema/files-io.cpp:68
+#: kicad-6297/eeschema/files-io.cpp:68 kicad-6996/eeschema/files-io.cpp:73
 msgid "Schematic Files"
 msgstr "回路図ファイル"
 
-#: eeschema/files-io.cpp:98
+#: kicad-6297/eeschema/files-io.cpp:98 kicad-6996/eeschema/files-io.cpp:103
 #, c-format
 msgid "Could not save backup of file '%s'"
 msgstr "ファイル '%s' のバックアップを保存できません"
 
-#: eeschema/files-io.cpp:112
-#: eeschema/netlist_exporters/netlist_exporter_cadstar.cpp:48
-#: eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp:51
-#: eeschema/netlist_exporters/netlist_exporter_pspice.cpp:61
+#: kicad-6297/eeschema/files-io.cpp:112
+#: kicad-6297/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp:48
+#: kicad-6297/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp:51
+#: kicad-6297/eeschema/netlist_exporters/netlist_exporter_pspice.cpp:61
+#: kicad-6996/eeschema/files-io.cpp:137
+#: kicad-6996/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp:48
+#: kicad-6996/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp:51
+#: kicad-6996/eeschema/netlist_exporters/netlist_exporter_pspice.cpp:60
 #, c-format
 msgid "Failed to create file '%s'"
 msgstr "ファイルの作成に失敗しました '%s'"
 
-#: eeschema/files-io.cpp:141
+#: kicad-6297/eeschema/files-io.cpp:141 kicad-6996/eeschema/files-io.cpp:169
 #, c-format
 msgid "File %s saved"
 msgstr "ファイル %s を保存しました"
 
-#: eeschema/files-io.cpp:146
+#: kicad-6297/eeschema/files-io.cpp:146 kicad-6996/eeschema/files-io.cpp:174
 msgid "File write operation failed."
 msgstr "ファイルの書き込みに失敗しました。"
 
-#: eeschema/files-io.cpp:200
+#: kicad-6297/eeschema/files-io.cpp:200 kicad-6996/eeschema/files-io.cpp:226
 #, c-format
 msgid "Schematic file '%s' is already open."
 msgstr "この回路図ファイル '%s' は既に開かれています。"
 
-#: eeschema/files-io.cpp:213
+#: kicad-6297/eeschema/files-io.cpp:213 kicad-6996/eeschema/files-io.cpp:239
 msgid ""
 "The current schematic has been modified.  Do you wish to save the changes?"
 msgstr "現在の回路図は変更されています。変更を保存しますか？"
 
-#: eeschema/files-io.cpp:215 pcbnew/files.cpp:422
+#: kicad-6297/eeschema/files-io.cpp:215 kicad-6297/pcbnew/files.cpp:429
+#: kicad-6996/eeschema/files-io.cpp:241 kicad-6996/pcbnew/files.cpp:429
 msgid "Save and Load"
 msgstr "保存と読み込み"
 
-#: eeschema/files-io.cpp:216 pcbnew/files.cpp:423
+#: kicad-6297/eeschema/files-io.cpp:216 kicad-6297/pcbnew/files.cpp:430
+#: kicad-6996/eeschema/files-io.cpp:242 kicad-6996/pcbnew/files.cpp:430
 msgid "Load Without Saving"
 msgstr "保存しないで読み込み"
 
-#: eeschema/files-io.cpp:246
+#: kicad-6297/eeschema/files-io.cpp:246 kicad-6996/eeschema/files-io.cpp:272
 #, c-format
 msgid "Schematic '%s' does not exist.  Do you wish to create it?"
 msgstr "回路図 '%s' は存在しません。新規作成しますか?"
 
-#: eeschema/files-io.cpp:268
+#: kicad-6297/eeschema/files-io.cpp:268 kicad-6996/eeschema/files-io.cpp:294
 #, c-format
 msgid ""
 "Ready\n"
@@ -5732,11 +7603,11 @@ msgstr ""
 "準備完了\n"
 "作業中のディレクトリ: '%s'\n"
 
-#: eeschema/files-io.cpp:352
+#: kicad-6297/eeschema/files-io.cpp:352 kicad-6996/eeschema/files-io.cpp:405
 msgid "Import Schematic"
 msgstr "回路図のインポート"
 
-#: eeschema/files-io.cpp:462
+#: kicad-6297/eeschema/files-io.cpp:464 kicad-6996/eeschema/files-io.cpp:521
 msgid ""
 "This operation cannot be undone. Besides, take into account that "
 "hierarchical sheets will not be appended.\n"
@@ -5748,187 +7619,534 @@ msgstr ""
 "\n"
 "操作を続行する前に現在の作業内容を保存しますか？"
 
-#: eeschema/files-io.cpp:486
+#: kicad-6297/eeschema/files-io.cpp:488 kicad-6996/eeschema/files-io.cpp:545
 #, c-format
 msgid "Directory '%s' is not writable"
 msgstr "ディレクトリ '%s' は書き込み禁止されています"
 
-#: eeschema/find.cpp:99
+#: kicad-6297/eeschema/find.cpp:99 kicad-6996/eeschema/find.cpp:97
 #, c-format
 msgid "Design rule check marker found in sheet %s at %0.3f%s, %0.3f%s"
 msgstr ""
 "シート %s の %0.3f%s, %0.3f%s にデザインルール チェック マーカーが見つかりま"
 "した。"
 
-#: eeschema/find.cpp:105
+#: kicad-6297/eeschema/find.cpp:105 kicad-6996/eeschema/find.cpp:103
 msgid "No more markers were found."
 msgstr "これ以上マーカーは見つかりませんでした。"
 
-#: eeschema/find.cpp:242
+#: kicad-6297/eeschema/find.cpp:242 kicad-6996/eeschema/find.cpp:241
 msgid "component"
 msgstr "コンポーネント"
 
-#: eeschema/find.cpp:246
+#: kicad-6297/eeschema/find.cpp:246 kicad-6996/eeschema/find.cpp:245
 #, c-format
 msgid "pin %s"
 msgstr "ピン %s"
 
-#: eeschema/find.cpp:250
+#: kicad-6297/eeschema/find.cpp:250 kicad-6996/eeschema/find.cpp:249
 #, c-format
 msgid "reference %s"
 msgstr "リファレンス %s"
 
-#: eeschema/find.cpp:254
-msgid "value"
-msgstr "定数"
+#: kicad-6297/eeschema/find.cpp:254 kicad-6996/eeschema/find.cpp:253
+#, c-format
+msgid "value %s"
+msgstr "定数 %s"
 
-#: eeschema/find.cpp:258
-msgid "field"
-msgstr "フィールド"
+#: kicad-6297/eeschema/find.cpp:258 kicad-6996/eeschema/find.cpp:257
+#, c-format
+msgid "field %s"
+msgstr "フィールド %s"
 
-#: eeschema/find.cpp:266
+#: kicad-6297/eeschema/find.cpp:266 kicad-6996/eeschema/find.cpp:265
 #, c-format
 msgid "%s %s found"
 msgstr "%s  %s が見つかりました"
 
-#: eeschema/find.cpp:271
+#: kicad-6297/eeschema/find.cpp:271 kicad-6996/eeschema/find.cpp:270
 #, c-format
 msgid "%s found but %s not found"
 msgstr "%s が見つかりましたが %s が見つかりません"
 
-#: eeschema/find.cpp:277
+#: kicad-6297/eeschema/find.cpp:277 kicad-6996/eeschema/find.cpp:276
 #, c-format
 msgid "Component %s not found"
 msgstr "コンポーネント %s が見つかりません"
 
-#: eeschema/find.cpp:511
+#: kicad-6297/eeschema/find.cpp:511 kicad-6996/eeschema/find.cpp:510
 #, c-format
 msgid "No item found matching %s."
 msgstr "%s にマッチするアイテムは見つかりませんでした。"
 
-#: eeschema/getpart.cpp:152
+#: kicad-6297/eeschema/getpart.cpp:152 kicad-6996/eeschema/getpart.cpp:150
 msgid "History"
 msgstr "履歴"
 
-#: eeschema/getpart.cpp:158
+#: kicad-6297/eeschema/getpart.cpp:158 kicad-6996/eeschema/getpart.cpp:156
 #, c-format
 msgid "Choose Component (%d items loaded)"
 msgstr "コンポーネントの選択 (%d アイテムが読込まれています)"
 
-#: eeschema/getpart.cpp:216
+#: kicad-6297/eeschema/getpart.cpp:216 kicad-6996/eeschema/getpart.cpp:214
 #, c-format
 msgid "Failed to find part '%s' in library"
 msgstr "ライブラリ中にコンポーネント '%s' が見つかりませんでした"
 
-#: eeschema/hierarch.cpp:147
+#: kicad-6297/eeschema/hierarch.cpp:147 kicad-6996/eeschema/hierarch.cpp:147
 msgid "Navigator"
 msgstr "ナビゲータ"
 
-#: eeschema/hierarch.cpp:157
+#: kicad-6297/eeschema/hierarch.cpp:157 kicad-6996/eeschema/hierarch.cpp:157
 msgid "Root"
 msgstr "ルート"
 
-#: eeschema/hotkeys.cpp:735
+#: kicad-6297/eeschema/hotkeys.cpp:87 kicad-6996/eeschema/hotkeys.cpp:87
+msgid "Fit on Screen"
+msgstr "スクリーンにフィット"
+
+#: kicad-6297/eeschema/hotkeys.cpp:89 kicad-6297/gerbview/hotkeys.cpp:62
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:72
+#: kicad-6297/pcbnew/basepcbframe.cpp:837 kicad-6297/pcbnew/hotkeys.cpp:159
+#: kicad-6297/pcbnew/hotkeys.cpp:161
+#: kicad-6297/pcbnew/tools/common_actions.cpp:210
+#: kicad-6996/eeschema/hotkeys.cpp:89 kicad-6996/gerbview/hotkeys.cpp:60
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:74
+#: kicad-6996/pcbnew/basepcbframe.cpp:843 kicad-6996/pcbnew/hotkeys.cpp:160
+#: kicad-6996/pcbnew/hotkeys.cpp:162
+#: kicad-6996/pcbnew/tools/common_actions.cpp:211
+msgid "Zoom Auto"
+msgstr "自動ズーム"
+
+#: kicad-6297/eeschema/hotkeys.cpp:93 kicad-6297/gerbview/hotkeys.cpp:63
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:73
+#: kicad-6297/pcbnew/hotkeys.cpp:164 kicad-6996/eeschema/hotkeys.cpp:93
+#: kicad-6996/gerbview/hotkeys.cpp:61
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:75
+#: kicad-6996/pcbnew/hotkeys.cpp:165
+msgid "Zoom Center"
+msgstr "中心へズーム"
+
+#: kicad-6297/eeschema/hotkeys.cpp:98 kicad-6297/eeschema/hotkeys.cpp:100
+#: kicad-6297/gerbview/hotkeys.cpp:64
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:75
+#: kicad-6297/pcbnew/hotkeys.cpp:168 kicad-6297/pcbnew/hotkeys.cpp:170
+#: kicad-6996/eeschema/hotkeys.cpp:98 kicad-6996/eeschema/hotkeys.cpp:100
+#: kicad-6996/gerbview/hotkeys.cpp:62
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:77
+#: kicad-6996/pcbnew/hotkeys.cpp:169 kicad-6996/pcbnew/hotkeys.cpp:171
+msgid "Zoom Redraw"
+msgstr "再描画をズーム"
+
+#: kicad-6297/eeschema/hotkeys.cpp:106 kicad-6297/eeschema/hotkeys.cpp:108
+#: kicad-6297/gerbview/hotkeys.cpp:66
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:77
+#: kicad-6297/pcbnew/hotkeys.cpp:175 kicad-6297/pcbnew/hotkeys.cpp:177
+#: kicad-6297/pcbnew/tools/common_actions.cpp:190
+#: kicad-6996/eeschema/hotkeys.cpp:106 kicad-6996/eeschema/hotkeys.cpp:108
+#: kicad-6996/gerbview/hotkeys.cpp:64
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:79
+#: kicad-6996/pcbnew/hotkeys.cpp:176 kicad-6996/pcbnew/hotkeys.cpp:178
+#: kicad-6996/pcbnew/tools/common_actions.cpp:191
+msgid "Zoom In"
+msgstr "ズーム イン"
+
+#: kicad-6297/eeschema/hotkeys.cpp:113 kicad-6297/eeschema/hotkeys.cpp:115
+#: kicad-6297/gerbview/hotkeys.cpp:65
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:76
+#: kicad-6297/pcbnew/hotkeys.cpp:182 kicad-6297/pcbnew/hotkeys.cpp:184
+#: kicad-6297/pcbnew/tools/common_actions.cpp:194
+#: kicad-6996/eeschema/hotkeys.cpp:113 kicad-6996/eeschema/hotkeys.cpp:115
+#: kicad-6996/gerbview/hotkeys.cpp:63
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:78
+#: kicad-6996/pcbnew/hotkeys.cpp:183 kicad-6996/pcbnew/hotkeys.cpp:185
+#: kicad-6996/pcbnew/tools/common_actions.cpp:195
+msgid "Zoom Out"
+msgstr "ズーム アウト"
+
+#: kicad-6297/eeschema/hotkeys.cpp:118 kicad-6297/gerbview/hotkeys.cpp:67
+#: kicad-6297/kicad/menubar.cpp:136 kicad-6297/pagelayout_editor/hotkeys.cpp:78
+#: kicad-6297/pcbnew/hotkeys.cpp:189 kicad-6996/eeschema/hotkeys.cpp:118
+#: kicad-6996/gerbview/hotkeys.cpp:66 kicad-6996/kicad/menubar.cpp:139
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:81
+#: kicad-6996/pcbnew/hotkeys.cpp:190
+msgid "Help (this window)"
+msgstr "ヘルプ (このウィンドウ)"
+
+#: kicad-6297/eeschema/hotkeys.cpp:119 kicad-6297/gerbview/hotkeys.cpp:69
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:70
+#: kicad-6297/pcbnew/hotkeys.cpp:128 kicad-6996/eeschema/hotkeys.cpp:119
+#: kicad-6996/gerbview/hotkeys.cpp:68
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:72
+#: kicad-6996/pcbnew/hotkeys.cpp:129
+msgid "Reset Local Coordinates"
+msgstr "ローカル座標をリセット"
+
+#: kicad-6297/eeschema/hotkeys.cpp:120 kicad-6297/eeschema/menubar.cpp:258
+#: kicad-6297/eeschema/onrightclick.cpp:196 kicad-6996/eeschema/hotkeys.cpp:120
+#: kicad-6996/eeschema/menubar.cpp:256 kicad-6996/eeschema/onrightclick.cpp:196
+msgid "Leave Sheet"
+msgstr "シートから抜ける"
+
+#: kicad-6297/eeschema/hotkeys.cpp:128 kicad-6297/eeschema/hotkeys.cpp:130
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:90
+#: kicad-6297/pcbnew/hotkeys.cpp:197 kicad-6297/pcbnew/hotkeys.cpp:199
+#: kicad-6996/eeschema/hotkeys.cpp:128 kicad-6996/eeschema/hotkeys.cpp:130
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:93
+#: kicad-6996/pcbnew/hotkeys.cpp:198 kicad-6996/pcbnew/hotkeys.cpp:200
+msgid "Redo"
+msgstr "やり直し"
+
+#: kicad-6297/eeschema/hotkeys.cpp:135
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:67 kicad-6297/pcbnew/hotkeys.cpp:67
+#: kicad-6996/eeschema/hotkeys.cpp:135
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:69 kicad-6996/pcbnew/hotkeys.cpp:67
+msgid "Mouse Left Click"
+msgstr "マウスの左クリック"
+
+#: kicad-6297/eeschema/hotkeys.cpp:136
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:68 kicad-6297/pcbnew/hotkeys.cpp:69
+#: kicad-6996/eeschema/hotkeys.cpp:136
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:70 kicad-6996/pcbnew/hotkeys.cpp:69
+msgid "Mouse Left Double Click"
+msgstr "マウスの左ダブルクリック"
+
+#: kicad-6297/eeschema/hotkeys.cpp:139 kicad-6297/eeschema/onrightclick.cpp:665
+#: kicad-6996/eeschema/hotkeys.cpp:139 kicad-6996/eeschema/onrightclick.cpp:668
+msgid "Begin Wire"
+msgstr "配線の開始"
+
+#: kicad-6297/eeschema/hotkeys.cpp:140 kicad-6297/eeschema/onrightclick.cpp:715
+#: kicad-6996/eeschema/hotkeys.cpp:140 kicad-6996/eeschema/onrightclick.cpp:718
+msgid "Begin Bus"
+msgstr "バスの開始"
+
+#: kicad-6297/eeschema/hotkeys.cpp:141 kicad-6996/eeschema/hotkeys.cpp:141
+msgid "End Line Wire Bus"
+msgstr "ワイヤ／バスの線を終端"
+
+#: kicad-6297/eeschema/hotkeys.cpp:144 kicad-6297/eeschema/onrightclick.cpp:698
+#: kicad-6297/eeschema/onrightclick.cpp:736 kicad-6996/eeschema/hotkeys.cpp:144
+#: kicad-6996/eeschema/onrightclick.cpp:701
+#: kicad-6996/eeschema/onrightclick.cpp:739
+msgid "Add Label"
+msgstr "ラベルを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:145 kicad-6996/eeschema/hotkeys.cpp:145
+msgid "Add Hierarchical Label"
+msgstr "階層ラベルを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:147 kicad-6297/eeschema/onrightclick.cpp:703
+#: kicad-6297/eeschema/onrightclick.cpp:741 kicad-6996/eeschema/hotkeys.cpp:147
+#: kicad-6996/eeschema/onrightclick.cpp:706
+#: kicad-6996/eeschema/onrightclick.cpp:744
+msgid "Add Global Label"
+msgstr "グローバル ラベルを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:149 kicad-6297/eeschema/onrightclick.cpp:696
+#: kicad-6297/eeschema/onrightclick.cpp:734 kicad-6996/eeschema/hotkeys.cpp:149
+#: kicad-6996/eeschema/onrightclick.cpp:699
+#: kicad-6996/eeschema/onrightclick.cpp:737
+msgid "Add Junction"
+msgstr "ジャンクションを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:150 kicad-6996/eeschema/hotkeys.cpp:150
+msgid "Add Component"
+msgstr "コンポーネントを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:152 kicad-6996/eeschema/hotkeys.cpp:152
+msgid "Add Power"
+msgstr "電源を追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:154 kicad-6996/eeschema/hotkeys.cpp:154
+msgid "Add No Connect Flag"
+msgstr "空き端子フラグを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:156 kicad-6996/eeschema/hotkeys.cpp:156
+msgid "Add Sheet"
+msgstr "シートを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:158 kicad-6996/eeschema/hotkeys.cpp:158
+msgid "Add Bus Entry"
+msgstr "バス エントリを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:160 kicad-6996/eeschema/hotkeys.cpp:160
+msgid "Add Wire Entry"
+msgstr "ワイヤ エントリを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:162 kicad-6996/eeschema/hotkeys.cpp:162
+msgid "Add Graphic PolyLine"
+msgstr "図形ポリラインを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:164 kicad-6996/eeschema/hotkeys.cpp:164
+msgid "Add Graphic Text"
+msgstr "図形テキストを追加"
+
+#: kicad-6297/eeschema/hotkeys.cpp:170 kicad-6996/eeschema/hotkeys.cpp:170
+msgid "Orient Normal Component"
+msgstr "標準のコンポーネントの方向"
+
+#: kicad-6297/eeschema/hotkeys.cpp:172 kicad-6297/pcbnew/hotkeys.cpp:116
+#: kicad-6996/eeschema/hotkeys.cpp:172 kicad-6996/pcbnew/hotkeys.cpp:117
+msgid "Rotate Item"
+msgstr "アイテムを回転"
+
+#: kicad-6297/eeschema/hotkeys.cpp:173 kicad-6297/pcbnew/hotkeys.cpp:113
+#: kicad-6996/eeschema/hotkeys.cpp:173 kicad-6996/pcbnew/hotkeys.cpp:114
+msgid "Edit Item"
+msgstr "アイテムを編集"
+
+#: kicad-6297/eeschema/hotkeys.cpp:174 kicad-6996/eeschema/hotkeys.cpp:174
+msgid "Edit Component Value"
+msgstr "コンポーネントの定数を編集"
+
+#: kicad-6297/eeschema/hotkeys.cpp:177 kicad-6996/eeschema/hotkeys.cpp:177
+msgid "Edit Component Reference"
+msgstr "コンポーネントのリファレンスを編集"
+
+#: kicad-6297/eeschema/hotkeys.cpp:180 kicad-6996/eeschema/hotkeys.cpp:180
+msgid "Edit Component Footprint"
+msgstr "コンポーネントのフットプリントを編集"
+
+#: kicad-6297/eeschema/hotkeys.cpp:183 kicad-6996/eeschema/hotkeys.cpp:183
+msgid "Edit with Component Editor"
+msgstr "コンポーネント ライブラリ エディタで編集"
+
+#: kicad-6297/eeschema/hotkeys.cpp:187 kicad-6996/eeschema/hotkeys.cpp:187
+msgid "Move Schematic Item"
+msgstr "回路図のアイテムを移動"
+
+#: kicad-6297/eeschema/hotkeys.cpp:191 kicad-6996/eeschema/hotkeys.cpp:191
+msgid "Copy Component or Label"
+msgstr "コンポーネントまたはラベルをコピー"
+
+#: kicad-6297/eeschema/hotkeys.cpp:195 kicad-6297/pcbnew/hotkeys.cpp:124
+#: kicad-6996/eeschema/hotkeys.cpp:195 kicad-6996/pcbnew/hotkeys.cpp:125
+msgid "Drag Item"
+msgstr "アイテムをドラッグ"
+
+#: kicad-6297/eeschema/hotkeys.cpp:196 kicad-6297/eeschema/onrightclick.cpp:841
+#: kicad-6996/eeschema/hotkeys.cpp:196 kicad-6996/eeschema/onrightclick.cpp:844
+msgid "Save Block"
+msgstr "ブロックを保存"
+
+#: kicad-6297/eeschema/hotkeys.cpp:197 kicad-6996/eeschema/hotkeys.cpp:197
+msgid "Move Block -> Drag Block"
+msgstr "ブロックを移動 -> ブロックをドラッグ"
+
+#: kicad-6297/eeschema/hotkeys.cpp:199 kicad-6996/eeschema/hotkeys.cpp:199
+msgid "Repeat Last Item"
+msgstr "最後のアイテムを繰り返し"
+
+#: kicad-6297/eeschema/hotkeys.cpp:200
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:85
+#: kicad-6996/eeschema/hotkeys.cpp:200
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:88
+msgid "Delete Item"
+msgstr "アイテムを削除"
+
+#: kicad-6297/eeschema/hotkeys.cpp:201 kicad-6297/eeschema/onrightclick.cpp:649
+#: kicad-6297/eeschema/onrightclick.cpp:683 kicad-6996/eeschema/hotkeys.cpp:201
+#: kicad-6996/eeschema/onrightclick.cpp:652
+#: kicad-6996/eeschema/onrightclick.cpp:686
+msgid "Delete Node"
+msgstr "ノードを削除"
+
+#: kicad-6297/eeschema/hotkeys.cpp:204
+#: kicad-6297/pcbnew/dialogs/dialog_find_base.cpp:38
+#: kicad-6297/pcbnew/hotkeys.cpp:100 kicad-6996/eeschema/hotkeys.cpp:204
+#: kicad-6996/pcbnew/dialogs/dialog_find_base.cpp:38
+#: kicad-6996/pcbnew/hotkeys.cpp:100
+msgid "Find Item"
+msgstr "アイテム検索"
+
+#: kicad-6297/eeschema/hotkeys.cpp:205 kicad-6996/eeschema/hotkeys.cpp:205
+msgid "Find Next Item"
+msgstr "次のアイテムを検索"
+
+#: kicad-6297/eeschema/hotkeys.cpp:209 kicad-6996/eeschema/hotkeys.cpp:209
+msgid "Find Next DRC Marker"
+msgstr "次の DRC マーカーを検索"
+
+#: kicad-6297/eeschema/hotkeys.cpp:213 kicad-6996/eeschema/hotkeys.cpp:214
+msgid "Create Pin"
+msgstr "ピンの作成"
+
+#: kicad-6297/eeschema/hotkeys.cpp:214 kicad-6996/eeschema/hotkeys.cpp:215
+msgid "Repeat Pin"
+msgstr "ピンの繰り返し"
+
+#: kicad-6297/eeschema/hotkeys.cpp:215 kicad-6996/eeschema/hotkeys.cpp:216
+msgid "Move Library Item"
+msgstr "ライブラリ アイテムを移動"
+
+#: kicad-6297/eeschema/hotkeys.cpp:218 kicad-6996/eeschema/hotkeys.cpp:219
+msgid "Save Library"
+msgstr "ライブラリを保存"
+
+#: kicad-6297/eeschema/hotkeys.cpp:219 kicad-6996/eeschema/hotkeys.cpp:220
+msgid "Save Schematic"
+msgstr "回路図を保存"
+
+#: kicad-6297/eeschema/hotkeys.cpp:220 kicad-6996/eeschema/hotkeys.cpp:221
+msgid "Load Schematic"
+msgstr "回路図を読み込み"
+
+#: kicad-6297/eeschema/hotkeys.cpp:321
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:114
+#: kicad-6297/pcbnew/hotkeys.cpp:350 kicad-6996/eeschema/hotkeys.cpp:333
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:117
+#: kicad-6996/pcbnew/hotkeys.cpp:304
+msgid "Common"
+msgstr "共通"
+
+#: kicad-6297/eeschema/hotkeys.cpp:322 kicad-6996/eeschema/hotkeys.cpp:334
+msgid "Schematic Editor"
+msgstr "回路図エディタ"
+
+#: kicad-6297/eeschema/hotkeys.cpp:323 kicad-6297/eeschema/libeditframe.cpp:181
+#: kicad-6996/eeschema/hotkeys.cpp:335 kicad-6996/eeschema/libeditframe.cpp:181
+msgid "Library Editor"
+msgstr "コンポーネント ライブラリ エディタ"
+
+#: kicad-6297/eeschema/hotkeys.cpp:735 kicad-6996/eeschema/hotkeys.cpp:749
 msgid "Add Pin"
 msgstr "ピンの追加"
 
-#: eeschema/lib_arc.cpp:95 gerbview/class_gerber_draw_item.cpp:186
-#: pcbnew/class_board_item.cpp:44 pcbnew/class_drawsegment.cpp:375
+#: kicad-6297/eeschema/lib_arc.cpp:95
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:186
+#: kicad-6297/pcbnew/class_board_item.cpp:44
+#: kicad-6297/pcbnew/class_drawsegment.cpp:377
+#: kicad-6996/eeschema/lib_arc.cpp:95
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:154
+#: kicad-6996/pcbnew/class_board_item.cpp:44
+#: kicad-6996/pcbnew/class_drawsegment.cpp:377
 msgid "Arc"
 msgstr "円弧"
 
-#: eeschema/lib_arc.cpp:136
+#: kicad-6297/eeschema/lib_arc.cpp:136 kicad-6996/eeschema/lib_arc.cpp:136
 #, c-format
 msgid "Arc only had %d parameters of the required 8"
 msgstr "円弧は8個のパラメータが必要ですが、%d個しか定義されていません。"
 
-#: eeschema/lib_arc.cpp:565 eeschema/lib_bezier.cpp:415
-#: eeschema/lib_circle.cpp:279 eeschema/lib_polyline.cpp:407
-#: eeschema/lib_rectangle.cpp:256 eeschema/lib_text.cpp:429
-#: pcb_calculator/transline_ident.cpp:186
-#: pcb_calculator/transline_ident.cpp:216
-#: pcb_calculator/transline_ident.cpp:248
-#: pcb_calculator/transline_ident.cpp:353
-#: pcb_calculator/transline_ident.cpp:388
+#: kicad-6297/eeschema/lib_arc.cpp:565 kicad-6297/eeschema/lib_bezier.cpp:415
+#: kicad-6297/eeschema/lib_circle.cpp:279
+#: kicad-6297/eeschema/lib_polyline.cpp:407
+#: kicad-6297/eeschema/lib_rectangle.cpp:256
+#: kicad-6297/eeschema/lib_text.cpp:429
+#: kicad-6297/pcb_calculator/transline_ident.cpp:186
+#: kicad-6297/pcb_calculator/transline_ident.cpp:216
+#: kicad-6297/pcb_calculator/transline_ident.cpp:248
+#: kicad-6297/pcb_calculator/transline_ident.cpp:353
+#: kicad-6297/pcb_calculator/transline_ident.cpp:388
+#: kicad-6996/eeschema/lib_arc.cpp:565 kicad-6996/eeschema/lib_bezier.cpp:415
+#: kicad-6996/eeschema/lib_circle.cpp:279
+#: kicad-6996/eeschema/lib_polyline.cpp:405
+#: kicad-6996/eeschema/lib_rectangle.cpp:256
+#: kicad-6996/eeschema/lib_text.cpp:429
+#: kicad-6996/pcb_calculator/transline_ident.cpp:186
+#: kicad-6996/pcb_calculator/transline_ident.cpp:216
+#: kicad-6996/pcb_calculator/transline_ident.cpp:248
+#: kicad-6996/pcb_calculator/transline_ident.cpp:353
+#: kicad-6996/pcb_calculator/transline_ident.cpp:388
 msgid "Line Width"
 msgstr "線幅"
 
-#: eeschema/lib_arc.cpp:570 eeschema/lib_bezier.cpp:420
-#: eeschema/lib_circle.cpp:287 eeschema/lib_polyline.cpp:412
+#: kicad-6297/eeschema/lib_arc.cpp:570 kicad-6297/eeschema/lib_bezier.cpp:420
+#: kicad-6297/eeschema/lib_circle.cpp:287
+#: kicad-6297/eeschema/lib_polyline.cpp:412 kicad-6996/eeschema/lib_arc.cpp:570
+#: kicad-6996/eeschema/lib_bezier.cpp:420
+#: kicad-6996/eeschema/lib_circle.cpp:287
+#: kicad-6996/eeschema/lib_polyline.cpp:410
 msgid "Bounding Box"
 msgstr "バウンディング ボックス"
 
-#: eeschema/lib_arc.cpp:576
+#: kicad-6297/eeschema/lib_arc.cpp:576 kicad-6996/eeschema/lib_arc.cpp:576
 #, c-format
 msgid "Arc center (%s, %s), radius %s"
 msgstr "円弧 中心 (%s, %s) 半径 %s"
 
-#: eeschema/lib_bezier.cpp:51
+#: kicad-6297/eeschema/lib_bezier.cpp:51 kicad-6996/eeschema/lib_bezier.cpp:51
 msgid "Bezier"
 msgstr "ベジェ曲線"
 
-#: eeschema/lib_bezier.cpp:83
+#: kicad-6297/eeschema/lib_bezier.cpp:83 kicad-6996/eeschema/lib_bezier.cpp:83
 #, c-format
 msgid "Bezier only had %d parameters of the required 4"
 msgstr "ベジェ曲線には4つのパラメータが必要ですが %d しかありません"
 
-#: eeschema/lib_bezier.cpp:89
+#: kicad-6297/eeschema/lib_bezier.cpp:89 kicad-6996/eeschema/lib_bezier.cpp:89
 #, c-format
 msgid "Bezier count parameter %d is invalid"
 msgstr "ベジェ曲線の %d 番目のパラメータが不正です"
 
-#: eeschema/lib_bezier.cpp:104
+#: kicad-6297/eeschema/lib_bezier.cpp:104
+#: kicad-6996/eeschema/lib_bezier.cpp:104
 #, c-format
 msgid "Bezier point %d X position not defined"
 msgstr "ベジェ曲線の %d ポイントのX座標が定義されていません"
 
-#: eeschema/lib_bezier.cpp:112
+#: kicad-6297/eeschema/lib_bezier.cpp:112
+#: kicad-6996/eeschema/lib_bezier.cpp:112
 #, c-format
 msgid "Bezier point %d Y position not defined"
 msgstr "ベジェ曲線の %d ポイントのY座標が定義されていません"
 
-#: eeschema/lib_circle.cpp:53 gerbview/class_gerber_draw_item.cpp:189
-#: pcbnew/class_board_item.cpp:45 pcbnew/class_drawsegment.cpp:371
-#: pcbnew/class_pad.cpp:864
+#: kicad-6297/eeschema/lib_circle.cpp:53
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:189
+#: kicad-6297/pcbnew/class_board_item.cpp:45
+#: kicad-6297/pcbnew/class_drawsegment.cpp:373
+#: kicad-6297/pcbnew/class_pad.cpp:846 kicad-6996/eeschema/lib_circle.cpp:53
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:157
+#: kicad-6996/pcbnew/class_board_item.cpp:45
+#: kicad-6996/pcbnew/class_drawsegment.cpp:373
+#: kicad-6996/pcbnew/class_pad.cpp:877
 msgid "Circle"
 msgstr "円"
 
-#: eeschema/lib_circle.cpp:76
+#: kicad-6297/eeschema/lib_circle.cpp:76 kicad-6996/eeschema/lib_circle.cpp:76
 #, c-format
 msgid "Circle only had %d parameters of the required 6"
 msgstr "円は6個のパラメータが必要ですが、%d個しか定義されていません。"
 
-#: eeschema/lib_circle.cpp:282
+#: kicad-6297/eeschema/lib_circle.cpp:282
+#: kicad-6996/eeschema/lib_circle.cpp:282
 msgid "Radius"
 msgstr "半径"
 
-#: eeschema/lib_circle.cpp:293
+#: kicad-6297/eeschema/lib_circle.cpp:293
+#: kicad-6996/eeschema/lib_circle.cpp:293
 #, c-format
 msgid "Circle center (%s, %s), radius %s"
 msgstr "円 中心 (%s, %s) 半径 %s"
 
-#: eeschema/lib_draw_item.cpp:55
+#: kicad-6297/eeschema/lib_draw_item.cpp:55
+#: kicad-6996/eeschema/lib_draw_item.cpp:55
 msgid "Undefined"
 msgstr "未定義"
 
-#: eeschema/lib_draw_item.cpp:77
+#: kicad-6297/eeschema/lib_draw_item.cpp:77
+#: kicad-6996/eeschema/lib_draw_item.cpp:77
 msgid "no"
 msgstr "いいえ"
 
-#: eeschema/lib_draw_item.cpp:79
+#: kicad-6297/eeschema/lib_draw_item.cpp:79
+#: kicad-6996/eeschema/lib_draw_item.cpp:79
 msgid "yes"
 msgstr "はい"
 
-#: eeschema/lib_draw_item.cpp:83 eeschema/libedit.cpp:496
-#: eeschema/onrightclick.cpp:440
+#: kicad-6297/eeschema/lib_draw_item.cpp:83 kicad-6297/eeschema/libedit.cpp:496
+#: kicad-6297/eeschema/onrightclick.cpp:440
+#: kicad-6996/eeschema/lib_draw_item.cpp:83 kicad-6996/eeschema/libedit.cpp:496
+#: kicad-6996/eeschema/onrightclick.cpp:443
 msgid "Convert"
 msgstr "シンボル変換"
 
-#: eeschema/lib_export.cpp:51
+#: kicad-6297/eeschema/lib_export.cpp:51 kicad-6996/eeschema/lib_export.cpp:51
 msgid "Import Component"
 msgstr "コンポーネントのインポート"
 
-#: eeschema/lib_export.cpp:72
+#: kicad-6297/eeschema/lib_export.cpp:72 kicad-6996/eeschema/lib_export.cpp:72
 #, c-format
 msgid ""
 "Unable to import library '%s'.  Error:\n"
@@ -5937,29 +8155,34 @@ msgstr ""
 "ライブラリ '%s' の読込みに失敗しました。\n"
 "エラー: %s"
 
-#: eeschema/lib_export.cpp:86
+#: kicad-6297/eeschema/lib_export.cpp:86 kicad-6996/eeschema/lib_export.cpp:86
 #, c-format
 msgid "Part library file '%s' is empty."
 msgstr "コンポーネント ライブラリ ファイル '%s' は空です。"
 
-#: eeschema/lib_export.cpp:113
+#: kicad-6297/eeschema/lib_export.cpp:111
+#: kicad-6996/eeschema/lib_export.cpp:111
 msgid "There is no component selected to save."
 msgstr "保存するコンポーネントが選択されていません。"
 
-#: eeschema/lib_export.cpp:121
+#: kicad-6297/eeschema/lib_export.cpp:119
+#: kicad-6996/eeschema/lib_export.cpp:119
 msgid "New Library"
 msgstr "新規ライブラリ"
 
-#: eeschema/lib_export.cpp:121
+#: kicad-6297/eeschema/lib_export.cpp:119
+#: kicad-6996/eeschema/lib_export.cpp:119
 msgid "Export Component"
 msgstr "コンポーネントのエクスポート"
 
-#: eeschema/lib_export.cpp:176
+#: kicad-6297/eeschema/lib_export.cpp:174
+#: kicad-6996/eeschema/lib_export.cpp:174
 #, c-format
 msgid "'%s' - OK"
 msgstr "'%s' - OK"
 
-#: eeschema/lib_export.cpp:178
+#: kicad-6297/eeschema/lib_export.cpp:176
+#: kicad-6996/eeschema/lib_export.cpp:176
 msgid ""
 "This library will not be available until it is loaded by Eeschema.\n"
 "\n"
@@ -5971,213 +8194,274 @@ msgstr ""
 "このプロジェクトのパーツとして取り込む場合は Eeschema のライブラリ設定を変更"
 "してください。"
 
-#: eeschema/lib_export.cpp:184
+#: kicad-6297/eeschema/lib_export.cpp:182
+#: kicad-6996/eeschema/lib_export.cpp:182
 #, c-format
 msgid "'%s' - Export OK"
 msgstr "'%s' - エクスポートOK"
 
-#: eeschema/lib_export.cpp:189
+#: kicad-6297/eeschema/lib_export.cpp:187
+#: kicad-6996/eeschema/lib_export.cpp:187
 #, c-format
 msgid "Error creating '%s'"
 msgstr "ファイル '%s' 生成時エラー"
 
-#: eeschema/lib_field.cpp:72 eeschema/lib_field.cpp:756
-#: eeschema/template_fieldnames.cpp:55
+#: kicad-6297/eeschema/lib_field.cpp:72 kicad-6297/eeschema/lib_field.cpp:767
+#: kicad-6297/eeschema/template_fieldnames.cpp:55
+#: kicad-6996/eeschema/lib_field.cpp:72 kicad-6996/eeschema/lib_field.cpp:767
+#: kicad-6996/eeschema/template_fieldnames.cpp:55
 msgid "Field"
 msgstr "フィールド"
 
-#: eeschema/lib_field.cpp:588 eeschema/onrightclick.cpp:433
-#: eeschema/sch_component.cpp:1536 eeschema/template_fieldnames.cpp:45
-#: pcbnew/class_edge_mod.cpp:260 pcbnew/class_module.cpp:626
-#: pcbnew/class_pad.cpp:631 pcbnew/class_text_mod.cpp:369
-#: pcbnew/loadcmp.cpp:436 pcbnew/loadcmp.cpp:500
+#: kicad-6297/eeschema/lib_field.cpp:599
+#: kicad-6297/eeschema/onrightclick.cpp:433
+#: kicad-6297/eeschema/sch_component.cpp:1536
+#: kicad-6297/eeschema/template_fieldnames.cpp:45
+#: kicad-6297/pcbnew/class_edge_mod.cpp:260
+#: kicad-6297/pcbnew/class_module.cpp:626 kicad-6297/pcbnew/class_pad.cpp:613
+#: kicad-6297/pcbnew/class_text_mod.cpp:369 kicad-6297/pcbnew/loadcmp.cpp:436
+#: kicad-6297/pcbnew/loadcmp.cpp:500 kicad-6996/eeschema/lib_field.cpp:599
+#: kicad-6996/eeschema/onrightclick.cpp:436
+#: kicad-6996/eeschema/sch_component.cpp:1560
+#: kicad-6996/eeschema/template_fieldnames.cpp:45
+#: kicad-6996/pcbnew/class_edge_mod.cpp:260
+#: kicad-6996/pcbnew/class_module.cpp:593 kicad-6996/pcbnew/class_pad.cpp:629
+#: kicad-6996/pcbnew/class_text_mod.cpp:346 kicad-6996/pcbnew/loadcmp.cpp:434
+#: kicad-6996/pcbnew/loadcmp.cpp:498
 msgid "Footprint"
 msgstr "フットプリント"
 
-#: eeschema/lib_field.cpp:595 eeschema/libedit.cpp:510
-#: eeschema/template_fieldnames.cpp:48
+#: kicad-6297/eeschema/lib_field.cpp:606 kicad-6297/eeschema/libedit.cpp:510
+#: kicad-6297/eeschema/template_fieldnames.cpp:48
+#: kicad-6996/eeschema/lib_field.cpp:606 kicad-6996/eeschema/libedit.cpp:510
+#: kicad-6996/eeschema/template_fieldnames.cpp:48
 msgid "Datasheet"
 msgstr "データシート"
 
-#: eeschema/lib_field.cpp:604
+#: kicad-6297/eeschema/lib_field.cpp:615 kicad-6996/eeschema/lib_field.cpp:615
 #, c-format
 msgid "Field%d"
 msgstr "フィールド%d"
 
-#: eeschema/lib_field.cpp:667
+#: kicad-6297/eeschema/lib_field.cpp:678 kicad-6996/eeschema/lib_field.cpp:678
 #, c-format
 msgid "Field %s %s"
 msgstr "フィールド %s %s"
 
-#: eeschema/lib_field.cpp:749 pcbnew/class_drawsegment.cpp:408
-#: pcbnew/class_pad.cpp:653 pcbnew/class_pcb_text.cpp:154
-#: pcbnew/class_text_mod.cpp:401 pcbnew/class_track.cpp:1157
-#: pcbnew/class_track.cpp:1184 pcbnew/dialogs/dialog_design_rules_base.cpp:322
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:48
+#: kicad-6297/eeschema/lib_field.cpp:760
+#: kicad-6297/pcbnew/class_drawsegment.cpp:410
+#: kicad-6297/pcbnew/class_pad.cpp:635 kicad-6297/pcbnew/class_pcb_text.cpp:154
+#: kicad-6297/pcbnew/class_text_mod.cpp:401
+#: kicad-6297/pcbnew/class_track.cpp:1169
+#: kicad-6297/pcbnew/class_track.cpp:1196
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:322
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:49
+#: kicad-6996/eeschema/lib_field.cpp:760
+#: kicad-6996/pcbnew/class_drawsegment.cpp:410
+#: kicad-6996/pcbnew/class_pad.cpp:651 kicad-6996/pcbnew/class_pcb_text.cpp:154
+#: kicad-6996/pcbnew/class_text_mod.cpp:378
+#: kicad-6996/pcbnew/class_track.cpp:1143
+#: kicad-6996/pcbnew/class_track.cpp:1170
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:322
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:52
 msgid "Width"
 msgstr "幅"
 
-#: eeschema/lib_field.cpp:752 pcbnew/class_pad.cpp:656
-#: pcbnew/class_pcb_text.cpp:157 pcbnew/class_text_mod.cpp:404
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:56
+#: kicad-6297/eeschema/lib_field.cpp:763 kicad-6297/pcbnew/class_pad.cpp:638
+#: kicad-6297/pcbnew/class_pcb_text.cpp:157
+#: kicad-6297/pcbnew/class_text_mod.cpp:404
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:56
+#: kicad-6996/eeschema/lib_field.cpp:763 kicad-6996/pcbnew/class_pad.cpp:654
+#: kicad-6996/pcbnew/class_pcb_text.cpp:157
+#: kicad-6996/pcbnew/class_text_mod.cpp:381
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:59
 msgid "Height"
 msgstr "高さ"
 
-#: eeschema/lib_pin.cpp:188
+#: kicad-6297/eeschema/lib_pin.cpp:188 kicad-6996/eeschema/pin_type.cpp:53
 msgid "Unspecified"
 msgstr "不特定"
 
-#: eeschema/lib_pin.cpp:189
+#: kicad-6297/eeschema/lib_pin.cpp:189 kicad-6996/eeschema/pin_type.cpp:56
 msgid "Power input"
 msgstr "電源入力"
 
-#: eeschema/lib_pin.cpp:190
+#: kicad-6297/eeschema/lib_pin.cpp:190 kicad-6996/eeschema/pin_type.cpp:59
 msgid "Power output"
 msgstr "電源出力"
 
-#: eeschema/lib_pin.cpp:191
+#: kicad-6297/eeschema/lib_pin.cpp:191 kicad-6996/eeschema/pin_type.cpp:62
 msgid "Open collector"
 msgstr "オープンコレクタ"
 
-#: eeschema/lib_pin.cpp:192
+#: kicad-6297/eeschema/lib_pin.cpp:192 kicad-6996/eeschema/pin_type.cpp:65
 msgid "Open emitter"
 msgstr "オープンエミッタ"
 
-#: eeschema/lib_pin.cpp:193
+#: kicad-6297/eeschema/lib_pin.cpp:193 kicad-6996/eeschema/pin_type.cpp:68
 msgid "Not connected"
 msgstr "未接続"
 
-#: eeschema/lib_pin.cpp:207 gerbview/class_gerber_draw_item.cpp:183
-#: pcbnew/class_board_item.cpp:42
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:241
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:53
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: kicad-6297/eeschema/lib_pin.cpp:207
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:183
+#: kicad-6297/pcbnew/class_board_item.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:241
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: kicad-6996/eeschema/pin_shape.cpp:38
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:151
+#: kicad-6996/pcbnew/class_board_item.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:236
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
 msgid "Line"
 msgstr "ライン"
 
-#: eeschema/lib_pin.cpp:208
+#: kicad-6297/eeschema/lib_pin.cpp:208 kicad-6996/eeschema/pin_shape.cpp:41
 msgid "Inverted"
 msgstr "反転"
 
-#: eeschema/lib_pin.cpp:209
+#: kicad-6297/eeschema/lib_pin.cpp:209 kicad-6996/eeschema/pin_shape.cpp:44
 msgid "Clock"
 msgstr "クロック"
 
 # 8973～8988要確認
-#: eeschema/lib_pin.cpp:210
+#: kicad-6297/eeschema/lib_pin.cpp:210 kicad-6996/eeschema/pin_shape.cpp:47
 msgid "Inverted clock"
 msgstr "反転クロック"
 
-#: eeschema/lib_pin.cpp:211
+#: kicad-6297/eeschema/lib_pin.cpp:211 kicad-6996/eeschema/pin_shape.cpp:50
 msgid "Input low"
 msgstr "負論理入力"
 
-#: eeschema/lib_pin.cpp:212
+#: kicad-6297/eeschema/lib_pin.cpp:212 kicad-6996/eeschema/pin_shape.cpp:53
 msgid "Clock low"
 msgstr "負論理クロック"
 
-#: eeschema/lib_pin.cpp:213
+#: kicad-6297/eeschema/lib_pin.cpp:213 kicad-6996/eeschema/pin_shape.cpp:56
 msgid "Output low"
 msgstr "負論理出力"
 
-#: eeschema/lib_pin.cpp:214
+#: kicad-6297/eeschema/lib_pin.cpp:214 kicad-6996/eeschema/pin_shape.cpp:59
 msgid "Falling edge clock"
 msgstr "ネガティブエッジ クロック"
 
-#: eeschema/lib_pin.cpp:215
+#: kicad-6297/eeschema/lib_pin.cpp:215 kicad-6996/eeschema/pin_shape.cpp:62
 msgid "NonLogic"
 msgstr "非ロジック"
 
-#: eeschema/lib_pin.cpp:2008 pcbnew/class_drawsegment.cpp:389
-#: pcbnew/class_track.cpp:1045
+#: kicad-6297/eeschema/lib_pin.cpp:2008
+#: kicad-6297/pcbnew/class_drawsegment.cpp:391
+#: kicad-6297/pcbnew/class_track.cpp:1057 kicad-6996/eeschema/lib_pin.cpp:2016
+#: kicad-6996/pcbnew/class_drawsegment.cpp:391
+#: kicad-6996/pcbnew/class_track.cpp:1031
 msgid "Length"
 msgstr "長さ"
 
-#: eeschema/lib_pin.cpp:2011 eeschema/sch_text.cpp:756
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:112
+#: kicad-6297/eeschema/lib_pin.cpp:2011 kicad-6297/eeschema/sch_text.cpp:756
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:108
+#: kicad-6996/eeschema/lib_pin.cpp:2019 kicad-6996/eeschema/sch_text.cpp:762
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:120
 msgid "Orientation"
 msgstr "角度"
 
-#: eeschema/lib_pin.cpp:2269
+#: kicad-6297/eeschema/lib_pin.cpp:2269 kicad-6996/eeschema/lib_pin.cpp:2217
 #, c-format
 msgid "Pin %s, %s, %s"
 msgstr "ピン %s, %s, %s"
 
-#: eeschema/lib_polyline.cpp:53
+#: kicad-6297/eeschema/lib_polyline.cpp:53
+#: kicad-6996/eeschema/lib_polyline.cpp:51
 msgid "PolyLine"
 msgstr "ポリライン"
 
-#: eeschema/lib_polyline.cpp:88
+#: kicad-6297/eeschema/lib_polyline.cpp:88
+#: kicad-6996/eeschema/lib_polyline.cpp:86
 #, c-format
 msgid "Polyline only had %d parameters of the required 4"
 msgstr "ポリラインは4個のパラメータが必要ですが、%d個しか定義されていません。"
 
-#: eeschema/lib_polyline.cpp:94
+#: kicad-6297/eeschema/lib_polyline.cpp:94
+#: kicad-6996/eeschema/lib_polyline.cpp:92
 #, c-format
 msgid "Polyline count parameter %d is invalid"
 msgstr "ポリラインのカウントパラメータ %d が不正です"
 
-#: eeschema/lib_polyline.cpp:109
+#: kicad-6297/eeschema/lib_polyline.cpp:109
+#: kicad-6996/eeschema/lib_polyline.cpp:107
 #, c-format
 msgid "Polyline point %d X position not defined"
 msgstr "ポリラインの座標点%dのX座標は定義されていません"
 
-#: eeschema/lib_polyline.cpp:117
+#: kicad-6297/eeschema/lib_polyline.cpp:117
+#: kicad-6996/eeschema/lib_polyline.cpp:115
 #, c-format
 msgid "Polyline point %d Y position not defined"
 msgstr "ポリラインの座標点%dのY座標は定義されていません"
 
-#: eeschema/lib_polyline.cpp:418
+#: kicad-6297/eeschema/lib_polyline.cpp:418
+#: kicad-6996/eeschema/lib_polyline.cpp:416
 #, c-format
 msgid "Polyline at (%s, %s) with %d points"
 msgstr "ポリライン (%s, %s)  %d ポイント"
 
-#: eeschema/lib_rectangle.cpp:51
+#: kicad-6297/eeschema/lib_rectangle.cpp:51
+#: kicad-6996/eeschema/lib_rectangle.cpp:51
 msgid "Rectangle"
 msgstr "矩形"
 
-#: eeschema/lib_rectangle.cpp:78
+#: kicad-6297/eeschema/lib_rectangle.cpp:78
+#: kicad-6996/eeschema/lib_rectangle.cpp:78
 #, c-format
 msgid "Rectangle only had %d parameters of the required 7"
 msgstr "矩形には7つのパラメータが必要ですが %d しかありません"
 
-#: eeschema/lib_rectangle.cpp:332
+#: kicad-6297/eeschema/lib_rectangle.cpp:332
+#: kicad-6996/eeschema/lib_rectangle.cpp:332
 #, c-format
 msgid "Rectangle from (%s, %s) to (%s, %s)"
 msgstr "矩形 始点 (%s, %s) 終点 (%s, %s)"
 
-#: eeschema/lib_text.cpp:132
+#: kicad-6297/eeschema/lib_text.cpp:132 kicad-6996/eeschema/lib_text.cpp:132
 #, c-format
 msgid "Text only had %d parameters of the required 8"
 msgstr "テキストには8個のパラメータが必要ですが、%d個しか定義されていません。"
 
-#: eeschema/lib_text.cpp:490 eeschema/sch_text.cpp:603
+#: kicad-6297/eeschema/lib_text.cpp:490 kicad-6297/eeschema/sch_text.cpp:603
+#: kicad-6996/eeschema/lib_text.cpp:490 kicad-6996/eeschema/sch_text.cpp:609
 #, c-format
 msgid "Graphic Text %s"
 msgstr "図形テキスト %s"
 
-#: eeschema/libarch.cpp:101 eeschema/project_rescue.cpp:61
+#: kicad-6297/eeschema/libarch.cpp:101
+#: kicad-6297/eeschema/project_rescue.cpp:61
+#: kicad-6996/eeschema/libarch.cpp:101
+#: kicad-6996/eeschema/project_rescue.cpp:60
 #, c-format
 msgid "An error occurred attempting to save component library '%s'."
 msgstr ""
 "コンポーネント ライブラリ '%s' を保存しようとしたところエラーが発生しました。"
 
-#: eeschema/libarch.cpp:111 eeschema/libedit.cpp:406
-#: eeschema/project_rescue.cpp:71
+#: kicad-6297/eeschema/libarch.cpp:111 kicad-6297/eeschema/libedit.cpp:406
+#: kicad-6297/eeschema/project_rescue.cpp:71
+#: kicad-6996/eeschema/libarch.cpp:111 kicad-6996/eeschema/libedit.cpp:406
+#: kicad-6996/eeschema/project_rescue.cpp:70
 #, c-format
 msgid "Failed to create component library file '%s'"
 msgstr "コンポーネント ライブラリ ファイル '%s' が作成できませんでした。"
 
-#: eeschema/libedit.cpp:53
+#: kicad-6297/eeschema/libedit.cpp:53 kicad-6996/eeschema/libedit.cpp:53
 msgid "Part Library Editor: "
 msgstr "コンポーネント ライブラリ エディタ:"
 
-#: eeschema/libedit.cpp:65 eeschema/viewlibs.cpp:141
-#: pcbnew/modview_frame.cpp:707
+#: kicad-6297/eeschema/libedit.cpp:65 kicad-6297/eeschema/viewlibs.cpp:141
+#: kicad-6297/pcbnew/modview_frame.cpp:707 kicad-6996/eeschema/libedit.cpp:65
+#: kicad-6996/eeschema/viewlibs.cpp:141 kicad-6996/pcbnew/modview_frame.cpp:726
 msgid "no library selected"
 msgstr "ライブラリが選択されていません"
 
-#: eeschema/libedit.cpp:89 eeschema/libedit.cpp:120
+#: kicad-6297/eeschema/libedit.cpp:89 kicad-6297/eeschema/libedit.cpp:120
+#: kicad-6996/eeschema/libedit.cpp:89 kicad-6996/eeschema/libedit.cpp:120
 msgid ""
 "The current component is not saved.\n"
 "\n"
@@ -6187,103 +8471,115 @@ msgstr ""
 "\n"
 "現在の変更を破棄しますか？"
 
-#: eeschema/libedit.cpp:168
+#: kicad-6297/eeschema/libedit.cpp:168 kicad-6996/eeschema/libedit.cpp:168
 msgid "The selected component is not in the active library."
 msgstr "選択されたコンポーネントは、アクティブなライブラリ中にありません."
 
-#: eeschema/libedit.cpp:170
+#: kicad-6297/eeschema/libedit.cpp:170 kicad-6996/eeschema/libedit.cpp:170
 msgid "Do you want to change the active library?"
 msgstr "アクティブなライブラリを変更しますか？"
 
-#: eeschema/libedit.cpp:180
+#: kicad-6297/eeschema/libedit.cpp:180 kicad-6996/eeschema/libedit.cpp:180
 #, c-format
 msgid "Part name '%s' not found in library '%s'"
 msgstr "コンポーネント名 \"%s\" はライブラリ \"%s\" 中に見つかりませんでした。"
 
-#: eeschema/libedit.cpp:315 eeschema/libeditframe.cpp:731
+#: kicad-6297/eeschema/libedit.cpp:315 kicad-6297/eeschema/libeditframe.cpp:731
+#: kicad-6996/eeschema/libedit.cpp:315 kicad-6996/eeschema/libeditframe.cpp:729
 msgid "No library specified."
 msgstr "指定されたライブラリがありません。"
 
-#: eeschema/libedit.cpp:321
+#: kicad-6297/eeschema/libedit.cpp:321 kicad-6996/eeschema/libedit.cpp:321
 msgid "Include last component changes?"
 msgstr "最後のコンポーネントの変更を含めますか？"
 
-#: eeschema/libedit.cpp:336
+#: kicad-6297/eeschema/libedit.cpp:336 kicad-6996/eeschema/libedit.cpp:336
 msgid "Part Library Name:"
 msgstr "コンポーネント ライブラリ名:"
 
-#: eeschema/libedit.cpp:356
+#: kicad-6297/eeschema/libedit.cpp:356 kicad-6996/eeschema/libedit.cpp:356
 #, c-format
 msgid "Modify library file '%s' ?"
 msgstr "ライブラリファイル '%s' を変更しますか?"
 
-#: eeschema/libedit.cpp:396
+#: kicad-6297/eeschema/libedit.cpp:396 kicad-6996/eeschema/libedit.cpp:396
 #, c-format
 msgid "Error occurred while saving library file '%s'"
 msgstr "ライブラリファイル '%s' の保存中にエラーが発生しました"
 
-#: eeschema/libedit.cpp:398 eeschema/libedit.cpp:440
+#: kicad-6297/eeschema/libedit.cpp:398 kicad-6297/eeschema/libedit.cpp:440
+#: kicad-6996/eeschema/libedit.cpp:398 kicad-6996/eeschema/libedit.cpp:440
 msgid "*** ERROR: ***"
 msgstr "***エラー: ***"
 
-#: eeschema/libedit.cpp:438
+#: kicad-6297/eeschema/libedit.cpp:438 kicad-6996/eeschema/libedit.cpp:438
 #, c-format
 msgid "Error occurred while saving library documentation file <%s>"
 msgstr "ライブラリドキュメントファイル <%s> の保存中にエラーが発生しました"
 
-#: eeschema/libedit.cpp:448
+#: kicad-6297/eeschema/libedit.cpp:448 kicad-6996/eeschema/libedit.cpp:448
 #, c-format
 msgid "Failed to create component document library file <%s>"
 msgstr ""
 "コンポーネントのドキュメントライブラリファイル <%s> が作成できませんでした"
 
-#: eeschema/libedit.cpp:454
+#: kicad-6297/eeschema/libedit.cpp:454 kicad-6996/eeschema/libedit.cpp:454
 #, c-format
 msgid "Library file '%s' OK"
 msgstr "ライブラリファイル '%s' : OK"
 
-#: eeschema/libedit.cpp:457
+#: kicad-6297/eeschema/libedit.cpp:457 kicad-6996/eeschema/libedit.cpp:457
 #, c-format
 msgid "Documentation file '%s' OK"
 msgstr "ドキュメントファイル '%s' OK"
 
-#: eeschema/libedit.cpp:480 eeschema/viewlibs.cpp:295
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:50
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:130
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:154
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:324
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:474
-#: pcbnew/dialogs/dialog_plot_base.cpp:141
+#: kicad-6297/eeschema/libedit.cpp:480 kicad-6297/eeschema/viewlibs.cpp:295
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:130
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:324
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:474
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:141
+#: kicad-6996/eeschema/libedit.cpp:480 kicad-6996/eeschema/viewlibs.cpp:295
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:195
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:325
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:502
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:140
 msgid "None"
 msgstr "なし"
 
-#: eeschema/libedit.cpp:503
+#: kicad-6297/eeschema/libedit.cpp:503 kicad-6996/eeschema/libedit.cpp:503
 msgid "Power Symbol"
 msgstr "電源シンボル"
 
-#: eeschema/libedit.cpp:505 eeschema/viewlibs.cpp:306
+#: kicad-6297/eeschema/libedit.cpp:505 kicad-6297/eeschema/viewlibs.cpp:306
+#: kicad-6996/eeschema/libedit.cpp:505 kicad-6996/eeschema/viewlibs.cpp:306
 msgid "Part"
 msgstr "パーツ"
 
-#: eeschema/libedit.cpp:509 eeschema/viewlibs.cpp:309
+#: kicad-6297/eeschema/libedit.cpp:509 kicad-6297/eeschema/viewlibs.cpp:309
+#: kicad-6996/eeschema/libedit.cpp:509 kicad-6996/eeschema/viewlibs.cpp:309
 msgid "Key words"
 msgstr "キーワード"
 
-#: eeschema/libedit.cpp:535
+#: kicad-6297/eeschema/libedit.cpp:535 kicad-6996/eeschema/libedit.cpp:535
 msgid "Please select a component library."
 msgstr "コンポーネント ライブラリを選択してください"
 
-#: eeschema/libedit.cpp:544
+#: kicad-6297/eeschema/libedit.cpp:544 kicad-6996/eeschema/libedit.cpp:544
 #, c-format
 msgid "Part library '%s' is empty."
 msgstr "コンポーネント ライブラリ '%s' は空です。"
 
-#: eeschema/libedit.cpp:545
+#: kicad-6297/eeschema/libedit.cpp:545 kicad-6996/eeschema/libedit.cpp:545
 msgid "Delete Entry Error"
 msgstr "Delete Entry エラー"
 
-#: eeschema/libedit.cpp:549
+#: kicad-6297/eeschema/libedit.cpp:549 kicad-6996/eeschema/libedit.cpp:549
 #, c-format
 msgid ""
 "Select one of %d components to delete\n"
@@ -6292,21 +8588,21 @@ msgstr ""
 "削除する %d コンポーネントの一つを選択\n"
 "(ライブラリ '%s' から)"
 
-#: eeschema/libedit.cpp:553
+#: kicad-6297/eeschema/libedit.cpp:553 kicad-6996/eeschema/libedit.cpp:553
 msgid "Delete Part"
 msgstr "コンポーネントを削除"
 
-#: eeschema/libedit.cpp:562
+#: kicad-6297/eeschema/libedit.cpp:562 kicad-6996/eeschema/libedit.cpp:562
 #, c-format
 msgid "Entry '%s' not found in library '%s'."
 msgstr "エントリー '%s' が ライブラリ '%s' 中に存在しません。"
 
-#: eeschema/libedit.cpp:569
+#: kicad-6297/eeschema/libedit.cpp:569 kicad-6996/eeschema/libedit.cpp:569
 #, c-format
 msgid "Delete component '%s' from library '%s' ?"
 msgstr "コンポーネント '%s' をライブラリ '%s' から削除しますか？"
 
-#: eeschema/libedit.cpp:588
+#: kicad-6297/eeschema/libedit.cpp:588 kicad-6996/eeschema/libedit.cpp:588
 msgid ""
 "The component being deleted has been modified. All changes will be lost. "
 "Discard changes?"
@@ -6314,7 +8610,7 @@ msgstr ""
 "削除しようとしているコンポーネントは編集されています。全ての変更が失われま"
 "す。変更を取りやめますか？"
 
-#: eeschema/libedit.cpp:617
+#: kicad-6297/eeschema/libedit.cpp:617 kicad-6996/eeschema/libedit.cpp:617
 msgid ""
 "All changes to the current component will be lost!\n"
 "\n"
@@ -6324,245 +8620,347 @@ msgstr ""
 "\n"
 "スクリーンから現在のコンポーネントをクリアしますか？"
 
-#: eeschema/libedit.cpp:636
+#: kicad-6297/eeschema/libedit.cpp:636 kicad-6996/eeschema/libedit.cpp:636
 msgid "This new component has no name and cannot be created. Aborted"
 msgstr "この新しいコンポーネントは名前がなく、作成できませんでした。中止"
 
-#: eeschema/libedit.cpp:649
+#: kicad-6297/eeschema/libedit.cpp:649 kicad-6996/eeschema/libedit.cpp:649
 #, c-format
 msgid "Part '%s' already exists in library '%s'"
 msgstr "コンポーネント '%s' は既にライブラリ '%s' 内に既に存在します。"
 
-#: eeschema/libedit.cpp:721
+#: kicad-6297/eeschema/libedit.cpp:721 kicad-6996/eeschema/libedit.cpp:721
 #, c-format
 msgid "Part '%s' already exists. Change it?"
 msgstr "コンポーネント '%s' は既に存在します。変更してもよろしいですか？"
 
-#: eeschema/libedit.cpp:735
+#: kicad-6297/eeschema/libedit.cpp:735 kicad-6996/eeschema/libedit.cpp:735
 #, c-format
 msgid "Part '%s' saved in library '%s'"
 msgstr "コンポーネント '%s' がライブラリ '%s' 内に保存されました"
 
-#: eeschema/libedit_onrightclick.cpp:88 eeschema/onrightclick.cpp:158
-#: gerbview/onrightclick.cpp:62 pcbnew/modedit_onclick.cpp:232
-#: pcbnew/onrightclick.cpp:87
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:88
+#: kicad-6297/eeschema/onrightclick.cpp:158
+#: kicad-6297/gerbview/onrightclick.cpp:62
+#: kicad-6297/pcbnew/modedit_onclick.cpp:232
+#: kicad-6297/pcbnew/onrightclick.cpp:87
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:88
+#: kicad-6996/eeschema/onrightclick.cpp:158
+#: kicad-6996/gerbview/onrightclick.cpp:62
+#: kicad-6996/pcbnew/modedit_onclick.cpp:231
+#: kicad-6996/pcbnew/onrightclick.cpp:87
 msgid "End Tool"
 msgstr "ツールの終了"
 
-#: eeschema/libedit_onrightclick.cpp:118
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:118
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:118
 msgid "Move Arc"
 msgstr "円弧を移動"
 
-#: eeschema/libedit_onrightclick.cpp:122
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:122
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:122
 msgid "Drag Arc Size"
 msgstr "円弧のサイズをドラッグ"
 
-#: eeschema/libedit_onrightclick.cpp:126
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:126
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:126
 msgid "Edit Arc Options"
 msgstr "円弧のオプションを編集"
 
-#: eeschema/libedit_onrightclick.cpp:131
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:131
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:131
 msgid "Delete Arc"
 msgstr "円弧を削除"
 
-#: eeschema/libedit_onrightclick.cpp:139
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:139
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:139
 msgid "Move Circle"
 msgstr "円を移動"
 
-#: eeschema/libedit_onrightclick.cpp:143
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:143
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:143
 msgid "Drag Circle Outline"
 msgstr "円のアウトラインをドラッグ"
 
-#: eeschema/libedit_onrightclick.cpp:148
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:148
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:148
 msgid "Edit Circle Options"
 msgstr "円のオプションを編集"
 
-#: eeschema/libedit_onrightclick.cpp:154
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:154
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:154
 msgid "Delete Circle"
 msgstr "円を削除"
 
-#: eeschema/libedit_onrightclick.cpp:163
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:163
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:163
 msgid "Move Rectangle"
 msgstr "矩形を移動"
 
-#: eeschema/libedit_onrightclick.cpp:169
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:169
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:169
 msgid "Edit Rectangle Options"
 msgstr "矩形のオプションを編集"
 
-#: eeschema/libedit_onrightclick.cpp:175
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:175
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:175
 msgid "Drag Rectangle Edge"
 msgstr "矩形の端をドラッグ"
 
-#: eeschema/libedit_onrightclick.cpp:178
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:178
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:178
 msgid "Delete Rectangle"
 msgstr "矩形を削除"
 
-#: eeschema/libedit_onrightclick.cpp:188 eeschema/onrightclick.cpp:597
-#: pcbnew/modedit_onclick.cpp:343 pcbnew/onrightclick.cpp:882
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:188
+#: kicad-6297/eeschema/onrightclick.cpp:597
+#: kicad-6297/pcbnew/modedit_onclick.cpp:343
+#: kicad-6297/pcbnew/onrightclick.cpp:877
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:188
+#: kicad-6996/eeschema/onrightclick.cpp:600
+#: kicad-6996/pcbnew/modedit_onclick.cpp:342
+#: kicad-6996/pcbnew/onrightclick.cpp:873
 msgid "Move Text"
 msgstr "テキストを移動"
 
-#: eeschema/libedit_onrightclick.cpp:194 eeschema/onrightclick.cpp:96
-#: eeschema/onrightclick.cpp:607 pcbnew/modedit_onclick.cpp:379
-#: pcbnew/onrightclick.cpp:898
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:194
+#: kicad-6297/eeschema/onrightclick.cpp:96
+#: kicad-6297/eeschema/onrightclick.cpp:607
+#: kicad-6297/pcbnew/modedit_onclick.cpp:379
+#: kicad-6297/pcbnew/onrightclick.cpp:893
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:194
+#: kicad-6996/eeschema/onrightclick.cpp:96
+#: kicad-6996/eeschema/onrightclick.cpp:610
+#: kicad-6996/pcbnew/modedit_onclick.cpp:378
+#: kicad-6996/pcbnew/onrightclick.cpp:889
 msgid "Edit Text"
 msgstr "テキストを編集"
 
-#: eeschema/libedit_onrightclick.cpp:197 eeschema/onrightclick.cpp:605
-#: pcbnew/modedit_onclick.cpp:349 pcbnew/onrightclick.cpp:892
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:197
+#: kicad-6297/eeschema/onrightclick.cpp:605
+#: kicad-6297/pcbnew/modedit_onclick.cpp:349
+#: kicad-6297/pcbnew/onrightclick.cpp:887
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:197
+#: kicad-6996/eeschema/onrightclick.cpp:608
+#: kicad-6996/pcbnew/modedit_onclick.cpp:348
+#: kicad-6996/pcbnew/onrightclick.cpp:883
 msgid "Rotate Text"
 msgstr "テキストを回転"
 
-#: eeschema/libedit_onrightclick.cpp:202 eeschema/onrightclick.cpp:609
-#: pcbnew/modedit_onclick.cpp:385 pcbnew/onrightclick.cpp:909
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:202
+#: kicad-6297/eeschema/onrightclick.cpp:609
+#: kicad-6297/pcbnew/modedit_onclick.cpp:385
+#: kicad-6297/pcbnew/onrightclick.cpp:904
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:202
+#: kicad-6996/eeschema/onrightclick.cpp:612
+#: kicad-6996/pcbnew/modedit_onclick.cpp:384
+#: kicad-6996/pcbnew/onrightclick.cpp:900
 msgid "Delete Text"
 msgstr "テキストを削除"
 
-#: eeschema/libedit_onrightclick.cpp:210
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:210
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:210
 msgid "Move Line"
 msgstr "線を移動"
 
-#: eeschema/libedit_onrightclick.cpp:214
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:214
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:214
 msgid "Drag Edge Point"
 msgstr "端点をドラッグ"
 
-#: eeschema/libedit_onrightclick.cpp:220
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:220
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:220
 msgid "Line End"
 msgstr "線の終端"
 
-#: eeschema/libedit_onrightclick.cpp:224
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:224
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:224
 msgid "Edit Line Options"
 msgstr "線のオプションを編集"
 
-#: eeschema/libedit_onrightclick.cpp:230
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:230
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:230
 msgid "Delete Line "
 msgstr "線を削除"
 
-#: eeschema/libedit_onrightclick.cpp:239 pcbnew/onrightclick.cpp:654
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:239
+#: kicad-6297/pcbnew/onrightclick.cpp:649
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:239
+#: kicad-6996/pcbnew/onrightclick.cpp:645
 msgid "Delete Segment"
 msgstr "セグメントを削除"
 
-#: eeschema/libedit_onrightclick.cpp:250 eeschema/onrightclick.cpp:306
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:250
+#: kicad-6297/eeschema/onrightclick.cpp:306
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:250
+#: kicad-6996/eeschema/onrightclick.cpp:306
 msgid "Move Field"
 msgstr "フィールドを移動"
 
-#: eeschema/libedit_onrightclick.cpp:256
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:256
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:256
 msgid "Field Rotate"
 msgstr "フィールドを回転"
 
-#: eeschema/libedit_onrightclick.cpp:258
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:258
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:258
 msgid "Field Edit"
 msgstr "フィールドを編集"
 
-#: eeschema/libedit_onrightclick.cpp:283
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:283
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:283
 msgid "Move Pin "
 msgstr "ピンを移動"
 
-#: eeschema/libedit_onrightclick.cpp:288
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:288
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:288
 msgid "Edit Pin "
 msgstr "ピンを編集"
 
-#: eeschema/libedit_onrightclick.cpp:291
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:291
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:291
 msgid "Rotate Pin "
 msgstr "ピンを回転"
 
-#: eeschema/libedit_onrightclick.cpp:296
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:296
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:296
 msgid "Delete Pin "
 msgstr "ピンを削除"
 
-#: eeschema/libedit_onrightclick.cpp:303
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:303
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:303
 msgid "Global"
 msgstr "グローバル"
 
-#: eeschema/libedit_onrightclick.cpp:306
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:306
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:306
 msgid "Pin Size to selected pins"
 msgstr "選択したピンのピンサイズ"
 
-#: eeschema/libedit_onrightclick.cpp:307
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:307
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:307
 msgid "Pin Size to Others"
 msgstr "他のピンサイズ"
 
-#: eeschema/libedit_onrightclick.cpp:310
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:310
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:310
 msgid "Pin Name Size to selected pin"
 msgstr "選択したピンのピン名サイズ"
 
-#: eeschema/libedit_onrightclick.cpp:311
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:311
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:311
 msgid "Pin Name Size to Others"
 msgstr "他のピン名サイズ"
 
-#: eeschema/libedit_onrightclick.cpp:314
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:314
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:314
 msgid "Pin Num Size to selected pin"
 msgstr "選択したピンのピン番号サイズ"
 
-#: eeschema/libedit_onrightclick.cpp:315
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:315
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:315
 msgid "Pin Num Size to Others"
 msgstr "他のピンのピン番号サイズ"
 
-#: eeschema/libedit_onrightclick.cpp:323 eeschema/onrightclick.cpp:827
-#: gerbview/onrightclick.cpp:73 pcbnew/modedit_onclick.cpp:244
-#: pcbnew/onrightclick.cpp:495
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:323
+#: kicad-6297/eeschema/onrightclick.cpp:827
+#: kicad-6297/gerbview/onrightclick.cpp:73
+#: kicad-6297/pcbnew/modedit_onclick.cpp:244
+#: kicad-6297/pcbnew/onrightclick.cpp:490
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:324
+#: kicad-6996/eeschema/onrightclick.cpp:830
+#: kicad-6996/gerbview/onrightclick.cpp:73
+#: kicad-6996/pcbnew/modedit_onclick.cpp:243
+#: kicad-6996/pcbnew/onrightclick.cpp:486
 msgid "Cancel Block"
 msgstr "ブロックのキャンセル"
 
-#: eeschema/libedit_onrightclick.cpp:328 pcbnew/modedit_onclick.cpp:246
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:328
+#: kicad-6297/pcbnew/modedit_onclick.cpp:246
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:329
+#: kicad-6996/pcbnew/modedit_onclick.cpp:245
 msgid "Zoom Block (drag middle mouse)"
 msgstr "ブロック ズーム(マウスの中ボタンでドラッグ)"
 
-#: eeschema/libedit_onrightclick.cpp:333 eeschema/onrightclick.cpp:835
-#: gerbview/onrightclick.cpp:76 pcbnew/modedit_onclick.cpp:250
-#: pcbnew/onrightclick.cpp:499
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:333
+#: kicad-6297/eeschema/onrightclick.cpp:835
+#: kicad-6297/gerbview/onrightclick.cpp:76
+#: kicad-6297/pcbnew/modedit_onclick.cpp:250
+#: kicad-6297/pcbnew/onrightclick.cpp:494
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:334
+#: kicad-6996/eeschema/onrightclick.cpp:838
+#: kicad-6996/gerbview/onrightclick.cpp:76
+#: kicad-6996/pcbnew/modedit_onclick.cpp:249
+#: kicad-6996/pcbnew/onrightclick.cpp:490
 msgid "Place Block"
 msgstr "ブロックを配置"
 
-#: eeschema/libedit_onrightclick.cpp:337
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:337
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:338
 msgid "Select Items"
 msgstr "アイテムを選択"
 
-#: eeschema/libedit_onrightclick.cpp:339 eeschema/onrightclick.cpp:844
-#: pcbnew/onrightclick.cpp:500
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:339
+#: kicad-6297/eeschema/onrightclick.cpp:844
+#: kicad-6297/pcbnew/onrightclick.cpp:495
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:340
+#: kicad-6996/eeschema/onrightclick.cpp:847
+#: kicad-6996/pcbnew/onrightclick.cpp:491
 msgid "Copy Block"
 msgstr "ブロックをコピー"
 
-#: eeschema/libedit_onrightclick.cpp:340 eeschema/onrightclick.cpp:849
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:340
+#: kicad-6297/eeschema/onrightclick.cpp:849
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:341
+#: kicad-6996/eeschema/onrightclick.cpp:852
 msgid "Mirror Block ||"
 msgstr "ブロックの縦軸ミラー"
 
-#: eeschema/libedit_onrightclick.cpp:342 eeschema/onrightclick.cpp:852
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:342
+#: kicad-6297/eeschema/onrightclick.cpp:852
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:344
+#: kicad-6996/eeschema/onrightclick.cpp:855
 msgid "Mirror Block --"
 msgstr "ブロックの横軸ミラー"
 
-#: eeschema/libedit_onrightclick.cpp:344
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:344
 msgid "Rotate Block ccw"
 msgstr "ブロックを反時計周り"
 
-#: eeschema/libedit_onrightclick.cpp:346 eeschema/onrightclick.cpp:848
-#: pcbnew/onrightclick.cpp:503
+#: kicad-6297/eeschema/libedit_onrightclick.cpp:346
+#: kicad-6297/eeschema/onrightclick.cpp:848
+#: kicad-6297/pcbnew/onrightclick.cpp:498
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:350
+#: kicad-6996/eeschema/onrightclick.cpp:851
+#: kicad-6996/pcbnew/onrightclick.cpp:494
 msgid "Delete Block"
 msgstr "ブロックを削除"
 
-#: eeschema/libedit_plot_component.cpp:57
+#: kicad-6297/eeschema/libedit_plot_component.cpp:57
+#: kicad-6996/eeschema/libedit_plot_component.cpp:55
 msgid "No component"
 msgstr "コンポーネントがありません"
 
-#: eeschema/libedit_plot_component.cpp:74
-#: eeschema/libedit_plot_component.cpp:97
+#: kicad-6297/eeschema/libedit_plot_component.cpp:74
+#: kicad-6297/eeschema/libedit_plot_component.cpp:97
+#: kicad-6996/eeschema/libedit_plot_component.cpp:72
+#: kicad-6996/eeschema/libedit_plot_component.cpp:95
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: eeschema/libedit_plot_component.cpp:139
+#: kicad-6297/eeschema/libedit_plot_component.cpp:139
+#: kicad-6996/eeschema/libedit_plot_component.cpp:137
 #, c-format
 msgid "Can't save file <%s>"
 msgstr "ファイル <%s> が保存できません"
 
-#: eeschema/libeditframe.cpp:181
-msgid "Library Editor"
-msgstr "コンポーネント ライブラリ エディタ"
-
-#: eeschema/libeditframe.cpp:317
+#: kicad-6297/eeschema/libeditframe.cpp:317
+#: kicad-6996/eeschema/libeditframe.cpp:315
 msgid "Save the changes in the library before closing?"
 msgstr "終了前にライブラリの変更を保存しますか？"
 
-#: eeschema/libeditframe.cpp:344
+#: kicad-6297/eeschema/libeditframe.cpp:344
+#: kicad-6996/eeschema/libeditframe.cpp:342
 #, c-format
 msgid ""
 "Library '%s' was modified!\n"
@@ -6571,109 +8969,125 @@ msgstr ""
 "ライブラリ '%s'は編集されています! \n"
 "変更を破棄しますか？"
 
-#: eeschema/libeditframe.cpp:450 eeschema/onrightclick.cpp:451
+#: kicad-6297/eeschema/libeditframe.cpp:450
+#: kicad-6297/eeschema/onrightclick.cpp:451
+#: kicad-6996/eeschema/libeditframe.cpp:448
+#: kicad-6996/eeschema/onrightclick.cpp:454
 #, c-format
 msgid "Unit %s"
 msgstr "ユニット %s"
 
-#: eeschema/libeditframe.cpp:718
+#: kicad-6297/eeschema/libeditframe.cpp:718
+#: kicad-6996/eeschema/libeditframe.cpp:716
 msgid "No part to save."
 msgstr "保存するコンポーネントがありません。"
 
-#: eeschema/libeditframe.cpp:1110
+#: kicad-6297/eeschema/libeditframe.cpp:1110
+#: kicad-6996/eeschema/libeditframe.cpp:1112
 msgid "Add pin"
 msgstr "ピンを追加"
 
-#: eeschema/libeditframe.cpp:1114
+#: kicad-6297/eeschema/libeditframe.cpp:1114
+#: kicad-6996/eeschema/libeditframe.cpp:1116
 msgid "Set pin options"
 msgstr "ピンのオプションをセット"
 
-#: eeschema/libeditframe.cpp:1125 eeschema/schedit.cpp:559 pcbnew/edit.cpp:1488
-#: pcbnew/modedit.cpp:951 pcbnew/tools/drawing_tool.cpp:1266
-#: pcbnew/tools/drawing_tool.cpp:1393
+#: kicad-6297/eeschema/libeditframe.cpp:1125
+#: kicad-6297/eeschema/schedit.cpp:559 kicad-6297/pcbnew/edit.cpp:1489
+#: kicad-6297/pcbnew/modedit.cpp:951
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:1267
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:1394
+#: kicad-6996/eeschema/libeditframe.cpp:1127
+#: kicad-6996/eeschema/schedit.cpp:573 kicad-6996/pcbnew/edit.cpp:1495
+#: kicad-6996/pcbnew/modedit.cpp:969
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:1266
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:1393
 msgid "Add text"
 msgstr "テキストを追加"
 
-#: eeschema/libeditframe.cpp:1129
+#: kicad-6297/eeschema/libeditframe.cpp:1129
+#: kicad-6996/eeschema/libeditframe.cpp:1131
 msgid "Add rectangle"
 msgstr "矩形を追加"
 
-#: eeschema/libeditframe.cpp:1133 pcbnew/modedit.cpp:947
+#: kicad-6297/eeschema/libeditframe.cpp:1133 kicad-6297/pcbnew/modedit.cpp:947
+#: kicad-6996/eeschema/libeditframe.cpp:1135 kicad-6996/pcbnew/modedit.cpp:965
 msgid "Add circle"
 msgstr "円を追加"
 
-#: eeschema/libeditframe.cpp:1137 pcbnew/modedit.cpp:943
+#: kicad-6297/eeschema/libeditframe.cpp:1137 kicad-6297/pcbnew/modedit.cpp:943
+#: kicad-6996/eeschema/libeditframe.cpp:1139 kicad-6996/pcbnew/modedit.cpp:961
 msgid "Add arc"
 msgstr "円弧を追加"
 
-#: eeschema/libeditframe.cpp:1141 pcbnew/modedit.cpp:939
+#: kicad-6297/eeschema/libeditframe.cpp:1141 kicad-6297/pcbnew/modedit.cpp:939
+#: kicad-6996/eeschema/libeditframe.cpp:1143 kicad-6996/pcbnew/modedit.cpp:957
 msgid "Add line"
 msgstr "線を追加"
 
-#: eeschema/libeditframe.cpp:1145
+#: kicad-6297/eeschema/libeditframe.cpp:1145
+#: kicad-6996/eeschema/libeditframe.cpp:1147
 msgid "Set anchor position"
 msgstr "アンカー位置を設定"
 
-#: eeschema/libeditframe.cpp:1149
+#: kicad-6297/eeschema/libeditframe.cpp:1149
+#: kicad-6996/eeschema/libeditframe.cpp:1151
 msgid "Import"
 msgstr "インポート"
 
-#: eeschema/libeditframe.cpp:1167 eeschema/schedit.cpp:595 pcbnew/edit.cpp:1500
-#: pcbnew/modedit.cpp:976 pcbnew/tools/pcbnew_control.cpp:752
-#: eeschema/help_common_strings.h:48
+#: kicad-6297/eeschema/libeditframe.cpp:1167
+#: kicad-6297/eeschema/schedit.cpp:595 kicad-6297/pcbnew/edit.cpp:1501
+#: kicad-6297/pcbnew/modedit.cpp:976
+#: kicad-6297/pcbnew/tools/pcbnew_control.cpp:761
+#: kicad-6996/eeschema/libeditframe.cpp:1169
+#: kicad-6996/eeschema/schedit.cpp:609 kicad-6996/pcbnew/edit.cpp:1507
+#: kicad-6996/pcbnew/modedit.cpp:994
+#: kicad-6996/pcbnew/tools/pcbnew_control.cpp:759
+#: kicad-6297/eeschema/help_common_strings.h:48
+#: kicad-6996/eeschema/help_common_strings.h:48
 msgid "Delete item"
 msgstr "アイテムを削除"
 
-#: eeschema/libfield.cpp:57
+#: kicad-6297/eeschema/libfield.cpp:57 kicad-6996/eeschema/libfield.cpp:57
 msgid "Component Name"
 msgstr "コンポーネント名"
 
-#: eeschema/libfield.cpp:58
+#: kicad-6297/eeschema/libfield.cpp:58 kicad-6996/eeschema/libfield.cpp:58
 msgid "Enter a name to create a new component based on this one."
 msgstr ""
 "このパーツをベースとして新しいコンポーネントを作成するための名前を入力してく"
 "ださい。"
 
-#: eeschema/libfield.cpp:62
+#: kicad-6297/eeschema/libfield.cpp:62 kicad-6996/eeschema/libfield.cpp:62
 #, c-format
 msgid "Edit Field %s"
 msgstr "フィールドの編集 %s"
 
-#: eeschema/libfield.cpp:63
+#: kicad-6297/eeschema/libfield.cpp:63 kicad-6996/eeschema/libfield.cpp:63
 #, c-format
 msgid "Enter a new value for the %s field."
 msgstr "%s フィールドの新しい値を入力してください。"
 
-#: eeschema/libfield.cpp:79
-#, c-format
-msgid "A %s field cannot be empty."
-msgstr "%s フィールドは空にできません。"
-
-#: eeschema/libfield.cpp:88
-msgid "Illegal reference. A reference must start by a letter"
-msgstr ""
-"無効なリファレンスです。リファレンスはアルファベット文字で始まる必要がありま"
-"す。"
-
-#: eeschema/libfield.cpp:108
+#: kicad-6297/eeschema/libfield.cpp:91 kicad-6996/eeschema/libfield.cpp:91
 #, c-format
 msgid ""
 "The name '%s' conflicts with an existing entry in the component library "
 "'%s'.\n"
 "\n"
-"Do you wish to replace the current component in library with this one?"
+"Do you wish to replace the current component in the library with this one?"
 msgstr ""
 " '%s' という名前はコンポーネント ライブラリ '%s' 内の既存エントリと衝突しま"
 "す。\n"
 "\n"
 "現在のコンポーネントをライブラリ内のコンポーネントと交換しますか？"
 
-#: eeschema/libfield.cpp:114 eeschema/libfield.cpp:130
-#: eeschema/libfield.cpp:149
+#: kicad-6297/eeschema/libfield.cpp:97 kicad-6297/eeschema/libfield.cpp:111
+#: kicad-6297/eeschema/libfield.cpp:131 kicad-6996/eeschema/libfield.cpp:97
+#: kicad-6996/eeschema/libfield.cpp:111 kicad-6996/eeschema/libfield.cpp:131
 msgid "Confirm"
 msgstr "確認"
 
-#: eeschema/libfield.cpp:125
+#: kicad-6297/eeschema/libfield.cpp:107 kicad-6996/eeschema/libfield.cpp:107
 #, c-format
 msgid ""
 "The current component already has an alias named '%s'.\n"
@@ -6684,7 +9098,7 @@ msgstr ""
 "\n"
 "このエイリアスをコンポーネントから削除しますか？"
 
-#: eeschema/libfield.cpp:144
+#: kicad-6297/eeschema/libfield.cpp:125 kicad-6996/eeschema/libfield.cpp:125
 #, c-format
 msgid ""
 "The new component contains alias names that conflict with entries in the "
@@ -6697,22 +9111,26 @@ msgstr ""
 "\n"
 "このコンポーネント内の衝突するエイリアスを削除しますか？"
 
-#: eeschema/load_one_schematic_file.cpp:94
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:94
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:94
 #, c-format
 msgid "Failed to open '%s'"
 msgstr "ファイル '%s' が開けませんでした"
 
-#: eeschema/load_one_schematic_file.cpp:102
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:102
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:102
 #, c-format
 msgid "Loading '%s'"
 msgstr "読込み中 '%s'"
 
-#: eeschema/load_one_schematic_file.cpp:109
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:109
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:109
 #, c-format
 msgid "'%s' is NOT an Eeschema file!"
 msgstr "'%s' は Eeschema のファイルではありません！"
 
-#: eeschema/load_one_schematic_file.cpp:128
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:128
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:128
 #, c-format
 msgid ""
 "'%s' was created by a more recent version of Eeschema and may not load "
@@ -6721,7 +9139,8 @@ msgstr ""
 "'%s' は新しいバージョンの Eeschema で作成されており、正しく読み込めない可能性"
 "があります。ソフトウェアの更新を検討してください！"
 
-#: eeschema/load_one_schematic_file.cpp:139
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:139
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:139
 msgid ""
 " was created by an older version of Eeschema. It will be stored in the new "
 "file format when you save this file again."
@@ -6729,30 +9148,35 @@ msgstr ""
 " は古いバージョンの Eeschema で作成されています。このファイルは保存する際に新"
 "しいフォーマットで保存されます。"
 
-#: eeschema/load_one_schematic_file.cpp:225
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:225
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:225
 #, c-format
 msgid "Eeschema file text load error at line %d"
 msgstr "%d 行で Eeschema のファイル読み込みエラー"
 
-#: eeschema/load_one_schematic_file.cpp:241
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:241
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:241
 #, c-format
 msgid "Eeschema file undefined object at line %d, aborted"
 msgstr ""
 "Eeschema ファイルの %d 行目に未定義のオブジェクトがありました、中止します。"
 
-#: eeschema/load_one_schematic_file.cpp:264
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:264
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:264
 #, c-format
 msgid "Eeschema file object not loaded at line %d, aborted"
 msgstr ""
 "Eeschema ファイルの %d 行目に読み込まれていないオブジェクトがありました、中止"
 "します。"
 
-#: eeschema/load_one_schematic_file.cpp:281
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:281
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:281
 #, c-format
 msgid "Done Loading <%s>"
 msgstr "読み込み完了 <%s>"
 
-#: eeschema/load_one_schematic_file.cpp:310
+#: kicad-6297/eeschema/load_one_schematic_file.cpp:310
+#: kicad-6996/eeschema/load_one_schematic_file.cpp:310
 #, c-format
 msgid ""
 "Eeschema file dimension definition error line %d,\n"
@@ -6761,490 +9185,636 @@ msgstr ""
 "Eeschema ファイルの単位定義でエラー (行番号: %d)\n"
 "ファイルの読み込みを中断しました。\n"
 
-#: eeschema/menubar.cpp:69
+#: kicad-6297/eeschema/menubar.cpp:69 kicad-6996/eeschema/menubar.cpp:67
 msgid "&New Schematic Project"
 msgstr "新規回路図プロジェクト(&N)"
 
-#: eeschema/menubar.cpp:70
+#: kicad-6297/eeschema/menubar.cpp:70 kicad-6996/eeschema/menubar.cpp:68
 msgid "Clear current schematic hierarchy and start a new schematic root sheet"
 msgstr "現在の回路図階層をクリアし、新しい回路図ルートシートを開始する"
 
-#: eeschema/menubar.cpp:73
+#: kicad-6297/eeschema/menubar.cpp:73 kicad-6996/eeschema/menubar.cpp:71
 msgid "&Open Schematic Project"
 msgstr "既存の回路図プロジェクトを開く(&O)"
 
-#: eeschema/menubar.cpp:76
+#: kicad-6297/eeschema/menubar.cpp:76 kicad-6996/eeschema/menubar.cpp:74
 msgid "Open an existing schematic hierarchy"
 msgstr "既存の回路図階層を開く"
 
-#: eeschema/menubar.cpp:97 kicad/menubar.cpp:224 pcbnew/menubar_pcbframe.cpp:94
+#: kicad-6297/eeschema/menubar.cpp:97 kicad-6297/kicad/menubar.cpp:224
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:94 kicad-6996/eeschema/menubar.cpp:95
+#: kicad-6996/kicad/menubar.cpp:227 kicad-6996/pcbnew/menubar_pcbframe.cpp:95
 msgid "Open &Recent"
 msgstr "最近開いたファイル(&R)"
 
-#: eeschema/menubar.cpp:98
+#: kicad-6297/eeschema/menubar.cpp:98 kicad-6996/eeschema/menubar.cpp:96
 msgid "Open a recent opened schematic project"
 msgstr "最近開いた回路図を開く"
 
-#: eeschema/menubar.cpp:103
+#: kicad-6297/eeschema/menubar.cpp:103
 msgid "App&end Schematic Sheet"
-msgstr "回路図シートを追加(&e)"
+msgstr "回路図シートから追加(&e)"
 
-#: eeschema/menubar.cpp:104
+#: kicad-6297/eeschema/menubar.cpp:104
 msgid "Append schematic sheet to current project"
 msgstr "現在読み込まれている回路図へ、他の回路図プロジェクトを追加する"
 
-#: eeschema/menubar.cpp:109
+#: kicad-6297/eeschema/menubar.cpp:109 kicad-6996/eeschema/menubar.cpp:107
 msgid "&Save Schematic Project"
 msgstr "回路図プロジェクトの保存(&S)"
 
-#: eeschema/menubar.cpp:113
+#: kicad-6297/eeschema/menubar.cpp:113 kicad-6996/eeschema/menubar.cpp:111
 msgid "Save all sheets in schematic project"
 msgstr "回路図プロジェクト内の全てのシートを保存"
 
-#: eeschema/menubar.cpp:118
+#: kicad-6297/eeschema/menubar.cpp:118 kicad-6996/eeschema/menubar.cpp:116
 msgid "Save &Current Sheet Only"
 msgstr "現在のシートのみ保存(&C)"
 
-#: eeschema/menubar.cpp:119
+#: kicad-6297/eeschema/menubar.cpp:119 kicad-6996/eeschema/menubar.cpp:117
 msgid "Save only current schematic sheet"
 msgstr "現在の回路図シートのみ保存"
 
-#: eeschema/menubar.cpp:126
+#: kicad-6297/eeschema/menubar.cpp:126 kicad-6996/eeschema/menubar.cpp:124
 msgid "Save C&urrent Sheet As"
 msgstr "現在のシートを名前をつけて保存(&u)"
 
-#: eeschema/menubar.cpp:127
+#: kicad-6297/eeschema/menubar.cpp:127 kicad-6996/eeschema/menubar.cpp:125
 msgid "Save current schematic sheet as..."
 msgstr "現在の回路図シートを名前をつけて保存"
 
-#: eeschema/menubar.cpp:135
+#: kicad-6297/eeschema/menubar.cpp:135 kicad-6996/eeschema/menubar.cpp:133
 msgid "Pa&ge Settings"
 msgstr "ページ設定(&G)"
 
-#: eeschema/menubar.cpp:136
+#: kicad-6297/eeschema/menubar.cpp:136 kicad-6996/eeschema/menubar.cpp:134
 msgid "Setting for sheet size and frame references"
 msgstr "ページサイズと図枠情報の設定"
 
-#: eeschema/menubar.cpp:141
+#: kicad-6297/eeschema/menubar.cpp:141 kicad-6996/eeschema/menubar.cpp:139
 msgid "Pri&nt"
 msgstr "印刷(&N)"
 
-#: eeschema/menubar.cpp:142
+#: kicad-6297/eeschema/menubar.cpp:142 kicad-6996/eeschema/menubar.cpp:140
 msgid "Print schematic sheet"
 msgstr "回路図の印刷"
 
-#: eeschema/menubar.cpp:148 eeschema/menubar.cpp:160
+#: kicad-6297/eeschema/menubar.cpp:148 kicad-6297/eeschema/menubar.cpp:160
+#: kicad-6996/eeschema/menubar.cpp:146 kicad-6996/eeschema/menubar.cpp:158
 msgid "&Plot"
 msgstr "出図(&P)"
 
-#: eeschema/menubar.cpp:149
+#: kicad-6297/eeschema/menubar.cpp:149 kicad-6996/eeschema/menubar.cpp:147
 msgid "Plot schematic sheet in PostScript, PDF, SVG, DXF or HPGL format"
 msgstr ""
 "回路図シートをPostScript, PDF, SVG, DXF, HPGLフォーマット等でプロットする"
 
-#: eeschema/menubar.cpp:154
+#: kicad-6297/eeschema/menubar.cpp:154 kicad-6996/eeschema/menubar.cpp:152
 msgid "Plot to C&lipboard"
 msgstr "クリップボードにプロット(&l)"
 
-#: eeschema/menubar.cpp:155
+#: kicad-6297/eeschema/menubar.cpp:155 kicad-6996/eeschema/menubar.cpp:153
 msgid "Export drawings to clipboard"
 msgstr "クリップボードに図をエクスポート"
 
-#: eeschema/menubar.cpp:161
+#: kicad-6297/eeschema/menubar.cpp:161 kicad-6996/eeschema/menubar.cpp:159
 msgid "Plot schematic sheet in HPGL, PostScript or SVG format"
 msgstr "HPGL, PostScript, SVGフォーマットのいづれかで回路図シートをプロット"
 
-#: eeschema/menubar.cpp:171
+#: kicad-6297/eeschema/menubar.cpp:171 kicad-6996/eeschema/menubar.cpp:169
 msgid "Close Eeschema"
 msgstr "Eeschema の終了"
 
-#: eeschema/menubar.cpp:178 eeschema/menubar_libedit.cpp:118
-#: pcbnew/menubar_modedit.cpp:158 pcbnew/menubar_pcbframe.cpp:279
+#: kicad-6297/eeschema/menubar.cpp:178
+#: kicad-6297/eeschema/menubar_libedit.cpp:118
+#: kicad-6297/pcbnew/menubar_modedit.cpp:158
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:279
+#: kicad-6996/eeschema/menubar.cpp:176
+#: kicad-6996/eeschema/menubar_libedit.cpp:118
+#: kicad-6996/pcbnew/menubar_modedit.cpp:157
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:283
 msgid "&Undo"
 msgstr "元に戻す(&U)"
 
-#: eeschema/menubar.cpp:183 eeschema/menubar_libedit.cpp:127
-#: pcbnew/menubar_modedit.cpp:164 pcbnew/menubar_pcbframe.cpp:282
+#: kicad-6297/eeschema/menubar.cpp:183
+#: kicad-6297/eeschema/menubar_libedit.cpp:127
+#: kicad-6297/pcbnew/menubar_modedit.cpp:164
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:282
+#: kicad-6996/eeschema/menubar.cpp:181
+#: kicad-6996/eeschema/menubar_libedit.cpp:127
+#: kicad-6996/pcbnew/menubar_modedit.cpp:163
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:286
 msgid "&Redo"
 msgstr "やり直し(&R)"
 
-#: eeschema/menubar.cpp:199
+#: kicad-6297/eeschema/menubar.cpp:199 kicad-6996/eeschema/menubar.cpp:197
 msgid "Find and Re&place"
 msgstr "検索と置換(&P)"
 
-#: eeschema/menubar.cpp:207
+#: kicad-6297/eeschema/menubar.cpp:207 kicad-6996/eeschema/menubar.cpp:205
 msgid "Import Footprint Selection"
 msgstr "フットプリントの関連付けをインポート"
 
-#: eeschema/menubar.cpp:229 eeschema/menubar_libedit.cpp:161
-#: eeschema/tool_viewlib.cpp:225 pcbnew/menubar_modedit.cpp:216
-#: pcbnew/menubar_pcbframe.cpp:330 pcbnew/tool_modview.cpp:157
+#: kicad-6297/eeschema/menubar.cpp:229
+#: kicad-6297/eeschema/menubar_libedit.cpp:161
+#: kicad-6297/eeschema/tool_viewlib.cpp:225
+#: kicad-6297/pcbnew/menubar_modedit.cpp:216
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:330
+#: kicad-6297/pcbnew/tool_modview.cpp:157 kicad-6996/eeschema/menubar.cpp:227
+#: kicad-6996/eeschema/menubar_libedit.cpp:161
+#: kicad-6996/eeschema/tool_viewlib.cpp:225
+#: kicad-6996/pcbnew/menubar_modedit.cpp:215
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:334
+#: kicad-6996/pcbnew/tool_modview.cpp:157
 msgid "Zoom &In"
 msgstr "ズーム イン(&I)"
 
-#: eeschema/menubar.cpp:233 eeschema/menubar_libedit.cpp:165
-#: eeschema/tool_viewlib.cpp:229 pcbnew/menubar_modedit.cpp:220
-#: pcbnew/menubar_pcbframe.cpp:334 pcbnew/tool_modview.cpp:161
+#: kicad-6297/eeschema/menubar.cpp:233
+#: kicad-6297/eeschema/menubar_libedit.cpp:165
+#: kicad-6297/eeschema/tool_viewlib.cpp:229
+#: kicad-6297/pcbnew/menubar_modedit.cpp:220
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:334
+#: kicad-6297/pcbnew/tool_modview.cpp:161 kicad-6996/eeschema/menubar.cpp:231
+#: kicad-6996/eeschema/menubar_libedit.cpp:165
+#: kicad-6996/eeschema/tool_viewlib.cpp:229
+#: kicad-6996/pcbnew/menubar_modedit.cpp:219
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:338
+#: kicad-6996/pcbnew/tool_modview.cpp:161
 msgid "Zoom &Out"
 msgstr "ズーム アウト(&O)"
 
-#: eeschema/menubar.cpp:237 eeschema/menubar_libedit.cpp:169
-#: eeschema/tool_viewlib.cpp:233 pcbnew/menubar_modedit.cpp:224
-#: pcbnew/menubar_pcbframe.cpp:338 pcbnew/tool_modview.cpp:165
+#: kicad-6297/eeschema/menubar.cpp:237
+#: kicad-6297/eeschema/menubar_libedit.cpp:169
+#: kicad-6297/eeschema/tool_viewlib.cpp:233
+#: kicad-6297/pcbnew/menubar_modedit.cpp:224
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:338
+#: kicad-6297/pcbnew/tool_modview.cpp:165 kicad-6996/eeschema/menubar.cpp:235
+#: kicad-6996/eeschema/menubar_libedit.cpp:169
+#: kicad-6996/eeschema/tool_viewlib.cpp:233
+#: kicad-6996/pcbnew/menubar_modedit.cpp:223
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:342
+#: kicad-6996/pcbnew/tool_modview.cpp:165
 msgid "&Fit on Screen"
 msgstr "スクリーンにフィット(&F)"
 
-#: eeschema/menubar.cpp:241 eeschema/menubar_libedit.cpp:176
-#: eeschema/tool_viewlib.cpp:238 pcbnew/menubar_modedit.cpp:229
-#: pcbnew/menubar_pcbframe.cpp:343 pcbnew/tool_modview.cpp:170
+#: kicad-6297/eeschema/menubar.cpp:241
+#: kicad-6297/eeschema/menubar_libedit.cpp:176
+#: kicad-6297/eeschema/tool_viewlib.cpp:238
+#: kicad-6297/pcbnew/menubar_modedit.cpp:229
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:343
+#: kicad-6297/pcbnew/tool_modview.cpp:170 kicad-6996/eeschema/menubar.cpp:239
+#: kicad-6996/eeschema/menubar_libedit.cpp:176
+#: kicad-6996/eeschema/tool_viewlib.cpp:238
+#: kicad-6996/pcbnew/menubar_modedit.cpp:228
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:347
+#: kicad-6996/pcbnew/tool_modview.cpp:170
 msgid "&Redraw"
 msgstr "再描画(&R)"
 
-#: eeschema/menubar.cpp:249
+#: kicad-6297/eeschema/menubar.cpp:249 kicad-6996/eeschema/menubar.cpp:247
 msgid "Show &Hierarchical Navigator"
 msgstr "階層ナビゲータの表示(&H)"
 
-#: eeschema/menubar.cpp:250
+#: kicad-6297/eeschema/menubar.cpp:250 kicad-6996/eeschema/menubar.cpp:248
 msgid "Navigate hierarchical sheets"
 msgstr "階層シートのナビゲート"
 
-#: eeschema/menubar.cpp:253
+#: kicad-6297/eeschema/menubar.cpp:253 kicad-6996/eeschema/menubar.cpp:251
 msgid "&Leave Sheet"
 msgstr "シートから抜ける(&L)"
 
-#: eeschema/menubar.cpp:258 eeschema/onrightclick.cpp:196
-msgid "Leave Sheet"
-msgstr "シートから抜ける"
-
-#: eeschema/menubar.cpp:264
+#: kicad-6297/eeschema/menubar.cpp:264 kicad-6996/eeschema/menubar.cpp:262
 msgid "&Component"
 msgstr "コンポーネント(&C)"
 
-#: eeschema/menubar.cpp:270
+#: kicad-6297/eeschema/menubar.cpp:270 kicad-6996/eeschema/menubar.cpp:268
 msgid "&Power Port"
 msgstr "電源ポート(&P)"
 
-#: eeschema/menubar.cpp:276
+#: kicad-6297/eeschema/menubar.cpp:276 kicad-6996/eeschema/menubar.cpp:274
 msgid "&Wire"
 msgstr "配線(&W)"
 
-#: eeschema/menubar.cpp:282
+#: kicad-6297/eeschema/menubar.cpp:282 kicad-6996/eeschema/menubar.cpp:280
 msgid "&Bus"
 msgstr "バス(&B)"
 
-#: eeschema/menubar.cpp:288
+#: kicad-6297/eeschema/menubar.cpp:288 kicad-6996/eeschema/menubar.cpp:286
 msgid "Wire to Bus &Entry"
 msgstr "ワイヤ-バス エントリの追加(&E)"
 
-#: eeschema/menubar.cpp:294
+#: kicad-6297/eeschema/menubar.cpp:294 kicad-6996/eeschema/menubar.cpp:292
 msgid "Bus &to Bus Entry"
 msgstr "バス-バス エントリの追加(&T)"
 
-#: eeschema/menubar.cpp:300
+#: kicad-6297/eeschema/menubar.cpp:300 kicad-6996/eeschema/menubar.cpp:298
 msgid "&No Connect Flag"
 msgstr "空き端子フラグ(&N)"
 
-#: eeschema/menubar.cpp:304
+#: kicad-6297/eeschema/menubar.cpp:304 kicad-6996/eeschema/menubar.cpp:302
 msgid "&Junction"
 msgstr "ジャンクション(&J)"
 
-#: eeschema/menubar.cpp:310
+#: kicad-6297/eeschema/menubar.cpp:310 kicad-6996/eeschema/menubar.cpp:308
 msgid "&Label"
 msgstr "ラベル(&L)"
 
-#: eeschema/menubar.cpp:316
+#: kicad-6297/eeschema/menubar.cpp:316 kicad-6996/eeschema/menubar.cpp:314
 msgid "Gl&obal Label"
 msgstr "グローバル ラベル(&O)"
 
-#: eeschema/menubar.cpp:324
+#: kicad-6297/eeschema/menubar.cpp:324 kicad-6996/eeschema/menubar.cpp:322
 msgid "&Hierarchical Label"
 msgstr "階層ラベル(&H)"
 
-#: eeschema/menubar.cpp:331
+#: kicad-6297/eeschema/menubar.cpp:331 kicad-6996/eeschema/menubar.cpp:329
 msgid "Hierarchical &Sheet"
 msgstr "階層シート(&S)"
 
-#: eeschema/menubar.cpp:339
+#: kicad-6297/eeschema/menubar.cpp:339 kicad-6996/eeschema/menubar.cpp:337
 msgid "I&mport Hierarchical Label"
 msgstr "階層ラベルのインポート(&M)"
 
-#: eeschema/menubar.cpp:345
+#: kicad-6297/eeschema/menubar.cpp:345 kicad-6996/eeschema/menubar.cpp:343
 msgid "Hierarchical Pi&n to Sheet"
 msgstr "階層ピンをシートに追加(&N)"
 
-#: eeschema/menubar.cpp:351
+#: kicad-6297/eeschema/menubar.cpp:351 kicad-6996/eeschema/menubar.cpp:349
 msgid "Graphic Pol&yline"
 msgstr "図形ライン入力(&y)"
 
-#: eeschema/menubar.cpp:357
+#: kicad-6297/eeschema/menubar.cpp:357 kicad-6996/eeschema/menubar.cpp:355
 msgid "&Graphic Text"
 msgstr "図形テキスト(&G)"
 
-#: eeschema/menubar.cpp:364
+#: kicad-6297/eeschema/menubar.cpp:364 kicad-6996/eeschema/menubar.cpp:362
 msgid "&Image"
 msgstr "画像(&I)"
 
-#: eeschema/menubar.cpp:374 eeschema/menubar_libedit.cpp:230
+#: kicad-6297/eeschema/menubar.cpp:374
+#: kicad-6297/eeschema/menubar_libedit.cpp:230
+#: kicad-6996/eeschema/menubar.cpp:372
+#: kicad-6996/eeschema/menubar_libedit.cpp:230
 msgid "Component &Libraries"
 msgstr "コンポーネント ライブラリ(&L)"
 
-#: eeschema/menubar.cpp:375 eeschema/menubar_libedit.cpp:231
+#: kicad-6297/eeschema/menubar.cpp:375
+#: kicad-6297/eeschema/menubar_libedit.cpp:231
+#: kicad-6996/eeschema/menubar.cpp:373
+#: kicad-6996/eeschema/menubar_libedit.cpp:231
 msgid "Configure component libraries and paths"
 msgstr "コンポーネント ライブラリとパスの設定"
 
-#: eeschema/menubar.cpp:381 eeschema/menubar_libedit.cpp:244
+#: kicad-6297/eeschema/menubar.cpp:381
+#: kicad-6297/eeschema/menubar_libedit.cpp:244
 msgid "Set &Colors Scheme"
 msgstr "色の設定(&C)"
 
-#: eeschema/menubar.cpp:382 eeschema/menubar_libedit.cpp:245
+#: kicad-6297/eeschema/menubar.cpp:382
+#: kicad-6297/eeschema/menubar_libedit.cpp:245
 msgid "Set color preferences"
 msgstr "色の設定"
 
-#: eeschema/menubar.cpp:392
+#: kicad-6297/eeschema/menubar.cpp:392 kicad-6996/eeschema/menubar.cpp:383
 msgid "Schematic Editor &Options"
 msgstr "回路図エディタ オプション(&O)"
 
-#: eeschema/menubar.cpp:393
+#: kicad-6297/eeschema/menubar.cpp:393 kicad-6996/eeschema/menubar.cpp:384
 msgid "Set Eeschema preferences"
 msgstr "Eeschema 設定"
 
-#: eeschema/menubar.cpp:409 pcbnew/menubar_pcbframe.cpp:596
+#: kicad-6297/eeschema/menubar.cpp:409
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:596
+#: kicad-6996/eeschema/menubar.cpp:397
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:582
 msgid "&Save Preferences"
 msgstr "設定の保存(&S)"
 
-#: eeschema/menubar.cpp:410 pcbnew/menubar_pcbframe.cpp:597
+#: kicad-6297/eeschema/menubar.cpp:410
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:597
+#: kicad-6996/eeschema/menubar.cpp:398
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:583
 msgid "Save application preferences"
 msgstr "アプリケーション設定の保存"
 
-#: eeschema/menubar.cpp:415 pcbnew/menubar_pcbframe.cpp:601
+#: kicad-6297/eeschema/menubar.cpp:415
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:601
+#: kicad-6996/eeschema/menubar.cpp:403
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:587
 msgid "Load Prefe&rences"
 msgstr "設定の読込み(&R)"
 
-#: eeschema/menubar.cpp:416 pcbnew/menubar_pcbframe.cpp:602
+#: kicad-6297/eeschema/menubar.cpp:416
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:602
+#: kicad-6996/eeschema/menubar.cpp:404
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:588
 msgid "Load application preferences"
 msgstr "アプリケーション設定の読込み"
 
-#: eeschema/menubar.cpp:424
+#: kicad-6297/eeschema/menubar.cpp:424 kicad-6996/eeschema/menubar.cpp:446
 msgid "Library &Editor"
 msgstr "コンポーネント ライブラリ エディタ(&E)"
 
-#: eeschema/menubar.cpp:429
+#: kicad-6297/eeschema/menubar.cpp:429 kicad-6996/eeschema/menubar.cpp:451
 msgid "Library &Browser"
 msgstr "ライブラリ ブラウザ(&B)"
 
-#: eeschema/menubar.cpp:434
+#: kicad-6297/eeschema/menubar.cpp:434 kicad-6996/eeschema/menubar.cpp:456
 msgid "&Rescue Old Components"
 msgstr "キャッシュされたコンポーネントのレスキュー(&R)"
 
-#: eeschema/menubar.cpp:435
+#: kicad-6297/eeschema/menubar.cpp:435 kicad-6996/eeschema/menubar.cpp:457
 msgid "Find old components in the project and rename/rescue them"
 msgstr "プロジェクトにある古いコンポーネントを探してリネーム/レスキューする"
 
-#: eeschema/menubar.cpp:442
+#: kicad-6297/eeschema/menubar.cpp:442 kicad-6996/eeschema/menubar.cpp:464
 msgid "&Annotate Schematic"
 msgstr "回路図のアノテーション(&A)"
 
-#: eeschema/menubar.cpp:448
+#: kicad-6297/eeschema/menubar.cpp:448 kicad-6996/eeschema/menubar.cpp:470
 msgid "Electrical Rules &Checker"
 msgstr "エレクトリカル ルール チェック(ERC) (&C)"
 
-#: eeschema/menubar.cpp:449 eeschema/tool_sch.cpp:148
+#: kicad-6297/eeschema/menubar.cpp:449 kicad-6297/eeschema/tool_sch.cpp:148
+#: kicad-6996/eeschema/menubar.cpp:471 kicad-6996/eeschema/tool_sch.cpp:148
 msgid "Perform electrical rules check"
 msgstr "エレクトリカル ルール チェックの実行"
 
-#: eeschema/menubar.cpp:454
+#: kicad-6297/eeschema/menubar.cpp:454 kicad-6996/eeschema/menubar.cpp:476
 msgid "Generate &Netlist File"
 msgstr "ネットリストの生成(&N)"
 
-#: eeschema/menubar.cpp:455
+#: kicad-6297/eeschema/menubar.cpp:455 kicad-6996/eeschema/menubar.cpp:477
 msgid "Generate the component netlist file"
 msgstr "コンポーネントネットリストの生成"
 
-#: eeschema/menubar.cpp:460
+#: kicad-6297/eeschema/menubar.cpp:460 kicad-6996/eeschema/menubar.cpp:482
 msgid "Generate Bill of &Materials"
 msgstr "部品表の生成(&M)"
 
-#: eeschema/menubar.cpp:469
+#: kicad-6297/eeschema/menubar.cpp:469
 msgid "A&ssign Component Footprint"
 msgstr "コンポーネントにフットプリントを割付け(&S)"
 
-#: eeschema/menubar.cpp:470
+#: kicad-6297/eeschema/menubar.cpp:470 kicad-6996/eeschema/menubar.cpp:492
 msgid "Run CvPcb"
 msgstr "CvPcb の実行"
 
-#: eeschema/menubar.cpp:476
+#: kicad-6297/eeschema/menubar.cpp:476
 msgid "&Layout Printed Circuit Board"
 msgstr "プリント基板のレイアウト(&L)"
 
-#: eeschema/menubar.cpp:477 kicad/menubar.cpp:370
+#: kicad-6297/eeschema/menubar.cpp:477 kicad-6297/kicad/menubar.cpp:145
+#: kicad-6297/kicad/menubar.cpp:370 kicad-6996/eeschema/menubar.cpp:439
+#: kicad-6996/kicad/menubar.cpp:148 kicad-6996/kicad/menubar.cpp:373
 msgid "Run Pcbnew"
 msgstr "プリント基板エディタ(Pcbnew) を起動"
 
-#: eeschema/menubar.cpp:488 eeschema/menubar_libedit.cpp:263
-#: eeschema/tool_viewlib.cpp:250
+#: kicad-6297/eeschema/menubar.cpp:488
+#: kicad-6297/eeschema/menubar_libedit.cpp:263
+#: kicad-6297/eeschema/tool_viewlib.cpp:250 kicad-6996/eeschema/menubar.cpp:500
+#: kicad-6996/eeschema/menubar_libedit.cpp:253
+#: kicad-6996/eeschema/tool_viewlib.cpp:247
 msgid "Eeschema &Manual"
 msgstr "Eeschema マニュアル(&M)"
 
-#: eeschema/menubar.cpp:489
+#: kicad-6297/eeschema/menubar.cpp:489 kicad-6996/eeschema/menubar.cpp:501
 msgid "Open Eeschema Manual"
 msgstr "Eeschema マニュアルを開く"
 
-#: eeschema/menubar.cpp:501 eeschema/menubar_libedit.cpp:278
-#: kicad/menubar.cpp:421 pcbnew/menubar_modedit.cpp:353
-#: pcbnew/menubar_pcbframe.cpp:659
+#: kicad-6297/eeschema/menubar.cpp:501
+#: kicad-6297/eeschema/menubar_libedit.cpp:278 kicad-6297/kicad/menubar.cpp:421
+#: kicad-6297/pcbnew/menubar_modedit.cpp:353
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:659
+#: kicad-6996/eeschema/menubar.cpp:519
+#: kicad-6996/eeschema/menubar_libedit.cpp:274 kicad-6996/kicad/menubar.cpp:427
+#: kicad-6996/pcbnew/menubar_modedit.cpp:354
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:656
 msgid "&About KiCad"
 msgstr "KiCad について(&A)"
 
-#: eeschema/menubar.cpp:507 eeschema/menubar_libedit.cpp:284
-#: pcbnew/menubar_modedit.cpp:359 pcbnew/menubar_pcbframe.cpp:665
+#: kicad-6297/eeschema/menubar.cpp:507
+#: kicad-6297/eeschema/menubar_libedit.cpp:284
+#: kicad-6297/pcbnew/menubar_modedit.cpp:359
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:665
+#: kicad-6996/eeschema/menubar.cpp:525
+#: kicad-6996/eeschema/menubar_libedit.cpp:280
+#: kicad-6996/pcbnew/menubar_modedit.cpp:360
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:662
 msgid "&Edit"
 msgstr "編集(&E)"
 
-#: eeschema/menubar.cpp:508 eeschema/menubar_libedit.cpp:285
-#: eeschema/tool_viewlib.cpp:269 pcbnew/menubar_modedit.cpp:360
-#: pcbnew/menubar_pcbframe.cpp:666 pcbnew/tool_modview.cpp:208
+#: kicad-6297/eeschema/menubar.cpp:508
+#: kicad-6297/eeschema/menubar_libedit.cpp:285
+#: kicad-6297/eeschema/tool_viewlib.cpp:269
+#: kicad-6297/pcbnew/menubar_modedit.cpp:360
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:666
+#: kicad-6297/pcbnew/tool_modview.cpp:208 kicad-6996/eeschema/menubar.cpp:526
+#: kicad-6996/eeschema/menubar_libedit.cpp:281
+#: kicad-6996/eeschema/tool_viewlib.cpp:266
+#: kicad-6996/pcbnew/menubar_modedit.cpp:361
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:663
+#: kicad-6996/pcbnew/tool_modview.cpp:205
 msgid "&View"
 msgstr "表示(&V)"
 
-#: eeschema/menubar.cpp:509 eeschema/menubar_libedit.cpp:286
-#: pcbnew/menubar_modedit.cpp:361 pcbnew/menubar_pcbframe.cpp:667
+#: kicad-6297/eeschema/menubar.cpp:509
+#: kicad-6297/eeschema/menubar_libedit.cpp:286
+#: kicad-6297/pcbnew/menubar_modedit.cpp:361
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:667
+#: kicad-6996/eeschema/menubar.cpp:527
+#: kicad-6996/eeschema/menubar_libedit.cpp:282
+#: kicad-6996/pcbnew/menubar_modedit.cpp:362
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:664
 msgid "&Place"
 msgstr "配置(&P)"
 
-#: eeschema/menubar.cpp:510 eeschema/menubar_libedit.cpp:287
-#: pcbnew/menubar_modedit.cpp:362 pcbnew/menubar_pcbframe.cpp:669
+#: kicad-6297/eeschema/menubar.cpp:510
+#: kicad-6297/eeschema/menubar_libedit.cpp:287
+#: kicad-6297/pcbnew/menubar_modedit.cpp:362
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:669
+#: kicad-6996/eeschema/menubar.cpp:528
+#: kicad-6996/eeschema/menubar_libedit.cpp:283
+#: kicad-6996/pcbnew/menubar_modedit.cpp:363
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:666
 msgid "P&references"
 msgstr "設定(&R)"
 
-#: eeschema/menubar.cpp:511 kicad/menubar.cpp:429
-#: pcbnew/menubar_pcbframe.cpp:671
+#: kicad-6297/eeschema/menubar.cpp:511 kicad-6297/kicad/menubar.cpp:429
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:671
+#: kicad-6996/eeschema/menubar.cpp:529 kicad-6996/kicad/menubar.cpp:435
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:668
 msgid "&Tools"
 msgstr "ツール(&T)"
 
-#: eeschema/menubar_libedit.cpp:68
+#: kicad-6297/eeschema/menubar_libedit.cpp:68
+#: kicad-6996/eeschema/menubar_libedit.cpp:68
 msgid "&Current Library"
 msgstr "現在のライブラリ(&C)"
 
-#: eeschema/menubar_libedit.cpp:69 eeschema/tool_lib.cpp:115
+#: kicad-6297/eeschema/menubar_libedit.cpp:69
+#: kicad-6297/eeschema/tool_lib.cpp:115
+#: kicad-6996/eeschema/menubar_libedit.cpp:69
+#: kicad-6996/eeschema/tool_lib.cpp:118
 msgid "Select working library"
 msgstr "作業ライブラリの選択"
 
-#: eeschema/menubar_libedit.cpp:76
+#: kicad-6297/eeschema/menubar_libedit.cpp:76
+#: kicad-6996/eeschema/menubar_libedit.cpp:76
 msgid "&Save Current Library\tCtrl+S"
 msgstr "現在のライブラリを保存(&S)\tCtrl+S"
 
-#: eeschema/menubar_libedit.cpp:77
+#: kicad-6297/eeschema/menubar_libedit.cpp:77
+#: kicad-6996/eeschema/menubar_libedit.cpp:77
 msgid "Save the current active library"
 msgstr "現在のアクティブライブラリを保存"
 
-#: eeschema/menubar_libedit.cpp:83
+#: kicad-6297/eeschema/menubar_libedit.cpp:83
+#: kicad-6996/eeschema/menubar_libedit.cpp:83
 msgid "Save Current Library &As"
 msgstr "現在のライブラリを名前をつけて保存(&A)"
 
-#: eeschema/menubar_libedit.cpp:84
+#: kicad-6297/eeschema/menubar_libedit.cpp:84
+#: kicad-6996/eeschema/menubar_libedit.cpp:84
 msgid "Save current active library as..."
 msgstr "現在アクティブなライブラリを名前をつけて保存"
 
-#: eeschema/menubar_libedit.cpp:93
+#: kicad-6297/eeschema/menubar_libedit.cpp:93
+#: kicad-6996/eeschema/menubar_libedit.cpp:93
 msgid "Create &PNG File from Screen"
 msgstr "画面からPNGファイルを生成(&P)"
 
-#: eeschema/menubar_libedit.cpp:94
+#: kicad-6297/eeschema/menubar_libedit.cpp:94
+#: kicad-6996/eeschema/menubar_libedit.cpp:94
 msgid "Create a PNG file from the component displayed on screen"
 msgstr "スクリーン上に表示されたコンポーネントからPNGファイルを作成"
 
-#: eeschema/menubar_libedit.cpp:100
+#: kicad-6297/eeschema/menubar_libedit.cpp:100
+#: kicad-6996/eeschema/menubar_libedit.cpp:100
 msgid "Create S&VG File"
 msgstr "SVGファイル作成(&V)"
 
-#: eeschema/menubar_libedit.cpp:101
+#: kicad-6297/eeschema/menubar_libedit.cpp:101
+#: kicad-6996/eeschema/menubar_libedit.cpp:101
 msgid "Create a SVG file from the current loaded component"
 msgstr "現在読込まれているコンポーネントからSVGファイルを作成"
 
-#: eeschema/menubar_libedit.cpp:110
+#: kicad-6297/eeschema/menubar_libedit.cpp:110
+#: kicad-6996/eeschema/menubar_libedit.cpp:110
 msgid "&Quit"
 msgstr "終了(&Q)"
 
-#: eeschema/menubar_libedit.cpp:111
+#: kicad-6297/eeschema/menubar_libedit.cpp:111
+#: kicad-6996/eeschema/menubar_libedit.cpp:111
 msgid "Quit Library Editor"
 msgstr "コンポーネント ライブラリ エディタの終了"
 
-#: eeschema/menubar_libedit.cpp:123
+#: kicad-6297/eeschema/menubar_libedit.cpp:123
+#: kicad-6996/eeschema/menubar_libedit.cpp:123
 msgid "Undo last edit"
 msgstr "一つ前の編集を元に戻す"
 
-#: eeschema/menubar_libedit.cpp:131 pcbnew/tool_modedit.cpp:111
-#: pcbnew/help_common_strings.h:16
+#: kicad-6297/eeschema/menubar_libedit.cpp:131
+#: kicad-6297/pcbnew/tool_modedit.cpp:111
+#: kicad-6996/eeschema/menubar_libedit.cpp:131
+#: kicad-6996/pcbnew/tool_modedit.cpp:111
+#: kicad-6297/pcbnew/help_common_strings.h:16
+#: kicad-6996/pcbnew/help_common_strings.h:16
 msgid "Redo the last undo command"
 msgstr "一つ前のコマンドをやり直し"
 
-#: eeschema/menubar_libedit.cpp:185
+#: kicad-6297/eeschema/menubar_libedit.cpp:185
+#: kicad-6996/eeschema/menubar_libedit.cpp:185
 msgid "&Pin"
 msgstr "ピン(&P)"
 
-#: eeschema/menubar_libedit.cpp:192
+#: kicad-6297/eeschema/menubar_libedit.cpp:192
+#: kicad-6996/eeschema/menubar_libedit.cpp:192
 msgid "Graphic &Text"
 msgstr "図形テキスト(&T)"
 
-#: eeschema/menubar_libedit.cpp:199
+#: kicad-6297/eeschema/menubar_libedit.cpp:199
+#: kicad-6996/eeschema/menubar_libedit.cpp:199
 msgid "&Rectangle"
 msgstr "矩形(&R)"
 
-#: eeschema/menubar_libedit.cpp:206 pcbnew/menubar_modedit.cpp:276
-#: pcbnew/menubar_pcbframe.cpp:408
+#: kicad-6297/eeschema/menubar_libedit.cpp:206
+#: kicad-6297/pcbnew/menubar_modedit.cpp:276
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:408
+#: kicad-6996/eeschema/menubar_libedit.cpp:206
+#: kicad-6996/pcbnew/menubar_modedit.cpp:275
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:412
 msgid "&Circle"
 msgstr "円(&C)"
 
-#: eeschema/menubar_libedit.cpp:213 pcbnew/menubar_modedit.cpp:287
-#: pcbnew/menubar_pcbframe.cpp:405
+#: kicad-6297/eeschema/menubar_libedit.cpp:213
+#: kicad-6297/pcbnew/menubar_modedit.cpp:287
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:405
+#: kicad-6996/eeschema/menubar_libedit.cpp:213
+#: kicad-6996/pcbnew/menubar_modedit.cpp:286
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:409
 msgid "&Arc"
 msgstr "円弧(&A)"
 
-#: eeschema/menubar_libedit.cpp:220 pcbnew/menubar_modedit.cpp:281
-#: pcbnew/menubar_pcbframe.cpp:412
+#: kicad-6297/eeschema/menubar_libedit.cpp:220
+#: kicad-6297/pcbnew/menubar_modedit.cpp:281
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:412
+#: kicad-6996/eeschema/menubar_libedit.cpp:220
+#: kicad-6996/pcbnew/menubar_modedit.cpp:280
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:416
 msgid "&Line or Polygon"
 msgstr "線 (ポリゴン) (&L)"
 
-#: eeschema/menubar_libedit.cpp:237
+#: kicad-6297/eeschema/menubar_libedit.cpp:237
+#: kicad-6996/eeschema/menubar_libedit.cpp:237
 msgid "Component Editor &Options"
 msgstr "コンポーネント ライブラリ エディタ オプション(&O)"
 
-#: eeschema/menubar_libedit.cpp:238
+#: kicad-6297/eeschema/menubar_libedit.cpp:238
+#: kicad-6996/eeschema/menubar_libedit.cpp:238
 msgid "Set Component Editor default values and options"
 msgstr "コンポーネント エディタにデフォルトの値とオプションを設定する"
 
-#: eeschema/menubar_libedit.cpp:264
+#: kicad-6297/eeschema/menubar_libedit.cpp:264
+#: kicad-6996/eeschema/menubar_libedit.cpp:254
 msgid "Open the Eeschema Manual"
 msgstr "Eeschema マニュアルを開く"
 
-#: eeschema/menubar_libedit.cpp:270 eeschema/tool_viewlib.cpp:256
-#: pcbnew/menubar_modedit.cpp:347 pcbnew/menubar_pcbframe.cpp:654
-#: pcbnew/tool_modview.cpp:195
+#: kicad-6297/eeschema/menubar_libedit.cpp:270
+#: kicad-6297/eeschema/tool_viewlib.cpp:256
+#: kicad-6297/pcbnew/menubar_modedit.cpp:347
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:654
+#: kicad-6297/pcbnew/tool_modview.cpp:195
+#: kicad-6996/eeschema/menubar_libedit.cpp:260
+#: kicad-6996/eeschema/tool_viewlib.cpp:253
+#: kicad-6996/pcbnew/menubar_modedit.cpp:343
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:646
+#: kicad-6996/pcbnew/tool_modview.cpp:192
 msgid "Open the \"Getting Started in KiCad\" guide for beginners"
 msgstr "チュートリアル\"KiCad ことはじめ\"を開く"
 
-#: eeschema/netform.cpp:111
+#: kicad-6297/eeschema/netform.cpp:111 kicad-6996/eeschema/netform.cpp:111
 msgid "Run command:"
 msgstr "コマンドラインで実行:"
 
-#: eeschema/netform.cpp:117
+#: kicad-6297/eeschema/netform.cpp:117 kicad-6996/eeschema/netform.cpp:117
 #, c-format
 msgid "Command error. Return code %d"
 msgstr "コマンドエラー. リターンコード %d"
 
-#: eeschema/netform.cpp:120
+#: kicad-6297/eeschema/netform.cpp:120 kicad-6996/eeschema/netform.cpp:120
 msgid "Success"
 msgstr "成功"
 
-#: eeschema/netform.cpp:127
+#: kicad-6297/eeschema/netform.cpp:127 kicad-6996/eeschema/netform.cpp:127
 msgid "Info messages:"
 msgstr "Info メッセージ:"
 
-#: eeschema/netform.cpp:137
+#: kicad-6297/eeschema/netform.cpp:137 kicad-6996/eeschema/netform.cpp:137
 msgid "Error messages:"
 msgstr "エラーメッセージ:"
 
-#: eeschema/netlist.cpp:68
+#: kicad-6297/eeschema/netlist.cpp:68 kicad-6996/eeschema/netlist.cpp:67
 msgid ""
 "Exporting the netlist requires a completely\n"
 "annotated schematic."
@@ -7252,426 +9822,532 @@ msgstr ""
 "ネットリストのエクスポートには回路図の完全な\n"
 "アノテーションが必要です."
 
-#: eeschema/netlist.cpp:78
+#: kicad-6297/eeschema/netlist.cpp:78 kicad-6996/eeschema/netlist.cpp:77
 msgid "Error: duplicate sheet names. Continue?"
 msgstr "エラー: シート名の重複。続けますか？"
 
-#: eeschema/netlist.cpp:172
+#: kicad-6297/eeschema/netlist.cpp:172 kicad-6996/eeschema/netlist.cpp:171
 msgid "No Objects"
 msgstr "オブジェクトがありまs年"
 
-#: eeschema/netlist.cpp:176
+#: kicad-6297/eeschema/netlist.cpp:176 kicad-6996/eeschema/netlist.cpp:175
 #, c-format
 msgid "Net count = %d"
 msgstr "ネット数 = %d"
 
-#: eeschema/onrightclick.cpp:102 eeschema/onrightclick.cpp:573
+#: kicad-6297/eeschema/onrightclick.cpp:102
+#: kicad-6297/eeschema/onrightclick.cpp:573
+#: kicad-6996/eeschema/onrightclick.cpp:102
+#: kicad-6996/eeschema/onrightclick.cpp:576
 msgid "Edit Label"
 msgstr "ラベルを編集"
 
-#: eeschema/onrightclick.cpp:108 eeschema/onrightclick.cpp:501
+#: kicad-6297/eeschema/onrightclick.cpp:108
+#: kicad-6297/eeschema/onrightclick.cpp:501
+#: kicad-6996/eeschema/onrightclick.cpp:108
+#: kicad-6996/eeschema/onrightclick.cpp:504
 msgid "Edit Global Label"
 msgstr "グローバル ラベルを編集"
 
-#: eeschema/onrightclick.cpp:115 eeschema/onrightclick.cpp:537
+#: kicad-6297/eeschema/onrightclick.cpp:115
+#: kicad-6297/eeschema/onrightclick.cpp:537
+#: kicad-6996/eeschema/onrightclick.cpp:115
+#: kicad-6996/eeschema/onrightclick.cpp:540
 msgid "Edit Hierarchical Label"
 msgstr "階層ラベルを編集"
 
-#: eeschema/onrightclick.cpp:122 eeschema/onrightclick.cpp:895
+#: kicad-6297/eeschema/onrightclick.cpp:122
+#: kicad-6297/eeschema/onrightclick.cpp:895
+#: kicad-6996/eeschema/onrightclick.cpp:122
+#: kicad-6996/eeschema/onrightclick.cpp:898
 msgid "Edit Image"
 msgstr "イメージを編集"
 
-#: eeschema/onrightclick.cpp:209
+#: kicad-6297/eeschema/onrightclick.cpp:209
+#: kicad-6996/eeschema/onrightclick.cpp:209
 msgid "Delete No Connect"
 msgstr "未接続を削除"
 
-#: eeschema/onrightclick.cpp:267 pcbnew/onrightclick.cpp:189
+#: kicad-6297/eeschema/onrightclick.cpp:267
+#: kicad-6297/pcbnew/onrightclick.cpp:189
+#: kicad-6996/eeschema/onrightclick.cpp:267
+#: kicad-6996/pcbnew/onrightclick.cpp:189
 msgid "End Drawing"
 msgstr "線ツールの終了"
 
-#: eeschema/onrightclick.cpp:270 pcbnew/onrightclick.cpp:220
+#: kicad-6297/eeschema/onrightclick.cpp:270
+#: kicad-6297/pcbnew/onrightclick.cpp:220
+#: kicad-6996/eeschema/onrightclick.cpp:270
+#: kicad-6996/pcbnew/onrightclick.cpp:220
 msgid "Delete Drawing"
 msgstr "図形を削除"
 
-#: eeschema/onrightclick.cpp:303
+#: kicad-6297/eeschema/onrightclick.cpp:303
+#: kicad-6996/eeschema/onrightclick.cpp:303
 msgid "Move Reference"
 msgstr "リファレンスを移動"
 
-#: eeschema/onrightclick.cpp:304
+#: kicad-6297/eeschema/onrightclick.cpp:304
+#: kicad-6996/eeschema/onrightclick.cpp:304
 msgid "Move Value"
 msgstr "定数を移動"
 
-#: eeschema/onrightclick.cpp:305
+#: kicad-6297/eeschema/onrightclick.cpp:305
+#: kicad-6996/eeschema/onrightclick.cpp:305
 msgid "Move Footprint Field"
 msgstr "フットプリント フィールドを移動"
 
-#: eeschema/onrightclick.cpp:316
+#: kicad-6297/eeschema/onrightclick.cpp:316
+#: kicad-6996/eeschema/onrightclick.cpp:316
 msgid "Rotate Reference"
 msgstr "リファレンスを回転"
 
-#: eeschema/onrightclick.cpp:317
+#: kicad-6297/eeschema/onrightclick.cpp:317
+#: kicad-6996/eeschema/onrightclick.cpp:317
 msgid "Rotate Value"
 msgstr "定数を回転"
 
-#: eeschema/onrightclick.cpp:318
+#: kicad-6297/eeschema/onrightclick.cpp:318
+#: kicad-6996/eeschema/onrightclick.cpp:318
 msgid "Rotate Footprint Field"
 msgstr "フットプリント フィールドを回転"
 
-#: eeschema/onrightclick.cpp:319
+#: kicad-6297/eeschema/onrightclick.cpp:319
+#: kicad-6996/eeschema/onrightclick.cpp:319
 msgid "Rotate Field"
 msgstr "フィールドを回転"
 
-#: eeschema/onrightclick.cpp:331
+#: kicad-6297/eeschema/onrightclick.cpp:331
+#: kicad-6996/eeschema/onrightclick.cpp:331
 msgid "Edit Reference"
 msgstr "リファレンスを編集"
 
-#: eeschema/onrightclick.cpp:335
+#: kicad-6297/eeschema/onrightclick.cpp:335
+#: kicad-6996/eeschema/onrightclick.cpp:335
 msgid "Edit Value"
 msgstr "定数を編集"
 
-#: eeschema/onrightclick.cpp:339
+#: kicad-6297/eeschema/onrightclick.cpp:339
+#: kicad-6996/eeschema/onrightclick.cpp:339
 msgid "Edit Footprint Field"
 msgstr "フットプリント フィールドを編集"
 
-#: eeschema/onrightclick.cpp:343
+#: kicad-6297/eeschema/onrightclick.cpp:343
+#: kicad-6996/eeschema/onrightclick.cpp:343
 msgid "Edit Field"
 msgstr "フィールドを編集"
 
-#: eeschema/onrightclick.cpp:364
+#: kicad-6297/eeschema/onrightclick.cpp:364
+#: kicad-6996/eeschema/onrightclick.cpp:364
 #, c-format
 msgid "Move Component %s"
 msgstr "コンポーネント %s を移動"
 
-#: eeschema/onrightclick.cpp:368
+#: kicad-6297/eeschema/onrightclick.cpp:368
+#: kicad-6996/eeschema/onrightclick.cpp:368
 msgid "Drag Component"
 msgstr "コンポーネントをドラッグ"
 
-#: eeschema/onrightclick.cpp:373
+#: kicad-6297/eeschema/onrightclick.cpp:373
+#: kicad-6996/eeschema/onrightclick.cpp:373
 msgid "Rotate Clockwise"
 msgstr "右回転"
 
-#: eeschema/onrightclick.cpp:375
+#: kicad-6297/eeschema/onrightclick.cpp:375
+#: kicad-6996/eeschema/onrightclick.cpp:375
 msgid "Rotate Counterclockwise"
 msgstr "左回転"
 
-#: eeschema/onrightclick.cpp:377 eeschema/onrightclick.cpp:769
-#: eeschema/onrightclick.cpp:889
+#: kicad-6297/eeschema/onrightclick.cpp:377
+#: kicad-6297/eeschema/onrightclick.cpp:769
+#: kicad-6297/eeschema/onrightclick.cpp:889
+#: kicad-6996/eeschema/onrightclick.cpp:377
+#: kicad-6996/eeschema/onrightclick.cpp:772
+#: kicad-6996/eeschema/onrightclick.cpp:892
 msgid "Mirror --"
 msgstr "横軸でミラー"
 
-#: eeschema/onrightclick.cpp:379 eeschema/onrightclick.cpp:771
-#: eeschema/onrightclick.cpp:892
+#: kicad-6297/eeschema/onrightclick.cpp:379
+#: kicad-6297/eeschema/onrightclick.cpp:771
+#: kicad-6297/eeschema/onrightclick.cpp:892
+#: kicad-6996/eeschema/onrightclick.cpp:379
+#: kicad-6996/eeschema/onrightclick.cpp:774
+#: kicad-6996/eeschema/onrightclick.cpp:895
 msgid "Mirror ||"
 msgstr "縦軸でミラー"
 
-#: eeschema/onrightclick.cpp:384
+#: kicad-6297/eeschema/onrightclick.cpp:384
+#: kicad-6996/eeschema/onrightclick.cpp:384
 msgid "Orient Component"
-msgstr "コンポーネントの角度"
+msgstr "コンポーネントの方向"
 
-#: eeschema/onrightclick.cpp:390
+#: kicad-6297/eeschema/onrightclick.cpp:390
+#: kicad-6996/eeschema/onrightclick.cpp:390
 msgid "Copy Component"
 msgstr "コンポーネントをコピー"
 
-#: eeschema/onrightclick.cpp:393
+#: kicad-6297/eeschema/onrightclick.cpp:393
+#: kicad-6996/eeschema/onrightclick.cpp:393
 msgid "Delete Component"
 msgstr "コンポーネントを削除"
 
-#: eeschema/onrightclick.cpp:398
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:26
+#: kicad-6297/eeschema/onrightclick.cpp:398
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:26
+#: kicad-6996/eeschema/onrightclick.cpp:401
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:26
 msgid "Doc"
 msgstr "ドキュメント"
 
-#: eeschema/onrightclick.cpp:470
+#: kicad-6297/eeschema/onrightclick.cpp:470
+#: kicad-6996/eeschema/onrightclick.cpp:473
 msgid "Edit with Library Editor"
 msgstr "コンポーネント ライブラリ エディタで編集"
 
-#: eeschema/onrightclick.cpp:477
+#: kicad-6297/eeschema/onrightclick.cpp:477
+#: kicad-6996/eeschema/onrightclick.cpp:480
 msgid "Edit Component"
 msgstr "コンポーネントを編集"
 
-#: eeschema/onrightclick.cpp:488
+#: kicad-6297/eeschema/onrightclick.cpp:488
+#: kicad-6996/eeschema/onrightclick.cpp:491
 msgid "Move Global Label"
 msgstr "グローバル ラベルを移動"
 
-#: eeschema/onrightclick.cpp:491
+#: kicad-6297/eeschema/onrightclick.cpp:491
+#: kicad-6996/eeschema/onrightclick.cpp:494
 msgid "Drag Global Label"
 msgstr "グローバル ラベルをドラッグ"
 
-#: eeschema/onrightclick.cpp:494
+#: kicad-6297/eeschema/onrightclick.cpp:494
+#: kicad-6996/eeschema/onrightclick.cpp:497
 msgid "Copy Global Label"
 msgstr "グローバル ラベルをコピー"
 
-#: eeschema/onrightclick.cpp:499
+#: kicad-6297/eeschema/onrightclick.cpp:499
+#: kicad-6996/eeschema/onrightclick.cpp:502
 msgid "Rotate Global Label"
 msgstr "グローバル ラベルを回転"
 
-#: eeschema/onrightclick.cpp:503
+#: kicad-6297/eeschema/onrightclick.cpp:503
+#: kicad-6996/eeschema/onrightclick.cpp:506
 msgid "Delete Global Label"
 msgstr "グローバル ラベルを削除"
 
-#: eeschema/onrightclick.cpp:508 eeschema/onrightclick.cpp:580
-#: eeschema/onrightclick.cpp:620
+#: kicad-6297/eeschema/onrightclick.cpp:508
+#: kicad-6297/eeschema/onrightclick.cpp:580
+#: kicad-6297/eeschema/onrightclick.cpp:620
+#: kicad-6996/eeschema/onrightclick.cpp:511
+#: kicad-6996/eeschema/onrightclick.cpp:583
+#: kicad-6996/eeschema/onrightclick.cpp:623
 msgid "Change to Hierarchical Label"
 msgstr "階層ラベルに変更"
 
-#: eeschema/onrightclick.cpp:510 eeschema/onrightclick.cpp:544
-#: eeschema/onrightclick.cpp:618
+#: kicad-6297/eeschema/onrightclick.cpp:510
+#: kicad-6297/eeschema/onrightclick.cpp:544
+#: kicad-6297/eeschema/onrightclick.cpp:618
+#: kicad-6996/eeschema/onrightclick.cpp:513
+#: kicad-6996/eeschema/onrightclick.cpp:547
+#: kicad-6996/eeschema/onrightclick.cpp:621
 msgid "Change to Label"
 msgstr "ラベルに変更"
 
-#: eeschema/onrightclick.cpp:512 eeschema/onrightclick.cpp:546
-#: eeschema/onrightclick.cpp:582
+#: kicad-6297/eeschema/onrightclick.cpp:512
+#: kicad-6297/eeschema/onrightclick.cpp:546
+#: kicad-6297/eeschema/onrightclick.cpp:582
+#: kicad-6996/eeschema/onrightclick.cpp:515
+#: kicad-6996/eeschema/onrightclick.cpp:549
+#: kicad-6996/eeschema/onrightclick.cpp:585
 msgid "Change to Text"
 msgstr "テキストに変更"
 
-#: eeschema/onrightclick.cpp:514 eeschema/onrightclick.cpp:550
-#: eeschema/onrightclick.cpp:586 eeschema/onrightclick.cpp:624
+#: kicad-6297/eeschema/onrightclick.cpp:514
+#: kicad-6297/eeschema/onrightclick.cpp:550
+#: kicad-6297/eeschema/onrightclick.cpp:586
+#: kicad-6297/eeschema/onrightclick.cpp:624
+#: kicad-6996/eeschema/onrightclick.cpp:517
+#: kicad-6996/eeschema/onrightclick.cpp:553
+#: kicad-6996/eeschema/onrightclick.cpp:589
+#: kicad-6996/eeschema/onrightclick.cpp:627
 msgid "Change Type"
 msgstr "タイプの変更"
 
-#: eeschema/onrightclick.cpp:525
+#: kicad-6297/eeschema/onrightclick.cpp:525
+#: kicad-6996/eeschema/onrightclick.cpp:528
 msgid "Move Hierarchical Label"
 msgstr "階層ラベルを移動"
 
-#: eeschema/onrightclick.cpp:528
+#: kicad-6297/eeschema/onrightclick.cpp:528
+#: kicad-6996/eeschema/onrightclick.cpp:531
 msgid "Drag Hierarchical Label"
 msgstr "階層ラベルをドラッグ"
 
-#: eeschema/onrightclick.cpp:530
+#: kicad-6297/eeschema/onrightclick.cpp:530
+#: kicad-6996/eeschema/onrightclick.cpp:533
 msgid "Copy Hierarchical Label"
 msgstr "階層ラベルをコピー"
 
-#: eeschema/onrightclick.cpp:535
+#: kicad-6297/eeschema/onrightclick.cpp:535
+#: kicad-6996/eeschema/onrightclick.cpp:538
 msgid "Rotate Hierarchical Label"
 msgstr "階層ラベルを回転"
 
-#: eeschema/onrightclick.cpp:539
+#: kicad-6297/eeschema/onrightclick.cpp:539
+#: kicad-6996/eeschema/onrightclick.cpp:542
 msgid "Delete Hierarchical Label"
 msgstr "階層ラベルを削除"
 
-#: eeschema/onrightclick.cpp:548 eeschema/onrightclick.cpp:584
-#: eeschema/onrightclick.cpp:622
+#: kicad-6297/eeschema/onrightclick.cpp:548
+#: kicad-6297/eeschema/onrightclick.cpp:584
+#: kicad-6297/eeschema/onrightclick.cpp:622
+#: kicad-6996/eeschema/onrightclick.cpp:551
+#: kicad-6996/eeschema/onrightclick.cpp:587
+#: kicad-6996/eeschema/onrightclick.cpp:625
 msgid "Change to Global Label"
 msgstr "グローバル ラベルに変更"
 
-#: eeschema/onrightclick.cpp:561
+#: kicad-6297/eeschema/onrightclick.cpp:561
+#: kicad-6996/eeschema/onrightclick.cpp:564
 msgid "Move Label"
 msgstr "ラベルを移動"
 
-#: eeschema/onrightclick.cpp:564
+#: kicad-6297/eeschema/onrightclick.cpp:564
+#: kicad-6996/eeschema/onrightclick.cpp:567
 msgid "Drag Label"
 msgstr "ラベルをドラッグ"
 
-#: eeschema/onrightclick.cpp:566
+#: kicad-6297/eeschema/onrightclick.cpp:566
+#: kicad-6996/eeschema/onrightclick.cpp:569
 msgid "Copy Label"
 msgstr "ラベルをコピー"
 
-#: eeschema/onrightclick.cpp:571
+#: kicad-6297/eeschema/onrightclick.cpp:571
+#: kicad-6996/eeschema/onrightclick.cpp:574
 msgid "Rotate Label"
 msgstr "ラベルを回転"
 
-#: eeschema/onrightclick.cpp:575
+#: kicad-6297/eeschema/onrightclick.cpp:575
+#: kicad-6996/eeschema/onrightclick.cpp:578
 msgid "Delete Label"
 msgstr "ラベルを削除"
 
-#: eeschema/onrightclick.cpp:600
+#: kicad-6297/eeschema/onrightclick.cpp:600
+#: kicad-6996/eeschema/onrightclick.cpp:603
 msgid "Copy Text"
 msgstr "テキストをコピー"
 
-#: eeschema/onrightclick.cpp:634
+#: kicad-6297/eeschema/onrightclick.cpp:634
+#: kicad-6996/eeschema/onrightclick.cpp:637
 msgid "Delete Junction"
 msgstr "ジャンクションを削除"
 
-#: eeschema/onrightclick.cpp:640
+#: kicad-6297/eeschema/onrightclick.cpp:640
+#: kicad-6996/eeschema/onrightclick.cpp:643
 msgid "Drag Junction"
 msgstr "ジャンクション (接続点) をドラッグ"
 
-#: eeschema/onrightclick.cpp:643 eeschema/onrightclick.cpp:691
+#: kicad-6297/eeschema/onrightclick.cpp:643
+#: kicad-6297/eeschema/onrightclick.cpp:691
+#: kicad-6996/eeschema/onrightclick.cpp:646
+#: kicad-6996/eeschema/onrightclick.cpp:694
 msgid "Break Wire"
 msgstr "配線を切断"
 
-#: eeschema/onrightclick.cpp:649 eeschema/onrightclick.cpp:683
-msgid "Delete Node"
-msgstr "ノードを削除"
-
 # コネクション→一連のネットの意であればそのまま用語として残す
-#: eeschema/onrightclick.cpp:651 eeschema/onrightclick.cpp:685
+#: kicad-6297/eeschema/onrightclick.cpp:651
+#: kicad-6297/eeschema/onrightclick.cpp:685
+#: kicad-6996/eeschema/onrightclick.cpp:654
+#: kicad-6996/eeschema/onrightclick.cpp:688
 msgid "Delete Connection"
 msgstr "コネクションを削除"
 
-#: eeschema/onrightclick.cpp:665
-msgid "Begin Wire"
-msgstr "配線の開始"
-
-#: eeschema/onrightclick.cpp:673
+#: kicad-6297/eeschema/onrightclick.cpp:673
+#: kicad-6996/eeschema/onrightclick.cpp:676
 msgid "Wire End"
 msgstr "ワイヤの終端"
 
-#: eeschema/onrightclick.cpp:678
+#: kicad-6297/eeschema/onrightclick.cpp:678
+#: kicad-6996/eeschema/onrightclick.cpp:681
 msgid "Drag Wire"
 msgstr "ワイヤをドラッグ"
 
-#: eeschema/onrightclick.cpp:681
+#: kicad-6297/eeschema/onrightclick.cpp:681
+#: kicad-6996/eeschema/onrightclick.cpp:684
 msgid "Delete Wire"
 msgstr "ワイヤを削除"
 
-#: eeschema/onrightclick.cpp:696 eeschema/onrightclick.cpp:734
-msgid "Add Junction"
-msgstr "ジャンクションを追加"
-
-#: eeschema/onrightclick.cpp:698 eeschema/onrightclick.cpp:736
-msgid "Add Label"
-msgstr "ラベルを追加"
-
-#: eeschema/onrightclick.cpp:703 eeschema/onrightclick.cpp:741
-msgid "Add Global Label"
-msgstr "グローバル ラベルを追加"
-
-#: eeschema/onrightclick.cpp:715
-msgid "Begin Bus"
-msgstr "バスの開始"
-
-#: eeschema/onrightclick.cpp:723
+#: kicad-6297/eeschema/onrightclick.cpp:723
+#: kicad-6996/eeschema/onrightclick.cpp:726
 msgid "Bus End"
 msgstr "バスの終端"
 
-#: eeschema/onrightclick.cpp:728
+#: kicad-6297/eeschema/onrightclick.cpp:728
+#: kicad-6996/eeschema/onrightclick.cpp:731
 msgid "Delete Bus"
 msgstr "バスを削除"
 
-#: eeschema/onrightclick.cpp:731
+#: kicad-6297/eeschema/onrightclick.cpp:731
+#: kicad-6996/eeschema/onrightclick.cpp:734
 msgid "Break Bus"
 msgstr "バスを切断"
 
-#: eeschema/onrightclick.cpp:752
+#: kicad-6297/eeschema/onrightclick.cpp:752
+#: kicad-6996/eeschema/onrightclick.cpp:755
 msgid "Enter Sheet"
 msgstr "シートに入る"
 
-#: eeschema/onrightclick.cpp:755
+#: kicad-6297/eeschema/onrightclick.cpp:755
+#: kicad-6996/eeschema/onrightclick.cpp:758
 msgid "Move Sheet"
 msgstr "シートの移動"
 
-#: eeschema/onrightclick.cpp:759
+#: kicad-6297/eeschema/onrightclick.cpp:759
+#: kicad-6996/eeschema/onrightclick.cpp:762
 msgid "Drag Sheet"
 msgstr "シートをドラッグ"
 
-#: eeschema/onrightclick.cpp:763
+#: kicad-6297/eeschema/onrightclick.cpp:763
+#: kicad-6996/eeschema/onrightclick.cpp:766
 msgid "Rotate Sheet CW"
 msgstr "シートを時計方向に回転"
 
-#: eeschema/onrightclick.cpp:766
+#: kicad-6297/eeschema/onrightclick.cpp:766
+#: kicad-6996/eeschema/onrightclick.cpp:769
 msgid "Rotate Sheet CCW"
 msgstr "シートを反時計方向に回転"
 
-#: eeschema/onrightclick.cpp:775
+#: kicad-6297/eeschema/onrightclick.cpp:775
+#: kicad-6996/eeschema/onrightclick.cpp:778
 msgid "Orient Sheet"
 msgstr "シートの向きを合わせる."
 
-#: eeschema/onrightclick.cpp:780
+#: kicad-6297/eeschema/onrightclick.cpp:780
+#: kicad-6996/eeschema/onrightclick.cpp:783
 msgid "Place Sheet"
 msgstr "シートを配置"
 
-#: eeschema/onrightclick.cpp:784
+#: kicad-6297/eeschema/onrightclick.cpp:784
+#: kicad-6996/eeschema/onrightclick.cpp:787
 msgid "Edit Sheet"
 msgstr "シートを編集"
 
-#: eeschema/onrightclick.cpp:787
+#: kicad-6297/eeschema/onrightclick.cpp:787
+#: kicad-6996/eeschema/onrightclick.cpp:790
 msgid "Resize Sheet"
 msgstr "シートのリサイズ"
 
-#: eeschema/onrightclick.cpp:790
+#: kicad-6297/eeschema/onrightclick.cpp:790
+#: kicad-6996/eeschema/onrightclick.cpp:793
 msgid "Import Sheet Pins"
 msgstr "シート ピンのインポート"
 
-#: eeschema/onrightclick.cpp:794
+#: kicad-6297/eeschema/onrightclick.cpp:794
+#: kicad-6996/eeschema/onrightclick.cpp:797
 msgid "Cleanup Sheet Pins"
 msgstr "シート ピンのクリーンアップ"
 
-#: eeschema/onrightclick.cpp:798
+#: kicad-6297/eeschema/onrightclick.cpp:798
+#: kicad-6996/eeschema/onrightclick.cpp:801
 msgid "Delete Sheet"
 msgstr "シートを削除"
 
-#: eeschema/onrightclick.cpp:810
+#: kicad-6297/eeschema/onrightclick.cpp:810
+#: kicad-6996/eeschema/onrightclick.cpp:813
 msgid "Move Sheet Pin"
 msgstr "シート ピンを移動"
 
-#: eeschema/onrightclick.cpp:815
+#: kicad-6297/eeschema/onrightclick.cpp:815
+#: kicad-6996/eeschema/onrightclick.cpp:818
 msgid "Edit Sheet Pin"
 msgstr "シート ピンを編集"
 
-#: eeschema/onrightclick.cpp:818
+#: kicad-6297/eeschema/onrightclick.cpp:818
+#: kicad-6996/eeschema/onrightclick.cpp:821
 msgid "Delete Sheet Pin"
 msgstr "シート ピンを削除"
 
-#: eeschema/onrightclick.cpp:833
+#: kicad-6297/eeschema/onrightclick.cpp:833
+#: kicad-6996/eeschema/onrightclick.cpp:836
 msgid "Window Zoom"
 msgstr "選択範囲ズーム"
 
-#: eeschema/onrightclick.cpp:841
-msgid "Save Block"
-msgstr "ブロックを保存"
-
-#: eeschema/onrightclick.cpp:845
+#: kicad-6297/eeschema/onrightclick.cpp:845
+#: kicad-6996/eeschema/onrightclick.cpp:848
 msgid "Drag Block"
 msgstr "ブロックをドラッグ"
 
-#: eeschema/onrightclick.cpp:855
+#: kicad-6297/eeschema/onrightclick.cpp:855
+#: kicad-6996/eeschema/libedit_onrightclick.cpp:347
+#: kicad-6996/eeschema/onrightclick.cpp:858
 msgid "Rotate Block CCW"
 msgstr "ブロックの左回転"
 
-#: eeschema/onrightclick.cpp:861
+#: kicad-6297/eeschema/onrightclick.cpp:861
+#: kicad-6996/eeschema/onrightclick.cpp:864
 msgid "Copy to Clipboard"
 msgstr "クリップボードにコピー"
 
-#: eeschema/onrightclick.cpp:870 pcbnew/onrightclick.cpp:1027
+#: kicad-6297/eeschema/onrightclick.cpp:870
+#: kicad-6297/pcbnew/onrightclick.cpp:1022
+#: kicad-6996/eeschema/onrightclick.cpp:873
+#: kicad-6996/pcbnew/onrightclick.cpp:1018
 msgid "Delete Marker"
 msgstr "マーカーを削除"
 
-#: eeschema/onrightclick.cpp:871 pcbnew/onrightclick.cpp:1029
+#: kicad-6297/eeschema/onrightclick.cpp:871
+#: kicad-6297/pcbnew/onrightclick.cpp:1024
+#: kicad-6996/eeschema/onrightclick.cpp:874
+#: kicad-6996/pcbnew/onrightclick.cpp:1020
 msgid "Marker Error Info"
 msgstr "マーカー エラー情報"
 
-#: eeschema/onrightclick.cpp:882
+#: kicad-6297/eeschema/onrightclick.cpp:882
+#: kicad-6996/eeschema/onrightclick.cpp:885
 msgid "Move Image"
 msgstr "イメージを移動"
 
-#: eeschema/onrightclick.cpp:887
+#: kicad-6297/eeschema/onrightclick.cpp:887
+#: kicad-6996/eeschema/onrightclick.cpp:890
 msgid "Rotate Image"
 msgstr "イメージを回転"
 
-#: eeschema/onrightclick.cpp:901
+#: kicad-6297/eeschema/onrightclick.cpp:901
+#: kicad-6996/eeschema/onrightclick.cpp:904
 msgid "Delete Image"
 msgstr "イメージを削除"
 
-#: eeschema/onrightclick.cpp:913
+#: kicad-6297/eeschema/onrightclick.cpp:913
+#: kicad-6996/eeschema/onrightclick.cpp:916
 msgid "Move Bus Entry"
 msgstr "バス エントリを移動"
 
-#: eeschema/onrightclick.cpp:920
+#: kicad-6297/eeschema/onrightclick.cpp:920
+#: kicad-6996/eeschema/onrightclick.cpp:923
 msgid "Set Bus Entry Shape /"
 msgstr "バス エントリ形状のセット /"
 
-#: eeschema/onrightclick.cpp:923
+#: kicad-6297/eeschema/onrightclick.cpp:923
+#: kicad-6996/eeschema/onrightclick.cpp:926
 msgid "Set Bus Entry Shape \\"
 msgstr "バス エントリ形状のセット \\"
 
-#: eeschema/onrightclick.cpp:925
+#: kicad-6297/eeschema/onrightclick.cpp:925
+#: kicad-6996/eeschema/onrightclick.cpp:928
 msgid "Delete Bus Entry"
 msgstr "バス エントリを削除"
 
-#: eeschema/pinedit.cpp:249
+#: kicad-6297/eeschema/pinedit.cpp:249 kicad-6996/eeschema/pinedit.cpp:246
 msgid "This position is already occupied by another pin. Continue?"
 msgstr "この位置にはすでに他のピンがあります。続けますか？"
 
-#: eeschema/pinedit.cpp:674
+#: kicad-6297/eeschema/pinedit.cpp:674 kicad-6996/eeschema/pinedit.cpp:671
 msgid "No pins!"
 msgstr "ピンがありません！"
 
-#: eeschema/pinedit.cpp:684
+#: kicad-6297/eeschema/pinedit.cpp:684 kicad-6996/eeschema/pinedit.cpp:681
 msgid "Marker Information"
 msgstr "マーカー情報"
 
-#: eeschema/pinedit.cpp:710
+#: kicad-6297/eeschema/pinedit.cpp:710 kicad-6996/eeschema/pinedit.cpp:707
 #, c-format
 msgid ""
 "<b>Duplicate pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b> conflicts "
@@ -7680,315 +10356,447 @@ msgstr ""
 "<b>重複ピン %s</b> \"%s\" 位置 <b>(%.3f, %.3f)</b> 衝突ピン %s \"%s\" 位置 "
 "<b>(%.3f, %.3f)</b>"
 
-#: eeschema/pinedit.cpp:724 eeschema/pinedit.cpp:766
+#: kicad-6297/eeschema/pinedit.cpp:724 kicad-6297/eeschema/pinedit.cpp:766
+#: kicad-6996/eeschema/pinedit.cpp:721 kicad-6996/eeschema/pinedit.cpp:763
 #, c-format
 msgid " in part %c"
 msgstr " パーツ %c"
 
-#: eeschema/pinedit.cpp:730 eeschema/pinedit.cpp:772
+#: kicad-6297/eeschema/pinedit.cpp:730 kicad-6297/eeschema/pinedit.cpp:772
+#: kicad-6996/eeschema/pinedit.cpp:727 kicad-6996/eeschema/pinedit.cpp:769
 msgid "  of converted"
 msgstr " 変換シンボル"
 
-#: eeschema/pinedit.cpp:732 eeschema/pinedit.cpp:774
+#: kicad-6297/eeschema/pinedit.cpp:732 kicad-6297/eeschema/pinedit.cpp:774
+#: kicad-6996/eeschema/pinedit.cpp:729 kicad-6996/eeschema/pinedit.cpp:771
 msgid "  of normal"
 msgstr "  標準"
 
-#: eeschema/pinedit.cpp:757
+#: kicad-6297/eeschema/pinedit.cpp:757 kicad-6996/eeschema/pinedit.cpp:754
 #, c-format
 msgid "<b>Off grid pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b>"
 msgstr "<b>グリッドから外れたピン %s</b> \"%s\" 位置 <b>(%.3f, %.3f)</b>"
 
-#: eeschema/pinedit.cpp:783
+#: kicad-6297/eeschema/pinedit.cpp:783 kicad-6996/eeschema/pinedit.cpp:780
 msgid "No off grid or duplicate pins were found."
 msgstr "グリッドから外れたり、重複したピンは見つかりませんでした。"
 
-#: eeschema/plot_schematic_DXF.cpp:94 eeschema/plot_schematic_HPGL.cpp:190
-#: eeschema/plot_schematic_PDF.cpp:139 eeschema/plot_schematic_PS.cpp:122
-#: eeschema/plot_schematic_SVG.cpp:100 eeschema/plot_schematic_SVG.cpp:137
+#: kicad-6297/eeschema/plot_schematic_DXF.cpp:94
+#: kicad-6297/eeschema/plot_schematic_HPGL.cpp:190
+#: kicad-6297/eeschema/plot_schematic_PDF.cpp:139
+#: kicad-6297/eeschema/plot_schematic_PS.cpp:122
+#: kicad-6297/eeschema/plot_schematic_SVG.cpp:100
+#: kicad-6297/eeschema/plot_schematic_SVG.cpp:137
+#: kicad-6996/eeschema/plot_schematic_DXF.cpp:80
+#: kicad-6996/eeschema/plot_schematic_HPGL.cpp:177
+#: kicad-6996/eeschema/plot_schematic_PDF.cpp:125
+#: kicad-6996/eeschema/plot_schematic_PS.cpp:107
+#: kicad-6996/eeschema/plot_schematic_SVG.cpp:83
 #, c-format
 msgid "Plot: '%s' OK.\n"
 msgstr "プロット: '%s' OK.\n"
 
-#: eeschema/plot_schematic_DXF.cpp:99 eeschema/plot_schematic_HPGL.cpp:195
-#: eeschema/plot_schematic_PDF.cpp:102 eeschema/plot_schematic_PS.cpp:128
-#: eeschema/plot_schematic_SVG.cpp:144
+#: kicad-6297/eeschema/plot_schematic_DXF.cpp:99
+#: kicad-6297/eeschema/plot_schematic_HPGL.cpp:195
+#: kicad-6297/eeschema/plot_schematic_PDF.cpp:103
+#: kicad-6297/eeschema/plot_schematic_PS.cpp:128
+#: kicad-6297/eeschema/plot_schematic_SVG.cpp:144
+#: kicad-6996/eeschema/plot_schematic_DXF.cpp:85
+#: kicad-6996/eeschema/plot_schematic_HPGL.cpp:182
+#: kicad-6996/eeschema/plot_schematic_PDF.cpp:90
+#: kicad-6996/eeschema/plot_schematic_PS.cpp:113
 #, c-format
 msgid "Unable to create file '%s'.\n"
 msgstr "ファイル '%s' を作成できません\n"
 
-#: eeschema/plot_schematic_SVG.cpp:94
+#: kicad-6297/eeschema/plot_schematic_SVG.cpp:94
+#: kicad-6996/eeschema/plot_schematic_SVG.cpp:77
 #, c-format
 msgid "Cannot create file '%s'.\n"
 msgstr "ファイル '%s' を作成できません\n"
 
-#: eeschema/project_rescue.cpp:295
+#: kicad-6297/eeschema/project_rescue.cpp:295
+#: kicad-6996/eeschema/project_rescue.cpp:294
 #, c-format
 msgid "Rename to %s"
 msgstr "ファイル名を %s へ変更"
 
-#: eeschema/project_rescue.cpp:389
+#: kicad-6297/eeschema/project_rescue.cpp:389
+#: kicad-6996/eeschema/project_rescue.cpp:388
 #, c-format
 msgid "Rescue %s as %s"
 msgstr "%s を %s としてレスキュー"
 
-#: eeschema/project_rescue.cpp:527
+#: kicad-6297/eeschema/project_rescue.cpp:527
+#: kicad-6996/eeschema/project_rescue.cpp:526
 msgid "This project has nothing to rescue."
 msgstr "このプロジェクトにレスキューは必要ありません."
 
-#: eeschema/project_rescue.cpp:541
+#: kicad-6297/eeschema/project_rescue.cpp:541
+#: kicad-6996/eeschema/project_rescue.cpp:541
 msgid "No symbols were rescued."
 msgstr "レスキューするシンボルがありません."
 
-#: eeschema/sch_bus_entry.cpp:335
+#: kicad-6297/eeschema/sch_bus_entry.cpp:335
+#: kicad-6996/eeschema/sch_bus_entry.cpp:334
 msgid "Bus to Wire Entry"
 msgstr "ワイヤ-バス エントリ"
 
-#: eeschema/sch_bus_entry.cpp:341
+#: kicad-6297/eeschema/sch_bus_entry.cpp:341
+#: kicad-6996/eeschema/sch_bus_entry.cpp:340
 msgid "Bus to Bus Entry"
 msgstr "バス-バス エントリ"
 
-#: eeschema/sch_collectors.cpp:432
+#: kicad-6297/eeschema/sch_collectors.cpp:432
+#: kicad-6996/eeschema/sch_collectors.cpp:432
 #, c-format
 msgid "Child item %s of parent item %s found in sheet %s"
 msgstr "子アイテム %s の親アイテム %s がシート %s 中にありません"
 
-#: eeschema/sch_collectors.cpp:439
+#: kicad-6297/eeschema/sch_collectors.cpp:439
+#: kicad-6996/eeschema/sch_collectors.cpp:439
 #, c-format
 msgid "Item %s found in sheet %s"
 msgstr "アイテム %s がシート%s 内に見つかりませんでした"
 
-#: eeschema/sch_component.cpp:1518
+#: kicad-6297/eeschema/sch_component.cpp:1518
+#: kicad-6996/eeschema/sch_component.cpp:1542
 msgid "Power symbol"
 msgstr "電源シンボル"
 
-#: eeschema/sch_component.cpp:1526
+#: kicad-6297/eeschema/sch_component.cpp:1526
+#: kicad-6996/eeschema/sch_component.cpp:1550
 msgid "Alias of"
 msgstr "エイリアス"
 
-#: eeschema/sch_component.cpp:1528 pcbnew/dialogs/wizard_add_fplib_base.cpp:185
-#: pcbnew/loadcmp.cpp:437
+#: kicad-6297/eeschema/sch_component.cpp:1528
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:185
+#: kicad-6297/pcbnew/loadcmp.cpp:437 kicad-6996/eeschema/sch_component.cpp:1552
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:185
+#: kicad-6996/pcbnew/loadcmp.cpp:435
 msgid "Library"
 msgstr "ライブラリ"
 
-#: eeschema/sch_component.cpp:1534
+#: kicad-6297/eeschema/sch_component.cpp:1534
+#: kicad-6996/eeschema/sch_component.cpp:1558
 msgid "<Unknown>"
 msgstr "<不明>"
 
-#: eeschema/sch_component.cpp:1540
+#: kicad-6297/eeschema/sch_component.cpp:1540
+#: kicad-6996/eeschema/sch_component.cpp:1564
 msgid "Key Words"
 msgstr "キーワード"
 
-#: eeschema/sch_component.cpp:1784
+#: kicad-6297/eeschema/sch_component.cpp:1784
+#: kicad-6996/eeschema/sch_component.cpp:1808
 #, c-format
 msgid "Component %s, %s"
 msgstr "コンポーネント %s, %s"
 
-#: eeschema/sch_field.cpp:453
+#: kicad-6297/eeschema/sch_field.cpp:453 kicad-6996/eeschema/sch_field.cpp:470
 #, c-format
 msgid "Field %s"
 msgstr "フィールド %s"
 
-#: eeschema/sch_line.cpp:469 pcbnew/dialogs/dialog_pad_properties_base.cpp:211
+#: kicad-6297/eeschema/sch_line.cpp:469
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:211
+#: kicad-6996/eeschema/sch_line.cpp:458
 msgid "Vert."
 msgstr "垂直"
 
-#: eeschema/sch_line.cpp:471 pcbnew/dialogs/dialog_pad_properties_base.cpp:211
+#: kicad-6297/eeschema/sch_line.cpp:471
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:211
+#: kicad-6996/eeschema/sch_line.cpp:460
 msgid "Horiz."
 msgstr "水平"
 
-#: eeschema/sch_line.cpp:476
+#: kicad-6297/eeschema/sch_line.cpp:476 kicad-6996/eeschema/sch_line.cpp:465
 #, c-format
 msgid "%s Graphic Line from (%s,%s) to (%s,%s) "
 msgstr "%s 図形ライン 始点 (%s,%s) 終点 (%s,%s) "
 
-#: eeschema/sch_line.cpp:480
+#: kicad-6297/eeschema/sch_line.cpp:480 kicad-6996/eeschema/sch_line.cpp:469
 #, c-format
 msgid "%s Wire from (%s,%s) to (%s,%s)"
 msgstr "%s ワイヤ 始点 (%s,%s) 終点 (%s,%s)"
 
-#: eeschema/sch_line.cpp:484
+#: kicad-6297/eeschema/sch_line.cpp:484 kicad-6996/eeschema/sch_line.cpp:473
 #, c-format
 msgid "%s Bus from (%s,%s) to (%s,%s)"
 msgstr "%s バス 始点 (%s,%s) 終点 (%s,%s)"
 
-#: eeschema/sch_line.cpp:488
+#: kicad-6297/eeschema/sch_line.cpp:488 kicad-6996/eeschema/sch_line.cpp:477
 #, c-format
 msgid "%s Line on Unknown Layer from (%s,%s) to (%s,%s)"
 msgstr "%s ライン 不明なレイヤ 始点 (%s,%s) 終点 (%s,%s)"
 
-#: eeschema/sch_marker.cpp:142
+#: kicad-6297/eeschema/sch_marker.cpp:142
+#: kicad-6996/eeschema/sch_marker.cpp:142
 msgid "Electronics Rule Check Error"
 msgstr "エレクトリカル ルール チェック(ERC) エラー"
 
-#: eeschema/sch_sheet.cpp:828
+#: kicad-6297/eeschema/sch_sheet.cpp:828 kicad-6996/eeschema/sch_sheet.cpp:857
 msgid "Sheet Name"
 msgstr "シート名"
 
-#: eeschema/sch_sheet.cpp:829
+#: kicad-6297/eeschema/sch_sheet.cpp:829 kicad-6996/eeschema/sch_sheet.cpp:858
 msgid "File Name"
 msgstr "ファイル名"
 
-#: eeschema/sch_sheet.cpp:834
+#: kicad-6297/eeschema/sch_sheet.cpp:834 kicad-6996/eeschema/sch_sheet.cpp:863
 msgid "Time Stamp"
 msgstr "タイムスタンプ"
 
-#: eeschema/sch_sheet.cpp:1047
+#: kicad-6297/eeschema/sch_sheet.cpp:1047
+#: kicad-6996/eeschema/sch_sheet.cpp:1075
 #, c-format
 msgid "Hierarchical Sheet %s"
 msgstr "階層シート　%s"
 
-#: eeschema/sch_sheet_path.cpp:175
+#: kicad-6297/eeschema/sch_sheet_path.cpp:175
 #, c-format
 msgid "Schematic sheets can only be nested %d levels deep."
 msgstr "回路図シートは %d 層までしかネストできません。"
 
-#: eeschema/sch_sheet_path.cpp:206
+#: kicad-6297/eeschema/sch_sheet_path.cpp:206
+#: kicad-6996/eeschema/sch_sheet_path.cpp:142
 #, c-format
 msgid "%8.8lX/"
 msgstr "%8.8lX/"
 
-#: eeschema/sch_sheet_pin.cpp:500
+#: kicad-6297/eeschema/sch_sheet_pin.cpp:500
+#: kicad-6996/eeschema/sch_sheet_pin.cpp:500
 #, c-format
 msgid "Hierarchical Sheet Pin %s"
 msgstr "階層シートピン %s"
 
-#: eeschema/sch_text.cpp:708
+#: kicad-6297/eeschema/sch_text.cpp:708 kicad-6996/eeschema/sch_text.cpp:714
 msgid "Graphic Text"
 msgstr "図形テキスト"
 
-#: eeschema/sch_text.cpp:716
+#: kicad-6297/eeschema/sch_text.cpp:716 kicad-6996/eeschema/sch_text.cpp:722
 msgid "Global Label"
 msgstr "グローバル ラベル"
 
-#: eeschema/sch_text.cpp:720
+#: kicad-6297/eeschema/sch_text.cpp:720 kicad-6996/eeschema/sch_text.cpp:726
 msgid "Hierarchical Label"
 msgstr "階層ラベル"
 
-#: eeschema/sch_text.cpp:724
+#: kicad-6297/eeschema/sch_text.cpp:724 kicad-6996/eeschema/sch_text.cpp:730
 msgid "Hierarchical Sheet Pin"
 msgstr "階層シートピン"
 
-#: eeschema/sch_text.cpp:736
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:110
+#: kicad-6297/eeschema/sch_text.cpp:736
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:106
+#: kicad-6996/eeschema/sch_text.cpp:742
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:208
 msgid "Horizontal"
 msgstr "水平"
 
-#: eeschema/sch_text.cpp:740
+#: kicad-6297/eeschema/sch_text.cpp:740 kicad-6996/eeschema/sch_text.cpp:746
 msgid "Vertical up"
 msgstr "下方向"
 
-#: eeschema/sch_text.cpp:744
+#: kicad-6297/eeschema/sch_text.cpp:744 kicad-6996/eeschema/sch_text.cpp:750
 msgid "Horizontal invert"
 msgstr "水平反転"
 
-#: eeschema/sch_text.cpp:748
+#: kicad-6297/eeschema/sch_text.cpp:748 kicad-6996/eeschema/sch_text.cpp:754
 msgid "Vertical down"
 msgstr "上方向"
 
-#: eeschema/sch_text.cpp:1009
+#: kicad-6297/eeschema/sch_text.cpp:1009 kicad-6996/eeschema/sch_text.cpp:988
 #, c-format
 msgid "Label %s"
 msgstr "ラベル %s"
 
-#: eeschema/sch_text.cpp:1434
+#: kicad-6297/eeschema/sch_text.cpp:1434 kicad-6996/eeschema/sch_text.cpp:1432
 #, c-format
 msgid "Global Label %s"
 msgstr "グローバル ラベル %s"
 
-#: eeschema/sch_text.cpp:1775
+#: kicad-6297/eeschema/sch_text.cpp:1775 kicad-6996/eeschema/sch_text.cpp:1773
 #, c-format
 msgid "Hierarchical Label %s"
 msgstr "階層ラベル %s"
 
-#: eeschema/schedit.cpp:258
+#: kicad-6297/eeschema/sch_validators.cpp:80
+#: kicad-6996/eeschema/sch_validators.cpp:80
+msgid "reference designator"
+msgstr "リファレンス記号"
+
+#: kicad-6297/eeschema/sch_validators.cpp:81
+#: kicad-6996/eeschema/sch_validators.cpp:81
+msgid "value"
+msgstr "定数"
+
+#: kicad-6297/eeschema/sch_validators.cpp:82
+#: kicad-6996/eeschema/sch_validators.cpp:82
+msgid "footprint"
+msgstr "フットプリント"
+
+#: kicad-6297/eeschema/sch_validators.cpp:83
+#: kicad-6996/eeschema/sch_validators.cpp:83
+msgid "data sheet"
+msgstr "データ シート"
+
+#: kicad-6297/eeschema/sch_validators.cpp:84
+#: kicad-6996/eeschema/sch_validators.cpp:84
+msgid "user defined"
+msgstr "ユーザ定義"
+
+#: kicad-6297/eeschema/sch_validators.cpp:92
+#: kicad-6996/eeschema/sch_validators.cpp:92
+#, c-format
+msgid "The %s field cannot be empty."
+msgstr "%s フィールドは空にできません。"
+
+#: kicad-6297/eeschema/sch_validators.cpp:98
+#: kicad-6996/eeschema/sch_validators.cpp:98
+msgid "carriage return"
+msgstr "復帰"
+
+#: kicad-6297/eeschema/sch_validators.cpp:100
+#: kicad-6996/eeschema/sch_validators.cpp:100
+msgid "line feed"
+msgstr "改行"
+
+#: kicad-6297/eeschema/sch_validators.cpp:102
+#: kicad-6996/eeschema/sch_validators.cpp:102
+msgid "tab"
+msgstr "タブ"
+
+#: kicad-6297/eeschema/sch_validators.cpp:104
+#: kicad-6996/eeschema/sch_validators.cpp:104
+msgid "space"
+msgstr "スペース"
+
+#: kicad-6297/eeschema/sch_validators.cpp:111
+#: kicad-6996/eeschema/sch_validators.cpp:111
+#, c-format
+msgid "%s or %s"
+msgstr "%s または %s"
+
+#: kicad-6297/eeschema/sch_validators.cpp:113
+#: kicad-6996/eeschema/sch_validators.cpp:113
+#, c-format
+msgid "%s, %s, or %s"
+msgstr "%s, %s, または %s"
+
+#: kicad-6297/eeschema/sch_validators.cpp:115
+#: kicad-6996/eeschema/sch_validators.cpp:115
+#, c-format
+msgid "%s, %s, %s, or %s"
+msgstr "%s, %s, %s, または %s"
+
+#: kicad-6297/eeschema/sch_validators.cpp:120
+#: kicad-6996/eeschema/sch_validators.cpp:120
+#, c-format
+msgid "The %s field cannot contain %s characters."
+msgstr "フィールド %s には文字 %s を含めることができません。"
+
+#: kicad-6297/eeschema/sch_validators.cpp:124
+#: kicad-6996/eeschema/sch_validators.cpp:124
+#, c-format
+msgid "The %s field cannot contain leading and/or trailing white space."
+msgstr "フィールド %s は空白文字からの開始や末尾への付加ができません。"
+
+#: kicad-6297/eeschema/sch_validators.cpp:132
+#: kicad-6996/eeschema/sch_validators.cpp:132
+msgid "Field Validation Error"
+msgstr "フィールド検証エラー"
+
+#: kicad-6297/eeschema/schedit.cpp:258 kicad-6996/eeschema/schedit.cpp:265
 msgid "There are no undefined labels in this sheet to clean up."
 msgstr "このシート中に未定義のラベルはありません。"
 
-#: eeschema/schedit.cpp:262
+#: kicad-6297/eeschema/schedit.cpp:262 kicad-6996/eeschema/schedit.cpp:269
 msgid "Do you wish to cleanup this sheet?"
 msgstr "このシートをクリーンアップしますか？"
 
-#: eeschema/schedit.cpp:519
+#: kicad-6297/eeschema/schedit.cpp:519 kicad-6996/eeschema/schedit.cpp:529
 msgid "No tool selected"
 msgstr "ツールが選択されていません"
 
-#: eeschema/schedit.cpp:523
+#: kicad-6297/eeschema/schedit.cpp:523 kicad-6996/eeschema/schedit.cpp:537
 msgid "Descend or ascend hierarchy"
 msgstr "階層の上下移動"
 
-#: eeschema/schedit.cpp:527
+#: kicad-6297/eeschema/schedit.cpp:527 kicad-6996/eeschema/schedit.cpp:541
 msgid "Add no connect"
 msgstr "空き端子フラグの追加"
 
-#: eeschema/schedit.cpp:531
+#: kicad-6297/eeschema/schedit.cpp:531 kicad-6996/eeschema/schedit.cpp:545
 msgid "Add wire"
 msgstr "ワイヤの追加"
 
-#: eeschema/schedit.cpp:535
+#: kicad-6297/eeschema/schedit.cpp:535 kicad-6996/eeschema/schedit.cpp:549
 msgid "Add bus"
 msgstr "バスの追加"
 
-#: eeschema/schedit.cpp:539
+#: kicad-6297/eeschema/schedit.cpp:539 kicad-6996/eeschema/schedit.cpp:553
 msgid "Add lines"
 msgstr "線の追加"
 
-#: eeschema/schedit.cpp:543
+#: kicad-6297/eeschema/schedit.cpp:543 kicad-6996/eeschema/schedit.cpp:557
 msgid "Add junction"
 msgstr "ジャンクションの追加"
 
-#: eeschema/schedit.cpp:547
+#: kicad-6297/eeschema/schedit.cpp:547 kicad-6996/eeschema/schedit.cpp:561
 msgid "Add label"
 msgstr "ラベルの追加"
 
-#: eeschema/schedit.cpp:551
+#: kicad-6297/eeschema/schedit.cpp:551 kicad-6996/eeschema/schedit.cpp:565
 msgid "Add global label"
 msgstr "グローバル ラベルの追加"
 
-#: eeschema/schedit.cpp:555
+#: kicad-6297/eeschema/schedit.cpp:555 kicad-6996/eeschema/schedit.cpp:569
 msgid "Add hierarchical label"
 msgstr "階層ラベルの追加"
 
-#: eeschema/schedit.cpp:563
+#: kicad-6297/eeschema/schedit.cpp:563 kicad-6996/eeschema/schedit.cpp:577
 msgid "Add image"
 msgstr "イメージの追加"
 
-#: eeschema/schedit.cpp:567
+#: kicad-6297/eeschema/schedit.cpp:567 kicad-6996/eeschema/schedit.cpp:581
 msgid "Add wire to bus entry"
 msgstr "配線にバスエントリを追加"
 
-#: eeschema/schedit.cpp:571
+#: kicad-6297/eeschema/schedit.cpp:571 kicad-6996/eeschema/schedit.cpp:585
 msgid "Add bus to bus entry"
 msgstr "バスに バスエントリを追加"
 
-#: eeschema/schedit.cpp:575
+#: kicad-6297/eeschema/schedit.cpp:575 kicad-6996/eeschema/schedit.cpp:589
 msgid "Add sheet"
 msgstr "シートの追加"
 
-#: eeschema/schedit.cpp:579
+#: kicad-6297/eeschema/schedit.cpp:579 kicad-6996/eeschema/schedit.cpp:593
 msgid "Add sheet pins"
 msgstr "シートピンの追加"
 
-#: eeschema/schedit.cpp:583
+#: kicad-6297/eeschema/schedit.cpp:583 kicad-6996/eeschema/schedit.cpp:597
 msgid "Import sheet pins"
 msgstr "シートピンのインポート"
 
-#: eeschema/schedit.cpp:587
+#: kicad-6297/eeschema/schedit.cpp:587 kicad-6996/eeschema/schedit.cpp:601
 msgid "Add component"
 msgstr "コンポーネントの追加"
 
-#: eeschema/schedit.cpp:591
+#: kicad-6297/eeschema/schedit.cpp:591 kicad-6996/eeschema/schedit.cpp:605
 msgid "Add power"
 msgstr "電源の追加"
 
-#: eeschema/schframe.cpp:169 pcbnew/class_zone.cpp:846
+#: kicad-6297/eeschema/schframe.cpp:169 kicad-6297/pcbnew/class_zone.cpp:847
+#: kicad-6996/eeschema/schframe.cpp:172 kicad-6996/pcbnew/class_zone.cpp:847
 msgid "Not Found"
 msgstr "見つかりませんでした"
 
-#: eeschema/schframe.cpp:171
+#: kicad-6297/eeschema/schframe.cpp:171 kicad-6996/eeschema/schframe.cpp:174
 msgid "The following libraries were not found:"
 msgstr "ライブラリは見つかりませんでした:"
 
-#: eeschema/schframe.cpp:619 pcbnew/pcbframe.cpp:583
+#: kicad-6297/eeschema/schframe.cpp:619 kicad-6297/pcbnew/pcbframe.cpp:583
+#: kicad-6996/eeschema/schframe.cpp:626 kicad-6996/pcbnew/pcbframe.cpp:579
 #, c-format
 msgid ""
 "Save the changes in\n"
@@ -7999,79 +10807,81 @@ msgstr ""
 "'%s'\n"
 " "
 
-#: eeschema/schframe.cpp:766
+#: kicad-6297/eeschema/schframe.cpp:766 kicad-6996/eeschema/schframe.cpp:773
 msgid "Draw wires and buses in any direction"
 msgstr "配線、バスを自由角度で描画"
 
-#: eeschema/schframe.cpp:767
+#: kicad-6297/eeschema/schframe.cpp:767 kicad-6996/eeschema/schframe.cpp:774
 msgid "Draw horizontal and vertical wires and buses only"
 msgstr "配線、バスを90度のみで描画"
 
-#: eeschema/schframe.cpp:776
+#: kicad-6297/eeschema/schframe.cpp:776 kicad-6996/eeschema/schframe.cpp:783
 msgid "Do not show hidden pins"
 msgstr "非表示のピンを表示しない"
 
-#: eeschema/schframe.cpp:777 eeschema/tool_sch.cpp:290
+#: kicad-6297/eeschema/schframe.cpp:777 kicad-6297/eeschema/tool_sch.cpp:290
+#: kicad-6996/eeschema/schframe.cpp:784 kicad-6996/eeschema/tool_sch.cpp:295
 msgid "Show hidden pins"
 msgstr "非表示ピンを表示"
 
-#: eeschema/schframe.cpp:902
+#: kicad-6297/eeschema/schframe.cpp:902 kicad-6996/eeschema/schframe.cpp:953
 msgid "Schematic"
 msgstr "回路図"
 
-#: eeschema/schframe.cpp:921
+#: kicad-6297/eeschema/schframe.cpp:921 kicad-6996/eeschema/schframe.cpp:972
 msgid "New Schematic"
 msgstr "新規回路図"
 
-#: eeschema/schframe.cpp:934
+#: kicad-6297/eeschema/schframe.cpp:934 kicad-6996/eeschema/schframe.cpp:985
 #, c-format
 msgid "Schematic file '%s' already exists, use Open instead"
 msgstr "回路図ファイル '%s' は既に存在します。"
 
-#: eeschema/schframe.cpp:955
+#: kicad-6297/eeschema/schframe.cpp:955 kicad-6996/eeschema/schframe.cpp:1006
 msgid "Open Schematic"
 msgstr "回路図を開く"
 
-#: eeschema/schframe.cpp:1085
+#: kicad-6297/eeschema/schframe.cpp:1085 kicad-6996/eeschema/schframe.cpp:1136
 msgid "Error: not a component or no component"
 msgstr "Error: コンポーネントではありません、又はコンポーネントがありません"
 
-#: eeschema/schframe.cpp:1315
+#: kicad-6297/eeschema/schframe.cpp:1315 kicad-6996/eeschema/schframe.cpp:1369
 msgid " [no file]"
 msgstr " [no file]"
 
-#: eeschema/selpart.cpp:65
+#: kicad-6297/eeschema/selpart.cpp:65 kicad-6996/eeschema/selpart.cpp:65
 msgid "No component libraries are loaded."
 msgstr "コンポーネント ライブラリが読込まれていません"
 
-#: eeschema/selpart.cpp:89 pcbnew/librairi.cpp:81
+#: kicad-6297/eeschema/selpart.cpp:89 kicad-6297/pcbnew/librairi.cpp:80
+#: kicad-6996/eeschema/selpart.cpp:89 kicad-6996/pcbnew/librairi.cpp:80
 msgid "Select Library"
 msgstr "ライブラリの選択"
 
-#: eeschema/selpart.cpp:139
+#: kicad-6297/eeschema/selpart.cpp:139 kicad-6996/eeschema/selpart.cpp:139
 msgid "Select Component"
 msgstr "コンポーネントの選択"
 
-#: eeschema/sheet.cpp:84
+#: kicad-6297/eeschema/sheet.cpp:84 kicad-6996/eeschema/sheet.cpp:84
 msgid "File name is not valid!"
 msgstr "ファイル名が不正です! "
 
-#: eeschema/sheet.cpp:93
+#: kicad-6297/eeschema/sheet.cpp:93 kicad-6996/eeschema/sheet.cpp:93
 #, c-format
 msgid "A sheet named \"%s\" already exists."
 msgstr "シート名 \"%s\" は既に存在します。"
 
-#: eeschema/sheet.cpp:125
+#: kicad-6297/eeschema/sheet.cpp:125 kicad-6996/eeschema/sheet.cpp:125
 #, c-format
 msgid "A file named '%s' already exists in the current schematic hierarchy."
 msgstr "名前'%s'のファイルは既に回路図階層内に存在しています。"
 
-#: eeschema/sheet.cpp:130
+#: kicad-6297/eeschema/sheet.cpp:130 kicad-6996/eeschema/sheet.cpp:130
 #, c-format
 msgid "A file named '%s' already exists."
 msgstr "ファイル名 '%s' は既に存在しています。"
 
-#: eeschema/sheet.cpp:133
+#: kicad-6297/eeschema/sheet.cpp:133 kicad-6996/eeschema/sheet.cpp:133
 msgid ""
 "\n"
 "\n"
@@ -8081,21 +10891,21 @@ msgstr ""
 "\n"
 "このファイルの内容でシートを作成しますか？"
 
-#: eeschema/sheet.cpp:160
+#: kicad-6297/eeschema/sheet.cpp:160 kicad-6996/eeschema/sheet.cpp:160
 msgid "Changing the sheet file name cannot be undone.  "
 msgstr "シートファイル名を変更すると元に戻せません。"
 
-#: eeschema/sheet.cpp:168
+#: kicad-6297/eeschema/sheet.cpp:168 kicad-6996/eeschema/sheet.cpp:168
 #, c-format
 msgid "A file named <%s> already exists in the current schematic hierarchy."
 msgstr "ファイル名 <%s> は既に回路図階層内に存在しています。"
 
-#: eeschema/sheet.cpp:173
+#: kicad-6297/eeschema/sheet.cpp:173 kicad-6996/eeschema/sheet.cpp:173
 #, c-format
 msgid "A file named <%s> already exists."
 msgstr "ファイル名 <%s> は既に存在します。"
 
-#: eeschema/sheet.cpp:178
+#: kicad-6297/eeschema/sheet.cpp:178 kicad-6996/eeschema/sheet.cpp:178
 msgid ""
 "\n"
 "\n"
@@ -8105,7 +10915,7 @@ msgstr ""
 "\n"
 "このファイルの内容でシートを置換しますか？"
 
-#: eeschema/sheet.cpp:190
+#: kicad-6297/eeschema/sheet.cpp:190 kicad-6996/eeschema/sheet.cpp:190
 msgid ""
 "This sheet uses shared data in a complex hierarchy.\n"
 "\n"
@@ -8113,1061 +10923,1390 @@ msgstr ""
 "このシートは複雑な階層の中で共有データを使用しています。\n"
 "\n"
 
-#: eeschema/sheet.cpp:191
+#: kicad-6297/eeschema/sheet.cpp:191 kicad-6996/eeschema/sheet.cpp:191
 msgid "Do you wish to convert it to a simple hierarchical sheet?"
 msgstr "シンプルな階層シートに変換しますか？"
 
-#: eeschema/sheetlab.cpp:164
+#: kicad-6297/eeschema/sheetlab.cpp:164 kicad-6996/eeschema/sheetlab.cpp:164
 msgid "No new hierarchical labels found."
 msgstr "新しい階層ラベルが見つかりません"
 
-#: eeschema/symbedit.cpp:65
+#: kicad-6297/eeschema/symbedit.cpp:65 kicad-6996/eeschema/symbedit.cpp:63
 msgid "Import Symbol Drawings"
 msgstr "シンボル図形をインポート"
 
-#: eeschema/symbedit.cpp:87
+#: kicad-6297/eeschema/symbedit.cpp:87 kicad-6996/eeschema/symbedit.cpp:85
 #, c-format
 msgid "Error '%s' occurred loading part file '%s'."
 msgstr "エラー '%s' がコンポーネントファイル '%s' の読み込み時に発生しました。"
 
-#: eeschema/symbedit.cpp:98
+#: kicad-6297/eeschema/symbedit.cpp:98 kicad-6996/eeschema/symbedit.cpp:96
 #, c-format
 msgid "No parts found in part file '%s'."
 msgstr "シンボル ライブラリ '%s' 内にコンポーネントがありません。"
 
-#: eeschema/symbedit.cpp:108
+#: kicad-6297/eeschema/symbedit.cpp:108 kicad-6996/eeschema/symbedit.cpp:106
 #, c-format
 msgid "More than one part in part file '%s'."
 msgstr "パーツファイル '%s' 内に1つ以上のパーツがあります。"
 
-#: eeschema/symbedit.cpp:158
+#: kicad-6297/eeschema/symbedit.cpp:158 kicad-6996/eeschema/symbedit.cpp:156
 msgid "Export Symbol Drawings"
 msgstr "シンボル図形のエクスポート"
 
-#: eeschema/symbedit.cpp:174
+#: kicad-6297/eeschema/symbedit.cpp:174 kicad-6996/eeschema/symbedit.cpp:172
 #, c-format
 msgid "Saving symbol in '%s'"
 msgstr "シンボルを \"%s\" へ保存中"
 
-#: eeschema/symbedit.cpp:240
+#: kicad-6297/eeschema/symbedit.cpp:240 kicad-6996/eeschema/symbedit.cpp:238
 #, c-format
 msgid "An error occurred attempting to save symbol file '%s'"
 msgstr "シンボルファイル '%s' を保存しようとしたところエラーが発生しました。"
 
-#: eeschema/tool_lib.cpp:62
+#: kicad-6297/eeschema/tool_lib.cpp:62 kicad-6996/eeschema/tool_lib.cpp:62
 msgid "Deselect current tool"
 msgstr "現在のツールの選択を外す"
 
-#: eeschema/tool_lib.cpp:83
+#: kicad-6297/eeschema/tool_lib.cpp:83 kicad-6996/eeschema/tool_lib.cpp:86
 msgid "Move part anchor"
 msgstr "パーツのアンカーを移動"
 
-#: eeschema/tool_lib.cpp:86
+#: kicad-6297/eeschema/tool_lib.cpp:86 kicad-6996/eeschema/tool_lib.cpp:89
 msgid "Import existing drawings"
 msgstr "既存の図形のインポート"
 
-#: eeschema/tool_lib.cpp:89
+#: kicad-6297/eeschema/tool_lib.cpp:89 kicad-6996/eeschema/tool_lib.cpp:92
 msgid "Export current drawing"
 msgstr "現在の図形のエクスポート"
 
-#: eeschema/tool_lib.cpp:112
+#: kicad-6297/eeschema/tool_lib.cpp:112 kicad-6996/eeschema/tool_lib.cpp:115
 msgid "Save current library to disk"
 msgstr "ディスクに現在のライブラリを保存"
 
-#: eeschema/tool_lib.cpp:118
+#: kicad-6297/eeschema/tool_lib.cpp:118 kicad-6996/eeschema/tool_lib.cpp:121
 msgid "Delete component in current library"
 msgstr "現在のライブラリのコンポーネントを削除"
 
-#: eeschema/tool_lib.cpp:126
+#: kicad-6297/eeschema/tool_lib.cpp:126 kicad-6996/eeschema/tool_lib.cpp:129
 msgid "Create a new component"
 msgstr "新規コンポーネントを作成"
 
-#: eeschema/tool_lib.cpp:130
+#: kicad-6297/eeschema/tool_lib.cpp:130 kicad-6996/eeschema/tool_lib.cpp:133
 msgid "Load component to edit from the current library"
 msgstr "現在のライブラリから、エディタへコンポーネントを読み込む"
 
-#: eeschema/tool_lib.cpp:134
+#: kicad-6297/eeschema/tool_lib.cpp:134 kicad-6996/eeschema/tool_lib.cpp:137
 msgid "Create a new component from the current one"
 msgstr "現在のものから新規コンポーネントを作成"
 
-#: eeschema/tool_lib.cpp:138
+#: kicad-6297/eeschema/tool_lib.cpp:138 kicad-6996/eeschema/tool_lib.cpp:141
 msgid "Update current component in current library"
 msgstr "現在のライブラリ内の現在のコンポーネントを更新"
 
-#: eeschema/tool_lib.cpp:141
+#: kicad-6297/eeschema/tool_lib.cpp:141 kicad-6996/eeschema/tool_lib.cpp:144
 msgid "Import component"
 msgstr "コンポーネントのインポート"
 
-#: eeschema/tool_lib.cpp:144
+#: kicad-6297/eeschema/tool_lib.cpp:144 kicad-6996/eeschema/tool_lib.cpp:147
 msgid "Export component"
 msgstr "コンポーネントのエクスポート"
 
-#: eeschema/tool_lib.cpp:147
+#: kicad-6297/eeschema/tool_lib.cpp:147 kicad-6996/eeschema/tool_lib.cpp:150
 msgid "Save current component to new library"
 msgstr "新しいライブラリへ現在のコンポーネントを保存"
 
-#: eeschema/tool_lib.cpp:150 eeschema/help_common_strings.h:40
+#: kicad-6297/eeschema/tool_lib.cpp:150 kicad-6996/eeschema/tool_lib.cpp:153
+#: kicad-6297/eeschema/help_common_strings.h:40
+#: kicad-6996/eeschema/help_common_strings.h:40
 msgid "Undo last command"
 msgstr "一つ前のコマンドを元に戻す"
 
-#: eeschema/tool_lib.cpp:152
+#: kicad-6297/eeschema/tool_lib.cpp:152 kicad-6996/eeschema/tool_lib.cpp:155
 msgid "Redo the last command"
 msgstr "一つ前のコマンドをやり直し"
 
-#: eeschema/tool_lib.cpp:158
+#: kicad-6297/eeschema/tool_lib.cpp:158 kicad-6996/eeschema/tool_lib.cpp:161
 msgid "Edit component properties"
 msgstr "コンポーネント プロパティの編集"
 
-#: eeschema/tool_lib.cpp:162
+#: kicad-6297/eeschema/tool_lib.cpp:162 kicad-6996/eeschema/tool_lib.cpp:165
 msgid "Add and remove fields and edit field properties"
 msgstr "フィールドの追加/削除とプロパティの編集"
 
-#: eeschema/tool_lib.cpp:166
+#: kicad-6297/eeschema/tool_lib.cpp:166 kicad-6996/eeschema/tool_lib.cpp:169
 msgid "Test for duplicate and off grid pins"
 msgstr "重複ピンとグリッドから外れたピンのテスト"
 
-#: eeschema/tool_lib.cpp:183 eeschema/tool_viewlib.cpp:98
+#: kicad-6297/eeschema/tool_lib.cpp:183 kicad-6297/eeschema/tool_viewlib.cpp:98
+#: kicad-6996/eeschema/tool_lib.cpp:186 kicad-6996/eeschema/tool_viewlib.cpp:98
 msgid "Show as \"De Morgan\" normal part"
 msgstr "\"ド・モルガン\" 標準部品として表示"
 
-#: eeschema/tool_lib.cpp:185 eeschema/tool_viewlib.cpp:103
+#: kicad-6297/eeschema/tool_lib.cpp:185
+#: kicad-6297/eeschema/tool_viewlib.cpp:103
+#: kicad-6996/eeschema/tool_lib.cpp:188
+#: kicad-6996/eeschema/tool_viewlib.cpp:103
 msgid "Show as \"De Morgan\" convert part"
 msgstr "\"ド・モルガン\" 変換部品として表示"
 
-#: eeschema/tool_lib.cpp:189
+#: kicad-6297/eeschema/tool_lib.cpp:189 kicad-6996/eeschema/tool_lib.cpp:192
 msgid "Show the associated datasheet or document"
 msgstr "関連するデータシートまたはドキュメントを表示する"
 
-#: eeschema/tool_lib.cpp:209
+#: kicad-6297/eeschema/tool_lib.cpp:209 kicad-6996/eeschema/tool_lib.cpp:212
 msgid "Edit pins per part or body style (Use carefully!)"
 msgstr "パーツ/ボディ形状ごとのピンの編集 (気をつけて使うこと!)"
 
-#: eeschema/tool_lib.cpp:213
+#: kicad-6297/eeschema/tool_lib.cpp:213 kicad-6996/eeschema/tool_lib.cpp:216
 msgid "Show pin table"
 msgstr "ピン テーブルの表示"
 
-#: eeschema/tool_lib.cpp:229 eeschema/tool_sch.cpp:273
-#: gerbview/toolbars_gerber.cpp:151
+#: kicad-6297/eeschema/tool_lib.cpp:229 kicad-6297/eeschema/tool_sch.cpp:273
+#: kicad-6297/gerbview/toolbars_gerber.cpp:151
+#: kicad-6996/eeschema/tool_lib.cpp:232 kicad-6996/eeschema/tool_sch.cpp:276
+#: kicad-6996/gerbview/toolbars_gerber.cpp:162
 msgid "Turn grid off"
 msgstr "グリッド非表示"
 
-#: eeschema/tool_sch.cpp:58
+#: kicad-6297/eeschema/tool_sch.cpp:58 kicad-6996/eeschema/tool_sch.cpp:58
 msgid "New schematic project"
 msgstr "新規回路図作成"
 
-#: eeschema/tool_sch.cpp:61
+#: kicad-6297/eeschema/tool_sch.cpp:61 kicad-6996/eeschema/tool_sch.cpp:61
 msgid "Open schematic project"
 msgstr "既存回路図を開く"
 
-#: eeschema/tool_sch.cpp:65
+#: kicad-6297/eeschema/tool_sch.cpp:65 kicad-6996/eeschema/tool_sch.cpp:65
 msgid "Save schematic project"
 msgstr "回路図プロジェクトの保存"
 
-#: eeschema/tool_sch.cpp:70 pagelayout_editor/toolbars_pl_editor.cpp:61
+#: kicad-6297/eeschema/tool_sch.cpp:70
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:61
+#: kicad-6996/eeschema/tool_sch.cpp:70
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:62
 msgid "Page settings"
 msgstr "ページの設定"
 
-#: eeschema/tool_sch.cpp:75
+#: kicad-6297/eeschema/tool_sch.cpp:75 kicad-6996/eeschema/tool_sch.cpp:75
 msgid "Print schematic"
 msgstr "回路図の印刷"
 
-#: eeschema/tool_sch.cpp:81
+#: kicad-6297/eeschema/tool_sch.cpp:81 kicad-6996/eeschema/tool_sch.cpp:81
 msgid "Cut selected item"
 msgstr "選択したアイテムを切り取り"
 
-#: eeschema/tool_sch.cpp:84
+#: kicad-6297/eeschema/tool_sch.cpp:84 kicad-6996/eeschema/tool_sch.cpp:84
 msgid "Copy selected item"
 msgstr "選択したアイテムをコピー"
 
-#: eeschema/tool_sch.cpp:87
+#: kicad-6297/eeschema/tool_sch.cpp:87 kicad-6996/eeschema/tool_sch.cpp:87
 msgid "Paste"
 msgstr "貼り付け"
 
-#: eeschema/tool_sch.cpp:105
+#: kicad-6297/eeschema/tool_sch.cpp:105 kicad-6996/eeschema/tool_sch.cpp:105
 msgid "Find and replace text"
 msgstr "テキストの検索と置換"
 
-#: eeschema/tool_sch.cpp:127
+#: kicad-6297/eeschema/tool_sch.cpp:127 kicad-6996/eeschema/tool_sch.cpp:127
 msgid "Navigate schematic hierarchy"
 msgstr "回路図の階層ナビゲータを表示"
 
-#: eeschema/tool_sch.cpp:131
+#: kicad-6297/eeschema/tool_sch.cpp:131 kicad-6996/eeschema/tool_sch.cpp:131
 msgid "Leave sheet"
 msgstr "シートから抜ける"
 
-#: eeschema/tool_sch.cpp:151
+#: kicad-6297/eeschema/tool_sch.cpp:151 kicad-6996/eeschema/tool_sch.cpp:151
 msgid "Generate netlist"
 msgstr "ネットリストの生成"
 
-#: eeschema/tool_sch.cpp:162
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:134
+#: kicad-6297/eeschema/tool_sch.cpp:162
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:134
+#: kicad-6297/pcbnew/hotkeys.cpp:352 kicad-6996/eeschema/tool_sch.cpp:162
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:129
+#: kicad-6996/pcbnew/hotkeys.cpp:306
 msgid "Footprint Editor"
 msgstr "フットプリント エディタ"
 
-#: eeschema/tool_sch.cpp:165
+#: kicad-6297/eeschema/tool_sch.cpp:165 kicad-6996/eeschema/tool_sch.cpp:165
 msgid "Run CvPcb to associate components and footprints"
 msgstr "CvPcb (コンポーネントとフットプリントの関連付け) の実行"
 
-#: eeschema/tool_sch.cpp:168
+#: kicad-6297/eeschema/tool_sch.cpp:168 kicad-6996/eeschema/tool_sch.cpp:168
 msgid "Run Pcbnew to layout printed circuit board"
 msgstr "Pcbnew (プリント基板のレイアウト) の実行"
 
-#: eeschema/tool_sch.cpp:195
+#: kicad-6297/eeschema/tool_sch.cpp:195 kicad-6996/eeschema/tool_sch.cpp:198
 msgid "Ascend/descend hierarchy"
 msgstr "階層の上下移動"
 
-#: eeschema/tool_sch.cpp:251 eeschema/help_common_strings.h:90
+#: kicad-6297/eeschema/tool_sch.cpp:251 kicad-6996/eeschema/tool_sch.cpp:254
+#: kicad-6297/eeschema/help_common_strings.h:90
+#: kicad-6996/eeschema/help_common_strings.h:90
 msgid "Add bitmap image"
 msgstr "ビットマップ イメージを追加"
 
-#: eeschema/tool_sch.cpp:277
+#: kicad-6297/eeschema/tool_sch.cpp:277 kicad-6996/eeschema/tool_sch.cpp:280
 msgid "Set unit to inch"
 msgstr "単位を inch に設定"
 
-#: eeschema/tool_sch.cpp:281
+#: kicad-6297/eeschema/tool_sch.cpp:281 kicad-6996/eeschema/tool_sch.cpp:284
 msgid "Set unit to mm"
 msgstr "単位を mm に設定"
 
-#: eeschema/tool_sch.cpp:295
+#: kicad-6297/eeschema/tool_sch.cpp:295 kicad-6996/eeschema/tool_sch.cpp:300
 msgid "HV orientation for wires and bus"
 msgstr "配線、バスの90度入力"
 
-#: eeschema/tool_viewlib.cpp:59 pcbnew/tool_modview.cpp:58
+#: kicad-6297/eeschema/tool_viewlib.cpp:59
+#: kicad-6297/pcbnew/tool_modview.cpp:58
+#: kicad-6996/eeschema/tool_viewlib.cpp:59
+#: kicad-6996/pcbnew/tool_modview.cpp:58
 msgid "Select library to browse"
 msgstr "参照するライブラリの選択"
 
-#: eeschema/tool_viewlib.cpp:63
+#: kicad-6297/eeschema/tool_viewlib.cpp:63
+#: kicad-6996/eeschema/tool_viewlib.cpp:63
 msgid "Select component to browse"
 msgstr "参照するパーツの選択"
 
-#: eeschema/tool_viewlib.cpp:68
+#: kicad-6297/eeschema/tool_viewlib.cpp:68
+#: kicad-6996/eeschema/tool_viewlib.cpp:68
 msgid "Display previous component"
 msgstr "前のコンポーネントの表示"
 
-#: eeschema/tool_viewlib.cpp:72
+#: kicad-6297/eeschema/tool_viewlib.cpp:72
+#: kicad-6996/eeschema/tool_viewlib.cpp:72
 msgid "Display next component"
 msgstr "次のコンポーネントを表示"
 
-#: eeschema/tool_viewlib.cpp:116
+#: kicad-6297/eeschema/tool_viewlib.cpp:116
+#: kicad-6996/eeschema/tool_viewlib.cpp:116
 msgid "View component documents"
 msgstr "コンポーネントのドキュメントを見る "
 
-#: eeschema/tool_viewlib.cpp:124
+#: kicad-6297/eeschema/tool_viewlib.cpp:124
+#: kicad-6996/eeschema/tool_viewlib.cpp:124
 msgid "Insert component in schematic"
 msgstr "回路図にコンポーネントを挿入"
 
-#: eeschema/tool_viewlib.cpp:170
+#: kicad-6297/eeschema/tool_viewlib.cpp:170
+#: kicad-6996/eeschema/tool_viewlib.cpp:170
 #, c-format
 msgid "Unit %c"
 msgstr "ユニット %c"
 
-#: eeschema/tool_viewlib.cpp:211 pcbnew/tool_modview.cpp:144
+#: kicad-6297/eeschema/tool_viewlib.cpp:211
+#: kicad-6297/pcbnew/tool_modview.cpp:144
+#: kicad-6996/eeschema/tool_viewlib.cpp:211
+#: kicad-6996/pcbnew/tool_modview.cpp:144
 msgid "Set Current Library"
 msgstr "現在のライブラリ"
 
-#: eeschema/tool_viewlib.cpp:212 pcbnew/tool_modview.cpp:145
+#: kicad-6297/eeschema/tool_viewlib.cpp:212
+#: kicad-6297/pcbnew/tool_modview.cpp:145
+#: kicad-6996/eeschema/tool_viewlib.cpp:212
+#: kicad-6996/pcbnew/tool_modview.cpp:145
 msgid "Select library to be displayed"
 msgstr "参照するライブラリの選択"
 
-#: eeschema/tool_viewlib.cpp:218 pcbnew/menubar_modedit.cpp:150
-#: pcbnew/tool_modview.cpp:150
+#: kicad-6297/eeschema/tool_viewlib.cpp:218
+#: kicad-6297/pcbnew/menubar_modedit.cpp:150
+#: kicad-6297/pcbnew/tool_modview.cpp:150
+#: kicad-6996/eeschema/tool_viewlib.cpp:218
+#: kicad-6996/pcbnew/menubar_modedit.cpp:149
+#: kicad-6996/pcbnew/tool_modview.cpp:150
 msgid "Cl&ose"
 msgstr "閉じる(&O)"
 
-#: eeschema/tool_viewlib.cpp:219
+#: kicad-6297/eeschema/tool_viewlib.cpp:219
+#: kicad-6996/eeschema/tool_viewlib.cpp:219
 msgid "Close schematic component viewer"
 msgstr "回路図 コンポーネント ビューアを閉じる"
 
-#: eeschema/tool_viewlib.cpp:251
+#: kicad-6297/eeschema/tool_viewlib.cpp:251
+#: kicad-6996/eeschema/tool_viewlib.cpp:248
 msgid "Open Eeschema manual"
 msgstr "Eeschema のマニュアルを開く"
 
-#: eeschema/tool_viewlib.cpp:262
+#: kicad-6297/eeschema/tool_viewlib.cpp:262
+#: kicad-6996/eeschema/tool_viewlib.cpp:259
 msgid "&About Eeschema"
 msgstr "Eeschema について(&A)"
 
-#: eeschema/tool_viewlib.cpp:263
+#: kicad-6297/eeschema/tool_viewlib.cpp:263
+#: kicad-6996/eeschema/tool_viewlib.cpp:260
 msgid "About Eeschema schematic designer"
 msgstr "Eeschema 回路図デザイナについて"
 
-#: eeschema/viewlib_frame.cpp:99 eeschema/viewlibs.cpp:134
-#: pcbnew/modview_frame.cpp:701
+#: kicad-6297/eeschema/viewlib_frame.cpp:99
+#: kicad-6297/eeschema/viewlibs.cpp:134 kicad-6297/pcbnew/modview_frame.cpp:701
+#: kicad-6996/eeschema/viewlib_frame.cpp:102
+#: kicad-6996/eeschema/viewlibs.cpp:134 kicad-6996/pcbnew/modview_frame.cpp:720
 msgid "Library Browser"
 msgstr "ライブラリ ブラウザ"
 
-#: gerbview/class_GERBER.cpp:347
+#: kicad-6297/gerbview/class_GERBER.cpp:347
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:330
 msgid "Image name"
 msgstr "画像名"
 
-#: gerbview/class_GERBER.cpp:352
+#: kicad-6297/gerbview/class_GERBER.cpp:352
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:335
 msgid "Graphic layer"
 msgstr "図形レイヤ"
 
-#: gerbview/class_GERBER.cpp:356
+#: kicad-6297/gerbview/class_GERBER.cpp:356
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:339
 msgid "Img Rot."
 msgstr "イメージの回転"
 
-#: gerbview/class_GERBER.cpp:360 gerbview/class_gerber_draw_item.cpp:568
+#: kicad-6297/gerbview/class_GERBER.cpp:360
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:568
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:508
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:343
 msgid "Polarity"
 msgstr "極性"
 
-#: gerbview/class_GERBER.cpp:364
+#: kicad-6297/gerbview/class_GERBER.cpp:364
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:347
 msgid "X Justify"
 msgstr "X位置調整"
 
-#: gerbview/class_GERBER.cpp:367
+#: kicad-6297/gerbview/class_GERBER.cpp:367
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:350
 msgid "Y Justify"
 msgstr "Y位置調整"
 
-#: gerbview/class_GERBER.cpp:375
+#: kicad-6297/gerbview/class_GERBER.cpp:375
+#: kicad-6996/gerbview/class_gerber_file_image.cpp:359
 msgid "Image Justify Offset"
 msgstr "イメージのオフセット"
 
-#: gerbview/class_GERBER.cpp:469
+#: kicad-6297/gerbview/class_GERBER.cpp:469
 #, c-format
 msgid "Layer %d (%s, %s, %s)"
 msgstr "レイヤ %d (%s, %s, %s)"
 
-#: gerbview/class_GERBER.cpp:476
+#: kicad-6297/gerbview/class_GERBER.cpp:476
 #, c-format
 msgid "Layer %d (%s, %s)"
 msgstr "レイヤ %d (%s, %s)"
 
-#: gerbview/class_GERBER.cpp:482
+#: kicad-6297/gerbview/class_GERBER.cpp:482
 #, c-format
 msgid "Layer %d *"
 msgstr "レイヤ %d *"
 
-#: gerbview/class_GERBER.cpp:485 gerbview/select_layers_to_pcb.cpp:183
+#: kicad-6297/gerbview/class_GERBER.cpp:485
+#: kicad-6297/gerbview/select_layers_to_pcb.cpp:183
+#: kicad-6996/gerbview/select_layers_to_pcb.cpp:186
 #, c-format
 msgid "Layer %d"
 msgstr "レイヤ %d"
 
-#: gerbview/class_gerber_draw_item.cpp:553
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:553
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:493
 msgid "D Code"
 msgstr "D コード"
 
-#: gerbview/class_gerber_draw_item.cpp:557
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:557
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:497
 msgid "Graphic Layer"
 msgstr "図形レイヤ"
 
-#: gerbview/class_gerber_draw_item.cpp:564
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:350
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:68
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:564
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:350
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:68
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:504
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:350
+#: kicad-6996/pcbnew/class_module.cpp:570
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
 msgid "Rotation"
 msgstr "回転"
 
-#: gerbview/class_gerber_draw_item.cpp:567
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:567
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:507
 msgid "Clear"
 msgstr "クリア"
 
-#: gerbview/class_gerber_draw_item.cpp:567
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:567
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:507
 msgid "Dark"
 msgstr "ダーク"
 
-#: gerbview/class_gerber_draw_item.cpp:578
+#: kicad-6297/gerbview/class_gerber_draw_item.cpp:578
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:518
 msgid "AB axis"
 msgstr "AB軸"
 
-#: gerbview/class_gerbview_layer_widget.cpp:89
-#: gerbview/dialogs/dialog_print_using_printer.cpp:163
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:163
-#: pcbnew/class_drawsegment.cpp:406 pcbnew/class_module.cpp:578
-#: pcbnew/class_pad.cpp:647 pcbnew/class_pcb_layer_widget.cpp:237
-#: pcbnew/class_pcb_text.cpp:140 pcbnew/class_text_mod.cpp:385
-#: pcbnew/class_track.cpp:1152 pcbnew/class_track.cpp:1179
-#: pcbnew/class_zone.cpp:628 pcbnew/dialogs/dialog_dimension_editor_base.cpp:89
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:115
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:144
-#: pcbnew/layer_widget.cpp:540
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:89
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:163
+#: kicad-6297/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:163
+#: kicad-6297/pcbnew/class_drawsegment.cpp:408
+#: kicad-6297/pcbnew/class_module.cpp:578 kicad-6297/pcbnew/class_pad.cpp:629
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:237
+#: kicad-6297/pcbnew/class_pcb_text.cpp:140
+#: kicad-6297/pcbnew/class_text_mod.cpp:385
+#: kicad-6297/pcbnew/class_track.cpp:1164
+#: kicad-6297/pcbnew/class_track.cpp:1191 kicad-6297/pcbnew/class_zone.cpp:628
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:115
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:144
+#: kicad-6297/pcbnew/layer_widget.cpp:540
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:88
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:163
+#: kicad-6996/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:163
+#: kicad-6996/pcbnew/class_drawsegment.cpp:408
+#: kicad-6996/pcbnew/class_pad.cpp:645
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:237
+#: kicad-6996/pcbnew/class_pcb_text.cpp:140
+#: kicad-6996/pcbnew/class_text_mod.cpp:362
+#: kicad-6996/pcbnew/class_track.cpp:1138
+#: kicad-6996/pcbnew/class_track.cpp:1165 kicad-6996/pcbnew/class_zone.cpp:628
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:111
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:140
+#: kicad-6996/pcbnew/layer_widget.cpp:548
 msgid "Layer"
 msgstr "レイヤ"
 
-#: gerbview/class_gerbview_layer_widget.cpp:90
-#: pcbnew/class_pcb_layer_widget.cpp:238 pcbnew/layer_widget.cpp:560
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:90
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:238
+#: kicad-6297/pcbnew/layer_widget.cpp:560
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:89
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:238
+#: kicad-6996/pcbnew/layer_widget.cpp:568
 msgid "Render"
 msgstr "表示"
 
-#: gerbview/class_gerbview_layer_widget.cpp:110
-#: pcbnew/class_pcb_layer_widget.cpp:74
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:110
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:74
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:109
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:74
 msgid "Show the (x,y) grid dots"
 msgstr "(x,y) グリッドのドットを表示"
 
-#: gerbview/class_gerbview_layer_widget.cpp:111
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:111
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:110
 msgid "DCodes"
 msgstr "Dコード"
 
-#: gerbview/class_gerbview_layer_widget.cpp:111
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:111
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:110
 msgid "Show DCodes identification"
 msgstr "Dコード表の表示"
 
-#: gerbview/class_gerbview_layer_widget.cpp:112
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:112
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:111
 msgid "Neg. Obj."
 msgstr "ネガのオブジェクト"
 
-#: gerbview/class_gerbview_layer_widget.cpp:113
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:113
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:112
 msgid "Show negative objects in this color"
 msgstr "ネガのオブジェクトをこの色で表示します"
 
-#: gerbview/class_gerbview_layer_widget.cpp:152
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:153
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:152
 msgid "Show All Layers"
 msgstr "全てのレイヤを表示"
 
-#: gerbview/class_gerbview_layer_widget.cpp:155
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:156
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:155
 msgid "Hide All Layers But Active"
 msgstr "アクティブでない全てのレイヤを隠す"
 
-#: gerbview/class_gerbview_layer_widget.cpp:158
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:159
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:158
 msgid "Always Hide All Layers But Active"
 msgstr "アクティブでない全てのレイヤを隠す"
 
-#: gerbview/class_gerbview_layer_widget.cpp:161
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:162
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:161
 msgid "Hide All Layers"
 msgstr "全てのレイヤを非表示"
 
-#: gerbview/class_gerbview_layer_widget.cpp:165
+#: kicad-6297/gerbview/class_gerbview_layer_widget.cpp:166
+#: kicad-6996/gerbview/class_gerbview_layer_widget.cpp:165
 msgid "Sort Layers if X2 Mode"
 msgstr "X2 モードならレイヤをソートする"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:31
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:31
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:30
 msgid "Layers selection:"
 msgstr "レイヤの選択:"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:56
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:56
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:55
 msgid "Copper layers count:"
 msgstr "導体レイヤ数:"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:60
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:61
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:60
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:61
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:59
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:60
 msgid "2 Layers"
 msgstr "２層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:62
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:62
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:61
 msgid "4 Layers"
 msgstr "４層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:63
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:63
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:62
 msgid "6 Layers"
 msgstr "６層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:64
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:64
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:63
 msgid "8 Layers"
 msgstr "８層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:65
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:65
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:64
 msgid "10 Layers"
 msgstr "１０層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:66
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:66
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:65
 msgid "12 Layers"
 msgstr "１２層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:67
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:67
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:66
 msgid "14 Layers"
 msgstr "１４層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:68
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:68
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:67
 msgid "16 Layers"
 msgstr "１６層"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:80
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:80
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:79
 msgid "Store Choice"
 msgstr "選択内容の保存"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:83
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:83
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:82
 msgid "Get Stored Choice"
 msgstr "保存された選択を取得する"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:86
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:39
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:53
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:67
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:86
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:39
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:67
+#: kicad-6996/common/dialogs/dialog_hotkeys_editor_base.cpp:28
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:387
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:85
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:53
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:67
 msgid "Reset"
 msgstr "リセット"
 
-#: gerbview/dialogs/dialog_print_using_printer.cpp:107
-#: pagelayout_editor/events_functions.cpp:517
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:114
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:107
+#: kicad-6297/pagelayout_editor/events_functions.cpp:517
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:114
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:110
+#: kicad-6996/pagelayout_editor/events_functions.cpp:527
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:125
 msgid "Error Init Printer info"
 msgstr "プリンタ情報の初期化エラー"
 
-#: gerbview/dialogs/dialog_print_using_printer.cpp:297
-#: pcbnew/dialogs/dialog_plot.cpp:775
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:366
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:297
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:775
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:366
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:299
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:755
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:356
 msgid "Warning: Scale option set to a very large value"
 msgstr "警告: 拡大率が非常に大きく設定されています"
 
-#: gerbview/dialogs/dialog_print_using_printer.cpp:305
-#: pcbnew/dialogs/dialog_plot.cpp:771
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:376
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:305
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:771
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:376
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:305
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:751
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:366
 msgid "Warning: Scale option set to a very small value"
 msgstr "警告: 拡大率が非常に小さく設定されています"
 
-#: gerbview/dialogs/dialog_print_using_printer.cpp:340
-#: pcbnew/dialogs/dialog_plot.cpp:827
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:443
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:340
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:827
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:443
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:354
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:814
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:433
 msgid "No layer selected"
 msgstr "レイヤが選択されていません"
 
-#: gerbview/dialogs/dialog_print_using_printer.cpp:354
-#: pcbnew/dialogs/dialog_print_for_modedit.cpp:171
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:448
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:354
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit.cpp:171
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:448
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:368
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit.cpp:181
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:438
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
-#: gerbview/dialogs/dialog_print_using_printer.cpp:396
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer.cpp:396
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer.cpp:410
 msgid "There was a problem printing"
 msgstr "印刷中に問題が発生しました"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:20
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:25
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:30
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:45
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:20
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:20
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:25
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:30
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:20
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:20
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:20
 msgid "Layers:"
 msgstr "レイヤ:"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "fit in page"
 msgstr "ページに合わせる"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Scale 0.5"
 msgstr "0.5倍"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Scale 0.7"
 msgstr "0.7倍"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Approx. Scale 1"
 msgstr "大まかな原寸"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Accurate Scale 1"
 msgstr "正確な原寸"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Scale 1.4"
 msgstr "1.4倍"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Scale 2"
 msgstr "2倍"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Scale 3"
 msgstr "3倍"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:44
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:49
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:67
 msgid "Scale 4"
 msgstr "4倍"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:46
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:24
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:51
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:24
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:51
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:24
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:69
 msgid "Approx. Scale:"
 msgstr "概略スケール値:"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:50
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:55
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:55
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:73
 msgid "X Scale Adjust"
 msgstr "Xスケール値の調整"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:56
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:61
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:61
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:78
 msgid "Set X scale adjust for exact scale plotting"
 msgstr "実際の作画倍率にXスケールを調整"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:60
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:65
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:65
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:59
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:82
 msgid "Y Scale Adjust"
 msgstr "Yスケールの調整"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:66
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:71
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:71
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:87
 msgid "Set Y scale adjust for exact scale plotting"
 msgstr "実際に作画倍率にYスケールを調整"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:87
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:36
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:114
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:114
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:85
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:129
 msgid "Print Mode"
 msgstr "印刷モード"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:89
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:89
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:87
 msgid ""
 "Choose if you want to print sheets in color, or force the black and white "
 "mode."
 msgstr "シートをカラーまたは強制的にモノクロで印刷したい場合に選択"
 
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:99
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:48
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:135
+#: kicad-6297/gerbview/dialogs/dialog_print_using_printer_base.cpp:99
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:135
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:97
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:150
 msgid "Page Options"
 msgstr "ページ オプション"
 
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:113
-#: pcbnew/dialogs/dialog_layer_selection_base.h:50
+#: kicad-6297/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:113
+#: kicad-6996/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_layer_selection_base.h:50
+#: kicad-6996/pcbnew/dialogs/dialog_layer_selection_base.h:50
 msgid "Select Layer:"
 msgstr "レイヤの選択: "
 
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:154
-#: gerbview/select_layers_to_pcb.cpp:222 gerbview/select_layers_to_pcb.cpp:338
-#: gerbview/select_layers_to_pcb.cpp:377
+#: kicad-6297/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:154
+#: kicad-6297/gerbview/select_layers_to_pcb.cpp:222
+#: kicad-6297/gerbview/select_layers_to_pcb.cpp:338
+#: kicad-6297/gerbview/select_layers_to_pcb.cpp:377
+#: kicad-6996/gerbview/dialogs/dialog_select_one_pcb_layer.cpp:154
+#: kicad-6996/gerbview/select_layers_to_pcb.cpp:225
+#: kicad-6996/gerbview/select_layers_to_pcb.cpp:341
+#: kicad-6996/gerbview/select_layers_to_pcb.cpp:380
 msgid "Do not export"
 msgstr "エクスポートできません。"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
 msgid "Full size. Do not show page limits"
 msgstr "フルサイズ、ページ区切り/非表示"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Full size"
 msgstr "フルサイズ"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Size A4"
 msgstr "A4サイズ"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Size A3"
 msgstr "A3サイズ"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Size A2"
 msgstr "A2サイズ"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Size A"
 msgstr "Aサイズ"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Size B"
 msgstr "Bサイズ"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:25
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Size C"
 msgstr "Cサイズ"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.cpp:27
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.cpp:27
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.cpp:27
 msgid "Show Page Limits:"
 msgstr "ページの境界を表示:"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:25
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:25
 msgid "Cartesian coordinates"
 msgstr "直交座標"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:25
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:25
 msgid "Polar coordinates"
 msgstr "極座標"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:27
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:27
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:27
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:27
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:27
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:27
 msgid "Coordinates"
 msgstr "座標"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:31
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:86
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:44
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:33
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:25
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:31
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:100
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:25
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:31
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:100
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:25
 msgid "Millimeters"
 msgstr "mm"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:37
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:41
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:41
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:41
 msgid "Small cross"
 msgstr "小十字"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:37
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:41
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:41
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:41
 msgid "Full screen cursor"
 msgstr "フルスクリーンカーソルに変更"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:39
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:43
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:39
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:43
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:43
 msgid "Cursor"
 msgstr "カーソル"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:43
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:43
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:43
 msgid "Show D codes"
 msgstr "Dコードの表示"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:53
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:59
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:65
-#: pcbnew/dialogs/dialog_plot_base.cpp:161
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:53
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:59
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:161
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:53
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:59
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:160
 msgid "Sketch"
 msgstr "スケッチ"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:53
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:59
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:65
-#: pcbnew/dialogs/dialog_plot_base.cpp:161
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:53
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:59
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:161
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:53
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:59
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:160
 msgid "Filled"
 msgstr "塗りつぶし"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:55
-#: pcbnew/autorouter/auto_place_footprints.cpp:477
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:55
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:477
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:55
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:477
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:132
 msgid "Lines"
 msgstr "行"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:61
-#: pcbnew/class_board.cpp:951 pcbnew/class_module.cpp:590
-#: pcbnew/class_netinfo_item.cpp:113 pcbnew/pcb_draw_panel_gal.cpp:347
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:61
+#: kicad-6297/pcbnew/class_board.cpp:951 kicad-6297/pcbnew/class_module.cpp:590
+#: kicad-6297/pcbnew/class_netinfo_item.cpp:113
+#: kicad-6297/pcbnew/pcb_draw_panel_gal.cpp:347
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:61
+#: kicad-6996/pcbnew/class_board.cpp:1155
+#: kicad-6996/pcbnew/class_module.cpp:557
+#: kicad-6996/pcbnew/class_netinfo_item.cpp:114
+#: kicad-6996/pcbnew/pcb_draw_panel_gal.cpp:336
 msgid "Pads"
 msgstr "パッド"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:67
-#: pcbnew/class_zone.cpp:636
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:67
+#: kicad-6297/pcbnew/class_zone.cpp:636
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:67
+#: kicad-6996/pcbnew/class_zone.cpp:636
 msgid "Polygons"
 msgstr "ポリゴン"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:77
 msgid "Full size without limits"
 msgstr "フルサイズ、ページ区切り/非表示"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:79
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:79
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:79
 msgid "Page"
 msgstr "ページ"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:86
-msgid "Do not center and warp cursor on zoom"
-msgstr "拡大縮小時にカーソルを中心へ移動させない"
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:97
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:180
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp:91
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:158
+msgid "Use touchpad to pan"
+msgstr "画面のパンにタッチパッドを使用"
 
-#: gerbview/events_called_functions.cpp:269
+#: kicad-6297/gerbview/events_called_functions.cpp:269
+#: kicad-6996/gerbview/events_called_functions.cpp:275
 msgid "No editor defined. Please select one"
 msgstr "エディタが定義されていません。一つ選択してください。"
 
-#: gerbview/events_called_functions.cpp:275
+#: kicad-6297/gerbview/events_called_functions.cpp:275
+#: kicad-6996/gerbview/events_called_functions.cpp:281
 #, c-format
 msgid "No file loaded on the active layer %d"
 msgstr "アクティブなレイヤ%d上にファイルが読み込まれていません"
 
-#: gerbview/events_called_functions.cpp:319 gerbview/gerbview_frame.cpp:143
-#: pcbnew/moduleframe.cpp:289 pcbnew/pcbframe.cpp:401 pcbnew/pcbframe.cpp:902
+#: kicad-6297/gerbview/events_called_functions.cpp:319
+#: kicad-6297/gerbview/gerbview_frame.cpp:143
+#: kicad-6297/pcbnew/moduleframe.cpp:289 kicad-6297/pcbnew/pcbframe.cpp:401
+#: kicad-6297/pcbnew/pcbframe.cpp:914
+#: kicad-6996/gerbview/events_called_functions.cpp:325
+#: kicad-6996/gerbview/gerbview_frame.cpp:140
+#: kicad-6996/pcbnew/moduleframe.cpp:292 kicad-6996/pcbnew/pcbframe.cpp:402
+#: kicad-6996/pcbnew/pcbframe.cpp:912
 msgid "Visibles"
 msgstr "表示"
 
-#: gerbview/events_called_functions.cpp:382 gerbview/menubar.cpp:155
-#: gerbview/menubar.cpp:157 gerbview/options.cpp:89 pcbnew/pcbnew_config.cpp:80
-#: pcbnew/tool_pcb.cpp:806
+#: kicad-6297/gerbview/events_called_functions.cpp:382
+#: kicad-6297/gerbview/menubar.cpp:155 kicad-6297/gerbview/menubar.cpp:157
+#: kicad-6297/gerbview/options.cpp:89 kicad-6297/pcbnew/pcbnew_config.cpp:80
+#: kicad-6297/pcbnew/tool_pcb.cpp:806
+#: kicad-6996/gerbview/events_called_functions.cpp:388
+#: kicad-6996/gerbview/menubar.cpp:155 kicad-6996/gerbview/menubar.cpp:157
+#: kicad-6996/pcbnew/pcbnew_config.cpp:80 kicad-6996/pcbnew/tool_pcb.cpp:805
 msgid "Hide &Layers Manager"
 msgstr "レイヤ マネージャを非表示(&L)"
 
-#: gerbview/events_called_functions.cpp:382 gerbview/menubar.cpp:157
-#: gerbview/options.cpp:89 pcbnew/pcbnew_config.cpp:80 pcbnew/tool_pcb.cpp:806
+#: kicad-6297/gerbview/events_called_functions.cpp:382
+#: kicad-6297/gerbview/menubar.cpp:157 kicad-6297/gerbview/options.cpp:89
+#: kicad-6297/pcbnew/pcbnew_config.cpp:80 kicad-6297/pcbnew/tool_pcb.cpp:806
+#: kicad-6996/gerbview/events_called_functions.cpp:388
+#: kicad-6996/gerbview/menubar.cpp:157 kicad-6996/pcbnew/pcbnew_config.cpp:80
+#: kicad-6996/pcbnew/tool_pcb.cpp:805
 msgid "Show &Layers Manager"
 msgstr "レイヤ マネージャを表示(&L)"
 
-#: gerbview/excellon_read_drill_file.cpp:189
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:189
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:175
 msgid "No room to load file"
 msgstr "ファイルをロードできません"
 
-#: gerbview/excellon_read_drill_file.cpp:199 pcbnew/pcbnew_config.cpp:227
-#: pcbnew/pcbnew_config.cpp:503
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:199
+#: kicad-6297/pcbnew/pcbnew_config.cpp:227
+#: kicad-6297/pcbnew/pcbnew_config.cpp:503
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:184
+#: kicad-6996/pcbnew/pcbnew_config.cpp:227
 #, c-format
 msgid "File %s not found"
 msgstr "ファイル %s が見つかりません"
 
-#: gerbview/excellon_read_drill_file.cpp:214
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:214
 msgid "Files not found"
 msgstr "ファイルが見つかりません"
 
-#: gerbview/excellon_read_drill_file.cpp:388
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:388
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:374
 msgid "METRIC command has no parameter"
 msgstr "METRIC コマンドはパラメータを持ちません"
 
-#: gerbview/excellon_read_drill_file.cpp:406
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:406
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:392
 msgid "INCH command has no parameter"
 msgstr "INCH コマンドはパラメータを持ちません"
 
-#: gerbview/excellon_read_drill_file.cpp:434
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:434
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:420
 msgid "ICI command has no parameter"
 msgstr "ICIコメントはパラメータを持っていません"
 
-#: gerbview/excellon_read_drill_file.cpp:444
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:444
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:430
 msgid "ICI command has incorrect parameter"
 msgstr "ICIコメントは不正なパラメータを持っています"
 
-#: gerbview/excellon_read_drill_file.cpp:482
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:482
 #, c-format
 msgid "Tool definition <%c> not supported"
 msgstr "ツール定義 <%c> はサポートされていません。"
 
-#: gerbview/excellon_read_drill_file.cpp:534
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:534
 #, c-format
 msgid "Tool <%d> not defined"
 msgstr "ツール <%d> は定義されていません"
 
-#: gerbview/excellon_read_drill_file.cpp:661
+#: kicad-6297/gerbview/excellon_read_drill_file.cpp:664
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:687
 #, c-format
 msgid "Unknown Excellon G Code: &lt;%s&gt;"
 msgstr "不明な Excellon G Code です : &lt;%s&gt;"
 
-#: gerbview/export_to_pcbnew.cpp:173
+#: kicad-6297/gerbview/export_to_pcbnew.cpp:173
+#: kicad-6996/gerbview/export_to_pcbnew.cpp:170
 msgid "None of the Gerber layers contain any data"
 msgstr "ガーバーレイヤにデータが含まれていません。"
 
-#: gerbview/export_to_pcbnew.cpp:180
+#: kicad-6297/gerbview/export_to_pcbnew.cpp:180
+#: kicad-6996/gerbview/export_to_pcbnew.cpp:177
 msgid "Board file name:"
 msgstr "ボード ファイル名:"
 
-#: gerbview/export_to_pcbnew.cpp:216
+#: kicad-6297/gerbview/export_to_pcbnew.cpp:216
+#: kicad-6996/gerbview/export_to_pcbnew.cpp:213
 #, c-format
 msgid "Cannot create file '%s'"
 msgstr "ファイル '%s' を作成できません"
 
-#: gerbview/files.cpp:46
+#: kicad-6297/gerbview/files.cpp:46 kicad-6996/gerbview/files.cpp:43
 msgid "Gerber files"
 msgstr "ガーバー ファイル"
 
-#: gerbview/files.cpp:60
+#: kicad-6297/gerbview/files.cpp:60 kicad-6996/gerbview/files.cpp:57
 msgid "Drill files"
 msgstr "ドリル ファイル"
 
-#: gerbview/files.cpp:121
+#: kicad-6297/gerbview/files.cpp:121 kicad-6996/gerbview/files.cpp:118
 msgid "Gerber files (.g* .lgr .pho)"
 msgstr "ガーバーファイル (.g*, .lgr, .pho)"
 
-#: gerbview/files.cpp:127
+#: kicad-6297/gerbview/files.cpp:127 kicad-6996/gerbview/files.cpp:124
 msgid "Top layer (*.GTL)|*.GTL;*.gtl|"
 msgstr "表面レイヤ (*.GTL)|*.GTL;*.gtl|"
 
-#: gerbview/files.cpp:128
+#: kicad-6297/gerbview/files.cpp:128 kicad-6996/gerbview/files.cpp:125
 msgid "Bottom layer (*.GBL)|*.GBL;*.gbl|"
 msgstr "裏面レイヤ (*.GBL)|*.GBL;*.gbl|"
 
-#: gerbview/files.cpp:129
+#: kicad-6297/gerbview/files.cpp:129 kicad-6996/gerbview/files.cpp:126
 msgid "Bottom solder resist (*.GBS)|*.GBS;*.gbs|"
 msgstr "裏面ハンダレジスト (*.GBS)|*.GBS;*.gbs|"
 
-#: gerbview/files.cpp:130
+#: kicad-6297/gerbview/files.cpp:130 kicad-6996/gerbview/files.cpp:127
 msgid "Top solder resist (*.GTS)|*.GTS;*.gts|"
 msgstr "表面ハンダレジスト (*.GTS)|*.GTS;*.gts|"
 
-#: gerbview/files.cpp:131
+#: kicad-6297/gerbview/files.cpp:131 kicad-6996/gerbview/files.cpp:128
 msgid "Bottom overlay (*.GBO)|*.GBO;*.gbo|"
 msgstr "裏面オーバーレイ (*.GBO)|*.GBO;*.gbo|"
 
-#: gerbview/files.cpp:132
+#: kicad-6297/gerbview/files.cpp:132 kicad-6996/gerbview/files.cpp:129
 msgid "Top overlay (*.GTO)|*.GTO;*.gto|"
 msgstr "表面オーバーレイ (*.GTO)|*.GTO;*.gto|"
 
-#: gerbview/files.cpp:133
+#: kicad-6297/gerbview/files.cpp:133 kicad-6996/gerbview/files.cpp:130
 msgid "Bottom paste (*.GBP)|*.GBP;*.gbp|"
 msgstr "裏面ペースト (*.GBP)|*.GBP;*.gbp|"
 
-#: gerbview/files.cpp:134
+#: kicad-6297/gerbview/files.cpp:134 kicad-6996/gerbview/files.cpp:131
 msgid "Top paste (*.GTP)|*.GTP;*.gtp|"
 msgstr "表面ペースト (*.GTP)|*.GTP;*.gtp|"
 
-#: gerbview/files.cpp:135
+#: kicad-6297/gerbview/files.cpp:135 kicad-6996/gerbview/files.cpp:132
 msgid "Keep-out layer (*.GKO)|*.GKO;*.gko|"
 msgstr "キープアウト レイヤ (*.GKO)|*.GKO;*.gko|"
 
-#: gerbview/files.cpp:136
+#: kicad-6297/gerbview/files.cpp:136 kicad-6996/gerbview/files.cpp:133
 msgid "Mechanical layers (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|"
 msgstr "メカニカル レイヤ (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|"
 
-#: gerbview/files.cpp:137
+#: kicad-6297/gerbview/files.cpp:137 kicad-6996/gerbview/files.cpp:134
 msgid "Top Pad Master (*.GPT)|*.GPT;*.gpt|"
 msgstr "表面パッド マスター (*.GPT)|*.GPT;*.gpt|"
 
-#: gerbview/files.cpp:138
+#: kicad-6297/gerbview/files.cpp:138 kicad-6996/gerbview/files.cpp:135
 msgid "Bottom Pad Master (*.GPB)|*.GPB;*.gpb|"
 msgstr "裏面パッド マスター (*.GPB)|*.GPB;*.gpb|"
 
-#: gerbview/files.cpp:150
+#: kicad-6297/gerbview/files.cpp:150 kicad-6996/gerbview/files.cpp:147
 msgid "Open Gerber File"
 msgstr "ガーバー ファイルを開く"
 
-#: gerbview/files.cpp:240
+#: kicad-6297/gerbview/files.cpp:240 kicad-6996/gerbview/files.cpp:236
 msgid "Open Drill File"
 msgstr "ドリル ファイルを開く"
 
-#: gerbview/gerbview_frame.cpp:465
+#: kicad-6297/gerbview/gerbview_frame.cpp:465
+#: kicad-6996/gerbview/gerbview_frame.cpp:476
 msgid "D Codes"
 msgstr "D コード"
 
-#: gerbview/gerbview_frame.cpp:484
+#: kicad-6297/gerbview/gerbview_frame.cpp:484
 #, c-format
 msgid "Layer %d not in use"
 msgstr "レイヤ %d は未使用です"
 
-#: gerbview/gerbview_frame.cpp:490
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:24
+#: kicad-6297/gerbview/gerbview_frame.cpp:490
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:24
+#: kicad-6996/gerbview/gerbview_frame.cpp:505
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:24
 msgid "File:"
 msgstr "ファイル:"
 
-#: gerbview/gerbview_frame.cpp:494
+#: kicad-6297/gerbview/gerbview_frame.cpp:494
+#: kicad-6996/gerbview/gerbview_frame.cpp:509
 msgid "(with X2 Attributes)"
 msgstr "(X2属性)"
 
-#: gerbview/gerbview_frame.cpp:501
+#: kicad-6297/gerbview/gerbview_frame.cpp:501
+#: kicad-6996/gerbview/gerbview_frame.cpp:516
 #, c-format
 msgid "Image name: '%s'  Layer name: '%s'"
 msgstr "イメージ名: '%s', レイヤ: '%s'"
 
-#: gerbview/gerbview_frame.cpp:514
+#: kicad-6297/gerbview/gerbview_frame.cpp:514
+#: kicad-6996/gerbview/gerbview_frame.cpp:529
 msgid "X2 attr"
 msgstr "X2 属性"
 
-#: gerbview/init_gbr_drawlayers.cpp:48
+#: kicad-6297/gerbview/hotkeys.cpp:68 kicad-6297/pcbnew/hotkeys.cpp:223
+#: kicad-6996/gerbview/hotkeys.cpp:67 kicad-6996/pcbnew/hotkeys.cpp:224
+msgid "Switch Units"
+msgstr "単位を切替"
+
+#: kicad-6297/gerbview/hotkeys.cpp:71 kicad-6996/gerbview/hotkeys.cpp:70
+msgid "Gbr Lines Display Mode"
+msgstr "GBR 線表示モード"
+
+#: kicad-6297/gerbview/hotkeys.cpp:72 kicad-6996/gerbview/hotkeys.cpp:71
+msgid "Gbr Flashed Display Mode"
+msgstr "GBR フラッシュ表示モード"
+
+#: kicad-6297/gerbview/hotkeys.cpp:73 kicad-6996/gerbview/hotkeys.cpp:72
+msgid "Gbr Polygons Display Mode"
+msgstr "GBR ポリゴン表示モード"
+
+#: kicad-6297/gerbview/hotkeys.cpp:74 kicad-6996/gerbview/hotkeys.cpp:73
+msgid "Gbr Negative Obj Display Mode"
+msgstr "GBR ネガティブObj表示モード"
+
+#: kicad-6297/gerbview/hotkeys.cpp:75 kicad-6996/gerbview/hotkeys.cpp:74
+msgid "DCodes Display Mode"
+msgstr "Dコード 表示モード"
+
+#: kicad-6297/gerbview/hotkeys.cpp:77 kicad-6297/pcbnew/hotkeys.cpp:91
+#: kicad-6996/gerbview/hotkeys.cpp:76 kicad-6996/pcbnew/hotkeys.cpp:91
+msgid "Switch to Next Layer"
+msgstr "次のレイヤへ切替"
+
+#: kicad-6297/gerbview/hotkeys.cpp:78 kicad-6297/pcbnew/hotkeys.cpp:93
+#: kicad-6996/gerbview/hotkeys.cpp:77 kicad-6996/pcbnew/hotkeys.cpp:93
+msgid "Switch to Previous Layer"
+msgstr "前のレイヤへ切替"
+
+#: kicad-6297/gerbview/hotkeys.cpp:96 kicad-6996/gerbview/hotkeys.cpp:95
+msgid "Gerbview Hotkeys"
+msgstr "Gerbview ホットキー"
+
+#: kicad-6297/gerbview/init_gbr_drawlayers.cpp:48
+#: kicad-6996/gerbview/clear_gbr_drawlayers.cpp:46
 msgid "Current data will be lost?"
 msgstr "現在のデータは失われます。よろしいですか？"
 
-#: gerbview/init_gbr_drawlayers.cpp:72
+#: kicad-6297/gerbview/init_gbr_drawlayers.cpp:72
+#: kicad-6996/gerbview/clear_gbr_drawlayers.cpp:66
 #, c-format
 msgid "Clear layer %d?"
 msgstr "レイヤ %d をクリアしますか？"
 
-#: gerbview/menubar.cpp:64
+#: kicad-6297/gerbview/menubar.cpp:64 kicad-6996/gerbview/menubar.cpp:64
 msgid "Load &Gerber File"
 msgstr "ガーバー ファイルを読み込む(&G)"
 
-#: gerbview/menubar.cpp:65 gerbview/toolbars_gerber.cpp:62
+#: kicad-6297/gerbview/menubar.cpp:65
+#: kicad-6297/gerbview/toolbars_gerber.cpp:62
+#: kicad-6996/gerbview/menubar.cpp:65
+#: kicad-6996/gerbview/toolbars_gerber.cpp:62
 msgid ""
 "Load a new Gerber file on the current layer. Previous data will be deleted"
 msgstr "現在のレイヤに新規ガーバーファイルを読み込む。前のデータは削除されます"
 
-#: gerbview/menubar.cpp:71
+#: kicad-6297/gerbview/menubar.cpp:71 kicad-6996/gerbview/menubar.cpp:71
 msgid "Load &EXCELLON Drill File"
 msgstr "EXCELLON ドリル ファイルを読み込む(&E)"
 
-#: gerbview/menubar.cpp:72
+#: kicad-6297/gerbview/menubar.cpp:72 kicad-6996/gerbview/menubar.cpp:72
 msgid "Load excellon drill file"
 msgstr "excellon ドリル ファイルを読み込む"
 
-#: gerbview/menubar.cpp:90
+#: kicad-6297/gerbview/menubar.cpp:90 kicad-6996/gerbview/menubar.cpp:90
 msgid "Open &Recent Gerber File"
 msgstr "最近のガーバー ファイルを開く(&R)"
 
-#: gerbview/menubar.cpp:91
+#: kicad-6297/gerbview/menubar.cpp:91 kicad-6996/gerbview/menubar.cpp:91
 msgid "Open a recent opened Gerber file"
 msgstr "最近開いたガーバーファイルを開く"
 
-#: gerbview/menubar.cpp:105
+#: kicad-6297/gerbview/menubar.cpp:105 kicad-6996/gerbview/menubar.cpp:105
 msgid "Open Recent Dri&ll File"
 msgstr "最近のドリル ファイルを開く(&L)"
 
-#: gerbview/menubar.cpp:106
+#: kicad-6297/gerbview/menubar.cpp:106 kicad-6996/gerbview/menubar.cpp:106
 msgid "Open a recent opened drill file"
 msgstr "最近開いたドリル ファイルを開く"
 
-#: gerbview/menubar.cpp:115
+#: kicad-6297/gerbview/menubar.cpp:115 kicad-6996/gerbview/menubar.cpp:115
 msgid "Clear &All"
 msgstr "全てクリア(&A)"
 
-#: gerbview/menubar.cpp:116
+#: kicad-6297/gerbview/menubar.cpp:116 kicad-6996/gerbview/menubar.cpp:116
 msgid "Clear all layers. All data will be deleted"
 msgstr "全てのレイヤをクリア。全てのデータが削除されます"
 
-#: gerbview/menubar.cpp:125
+#: kicad-6297/gerbview/menubar.cpp:125 kicad-6996/gerbview/menubar.cpp:125
 msgid "E&xport to Pcbnew"
 msgstr "Pcbnew へエクスポート(&X)"
 
-#: gerbview/menubar.cpp:126
+#: kicad-6297/gerbview/menubar.cpp:126 kicad-6996/gerbview/menubar.cpp:126
 msgid "Export data in Pcbnew format"
 msgstr "Pcbnew フォーマットでデータのエクスポート"
 
-#: gerbview/menubar.cpp:135 pagelayout_editor/menubar.cpp:101
-#: pcbnew/menubar_modedit.cpp:141 pcbnew/menubar_pcbframe.cpp:237
+#: kicad-6297/gerbview/menubar.cpp:135
+#: kicad-6297/pagelayout_editor/menubar.cpp:101
+#: kicad-6297/pcbnew/menubar_modedit.cpp:141
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:237
+#: kicad-6996/gerbview/menubar.cpp:135
+#: kicad-6996/pagelayout_editor/menubar.cpp:102
+#: kicad-6996/pcbnew/menubar_modedit.cpp:140
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:241
 msgid "&Print"
 msgstr "印刷(&P)"
 
-#: gerbview/menubar.cpp:136
+#: kicad-6297/gerbview/menubar.cpp:136 kicad-6996/gerbview/menubar.cpp:136
 msgid "Print gerber"
 msgstr "ガーバー印刷"
 
-#: gerbview/menubar.cpp:146
+#: kicad-6297/gerbview/menubar.cpp:146 kicad-6996/gerbview/menubar.cpp:146
 msgid "Close GerbView"
 msgstr "GerbView の終了"
 
-#: gerbview/menubar.cpp:167
+#: kicad-6297/gerbview/menubar.cpp:167 kicad-6996/gerbview/menubar.cpp:167
 msgid "&Options"
 msgstr "オプション(&O)"
 
-#: gerbview/menubar.cpp:168
+#: kicad-6297/gerbview/menubar.cpp:168 kicad-6996/gerbview/menubar.cpp:168
 msgid "Set options to draw items"
 msgstr "アイテム描画オプションの設定"
 
-#: gerbview/menubar.cpp:184
+#: kicad-6297/gerbview/menubar.cpp:184 kicad-6996/gerbview/menubar.cpp:184
 msgid "&List DCodes"
 msgstr "Dコードのリスト(&L)"
 
-#: gerbview/menubar.cpp:185
+#: kicad-6297/gerbview/menubar.cpp:185 kicad-6996/gerbview/menubar.cpp:185
 msgid "List and edit D-codes"
 msgstr "D-codesリスト表示、編集"
 
-#: gerbview/menubar.cpp:191
+#: kicad-6297/gerbview/menubar.cpp:191 kicad-6996/gerbview/menubar.cpp:191
 msgid "&Show Source"
 msgstr "ソースの表示(&S)"
 
-#: gerbview/menubar.cpp:192
+#: kicad-6297/gerbview/menubar.cpp:192 kicad-6996/gerbview/menubar.cpp:192
 msgid "Show source file for the current layer"
 msgstr "現在のレイヤのソースファイルを表示"
 
-#: gerbview/menubar.cpp:201
+#: kicad-6297/gerbview/menubar.cpp:201 kicad-6996/gerbview/menubar.cpp:201
 msgid "&Clear Layer"
 msgstr "レイヤのクリア(&C)"
 
-#: gerbview/menubar.cpp:202
+#: kicad-6297/gerbview/menubar.cpp:202 kicad-6996/gerbview/menubar.cpp:202
 msgid "Clear current layer"
 msgstr "現在のレイヤをクリアする"
 
-#: gerbview/menubar.cpp:211 pagelayout_editor/menubar.cpp:132
+#: kicad-6297/gerbview/menubar.cpp:211
+#: kicad-6297/pagelayout_editor/menubar.cpp:132
+#: kicad-6996/gerbview/menubar.cpp:211
+#: kicad-6996/pagelayout_editor/menubar.cpp:133
 msgid "&Text Editor"
 msgstr "テキスト エディタ(&T)"
 
-#: gerbview/menubar.cpp:212 pagelayout_editor/menubar.cpp:133
+#: kicad-6297/gerbview/menubar.cpp:212
+#: kicad-6297/pagelayout_editor/menubar.cpp:133
+#: kicad-6996/gerbview/menubar.cpp:212
+#: kicad-6996/pagelayout_editor/menubar.cpp:134
 msgid "Select your preferred text editor"
 msgstr "使用するテキスト エディタを指定"
 
-#: gerbview/menubar.cpp:224
+#: kicad-6297/gerbview/menubar.cpp:224 kicad-6996/gerbview/menubar.cpp:221
 msgid "Gerbview &Manual"
 msgstr "Gerbview マニュアル(&M)"
 
-#: gerbview/menubar.cpp:225
+#: kicad-6297/gerbview/menubar.cpp:225 kicad-6996/gerbview/menubar.cpp:222
 msgid "Open the GerbView Manual"
 msgstr "Gerbview マニュアルを開く"
 
-#: gerbview/menubar.cpp:247
+#: kicad-6297/gerbview/menubar.cpp:247 kicad-6996/gerbview/menubar.cpp:250
 msgid "&Miscellaneous"
 msgstr "その他(&M)"
 
-#: gerbview/readgerb.cpp:69
+#: kicad-6297/gerbview/readgerb.cpp:69 kicad-6996/gerbview/readgerb.cpp:58
 #, c-format
 msgid "File <%s> not found"
 msgstr "ファイル <%s> が見つかりません。"
 
-#: gerbview/readgerb.cpp:192
+#: kicad-6297/gerbview/readgerb.cpp:192 kicad-6996/gerbview/readgerb.cpp:76
 msgid ""
 "Warning: this file has no D-Code definition\n"
 "It is perhaps an old RS274D file\n"
@@ -9177,19 +12316,20 @@ msgstr ""
 "古い RS274D ファイルだと思われます\n"
 "そのため、アイテムのサイズは未定義です"
 
-#: gerbview/rs274x.cpp:444
+#: kicad-6297/gerbview/rs274x.cpp:444 kicad-6996/gerbview/rs274x.cpp:539
 msgid "RS274X: Command \"IR\" rotation value not allowed"
 msgstr "RS274X: コマンド \"IR\" 回転値は許可されていません。"
 
-#: gerbview/rs274x.cpp:535
+#: kicad-6297/gerbview/rs274x.cpp:535 kicad-6996/gerbview/rs274x.cpp:630
 msgid "RS274X: Command KNOCKOUT ignored by GerbView"
 msgstr "RS274X: コマンド「KNOCKOUT」は GerbViewで無視されます。"
 
-#: gerbview/rs274x.cpp:597
+#: kicad-6297/gerbview/rs274x.cpp:597 kicad-6996/gerbview/rs274x.cpp:693
 msgid "Too many include files!!"
 msgstr "含まれるファイル数が多過ぎます!!"
 
-#: gerbview/select_layers_to_pcb.cpp:424
+#: kicad-6297/gerbview/select_layers_to_pcb.cpp:424
+#: kicad-6996/gerbview/select_layers_to_pcb.cpp:421
 msgid ""
 "The exported board has not enough copper layers to handle selected inner "
 "layers"
@@ -9197,11 +12337,13 @@ msgstr ""
 "エクスポートされた基板は選択された内層を操作するための導体層が不足していま"
 "す。"
 
-#: gerbview/toolbars_gerber.cpp:59
+#: kicad-6297/gerbview/toolbars_gerber.cpp:59
+#: kicad-6996/gerbview/toolbars_gerber.cpp:59
 msgid "Erase all layers"
 msgstr "全レイヤを消去"
 
-#: gerbview/toolbars_gerber.cpp:66
+#: kicad-6297/gerbview/toolbars_gerber.cpp:66
+#: kicad-6996/gerbview/toolbars_gerber.cpp:66
 msgid ""
 "Load an excellon drill file on the current layer. Previous data will be "
 "deleted"
@@ -9209,56 +12351,69 @@ msgstr ""
 "現在のレイヤに excellon ドリル ファイルを読込みます。以前のデータは削除されま"
 "す。"
 
-#: gerbview/toolbars_gerber.cpp:70
+#: kicad-6297/gerbview/toolbars_gerber.cpp:70
+#: kicad-6996/gerbview/toolbars_gerber.cpp:70
 msgid "Show/hide frame reference and select paper size for printing"
 msgstr "フレームリファレンスの表示/非表示 及び 印刷用紙サイズ"
 
-#: gerbview/toolbars_gerber.cpp:74
+#: kicad-6297/gerbview/toolbars_gerber.cpp:74
+#: kicad-6996/gerbview/toolbars_gerber.cpp:74
 msgid "Print layers"
 msgstr "レイヤを印刷"
 
-#: gerbview/toolbars_gerber.cpp:101
+#: kicad-6297/gerbview/toolbars_gerber.cpp:101
+#: kicad-6996/gerbview/toolbars_gerber.cpp:101
 msgid "No tool"
 msgstr "ツールなし"
 
-#: gerbview/toolbars_gerber.cpp:105
+#: kicad-6297/gerbview/toolbars_gerber.cpp:105
+#: kicad-6996/gerbview/toolbars_gerber.cpp:105
 msgid "Tool "
 msgstr "ツール"
 
-#: gerbview/toolbars_gerber.cpp:155
+#: kicad-6297/gerbview/toolbars_gerber.cpp:155
+#: kicad-6996/gerbview/toolbars_gerber.cpp:166
 msgid "Turn polar coordinate on"
-msgstr "極座標表示に切り替え"
+msgstr "極座標表示に切替"
 
-#: gerbview/toolbars_gerber.cpp:159
+#: kicad-6297/gerbview/toolbars_gerber.cpp:159
+#: kicad-6996/gerbview/toolbars_gerber.cpp:170
 msgid "Set units to inches"
 msgstr "単位を inch に設定"
 
-#: gerbview/toolbars_gerber.cpp:163
+#: kicad-6297/gerbview/toolbars_gerber.cpp:163
+#: kicad-6996/gerbview/toolbars_gerber.cpp:174
 msgid "Set units to millimeters"
 msgstr "単位を mm に設定"
 
-#: gerbview/toolbars_gerber.cpp:172
+#: kicad-6297/gerbview/toolbars_gerber.cpp:172
+#: kicad-6996/gerbview/toolbars_gerber.cpp:185
 msgid "Show spots in sketch mode"
 msgstr "スポットをスケッチモード表示"
 
-#: gerbview/toolbars_gerber.cpp:176
+#: kicad-6297/gerbview/toolbars_gerber.cpp:176
+#: kicad-6996/gerbview/toolbars_gerber.cpp:189
 msgid "Show lines in sketch mode"
 msgstr "ラインをスケッチモード表示"
 
-#: gerbview/toolbars_gerber.cpp:180
+#: kicad-6297/gerbview/toolbars_gerber.cpp:180
+#: kicad-6996/gerbview/toolbars_gerber.cpp:193
 msgid "Show polygons in sketch mode"
 msgstr "ポリゴンをスケッチモード表示"
 
-#: gerbview/toolbars_gerber.cpp:185
+#: kicad-6297/gerbview/toolbars_gerber.cpp:185
+#: kicad-6996/gerbview/toolbars_gerber.cpp:198
 msgid "Show negatives objects in ghost color"
 msgstr "ネガのオブジェクトをこの反転色で表示します"
 
-#: gerbview/toolbars_gerber.cpp:190
+#: kicad-6297/gerbview/toolbars_gerber.cpp:190
+#: kicad-6996/gerbview/toolbars_gerber.cpp:203
 msgid "Show dcode number"
 msgstr "Dコード番号を表示"
 
 # pls translate more better.
-#: gerbview/toolbars_gerber.cpp:196
+#: kicad-6297/gerbview/toolbars_gerber.cpp:196
+#: kicad-6996/gerbview/toolbars_gerber.cpp:209
 msgid ""
 "Show layers in raw mode (could have problems with negative items when more "
 "than one gerber file is shown)"
@@ -9266,7 +12421,8 @@ msgstr ""
 "レイヤを実 (raw) モードで表示 (複数のガーバーファイルを表示する際にネガのアイ"
 "テムで問題が発生します)"
 
-#: gerbview/toolbars_gerber.cpp:201
+#: kicad-6297/gerbview/toolbars_gerber.cpp:201
+#: kicad-6996/gerbview/toolbars_gerber.cpp:214
 msgid ""
 "Show layers in stacked mode (show negative items without artifacts, "
 "sometimes slow)"
@@ -9275,7 +12431,8 @@ msgstr ""
 "す)"
 
 # pls translate more better.
-#: gerbview/toolbars_gerber.cpp:206
+#: kicad-6297/gerbview/toolbars_gerber.cpp:206
+#: kicad-6996/gerbview/toolbars_gerber.cpp:219
 msgid ""
 "Show layers in transparency mode (show negative items without artifacts, "
 "sometimes slow)"
@@ -9283,19 +12440,25 @@ msgstr ""
 "レイヤを透過 (transparency) モードで表示 (加工なしでネガのアイテムを表示、"
 "時々遅くなります)"
 
-#: gerbview/toolbars_gerber.cpp:215 pcbnew/help_common_strings.h:24
+#: kicad-6297/gerbview/toolbars_gerber.cpp:215
+#: kicad-6996/gerbview/toolbars_gerber.cpp:228
+#: kicad-6297/pcbnew/help_common_strings.h:24
+#: kicad-6996/pcbnew/help_common_strings.h:24
 msgid "Show/hide the layers manager toolbar"
 msgstr "レイヤ マネージャー ツールバーの表示/非表示"
 
-#: gerbview/toolbars_gerber.cpp:287
+#: kicad-6297/gerbview/toolbars_gerber.cpp:287
+#: kicad-6996/gerbview/toolbars_gerber.cpp:300
 msgid "Hide layers manager"
 msgstr "レイヤ マネージャを非表示"
 
-#: gerbview/toolbars_gerber.cpp:289
+#: kicad-6297/gerbview/toolbars_gerber.cpp:289
+#: kicad-6996/gerbview/toolbars_gerber.cpp:302
 msgid "Show layers manager"
 msgstr "レイヤ マネージャを表示"
 
-#: kicad/class_treeproject_item.cpp:111
+#: kicad-6297/kicad/class_treeproject_item.cpp:111
+#: kicad-6996/kicad/class_treeproject_item.cpp:107
 msgid ""
 "Changing file extension will change file type.\n"
 " Do you want to continue ?"
@@ -9303,95 +12466,108 @@ msgstr ""
 "ファイル拡張子を変更するとファイルのタイプが変更されます。 \n"
 "続けますか？"
 
-#: kicad/class_treeproject_item.cpp:112
+#: kicad-6297/kicad/class_treeproject_item.cpp:112
+#: kicad-6996/kicad/class_treeproject_item.cpp:108
 msgid "Rename File"
 msgstr "ファイル名の変更"
 
-#: kicad/class_treeproject_item.cpp:121
+#: kicad-6297/kicad/class_treeproject_item.cpp:121
+#: kicad-6996/kicad/class_treeproject_item.cpp:117
 msgid "Unable to rename file ... "
 msgstr "ファイル名を変更できません。 "
 
-#: kicad/class_treeproject_item.cpp:122
+#: kicad-6297/kicad/class_treeproject_item.cpp:122
+#: kicad-6996/kicad/class_treeproject_item.cpp:118
 msgid "Permission error ?"
 msgstr "パーミッション エラー?"
 
-#: kicad/class_treeproject_item.cpp:135
+#: kicad-6297/kicad/class_treeproject_item.cpp:135
+#: kicad-6996/kicad/class_treeproject_item.cpp:131
 #, c-format
 msgid "Do you really want to delete '%s'"
 msgstr "本当に削除してもよろしいですか？ - '%s'"
 
-#: kicad/class_treeproject_item.cpp:140
+#: kicad-6297/kicad/class_treeproject_item.cpp:140
+#: kicad-6996/kicad/class_treeproject_item.cpp:136
 msgid "Delete File"
 msgstr "ファイルの削除"
 
-#: kicad/commandframe.cpp:67
+#: kicad-6297/kicad/commandframe.cpp:67 kicad-6996/kicad/commandframe.cpp:65
 msgid "Eeschema - Electronic schematic editor"
 msgstr "Eeschema - 回路図エディタ"
 
-#: kicad/commandframe.cpp:70
+#: kicad-6297/kicad/commandframe.cpp:70 kicad-6996/kicad/commandframe.cpp:68
 msgid "Schematic library editor"
 msgstr "コンポーネント ライブラリ エディタ"
 
-#: kicad/commandframe.cpp:73
+#: kicad-6297/kicad/commandframe.cpp:73 kicad-6996/kicad/commandframe.cpp:71
 msgid "Pcbnew - Printed circuit board editor"
 msgstr "Pcbnew - プリント基板エディタ"
 
-#: kicad/commandframe.cpp:76
+#: kicad-6297/kicad/commandframe.cpp:76 kicad-6996/kicad/commandframe.cpp:74
 msgid "PCB footprint editor"
 msgstr "フットプリント エディタ"
 
-#: kicad/commandframe.cpp:79
+#: kicad-6297/kicad/commandframe.cpp:79 kicad-6996/kicad/commandframe.cpp:77
 msgid "GerbView - Gerber viewer"
 msgstr "GerbView - ガーバービューア"
 
-#: kicad/commandframe.cpp:83 kicad/menubar.cpp:385
+#: kicad-6297/kicad/commandframe.cpp:83 kicad-6297/kicad/menubar.cpp:385
+#: kicad-6996/kicad/commandframe.cpp:81 kicad-6996/kicad/menubar.cpp:388
 msgid ""
 "Bitmap2Component - Convert bitmap images to Eeschema\n"
 "or Pcbnew elements"
 msgstr ""
 "Bitmap2Component - ビットマップからEeschema/Pcbnewコンポーネントへの変換"
 
-#: kicad/commandframe.cpp:87 kicad/menubar.cpp:391
+#: kicad-6297/kicad/commandframe.cpp:87 kicad-6297/kicad/menubar.cpp:391
+#: kicad-6996/kicad/commandframe.cpp:85 kicad-6996/kicad/menubar.cpp:394
 msgid "Pcb calculator - Calculator for components, track width, etc."
 msgstr "Pcb calculator - コンポーネント、配線幅などの計算"
 
-#: kicad/commandframe.cpp:90 kicad/menubar.cpp:396
+#: kicad-6297/kicad/commandframe.cpp:90 kicad-6297/kicad/menubar.cpp:396
+#: kicad-6996/kicad/commandframe.cpp:88 kicad-6996/kicad/menubar.cpp:399
 msgid "Pl editor - Worksheet layout editor"
 msgstr "Pl editor - 図枠エディタ"
 
-#: kicad/dialogs/dialog_template_selector.cpp:120
+#: kicad-6297/kicad/dialogs/dialog_template_selector.cpp:120
+#: kicad-6996/kicad/dialogs/dialog_template_selector.cpp:120
 msgid "<html><h1>Template Selector</h1></html>"
 msgstr "<html><h1>テンプレート選択</h1></html>"
 
-#: kicad/dialogs/dialog_template_selector.cpp:211
+#: kicad-6297/kicad/dialogs/dialog_template_selector.cpp:211
+#: kicad-6996/kicad/dialogs/dialog_template_selector.cpp:211
 msgid "Select Templates Directory"
 msgstr "テンプレートディレクトリの選択"
 
-#: kicad/dialogs/dialog_template_selector_base.cpp:26
-msgid "Templates path"
+#: kicad-6297/kicad/dialogs/dialog_template_selector_base.cpp:26
+#: kicad-6996/kicad/dialogs/dialog_template_selector_base.cpp:26
+msgid "Template path"
 msgstr "テンプレートのパス"
 
-#: kicad/dialogs/dialog_template_selector_base.cpp:39
+#: kicad-6297/kicad/dialogs/dialog_template_selector_base.cpp:39
+#: kicad-6996/kicad/dialogs/dialog_template_selector_base.cpp:39
 msgid "Validate"
 msgstr "有効にする"
 
-#: kicad/dialogs/dialog_template_selector_base.cpp:114
+#: kicad-6297/kicad/dialogs/dialog_template_selector_base.cpp:114
+#: kicad-6996/kicad/dialogs/dialog_template_selector_base.cpp:114
 msgid "Project Template Title"
 msgstr "プロジェクト・テンプレート・タイトル"
 
-#: kicad/files-io.cpp:46
+#: kicad-6297/kicad/files-io.cpp:46 kicad-6996/kicad/files-io.cpp:44
 msgid "Zip file (*.zip)|*.zip"
 msgstr "Zip ファイル (*.zip)|*.zip"
 
-#: kicad/files-io.cpp:52
+#: kicad-6297/kicad/files-io.cpp:52 kicad-6996/kicad/files-io.cpp:50
 msgid "KiCad project file"
 msgstr "Kicad プロジェクト ファイル"
 
-#: kicad/files-io.cpp:78
+#: kicad-6297/kicad/files-io.cpp:78 kicad-6996/kicad/files-io.cpp:76
 msgid "Unzip Project"
 msgstr "プロジェクトを解凍"
 
-#: kicad/files-io.cpp:85
+#: kicad-6297/kicad/files-io.cpp:85 kicad-6996/kicad/files-io.cpp:83
 #, c-format
 msgid ""
 "\n"
@@ -9400,47 +12576,47 @@ msgstr ""
 "\n"
 "開く '%s'\n"
 
-#: kicad/files-io.cpp:88
+#: kicad-6297/kicad/files-io.cpp:88 kicad-6996/kicad/files-io.cpp:86
 msgid "Target Directory"
 msgstr "ターゲット ディレクトリ"
 
-#: kicad/files-io.cpp:95
+#: kicad-6297/kicad/files-io.cpp:95 kicad-6996/kicad/files-io.cpp:93
 #, c-format
 msgid "Unzipping project in '%s'\n"
 msgstr "プロジェクトを \"%s\" 以下に展開\n"
 
-#: kicad/files-io.cpp:119
+#: kicad-6297/kicad/files-io.cpp:119 kicad-6996/kicad/files-io.cpp:117
 #, c-format
 msgid "Extract file '%s'"
 msgstr "ファイル '%s' の抽出"
 
-#: kicad/files-io.cpp:128
+#: kicad-6297/kicad/files-io.cpp:128 kicad-6996/kicad/files-io.cpp:126
 msgid " OK\n"
 msgstr " OK\n"
 
-#: kicad/files-io.cpp:131
+#: kicad-6297/kicad/files-io.cpp:131 kicad-6996/kicad/files-io.cpp:129
 msgid " *ERROR*\n"
 msgstr " *エラー*\n"
 
-#: kicad/files-io.cpp:159
+#: kicad-6297/kicad/files-io.cpp:159 kicad-6996/kicad/files-io.cpp:157
 msgid "Archive Project Files"
 msgstr "プロジェクトファイルをアーカイブ"
 
-#: kicad/files-io.cpp:202
+#: kicad-6297/kicad/files-io.cpp:202 kicad-6996/kicad/files-io.cpp:200
 #, c-format
 msgid "Archive file <%s>"
 msgstr "ファイル <%s> をアーカイブ"
 
-#: kicad/files-io.cpp:216
+#: kicad-6297/kicad/files-io.cpp:216 kicad-6996/kicad/files-io.cpp:214
 #, c-format
 msgid "(%lu bytes, compressed %d bytes)\n"
 msgstr "(%lu bytes, 圧縮後 %d bytes)\n"
 
-#: kicad/files-io.cpp:222
+#: kicad-6297/kicad/files-io.cpp:222 kicad-6996/kicad/files-io.cpp:220
 msgid " >>Error\n"
 msgstr " >>エラー\n"
 
-#: kicad/files-io.cpp:229
+#: kicad-6297/kicad/files-io.cpp:229 kicad-6996/kicad/files-io.cpp:227
 #, c-format
 msgid ""
 "\n"
@@ -9449,25 +12625,25 @@ msgstr ""
 "\n"
 "Zip アーカイブ <%s> が作成されました (%d bytes)"
 
-#: kicad/mainframe.cpp:249
+#: kicad-6297/kicad/mainframe.cpp:250 kicad-6996/kicad/mainframe.cpp:246
 #, c-format
 msgid "%s closed [pid=%d]\n"
 msgstr "%s の終了 [pid=%d]\n"
 
-#: kicad/mainframe.cpp:280
+#: kicad-6297/kicad/mainframe.cpp:281 kicad-6996/kicad/mainframe.cpp:277
 #, c-format
 msgid "%s %s opened [pid=%ld]\n"
-msgstr "%s %s 開きました [pid=%ld]\n"
+msgstr "%s %sの開始 [pid=%ld]\n"
 
-#: kicad/mainframe.cpp:451
+#: kicad-6297/kicad/mainframe.cpp:450 kicad-6996/kicad/mainframe.cpp:486
 msgid "Text file ("
 msgstr "テキスト ファイル ("
 
-#: kicad/mainframe.cpp:454
+#: kicad-6297/kicad/mainframe.cpp:453 kicad-6996/kicad/mainframe.cpp:489
 msgid "Load File to Edit"
 msgstr "編集するファイルを読み込む"
 
-#: kicad/mainframe.cpp:508
+#: kicad-6297/kicad/mainframe.cpp:507 kicad-6996/kicad/mainframe.cpp:542
 #, c-format
 msgid ""
 "Project name:\n"
@@ -9476,226 +12652,267 @@ msgstr ""
 "プロジェクト名:\n"
 "%s\n"
 
-#: kicad/menubar.cpp:213
-msgid "&Open Project"
-msgstr "プロジェクトを開く(&O)"
+#: kicad-6297/kicad/menubar.cpp:137 kicad-6996/kicad/menubar.cpp:140
+msgid "Load project"
+msgstr "プロジェクトの読み込み"
 
-#: kicad/menubar.cpp:215 kicad/menubar.cpp:476
-msgid "Open existing project"
-msgstr "既存のプロジェクトを開く"
+#: kicad-6297/kicad/menubar.cpp:138 kicad-6996/kicad/menubar.cpp:141
+msgid "Save project"
+msgstr "プロジェクトの保存"
 
-#: kicad/menubar.cpp:225
-msgid "Open recent schematic project"
-msgstr "最近開いた回路図プロジェクトを開く"
-
-#: kicad/menubar.cpp:231
-msgid "&New Project"
-msgstr "新規プロジェクト(&N)"
-
-#: kicad/menubar.cpp:233
-msgid "Create new blank project"
-msgstr "空のプロジェクトを作成"
-
-#: kicad/menubar.cpp:236
-msgid "New Project from &Template"
-msgstr "テンプレートから新規プロジェクトを作成(&T)"
-
-#: kicad/menubar.cpp:239
-msgid "Create a new project from a template"
-msgstr "テンプレートから新規プロジェクト作成"
-
-#: kicad/menubar.cpp:244
+#: kicad-6297/kicad/menubar.cpp:139 kicad-6297/kicad/menubar.cpp:244
+#: kicad-6996/kicad/menubar.cpp:142 kicad-6996/kicad/menubar.cpp:247
 msgid "New Project"
 msgstr "新規プロジェクト"
 
-#: kicad/menubar.cpp:245 kicad/menubar.cpp:467
-msgid "Create new project"
-msgstr "新規プロジェクト作成"
+#: kicad-6297/kicad/menubar.cpp:140 kicad-6996/kicad/menubar.cpp:143
+msgid "New Prj From Template"
+msgstr "テンプレートから新規プロジェクト"
 
-#: kicad/menubar.cpp:252 pcbnew/menubar_pcbframe.cpp:109
-#: pcbnew/menubar_pcbframe.cpp:566
-msgid "&Save"
-msgstr "設定の保存(&S)"
-
-#: kicad/menubar.cpp:254 kicad/menubar.cpp:481
-msgid "Save current project"
-msgstr "現在のプロジェクトを保存"
-
-#: kicad/menubar.cpp:262
-msgid "&Archive"
-msgstr "アーカイブ(&A)"
-
-#: kicad/menubar.cpp:263
-msgid "Archive project files in zip archive"
-msgstr "プロジェクト ファイルをZipでアーカイブ"
-
-#: kicad/menubar.cpp:269
-msgid "&Unarchive"
-msgstr "アーカイブの展開(&U)"
-
-#: kicad/menubar.cpp:270
-msgid "Unarchive project files from zip file"
-msgstr "Zipファイルからプロジェクト ファイルを解凍"
-
-#: kicad/menubar.cpp:280
-msgid "Close KiCad"
-msgstr "KiCad の終了"
-
-#: kicad/menubar.cpp:289
-msgid "Open Text E&ditor"
-msgstr "テキスト エディタ(&D)"
-
-#: kicad/menubar.cpp:290
-msgid "Launch preferred text editor"
-msgstr "テキスト エディタで表示"
-
-#: kicad/menubar.cpp:296
-msgid "&Open Local File"
-msgstr "ファイルを開く(&O)"
-
-#: kicad/menubar.cpp:297
-msgid "Edit local file"
-msgstr "ローカル ファイルの編集"
-
-#: kicad/menubar.cpp:313
-msgid "&Set Text Editor"
-msgstr "テキスト エディタの設定(&T)"
-
-#: kicad/menubar.cpp:314
-msgid "Set your preferred text editor"
-msgstr "使用するテキスト エディタを指定"
-
-#: kicad/menubar.cpp:322
-msgid "System &Default PDF Viewer"
-msgstr "システム標準のPDFビューア(&D)"
-
-#: kicad/menubar.cpp:323
-msgid "Use system default PDF viewer"
-msgstr "システムデフォルトのPDFビューアを使用"
-
-#: kicad/menubar.cpp:331
-msgid "&Favourite PDF Viewer"
-msgstr "お気に入りのPDFビューア(&F)"
-
-#: kicad/menubar.cpp:332
-msgid "Use favourite PDF viewer"
-msgstr "お気に入りのPDFビューアを使用"
-
-#: kicad/menubar.cpp:342
-msgid "Set &PDF Viewer"
-msgstr "PDFビューアの設定(&P)"
-
-#: kicad/menubar.cpp:343
-msgid "Set favourite PDF viewer"
-msgstr "お気に入りのPDFビューアを設定"
-
-#: kicad/menubar.cpp:348
-msgid "&PDF Viewer"
-msgstr "PDFビューア(&P)"
-
-#: kicad/menubar.cpp:349
-msgid "PDF viewer preferences"
-msgstr "PDFビューアの設定"
-
-#: kicad/menubar.cpp:363
+#: kicad-6297/kicad/menubar.cpp:143 kicad-6297/kicad/menubar.cpp:363
+#: kicad-6996/kicad/menubar.cpp:146 kicad-6996/kicad/menubar.cpp:366
 msgid "Run Eeschema"
 msgstr "回路図エディタ(Eeschema) を起動"
 
-#: kicad/menubar.cpp:366
-msgid "Run Library Editor"
+#: kicad-6297/kicad/menubar.cpp:144 kicad-6996/kicad/menubar.cpp:147
+msgid "Run LibEdit"
 msgstr "コンポーネント ライブラリ エディタ を起動"
 
-#: kicad/menubar.cpp:374
-msgid "Run Footprint Editor"
+#: kicad-6297/kicad/menubar.cpp:146 kicad-6996/kicad/menubar.cpp:149
+msgid "Run FpEditor"
 msgstr "フットプリント エディタ を起動"
 
-#: kicad/menubar.cpp:378
+#: kicad-6297/kicad/menubar.cpp:147 kicad-6297/kicad/menubar.cpp:378
+#: kicad-6996/kicad/menubar.cpp:150 kicad-6996/kicad/menubar.cpp:381
 msgid "Run Gerbview"
 msgstr "ガーバビューア(GerbView) を起動"
 
-#: kicad/menubar.cpp:382
+#: kicad-6297/kicad/menubar.cpp:148 kicad-6297/kicad/menubar.cpp:382
+#: kicad-6996/kicad/menubar.cpp:151 kicad-6996/kicad/menubar.cpp:385
 msgid "Run Bitmap2Component"
 msgstr "画像変換ツール(Bitmap2Component) を起動"
 
-#: kicad/menubar.cpp:389
+#: kicad-6297/kicad/menubar.cpp:150 kicad-6996/kicad/menubar.cpp:153
+msgid "Run PcbCalculator"
+msgstr "電気計算ツール(PcbCalculator) を起動"
+
+#: kicad-6297/kicad/menubar.cpp:152 kicad-6996/kicad/menubar.cpp:155
+msgid "Run PlEditor"
+msgstr "図枠エディタ(Pl_Editor) を起動"
+
+#: kicad-6297/kicad/menubar.cpp:168 kicad-6996/kicad/menubar.cpp:171
+msgid "Kicad Manager Hotkeys"
+msgstr "KiCad ホットキー マネージャー"
+
+#: kicad-6297/kicad/menubar.cpp:213 kicad-6996/kicad/menubar.cpp:216
+msgid "&Open Project"
+msgstr "プロジェクトを開く(&O)"
+
+#: kicad-6297/kicad/menubar.cpp:215 kicad-6297/kicad/menubar.cpp:476
+#: kicad-6996/kicad/menubar.cpp:218 kicad-6996/kicad/menubar.cpp:482
+msgid "Open existing project"
+msgstr "既存のプロジェクトを開く"
+
+#: kicad-6297/kicad/menubar.cpp:225 kicad-6996/kicad/menubar.cpp:228
+msgid "Open recent schematic project"
+msgstr "最近開いた回路図プロジェクトを開く"
+
+#: kicad-6297/kicad/menubar.cpp:231 kicad-6996/kicad/menubar.cpp:234
+msgid "&New Project"
+msgstr "新規プロジェクト(&N)"
+
+#: kicad-6297/kicad/menubar.cpp:233 kicad-6996/kicad/menubar.cpp:236
+msgid "Create new blank project"
+msgstr "空のプロジェクトを作成"
+
+#: kicad-6297/kicad/menubar.cpp:236 kicad-6996/kicad/menubar.cpp:239
+msgid "New Project from &Template"
+msgstr "テンプレートから新規プロジェクトを作成(&T)"
+
+#: kicad-6297/kicad/menubar.cpp:239 kicad-6996/kicad/menubar.cpp:242
+msgid "Create a new project from a template"
+msgstr "テンプレートから新規プロジェクト作成"
+
+#: kicad-6297/kicad/menubar.cpp:245 kicad-6297/kicad/menubar.cpp:467
+#: kicad-6996/kicad/menubar.cpp:248 kicad-6996/kicad/menubar.cpp:473
+msgid "Create new project"
+msgstr "新規プロジェクト作成"
+
+#: kicad-6297/kicad/menubar.cpp:252 kicad-6297/pcbnew/menubar_pcbframe.cpp:109
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:566 kicad-6996/cvpcb/menubar.cpp:131
+#: kicad-6996/kicad/menubar.cpp:255 kicad-6996/pcbnew/menubar_pcbframe.cpp:113
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:570
+msgid "&Save"
+msgstr "保存(&S)"
+
+#: kicad-6297/kicad/menubar.cpp:254 kicad-6297/kicad/menubar.cpp:481
+#: kicad-6996/kicad/menubar.cpp:257 kicad-6996/kicad/menubar.cpp:487
+msgid "Save current project"
+msgstr "現在のプロジェクトを保存"
+
+#: kicad-6297/kicad/menubar.cpp:262 kicad-6996/kicad/menubar.cpp:265
+msgid "&Archive"
+msgstr "アーカイブ(&A)"
+
+#: kicad-6297/kicad/menubar.cpp:263 kicad-6996/kicad/menubar.cpp:266
+msgid "Archive project files in zip archive"
+msgstr "プロジェクト ファイルをZipでアーカイブ"
+
+#: kicad-6297/kicad/menubar.cpp:269 kicad-6996/kicad/menubar.cpp:272
+msgid "&Unarchive"
+msgstr "アーカイブの展開(&U)"
+
+#: kicad-6297/kicad/menubar.cpp:270 kicad-6996/kicad/menubar.cpp:273
+msgid "Unarchive project files from zip file"
+msgstr "Zipファイルからプロジェクト ファイルを解凍"
+
+#: kicad-6297/kicad/menubar.cpp:280 kicad-6996/kicad/menubar.cpp:283
+msgid "Close KiCad"
+msgstr "KiCad の終了"
+
+#: kicad-6297/kicad/menubar.cpp:289 kicad-6996/kicad/menubar.cpp:292
+msgid "Open Text E&ditor"
+msgstr "テキスト エディタ(&D)"
+
+#: kicad-6297/kicad/menubar.cpp:290 kicad-6996/kicad/menubar.cpp:293
+msgid "Launch preferred text editor"
+msgstr "テキスト エディタで表示"
+
+#: kicad-6297/kicad/menubar.cpp:296 kicad-6996/kicad/menubar.cpp:299
+msgid "&Open Local File"
+msgstr "ファイルを開く(&O)"
+
+#: kicad-6297/kicad/menubar.cpp:297 kicad-6996/kicad/menubar.cpp:300
+msgid "Edit local file"
+msgstr "ローカル ファイルの編集"
+
+#: kicad-6297/kicad/menubar.cpp:313 kicad-6996/kicad/menubar.cpp:316
+msgid "&Set Text Editor"
+msgstr "テキスト エディタの設定(&T)"
+
+#: kicad-6297/kicad/menubar.cpp:314 kicad-6996/kicad/menubar.cpp:317
+msgid "Set your preferred text editor"
+msgstr "使用するテキスト エディタを指定"
+
+#: kicad-6297/kicad/menubar.cpp:322 kicad-6996/kicad/menubar.cpp:325
+msgid "System &Default PDF Viewer"
+msgstr "システム標準のPDFビューア(&D)"
+
+#: kicad-6297/kicad/menubar.cpp:323 kicad-6996/kicad/menubar.cpp:326
+msgid "Use system default PDF viewer"
+msgstr "システムデフォルトのPDFビューアを使用"
+
+#: kicad-6297/kicad/menubar.cpp:331 kicad-6996/kicad/menubar.cpp:334
+msgid "&Favourite PDF Viewer"
+msgstr "お気に入りのPDFビューア(&F)"
+
+#: kicad-6297/kicad/menubar.cpp:332 kicad-6996/kicad/menubar.cpp:335
+msgid "Use favourite PDF viewer"
+msgstr "お気に入りのPDFビューアを使用"
+
+#: kicad-6297/kicad/menubar.cpp:342 kicad-6996/kicad/menubar.cpp:345
+msgid "Set &PDF Viewer"
+msgstr "PDFビューアの設定(&P)"
+
+#: kicad-6297/kicad/menubar.cpp:343 kicad-6996/kicad/menubar.cpp:346
+msgid "Set favourite PDF viewer"
+msgstr "お気に入りのPDFビューアを設定"
+
+#: kicad-6297/kicad/menubar.cpp:348 kicad-6996/kicad/menubar.cpp:351
+msgid "&PDF Viewer"
+msgstr "PDFビューア(&P)"
+
+#: kicad-6297/kicad/menubar.cpp:349 kicad-6996/kicad/menubar.cpp:352
+msgid "PDF viewer preferences"
+msgstr "PDFビューアの設定"
+
+#: kicad-6297/kicad/menubar.cpp:366 kicad-6996/kicad/menubar.cpp:369
+msgid "Run Library Editor"
+msgstr "コンポーネント ライブラリ エディタ を起動"
+
+#: kicad-6297/kicad/menubar.cpp:374 kicad-6996/kicad/menubar.cpp:377
+msgid "Run Footprint Editor"
+msgstr "フットプリント エディタ を起動"
+
+#: kicad-6297/kicad/menubar.cpp:389 kicad-6996/kicad/menubar.cpp:392
 msgid "Run Pcb Calculator"
 msgstr "電気計算ツール(PcbCalculator) を起動"
 
-#: kicad/menubar.cpp:394
+#: kicad-6297/kicad/menubar.cpp:394 kicad-6996/kicad/menubar.cpp:397
 msgid "Run Page Layout Editor"
 msgstr "図枠エディタ(Pl_Editor) を起動"
 
-#: kicad/menubar.cpp:407
+#: kicad-6297/kicad/menubar.cpp:407 kicad-6996/kicad/menubar.cpp:407
 msgid "KiCad &Manual"
 msgstr "KiCad マニュアル(&M)"
 
-#: kicad/menubar.cpp:408
+#: kicad-6297/kicad/menubar.cpp:408 kicad-6996/kicad/menubar.cpp:408
 msgid "Open KiCad user manual"
 msgstr "KiCad ユーザーズ マニュアルを開く"
 
-#: kicad/menubar.cpp:427
+#: kicad-6297/kicad/menubar.cpp:427 kicad-6996/kicad/menubar.cpp:433
 msgid "&Browse"
 msgstr "ブラウズ(&B)"
 
-#: kicad/menubar.cpp:471
+#: kicad-6297/kicad/menubar.cpp:471 kicad-6996/kicad/menubar.cpp:477
 msgid "Create new project from template"
 msgstr "テンプレートから新規プロジェクト作成"
 
-#: kicad/menubar.cpp:489
+#: kicad-6297/kicad/menubar.cpp:489 kicad-6996/kicad/menubar.cpp:495
 msgid "Archive all project files"
 msgstr "プロジェクトの全てのファイルをアーカイブ"
 
-#: kicad/menubar.cpp:497
+#: kicad-6297/kicad/menubar.cpp:497 kicad-6996/kicad/menubar.cpp:503
 msgid "Refresh project tree"
 msgstr "プロジェクト ツリーの再読込み"
 
-#: kicad/preferences.cpp:66
+#: kicad-6297/kicad/preferences.cpp:66 kicad-6996/kicad/preferences.cpp:63
 msgid "You must choose a PDF viewer before using this option."
 msgstr "このオプションを使用する前に、PDFビューアを指定する必要があります。"
 
-#: kicad/preferences.cpp:78
+#: kicad-6297/kicad/preferences.cpp:78 kicad-6996/kicad/preferences.cpp:75
 msgid "Executable files ("
 msgstr "実行ファイル ("
 
-#: kicad/preferences.cpp:83
-msgid "Select Preferred Pdf Browser"
-msgstr "PDFビューアの指定"
+#: kicad-6297/kicad/preferences.cpp:83 kicad-6996/kicad/preferences.cpp:80
+msgid "Select Preferred PDF Browser"
+msgstr "PDF ビューアの指定"
 
-#: kicad/prjconfig.cpp:111
+#: kicad-6297/kicad/prjconfig.cpp:111 kicad-6996/kicad/prjconfig.cpp:108
 msgid "System Templates"
 msgstr "システム テンプレート"
 
-#: kicad/prjconfig.cpp:117
+#: kicad-6297/kicad/prjconfig.cpp:117 kicad-6996/kicad/prjconfig.cpp:114
 msgid "User Templates"
 msgstr "ユーザ テンプレート"
 
-#: kicad/prjconfig.cpp:131
+#: kicad-6297/kicad/prjconfig.cpp:131 kicad-6996/kicad/prjconfig.cpp:128
 msgid "Portable Templates"
 msgstr "移動可能テンプレート"
 
-#: kicad/prjconfig.cpp:141
+#: kicad-6297/kicad/prjconfig.cpp:141 kicad-6996/kicad/prjconfig.cpp:138
 msgid "No project template was selected.  Cannot generate new project."
 msgstr ""
 "プロジェクト テンプレートが選択されていません。新規プロジェクトを生成すること"
 "ができませんでした。"
 
-#: kicad/prjconfig.cpp:154
+#: kicad-6297/kicad/prjconfig.cpp:154 kicad-6996/kicad/prjconfig.cpp:151
 msgid "Problem whilst creating new project from template!"
 msgstr "テンプレートから新規プロジェクトを作成中に問題が発生しました！"
 
-#: kicad/prjconfig.cpp:155
+#: kicad-6297/kicad/prjconfig.cpp:155 kicad-6996/kicad/prjconfig.cpp:152
 msgid "Template Error"
 msgstr "テンプレート エラー"
 
-#: kicad/prjconfig.cpp:234
+#: kicad-6297/kicad/prjconfig.cpp:234 kicad-6996/kicad/prjconfig.cpp:233
 msgid "Create New Project"
 msgstr "新規プロジェクト作成"
 
-#: kicad/prjconfig.cpp:239
+#: kicad-6297/kicad/prjconfig.cpp:239 kicad-6996/kicad/prjconfig.cpp:238
 msgid "Open Existing Project"
 msgstr "既存プロジェクトを開く"
 
-#: kicad/prjconfig.cpp:265
+#: kicad-6297/kicad/prjconfig.cpp:265 kicad-6996/kicad/prjconfig.cpp:264
 msgid ""
 "The selected directory is not empty.  We recommend you create projects in "
 "their own clean directory.\n"
@@ -9707,22 +12924,23 @@ msgstr ""
 "\n"
 "このプロジェクトのために新しい空のディレクトリを作成しますか？"
 
-#: kicad/prjconfig.cpp:308
+#: kicad-6297/kicad/prjconfig.cpp:308 kicad-6996/kicad/prjconfig.cpp:307
 #, c-format
 msgid "KiCad project file '%s' not found"
 msgstr "Kicad プロジェクト ファイル \"%s\" が見つかりませんでした。"
 
-#: kicad/prjconfig.cpp:321
+#: kicad-6297/kicad/prjconfig.cpp:321 kicad-6996/kicad/prjconfig.cpp:320
 msgid "To proceed, you can use the File menu to start a new project."
 msgstr ""
 "続行するには、新規プロジェクトを開始するためのファイルメニューを使用して下さ"
 "い。"
 
-#: kicad/prjconfig.cpp:363
+#: kicad-6297/kicad/prjconfig.cpp:363 kicad-6996/kicad/prjconfig.cpp:362
 msgid "New Project Folder"
 msgstr "新規プロジェクト フォルダ"
 
-#: kicad/tree_project_frame.cpp:215
+#: kicad-6297/kicad/tree_project_frame.cpp:220
+#: kicad-6996/kicad/tree_project_frame.cpp:220
 #, c-format
 msgid ""
 "Current project directory:\n"
@@ -9731,327 +12949,437 @@ msgstr ""
 "現在の作業ディレクトリ:\n"
 "%s"
 
-#: kicad/tree_project_frame.cpp:216
+#: kicad-6297/kicad/tree_project_frame.cpp:221
+#: kicad-6996/kicad/tree_project_frame.cpp:221
 msgid "Create New Directory"
 msgstr "新規ディレクトリ作成"
 
-#: kicad/tree_project_frame.cpp:677 kicad/tree_project_frame.cpp:684
+#: kicad-6297/kicad/tree_project_frame.cpp:682
+#: kicad-6297/kicad/tree_project_frame.cpp:689
+#: kicad-6996/kicad/tree_project_frame.cpp:682
+#: kicad-6996/kicad/tree_project_frame.cpp:689
 msgid "New D&irectory"
 msgstr "新規ディレクトリ(&I)"
 
-#: kicad/tree_project_frame.cpp:678 kicad/tree_project_frame.cpp:685
+#: kicad-6297/kicad/tree_project_frame.cpp:683
+#: kicad-6297/kicad/tree_project_frame.cpp:690
+#: kicad-6996/kicad/tree_project_frame.cpp:683
+#: kicad-6996/kicad/tree_project_frame.cpp:690
 msgid "Create a New Directory"
 msgstr "新規ディレクトリの作成"
 
-#: kicad/tree_project_frame.cpp:688
+#: kicad-6297/kicad/tree_project_frame.cpp:693
+#: kicad-6996/kicad/tree_project_frame.cpp:693
 msgid "&Delete Directory"
 msgstr "ディレクトリ削除(&D)"
 
-#: kicad/tree_project_frame.cpp:689 kicad/tree_project_frame.cpp:704
+#: kicad-6297/kicad/tree_project_frame.cpp:694
+#: kicad-6297/kicad/tree_project_frame.cpp:709
+#: kicad-6996/kicad/tree_project_frame.cpp:694
+#: kicad-6996/kicad/tree_project_frame.cpp:709
 msgid "Delete the Directory and its content"
 msgstr "ディレクトリを中身ごと削除"
 
-#: kicad/tree_project_frame.cpp:695
+#: kicad-6297/kicad/tree_project_frame.cpp:700
+#: kicad-6996/kicad/tree_project_frame.cpp:700
 msgid "&Edit in a text editor"
 msgstr "テキスト エディタで開く(&E)"
 
-#: kicad/tree_project_frame.cpp:696
+#: kicad-6297/kicad/tree_project_frame.cpp:701
+#: kicad-6996/kicad/tree_project_frame.cpp:701
 msgid "Open the file in a Text Editor"
 msgstr "テキスト エディタで開く"
 
-#: kicad/tree_project_frame.cpp:699
+#: kicad-6297/kicad/tree_project_frame.cpp:704
+#: kicad-6996/kicad/tree_project_frame.cpp:704
 msgid "&Rename file"
 msgstr "ファイル名変更(&R)"
 
-#: kicad/tree_project_frame.cpp:700
+#: kicad-6297/kicad/tree_project_frame.cpp:705
+#: kicad-6996/kicad/tree_project_frame.cpp:705
 msgid "Rename file"
 msgstr "ファイル名変更"
 
-#: kicad/tree_project_frame.cpp:703
+#: kicad-6297/kicad/tree_project_frame.cpp:708
+#: kicad-6996/kicad/tree_project_frame.cpp:708
 msgid "&Delete File"
 msgstr "ファイル削除(&D)"
 
-#: kicad/tree_project_frame.cpp:753
+#: kicad-6297/kicad/tree_project_frame.cpp:758
+#: kicad-6996/kicad/tree_project_frame.cpp:758
 #, c-format
 msgid "Change filename: '%s'"
 msgstr "ファイル名変更: '%s'"
 
-#: kicad/tree_project_frame.cpp:756
+#: kicad-6297/kicad/tree_project_frame.cpp:761
+#: kicad-6996/kicad/tree_project_frame.cpp:761
 msgid "Change filename"
 msgstr "ファイル名変更"
 
-#: new/sch_lib.cpp:237
+#: kicad-6297/new/sch_lib.cpp:237 kicad-6996/new/sch_lib.cpp:237
 #, c-format
 msgid "part '%s' not found in lib %s"
 msgstr "パーツ '%s' はライブラリ %s 中に見つかりませんでした"
 
-#: new/sch_lpid.cpp:208
+#: kicad-6297/new/sch_lpid.cpp:208 kicad-6996/new/sch_lpid.cpp:208
 msgid "Illegal character found in LPID string"
 msgstr "FPID文字列中に不正な文字があります"
 
-#: new/sch_lpid.cpp:375
+#: kicad-6297/new/sch_lpid.cpp:375 kicad-6996/new/sch_lpid.cpp:375
 msgid "Illegal character found in logical lib name"
 msgstr "論理的なライブラリ名の中に不正な文字があります"
 
-#: new/sch_lpid.cpp:406
+#: kicad-6297/new/sch_lpid.cpp:406 kicad-6996/new/sch_lpid.cpp:406
 msgid "Illegal character found in category"
 msgstr "カテゴリに不正な文字があります"
 
-#: new/sch_lpid.cpp:417
+#: kicad-6297/new/sch_lpid.cpp:417 kicad-6996/new/sch_lpid.cpp:417
 msgid "Illegal character found in base name"
 msgstr "ベース名に不正な文字があります"
 
-#: new/sch_sweet_parser.cpp:338
+#: kicad-6297/new/sch_sweet_parser.cpp:338
+#: kicad-6996/new/sch_sweet_parser.cpp:338
 msgid "invalid extends LPID"
 msgstr "不正な拡張 LPID"
 
-#: new/sch_sweet_parser.cpp:354
+#: kicad-6297/new/sch_sweet_parser.cpp:354
+#: kicad-6996/new/sch_sweet_parser.cpp:354
 msgid "'extends' may not have self as any ancestor"
 msgstr "'extends' はいかなる先祖も持っていないようです"
 
-#: new/sch_sweet_parser.cpp:364
+#: kicad-6297/new/sch_sweet_parser.cpp:364
+#: kicad-6996/new/sch_sweet_parser.cpp:364
 msgid "max allowed extends depth exceeded"
 msgstr "深度が超過しています"
 
-#: new/sch_sweet_parser.cpp:392
+#: kicad-6297/new/sch_sweet_parser.cpp:392
+#: kicad-6996/new/sch_sweet_parser.cpp:392
 msgid "invalid alternates LPID"
 msgstr "不正な代替 LPID"
 
-#: new/sch_sweet_parser.cpp:709 new/sch_sweet_parser.cpp:748
-#: new/sch_sweet_parser.cpp:761 new/sch_sweet_parser.cpp:790
-#: new/sch_sweet_parser.cpp:821
+#: kicad-6297/new/sch_sweet_parser.cpp:709
+#: kicad-6297/new/sch_sweet_parser.cpp:748
+#: kicad-6297/new/sch_sweet_parser.cpp:761
+#: kicad-6297/new/sch_sweet_parser.cpp:790
+#: kicad-6297/new/sch_sweet_parser.cpp:821
+#: kicad-6996/new/sch_sweet_parser.cpp:709
+#: kicad-6996/new/sch_sweet_parser.cpp:748
+#: kicad-6996/new/sch_sweet_parser.cpp:761
+#: kicad-6996/new/sch_sweet_parser.cpp:790
+#: kicad-6996/new/sch_sweet_parser.cpp:821
 msgid "undefined pin"
 msgstr "未定義のピン"
 
-#: new/sch_sweet_parser.cpp:852 new/sch_sweet_parser.cpp:949
+#: kicad-6297/new/sch_sweet_parser.cpp:852
+#: kicad-6297/new/sch_sweet_parser.cpp:949
+#: kicad-6996/new/sch_sweet_parser.cpp:852
+#: kicad-6996/new/sch_sweet_parser.cpp:949
 #, c-format
 msgid "undefined pin %s"
 msgstr "未定義のピン %s"
 
-#: new/sch_sweet_parser.cpp:862 new/sch_sweet_parser.cpp:959
+#: kicad-6297/new/sch_sweet_parser.cpp:862
+#: kicad-6297/new/sch_sweet_parser.cpp:959
+#: kicad-6996/new/sch_sweet_parser.cpp:862
+#: kicad-6996/new/sch_sweet_parser.cpp:959
 #, c-format
 msgid "pin %s already in pin_merge group %s"
 msgstr "ピン %s は既にピングループ %s に存在します。"
 
-#: new/sch_sweet_parser.cpp:903
+#: kicad-6297/new/sch_sweet_parser.cpp:903
+#: kicad-6996/new/sch_sweet_parser.cpp:903
 #, c-format
 msgid "no pins with signal %s"
 msgstr "信号 %s のピンがありません"
 
-#: new/sch_sweet_parser.cpp:915
+#: kicad-6297/new/sch_sweet_parser.cpp:915
+#: kicad-6996/new/sch_sweet_parser.cpp:915
 #, c-format
 msgid "signal pin %s already in pin_merge group %s"
 msgstr "信号ピン %s は既にピングループ %s に存在します"
 
-#: new/sch_sweet_parser.cpp:998
+#: kicad-6297/new/sch_sweet_parser.cpp:998
+#: kicad-6996/new/sch_sweet_parser.cpp:998
 #, c-format
 msgid "Unable to find property: %s"
 msgstr "プロパティが見つかりませんでした: %s"
 
-#: new/sweet_editor_panel.cpp:31
+#: kicad-6297/new/sweet_editor_panel.cpp:31
+#: kicad-6996/new/sweet_editor_panel.cpp:31
 msgid "Sweet"
 msgstr "甘い"
 
-#: new/sweet_editor_panel.cpp:42
+#: kicad-6297/new/sweet_editor_panel.cpp:42
+#: kicad-6996/new/sweet_editor_panel.cpp:42
 msgid "Visual Part"
 msgstr "可視部分"
 
-#: new/sweet_editor_panel.cpp:59
+#: kicad-6297/new/sweet_editor_panel.cpp:59
+#: kicad-6996/new/sweet_editor_panel.cpp:59
 msgid "Parsing Errors"
 msgstr "構文エラー"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:28
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:218
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:28
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:218
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:28
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:218
 msgid "Pos X (mm)"
 msgstr "X位置(mm)"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:35
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:231
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:35
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:231
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:35
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:231
 msgid "Pos Y (mm)"
 msgstr "Y位置(mm)"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:252
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:307
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:252
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:307
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:252
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:307
 msgid "Upper Right"
 msgstr "右上"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:253
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:308
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:253
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:308
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:253
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:308
 msgid "Upper Left"
 msgstr "左上"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:251
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:254
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:306
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:309
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:251
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:254
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:306
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:309
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:251
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:254
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:306
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:309
 msgid "Lower Right"
 msgstr "右下"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:255
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:310
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:255
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:310
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:52
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:96
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:255
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:310
 msgid "Lower Left"
 msgstr "左下"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:72
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:273
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:72
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:273
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:72
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:273
 msgid "End X (mm)"
 msgstr "終点X位置(mm)"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:79
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:286
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:79
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:286
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:79
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:286
 msgid "End Y (mm)"
 msgstr "終点Y位置(mm)"
 
-#: pagelayout_editor/dialogs/dialogs_for_printing.cpp:219
+#: kicad-6297/pagelayout_editor/dialogs/dialogs_for_printing.cpp:219
+#: kicad-6996/pagelayout_editor/dialogs/dialogs_for_printing.cpp:219
 msgid "Print Page Layout"
 msgstr "図枠の印刷"
 
-#: pagelayout_editor/dialogs/dialogs_for_printing.cpp:224
+#: kicad-6297/pagelayout_editor/dialogs/dialogs_for_printing.cpp:224
+#: kicad-6996/pagelayout_editor/dialogs/dialogs_for_printing.cpp:224
 msgid "An error occurred attempting to print the page layout."
 msgstr "図枠の印刷中にエラーが発生しました。"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:44
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:44
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:44
 msgid "Page 1 option"
 msgstr "1ページ目の設定"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:50
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:50
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:50
 msgid "Page 1 only"
 msgstr "1ページ目のみ"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:50
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:50
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:50
 msgid "Not on page 1"
 msgstr "1ページ目には適用しない"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:80
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:80
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:80
 msgid "H justification"
 msgstr "水平位置合わせ"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:99
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:99
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:99
 msgid "V justification"
 msgstr "垂直位置合わせ"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:124
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:124
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:124
 msgid "Text Width (mm)"
 msgstr "テキスト幅(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:137
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:137
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:137
 msgid "Text Height (mm)"
 msgstr "テキスト高さ(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:150
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:150
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:150
 msgid "Constraints:"
 msgstr "制約:"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:160
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:160
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:160
 msgid "Max Size X (mm)"
 msgstr "最大Xサイズ(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:173
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:173
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:173
 msgid "Max Size Y (mm)"
 msgstr "最大Yサイズ(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:199
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:199
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:199
 msgid "Comment"
 msgstr "コメント"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:325
-#: pcbnew/class_pcb_text.cpp:151 pcbnew/class_text_mod.cpp:398
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:64
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:39
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:325
+#: kicad-6297/pcbnew/class_pcb_text.cpp:151
+#: kicad-6297/pcbnew/class_text_mod.cpp:398
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.cpp:39
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:325
+#: kicad-6996/pcbnew/class_pcb_text.cpp:151
+#: kicad-6996/pcbnew/class_text_mod.cpp:375
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.cpp:39
 msgid "Thickness"
 msgstr "太さ"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:335
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:335
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:335
 msgid "Set to 0 to use default"
 msgstr "0を指定すると、デフォルト値が使用されます"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:365
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:365
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:365
 msgid "Bitmap PPI"
 msgstr "ビットマップPixel/Inch"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:378
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:378
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:378
 msgid "Repeat parameters:"
 msgstr "パラメータの繰り返し:"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:388
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:388
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:388
 msgid "Repeat count"
 msgstr "繰り返し数"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:400
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:400
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:400
 msgid "Text Increment"
 msgstr "テキストの増分"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:419
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:419
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:419
 msgid "Step X (mm)"
 msgstr "Xステップ(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:432
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:432
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:432
 msgid "Step Y (mm)"
 msgstr "Yステップ(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:449
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:449
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:449
 msgid "Item Properties"
 msgstr "アイテムのプロパティ"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:458
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:458
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:458
 msgid "Default Values:"
 msgstr "デフォルト値:"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:468
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:468
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:468
 msgid "Text Size X (mm)"
 msgstr "テキストサイズ X(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:481
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:481
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:481
 msgid "Text Size Y (mm)"
 msgstr "テキストサイズ Y(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:500
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:500
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:500
 msgid "Line Thickness (mm)"
 msgstr "線幅(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:513
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:53
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:513
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:53
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:513
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:50
 msgid "Text Thickness"
 msgstr "テキストの太さ"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:529
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:529
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:529
 msgid "Set to Default"
 msgstr "デフォルトに設定"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:538
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:538
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:538
 msgid "Page Margins"
 msgstr "ページ余白"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:548
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:548
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:548
 msgid "Left Margin (mm)"
 msgstr "左余白(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:561
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:561
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:561
 msgid "Right Margin (mm)"
 msgstr "右余白(mm)"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:580
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:580
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:580
 msgid "Top Margin (mm)"
 msgstr "上余白(mm)"
 
 # orペア下層
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:593
+#: kicad-6297/pagelayout_editor/dialogs/properties_frame_base.cpp:593
+#: kicad-6996/pagelayout_editor/dialogs/properties_frame_base.cpp:593
 msgid "Bottom Margin (mm)"
 msgstr "下余白"
 
-#: pagelayout_editor/files.cpp:46
+#: kicad-6297/pagelayout_editor/files.cpp:46
+#: kicad-6996/pagelayout_editor/files.cpp:46
 msgid "Page Layout Description File"
 msgstr "図枠ファイル"
 
-#: pagelayout_editor/files.cpp:51 pagelayout_editor/files.cpp:85
+#: kicad-6297/pagelayout_editor/files.cpp:51
+#: kicad-6297/pagelayout_editor/files.cpp:85
+#: kicad-6996/pagelayout_editor/files.cpp:51
+#: kicad-6996/pagelayout_editor/files.cpp:85
 msgid ""
 "The current page layout has been modified.\n"
 "Do you wish to discard the changes?"
@@ -10059,176 +13387,262 @@ msgstr ""
 "現在の図枠レイアウトは変更されています。\n"
 "変更を破棄しますか？"
 
-#: pagelayout_editor/files.cpp:60 pagelayout_editor/files.cpp:154
+#: kicad-6297/pagelayout_editor/files.cpp:60
+#: kicad-6297/pagelayout_editor/files.cpp:154
+#: kicad-6996/pagelayout_editor/files.cpp:60
+#: kicad-6996/pagelayout_editor/files.cpp:152
 #, c-format
 msgid "File <%s> loaded"
 msgstr "ファイル <%s> を読み込みました"
 
-#: pagelayout_editor/files.cpp:111 pagelayout_editor/onrightclick.cpp:52
+#: kicad-6297/pagelayout_editor/files.cpp:111
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:52
+#: kicad-6996/pagelayout_editor/files.cpp:111
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:52
 msgid "Append Page Layout Descr File"
 msgstr "図枠ファイルを追加"
 
-#: pagelayout_editor/files.cpp:122 pagelayout_editor/files.cpp:148
+#: kicad-6297/pagelayout_editor/files.cpp:122
+#: kicad-6297/pagelayout_editor/files.cpp:148
+#: kicad-6996/pagelayout_editor/files.cpp:121
+#: kicad-6996/pagelayout_editor/files.cpp:146
 #, c-format
 msgid "Unable to load %s file"
 msgstr "ファイル %s が読み込めませんでした"
 
-#: pagelayout_editor/files.cpp:130
+#: kicad-6297/pagelayout_editor/files.cpp:130
+#: kicad-6996/pagelayout_editor/files.cpp:129
 #, c-format
 msgid "File <%s> inserted"
 msgstr "ファイル %s を挿入しました"
 
-#: pagelayout_editor/files.cpp:138
+#: kicad-6297/pagelayout_editor/files.cpp:138
+#: kicad-6996/pagelayout_editor/files.cpp:137
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: pagelayout_editor/files.cpp:163
+#: kicad-6297/pagelayout_editor/files.cpp:163
+#: kicad-6996/pagelayout_editor/files.cpp:161
 #, c-format
 msgid "Unable to write <%s>"
 msgstr "<%s> を作成できません"
 
-#: pagelayout_editor/files.cpp:168 pagelayout_editor/files.cpp:200
+#: kicad-6297/pagelayout_editor/files.cpp:168
+#: kicad-6297/pagelayout_editor/files.cpp:200
+#: kicad-6996/pagelayout_editor/files.cpp:166
+#: kicad-6996/pagelayout_editor/files.cpp:197
 #, c-format
 msgid "File <%s> written"
 msgstr "ファイル <%s> に書き込みました"
 
-#: pagelayout_editor/files.cpp:175 pagelayout_editor/pl_editor_frame.cpp:243
+#: kicad-6297/pagelayout_editor/files.cpp:175
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:243
+#: kicad-6996/pagelayout_editor/files.cpp:173
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:245
 msgid "Create file"
 msgstr "ファイルの作成"
 
-#: pagelayout_editor/files.cpp:194 pagelayout_editor/pl_editor_frame.cpp:255
-#: pcbnew/exporters/export_gencad.cpp:267
+#: kicad-6297/pagelayout_editor/files.cpp:194
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:255
+#: kicad-6297/pcbnew/exporters/export_gencad.cpp:267
+#: kicad-6996/pagelayout_editor/files.cpp:191
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:256
+#: kicad-6996/pcbnew/exporters/export_gencad.cpp:266
 #, c-format
 msgid "Unable to create <%s>"
 msgstr "<%s> を作成できません"
 
-#: pagelayout_editor/menubar.cpp:62
-msgid "&New Page Layout Design"
-msgstr "新規図枠(&N)"
-
-#: pagelayout_editor/menubar.cpp:65
-msgid "Load Page Layout &File"
-msgstr "図枠ファイルの読み込み(&F)"
-
-#: pagelayout_editor/menubar.cpp:68
-msgid "Load &Default Page Layout"
-msgstr "デフォルト図枠の読み込み(&D)"
-
-#: pagelayout_editor/menubar.cpp:85
-msgid "Open &Recent Page Layout File"
-msgstr "最近開いた図枠ファイル(&R)"
-
-#: pagelayout_editor/menubar.cpp:91
-msgid "&Save Page Layout Design"
-msgstr "図枠を保存(&S)"
-
-#: pagelayout_editor/menubar.cpp:96
-msgid "Save Page Layout Design &As"
-msgstr "名前をつけて図枠を保存(&A)"
-
-#: pagelayout_editor/menubar.cpp:103
-msgid "Print Pre&view"
-msgstr "印刷プレビュー(&V)"
-
-#: pagelayout_editor/menubar.cpp:112
-msgid "&Close Page Layout Editor"
-msgstr "図枠エディタの終了(&C)"
-
-#: pagelayout_editor/menubar.cpp:121 pagelayout_editor/pl_editor_config.cpp:58
-msgid "&BackGround Black"
-msgstr "背景を黒色にする(&B)"
-
-#: pagelayout_editor/menubar.cpp:121 pagelayout_editor/pl_editor_config.cpp:59
-msgid "&BackGround White"
-msgstr "背景を白色にする(&B)"
-
-#: pagelayout_editor/menubar.cpp:126 pagelayout_editor/pl_editor_config.cpp:66
-msgid "Hide &Grid"
-msgstr "グリッドを非表示"
-
-#: pagelayout_editor/menubar.cpp:126 pagelayout_editor/pl_editor_config.cpp:67
-msgid "Show &Grid"
-msgstr "グリッドを表示"
-
-#: pagelayout_editor/menubar.cpp:151
-msgid "Page Layout Editor &Manual"
-msgstr "図枠エディタ マニュアル(&M)"
-
-#: pagelayout_editor/menubar.cpp:152
-msgid "Open the Page Layout Editor Manual"
-msgstr "図枠エディタ マニュアルを開く"
-
-#: pagelayout_editor/onrightclick.cpp:45 pcbnew/muwave_command.cpp:60
-msgid "Add Line"
-msgstr "線の追加"
-
-#: pagelayout_editor/onrightclick.cpp:47
-msgid "Add Rectangle"
-msgstr "矩形を追加"
-
-#: pagelayout_editor/onrightclick.cpp:49 pcbnew/tool_modedit.cpp:179
-msgid "Add Text"
-msgstr "テキストを追加"
-
-#: pagelayout_editor/onrightclick.cpp:55
-msgid "Add Bitmap"
-msgstr "ビットマップを追加"
-
-#: pagelayout_editor/onrightclick.cpp:83
-msgid "Move Start Point"
-msgstr "始点を移動"
-
-#: pagelayout_editor/onrightclick.cpp:91
-msgid "Move End Point"
-msgstr "終点を移動"
-
-#: pagelayout_editor/onrightclick.cpp:97
-#: pcbnew/dialogs/dialog_move_exact_base.h:69
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:79
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:97
+#: kicad-6297/pcbnew/hotkeys.cpp:117
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:82
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:97
+#: kicad-6996/pcbnew/hotkeys.cpp:118
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.h:69
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.h:69
 msgid "Move Item"
 msgstr "アイテムの移動"
 
-#: pagelayout_editor/onrightclick.cpp:111
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:80
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:111
+#: kicad-6297/pcbnew/hotkeys.cpp:112
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:83
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:111
+#: kicad-6996/pcbnew/hotkeys.cpp:113
 msgid "Place Item"
 msgstr "アイテムの配置"
 
-#: pagelayout_editor/page_layout_writer.cpp:103
-#: pagelayout_editor/page_layout_writer.cpp:130
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:81
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:83
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:84
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:83
+msgid "Move Start Point"
+msgstr "始点を移動"
+
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:83
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:91
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:86
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:91
+msgid "Move End Point"
+msgstr "終点を移動"
+
+#: kicad-6297/pagelayout_editor/hotkeys.cpp:119
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:122
+msgid "Page Layout Editor"
+msgstr "図枠エディタ"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:62
+#: kicad-6996/pagelayout_editor/menubar.cpp:63
+msgid "&New Page Layout Design"
+msgstr "新規図枠(&N)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:65
+#: kicad-6996/pagelayout_editor/menubar.cpp:66
+msgid "Load Page Layout &File"
+msgstr "図枠ファイルの読み込み(&F)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:68
+#: kicad-6996/pagelayout_editor/menubar.cpp:69
+msgid "Load &Default Page Layout"
+msgstr "デフォルト図枠の読み込み(&D)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:85
+#: kicad-6996/pagelayout_editor/menubar.cpp:86
+msgid "Open &Recent Page Layout File"
+msgstr "最近開いた図枠ファイル(&R)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:91
+#: kicad-6996/pagelayout_editor/menubar.cpp:92
+msgid "&Save Page Layout Design"
+msgstr "図枠を保存(&S)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:96
+#: kicad-6996/pagelayout_editor/menubar.cpp:97
+msgid "Save Page Layout Design &As"
+msgstr "名前をつけて図枠を保存(&A)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:103
+#: kicad-6996/pagelayout_editor/menubar.cpp:104
+msgid "Print Pre&view"
+msgstr "印刷プレビュー(&V)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:112
+#: kicad-6996/pagelayout_editor/menubar.cpp:113
+msgid "&Close Page Layout Editor"
+msgstr "図枠エディタの終了(&C)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:121
+#: kicad-6297/pagelayout_editor/pl_editor_config.cpp:58
+#: kicad-6996/pagelayout_editor/menubar.cpp:122
+#: kicad-6996/pagelayout_editor/pl_editor_config.cpp:58
+msgid "&Background Black"
+msgstr "背景を黒色にする(&B)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:121
+#: kicad-6297/pagelayout_editor/pl_editor_config.cpp:59
+#: kicad-6996/pagelayout_editor/menubar.cpp:122
+#: kicad-6996/pagelayout_editor/pl_editor_config.cpp:59
+msgid "&Background White"
+msgstr "背景を白色にする(&B)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:126
+#: kicad-6297/pagelayout_editor/pl_editor_config.cpp:66
+#: kicad-6996/pagelayout_editor/menubar.cpp:127
+#: kicad-6996/pagelayout_editor/pl_editor_config.cpp:66
+msgid "Hide &Grid"
+msgstr "グリッドを非表示"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:126
+#: kicad-6297/pagelayout_editor/pl_editor_config.cpp:67
+#: kicad-6996/pagelayout_editor/menubar.cpp:127
+#: kicad-6996/pagelayout_editor/pl_editor_config.cpp:67
+msgid "Show &Grid"
+msgstr "グリッドを表示"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:151
+#: kicad-6996/pagelayout_editor/menubar.cpp:149
+msgid "Page Layout Editor &Manual"
+msgstr "図枠エディタ マニュアル(&M)"
+
+#: kicad-6297/pagelayout_editor/menubar.cpp:152
+#: kicad-6996/pagelayout_editor/menubar.cpp:150
+msgid "Open the Page Layout Editor Manual"
+msgstr "図枠エディタ マニュアルを開く"
+
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:45
+#: kicad-6297/pcbnew/muwave_command.cpp:60
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:45
+#: kicad-6996/pcbnew/muwave_command.cpp:60
+msgid "Add Line"
+msgstr "線の追加"
+
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:47
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:47
+msgid "Add Rectangle"
+msgstr "矩形を追加"
+
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:49
+#: kicad-6297/pcbnew/tool_modedit.cpp:179
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:49
+#: kicad-6996/pcbnew/tool_modedit.cpp:182
+msgid "Add Text"
+msgstr "テキストを追加"
+
+#: kicad-6297/pagelayout_editor/onrightclick.cpp:55
+#: kicad-6996/pagelayout_editor/onrightclick.cpp:55
+msgid "Add Bitmap"
+msgstr "ビットマップを追加"
+
+#: kicad-6297/pagelayout_editor/page_layout_writer.cpp:103
+#: kicad-6297/pagelayout_editor/page_layout_writer.cpp:130
+#: kicad-6996/pagelayout_editor/page_layout_writer.cpp:105
+#: kicad-6996/pagelayout_editor/page_layout_writer.cpp:133
 msgid "Error writing page layout descr file"
 msgstr "図枠ファイル書き込み中のエラー"
 
-#: pagelayout_editor/pl_editor.cpp:149
+#: kicad-6297/pagelayout_editor/pl_editor.cpp:149
+#: kicad-6996/pagelayout_editor/pl_editor.cpp:149
 msgid "pl_editor is already running. Continue?"
 msgstr "図枠エディタは既に実行中です。続けますか？"
 
-#: pagelayout_editor/pl_editor.cpp:186
+#: kicad-6297/pagelayout_editor/pl_editor.cpp:186
+#: kicad-6996/pagelayout_editor/pl_editor.cpp:186
 #, c-format
 msgid "Error when loading file <%s>"
 msgstr "<%s> ファイルの読み込み中エラー"
 
-#: pagelayout_editor/pl_editor_frame.cpp:114
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:114
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:115
 msgid "coord origin: Right Bottom page corner"
 msgstr "原点位置: 用紙の左下角"
 
-#: pagelayout_editor/pl_editor_frame.cpp:139
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:302
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:236
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:139
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:302
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:236
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:140
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:293
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:227
 msgid "Properties"
 msgstr "プロパティ"
 
-#: pagelayout_editor/pl_editor_frame.cpp:146
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:146
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:147
 msgid "Design"
 msgstr "デザイン"
 
-#: pagelayout_editor/pl_editor_frame.cpp:200
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:200
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:201
 #, c-format
 msgid "Error when loading file '%s'"
 msgstr "'%s' ファイルの読み込み中のエラー"
 
-#: pagelayout_editor/pl_editor_frame.cpp:222
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:222
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:224
 msgid "Save changes in a new file before closing?"
 msgstr "終了前に、変更を新規ファイルに保存しますか？"
 
-#: pagelayout_editor/pl_editor_frame.cpp:224
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:224
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:226
 #, c-format
 msgid ""
 "Save the changes in\n"
@@ -10238,54 +13652,67 @@ msgstr ""
 "閉じる前に変更を保存しますか？\n"
 "<%s>"
 
-#: pagelayout_editor/pl_editor_frame.cpp:456
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:456
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:457
 #, c-format
 msgid "Page size: width %.4g height %.4g"
 msgstr "ページサイズ: 幅 %.4g 高さ %.4g"
 
-#: pagelayout_editor/pl_editor_frame.cpp:501
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:501
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:502
 #, c-format
 msgid "coord origin: %s"
 msgstr "原点位置: %s"
 
-#: pagelayout_editor/pl_editor_frame.cpp:731
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:731
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:731
 msgid "(start or end point)"
 msgstr "(始点または終点)"
 
-#: pagelayout_editor/pl_editor_frame.cpp:735
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:735
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:735
 msgid "(start point)"
 msgstr "(始点)"
 
-#: pagelayout_editor/pl_editor_frame.cpp:738
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:738
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:738
 msgid "(end point)"
 msgstr "(終点)"
 
-#: pagelayout_editor/pl_editor_frame.cpp:747 pcbnew/controle.cpp:231
-#: pcbnew/modedit.cpp:130
+#: kicad-6297/pagelayout_editor/pl_editor_frame.cpp:747
+#: kicad-6297/pcbnew/controle.cpp:231 kicad-6297/pcbnew/modedit.cpp:130
+#: kicad-6996/pagelayout_editor/pl_editor_frame.cpp:747
+#: kicad-6996/pcbnew/controle.cpp:231 kicad-6996/pcbnew/modedit.cpp:131
 msgid "Selection Clarification"
 msgstr "明示的な選択"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:51
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:51
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:52
 msgid "New page layout design"
 msgstr "新規図枠"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:54
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:54
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:55
 msgid "Load a page layout file. Previous data will be deleted"
 msgstr "図枠ファイルの読み込み（以前の図枠は削除されます）"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:57
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:57
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:58
 msgid "Save page layout design"
 msgstr "図枠の保存"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:64
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:64
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:65
 msgid "Print page layout"
 msgstr "図枠の印刷"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:68
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:68
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:69
 msgid "Delete selected item"
 msgstr "選択したアイテムを削除"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:94
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:94
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:103
 msgid ""
 "Show title block like it will be displayed in applications\n"
 "texts with format are replaced by the full text"
@@ -10293,7 +13720,8 @@ msgstr ""
 "アプリケーションで表示されるタイトル ブロックを表示\n"
 "（テキスト部にはフォーマット指定が反映された内容が表示されます）"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:99
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:99
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:108
 msgid ""
 "Show title block in edit mode: texts are shown as is:\n"
 "texts with format are displayed with no change"
@@ -10301,41 +13729,50 @@ msgstr ""
 "編集モードでタイトル ブロックを表示\n"
 "（テキスト部にはフォーマット指定子が表示されます）"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:107
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:107
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:116
 msgid "Left Top paper corner"
 msgstr "用紙の左上角"
 
 # orペア下層
-#: pagelayout_editor/toolbars_pl_editor.cpp:108
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:108
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:117
 msgid "Right Bottom page corner"
 msgstr "ページの右下角"
 
 # orペア下層
-#: pagelayout_editor/toolbars_pl_editor.cpp:109
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:109
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:118
 msgid "Left Bottom page corner"
 msgstr "ページの左下角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:110
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:110
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:119
 msgid "Right Top page corner"
 msgstr "ページの右上角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:111
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:111
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:120
 msgid "Left Top page corner"
 msgstr "ページの左上角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:118
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:118
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:127
 msgid " Origin of coordinates displayed to the status bar"
 msgstr " ステータス バーに現在の原点設定が表示されています"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:131
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:131
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:140
 msgid "Page 1"
 msgstr "ページ1"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:132
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:132
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:141
 msgid "Other pages"
 msgstr "その他のページ"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:139
+#: kicad-6297/pagelayout_editor/toolbars_pl_editor.cpp:139
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:148
 msgid ""
 "Simulate page 1 or other pages to show how items\n"
 "which are not on all page are displayed"
@@ -10343,129 +13780,177 @@ msgstr ""
 "アイテム表示を、1ページ目、またはそれ以降のページ用に表示させます。\n"
 "これらは全てのページは表示されません。"
 
-#: pcb_calculator/UnitSelector.cpp:39
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:39
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:39
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:71
 msgid "um"
 msgstr "um"
 
-#: pcb_calculator/UnitSelector.cpp:40
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:40
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:40
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:72
 msgid "cm"
 msgstr "cm"
 
-#: pcb_calculator/UnitSelector.cpp:41
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:41
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:41
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:73
 msgid "mil"
 msgstr "mils"
 
-#: pcb_calculator/UnitSelector.cpp:42
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:191
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:46
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:64
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:90
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:191
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:64
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:90
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:42
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:184
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:64
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:90
 msgid "inch"
 msgstr "inch"
 
-#: pcb_calculator/UnitSelector.cpp:70
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:70
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:104
 msgid "GHz"
 msgstr "GHz"
 
-#: pcb_calculator/UnitSelector.cpp:71
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:71
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:105
 msgid "MHz"
 msgstr "MHz"
 
-#: pcb_calculator/UnitSelector.cpp:72
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:72
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:106
 msgid "KHz"
 msgstr "KHz"
 
-#: pcb_calculator/UnitSelector.cpp:73
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:73
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:107
 msgid "Hz"
 msgstr "Hz"
 
-#: pcb_calculator/UnitSelector.cpp:99
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:99
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:133
 msgid "Radian"
 msgstr "ラジアン"
 
-#: pcb_calculator/UnitSelector.cpp:100
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:100
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:134
 msgid "Degree"
 msgstr "度"
 
-#: pcb_calculator/UnitSelector.cpp:124
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:389
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:478
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:124
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:389
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:478
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:158
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:391
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:480
 msgid "Ohm"
 msgstr "Ω"
 
-#: pcb_calculator/UnitSelector.cpp:125
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:97
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:112
+#: kicad-6297/pcb_calculator/UnitSelector.cpp:125
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:97
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:112
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:159
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:96
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:110
 msgid "KOhm"
 msgstr "kΩ"
 
-#: pcb_calculator/attenuators.cpp:107
+#: kicad-6297/pcb_calculator/attenuators.cpp:107
+#: kicad-6996/pcb_calculator/attenuators.cpp:114
 #, c-format
 msgid "Attenuation more than %f dB"
 msgstr "減衰量は %f dB 以上に設定してください"
 
-#: pcb_calculator/datafile_read_write.cpp:76
+#: kicad-6297/pcb_calculator/datafile_read_write.cpp:76
+#: kicad-6996/pcb_calculator/datafile_read_write.cpp:76
 msgid "Data file error."
 msgstr "データ ファイル エラー"
 
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:36
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:134
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:36
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:134
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:36
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:131
 msgid "Vref"
 msgstr "Vref"
 
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:43
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:401
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:490
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:43
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:401
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:490
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:43
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:403
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:492
 msgid "Volt"
 msgstr "V"
 
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:51
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:51
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:51
 msgid "Separate sense pin"
 msgstr "Vref 検出端子が独立(4端子)"
 
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:51
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:51
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:51
 msgid "3 terminals regulator"
 msgstr "三端子レギュレータ"
 
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:60
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:151
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:60
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:151
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:60
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:147
 msgid "Iadj"
 msgstr "Iadj"
 
-#: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:67
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:161
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:67
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:161
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.cpp:67
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:156
 msgid "uA"
 msgstr "μA"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:62
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1183
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:62
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1183
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:62
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1162
 msgid "Formula"
 msgstr "計算式"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:64
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:64
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:64
 msgid "Vout = Vref * (R1 + R2) / R2"
 msgstr "Vout = Vref * (R1 + R2) / R2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:89
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1130
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:89
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1130
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:89
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1112
 msgid "R1"
 msgstr "R1"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:104
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1142
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:104
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1142
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:103
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1123
 msgid "R2"
 msgstr "R2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:119
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:119
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:117
 msgid "Vout"
 msgstr "Vout"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:127
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:144
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:127
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:144
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:124
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:140
 msgid "V"
 msgstr "V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:136
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:136
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:133
 msgid ""
 "The internal reference voltage of the regulator.\n"
 "Should not be 0."
@@ -10473,11 +13958,13 @@ msgstr ""
 "レギュレータ内部での基準電圧です。\n"
 "0を設定することはできません。"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:153
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:153
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:149
 msgid "For 3 terminal regulators only, the  Adjust pin current."
 msgstr "3端子レギュレータのみ、Adjustピンの電流。"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:170
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:170
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:165
 msgid ""
 "Type of the regulator.\n"
 "There are 2 types:\n"
@@ -10489,255 +13976,343 @@ msgstr ""
 "- 出力電圧設定のための独立したSensピンあるもの.n\n"
 "- 3端子レギュレータ."
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:174
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:174
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:169
 msgid "Standard Type"
 msgstr "スタンダード"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:174
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:174
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:169
 msgid "3 Terminal Type"
 msgstr "三端子タイプ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:186
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1112
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:186
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1112
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:181
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1094
 msgid "Calculate"
 msgstr "計算"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:190
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:190
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:185
 msgid "Regulator"
 msgstr "レギュレータ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:197
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:197
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:192
 msgid "Regulators data file:"
 msgstr "レギュレータ データ ファイル:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:199
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:199
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:194
 msgid "The name of the data file which stores known regulators parameters."
 msgstr "既存のレギュレータのパラメータで保存されているデータ ファイル名。"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:219
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:219
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:213
 msgid "Edit Regulator"
 msgstr "レギュレータの編集"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:220
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:220
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:214
 msgid "Edit the current selected regulator."
 msgstr "選択されているレギュレータを編集"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:224
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:224
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:218
 msgid "Add Regulator"
 msgstr "レギュレータの追加"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:225
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:225
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:219
 msgid "Enter a new item to the current list of available regulators"
 msgstr "レギュレータ リストへ新しい項目を追加します"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:229
-#: pcb_calculator/regulators_funct.cpp:321
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:229
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:321
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:223
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:322
 msgid "Remove Regulator"
 msgstr "レギュレータの削除"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:230
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:230
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:224
 msgid "Remove an item from the current list of available regulators"
 msgstr "レギュレータのリストから項目を削除します"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:240
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:240
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:234
 msgid "Message"
 msgstr "メッセージ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:251
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:251
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:245
 msgid "Regulators"
 msgstr "レギュレータ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:260
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:260
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:254
 msgid "Parameters"
 msgstr "パラメータ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:268
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:268
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:262
 msgid "Current"
 msgstr "電流"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:280
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:280
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:275
 msgid "Temperature rise"
 msgstr "温度上昇"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:288
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:288
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:282
 msgid "deg C"
 msgstr "℃"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:292
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:292
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:286
 msgid "Conductor length"
 msgstr "導体長"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:305
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:305
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:298
 msgid "Resistivity"
 msgstr "抵抗率"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:312
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:312
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:305
 msgid "Ohm-meter"
 msgstr "電気抵抗計"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:335
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:335
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:328
 msgid "External layer traces"
 msgstr "外層配線"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:343
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:432
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:343
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:432
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:336
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:434
 msgid "Trace width"
 msgstr "配線幅"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:356
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:445
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:356
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:445
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:350
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:448
 msgid "Trace thickness"
 msgstr "配線の銅箔厚"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:369
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:458
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:369
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:458
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:371
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:460
 msgid "Cross-section area"
 msgstr "断面積"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:373
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:385
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:397
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:409
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:462
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:474
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:486
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:498
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:966
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:974
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:978
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:982
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:986
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:990
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:994
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:998
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1002
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1006
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1010
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1014
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1018
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:170
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:373
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:385
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:397
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:409
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:462
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:474
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:486
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:498
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:966
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:974
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:978
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:982
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:986
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:990
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:994
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:998
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1002
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1006
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1010
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1014
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1018
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:170
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:375
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:387
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:399
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:411
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:464
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:476
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:488
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:500
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:951
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:955
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:959
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:963
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:967
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:971
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:975
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:979
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:983
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:987
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:991
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:995
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:999
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1003
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:245
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:170
 msgid "dummy"
 msgstr "ダミー"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:377
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:466
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:377
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:466
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:379
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:468
 msgid "mm ^ 2"
 msgstr "mm^2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:381
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:470
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:381
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:470
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:383
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:472
 msgid "Resistance"
 msgstr "抵抗"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:393
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:482
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:393
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:482
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:395
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:484
 msgid "Voltage drop"
 msgstr "電圧降下"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:405
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:494
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:405
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:494
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:407
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:496
 msgid "Power loss"
 msgstr "電力損失"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:413
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:502
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:413
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:502
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:415
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:504
 msgid "Watt"
 msgstr "W"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:424
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:424
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:426
 msgid "Internal layer traces"
 msgstr "内層配線"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:519
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:49
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:519
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:49
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:521
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:49
 msgid "Track Width"
 msgstr "配線幅"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:535
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:535
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:537
 msgid "Voltage > 500V:"
 msgstr "電圧 > 500V:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:543
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:543
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:544
 msgid "Update Values"
 msgstr "値の更新"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:552
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:552
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:553
 msgid "Note: Values are minimal values (from IPC 2221)"
 msgstr ""
 "注: 値は最小値です (IPC 2221 より) 　設計時には他の規格も確認して下さい"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:571
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:571
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:572
 msgid "B1"
 msgstr "B1"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:572
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:572
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:573
 msgid "B2"
 msgstr "B2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:573
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:573
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:574
 msgid "B3"
 msgstr "B3"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:574
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:574
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:575
 msgid "B4"
 msgstr "B4"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:575
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:575
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:576
 msgid "A5"
 msgstr "A5"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:576
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:576
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:577
 msgid "A6"
 msgstr "A6"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:577
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:577
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:578
 msgid "A7"
 msgstr "A7"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:584
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:584
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:585
 msgid "0 ... 15V"
 msgstr "0 ... 15V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:585
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:585
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:586
 msgid "16 ... 30V"
 msgstr "16 ... 30V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:586
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:586
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:587
 msgid "31 ... 50V"
 msgstr "31 ... 50V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:587
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:587
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:588
 msgid "51 ... 100V"
 msgstr "51 ... 100V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:588
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:588
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:589
 msgid "101 ... 150V"
 msgstr "101 ... 150V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:589
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:589
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:590
 msgid "151 ... 170V"
 msgstr "151 ... 170V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:590
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:590
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:591
 msgid "171 ... 250V"
 msgstr "171 ... 250V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:591
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:591
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:592
 msgid "251 ... 300V"
 msgstr "251 ... 300V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:592
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:592
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:593
 msgid "301 ... 500V"
 msgstr "301 ... 500V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:593
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:593
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:594
 msgid " > 500V"
 msgstr " > 500V"
 
 # IPC2221 Table 6-1の説明
 # IEC60950など他の規格も参照する必要がある事は謳うべき？
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:602
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:602
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:603
 msgid ""
 "*  B1 - Internal Conductors\n"
 "*  B2 - External Conductors, uncoated, sea level to 3050 m\n"
@@ -10757,358 +14332,479 @@ msgstr ""
 "*  A6 - 外層　コンポーネント リード/終端, コーティングなし\n"
 "*  A7 - 外層　コンポーネント リード/終端, 絶縁保護コーティング (海抜によらず)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:613
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:613
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:614
 msgid "Electrical Spacing"
 msgstr "導体間隔"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Microstrip Line"
 msgstr "マイクロストリップ ライン"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Coplanar wave guide"
 msgstr "コプレーナ導波路"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Coplanar wave guide with ground plane"
 msgstr "グランド プレーン付きコプレーナ導波路"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Rectangular Waveguide"
 msgstr "方形導波管"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Coaxial Line"
 msgstr "同軸線路"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Coupled Microstrip Line"
 msgstr "カップルド マイクロストリップ ライン"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Stripline"
 msgstr "ストリップライン"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:622
 msgid "Twisted Pair"
 msgstr "ツイスト ペア"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:623
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:623
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:624
 msgid "Transmission Line Type:"
 msgstr "伝送線路のタイプ:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:640
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:640
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:641
 msgid "Substrate Parameters"
 msgstr "基本パラメータ:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:648
-#: pcb_calculator/transline_ident.cpp:142
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:648
+#: kicad-6297/pcb_calculator/transline_ident.cpp:142
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:649
+#: kicad-6996/pcb_calculator/transline_ident.cpp:142
 msgid "Er"
 msgstr "Er"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:656
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:667
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:680
-#: pcbnew/dialogs/dialog_drc_base.cpp:94
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:656
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:667
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:680
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:110
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:656
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:666
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:678
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:110
 msgid "..."
 msgstr "..."
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:659
-#: pcb_calculator/transline_ident.cpp:145
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:659
+#: kicad-6297/pcb_calculator/transline_ident.cpp:145
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:659
+#: kicad-6996/pcb_calculator/transline_ident.cpp:145
 msgid "TanD"
 msgstr "tanδ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:670
-#: pcb_calculator/transline_ident.cpp:150
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:670
+#: kicad-6297/pcb_calculator/transline_ident.cpp:150
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:669
+#: kicad-6996/pcb_calculator/transline_ident.cpp:150
 msgid "Rho"
 msgstr "Rho"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:672
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:672
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:671
 msgid "Specific resistance in ohms * meters"
 msgstr "Ω・mでの抵抗率"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:683
-#: pcb_calculator/transline_ident.cpp:171
-#: pcb_calculator/transline_ident.cpp:208
-#: pcb_calculator/transline_ident.cpp:240
-#: pcb_calculator/transline_ident.cpp:341
-#: pcb_calculator/transline_ident.cpp:377
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:683
+#: kicad-6297/pcb_calculator/transline_ident.cpp:171
+#: kicad-6297/pcb_calculator/transline_ident.cpp:208
+#: kicad-6297/pcb_calculator/transline_ident.cpp:240
+#: kicad-6297/pcb_calculator/transline_ident.cpp:341
+#: kicad-6297/pcb_calculator/transline_ident.cpp:377
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:681
+#: kicad-6996/pcb_calculator/transline_ident.cpp:171
+#: kicad-6996/pcb_calculator/transline_ident.cpp:208
+#: kicad-6996/pcb_calculator/transline_ident.cpp:240
+#: kicad-6996/pcb_calculator/transline_ident.cpp:341
+#: kicad-6996/pcb_calculator/transline_ident.cpp:377
 msgid "H"
 msgstr "H"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:696
-#: pcb_calculator/transline_ident.cpp:173
-#: pcb_calculator/transline_ident.cpp:343
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:696
+#: kicad-6297/pcb_calculator/transline_ident.cpp:173
+#: kicad-6297/pcb_calculator/transline_ident.cpp:343
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:693
+#: kicad-6996/pcb_calculator/transline_ident.cpp:173
+#: kicad-6996/pcb_calculator/transline_ident.cpp:343
 msgid "H_t"
 msgstr "H_t"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:709
-#: pcb_calculator/transline_ident.cpp:175
-#: pcb_calculator/transline_ident.cpp:210
-#: pcb_calculator/transline_ident.cpp:242
-#: pcb_calculator/transline_ident.cpp:345
-#: pcb_calculator/transline_ident.cpp:382
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:709
+#: kicad-6297/pcb_calculator/transline_ident.cpp:175
+#: kicad-6297/pcb_calculator/transline_ident.cpp:210
+#: kicad-6297/pcb_calculator/transline_ident.cpp:242
+#: kicad-6297/pcb_calculator/transline_ident.cpp:345
+#: kicad-6297/pcb_calculator/transline_ident.cpp:382
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:705
+#: kicad-6996/pcb_calculator/transline_ident.cpp:175
+#: kicad-6996/pcb_calculator/transline_ident.cpp:210
+#: kicad-6996/pcb_calculator/transline_ident.cpp:242
+#: kicad-6996/pcb_calculator/transline_ident.cpp:345
+#: kicad-6996/pcb_calculator/transline_ident.cpp:382
 msgid "T"
 msgstr "T"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:722
-#: pcb_calculator/transline_ident.cpp:177
-#: pcb_calculator/transline_ident.cpp:347
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:722
+#: kicad-6297/pcb_calculator/transline_ident.cpp:177
+#: kicad-6297/pcb_calculator/transline_ident.cpp:347
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:717
+#: kicad-6996/pcb_calculator/transline_ident.cpp:177
+#: kicad-6996/pcb_calculator/transline_ident.cpp:347
 msgid "Rough"
 msgstr "表面荒さ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:735
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:735
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:729
 msgid "mu Rel"
 msgstr "μ (比透磁率)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:748
-#: pcb_calculator/transline_ident.cpp:182
-#: pcb_calculator/transline_ident.cpp:212
-#: pcb_calculator/transline_ident.cpp:244
-#: pcb_calculator/transline_ident.cpp:279
-#: pcb_calculator/transline_ident.cpp:310
-#: pcb_calculator/transline_ident.cpp:349
-#: pcb_calculator/transline_ident.cpp:384
-#: pcb_calculator/transline_ident.cpp:412
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:748
+#: kicad-6297/pcb_calculator/transline_ident.cpp:182
+#: kicad-6297/pcb_calculator/transline_ident.cpp:212
+#: kicad-6297/pcb_calculator/transline_ident.cpp:244
+#: kicad-6297/pcb_calculator/transline_ident.cpp:279
+#: kicad-6297/pcb_calculator/transline_ident.cpp:310
+#: kicad-6297/pcb_calculator/transline_ident.cpp:349
+#: kicad-6297/pcb_calculator/transline_ident.cpp:384
+#: kicad-6297/pcb_calculator/transline_ident.cpp:412
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:741
+#: kicad-6996/pcb_calculator/transline_ident.cpp:182
+#: kicad-6996/pcb_calculator/transline_ident.cpp:212
+#: kicad-6996/pcb_calculator/transline_ident.cpp:244
+#: kicad-6996/pcb_calculator/transline_ident.cpp:279
+#: kicad-6996/pcb_calculator/transline_ident.cpp:310
+#: kicad-6996/pcb_calculator/transline_ident.cpp:349
+#: kicad-6996/pcb_calculator/transline_ident.cpp:384
+#: kicad-6996/pcb_calculator/transline_ident.cpp:412
 msgid "mu Rel C"
 msgstr "μ (比透磁率) C (導体)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:768
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:768
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:760
 msgid "Component Parameters:"
 msgstr "コンポーネント パラメータ:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:776
-#: pcb_calculator/transline_ident.cpp:156
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:776
+#: kicad-6297/pcb_calculator/transline_ident.cpp:156
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:768
+#: kicad-6996/pcb_calculator/transline_ident.cpp:156
 msgid "Frequency"
 msgstr "周波数"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:811
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:811
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:802
 msgid "Physical Parameters"
 msgstr "物理パラメータ:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:822
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:822
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:813
 msgid "Prm1"
 msgstr "Prm1"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:838
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:838
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:828
 msgid "prm2"
 msgstr "prm2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:854
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:854
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:843
 msgid "prm3"
 msgstr "prm3"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:888
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:888
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:876
 msgid "Analyze"
 msgstr "分析"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:891
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:891
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:879
 msgid "Synthetize"
 msgstr "合成"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:904
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:904
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:892
 msgid "Electrical Parameters:"
 msgstr "電気的パラメータ:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:912
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:925
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:912
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:925
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:900
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:912
 msgid "Z"
 msgstr "Z"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:938
-#: pcbnew/class_drawsegment.cpp:377 pcbnew/class_drawsegment.cpp:395
-#: pcbnew/class_module.cpp:603 pcbnew/class_pad.cpp:682
-#: pcbnew/class_pcb_text.cpp:148 pcbnew/class_text_mod.cpp:395
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:938
+#: kicad-6297/pcbnew/class_drawsegment.cpp:379
+#: kicad-6297/pcbnew/class_drawsegment.cpp:397
+#: kicad-6297/pcbnew/class_module.cpp:603 kicad-6297/pcbnew/class_pad.cpp:664
+#: kicad-6297/pcbnew/class_pcb_text.cpp:148
+#: kicad-6297/pcbnew/class_text_mod.cpp:395
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:924
+#: kicad-6996/pcbnew/class_drawsegment.cpp:379
+#: kicad-6996/pcbnew/class_drawsegment.cpp:397
+#: kicad-6996/pcbnew/class_pad.cpp:680 kicad-6996/pcbnew/class_pcb_text.cpp:148
+#: kicad-6996/pcbnew/class_text_mod.cpp:372
 msgid "Angle"
 msgstr "角度"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:958
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:958
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:943
 msgid "Results:"
 msgstr "結果:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1035
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1035
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1020
 msgid "TransLine"
 msgstr "伝送線路"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1038
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1038
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1023
 msgid "label"
 msgstr "ラベル"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1028
 msgid "PI"
 msgstr "パイ型"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1028
 msgid "Tee"
 msgstr "T型"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1028
 msgid "Bridged Tee"
 msgstr "ブリッジT型"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1043
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1028
 msgid "Resistive Splitter"
 msgstr "抵抗分割型"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1045
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1045
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1030
 msgid "Attenuators:"
 msgstr "アッテネータ:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1059
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1059
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1044
 msgid "Parameters:"
 msgstr "パラメータ:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1067
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1067
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1052
 msgid "Attenuation"
 msgstr "減衰量"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1075
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1075
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1059
 msgid "dB"
 msgstr "dB"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1079
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1079
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1063
 msgid "Zin"
 msgstr "Zin"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1087
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1099
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1138
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1150
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1162
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1087
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1099
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1138
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1150
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1162
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1070
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1081
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1119
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1130
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1141
 msgid "Ohms"
 msgstr "Ω"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1091
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1091
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1074
 msgid "Zout"
 msgstr "Zout"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1122
-#: pcbnew/class_pcb_layer_widget.cpp:78
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1122
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:78
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1104
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:78
 msgid "Values"
 msgstr "値"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1154
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1154
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1134
 msgid "R3"
 msgstr "R3"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1197
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1197
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1174
 msgid "RF Attenuators"
 msgstr "RFアッテネータ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "10%"
 msgstr "10%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "5%"
 msgstr "5%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "2%"
 msgstr "2%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "1%"
 msgstr "1%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "0.5%"
 msgstr "0.5%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "0.25%"
 msgstr "0.25%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "0.1%"
 msgstr "0.1%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1179
 msgid "0.05%"
 msgstr "0.05%"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1204
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1233
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1204
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1233
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1181
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1210
 msgid "Tolerance"
 msgstr "誤差"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1213
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1213
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1190
 msgid "1st Band"
 msgstr "第１帯"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1217
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1217
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1194
 msgid "2nd Band"
 msgstr "第２帯"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1221
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1221
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1198
 msgid "3rd Band"
 msgstr "第３帯"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1225
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1225
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1202
 msgid "4rd Band"
 msgstr "第４帯"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1229
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1229
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1206
 msgid "Multiplier"
 msgstr "乗数"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1262
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1262
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1239
 msgid "Color Code"
 msgstr "カラーコード"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1275
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1275
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1252
 msgid "Note: Values are minimal values"
 msgstr "注: 値は最小値です。"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1294
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1294
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1271
 msgid "Class 1"
 msgstr "クラス 1"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1295
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1295
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1272
 msgid "Class 2"
 msgstr "クラス 2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1296
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1296
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1273
 msgid "Class 3"
 msgstr "クラス 3"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1297
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1297
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1274
 msgid "Class 4"
 msgstr "クラス 4"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1298
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1298
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1275
 msgid "Class 5"
 msgstr "クラス 5"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1299
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1299
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1276
 msgid "Class 6"
 msgstr "クラス 6"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1306
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1306
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1283
 msgid "Lines width"
 msgstr "配線幅"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1307
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1307
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1284
 msgid "Min clearance"
 msgstr "最小クリアランス"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1308
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1308
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1285
 msgid "Via: (diam - drill)"
 msgstr "ビア: (直径 - ドリル径)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1309
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1309
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1286
 msgid "Plated Pad: (diam - drill)"
 msgstr "PTHパッド:  (直径-ドリル)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1310
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1310
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1287
 msgid "NP Pad: (diam - drill)"
 msgstr "NPTHパッド(直径-ドリル)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1329
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1329
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1306
 msgid "Board Classes"
 msgstr "ボード クラス"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:144
+#: kicad-6297/pcb_calculator/pcb_calculator_frame.cpp:144
+#: kicad-6996/pcb_calculator/pcb_calculator_frame.cpp:144
 msgid ""
 "Data modified, and no data filename to save modifications\n"
 "Do you want to exit and abandon your change?"
@@ -11116,11 +14812,13 @@ msgstr ""
 "変更されたデータが保存されていません。\n"
 "変更を破棄して終了してよいですか？"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:146
+#: kicad-6297/pcb_calculator/pcb_calculator_frame.cpp:146
+#: kicad-6996/pcb_calculator/pcb_calculator_frame.cpp:146
 msgid "Regulator list change"
 msgstr "レギュレータが変更されています"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:157
+#: kicad-6297/pcb_calculator/pcb_calculator_frame.cpp:157
+#: kicad-6996/pcb_calculator/pcb_calculator_frame.cpp:157
 #, c-format
 msgid ""
 "Unable to write file<%s>\n"
@@ -11129,56 +14827,69 @@ msgstr ""
 "<%s>に書込めませんでした．\n"
 "変更を破棄して終了しますか？"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:161
+#: kicad-6297/pcb_calculator/pcb_calculator_frame.cpp:161
+#: kicad-6996/pcb_calculator/pcb_calculator_frame.cpp:161
 msgid "Write Data File Error"
 msgstr "データファイル書き出しエラー"
 
-#: pcb_calculator/regulators_funct.cpp:100
-#: pcb_calculator/regulators_funct.cpp:274
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:100
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:274
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:100
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:275
 msgid "Bad or missing parameters!"
 msgstr "パラメータ設定値が不正です!"
 
-#: pcb_calculator/regulators_funct.cpp:226
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:226
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:227
 #, c-format
 msgid "PCB Calculator data  file (*.%s)|*.%s"
 msgstr "Pcb Calculator データファイル (*.%s)|*.%s"
 
-#: pcb_calculator/regulators_funct.cpp:231
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:231
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:232
 msgid "Select a PCB Calculator data file"
 msgstr "Pcb Calculator データファイルの選択"
 
-#: pcb_calculator/regulators_funct.cpp:246
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:246
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:247
 msgid "Do you want to load this file and replace current regulator list?"
 msgstr "ファイルを読み込み、現在のレギュレータ設定を置換えて良いですか？"
 
-#: pcb_calculator/regulators_funct.cpp:262
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:262
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:263
 #, c-format
 msgid "Unable to read data file <%s>"
 msgstr "ファイル <%s> が読み込めません"
 
-#: pcb_calculator/regulators_funct.cpp:293
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:293
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:294
 msgid "This regulator is already in list. Aborted"
 msgstr "指定されたレギュレータは既にリストへ登録されています。"
 
-#: pcb_calculator/regulators_funct.cpp:397
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:397
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:398
 msgid " Vout must be greater than vref"
 msgstr " Vout は　Vref 以上にしてください。"
 
-#: pcb_calculator/regulators_funct.cpp:403
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:403
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:404
 msgid " Vref set to 0 !"
 msgstr " Vref が 0 に設定されています！"
 
-#: pcb_calculator/regulators_funct.cpp:409
+#: kicad-6297/pcb_calculator/regulators_funct.cpp:409
+#: kicad-6996/pcb_calculator/regulators_funct.cpp:410
 msgid "Incorrect value for R1 R2"
 msgstr "R1 R2 の値が正しくありません"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:446
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:446
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:449
 msgid ""
 "If you specify the maximum current, then the trace widths will be calculated "
 "to suit."
 msgstr "最大電流を指定した場合、配線幅は適応するように計算されます。"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:448
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:448
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:451
 msgid ""
 "If you specify one of the trace widths, the maximum current it can handle "
 "will be calculated. The width for the other trace to also handle this "
@@ -11187,11 +14898,13 @@ msgstr ""
 "配線幅の一つを指定した場合、流せる最大電流が計算されます。また、この電流を流"
 "すことができるように他の配線幅の計算が行われます。"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:452
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:452
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:455
 msgid "The controlling value is shown in bold."
 msgstr "コントロール値は、ボールド体で表示されます。"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:453
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:453
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:456
 msgid ""
 "The calculations are valid for currents up to 35A (external) or 17.5A "
 "(internal), temperature rises up to 100 deg C, and widths of up to 400mil "
@@ -11200,366 +14913,530 @@ msgstr ""
 "計算は、電流に対しては 35A (外部) または 17.5A (内部) まで、温度上昇は 100℃ "
 "まで、幅は 400mil (10mm) まで有効です。"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:456
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:456
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:459
 msgid "The formula, from IPC 2221, is"
 msgstr "計算式 (IPC 2221 より) は"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:458
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:458
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:461
 msgid "where:"
 msgstr "ここで:"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:459
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:459
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:462
 msgid "maximum current in amps"
 msgstr "アンペア表記による最大電流"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:461
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:461
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:464
 msgid "temperature rise above ambient in deg C"
 msgstr "℃ 表記による周囲に対する上昇温度"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:463
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:463
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:466
 msgid "width and thickness in mils"
 msgstr "mil 表記による幅と厚さ"
 
-#: pcb_calculator/tracks_width_versus_current.cpp:465
+#: kicad-6297/pcb_calculator/tracks_width_versus_current.cpp:465
+#: kicad-6996/pcb_calculator/tracks_width_versus_current.cpp:468
 msgid "0.024 for internal traces or 0.048 for external traces"
 msgstr "内層配線 0.024 または外層配線 0.048"
 
-#: pcb_calculator/transline_dlg_funct.cpp:66
+#: kicad-6297/pcb_calculator/transline_dlg_funct.cpp:66
+#: kicad-6996/pcb_calculator/transline_dlg_funct.cpp:66
 msgid "Relative Dielectric Constants"
 msgstr "比誘電率"
 
-#: pcb_calculator/transline_dlg_funct.cpp:96
+#: kicad-6297/pcb_calculator/transline_dlg_funct.cpp:96
+#: kicad-6996/pcb_calculator/transline_dlg_funct.cpp:96
 msgid "Dielectric Loss Factor"
 msgstr "誘電損失"
 
-#: pcb_calculator/transline_dlg_funct.cpp:124
+#: kicad-6297/pcb_calculator/transline_dlg_funct.cpp:124
+#: kicad-6996/pcb_calculator/transline_dlg_funct.cpp:124
 msgid "Specific Resistance"
 msgstr "固有抵抗"
 
-#: pcb_calculator/transline_ident.cpp:142
+#: kicad-6297/pcb_calculator/transline_ident.cpp:142
+#: kicad-6996/pcb_calculator/transline_ident.cpp:142
 msgid "Epsilon R: substrate relative dielectric constant"
 msgstr "Epsilon R: 比誘電率"
 
-#: pcb_calculator/transline_ident.cpp:145
+#: kicad-6297/pcb_calculator/transline_ident.cpp:145
+#: kicad-6996/pcb_calculator/transline_ident.cpp:145
 msgid "Tangent delta: dielectric loss factor."
 msgstr "Tanδ: 誘電損失"
 
-#: pcb_calculator/transline_ident.cpp:151
+#: kicad-6297/pcb_calculator/transline_ident.cpp:151
+#: kicad-6996/pcb_calculator/transline_ident.cpp:151
 msgid ""
 "Electrical resistivity or specific electrical resistance of conductor "
 "(Ohm*meter)"
 msgstr "電気抵抗率または導体固有の電気抵抗 (Ohm*meter)"
 
 # 原文の関連付けエラー？
-#: pcb_calculator/transline_ident.cpp:156
-#: pcb_calculator/transline_ident.cpp:171
-#: pcb_calculator/transline_ident.cpp:208
-#: pcb_calculator/transline_ident.cpp:240
-#: pcb_calculator/transline_ident.cpp:341
-#: pcb_calculator/transline_ident.cpp:377
+#: kicad-6297/pcb_calculator/transline_ident.cpp:156
+#: kicad-6297/pcb_calculator/transline_ident.cpp:171
+#: kicad-6297/pcb_calculator/transline_ident.cpp:208
+#: kicad-6297/pcb_calculator/transline_ident.cpp:240
+#: kicad-6297/pcb_calculator/transline_ident.cpp:341
+#: kicad-6297/pcb_calculator/transline_ident.cpp:377
+#: kicad-6996/pcb_calculator/transline_ident.cpp:156
+#: kicad-6996/pcb_calculator/transline_ident.cpp:171
+#: kicad-6996/pcb_calculator/transline_ident.cpp:208
+#: kicad-6996/pcb_calculator/transline_ident.cpp:240
+#: kicad-6996/pcb_calculator/transline_ident.cpp:341
+#: kicad-6996/pcb_calculator/transline_ident.cpp:377
 msgid "Height of Substrate"
 msgstr "サブストレートの高さ"
 
-#: pcb_calculator/transline_ident.cpp:165
-#: pcb_calculator/transline_ident.cpp:202
-#: pcb_calculator/transline_ident.cpp:234
-#: pcb_calculator/transline_ident.cpp:268
-#: pcb_calculator/transline_ident.cpp:301
-#: pcb_calculator/transline_ident.cpp:371
-#: pcb_calculator/transline_ident.cpp:404
+#: kicad-6297/pcb_calculator/transline_ident.cpp:165
+#: kicad-6297/pcb_calculator/transline_ident.cpp:202
+#: kicad-6297/pcb_calculator/transline_ident.cpp:234
+#: kicad-6297/pcb_calculator/transline_ident.cpp:268
+#: kicad-6297/pcb_calculator/transline_ident.cpp:301
+#: kicad-6297/pcb_calculator/transline_ident.cpp:371
+#: kicad-6297/pcb_calculator/transline_ident.cpp:404
+#: kicad-6996/pcb_calculator/transline_ident.cpp:165
+#: kicad-6996/pcb_calculator/transline_ident.cpp:202
+#: kicad-6996/pcb_calculator/transline_ident.cpp:234
+#: kicad-6996/pcb_calculator/transline_ident.cpp:268
+#: kicad-6996/pcb_calculator/transline_ident.cpp:301
+#: kicad-6996/pcb_calculator/transline_ident.cpp:371
+#: kicad-6996/pcb_calculator/transline_ident.cpp:404
 msgid "ErEff"
 msgstr "実効誘電率"
 
-#: pcb_calculator/transline_ident.cpp:166
-#: pcb_calculator/transline_ident.cpp:203
-#: pcb_calculator/transline_ident.cpp:235
-#: pcb_calculator/transline_ident.cpp:269
-#: pcb_calculator/transline_ident.cpp:302
-#: pcb_calculator/transline_ident.cpp:372
-#: pcb_calculator/transline_ident.cpp:405
+#: kicad-6297/pcb_calculator/transline_ident.cpp:166
+#: kicad-6297/pcb_calculator/transline_ident.cpp:203
+#: kicad-6297/pcb_calculator/transline_ident.cpp:235
+#: kicad-6297/pcb_calculator/transline_ident.cpp:269
+#: kicad-6297/pcb_calculator/transline_ident.cpp:302
+#: kicad-6297/pcb_calculator/transline_ident.cpp:372
+#: kicad-6297/pcb_calculator/transline_ident.cpp:405
+#: kicad-6996/pcb_calculator/transline_ident.cpp:166
+#: kicad-6996/pcb_calculator/transline_ident.cpp:203
+#: kicad-6996/pcb_calculator/transline_ident.cpp:235
+#: kicad-6996/pcb_calculator/transline_ident.cpp:269
+#: kicad-6996/pcb_calculator/transline_ident.cpp:302
+#: kicad-6996/pcb_calculator/transline_ident.cpp:372
+#: kicad-6996/pcb_calculator/transline_ident.cpp:405
 msgid "Conductor Losses"
 msgstr "導体損失"
 
-#: pcb_calculator/transline_ident.cpp:167
-#: pcb_calculator/transline_ident.cpp:204
-#: pcb_calculator/transline_ident.cpp:236
-#: pcb_calculator/transline_ident.cpp:270
-#: pcb_calculator/transline_ident.cpp:303
-#: pcb_calculator/transline_ident.cpp:373
-#: pcb_calculator/transline_ident.cpp:406
+#: kicad-6297/pcb_calculator/transline_ident.cpp:167
+#: kicad-6297/pcb_calculator/transline_ident.cpp:204
+#: kicad-6297/pcb_calculator/transline_ident.cpp:236
+#: kicad-6297/pcb_calculator/transline_ident.cpp:270
+#: kicad-6297/pcb_calculator/transline_ident.cpp:303
+#: kicad-6297/pcb_calculator/transline_ident.cpp:373
+#: kicad-6297/pcb_calculator/transline_ident.cpp:406
+#: kicad-6996/pcb_calculator/transline_ident.cpp:167
+#: kicad-6996/pcb_calculator/transline_ident.cpp:204
+#: kicad-6996/pcb_calculator/transline_ident.cpp:236
+#: kicad-6996/pcb_calculator/transline_ident.cpp:270
+#: kicad-6996/pcb_calculator/transline_ident.cpp:303
+#: kicad-6996/pcb_calculator/transline_ident.cpp:373
+#: kicad-6996/pcb_calculator/transline_ident.cpp:406
 msgid "Dielectric Losses"
 msgstr "誘電体損失"
 
-#: pcb_calculator/transline_ident.cpp:168
-#: pcb_calculator/transline_ident.cpp:205
-#: pcb_calculator/transline_ident.cpp:237
-#: pcb_calculator/transline_ident.cpp:338
-#: pcb_calculator/transline_ident.cpp:374
-#: pcb_calculator/transline_ident.cpp:407
+#: kicad-6297/pcb_calculator/transline_ident.cpp:168
+#: kicad-6297/pcb_calculator/transline_ident.cpp:205
+#: kicad-6297/pcb_calculator/transline_ident.cpp:237
+#: kicad-6297/pcb_calculator/transline_ident.cpp:338
+#: kicad-6297/pcb_calculator/transline_ident.cpp:374
+#: kicad-6297/pcb_calculator/transline_ident.cpp:407
+#: kicad-6996/pcb_calculator/transline_ident.cpp:168
+#: kicad-6996/pcb_calculator/transline_ident.cpp:205
+#: kicad-6996/pcb_calculator/transline_ident.cpp:237
+#: kicad-6996/pcb_calculator/transline_ident.cpp:338
+#: kicad-6996/pcb_calculator/transline_ident.cpp:374
+#: kicad-6996/pcb_calculator/transline_ident.cpp:407
 msgid "Skin Depth"
 msgstr "表皮深さ"
 
-#: pcb_calculator/transline_ident.cpp:173
-#: pcb_calculator/transline_ident.cpp:343
+#: kicad-6297/pcb_calculator/transline_ident.cpp:173
+#: kicad-6297/pcb_calculator/transline_ident.cpp:343
+#: kicad-6996/pcb_calculator/transline_ident.cpp:173
+#: kicad-6996/pcb_calculator/transline_ident.cpp:343
 msgid "Height of Box Top"
 msgstr "ボックスの高さ"
 
-#: pcb_calculator/transline_ident.cpp:175
-#: pcb_calculator/transline_ident.cpp:210
-#: pcb_calculator/transline_ident.cpp:242
-#: pcb_calculator/transline_ident.cpp:345
-#: pcb_calculator/transline_ident.cpp:382
+#: kicad-6297/pcb_calculator/transline_ident.cpp:175
+#: kicad-6297/pcb_calculator/transline_ident.cpp:210
+#: kicad-6297/pcb_calculator/transline_ident.cpp:242
+#: kicad-6297/pcb_calculator/transline_ident.cpp:345
+#: kicad-6297/pcb_calculator/transline_ident.cpp:382
+#: kicad-6996/pcb_calculator/transline_ident.cpp:175
+#: kicad-6996/pcb_calculator/transline_ident.cpp:210
+#: kicad-6996/pcb_calculator/transline_ident.cpp:242
+#: kicad-6996/pcb_calculator/transline_ident.cpp:345
+#: kicad-6996/pcb_calculator/transline_ident.cpp:382
 msgid "Strip Thickness"
 msgstr "銅箔厚"
 
-#: pcb_calculator/transline_ident.cpp:177
-#: pcb_calculator/transline_ident.cpp:347
+#: kicad-6297/pcb_calculator/transline_ident.cpp:177
+#: kicad-6297/pcb_calculator/transline_ident.cpp:347
+#: kicad-6996/pcb_calculator/transline_ident.cpp:177
+#: kicad-6996/pcb_calculator/transline_ident.cpp:347
 msgid "Conductor Roughness"
 msgstr "導体の荒さ"
 
-#: pcb_calculator/transline_ident.cpp:179
+#: kicad-6297/pcb_calculator/transline_ident.cpp:179
+#: kicad-6996/pcb_calculator/transline_ident.cpp:179
 msgid "mu Rel S"
 msgstr "μ (比透磁率) S (サブストレート)"
 
-#: pcb_calculator/transline_ident.cpp:180
+#: kicad-6297/pcb_calculator/transline_ident.cpp:180
+#: kicad-6996/pcb_calculator/transline_ident.cpp:180
 msgid "Relative Permeability (mu) of Substrate"
 msgstr "サブストレートの比透磁率 (μ)"
 
-#: pcb_calculator/transline_ident.cpp:182
-#: pcb_calculator/transline_ident.cpp:212
-#: pcb_calculator/transline_ident.cpp:244
-#: pcb_calculator/transline_ident.cpp:279
-#: pcb_calculator/transline_ident.cpp:310
-#: pcb_calculator/transline_ident.cpp:349
-#: pcb_calculator/transline_ident.cpp:384
-#: pcb_calculator/transline_ident.cpp:412
+#: kicad-6297/pcb_calculator/transline_ident.cpp:182
+#: kicad-6297/pcb_calculator/transline_ident.cpp:212
+#: kicad-6297/pcb_calculator/transline_ident.cpp:244
+#: kicad-6297/pcb_calculator/transline_ident.cpp:279
+#: kicad-6297/pcb_calculator/transline_ident.cpp:310
+#: kicad-6297/pcb_calculator/transline_ident.cpp:349
+#: kicad-6297/pcb_calculator/transline_ident.cpp:384
+#: kicad-6297/pcb_calculator/transline_ident.cpp:412
+#: kicad-6996/pcb_calculator/transline_ident.cpp:182
+#: kicad-6996/pcb_calculator/transline_ident.cpp:212
+#: kicad-6996/pcb_calculator/transline_ident.cpp:244
+#: kicad-6996/pcb_calculator/transline_ident.cpp:279
+#: kicad-6996/pcb_calculator/transline_ident.cpp:310
+#: kicad-6996/pcb_calculator/transline_ident.cpp:349
+#: kicad-6996/pcb_calculator/transline_ident.cpp:384
+#: kicad-6996/pcb_calculator/transline_ident.cpp:412
 msgid "Relative Permeability (mu) of Conductor"
 msgstr "導体の比透磁率 (μ)"
 
-#: pcb_calculator/transline_ident.cpp:186
-#: pcb_calculator/transline_ident.cpp:216
-#: pcb_calculator/transline_ident.cpp:248
-#: pcb_calculator/transline_ident.cpp:353
-#: pcb_calculator/transline_ident.cpp:388
+#: kicad-6297/pcb_calculator/transline_ident.cpp:186
+#: kicad-6297/pcb_calculator/transline_ident.cpp:216
+#: kicad-6297/pcb_calculator/transline_ident.cpp:248
+#: kicad-6297/pcb_calculator/transline_ident.cpp:353
+#: kicad-6297/pcb_calculator/transline_ident.cpp:388
+#: kicad-6996/pcb_calculator/transline_ident.cpp:186
+#: kicad-6996/pcb_calculator/transline_ident.cpp:216
+#: kicad-6996/pcb_calculator/transline_ident.cpp:248
+#: kicad-6996/pcb_calculator/transline_ident.cpp:353
+#: kicad-6996/pcb_calculator/transline_ident.cpp:388
 msgid "W"
 msgstr "W"
 
-#: pcb_calculator/transline_ident.cpp:188
-#: pcb_calculator/transline_ident.cpp:220
-#: pcb_calculator/transline_ident.cpp:252
-#: pcb_calculator/transline_ident.cpp:287
-#: pcb_calculator/transline_ident.cpp:318
-#: pcb_calculator/transline_ident.cpp:357
-#: pcb_calculator/transline_ident.cpp:390
-#: pcb_calculator/transline_ident.cpp:422
+#: kicad-6297/pcb_calculator/transline_ident.cpp:188
+#: kicad-6297/pcb_calculator/transline_ident.cpp:220
+#: kicad-6297/pcb_calculator/transline_ident.cpp:252
+#: kicad-6297/pcb_calculator/transline_ident.cpp:287
+#: kicad-6297/pcb_calculator/transline_ident.cpp:318
+#: kicad-6297/pcb_calculator/transline_ident.cpp:357
+#: kicad-6297/pcb_calculator/transline_ident.cpp:390
+#: kicad-6297/pcb_calculator/transline_ident.cpp:422
+#: kicad-6996/pcb_calculator/transline_ident.cpp:188
+#: kicad-6996/pcb_calculator/transline_ident.cpp:220
+#: kicad-6996/pcb_calculator/transline_ident.cpp:252
+#: kicad-6996/pcb_calculator/transline_ident.cpp:287
+#: kicad-6996/pcb_calculator/transline_ident.cpp:318
+#: kicad-6996/pcb_calculator/transline_ident.cpp:357
+#: kicad-6996/pcb_calculator/transline_ident.cpp:390
+#: kicad-6996/pcb_calculator/transline_ident.cpp:422
 msgid "L"
 msgstr "L"
 
-#: pcb_calculator/transline_ident.cpp:188
-#: pcb_calculator/transline_ident.cpp:220
-#: pcb_calculator/transline_ident.cpp:252
-#: pcb_calculator/transline_ident.cpp:318
-#: pcb_calculator/transline_ident.cpp:357
-#: pcb_calculator/transline_ident.cpp:390
+#: kicad-6297/pcb_calculator/transline_ident.cpp:188
+#: kicad-6297/pcb_calculator/transline_ident.cpp:220
+#: kicad-6297/pcb_calculator/transline_ident.cpp:252
+#: kicad-6297/pcb_calculator/transline_ident.cpp:318
+#: kicad-6297/pcb_calculator/transline_ident.cpp:357
+#: kicad-6297/pcb_calculator/transline_ident.cpp:390
+#: kicad-6996/pcb_calculator/transline_ident.cpp:188
+#: kicad-6996/pcb_calculator/transline_ident.cpp:220
+#: kicad-6996/pcb_calculator/transline_ident.cpp:252
+#: kicad-6996/pcb_calculator/transline_ident.cpp:318
+#: kicad-6996/pcb_calculator/transline_ident.cpp:357
+#: kicad-6996/pcb_calculator/transline_ident.cpp:390
 msgid "Line Length"
 msgstr "線路長"
 
-#: pcb_calculator/transline_ident.cpp:191
-#: pcb_calculator/transline_ident.cpp:223
-#: pcb_calculator/transline_ident.cpp:255
-#: pcb_calculator/transline_ident.cpp:290
-#: pcb_calculator/transline_ident.cpp:321
-#: pcb_calculator/transline_ident.cpp:393
-#: pcb_calculator/transline_ident.cpp:425
+#: kicad-6297/pcb_calculator/transline_ident.cpp:191
+#: kicad-6297/pcb_calculator/transline_ident.cpp:223
+#: kicad-6297/pcb_calculator/transline_ident.cpp:255
+#: kicad-6297/pcb_calculator/transline_ident.cpp:290
+#: kicad-6297/pcb_calculator/transline_ident.cpp:321
+#: kicad-6297/pcb_calculator/transline_ident.cpp:393
+#: kicad-6297/pcb_calculator/transline_ident.cpp:425
+#: kicad-6996/pcb_calculator/transline_ident.cpp:191
+#: kicad-6996/pcb_calculator/transline_ident.cpp:223
+#: kicad-6996/pcb_calculator/transline_ident.cpp:255
+#: kicad-6996/pcb_calculator/transline_ident.cpp:290
+#: kicad-6996/pcb_calculator/transline_ident.cpp:321
+#: kicad-6996/pcb_calculator/transline_ident.cpp:393
+#: kicad-6996/pcb_calculator/transline_ident.cpp:425
 msgid "Z0"
 msgstr "Z0"
 
-#: pcb_calculator/transline_ident.cpp:191
-#: pcb_calculator/transline_ident.cpp:223
-#: pcb_calculator/transline_ident.cpp:255
-#: pcb_calculator/transline_ident.cpp:290
-#: pcb_calculator/transline_ident.cpp:321
-#: pcb_calculator/transline_ident.cpp:393
-#: pcb_calculator/transline_ident.cpp:425
+#: kicad-6297/pcb_calculator/transline_ident.cpp:191
+#: kicad-6297/pcb_calculator/transline_ident.cpp:223
+#: kicad-6297/pcb_calculator/transline_ident.cpp:255
+#: kicad-6297/pcb_calculator/transline_ident.cpp:290
+#: kicad-6297/pcb_calculator/transline_ident.cpp:321
+#: kicad-6297/pcb_calculator/transline_ident.cpp:393
+#: kicad-6297/pcb_calculator/transline_ident.cpp:425
+#: kicad-6996/pcb_calculator/transline_ident.cpp:191
+#: kicad-6996/pcb_calculator/transline_ident.cpp:223
+#: kicad-6996/pcb_calculator/transline_ident.cpp:255
+#: kicad-6996/pcb_calculator/transline_ident.cpp:290
+#: kicad-6996/pcb_calculator/transline_ident.cpp:321
+#: kicad-6996/pcb_calculator/transline_ident.cpp:393
+#: kicad-6996/pcb_calculator/transline_ident.cpp:425
 msgid "Characteristic Impedance"
 msgstr "特性インピーダンス"
 
-#: pcb_calculator/transline_ident.cpp:194
-#: pcb_calculator/transline_ident.cpp:226
-#: pcb_calculator/transline_ident.cpp:258
-#: pcb_calculator/transline_ident.cpp:293
-#: pcb_calculator/transline_ident.cpp:324
-#: pcb_calculator/transline_ident.cpp:364
-#: pcb_calculator/transline_ident.cpp:396
-#: pcb_calculator/transline_ident.cpp:428
+#: kicad-6297/pcb_calculator/transline_ident.cpp:194
+#: kicad-6297/pcb_calculator/transline_ident.cpp:226
+#: kicad-6297/pcb_calculator/transline_ident.cpp:258
+#: kicad-6297/pcb_calculator/transline_ident.cpp:293
+#: kicad-6297/pcb_calculator/transline_ident.cpp:324
+#: kicad-6297/pcb_calculator/transline_ident.cpp:364
+#: kicad-6297/pcb_calculator/transline_ident.cpp:396
+#: kicad-6297/pcb_calculator/transline_ident.cpp:428
+#: kicad-6996/pcb_calculator/transline_ident.cpp:194
+#: kicad-6996/pcb_calculator/transline_ident.cpp:226
+#: kicad-6996/pcb_calculator/transline_ident.cpp:258
+#: kicad-6996/pcb_calculator/transline_ident.cpp:293
+#: kicad-6996/pcb_calculator/transline_ident.cpp:324
+#: kicad-6996/pcb_calculator/transline_ident.cpp:364
+#: kicad-6996/pcb_calculator/transline_ident.cpp:396
+#: kicad-6996/pcb_calculator/transline_ident.cpp:428
 msgid "Ang_l"
 msgstr "Ang_l"
 
-#: pcb_calculator/transline_ident.cpp:194
-#: pcb_calculator/transline_ident.cpp:226
-#: pcb_calculator/transline_ident.cpp:258
-#: pcb_calculator/transline_ident.cpp:293
-#: pcb_calculator/transline_ident.cpp:324
-#: pcb_calculator/transline_ident.cpp:396
-#: pcb_calculator/transline_ident.cpp:428
+#: kicad-6297/pcb_calculator/transline_ident.cpp:194
+#: kicad-6297/pcb_calculator/transline_ident.cpp:226
+#: kicad-6297/pcb_calculator/transline_ident.cpp:258
+#: kicad-6297/pcb_calculator/transline_ident.cpp:293
+#: kicad-6297/pcb_calculator/transline_ident.cpp:324
+#: kicad-6297/pcb_calculator/transline_ident.cpp:396
+#: kicad-6297/pcb_calculator/transline_ident.cpp:428
+#: kicad-6996/pcb_calculator/transline_ident.cpp:194
+#: kicad-6996/pcb_calculator/transline_ident.cpp:226
+#: kicad-6996/pcb_calculator/transline_ident.cpp:258
+#: kicad-6996/pcb_calculator/transline_ident.cpp:293
+#: kicad-6996/pcb_calculator/transline_ident.cpp:324
+#: kicad-6996/pcb_calculator/transline_ident.cpp:396
+#: kicad-6996/pcb_calculator/transline_ident.cpp:428
 msgid "Electrical Length"
 msgstr "電気長"
 
-#: pcb_calculator/transline_ident.cpp:218
-#: pcb_calculator/transline_ident.cpp:250
-#: pcb_calculator/transline_ident.cpp:355
+#: kicad-6297/pcb_calculator/transline_ident.cpp:218
+#: kicad-6297/pcb_calculator/transline_ident.cpp:250
+#: kicad-6297/pcb_calculator/transline_ident.cpp:355
+#: kicad-6996/pcb_calculator/transline_ident.cpp:218
+#: kicad-6996/pcb_calculator/transline_ident.cpp:250
+#: kicad-6996/pcb_calculator/transline_ident.cpp:355
 msgid "S"
 msgstr "S"
 
-#: pcb_calculator/transline_ident.cpp:218
-#: pcb_calculator/transline_ident.cpp:250
-#: pcb_calculator/transline_ident.cpp:355
+#: kicad-6297/pcb_calculator/transline_ident.cpp:218
+#: kicad-6297/pcb_calculator/transline_ident.cpp:250
+#: kicad-6297/pcb_calculator/transline_ident.cpp:355
+#: kicad-6996/pcb_calculator/transline_ident.cpp:218
+#: kicad-6996/pcb_calculator/transline_ident.cpp:250
+#: kicad-6996/pcb_calculator/transline_ident.cpp:355
 msgid "Gap Width"
 msgstr "ギャップ幅"
 
-#: pcb_calculator/transline_ident.cpp:267
+#: kicad-6297/pcb_calculator/transline_ident.cpp:267
+#: kicad-6996/pcb_calculator/transline_ident.cpp:267
 msgid "ZF(H10) = Ey / Hx"
 msgstr "ZF(H10) = Ey / Hx"
 
-#: pcb_calculator/transline_ident.cpp:271
-#: pcb_calculator/transline_ident.cpp:304
+#: kicad-6297/pcb_calculator/transline_ident.cpp:271
+#: kicad-6297/pcb_calculator/transline_ident.cpp:304
+#: kicad-6996/pcb_calculator/transline_ident.cpp:271
+#: kicad-6996/pcb_calculator/transline_ident.cpp:304
 msgid "TE-Modes"
 msgstr "TEモード"
 
-#: pcb_calculator/transline_ident.cpp:272
-#: pcb_calculator/transline_ident.cpp:305
+#: kicad-6297/pcb_calculator/transline_ident.cpp:272
+#: kicad-6297/pcb_calculator/transline_ident.cpp:305
+#: kicad-6996/pcb_calculator/transline_ident.cpp:272
+#: kicad-6996/pcb_calculator/transline_ident.cpp:305
 msgid "TM-Modes"
 msgstr "TMモード"
 
-#: pcb_calculator/transline_ident.cpp:275
-#: pcb_calculator/transline_ident.cpp:308
+#: kicad-6297/pcb_calculator/transline_ident.cpp:275
+#: kicad-6297/pcb_calculator/transline_ident.cpp:308
+#: kicad-6996/pcb_calculator/transline_ident.cpp:275
+#: kicad-6996/pcb_calculator/transline_ident.cpp:308
 msgid "mu Rel I"
 msgstr "μ (比透磁率) I (絶縁体)"
 
-#: pcb_calculator/transline_ident.cpp:275
-#: pcb_calculator/transline_ident.cpp:308
+#: kicad-6297/pcb_calculator/transline_ident.cpp:275
+#: kicad-6297/pcb_calculator/transline_ident.cpp:308
+#: kicad-6996/pcb_calculator/transline_ident.cpp:275
+#: kicad-6996/pcb_calculator/transline_ident.cpp:308
 msgid "Relative Permeability (mu) of Insulator"
 msgstr "絶縁体の比透磁率 (μ)"
 
-#: pcb_calculator/transline_ident.cpp:277
+#: kicad-6297/pcb_calculator/transline_ident.cpp:277
+#: kicad-6996/pcb_calculator/transline_ident.cpp:277
 msgid "TanM"
 msgstr "TanM"
 
-#: pcb_calculator/transline_ident.cpp:277
+#: kicad-6297/pcb_calculator/transline_ident.cpp:277
+#: kicad-6996/pcb_calculator/transline_ident.cpp:277
 msgid "Magnetic Loss Tangent"
 msgstr "磁気損失正接"
 
-#: pcb_calculator/transline_ident.cpp:283
-#: pcb_calculator/transline_ident.cpp:379
+#: kicad-6297/pcb_calculator/transline_ident.cpp:283
+#: kicad-6297/pcb_calculator/transline_ident.cpp:379
+#: kicad-6996/pcb_calculator/transline_ident.cpp:283
+#: kicad-6996/pcb_calculator/transline_ident.cpp:379
 msgid "a"
 msgstr "a"
 
-#: pcb_calculator/transline_ident.cpp:283
+#: kicad-6297/pcb_calculator/transline_ident.cpp:283
+#: kicad-6996/pcb_calculator/transline_ident.cpp:283
 msgid "Width of Waveguide"
 msgstr "導波管の幅"
 
-#: pcb_calculator/transline_ident.cpp:285
+#: kicad-6297/pcb_calculator/transline_ident.cpp:285
+#: kicad-6996/pcb_calculator/transline_ident.cpp:285
 msgid "b"
 msgstr "b"
 
-#: pcb_calculator/transline_ident.cpp:285
+#: kicad-6297/pcb_calculator/transline_ident.cpp:285
+#: kicad-6996/pcb_calculator/transline_ident.cpp:285
 msgid "Height of Waveguide"
 msgstr "導波管の高さ"
 
-#: pcb_calculator/transline_ident.cpp:287
+#: kicad-6297/pcb_calculator/transline_ident.cpp:287
+#: kicad-6996/pcb_calculator/transline_ident.cpp:287
 msgid "Waveguide Length"
 msgstr "導波管長"
 
-#: pcb_calculator/transline_ident.cpp:314
-#: pcb_calculator/transline_ident.cpp:418
+#: kicad-6297/pcb_calculator/transline_ident.cpp:314
+#: kicad-6297/pcb_calculator/transline_ident.cpp:418
+#: kicad-6996/pcb_calculator/transline_ident.cpp:314
+#: kicad-6996/pcb_calculator/transline_ident.cpp:418
 msgid "Din"
 msgstr "Din"
 
-#: pcb_calculator/transline_ident.cpp:314
-#: pcb_calculator/transline_ident.cpp:418
+#: kicad-6297/pcb_calculator/transline_ident.cpp:314
+#: kicad-6297/pcb_calculator/transline_ident.cpp:418
+#: kicad-6996/pcb_calculator/transline_ident.cpp:314
+#: kicad-6996/pcb_calculator/transline_ident.cpp:418
 msgid "Inner Diameter (conductor)"
 msgstr "内径 (導体)"
 
-#: pcb_calculator/transline_ident.cpp:316
-#: pcb_calculator/transline_ident.cpp:420
+#: kicad-6297/pcb_calculator/transline_ident.cpp:316
+#: kicad-6297/pcb_calculator/transline_ident.cpp:420
+#: kicad-6996/pcb_calculator/transline_ident.cpp:316
+#: kicad-6996/pcb_calculator/transline_ident.cpp:420
 msgid "Dout"
 msgstr "Dout"
 
-#: pcb_calculator/transline_ident.cpp:316
-#: pcb_calculator/transline_ident.cpp:420
+#: kicad-6297/pcb_calculator/transline_ident.cpp:316
+#: kicad-6297/pcb_calculator/transline_ident.cpp:420
+#: kicad-6996/pcb_calculator/transline_ident.cpp:316
+#: kicad-6996/pcb_calculator/transline_ident.cpp:420
 msgid "Outer Diameter (insulator)"
 msgstr "外形 (絶縁体)"
 
-#: pcb_calculator/transline_ident.cpp:332
+#: kicad-6297/pcb_calculator/transline_ident.cpp:332
+#: kicad-6996/pcb_calculator/transline_ident.cpp:332
 msgid "ErEff Even"
 msgstr "実効比誘電率 Even"
 
-#: pcb_calculator/transline_ident.cpp:333
+#: kicad-6297/pcb_calculator/transline_ident.cpp:333
+#: kicad-6996/pcb_calculator/transline_ident.cpp:333
 msgid "ErEff Odd"
 msgstr "実効比誘電率 Odd"
 
-#: pcb_calculator/transline_ident.cpp:334
+#: kicad-6297/pcb_calculator/transline_ident.cpp:334
+#: kicad-6996/pcb_calculator/transline_ident.cpp:334
 msgid "Conductor Losses Even"
 msgstr "導体損 Even"
 
-#: pcb_calculator/transline_ident.cpp:335
+#: kicad-6297/pcb_calculator/transline_ident.cpp:335
+#: kicad-6996/pcb_calculator/transline_ident.cpp:335
 msgid "Conductor Losses Odd"
 msgstr "導体損 Odd"
 
-#: pcb_calculator/transline_ident.cpp:336
+#: kicad-6297/pcb_calculator/transline_ident.cpp:336
+#: kicad-6996/pcb_calculator/transline_ident.cpp:336
 msgid "Dielectric Losses Even"
 msgstr "誘電体損 Even"
 
-#: pcb_calculator/transline_ident.cpp:337
+#: kicad-6297/pcb_calculator/transline_ident.cpp:337
+#: kicad-6996/pcb_calculator/transline_ident.cpp:337
 msgid "Dielectric Losses Odd"
 msgstr "誘電体損 Odd"
 
-#: pcb_calculator/transline_ident.cpp:360
+#: kicad-6297/pcb_calculator/transline_ident.cpp:360
+#: kicad-6996/pcb_calculator/transline_ident.cpp:360
 msgid "Zeven"
 msgstr "Zeven (偶モードインピーダンス)"
 
-#: pcb_calculator/transline_ident.cpp:360
+#: kicad-6297/pcb_calculator/transline_ident.cpp:360
+#: kicad-6996/pcb_calculator/transline_ident.cpp:360
 msgid "Even mode impedance (lines driven by common voltages)"
 msgstr "偶モードインピーダンス (線路は同じ (同相) 電圧で駆動される)"
 
-#: pcb_calculator/transline_ident.cpp:362
+#: kicad-6297/pcb_calculator/transline_ident.cpp:362
+#: kicad-6996/pcb_calculator/transline_ident.cpp:362
 msgid "Zodd"
 msgstr "Zodd (奇モードインピーダンス)"
 
-#: pcb_calculator/transline_ident.cpp:362
+#: kicad-6297/pcb_calculator/transline_ident.cpp:362
+#: kicad-6996/pcb_calculator/transline_ident.cpp:362
 msgid "Odd mode impedance (lines driven by opposite (differential) voltages)"
 msgstr "奇モードインピーダンス (線路は逆 (差動) 電圧で駆動される)"
 
-#: pcb_calculator/transline_ident.cpp:364
+#: kicad-6297/pcb_calculator/transline_ident.cpp:364
+#: kicad-6996/pcb_calculator/transline_ident.cpp:364
 msgid "Electrical length"
 msgstr "電気長"
 
-#: pcb_calculator/transline_ident.cpp:379
+#: kicad-6297/pcb_calculator/transline_ident.cpp:379
+#: kicad-6996/pcb_calculator/transline_ident.cpp:379
 msgid "distance between strip and top metal"
 msgstr "ストリップラインと上部導体の距離"
 
-#: pcb_calculator/transline_ident.cpp:410
+#: kicad-6297/pcb_calculator/transline_ident.cpp:410
+#: kicad-6996/pcb_calculator/transline_ident.cpp:410
 msgid "Twists"
 msgstr "ツイスト数"
 
-#: pcb_calculator/transline_ident.cpp:410
+#: kicad-6297/pcb_calculator/transline_ident.cpp:410
+#: kicad-6996/pcb_calculator/transline_ident.cpp:410
 msgid "Number of Twists per Length"
 msgstr "長さあたりの撚り数"
 
-#: pcb_calculator/transline_ident.cpp:415
+#: kicad-6297/pcb_calculator/transline_ident.cpp:415
+#: kicad-6996/pcb_calculator/transline_ident.cpp:415
 msgid "ErEnv"
 msgstr "ErEnv"
 
-#: pcb_calculator/transline_ident.cpp:415
+#: kicad-6297/pcb_calculator/transline_ident.cpp:415
+#: kicad-6996/pcb_calculator/transline_ident.cpp:415
 msgid "Relative Permittivity of Environment"
 msgstr "環境の比誘電率"
 
-#: pcb_calculator/transline_ident.cpp:422
+#: kicad-6297/pcb_calculator/transline_ident.cpp:422
+#: kicad-6996/pcb_calculator/transline_ident.cpp:422
 msgid "Cable Length"
 msgstr "ケーブル長"
 
-#: pcbnew/append_board_to_current.cpp:91 pcbnew/files.cpp:511
-#: pcbnew/tools/pcbnew_control.cpp:818
+#: kicad-6297/pcbnew/append_board_to_current.cpp:91
+#: kicad-6297/pcbnew/files.cpp:518
+#: kicad-6297/pcbnew/tools/pcbnew_control.cpp:827
+#: kicad-6996/pcbnew/append_board_to_current.cpp:92
+#: kicad-6996/pcbnew/files.cpp:518
+#: kicad-6996/pcbnew/tools/pcbnew_control.cpp:825
 #, c-format
 msgid ""
 "Error loading board.\n"
@@ -11568,222 +15445,286 @@ msgstr ""
 "ボード読み込み中のエラーです\n"
 "%s"
 
-#: pcbnew/autorouter/auto_place_footprints.cpp:165
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:165
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:165
 msgid "Footprints NOT LOCKED will be moved"
 msgstr "ロックしていないフットプリントは移動されます"
 
-#: pcbnew/autorouter/auto_place_footprints.cpp:172
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:172
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:172
 msgid "Footprints NOT PLACED will be moved"
 msgstr "配置していないフットプリントは移動されます"
 
-#: pcbnew/autorouter/auto_place_footprints.cpp:281
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:281
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:281
 #, c-format
 msgid "Place footprint %d of %d"
 msgstr "フットプリント %d / %d の配置"
 
-#: pcbnew/autorouter/auto_place_footprints.cpp:466
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:466
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:466
 msgid "No PCB edge found, unknown board size!"
 msgstr "基板外形がないため、ボードサイズが不明です。"
 
-#: pcbnew/autorouter/auto_place_footprints.cpp:475
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:475
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:475
 msgid "Cols"
 msgstr "列"
 
-#: pcbnew/autorouter/auto_place_footprints.cpp:479
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:479
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:479
 msgid "Cells."
 msgstr "セル"
 
-#: pcbnew/autorouter/auto_place_footprints.cpp:692
+#: kicad-6297/pcbnew/autorouter/auto_place_footprints.cpp:692
+#: kicad-6996/pcbnew/autorouter/auto_place_footprints.cpp:692
 msgid "OK to abort?"
 msgstr "中止してもよろしいですか？"
 
-#: pcbnew/autorouter/autorout.cpp:90
+#: kicad-6297/pcbnew/autorouter/autorout.cpp:90
+#: kicad-6996/pcbnew/autorouter/autorout.cpp:90
 msgid "Net not selected"
 msgstr "ネットが選択されていません"
 
-#: pcbnew/autorouter/autorout.cpp:98
+#: kicad-6297/pcbnew/autorouter/autorout.cpp:98
+#: kicad-6996/pcbnew/autorouter/autorout.cpp:98
 msgid "Footprint not selected"
 msgstr "フットプリントが選択されていません"
 
-#: pcbnew/autorouter/autorout.cpp:108
+#: kicad-6297/pcbnew/autorouter/autorout.cpp:108
+#: kicad-6996/pcbnew/autorouter/autorout.cpp:108
 msgid "Pad not selected"
 msgstr "パッドが選択されていません"
 
-#: pcbnew/autorouter/autorout.cpp:180
+#: kicad-6297/pcbnew/autorouter/autorout.cpp:180
+#: kicad-6996/pcbnew/autorouter/autorout.cpp:180
 msgid "No memory for autorouting"
 msgstr "オートルーターのためのメモリがありません"
 
-#: pcbnew/autorouter/autorout.cpp:185
+#: kicad-6297/pcbnew/autorouter/autorout.cpp:185
+#: kicad-6996/pcbnew/autorouter/autorout.cpp:185
 msgid "Place Cells"
 msgstr "セルの配置"
 
-#: pcbnew/autorouter/move_and_route_event_functions.cpp:133
+#: kicad-6297/pcbnew/autorouter/move_and_route_event_functions.cpp:133
+#: kicad-6996/pcbnew/autorouter/move_and_route_event_functions.cpp:133
 msgid "Not locked footprints inside the board will be moved. OK?"
 msgstr ""
 "基板内側のロックしていないフットプリントは移動されます。よろしいですか？"
 
-#: pcbnew/autorouter/move_and_route_event_functions.cpp:139
+#: kicad-6297/pcbnew/autorouter/move_and_route_event_functions.cpp:139
+#: kicad-6996/pcbnew/autorouter/move_and_route_event_functions.cpp:139
 msgid "No footprint found!"
 msgstr "フットプリントが見つかりません！"
 
-#: pcbnew/autorouter/solve.cpp:301
+#: kicad-6297/pcbnew/autorouter/solve.cpp:301
+#: kicad-6996/pcbnew/autorouter/solve.cpp:301
 msgid "Abort routing?"
 msgstr "配線作業を中止しますか？"
 
-#: pcbnew/autorouter/spread_footprints.cpp:181
+#: kicad-6297/pcbnew/autorouter/spread_footprints.cpp:181
+#: kicad-6996/pcbnew/autorouter/spread_footprints.cpp:188
 msgid "Could not automatically place footprints. No board outlines detected."
 msgstr "フットプリントを自動配置できません。基板外形が検出できません。"
 
-#: pcbnew/basepcbframe.cpp:465
+#: kicad-6297/pcbnew/basepcbframe.cpp:465
+#: kicad-6996/pcbnew/basepcbframe.cpp:471
 msgid "Display rectangular coordinates"
 msgstr "直交座標表示"
 
-#: pcbnew/basepcbframe.cpp:477
+#: kicad-6297/pcbnew/basepcbframe.cpp:477
+#: kicad-6996/pcbnew/basepcbframe.cpp:483
 msgid "Show pads in fill mode"
 msgstr "塗りつぶしモードでパッドを表示"
 
-#: pcbnew/basepcbframe.cpp:837 pcbnew/tools/common_actions.cpp:210
-msgid "Zoom Auto"
-msgstr "自動ズーム"
-
-#: pcbnew/basepcbframe.cpp:842
+#: kicad-6297/pcbnew/basepcbframe.cpp:842
+#: kicad-6996/pcbnew/basepcbframe.cpp:848
 msgid "Zoom "
 msgstr "ズーム"
 
-#: pcbnew/block.cpp:295
+#: kicad-6297/pcbnew/block.cpp:295 kicad-6996/pcbnew/block.cpp:295
 msgid "Block Operation"
 msgstr "ブロックの操作"
 
-#: pcbnew/build_BOM_from_board.cpp:61
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:61
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:61
 msgid "Comma separated value files (*.csv)|*.csv"
 msgstr "コンマ区切りファイル (*.csv)|*.csv"
 
-#: pcbnew/build_BOM_from_board.cpp:86
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:86
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:86
 msgid "Cannot export BOM: there are no footprints in the PCB"
 msgstr "部品表 (BOM) をエクスポートできない：基板にフットプリントがありません"
 
-#: pcbnew/build_BOM_from_board.cpp:96
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:96
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:96
 msgid "Save Bill of Materials"
 msgstr "部品表の保存"
 
-#: pcbnew/build_BOM_from_board.cpp:109
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:109
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:109
 #, c-format
 msgid "Unable to create file <%s>"
 msgstr "ファイル %s を作成できません"
 
-#: pcbnew/build_BOM_from_board.cpp:116
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:116
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:116
 msgid "Id"
 msgstr "ID"
 
-#: pcbnew/build_BOM_from_board.cpp:117
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:117
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:117
 msgid "Designator"
 msgstr "参照記号"
 
-#: pcbnew/build_BOM_from_board.cpp:118
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:118
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:118
 msgid "Package"
 msgstr "パッケージ"
 
-#: pcbnew/build_BOM_from_board.cpp:119
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:119
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:119
 msgid "Quantity"
 msgstr "数"
 
-#: pcbnew/build_BOM_from_board.cpp:120
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:120
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:120
 msgid "Designation"
 msgstr "名称"
 
-#: pcbnew/build_BOM_from_board.cpp:121
+#: kicad-6297/pcbnew/build_BOM_from_board.cpp:121
+#: kicad-6996/pcbnew/build_BOM_from_board.cpp:121
 msgid "Supplier and ref"
 msgstr "Supplier and ref"
 
-#: pcbnew/class_board.cpp:99
+#: kicad-6297/pcbnew/class_board.cpp:99 kicad-6996/pcbnew/class_board.cpp:99
 msgid "This is the default net class."
 msgstr "これは標準のネット クラスです。"
 
-#: pcbnew/class_board.cpp:954 pcbnew/class_netinfo_item.cpp:133
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:68
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:123
-#: pcbnew/pcb_draw_panel_gal.cpp:350
+#: kicad-6297/pcbnew/class_board.cpp:954
+#: kicad-6297/pcbnew/class_netinfo_item.cpp:133
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:68
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:118
+#: kicad-6297/pcbnew/pcb_draw_panel_gal.cpp:350
+#: kicad-6996/pcbnew/class_board.cpp:1158
+#: kicad-6996/pcbnew/class_netinfo_item.cpp:134
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:68
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:118
+#: kicad-6996/pcbnew/pcb_draw_panel_gal.cpp:339
 msgid "Vias"
 msgstr "ビア数"
 
-#: pcbnew/class_board.cpp:957 pcbnew/pcb_draw_panel_gal.cpp:353
+#: kicad-6297/pcbnew/class_board.cpp:957
+#: kicad-6297/pcbnew/pcb_draw_panel_gal.cpp:353
+#: kicad-6996/pcbnew/class_board.cpp:1161
+#: kicad-6996/pcbnew/pcb_draw_panel_gal.cpp:342
 msgid "Track Segments"
 msgstr "配線セグメント数"
 
-#: pcbnew/class_board.cpp:960 pcbnew/pcb_draw_panel_gal.cpp:356
+#: kicad-6297/pcbnew/class_board.cpp:960
+#: kicad-6297/pcbnew/pcb_draw_panel_gal.cpp:356
+#: kicad-6996/pcbnew/class_board.cpp:1164
+#: kicad-6996/pcbnew/pcb_draw_panel_gal.cpp:345
 msgid "Nodes"
 msgstr "ノード数"
 
-#: pcbnew/class_board.cpp:963 pcbnew/pcb_draw_panel_gal.cpp:359
+#: kicad-6297/pcbnew/class_board.cpp:963
+#: kicad-6297/pcbnew/pcb_draw_panel_gal.cpp:359
+#: kicad-6996/pcbnew/class_board.cpp:1167
+#: kicad-6996/pcbnew/pcb_draw_panel_gal.cpp:348
+#: kicad-6996/pcbnew/dialogs/dialog_select_net_from_list_base.h:58
 msgid "Nets"
 msgstr "ネット数"
 
-#: pcbnew/class_board.cpp:971
+#: kicad-6297/pcbnew/class_board.cpp:971 kicad-6996/pcbnew/class_board.cpp:1175
 msgid "Links"
 msgstr "リンク数"
 
-#: pcbnew/class_board.cpp:974
+#: kicad-6297/pcbnew/class_board.cpp:974 kicad-6996/pcbnew/class_board.cpp:1178
 msgid "Connections"
 msgstr "接続"
 
-#: pcbnew/class_board.cpp:977 pcbnew/dialogs/dialog_drc_base.cpp:184
-#: pcbnew/pcb_draw_panel_gal.cpp:362
+#: kicad-6297/pcbnew/class_board.cpp:977
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:200
+#: kicad-6297/pcbnew/pcb_draw_panel_gal.cpp:362
+#: kicad-6996/pcbnew/class_board.cpp:1181
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:200
+#: kicad-6996/pcbnew/pcb_draw_panel_gal.cpp:351
 msgid "Unconnected"
 msgstr "未配線"
 
-#: pcbnew/class_board.cpp:2299
+#: kicad-6297/pcbnew/class_board.cpp:2299
+#: kicad-6996/pcbnew/class_board.cpp:2407
 #, c-format
 msgid "Checking netlist component footprint \"%s:%s:%s\".\n"
 msgstr ""
 "ネットリストよりコンポーネントとフットプリントをチェックしています \"%s:%s:%s"
 "\"。\n"
 
-#: pcbnew/class_board.cpp:2317
+#: kicad-6297/pcbnew/class_board.cpp:2317
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:123
+#: kicad-6996/pcbnew/class_board.cpp:2425
 #, c-format
 msgid "Adding new component \"%s:%s\" footprint \"%s\".\n"
 msgstr "コンポーネント \"%s:%s\" フットプリント \"%s\" を追加します。\n"
 
-#: pcbnew/class_board.cpp:2326
+#: kicad-6297/pcbnew/class_board.cpp:2326
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:161
+#: kicad-6996/pcbnew/class_board.cpp:2434
 #, c-format
 msgid "Cannot add new component \"%s:%s\" due to missing footprint \"%s\".\n"
 msgstr ""
 "新規コンポーネント \"%s:%s\" が作成できませんでした。これは フットプリント  "
 "\"%s\" が不正であることに起因します。\n"
 
-#: pcbnew/class_board.cpp:2358
+#: kicad-6297/pcbnew/class_board.cpp:2358
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:196
+#: kicad-6996/pcbnew/class_board.cpp:2467
 #, c-format
 msgid "Replacing component \"%s:%s\" footprint \"%s\" with \"%s\".\n"
 msgstr ""
 "コンポーネント \"%s:%s\" フットプリント \"%s\" - \"%s\" を置換します.\n"
 
-#: pcbnew/class_board.cpp:2369
+#: kicad-6297/pcbnew/class_board.cpp:2369
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:233
+#: kicad-6996/pcbnew/class_board.cpp:2478
 #, c-format
 msgid "Cannot replace component \"%s:%s\" due to missing footprint \"%s\".\n"
 msgstr ""
 "コンポーネント \"%s:%s\" が置換できませんでした。これは フットプリント  \"%s"
 "\" が不正であることに起因します。\n"
 
-#: pcbnew/class_board.cpp:2408
+#: kicad-6297/pcbnew/class_board.cpp:2408
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:266
+#: kicad-6996/pcbnew/class_board.cpp:2517
 #, c-format
 msgid "Changing component \"%s:%s\" reference to \"%s\".\n"
 msgstr "コンポーネント \"%s:%s\" の変更. (\"%s\" を参照する) \n"
 
-#: pcbnew/class_board.cpp:2424
+#: kicad-6297/pcbnew/class_board.cpp:2424
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:290
+#: kicad-6996/pcbnew/class_board.cpp:2533
 #, c-format
 msgid "Changing component \"%s:%s\" value from \"%s\" to \"%s\".\n"
 msgstr "コンポーネント \"%s:%s\" の値を， \"%s\" から \"%s\" に変更．\n"
 
-#: pcbnew/class_board.cpp:2441
+#: kicad-6297/pcbnew/class_board.cpp:2441
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:307
+#: kicad-6996/pcbnew/class_board.cpp:2550
 #, c-format
 msgid "Changing component path \"%s:%s\" to \"%s\".\n"
 msgstr "コンポーネントのパス， \"%s:%s\" を \"%s\" に変更．\n"
 
-#: pcbnew/class_board.cpp:2465
+#: kicad-6297/pcbnew/class_board.cpp:2465
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:349
+#: kicad-6996/pcbnew/class_board.cpp:2574
 #, c-format
 msgid "Clearing component \"%s:%s\" pin \"%s\" net name.\n"
 msgstr "コンポーネントの \"%s:%s\" ピン \"%s\" ネット名をクリア．\n"
 
-#: pcbnew/class_board.cpp:2481
+#: kicad-6297/pcbnew/class_board.cpp:2481
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:403
+#: kicad-6996/pcbnew/class_board.cpp:2590
 #, c-format
 msgid ""
 "Changing component \"%s:%s\" pin \"%s\" net name from \"%s\" to \"%s\".\n"
@@ -11791,846 +15732,1063 @@ msgstr ""
 "コンポーネントを \"%s:%s\" ピン \"%s\" ネット名を， \"%s\" から \"%s\" に変"
 "更．\n"
 
-#: pcbnew/class_board.cpp:2530
+#: kicad-6297/pcbnew/class_board.cpp:2530
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:454
+#: kicad-6996/pcbnew/class_board.cpp:2639
 #, c-format
 msgid "Removing unused component \"%s:%s\".\n"
 msgstr "未使用のコンポーネント \"%s:%s\" を削除しました.\n"
 
-#: pcbnew/class_board.cpp:2590
+#: kicad-6297/pcbnew/class_board.cpp:2590
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:526
+#: kicad-6996/pcbnew/class_board.cpp:2699
 #, c-format
 msgid "Remove single pad net \"%s\" on \"%s\" pad '%s'\n"
 msgstr "孤立したパッドを削除：ネット \"%s\" / \"%s\" パッド '%s'\n"
 
-#: pcbnew/class_board.cpp:2645
+#: kicad-6297/pcbnew/class_board.cpp:2645
+#: kicad-6996/pcbnew/class_board.cpp:2754
 #, c-format
 msgid "Component '%s' pad '%s' not found in footprint '%s'\n"
 msgstr ""
 "コンポーネント '%s' のパッド '%s' がフットプリント '%s' に見つかりませんでし"
 "た.\n"
 
-#: pcbnew/class_board.cpp:2663
+#: kicad-6297/pcbnew/class_board.cpp:2663
+#: kicad-6996/pcbnew/class_board.cpp:2772
 #, c-format
 msgid "Copper zone (net name '%s'): net has no pads connected."
 msgstr "導体ゾーン(ネット名 '%s' )：ネットがパッドへ接続されていません."
 
-#: pcbnew/class_board_item.cpp:43 pcbnew/class_pad.cpp:870
+#: kicad-6297/pcbnew/class_board_item.cpp:43
+#: kicad-6297/pcbnew/class_pad.cpp:852
+#: kicad-6996/pcbnew/class_board_item.cpp:43
+#: kicad-6996/pcbnew/class_pad.cpp:883
 msgid "Rect"
 msgstr "矩形"
 
-#: pcbnew/class_board_item.cpp:46
+#: kicad-6297/pcbnew/class_board_item.cpp:46
+#: kicad-6996/pcbnew/class_board_item.cpp:46
 msgid "Bezier Curve"
 msgstr "ベジェ曲線"
 
-#: pcbnew/class_board_item.cpp:47
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:205
+#: kicad-6297/pcbnew/class_board_item.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:205
+#: kicad-6996/pcbnew/class_board_item.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:200
 msgid "Polygon"
 msgstr "ポリゴン"
 
-#: pcbnew/class_dimension.cpp:500
+#: kicad-6297/pcbnew/class_dimension.cpp:503
+#: kicad-6996/pcbnew/class_dimension.cpp:503
 #, c-format
 msgid "Dimension \"%s\" on %s"
 msgstr "寸法 \"%s\" - %s"
 
-#: pcbnew/class_drawsegment.cpp:362
+#: kicad-6297/pcbnew/class_drawsegment.cpp:364
+#: kicad-6996/pcbnew/class_drawsegment.cpp:364
 msgid "Drawing"
 msgstr "図形"
 
-#: pcbnew/class_drawsegment.cpp:366
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:50
+#: kicad-6297/pcbnew/class_drawsegment.cpp:368
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.cpp:50
+#: kicad-6996/pcbnew/class_drawsegment.cpp:368
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.cpp:50
 msgid "Shape"
 msgstr "形状"
 
-#: pcbnew/class_drawsegment.cpp:381
+#: kicad-6297/pcbnew/class_drawsegment.cpp:383
+#: kicad-6996/pcbnew/class_drawsegment.cpp:383
 msgid "Curve"
 msgstr "曲線"
 
-#: pcbnew/class_drawsegment.cpp:386
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:205
+#: kicad-6297/pcbnew/class_drawsegment.cpp:388
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:205
+#: kicad-6996/pcbnew/class_drawsegment.cpp:388
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:200
 msgid "Segment"
 msgstr "セグメント"
 
-#: pcbnew/class_drawsegment.cpp:606
+#: kicad-6297/pcbnew/class_drawsegment.cpp:608
+#: kicad-6996/pcbnew/class_drawsegment.cpp:609
 #, c-format
 msgid "Pcb Graphic: %s, length %s on %s"
 msgstr "基板上の図形: %s, 長さ %s (レイヤ %s)"
 
-#: pcbnew/class_drc_item.cpp:43
+#: kicad-6297/pcbnew/class_drc_item.cpp:43
+#: kicad-6996/pcbnew/class_drc_item.cpp:43
 msgid "Unconnected pads"
 msgstr "未接続パッド"
 
-#: pcbnew/class_drc_item.cpp:45
+#: kicad-6297/pcbnew/class_drc_item.cpp:45
+#: kicad-6996/pcbnew/class_drc_item.cpp:45
 msgid "Track near thru-hole"
 msgstr "配線がスルーホールに近いです"
 
-#: pcbnew/class_drc_item.cpp:47
+#: kicad-6297/pcbnew/class_drc_item.cpp:47
+#: kicad-6996/pcbnew/class_drc_item.cpp:47
 msgid "Track near pad"
 msgstr "配線がパッドに近いです"
 
-#: pcbnew/class_drc_item.cpp:49
+#: kicad-6297/pcbnew/class_drc_item.cpp:49
+#: kicad-6996/pcbnew/class_drc_item.cpp:49
 msgid "Track near via"
 msgstr "配線がビアに近いです"
 
-#: pcbnew/class_drc_item.cpp:51
+#: kicad-6297/pcbnew/class_drc_item.cpp:51
+#: kicad-6996/pcbnew/class_drc_item.cpp:51
 msgid "Via near via"
 msgstr "ビアが他のビアに近いです"
 
-#: pcbnew/class_drc_item.cpp:53
+#: kicad-6297/pcbnew/class_drc_item.cpp:53
+#: kicad-6996/pcbnew/class_drc_item.cpp:53
 msgid "Via near track"
 msgstr "ビアが配線に近いです"
 
-#: pcbnew/class_drc_item.cpp:63
+#: kicad-6297/pcbnew/class_drc_item.cpp:63
+#: kicad-6996/pcbnew/class_drc_item.cpp:63
 msgid "Two track ends too close"
 msgstr "2点の配線端が近すぎます"
 
-#: pcbnew/class_drc_item.cpp:65
+#: kicad-6297/pcbnew/class_drc_item.cpp:65
+#: kicad-6996/pcbnew/class_drc_item.cpp:65
 msgid "Two parallel track segments too close"
 msgstr "2本の並行配線が近すぎます"
 
-#: pcbnew/class_drc_item.cpp:67
+#: kicad-6297/pcbnew/class_drc_item.cpp:67
+#: kicad-6996/pcbnew/class_drc_item.cpp:67
 msgid "Tracks crossing"
 msgstr "配線が交差しています"
 
-#: pcbnew/class_drc_item.cpp:69
+#: kicad-6297/pcbnew/class_drc_item.cpp:69
+#: kicad-6996/pcbnew/class_drc_item.cpp:69
 msgid "Pad near pad"
 msgstr "パッドが他のパッドに近いです"
 
-#: pcbnew/class_drc_item.cpp:71
+#: kicad-6297/pcbnew/class_drc_item.cpp:71
+#: kicad-6996/pcbnew/class_drc_item.cpp:71
 msgid "Via hole > diameter"
 msgstr "ビア穴 > ビア径"
 
-#: pcbnew/class_drc_item.cpp:73
+#: kicad-6297/pcbnew/class_drc_item.cpp:73
+#: kicad-6996/pcbnew/class_drc_item.cpp:73
 msgid "Micro Via: incorrect layer pairs (not adjacent)"
 msgstr "マイクロビア:  (隣接していない) 不正なレイヤ ペアです"
 
-#: pcbnew/class_drc_item.cpp:75
+#: kicad-6297/pcbnew/class_drc_item.cpp:75
+#: kicad-6996/pcbnew/class_drc_item.cpp:75
 msgid "Copper area inside copper area"
 msgstr "導体エリア内の導体エリア"
 
-#: pcbnew/class_drc_item.cpp:77
+#: kicad-6297/pcbnew/class_drc_item.cpp:77
+#: kicad-6996/pcbnew/class_drc_item.cpp:77
 msgid "Copper areas intersect or are too close"
 msgstr "導体エリアが交わっているか、非常に接近しています"
 
-#: pcbnew/class_drc_item.cpp:80
+#: kicad-6297/pcbnew/class_drc_item.cpp:80
+#: kicad-6996/pcbnew/class_drc_item.cpp:80
 msgid "Copper area belongs a net which has no pads. This is strange"
 msgstr "導体ゾーンはパッドがないネットに属しています。これは奇妙なことです。"
 
-#: pcbnew/class_drc_item.cpp:83
+#: kicad-6297/pcbnew/class_drc_item.cpp:83
+#: kicad-6996/pcbnew/class_drc_item.cpp:83
 msgid "Hole near pad"
 msgstr "穴がパッドに近いです"
 
-#: pcbnew/class_drc_item.cpp:85
+#: kicad-6297/pcbnew/class_drc_item.cpp:85
+#: kicad-6996/pcbnew/class_drc_item.cpp:85
 msgid "Hole near track"
 msgstr "穴が配線に近いです"
 
-#: pcbnew/class_drc_item.cpp:87
+#: kicad-6297/pcbnew/class_drc_item.cpp:87
+#: kicad-6996/pcbnew/class_drc_item.cpp:87
 msgid "Too small track width"
 msgstr "配線の幅が細過ぎます"
 
-#: pcbnew/class_drc_item.cpp:89
+#: kicad-6297/pcbnew/class_drc_item.cpp:89
+#: kicad-6996/pcbnew/class_drc_item.cpp:89
 msgid "Too small via size"
 msgstr "ビアが小さすぎます"
 
-#: pcbnew/class_drc_item.cpp:91
+#: kicad-6297/pcbnew/class_drc_item.cpp:91
+#: kicad-6996/pcbnew/class_drc_item.cpp:91
 msgid "Too small micro via size"
 msgstr "マイクロビアのサイズが小さ過ぎます"
 
 # ９７３～９９８、DRCエラー表示か、要確認
-#: pcbnew/class_drc_item.cpp:95
+#: kicad-6297/pcbnew/class_drc_item.cpp:95
+#: kicad-6996/pcbnew/class_drc_item.cpp:95
 msgid "NetClass Track Width &lt; global limit"
 msgstr "ネットクラス 配線幅 &lt; グローバル リミット"
 
-#: pcbnew/class_drc_item.cpp:97
+#: kicad-6297/pcbnew/class_drc_item.cpp:97
+#: kicad-6996/pcbnew/class_drc_item.cpp:97
 msgid "NetClass Clearance &lt; global limit"
 msgstr "ネットクラス クリアランス &lt; グローバル リミット"
 
-#: pcbnew/class_drc_item.cpp:99
+#: kicad-6297/pcbnew/class_drc_item.cpp:99
+#: kicad-6996/pcbnew/class_drc_item.cpp:99
 msgid "NetClass Via Dia &lt; global limit"
 msgstr "ネットクラス ビア径 &lt; グローバル リミット"
 
-#: pcbnew/class_drc_item.cpp:101
+#: kicad-6297/pcbnew/class_drc_item.cpp:101
+#: kicad-6996/pcbnew/class_drc_item.cpp:101
 msgid "NetClass Via Drill &lt; global limit"
 msgstr "ネットクラス ビア ドリル &lt; グローバル リミット"
 
-#: pcbnew/class_drc_item.cpp:103
+#: kicad-6297/pcbnew/class_drc_item.cpp:103
+#: kicad-6996/pcbnew/class_drc_item.cpp:103
 msgid "NetClass uVia Dia &lt; global limit"
 msgstr "ネットクラス マイクロビア径 &lt; グローバル リミット"
 
-#: pcbnew/class_drc_item.cpp:105
+#: kicad-6297/pcbnew/class_drc_item.cpp:105
+#: kicad-6996/pcbnew/class_drc_item.cpp:105
 msgid "NetClass uVia Drill &lt; global limit"
 msgstr "ネットクラス マイクロビア ドリル &lt; グローバル リミット"
 
-#: pcbnew/class_drc_item.cpp:108
+#: kicad-6297/pcbnew/class_drc_item.cpp:108
+#: kicad-6996/pcbnew/class_drc_item.cpp:108
 msgid "Via inside a keepout area"
 msgstr "ビアが禁止エリア内に入っています"
 
-#: pcbnew/class_drc_item.cpp:111
+#: kicad-6297/pcbnew/class_drc_item.cpp:111
+#: kicad-6996/pcbnew/class_drc_item.cpp:111
 msgid "Track inside a keepout area"
 msgstr "配線が禁止エリア内に入っています"
 
-#: pcbnew/class_drc_item.cpp:114
+#: kicad-6297/pcbnew/class_drc_item.cpp:114
+#: kicad-6996/pcbnew/class_drc_item.cpp:114
 msgid "Pad inside a keepout area"
 msgstr "パッドが禁止エリア内に入っています"
 
-#: pcbnew/class_drc_item.cpp:117
+#: kicad-6297/pcbnew/class_drc_item.cpp:117
+#: kicad-6996/pcbnew/class_drc_item.cpp:117
 msgid "Via inside a text"
 msgstr "ビアがテキスト内に入っています"
 
-#: pcbnew/class_drc_item.cpp:120
+#: kicad-6297/pcbnew/class_drc_item.cpp:120
+#: kicad-6996/pcbnew/class_drc_item.cpp:120
 msgid "Track inside a text"
 msgstr "配線がテキスト内に入っています"
 
-#: pcbnew/class_drc_item.cpp:123
+#: kicad-6297/pcbnew/class_drc_item.cpp:123
+#: kicad-6996/pcbnew/class_drc_item.cpp:123
 msgid "Pad inside a text"
 msgstr "パッドがテキスト内に入っています"
 
-#: pcbnew/class_edge_mod.cpp:263
+#: kicad-6297/pcbnew/class_edge_mod.cpp:263
+#: kicad-6996/pcbnew/class_edge_mod.cpp:263
 msgid "TimeStamp"
 msgstr "タイムスタンプ"
 
-#: pcbnew/class_edge_mod.cpp:264
+#: kicad-6297/pcbnew/class_edge_mod.cpp:264
+#: kicad-6996/pcbnew/class_edge_mod.cpp:264
 msgid "Footprint Layer"
 msgstr "フットプリント レイヤ"
 
-#: pcbnew/class_edge_mod.cpp:276
+#: kicad-6297/pcbnew/class_edge_mod.cpp:276
+#: kicad-6996/pcbnew/class_edge_mod.cpp:276
 #, c-format
 msgid "Graphic (%s) on %s of %s"
 msgstr "図形: %s,  %s (%s)"
 
-#: pcbnew/class_marker_pcb.cpp:97
+#: kicad-6297/pcbnew/class_marker_pcb.cpp:97
+#: kicad-6996/pcbnew/class_marker_pcb.cpp:97
 msgid "Marker"
 msgstr "マーカー"
 
-#: pcbnew/class_marker_pcb.cpp:101
+#: kicad-6297/pcbnew/class_marker_pcb.cpp:101
+#: kicad-6996/pcbnew/class_marker_pcb.cpp:101
 #, c-format
 msgid "ErrType (%d)- %s:"
 msgstr "エラータイプ (%d)- %s:"
 
-#: pcbnew/class_marker_pcb.cpp:134
+#: kicad-6297/pcbnew/class_marker_pcb.cpp:134
+#: kicad-6996/pcbnew/class_marker_pcb.cpp:134
 #, c-format
 msgid "Marker @(%d,%d)"
 msgstr "マーカ @(%d,%d)"
 
-#: pcbnew/class_mire.cpp:202
+#: kicad-6297/pcbnew/class_mire.cpp:202 kicad-6996/pcbnew/class_mire.cpp:202
 #, c-format
 msgid "Target size %s"
 msgstr "ターゲットサイズ %s"
 
-#: pcbnew/class_module.cpp:573
+#: kicad-6297/pcbnew/class_module.cpp:573
+#: kicad-6996/pcbnew/class_module.cpp:538
 msgid "Last Change"
 msgstr "前回の変更"
 
-#: pcbnew/class_module.cpp:576
+#: kicad-6297/pcbnew/class_module.cpp:576
+#: kicad-6996/pcbnew/class_module.cpp:541
 msgid "Netlist Path"
 msgstr "ネットリストのパス"
 
-#: pcbnew/class_module.cpp:600 pcbnew/class_track.cpp:1134
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:191
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:186
+#: kicad-6297/pcbnew/class_module.cpp:600
+#: kicad-6297/pcbnew/class_track.cpp:1146
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:191
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:186
+#: kicad-6996/pcbnew/class_module.cpp:567
+#: kicad-6996/pcbnew/class_track.cpp:1120
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:191
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:186
 msgid "Status"
 msgstr "ステータス"
 
-#: pcbnew/class_module.cpp:617
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:140
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:98
+#: kicad-6297/pcbnew/class_module.cpp:617
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:98
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:356
+#: kicad-6996/pcbnew/class_module.cpp:584
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:93
 msgid "Virtual"
 msgstr "仮想"
 
-#: pcbnew/class_module.cpp:625
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:142
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:100
+#: kicad-6297/pcbnew/class_module.cpp:625
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:142
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:100
+#: kicad-6996/pcbnew/class_module.cpp:592
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:137
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:95
 msgid "Attributes"
 msgstr "属性"
 
-#: pcbnew/class_module.cpp:628
+#: kicad-6297/pcbnew/class_module.cpp:628
+#: kicad-6996/pcbnew/class_module.cpp:596
 msgid "No 3D shape"
 msgstr "3Dシェイプがありません！"
 
-#: pcbnew/class_module.cpp:639
+#: kicad-6297/pcbnew/class_module.cpp:639
+#: kicad-6996/pcbnew/class_module.cpp:602
 msgid "3D-Shape"
 msgstr "3Dシェイプ"
 
-#: pcbnew/class_module.cpp:642
+#: kicad-6297/pcbnew/class_module.cpp:642
+#: kicad-6996/pcbnew/class_module.cpp:605
 #, c-format
 msgid "Doc: %s"
 msgstr "ドキュメント: %s"
 
-#: pcbnew/class_module.cpp:643
+#: kicad-6297/pcbnew/class_module.cpp:643
+#: kicad-6996/pcbnew/class_module.cpp:606
 #, c-format
 msgid "Key Words: %s"
 msgstr "キーワード:  %s"
 
-#: pcbnew/class_module.cpp:839
+#: kicad-6297/pcbnew/class_module.cpp:839
+#: kicad-6996/pcbnew/class_module.cpp:806
 #, c-format
 msgid "Footprint %s on %s"
 msgstr "フットプリント %s - %s"
 
-#: pcbnew/class_netinfo_item.cpp:87
+#: kicad-6297/pcbnew/class_netinfo_item.cpp:87
+#: kicad-6996/pcbnew/class_netinfo_item.cpp:88
 msgid "Net Name"
 msgstr "ネット名"
 
-#: pcbnew/class_netinfo_item.cpp:90
+#: kicad-6297/pcbnew/class_netinfo_item.cpp:90
+#: kicad-6996/pcbnew/class_netinfo_item.cpp:91
 msgid "Net Code"
 msgstr "ネット コード"
 
-#: pcbnew/class_netinfo_item.cpp:137
+#: kicad-6297/pcbnew/class_netinfo_item.cpp:137
+#: kicad-6996/pcbnew/class_netinfo_item.cpp:138
 msgid "Net Length"
 msgstr "ネット長"
 
-#: pcbnew/class_netinfo_item.cpp:141
+#: kicad-6297/pcbnew/class_netinfo_item.cpp:141
+#: kicad-6996/pcbnew/class_netinfo_item.cpp:142
 msgid "On Board"
 msgstr "基板上"
 
-#: pcbnew/class_netinfo_item.cpp:145
+#: kicad-6297/pcbnew/class_netinfo_item.cpp:145
+#: kicad-6996/pcbnew/class_netinfo_item.cpp:146
 msgid "In Package"
 msgstr "パッケージ内"
 
-#: pcbnew/class_pad.cpp:633
+#: kicad-6297/pcbnew/class_pad.cpp:615 kicad-6996/pcbnew/class_pad.cpp:631
 msgid "Pad"
 msgstr "パッド"
 
-#: pcbnew/class_pad.cpp:636 pcbnew/dialogs/dialog_design_rules.cpp:53
+#: kicad-6297/pcbnew/class_pad.cpp:618
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:53
+#: kicad-6996/pcbnew/class_pad.cpp:634
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:51
 msgid "Net"
 msgstr "ネット"
 
-#: pcbnew/class_pad.cpp:662 pcbnew/class_track.cpp:1247
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:273
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:262
+#: kicad-6297/pcbnew/class_pad.cpp:644 kicad-6297/pcbnew/class_track.cpp:1259
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:273
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:262
+#: kicad-6996/pcbnew/class_pad.cpp:660 kicad-6996/pcbnew/class_track.cpp:1233
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:273
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:265
 msgid "Drill"
 msgstr "ドリル"
 
-#: pcbnew/class_pad.cpp:670
+#: kicad-6297/pcbnew/class_pad.cpp:652 kicad-6996/pcbnew/class_pad.cpp:668
 msgid "Drill X / Y"
 msgstr "ドリル X/Y"
 
-#: pcbnew/class_pad.cpp:690
+#: kicad-6297/pcbnew/class_pad.cpp:672 kicad-6996/pcbnew/class_pad.cpp:688
 msgid "Length in package"
 msgstr "パッケージ内の長さ"
 
-#: pcbnew/class_pad.cpp:867 pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6297/pcbnew/class_pad.cpp:849
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6996/pcbnew/class_pad.cpp:880
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:66
 msgid "Oval"
 msgstr "楕円"
 
-#: pcbnew/class_pad.cpp:873
+#: kicad-6297/pcbnew/class_pad.cpp:855 kicad-6996/pcbnew/class_pad.cpp:886
 msgid "Trap"
 msgstr "トラップ"
 
-#: pcbnew/class_pad.cpp:886
+#: kicad-6297/pcbnew/class_pad.cpp:868 kicad-6996/pcbnew/class_pad.cpp:902
 msgid "Std"
 msgstr "標準"
 
-#: pcbnew/class_pad.cpp:889 pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6297/pcbnew/class_pad.cpp:871
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6996/pcbnew/class_pad.cpp:905
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:56
 msgid "SMD"
 msgstr "SMD"
 
-#: pcbnew/class_pad.cpp:892
+#: kicad-6297/pcbnew/class_pad.cpp:874 kicad-6996/pcbnew/class_pad.cpp:908
 msgid "Conn"
 msgstr "コネクタ"
 
-#: pcbnew/class_pad.cpp:895
+#: kicad-6297/pcbnew/class_pad.cpp:877 kicad-6996/pcbnew/class_pad.cpp:911
 msgid "Not Plated"
 msgstr "メッキ無し穴(NPTH)"
 
-#: pcbnew/class_pad.cpp:911
+#: kicad-6297/pcbnew/class_pad.cpp:893 kicad-6996/pcbnew/class_pad.cpp:927
 #, c-format
 msgid "Pad on %s of %s"
 msgstr "パッド %s - %s"
 
-#: pcbnew/class_pad.cpp:917
+#: kicad-6297/pcbnew/class_pad.cpp:899 kicad-6996/pcbnew/class_pad.cpp:933
 #, c-format
 msgid "Pad %s on %s of %s"
 msgstr "パッド %s (%s) - %s"
 
-#: pcbnew/class_pcb_layer_box_selector.cpp:98
+#: kicad-6297/pcbnew/class_pcb_layer_box_selector.cpp:98
+#: kicad-6996/pcbnew/class_pcb_layer_box_selector.cpp:98
 msgid "(not activated)"
 msgstr "(アクティブではありません)"
 
-#: pcbnew/class_pcb_layer_widget.cpp:60 pcbnew/class_track.cpp:1214
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:60
+#: kicad-6297/pcbnew/class_track.cpp:1226
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:60
+#: kicad-6996/pcbnew/class_track.cpp:1200
 msgid "Through Via"
 msgstr "貫通ビア"
 
-#: pcbnew/class_pcb_layer_widget.cpp:60
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:60
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:60
 msgid "Show through vias"
 msgstr "貫通ビアを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:61
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:61
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:61
 msgid "Bl/Buried Via"
 msgstr "ブラインド/ベリードビア"
 
-#: pcbnew/class_pcb_layer_widget.cpp:61
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:61
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:61
 msgid "Show blind or buried vias"
 msgstr "ブラインド/ベリッドビアの表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:62 pcbnew/class_track.cpp:1204
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:62
+#: kicad-6297/pcbnew/class_track.cpp:1216
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:62
+#: kicad-6996/pcbnew/class_track.cpp:1190
 msgid "Micro Via"
 msgstr "マイクロビア"
 
-#: pcbnew/class_pcb_layer_widget.cpp:62
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:62
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:62
 msgid "Show micro vias"
 msgstr "マイクロビアを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:63
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:63
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:63
 msgid "Non Plated"
 msgstr "メッキ無し"
 
-#: pcbnew/class_pcb_layer_widget.cpp:63
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:63
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:63
 msgid "Show non plated holes"
 msgstr "メッキ無し穴の表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:64
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:64
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:64
 msgid "Ratsnest"
 msgstr "ラッツネスト"
 
-#: pcbnew/class_pcb_layer_widget.cpp:64
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:64
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:64
 msgid "Show unconnected nets as a ratsnest"
 msgstr "未接続のネットをラッツネストとして表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:66
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:66
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:66
 msgid "Pads Front"
 msgstr "表面パッド"
 
-#: pcbnew/class_pcb_layer_widget.cpp:66
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:66
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:66
 msgid "Show footprint pads on board's front"
 msgstr "ボード表面のフットプリントのパッドを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:67
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:67
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:67
 msgid "Pads Back"
 msgstr "裏面パッド"
 
-#: pcbnew/class_pcb_layer_widget.cpp:67
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:67
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:67
 msgid "Show footprint pads on board's back"
 msgstr "ボード裏面のフットプリントのパッドを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:69
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:69
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:69
 msgid "Text Front"
 msgstr "表面テキスト"
 
-#: pcbnew/class_pcb_layer_widget.cpp:69
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:69
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:69
 msgid "Show footprint text on board's front"
 msgstr "ボード表面にフットプリントのテキストを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:70
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:70
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:70
 msgid "Text Back"
 msgstr "裏面テキスト"
 
-#: pcbnew/class_pcb_layer_widget.cpp:70
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:70
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:70
 msgid "Show footprint text on board's back"
 msgstr "ボード裏面のフットプリントのテキストを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:71
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:71
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:71
 msgid "Hidden Text"
 msgstr "非表示テキスト"
 
-#: pcbnew/class_pcb_layer_widget.cpp:71
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:71
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:71
 msgid "Show footprint text marked as invisible"
 msgstr "非表示のフットプリントのテキストを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:73
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:73
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:73
 msgid "Anchors"
 msgstr "アンカー"
 
-#: pcbnew/class_pcb_layer_widget.cpp:73
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:73
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:73
 msgid "Show footprint and text origins as a cross"
 msgstr "フットプリントとテキストの原点を十字で表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:75
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:75
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:75
 msgid "No-Connects"
 msgstr "未接続"
 
-#: pcbnew/class_pcb_layer_widget.cpp:75
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:75
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:75
 msgid "Show a marker on pads which have no net connected"
 msgstr "ネットに接続されていないパッドにマーカーを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:76
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:76
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:76
 msgid "Footprints Front"
 msgstr "表面のフットプリント"
 
-#: pcbnew/class_pcb_layer_widget.cpp:76
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:76
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:76
 msgid "Show footprints that are on board's front"
 msgstr "ボード表面のフットプリントを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:77
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:77
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:77
 msgid "Footprints Back"
 msgstr "裏面のフットプリント"
 
-#: pcbnew/class_pcb_layer_widget.cpp:77
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:77
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:77
 msgid "Show footprints that are on board's back"
 msgstr "ボード裏面のフットプリントを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:78
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:78
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:78
 msgid "Show footprint's values"
 msgstr "フットプリントの定数を表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:79
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:79
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:79
 msgid "References"
 msgstr "リファレンス"
 
-#: pcbnew/class_pcb_layer_widget.cpp:79
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:79
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:79
 msgid "Show footprint's references"
 msgstr "フットプリントの設定を表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:161
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:161
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:161
 msgid "Show All Copper Layers"
 msgstr "全ての導体レイヤを表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:163
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:163
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:163
 msgid "Hide All Copper Layers But Active"
 msgstr "全てのアクティブでない導体レイヤを隠す"
 
-#: pcbnew/class_pcb_layer_widget.cpp:165
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:165
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:165
 msgid "Always Hide All Copper Layers But Active"
 msgstr "全てのアクティブでない導体レイヤを隠す"
 
-#: pcbnew/class_pcb_layer_widget.cpp:167
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:167
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:167
 msgid "Hide All Copper Layers"
 msgstr "全ての導体レイヤを非表示"
 
-#: pcbnew/class_pcb_layer_widget.cpp:328
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:328
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:328
 msgid "Front copper layer"
 msgstr "表面の導体層"
 
-#: pcbnew/class_pcb_layer_widget.cpp:332
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:332
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:332
 msgid "Back copper layer"
 msgstr "裏面の導体層"
 
-#: pcbnew/class_pcb_layer_widget.cpp:336
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:336
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:336
 msgid "Inner copper layer"
 msgstr "内部の導体層"
 
-#: pcbnew/class_pcb_layer_widget.cpp:360
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:360
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:360
 msgid "Adhesive on board's front"
 msgstr "ボード表面の部品実装用ボンド位置"
 
-#: pcbnew/class_pcb_layer_widget.cpp:361
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:361
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:361
 msgid "Adhesive on board's back"
 msgstr "ボード裏面の部品実装用ボンド位置"
 
-#: pcbnew/class_pcb_layer_widget.cpp:362
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:362
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:362
 msgid "Solder paste on board's front"
 msgstr "ボード表面のハンダペースト (メタルマスク)"
 
-#: pcbnew/class_pcb_layer_widget.cpp:363
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:363
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:363
 msgid "Solder paste on board's back"
 msgstr "ボード裏面のハンダペースト (メタルマスク)"
 
-#: pcbnew/class_pcb_layer_widget.cpp:364
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:364
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:364
 msgid "Silkscreen on board's front"
 msgstr "ボード表面のシルクスクリーン"
 
-#: pcbnew/class_pcb_layer_widget.cpp:365
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:365
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:365
 msgid "Silkscreen on board's back"
 msgstr "ボード裏面のシルクスクリーン"
 
-#: pcbnew/class_pcb_layer_widget.cpp:366
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:366
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:366
 msgid "Solder mask on board's front"
 msgstr "ボード表面のレジスト"
 
-#: pcbnew/class_pcb_layer_widget.cpp:367
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:367
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:367
 msgid "Solder mask on board's back"
 msgstr "ボード裏面のレジスト"
 
-#: pcbnew/class_pcb_layer_widget.cpp:368
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:368
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:368
 msgid "Explanatory drawings"
 msgstr "説明用の図形"
 
-#: pcbnew/class_pcb_layer_widget.cpp:369
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:369
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:369
 msgid "Explanatory comments"
 msgstr "説明用のコメント"
 
-#: pcbnew/class_pcb_layer_widget.cpp:370 pcbnew/class_pcb_layer_widget.cpp:371
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:370
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:371
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:370
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:371
 msgid "User defined meaning"
 msgstr "ユーザ定義"
 
-#: pcbnew/class_pcb_layer_widget.cpp:372
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:372
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:372
 msgid "Board's perimeter definition"
 msgstr "基板外形の定義"
 
-#: pcbnew/class_pcb_layer_widget.cpp:373
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:373
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:373
 msgid "Board's edge setback outline"
 msgstr "ボードの辺をアウトライン内へ後退させる"
 
-#: pcbnew/class_pcb_layer_widget.cpp:374
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:374
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:374
 msgid "Footprint courtyards on board's front"
 msgstr "ボード表面のフットプリントのコートヤード"
 
-#: pcbnew/class_pcb_layer_widget.cpp:375
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:375
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:375
 msgid "Footprint courtyards on board's back"
 msgstr "ボード裏面のフットプリントのコートヤード"
 
-#: pcbnew/class_pcb_layer_widget.cpp:376
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:376
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:376
 msgid "Footprint assembly on board's front"
 msgstr "ボード表面のフットプリントの実装"
 
-#: pcbnew/class_pcb_layer_widget.cpp:377
+#: kicad-6297/pcbnew/class_pcb_layer_widget.cpp:377
+#: kicad-6996/pcbnew/class_pcb_layer_widget.cpp:377
 msgid "Footprint assembly on board's back"
 msgstr "ボード裏面のフットプリントの実装"
 
-#: pcbnew/class_pcb_text.cpp:136
+#: kicad-6297/pcbnew/class_pcb_text.cpp:136
+#: kicad-6996/pcbnew/class_pcb_text.cpp:136
 msgid "Dimension"
 msgstr "寸法線"
 
-#: pcbnew/class_pcb_text.cpp:138
+#: kicad-6297/pcbnew/class_pcb_text.cpp:138
+#: kicad-6996/pcbnew/class_pcb_text.cpp:138
 msgid "PCB Text"
 msgstr "PCBテキスト"
 
-#: pcbnew/class_pcb_text.cpp:191
+#: kicad-6297/pcbnew/class_pcb_text.cpp:192
+#: kicad-6996/pcbnew/class_pcb_text.cpp:192
 #, c-format
 msgid "Pcb Text \"%s\" on %s"
 msgstr "基板上のテキスト \"%s\" (%s)"
 
-#: pcbnew/class_text_mod.cpp:365
+#: kicad-6297/pcbnew/class_text_mod.cpp:365
+#: kicad-6996/pcbnew/class_text_mod.cpp:342
 msgid "Ref."
 msgstr "リファレンス"
 
-#: pcbnew/class_text_mod.cpp:382
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:85
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:118
+#: kicad-6297/pcbnew/class_text_mod.cpp:382
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:114
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:119
+#: kicad-6996/pcbnew/class_text_mod.cpp:359
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:79
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:105
 msgid "Display"
 msgstr "表示"
 
-#: pcbnew/class_text_mod.cpp:388
+#: kicad-6297/pcbnew/class_text_mod.cpp:388
+#: kicad-6996/pcbnew/class_text_mod.cpp:365
 msgid " Yes"
 msgstr " はい"
 
-#: pcbnew/class_text_mod.cpp:390
+#: kicad-6297/pcbnew/class_text_mod.cpp:390
+#: kicad-6996/pcbnew/class_text_mod.cpp:367
 msgid " No"
 msgstr " いいえ"
 
-#: pcbnew/class_text_mod.cpp:416
+#: kicad-6297/pcbnew/class_text_mod.cpp:416
+#: kicad-6996/pcbnew/class_text_mod.cpp:393
 #, c-format
 msgid "Reference %s"
 msgstr "リファレンス %s"
 
-#: pcbnew/class_text_mod.cpp:420
+#: kicad-6297/pcbnew/class_text_mod.cpp:420
+#: kicad-6996/pcbnew/class_text_mod.cpp:397
 #, c-format
 msgid "Value %s of %s"
 msgstr "定数 %s (%s)"
 
-#: pcbnew/class_text_mod.cpp:424
+#: kicad-6297/pcbnew/class_text_mod.cpp:424
+#: kicad-6996/pcbnew/class_text_mod.cpp:401
 #, c-format
 msgid "Text \"%s\" on %s of %s"
 msgstr "テキスト \"%s\" (%s) - %s"
 
-#: pcbnew/class_track.cpp:145
+#: kicad-6297/pcbnew/class_track.cpp:145 kicad-6996/pcbnew/class_track.cpp:145
 #, c-format
 msgid "Zone (%08lX) [%s] on %s"
 msgstr "ゾーン (%08lX) [%s] - %s"
 
-#: pcbnew/class_track.cpp:176
+#: kicad-6297/pcbnew/class_track.cpp:176 kicad-6996/pcbnew/class_track.cpp:176
 #, c-format
 msgid "Blind/Buried Via %s, net[%s] (%d) on layers %s/%s"
 msgstr "ブラインド/ベリッドビア %s, ネット[%s] (%d) レイヤ %s/%s"
 
-#: pcbnew/class_track.cpp:179
+#: kicad-6297/pcbnew/class_track.cpp:179 kicad-6996/pcbnew/class_track.cpp:179
 #, c-format
 msgid "Micro Via %s, Net [%s] (%d) on layers %s/%s"
 msgstr "マイクロビア %s, ネット [%s] (%d) - レイヤ %s/%s"
 
-#: pcbnew/class_track.cpp:183
+#: kicad-6297/pcbnew/class_track.cpp:183 kicad-6996/pcbnew/class_track.cpp:183
 #, c-format
 msgid "Via %s net [%s] (%d) on layers %s/%s"
 msgstr "ビア %s ネット[%s] (%d) - レイヤ %s/%s"
 
-#: pcbnew/class_track.cpp:1050
+#: kicad-6297/pcbnew/class_track.cpp:1062
+#: kicad-6996/pcbnew/class_track.cpp:1036
 msgid "Full Length"
 msgstr "全長"
 
-#: pcbnew/class_track.cpp:1053
+#: kicad-6297/pcbnew/class_track.cpp:1065
+#: kicad-6996/pcbnew/class_track.cpp:1039
 msgid "Pad To Die Length"
 msgstr "パッドからダイまでの長さ"
 
-#: pcbnew/class_track.cpp:1061
+#: kicad-6297/pcbnew/class_track.cpp:1073
+#: kicad-6996/pcbnew/class_track.cpp:1047
 msgid "NC Name"
 msgstr "ネットクラス名"
 
-#: pcbnew/class_track.cpp:1062
+#: kicad-6297/pcbnew/class_track.cpp:1074
+#: kicad-6996/pcbnew/class_track.cpp:1048
 msgid "NC Clearance"
 msgstr "ネットクラス クリアランス"
 
-#: pcbnew/class_track.cpp:1065
+#: kicad-6297/pcbnew/class_track.cpp:1077
+#: kicad-6996/pcbnew/class_track.cpp:1051
 msgid "NC Width"
 msgstr "ネットクラス 幅"
 
-#: pcbnew/class_track.cpp:1068
+#: kicad-6297/pcbnew/class_track.cpp:1080
+#: kicad-6996/pcbnew/class_track.cpp:1054
 msgid "NC Via Size"
 msgstr "ネットクラス ビア径"
 
-#: pcbnew/class_track.cpp:1071
+#: kicad-6297/pcbnew/class_track.cpp:1083
+#: kicad-6996/pcbnew/class_track.cpp:1057
 msgid "NC Via Drill"
 msgstr "ネットクラス ビア ドリル径"
 
-#: pcbnew/class_track.cpp:1091 pcbnew/class_zone.cpp:613
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:46
-#: pcbnew/zones_by_polygon_fill_functions.cpp:113
+#: kicad-6297/pcbnew/class_track.cpp:1103 kicad-6297/pcbnew/class_zone.cpp:613
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:46
+#: kicad-6297/pcbnew/zones_by_polygon_fill_functions.cpp:113
+#: kicad-6996/pcbnew/class_track.cpp:1077 kicad-6996/pcbnew/class_zone.cpp:613
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:46
+#: kicad-6996/pcbnew/zones_by_polygon_fill_functions.cpp:113
 msgid "NetName"
 msgstr "ネット名"
 
-#: pcbnew/class_track.cpp:1095 pcbnew/class_zone.cpp:617
+#: kicad-6297/pcbnew/class_track.cpp:1107 kicad-6297/pcbnew/class_zone.cpp:617
+#: kicad-6996/pcbnew/class_track.cpp:1081 kicad-6996/pcbnew/class_zone.cpp:617
 msgid "NetCode"
 msgstr "ネットコード"
 
-#: pcbnew/class_track.cpp:1142
+#: kicad-6297/pcbnew/class_track.cpp:1154
+#: kicad-6996/pcbnew/class_track.cpp:1128
 msgid "Track"
 msgstr "配線"
 
-#: pcbnew/class_track.cpp:1161 pcbnew/class_track.cpp:1188
+#: kicad-6297/pcbnew/class_track.cpp:1173
+#: kicad-6297/pcbnew/class_track.cpp:1200
+#: kicad-6996/pcbnew/class_track.cpp:1147
+#: kicad-6996/pcbnew/class_track.cpp:1174
 msgid "Segment Length"
 msgstr "セグメント長"
 
-#: pcbnew/class_track.cpp:1169
+#: kicad-6297/pcbnew/class_track.cpp:1181
+#: kicad-6996/pcbnew/class_track.cpp:1155
 msgid "Zone "
 msgstr "ゾーン"
 
-#: pcbnew/class_track.cpp:1209
+#: kicad-6297/pcbnew/class_track.cpp:1221
+#: kicad-6996/pcbnew/class_track.cpp:1195
 msgid "Blind/Buried Via"
 msgstr "ブラインドビア(BVH)/ベリッドホール(BH)"
 
-#: pcbnew/class_track.cpp:1234 pcbnew/dialogs/dialog_layers_setup_base.cpp:86
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:315
-#: pcbnew/dialogs/dialog_plot_base.cpp:70
+#: kicad-6297/pcbnew/class_track.cpp:1246
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:86
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:315
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:70
+#: kicad-6996/pcbnew/class_track.cpp:1220
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:86
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:316
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:69
 msgid "Layers"
 msgstr "レイヤ"
 
-#: pcbnew/class_track.cpp:1240 pcbnew/dialogs/dialog_design_rules_base.cpp:272
+#: kicad-6297/pcbnew/class_track.cpp:1252
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:272
+#: kicad-6996/pcbnew/class_track.cpp:1226
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:272
 msgid "Diameter"
 msgstr "直径"
 
-#: pcbnew/class_track.cpp:1270
+#: kicad-6297/pcbnew/class_track.cpp:1282
+#: kicad-6996/pcbnew/class_track.cpp:1256
 msgid "(Specific)"
 msgstr "(固有値)"
 
-#: pcbnew/class_track.cpp:1272
+#: kicad-6297/pcbnew/class_track.cpp:1284
+#: kicad-6996/pcbnew/class_track.cpp:1258
 msgid "(NetClass)"
 msgstr "(ネットクラス)"
 
-#: pcbnew/class_track.cpp:1581
+#: kicad-6297/pcbnew/class_track.cpp:1593
+#: kicad-6996/pcbnew/class_track.cpp:1567
 msgid "Not found"
 msgstr "見つかりませんでした"
 
-#: pcbnew/class_track.cpp:1589
+#: kicad-6297/pcbnew/class_track.cpp:1601
+#: kicad-6996/pcbnew/class_track.cpp:1575
 #, c-format
 msgid "Track %s, net [%s] (%d) on layer %s, length: %s"
 msgstr "配線 %s, ネット [%s] (%d) レイヤ %s, 配線長: %s"
 
-#: pcbnew/class_zone.cpp:573
+#: kicad-6297/pcbnew/class_zone.cpp:573 kicad-6996/pcbnew/class_zone.cpp:573
 msgid "Zone Outline"
 msgstr "ゾーンの外枠"
 
-#: pcbnew/class_zone.cpp:580 pcbnew/class_zone.cpp:816
+#: kicad-6297/pcbnew/class_zone.cpp:580 kicad-6297/pcbnew/class_zone.cpp:817
+#: kicad-6996/pcbnew/class_zone.cpp:580 kicad-6996/pcbnew/class_zone.cpp:817
 msgid "(Cutout)"
 msgstr "(切り抜き)"
 
-#: pcbnew/class_zone.cpp:589
+#: kicad-6297/pcbnew/class_zone.cpp:589 kicad-6996/pcbnew/class_zone.cpp:589
 msgid "No via"
 msgstr "ビアなし"
 
-#: pcbnew/class_zone.cpp:592
+#: kicad-6297/pcbnew/class_zone.cpp:592 kicad-6996/pcbnew/class_zone.cpp:592
 msgid "No track"
 msgstr "配線なし"
 
-#: pcbnew/class_zone.cpp:595
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:68
+#: kicad-6297/pcbnew/class_zone.cpp:595
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:68
+#: kicad-6996/pcbnew/class_zone.cpp:595
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:67
 msgid "No copper pour"
 msgstr "ベタパターン無し"
 
-#: pcbnew/class_zone.cpp:597
+#: kicad-6297/pcbnew/class_zone.cpp:597 kicad-6996/pcbnew/class_zone.cpp:597
 msgid "Keepout"
 msgstr "禁止エリア"
 
-#: pcbnew/class_zone.cpp:608
+#: kicad-6297/pcbnew/class_zone.cpp:608 kicad-6996/pcbnew/class_zone.cpp:608
 msgid "<unknown>"
 msgstr "<不明>"
 
-#: pcbnew/class_zone.cpp:621
+#: kicad-6297/pcbnew/class_zone.cpp:621 kicad-6996/pcbnew/class_zone.cpp:621
 msgid "Priority"
 msgstr "優先度"
 
-#: pcbnew/class_zone.cpp:625
+#: kicad-6297/pcbnew/class_zone.cpp:625 kicad-6996/pcbnew/class_zone.cpp:625
 msgid "Non Copper Zone"
 msgstr "導体ゾーンがありません"
 
-#: pcbnew/class_zone.cpp:631
+#: kicad-6297/pcbnew/class_zone.cpp:631 kicad-6996/pcbnew/class_zone.cpp:631
 msgid "Corners"
 msgstr "角"
 
-#: pcbnew/class_zone.cpp:634
+#: kicad-6297/pcbnew/class_zone.cpp:634 kicad-6996/pcbnew/class_zone.cpp:634
 msgid "Segments"
 msgstr "セグメント"
 
-#: pcbnew/class_zone.cpp:638
+#: kicad-6297/pcbnew/class_zone.cpp:638 kicad-6996/pcbnew/class_zone.cpp:638
 msgid "Fill Mode"
 msgstr "塗りつぶしモード"
 
-#: pcbnew/class_zone.cpp:642
+#: kicad-6297/pcbnew/class_zone.cpp:642 kicad-6996/pcbnew/class_zone.cpp:642
 msgid "Hatch Lines"
 msgstr "ハッチングライン"
 
-#: pcbnew/class_zone.cpp:647
+#: kicad-6297/pcbnew/class_zone.cpp:647 kicad-6996/pcbnew/class_zone.cpp:647
 msgid "Corner Count"
 msgstr "角の数"
 
-#: pcbnew/class_zone.cpp:819
+#: kicad-6297/pcbnew/class_zone.cpp:820 kicad-6996/pcbnew/class_zone.cpp:820
 msgid "(Keepout)"
 msgstr "(禁止エリア)"
 
-#: pcbnew/class_zone.cpp:839
+#: kicad-6297/pcbnew/class_zone.cpp:840 kicad-6996/pcbnew/class_zone.cpp:840
 msgid "** NO BOARD DEFINED **"
 msgstr "** ボードが定義されていません **"
 
-#: pcbnew/class_zone.cpp:851
+#: kicad-6297/pcbnew/class_zone.cpp:852 kicad-6996/pcbnew/class_zone.cpp:852
 #, c-format
 msgid "Zone Outline %s on %s"
 msgstr "ゾーンの外枠 %s - %s"
 
-#: pcbnew/cross-probing.cpp:66
+#: kicad-6297/pcbnew/cross-probing.cpp:67
+#: kicad-6996/pcbnew/cross-probing.cpp:70
 #, c-format
 msgid "%s found"
 msgstr "%s が見つかりました"
 
-#: pcbnew/cross-probing.cpp:68 pcbnew/cross-probing.cpp:115
+#: kicad-6297/pcbnew/cross-probing.cpp:69
+#: kicad-6297/pcbnew/cross-probing.cpp:115
+#: kicad-6996/pcbnew/cross-probing.cpp:72
+#: kicad-6996/pcbnew/cross-probing.cpp:118
 #, c-format
 msgid "%s not found"
 msgstr "%s が見つかりません"
 
-#: pcbnew/cross-probing.cpp:119
+#: kicad-6297/pcbnew/cross-probing.cpp:119
+#: kicad-6996/pcbnew/cross-probing.cpp:122
 #, c-format
 msgid "%s pin %s not found"
 msgstr "%s ピン %s が見つかりません"
 
-#: pcbnew/cross-probing.cpp:124
+#: kicad-6297/pcbnew/cross-probing.cpp:124
+#: kicad-6996/pcbnew/cross-probing.cpp:127
 #, c-format
 msgid "%s pin %s found"
 msgstr "%s ピン %s が見つかりました"
 
-#: pcbnew/deltrack.cpp:158
+#: kicad-6297/pcbnew/deltrack.cpp:158 kicad-6996/pcbnew/deltrack.cpp:158
 msgid "Delete NET?"
 msgstr "NETを削除しますか？"
 
-#: pcbnew/dialogs/dialog_SVG_print.cpp:222
-#: pcbnew/dialogs/dialog_gendrill.cpp:302
-#: pcbnew/exporters/gen_modules_placefile.cpp:183
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:222
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:302
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:182
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:221
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:187
 msgid "Use a relative path? "
 msgstr "相対パスを使用しますか？"
 
-#: pcbnew/dialogs/dialog_SVG_print.cpp:233
-#: pcbnew/exporters/gen_modules_placefile.cpp:192
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:233
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:191
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:232
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:196
 msgid ""
 "Cannot make path relative (target volume different from board file volume)!"
 msgstr ""
 "パスの関連付けを作成できません (ターゲットボリュームがボードファイルのボ"
 "リュームと異なります"
 
-#: pcbnew/dialogs/dialog_SVG_print.cpp:306
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:306
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:305
 #, c-format
 msgid "Plot: '%s' OK."
 msgstr "プロット: '%s' OK."
 
-#: pcbnew/dialogs/dialog_SVG_print.cpp:312 pcbnew/dialogs/dialog_plot.cpp:819
-#: pcbnew/exporters/gen_modules_placefile.cpp:309
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print.cpp:312
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:819
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:308
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print.cpp:311
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:806
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:333
 #, c-format
 msgid "Unable to create file '%s'."
 msgstr "ファイル '%s' を作成できません"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:30
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:30
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:29
 msgid ""
 "Enter a filename if you do not want to use default file names\n"
 "Can be used only when printing the current sheet"
@@ -12639,170 +16797,215 @@ msgstr ""
 "い。\n"
 "これは現在のシートを印刷するときにのみ使用されます。"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:47
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:49
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:28
 msgid "Copper Layers:"
 msgstr "導体レイヤ:"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:52
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:30
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:30
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:63
 msgid "Technical Layers:"
 msgstr "テクニカル レイヤ:"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:78
 msgid "Print SVG options:"
 msgstr "SVG印刷オプション:"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:63
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:80
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:100
 msgid "Default pen size"
 msgstr "デフォルト ペン サイズ"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:82
 msgid ""
 "Selection of the pen size used to draw items which have no pen size "
 "specified."
 msgstr "太さが０にセットされているアイテムを描画する時の、標準ペン幅を選択"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:75
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:75
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:91
 msgid "Print mode"
 msgstr "印刷モード"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:81
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:97
 msgid "Full page with  frame ref"
 msgstr "図枠付きフルページ"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:81
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:97
 msgid "Current page size"
 msgstr "現在の用紙サイズ"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:81
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:97
 msgid "Board area only"
 msgstr "ボードの範囲のみ"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:99
 msgid "SVG Page Size"
 msgstr "SVGページ サイズ"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:103
 msgid "Print board edges"
 msgstr "基板外形を出力"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:105
 msgid "Print (or not) the edges layer on others layers"
 msgstr "基板外形レイヤを他のレイヤに印刷する"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:93
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:109
 msgid "Print mirrored"
 msgstr "反転印刷"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:110
 msgid "Print the layer(s) horizontally mirrored"
 msgstr "水平反転してレイヤを印刷"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:104
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:104
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:120
 msgid "One file per layer"
 msgstr "レイヤごとにファイルを出力する"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:104
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:104
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:120
 msgid "All in one file"
 msgstr "全てを1つのファイルへまとめる"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:122
 msgid "File option:"
 msgstr "ファイルオプション:"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.cpp:110
-#: pcbnew/dialogs/dialog_plot_base.cpp:379
-#: pcbnew/dialogs/dialog_plot_base.h:132
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.cpp:110
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:379
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:351
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.h:132
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.h:132
 msgid "Plot"
 msgstr "製造ファイル出力"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:25
 msgid "Include &footprints"
 msgstr "フットプリントを含む(&f)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:28
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:28
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:28
 msgid "Include t&ext items"
 msgstr "文字アイテムを含む(&e)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:32
 msgid "Include &locked footprints"
 msgstr "ロックされているフットプリントを含む(&l)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:35
 msgid "Include &drawings"
 msgstr "図形を含む(&d)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:38
 msgid "Include &tracks"
 msgstr "配線を含む(&t)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:41
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:41
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:41
 msgid "Include &board outline layer"
 msgstr "基板外形レイヤを含む(&b)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:44
 msgid "Include &zones"
 msgstr "ゾーンを含む(&z)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:47
 msgid "Draw &selected items while moving"
 msgstr "移動中に選択したアイテムを描画(&s)"
 
-#: pcbnew/dialogs/dialog_block_options_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_block_options_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_block_options_base.cpp:56
 msgid "Include &items on invisible layers"
 msgstr "非表示レイヤのアイテムを含む(&i)"
 
-#: pcbnew/dialogs/dialog_cleaning_options_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_cleaning_options_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_cleaning_options_base.cpp:22
 msgid "&Delete redundant vias"
 msgstr "余分なビアを削除(&D)"
 
-#: pcbnew/dialogs/dialog_cleaning_options_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_cleaning_options_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_cleaning_options_base.cpp:23
 msgid "remove vias on pads with a through hole"
 msgstr "スルーホールパッド上にあるビアを削除"
 
-#: pcbnew/dialogs/dialog_cleaning_options_base.cpp:27
+#: kicad-6297/pcbnew/dialogs/dialog_cleaning_options_base.cpp:27
+#: kicad-6996/pcbnew/dialogs/dialog_cleaning_options_base.cpp:27
 msgid "&Merge overlapping segments"
 msgstr "重なっている配線セグメントの統合(&M)"
 
-#: pcbnew/dialogs/dialog_cleaning_options_base.cpp:28
+#: kicad-6297/pcbnew/dialogs/dialog_cleaning_options_base.cpp:28
+#: kicad-6996/pcbnew/dialogs/dialog_cleaning_options_base.cpp:28
 msgid "merge aligned track segments, and remove null segments"
 msgstr "一直線上の配線セグメントをマージし、空のセグメントを削除"
 
-#: pcbnew/dialogs/dialog_cleaning_options_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_cleaning_options_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_cleaning_options_base.cpp:32
 msgid "D&elete unconnected tracks"
 msgstr "未接続の配線を削除(&e)"
 
-#: pcbnew/dialogs/dialog_cleaning_options_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_cleaning_options_base.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_cleaning_options_base.cpp:33
 msgid "delete track segment having a dangling end"
 msgstr "浮いている終端を持つ配線セグメントを削除"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:408
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:408
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:395
 #, c-format
 msgid "Clearance must be smaller than %f\" / %f mm."
 msgstr "クリアランスは %f\" / %f mm より小さい必要があります。"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:420
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:420
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:407
 #, c-format
 msgid "Minimum width must be larger than %f\" / %f mm."
 msgstr "最小幅は %f\" / %f mm より大い必要があります。"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:458
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:460
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:447
 msgid "Thermal relief spoke must be greater than the minimum width."
 msgstr "サーマルリリーフのスポーク幅は最小幅より太い必要があります。"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:471
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:227
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:496
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:473
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties.cpp:227
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:496
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:460
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties.cpp:220
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:486
 msgid "No layer selected."
 msgstr "レイヤが選択されていません"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:482
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:484
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:471
 msgid "No net selected."
 msgstr "ネットが選択されていません"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:488
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:490
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:477
 msgid ""
 "You have chosen the \"not connected\" option. This will create insulated "
 "copper islands. Are you sure ?"
@@ -12810,58 +17013,78 @@ msgstr ""
 "\"ネットなし\"オプションが選択されました。浮きパターンを作成します。よろしい"
 "ですか？"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:523
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:525
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:512
 msgid "Chamfer distance"
 msgstr "面取り長さ"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:529
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones.cpp:531
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones.cpp:518
 msgid "Fillet radius"
 msgstr "フィレット半径"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:37
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:88
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:129
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:30
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:51
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:107
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:110
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:129
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:30
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:51
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:102
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:110
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:122
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:102
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:110
 msgid "Layer:"
 msgstr "レイヤ:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:50
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:529
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:50
 msgid "Net:"
 msgstr "ネット:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:61
 msgid "Net Filtering"
 msgstr "ネット フィルター"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:63
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:58
 msgid "Display:"
 msgstr "表示:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
 msgid "Show all (alphabetical)"
 msgstr "全て表示(アルファベット順)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
 msgid "Show all (pad count)"
 msgstr "全て表示(パッド数)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
 msgid "Filtered (alphabetical)"
 msgstr "フィルタあり (アルファベット順)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:67
 msgid "Filtered (pad count)"
 msgstr "ピン数によるフィルタ"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:73
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:73
 msgid "Hidden net filter:"
 msgstr "非表示ネットフィルタ:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:79
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:79
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:78
 msgid ""
 "Pattern to filter net names in filtered list.\n"
 "Net names matching this pattern are not displayed."
@@ -12869,16 +17092,19 @@ msgstr ""
 "リスト内のネット名をフィルタするパターン,\n"
 "このパターンに適合するネット名は表示されません"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:82
 msgid "Visible net filter:"
 msgstr "表示ネットフィルタ:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:87
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:86
 msgid "*"
 msgstr "*"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:87
 msgid ""
 "Pattern to filter net names in filtered list.\n"
 "Only net names matching this pattern are displayed."
@@ -12886,90 +17112,115 @@ msgstr ""
 "リスト内のネット名をフィルタするパターン,\n"
 "このパターンに適合するネット名のみ表示されます"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:93
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:91
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:101
 msgid "Settings"
 msgstr "設定"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:108
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:48
-#: pcbnew/dialogs/dialog_drc_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:108
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:36
 msgid "Clearance"
 msgstr "クリアランス"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:116
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:116
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:113
 msgid "Minimum width"
 msgstr "最小幅"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:118
-msgid "Minimun thickness of filled areas."
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:115
+msgid "Minimum thickness of filled areas."
 msgstr "塗りつぶしエリアの最小幅"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:126
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:122
 msgid "Corner smoothing:"
 msgstr "コーナーのスムージング"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:130
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:130
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:126
 msgid "Chamfer"
 msgstr "面取り"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:130
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:130
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:126
 msgid "Fillet"
 msgstr "フィレット"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:132
 msgid "Chamfer distance (mm):"
 msgstr "面取り長さ(mm):"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:150
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:470
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:150
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:470
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:498
 msgid "Pad connection:"
 msgstr "パッド接続:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:154
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:474
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:474
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:195
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:502
 msgid "Solid"
 msgstr "ベタ接続"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:154
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:474
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:474
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:195
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:502
 msgid "Thermal relief"
 msgstr "サーマルリリーフ"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:151
 msgid "THT thermal"
 msgstr "THTサーマル"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:161
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:161
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:158
 msgid "Thermal Reliefs"
 msgstr "サーマルリリーフ"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:163
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:163
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:160
 msgid "Antipad clearance"
 msgstr "パッド抜きのクリアランス"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:169
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:169
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:165
 msgid "Clearance between pads in the same net and filled areas."
 msgstr "同一ネット内のパッドと塗りつぶしエリアのクリアランス"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:173
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:173
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:169
 msgid "Spoke width"
 msgstr "スポーク幅"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:179
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:179
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:174
 msgid "Width of copper in thermal reliefs."
 msgstr "サーマル リリーフ内のブリッジ幅"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:192
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:192
 msgid "Priority level:"
 msgstr "優先度:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:194
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:194
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:189
 msgid ""
 "On each copper layer, zones are filled by priority order.\n"
 "So when a zone is inside an other zone:\n"
@@ -12982,53 +17233,67 @@ msgstr ""
 "* 優先順位が高い場合: その外形は切り抜かれます。\n"
 "* 優先順位が同じ場合: DRCエラーが設定されます。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:201
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:201
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:196
 msgid "Fill mode:"
 msgstr "塗りつぶしモード:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:211
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:211
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:206
 msgid "Segments / 360 deg:"
 msgstr "セグメント数/360度:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:215
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:215
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:210
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "16"
 msgstr "16"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:215
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:215
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:210
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "32"
 msgstr "32"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:227
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:227
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:222
 msgid "Outline slope:"
 msgstr "外枠の角度:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:231
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:231
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:226
 msgid "Arbitrary"
 msgstr "任意角度"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:231
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:231
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:226
 msgid "H, V, and 45 deg only"
 msgstr "0 , 45 , 90度"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:237
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:237
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:232
 msgid "Outline style:"
 msgstr "外枠のスタイル:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:241
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:241
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:236
 msgid "Hatched"
 msgstr "ハッチング"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:241
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:241
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:236
 msgid "Fully hatched"
 msgstr "全てハッチング"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:256
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:256
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:251
 msgid "Export Settings to Other Zones"
 msgstr "他のゾーンに設定をエクスポートする"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:257
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.cpp:257
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:252
 msgid ""
 "Export this zone setup (excluding layer and net selection) to all other "
 "copper zones."
@@ -13036,311 +17301,413 @@ msgstr ""
 "このゾーンの設定 (レイヤとネットの設定を除く) を他の全ての導体ゾーンにエクス"
 "ポートします。"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_create_array.cpp:53
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:56
 msgid "Numerals (0,1,2,...,9,10)"
 msgstr "数値 (0,1,2,...,9,10)"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_create_array.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:57
 msgid "Hexadecimal (0,1,...,F,10,...)"
 msgstr "16進数値 (0,1,...,F,10,...)"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_create_array.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:58
 msgid "Alphabet, minus IOSQXZ"
 msgstr "アルファベット, IOSQXY以外の文字"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_create_array.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:59
 msgid "Alphabet, full 26 characters"
 msgstr "アルファベット, 26文字全て"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_create_array.cpp:296
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:398
+msgid "Bad parameters"
+msgstr "不正なパラメータ"
+
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:29
 msgid "Horizontal count:"
 msgstr "横(X)方向の数："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:33
-#: pcbnew/dialogs/dialog_create_array_base.cpp:40
-#: pcbnew/dialogs/dialog_create_array_base.cpp:47
-#: pcbnew/dialogs/dialog_create_array_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:58
 msgid "5"
 msgstr "5"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:36
 msgid "Vertical count:"
 msgstr "縦(Y)方向の数："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:43
 msgid "Horizontal spacing:"
 msgstr "横(X)方向の間隔："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:54
 msgid "Vertical spacing:"
 msgstr "縦(Y)方向の間隔："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:65
 msgid "Horizontal offset:"
 msgstr "横(X)方向のオフセット："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:76
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:76
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:76
 msgid "Vertical offset:"
 msgstr "縦(Y)方向のオフセット："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:87
 msgid "Stagger:"
 msgstr "配置シフトの間隔: "
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:91
-#: pcbnew/dialogs/dialog_create_array_base.cpp:154
-#: pcbnew/dialogs/dialog_create_array_base.cpp:157
-#: pcbnew/dialogs/dialog_create_array_base.cpp:268
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:91
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:156
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:159
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:263
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:91
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:155
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:158
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:261
 msgid "1"
 msgstr "1"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:94
 msgid "Rows"
 msgstr "行"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:94
 msgid "Columns"
 msgstr "列"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:96
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:96
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:96
 msgid "Stagger Type"
 msgstr "配置シフトのタイプ"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:105
 msgid "Horizontal, then vertical"
 msgstr "水平方向のち垂直方向"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:105
 msgid "Vertical, then horizontal"
 msgstr "垂直方向のち水平方向"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:108
-msgid "Numbering Direction"
-msgstr "ナンバリングの方向:"
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:108
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:107
+msgid "Pad Numbering Direction"
+msgstr "パッド ナンバリングの方向:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:112
-msgid "Reverse numbering on alternate rows or columns"
-msgstr "行/列ごとにナンバリングの方向を反転"
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:112
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:111
+msgid "Reverse pad numbering on alternate rows or columns"
+msgstr "行/列ごとにパッド ナンバリングの方向を反転"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:115
-#: pcbnew/dialogs/dialog_create_array_base.cpp:248
-msgid "Restart numbering"
-msgstr "自動ナンバリング"
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:115
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:250
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:114
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:248
+msgid "Use first free number"
+msgstr "最初の空き番号から使用"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:115
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:250
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:114
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:248
+msgid "From start value"
+msgstr "開始値から"
+
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:117
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:252
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:116
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:250
+msgid "Initial pad number"
+msgstr "最初のパット番号: "
+
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:121
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:120
 msgid "Continuous (1, 2, 3...)"
 msgstr "連続 (1, 2, 3...)"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:121
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:120
 msgid "Coordinate (A1, A2, ... B1, ...)"
 msgstr "組み合わせ (A1, A2, ... B1, ...)"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:121
-msgid "Numbering Scheme"
-msgstr "ナンバリングの方式"
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:123
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:122
+msgid "Pad Numbering Scheme"
+msgstr "パッド ナンバリングの方式"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:125
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:127
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:126
 msgid "Primary axis numbering:"
 msgstr "第1軸のナンバリング:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:134
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:135
 msgid "Secondary axis numbering:"
 msgstr "第2軸のナンバリング:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:150
-#: pcbnew/dialogs/dialog_create_array_base.cpp:264
-msgid "Numbering start:"
-msgstr "ナンバリングの開始:"
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:152
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:151
+msgid "Pad numbering start:"
+msgstr "パッド ナンバリングの開始:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:170
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:172
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:171
 msgid "Grid Array"
 msgstr "グリッド配列"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:180
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:182
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:181
 msgid "Horizontal center:"
 msgstr "横(X)方向の中心："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:191
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:193
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:192
 msgid "Vertical center:"
 msgstr "縦(Y)方向の中心："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:202
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:204
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:203
 msgid "Radius:"
 msgstr "半径:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:206
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:208
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:207
 msgid "0 mm"
 msgstr "0 mm"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:210
-#: pcbnew/dialogs/dialog_move_exact.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:212
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:211
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact.cpp:137
 msgid "Angle:"
 msgstr "角度:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:215
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:217
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:216
 msgid ""
 "Positive angles represent an anti-clockwise rotation. An angle of 0 will "
 "produce a full circle divided evenly into \"Count\" portions."
 msgstr ""
 "正の角度は左回りを意味します。 角度 0 は完全な円を \"Count\" で等分割します。"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:223
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:225
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:224
 msgid "Count:"
 msgstr "数:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:227
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:229
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:228
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "4"
 msgstr "4"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:228
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:230
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:229
 msgid "How many items in the array."
 msgstr "配列中のアイテム数"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:232
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:234
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:233
 msgid "Rotate:"
 msgstr "回転:"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:238
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:240
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:239
 msgid ""
 "Rotate the item as well as move it - multi-selections will be rotated "
 "together"
 msgstr "複数の選択アイテムを動かすのと同様、回転は一緒になって回転します"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:252
-msgid "Numbering type:"
-msgstr "ナンバリング方式:"
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:248
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:246
+msgid "Pad Numbering Options"
+msgstr "パッド ナンバリングのオプション"
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:281
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:259
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:257
+msgid "Pad numbering start value:"
+msgstr "パッド ナンバリングの開始値:"
+
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.cpp:276
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.cpp:274
 msgid "Circular Array"
 msgstr "円配列"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:52
 msgid "Class"
 msgstr "クラス"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:64
 msgid "* (Any)"
 msgstr "* (全て)"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:637
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:639
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:637
 msgid "Design Rule Setting Error"
 msgstr "デザイン ルール設定エラー"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:657
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:659
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:657
 msgid "New Net Class Name:"
 msgstr "新規ネットクラス名:"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:677
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:679
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:677
 msgid "Duplicate net class names are not allowed."
 msgstr "重複したネットクラス名は許可されていません。"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:739
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:741
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:739
 msgid "The default net class cannot be removed"
 msgstr "デフォルト ネットクラスは削除できません。"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:922
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:924
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:922
 #, c-format
 msgid "%s: <b>Track Size</b> &lt; <b>Min Track Size</b><br>"
 msgstr "%s: <b>配線 サイズ</b> &lt; <b>最小配線サイズ</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:934
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:936
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:934
 #, c-format
-msgid "%s: <b>Via Diameter</b> &lt; <b>Minimun Via Diameter</b><br>"
+msgid "%s: <b>Via Diameter</b> &lt; <b>Minimum Via Diameter</b><br>"
 msgstr "%s: <b>ビア径</b> &lt; <b>最小ビア径</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:945
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:947
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:945
 #, c-format
 msgid "%s: <b>Via Drill</b> &ge; <b>Via Dia</b><br>"
 msgstr "%s: <b>ビア ドリル径</b> &ge; <b>ビア径</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:953
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:955
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:953
 #, c-format
 msgid "%s: <b>Via Drill</b> &lt; <b>Min Via Drill</b><br>"
 msgstr "%s: <b>ビア ドリル径</b> &lt; <b>最小ビアドリル径</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:965
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:967
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:965
 #, c-format
 msgid "%s: <b>MicroVia Diameter</b> &lt; <b>MicroVia Min Diameter</b><br>"
 msgstr "%s: <b>マイクロビア径</b> &lt; <b>最小マイクロビア径</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:976
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:978
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:976
 #, c-format
 msgid "%s: <b>MicroVia Drill</b> &ge; <b>MicroVia Dia</b><br>"
 msgstr "%s: <b>マイクロビア ドリル径</b> &ge; <b>マイクロビア径</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:984
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:986
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:984
 #, c-format
 msgid "%s: <b>MicroVia Drill</b> &lt; <b>MicroVia Min Drill</b><br>"
 msgstr ""
 "%s: <b>最小マイクロビア ドリル径</b> &lt; <b>最小マイクロビア ドリル径</"
 "b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:1003
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:1005
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:1003
 #, c-format
 msgid "<b>Extra Track %d Size</b> %s &lt; <b>Min Track Size</b><br>"
 msgstr "<b>エクストラ 配線 %d サイズ</b> %s &lt; <b>最小配線サイズ</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:1012
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:1014
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:1012
 #, c-format
 msgid "<b>Extra Track %d Size</b> %s &gt; <b>1 inch!</b><br>"
 msgstr "<b>エクストラ 配線 %d サイズ</b> %s &gt; <b>1 inch!</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:1032
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:1034
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:1032
 #, c-format
 msgid "<b>Extra Via %d Size</b> %s &lt; <b>Min Via Size</b><br>"
 msgstr "<b>エクストラ ビア %d 径</b> %s &lt; <b>最小ビア径</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:1042
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:1044
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:1042
 #, c-format
 msgid "<b>No via drill size define in row %d</b><br>"
 msgstr "<b>ビアのドリル サイズが定義されていません (行 %d)</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:1052
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:1054
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:1052
 #, c-format
 msgid "<b>Extra Via %d Drill</b> %s &lt; <b>Min Via Drill %s</b><br>"
 msgstr "<b>追加 ビア %d ドリル</b> %s &lt; <b>最小 ビア ドリル %s</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:1061
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:1063
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:1061
 #, c-format
 msgid "<b>Extra Via %d Size</b> %s &le; <b> Drill Size</b> %s<br>"
 msgstr "<b>エクストラ ビア %d 径</b> %s &lt; <b>最小ビア径</b> %s<br>"
 
-#: pcbnew/dialogs/dialog_design_rules.cpp:1070
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules.cpp:1072
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules.cpp:1070
 #, c-format
 msgid "<b>Extra Via %d Size</b>%s &gt; <b>1 inch!</b><br>"
 msgstr "<b>エクストラ ビア %d 径</b> %s &gt; <b>1 inch!</b><br>"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:27
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:27
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:27
 msgid "Net Classes:"
 msgstr "ネットクラス:"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:50
 msgid "Via Dia"
 msgstr "ビア径"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:51
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:51
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:51
 msgid "Via Drill"
 msgstr "ビア ドリル"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:52
 msgid "uVia Dia"
 msgstr "マイクロビア径"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:53
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:86
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:86
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:53
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:86
 msgid "uVia Drill"
 msgstr "マイクロビア ドリル"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:66
 msgid "Net Class parameters"
 msgstr "ネット クラスのパラメータ"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:74
 msgid "Add another Net Class"
 msgstr "別のネット クラスを追加"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:79
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:79
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:79
 msgid ""
 "Remove the currently select Net Class\n"
 "The default Net Class cannot be removed"
@@ -13348,63 +17715,78 @@ msgstr ""
 "現在選択中のネットクラスを削除\n"
 "デフォルトのネットクラスは削除できません"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:84
 msgid "Move the currently selected Net Class up one row"
 msgstr "現在選択中のネットを一行上のクラスに移動"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:95
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:95
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:95
 msgid "Membership:"
 msgstr "メンバーシップ:"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:113
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:113
 msgid "Move the selected nets in the right list to the left list"
 msgstr "右のリストで選択したネットを左のリストへ移動"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:117
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:117
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:117
 msgid ">>>"
 msgstr ">>>"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:118
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:118
 msgid "Move the selected nets in the left list to the right list"
 msgstr "左のリストで選択したネットを右のリストへ移動"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:122
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:122
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:122
 msgid "<< Select All"
 msgstr "<< 全て選択"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:123
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:123
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:123
 msgid "Select all nets in the left list"
 msgstr "左のリストの全てのネットを選択"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:127
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:127
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:127
 msgid "Select All >>"
 msgstr "全て選択 >>"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:128
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:128
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:128
 msgid "Select all nets in the right list"
 msgstr "右のリストの全てのネットを選択"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:154
 msgid "Net Classes Editor"
 msgstr "ネットクラス エディタ"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:163
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:163
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:163
 msgid "Via Options:"
 msgstr "ビア オプション:"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:165
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:165
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:165
 msgid "Do not allow blind/buried vias"
 msgstr "ブラインド/ベリッドビアを禁止"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:165
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:165
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:165
 msgid "Allow blind/buried vias"
 msgstr "ブラインド/ベリッドビアを許可"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:167
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:167
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:167
 msgid "Blind/buried Vias:"
 msgstr "ブラインドビア(BVH)/ベリッドホール(BH)"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:169
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:169
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:169
 msgid ""
 "Allows or not blind/buried vias.\n"
 "Do not allow is the usual selection.\n"
@@ -13415,20 +17797,25 @@ msgstr ""
 "注意: マイクロビアはブラインドビアの特殊形状のひとつですが、この設定では管理"
 "しません。"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:173
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:173
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:173
 msgid "Do not allow micro vias"
 msgstr "マイクロビアを禁止"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:173
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:173
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:173
 msgid "Allow micro vias"
 msgstr "マイクロビアを許可"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:175
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:153
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:175
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:153
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:175
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:153
 msgid "Micro Vias:"
 msgstr "マイクロビア:"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:177
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:177
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:177
 msgid ""
 "Allows or do not allow use of micro vias\n"
 "They are very small vias only from an external copper layer to its near "
@@ -13437,32 +17824,40 @@ msgstr ""
 "マイクロビアの許可/不許可を設定します。\n"
 "マイクロビアとは最外層とその直下の配線層のみを接続する微小ビアの事です。"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:185
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:185
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:185
 msgid "Minimum Allowed Values:"
 msgstr "許容最小値:"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:193
-#: pcbnew/dialogs/dialog_drc_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:193
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:193
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:48
 msgid "Min track width"
 msgstr "最小配線幅"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:201
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:201
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:201
 msgid "Min via diameter"
 msgstr "最小ビア径"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:209
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:209
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:209
 msgid "Min via drill dia"
 msgstr "最小ビア ドリル径"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:217
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:217
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:217
 msgid "Min uvia diameter"
 msgstr "最小マイクロビア径"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:225
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:225
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:225
 msgid "Min uvia drill dia"
 msgstr "最小マイクロビア ドリル径"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:245
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:245
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:245
 msgid ""
 "Specific via diameters and track widths, which \n"
 "can be used to replace default Netclass values \n"
@@ -13471,169 +17866,210 @@ msgstr ""
 "下記に設定されるカスタムビア径とカスタム配線幅の値は\n"
 "必要に応じてデフォルトネットクラスから切り替えて使用することができます。"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:253
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:253
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:253
 msgid "Custom Via Sizes:"
 msgstr "カスタム ビア サイズ:"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:255
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:255
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:255
 msgid "Drill value: a blank or 0 => default Netclass value"
 msgstr "ドリルの値: 空か0の場合は、デフォルト ネットクラスの値が使用されます"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:279
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:279
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:279
 msgid "Via 1"
 msgstr "ビア 1"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:280
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:280
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:280
 msgid "Via 2"
 msgstr "ビア 2"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:281
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:281
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:281
 msgid "Via 3"
 msgstr "ビア 3"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:282
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:282
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:282
 msgid "Via 4"
 msgstr "ビア 4"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:283
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:283
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:283
 msgid "Via 5"
 msgstr "ビア 5"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:284
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:284
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:284
 msgid "Via 6"
 msgstr "ビア 6"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:285
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:285
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:285
 msgid "Via 7"
 msgstr "ビア 7"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:286
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:286
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:286
 msgid "Via 8"
 msgstr "ビア8"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:287
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:287
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:287
 msgid "Via 9"
 msgstr "ビア9"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:288
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:288
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:288
 msgid "Via 10"
 msgstr "ビア10"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:289
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:289
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:289
 msgid "Via 11"
 msgstr "ビア11"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:290
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:290
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:290
 msgid "Via 12"
 msgstr "ビア12"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:303
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:303
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:303
 msgid "Custom Track Widths:"
 msgstr "カスタム配線幅:"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:328
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:328
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:328
 msgid "Track 1"
 msgstr "配線 1"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:329
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:329
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:329
 msgid "Track 2"
 msgstr "配線 2"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:330
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:330
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:330
 msgid "Track 3"
 msgstr "配線 3"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:331
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:331
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:331
 msgid "Track 4"
 msgstr "配線 4"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:332
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:332
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:332
 msgid "Track 5"
 msgstr "配線 5"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:333
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:333
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:333
 msgid "Track 6"
 msgstr "配線 6"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:334
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:334
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:334
 msgid "Track 7"
 msgstr "配線 7"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:335
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:335
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:335
 msgid "Track 8"
 msgstr "配線8"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:336
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:336
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:336
 msgid "Track 9"
 msgstr "配線9"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:337
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:337
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:337
 msgid "Track 10"
 msgstr "配線10"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:338
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:338
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:338
 msgid "Track 11"
 msgstr "配線11"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:339
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:339
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:339
 msgid "Track 12"
 msgstr "配線12"
 
-#: pcbnew/dialogs/dialog_design_rules_base.cpp:358
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.cpp:358
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.cpp:358
 msgid "Global Design Rules"
 msgstr "グローバル デザインルール"
 
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:36
 msgid "Text Width"
 msgstr "テキストの幅"
 
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:43
 msgid "Text Height"
 msgstr "テキストの高さ"
 
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:57
 msgid "Text Position X"
 msgstr "テキストの位置 X"
 
-#: pcbnew/dialogs/dialog_dimension_editor_base.cpp:69
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.cpp:69
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.cpp:64
 msgid "Text Position Y"
 msgstr "テキストの位置 Y"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:23
 msgid "Tracks and Vias:"
 msgstr "配線とビア:"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:25
 msgid "Show tracks in sketch mode"
 msgstr "スケッチモードで配線を表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:28
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:28
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:28
 msgid "Show vias in sketch mode"
 msgstr "スケッチモードでビアを表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:31
-#: pcbnew/dialogs/dialog_display_options_base.cpp:53
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:146
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:31
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:134
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:142
 msgid "Never"
 msgstr "非表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:31
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:31
 msgid "Defined holes"
 msgstr "定義された穴のみ"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:31
-#: pcbnew/dialogs/dialog_display_options_base.cpp:53
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:146
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:31
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:134
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:142
 msgid "Always"
 msgstr "常時"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:33
 msgid "Show Via Holes:"
 msgstr "ビア穴の表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:35
 msgid ""
 "Show or hide via holes.\n"
 "If Defined Holes is selected, only the non default size holes are shown"
@@ -13641,51 +18077,63 @@ msgstr ""
 "ビア(穴)の表示または非表示、\n"
 "定義済の穴が選択された場合、デフォルトサイズ以外の穴のみを表示する。"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:35
 msgid "Routing Help:"
 msgstr "ルーティング ヘルプ:"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:37
 msgid "Do not show"
 msgstr "非表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:37
 msgid "On pads"
 msgstr "パッド上"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:37
 msgid "On tracks"
 msgstr "配線上"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:37
 msgid "On pads and tracks"
 msgstr "パッドと配線上"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:39
 msgid "Show Net Names:"
 msgstr "ネット名"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:49
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:49
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:41
 msgid "Show or hide net names on pads and/or tracks"
 msgstr "パッドや配線のネット名の表示または非表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:45
 msgid "New track"
 msgstr "新規配線のみ"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:45
 msgid "New track with via area"
 msgstr "新規配線とビアエリア"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:53
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:45
 msgid "New and edited tracks with via area"
 msgstr "新規および編集配線 (ビア領域を使用)"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:47
 msgid "Show Track Clearance:"
 msgstr "配線のクリアランスを表示:"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:49
 msgid ""
 "Show or hide the track and via clearance area.\n"
 "If New track is selected,  track clearance area is shown only when creating "
@@ -13695,148 +18143,201 @@ msgstr ""
 "新しい配線が選択された場合、配線のクリアランス エリアは布線された時のみ表示さ"
 "れる。"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:68
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:69
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:68
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:64
 msgid "Footprints:"
 msgstr "フットプリント"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:66
 msgid "Show text in sketch mode"
 msgstr "スケッチモードでテキストを表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:78
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:78
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:70
 msgid "Show pads in sketch mode"
 msgstr "スケッチモードでパッドを表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:81
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:73
 msgid "Show pad clearance"
 msgstr "パッド クリアランスを表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:76
 msgid "Show pad number"
 msgstr "パッド番号を表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:88
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:80
 msgid "Show pad no net connection indicator"
 msgstr "ネット未接続パッドのインジケータを表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:96
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:96
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:88
 msgid "Other:"
 msgstr "その他:"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:90
 msgid "Show graphic items in sketch mode"
 msgstr "スケッチモードでグラフィック要素を表示"
 
-#: pcbnew/dialogs/dialog_display_options_base.cpp:102
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.cpp:102
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.cpp:94
 msgid "Show page limits"
 msgstr "ページの境界を表示"
 
-#: pcbnew/dialogs/dialog_drc.cpp:148 pcbnew/dialogs/dialog_drc.cpp:211
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:192
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:256
+#: kicad-6996/pcbnew/dialogs/dialog_drc.cpp:196
+#: kicad-6996/pcbnew/dialogs/dialog_drc.cpp:263
 #, c-format
 msgid "Report file \"%s\" created"
 msgstr "レポートファイル \"%s\" が作成されました"
 
-#: pcbnew/dialogs/dialog_drc.cpp:150 pcbnew/dialogs/dialog_drc.cpp:212
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:194
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:257
+#: kicad-6996/pcbnew/dialogs/dialog_drc.cpp:198
+#: kicad-6996/pcbnew/dialogs/dialog_drc.cpp:264
 msgid "Disk File Report Completed"
 msgstr "レポートファイルを作成しました"
 
-#: pcbnew/dialogs/dialog_drc.cpp:232
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:199
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:262
+#: kicad-6996/pcbnew/dialogs/dialog_drc.cpp:203
+#: kicad-6996/pcbnew/dialogs/dialog_drc.cpp:269
+#, c-format
+msgid "Unable to create report file '%s' "
+msgstr "レポート ファイル '%s' を作成できません"
+
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:281
 msgid "DRC report files (.rpt)|*.rpt"
 msgstr "DRCレポートファイル (.rpt)|*.rpt"
 
-#: pcbnew/dialogs/dialog_drc.cpp:238
+#: kicad-6297/pcbnew/dialogs/dialog_drc.cpp:287
+#: kicad-6996/pcbnew/dialogs/dialog_drc.cpp:287
 msgid "Save DRC Report File"
 msgstr "DRCレポートファイルの保存"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:40
 msgid "By Netclass"
 msgstr "(ネットクラスを使用)"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:59
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:59
 msgid "Enter the minimum acceptable value for a track width"
 msgstr "配線に許可する最小幅を入力"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:63
 msgid "Min via size"
 msgstr "最小ビア径"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:74
 msgid "Enter the minimum acceptable diameter for a standard via"
 msgstr "標準ビアに許可する最小径を入力"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:78
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:78
 msgid "Min uVia size"
 msgstr "最小のマイクロビア径"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:68
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:80
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:80
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:89
 msgid "Enter the minimum acceptable diameter for a micro via"
 msgstr "マイクロビアに許可する最小径を入力"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:80
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:97
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:97
 msgid "Create Report File"
 msgstr "レポートファイルを作成"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:100
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:100
 msgid "Enable writing report to this file"
 msgstr "このファイルにレポートを書き込みを許可"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:105
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:105
 msgid "Enter the report filename"
 msgstr "レポートファイル名を入力"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:124
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:140
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:140
 msgid "Start DRC"
 msgstr "DRCの開始"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:126
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:142
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:142
 msgid "Start the Design Rule Checker"
 msgstr "デザインルール チェックを開始します"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:130
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:146
 msgid "List Unconnected"
 msgstr "未結線情報の一覧"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:131
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:147
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:147
 msgid "List unconnected pads or tracks"
 msgstr "未接続のパッドど配線を列挙"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:151
 msgid "Delete All Markers"
 msgstr "全マーカーを削除"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:152
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:152
 msgid "Delete every marker"
 msgstr "全てのマーカーを削除"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:156
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:156
 msgid "Delete Current Marker"
 msgstr "現在のマーカーを削除"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:141
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:157
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:157
 msgid "Delete the marker selected in the list box below"
 msgstr "下記のリストで選択されたマーカーを削除"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:167
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:167
 msgid "Error Messages:"
 msgstr "エラーメッセージ:"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:161
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:177
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:177
 msgid ""
 "MARKERs, double click any to go there in PCB, right click for popup menu"
 msgstr ""
 "マーカー, ダブルクリックするとPCBの該当箇所に飛びます, 右クリックでメニューが"
 "出ます"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:170
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:186
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:186
 msgid "Problems / Markers"
 msgstr "問題 / マーカー"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:176
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.cpp:192
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.cpp:192
 msgid "A list of unconnected pads, right click for popup menu"
 msgstr "未接続パッドのリスト, 右クリックでメニューが出ます"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:283
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:286
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:339
 msgid ""
 "Use this attribute for most non SMD components\n"
 "Components with this option are not put in the footprint position list file"
@@ -13845,8 +18346,10 @@ msgstr ""
 "このオプションを持つコンポーネントはフットプリント座標リスト ファイルに出力さ"
 "れません。"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:286
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:138
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:289
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:141
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:342
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:178
 msgid ""
 "Use this attribute for SMD components.\n"
 "Only components with this option are put in the footprint position list file"
@@ -13855,7 +18358,8 @@ msgstr ""
 "このオプションを持つコンポーネントのみがフットプリント座標リスト ファイルに出"
 "力されます。"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:289
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:292
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:345
 msgid ""
 "Use this attribute for \"virtual\" components drawn on board\n"
 "(like a old ISA PC bus connector)"
@@ -13864,7 +18368,8 @@ msgstr ""
 "す。\n"
 " (例: 古いISA-PCバスコネクタなど)"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:320
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:323
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:376
 msgid ""
 "Component can be freely moved and auto placed. User can arbitrarily select "
 "and edit component's pads."
@@ -13872,7 +18377,8 @@ msgstr ""
 "コンポーネントは自由に動かすことができ、自動配置できます. コンポーネントの"
 "パッドは、任意に選択でき、編集可能です."
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:322
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:325
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:378
 msgid ""
 "Component can be freely moved and auto placed, but its pads cannot be "
 "selected or edited."
@@ -13880,128 +18386,169 @@ msgstr ""
 "コンポーネントは自由に動かすことができ、自動配置できますが、コンポーネントの"
 "パッドは、選択/編集できません."
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:324
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:327
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:380
 msgid "Component is locked: it cannot be freely moved or auto placed."
 msgstr ""
 "コンポーネントはロックされています. 自由に動かしたり、自動配置はできません."
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:482
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:352
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:485
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:355
 msgid "3D Shape:"
 msgstr "3Dシェイプ:"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:508
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:379
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:511
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:382
 #, c-format
 msgid "Use a path relative to '%s'?"
 msgstr "'%s' への相対パスを使用しますか？"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:60
+#: kicad-6996/pcbnew/class_module.cpp:545
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:58
 msgid "Front"
 msgstr "表面"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:60
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1168
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1168
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1168
 msgid "Back"
 msgstr "裏面"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:62
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:62
+#: kicad-6996/pcbnew/class_module.cpp:544
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:60
 msgid "Board Side"
 msgstr "配置面"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:58
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:58
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:118
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:58
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:74
 msgid "0.0"
 msgstr "0.0"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:118
 msgid "+90.0"
 msgstr "+90.0"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:118
 msgid "-90.0"
 msgstr "- 90.0"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:64
 msgid "180.0"
 msgstr "180.0"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:118
 msgid "Other"
 msgstr "その他"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:72
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:72
 msgid "Rotation (in 0.1 degrees):"
 msgstr "回転角度 (0.1 度単位):"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:117
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:117
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:112
 msgid "Sheet path:"
 msgstr "シートのパス:"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:131
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:131
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:126
 msgid "Change Footprint(s)"
 msgstr "フットプリントの変更"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:140
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:98
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:352
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:93
 msgid "Normal+Insert"
 msgstr "ノーマル+挿入部品"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:146
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:104
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:104
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:141
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:99
 msgid "Free"
 msgstr "フリー"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:141
 msgid "Lock pads"
 msgstr "パッドをロック"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:141
 msgid "Lock footprint"
 msgstr "フットプリントをロック"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:148
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:148
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:143
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:101
 msgid "Move and Place"
 msgstr "移動/配置"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:156
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:114
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:156
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:114
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:109
 msgid "Auto Place"
 msgstr "自動配置"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:161
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:161
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:156
 msgid "Rotate 90 degrees"
 msgstr "90度回転"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:174
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:174
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:169
 msgid "Rotate 180 degrees"
 msgstr "180度回転"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:188
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:188
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:183
 msgid "Local Settings"
 msgstr "ローカル設定"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:196
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:196
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:191
 msgid "Pad connection to zones:"
 msgstr "パッドをゾーンへ接続:"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:200
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:195
 msgid "Use zone setting"
 msgstr "ゾーンの設定を利用"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:209
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:148
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:209
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:148
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:204
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:143
 msgid "Set clearances to 0 to use global values"
 msgstr "0を指定すると、グローバル値が使用されます。"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:224
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:160
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:224
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:160
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:219
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:155
 msgid "Pad clearance:"
 msgstr "パッドクリアランス: "
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:226
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:226
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:221
 msgid ""
 "This is the local net clearance for all pad of this footprint\n"
 "If 0, the Netclass values are used\n"
@@ -14011,16 +18558,23 @@ msgstr ""
 "0ならば、ネットクラスの値が使用されます。\n"
 "パッドにローカル値がある場合、そちらが優先されます。"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:247
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:181
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:40
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:413
-#: pcbnew/dialogs/dialog_plot_base.cpp:196
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:247
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:181
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:413
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:196
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:241
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:175
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:444
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:194
 msgid "Solder mask clearance:"
 msgstr "レジストのクリアランス:"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:249
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:183
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:249
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:183
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:243
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:177
 msgid ""
 "This is the local clearance between pads and the solder mask\n"
 "for this footprint\n"
@@ -14031,15 +18585,21 @@ msgstr ""
 "この値よりもパッドのローカル値が優先されます。\n"
 "0ならば、グローバル値が使用されます。"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:261
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:195
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:77
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:427
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:261
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:195
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:77
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:427
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:254
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:188
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:77
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:457
 msgid "Solder paste clearance:"
 msgstr "ハンダ ペーストのクリアランス"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:263
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:197
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:263
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:197
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:256
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:190
 msgid ""
 "This is the local clearance between pads and the solder paste\n"
 "for this footprint.\n"
@@ -14053,15 +18613,21 @@ msgstr ""
 "最終的なクリアランス値はこの値とクリアランス率の合算です。\n"
 "マイナス値ならば、パッド径よりも小さなマスクが使用されます。"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:275
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:209
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:91
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:441
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:275
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:209
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:91
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:441
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:267
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:201
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:91
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:470
 msgid "Solder paste ratio clearance:"
 msgstr "メタルマスクのクリアランス比"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:277
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:211
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:277
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:211
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:269
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:203
 msgid ""
 "This is the local clearance ratio in per cent between pads and the solder "
 "paste\n"
@@ -14079,68 +18645,83 @@ msgstr ""
 "す。\n"
 "負値が指定された場合、マスクのサイズはパッドのサイズより小さくなります。"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:285
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:219
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:101
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:451
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:285
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:219
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:101
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:451
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:276
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:210
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:101
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:235
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:479
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:136
 msgid "%"
 msgstr "%"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:307
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:307
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:298
 msgid "3D Shape Name"
 msgstr "3Dシェイプ名"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:314
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:248
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:314
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:248
 msgid "Default Path (from KISYS3DMOD environment variable)"
 msgstr "標準パス(KISYS3DMOD環境変数が使用されます)"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:324
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:258
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:324
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:258
 msgid "3D Scale and Position"
 msgstr "3D拡大率と位置"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:328
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:262
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:328
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:262
 msgid "Shape Scale:"
 msgstr "シェイプの倍率:"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:337
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:271
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:337
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:271
 msgid "Shape Offset (inch):"
 msgstr "シェイプのオフセット(inch):"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:346
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:280
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:346
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:280
 msgid "Shape Rotation (degrees):"
 msgstr "シェイプの回転(度):"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:359
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:293
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:359
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:293
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:318
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:253
 msgid "Add 3D Shape"
 msgstr "3Dシェイプを追加"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:362
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:296
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:362
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:296
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:321
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:256
 msgid "Remove 3D Shape"
 msgstr "3Dシェイプを削除"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:365
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:299
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:365
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:299
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:324
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:259
 msgid "Edit Filename"
 msgstr "ファイル名を編集"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:378
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:312
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:378
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:312
 msgid "3D settings"
 msgstr "3D設定"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:139
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:176
 msgid "Use this attribute for most non SMD components"
 msgstr "ほとんどの非表面実装部品に対して、この属性を使用します"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:143
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:180
 msgid ""
 "Use this attribute for \"virtual\" components drawn on board (like a old ISA "
 "PC bus connector)"
@@ -14149,15 +18730,18 @@ msgstr ""
 "す。\n"
 " (例: 古いISA-PCバスコネクタなど)"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:163
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:166
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:203
 msgid "Enable hotkey move commands and Auto Placement"
 msgstr "移動コマンドと自動配置のホットキーを有効化"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:164
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:167
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:204
 msgid "Disable hotkey move commands and Auto Placement"
 msgstr "移動コマンドと自動配置のホットキーを無効化"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:425
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:428
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:449
 #, c-format
 msgid ""
 "Error:\n"
@@ -14168,69 +18752,104 @@ msgstr ""
 "不正な文字 <%s> が見つかりました。\n"
 "(<%s>)"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:79
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:79
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:75
 msgid "Footprint Name in Library"
 msgstr "ライブラリに登録されたフットプリント名"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:104
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:104
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:99
 msgid "Locked"
 msgstr "ロック"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:119
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:114
 msgid "Rotation 90 degree"
 msgstr "90度回転(10で完全に許可)"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:132
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:132
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:127
 msgid "Rotation 180 degree"
 msgstr "180度回転(10で完全に許可)"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:141
 msgid "Local Clearance Values"
 msgstr "ローカル クリアランス値:"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:168
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:205
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:98
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:50
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:64
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:87
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:91
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:103
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:115
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:127
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:165
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:177
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:191
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:203
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:292
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:304
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:409
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:423
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:437
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:492
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:504
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:168
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:205
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:64
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:91
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:115
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:127
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:165
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:177
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:191
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:203
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:292
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:304
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:409
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:423
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:437
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:492
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:504
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:162
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:197
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:88
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:99
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:110
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:121
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:156
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:167
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:180
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:200
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:294
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:305
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:440
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:453
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:466
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:519
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:530
 msgid "Inch"
 msgstr "inch"
 
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:241
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:241
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:233
 msgid "3D Shape Names"
 msgstr "3Dシェイプ名"
 
-#: pcbnew/dialogs/dialog_edit_module_text.cpp:122
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text.cpp:123
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text.cpp:121
 msgid "Value:"
 msgstr "定数:"
 
-#: pcbnew/dialogs/dialog_edit_module_text.cpp:126
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:24
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text.cpp:127
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:24
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text.cpp:125
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:24
 msgid "Text:"
 msgstr "テキスト:"
 
-#: pcbnew/dialogs/dialog_edit_module_text.cpp:130
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:40 pcbnew/modules.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text.cpp:131
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:42
+#: kicad-6297/pcbnew/modules.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text.cpp:129
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp:27
 msgid "Reference:"
 msgstr "リファレンス:"
 
-#: pcbnew/dialogs/dialog_edit_module_text.cpp:175
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text.cpp:176
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text.cpp:199
 msgid ""
 "This item has an illegal layer id.\n"
 "Now, forced on the front silk screen layer. Please, fix it"
@@ -14238,320 +18857,403 @@ msgstr ""
 "アイテムのレイヤ ID が不正です.\n"
 "表のシルク面へ強制的に置かれました. 修正して下さい"
 
-#: pcbnew/dialogs/dialog_edit_module_text.cpp:234
-#: pcbnew/dialogs/dialog_pcb_text_properties.cpp:260
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text.cpp:235
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties.cpp:263
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text.cpp:257
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties.cpp:267
 msgid "The text thickness is too large for the text size. It will be clamped"
 msgstr "文字太さが文字サイズに比べて太過ぎるため、文字が潰れてしまいます。"
 
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:21
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:24
 #, c-format
 msgid "Footprint %s (%s) orientation %.1f"
 msgstr "フットプリント %s(%s) の角度 %.1f"
 
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:72
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:73
 msgid "Offset X"
 msgstr "オフセット X"
 
-#: pcbnew/dialogs/dialog_edit_module_text_base.cpp:80
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.cpp:77
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:80
 msgid "Offset Y"
 msgstr "オフセット Y"
 
-#: pcbnew/dialogs/dialog_enum_pads_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_enum_pads_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_enum_pads_base.cpp:19
 msgid "Pad names are restricted to 4 characters (including number)."
 msgstr "パッド名は4文字までに制限されています(パッド番号を含む)。"
 
-#: pcbnew/dialogs/dialog_enum_pads_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_enum_pads_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_enum_pads_base.cpp:32
 msgid "Pad name prefix:"
 msgstr "パッド名の前置記号:"
 
-#: pcbnew/dialogs/dialog_enum_pads_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_enum_pads_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_enum_pads_base.cpp:40
 msgid "First pad number:"
 msgstr "最初のパット番号: "
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:25
 msgid "Component value"
 msgstr "コンポーネントの定数"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:33
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:33
 msgid "Component reference"
 msgstr "コンポーネントのリファレンス"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
 msgid "Change footprint"
 msgstr "フットプリントの変更"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
 msgid "Change footprints"
 msgstr "フットプリントの変更"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
 msgid "Change footprints having same value"
 msgstr "同じ定数を持つフットプリントを変更"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:46
 msgid "Update all footprints of the board"
 msgstr "基板上の全てのフットプリントを再読み込み"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:58
 msgid "Export Footprint Association File"
 msgstr "フットプリントの関連付けファイルをエクスポート"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:61
 msgid "List Footprints"
 msgstr "フットプリントのリスト"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:64
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:64
 msgid "View Footprints"
 msgstr "フットプリントの表示"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:73
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:73
 msgid "Current footprint name (FPID)"
 msgstr "現在のフットプリント名 (FPID)"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:81
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:81
 msgid "New footprint name (FPID)"
 msgstr "新しいフットプリント名 (FPID)"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.cpp:104
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.cpp:104
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.cpp:104
 msgid "Apply"
 msgstr "適用"
 
-#: pcbnew/dialogs/dialog_export_idf.cpp:228
-#: pcbnew/exporters/export_d356.cpp:373
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf.cpp:227
+#: kicad-6297/pcbnew/exporters/export_d356.cpp:373
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf.cpp:213
+#: kicad-6996/pcbnew/exporters/export_d356.cpp:373
 msgid "Unable to create "
 msgstr "作成できません"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:19
 msgid "File name:"
 msgstr "ファイル名:"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:23
 msgid "Select an IDF export filename"
 msgstr "IDFファイル名の指定"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:32
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:50
 msgid "Grid Reference Point:"
 msgstr "グリッドの基準点"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:36
 msgid "Adjust automatically"
 msgstr "自動調整"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:42
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:60
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:57
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:86
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:57
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:86
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:62
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:86
 msgid "Units:"
 msgstr "単位:"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:58
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:58
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:58
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:54
 msgid "X Position:"
 msgstr "X 位置:"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:72
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:70
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:79
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:79
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:70
 msgid "Y Position:"
 msgstr "Y 位置:"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:86
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:100
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:100
 msgid "Mils"
 msgstr "Mil"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:88
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:100
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.cpp:102
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:100
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.cpp:102
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:100
 msgid "Output Units:"
 msgstr "出力単位:"
 
-#: pcbnew/dialogs/dialog_export_vrml.cpp:243
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml.cpp:246
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml.cpp:246
 #, c-format
 msgid "Unable to create file '%s'"
 msgstr "ファイル '%s' を作成できません"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:22
 msgid "File Name:"
 msgstr "ファイル名:"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:26
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:26
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:26
 msgid "Save VRML Board File"
 msgstr "VRML ボード ファイルの保存"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:29
 msgid "Footprint 3D model path:"
 msgstr "フットプリントの3Dモデル パス:"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:70
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:70
 msgid "X Ref:"
 msgstr "X Ref:"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:78
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:78
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:78
 msgid "Y Ref:"
 msgstr "Y Ref:"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
 msgid "meter"
 msgstr "メートル"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:98
 msgid "0.1 Inch"
 msgstr "0.1 inch"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:113
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:113
 msgid "Copy 3D model files to 3D model path"
 msgstr "3Dモデルパスへ3Dモデルファイルをコピー"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:117
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:117
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:117
 msgid "Use relative paths to model files in board VRML file"
 msgstr "VRMLファイル中に相対パスでモデルファイルを指定"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:118
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:118
 msgid "Use paths for model files in board VRML file relative to the vrml file"
 msgstr "モデルファイルへはVRMLファイルへの相対パスをパスを使って下さい。"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:122
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.cpp:122
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.cpp:122
 msgid "Plain PCB (no copper or silk)"
 msgstr "シンプルPCB(銅箔/シルクなし)"
 
-#: pcbnew/dialogs/dialog_find.cpp:127
+#: kicad-6297/pcbnew/dialogs/dialog_find.cpp:127
+#: kicad-6996/pcbnew/dialogs/dialog_find.cpp:127
 #, c-format
 msgid "<%s> found"
 msgstr "\"%s\" が見つかりました"
 
-#: pcbnew/dialogs/dialog_find.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_find.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_find.cpp:135
 #, c-format
 msgid "<%s> not found"
 msgstr "\"%s\" が見つかりません"
 
-#: pcbnew/dialogs/dialog_find.cpp:165
+#: kicad-6297/pcbnew/dialogs/dialog_find.cpp:165
+#: kicad-6996/pcbnew/dialogs/dialog_find.cpp:165
 msgid "Marker found"
 msgstr "マーカが見つかりました"
 
-#: pcbnew/dialogs/dialog_find.cpp:173
+#: kicad-6297/pcbnew/dialogs/dialog_find.cpp:173
+#: kicad-6996/pcbnew/dialogs/dialog_find.cpp:173
 msgid "No marker found"
 msgstr "マーカが見つかりませんでした"
 
-#: pcbnew/dialogs/dialog_find_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_find_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_find_base.cpp:22
 msgid "Search for:"
 msgstr "キーワード:"
 
-#: pcbnew/dialogs/dialog_find_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_find_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_find_base.cpp:29
 msgid "Do not warp mouse pointer"
 msgstr "マウスカーソルを移動しない"
 
-#: pcbnew/dialogs/dialog_find_base.cpp:38
-msgid "Find Item"
-msgstr "アイテム検索"
-
-#: pcbnew/dialogs/dialog_find_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_find_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_find_base.cpp:42
 msgid "Find Marker"
 msgstr "マーカー検索"
 
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:204 pcbnew/librairi.cpp:774
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:204
+#: kicad-6297/pcbnew/librairi.cpp:822
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:204
+#: kicad-6996/pcbnew/librairi.cpp:822
 msgid "Nickname"
 msgstr "別名(ニックネーム)"
 
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:205
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:205
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:205
 msgid "Library Path"
 msgstr "ライブラリのパス"
 
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:208
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:208
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:208
 msgid "Plugin Type"
 msgstr "プラグインの種類"
 
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:432
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:432
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:432
 #, c-format
 msgid "Illegal character '%s' found in Nickname: '%s' in row %d"
 msgstr "不正な文字 '%s' が、ニックネーム '%s' に見つかりました(%d列目)"
 
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:446
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:446
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:446
 msgid "No Colon in Nicknames"
 msgstr "ニックネーム中にコロン(:)は使用できません"
 
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:476
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:476
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:476
 #, c-format
 msgid "Duplicate Nickname: '%s' in rows %d and %d"
 msgstr "重複する別名(ニックネーム): '%s' %d 行目と %d 行目"
 
-#: pcbnew/dialogs/dialog_fp_lib_table.cpp:491
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table.cpp:491
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table.cpp:491
 msgid "Please Delete or Modify One"
 msgstr "削除または修正して下さい"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:20
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:20
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:20
 msgid "Library Tables by Scope"
 msgstr "発見されたライブラリの一覧"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:32
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:84
 msgid "Table:"
 msgstr "テーブル: "
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:36
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:88
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:88
 msgid "Table Name"
 msgstr "テーブル名:"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:74
 msgid "Global Libraries"
 msgstr "グローバルライブラリ"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:126
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:126
 msgid "Project Specific Libraries"
 msgstr "プロジェクト固有のライブラリ"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:133
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:133
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:133
 msgid "Append with Wizard"
 msgstr "ウイザードを使用して追加"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:136
 msgid "Append Library"
 msgstr "ライブラリの追加"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:137
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:137
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:137
 msgid "Add a PCB library row to this table"
 msgstr "表中にPCBライブラリの行を追加"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:141
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:141
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:141
 msgid "Remove Library"
 msgstr "ライブラリを削除"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:142
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:142
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:142
 msgid "Remove a PCB library from this library table"
 msgstr "このライブラリ テーブルからPCBライブラリを削除"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:147
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:147
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:147
 msgid "Move the currently selected row up one position"
 msgstr "現在選択されている行をひとつ上の行と入れ替え"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:152
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:152
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:152
 msgid "Move the currently selected row down one position"
 msgstr "現在選択されている行をひとつ下の行と入れ替え"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:156
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:156
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:156
 msgid "Options Editor"
 msgstr "オプション"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:157
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:157
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:157
 msgid "Zoom into the options table for current row"
 msgstr "選択されている行の詳細を設定します"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:168
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:168
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:168
 msgid "Path Substitutions"
 msgstr "設定されているパス"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:186
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:186
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:186
 msgid "Environment Variable"
 msgstr "環境変数"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:187
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:187
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:187
 msgid "Path Segment"
 msgstr "パス"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.cpp:199
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:199
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.cpp:199
 msgid "This is a read-only table which shows pertinent environment variables."
 msgstr "これは固定された環境変数を表す、読込み専用テーブルです."
 
-#: pcbnew/dialogs/dialog_fp_plugin_options.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options.cpp:35
 msgid ""
 "Select an <b>Option Choice</b> in the listbox above, and then click the "
 "<b>Append Selected Option</b> button."
@@ -14559,64 +19261,79 @@ msgstr ""
 "<b>追加するオプションの選択</b>に表示されている一覧より選択し、<b>選択したオ"
 "プションの追加</b>ボタンをクリックしてください。"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options.cpp:64
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options.cpp:64
 #, c-format
 msgid "Options for Library '%s'"
 msgstr "ライブラリ '%s' のオプション"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:23
 msgid "Plugin Options:"
 msgstr "プラグイン設定:"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:39
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:39
 msgid "Option"
 msgstr "オプション"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:57
 msgid "Append"
 msgstr "追加"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:58
 msgid "Append a blank row"
 msgstr "空行を追加"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:63
 msgid "Delete the selected row"
 msgstr "選択した行を削除"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:68
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:68
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:68
 msgid "Move the selected row up one position"
 msgstr "現在選択されている行をひとつ上の行と入れ替え"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:73
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:73
 msgid "Move the selected row down one position"
 msgstr "現在選択されている行をひとつ下の行と入れ替え"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:90
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:90
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:90
 msgid "Option Choices:"
 msgstr "追加するオプションの選択:"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:94
 msgid "Options supported by current plugin"
 msgstr "現在のプラグインにより、次のオプションがサポートされています"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:98
 msgid "<< Append Selected Option"
 msgstr "<< 選択したオプションの追加"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:101
+#: kicad-6297/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:101
+#: kicad-6996/pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:101
 msgid "Option Specific Help:"
 msgstr "オプションについての情報:"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:90
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange.cpp:90
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange.cpp:90
 msgid "Freeroute Help"
 msgstr "Freerouter のヘルプ"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:111
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange.cpp:111
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange.cpp:111
 msgid "Do you want to rebuild connectivity data ?"
 msgstr "結線情報データを再構築しますか？"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:155
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange.cpp:155
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange.cpp:155
 msgid ""
 "It appears that the Java run time environment is not installed on this "
 "computer.  Java is required to use FreeRoute."
@@ -14624,48 +19341,60 @@ msgstr ""
 "Java ランタイムがインストールされていません。Java は Freerouter を使用する際"
 "に必要となります。"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:158
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange.cpp:158
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange.cpp:158
 msgid "Pcbnew Error"
 msgstr "Pcbnew エラー"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:194
-#: pcbnew/specctra_export.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange.cpp:194
+#: kicad-6297/pcbnew/specctra_export.cpp:140
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange.cpp:194
+#: kicad-6996/pcbnew/specctra_export.cpp:140
 msgid "Specctra DSN file:"
 msgstr "Specctra DSN ファイル:"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:25
 msgid "Export/Import to/from FreeRoute:"
 msgstr "Freerouter の エクスポートとインポート:"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:40
 msgid "Export a Specctra Design (*.dsn) File"
 msgstr "現在のボードを \"Specctra DSN\" ファイルへエクスポート"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:41
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:41
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:41
 msgid "Export a Specctra DSN file (to FreeRouter)"
 msgstr "現在のボードを \"Specctra DSN\" ファイルへエクスポート"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:45
 msgid "Export a Specctra Design and Launch FreeRoute"
 msgstr "Specctra Design 形式で出力し、Freerouter を起動"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:46
 msgid ""
 "FreeRouter can be run only if freeroute.jar is found in Kicad binaries folder"
 msgstr ""
 "Freerouter は freeroute.jar が Kicad のバイナリ フォルダに配置されている場合"
 "のみ実行できます"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:50
 msgid "Back Import the Specctra Session (*.ses) File"
 msgstr "スペクトラ セッション ファイル (*.ses) のバックインポート"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:51
+#: kicad-6297/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:51
+#: kicad-6996/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:51
 msgid "Merge a session file created by FreeRouter with the current board."
 msgstr "現在のボードに Freerouter が作成したセッション ファイルをマージします"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:35
-#: pcbnew/dialogs/dialog_plot_base.cpp:51
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:51
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:50
 msgid ""
 "Target directory for plot files. Can be absolute or relative to the board "
 "file location."
@@ -14673,19 +19402,23 @@ msgstr ""
 "出図ファイルのターゲット ディレクトリです。\n"
 "ボード ファイルの位置に絶対パス、または相対パスが使用できます。"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:66
 msgid "One file per side"
 msgstr "レイヤごとにファイルを出力"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:66
 msgid "One file for board"
 msgstr "ボードごとにファイルを出力"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:68
 msgid "Files:"
 msgstr "ファイル"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:70
 msgid ""
 "Creates 2 files: one for each board side or\n"
 "Creates only one file containing all footprints to place\n"
@@ -14693,19 +19426,23 @@ msgstr ""
 "2ファイルを生成: ボード面ごとにファイルを生成します\n"
 "または、全てのフットプリントを1つのファイル内に全て配置します\n"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:69
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:69
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:74
 msgid "With INSERT attribute set"
 msgstr "属性情報の挿入"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:69
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:69
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:74
 msgid "Force INSERT attribute for all SMD footprints"
 msgstr "すべての表面実装フットプリントへ属性情報を強制挿入"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:71
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:71
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:76
 msgid "Footprints Selection:"
 msgstr "フットプリントについて"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:73
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:78
 msgid ""
 "Only footprints with option INSERT are listed in placement file.\n"
 "This option can force this option for all footprints having only SMD pads.\n"
@@ -14715,12 +19452,14 @@ msgstr ""
 "このオプションは表面実装パッドを持つ全てのフットプリントへ強制適用できます.\n"
 "警告: このオプションは基板へ変更を加えます."
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:134
-#: pcbnew/dialogs/dialog_gendrill.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:134
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:134
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:135
 msgid "Use Netclasses values"
 msgstr "ネットクラスの値を使用"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:313
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:313
 msgid ""
 "Cannot make path relative.  The target volume is different from board file "
 "volume!"
@@ -14728,81 +19467,102 @@ msgstr ""
 "パスの関連付けを作成できません。ターゲット ボリュームがボード ファイルのボ"
 "リュームと異なります!"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:399
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:399
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:400
 msgid "Save Drill Report File"
 msgstr "ドリル レポート ファイルの保存"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:419
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:118
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:148
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:419
+#: kicad-6297/pcbnew/exporters/gendrill_Excellon_writer.cpp:118
+#: kicad-6297/pcbnew/exporters/gendrill_Excellon_writer.cpp:148
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:420
+#: kicad-6996/pcbnew/exporters/gendrill_Excellon_writer.cpp:121
+#: kicad-6996/pcbnew/exporters/gendrill_Excellon_writer.cpp:151
 #, c-format
 msgid "** Unable to create %s **\n"
 msgstr "** %s が作成できません **\n"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:424
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill.cpp:424
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill.cpp:425
 #, c-format
 msgid "Report file %s created\n"
 msgstr "レポートファイル \"%s\" が作成されました\n"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:46
 msgid "Drill Units:"
 msgstr "ドリルの単位:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:50
 msgid "Decimal format"
 msgstr "小数点フォーマット"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:50
 msgid "Suppress leading zeros"
 msgstr "先頭ゼロ省略 (リーディング ゼロ サプレス)"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:50
 msgid "Suppress trailing zeros"
 msgstr "後方ゼロ省略 (トレイリング ゼロ サプレス)"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:50
 msgid "Keep zeros"
 msgstr "ゼロを保持"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:52
 msgid "Zeros Format"
 msgstr "ゼロの扱い"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:54
 msgid "Choose EXCELLON numbers notation"
 msgstr "EXCELLONデータの精度を選択"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:59
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:59
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:59
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:61
 msgid "Precision"
 msgstr "精度"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:74
 msgid "PostScript"
 msgstr "PostScript"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:74
-#: pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:30
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:30
 msgid "Gerber"
 msgstr "ガーバー"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:76
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:76
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:76
 msgid "Drill Map File Format:"
 msgstr "ドリルマップ ファイルフォーマット"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:78
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:78
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:78
 msgid "Creates a drill map in PS, HPGL or other formats"
 msgstr "PostScript,HPGL, その他の形式でドリル マップを作成"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:83
 msgid "Drill File Options:"
 msgstr "ドリル ファイル設定:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:85
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:85
 msgid "Mirror y axis"
 msgstr "y軸でミラー"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:86
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:86
 msgid ""
 "Not recommanded.\n"
 "Used mostly by users who make themselves the boards."
@@ -14810,11 +19570,12 @@ msgstr ""
 "推奨されません。\n"
 "基板自体を作成したユーザーが使用して下さい。"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:90
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:90
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:90
 msgid "Minimal header"
 msgstr "最小のヘッダー"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:91
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:91
 msgid ""
 "Not recommanded.\n"
 "Use it only for board houses which do not accept fully featured headers."
@@ -14822,11 +19583,12 @@ msgstr ""
 "推奨されません。\n"
 "フル機能のヘッダを受け付けない基板メーカー用にのみ使用して下さい。"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:95
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:95
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:95
 msgid "Merge PTH and NPTH holes into one file"
 msgstr "PTHとNPTH穴データを一つのファイルにマージ"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:96
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:96
 msgid ""
 "Not recommanded.\n"
 "Use it only for board houses which ask for merged PTH and NPTH into onlu one "
@@ -14836,76 +19598,94 @@ msgstr ""
 "PTHとNPTH穴データを一つのファイルにマージしたものを受け付ける基板メーカー用に"
 "のみ使用して下さい。"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:103
 msgid "Absolute"
 msgstr "絶対位置"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:103
 msgid "Auxiliary axis"
 msgstr "補助座標"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:105
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:105
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:105
 msgid "Drill Origin:"
 msgstr "ドリル原点:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:107
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:107
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:107
 msgid ""
 "Choose the coordinate origin: absolute or relative to the auxiliray axis"
 msgstr "座標原点の選択: 絶対位置または補助座標からの相対位置"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:118
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:118
 msgid "Info:"
 msgstr "情報:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:120
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:120
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:120
 msgid "Default Vias Drill:"
 msgstr "デフォルトのビア ドリル径:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:122
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:122
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:122
 msgid "Via Drill Value"
 msgstr "ビア ドリルの値"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:129
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:129
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:129
 msgid "Micro Vias Drill:"
 msgstr "マイクロビア ホール径:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:131
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:131
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:131
 msgid "Micro Via Drill Value"
 msgstr "マイクロビア ドリルの値"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:139
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:139
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:139
 msgid "Holes Count:"
 msgstr "穴の数:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:141
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:141
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:141
 msgid "Plated Pads:"
 msgstr "PTH(メッキあり)パッド:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:145
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:145
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:145
 msgid "Not Plated Pads:"
 msgstr "NPTH(メッキ無し)パッド:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:149
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:149
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:149
 msgid "Through Vias:"
 msgstr "貫通ビア:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:157
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:157
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:157
 msgid "Buried Vias:"
 msgstr "ベリードビア:"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:176
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:176
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:176
 msgid "Drill File"
 msgstr "ドリル ファイル"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:180
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:180
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:180
 msgid "Map File"
 msgstr "マップ ファイル"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:183
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.cpp:183
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:183
 msgid "Report File"
 msgstr "レポート ファイル"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:29
 msgid ""
 "Activates the display of relative coordinates from relative origin (set by "
 "the space key)\n"
@@ -14914,48 +19694,58 @@ msgstr ""
 "相対座標の原点 (スペース キーでセット) からカーソル位置までの\n"
 "相対座標を極座標表示 (角度及び距離) "
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:37
 msgid "Selection of units used to display dimensions and positions of items"
 msgstr "ディメンジョンの表示やアイテムの配置に使用する単位の選択"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:45
 msgid "Main cursor shape selection (small cross or large cursor)"
 msgstr "メイン カーソル形状の選択 (小さな十字または大きなカーソル)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:60
 msgid "&Maximum links:"
 msgstr "最大リンク数(&M):"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:65
 msgid "Adjust the number of ratsnets shown from cursor to closest pads"
 msgstr "カーソルから最も近いパッドまでに表示されるラッツネットの数を調整"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:69
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:69
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:69
 msgid "&Auto save (minutes):"
 msgstr "自動保存(分) (&A):"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:74
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:74
 msgid ""
 "Delay after the first change to create a backup file of the board on disk."
 msgstr "ディスク上のボードのバックアップを作成してから初期変更を加える遅延"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:78
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:78
 msgid "Ma&ximum undo items:"
 msgstr "最大 undo アイテム数(&x):"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:85
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:78
 msgid "&Rotation angle:"
 msgstr "回転角度(&R):"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:90
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:90
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:83
 msgid "Context menu and hot key footprint rotation increment."
 msgstr "コンテキスト メニューとホットキー フットプリント 回転 増分."
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:100
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:100
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:93
 msgid "&Enforce design rules when routing"
 msgstr "ルーティング中にデザインルール チェックを実行(&E)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:102
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:102
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:95
 msgid ""
 "Enable/disable the DRC control.\n"
 "When the DRC control is disabled, all connections are allowed."
@@ -14963,19 +19753,21 @@ msgstr ""
 "DRC 有効／無効。\n"
 "DRC を無効にした場合、全ての接続が可能です。"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:99
 msgid "&Show ratsnest"
 msgstr "ラッツネストを表示(&S)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:108
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:108
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:101
 msgid "Show (or not) the full rastnest."
 msgstr "全てのラッツネストを表示 (あるいは非表示)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:112
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:112
 msgid "S&how footprint ratsnest"
 msgstr "フットプリントに接続されたラッツネストを表示(&h)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:113
 msgid ""
 "Shows (or not) the local ratsnest relative to a footprint, when moving it.\n"
 "This ratsnest is useful to place a footprint."
@@ -14983,39 +19775,47 @@ msgstr ""
 "移動時にフットプリントに関連したローカルのラッツネストを表示 (非表示)。\n"
 "このラッツネストはフットプリントの配置に役立ちます。"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:117
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:117
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:105
 msgid "&Delete unconnected tracks"
 msgstr "未接続の配線を削除(&D)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:118
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:106
 msgid "Enable/disable the automatic track deletion when recreating a track."
 msgstr "配線を引き直した際の自動配線削除を有効化/無効化"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:122
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:122
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:110
 msgid "&Limit tracks to 45 degrees"
 msgstr "配線時の角度を45度単位に制限(&L)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:123
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:123
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:111
 msgid ""
 "If enabled, force tracks directions to H, V or 45 degrees, when creating a "
 "track."
 msgstr "有効にすると、配線入力時に45度単位で配線します。"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:127
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:127
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:115
 msgid "L&imit graphic lines to 45 degrees"
 msgstr "グラフィック・ラインの角度を45度単位に制限(&i)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:128
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:128
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:116
 msgid ""
 "If enabled, force segments directions to H, V or 45 degrees, when creating a "
 "segment on technical layers."
 msgstr "有効にすると、テクニカル層のセグメントを45度単位で入力します。"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:132
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:132
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:120
 msgid "&Use double segmented tracks"
 msgstr "ダブル セグメント配線を使用(&U)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:133
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:133
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:121
 msgid ""
 "If enabled, uses two track segments, with 45 degrees angle between them when "
 "creating a new track "
@@ -15023,236 +19823,294 @@ msgstr ""
 "有効にすると、新規配線描画の際に４５度の角度を持つ２つのセグメントを用いて配"
 "線します"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:146
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:134
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:142
 msgid "When creating tracks"
 msgstr "配線入力時"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:148
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:148
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:136
 msgid "Magnetic Pads"
 msgstr "マグネティック パッド"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:150
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:150
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:138
 msgid ""
 "control the capture of the pcb cursor when the mouse cursor enters a pad area"
 msgstr ""
 "マウスカーソルがパッドエリア内に入った時、カーソルをパッド中心に引き込みま"
 "す。"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:156
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:156
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:144
 msgid "Magnetic Tracks"
 msgstr "マグネティック配線"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:158
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:158
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:146
 msgid ""
 "Control the capture of the pcb cursor when the mouse cursor enters a track"
 msgstr "マウスカーソルが配線内に入った時にカーソルを配線に引き込みます。"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:171
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:170
 msgid "Use middle mouse &button to pan"
 msgstr "画面のパンにマウスの中ボタンを使用(&b)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:176
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:175
 msgid "Limi&t panning to scroll size"
 msgstr "パン可能な領域を、スクロールバーサイズ範囲内に制限(&t)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:181
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:185
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:268
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:163
 msgid "&Pan while moving object"
 msgstr "オブジェクト移動時に表示領域を移動(&P)"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:182
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:186
+#: kicad-6996/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:164
 msgid "Allows auto pan when creating a track, or moving an item."
 msgstr "配線時やアイテムの移動時の自動視点移動を許可"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:190
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:194
 msgid "Advanced/Developer"
 msgstr "上級者/開発者向け"
 
-#: pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:192
+#: kicad-6297/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp:196
 msgid "Dump zone geometry to files when filling"
 msgstr "塗りつぶす時にゾーンのジオメトリをファイルへダンプ"
 
-#: pcbnew/dialogs/dialog_global_deletion.cpp:101
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion.cpp:101
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion.cpp:102
 msgid "Are you sure you want to delete the entire board?"
 msgstr "本当に基板全体を削除してもよろしいですか？"
 
-#: pcbnew/dialogs/dialog_global_deletion.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion.cpp:107
 msgid "Are you sure you want to delete the selected items?"
 msgstr "選択されたアイテムを削除してもよろしいですか？"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:23
 msgid "Items to Delete"
 msgstr "削除するアイテム"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:25
-#: pcbnew/onrightclick.cpp:724 pcbnew/tools/pcb_editor_control.cpp:121
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:25
+#: kicad-6297/pcbnew/onrightclick.cpp:719
+#: kicad-6297/pcbnew/tools/pcb_editor_control.cpp:121
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:25
+#: kicad-6996/pcbnew/onrightclick.cpp:715
+#: kicad-6996/pcbnew/tools/pcb_editor_control.cpp:135
 msgid "Zones"
 msgstr "ゾーン"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:31
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:31
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:31
 msgid "Board outlines"
 msgstr "ボードの外形"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:34
 msgid "Drawings"
 msgstr "図形"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:40
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:20
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:20
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:20
 msgid "Tracks"
 msgstr "配線"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:43
 msgid "Markers"
 msgstr "マーカー"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:46
 msgid "Clear board"
 msgstr "基板のクリア"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:55
 msgid "Filter Settings"
 msgstr "設定の絞込み"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:57
 msgid "Automatically routed tracks"
 msgstr "自動配線された配線"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:61
 msgid "Locked tracks"
 msgstr "ロックされている配線"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:64
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:64
 msgid "Unlocked tracks"
 msgstr "ロックされていない配線"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:72
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:72
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:72
 msgid "Locked footprints"
 msgstr "ロックされているフットプリント"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:75
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:75
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:75
 msgid "Unlocked footprints"
 msgstr "ロックされていないフットプリント"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:82
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:82
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:82
 msgid "All layers"
 msgstr "全レイヤ"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:82
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:82
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:82
 msgid "Current layer only"
 msgstr "現在のレイヤのみ"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:84
 msgid "Layer Filter"
 msgstr "レイヤの絞り込み"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:100
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.cpp:100
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.cpp:100
 msgid "Current layer:"
 msgstr "現在のレイヤ:"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:173
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:173
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:173
 msgid "Set current Net tracks and vias sizes and drill to the current values?"
 msgstr "現在のネット配線とビア径・ドリルを現在の値にセットしますか？"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:183
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:183
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:183
 msgid ""
 "Set current Net tracks and vias sizes and drill to the Netclass default "
 "value?"
 msgstr "現在のネット配線とビア径・ドリルをデフォルトの値にセットしますか？"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:192
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:192
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:192
 msgid "Set All Tracks and Vias to Netclass value"
 msgstr "全ての配線とビアをネットクラスの値にセット"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:201
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:201
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:201
 msgid "Set All Via to Netclass value"
 msgstr "全てのビアをネットクラスの値にセット"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:210
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:210
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:210
 msgid "Set All Track to Netclass value"
 msgstr "全ての配線をネットクラスの値にセット"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:22
 msgid "Current Settings:"
 msgstr "現在の設定:"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:42
 msgid "Current Net:"
 msgstr "現在のネット:"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:52
 msgid "Current NetClass:"
 msgstr "現在のネットクラス:"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:56
 msgid "NetClassName"
 msgstr "ネットクラス名"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:82
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:82
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:82
 msgid "Track size"
 msgstr "配線の大きさ"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:83
 msgid "Via diameter"
 msgstr "ビア径"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:84
 msgid "Via drill"
 msgstr "ビア ドリル径"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:85
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:85
 msgid "uVia size"
 msgstr "マイクロビア径"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:93
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:93
 msgid "Netclass value"
 msgstr "ネットクラスの値"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:94
 msgid "Current value"
 msgstr "現在の値"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:118
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:118
 msgid "Global Edition Option:"
 msgstr "グローバル編集のオプション:"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:136
 msgid "Set tracks and vias of the current Net to the current value"
 msgstr "現在のネットの配線とビアにカレント値をセット"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:140
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:140
 msgid "Set tracks and vias of the current Net to the Netclass value"
 msgstr "現在のネットの配線とビアにネットクラスの値を設定する"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:143
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:143
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:143
 msgid "Set all tracks and vias to their Netclass value"
 msgstr "全ての配線とビアにネットクラスの値を設定する"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:146
 msgid "Set all vias (no track) to their Netclass value"
 msgstr "全てのビア (配線は除く) にこれらのネットクラス値をセット"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:149
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:149
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:149
 msgid "Set all tracks (no via) to their Netclass value"
 msgstr "全ての配線 (ビアは除く) にこれらのネットクラス値をセット"
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:26
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:26
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:26
 msgid "Footprint Fields"
 msgstr "フットプリント フィールド"
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:28
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:28
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:28
 msgid "Reference designator"
 msgstr "リファレンス記号"
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:34
 msgid "User defined"
 msgstr "ユーザ定義"
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:40
 msgid "Footprint Filter:"
 msgstr "フットプリント フィルター: "
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:42
 msgid ""
 "A string to filter footprints to edit.\n"
 "If not void, footprint names should match this filter.\n"
@@ -15263,85 +20121,110 @@ msgstr ""
 "ます。\n"
 "フィルタは、SM* のように指定します。(*はワイルドカード)"
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:56
 msgid "Current Text Dimensions"
 msgstr "現在のテキストの寸法"
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:89
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:112
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:112
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp:86
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:111
 msgid "Thickness:"
 msgstr "太さ:"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:23
 msgid "Pad Filter :"
 msgstr "パッド フィルター:"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:25
 msgid "Do not modify pads having a different shape"
 msgstr "異なる形状のパッドは更新しない"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:28
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:28
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:28
 msgid "Do not modify pads having different layers"
 msgstr "違うレイヤのパッドは更新しない"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:31
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:31
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:31
 msgid "Do not modify pads having a different orientation"
 msgstr "異なる角度のパッドは更新しない"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:43
 msgid "Pad Editor"
 msgstr "パッド エディタ"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:49
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:49
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:49
 msgid "Change Pads on Footprint"
 msgstr "フットプリント上のパッドを変更する"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.cpp:52
 msgid "Change Pads on Identical Footprints"
 msgstr "特定のフットプリント上のパッドを変更する"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:132
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:143
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:143
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:145
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:148
 msgid "Circle Properties"
 msgstr "円のプロパティ"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:133
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:144
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:147
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:157
 msgid "Center X:"
 msgstr "中心 X:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:134
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:145
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:137
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:148
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:147
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:158
 msgid "Center Y:"
 msgstr "中心 Y:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:138
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:148
 msgid "Point X:"
 msgstr "点 X:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:136
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:139
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:149
 msgid "Point Y:"
 msgstr "点 Y:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:143
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:156
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:159
 msgid "Arc Properties"
 msgstr "円弧のプロパティ"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:149
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:159
 msgid "Start Point X:"
 msgstr "始点 X:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:147
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:150
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:160
 msgid "Start Point Y:"
 msgstr "始点 Y:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:155
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:167
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:158
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:167
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:166
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:169
 msgid "Line Segment Properties"
 msgstr "配線セグメントのプロパティ"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:192
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:195
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:203
 msgid ""
 "This item was on an unknown layer.\n"
 "It has been moved to the drawings layer. Please fix it."
@@ -15349,98 +20232,129 @@ msgstr ""
 "このアイテムは不明なレイヤ上にあります。\n"
 "図形レイヤに移動しました。適時修正してください。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:291
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:298
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:294
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:298
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:300
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:296
 msgid "The arc angle must be greater than zero."
 msgstr "円弧の角度は0以上である必要があります。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:300
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:306
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:303
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:306
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:309
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:304
 msgid "The radius must be greater than zero."
 msgstr "半径は0以上である必要があります。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:310
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:314
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:313
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:314
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:319
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:312
 msgid "The start and end points cannot be the same."
 msgstr "始点と終点は同じにはできません."
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:320
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:323
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:323
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:323
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:329
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:321
 msgid "The item thickness must be greater than zero."
 msgstr "アイテムの太さは0以上である必要があります。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:326
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:329
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:329
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:329
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:335
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:327
 msgid "The default thickness must be greater than zero."
 msgstr "デフォルトの太さは0以上である必要があります。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:330
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties.cpp:333
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties.cpp:339
 msgid "Error List"
 msgstr "エラー リスト"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:30
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:27
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:30
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:27
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:30
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:27
 msgid "Start point X:"
 msgstr "始点 X:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:42
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:39
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:41
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:38
 msgid "Start point Y:"
 msgstr "始点 Y:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:54
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:51
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:49
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:49
 msgid "End point X:"
 msgstr "終点 X:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:66
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:60
 msgid "End point Y:"
 msgstr "終点 Y:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:93
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:89
 msgid "Arc angle:"
 msgstr "円弧角:"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:101
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:101
 msgid "0.1 degree"
 msgstr "0.1度"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:105
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:105
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:100
 msgid "Item thickness:"
 msgstr "アイテムの太さ: "
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:117
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:117
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:111
 msgid "Default thickness:"
 msgstr "デフォルトの太さ: "
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:144
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:155
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:144
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:155
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:149
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:160
 msgid "Center X"
 msgstr "X中央"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:145
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:156
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:145
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:156
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:150
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:161
 msgid "Center Y"
 msgstr "Y中央"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:151
 msgid "Point X"
 msgstr "ポイント X"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:147
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:147
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:152
 msgid "Point Y"
 msgstr "ポイント Y"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:157
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:157
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:162
 msgid "Start Point X"
 msgstr "始点 X"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:158
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:158
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:163
 msgid "Start Point Y"
 msgstr "始点 Y"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:197
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:197
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:199
 msgid ""
 "This item was on an unknown layer.\n"
 "It has been moved to the front silk screen layer. Please fix it."
@@ -15448,7 +20362,8 @@ msgstr ""
 "このアイテムは不明なレイヤ上にあります。\n"
 "表面シルクレイヤに移動しました。適時修正してください。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:227
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:227
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:225
 msgid ""
 "The graphic item will be on a copper layer. This is very dangerous. Are you "
 "sure?"
@@ -15456,45 +20371,57 @@ msgstr ""
 "図形アイテムを導体層に配置しようとしています。これはとても危険です。本当に実"
 "行してもよろしいですか？"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:333
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:333
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp:331
 msgid "Error list"
 msgstr "エラー一覧"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:23
 msgid "Graphics:"
 msgstr "図形:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:25
 msgid "Graphic segment width:"
 msgstr "グラフィック セグメント幅:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:33
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:32
 msgid "Board edge width:"
 msgstr "基板の輪郭線幅:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:41
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:39
 msgid "Copper text thickness:"
 msgstr "導体層テキストの太さ:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:71
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:66
 msgid "Edge width:"
 msgstr "輪郭線幅:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:79
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:73
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:73
 msgid "Text thickness:"
 msgstr "テキストの太さ:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:107
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:98
 msgid "General:"
 msgstr "一般:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:109
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:100
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:100
 msgid "Default pen size:"
 msgstr "デフォルト ペン サイズ:"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.cpp:111
-#: pcbnew/dialogs/dialog_plot_base.cpp:169
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:86
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:102
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:169
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:86
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.cpp:102
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:168
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:102
 msgid ""
 "Pen size used to draw items that have no pen size specified.\n"
 "Used mainly to draw items in sketch mode."
@@ -15503,429 +20430,662 @@ msgstr ""
 "す。\n"
 "主にスケッチモードで描画するアイテムに使われます。"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:218
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties.cpp:218
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties.cpp:211
 msgid "Tracks, vias, and pads are allowed. The keepout is useless"
 msgstr "配線、ビア、パッドは許容されています。禁止領域は意味がありません。"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:42
 msgid "Properties:"
 msgstr "プロパティ:"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:47
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:46
 msgid "Any"
 msgstr "* (全て)"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:46
 msgid "180, 90, and 45 degrees"
 msgstr "180、90 と 45 度"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:49
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:49
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:48
 msgid "Zone Edge Orientation:"
 msgstr "ゾーンエッジの方向:"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:53
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
 msgid "Hatched Outline"
 msgstr "アウトラインのみハッチング"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:53
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:53
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
 msgid "Full Hatched"
 msgstr "全てハッチング"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:54
 msgid "Outline Appearence:"
 msgstr "外形線の種類:"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:59
 msgid "Keepout Options:"
 msgstr "キープアウト(禁止)エリアのオプション"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:62
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:62
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:61
 msgid "No tracks"
 msgstr "配線なし"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:64
 msgid "No vias"
 msgstr "ビアなし"
 
-#: pcbnew/dialogs/dialog_layer_selection_base.cpp:116
+#: kicad-6297/pcbnew/dialogs/dialog_layer_selection_base.cpp:116
+#: kicad-6996/pcbnew/dialogs/dialog_layer_selection_base.cpp:116
 msgid "Top/Front Layer"
 msgstr "上層"
 
 # orペア下層
-#: pcbnew/dialogs/dialog_layer_selection_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/dialog_layer_selection_base.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_layer_selection_base.cpp:154
 msgid "Bottom/Back Layer"
 msgstr "下層"
 
-#: pcbnew/dialogs/dialog_layers_setup.cpp:344
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup.cpp:344
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup.cpp:344
 msgid "Enabled"
 msgstr "有効化"
 
-#: pcbnew/dialogs/dialog_layers_setup.cpp:700
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup.cpp:702
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup.cpp:700
 msgid "Layer name may not be empty"
 msgstr "レイヤ名が空です"
 
-#: pcbnew/dialogs/dialog_layers_setup.cpp:707
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup.cpp:709
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup.cpp:707
 msgid "Layer name has an illegal character, one of: '"
 msgstr "レイヤ名に不正な文字が含まれています。例) '"
 
-#: pcbnew/dialogs/dialog_layers_setup.cpp:714
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup.cpp:716
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup.cpp:714
 msgid "'signal' is a reserved layer name"
 msgstr "'signal' は予約されたレイヤ名です。使用することはできません。"
 
-#: pcbnew/dialogs/dialog_layers_setup.cpp:723
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup.cpp:725
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup.cpp:723
 msgid "Layer name is a duplicate of another"
 msgstr "レイヤ名が他と重複しています"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:25
 msgid "Preset Layer Groupings"
 msgstr "プリセットレイヤのグループ"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:29
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:129
 msgid "Custom"
 msgstr "カスタム"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
 msgid "Two layers, parts on Front only"
 msgstr "2レイヤ、表面のみ部品実装"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
 msgid "Two layers, parts on Back only"
 msgstr "2レイヤ、裏面のみ部品実装"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
 msgid "Two layers, parts on Front and Back"
 msgstr "2レイヤ、両面実装"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
 msgid "Four layers, parts on Front only"
 msgstr "4レイヤ、表面のみ部品実装"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
 msgid "Four layers, parts on Front and Back"
 msgstr "4レイヤ、両面実装"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:29
 msgid "All layers on"
 msgstr "全レイヤ　オン"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:41
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:41
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:41
 msgid "Copper Layers"
 msgstr "配線層数"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "2"
 msgstr "2"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "6"
 msgstr "6"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "8"
 msgstr "8"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "10"
 msgstr "10"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "12"
 msgstr "12"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "14"
 msgstr "14"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "18"
 msgstr "18"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "20"
 msgstr "20"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "22"
 msgstr "22"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "24"
 msgstr "24"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "26"
 msgstr "26"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "28"
 msgstr "28"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:45
 msgid "30"
 msgstr "30"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:57
 msgid "Board Thickness"
 msgstr "基板厚"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:110
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:110
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:110
 msgid "CrtYd_Front_later"
 msgstr "CrtYd_Front_later"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:124
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1336
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:124
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1336
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:124
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1336
 msgid "If you want a courtyard layer for the front side of the board"
 msgstr "ボード表面にコートヤードレイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:137
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1346
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:137
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1346
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:137
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1346
 msgid "Off-board, testing"
 msgstr "Off-board、テスト用"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:141
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:141
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:141
 msgid "Fab_Front_later"
 msgstr "Fab_Front_later"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:152
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:152
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:152
 msgid "If you want a fabrication layer for the front side of the board"
 msgstr "ボード表面に基板製造用レイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:162
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:187
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1296
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1321
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:162
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:187
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1296
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1321
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:162
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:187
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1296
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1321
 msgid "Off-board, manufacturing"
 msgstr "Off-board、製造用"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:166
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:166
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:166
 msgid "Adhes_Front_later"
 msgstr "表面 実装用ボンド"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:177
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:177
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:177
 msgid "If you want an adhesive template for the front side of the board"
 msgstr "ボード表面に実装用ボンドのテンプレートを使用する場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:191
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:191
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:191
 msgid "SoldP_Front_later"
 msgstr "表面メタルマスク"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:202
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:202
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:202
 msgid "If you want a solder paster layer for front side of the board"
 msgstr "ボード表面にメタルマスク (半田ペースト) を使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:212
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:237
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:262
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1221
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1246
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1271
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:212
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:237
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:262
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1221
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1246
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1271
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:212
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:237
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:262
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1221
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1246
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1271
 msgid "On-board, non-copper"
 msgstr "On-board、非導体層"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:216
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:216
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:216
 msgid "SilkS_Front_later"
 msgstr "表面 シルクスクリーン"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:227
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:227
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:227
 msgid "If you want a silk screen layer for the front side of the board"
 msgstr "ボード表面のシルク スクリーンレイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:241
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:241
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:241
 msgid "Mask_Front_later"
 msgstr "表面レジスト"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:252
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:252
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:252
 msgid "If you want a solder mask layer for the front of the board"
 msgstr "ボード表面にレジスト レイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:266
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:266
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:266
 msgid "Front_later"
 msgstr "表面 導体"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:268
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:268
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:268
 msgid "Layer name of front (top) copper layer"
 msgstr "表 (最上面) の導体層の名称"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:280
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:280
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:280
 msgid "If you want a front copper layer"
 msgstr "ボード表面の導体層を使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:290
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:319
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:348
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:377
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:406
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:435
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:464
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:493
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:522
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:551
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:580
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:609
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:638
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:667
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:696
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:725
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:754
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:783
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:812
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:841
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:870
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:899
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:928
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:957
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:986
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
 msgid "signal"
 msgstr "信号層"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:290
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:319
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:348
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:377
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:406
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:435
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:464
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:493
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:522
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:551
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:580
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:609
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:638
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:667
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:696
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:725
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:754
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:783
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:812
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:841
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:870
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:899
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:928
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:957
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:986
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
 msgid "power"
 msgstr "電源層"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:290
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:319
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:348
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:377
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:406
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:435
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:464
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:493
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:522
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:551
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:580
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:609
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:638
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:667
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:696
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:725
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:754
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:783
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:812
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:841
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:870
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:899
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:928
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:957
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:986
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
 msgid "mixed"
 msgstr "混在層"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:290
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:319
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:348
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:377
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:406
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:435
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:464
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:493
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:522
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:551
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:580
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:609
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:638
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:667
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:696
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:725
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:754
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:783
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:812
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:841
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:870
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:899
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:928
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:957
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:986
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:290
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:319
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:348
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:377
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:406
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:435
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:464
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:493
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:522
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:551
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:580
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:609
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:638
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:667
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:696
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:725
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:754
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:783
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:812
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:841
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:870
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:899
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:928
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:957
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:986
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1015
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1044
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1073
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1102
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1131
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1160
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1192
 msgid "jumper"
 msgstr "ジャンパー層"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:294
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:323
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:352
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:381
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:410
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:439
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:468
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:497
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:526
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:555
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:584
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:613
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:642
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:671
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:700
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:729
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:758
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:787
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:816
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:845
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:874
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:903
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:932
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:961
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:990
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1019
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1048
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1077
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1106
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1135
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1164
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1196
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:294
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:323
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:352
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:381
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:410
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:439
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:468
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:497
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:526
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:555
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:584
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:613
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:642
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:671
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:700
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:729
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:758
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:787
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:816
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:845
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:874
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:903
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:932
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:961
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:990
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1019
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1048
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1077
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1106
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1135
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1164
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1196
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:294
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:323
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:352
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:381
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:410
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:439
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:468
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:497
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:526
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:555
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:584
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:613
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:642
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:671
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:700
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:729
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:758
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:787
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:816
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:845
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:874
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:903
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:932
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:961
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:990
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1019
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1048
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1077
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1106
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1135
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1164
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1196
 msgid ""
 "Copper layer type for Freerouter.  Power layers are removed from "
 "Freerouter's layer menus."
@@ -15933,230 +21093,289 @@ msgstr ""
 "Freerouter 用の導体レイヤ。電源レイヤは Freerouter のレイヤメニューで削除され"
 "ます。"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:298
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:298
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:298
 msgid "In1"
 msgstr "In1"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:327
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:327
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:327
 msgid "In2"
 msgstr "In2"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:356
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:356
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:356
 msgid "In3"
 msgstr "In3"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:385
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:385
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:385
 msgid "In4"
 msgstr "In4"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:414
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:414
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:414
 msgid "In5"
 msgstr "In5"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:443
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:443
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:443
 msgid "In6"
 msgstr "In6"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:472
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:472
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:472
 msgid "In7"
 msgstr "In7"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:501
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:501
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:501
 msgid "In8"
 msgstr "In8"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:530
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:530
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:530
 msgid "In9"
 msgstr "In9"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:559
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:559
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:559
 msgid "In10"
 msgstr "In10"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:588
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:588
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:588
 msgid "In11"
 msgstr "In11"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:617
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:617
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:617
 msgid "In12"
 msgstr "In12"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:646
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:646
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:646
 msgid "In13"
 msgstr "In13"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:675
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:675
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:675
 msgid "In14"
 msgstr "In14"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:704
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:704
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:704
 msgid "In15"
 msgstr "In15"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:733
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:733
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:733
 msgid "In16"
 msgstr "In16"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:762
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:762
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:762
 msgid "In17"
 msgstr "In17"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:791
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:791
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:791
 msgid "In18"
 msgstr "In18"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:820
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:820
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:820
 msgid "In19"
 msgstr "In19"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:849
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:849
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:849
 msgid "In20"
 msgstr "In20"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:878
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:878
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:878
 msgid "In21"
 msgstr "In21"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:907
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:907
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:907
 msgid "In22"
 msgstr "In22"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:936
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:936
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:936
 msgid "In23"
 msgstr "In23"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:965
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:965
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:965
 msgid "In24"
 msgstr "In24"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:994
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:994
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:994
 msgid "In25"
 msgstr "In25"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1023
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1023
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1023
 msgid "In26"
 msgstr "In26"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1052
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1052
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1052
 msgid "In27"
 msgstr "In27"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1081
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1081
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1081
 msgid "In28"
 msgstr "In28"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1110
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1110
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1110
 msgid "In29"
 msgstr "In29"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1139
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1139
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1139
 msgid "In30"
 msgstr "In30"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1170
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1170
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1170
 msgid "Layer name of back (bottom) copper layer"
 msgstr "裏 (最背面) の導体層の名称"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1182
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1182
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1182
 msgid "If you want a back copper layer"
 msgstr "ボード裏面の導体層を使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1200
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1200
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1200
 msgid "Mask_Back_later"
 msgstr "裏面レジスト"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1211
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1211
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1211
 msgid "If you want a solder mask layer for the back side of the board"
 msgstr "ボード裏面のレジスト レイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1225
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1225
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1225
 msgid "SilkS_Back_later"
 msgstr "裏面 シルクスクリーン"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1236
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1236
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1236
 msgid "If you want a silk screen layer for the back side of the board"
 msgstr "ボード裏面のシルク スクリーン レイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1250
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1250
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1250
 msgid "SoldP_Back_later"
 msgstr "裏面 メタルマスク"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1261
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1261
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1261
 msgid "If you want a solder paste layer for the back side of the board"
 msgstr "ボード裏面のメタルマスク (半田ペースト) レイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1275
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1275
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1275
 msgid "Adhes_Back_later"
 msgstr "裏面 実装用ボンド"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1286
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1286
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1286
 msgid "If you want an adhesive layer for the back side of the board"
 msgstr "ボード裏面に実装用ボンドのレイヤを使用する場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1300
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1300
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1300
 msgid "Fab_Back_later"
 msgstr "Fab_Back_later"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1311
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1311
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1311
 msgid "If you want a fabrication layer for the back side of the board"
 msgstr "ボード裏面に基板製造用レイヤを使用したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1325
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1325
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1325
 msgid "CrtYd_Back_later"
 msgstr "CrtYd_Back_later"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1350
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1350
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1350
 msgid "PCB_Edges_later"
 msgstr "基板外形レイヤ"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1361
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1361
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1361
 msgid "If you want a board perimeter layer"
 msgstr "基板外周レイヤが欲しい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1371
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1371
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1371
 msgid "Board contour"
 msgstr "基板外形"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1375
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1375
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1375
 msgid "Margin_later"
 msgstr "Margin_later"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1394
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1394
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1394
 msgid "Edge_Cuts setback"
 msgstr "Edge.Cutsのオフセット"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1398
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1398
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1398
 msgid "Eco1_later"
 msgstr "Eco1レイヤ"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1417
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1440
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1465
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1490
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1417
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1440
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1465
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1490
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1417
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1440
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1465
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1490
 msgid "Auxiliary"
 msgstr "補助"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1421
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1421
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1421
 msgid "Eco2_later"
 msgstr "Eco2レイヤ"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1444
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1444
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1444
 msgid "Comments_later"
 msgstr "後でコメントを追加"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1455
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1455
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1455
 msgid "If you want a separate layer for comments or notes"
 msgstr "別のレイヤにコメントや注意書きを作成したい場合"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1469
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1469
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1469
 msgid "Drawings_later"
 msgstr "後で図形を追加"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.cpp:1480
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.cpp:1480
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.cpp:1480
 msgid "If you want a layer for documentation drawings"
 msgstr "ドキュメント用の図示を使用する場合"
 
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:27
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:27
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:27
 msgid ""
 "Note: For clearance values:\n"
 "- a positive value means a mask bigger than a pad\n"
@@ -16166,7 +21385,8 @@ msgstr ""
 "- 正の数はマスクがパッドサイズより大きいことを示します\n"
 "- 負の数はマスクがパッドサイズより小さいことを示します\n"
 
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:42
 msgid ""
 "This is the global clearance between pads and the solder mask\n"
 "This value can be superseded by local values for a footprint or a pad."
@@ -16174,12 +21394,15 @@ msgstr ""
 "これはパッドとレジスト間のグローバル クリアランスです。\n"
 "フットプリントやパッドにローカル値がある場合、そちらが優先されます。"
 
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:54
-#: pcbnew/dialogs/dialog_plot_base.cpp:206
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:206
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:204
 msgid "Solder mask min width:"
 msgstr "レジストの最小幅:"
 
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:56
 msgid ""
 "Min dist between 2 pad areas.\n"
 "Two pad areas nearer than this value will be merged during plotting.\n"
@@ -16189,7 +21412,8 @@ msgstr ""
 "この値より近い 2 つのパッドは、プロット時に結合されます.\n"
 "このパラメータは、ハンダマスクレイヤのプロットにのみ適用されます."
 
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:79
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:79
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:79
 msgid ""
 "This is the global clearance between pads and the solder paste\n"
 "This value can be superseded by local values for a footprint or a pad.\n"
@@ -16200,7 +21424,8 @@ msgstr ""
 "フットプリントまたはパッドにローカル値がある場合、そちらが優先されます。\n"
 "最終的なクリアランスの値は、この値とクリアランス率の合算となります。"
 
-#: pcbnew/dialogs/dialog_mask_clearance_base.cpp:93
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.cpp:93
 msgid ""
 "This is the global clearance ratio in per cent between pads and the solder "
 "paste\n"
@@ -16213,42 +21438,50 @@ msgstr ""
 "フットプリントやパッドにローカル値がある場合、そちらが優先されます。\n"
 "最終的な値はこの値とローカル値の合算となります。"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:22
 msgid "On new graphic item creation:"
 msgstr "新しいグラフィック アイテムの作成時:"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:34
 msgid "&Graphic line width"
 msgstr "図形ライン幅(&G)"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:46
 msgid "Text line width"
 msgstr "テキスト線幅"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:56
 msgid "Text &height"
 msgstr "テキスト高さ(&h)"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:70
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:67
 msgid "Text &width"
 msgstr "テキスト幅(&w)"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:88
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:84
 msgid "Default values on new footprint creation:"
 msgstr "新規フットプリントのデフォルト値:"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:90
 msgid ""
 "Leave reference or value blank to use the footprint name as default text"
 msgstr ""
 "デフォルト テキストにフットプリント名に使うには、リファレンスまたは定数を空白"
 "のままにします"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:102
 msgid "&Reference"
 msgstr "リファレンス(&R)"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:111
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:111
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:107
 msgid ""
 "Default text for reference\n"
 "Leave blank to use the footprint name"
@@ -16256,21 +21489,27 @@ msgstr ""
 "リファレンスのデフォルト テキストに\n"
 "フットプリント名に使うには空白のままにします"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:119
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:148
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:148
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:115
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:144
 msgid "SilkScreen"
 msgstr "シルク"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:119
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:148
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:148
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:115
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:144
 msgid "Fab. Layer"
 msgstr "Fab. レイヤ"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:131
 msgid "V&alue"
 msgstr "定数(&a)"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:140
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:136
 msgid ""
 "Default text for value\n"
 "Leave blank to use the footprint name"
@@ -16278,55 +21517,67 @@ msgstr ""
 "定数のデフォルト テキストに\n"
 "フットプリント名に使うには空白のままにします"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.cpp:170
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.cpp:170
 msgid "General options:"
 msgstr "全般 オプション:"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact.cpp:136
 msgid "Distance:"
 msgstr "距離:"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:142
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact.cpp:142
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact.cpp:143
 msgid "Move vector X:"
 msgstr "横(X)方向へ移動:"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:143
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact.cpp:143
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact.cpp:144
 msgid "Move vector Y:"
 msgstr "縦(Y)方向へ移動:"
 
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:19
 msgid "Use polar coordinates"
 msgstr "極座標を使用する"
 
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:28
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:28
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:28
 msgid "x:"
 msgstr "x:"
 
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:42
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:42
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:42
 msgid "y:"
 msgstr "y:"
 
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_move_exact_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_move_exact_base.cpp:56
 msgid "Item rotation:"
 msgstr "アイテムの回転:"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:85
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:85
 msgid "The project configuration has changed.  Do you want to save it?"
 msgstr "プロジェクトの設定が変更されました、保存しますか?"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:148
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:154
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:150
 msgid "Select Netlist"
 msgstr "ネットリストの選択"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:164
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:170
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:166
 msgid "Please, choose a valid netlist file"
 msgstr "有効なネットリスト ファイルを選択して下さい"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:170
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:176
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:172
 msgid "The netlist file does not exist"
 msgstr "ネットリスト ファイルがありません"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:177
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:183
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:179
 msgid ""
 "The changes made by reading the netlist cannot be undone.  Are you sure you "
 "want to read the netlist?"
@@ -16334,78 +21585,102 @@ msgstr ""
 "ネットリスト読込みによる変更は途中終了できません.  本当にネットリストを読み込"
 "みますか?"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:187
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:193
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:189
 #, c-format
 msgid "Reading netlist file \"%s\".\n"
 msgstr "ネットリストファイル \"%s\"を読み込んでいます。\n"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:191
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:197
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:193
 msgid "Using time stamps to match components and footprints.\n"
 msgstr "コンポーネントとフットプリントの関連付けにタイムスタンプを使用\n"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:193
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:199
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:195
 msgid "Using references to match components and footprints.\n"
 msgstr "コンポーネントとフットプリントの関連付けにリファレンスを使用\n"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:216 pcbnew/netlist.cpp:153
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:222
+#: kicad-6297/pcbnew/netlist.cpp:153
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:218
+#: kicad-6996/pcbnew/netlist.cpp:184
 msgid "No footprints"
 msgstr "フットプリント無し"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:240
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:246
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:242
 msgid "No duplicate."
 msgstr "重複はありませんでした。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:243
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:249
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:245
 msgid "Duplicates:"
 msgstr "重複:"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:267
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:273
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:269
 msgid "No missing footprints."
 msgstr "フットプリントが見つかりません！"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:270
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:276
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:272
 msgid "Missing:"
 msgstr "欠落: "
 
-#: pcbnew/dialogs/dialog_netlist.cpp:286
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:292
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:288
 msgid "No extra footprints."
 msgstr "追加のフットプリントがありません。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:289
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:295
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:291
 msgid "Not in Netlist:"
 msgstr "ネットリストに含まれていません: "
 
-#: pcbnew/dialogs/dialog_netlist.cpp:314
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:320
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:316
 msgid "Too many errors: some are skipped"
 msgstr "大量のエラー: いくつか省略されました"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:318
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:324
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:320
 msgid "Check footprints"
 msgstr "フットプリントのチェック"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:362
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:368
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:364
 msgid "Save contents of message window"
 msgstr "メッセージ ウインドウ内のメッセージを保存する"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:379
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:385
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:381
 #, c-format
 msgid "Cannot write message contents to file \"%s\"."
 msgstr "メッセージ内容をファイル \"%s\" へ書き出すことが出来ませんでした。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:381
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:387
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:383
 msgid "File Write Error"
 msgstr "ファイル書き出しエラー"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:420 pcbnew/netlist.cpp:82
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:426
+#: kicad-6297/pcbnew/netlist.cpp:82
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:422
+#: kicad-6996/pcbnew/netlist.cpp:88
 #, c-format
 msgid "Cannot open netlist file \"%s\"."
 msgstr "ネットリスト ファイル \"%s\" が開けませんでした。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:421 pcbnew/netlist.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:427
+#: kicad-6297/pcbnew/netlist.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:423
+#: kicad-6996/pcbnew/netlist.cpp:89
 msgid "Netlist Load Error."
 msgstr "ネットリストの読み込みエラー"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:430
+#: kicad-6297/pcbnew/dialogs/dialog_netlist.cpp:436
+#: kicad-6996/pcbnew/dialogs/dialog_netlist.cpp:432
 #, c-format
 msgid ""
 "Error loading netlist file:\n"
@@ -16414,11 +21689,13 @@ msgstr ""
 "ネットリスト ファイルの読み込み時にエラーが発生しました:\n"
 "%s"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:35
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:35
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:35
 msgid "Footprint Selection"
 msgstr "フットプリントの選択"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:37
 msgid ""
 "Select how footprints are recognized:\n"
 "by their reference (U1, R3...) (normal setting)\n"
@@ -16429,22 +21706,29 @@ msgstr ""
 "- タイムスタンプで認識(再アノテーションなどで回路図上のリファレンスが変わった"
 "場合)"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:41
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:55
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:63
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:71
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:41
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:55
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:63
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:71
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:41
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:55
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:63
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:71
 msgid "Keep"
 msgstr "保持"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:41
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:41
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:41
 msgid "Change"
 msgstr "変更"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:43
 msgid "Exchange Footprint"
 msgstr "フットプリントの交換"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:45
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:45
 msgid ""
 "Keep or change an existing footprint when the netlist gives a different "
 "footprint"
@@ -16453,19 +21737,23 @@ msgstr ""
 "に、\n"
 "既存のフットプリントを保持するか指定されたものへ変更するか"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:57
 msgid "Unconnected Tracks"
 msgstr "未接続配線"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:59
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:59
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:59
 msgid "Keep or delete bad tracks after a netlist change"
 msgstr "ネットリストを変更後、以前の配線を削除"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:65
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:65
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:65
 msgid "Extra Footprints"
 msgstr "ネットリストに無い部品"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:67
 msgid ""
 "Remove footprints found on the Board but not in netlist\n"
 "Note: only not locked footprints will be removed"
@@ -16473,45 +21761,55 @@ msgstr ""
 "ボードにあってネットリストにないフットプリントの削除設定\n"
 "(ロックされていないフットプリントのみ削除されます)"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:73
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:73
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:73
 msgid "Single Pad Nets"
 msgstr "孤立したパッドやネット"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:89
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:89
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:89
 msgid "Read Current Netlist"
 msgstr "現在のネットリストを読み込む"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:91
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:91
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:91
 msgid "Read the current netlist and update connections and connectivity info"
 msgstr ""
 "現在のネットリストを読み込み、コネクションとコネクションの情報を更新する"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:98
 msgid "Test Footprints"
 msgstr "フットプリントのテスト"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:99
-msgid "Read the current neltist file and list missing and extra footprints"
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:99
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:99
+msgid "Read the current netlist file and list missing and extra footprints"
 msgstr ""
 "現在のネットリスト ファイルを読み込み、エラーのあるフットプリントを一覧表示"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:103
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:103
 msgid "Rebuild Board Connectivity"
 msgstr "ボード結線情報の再構築"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:104
-msgid "Rebuild the full ratsnest (usefull after a manual pad netname edition)"
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:104
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:104
+msgid "Rebuild the full ratsnest (useful after a manual pad netname edition)"
 msgstr "全てのラッツネストを再構築 (手作業でネット名を編集した後に便利です)"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:108
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:108
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:108
 msgid "Save Messages to File"
 msgstr "メッセージをファイルへ保存"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:123
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:123
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:123
 msgid "Dry run. Only report changes in message panel"
 msgstr "ドライ ラン - 実際の変更は行われず、変更点が表示されます。"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:124
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:124
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:124
 msgid ""
 "Dry Run:\n"
 "The netlist is read, but no change is actually made on board.\n"
@@ -16521,11 +21819,13 @@ msgstr ""
 "ネットリストを読み込みますが、実際の基板上に変更を加えません。\n"
 "変更点は情報として、メッセージパネルに表示されます。"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:128
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:128
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:128
 msgid "Silent mode"
 msgstr "サイレント モード"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:129
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:129
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:129
 msgid ""
 "Silent mode:\n"
 "Do not show the warning message before reading the netlist"
@@ -16533,11 +21833,13 @@ msgstr ""
 "サイレント モード:\n"
 "ネットリストを読み込む前の警告メッセージを表示しません"
 
-#: pcbnew/dialogs/dialog_netlist_fbp.cpp:142
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.cpp:142
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.cpp:142
 msgid "Netlist File:"
 msgstr "ネットリスト ファイル:"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:196
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:196
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:196
 msgid ""
 "Error :\n"
 "you must choose a min thickness value bigger than 0.001 inch (or 0.0254 mm)"
@@ -16545,81 +21847,95 @@ msgstr ""
 "エラー :\n"
 "配線幅は 0.001 inch (0.0254 mm)より太くする必要があります。"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:232
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:232
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:232
 msgid "Error : you must choose a layer"
 msgstr "エラー:レイヤを選択してください"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:30
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.h:83
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:30
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:30
+#: kicad-6297/gerbview/dialogs/dialog_layers_select_to_pcb_base.h:83
+#: kicad-6996/gerbview/dialogs/dialog_layers_select_to_pcb_base.h:83
 msgid "Layer selection:"
 msgstr "レイヤの選択:"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:44
 msgid "Outlines Options:"
 msgstr "アウトラインのオプション:"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:46
 msgid "H, V and 45 deg"
 msgstr "0 , 45 , 90度"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:48
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:48
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:48
 msgid "Zone Edges Orient"
 msgstr "ゾーンの外形の角度"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:54
 msgid "Outlines Appearence"
 msgstr "外形の形状"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:61
 msgid "Zone min thickness value"
 msgstr "ゾーンの最小幅"
 
-#: pcbnew/dialogs/dialog_orient_footprints.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints.cpp:119
 #, c-format
 msgid "OK to set footprints orientation to %.1f degrees ?"
 msgstr "フットプリントの角度を %.1f 度にセットします。よろしいですか?"
 
-#: pcbnew/dialogs/dialog_orient_footprints.cpp:150
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints.cpp:150
 msgid "Bad value for footprints orientation"
 msgstr "フットプリントの角度が不正です。"
 
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:27
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:27
 msgid "New orientation (0.1 degree resolution)"
 msgstr "新しい角度(0.1度単位)"
 
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:36
 msgid "Filter to select footprints by reference"
 msgstr "リファレンスで選択するフットプリントを選別"
 
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:43
 msgid "Include Locked Footprints"
 msgstr "ロックされているフットプリントを含む"
 
-#: pcbnew/dialogs/dialog_orient_footprints_base.cpp:44
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.cpp:44
 msgid "Force locked footprints to be modified"
 msgstr "ロックされたフットプリントを強制的に編集"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:340
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:343
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:352
 msgid "Back side (footprint is mirrored)"
 msgstr "裏面 (フットプリントは反転)"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:742
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:746
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:768
 msgid "Pad size must be greater than zero"
 msgstr "パッドサイズは0以上である必要があります"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:748
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:752
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:774
 msgid "Incorrect value for pad drill: pad drill bigger than pad size"
 msgstr "不正なパッド ドリル値: パッド ドリルがパッド径よりも大きいです"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:754
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:760
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:782
 msgid "Error: pad has no layer"
 msgstr "エラー:パッドにレイヤ情報がありません"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:761
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:767
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:789
 msgid "Error: the pad is not on a copper layer and has a hole"
 msgstr "エラー: パッドが銅箔レイヤ上になく、穴情報をもっています"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:766
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:772
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:794
 msgid ""
 "For NPTH pad, set pad size value to pad drill value, if you do not want this "
 "pad plotted in gerber files"
@@ -16628,19 +21944,23 @@ msgstr ""
 "くない場合、\n"
 "ドリルの値をパッドサイズの値にセットしてください。"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:784
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:792
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:814
 msgid "Incorrect value for pad offset"
 msgstr "不正なパッド オフセット値"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:789
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:798
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:820
 msgid "Too large value for pad delta size"
 msgstr "パッドの デルタ サイズが大きすぎます"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:797
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:806
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:828
 msgid "Error: Through hole pad: drill diameter set to 0"
 msgstr "エラー: スルーホールパッド: ドリル経に0が指定されいます"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:802
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:811
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:833
 msgid ""
 "Error: Connector pads are not on the solder paste layer\n"
 "Use SMD pads instead"
@@ -16648,207 +21968,264 @@ msgstr ""
 "エラー: コネクタのパッドが半田ペーストレイヤにありません\n"
 "代わりにSMDパッドを使用してください"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:811
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:820
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:842
 msgid "Error: only one external copper layer allowed for SMD or Connector pads"
 msgstr ""
 "エラー: SMD またはコネクタのパッドは、外層銅箔層のどちらか一つにのみ配置でき"
 "ます"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:818
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:827
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:866
 msgid "Pad setup errors list"
 msgstr "パッド設定 エラー一覧"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:936
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties.cpp:945
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:1017
 msgid "Unknown netname, netname not changed"
 msgstr "不明なネット名、ネット名は変更されていません"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:38
 msgid "Pad number:"
 msgstr "パッド番号:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:46
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:539
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:45
 msgid "Net name:"
 msgstr "ネット名:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:52
 msgid "Pad type:"
 msgstr "パッド形状: "
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:56
 msgid "Through-hole"
 msgstr "スルーホール"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:56
 msgid "Connector"
 msgstr "コネクタ"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:56
 msgid "NPTH, Mechanical"
 msgstr "NPTH(メッキ無し貫通穴), 機構穴"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:64
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:270
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:64
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:270
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:62
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:273
 msgid "Shape:"
 msgstr "形状:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:66
 msgid "Circular"
 msgstr "円"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:66
 msgid "Rectangular"
 msgstr "四角"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:68
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:66
 msgid "Trapezoidal"
 msgstr "台形"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:83
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:47
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:130
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:125
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:125
 msgid "Position X:"
 msgstr "X位置:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:95
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:80
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:142
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:95
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:80
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:136
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:92
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:136
 msgid "Position Y:"
 msgstr "Y位置:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:107
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:284
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:107
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:284
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:103
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:287
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:37
 msgid "Size X:"
 msgstr "サイズ X:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:119
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:296
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:45
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:296
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:44
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:114
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:298
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:44
 msgid "Size Y:"
 msgstr "サイズ Y:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:135
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:129
 msgid "90"
 msgstr "90"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:153
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:153
 msgid "0.1 deg"
 msgstr "0.1 度"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:157
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:157
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:149
 msgid "Shape offset X:"
 msgstr "形状のX方向オフセット: "
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:169
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:169
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:160
 msgid "Shape offset Y:"
 msgstr "形状のY方向オフセット: "
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:181
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:181
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:171
 msgid "Pad to die length:"
 msgstr "パッドからダイまでの長さ:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:183
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:183
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:173
 msgid ""
 "Wire length from pad to die on chip ( used to calculate actual track length)"
 msgstr "パッドからチップのダイまでの配線長(実配線長の計算に使用されます)"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:195
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:195
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:193
 msgid "Trapezoid delta:"
 msgstr "台形のデルタ:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:207
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:207
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:204
 msgid "Trapezoid direction:"
 msgstr "台形の方向:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:225
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:225
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:377
 msgid "Parent footprint orientation"
 msgstr "親フットプリントの方向"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:233
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:233
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:385
 msgid "Rotation:"
 msgstr "回転:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:241
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:241
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:393
 msgid "Board side:"
 msgstr "配置面:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:245
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:245
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:397
 msgid "Front side"
 msgstr "表面"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:274
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:274
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:277
 msgid "Circular hole"
 msgstr "円形穴"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:274
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:274
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:277
 msgid "Oval hole"
 msgstr "楕円穴"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:320
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:320
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:321
 msgid "Copper:"
 msgstr "導体:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:324
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:324
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:325
 msgid "Front layer"
 msgstr "表面レイヤ"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:324
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:324
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:325
 msgid "Back layer"
 msgstr "裏面レイヤ"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:324
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:324
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:325
 msgid "All copper layers"
 msgstr "全ての導体レイヤ"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:334
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:334
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:335
 msgid "Technical Layers"
 msgstr "テクニカル レイヤ"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:336
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:336
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:337
 msgid "Front adhesive"
 msgstr "表面層の接着剤"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:339
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:339
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:340
 msgid "Back adhesive"
 msgstr "裏面層の接着剤"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:342
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:342
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:343
 msgid "Front solder paste"
 msgstr "表面層の半田ペースト"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:345
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:345
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:346
 msgid "Back solder paste"
 msgstr "裏面層の半田ペースト"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:351
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:351
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:352
 msgid "Back silk screen"
 msgstr "裏面層のシルク"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:357
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:357
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:358
 msgid "Back solder mask"
 msgstr "裏面層のレジスト"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:360
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:360
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:361
 msgid "Drafting notes"
 msgstr "注釈"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:363
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:363
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:364
 msgid "E.C.O.1"
 msgstr "E.C.O.1"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:366
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:366
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:367
 msgid "E.C.O.2"
 msgstr "E.C.O.2"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:391
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:391
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:423
 msgid "Clearances"
 msgstr "クリアランス"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:399
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:399
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:431
 msgid "Net pad clearance:"
 msgstr "ネット-パッド間のクリアランス:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:401
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:401
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:433
 msgid ""
 "This is the local net clearance for  pad.\n"
 "If 0, the footprint local value or the Netclass value is used"
@@ -16856,7 +22233,8 @@ msgstr ""
 "これはパッドについての局所的なネットのクリアランスです。\n"
 "0にした場合、フットプリントかネットクラスの値が使用されます。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:415
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:415
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:446
 msgid ""
 "This is the local clearance between this  pad and the solder mask\n"
 "If 0, the footprint local value or the global value is used"
@@ -16864,7 +22242,8 @@ msgstr ""
 "これはパッドとレジスト間の局所的なクリアランスです\n"
 "0にした場合、フットプリントかグローバルの値が使用されます"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:429
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:429
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:459
 msgid ""
 "This is the local clearance between this pad and the solder paste.\n"
 "If 0 the footprint value or the global value is used..\n"
@@ -16877,7 +22256,8 @@ msgstr ""
 "最終的なクリアランス値はこの値とクリアランス率の合算となります。\n"
 "マイナス値の場合、マスクのサイズはパッドのサイズより小さくなります。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:443
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:443
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:472
 msgid ""
 "This is the local clearance ratio in per cent between this pad and the "
 "solder paste.\n"
@@ -16895,33 +22275,40 @@ msgstr ""
 "マイナス値が指定された場合、マスクのサイズはパッドのサイズより小さくなりま"
 "す。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:462
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:462
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:490
 msgid "Copper Zones"
 msgstr "導体エリア"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:474
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:474
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:502
 msgid "From parent footprint"
 msgstr "親のフットプリントから"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:484
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:484
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:512
 msgid "Thermal relief width:"
 msgstr "サーマルリリーフの幅:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:496
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:496
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:523
 msgid "Thermal relief gap:"
 msgstr "サーマルリリーフのギャップ:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:514
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:514
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:540
 msgid "Set fields to 0 to use parent or global values"
 msgstr ""
 "これらの値を0にすると\n"
 "親のフットプリントまたはグローバル値が使用されます"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:527
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:527
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:553
 msgid "Local Clearance and Settings"
 msgstr "ローカルクリアランスと設定"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:549
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.cpp:549
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:575
 msgid ""
 "Warning:\n"
 "This pad is flipped on board.\n"
@@ -16931,47 +22318,58 @@ msgstr ""
 "このパッドはボード上で表裏反転しています。\n"
 "裏と表レイヤは交換されます。"
 
-#: pcbnew/dialogs/dialog_pcb_text_properties.cpp:193
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties.cpp:196
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties.cpp:200
 msgid "No layer selected, Please select the text layer"
 msgstr "レイヤが選択されていません。テキストレイヤを選択してください。"
 
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:29
 msgid "Enter the text placed on selected layer."
 msgstr "選択されたレイヤ上に置くテキストを入力。"
 
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:70 pcbnew/muonde.cpp:813
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:70
+#: kicad-6297/pcbnew/muonde.cpp:813
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:71
+#: kicad-6996/pcbnew/muonde.cpp:859
 msgid "Mirrored"
 msgstr "反転"
 
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:88
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:88
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:89
 msgid "Justification:"
 msgstr "位置合わせ:"
 
-#: pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:116
+#: kicad-6297/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:116
 msgid "Orientation (0.1 deg):"
 msgstr "角度 (0.1度単位)"
 
-#: pcbnew/dialogs/dialog_plot.cpp:594
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:594
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:583
 msgid "HPGL pen size constrained."
 msgstr "HPGLペンサイズは制限されています！"
 
-#: pcbnew/dialogs/dialog_plot.cpp:607
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:607
 msgid "HPGL pen overlay constrained."
 msgstr "HPGLペンのオーバーレイは制限されています！"
 
-#: pcbnew/dialogs/dialog_plot.cpp:619
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:619
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:595
 msgid "Default line width constrained."
 msgstr "標準の線幅は制限されています！"
 
-#: pcbnew/dialogs/dialog_plot.cpp:632
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:632
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:608
 msgid "X scale constrained."
 msgstr "拡大率(X)は制限されています！"
 
-#: pcbnew/dialogs/dialog_plot.cpp:646
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:646
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:622
 msgid "Y scale constrained."
 msgstr "拡大率(Ｙ)は制限されています！"
 
-#: pcbnew/dialogs/dialog_plot.cpp:660
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:660
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:636
 #, c-format
 msgid ""
 "Width correction constrained. The reasonable width correction value must be "
@@ -16980,30 +22378,37 @@ msgstr ""
 "幅が制限されています！幅は、現在のデザインルールの設定では [%+f; %+f] (%s) の"
 "範囲でなければいけません。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:719
-#: pcbnew/exporters/gen_modules_placefile.cpp:247
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:719
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:246
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:699
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:257
 #, c-format
 msgid "Could not write plot files to folder \"%s\"."
 msgstr "フォルダー \"%s\" へプロットファイルを生成できませんでした。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:814
+#: kicad-6297/pcbnew/dialogs/dialog_plot.cpp:814
+#: kicad-6996/pcbnew/dialogs/dialog_plot.cpp:801
 #, c-format
 msgid "Plot file '%s' created."
 msgstr "出図ファイル '%s' が作成されました."
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:26
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:26
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:26
 msgid "Plot format:"
 msgstr "出力フォーマット:"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:90
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:90
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:89
 msgid "Plot sheet reference on all layers"
 msgstr "全てのレイヤにシートリファレンスを出力"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:93
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:93
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:92
 msgid "Plot pads on silkscreen"
 msgstr "シルクスクリーンにパッドを出力"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:93
 msgid ""
 "Enable plotting of pads on silkscreen layers\n"
 "When disabled, pads are never plotted on silkscreen layers\n"
@@ -17013,116 +22418,145 @@ msgstr ""
 "無効化のとき、パッドはシルクレイヤ上に出力されません。\n"
 "有効化のとき、パッドはシルク上にのみ出力されます。"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:98
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:97
 msgid "Plot footprint values"
 msgstr "フットプリントの定数をプロット"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:102
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:102
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:101
 msgid "Plot footprint references"
 msgstr "フットプリントのリファレンスをプロット"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:105
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:105
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:104
 msgid "Force plotting of invisible values/references"
 msgstr "非表示の定数/リファレンスを強制的にプロット"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:105
 msgid "Force plot invisible values and/or references"
 msgstr "非表示の定数/リファレンスを強制的にプロット"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:110
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:110
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:109
 msgid "Do not tent vias"
 msgstr "ビアのテンティングを禁止"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:111
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:111
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:110
 msgid "Remove soldermask on vias"
 msgstr "ビア上の半田マスクを削除"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:115
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:115
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:114
 msgid "Exclude PCB edge layer from other layers"
 msgstr "基板外形レイヤのデータを他のレイヤから除外"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:116
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:116
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:115
 msgid "Exclude contents of the pcb edge layer from all other layers"
 msgstr "PCBエッジレイヤの内容を他のレイヤから除外"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:120
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:120
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:119
 msgid "Mirrored plot"
 msgstr "横軸に対して反転して出力"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:123
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:123
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:122
 msgid "Negative plot"
 msgstr "ネガ出力"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:126
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:125
 msgid "Use auxiliary axis as origin"
 msgstr "原点に補助座標を使用"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:127
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:127
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:126
 msgid "Use auxiliary axis as coordinates origin in plot files"
 msgstr "プロットの原点に補助座標を使用"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:137
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:137
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:136
 msgid "Drill marks:"
 msgstr "ドリルマーク: "
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:141
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:141
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:140
 msgid "Small"
 msgstr "小"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:141
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:141
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:140
 msgid "Actual size"
 msgstr "実際の大きさ"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:147
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:147
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:146
 msgid "Scaling:"
 msgstr "倍率:"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:150
 msgid "Auto"
 msgstr "自動倍率"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:150
 msgid "1:1"
 msgstr "1:1"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:150
 msgid "3:2"
 msgstr "3:2"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:150
 msgid "2:1"
 msgstr "2:1"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:150
 msgid "3:1"
 msgstr "3:1"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:157
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:157
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:156
 msgid "Plot mode:"
 msgstr "出力モード:"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:167
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:167
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:166
 msgid "Default line width"
 msgstr "デフォルトの線幅"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:175
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:175
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:173
 msgid "Line width for, e.g., sheet references."
 msgstr "図枠等に使用される線幅"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:189
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:189
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:187
 msgid "Current solder mask settings:"
 msgstr "現在の半田マスク設定:"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:198
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:198
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:196
 msgid "Margin between pads and solder mask"
 msgstr "パッドとレジスト間のマージン"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:202
-#: pcbnew/dialogs/dialog_plot_base.cpp:212
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:202
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:212
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:200
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:210
 msgid "val"
 msgstr "値"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:208
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:208
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:206
 msgid ""
 "Minimum distance between 2 pad areas.\n"
 "Two pad areas nearer than this value will be merged during plotting"
@@ -17130,43 +22564,53 @@ msgstr ""
 "2 つのパッド間の最小距離.\n"
 "この値より近い 2 つのパッドは、プロット時に結合されます."
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:222
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:222
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:220
 msgid "Gerber Options"
 msgstr "ガーバーオプション"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:227
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:227
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:225
 msgid "Use Protel filename extensions"
 msgstr "Protelの拡張子を使用"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:228
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:228
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:226
 msgid "Use conventional Protel Gerber extensions - .GBL, .GTL, etc..."
 msgstr "一般的な Protel ガーバー 拡張子を使用 - .GBL, .GTL, など…"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:232
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:232
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:230
 msgid "Include extended attributes"
 msgstr "拡張属性を含む"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:233
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:233
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:231
 msgid "Include extended attributes (X2 Gerber files format) in the Gerber file"
 msgstr "ガーバー ファイルに拡張属性を含む (X2 ガーバー ファイル フォーマット)"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:237
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:237
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:235
 msgid "Subtract soldermask from silkscreen"
 msgstr "シルクをレジストで抜く"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:238
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:238
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:236
 msgid "Remove silkscreen from areas without soldermask"
 msgstr "レジスト剥離エリアに重なるシルクスクリーンを削除"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:245
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:245
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:243
 msgid "4.5 (unit mm)"
 msgstr "4.5 (単位 mm)"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:245
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:245
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:243
 msgid "4.6 (unit mm)"
 msgstr "4.6 (単位 mm)"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:249
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:249
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:247
 msgid ""
 "Resolution of coordinates in Gerber files.\n"
 "Use the higher value if possible."
@@ -17174,43 +22618,51 @@ msgstr ""
 "ガーバー ファイル座標軸の解像度.\n"
 "できるだけ高い値を使うこと."
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:264
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:264
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:259
 msgid "Pen size"
 msgstr "ペン サイズ"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:278
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:278
 msgid "Pen overlay"
 msgstr "ペンのオーバーレイ"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:284
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:284
 msgid "Set plot overlay for filling"
 msgstr "塗りつぶし部の印刷の重なりを設定"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:297
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:297
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:272
 msgid "Postscript Options"
 msgstr "PostScriptオプション"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:305
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:305
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:280
 msgid "X scale:"
 msgstr "X スケール:"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:311
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:311
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:285
 msgid "Set global X scale adjust for exact scale postscript output."
 msgstr "正確なスケールでPostscript出力をするためグローバルXスケールを設定"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:321
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:321
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:295
 msgid "Y scale:"
 msgstr "Y スケール:"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:327
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:327
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:300
 msgid "Set global Y scale adjust for exact scale postscript output."
 msgstr "正確なスケールでPostscript出力をするためグローバルYスケールを設定"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:337
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:337
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:310
 msgid "Width correction"
 msgstr "修正幅"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:343
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:343
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:315
 msgid ""
 "Set global width correction for exact width postscript output.\n"
 "These width correction is intended to compensate tracks width and also pads "
@@ -17223,177 +22675,222 @@ msgstr ""
 "妥当な幅の補正値は次の範囲でなければなりません [-(最小配線幅-1), +(最小クリア"
 "ランス-1)] (0.1 mil 単位)."
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:353
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:353
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:325
 msgid "Force A4 output"
 msgstr "強制的にA4で出力"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:383
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:383
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:355
 msgid "Generate Drill File"
 msgstr "ドリル ファイルの生成"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:397
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:397
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:375
 msgid "Select Fab Layers"
 msgstr "製造に関連するレイヤを選択"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:401
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:401
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:379
 msgid "Select all Copper Layers"
 msgstr "全ての導体レイヤを選択"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:405
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:405
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:383
 msgid "Deselect all Copper Layers"
 msgstr "全ての導体レイヤの選択解除"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:409
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:409
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:387
 msgid "Select all Layers"
 msgstr "全てのレイヤを選択"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:413
+#: kicad-6297/pcbnew/dialogs/dialog_plot_base.cpp:413
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:391
 msgid "Deselect all Layers"
 msgstr "全てのレイヤの選択解除"
 
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:32
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:43
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:32
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:43
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:60
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:32
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:43
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:60
 msgid "u"
 msgstr "u"
 
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:36
 msgid "Trace gap:"
 msgstr "配線間の間隔:"
 
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:49
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:49
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:49
 msgid "Via gap:"
 msgstr "ビア間の間隔:"
 
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:70
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:70
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:70
 msgid "Via gap same as trace gap"
 msgstr "ビアの間隔を配線の間隔と同一にする"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:52
 msgid "Single Track Length Tuning"
 msgstr "単線(シングル)長の調整"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:58
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:58
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:58
 msgid "Differential Pair Length Tuning"
 msgstr "差動ペア長の調整"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:64
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:64
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:64
 msgid "Differential Pair Skew Tuning"
 msgstr "差動ペア遅延(スキュー)の調整"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:66
 msgid "Target skew: "
 msgstr "ターゲット遅延(スキュー)"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:20
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:20
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:20
 msgid "Length/skew"
 msgstr "長さ/遅延(スキュー)"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:28
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:28
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:28
 msgid "Tune from:"
 msgstr "調整前:"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:40
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:40
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:40
 msgid "Tune to:"
 msgstr "ターゲット:"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:52
 msgid "Constraint:"
 msgstr "制約:"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:56
 msgid "From Design Rules"
 msgstr "デザインルールより"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:56
 msgid "Manual"
 msgstr "手動"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:67
 msgid "Target length:"
 msgstr "ターゲット長:"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:85
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:85
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:85
 msgid "Meandering"
 msgstr "蛇行"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:96
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:96
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:96
 msgid "Min amplitude (Amin):"
 msgstr "最小振幅 (Amin):"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:107
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:107
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:107
 msgid "Max amplitude (Amax):"
 msgstr "最大振幅 (Amax):"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:118
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:118
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:118
 msgid "Spacing (s):"
 msgstr "間隔 (s):"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:129
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:129
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:129
 msgid "Miter radius (r):"
 msgstr "折り返し部の半径 (r):"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:140
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:140
 msgid "Miter style:"
 msgstr "折り返し部のスタイル:"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:146
 msgid "45 degree"
 msgstr "45度"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:146
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:146
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:146
 msgid "arc"
 msgstr "円弧"
 
-#: pcbnew/dialogs/dialog_pns_settings.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings.cpp:36
 msgid "DRC violation: highlight obstacles"
 msgstr "DRC 違反: 障害物をハイライト"
 
-#: pcbnew/dialogs/dialog_pns_settings.cpp:37
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings.cpp:37
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings.cpp:37
 msgid "DRC violation: shove tracks and vias"
 msgstr "DRC 違反: 押しのけ配線とビア"
 
-#: pcbnew/dialogs/dialog_pns_settings.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings.cpp:38
 msgid "DRC violation: walk around obstacles"
 msgstr "DRC 違反: 障害物を迂回"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
 msgid "Highlight collisions"
 msgstr "衝突箇所をハイライト表示"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
 msgid "Shove"
 msgstr "押しのけ"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
 msgid "Walk around"
 msgstr "速度優先探索"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:19
 msgid "Figure out what's best"
 msgstr "最適化優先探索"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:34
 msgid "Mouse drag behaviour:"
 msgstr "ドラッグ中のマウスモード:"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:38
 msgid "move item"
 msgstr "アイテムの移動"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:38
 msgid "interactive drag"
 msgstr "インタラクティブなドラッグ"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:47
 msgid "Free angle mode (no shove/walkaround)"
 msgstr "自在モード (押しのけ/速度優先探索なし)"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:50
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:50
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:50
 msgid "Shove vias"
 msgstr "ビアの押しのけ"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:52
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:52
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:52
 msgid ""
 "When disabled, vias are treated as un-movable objects and hugged instead of "
 "shoved."
@@ -17401,11 +22898,13 @@ msgstr ""
 "無効の場合、ビアは動かないものとして扱われ、押しのけに代わって周りに沿うよう"
 "に配線されます。"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:56
 msgid "Jump over obstacles"
 msgstr "障害物を迂回"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:57
 msgid ""
 "When enabled, the router tries to move colliding traces behind solid "
 "obstacles (e.g. pads) instead of \"reflecting\" back the collision"
@@ -17413,11 +22912,13 @@ msgstr ""
 "有効の場合、ルーターは障害物を押しのける代わりに、衝突した配線を障害物（例え"
 "ば、パッド）の後ろに迂回させます。"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:61
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:61
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:61
 msgid "Remove redundant tracks"
 msgstr "余分な配線を削除"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:62
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:62
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:62
 msgid ""
 "Removes loops while routing (e.g. if the new track ensures same connectivity "
 "as an already existing one, the old track is removed).\n"
@@ -17429,11 +22930,13 @@ msgstr ""
 "重複の削除は局所的に行われます。（現在ルーティング中の配線の始点と終点の間に"
 "あるものだけが対象です）"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:66
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:66
 msgid "Automatic neckdown"
 msgstr "自動ネックダウン(線幅調整)"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:67
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:67
 msgid ""
 "When enabled, the router tries to break out pads/vias in a clean way, "
 "avoiding acute angles and jagged breakout traces."
@@ -17441,11 +22944,13 @@ msgstr ""
 "有効の場合、ルーターは、鋭角やギザギザした配線を避けるように、パッド／ビアを"
 "直線的に配置します。"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:71
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:71
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:71
 msgid "Smooth dragged segments"
 msgstr "セグメントをスムーズに移動"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:72
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:72
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:72
 msgid ""
 "When enabled, the router attempts to merge several jagged segments into a "
 "single straight one (dragging mode)."
@@ -17453,11 +22958,13 @@ msgstr ""
 "有効の場合、ルーターはいくつかのギザギザした配線を一つの直線的な配線へ纏めよ"
 "うと試みます。（ドラッグモード）"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:76
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:76
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:76
 msgid "Allow DRC violations"
 msgstr "DRC違反を許容する"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:77
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:77
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:77
 msgid ""
 "(Highlight collisions mode only) - allows to establish a track even if is "
 "violating the DRC rules."
@@ -17465,15 +22972,18 @@ msgstr ""
 "(衝突箇所をハイライト表示モードのみ) - DRC ルール違反があっても配線することを"
 "許容します。"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:81
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:81
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:81
 msgid "Suggest track finish"
 msgstr "配線完了までを提示"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:92
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:92
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:92
 msgid "Optimizer effort"
 msgstr "探索最適化レベル"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:94
 msgid ""
 "Defines how much time the router shall spend optimizing the routed/shoved "
 "traces.\n"
@@ -17486,80 +22996,100 @@ msgstr ""
 "低い探索最適化レベルは幾分ギザギザした配線でもより早くルーティングすることを"
 "意味します。"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:110
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:110
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:110
 msgid "low"
 msgstr "低"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.cpp:119
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.cpp:119
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.cpp:119
 msgid "high"
 msgstr "高"
 
-#: pcbnew/dialogs/dialog_print_for_modedit.cpp:87
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit.cpp:87
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit.cpp:97
 msgid "An error occurred initializing the printer information."
 msgstr "プリンタ情報の初期化でエラーが発生しました。"
 
-#: pcbnew/dialogs/dialog_print_for_modedit.cpp:225
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit.cpp:225
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit.cpp:235
 msgid "Print Footprint"
 msgstr "フットプリントの印刷"
 
-#: pcbnew/dialogs/dialog_print_for_modedit.cpp:230
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:510
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit.cpp:230
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer.cpp:510
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit.cpp:240
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer.cpp:501
 msgid "There was a problem printing."
 msgstr "印刷に関して問題があります。"
 
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
 msgid "Scale 1"
 msgstr "等倍"
 
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
 msgid "Scale 8"
 msgstr "8倍"
 
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6297/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
+#: kicad-6996/pcbnew/dialogs/dialog_print_for_modedit_base.cpp:22
 msgid "Scale 16"
 msgstr "16倍"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:56
 msgid "Exclude Edges_Pcb Layer"
 msgstr "基板外形レイヤの除外"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:39
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:57
 msgid "Exclude contents of Edges_Pcb layer from all other layers"
 msgstr "基板外形レイヤのデータを他の全てのレイヤから削除します"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:94
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:94
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:109
 msgid "Print frame ref"
 msgstr "フレームリファレンスを作画"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:121
 msgid "No drill mark"
 msgstr "ドリルマークなし"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:121
 msgid "Small mark"
 msgstr "小マーク"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:121
 msgid "Real drill"
 msgstr "実ドリル形状"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:108
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:108
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:123
 msgid "Pads Drill Opt"
 msgstr "パッドドリルのオプション"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:126
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:141
 msgid "1 Page per Layer"
 msgstr "レイヤ毎に1ページ"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:126
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:141
 msgid "Single page"
 msgstr "シングル ページ"
 
-#: pcbnew/dialogs/dialog_print_using_printer_base.cpp:128
+#: kicad-6297/pcbnew/dialogs/dialog_print_using_printer_base.cpp:128
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:143
 msgid "Page Print"
 msgstr "ページ印刷"
 
-#: pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:19
+#: kicad-6297/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:19
+#: kicad-6996/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:19
 msgid ""
 "The footprint library is a folder with a name ending with .pretty\n"
 "Footprints are .kicad_mod files inside this folder."
@@ -17567,159 +23097,203 @@ msgstr ""
 "フットプリント ライブラリは、.prettyで終わる名前のフォルダです。\n"
 "フットプリントは、そのフォルダに格納された .kicad_mod ファイルとなります。"
 
-#: pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:25
 msgid "Path base:"
 msgstr "パスのベース:"
 
-#: pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:29
+#: kicad-6297/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:29
+#: kicad-6996/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:29
 msgid "Select a folder"
 msgstr "フォルダを指定"
 
-#: pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:34
+#: kicad-6297/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:34
+#: kicad-6996/pcbnew/dialogs/dialog_select_pretty_lib_base.cpp:34
 msgid "Library folder (.pretty will be added to name, if missing)"
 msgstr "ライブラリ フォルダ (.pretty が名前に付加されます。)"
 
-#: pcbnew/dialogs/dialog_set_grid.cpp:233
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid.cpp:239
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid.cpp:112
 #, c-format
 msgid "Incorrect grid size (size must be >= %.3f mm and <= %.3f mm)"
 msgstr ""
 "不正なグリッドサイズ (サイズは %.3f mm 以上、且つ %.3f mm 以下でなければなり"
 "ません)"
 
-#: pcbnew/dialogs/dialog_set_grid.cpp:242
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid.cpp:248
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid.cpp:122
 #, c-format
 msgid "Incorrect grid origin (coordinates must be >= %.3f mm and <= %.3f mm)"
 msgstr ""
 "不正なグリッド原点 (座標は %.3f mm 以上、且つ %.3f mm 以下でなければなりませ"
 "ん)"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:23
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:23
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:23
 msgid "User Defined Grid"
 msgstr "ユーザ グリッド"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:71
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:69
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:69
 msgid "X:"
 msgstr "X:"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:83
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:80
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:80
 msgid "Y:"
 msgstr "Y:"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:98
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:94
+#: kicad-6297/pcbnew/hotkeys.cpp:132
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:94
+#: kicad-6996/pcbnew/hotkeys.cpp:133
 msgid "Reset Grid Origin"
 msgstr "グリッド原点のリセット"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:105
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:101
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:101
 msgid "Fast Switching"
-msgstr "高速切り替え用のグリッド"
+msgstr "高速切替用のグリッド"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:113
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:109
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:109
 msgid "Grid 1:"
 msgstr "グリッド1:"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:120
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.cpp:116
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:116
 msgid "Grid 2:"
 msgstr "グリッド2:"
 
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:54
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.cpp:54
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.cpp:54
 msgid "+"
 msgstr "+"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:333
-#: pcbnew/dialogs/dialog_track_via_size.cpp:60
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties.cpp:334
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size.cpp:62
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties.cpp:331
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size.cpp:62
 msgid "Invalid track width"
 msgstr "不正な配線幅"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:342
-#: pcbnew/dialogs/dialog_track_via_size.cpp:67
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties.cpp:343
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size.cpp:69
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties.cpp:340
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size.cpp:69
 msgid "Invalid via diameter"
 msgstr "不正なビア径"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:349
-#: pcbnew/dialogs/dialog_track_via_size.cpp:74
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties.cpp:350
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size.cpp:76
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties.cpp:347
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size.cpp:76
 msgid "Invalid via drill size"
 msgstr "不正なドリル径"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:356
-#: pcbnew/dialogs/dialog_track_via_size.cpp:81
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties.cpp:357
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size.cpp:83
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties.cpp:354
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size.cpp:83
 msgid "Via drill size has to be smaller than via diameter"
 msgstr "ビアのドリルサイズはビアの直径より小さくなければなりません"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:101
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:96
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:96
 msgid "Use net class width"
 msgstr "ネットクラスの幅を使用"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:165
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:158
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:158
 msgid "Diameter:"
 msgstr "直径:"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:177
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:169
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:169
 msgid "Drill:"
 msgstr "ドリル:"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:192
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.cpp:183
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.cpp:183
 msgid "Use net class size"
 msgstr "ネットクラスのサイズを使用"
 
-#: pcbnew/dialogs/dialog_track_via_size_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size_base.cpp:25
 msgid "Track width:"
 msgstr "配線幅:"
 
-#: pcbnew/dialogs/dialog_track_via_size_base.cpp:36
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size_base.cpp:36
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size_base.cpp:36
 msgid "Via diameter:"
 msgstr "ビア径:"
 
-#: pcbnew/dialogs/dialog_track_via_size_base.cpp:47
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size_base.cpp:47
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size_base.cpp:47
 msgid "Via drill:"
 msgstr "ビア ドリル径:"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:209
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:209
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:211
 msgid "New"
 msgstr "新規"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:209
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:209
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:211
 msgid "Update"
 msgstr "更新"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:296
-#: pcbnew/dialogs/wizard_add_fplib.cpp:557
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:296
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:557
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:298
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:557
 msgid "Choose a folder to save the downloaded libraries"
 msgstr "ダウンロードしたライブラリの保存先を指定"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:318
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:318
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:320
 msgid "KISYS3DMOD path not defined , or not existing"
 msgstr "KISYS3DMOD のパスが設定されてないか、存在しません。"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:356
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:356
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:358
 msgid "Downloading 3D libraries"
 msgstr "3D ライブラリをダウンロード"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:460
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:460
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:462
 msgid "Aborted by user"
 msgstr "ユーザーによる中断"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:25
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:25
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:25
 msgid "Welcome to the 3D shape Libraries downloader Wizard!"
 msgstr "3D シェイプ ライブラリの追加ウィザードへようこそ！"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:35
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:35
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:35
 msgid "Please select the URL for the 3D libraries to download"
 msgstr "ダウンロードする 3D ライブラリの URL を選択して下さい。"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:39
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:39
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:39
 msgid "http://github.com/KiCad"
 msgstr "http://github.com/KiCad"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:56
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:56
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:56
 msgid "3D shape local folder:"
 msgstr "3D シェイプのローカル フォルダ:"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:72
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:72
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:72
 msgid "Default 3D Path"
 msgstr "デフォルトの 3D パス"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:84
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:82
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:84
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:82
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:84
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:82
 msgid ""
 "It is not possible to write in the selected directory.\n"
 "Please choose another one."
@@ -17727,54 +23301,70 @@ msgstr ""
 "選択されたディレクトリへは保存できません。\n"
 "別のディレクトリを指定してください。"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:111
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:106
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:111
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:106
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:111
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:106
 msgid "Visit our official Kicad repository on Github and get more libraries"
 msgstr ""
 "GithubのKicad公式リポジトリへアクセスすると、より多くのライブラリを入手できま"
 "す"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:126
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:126
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:140
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:126
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:140
 msgid "Select Github libraries to add:"
 msgstr "追加するGithubライブラリを選択:"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:137
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:151
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:137
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:151
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:137
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:151
 msgid "Select all"
 msgstr "全て選択"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:140
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:154
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:140
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:154
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:140
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:154
 msgid "Unselect all"
 msgstr "全て選択解除"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:166
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:166
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:166
 msgid "Local library folder:"
 msgstr "ローカル・ライブラリ・フォルダ:"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:174
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:174
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:174
 msgid "3D shape libraries to be downloaded:"
 msgstr "ダウンロードによる 3D シェイプ ライブラリ:"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:192
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:192
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:192
 msgid "Libraries"
 msgstr "ライブラリ"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:76
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:76
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:76
 msgid "All supported library formats|"
 msgstr "サポートされている全てのライブラリフォーマット|"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:200
-#: pcbnew/dialogs/wizard_add_fplib.cpp:220
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:200
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:220
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:200
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:220
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:630
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:630
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:630
 msgid "Downloading libraries"
 msgstr "ライブラリのダウンロード中"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:669
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:669
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:669
 #, c-format
 msgid ""
 "Error:\n"
@@ -17787,28 +23377,34 @@ msgstr ""
 "ライブラリのダウンロード中にエラーが発生しました:\n"
 "'%s'"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:811
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:811
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:811
 msgid "Please wait..."
 msgstr "お待ちください..."
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:811
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:811
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:811
 msgid "Validating libraries"
 msgstr "ライブラリを有効にしています"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:837
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:837
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:837
 msgid "NOT CHECKED"
 msgstr "未確認"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:845
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:845
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:845
 msgid "INVALID"
 msgstr "無効"
 
-#: pcbnew/dialogs/wizard_add_fplib.cpp:854
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib.cpp:854
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib.cpp:854
 #, c-format
 msgid "Validating libraries %d/%d"
 msgstr "ライブラリを確認しています %d/%d"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:31
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:31
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:31
 msgid ""
 "Welcome to the Add Footprint Libraries Wizard!\n"
 "\n"
@@ -17818,43 +23414,52 @@ msgstr ""
 "\n"
 "追加するライブラリを選択してください："
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:38
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:38
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:38
 msgid "Files on my computer"
 msgstr "このコンピュータにあるファイル"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:46
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:46
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:46
 msgid "Github repository"
 msgstr "Githubリポジトリ"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:49
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:49
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:49
 msgid "https://github.com/KiCad"
 msgstr "https://github.com/KiCad"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:57
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:57
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:57
 msgid "Save a local copy to:"
 msgstr "ローカルの保存先："
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:121
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:121
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:121
 msgid "Select files or folders to add:"
 msgstr "追加するファイルかフォルダを選択:"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:180
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:180
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:180
 msgid "Review and confirm the changes to the libraries:"
 msgstr "追加するライブラリ："
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:200
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:200
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:200
 msgid "Where do you wish the new libraries to be added:"
 msgstr "新しいライブラリをどのように追加しますか:"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:204
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:204
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:204
 msgid "To global library configuration (visible by all projects)"
 msgstr "グローバルライブラリとして設定(全てのプロジェクトから参照できます)"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.cpp:207
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.cpp:207
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.cpp:207
 msgid "To the current project only"
 msgstr "現在のプロジェクトのみ"
 
-#: pcbnew/dimension.cpp:149
+#: kicad-6297/pcbnew/dimension.cpp:149 kicad-6996/pcbnew/dimension.cpp:148
 msgid ""
 "This item has an illegal layer id.\n"
 "Now, forced on the drawings layer. Please, fix it"
@@ -17862,7 +23467,7 @@ msgstr ""
 "このアイテム中には不正なレイヤIDがあります．\n"
 "現在は強制的に描画レイヤにしているため，適切に修正してください．"
 
-#: pcbnew/dimension.cpp:173
+#: kicad-6297/pcbnew/dimension.cpp:173 kicad-6996/pcbnew/dimension.cpp:168
 msgid ""
 "The layer currently selected is not enabled for this board\n"
 "You cannot use it"
@@ -17870,108 +23475,112 @@ msgstr ""
 "現在選択されているレイヤはこのボードで有効になっていません。\n"
 "現在使用することができません"
 
-#: pcbnew/dimension.cpp:217
+#: kicad-6297/pcbnew/dimension.cpp:217 kicad-6996/pcbnew/dimension.cpp:212
 msgid "The text thickness is too large for the text size.  It will be clamped"
 msgstr "文字太さが文字サイズに比べて太過ぎるため、文字が潰れてしまいます。"
 
-#: pcbnew/drc.cpp:180
+#: kicad-6297/pcbnew/drc.cpp:177 kicad-6996/pcbnew/drc.cpp:195
 msgid "Compile ratsnest...\n"
 msgstr "ラッツネストのコンパイル中...\n"
 
-#: pcbnew/drc.cpp:196
+#: kicad-6297/pcbnew/drc.cpp:193 kicad-6996/pcbnew/drc.cpp:211
 msgid "Aborting\n"
 msgstr "停止割り込み中\n"
 
-#: pcbnew/drc.cpp:209
+#: kicad-6297/pcbnew/drc.cpp:206 kicad-6996/pcbnew/drc.cpp:224
 msgid "Pad clearances...\n"
 msgstr "パッドのクリアランス...\n"
 
-#: pcbnew/drc.cpp:219
+#: kicad-6297/pcbnew/drc.cpp:216 kicad-6996/pcbnew/drc.cpp:234
 msgid "Track clearances...\n"
 msgstr "配線のクリアランス...\n"
 
-#: pcbnew/drc.cpp:229
+#: kicad-6297/pcbnew/drc.cpp:226 kicad-6996/pcbnew/drc.cpp:244
 msgid "Fill zones...\n"
 msgstr "ゾーンの塗りつぶし...\n"
 
-#: pcbnew/drc.cpp:239
+#: kicad-6297/pcbnew/drc.cpp:236 kicad-6996/pcbnew/drc.cpp:254
 msgid "Test zones...\n"
 msgstr "ゾーンのテスト...\n"
 
-#: pcbnew/drc.cpp:250
+#: kicad-6297/pcbnew/drc.cpp:247 kicad-6996/pcbnew/drc.cpp:265
 msgid "Unconnected pads...\n"
 msgstr "未接続パッド...\n"
 
-#: pcbnew/drc.cpp:262
+#: kicad-6297/pcbnew/drc.cpp:259 kicad-6996/pcbnew/drc.cpp:277
 msgid "Keepout areas ...\n"
 msgstr "禁止エリア ...\n"
 
-#: pcbnew/drc.cpp:272
+#: kicad-6297/pcbnew/drc.cpp:269 kicad-6996/pcbnew/drc.cpp:287
 msgid "Test texts...\n"
 msgstr "テストテキスト...\n"
 
-#: pcbnew/drc.cpp:285
+#: kicad-6297/pcbnew/drc.cpp:282 kicad-6996/eeschema/dialogs/dialog_erc.cpp:592
+#: kicad-6996/pcbnew/drc.cpp:300
 msgid "Finished"
 msgstr "終了"
 
-#: pcbnew/drc.cpp:323
+#: kicad-6297/pcbnew/drc.cpp:320 kicad-6996/pcbnew/drc.cpp:338
 #, c-format
 msgid "NETCLASS: '%s' has Clearance:%s which is less than global:%s"
 msgstr ""
 "ネットクラス: '%s' のクリアランス:%s はグローバル クリアランス:%s よりも小さ"
 "いです"
 
-#: pcbnew/drc.cpp:339
+#: kicad-6297/pcbnew/drc.cpp:336 kicad-6996/pcbnew/drc.cpp:354
 #, c-format
 msgid "NETCLASS: '%s' has TrackWidth:%s which is less than global:%s"
 msgstr "ネットクラス: '%s' の配線幅:%s はグローバル配線幅:%s より小さいです"
 
-#: pcbnew/drc.cpp:354
+#: kicad-6297/pcbnew/drc.cpp:351 kicad-6996/pcbnew/drc.cpp:369
 #, c-format
 msgid "NETCLASS: '%s' has Via Dia:%s which is less than global:%s"
 msgstr "ネットクラス: '%s' のビア径:%s はグローバル ビア径:%s より小さいです"
 
-#: pcbnew/drc.cpp:369
+#: kicad-6297/pcbnew/drc.cpp:366 kicad-6996/pcbnew/drc.cpp:384
 #, c-format
 msgid "NETCLASS: '%s' has Via Drill:%s which is less than global:%s"
 msgstr ""
 "ネットクラス: '%s' のビア ドリル径: %s はグローバル ビア ドリル径: %s より小"
 "さいです"
 
-#: pcbnew/drc.cpp:384
+#: kicad-6297/pcbnew/drc.cpp:381 kicad-6996/pcbnew/drc.cpp:399
 #, c-format
 msgid "NETCLASS: '%s' has uVia Dia:%s which is less than global:%s"
 msgstr ""
 "ネットクラス: '%s' のマイクロビア径: %s はグローバル マイクロビア径: %s より"
 "小さいです"
 
-#: pcbnew/drc.cpp:399
+#: kicad-6297/pcbnew/drc.cpp:396 kicad-6996/pcbnew/drc.cpp:414
 #, c-format
 msgid "NETCLASS: '%s' has uVia Drill:%s which is less than global:%s"
 msgstr ""
 "ネットクラス: '%s' のマイクロビア ドリル径 :%s はグローバル マイクロビア ドリ"
 "ル径 :%s より小さいです"
 
-#: pcbnew/drc.cpp:492
+#: kicad-6297/pcbnew/drc.cpp:489 kicad-6996/pcbnew/drc.cpp:507
 msgid "Track clearances"
 msgstr "配線のクリアランス"
 
-#: pcbnew/eagle_plugin.cpp:1673
+#: kicad-6297/pcbnew/eagle_plugin.cpp:1672
+#: kicad-6996/pcbnew/eagle_plugin.cpp:1756
 #, c-format
 msgid "<package> name: '%s' duplicated in eagle <library>: '%s'"
 msgstr "<package> の名前:'%s' が，Eagleの <library> 名と重複しています:'%s'"
 
-#: pcbnew/eagle_plugin.cpp:1730
+#: kicad-6297/pcbnew/eagle_plugin.cpp:1729
+#: kicad-6996/pcbnew/eagle_plugin.cpp:1817
 #, c-format
 msgid "No '%s' package in library '%s'"
 msgstr "パッケージ '%s' がライブラリ '%s' 内に見つかりませんでした"
 
-#: pcbnew/eagle_plugin.cpp:2820
+#: kicad-6297/pcbnew/eagle_plugin.cpp:2819
+#: kicad-6996/pcbnew/eagle_plugin.cpp:3021
 #, c-format
 msgid "File '%s' is not readable."
 msgstr "ファイル '%s' が読み込めません。"
 
-#: pcbnew/edgemod.cpp:213
+#: kicad-6297/pcbnew/edgemod.cpp:213 kicad-6996/pcbnew/edgemod.cpp:213
 msgid ""
 "The graphic item will be on a copper layer.\n"
 "This is very dangerous. Are you sure?"
@@ -17979,147 +23588,200 @@ msgstr ""
 "図形アイテムが銅箔層の上に配置されます。\n"
 "これは非常に危険ですが、続行しますか？"
 
-#: pcbnew/edgemod.cpp:254
+#: kicad-6297/pcbnew/edgemod.cpp:254 kicad-6996/pcbnew/edgemod.cpp:254
 msgid "New Width:"
 msgstr "新しい幅:"
 
-#: pcbnew/edgemod.cpp:254
+#: kicad-6297/pcbnew/edgemod.cpp:254 kicad-6996/pcbnew/edgemod.cpp:254
 msgid "Edge Width"
 msgstr "エッジの幅"
 
-#: pcbnew/edit.cpp:693 pcbnew/edit.cpp:715 pcbnew/edit.cpp:741
-#: pcbnew/edit.cpp:769 pcbnew/edit.cpp:797 pcbnew/edit.cpp:825
+#: kicad-6297/pcbnew/edit.cpp:694 kicad-6297/pcbnew/edit.cpp:716
+#: kicad-6297/pcbnew/edit.cpp:742 kicad-6297/pcbnew/edit.cpp:770
+#: kicad-6297/pcbnew/edit.cpp:798 kicad-6297/pcbnew/edit.cpp:826
+#: kicad-6996/pcbnew/edit.cpp:696 kicad-6996/pcbnew/edit.cpp:718
+#: kicad-6996/pcbnew/edit.cpp:744 kicad-6996/pcbnew/edit.cpp:772
+#: kicad-6996/pcbnew/edit.cpp:800 kicad-6996/pcbnew/edit.cpp:828
 #, c-format
 msgid "Footprint %s found, but it is locked"
 msgstr "フットプリント %s はロックされています"
 
-#: pcbnew/edit.cpp:897 pcbnew/edit.cpp:916
+#: kicad-6297/pcbnew/edit.cpp:898 kicad-6297/pcbnew/edit.cpp:917
+#: kicad-6996/pcbnew/edit.cpp:900 kicad-6996/pcbnew/edit.cpp:919
 #, c-format
 msgid "The parent (%s) of the pad is locked"
 msgstr "パッドの親 (%s) はロックされています"
 
-#: pcbnew/edit.cpp:1433 pcbnew/edit.cpp:1435
+#: kicad-6297/pcbnew/edit.cpp:1434 kicad-6297/pcbnew/edit.cpp:1436
+#: kicad-6996/pcbnew/edit.cpp:1440 kicad-6996/pcbnew/edit.cpp:1442
 msgid "Add tracks"
 msgstr "配線を追加"
 
-#: pcbnew/edit.cpp:1445 pcbnew/edit.cpp:1492
-#: pcbnew/tools/pcb_editor_control.cpp:222
+#: kicad-6297/pcbnew/edit.cpp:1446 kicad-6297/pcbnew/edit.cpp:1493
+#: kicad-6297/pcbnew/tools/pcb_editor_control.cpp:222
+#: kicad-6996/pcbnew/edit.cpp:1452 kicad-6996/pcbnew/edit.cpp:1499
+#: kicad-6996/pcbnew/tools/pcb_editor_control.cpp:241
 msgid "Add footprint"
 msgstr "フットプリントを追加"
 
-#: pcbnew/edit.cpp:1449 pcbnew/tools/drawing_tool.cpp:422
+#: kicad-6297/pcbnew/edit.cpp:1450 kicad-6297/pcbnew/tools/drawing_tool.cpp:422
+#: kicad-6996/pcbnew/edit.cpp:1456 kicad-6996/pcbnew/tools/drawing_tool.cpp:422
 msgid "Add zones"
 msgstr "ゾーンを追加"
 
-#: pcbnew/edit.cpp:1452
+#: kicad-6297/pcbnew/edit.cpp:1453 kicad-6996/pcbnew/edit.cpp:1459
 msgid "Warning: zone display is OFF!!!"
 msgstr "警告: ゾーンの表示がOFFになっています!!!"
 
-#: pcbnew/edit.cpp:1460 pcbnew/tools/drawing_tool.cpp:430
+#: kicad-6297/pcbnew/edit.cpp:1461 kicad-6297/pcbnew/tools/drawing_tool.cpp:430
+#: kicad-6996/pcbnew/edit.cpp:1467 kicad-6996/pcbnew/tools/drawing_tool.cpp:430
 msgid "Add keepout"
 msgstr "キープアウト(禁止)エリアを追加"
 
-#: pcbnew/edit.cpp:1464 pcbnew/menubar_pcbframe.cpp:423 pcbnew/tool_pcb.cpp:466
-#: pcbnew/tools/common_actions.cpp:384 pcbnew/tools/pcb_editor_control.cpp:371
+#: kicad-6297/pcbnew/edit.cpp:1465 kicad-6297/pcbnew/menubar_pcbframe.cpp:423
+#: kicad-6297/pcbnew/tool_pcb.cpp:466
+#: kicad-6297/pcbnew/tools/common_actions.cpp:388
+#: kicad-6297/pcbnew/tools/pcb_editor_control.cpp:371
+#: kicad-6996/pcbnew/edit.cpp:1471 kicad-6996/pcbnew/menubar_pcbframe.cpp:427
+#: kicad-6996/pcbnew/tool_pcb.cpp:469
+#: kicad-6996/pcbnew/tools/common_actions.cpp:389
+#: kicad-6996/pcbnew/tools/pcb_editor_control.cpp:425
 msgid "Add layer alignment target"
 msgstr "層合わせマーク(ターゲットマーク)を追加"
 
-#: pcbnew/edit.cpp:1468 pcbnew/tools/pcb_editor_control.cpp:670
+#: kicad-6297/pcbnew/edit.cpp:1469
+#: kicad-6297/pcbnew/tools/pcb_editor_control.cpp:681
+#: kicad-6996/pcbnew/edit.cpp:1475
+#: kicad-6996/pcbnew/tools/pcb_editor_control.cpp:735
 msgid "Adjust zero"
 msgstr "ゼロ設定"
 
-#: pcbnew/edit.cpp:1472 pcbnew/tools/pcbnew_control.cpp:657
+#: kicad-6297/pcbnew/edit.cpp:1473
+#: kicad-6297/pcbnew/tools/pcbnew_control.cpp:657
+#: kicad-6996/pcbnew/edit.cpp:1479
+#: kicad-6996/pcbnew/tools/pcbnew_control.cpp:655
 msgid "Adjust grid origin"
 msgstr "グリッドの原点設定"
 
-#: pcbnew/edit.cpp:1476 pcbnew/tools/drawing_tool.cpp:79
-#: pcbnew/tools/drawing_tool.cpp:104
+#: kicad-6297/pcbnew/edit.cpp:1477 kicad-6297/pcbnew/tools/drawing_tool.cpp:79
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:104 kicad-6996/pcbnew/edit.cpp:1483
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:79
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:104
 msgid "Add graphic line"
 msgstr "図形ラインを追加"
 
-#: pcbnew/edit.cpp:1480 pcbnew/menubar_modedit.cpp:287
-#: pcbnew/menubar_pcbframe.cpp:405 pcbnew/tool_modedit.cpp:176
-#: pcbnew/tool_pcb.cpp:456 pcbnew/tools/drawing_tool.cpp:183
-#: pcbnew/tools/drawing_tool.cpp:203
+#: kicad-6297/pcbnew/edit.cpp:1481 kicad-6297/pcbnew/menubar_modedit.cpp:287
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:405
+#: kicad-6297/pcbnew/tool_modedit.cpp:176 kicad-6297/pcbnew/tool_pcb.cpp:456
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:183
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:203 kicad-6996/pcbnew/edit.cpp:1487
+#: kicad-6996/pcbnew/menubar_modedit.cpp:286
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:409
+#: kicad-6996/pcbnew/tool_modedit.cpp:179 kicad-6996/pcbnew/tool_pcb.cpp:459
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:183
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:203
 msgid "Add graphic arc"
 msgstr "円弧を追加"
 
-#: pcbnew/edit.cpp:1484 pcbnew/menubar_modedit.cpp:276
-#: pcbnew/menubar_pcbframe.cpp:408 pcbnew/tool_modedit.cpp:173
-#: pcbnew/tool_pcb.cpp:453 pcbnew/tools/drawing_tool.cpp:136
-#: pcbnew/tools/drawing_tool.cpp:156
+#: kicad-6297/pcbnew/edit.cpp:1485 kicad-6297/pcbnew/menubar_modedit.cpp:276
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:408
+#: kicad-6297/pcbnew/tool_modedit.cpp:173 kicad-6297/pcbnew/tool_pcb.cpp:453
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:136
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:156 kicad-6996/pcbnew/edit.cpp:1491
+#: kicad-6996/pcbnew/menubar_modedit.cpp:275
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:412
+#: kicad-6996/pcbnew/tool_modedit.cpp:176 kicad-6996/pcbnew/tool_pcb.cpp:456
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:136
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:156
 msgid "Add graphic circle"
 msgstr "円を追加"
 
-#: pcbnew/edit.cpp:1496 pcbnew/menubar_pcbframe.cpp:419 pcbnew/tool_pcb.cpp:463
-#: pcbnew/tools/drawing_tool.cpp:253
+#: kicad-6297/pcbnew/edit.cpp:1497 kicad-6297/pcbnew/menubar_pcbframe.cpp:419
+#: kicad-6297/pcbnew/tool_pcb.cpp:463
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:253 kicad-6996/pcbnew/edit.cpp:1503
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:423
+#: kicad-6996/pcbnew/tool_pcb.cpp:466
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:253
 msgid "Add dimension"
 msgstr "寸法線を追加"
 
-#: pcbnew/edit.cpp:1504 pcbnew/tool_pcb.cpp:428
-#: pcbnew/tools/pcb_editor_control.cpp:730
+#: kicad-6297/pcbnew/edit.cpp:1505 kicad-6297/pcbnew/tool_pcb.cpp:428
+#: kicad-6297/pcbnew/tools/pcb_editor_control.cpp:753
+#: kicad-6996/pcbnew/edit.cpp:1511 kicad-6996/pcbnew/tool_pcb.cpp:431
+#: kicad-6996/pcbnew/tools/pcb_editor_control.cpp:807
 msgid "Highlight net"
 msgstr "ネットをハイライト"
 
-#: pcbnew/edit.cpp:1508
+#: kicad-6297/pcbnew/edit.cpp:1509 kicad-6996/pcbnew/edit.cpp:1515
 msgid "Select rats nest"
 msgstr "ラッツネストを選択"
 
-#: pcbnew/editedge.cpp:152
+#: kicad-6297/pcbnew/editedge.cpp:152 kicad-6996/pcbnew/editedge.cpp:152
 msgid "Copper layer global delete not allowed!"
 msgstr "導体層はグローバル削除できません！"
 
-#: pcbnew/editedge.cpp:157
+#: kicad-6297/pcbnew/editedge.cpp:157 kicad-6996/pcbnew/editedge.cpp:157
 #, c-format
 msgid "Delete everything on layer %s?"
 msgstr "レイヤ %s 上の全てを削除する"
 
-#: pcbnew/editmod.cpp:115
+#: kicad-6297/pcbnew/editmod.cpp:115 kicad-6996/pcbnew/editmod.cpp:117
 msgid "Cannot delete REFERENCE!"
 msgstr "リファレンスは削除できません!"
 
-#: pcbnew/editmod.cpp:119
+#: kicad-6297/pcbnew/editmod.cpp:119 kicad-6996/pcbnew/editmod.cpp:121
 msgid "Cannot delete VALUE!"
 msgstr "部品定数は削除することが出来ません!"
 
-#: pcbnew/editrack.cpp:815
+#: kicad-6297/pcbnew/editrack.cpp:815 kicad-6996/pcbnew/editrack.cpp:815
 msgid "Track Len"
 msgstr "配線長"
 
-#: pcbnew/editrack.cpp:819
+#: kicad-6297/pcbnew/editrack.cpp:819 kicad-6996/pcbnew/editrack.cpp:819
 msgid "Full Len"
 msgstr "全長"
 
-#: pcbnew/editrack.cpp:821
+#: kicad-6297/pcbnew/editrack.cpp:821 kicad-6996/pcbnew/editrack.cpp:821
 msgid "Pad to die"
 msgstr "パッドからダイ"
 
-#: pcbnew/editrack.cpp:826
+#: kicad-6297/pcbnew/editrack.cpp:826 kicad-6996/pcbnew/editrack.cpp:826
 msgid "Segs Count"
 msgstr "セグメント数"
 
-#: pcbnew/exporters/export_d356.cpp:359
+#: kicad-6297/pcbnew/exporters/export_d356.cpp:359
+#: kicad-6996/pcbnew/exporters/export_d356.cpp:359
 msgid "IPC-D-356 Test Files (.d356)|*.d356"
 msgstr "IPC-D-356テストファイル (.d356)|*d356"
 
-#: pcbnew/exporters/export_d356.cpp:364
+#: kicad-6297/pcbnew/exporters/export_d356.cpp:364
+#: kicad-6996/pcbnew/exporters/export_d356.cpp:364
 msgid "Export D-356 Test File"
 msgstr "D-356テストファイルの出力"
 
-#: pcbnew/exporters/export_gencad.cpp:250
+#: kicad-6297/pcbnew/exporters/export_gencad.cpp:250
+#: kicad-6996/pcbnew/exporters/export_gencad.cpp:249
 msgid "GenCAD 1.4 board files (.cad)|*.cad"
 msgstr "GenCAD 1.4 ボード ファイル (.cad)|*.cad"
 
-#: pcbnew/exporters/export_gencad.cpp:256
+#: kicad-6297/pcbnew/exporters/export_gencad.cpp:256
+#: kicad-6996/pcbnew/exporters/export_gencad.cpp:255
 msgid "Save GenCAD Board File"
 msgstr "GenCAD ボード ファイルの保存"
 
-#: pcbnew/exporters/export_idf.cpp:585 pcbnew/exporters/export_idf.cpp:594
-#: pcbnew/exporters/export_idf.cpp:602 pcbnew/exporters/export_vrml.cpp:1397
+#: kicad-6297/pcbnew/exporters/export_idf.cpp:586
+#: kicad-6297/pcbnew/exporters/export_idf.cpp:595
+#: kicad-6297/pcbnew/exporters/export_idf.cpp:603
+#: kicad-6297/pcbnew/exporters/export_vrml.cpp:1397
+#: kicad-6996/pcbnew/exporters/export_idf.cpp:605
+#: kicad-6996/pcbnew/exporters/export_idf.cpp:614
+#: kicad-6996/pcbnew/exporters/export_idf.cpp:622
+#: kicad-6996/pcbnew/exporters/export_vrml.cpp:1415
 msgid "IDF Export Failed:\n"
 msgstr "IDF出力エラー:\n"
 
-#: pcbnew/exporters/export_vrml.cpp:713
+#: kicad-6297/pcbnew/exporters/export_vrml.cpp:713
+#: kicad-6996/pcbnew/exporters/export_vrml.cpp:716
 msgid ""
 "Unable to calculate the board outlines;\n"
 "fall back to using the board boundary box."
@@ -18127,7 +23789,8 @@ msgstr ""
 "基板の外形を計算できません;\n"
 "バウンダリボックスの使用に戻ります."
 
-#: pcbnew/exporters/export_vrml.cpp:746
+#: kicad-6297/pcbnew/exporters/export_vrml.cpp:746
+#: kicad-6996/pcbnew/exporters/export_vrml.cpp:749
 msgid ""
 "VRML Export Failed:\n"
 "Could not add holes to contours."
@@ -18135,47 +23798,58 @@ msgstr ""
 "VRMLファイル出力エラー:\n"
 "外形へ穴を追加できませんでした。"
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:234
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:233
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:244
 msgid "No footprint for automated placement."
 msgstr "自動配置するフットプリントがありません"
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:274
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:273
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:291
 #, c-format
 msgid "Unable to create '%s'."
 msgstr " '%s' を作成できません"
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:281
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:280
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:298
 #, c-format
 msgid "Place file: '%s'."
 msgstr "ファイルの配置: '%s'."
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:283
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:282
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:300
 #, c-format
 msgid "Front side (top side) place file: '%s'."
 msgstr "部品面 (表面) に配置されたファイル: '%s'."
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:287
-#: pcbnew/exporters/gen_modules_placefile.cpp:321
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:286
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:320
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:304
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:345
 #, c-format
 msgid "Component count: %d."
 msgstr "コンポーネントの数: %d."
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:292
-#: pcbnew/exporters/gen_modules_placefile.cpp:333
-msgid "Componment Placement File generation OK."
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:291
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:332
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:309
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:357
+msgid "Component Placement File generation OK."
 msgstr "コンポーネント 配置 ファイルの生成 - OK."
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:318
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:317
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:342
 #, c-format
 msgid "Back side (bottom side) place file: '%s'."
 msgstr "半田面 (裏面) に配置されたファイル: '%s'."
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:329
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:328
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:353
 #, c-format
 msgid "Full component count: %d\n"
 msgstr "全体のフットプリント数: %d\n"
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:579
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:558
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:625
 #, c-format
 msgid ""
 "Footprint report file created:\n"
@@ -18184,30 +23858,34 @@ msgstr ""
 "フットプリント レポートを生成しました:\n"
 "'%s'"
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:581
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:560
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:627
 msgid "Footprint Report"
 msgstr "フットプリント レポート"
 
-#: pcbnew/exporters/gen_modules_placefile.cpp:586
+#: kicad-6297/pcbnew/exporters/gen_modules_placefile.cpp:565
+#: kicad-6996/pcbnew/exporters/gen_modules_placefile.cpp:632
 #, c-format
 msgid "Unable to create '%s'"
 msgstr "'%s' を作成できません"
 
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:128
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:158
+#: kicad-6297/pcbnew/exporters/gendrill_Excellon_writer.cpp:128
+#: kicad-6297/pcbnew/exporters/gendrill_Excellon_writer.cpp:158
+#: kicad-6996/pcbnew/exporters/gendrill_Excellon_writer.cpp:131
+#: kicad-6996/pcbnew/exporters/gendrill_Excellon_writer.cpp:161
 #, c-format
 msgid "Create file %s\n"
 msgstr "ファイルの作成 %s\n"
 
-#: pcbnew/files.cpp:123
+#: kicad-6297/pcbnew/files.cpp:124 kicad-6996/pcbnew/files.cpp:136
 msgid "Open Board File"
 msgstr "ボード ファイルを開く"
 
-#: pcbnew/files.cpp:161
+#: kicad-6297/pcbnew/files.cpp:162 kicad-6996/pcbnew/files.cpp:172
 msgid "Save Board File As"
 msgstr "ボード ファイルを名前を付けて保存"
 
-#: pcbnew/files.cpp:186
+#: kicad-6297/pcbnew/files.cpp:187
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -18218,40 +23896,40 @@ msgstr ""
 "\n"
 "上書きしますか？"
 
-#: pcbnew/files.cpp:205
+#: kicad-6297/pcbnew/files.cpp:206 kicad-6996/pcbnew/files.cpp:195
 msgid "Printed circuit board"
 msgstr "プリント基板"
 
-#: pcbnew/files.cpp:276
+#: kicad-6297/pcbnew/files.cpp:277 kicad-6996/pcbnew/files.cpp:276
 #, c-format
 msgid "Recovery file '%s' not found."
 msgstr "リカバリ ファイル '%s' が見つかりません。"
 
-#: pcbnew/files.cpp:282
+#: kicad-6297/pcbnew/files.cpp:283 kicad-6996/pcbnew/files.cpp:282
 #, c-format
 msgid "OK to load recovery or backup file '%s'"
 msgstr ""
 "リカバリ - バックアップ ファイル \"%s\" を読み込みます。よろしいですか？"
 
-#: pcbnew/files.cpp:342
+#: kicad-6297/pcbnew/files.cpp:343 kicad-6996/pcbnew/files.cpp:343
 msgid "noname"
 msgstr "名前なし"
 
-#: pcbnew/files.cpp:410
+#: kicad-6297/pcbnew/files.cpp:417 kicad-6996/pcbnew/files.cpp:417
 #, c-format
 msgid "PCB file '%s' is already open."
 msgstr "PCBファイル '%s' は既に開かれています。"
 
-#: pcbnew/files.cpp:420
+#: kicad-6297/pcbnew/files.cpp:427 kicad-6996/pcbnew/files.cpp:427
 msgid "The current board has been modified.  Do you wish to save the changes?"
 msgstr "現在のボードは変更されています。変更を保存しますか？"
 
-#: pcbnew/files.cpp:446
+#: kicad-6297/pcbnew/files.cpp:453 kicad-6996/pcbnew/files.cpp:453
 #, c-format
 msgid "Board '%s' does not exist.  Do you wish to create it?"
 msgstr "ボード '%s' は存在しません。新規作成しますか?"
 
-#: pcbnew/files.cpp:542
+#: kicad-6297/pcbnew/files.cpp:548 kicad-6996/pcbnew/files.cpp:548
 msgid ""
 "This file was created by an older version of Pcbnew.\n"
 "It will be stored in the new file format when you save this file again."
@@ -18259,17 +23937,19 @@ msgstr ""
 "このファイルは古いバージョンの Pcbnew で作成されています。\n"
 "次に保存する際に、新しいフォーマットで保存し直されます。"
 
-#: pcbnew/files.cpp:643
+#: kicad-6297/pcbnew/files.cpp:652 kicad-6996/pcbnew/files.cpp:654
 #, c-format
 msgid "Warning: unable to create backup file '%s'"
 msgstr "警告: バックアップ ファイル '%s' を作成できません"
 
-#: pcbnew/files.cpp:670 pcbnew/files.cpp:765
+#: kicad-6297/pcbnew/files.cpp:679 kicad-6297/pcbnew/files.cpp:774
+#: kicad-6996/pcbnew/files.cpp:681 kicad-6996/pcbnew/files.cpp:776
 #, c-format
 msgid "No access rights to write to file '%s'"
 msgstr "'%s' ファイルへの書き込み権限がありません。"
 
-#: pcbnew/files.cpp:711 pcbnew/files.cpp:791
+#: kicad-6297/pcbnew/files.cpp:720 kicad-6297/pcbnew/files.cpp:800
+#: kicad-6996/pcbnew/files.cpp:722 kicad-6996/pcbnew/files.cpp:802
 #, c-format
 msgid ""
 "Error saving board file '%s'.\n"
@@ -18278,22 +23958,22 @@ msgstr ""
 "ボード保存中のエラー '%s'\n"
 "%s"
 
-#: pcbnew/files.cpp:717
+#: kicad-6297/pcbnew/files.cpp:726 kicad-6996/pcbnew/files.cpp:728
 #, c-format
 msgid "Failed to create '%s'"
 msgstr "'%s' の作成に失敗しました"
 
-#: pcbnew/files.cpp:743
+#: kicad-6297/pcbnew/files.cpp:752 kicad-6996/pcbnew/files.cpp:754
 #, c-format
 msgid "Backup file: '%s'"
 msgstr "バックアップファイル: '%s'"
 
-#: pcbnew/files.cpp:745
+#: kicad-6297/pcbnew/files.cpp:754 kicad-6996/pcbnew/files.cpp:756
 #, c-format
 msgid "Wrote board file: '%s'"
 msgstr "ボードファイルに書き込みました: '%s'"
 
-#: pcbnew/files.cpp:800
+#: kicad-6297/pcbnew/files.cpp:809 kicad-6996/pcbnew/files.cpp:811
 #, c-format
 msgid ""
 "Board copied to:\n"
@@ -18302,53 +23982,72 @@ msgstr ""
 "次へボードをコピーしました:\n"
 "'%s'"
 
-#: pcbnew/footprint_wizard.cpp:78 pcbnew/footprint_wizard_frame.cpp:93
+#: kicad-6297/pcbnew/footprint_wizard.cpp:78
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:93
+#: kicad-6996/pcbnew/footprint_wizard.cpp:78
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:107
 msgid "Footprint Wizard"
 msgstr "フットプリント ウィザード"
 
-#: pcbnew/footprint_wizard.cpp:84
+#: kicad-6297/pcbnew/footprint_wizard.cpp:84
+#: kicad-6996/pcbnew/footprint_wizard.cpp:84
 msgid "no wizard selected"
 msgstr "ウィザードが選択されていません"
 
-#: pcbnew/footprint_wizard.cpp:148
+#: kicad-6297/pcbnew/footprint_wizard.cpp:148
+#: kicad-6996/pcbnew/footprint_wizard.cpp:148
 msgid "Couldn't reload footprint wizard"
 msgstr "フットプリント ウィザードの再読み込みに失敗しました"
 
-#: pcbnew/footprint_wizard_frame.cpp:268
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:268
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:281
 msgid "Parameter"
 msgstr "パラメータ"
 
-#: pcbnew/footprint_wizard_frame.cpp:550 pcbnew/modview_frame.cpp:645
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:550
+#: kicad-6297/pcbnew/modview_frame.cpp:645
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:567
+#: kicad-6996/pcbnew/modview_frame.cpp:664
 #, c-format
 msgid "ModView: 3D Viewer [%s]"
 msgstr "ModView: 3Dビューア [%s]"
 
-#: pcbnew/footprint_wizard_frame.cpp:576
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:576
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:593
 msgid "Select the wizard script to load and run"
 msgstr "読込んで実行するウィザードのスクリプトを選択"
 
-#: pcbnew/footprint_wizard_frame.cpp:581
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:581
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:598
 msgid "Select previous parameters page"
 msgstr "前のパラメータ ページを選択"
 
-#: pcbnew/footprint_wizard_frame.cpp:585
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:585
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:602
 msgid "Select next parameters page"
 msgstr "次のパラメータ ページを選択"
 
-#: pcbnew/footprint_wizard_frame.cpp:590 pcbnew/menubar_modedit.cpp:237
-#: pcbnew/tool_modview.cpp:76 pcbnew/tool_modview.cpp:178
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:590
+#: kicad-6297/pcbnew/menubar_modedit.cpp:237
+#: kicad-6297/pcbnew/tool_modview.cpp:76 kicad-6297/pcbnew/tool_modview.cpp:178
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:607
+#: kicad-6996/pcbnew/menubar_modedit.cpp:236
+#: kicad-6996/pcbnew/tool_modview.cpp:76 kicad-6996/pcbnew/tool_modview.cpp:178
 msgid "Show footprint in 3D viewer"
 msgstr "フットプリントを3Dビューアで表示"
 
-#: pcbnew/footprint_wizard_frame.cpp:617
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:617
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:634
 msgid "Export the footprint to the editor"
 msgstr "エディタへフットプリントをエクスポート"
 
-#: pcbnew/footprint_wizard_frame.cpp:636
+#: kicad-6297/pcbnew/footprint_wizard_frame.cpp:636
+#: kicad-6996/pcbnew/footprint_wizard_frame.cpp:653
 msgid "Footprint Builder Messages"
 msgstr "フットプリント ビルダーのメッセージ"
 
-#: pcbnew/github/github_getliblist.cpp:132
+#: kicad-6297/pcbnew/github/github_getliblist.cpp:132
+#: kicad-6996/pcbnew/github/github_getliblist.cpp:106
 #, c-format
 msgid ""
 "malformed URL:\n"
@@ -18357,7 +24056,8 @@ msgstr ""
 "不正な形式のURL:\n"
 "'%s'"
 
-#: pcbnew/github/github_plugin.cpp:304
+#: kicad-6297/pcbnew/github/github_plugin.cpp:304
+#: kicad-6996/pcbnew/github/github_plugin.cpp:283
 #, c-format
 msgid ""
 "Footprint\n"
@@ -18370,7 +24070,8 @@ msgstr ""
 "が Github ライブラリ <%s> の書き込み可能な部分に存在\n"
 "しません。"
 
-#: pcbnew/github/github_plugin.cpp:365
+#: kicad-6297/pcbnew/github/github_plugin.cpp:365
+#: kicad-6996/pcbnew/github/github_plugin.cpp:344
 msgid ""
 "Set this property to a directory where footprints are to be written as "
 "pretty footprints when saving to this library. Anything saved will take "
@@ -18386,7 +24087,8 @@ msgstr ""
 "は <b>必ず</b> 拡張子に <b>.pretty</b> を付けること。 (保存フォーマットが "
 "pretty のため)</p>"
 
-#: pcbnew/github/github_plugin.cpp:415
+#: kicad-6297/pcbnew/github/github_plugin.cpp:415
+#: kicad-6996/pcbnew/github/github_plugin.cpp:394
 #, c-format
 msgid ""
 "option '%s' for Github library '%s' must point to a writable directory "
@@ -18395,7 +24097,8 @@ msgstr ""
 "オプション '%s' は Github ライブラリ '%s' 用で、必ず最後に '.pretty' 拡張子を"
 "持つ書込み可能なディレクトリを指さなければなりません."
 
-#: pcbnew/github/github_plugin.cpp:542
+#: kicad-6297/pcbnew/github/github_plugin.cpp:542
+#: kicad-6996/pcbnew/github/github_plugin.cpp:521
 #, c-format
 msgid ""
 "Unable to parse URL:\n"
@@ -18404,7 +24107,8 @@ msgstr ""
 "以下のURLが処理できませんでした:\n"
 "'%s'"
 
-#: pcbnew/github/github_plugin.cpp:573
+#: kicad-6297/pcbnew/github/github_plugin.cpp:573
+#: kicad-6996/pcbnew/github/github_plugin.cpp:545
 #, c-format
 msgid ""
 "%s\n"
@@ -18417,12 +24121,12 @@ msgstr ""
 "ライブラリ: '%s'.\n"
 "理由: '%s'"
 
-#: pcbnew/github/github_plugin.cpp:588
+#: kicad-6297/pcbnew/github/github_plugin.cpp:588
 #, c-format
 msgid "Exception '%s' in avhttp while open()-ing URI:'%s'"
 msgstr "URI:'%s' を開いているダウンローダ avhttp の '%s' 例外"
 
-#: pcbnew/github/github_plugin.cpp:629
+#: kicad-6297/pcbnew/github/github_plugin.cpp:629
 #, c-format
 msgid ""
 "%s\n"
@@ -18433,168 +24137,484 @@ msgstr ""
 "データを取得することができませんでした: '%s'\n"
 "理由: '%s'"
 
-#: pcbnew/gpcb_plugin.cpp:117
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:116 kicad-6996/pcbnew/gpcb_plugin.cpp:112
 #, c-format
 msgid "Cannot convert \"%s\" to an integer"
 msgstr "\"%s\" を整数に変換できません"
 
-#: pcbnew/gpcb_plugin.cpp:299 pcbnew/gpcb_plugin.cpp:966
-#: pcbnew/kicad_plugin.cpp:1757
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:298 kicad-6297/pcbnew/gpcb_plugin.cpp:965
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1780
+#: kicad-6996/pcbnew/gpcb_plugin.cpp:294 kicad-6996/pcbnew/gpcb_plugin.cpp:961
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1797
 #, c-format
 msgid "footprint library path '%s' does not exist"
 msgstr "フットプリント ライブラリのパス '%s' は存在しません"
 
-#: pcbnew/gpcb_plugin.cpp:339
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:338 kicad-6996/pcbnew/gpcb_plugin.cpp:334
 #, c-format
 msgid "library <%s> has no footprint '%s' to delete"
 msgstr "ライブラリ <%s> には削除するフットプリント '%s' がありません"
 
-#: pcbnew/gpcb_plugin.cpp:440 pcbnew/pcb_parser.cpp:406
-#: pcbnew/pcb_parser.cpp:495
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:439 kicad-6297/pcbnew/pcb_parser.cpp:444
+#: kicad-6297/pcbnew/pcb_parser.cpp:549 kicad-6996/pcbnew/gpcb_plugin.cpp:435
+#: kicad-6996/pcbnew/pcb_parser.cpp:439 kicad-6996/pcbnew/pcb_parser.cpp:544
 #, c-format
 msgid "unknown token \"%s\""
 msgstr "未知のトークン \"%s\""
 
-#: pcbnew/gpcb_plugin.cpp:447
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:446 kicad-6996/pcbnew/gpcb_plugin.cpp:442
 #, c-format
 msgid "Element token contains %d parameters."
 msgstr "要素は%dのパラメータを持っています。"
 
-#: pcbnew/gpcb_plugin.cpp:1034 pcbnew/kicad_plugin.cpp:1830
-#: pcbnew/kicad_plugin.cpp:1895 pcbnew/legacy_plugin.cpp:4648
-#: pcbnew/legacy_plugin.cpp:4693 pcbnew/librairi.cpp:475
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:1033
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1853
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1918
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4649
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4694 kicad-6297/pcbnew/librairi.cpp:523
+#: kicad-6996/pcbnew/gpcb_plugin.cpp:1029
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1870
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1935 kicad-6996/pcbnew/librairi.cpp:523
 #, c-format
 msgid "Library '%s' is read only"
 msgstr "ライブラリ '%s' は読み込み専用です。"
 
-#: pcbnew/gpcb_plugin.cpp:1053 pcbnew/kicad_plugin.cpp:1932
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:1052
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1955
+#: kicad-6996/pcbnew/gpcb_plugin.cpp:1048
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1972
 #, c-format
 msgid "user does not have permission to delete directory '%s'"
 msgstr "現在のユーザは、ディレクトリ '%s' を削除する権限がありません"
 
-#: pcbnew/gpcb_plugin.cpp:1061 pcbnew/kicad_plugin.cpp:1940
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:1060
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1963
+#: kicad-6996/pcbnew/gpcb_plugin.cpp:1056
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1980
 #, c-format
 msgid "library directory '%s' has unexpected sub-directories"
 msgstr ""
 "ライブラリのディレクトリ <%s> が予期しないサブディレクトリを含んでいます"
 
-#: pcbnew/gpcb_plugin.cpp:1080 pcbnew/kicad_plugin.cpp:1959
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:1079
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1982
+#: kicad-6996/pcbnew/gpcb_plugin.cpp:1075
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1999
 #, c-format
 msgid "unexpected file '%s' was found in library path '%s'"
 msgstr "不正なファイル '%s' がライブラリパス '%s'から見つかりました"
 
-#: pcbnew/gpcb_plugin.cpp:1098 pcbnew/kicad_plugin.cpp:1977
+#: kicad-6297/pcbnew/gpcb_plugin.cpp:1097
+#: kicad-6297/pcbnew/kicad_plugin.cpp:2000
+#: kicad-6996/pcbnew/gpcb_plugin.cpp:1093
+#: kicad-6996/pcbnew/kicad_plugin.cpp:2017
 #, c-format
 msgid "footprint library '%s' cannot be deleted"
 msgstr "フットプリント ライブラリ '%s' は削除できません"
 
-#: pcbnew/highlight.cpp:53
+#: kicad-6297/pcbnew/highlight.cpp:53
 msgid "Filter Net Names"
 msgstr "ネット名のフィルター"
 
-#: pcbnew/highlight.cpp:53
+#: kicad-6297/pcbnew/highlight.cpp:53
 msgid "Net Filter"
 msgstr "ネット フィルター"
 
-#: pcbnew/highlight.cpp:76
+#: kicad-6297/pcbnew/highlight.cpp:76
 msgid "Select Net"
 msgstr "ネットの選択"
 
-#: pcbnew/hotkeys_board_editor.cpp:63
+#: kicad-6297/pcbnew/hotkeys.cpp:72 kicad-6996/pcbnew/hotkeys.cpp:72
+msgid "Switch to Copper (B.Cu) layer"
+msgstr "導体レイヤ (B.Cu) へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:75 kicad-6996/pcbnew/hotkeys.cpp:75
+msgid "Switch to Component (F.Cu) layer"
+msgstr "部品レイヤ (F.Cu) へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:78 kicad-6996/pcbnew/hotkeys.cpp:78
+msgid "Switch to Inner layer 1"
+msgstr "内層レイヤ１へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:80 kicad-6996/pcbnew/hotkeys.cpp:80
+msgid "Switch to Inner layer 2"
+msgstr "内層レイヤ２へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:82 kicad-6996/pcbnew/hotkeys.cpp:82
+msgid "Switch to Inner layer 3"
+msgstr "内層レイヤ３へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:84 kicad-6996/pcbnew/hotkeys.cpp:84
+msgid "Switch to Inner layer 4"
+msgstr "内層レイヤ４へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:86 kicad-6996/pcbnew/hotkeys.cpp:86
+msgid "Switch to Inner layer 5"
+msgstr "内層レイヤ５へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:88 kicad-6996/pcbnew/hotkeys.cpp:88
+msgid "Switch to Inner layer 6"
+msgstr "内層レイヤ６へ切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:96 kicad-6297/pcbnew/librairi.cpp:72
+#: kicad-6996/pcbnew/hotkeys.cpp:96 kicad-6996/pcbnew/librairi.cpp:72
+msgid "Save Footprint"
+msgstr "フットプリントの保存"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:97 kicad-6996/pcbnew/hotkeys.cpp:97
+msgid "Save Board"
+msgstr "ボードを保存"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:98 kicad-6996/pcbnew/hotkeys.cpp:98
+msgid "Save Board As"
+msgstr "名前を付けてボードを保存"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:99 kicad-6996/pcbnew/hotkeys.cpp:99
+msgid "Load Board"
+msgstr "ボードを読み込み"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:101 kicad-6996/pcbnew/hotkeys.cpp:102
+msgid "Delete Track Segment"
+msgstr "配線セグメントを削除"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:102 kicad-6996/pcbnew/hotkeys.cpp:103
+msgid "Add New Track"
+msgstr "新規配線を追加"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:103 kicad-6996/pcbnew/hotkeys.cpp:104
+msgid "Add Through Via"
+msgstr "貫通ビアを追加"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:104 kicad-6996/pcbnew/hotkeys.cpp:105
+msgid "Select Layer and Add Through Via"
+msgstr "レイヤを指定して貫通ビアを追加"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:106 kicad-6996/pcbnew/hotkeys.cpp:107
+msgid "Add MicroVia"
+msgstr "マイクロビアを追加"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:107 kicad-6996/pcbnew/hotkeys.cpp:108
+msgid "Add Blind/Buried Via"
+msgstr "ブラインドビア(BVH)/ベリッドホール(BH)を追加"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:108 kicad-6996/pcbnew/hotkeys.cpp:109
+msgid "Select Layer and Add Blind/Buried Via"
+msgstr "レイヤを指定してブラインド/ベリッドビアを追加"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:110 kicad-6297/pcbnew/onrightclick.cpp:605
+#: kicad-6297/pcbnew/router/router_tool.cpp:101
+#: kicad-6996/pcbnew/hotkeys.cpp:111 kicad-6996/pcbnew/onrightclick.cpp:601
+#: kicad-6996/pcbnew/router/router_tool.cpp:101
+msgid "Switch Track Posture"
+msgstr "配線の形状を変更"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:111 kicad-6996/pcbnew/hotkeys.cpp:112
+msgid "Drag Track Keep Slope"
+msgstr "配線のドラッグ移動 (角度保持)"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:114 kicad-6297/pcbnew/onrightclick.cpp:827
+#: kicad-6996/pcbnew/hotkeys.cpp:115 kicad-6996/pcbnew/onrightclick.cpp:823
+msgid "Edit with Footprint Editor"
+msgstr "フットプリント エディタで編集"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:115 kicad-6996/pcbnew/hotkeys.cpp:116
+msgid "Flip Item"
+msgstr "アイテムを裏返す"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:118 kicad-6996/pcbnew/hotkeys.cpp:119
+msgid "Move Item Exactly"
+msgstr "数値を指定してアイテムを移動"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:119 kicad-6996/pcbnew/hotkeys.cpp:120
+msgid "Duplicate Item"
+msgstr "アイテムの複製"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:120 kicad-6996/pcbnew/hotkeys.cpp:121
+msgid "Duplicate Item and Increment"
+msgstr "アイテムの複製とインクリメント"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:122 kicad-6996/pcbnew/hotkeys.cpp:123
+#: kicad-6297/pcbnew/dialogs/dialog_create_array_base.h:113
+#: kicad-6996/pcbnew/dialogs/dialog_create_array_base.h:115
+msgid "Create Array"
+msgstr "配列の作成"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:123 kicad-6996/pcbnew/hotkeys.cpp:124
+msgid "Copy Item"
+msgstr "アイテムをコピー"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:125 kicad-6297/pcbnew/onrightclick.cpp:349
+#: kicad-6996/pcbnew/hotkeys.cpp:126 kicad-6996/pcbnew/onrightclick.cpp:349
+msgid "Get and Move Footprint"
+msgstr "フットプリントの検索と移動"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:126 kicad-6996/pcbnew/hotkeys.cpp:127
+msgid "Lock/Unlock Footprint"
+msgstr "フットプリントをロック／ロック解除"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:127 kicad-6996/pcbnew/hotkeys.cpp:128
+msgid "Delete Track or Footprint"
+msgstr "配線またはフットプリントを削除"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:129 kicad-6996/pcbnew/hotkeys.cpp:130
+msgid "Toggle High Contrast Mode"
+msgstr "ハイ コントラスト表示モードとの切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:131 kicad-6996/pcbnew/hotkeys.cpp:132
+msgid "Set Grid Origin"
+msgstr "グリッド原点のセット"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:134
+msgid "Switch to Default Canvas"
+msgstr "描画キャンバスを 標準 に切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:140 kicad-6996/pcbnew/hotkeys.cpp:141
+msgid "Switch to OpenGL Canvas"
+msgstr "描画キャンバスを OpenGL(3D) に切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:146 kicad-6996/pcbnew/hotkeys.cpp:147
+msgid "Switch to Cairo Canvas"
+msgstr "描画キャンバスを Cairo(2D) に切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:153 kicad-6297/pcbnew/onrightclick.cpp:362
+#: kicad-6996/pcbnew/hotkeys.cpp:154 kicad-6996/pcbnew/onrightclick.cpp:362
+msgid "Fill or Refill All Zones"
+msgstr "全てのゾーンを塗りつぶす"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:155 kicad-6297/pcbnew/onrightclick.cpp:366
+#: kicad-6996/pcbnew/hotkeys.cpp:156 kicad-6996/pcbnew/onrightclick.cpp:366
+msgid "Remove Filled Areas in All Zones"
+msgstr "全てのゾーンの塗りつぶしエリアを削除"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:204 kicad-6996/pcbnew/hotkeys.cpp:205
+msgid "Switch Track Width To Next"
+msgstr "配線幅を次のものに変更"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:207 kicad-6996/pcbnew/hotkeys.cpp:208
+msgid "Switch Track Width To Previous"
+msgstr "配線幅を前のものに変更"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:211 kicad-6996/pcbnew/hotkeys.cpp:212
+msgid "Switch Grid To Fast Grid1"
+msgstr "グリッドを高速グリッド１に切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:214 kicad-6996/pcbnew/hotkeys.cpp:215
+msgid "Switch Grid To Fast Grid2"
+msgstr "グリッドを高速グリッド２に切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:217 kicad-6996/pcbnew/hotkeys.cpp:218
+msgid "Switch Grid To Next"
+msgstr "グリッドを次のものに切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:220 kicad-6996/pcbnew/hotkeys.cpp:221
+msgid "Switch Grid To Previous"
+msgstr "グリッドを前のものに切替"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:224 kicad-6996/pcbnew/hotkeys.cpp:225
+msgid "Track Display Mode"
+msgstr "配線表示モード"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:226 kicad-6996/pcbnew/hotkeys.cpp:227
+msgid "Add Footprint"
+msgstr "フットプリントを追加"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:229
+msgid "Record Macro 0"
+msgstr "マクロ 0 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:231
+msgid "Call Macro 0"
+msgstr "マクロ 0 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:233
+msgid "Record Macro 1"
+msgstr "マクロ 1 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:235
+msgid "Call Macro 1"
+msgstr "マクロ 1 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:237
+msgid "Record Macro 2"
+msgstr "マクロ 2 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:239
+msgid "Call Macro 2"
+msgstr "マクロ 2 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:241
+msgid "Record Macro 3"
+msgstr "マクロ 3 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:243
+msgid "Call Macro 3"
+msgstr "マクロ 3 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:245
+msgid "Record Macro 4"
+msgstr "マクロ 4 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:247
+msgid "Call Macro 4"
+msgstr "マクロ 4 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:249
+msgid "Record Macro 5"
+msgstr "マクロ 5 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:251
+msgid "Call Macro 5"
+msgstr "マクロ 5 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:253
+msgid "Record Macro 6"
+msgstr "マクロ 6 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:255
+msgid "Call Macro 6"
+msgstr "マクロ 6 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:257
+msgid "Record Macro 7"
+msgstr "マクロ 7 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:259
+msgid "Call Macro 7"
+msgstr "マクロ 7 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:261
+msgid "Record Macro 8"
+msgstr "マクロ 8 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:263
+msgid "Call Macro 8"
+msgstr "マクロ 8 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:265
+msgid "Record Macro 9"
+msgstr "マクロ 9 を記録"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:267
+msgid "Call Macro 9"
+msgstr "マクロ 9 の呼び出し"
+
+#: kicad-6297/pcbnew/hotkeys.cpp:351 kicad-6996/pcbnew/hotkeys.cpp:305
+msgid "Board Editor"
+msgstr "基板エディタ"
+
+#: kicad-6297/pcbnew/hotkeys_board_editor.cpp:63
 #, c-format
 msgid "Recording macro %d"
 msgstr "マクロの記録中 %d"
 
-#: pcbnew/hotkeys_board_editor.cpp:70
+#: kicad-6297/pcbnew/hotkeys_board_editor.cpp:70
 #, c-format
 msgid "Macro %d recorded"
 msgstr "マクロ %d が記録されました"
 
-#: pcbnew/hotkeys_board_editor.cpp:82
+#: kicad-6297/pcbnew/hotkeys_board_editor.cpp:82
 #, c-format
 msgid "Call macro %d"
 msgstr "マクロ %d の呼び出し"
 
-#: pcbnew/hotkeys_board_editor.cpp:160
+#: kicad-6297/pcbnew/hotkeys_board_editor.cpp:160
 #, c-format
 msgid "Add key [%c] in macro %d"
 msgstr "[%c] キーをマクロ %d に追加"
 
-#: pcbnew/import_dxf/dialog_dxf_import.cpp:137
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import.cpp:137
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import.cpp:137
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
 msgid "Center of page"
 msgstr "ページの中央"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
 msgid "Upper left corner of page"
 msgstr "ページの左上角"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
 msgid "Center left side of page"
 msgstr "ページの左端中央"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
 msgid "Lower left corner of page"
 msgstr "ページの左下角"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:42
 msgid "User defined position"
 msgstr "ユーザ定義の位置"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:44
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:44
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:44
 msgid "Place DXF origin (0,0) point:"
 msgstr "DXFの原点座標 (0,0) をセット:"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:60
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:60
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:60
 msgid "DXF origin on PCB Grid, X Coordinate"
 msgstr "基板グリッドの DXF 原点、X 座標"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:76
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:76
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:76
 msgid "DXF origin on PCB Grid, Y Coordinate"
 msgstr "基板グリッドの DXF 原点、Y 座標"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.cpp:94
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.cpp:94
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.cpp:94
 msgid "Select PCB grid units"
 msgstr "基板グリッドの単位を選択"
 
-#: pcbnew/initpcb.cpp:47
+#: kicad-6297/pcbnew/initpcb.cpp:47 kicad-6996/pcbnew/initpcb.cpp:47
 msgid ""
 "Current Board will be lost and this operation cannot be undone. Continue ?"
 msgstr "現在のボードは失われます、この操作はやり直しできません。 続けますか？"
 
-#: pcbnew/initpcb.cpp:102 pcbnew/modedit.cpp:340
+#: kicad-6297/pcbnew/initpcb.cpp:102 kicad-6297/pcbnew/modedit.cpp:340
+#: kicad-6996/pcbnew/initpcb.cpp:102 kicad-6996/pcbnew/modedit.cpp:343
 msgid ""
 "Current Footprint will be lost and this operation cannot be undone. "
 "Continue ?"
 msgstr ""
 "現在のフットプリントは失われます、この操作はやり直しできません。 続けますか？"
 
-#: pcbnew/io_mgr.cpp:42 pcbnew/plugin.cpp:27
+#: kicad-6297/pcbnew/io_mgr.cpp:42 kicad-6297/pcbnew/plugin.cpp:27
+#: kicad-6996/eeschema/sch_io_mgr.cpp:31 kicad-6996/eeschema/sch_plugin.cpp:27
+#: kicad-6996/pcbnew/io_mgr.cpp:42 kicad-6996/pcbnew/plugin.cpp:29
 #, c-format
 msgid "Plugin '%s' does not implement the '%s' function."
 msgstr "'%s' プラグインには '%s' 機能はありません．"
 
-#: pcbnew/io_mgr.cpp:43
+#: kicad-6297/pcbnew/io_mgr.cpp:43 kicad-6996/eeschema/sch_io_mgr.cpp:32
+#: kicad-6996/pcbnew/io_mgr.cpp:43
 #, c-format
 msgid "Plugin type '%s' is not found."
 msgstr "プラグインタイプ \"%s\" が見つかりません。"
 
-#: pcbnew/io_mgr.cpp:126
+#: kicad-6297/pcbnew/io_mgr.cpp:129 kicad-6996/pcbnew/io_mgr.cpp:114
 #, c-format
 msgid "Unknown PCB_FILE_T value: %d"
 msgstr "未知の PCB_FILE_T の値: %d"
 
-#: pcbnew/kicad_netlist_reader.cpp:253
+#: kicad-6297/pcbnew/kicad_netlist_reader.cpp:253
+#: kicad-6996/pcbnew/kicad_netlist_reader.cpp:253
 #, c-format
 msgid "Cannot find component with reference \"%s\" in netlist."
 msgstr ""
 "リファレンス \"%s\" のコンポーネントは、ネットリストから見つかりませんでし"
 "た。"
 
-#: pcbnew/kicad_netlist_reader.cpp:369 pcbnew/pcb_parser.cpp:1674
+#: kicad-6297/pcbnew/kicad_netlist_reader.cpp:369
+#: kicad-6297/pcbnew/pcb_parser.cpp:1760
+#: kicad-6996/pcbnew/kicad_netlist_reader.cpp:369
+#: kicad-6996/pcbnew/pcb_parser.cpp:1755
 #, c-format
 msgid ""
 "invalid footprint ID in\n"
@@ -18607,124 +24627,150 @@ msgstr ""
 "行: %d\n"
 "オフセット: %d"
 
-#: pcbnew/kicad_plugin.cpp:215
+#: kicad-6297/pcbnew/kicad_plugin.cpp:214
+#: kicad-6996/pcbnew/kicad_plugin.cpp:213
 #, c-format
 msgid "Cannot create footprint library path '%s'"
 msgstr "フットプリント ライブラリのパス '%s' が生成できません"
 
-#: pcbnew/kicad_plugin.cpp:221
+#: kicad-6297/pcbnew/kicad_plugin.cpp:220
+#: kicad-6996/pcbnew/kicad_plugin.cpp:219
 #, c-format
 msgid "Footprint library path '%s' is read only"
 msgstr "フットプリント ライブラリ パス '%s' は読み込み専用です"
 
-#: pcbnew/kicad_plugin.cpp:260
+#: kicad-6297/pcbnew/kicad_plugin.cpp:259
+#: kicad-6996/pcbnew/kicad_plugin.cpp:258
 #, c-format
 msgid "Cannot rename temporary file '%s' to footprint library file '%s'"
 msgstr ""
 "一時ファイル '%s' のファイル名は、フットプリント ライブラリ ファイル '%s' に"
 "対しては変更できません"
 
-#: pcbnew/kicad_plugin.cpp:280
+#: kicad-6297/pcbnew/kicad_plugin.cpp:279
+#: kicad-6996/pcbnew/kicad_plugin.cpp:278
 #, c-format
 msgid "Footprint library path '%s' does not exist"
 msgstr "フットプリント ライブラリのパス '%s' は存在しません"
 
-#: pcbnew/kicad_plugin.cpp:327 pcbnew/legacy_plugin.cpp:4703
+#: kicad-6297/pcbnew/kicad_plugin.cpp:326
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4704
+#: kicad-6996/pcbnew/kicad_plugin.cpp:325
 #, c-format
 msgid "library '%s' has no footprint '%s' to delete"
 msgstr "ライブラリ '%s' には削除するフットプリント '%s' がありません"
 
-#: pcbnew/kicad_plugin.cpp:1234 pcbnew/legacy_plugin.cpp:98
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1244
+#: kicad-6297/pcbnew/legacy_plugin.cpp:98
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1248
+#: kicad-6996/pcbnew/legacy_plugin.cpp:97
 #, c-format
 msgid "unknown pad type: %d"
 msgstr "未知のパッド形状です: %d"
 
-#: pcbnew/kicad_plugin.cpp:1247 pcbnew/legacy_plugin.cpp:99
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1257
+#: kicad-6297/pcbnew/legacy_plugin.cpp:99
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1261
+#: kicad-6996/pcbnew/legacy_plugin.cpp:98
 #, c-format
 msgid "unknown pad attribute: %d"
 msgstr "未知のパッド属性です: %d"
 
-#: pcbnew/kicad_plugin.cpp:1429
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1439
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1450
 #, c-format
 msgid "unknown via type %d"
 msgstr "未知のビア形状です: %d"
 
-#: pcbnew/kicad_plugin.cpp:1560
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1570
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1581
 #, c-format
 msgid "unknown zone corner smoothing type %d"
 msgstr "未知のゾーンの角の平滑化タイプ %d "
 
-#: pcbnew/kicad_plugin.cpp:1846
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1869
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1886
 #, c-format
 msgid "Footprint file name '%s' is not valid."
 msgstr "不正なフットプリント ファイル名です '%s' 。"
 
-#: pcbnew/kicad_plugin.cpp:1852
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1875
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1892
 #, c-format
 msgid "user does not have write permission to delete file '%s' "
 msgstr "現在のユーザは '%s' を削除するための書き込み権限がありません"
 
-#: pcbnew/kicad_plugin.cpp:1907
+#: kicad-6297/pcbnew/kicad_plugin.cpp:1930
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1947
 #, c-format
 msgid "cannot overwrite library path '%s'"
 msgstr "ライブラリ パス '%s' は上書きできません"
 
-#: pcbnew/layer_widget.cpp:427
+#: kicad-6297/pcbnew/layer_widget.cpp:427
 msgid ""
 "Left click to select, middle click for color change, right click for menu"
 msgstr "左クリックで選択, 中クリックで色の変更, 右クリックでメニュー"
 
-#: pcbnew/layer_widget.cpp:435
+#: kicad-6297/pcbnew/layer_widget.cpp:435
+#: kicad-6996/pcbnew/layer_widget.cpp:442
 msgid "Enable this for visibility"
 msgstr "表示する"
 
-#: pcbnew/layer_widget.cpp:462
+#: kicad-6297/pcbnew/layer_widget.cpp:462
 msgid "Middle click for color change"
 msgstr "中クリックで色の変更"
 
-#: pcbnew/legacy_netlist_reader.cpp:121
+#: kicad-6297/pcbnew/legacy_netlist_reader.cpp:121
+#: kicad-6996/pcbnew/legacy_netlist_reader.cpp:121
 msgid "Cannot parse time stamp in component section of netlist."
 msgstr ""
 "ネットリスト中のコンポーネント情報内のタイムスタンプを解釈することが出来ませ"
 "んでした。"
 
-#: pcbnew/legacy_netlist_reader.cpp:131
+#: kicad-6297/pcbnew/legacy_netlist_reader.cpp:131
+#: kicad-6996/pcbnew/legacy_netlist_reader.cpp:131
 msgid "Cannot parse footprint name in component section of netlist."
 msgstr ""
 "ネットリスト中のコンポーネント情報内のフットプリント名を解釈することが出来ま"
 "せんでした。"
 
-#: pcbnew/legacy_netlist_reader.cpp:145
+#: kicad-6297/pcbnew/legacy_netlist_reader.cpp:145
+#: kicad-6996/pcbnew/legacy_netlist_reader.cpp:145
 msgid "Cannot parse reference designator in component section of netlist."
 msgstr ""
 "ネットリスト中のコンポーネント情報内のリファレンス情報を解釈することが出来ま"
 "せんでした。"
 
-#: pcbnew/legacy_netlist_reader.cpp:155
+#: kicad-6297/pcbnew/legacy_netlist_reader.cpp:155
+#: kicad-6996/pcbnew/legacy_netlist_reader.cpp:155
 msgid "Cannot parse value in component section of netlist."
 msgstr ""
 "ネットリスト中のコンポーネント情報内の定数を解釈することが出来ませんでした。"
 
-#: pcbnew/legacy_netlist_reader.cpp:192
+#: kicad-6297/pcbnew/legacy_netlist_reader.cpp:192
+#: kicad-6996/pcbnew/legacy_netlist_reader.cpp:192
 msgid "Cannot parse pin name in component net section of netlist."
 msgstr ""
 "ネットリスト中のコンポーネント情報内のピン名を解釈することが出来ませんでし"
 "た。"
 
-#: pcbnew/legacy_netlist_reader.cpp:201
+#: kicad-6297/pcbnew/legacy_netlist_reader.cpp:201
+#: kicad-6996/pcbnew/legacy_netlist_reader.cpp:201
 msgid "Cannot parse net name in component net section of netlist."
 msgstr ""
 "ネットリスト中のコンポーネント情報内のネット名を解釈することが出来ませんでし"
 "た。"
 
-#: pcbnew/legacy_netlist_reader.cpp:249
+#: kicad-6297/pcbnew/legacy_netlist_reader.cpp:249
+#: kicad-6996/pcbnew/legacy_netlist_reader.cpp:249
 #, c-format
 msgid "Cannot find component '%s' in footprint filter section of netlist."
 msgstr ""
 "コンポーネント '%s' はネットリストのフットプリント フィルタ情報内に見つかりま"
 "せんでした。"
 
-#: pcbnew/legacy_plugin.cpp:96
+#: kicad-6297/pcbnew/legacy_plugin.cpp:96
+#: kicad-6996/pcbnew/legacy_plugin.cpp:95
 #, c-format
 msgid ""
 "File '%s' is format version: %d.\n"
@@ -18735,27 +24781,34 @@ msgstr ""
 "このプログラムでは、%d 以下のフォーマット バージョンしかサポートしていませ"
 "ん。新しいバージョンのPcbnewを取得し、ロードし直してください。"
 
-#: pcbnew/legacy_plugin.cpp:97
+#: kicad-6297/pcbnew/legacy_plugin.cpp:97
+#: kicad-6996/pcbnew/legacy_plugin.cpp:96
 #, c-format
 msgid "unknown graphic type: %d"
 msgstr "未知のグラフィック タイプ: %d"
 
-#: pcbnew/legacy_plugin.cpp:761
+#: kicad-6297/pcbnew/legacy_plugin.cpp:762
+#: kicad-6996/pcbnew/legacy_plugin.cpp:735
 #, c-format
 msgid "Unknown sheet type '%s' on line:%d"
 msgstr "未知のシートタイプ \"%s\" : %d 行目"
 
-#: pcbnew/legacy_plugin.cpp:1457
+#: kicad-6297/pcbnew/legacy_plugin.cpp:1458
+#: kicad-6996/pcbnew/legacy_plugin.cpp:1431
 #, c-format
 msgid "Unknown padshape '%c=0x%02x' on line: %d of footprint: '%s'"
 msgstr "未知のパッド形状 '%c=0x%02x' 、行: %d 、フットプリント: '%s'"
 
-#: pcbnew/legacy_plugin.cpp:2506
+#: kicad-6297/pcbnew/legacy_plugin.cpp:2507
+#: kicad-6996/pcbnew/legacy_plugin.cpp:2473
 #, c-format
 msgid "duplicate NETCLASS name '%s'"
 msgstr "重複したネットクラス名 '%s'"
 
-#: pcbnew/legacy_plugin.cpp:3033 pcbnew/legacy_plugin.cpp:3070
+#: kicad-6297/pcbnew/legacy_plugin.cpp:3034
+#: kicad-6297/pcbnew/legacy_plugin.cpp:3071
+#: kicad-6996/pcbnew/legacy_plugin.cpp:3000
+#: kicad-6996/pcbnew/legacy_plugin.cpp:3037
 #, c-format
 msgid ""
 "invalid float number in file: '%s'\n"
@@ -18764,7 +24817,10 @@ msgstr ""
 "不正な浮動小数点数値が見つかりました: '%s' \n"
 "%d行目, %d文字目"
 
-#: pcbnew/legacy_plugin.cpp:3042 pcbnew/legacy_plugin.cpp:3078
+#: kicad-6297/pcbnew/legacy_plugin.cpp:3043
+#: kicad-6297/pcbnew/legacy_plugin.cpp:3079
+#: kicad-6996/pcbnew/legacy_plugin.cpp:3009
+#: kicad-6996/pcbnew/legacy_plugin.cpp:3045
 #, c-format
 msgid ""
 "missing float number in file: '%s'\n"
@@ -18773,130 +24829,128 @@ msgstr ""
 "不正な浮動小数点数値が見つかりました: '%s' \n"
 "行番号: %d, 位置: %d"
 
-#: pcbnew/legacy_plugin.cpp:3243
+#: kicad-6297/pcbnew/legacy_plugin.cpp:3244
 #, c-format
 msgid "Unable to open file '%s'"
 msgstr "ファイル '%s' が開けません"
 
-#: pcbnew/legacy_plugin.cpp:4350
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4351
+#: kicad-6996/pcbnew/legacy_plugin.cpp:3271
 #, c-format
 msgid "File '%s' is empty or is not a legacy library"
 msgstr "ファイル \"%s\" は空であるか、古い形式のライブラリです"
 
-#: pcbnew/legacy_plugin.cpp:4488
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4489
 #, c-format
 msgid "Legacy library file '%s' is read only"
 msgstr "レガシー ライブラリ ファイル '%s' は読み込み専用です"
 
-#: pcbnew/legacy_plugin.cpp:4507
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4508
 #, c-format
 msgid "Unable to open or create legacy library file '%s'"
 msgstr ""
 "レガシー フォーマットのライブラリ ファイル '%s' を読み込み/保存できませんでし"
 "た"
 
-#: pcbnew/legacy_plugin.cpp:4533
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4534
 #, c-format
 msgid "Unable to rename tempfile '%s' to library file '%s'"
 msgstr ""
 "一時ファイル '%s' をライブラリ ファイル '%s' へファイル名の変更保存ができませ"
 "んでした"
 
-#: pcbnew/legacy_plugin.cpp:4716
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4717
 #, c-format
 msgid "library '%s' already exists, will not create a new"
 msgstr "ライブラリ '%s' は既に存在します。新規作成できません。"
 
-#: pcbnew/legacy_plugin.cpp:4745
+#: kicad-6297/pcbnew/legacy_plugin.cpp:4746
+#: kicad-6996/pcbnew/legacy_plugin.cpp:3478
 #, c-format
 msgid "library '%s' cannot be deleted"
 msgstr "ライブラリ '%s' が削除できませんでした"
 
-#: pcbnew/librairi.cpp:61
+#: kicad-6297/pcbnew/librairi.cpp:60 kicad-6996/pcbnew/librairi.cpp:60
 #, c-format
 msgid "Library '%s' exists, OK to replace ?"
 msgstr "ライブラリ '%s' は既に存在します。置換してもよろしいですか？"
 
-#: pcbnew/librairi.cpp:62
+#: kicad-6297/pcbnew/librairi.cpp:61 kicad-6996/pcbnew/librairi.cpp:61
 msgid "Create New Library Folder (the .pretty folder is the library)"
 msgstr "新しくライブラリのフォルダ (.prettyフォルダはライブラリ) を作成"
 
-#: pcbnew/librairi.cpp:63
+#: kicad-6297/pcbnew/librairi.cpp:62 kicad-6996/pcbnew/librairi.cpp:62
 #, c-format
 msgid "OK to delete footprint %s in library '%s'"
 msgstr "フットプリント %s (ライブラリ '%s' )を削除してもよろしいですか？"
 
-#: pcbnew/librairi.cpp:64
+#: kicad-6297/pcbnew/librairi.cpp:63 kicad-6996/pcbnew/librairi.cpp:63
 msgid "Import Footprint"
 msgstr "フットプリントのインポート"
 
-#: pcbnew/librairi.cpp:65
+#: kicad-6297/pcbnew/librairi.cpp:64 kicad-6996/pcbnew/librairi.cpp:64
 #, c-format
 msgid "File '%s' not found"
 msgstr "ファイル '%s' が見つかりません"
 
-#: pcbnew/librairi.cpp:66
+#: kicad-6297/pcbnew/librairi.cpp:65 kicad-6996/pcbnew/librairi.cpp:65
 msgid "Not a footprint file"
 msgstr "フットプリント ファイルではありません"
 
-#: pcbnew/librairi.cpp:67
+#: kicad-6297/pcbnew/librairi.cpp:66 kicad-6996/pcbnew/librairi.cpp:66
 #, c-format
 msgid "Unable to find or load footprint %s from lib path '%s'"
 msgstr ""
 "フットプリント %s をライブラリ パス '%s' から見つけることが出来ませんでした"
 
-#: pcbnew/librairi.cpp:68
+#: kicad-6297/pcbnew/librairi.cpp:67 kicad-6996/pcbnew/librairi.cpp:67
 #, c-format
 msgid "Unable to find or load footprint from path '%s'"
 msgstr "フットプリントを '%s' からロードすることができませんでした"
 
-#: pcbnew/librairi.cpp:69
+#: kicad-6297/pcbnew/librairi.cpp:68 kicad-6996/pcbnew/librairi.cpp:68
 #, c-format
 msgid ""
 "The footprint library '%s' could not be found in any of the search paths."
 msgstr "フットプリント ライブラリ <%s> はデフォルト検索パス内に存在しません。"
 
-#: pcbnew/librairi.cpp:70
+#: kicad-6297/pcbnew/librairi.cpp:69 kicad-6996/pcbnew/librairi.cpp:69
 #, c-format
 msgid "Library '%s' is read only, not writable"
 msgstr "ライブラリ '%s' は読み込み専用です。"
 
-#: pcbnew/librairi.cpp:72
+#: kicad-6297/pcbnew/librairi.cpp:71 kicad-6996/pcbnew/librairi.cpp:71
 msgid "Export Footprint"
 msgstr "フットプリントのエクスポート"
 
-#: pcbnew/librairi.cpp:73
-msgid "Save Footprint"
-msgstr "フットプリントの保存"
-
-#: pcbnew/librairi.cpp:74
+#: kicad-6297/pcbnew/librairi.cpp:73 kicad-6996/pcbnew/librairi.cpp:73
 msgid "Enter footprint name:"
 msgstr "フットプリント名:"
 
-#: pcbnew/librairi.cpp:75
+#: kicad-6297/pcbnew/librairi.cpp:74 kicad-6996/pcbnew/librairi.cpp:74
 #, c-format
 msgid "Footprint exported to file '%s'"
 msgstr "フットプリントを '%s' へ出力しました"
 
-#: pcbnew/librairi.cpp:76
+#: kicad-6297/pcbnew/librairi.cpp:75 kicad-6996/pcbnew/librairi.cpp:75
 #, c-format
 msgid "Footprint %s deleted from library '%s'"
 msgstr "フットプリント %s をライブラリ '%s' から削除しました"
 
-#: pcbnew/librairi.cpp:77
+#: kicad-6297/pcbnew/librairi.cpp:76 kicad-6996/pcbnew/librairi.cpp:76
 msgid "New Footprint"
 msgstr "新規フットプリント"
 
-#: pcbnew/librairi.cpp:79
+#: kicad-6297/pcbnew/librairi.cpp:78 kicad-6996/pcbnew/librairi.cpp:78
 #, c-format
 msgid "Footprint %s already exists in library '%s'"
 msgstr "フットプリント %s は既にライブラリ %s 内に既に存在します。"
 
-#: pcbnew/librairi.cpp:80
+#: kicad-6297/pcbnew/librairi.cpp:79 kicad-6996/pcbnew/librairi.cpp:79
 msgid "No footprint name defined."
 msgstr "フットプリント名が定義されていません。"
 
-#: pcbnew/librairi.cpp:84
+#: kicad-6297/pcbnew/librairi.cpp:83 kicad-6996/pcbnew/librairi.cpp:83
 msgid ""
 "Writing/modifying legacy libraries (.mod files) is not allowed\n"
 "Please save the current library to the new .pretty format\n"
@@ -18910,7 +24964,7 @@ msgstr ""
 "フットプリント (.kicad_mod ファイル) を .pretty ライブラリ フォルダの中で保存"
 "してください．"
 
-#: pcbnew/librairi.cpp:90
+#: kicad-6297/pcbnew/librairi.cpp:89 kicad-6996/pcbnew/librairi.cpp:89
 msgid ""
 "Modifying legacy libraries (.mod files) is not allowed\n"
 "Please save the current library under the new .pretty format\n"
@@ -18922,19 +24976,24 @@ msgstr ""
 "現在のライブラリを新しい .pretty フォーマットで保存して，\n"
 "フットプリント lib テーブルを更新してください．"
 
-#: pcbnew/librairi.cpp:95
+#: kicad-6297/pcbnew/librairi.cpp:94 kicad-6996/pcbnew/librairi.cpp:94
 msgid "Legacy foot print export files (*.emp)|*.emp"
 msgstr "レガシー フットプリント ファイル (*.emp)|*.emp"
 
-#: pcbnew/librairi.cpp:96
+#: kicad-6297/pcbnew/librairi.cpp:95 kicad-6996/pcbnew/librairi.cpp:95
 msgid "GPcb foot print files (*)|*"
 msgstr "GPcb フットプリント ファイル (*)|*"
 
-#: pcbnew/librairi.cpp:520
+#: kicad-6297/pcbnew/librairi.cpp:390 kicad-6996/pcbnew/librairi.cpp:390
+#, c-format
+msgid "Unable to create or write file '%s'"
+msgstr "ファイル '%s' を作成／書込みできません"
+
+#: kicad-6297/pcbnew/librairi.cpp:568 kicad-6996/pcbnew/librairi.cpp:568
 msgid "No footprints to archive!"
 msgstr "アーカイブにフットプリントがありません！"
 
-#: pcbnew/librairi.cpp:623
+#: kicad-6297/pcbnew/librairi.cpp:671 kicad-6996/pcbnew/librairi.cpp:671
 #, c-format
 msgid ""
 "Error:\n"
@@ -18945,21 +25004,21 @@ msgstr ""
 "不正な文字 '%s' が見つかりました。\n"
 "('%s')"
 
-#: pcbnew/librairi.cpp:684
+#: kicad-6297/pcbnew/librairi.cpp:732 kicad-6996/pcbnew/librairi.cpp:732
 #, c-format
 msgid "Component [%s] replaced in '%s'"
 msgstr "コンポーネント [%s] を <%s> に置き換えました"
 
-#: pcbnew/librairi.cpp:685
+#: kicad-6297/pcbnew/librairi.cpp:733 kicad-6996/pcbnew/librairi.cpp:733
 #, c-format
 msgid "Component [%s] added in  '%s'"
 msgstr "コンポーネント [%s] を <%s> に追加しました"
 
-#: pcbnew/loadcmp.cpp:175
+#: kicad-6297/pcbnew/loadcmp.cpp:175 kicad-6996/pcbnew/loadcmp.cpp:175
 msgid "Load Footprint"
 msgstr "フットプリントの読み込み"
 
-#: pcbnew/loadcmp.cpp:386
+#: kicad-6297/pcbnew/loadcmp.cpp:386 kicad-6996/pcbnew/loadcmp.cpp:384
 #, c-format
 msgid ""
 "No footprints could be read from library file(s):\n"
@@ -18974,16 +25033,16 @@ msgstr ""
 "ライブラリの検索パス．フットプリント ライブラリのパスがシステムで正しく設定さ"
 "れていることを確認してください．"
 
-#: pcbnew/loadcmp.cpp:439
+#: kicad-6297/pcbnew/loadcmp.cpp:439 kicad-6996/pcbnew/loadcmp.cpp:437
 #, c-format
 msgid "Footprints [%d items]"
 msgstr "フットプリント一覧 [%d のアイテム]"
 
-#: pcbnew/loadcmp.cpp:456
+#: kicad-6297/pcbnew/loadcmp.cpp:456 kicad-6996/pcbnew/loadcmp.cpp:454
 msgid "No footprint found."
 msgstr "フットプリントが見つかりません。"
 
-#: pcbnew/loadcmp.cpp:480
+#: kicad-6297/pcbnew/loadcmp.cpp:480 kicad-6996/pcbnew/loadcmp.cpp:478
 msgid ""
 "\n"
 "Key words: "
@@ -18991,276 +25050,368 @@ msgstr ""
 "\n"
 "キーワード:"
 
-#: pcbnew/loadcmp.cpp:496
+#: kicad-6297/pcbnew/loadcmp.cpp:496 kicad-6996/pcbnew/loadcmp.cpp:494
 #, c-format
 msgid "Footprints [%u items]"
 msgstr "フットプリント [%u アイテム]"
 
-#: pcbnew/loadcmp.cpp:560
+#: kicad-6297/pcbnew/loadcmp.cpp:560 kicad-6996/pcbnew/loadcmp.cpp:558
 #, c-format
 msgid "Footprint '%s' saved"
 msgstr "フットプリント '%s' を保存しました"
 
-#: pcbnew/loadcmp.cpp:574
+#: kicad-6297/pcbnew/loadcmp.cpp:574 kicad-6996/pcbnew/loadcmp.cpp:572
 #, c-format
 msgid "Footprint library '%s' saved as '%s'."
 msgstr "フットプリント ライブラリ '%s' を '%s' へ保存しました。"
 
-#: pcbnew/menubar_modedit.cpp:67
+#: kicad-6297/pcbnew/menubar_modedit.cpp:67
+#: kicad-6996/pcbnew/menubar_modedit.cpp:66
 msgid "Set Acti&ve Library"
 msgstr "アクティブなライブラリの設定(&V)"
 
-#: pcbnew/menubar_modedit.cpp:68 pcbnew/tool_modedit.cpp:55
+#: kicad-6297/pcbnew/menubar_modedit.cpp:68
+#: kicad-6297/pcbnew/tool_modedit.cpp:55
+#: kicad-6996/pcbnew/menubar_modedit.cpp:67
+#: kicad-6996/pcbnew/tool_modedit.cpp:55
 msgid "Select active library"
 msgstr "アクティブなライブラリを選択してください"
 
-#: pcbnew/menubar_modedit.cpp:74
+#: kicad-6297/pcbnew/menubar_modedit.cpp:74
+#: kicad-6996/pcbnew/menubar_modedit.cpp:73
 msgid "&New Footprint"
 msgstr "新規フットプリント(&N)"
 
-#: pcbnew/menubar_modedit.cpp:74
+#: kicad-6297/pcbnew/menubar_modedit.cpp:74
+#: kicad-6996/pcbnew/menubar_modedit.cpp:73
 msgid "Create new footprint"
 msgstr "新規フットプリントを作成"
 
-#: pcbnew/menubar_modedit.cpp:82
+#: kicad-6297/pcbnew/menubar_modedit.cpp:82
+#: kicad-6996/pcbnew/menubar_modedit.cpp:81
 msgid "&Import Footprint From File"
 msgstr "ファイルからフットプリントのインポート(&I)"
 
-#: pcbnew/menubar_modedit.cpp:83
+#: kicad-6297/pcbnew/menubar_modedit.cpp:83
+#: kicad-6996/pcbnew/menubar_modedit.cpp:82
 msgid "Import footprint from an existing file"
 msgstr "既存のファイルからフットプリントをインポート"
 
-#: pcbnew/menubar_modedit.cpp:88
+#: kicad-6297/pcbnew/menubar_modedit.cpp:88
+#: kicad-6996/pcbnew/menubar_modedit.cpp:87
 msgid "Load Footprint From Current Li&brary"
 msgstr "現在のライブラリからフットプリントを読み込み(&B)"
 
-#: pcbnew/menubar_modedit.cpp:89
+#: kicad-6297/pcbnew/menubar_modedit.cpp:89
+#: kicad-6996/pcbnew/menubar_modedit.cpp:88
 msgid "Open a footprint from library"
 msgstr "ライブラリからフットプリントを開く"
 
-#: pcbnew/menubar_modedit.cpp:94
+#: kicad-6297/pcbnew/menubar_modedit.cpp:94
+#: kicad-6996/pcbnew/menubar_modedit.cpp:93
 msgid "Load Footprint From &Current Board"
 msgstr "現在のボードからフットプリントを読み込む(&C)"
 
-#: pcbnew/menubar_modedit.cpp:95
+#: kicad-6297/pcbnew/menubar_modedit.cpp:95
+#: kicad-6996/pcbnew/menubar_modedit.cpp:94
 msgid "Load a footprint from the current board"
 msgstr "現在のボードからフットプリントを読み込む"
 
-#: pcbnew/menubar_modedit.cpp:100
+#: kicad-6297/pcbnew/menubar_modedit.cpp:100
+#: kicad-6996/pcbnew/menubar_modedit.cpp:99
 msgid "&Load Footprint"
 msgstr "フットプリントの読み出し(&L)"
 
-#: pcbnew/menubar_modedit.cpp:101
+#: kicad-6297/pcbnew/menubar_modedit.cpp:101
+#: kicad-6996/pcbnew/menubar_modedit.cpp:100
 msgid "Load footprint"
 msgstr "フットプリントの読み出し"
 
-#: pcbnew/menubar_modedit.cpp:107
+#: kicad-6297/pcbnew/menubar_modedit.cpp:107
+#: kicad-6996/pcbnew/menubar_modedit.cpp:106
 msgid "Save &Current Library As..."
 msgstr "現在のライブラリを名前をつけて保存(&C)"
 
-#: pcbnew/menubar_modedit.cpp:108
+#: kicad-6297/pcbnew/menubar_modedit.cpp:108
+#: kicad-6996/pcbnew/menubar_modedit.cpp:107
 msgid "Save entire current library under a new name."
 msgstr "現在のライブラリ全体を新規保存"
 
-#: pcbnew/menubar_modedit.cpp:112
+#: kicad-6297/pcbnew/menubar_modedit.cpp:112
+#: kicad-6996/pcbnew/menubar_modedit.cpp:111
 msgid "&Save Footprint in Active Library"
 msgstr "アクティブなライブラリにフットプリントを保存(&S)"
 
-#: pcbnew/menubar_modedit.cpp:116 pcbnew/tool_modedit.cpp:58
+#: kicad-6297/pcbnew/menubar_modedit.cpp:116
+#: kicad-6297/pcbnew/tool_modedit.cpp:58
+#: kicad-6996/pcbnew/menubar_modedit.cpp:115
+#: kicad-6996/pcbnew/tool_modedit.cpp:58
 msgid "Save footprint in active library"
 msgstr "アクティブなライブラリへフットプリントを保存"
 
-#: pcbnew/menubar_modedit.cpp:121
+#: kicad-6297/pcbnew/menubar_modedit.cpp:121
+#: kicad-6996/pcbnew/menubar_modedit.cpp:120
 msgid "S&ave Footprint in New Library"
 msgstr "フットプリントを新規ライブラリへ保存(&A)"
 
-#: pcbnew/menubar_modedit.cpp:122
+#: kicad-6297/pcbnew/menubar_modedit.cpp:122
+#: kicad-6996/pcbnew/menubar_modedit.cpp:121
 msgid "Create a new library and save current footprint into it"
 msgstr "新規ライブラリを作成して現在のフットプリントを保存"
 
-#: pcbnew/menubar_modedit.cpp:127
+#: kicad-6297/pcbnew/menubar_modedit.cpp:127
+#: kicad-6996/pcbnew/menubar_modedit.cpp:126
 msgid "&Export Footprint"
 msgstr "フットプリントのエクスポート(&E)"
 
-#: pcbnew/menubar_modedit.cpp:128
+#: kicad-6297/pcbnew/menubar_modedit.cpp:128
+#: kicad-6996/pcbnew/menubar_modedit.cpp:127
 msgid "Save currently loaded footprint into file"
 msgstr "現在ロードされているフットプリントをファイルに保存"
 
-#: pcbnew/menubar_modedit.cpp:133
+#: kicad-6297/pcbnew/menubar_modedit.cpp:133
+#: kicad-6996/pcbnew/menubar_modedit.cpp:132
 msgid "&Import DXF File"
 msgstr "DXFファイルのインポート(&I)"
 
-#: pcbnew/menubar_modedit.cpp:134 pcbnew/menubar_pcbframe.cpp:191
+#: kicad-6297/pcbnew/menubar_modedit.cpp:134
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:191
+#: kicad-6996/pcbnew/menubar_modedit.cpp:133
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:195
 msgid "Import a 2D Drawing DXF file to Pcbnew on the Drawings layer"
 msgstr "2D図面を Pcbnew の図面描画レイヤ上へインポートする"
 
-#: pcbnew/menubar_modedit.cpp:142
+#: kicad-6297/pcbnew/menubar_modedit.cpp:142
+#: kicad-6996/pcbnew/menubar_modedit.cpp:141
 msgid "Print current footprint"
 msgstr "現在のフットプリントを印刷"
 
-#: pcbnew/menubar_modedit.cpp:151
+#: kicad-6297/pcbnew/menubar_modedit.cpp:151
+#: kicad-6996/pcbnew/menubar_modedit.cpp:150
 msgid "Close footprint editor"
 msgstr "フットプリント エディタを閉じる"
 
-#: pcbnew/menubar_modedit.cpp:160
+#: kicad-6297/pcbnew/menubar_modedit.cpp:160
+#: kicad-6996/pcbnew/menubar_modedit.cpp:159
 msgid "Undo last action"
 msgstr "一つ前の編集を元に戻す"
 
-#: pcbnew/menubar_modedit.cpp:166
+#: kicad-6297/pcbnew/menubar_modedit.cpp:166
+#: kicad-6996/pcbnew/menubar_modedit.cpp:165
 msgid "Redo last action"
 msgstr "一つ前のコマンドをやり直し"
 
-#: pcbnew/menubar_modedit.cpp:171
+#: kicad-6297/pcbnew/menubar_modedit.cpp:171
+#: kicad-6996/pcbnew/menubar_modedit.cpp:170
 msgid "Delete objects with eraser"
 msgstr "消しゴムでオブジェクトを削除"
 
-#: pcbnew/menubar_modedit.cpp:179
+#: kicad-6297/pcbnew/menubar_modedit.cpp:179
+#: kicad-6996/pcbnew/menubar_modedit.cpp:178
 msgid "Edit &Properties"
 msgstr "プロパティ(&P)"
 
-#: pcbnew/menubar_modedit.cpp:180
+#: kicad-6297/pcbnew/menubar_modedit.cpp:180
+#: kicad-6996/pcbnew/menubar_modedit.cpp:179
 msgid "Edit footprint properties"
 msgstr "フットプリント プロパティの編集"
 
-#: pcbnew/menubar_modedit.cpp:188
+#: kicad-6297/pcbnew/menubar_modedit.cpp:188
+#: kicad-6996/pcbnew/menubar_modedit.cpp:187
 msgid "&User Grid Size"
 msgstr "ユーザ グリッドのサイズ(&U)"
 
-#: pcbnew/menubar_modedit.cpp:188
+#: kicad-6297/pcbnew/menubar_modedit.cpp:188
+#: kicad-6996/pcbnew/menubar_modedit.cpp:187
 msgid "Adjust user grid"
 msgstr "ユーザ グリッドに合わせる"
 
-#: pcbnew/menubar_modedit.cpp:193
+#: kicad-6297/pcbnew/menubar_modedit.cpp:193
+#: kicad-6996/pcbnew/menubar_modedit.cpp:192
 msgid "&Size and Width"
 msgstr "サイズと幅(&S)"
 
-#: pcbnew/menubar_modedit.cpp:194
+#: kicad-6297/pcbnew/menubar_modedit.cpp:194
+#: kicad-6996/pcbnew/menubar_modedit.cpp:193
 msgid "Adjust width for texts and drawings"
 msgstr "テキストと図形の幅をアジャスト"
 
-#: pcbnew/menubar_modedit.cpp:199
+#: kicad-6297/pcbnew/menubar_modedit.cpp:199
+#: kicad-6996/pcbnew/menubar_modedit.cpp:198
 msgid "&Pad Setting"
 msgstr "パッドの設定(&P)"
 
-#: pcbnew/menubar_modedit.cpp:199
+#: kicad-6297/pcbnew/menubar_modedit.cpp:199
+#: kicad-6996/pcbnew/menubar_modedit.cpp:198
 msgid "Edit settings for new pads"
 msgstr "新規パッドの設定を編集"
 
-#: pcbnew/menubar_modedit.cpp:236 pcbnew/menubar_pcbframe.cpp:349
+#: kicad-6297/pcbnew/menubar_modedit.cpp:236
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:349
+#: kicad-6996/pcbnew/menubar_modedit.cpp:235
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:353
 msgid "&3D Viewer"
 msgstr "3Dビューア(&3)"
 
-#: pcbnew/menubar_modedit.cpp:243 pcbnew/menubar_pcbframe.cpp:360
+#: kicad-6297/pcbnew/menubar_modedit.cpp:243
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:360
 msgid "&Switch Canvas to Default"
 msgstr "描画キャンバスを 標準 に切替 (&S)"
 
-#: pcbnew/menubar_modedit.cpp:247 pcbnew/menubar_pcbframe.cpp:364
+#: kicad-6297/pcbnew/menubar_modedit.cpp:247
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:364
 msgid "Switch the canvas implementation to default"
-msgstr "描画キャンバスを標準へ切り替え"
+msgstr "描画キャンバスを標準へ切替"
 
-#: pcbnew/menubar_modedit.cpp:250 pcbnew/menubar_pcbframe.cpp:367
+#: kicad-6297/pcbnew/menubar_modedit.cpp:250
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:367
+#: kicad-6996/pcbnew/menubar_modedit.cpp:249
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:371
 msgid "Switch Canvas to Open&GL"
 msgstr "描画キャンバスを OpenGL(3D) に切替 (&G)"
 
-#: pcbnew/menubar_modedit.cpp:254 pcbnew/menubar_pcbframe.cpp:371
+#: kicad-6297/pcbnew/menubar_modedit.cpp:254
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:371
+#: kicad-6996/pcbnew/menubar_modedit.cpp:253
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:375
 msgid "Switch the canvas implementation to OpenGL"
-msgstr "描画キャンバスをOpenGLへ切り替え"
+msgstr "描画キャンバスをOpenGLへ切替"
 
-#: pcbnew/menubar_modedit.cpp:257 pcbnew/menubar_pcbframe.cpp:374
+#: kicad-6297/pcbnew/menubar_modedit.cpp:257
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:374
+#: kicad-6996/pcbnew/menubar_modedit.cpp:256
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:378
 msgid "Switch Canvas to &Cairo"
 msgstr "描画キャンバスを Cairo(2D) に切替 (&C)"
 
-#: pcbnew/menubar_modedit.cpp:261 pcbnew/menubar_pcbframe.cpp:378
+#: kicad-6297/pcbnew/menubar_modedit.cpp:261
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:378
+#: kicad-6996/pcbnew/menubar_modedit.cpp:260
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:382
 msgid "Switch the canvas implementation to Cairo"
-msgstr "描画キャンバスをCairoへ切り替え"
+msgstr "描画キャンバスをCairoへ切替"
 
-#: pcbnew/menubar_modedit.cpp:269
+#: kicad-6297/pcbnew/menubar_modedit.cpp:269
+#: kicad-6996/pcbnew/menubar_modedit.cpp:268
 msgid "&Pad"
 msgstr "パッド(&P)"
 
-#: pcbnew/menubar_modedit.cpp:269 pcbnew/modedit.cpp:965
+#: kicad-6297/pcbnew/menubar_modedit.cpp:269 kicad-6297/pcbnew/modedit.cpp:965
+#: kicad-6996/pcbnew/menubar_modedit.cpp:268 kicad-6996/pcbnew/modedit.cpp:983
 msgid "Add pad"
 msgstr "パッドを追加"
 
-#: pcbnew/menubar_modedit.cpp:282 pcbnew/menubar_pcbframe.cpp:413
-#: pcbnew/tool_modedit.cpp:170 pcbnew/tool_pcb.cpp:450
+#: kicad-6297/pcbnew/menubar_modedit.cpp:282
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:413
+#: kicad-6297/pcbnew/tool_modedit.cpp:170 kicad-6297/pcbnew/tool_pcb.cpp:450
+#: kicad-6996/pcbnew/menubar_modedit.cpp:281
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:417
+#: kicad-6996/pcbnew/tool_modedit.cpp:173 kicad-6996/pcbnew/tool_pcb.cpp:453
 msgid "Add graphic line or polygon"
 msgstr "図形ライン (またはポリゴン) を追加"
 
-#: pcbnew/menubar_modedit.cpp:292
+#: kicad-6297/pcbnew/menubar_modedit.cpp:292
+#: kicad-6996/pcbnew/menubar_modedit.cpp:291
 msgid "&Text"
 msgstr "テキスト(&T)"
 
-#: pcbnew/menubar_modedit.cpp:292
+#: kicad-6297/pcbnew/menubar_modedit.cpp:292
+#: kicad-6996/pcbnew/menubar_modedit.cpp:291
 msgid "Add graphic text"
 msgstr "図形テキストを追加"
 
-#: pcbnew/menubar_modedit.cpp:299
+#: kicad-6297/pcbnew/menubar_modedit.cpp:299
+#: kicad-6996/pcbnew/menubar_modedit.cpp:298
 msgid "A&nchor"
 msgstr "アンカー(&N)"
 
-#: pcbnew/menubar_modedit.cpp:300
+#: kicad-6297/pcbnew/menubar_modedit.cpp:300
+#: kicad-6996/pcbnew/menubar_modedit.cpp:299
 msgid "Place footprint reference anchor"
 msgstr "フットプリントのアンカー (基準点) を配置"
 
-#: pcbnew/menubar_modedit.cpp:308 pcbnew/menubar_pcbframe.cpp:485
+#: kicad-6297/pcbnew/menubar_modedit.cpp:308
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:485
+#: kicad-6996/pcbnew/menubar_modedit.cpp:307
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:489
 msgid "&Footprint Libraries Wizard"
 msgstr "フットプリント ライブラリ ウィザード(&F)"
 
-#: pcbnew/menubar_modedit.cpp:308 pcbnew/menubar_pcbframe.cpp:485
+#: kicad-6297/pcbnew/menubar_modedit.cpp:308
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:485
+#: kicad-6996/pcbnew/menubar_modedit.cpp:307
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:489
 msgid "Add footprint libraries with wizard"
 msgstr "ウィザード で フットプリント ライブラリ を追加"
 
-#: pcbnew/menubar_modedit.cpp:312 pcbnew/menubar_pcbframe.cpp:489
+#: kicad-6297/pcbnew/menubar_modedit.cpp:312
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:489
+#: kicad-6996/pcbnew/menubar_modedit.cpp:311
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:493
 msgid "Footprint Li&braries Manager"
 msgstr "フットプリント ライブラリの管理(&B)"
 
-#: pcbnew/menubar_modedit.cpp:324
+#: kicad-6297/pcbnew/menubar_modedit.cpp:324
+#: kicad-6996/pcbnew/menubar_modedit.cpp:323
 msgid "&Settings"
 msgstr "設定(&S)"
 
-#: pcbnew/menubar_modedit.cpp:324
+#: kicad-6297/pcbnew/menubar_modedit.cpp:324
+#: kicad-6996/pcbnew/menubar_modedit.cpp:323
 msgid "Change the footprint editor settings."
 msgstr "フットプリント エディタ設定の変更"
 
-#: pcbnew/menubar_modedit.cpp:341 pcbnew/menubar_pcbframe.cpp:648
-#: pcbnew/tool_modview.cpp:189
+#: kicad-6297/pcbnew/menubar_modedit.cpp:341
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:648
+#: kicad-6297/pcbnew/tool_modview.cpp:189
+#: kicad-6996/pcbnew/menubar_modedit.cpp:337
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:640
+#: kicad-6996/pcbnew/tool_modview.cpp:186
 msgid "Pcbnew &Manual"
 msgstr "Pcbnew マニュアル(&M)"
 
-#: pcbnew/menubar_modedit.cpp:342 pcbnew/menubar_pcbframe.cpp:649
+#: kicad-6297/pcbnew/menubar_modedit.cpp:342
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:649
+#: kicad-6996/pcbnew/menubar_modedit.cpp:338
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:641
 msgid "Open the Pcbnew Manual"
 msgstr "Pcbnew マニュアルを開く"
 
-#: pcbnew/menubar_modedit.cpp:363
+#: kicad-6297/pcbnew/menubar_modedit.cpp:363
+#: kicad-6996/pcbnew/menubar_modedit.cpp:364
 msgid "Di&mensions"
 msgstr "寸法(&M)"
 
-#: pcbnew/menubar_pcbframe.cpp:68
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:68
 msgid "&New"
 msgstr "新規(&N)"
 
-#: pcbnew/menubar_pcbframe.cpp:69
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:69
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:70
 msgid "Clear current board and initialize a new one"
 msgstr "現在のボードをクリアし，新規ボードに初期化"
 
-#: pcbnew/menubar_pcbframe.cpp:72
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:72
 msgid "&Open"
 msgstr "開く(&O)"
 
-#: pcbnew/menubar_pcbframe.cpp:74
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:74
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:75
 msgid "Delete current board and load new board"
 msgstr "現在のボードを破棄し．新規ボードを読み込む"
 
-#: pcbnew/menubar_pcbframe.cpp:95
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:95
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:96
 msgid "Open a recent opened board"
 msgstr "最近開いたボードを開く"
 
-#: pcbnew/menubar_pcbframe.cpp:100
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:100
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:99
 msgid "&Append Board"
 msgstr "ボードを追加(&A)"
 
-#: pcbnew/menubar_pcbframe.cpp:101
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:101
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:100
 msgid ""
 "Append another Pcbnew board to the current loaded board. Available only when "
 "Pcbnew runs in stand alone mode"
@@ -19268,194 +25419,245 @@ msgstr ""
 "現在読み込まれているボードに別の Pcbnew ボードを付け加えます。これは Pcbnew "
 "をスタンドアロンモードで実行している時のみ有効です。"
 
-#: pcbnew/menubar_pcbframe.cpp:111
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:111
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:115
 msgid "Save current board"
 msgstr "現在のボードを保存"
 
-#: pcbnew/menubar_pcbframe.cpp:121
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:121
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:125
 msgid "Sa&ve As..."
 msgstr "名前をつけて保存...(&V)"
 
-#: pcbnew/menubar_pcbframe.cpp:123
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:123
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:127
 msgid "Save the current board as..."
 msgstr "現在ボードを名前をつけて保存"
 
-#: pcbnew/menubar_pcbframe.cpp:130
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:130
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:134
 msgid "Sa&ve Copy As..."
 msgstr "名前をつけて保存...(&V)"
 
-#: pcbnew/menubar_pcbframe.cpp:132
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:132
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:136
 msgid "Save a copy of the current board as..."
 msgstr "現在のボードを名前をつけて保存"
 
-#: pcbnew/menubar_pcbframe.cpp:139
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:139
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:143
 msgid "Revert to Las&t"
 msgstr "リカバリ - バックアップより復帰(&T)"
 
-#: pcbnew/menubar_pcbframe.cpp:140
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:140
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:144
 msgid "Clear board and get previous backup version of board"
 msgstr "ボードをクリアし，一つ前に保存されたバージョンのボードを取得"
 
-#: pcbnew/menubar_pcbframe.cpp:144
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:144
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:148
 msgid "Resc&ue"
 msgstr "レスキュー(&U)"
 
-#: pcbnew/menubar_pcbframe.cpp:145
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:145
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:149
 msgid "Clear board and get last rescue file automatically saved by Pcbnew"
 msgstr "ボードをクリアし，直近のレスキューファイルを取得"
 
-#: pcbnew/menubar_pcbframe.cpp:152
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:152
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:156
 msgid "Footprint &Position (.pos) File"
 msgstr "フットプリント位置情報ファイル(.pos) (&P)"
 
-#: pcbnew/menubar_pcbframe.cpp:153
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:153
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:157
 msgid "Generate footprint position file for pick and place"
 msgstr "部品実装用のフットプリント座標ファイルを生成します"
 
-#: pcbnew/menubar_pcbframe.cpp:157
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:157
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:161
 msgid "&Drill (.drl) File"
 msgstr "ドリル ファイル(.drl) (&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:158
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:158
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:162
 msgid "Generate excellon2 drill file"
 msgstr "excellon2 ドリル ファイルの生成"
 
-#: pcbnew/menubar_pcbframe.cpp:162
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:162
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:166
 msgid "&Footprint (.rpt) Report"
 msgstr "フットプリント レポート(.rpt) (&F)"
 
-#: pcbnew/menubar_pcbframe.cpp:163
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:163
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:167
 msgid "Create a report of all footprints on the current board"
 msgstr "現在のボード中の全てのフットプリントのレポートを作成"
 
-#: pcbnew/menubar_pcbframe.cpp:167
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:167
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:171
 msgid "IPC-D-356 Netlist File"
 msgstr "IPC-D-356形式ネットリスト ファイル"
 
-#: pcbnew/menubar_pcbframe.cpp:168
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:168
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:172
 msgid "Generate IPC-D-356 netlist file"
 msgstr "IPC-D-356形式ネットリストの生成"
 
-#: pcbnew/menubar_pcbframe.cpp:172
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:172
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:176
 msgid "&BOM File"
 msgstr "BOM ファイル(&B)"
 
-#: pcbnew/menubar_pcbframe.cpp:173
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:173
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:177
 msgid "Create a bill of materials from schematic"
 msgstr "回路図からBOM(部品表)を作成する"
 
-#: pcbnew/menubar_pcbframe.cpp:177
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:177
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:181
 msgid "&Fabrication Outputs"
 msgstr "各種製造用ファイル出力(&F)"
 
-#: pcbnew/menubar_pcbframe.cpp:178
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:178
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:182
 msgid "Generate files for fabrication"
 msgstr "製造用ファイルの生成"
 
-#: pcbnew/menubar_pcbframe.cpp:185
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:185
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:189
 msgid "&Specctra Session"
 msgstr "Specctra セッション(&S)"
 
-#: pcbnew/menubar_pcbframe.cpp:186
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:186
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:190
 msgid "Import a routed \"Specctra Session\" (*.ses) file"
 msgstr "配線済みのSpecctra セッション ファイル (*.ses) のインポート"
 
-#: pcbnew/menubar_pcbframe.cpp:190
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:190
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:194
 msgid "&DXF File"
 msgstr "DXF ファイル(&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:195
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:195
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:199
 msgid "&Import"
 msgstr "インポート(&I)"
 
-#: pcbnew/menubar_pcbframe.cpp:196
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:196
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:200
 msgid "Import files"
 msgstr "ファイルのインポート"
 
-#: pcbnew/menubar_pcbframe.cpp:203
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:203
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:207
 msgid "&Specctra DSN"
 msgstr "Specctra DSN ファイル(&S)"
 
-#: pcbnew/menubar_pcbframe.cpp:204
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:204
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:208
 msgid "Export the current board to a \"Specctra DSN\" file"
 msgstr "現在のボードを \"Specctra DSN\" ファイルへエクスポート"
 
-#: pcbnew/menubar_pcbframe.cpp:208
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:208
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:212
 msgid "&GenCAD"
 msgstr "GenCAD(&G)"
 
-#: pcbnew/menubar_pcbframe.cpp:208
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:208
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:212
 msgid "Export GenCAD format"
 msgstr "GenCAD フォーマットでエクスポート"
 
-#: pcbnew/menubar_pcbframe.cpp:212
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:212
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:216
 msgid "&VRML"
 msgstr "VRML(&V)"
 
-#: pcbnew/menubar_pcbframe.cpp:213
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:213
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:217
 msgid "Export a VRML board representation"
 msgstr "VRML ボード表現でエクスポート"
 
-#: pcbnew/menubar_pcbframe.cpp:217
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:217
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:221
 msgid "I&DFv3"
 msgstr "IDFv3 (&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:217
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:217
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:221
 msgid "IDFv3 board and component export"
 msgstr "IDFv3 ボード フォーマットのエクスポート"
 
-#: pcbnew/menubar_pcbframe.cpp:221
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:221
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:225
 msgid "&Component (.cmp) File"
 msgstr "コンポーネント ファイル(.cmp) (&C)"
 
-#: pcbnew/menubar_pcbframe.cpp:222
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:222
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:226
 msgid ""
 "Export component file (*.cmp) for Eeschema footprint field back-annotation"
 msgstr ""
 "Eeschema フットプリント フィールド への バック アノテーションのために コン"
 "ポーネント ファイル (*.cmp) をエクスポート"
 
-#: pcbnew/menubar_pcbframe.cpp:226
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:226
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:230
 msgid "E&xport"
 msgstr "エクスポート(&x)"
 
-#: pcbnew/menubar_pcbframe.cpp:227
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:227
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:231
 msgid "Export board"
 msgstr "ボードのエクスポート"
 
-#: pcbnew/menubar_pcbframe.cpp:232
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:232
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:236
 msgid "Page s&ettings"
 msgstr "ページ設定(&e)"
 
-#: pcbnew/menubar_pcbframe.cpp:233 pcbnew/tool_pcb.cpp:228
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:233
+#: kicad-6297/pcbnew/tool_pcb.cpp:228
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:237
+#: kicad-6996/pcbnew/tool_pcb.cpp:228
 msgid "Page settings for paper size and texts"
 msgstr "ページ設定 (用紙サイズ 及び テキスト)"
 
-#: pcbnew/menubar_pcbframe.cpp:237 pcbnew/tool_pcb.cpp:247
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:237
+#: kicad-6297/pcbnew/tool_pcb.cpp:247
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:241
+#: kicad-6996/pcbnew/tool_pcb.cpp:247
 msgid "Print board"
 msgstr "ボードの印刷"
 
-#: pcbnew/menubar_pcbframe.cpp:241
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:241
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:245
 msgid "Export SV&G"
 msgstr "SVG ファイルのエクスポート(&G)"
 
-#: pcbnew/menubar_pcbframe.cpp:242
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:242
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:246
 msgid "Export a board file in Scalable Vector Graphics format"
 msgstr "SVG(Scalable Vector Graphics) 形式でエクスポート"
 
-#: pcbnew/menubar_pcbframe.cpp:246
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:246
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:250
 msgid "P&lot"
 msgstr "プロット(&l)"
 
-#: pcbnew/menubar_pcbframe.cpp:247
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:247
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:251
 msgid "Plot board in HPGL, PostScript or Gerber RS-274X format)"
 msgstr "ボードをHPGLかPostScript, ガーバー(RS-274X フォーマット)で出図"
 
-#: pcbnew/menubar_pcbframe.cpp:256
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:256
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:260
 msgid "&Archive Footprints in a Project Library"
 msgstr "プロジェクト ライブラリへフットプリントをアーカイブ(&A)"
 
-#: pcbnew/menubar_pcbframe.cpp:257
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:257
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:261
 msgid ""
 "Archive footprints in an existing library in footprint Lib table(do not "
 "remove other footprints in this lib)"
@@ -19463,11 +25665,13 @@ msgstr ""
 "フットプリント ライブラリ テーブルにある既存のライブラリへフットプリントを"
 "アーカイブ (このライブラリにある他のフットプリントを削除しないこと)"
 
-#: pcbnew/menubar_pcbframe.cpp:262
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:262
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:266
 msgid "&Create Library and Archive Footprints"
 msgstr "フットプリントのアーカイブとライブラリの作成(&C)"
 
-#: pcbnew/menubar_pcbframe.cpp:263
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:263
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:267
 msgid ""
 "Archive all footprints in a new library\n"
 "(if this library already exists, it will be deleted)"
@@ -19475,361 +25679,466 @@ msgstr ""
 "新しいライブラリへ全てのフットプリントをアーカイブ\n"
 "(このライブラリが存在していた場合は削除されます)"
 
-#: pcbnew/menubar_pcbframe.cpp:269
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:269
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:273
 msgid "Arc&hive Footprints"
 msgstr "フットプリントのアーカイブ(&h)"
 
-#: pcbnew/menubar_pcbframe.cpp:270
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:270
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:274
 msgid "Archive or add footprints in a library file"
 msgstr "ライブラリ ファイル中のフットプリントをアーカイブか追加"
 
-#: pcbnew/menubar_pcbframe.cpp:274
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:274
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:278
 msgid "Close Pcbnew"
 msgstr "Pcbnew の終了"
 
-#: pcbnew/menubar_pcbframe.cpp:286 pcbnew/tool_modedit.cpp:188
-#: pcbnew/tool_pcb.cpp:470
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:286
+#: kicad-6297/pcbnew/tool_modedit.cpp:188 kicad-6297/pcbnew/tool_pcb.cpp:470
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:290
+#: kicad-6996/pcbnew/tool_modedit.cpp:191 kicad-6996/pcbnew/tool_pcb.cpp:473
 msgid "Delete items"
 msgstr "アイテムを削除"
 
-#: pcbnew/menubar_pcbframe.cpp:297
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:297
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:301
 msgid "&Global Deletions"
 msgstr "広域削除(&G)"
 
-#: pcbnew/menubar_pcbframe.cpp:298
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:298
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:302
 msgid "Delete tracks, footprints, texts... on board"
 msgstr "ボードの配線、フットプリント、テキストなどを削除"
 
-#: pcbnew/menubar_pcbframe.cpp:302
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:302
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:306
 msgid "&Cleanup Tracks and Vias"
 msgstr "配線とビアのクリーンアップ(&C)"
 
-#: pcbnew/menubar_pcbframe.cpp:303
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:303
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:307
 msgid ""
 "Clean stubs, vias, delete break points, or unconnected tracks to pads and "
 "vias"
 msgstr "スタブ、ビアのクリーン、切断点やパッドとビアへの未接続配線を削除"
 
-#: pcbnew/menubar_pcbframe.cpp:307
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:307
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:311
 msgid "&Swap Layers"
 msgstr "レイヤの入替(&S)"
 
-#: pcbnew/menubar_pcbframe.cpp:308
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:308
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:312
 msgid "Swap tracks on copper layers or drawings on other layers"
 msgstr "配線層や他の図形層をスワップします"
 
-#: pcbnew/menubar_pcbframe.cpp:312
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:312
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:316
 msgid "Set Footp&rint Field Sizes"
 msgstr "フットプリント フィールドのサイズをセット(&r)"
 
-#: pcbnew/menubar_pcbframe.cpp:313
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:313
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:317
 msgid "Set text size and width of footprint fields."
 msgstr "フットプリント フィールドのテキストのサイズと高さをセット"
 
-#: pcbnew/menubar_pcbframe.cpp:351
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:351
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:355
 msgid "Show board in 3D viewer"
 msgstr "ボードを3Dビューアで表示"
 
-#: pcbnew/menubar_pcbframe.cpp:355
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:355
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:359
 msgid "&List Nets"
 msgstr "ネットの一覧を表示(&L)"
 
-#: pcbnew/menubar_pcbframe.cpp:355
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:355
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:359
 msgid "View a list of nets with names and id's"
 msgstr "名前とIDでネットのリストを見る"
 
-#: pcbnew/menubar_pcbframe.cpp:384
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:384
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:388
 msgid "&Footprint"
 msgstr "フットプリント(&F)"
 
-#: pcbnew/menubar_pcbframe.cpp:387 pcbnew/tool_pcb.cpp:436
-#: pcbnew/tools/common_actions.cpp:388
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:387
+#: kicad-6297/pcbnew/tool_pcb.cpp:436
+#: kicad-6297/pcbnew/tools/common_actions.cpp:392
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:391
+#: kicad-6996/pcbnew/tool_pcb.cpp:439
+#: kicad-6996/pcbnew/tools/common_actions.cpp:393
 msgid "Add footprints"
 msgstr "フットプリントを追加"
 
-#: pcbnew/menubar_pcbframe.cpp:389
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:389
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:393
 msgid "&Track"
 msgstr "配線(&T)"
 
-#: pcbnew/menubar_pcbframe.cpp:392 pcbnew/tool_pcb.cpp:439
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:392
+#: kicad-6297/pcbnew/tool_pcb.cpp:439
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:396
+#: kicad-6996/pcbnew/tool_pcb.cpp:442
 msgid "Add tracks and vias"
 msgstr "配線とビアを追加"
 
-#: pcbnew/menubar_pcbframe.cpp:395
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:395
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:399
 msgid "&Zone"
 msgstr "塗りつぶしゾーン(&Z)"
 
-#: pcbnew/menubar_pcbframe.cpp:395 pcbnew/tool_pcb.cpp:442
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:395
+#: kicad-6297/pcbnew/tool_pcb.cpp:442
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:399
+#: kicad-6996/pcbnew/tool_pcb.cpp:445
 msgid "Add filled zones"
 msgstr "塗りつぶしゾーンを追加"
 
-#: pcbnew/menubar_pcbframe.cpp:398
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:398
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:402
 msgid "&Keepout Area"
 msgstr "キープアウト(禁止)エリア(&K)"
 
-#: pcbnew/menubar_pcbframe.cpp:398 pcbnew/tool_pcb.cpp:446
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:398
+#: kicad-6297/pcbnew/tool_pcb.cpp:446
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:402
+#: kicad-6996/pcbnew/tool_pcb.cpp:449
 msgid "Add keepout areas"
 msgstr "キープアウト(禁止)エリアを追加"
 
-#: pcbnew/menubar_pcbframe.cpp:401
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:401
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:405
 msgid "Te&xt"
 msgstr "テキスト(&x)"
 
-#: pcbnew/menubar_pcbframe.cpp:401 pcbnew/tool_pcb.cpp:459
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:401
+#: kicad-6297/pcbnew/tool_pcb.cpp:459
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:405
+#: kicad-6996/pcbnew/tool_pcb.cpp:462
 msgid "Add text on copper layers or graphic text"
 msgstr "導体層または図形層にテキストを追加"
 
-#: pcbnew/menubar_pcbframe.cpp:419
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:419
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:423
 msgid "&Dimension"
 msgstr "寸法線(&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:423
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:423
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:427
 msgid "La&yer alignment target"
 msgstr "層合わせターゲット(&Y)"
 
-#: pcbnew/menubar_pcbframe.cpp:429
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:429
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:433
 msgid "Drill and &Place Offset"
 msgstr "ドリルと配置のオフセット(&F)"
 
-#: pcbnew/menubar_pcbframe.cpp:430 pcbnew/tool_pcb.cpp:475
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:430
+#: kicad-6297/pcbnew/tool_pcb.cpp:475
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:434
+#: kicad-6996/pcbnew/tool_pcb.cpp:478
 msgid "Place the origin point for drill and place files"
 msgstr "ドリル ファイル、実装ファイル用の原点を設定"
 
-#: pcbnew/menubar_pcbframe.cpp:434
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:434
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:438
 msgid "&Grid Origin"
 msgstr "グリッド原点(&G)"
 
-#: pcbnew/menubar_pcbframe.cpp:435 pcbnew/tool_modedit.cpp:192
-#: pcbnew/tool_pcb.cpp:480
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:435
+#: kicad-6297/pcbnew/tool_modedit.cpp:192 kicad-6297/pcbnew/tool_pcb.cpp:480
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:439
+#: kicad-6996/pcbnew/tool_modedit.cpp:195 kicad-6996/pcbnew/tool_pcb.cpp:483
 msgid "Set the origin point for the grid"
 msgstr "グリッドの原点をセット"
 
-#: pcbnew/menubar_pcbframe.cpp:441
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:441
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:445
 msgid "&Single Track"
 msgstr "単線(シングル) (&S)"
 
-#: pcbnew/menubar_pcbframe.cpp:442
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:442
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:446
 msgid "Interactively route a single track"
 msgstr "単線(シングル)のインタラクティブ配線"
 
-#: pcbnew/menubar_pcbframe.cpp:446
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:446
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:450
 msgid "&Differential Pair"
 msgstr "差動ペア(&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:447
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:447
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:451
 msgid "Interactively route a differential pair"
 msgstr "差動ペアのインタラクティブ配線"
 
-#: pcbnew/menubar_pcbframe.cpp:453
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:453
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:457
 msgid "&Tune Track Length"
 msgstr "配線長の調整(&T)"
 
-#: pcbnew/menubar_pcbframe.cpp:454 pcbnew/tools/common_actions.cpp:530
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:454
+#: kicad-6297/pcbnew/tools/common_actions.cpp:534
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:458
+#: kicad-6996/pcbnew/tools/common_actions.cpp:547
 msgid "Tune length of a single track"
 msgstr "単線の配線長を調整"
 
-#: pcbnew/menubar_pcbframe.cpp:458
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:458
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:462
 msgid "Tune Differential Pair &Length"
 msgstr "差動ペアの配線長の調整(&L)"
 
-#: pcbnew/menubar_pcbframe.cpp:459 pcbnew/tools/common_actions.cpp:534
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:459
+#: kicad-6297/pcbnew/tools/common_actions.cpp:538
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:463
+#: kicad-6996/pcbnew/tools/common_actions.cpp:551
 msgid "Tune length of a differential pair"
 msgstr "差動ペア配線の配線長を調整"
 
-#: pcbnew/menubar_pcbframe.cpp:463
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:463
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:467
 msgid "Tune Differential Pair &Skew/Phase"
 msgstr "差動ペアの遅延/位相の調整(&S)"
 
-#: pcbnew/menubar_pcbframe.cpp:464
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:464
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:468
 msgid "Tune skew/phase of a differential pair"
 msgstr "差動ペア配線の遅延(スキュー)/位相を調整"
 
-#: pcbnew/menubar_pcbframe.cpp:501
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:501
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:505
 msgid "&3D Shapes Libraries Downloader"
 msgstr "&3D シェイプ ライブラリ ダウンローダ"
 
-#: pcbnew/menubar_pcbframe.cpp:502
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:502
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:506
 msgid "Download from Github the 3D shape libraries with wizard"
 msgstr "ウィザードで 3D シェイプ ライブラリを Github からダウンロード"
 
-#: pcbnew/menubar_pcbframe.cpp:509
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:509
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:513
 msgid "Hide La&yers Manager"
 msgstr "レイヤ マネージャを非表示(&Y)"
 
-#: pcbnew/menubar_pcbframe.cpp:509
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:509
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:513
 msgid "Show La&yers Manager"
 msgstr "レイヤ マネージャを表示(&Y)"
 
-#: pcbnew/menubar_pcbframe.cpp:515
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:515
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:519
 msgid "Hide Microwa&ve Toolbar"
 msgstr "高周波支援設計のツールバーの表示/非表示(&v)"
 
-#: pcbnew/menubar_pcbframe.cpp:515 pcbnew/pcbnew_config.cpp:90
-#: pcbnew/tool_pcb.cpp:795
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:515
+#: kicad-6297/pcbnew/pcbnew_config.cpp:90 kicad-6297/pcbnew/tool_pcb.cpp:795
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:519
+#: kicad-6996/pcbnew/pcbnew_config.cpp:90 kicad-6996/pcbnew/tool_pcb.cpp:794
 msgid "Show Microwave Toolbar"
 msgstr "高周波設計支援ツール バーの表示"
 
-#: pcbnew/menubar_pcbframe.cpp:524
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:524
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:528
 msgid "&General"
 msgstr "一般設定(&G)"
 
-#: pcbnew/menubar_pcbframe.cpp:524
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:524
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:528
 msgid "Select general options for Pcbnew"
 msgstr "Pcbnew の一般オプションを選択"
 
-#: pcbnew/menubar_pcbframe.cpp:529
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:529
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:533
 msgid "&Display"
 msgstr "表示設定(&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:530
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:530
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:534
 msgid "Select how items (pads, tracks texts ... ) are displayed"
 msgstr "表示するアイテム (パッド・配線・テキストなど) を選択"
 
-#: pcbnew/menubar_pcbframe.cpp:534
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:534
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:538
 msgid "&Interactive Routing"
 msgstr "インタラクティブ ルーター(&I)"
 
-#: pcbnew/menubar_pcbframe.cpp:535
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:535
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:539
 msgid "Configure the interactive router."
 msgstr "インタラクティブ ルーターを設定する。"
 
-#: pcbnew/menubar_pcbframe.cpp:542
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:542
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:546
 msgid "G&rid"
 msgstr "グリッド(&R)"
 
-#: pcbnew/menubar_pcbframe.cpp:542
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:542
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:546
 msgid "Adjust user grid dimensions"
 msgstr "ユーザ グリッドのディメンジョンを合わせる"
 
-#: pcbnew/menubar_pcbframe.cpp:546
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:546
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:550
 msgid "Te&xts and Drawings"
 msgstr "テキストと図形(&X)"
 
-#: pcbnew/menubar_pcbframe.cpp:547
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:547
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:551
 msgid "Adjust dimensions for texts and drawings"
 msgstr "テキストと図形の寸法を調整"
 
-#: pcbnew/menubar_pcbframe.cpp:551
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:551
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:555
 msgid "&Pads"
 msgstr "パッド(&P)"
 
-#: pcbnew/menubar_pcbframe.cpp:551
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:551
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:555
 msgid "Adjust default pad characteristics"
 msgstr "デフォルトのパッドキャラクタを設定"
 
-#: pcbnew/menubar_pcbframe.cpp:555
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:555
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:559
 msgid "Pads &Mask Clearance"
 msgstr "パッド-マスク (レジスト) のクリアランス(&M)"
 
-#: pcbnew/menubar_pcbframe.cpp:556
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:556
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:560
 msgid "Adjust the global clearance between pads and the solder resist mask"
 msgstr "パッドに対するレジストのグローバルクリアランス(逃げ寸法)を調整します。"
 
-#: pcbnew/menubar_pcbframe.cpp:560
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:560
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:564
 msgid "&Differential Pairs"
 msgstr "差動ペア(&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:561
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:561
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:565
 msgid "Define the global gap/width for differential pairs."
 msgstr "差動ペア配線のギャップ/幅のグローバル設定"
 
-#: pcbnew/menubar_pcbframe.cpp:566
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:566
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:570
 msgid "Save dimension preferences"
 msgstr "寸法設定の保存"
 
-#: pcbnew/menubar_pcbframe.cpp:579
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:579
 msgid "&Save macros"
 msgstr "マクロの保存(&S)"
 
-#: pcbnew/menubar_pcbframe.cpp:580
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:580
 msgid "Save macros to file"
 msgstr "マクロをファイルに保存"
 
-#: pcbnew/menubar_pcbframe.cpp:584
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:584
 msgid "&Read macros"
 msgstr "マクロ読み込み(&R)"
 
-#: pcbnew/menubar_pcbframe.cpp:585
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:585
 msgid "Read macros from file"
 msgstr "マクロをファイルから読み込む"
 
-#: pcbnew/menubar_pcbframe.cpp:589
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:589
 msgid "Ma&cros"
 msgstr "マクロ(&C)"
 
-#: pcbnew/menubar_pcbframe.cpp:590
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:590
 msgid "Macros save/read operations"
 msgstr "マクロの保存/読み込み"
 
-#: pcbnew/menubar_pcbframe.cpp:609
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:609
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:603
 msgid "&Netlist"
 msgstr "ネットリスト(&N)"
 
-#: pcbnew/menubar_pcbframe.cpp:610
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:610
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:604
 msgid "Read the netlist and update board connectivity"
 msgstr "ネットリストを読み込み、ボードの結線情報を更新する"
 
-#: pcbnew/menubar_pcbframe.cpp:614
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:614
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:608
 msgid "&Layer Pair"
 msgstr "レイヤペア(&L)"
 
-#: pcbnew/menubar_pcbframe.cpp:614
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:614
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:608
 msgid "Change the active layer pair"
 msgstr "アクティブなレイヤペアを変更"
 
-#: pcbnew/menubar_pcbframe.cpp:618
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:618
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:612
 msgid "&DRC"
 msgstr "デザインルール チェック(&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:619 pcbnew/tool_pcb.cpp:273
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:619
+#: kicad-6297/pcbnew/tool_pcb.cpp:273
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:613
+#: kicad-6996/pcbnew/tool_pcb.cpp:273
 msgid "Perform design rules check"
 msgstr "デザインルール チェックの実行"
 
-#: pcbnew/menubar_pcbframe.cpp:622
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:622
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:616
 msgid "&FreeRoute"
 msgstr "&Freerouter"
 
-#: pcbnew/menubar_pcbframe.cpp:623
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:623
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:617
 msgid "Fast access to the web based FreeROUTE advanced router"
 msgstr "外部ルータ Freerouter とのデータ交換"
 
-#: pcbnew/menubar_pcbframe.cpp:628
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:628
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:622
 msgid "&Scripting Console"
 msgstr "スクリプト コンソール(&S)"
 
-#: pcbnew/menubar_pcbframe.cpp:629
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:629
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:623
 msgid "Show/Hide the Python scripting console"
 msgstr "Python スクリプト コンソールの表示/非表示"
 
-#: pcbnew/menubar_pcbframe.cpp:636 pcbnew/menubar_pcbframe.cpp:672
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:636
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:672
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:630
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:669
 msgid "&Design Rules"
 msgstr "デザインルール(&D)"
 
-#: pcbnew/menubar_pcbframe.cpp:637
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:637
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:631
 msgid "Open the design rules editor"
 msgstr "デザインルール エディタを開く"
 
-#: pcbnew/menubar_pcbframe.cpp:640
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:640
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:634
 msgid "&Layers Setup"
-msgstr "レイヤのセットアップ(&L)"
+msgstr "レイヤ セットアップ(&L)"
 
-#: pcbnew/menubar_pcbframe.cpp:640
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:640
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:634
 msgid "Enable and set layer properties"
 msgstr "レイヤのプロパティを設定して有効化"
 
-#: pcbnew/menubar_pcbframe.cpp:660
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:660
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:657
 msgid "Display the KiCad About dialog"
 msgstr "KiCad について ダイアログを表示"
 
-#: pcbnew/menubar_pcbframe.cpp:668
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:668
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:665
 msgid "Ro&ute"
 msgstr "配線(&u)"
 
-#: pcbnew/menubar_pcbframe.cpp:670
+#: kicad-6297/pcbnew/menubar_pcbframe.cpp:670
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:667
 msgid "D&imensions"
 msgstr "寸法(&I)"
 
-#: pcbnew/modedit.cpp:185
+#: kicad-6297/pcbnew/modedit.cpp:185 kicad-6996/pcbnew/modedit.cpp:186
 msgid ""
 "Current footprint changes will be lost and this operation cannot be undone. "
 "Continue?"
@@ -19837,15 +26146,15 @@ msgstr ""
 "現在のフットプリントの変更は破棄されます。 この操作はやり直しできません。続け"
 "ますか？"
 
-#: pcbnew/modedit.cpp:400
+#: kicad-6297/pcbnew/modedit.cpp:400 kicad-6996/pcbnew/modedit.cpp:405
 msgid "No board currently edited"
 msgstr "編集中のボードがありません"
 
-#: pcbnew/modedit.cpp:425
+#: kicad-6297/pcbnew/modedit.cpp:425 kicad-6996/pcbnew/modedit.cpp:430
 msgid "Unable to find the footprint source on the main board"
 msgstr "メインボードからフットプリントのソースを見つけられません"
 
-#: pcbnew/modedit.cpp:426
+#: kicad-6297/pcbnew/modedit.cpp:426 kicad-6996/pcbnew/modedit.cpp:431
 msgid ""
 "\n"
 "Cannot update the footprint"
@@ -19853,11 +26162,11 @@ msgstr ""
 "\n"
 "フットプリントを更新できません"
 
-#: pcbnew/modedit.cpp:435
+#: kicad-6297/pcbnew/modedit.cpp:435 kicad-6996/pcbnew/modedit.cpp:440
 msgid "A footprint source was found on the main board"
 msgstr "メインボード上からフットプリントのソースを見つけました"
 
-#: pcbnew/modedit.cpp:436
+#: kicad-6297/pcbnew/modedit.cpp:436 kicad-6996/pcbnew/modedit.cpp:441
 msgid ""
 "\n"
 "Cannot insert this footprint"
@@ -19865,163 +26174,204 @@ msgstr ""
 "\n"
 "このフットプリントを挿入できません"
 
-#: pcbnew/modedit.cpp:955
+#: kicad-6297/pcbnew/modedit.cpp:955 kicad-6996/pcbnew/modedit.cpp:973
 msgid "Place anchor"
 msgstr "アンカーの配置"
 
-#: pcbnew/modedit.cpp:959
+#: kicad-6297/pcbnew/modedit.cpp:959 kicad-6996/pcbnew/modedit.cpp:977
 msgid "Set grid origin"
 msgstr "グリッド原点のセット"
 
-#: pcbnew/modedit.cpp:969 pcbnew/tool_modedit.cpp:138
+#: kicad-6297/pcbnew/modedit.cpp:969 kicad-6297/pcbnew/tool_modedit.cpp:138
+#: kicad-6996/pcbnew/modedit.cpp:987 kicad-6996/pcbnew/tool_modedit.cpp:138
 msgid "Pad settings"
 msgstr "パッドの設定"
 
-#: pcbnew/modedit_onclick.cpp:252
+#: kicad-6297/pcbnew/modedit_onclick.cpp:252
+#: kicad-6996/pcbnew/modedit_onclick.cpp:251
 msgid "Copy Block (shift + drag mouse)"
 msgstr "ブロックをコピー(Shift + マウスドラッグ)"
 
-#: pcbnew/modedit_onclick.cpp:255
+#: kicad-6297/pcbnew/modedit_onclick.cpp:255
+#: kicad-6996/pcbnew/modedit_onclick.cpp:254
 msgid "Mirror Block (alt + drag mouse)"
 msgstr "ブロックをミラー(alt + マウスドラッグ)"
 
-#: pcbnew/modedit_onclick.cpp:258
+#: kicad-6297/pcbnew/modedit_onclick.cpp:258
+#: kicad-6996/pcbnew/modedit_onclick.cpp:257
 msgid "Rotate Block (ctrl + drag mouse)"
 msgstr "ブロックを回転(ctrl + マウスドラッグ)"
 
-#: pcbnew/modedit_onclick.cpp:261
+#: kicad-6297/pcbnew/modedit_onclick.cpp:261
+#: kicad-6996/pcbnew/modedit_onclick.cpp:260
 msgid "Delete Block (shift+ctrl + drag mouse)"
 msgstr "ブロックを削除(shift + ctrl + マウスドラッグ)"
 
-#: pcbnew/modedit_onclick.cpp:264
+#: kicad-6297/pcbnew/modedit_onclick.cpp:264
+#: kicad-6996/pcbnew/modedit_onclick.cpp:263
 msgid "Move Block Exactly"
 msgstr "数値を指定してブロックを移動"
 
-#: pcbnew/modedit_onclick.cpp:294
+#: kicad-6297/pcbnew/modedit_onclick.cpp:294
+#: kicad-6996/pcbnew/modedit_onclick.cpp:293
 msgid "Move Exactly"
 msgstr "数値を指定して移動"
 
-#: pcbnew/modedit_onclick.cpp:297
+#: kicad-6297/pcbnew/modedit_onclick.cpp:297
+#: kicad-6996/pcbnew/modedit_onclick.cpp:296
 msgid "Edit Footprint"
 msgstr "フットプリントを編集"
 
-#: pcbnew/modedit_onclick.cpp:300
+#: kicad-6297/pcbnew/modedit_onclick.cpp:300
+#: kicad-6996/pcbnew/modedit_onclick.cpp:299
 msgid "Transform Footprint"
 msgstr "フットプリントを変形"
 
-#: pcbnew/modedit_onclick.cpp:308 pcbnew/onrightclick.cpp:943
+#: kicad-6297/pcbnew/modedit_onclick.cpp:308
+#: kicad-6297/pcbnew/onrightclick.cpp:938
+#: kicad-6996/pcbnew/modedit_onclick.cpp:307
+#: kicad-6996/pcbnew/onrightclick.cpp:934
 msgid "Move Pad"
 msgstr "パッドを移動"
 
-#: pcbnew/modedit_onclick.cpp:312 pcbnew/onrightclick.cpp:948
+#: kicad-6297/pcbnew/modedit_onclick.cpp:312
+#: kicad-6297/pcbnew/onrightclick.cpp:943
+#: kicad-6996/pcbnew/modedit_onclick.cpp:311
+#: kicad-6996/pcbnew/onrightclick.cpp:939
 msgid "Edit Pad"
 msgstr "パッドを編集"
 
-#: pcbnew/modedit_onclick.cpp:315
+#: kicad-6297/pcbnew/modedit_onclick.cpp:315
+#: kicad-6996/pcbnew/modedit_onclick.cpp:314
 msgid "New Pad Settings"
 msgstr "パッド設定の更新"
 
-#: pcbnew/modedit_onclick.cpp:317
+#: kicad-6297/pcbnew/modedit_onclick.cpp:317
+#: kicad-6996/pcbnew/modedit_onclick.cpp:316
 msgid "Export Pad Settings"
 msgstr "パッド設定のエクスポート"
 
-#: pcbnew/modedit_onclick.cpp:318
+#: kicad-6297/pcbnew/modedit_onclick.cpp:318
+#: kicad-6996/pcbnew/modedit_onclick.cpp:317
 msgid "Delete Pad"
 msgstr "パッドを削除"
 
-#: pcbnew/modedit_onclick.cpp:321
+#: kicad-6297/pcbnew/modedit_onclick.cpp:321
+#: kicad-6996/pcbnew/modedit_onclick.cpp:320
 msgid "Duplicate Pad"
 msgstr "パッドを複製"
 
-#: pcbnew/modedit_onclick.cpp:324
+#: kicad-6297/pcbnew/modedit_onclick.cpp:324
+#: kicad-6996/pcbnew/modedit_onclick.cpp:323
 msgid "Move Pad Exactly"
 msgstr "数値を指定してパッドを移動"
 
-#: pcbnew/modedit_onclick.cpp:327
+#: kicad-6297/pcbnew/modedit_onclick.cpp:327
+#: kicad-6996/pcbnew/modedit_onclick.cpp:326
 msgid "Create Pad Array"
 msgstr "パッド配列を作成"
 
-#: pcbnew/modedit_onclick.cpp:335
+#: kicad-6297/pcbnew/modedit_onclick.cpp:335
+#: kicad-6996/pcbnew/modedit_onclick.cpp:334
 msgid "Global Pad Settings"
 msgstr "グローバル パッド設定"
 
-#: pcbnew/modedit_onclick.cpp:362
+#: kicad-6297/pcbnew/modedit_onclick.cpp:362
+#: kicad-6996/pcbnew/modedit_onclick.cpp:361
 msgid "Duplicate Text"
 msgstr "テキストを複製"
 
-#: pcbnew/modedit_onclick.cpp:367
+#: kicad-6297/pcbnew/modedit_onclick.cpp:367
+#: kicad-6996/pcbnew/modedit_onclick.cpp:366
 msgid "Create Text Array"
 msgstr "テキスト配列を作成"
 
-#: pcbnew/modedit_onclick.cpp:374 pcbnew/onrightclick.cpp:886
+#: kicad-6297/pcbnew/modedit_onclick.cpp:374
+#: kicad-6297/pcbnew/onrightclick.cpp:881
+#: kicad-6996/pcbnew/modedit_onclick.cpp:373
+#: kicad-6996/pcbnew/onrightclick.cpp:877
 msgid "Move Text Exactly"
 msgstr "数値を指定してテキストをコピー"
 
-#: pcbnew/modedit_onclick.cpp:396
+#: kicad-6297/pcbnew/modedit_onclick.cpp:396
+#: kicad-6996/pcbnew/modedit_onclick.cpp:395
 msgid "End edge"
 msgstr "エッジの終了"
 
-#: pcbnew/modedit_onclick.cpp:401
+#: kicad-6297/pcbnew/modedit_onclick.cpp:401
+#: kicad-6996/pcbnew/modedit_onclick.cpp:400
 msgid "Move Edge"
 msgstr "エッジを移動"
 
-#: pcbnew/modedit_onclick.cpp:405
+#: kicad-6297/pcbnew/modedit_onclick.cpp:405
+#: kicad-6996/pcbnew/modedit_onclick.cpp:404
 msgid "Duplicate Edge"
 msgstr "エッジを複製"
 
-#: pcbnew/modedit_onclick.cpp:408
+#: kicad-6297/pcbnew/modedit_onclick.cpp:408
+#: kicad-6996/pcbnew/modedit_onclick.cpp:407
 msgid "Move Edge Exactly"
 msgstr "数値を指定してエッジを移動"
 
-#: pcbnew/modedit_onclick.cpp:411
+#: kicad-6297/pcbnew/modedit_onclick.cpp:411
+#: kicad-6996/pcbnew/modedit_onclick.cpp:410
 msgid "Create Edge Array"
 msgstr "エッジ配列を作成"
 
-#: pcbnew/modedit_onclick.cpp:415
+#: kicad-6297/pcbnew/modedit_onclick.cpp:415
+#: kicad-6996/pcbnew/modedit_onclick.cpp:414
 msgid "Place edge"
 msgstr "エッジを配置"
 
-#: pcbnew/modedit_onclick.cpp:422
+#: kicad-6297/pcbnew/modedit_onclick.cpp:422
+#: kicad-6996/pcbnew/modedit_onclick.cpp:421
 msgid "Delete Edge"
 msgstr "エッジを削除"
 
-#: pcbnew/modedit_onclick.cpp:427
+#: kicad-6297/pcbnew/modedit_onclick.cpp:427
+#: kicad-6996/pcbnew/modedit_onclick.cpp:426
 msgid "Global Changes"
 msgstr "広域変更"
 
-#: pcbnew/modedit_onclick.cpp:429
+#: kicad-6297/pcbnew/modedit_onclick.cpp:429
+#: kicad-6996/pcbnew/modedit_onclick.cpp:428
 msgid "Change Body Items Width"
 msgstr "アイテムの幅を変更"
 
-#: pcbnew/modedit_onclick.cpp:431
+#: kicad-6297/pcbnew/modedit_onclick.cpp:431
+#: kicad-6996/pcbnew/modedit_onclick.cpp:430
 msgid "Change Body Items Layer"
 msgstr "アイテムのレイヤを変更"
 
-#: pcbnew/modedit_onclick.cpp:469
+#: kicad-6297/pcbnew/modedit_onclick.cpp:469
+#: kicad-6996/pcbnew/modedit_onclick.cpp:468
 msgid "Set Line Width"
 msgstr "線幅を設定"
 
-#: pcbnew/moduleframe.cpp:501
+#: kicad-6297/pcbnew/moduleframe.cpp:501 kicad-6996/pcbnew/moduleframe.cpp:504
 msgid "Save the changes to the footprint before closing?"
 msgstr "フットプリントの変更を終了前に保存しますか？"
 
-#: pcbnew/moduleframe.cpp:522
+#: kicad-6297/pcbnew/moduleframe.cpp:522 kicad-6996/pcbnew/moduleframe.cpp:525
 msgid "Library is not set, the footprint could not be saved."
 msgstr "ライブラリが選択されていないため，フットプリントを保存できません．"
 
-#: pcbnew/moduleframe.cpp:745
+#: kicad-6297/pcbnew/moduleframe.cpp:745 kicad-6996/pcbnew/moduleframe.cpp:752
 msgid "Footprint Editor "
 msgstr "フットプリント エディタ"
 
-#: pcbnew/moduleframe.cpp:752
+#: kicad-6297/pcbnew/moduleframe.cpp:752 kicad-6996/pcbnew/moduleframe.cpp:759
 msgid "(no active library)"
 msgstr "(アクティブなライブラリがありません)"
 
-#: pcbnew/moduleframe.cpp:761
+#: kicad-6297/pcbnew/moduleframe.cpp:761 kicad-6996/pcbnew/moduleframe.cpp:768
 msgid "Footprint Editor (active library: "
 msgstr "フットプリント エディタ (アクティブなライブラリ:"
 
-#: pcbnew/moduleframe.cpp:860 pcbnew/pcbnew_config.cpp:138
+#: kicad-6297/pcbnew/moduleframe.cpp:860
+#: kicad-6297/pcbnew/pcbnew_config.cpp:138
+#: kicad-6996/pcbnew/moduleframe.cpp:867
+#: kicad-6996/pcbnew/pcbnew_config.cpp:138
 #, c-format
 msgid ""
 "Error occurred saving the global footprint library table:\n"
@@ -20032,7 +26382,10 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/moduleframe.cpp:880 pcbnew/pcbnew_config.cpp:160
+#: kicad-6297/pcbnew/moduleframe.cpp:880
+#: kicad-6297/pcbnew/pcbnew_config.cpp:160
+#: kicad-6996/pcbnew/moduleframe.cpp:887
+#: kicad-6996/pcbnew/pcbnew_config.cpp:160
 #, c-format
 msgid ""
 "Error occurred saving project specific footprint library table:\n"
@@ -20043,15 +26396,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/modules.cpp:66
+#: kicad-6297/pcbnew/modules.cpp:66
+#: kicad-6996/pcbnew/dialogs/dialog_get_footprint_by_name_base.h:57
 msgid "Search for footprint"
 msgstr "フットプリントの検索"
 
-#: pcbnew/modview_frame.cpp:120
+#: kicad-6297/pcbnew/modview_frame.cpp:120
+#: kicad-6996/pcbnew/modview_frame.cpp:123
 msgid "Footprint Library Browser"
 msgstr "フットプリント ライブラリ ブラウザ"
 
-#: pcbnew/modview_frame.cpp:448
+#: kicad-6297/pcbnew/modview_frame.cpp:448
+#: kicad-6996/pcbnew/modview_frame.cpp:463
 #, c-format
 msgid ""
 "Could not load footprint \"%s\" from library \"%s\".\n"
@@ -20063,129 +26419,136 @@ msgstr ""
 "\n"
 "エラー %s."
 
-#: pcbnew/move_or_drag_track.cpp:714
+#: kicad-6297/pcbnew/move_or_drag_track.cpp:714
+#: kicad-6996/pcbnew/move_or_drag_track.cpp:714
 msgid "Unable to drag this segment: too many segments connected"
 msgstr "セグメントをドラッグできません: 接続されているセグメントが多すぎます"
 
-#: pcbnew/move_or_drag_track.cpp:785
+#: kicad-6297/pcbnew/move_or_drag_track.cpp:785
+#: kicad-6996/pcbnew/move_or_drag_track.cpp:785
 msgid "Unable to drag this segment: two collinear segments"
 msgstr "セグメントをドラッグできません: ２つの直線セグメントが重なっています"
 
-#: pcbnew/muonde.cpp:201
+#: kicad-6297/pcbnew/muonde.cpp:201 kicad-6996/pcbnew/muonde.cpp:253
 msgid "Length of Trace:"
 msgstr "配線長:"
 
-#: pcbnew/muonde.cpp:212
+#: kicad-6297/pcbnew/muonde.cpp:212 kicad-6996/pcbnew/muonde.cpp:264
 msgid "Requested length < minimum length"
 msgstr "指定された長さ < 最小長さ"
 
-#: pcbnew/muonde.cpp:226
+#: kicad-6297/pcbnew/muonde.cpp:226 kicad-6996/pcbnew/muonde.cpp:276
 msgid "Requested length too large"
 msgstr "指定された長さは長過ぎます"
 
-#: pcbnew/muonde.cpp:232
+#: kicad-6297/pcbnew/muonde.cpp:232 kicad-6996/pcbnew/muonde.cpp:282
 msgid "Component Value:"
 msgstr "コンポーネントの定数:"
 
-#: pcbnew/muonde.cpp:588
+#: kicad-6297/pcbnew/muonde.cpp:588 kicad-6996/pcbnew/muonde.cpp:634
 msgid "Gap"
 msgstr "ギャップ"
 
-#: pcbnew/muonde.cpp:594
+#: kicad-6297/pcbnew/muonde.cpp:594 kicad-6996/pcbnew/muonde.cpp:640
 msgid "Stub"
 msgstr "スタブ"
 
-#: pcbnew/muonde.cpp:601
+#: kicad-6297/pcbnew/muonde.cpp:601 kicad-6996/pcbnew/muonde.cpp:647
 msgid "Arc Stub"
 msgstr "円弧スタブ"
 
-#: pcbnew/muonde.cpp:612 pcbnew/muonde.cpp:630
+#: kicad-6297/pcbnew/muonde.cpp:612 kicad-6297/pcbnew/muonde.cpp:630
+#: kicad-6996/pcbnew/muonde.cpp:658 kicad-6996/pcbnew/muonde.cpp:676
 msgid "Create microwave module"
 msgstr "高周波モジュールの作成"
 
-#: pcbnew/muonde.cpp:629
+#: kicad-6297/pcbnew/muonde.cpp:629 kicad-6996/pcbnew/muonde.cpp:675
 msgid "Angle in degrees:"
 msgstr "角度:"
 
-#: pcbnew/muonde.cpp:642
+#: kicad-6297/pcbnew/muonde.cpp:642 kicad-6996/pcbnew/muonde.cpp:688
 msgid "Incorrect number, abort"
 msgstr "無効な数, 中止"
 
-#: pcbnew/muonde.cpp:787
+#: kicad-6297/pcbnew/muonde.cpp:787 kicad-6996/pcbnew/muonde.cpp:833
 msgid "Complex shape"
 msgstr "複雑なシェイプ"
 
-#: pcbnew/muonde.cpp:808
+#: kicad-6297/pcbnew/muonde.cpp:808 kicad-6996/pcbnew/muonde.cpp:854
 msgid "Read Shape Description File..."
 msgstr "シェイプの説明を読む"
 
-#: pcbnew/muonde.cpp:813
+#: kicad-6297/pcbnew/muonde.cpp:813 kicad-6996/pcbnew/muonde.cpp:859
 msgid "Symmetrical"
 msgstr "対称"
 
-#: pcbnew/muonde.cpp:816
+#: kicad-6297/pcbnew/muonde.cpp:816 kicad-6996/pcbnew/muonde.cpp:862
 msgid "Shape Option"
 msgstr "シェイプのオプション"
 
-#: pcbnew/muonde.cpp:848
+#: kicad-6297/pcbnew/muonde.cpp:848 kicad-6996/pcbnew/muonde.cpp:894
 msgid "Read descr shape file"
 msgstr "シェイプの説明を読む"
 
-#: pcbnew/muonde.cpp:863
+#: kicad-6297/pcbnew/muonde.cpp:863 kicad-6996/pcbnew/muonde.cpp:909
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: pcbnew/muonde.cpp:951
+#: kicad-6297/pcbnew/muonde.cpp:951 kicad-6996/pcbnew/muonde.cpp:997
 msgid "Shape has a null size!"
 msgstr "シェイプが無効なサイズです！"
 
-#: pcbnew/muonde.cpp:957
+#: kicad-6297/pcbnew/muonde.cpp:957 kicad-6996/pcbnew/muonde.cpp:1003
 msgid "Shape has no points!"
 msgstr "シェイプに点がありません！"
 
-#: pcbnew/muonde.cpp:1049
+#: kicad-6297/pcbnew/muonde.cpp:1049 kicad-6996/pcbnew/muonde.cpp:1095
 msgid "No pad for this footprint"
 msgstr "このフットプリントにはパッドがありません"
 
-#: pcbnew/muonde.cpp:1057
+#: kicad-6297/pcbnew/muonde.cpp:1057 kicad-6996/pcbnew/muonde.cpp:1103
 msgid "Only one pad for this footprint"
 msgstr "このフットプリントには1つだけパッドがあります"
 
-#: pcbnew/muonde.cpp:1068
+#: kicad-6297/pcbnew/muonde.cpp:1068 kicad-6996/pcbnew/muonde.cpp:1114
 msgid "Gap:"
 msgstr "ギャップ:"
 
-#: pcbnew/muonde.cpp:1068
+#: kicad-6297/pcbnew/muonde.cpp:1068 kicad-6996/pcbnew/muonde.cpp:1114
 msgid "Create Microwave Gap"
 msgstr "高周波用ギャップの作成"
 
-#: pcbnew/muwave_command.cpp:64
+#: kicad-6297/pcbnew/muwave_command.cpp:64
+#: kicad-6996/pcbnew/muwave_command.cpp:64
 msgid "Add Gap"
 msgstr "ギャップの追加"
 
-#: pcbnew/muwave_command.cpp:68
+#: kicad-6297/pcbnew/muwave_command.cpp:68
+#: kicad-6996/pcbnew/muwave_command.cpp:68
 msgid "Add Stub"
 msgstr "スタブの追加"
 
-#: pcbnew/muwave_command.cpp:72
+#: kicad-6297/pcbnew/muwave_command.cpp:72
+#: kicad-6996/pcbnew/muwave_command.cpp:72
 msgid "Add Arc Stub"
 msgstr "円弧スタブの追加"
 
-#: pcbnew/muwave_command.cpp:76
+#: kicad-6297/pcbnew/muwave_command.cpp:76
+#: kicad-6996/pcbnew/muwave_command.cpp:76
 msgid "Add Polynomial Shape"
 msgstr "ポリノミナル シェイプの追加"
 
-#: pcbnew/netlist.cpp:176
+#: kicad-6297/pcbnew/netlist.cpp:176 kicad-6996/pcbnew/netlist.cpp:207
 msgid "Components"
 msgstr "コンポーネント"
 
-#: pcbnew/netlist.cpp:223
+#: kicad-6297/pcbnew/netlist.cpp:223 kicad-6996/pcbnew/netlist.cpp:254
 #, c-format
 msgid "No footprint defined for component '%s'.\n"
 msgstr ""
 "コンポーネント '%s' に対して、フットプリントが割り当てられていません。\n"
 
-#: pcbnew/netlist.cpp:245
+#: kicad-6297/pcbnew/netlist.cpp:245 kicad-6996/pcbnew/netlist.cpp:276
 #, c-format
 msgid ""
 "* Warning: component '%s': board footprint '%s', netlist footprint '%s'\n"
@@ -20193,12 +26556,12 @@ msgstr ""
 "* 警告: コンポーネント '%s' ：ボードのフットプリント '%s' ：ネットリストの"
 "フットプリント '%s'\n"
 
-#: pcbnew/netlist.cpp:274
+#: kicad-6297/pcbnew/netlist.cpp:274 kicad-6996/pcbnew/netlist.cpp:305
 #, c-format
 msgid "Component '%s' footprint ID '%s' is not valid.\n"
 msgstr "コンポーネント '%s' のフットプリントID '%s' が不正です。\n"
 
-#: pcbnew/netlist.cpp:296
+#: kicad-6297/pcbnew/netlist.cpp:296 kicad-6996/pcbnew/netlist.cpp:326
 #, c-format
 msgid ""
 "Component '%s' footprint '%s' was not found in any libraries in the "
@@ -20207,7 +26570,8 @@ msgstr ""
 "コンポーネント '%s' フットプリント '%s' はどのライブラリからも見つけることが"
 "できませんでした。\n"
 
-#: pcbnew/netlist_reader.cpp:182
+#: kicad-6297/pcbnew/netlist_reader.cpp:182
+#: kicad-6996/pcbnew/netlist_reader.cpp:182
 #, c-format
 msgid ""
 "invalid footprint ID in\n"
@@ -20218,483 +26582,602 @@ msgstr ""
 "ファイル: <%s>\n"
 "行: %d"
 
-#: pcbnew/onleftclick.cpp:252 pcbnew/tools/drawing_tool.cpp:727
-#: pcbnew/tools/drawing_tool.cpp:902
+#: kicad-6297/pcbnew/onleftclick.cpp:258
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:727
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:902
+#: kicad-6996/pcbnew/onleftclick.cpp:259
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:726
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:901
 msgid "Graphic not allowed on Copper layers"
 msgstr "図形は導体レイヤに配置できません"
 
-#: pcbnew/onleftclick.cpp:276
+#: kicad-6297/pcbnew/onleftclick.cpp:282 kicad-6996/pcbnew/onleftclick.cpp:283
 msgid "Tracks on Copper layers only "
 msgstr "配線は導体レイヤのみです"
 
-#: pcbnew/onleftclick.cpp:335
+#: kicad-6297/pcbnew/onleftclick.cpp:341 kicad-6996/pcbnew/onleftclick.cpp:342
 msgid "Texts not allowed on Edge Cut layer"
 msgstr "基板外形レイヤには文字列を配置できません"
 
-#: pcbnew/onleftclick.cpp:384 pcbnew/tools/drawing_tool.cpp:313
+#: kicad-6297/pcbnew/onleftclick.cpp:390
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:313
+#: kicad-6996/pcbnew/onleftclick.cpp:391
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:313
 msgid "Dimension not allowed on Copper or Edge Cut layers"
 msgstr "寸法線は導体レイヤまたは外形線レイヤに配置できません"
 
-#: pcbnew/onrightclick.cpp:151
+#: kicad-6297/pcbnew/onrightclick.cpp:151
+#: kicad-6996/pcbnew/onrightclick.cpp:151
 msgid "Lock Footprint"
 msgstr "フットプリントをロック"
 
-#: pcbnew/onrightclick.cpp:158
+#: kicad-6297/pcbnew/onrightclick.cpp:158
+#: kicad-6996/pcbnew/onrightclick.cpp:158
 msgid "Unlock Footprint"
 msgstr "フットプリントをロック解除"
 
-#: pcbnew/onrightclick.cpp:166
+#: kicad-6297/pcbnew/onrightclick.cpp:166
+#: kicad-6996/pcbnew/onrightclick.cpp:166
 msgid "Automatically Place Footprint"
 msgstr "フットプリントを自動配置"
 
-#: pcbnew/onrightclick.cpp:173
+#: kicad-6297/pcbnew/onrightclick.cpp:173
+#: kicad-6996/pcbnew/onrightclick.cpp:173
 msgid "Automatically Route Footprint"
 msgstr "フットプリントの自動配線"
 
-#: pcbnew/onrightclick.cpp:194
+#: kicad-6297/pcbnew/onrightclick.cpp:194
+#: kicad-6996/pcbnew/onrightclick.cpp:194
 msgid "Move Drawing"
 msgstr "図形を移動"
 
-#: pcbnew/onrightclick.cpp:199
+#: kicad-6297/pcbnew/onrightclick.cpp:199
+#: kicad-6996/pcbnew/onrightclick.cpp:199
 msgid "Duplicate Drawing"
 msgstr "図形を複製"
 
-#: pcbnew/onrightclick.cpp:204
+#: kicad-6297/pcbnew/onrightclick.cpp:204
+#: kicad-6996/pcbnew/onrightclick.cpp:204
 msgid "Move Drawing Exactly"
 msgstr "数値を指定して図形を移動"
 
-#: pcbnew/onrightclick.cpp:209
+#: kicad-6297/pcbnew/onrightclick.cpp:209
+#: kicad-6996/pcbnew/onrightclick.cpp:209
 msgid "Create Drawing Array"
 msgstr "図形配列を作成"
 
-#: pcbnew/onrightclick.cpp:214
+#: kicad-6297/pcbnew/onrightclick.cpp:214
+#: kicad-6996/pcbnew/onrightclick.cpp:214
 msgid "Edit Drawing"
 msgstr "図形を編集"
 
-#: pcbnew/onrightclick.cpp:224
+#: kicad-6297/pcbnew/onrightclick.cpp:224
+#: kicad-6996/pcbnew/onrightclick.cpp:224
 msgid "Delete All Drawings on Layer"
 msgstr "レイヤ上の全ての図形描画を削除する"
 
-#: pcbnew/onrightclick.cpp:231
+#: kicad-6297/pcbnew/onrightclick.cpp:231
+#: kicad-6996/pcbnew/onrightclick.cpp:231
 msgid "Delete Zone Filling"
 msgstr "ゾーン塗りつぶしを削除"
 
-#: pcbnew/onrightclick.cpp:238
+#: kicad-6297/pcbnew/onrightclick.cpp:238
+#: kicad-6996/pcbnew/onrightclick.cpp:238
 msgid "Close Zone Outline"
 msgstr "ゾーンの外枠を閉じる"
 
-#: pcbnew/onrightclick.cpp:240
+#: kicad-6297/pcbnew/onrightclick.cpp:240
+#: kicad-6996/pcbnew/onrightclick.cpp:240
 msgid "Delete Last Corner"
 msgstr "一つ前の角を削除"
 
-#: pcbnew/onrightclick.cpp:266
+#: kicad-6297/pcbnew/onrightclick.cpp:266
+#: kicad-6996/pcbnew/onrightclick.cpp:266
 msgid "Edit Dimension"
 msgstr "寸法線を編集"
 
-#: pcbnew/onrightclick.cpp:270
+#: kicad-6297/pcbnew/onrightclick.cpp:270
+#: kicad-6996/pcbnew/onrightclick.cpp:270
 msgid "Move Dimension Text"
 msgstr "寸法線テキストを移動"
 
-#: pcbnew/onrightclick.cpp:275
+#: kicad-6297/pcbnew/onrightclick.cpp:275
+#: kicad-6996/pcbnew/onrightclick.cpp:275
 msgid "Duplicate Dimension"
 msgstr "寸法線を複製"
 
-#: pcbnew/onrightclick.cpp:280
+#: kicad-6297/pcbnew/onrightclick.cpp:280
+#: kicad-6996/pcbnew/onrightclick.cpp:280
 msgid "Move Dimension Exactly"
 msgstr "数値を指定して寸法線を移動"
 
-#: pcbnew/onrightclick.cpp:285
+#: kicad-6297/pcbnew/onrightclick.cpp:285
+#: kicad-6996/pcbnew/onrightclick.cpp:285
 msgid "Delete Dimension"
 msgstr "寸法線を削除"
 
-#: pcbnew/onrightclick.cpp:296
+#: kicad-6297/pcbnew/onrightclick.cpp:296
+#: kicad-6996/pcbnew/onrightclick.cpp:296
 msgid "Move Target"
 msgstr "ターゲットを移動"
 
-#: pcbnew/onrightclick.cpp:301
+#: kicad-6297/pcbnew/onrightclick.cpp:301
+#: kicad-6996/pcbnew/onrightclick.cpp:301
 msgid "Move Target Exactly"
 msgstr "数値を指定してターゲットを移動"
 
-#: pcbnew/onrightclick.cpp:306
+#: kicad-6297/pcbnew/onrightclick.cpp:306
+#: kicad-6996/pcbnew/onrightclick.cpp:306
 msgid "Duplicate Target"
 msgstr "ターゲットを複製"
 
-#: pcbnew/onrightclick.cpp:311
-msgid "Create Target Array"
-msgstr "ターゲット配列を作成"
-
-#: pcbnew/onrightclick.cpp:316
+#: kicad-6297/pcbnew/onrightclick.cpp:311
+#: kicad-6996/pcbnew/onrightclick.cpp:311
 msgid "Edit Target"
 msgstr "ターゲットを編集"
 
-#: pcbnew/onrightclick.cpp:320
+#: kicad-6297/pcbnew/onrightclick.cpp:315
+#: kicad-6996/pcbnew/onrightclick.cpp:315
 msgid "Delete Target"
 msgstr "ターゲットを削除"
 
-#: pcbnew/onrightclick.cpp:354
-msgid "Get and Move Footprint"
-msgstr "フットプリントの検索と移動"
-
-#: pcbnew/onrightclick.cpp:367
-msgid "Fill or Refill All Zones"
-msgstr "全てのゾーンを塗りつぶす"
-
-#: pcbnew/onrightclick.cpp:371
-msgid "Remove Filled Areas in All Zones"
-msgstr "全てのゾーンの塗りつぶしエリアを削除"
-
-#: pcbnew/onrightclick.cpp:379 pcbnew/onrightclick.cpp:385
-#: pcbnew/onrightclick.cpp:403 pcbnew/onrightclick.cpp:416
-#: pcbnew/onrightclick.cpp:481 pcbnew/onrightclick.cpp:574
+#: kicad-6297/pcbnew/onrightclick.cpp:374
+#: kicad-6297/pcbnew/onrightclick.cpp:380
+#: kicad-6297/pcbnew/onrightclick.cpp:398
+#: kicad-6297/pcbnew/onrightclick.cpp:411
+#: kicad-6297/pcbnew/onrightclick.cpp:476
+#: kicad-6297/pcbnew/onrightclick.cpp:569
+#: kicad-6996/pcbnew/onrightclick.cpp:374
+#: kicad-6996/pcbnew/onrightclick.cpp:380
+#: kicad-6996/pcbnew/onrightclick.cpp:398
+#: kicad-6996/pcbnew/onrightclick.cpp:411
+#: kicad-6996/pcbnew/onrightclick.cpp:472
+#: kicad-6996/pcbnew/onrightclick.cpp:565
 msgid "Select Working Layer"
 msgstr "作業レイヤの選択"
 
-#: pcbnew/onrightclick.cpp:393 pcbnew/onrightclick.cpp:473
-#: pcbnew/onrightclick.cpp:521
+#: kicad-6297/pcbnew/onrightclick.cpp:388
+#: kicad-6297/pcbnew/onrightclick.cpp:468
+#: kicad-6297/pcbnew/onrightclick.cpp:516
+#: kicad-6996/pcbnew/onrightclick.cpp:388
+#: kicad-6996/pcbnew/onrightclick.cpp:464
+#: kicad-6996/pcbnew/onrightclick.cpp:512
 msgid "Begin Track"
 msgstr "配線の開始"
 
-#: pcbnew/onrightclick.cpp:399 pcbnew/onrightclick.cpp:477
-#: pcbnew/onrightclick.cpp:645
+#: kicad-6297/pcbnew/onrightclick.cpp:394
+#: kicad-6297/pcbnew/onrightclick.cpp:472
+#: kicad-6297/pcbnew/onrightclick.cpp:640
+#: kicad-6996/pcbnew/onrightclick.cpp:394
+#: kicad-6996/pcbnew/onrightclick.cpp:468
+#: kicad-6996/pcbnew/onrightclick.cpp:636
 msgid "Select Track Width"
 msgstr "配線幅の選択"
 
-#: pcbnew/onrightclick.cpp:405
+#: kicad-6297/pcbnew/onrightclick.cpp:400
+#: kicad-6996/pcbnew/onrightclick.cpp:400
 msgid "Select Layer Pair for Vias"
 msgstr "ビアのレイヤペアを選択"
 
-#: pcbnew/onrightclick.cpp:424
+#: kicad-6297/pcbnew/onrightclick.cpp:419
+#: kicad-6996/pcbnew/onrightclick.cpp:419
 msgid "Footprint Documentation"
 msgstr "フットプリントのドキュメントを見る"
 
-#: pcbnew/onrightclick.cpp:434
+#: kicad-6297/pcbnew/onrightclick.cpp:429
+#: kicad-6996/pcbnew/onrightclick.cpp:429
 msgid "Global Spread and Place"
 msgstr "グローバル移動/配置"
 
-#: pcbnew/onrightclick.cpp:436
+#: kicad-6297/pcbnew/onrightclick.cpp:431
+#: kicad-6996/pcbnew/onrightclick.cpp:431
 msgid "Unlock All Footprints"
 msgstr "全てのフットプリントをアンロック"
 
-#: pcbnew/onrightclick.cpp:438
+#: kicad-6297/pcbnew/onrightclick.cpp:433
+#: kicad-6996/pcbnew/onrightclick.cpp:433
 msgid "Lock All Footprints"
 msgstr "全てのフットプリントをロック"
 
-#: pcbnew/onrightclick.cpp:441
+#: kicad-6297/pcbnew/onrightclick.cpp:436
+#: kicad-6996/pcbnew/onrightclick.cpp:436
 msgid "Spread out All Footprints"
 msgstr "全てのフットプリントを展開"
 
-#: pcbnew/onrightclick.cpp:443
+#: kicad-6297/pcbnew/onrightclick.cpp:438
+#: kicad-6996/pcbnew/onrightclick.cpp:438
 msgid "Spread out Footprints not Already on Board"
 msgstr "ボード上に無い全てのフットプリントを展開"
 
-#: pcbnew/onrightclick.cpp:446
+#: kicad-6297/pcbnew/onrightclick.cpp:441
+#: kicad-6996/pcbnew/onrightclick.cpp:441
 msgid "Automatically Place All Footprints"
 msgstr "全てのフットプリントを自動配置"
 
-#: pcbnew/onrightclick.cpp:448
+#: kicad-6297/pcbnew/onrightclick.cpp:443
+#: kicad-6996/pcbnew/onrightclick.cpp:443
 msgid "Automatically Place New Footprints"
 msgstr "新しいフットプリントを自動配置"
 
-#: pcbnew/onrightclick.cpp:450
+#: kicad-6297/pcbnew/onrightclick.cpp:445
+#: kicad-6996/pcbnew/onrightclick.cpp:445
 msgid "Automatically Place Next Footprints"
 msgstr "次のフットプリントを自動配置"
 
-#: pcbnew/onrightclick.cpp:453
+#: kicad-6297/pcbnew/onrightclick.cpp:448
 msgid "Orient All Footprints"
 msgstr "全てのフットプリントの方向を揃える"
 
-#: pcbnew/onrightclick.cpp:460
+#: kicad-6297/pcbnew/onrightclick.cpp:455
+#: kicad-6996/pcbnew/onrightclick.cpp:451
 msgid "Autoroute"
 msgstr "自動配線"
 
-#: pcbnew/onrightclick.cpp:462
+#: kicad-6297/pcbnew/onrightclick.cpp:457
+#: kicad-6996/pcbnew/onrightclick.cpp:453
 msgid "Select Layer Pair"
 msgstr "レイヤ ペアの選択"
 
-#: pcbnew/onrightclick.cpp:465
+#: kicad-6297/pcbnew/onrightclick.cpp:460
+#: kicad-6996/pcbnew/onrightclick.cpp:456
 msgid "Automatically Route All Footprints"
 msgstr "全てのフットプリントを自動配線"
 
-#: pcbnew/onrightclick.cpp:467
+#: kicad-6297/pcbnew/onrightclick.cpp:462
+#: kicad-6996/pcbnew/onrightclick.cpp:458
 msgid "Reset Unrouted"
 msgstr "未配線をリセット"
 
-#: pcbnew/onrightclick.cpp:497
+#: kicad-6297/pcbnew/onrightclick.cpp:492
+#: kicad-6996/pcbnew/onrightclick.cpp:488
 msgid "Zoom Block"
 msgstr "ブロックを拡大"
 
-#: pcbnew/onrightclick.cpp:501
+#: kicad-6297/pcbnew/onrightclick.cpp:496
+#: kicad-6996/pcbnew/onrightclick.cpp:492
 msgid "Flip Block"
 msgstr "ブロックを裏返す"
 
-#: pcbnew/onrightclick.cpp:502
+#: kicad-6297/pcbnew/onrightclick.cpp:497
+#: kicad-6996/pcbnew/onrightclick.cpp:493
 msgid "Rotate Block"
 msgstr "ブロックを回転"
 
-#: pcbnew/onrightclick.cpp:528
+#: kicad-6297/pcbnew/onrightclick.cpp:523
+#: kicad-6996/pcbnew/onrightclick.cpp:519
 msgid "Drag Via"
 msgstr "ビアを移動"
 
-#: pcbnew/onrightclick.cpp:537
+#: kicad-6297/pcbnew/onrightclick.cpp:532
+#: kicad-6996/pcbnew/onrightclick.cpp:528
 msgid "Move Node"
 msgstr "ノードを移動"
 
-#: pcbnew/onrightclick.cpp:543
+#: kicad-6297/pcbnew/onrightclick.cpp:538
+#: kicad-6996/pcbnew/onrightclick.cpp:534
 msgid "Drag Segments, Keep Slope"
 msgstr "セグメントのドラッグ移動 (角度保持)"
 
-#: pcbnew/onrightclick.cpp:548
+#: kicad-6297/pcbnew/onrightclick.cpp:543
+#: kicad-6996/pcbnew/onrightclick.cpp:539
 msgid "Drag Segment"
 msgstr "セグメントのドラッグ移動"
 
-#: pcbnew/onrightclick.cpp:553
+#: kicad-6297/pcbnew/onrightclick.cpp:548
+#: kicad-6996/pcbnew/onrightclick.cpp:544
 msgid "Duplicate Track"
 msgstr "配線を複製"
 
-#: pcbnew/onrightclick.cpp:558
+#: kicad-6297/pcbnew/onrightclick.cpp:553
+#: kicad-6996/pcbnew/onrightclick.cpp:549
 msgid "Move Track Exactly"
 msgstr "数値を指定してトラックを移動"
 
-#: pcbnew/onrightclick.cpp:563
+#: kicad-6297/pcbnew/onrightclick.cpp:558
+#: kicad-6996/pcbnew/onrightclick.cpp:554
 msgid "Create Track Array"
 msgstr "配線配列を作成"
 
-#: pcbnew/onrightclick.cpp:569
+#: kicad-6297/pcbnew/onrightclick.cpp:564
+#: kicad-6996/pcbnew/onrightclick.cpp:560
 msgid "Break Track"
 msgstr "配線を切断"
 
-#: pcbnew/onrightclick.cpp:579
+#: kicad-6297/pcbnew/onrightclick.cpp:574
+#: kicad-6996/pcbnew/onrightclick.cpp:570
 msgid "Place Node"
 msgstr "ノードを配置"
 
-#: pcbnew/onrightclick.cpp:586 pcbnew/router/length_tuner_tool.cpp:54
-#: pcbnew/router/router_tool.cpp:67
+#: kicad-6297/pcbnew/onrightclick.cpp:581
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:54
+#: kicad-6297/pcbnew/router/router_tool.cpp:67
+#: kicad-6996/pcbnew/onrightclick.cpp:577
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:53
+#: kicad-6996/pcbnew/router/router_tool.cpp:67
 msgid "End Track"
 msgstr "配線の終了"
 
-#: pcbnew/onrightclick.cpp:590 pcbnew/router/router_tool.cpp:78
+#: kicad-6297/pcbnew/onrightclick.cpp:585
+#: kicad-6297/pcbnew/router/router_tool.cpp:78
+#: kicad-6996/pcbnew/onrightclick.cpp:581
+#: kicad-6996/pcbnew/router/router_tool.cpp:78
 msgid "Place Through Via"
 msgstr "貫通ビアを配置"
 
-#: pcbnew/onrightclick.cpp:593
+#: kicad-6297/pcbnew/onrightclick.cpp:588
+#: kicad-6996/pcbnew/onrightclick.cpp:584
 msgid "Select Layer and Place Through Via"
 msgstr "スルーホールを配置するレイヤの選択"
 
-#: pcbnew/onrightclick.cpp:600 pcbnew/router/router_tool.cpp:84
+#: kicad-6297/pcbnew/onrightclick.cpp:595
+#: kicad-6297/pcbnew/router/router_tool.cpp:84
+#: kicad-6996/pcbnew/onrightclick.cpp:591
+#: kicad-6996/pcbnew/router/router_tool.cpp:84
 msgid "Place Blind/Buried Via"
 msgstr "ブラインドビア(BVH)/ベリッドホール(BH)を配置"
 
-#: pcbnew/onrightclick.cpp:604
+#: kicad-6297/pcbnew/onrightclick.cpp:599
+#: kicad-6996/pcbnew/onrightclick.cpp:595
 msgid "Select Layer and Place Blind/Buried Via"
 msgstr "レイヤを指定してブラインド/ベリッドビアを配置"
 
-#: pcbnew/onrightclick.cpp:610 pcbnew/router/router_tool.cpp:101
-msgid "Switch Track Posture"
-msgstr "配線の形状を変更"
-
-#: pcbnew/onrightclick.cpp:618
+#: kicad-6297/pcbnew/onrightclick.cpp:613
+#: kicad-6996/pcbnew/onrightclick.cpp:609
 msgid "Place Micro Via"
 msgstr "マイクロビアを配置"
 
-#: pcbnew/onrightclick.cpp:629
+#: kicad-6297/pcbnew/onrightclick.cpp:624
+#: kicad-6996/pcbnew/onrightclick.cpp:620
 msgid "Change Via Size and Drill"
 msgstr "ビア径/ドリル径を変更"
 
-#: pcbnew/onrightclick.cpp:635
+#: kicad-6297/pcbnew/onrightclick.cpp:630
+#: kicad-6996/pcbnew/onrightclick.cpp:626
 msgid "Change Segment Width"
 msgstr "セグメント幅を変更"
 
-#: pcbnew/onrightclick.cpp:639
+#: kicad-6297/pcbnew/onrightclick.cpp:634
+#: kicad-6996/pcbnew/onrightclick.cpp:630
 msgid "Change Track Width"
 msgstr "配線幅を変更"
 
-#: pcbnew/onrightclick.cpp:654
+#: kicad-6297/pcbnew/onrightclick.cpp:649
+#: kicad-6996/pcbnew/onrightclick.cpp:645
 msgid "Delete Via"
 msgstr "ビアを削除"
 
-#: pcbnew/onrightclick.cpp:661
+#: kicad-6297/pcbnew/onrightclick.cpp:656
+#: kicad-6996/pcbnew/onrightclick.cpp:652
 msgid "Delete Track"
 msgstr "配線を削除"
 
-#: pcbnew/onrightclick.cpp:663
+#: kicad-6297/pcbnew/onrightclick.cpp:658
+#: kicad-6996/pcbnew/onrightclick.cpp:654
 msgid "Delete Net"
 msgstr "ネットを削除"
 
-#: pcbnew/onrightclick.cpp:672
+#: kicad-6297/pcbnew/onrightclick.cpp:667
+#: kicad-6996/pcbnew/onrightclick.cpp:663
 msgid "Edit All Tracks and Vias"
 msgstr "配線とビアのグローバル編集"
 
-#: pcbnew/onrightclick.cpp:678
+#: kicad-6297/pcbnew/onrightclick.cpp:673
+#: kicad-6996/pcbnew/onrightclick.cpp:669
 msgid "Set Flags"
 msgstr "フラグをセット"
 
-#: pcbnew/onrightclick.cpp:680
+#: kicad-6297/pcbnew/onrightclick.cpp:675
+#: kicad-6996/pcbnew/onrightclick.cpp:671
 msgid "Locked: Yes"
 msgstr "セグメントロック: Yes"
 
-#: pcbnew/onrightclick.cpp:681
+#: kicad-6297/pcbnew/onrightclick.cpp:676
+#: kicad-6996/pcbnew/onrightclick.cpp:672
 msgid "Locked: No"
 msgstr "セグメントロック: No"
 
-#: pcbnew/onrightclick.cpp:690
+#: kicad-6297/pcbnew/onrightclick.cpp:685
+#: kicad-6996/pcbnew/onrightclick.cpp:681
 msgid "Track Locked: Yes"
 msgstr "配線のロック: Yes"
 
-#: pcbnew/onrightclick.cpp:691
+#: kicad-6297/pcbnew/onrightclick.cpp:686
+#: kicad-6996/pcbnew/onrightclick.cpp:682
 msgid "Track Locked: No"
 msgstr "配線のロック: No"
 
-#: pcbnew/onrightclick.cpp:693
+#: kicad-6297/pcbnew/onrightclick.cpp:688
+#: kicad-6996/pcbnew/onrightclick.cpp:684
 msgid "Net Locked: Yes"
 msgstr "ネットのロック: Yes"
 
-#: pcbnew/onrightclick.cpp:694
+#: kicad-6297/pcbnew/onrightclick.cpp:689
+#: kicad-6996/pcbnew/onrightclick.cpp:685
 msgid "Net Locked: No"
 msgstr "ネットのロック: No"
 
-#: pcbnew/onrightclick.cpp:708
+#: kicad-6297/pcbnew/onrightclick.cpp:703
+#: kicad-6996/pcbnew/onrightclick.cpp:699
 msgid "Place Edge Outline"
 msgstr "エッジを配置"
 
-#: pcbnew/onrightclick.cpp:714
+#: kicad-6297/pcbnew/onrightclick.cpp:709
+#: kicad-6996/pcbnew/onrightclick.cpp:705
 msgid "Place Corner"
 msgstr "角を配置"
 
-#: pcbnew/onrightclick.cpp:717
+#: kicad-6297/pcbnew/onrightclick.cpp:712
+#: kicad-6996/pcbnew/onrightclick.cpp:708
 msgid "Place Zone"
 msgstr "ゾーンを配置"
 
-#: pcbnew/onrightclick.cpp:724
+#: kicad-6297/pcbnew/onrightclick.cpp:719
+#: kicad-6996/pcbnew/onrightclick.cpp:715
 msgid "Keepout Area"
 msgstr "キープアウト(禁止)エリア"
 
-#: pcbnew/onrightclick.cpp:730
+#: kicad-6297/pcbnew/onrightclick.cpp:725
+#: kicad-6996/pcbnew/onrightclick.cpp:721
 msgid "Move Corner"
 msgstr "角を移動"
 
-#: pcbnew/onrightclick.cpp:732
+#: kicad-6297/pcbnew/onrightclick.cpp:727
+#: kicad-6996/pcbnew/onrightclick.cpp:723
 msgid "Delete Corner"
 msgstr "角を削除"
 
-#: pcbnew/onrightclick.cpp:737
+#: kicad-6297/pcbnew/onrightclick.cpp:732
+#: kicad-6996/pcbnew/onrightclick.cpp:728
 msgid "Create Corner"
 msgstr "角を作成"
 
-#: pcbnew/onrightclick.cpp:738
+#: kicad-6297/pcbnew/onrightclick.cpp:733
+#: kicad-6996/pcbnew/onrightclick.cpp:729
 msgid "Drag Outline Segment"
 msgstr "外枠セグメントをドラッグ"
 
-#: pcbnew/onrightclick.cpp:746
+#: kicad-6297/pcbnew/onrightclick.cpp:741
+#: kicad-6996/pcbnew/onrightclick.cpp:737
 msgid "Add Similar Zone"
 msgstr "類似ゾーンを追加"
 
-#: pcbnew/onrightclick.cpp:749
+#: kicad-6297/pcbnew/onrightclick.cpp:744
+#: kicad-6996/pcbnew/onrightclick.cpp:740
 msgid "Add Cutout Area"
 msgstr "切り抜きを追加"
 
-#: pcbnew/onrightclick.cpp:752
+#: kicad-6297/pcbnew/onrightclick.cpp:747
+#: kicad-6996/pcbnew/onrightclick.cpp:743
 msgid "Duplicate Zone Onto Layer"
 msgstr "レイヤ上にゾーンを複製"
 
-#: pcbnew/onrightclick.cpp:757
+#: kicad-6297/pcbnew/onrightclick.cpp:752
+#: kicad-6996/pcbnew/onrightclick.cpp:748
 msgid "Fill Zone"
 msgstr "ゾーンの塗りつぶし"
 
-#: pcbnew/onrightclick.cpp:763
+#: kicad-6297/pcbnew/onrightclick.cpp:758
+#: kicad-6996/pcbnew/onrightclick.cpp:754
 msgid "Remove Filled Areas in Zone"
 msgstr "ゾーンの塗りつぶしを削除"
 
-#: pcbnew/onrightclick.cpp:766
+#: kicad-6297/pcbnew/onrightclick.cpp:761
+#: kicad-6996/pcbnew/onrightclick.cpp:757
 msgid "Move Zone"
 msgstr "ゾーンを移動"
 
-#: pcbnew/onrightclick.cpp:769
+#: kicad-6297/pcbnew/onrightclick.cpp:764
+#: kicad-6996/pcbnew/onrightclick.cpp:760
 msgid "Move Zone Exactly"
 msgstr "数値を指定してゾーンを移動"
 
-#: pcbnew/onrightclick.cpp:774
+#: kicad-6297/pcbnew/onrightclick.cpp:769
+#: kicad-6996/pcbnew/onrightclick.cpp:765
 msgid "Edit Zone Properties"
 msgstr "ゾーンプロパティを編集"
 
-#: pcbnew/onrightclick.cpp:784
+#: kicad-6297/pcbnew/onrightclick.cpp:779
+#: kicad-6996/pcbnew/onrightclick.cpp:775
 msgid "Delete Cutout"
 msgstr "切り抜きを削除"
 
-#: pcbnew/onrightclick.cpp:787
+#: kicad-6297/pcbnew/onrightclick.cpp:782
+#: kicad-6996/pcbnew/onrightclick.cpp:778
 msgid "Delete Zone Outline"
 msgstr "ゾーン外枠を削除"
 
-#: pcbnew/onrightclick.cpp:807 pcbnew/onrightclick.cpp:999
-#: pcbnew/tools/common_actions.cpp:100
+#: kicad-6297/pcbnew/onrightclick.cpp:802
+#: kicad-6297/pcbnew/onrightclick.cpp:994
+#: kicad-6297/pcbnew/tools/common_actions.cpp:100
+#: kicad-6996/pcbnew/onrightclick.cpp:798
+#: kicad-6996/pcbnew/onrightclick.cpp:990
+#: kicad-6996/pcbnew/tools/common_actions.cpp:101
 msgid "Move"
 msgstr "移動"
 
-#: pcbnew/onrightclick.cpp:811
+#: kicad-6297/pcbnew/onrightclick.cpp:806
+#: kicad-6996/pcbnew/onrightclick.cpp:802
 msgid "Drag"
 msgstr "ドラッグ"
 
-#: pcbnew/onrightclick.cpp:816
+#: kicad-6297/pcbnew/onrightclick.cpp:811
+#: kicad-6996/pcbnew/onrightclick.cpp:807
 msgid "Rotate +"
 msgstr "左に回転"
 
-#: pcbnew/onrightclick.cpp:820
+#: kicad-6297/pcbnew/onrightclick.cpp:815
+#: kicad-6996/pcbnew/onrightclick.cpp:811
 msgid "Rotate -"
 msgstr "右に回転"
 
-#: pcbnew/onrightclick.cpp:821 pcbnew/onrightclick.cpp:1009
-#: pcbnew/tools/common_actions.cpp:125
+#: kicad-6297/pcbnew/onrightclick.cpp:816
+#: kicad-6297/pcbnew/onrightclick.cpp:1004
+#: kicad-6297/pcbnew/tools/common_actions.cpp:125
+#: kicad-6996/pcbnew/onrightclick.cpp:812
+#: kicad-6996/pcbnew/onrightclick.cpp:1000
+#: kicad-6996/pcbnew/tools/common_actions.cpp:126
 msgid "Flip"
 msgstr "裏返す"
 
-#: pcbnew/onrightclick.cpp:827
+#: kicad-6297/pcbnew/onrightclick.cpp:822
+#: kicad-6996/pcbnew/onrightclick.cpp:818
 msgid "Edit Parameters"
 msgstr "パラメータを編集"
 
-#: pcbnew/onrightclick.cpp:832
-msgid "Edit with Footprint Editor"
-msgstr "フットプリント エディタで編集"
-
-#: pcbnew/onrightclick.cpp:839
+#: kicad-6297/pcbnew/onrightclick.cpp:834
+#: kicad-6996/pcbnew/onrightclick.cpp:830
 msgid "Delete Footprint"
 msgstr "フットプリントを削除"
 
-#: pcbnew/onrightclick.cpp:846
+#: kicad-6297/pcbnew/onrightclick.cpp:841
+#: kicad-6996/pcbnew/onrightclick.cpp:837
 msgid "Move Footprint Exactly"
 msgstr "数値を指定してフットプリントを移動"
 
-#: pcbnew/onrightclick.cpp:851
+#: kicad-6297/pcbnew/onrightclick.cpp:846
+#: kicad-6996/pcbnew/onrightclick.cpp:842
 msgid "Duplicate Footprint"
 msgstr "フットプリントを複製"
 
-#: pcbnew/onrightclick.cpp:856
+#: kicad-6297/pcbnew/onrightclick.cpp:851
+#: kicad-6996/pcbnew/onrightclick.cpp:847
 msgid "Create Footprint Array"
 msgstr "フットプリント配列を作成"
 
-#: pcbnew/onrightclick.cpp:862
+#: kicad-6297/pcbnew/onrightclick.cpp:857
+#: kicad-6996/pcbnew/onrightclick.cpp:853
 msgid "Exchange Footprint(s)"
 msgstr "フットプリントの交換"
 
-#: pcbnew/onrightclick.cpp:902 pcbnew/onrightclick.cpp:1016
+#: kicad-6297/pcbnew/onrightclick.cpp:897
+#: kicad-6297/pcbnew/onrightclick.cpp:1011
+#: kicad-6996/pcbnew/onrightclick.cpp:893
+#: kicad-6996/pcbnew/onrightclick.cpp:1007
 msgid "Reset Size"
 msgstr "サイズをリセット"
 
-#: pcbnew/onrightclick.cpp:945
+#: kicad-6297/pcbnew/onrightclick.cpp:940
+#: kicad-6996/pcbnew/onrightclick.cpp:936
 msgid "Drag Pad"
 msgstr "パッドをドラッグ"
 
-#: pcbnew/onrightclick.cpp:953
+#: kicad-6297/pcbnew/onrightclick.cpp:948
+#: kicad-6996/pcbnew/onrightclick.cpp:944
 msgid "Copy Current Settings to this Pad"
 msgstr "このパッドに現在の設定をコピー"
 
-#: pcbnew/onrightclick.cpp:957
+#: kicad-6297/pcbnew/onrightclick.cpp:952
+#: kicad-6996/pcbnew/onrightclick.cpp:948
 msgid "Copy this Pad Settings to Current Settings"
 msgstr "このパッドの設定を現在の設定にコピー"
 
-#: pcbnew/onrightclick.cpp:962
+#: kicad-6297/pcbnew/onrightclick.cpp:957
+#: kicad-6996/pcbnew/onrightclick.cpp:953
 msgid "Edit All Pads"
 msgstr "パッドのグローバル編集"
 
-#: pcbnew/onrightclick.cpp:963
+#: kicad-6297/pcbnew/onrightclick.cpp:958
+#: kicad-6996/pcbnew/onrightclick.cpp:954
 msgid ""
 "Copy this pad's settings to all pads in this footprint (or similar "
 "footprints)"
@@ -20702,61 +27185,75 @@ msgstr ""
 "このパッドの設定をこのフットプリント (及び同様のフットプリント) 内の全ての"
 "パッドにコピー"
 
-#: pcbnew/onrightclick.cpp:971
+#: kicad-6297/pcbnew/onrightclick.cpp:966
+#: kicad-6996/pcbnew/onrightclick.cpp:962
 msgid "Automatically Route Pad"
 msgstr "パッドの自動配線"
 
-#: pcbnew/onrightclick.cpp:972
+#: kicad-6297/pcbnew/onrightclick.cpp:967
+#: kicad-6996/pcbnew/onrightclick.cpp:963
 msgid "Automatically Route Net"
 msgstr "ネットの自動配線"
 
-#: pcbnew/onrightclick.cpp:1002
+#: kicad-6297/pcbnew/onrightclick.cpp:997
+#: kicad-6996/pcbnew/onrightclick.cpp:993
 msgid "Copy"
 msgstr "コピー"
 
-#: pcbnew/onrightclick.cpp:1047
+#: kicad-6297/pcbnew/onrightclick.cpp:1042
+#: kicad-6996/pcbnew/onrightclick.cpp:1038
 msgid "Auto Width"
 msgstr "自動幅"
 
-#: pcbnew/onrightclick.cpp:1048
+#: kicad-6297/pcbnew/onrightclick.cpp:1043
+#: kicad-6996/pcbnew/onrightclick.cpp:1039
 msgid ""
 "Use the track width when starting on a track, otherwise the current track "
 "width"
 msgstr "現在の配線幅ではなく、通常時の配線幅を使用"
 
-#: pcbnew/onrightclick.cpp:1058
+#: kicad-6297/pcbnew/onrightclick.cpp:1053
+#: kicad-6996/pcbnew/onrightclick.cpp:1049
 msgid "Use Netclass Values"
 msgstr "ネットクラスの値を使用"
 
-#: pcbnew/onrightclick.cpp:1059
+#: kicad-6297/pcbnew/onrightclick.cpp:1054
+#: kicad-6996/pcbnew/onrightclick.cpp:1050
 msgid "Use track and via sizes from their Netclass values"
 msgstr "ネットクラスの値の配線とビア径を使用"
 
-#: pcbnew/onrightclick.cpp:1065
+#: kicad-6297/pcbnew/onrightclick.cpp:1060
+#: kicad-6996/pcbnew/onrightclick.cpp:1056
 #, c-format
 msgid "Track %s"
 msgstr "配線 %s"
 
-#: pcbnew/onrightclick.cpp:1068 pcbnew/onrightclick.cpp:1094
+#: kicad-6297/pcbnew/onrightclick.cpp:1063
+#: kicad-6297/pcbnew/onrightclick.cpp:1089
+#: kicad-6996/pcbnew/onrightclick.cpp:1059
+#: kicad-6996/pcbnew/onrightclick.cpp:1085
 msgid " uses NetClass"
 msgstr "ネットクラスを使用"
 
-#: pcbnew/onrightclick.cpp:1086
+#: kicad-6297/pcbnew/onrightclick.cpp:1081
+#: kicad-6996/pcbnew/onrightclick.cpp:1077
 #, c-format
 msgid "Via %s"
 msgstr "ビア %s"
 
-#: pcbnew/onrightclick.cpp:1090
+#: kicad-6297/pcbnew/onrightclick.cpp:1085
+#: kicad-6996/pcbnew/onrightclick.cpp:1081
 #, c-format
 msgid "Via %s, drill %s"
 msgstr "ビア %s (%s)"
 
-#: pcbnew/pad_edition_functions.cpp:211
+#: kicad-6297/pcbnew/pad_edition_functions.cpp:211
+#: kicad-6996/pcbnew/pad_edition_functions.cpp:208
 #, c-format
 msgid "Delete Pad (footprint %s %s) ?"
 msgstr "パッドを削除しますか(フットプリント %s %s) ?"
 
-#: pcbnew/pcb_parser.cpp:138
+#: kicad-6297/pcbnew/pcb_parser.cpp:139 kicad-6996/pcbnew/pcb_parser.cpp:135
 #, c-format
 msgid ""
 "invalid floating point number in\n"
@@ -20769,7 +27266,7 @@ msgstr ""
 "行数: %d\n"
 "文字: %d"
 
-#: pcbnew/pcb_parser.cpp:147
+#: kicad-6297/pcbnew/pcb_parser.cpp:148 kicad-6996/pcbnew/pcb_parser.cpp:144
 #, c-format
 msgid ""
 "missing floating point number in\n"
@@ -20782,23 +27279,28 @@ msgstr ""
 "行数: %d\n"
 "文字: %d"
 
-#: pcbnew/pcb_parser.cpp:591
+#: kicad-6297/pcbnew/pcb_parser.cpp:201 kicad-6996/pcbnew/pcb_parser.cpp:197
+#, c-format
+msgid "cannot interpret date code %d"
+msgstr "デートコード %d を解釈できません"
+
+#: kicad-6297/pcbnew/pcb_parser.cpp:655 kicad-6996/pcbnew/pcb_parser.cpp:650
 #, c-format
 msgid "page type \"%s\" is not valid "
 msgstr "ページタイプ \"%s\" は不正です! "
 
-#: pcbnew/pcb_parser.cpp:823
+#: kicad-6297/pcbnew/pcb_parser.cpp:887 kicad-6996/pcbnew/pcb_parser.cpp:882
 #, c-format
 msgid "Layer '%s' in file '%s' at line %d, is not in fixed layer hash"
 msgstr ""
 "レイヤ '%s' (ファイル: '%s' %d行) はこのレイヤハッシュで定義されていません。"
 
-#: pcbnew/pcb_parser.cpp:856
+#: kicad-6297/pcbnew/pcb_parser.cpp:920 kicad-6996/pcbnew/pcb_parser.cpp:915
 #, c-format
 msgid "%d is not a valid layer count"
 msgstr "%d は有効なレイヤ番号ではありません"
 
-#: pcbnew/pcb_parser.cpp:887
+#: kicad-6297/pcbnew/pcb_parser.cpp:951 kicad-6996/pcbnew/pcb_parser.cpp:946
 #, c-format
 msgid ""
 "Layer '%s' in file\n"
@@ -20811,20 +27313,22 @@ msgstr ""
 ", %d行, %d文字目) \n"
 "はこのレイヤセクションで定義されていません。"
 
-#: pcbnew/pcb_parser.cpp:1265
+#: kicad-6297/pcbnew/pcb_parser.cpp:1329 kicad-6996/pcbnew/pcb_parser.cpp:1324
 #, c-format
 msgid "duplicate NETCLASS name '%s' in file <%s> at line %d, offset %d"
 msgstr ""
 "重複したネットクラス '%s' がファイル <%s>  %d 行目, 位置 %d に見つかりました"
 
-#: pcbnew/pcb_parser.cpp:1908
+#: kicad-6297/pcbnew/pcb_parser.cpp:2012 kicad-6996/pcbnew/pcb_parser.cpp:2007
 #, c-format
 msgid "cannot handle footprint text type %s"
 msgstr "フットプリント テキスト タイプ %s は使用できません"
 
-#: pcbnew/pcb_parser.cpp:2316 pcbnew/pcb_parser.cpp:2322
-#: pcbnew/pcb_parser.cpp:2422 pcbnew/pcb_parser.cpp:2504
-#: pcbnew/pcb_parser.cpp:2568
+#: kicad-6297/pcbnew/pcb_parser.cpp:2420 kicad-6297/pcbnew/pcb_parser.cpp:2426
+#: kicad-6297/pcbnew/pcb_parser.cpp:2526 kicad-6297/pcbnew/pcb_parser.cpp:2608
+#: kicad-6297/pcbnew/pcb_parser.cpp:2672 kicad-6996/pcbnew/pcb_parser.cpp:2419
+#: kicad-6996/pcbnew/pcb_parser.cpp:2425 kicad-6996/pcbnew/pcb_parser.cpp:2530
+#: kicad-6996/pcbnew/pcb_parser.cpp:2612 kicad-6996/pcbnew/pcb_parser.cpp:2676
 #, c-format
 msgid ""
 "invalid net ID in\n"
@@ -20837,7 +27341,7 @@ msgstr ""
 "%d行目\n"
 "%d文字目"
 
-#: pcbnew/pcb_parser.cpp:2880
+#: kicad-6297/pcbnew/pcb_parser.cpp:2988 kicad-6996/pcbnew/pcb_parser.cpp:2992
 #, c-format
 msgid ""
 "There is a zone that belongs to a not existing net\n"
@@ -20848,16 +27352,16 @@ msgstr ""
 "\"%s\"\n"
 "に属しています。確認して修正して下さい。(DRC テストを実施)"
 
-#: pcbnew/pcbframe.cpp:619
+#: kicad-6297/pcbnew/pcbframe.cpp:619 kicad-6996/pcbnew/pcbframe.cpp:615
 #, c-format
 msgid "The auto save file '%s' could not be removed!"
 msgstr "自動保存ファイル '%s' は削除できませんでした!"
 
-#: pcbnew/pcbframe.cpp:976
+#: kicad-6297/pcbnew/pcbframe.cpp:988 kicad-6996/pcbnew/pcbframe.cpp:988
 msgid " [new file]"
 msgstr " [新規ファイル]"
 
-#: pcbnew/pcbnew.cpp:347
+#: kicad-6297/pcbnew/pcbnew.cpp:347 kicad-6996/pcbnew/pcbnew.cpp:337
 msgid ""
 "You have run Pcbnew for the first time using the new footprint library table "
 "method for finding footprints.\n"
@@ -20877,32 +27381,37 @@ msgstr ""
 "詳細は、CvPcb か Pcbnewのドキュメントにある \"フットプリント ライブラリ テー"
 "ブル\" の章を参照してください。"
 
-#: pcbnew/pcbnew_config.cpp:90 pcbnew/tool_pcb.cpp:795
+#: kicad-6297/pcbnew/pcbnew_config.cpp:90 kicad-6297/pcbnew/tool_pcb.cpp:795
+#: kicad-6996/pcbnew/pcbnew_config.cpp:90 kicad-6996/pcbnew/tool_pcb.cpp:794
 msgid "Hide Microwave Toolbar"
 msgstr "高周波設計支援ツール バーを隠す"
 
-#: pcbnew/pcbnew_config.cpp:446
+#: kicad-6297/pcbnew/pcbnew_config.cpp:446
 msgid "Save Macros File"
 msgstr "マクロ ファイルの保存"
 
-#: pcbnew/pcbnew_config.cpp:493
+#: kicad-6297/pcbnew/pcbnew_config.cpp:493
 msgid "Read Macros File"
 msgstr "マクロ ファイルの読込み"
 
-#: pcbnew/plot_board_layers.cpp:116 pcbnew/plot_board_layers.cpp:301
+#: kicad-6297/pcbnew/plot_board_layers.cpp:116
+#: kicad-6297/pcbnew/plot_board_layers.cpp:301
+#: kicad-6996/pcbnew/plot_board_layers.cpp:116
+#: kicad-6996/pcbnew/plot_board_layers.cpp:301
 #, c-format
 msgid "Your BOARD has a bad layer number for footprint %s"
 msgstr "ボードにフットプリント %s に対して不正なレイヤ番号があります"
 
-#: pcbnew/plugin.cpp:118
+#: kicad-6297/pcbnew/plugin.cpp:118 kicad-6996/pcbnew/plugin.cpp:120
 msgid "Enable <b>debug</b> logging for Footprint*() functions in this PLUGIN."
 msgstr "このプラグインで Footprint*() 関数の<b>デバッグ</b>を有効にします"
 
-#: pcbnew/plugin.cpp:122
+#: kicad-6297/pcbnew/plugin.cpp:122 kicad-6996/pcbnew/plugin.cpp:124
 msgid "Regular expression <b>footprint name</b> filter."
 msgstr "正規表現で<b>フットプリント名</b>を絞込み。"
 
-#: pcbnew/plugin.cpp:126
+#: kicad-6297/pcbnew/plugin.cpp:126 kicad-6996/eeschema/sch_plugin.cpp:131
+#: kicad-6996/pcbnew/plugin.cpp:128
 msgid ""
 "Enable transaction logging. The mere presence of this option turns on the "
 "logging, no need to set a Value."
@@ -20910,93 +27419,118 @@ msgstr ""
 "トランザクションのログを許可する。このオプションを有効にするだけでログを開始"
 "します。値のセットは必要ありません。"
 
-#: pcbnew/plugin.cpp:131
+#: kicad-6297/pcbnew/plugin.cpp:131 kicad-6996/eeschema/sch_plugin.cpp:136
+#: kicad-6996/pcbnew/plugin.cpp:133
 msgid "User name for <b>login</b> to some special library server."
 msgstr "特別なライブラリサーバーへ <b>ログイン</b> するためのユーザー名."
 
-#: pcbnew/plugin.cpp:135
+#: kicad-6297/pcbnew/plugin.cpp:135 kicad-6996/eeschema/sch_plugin.cpp:140
+#: kicad-6996/pcbnew/plugin.cpp:137
 msgid "Password for <b>login</b> to some special library server."
 msgstr "特別なライブラリサーバーへ <b>ログイン</b> するためのパスワード."
 
-#: pcbnew/plugin.cpp:143
+#: kicad-6297/pcbnew/plugin.cpp:143 kicad-6996/pcbnew/plugin.cpp:145
 msgid ""
 "Enter the python module which implements the PLUGIN::Footprint*() functions."
 msgstr ""
 "PLUGIN::Footprint*() 関数が定義されている Python モジュールを入力して下さい。"
 
-#: pcbnew/router/length_tuner_tool.cpp:51 pcbnew/router/router_tool.cpp:64
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:51
+#: kicad-6297/pcbnew/router/router_tool.cpp:64
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:50
+#: kicad-6996/pcbnew/router/router_tool.cpp:64
 msgid "New Track"
 msgstr "新規配線"
 
-#: pcbnew/router/length_tuner_tool.cpp:51 pcbnew/router/router_tool.cpp:64
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:51
+#: kicad-6297/pcbnew/router/router_tool.cpp:64
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:50
+#: kicad-6996/pcbnew/router/router_tool.cpp:64
 msgid "Starts laying a new track."
 msgstr "新規配線を開始"
 
-#: pcbnew/router/length_tuner_tool.cpp:54
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:54
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:53
 msgid "Stops laying the current meander."
 msgstr "現在の配線を終了する。"
 
-#: pcbnew/router/length_tuner_tool.cpp:57
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:57
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:56
 msgid "Length Tuning Settings"
 msgstr "配線長の調整設定"
 
-#: pcbnew/router/length_tuner_tool.cpp:57
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:57
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:56
 msgid "Sets the length tuning parameters for currently routed item."
 msgstr "作業中の配線長の調整パラメータを設定する。"
 
-#: pcbnew/router/length_tuner_tool.cpp:60
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:60
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:59
 msgid "Increase spacing"
 msgstr "間隔を広げる"
 
-#: pcbnew/router/length_tuner_tool.cpp:60
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:60
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:59
 msgid "Increase meander spacing by one step."
 msgstr "1ステップ間隔を広げます。"
 
-#: pcbnew/router/length_tuner_tool.cpp:63
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:63
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:62
 msgid "Decrease spacing"
 msgstr "間隔を狭める"
 
-#: pcbnew/router/length_tuner_tool.cpp:63
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:63
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:62
 msgid "Decrease meander spacing by one step."
 msgstr "1ステップ間隔を狭めます。"
 
-#: pcbnew/router/length_tuner_tool.cpp:66
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:66
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:65
 msgid "Increase amplitude"
 msgstr "振幅を大きく"
 
-#: pcbnew/router/length_tuner_tool.cpp:66
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:66
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:65
 msgid "Increase meander amplitude by one step."
 msgstr "1ステップ振幅を大きくします。"
 
-#: pcbnew/router/length_tuner_tool.cpp:69
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:69
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:68
 msgid "Decrease amplitude"
 msgstr "振幅を小さく"
 
-#: pcbnew/router/length_tuner_tool.cpp:69
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:69
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:68
 msgid "Decrease meander amplitude by one step."
 msgstr "1ステップ振幅を小さくします。"
 
-#: pcbnew/router/length_tuner_tool.cpp:83
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:83
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:82
 msgid "Length Tuner"
 msgstr "配線長調整"
 
-#: pcbnew/router/length_tuner_tool.cpp:245
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:245
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:244
 msgid "Tune Trace Length"
 msgstr "配線長の調整"
 
-#: pcbnew/router/length_tuner_tool.cpp:252
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:252
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:251
 msgid "Tune Diff Pair Length"
 msgstr "差動ペアの配線長を調整"
 
-#: pcbnew/router/length_tuner_tool.cpp:259
+#: kicad-6297/pcbnew/router/length_tuner_tool.cpp:259
+#: kicad-6996/pcbnew/router/length_tuner_tool.cpp:258
 msgid "Tune Diff Pair Skew"
 msgstr "差動ペアの遅延(スキュー)を調整"
 
-#: pcbnew/router/pns_diff_pair_placer.cpp:596
+#: kicad-6297/pcbnew/router/pns_diff_pair_placer.cpp:596
+#: kicad-6996/pcbnew/router/pns_diff_pair_placer.cpp:597
 msgid "Can't start a differential pair  in the middle of nowhere."
 msgstr "無効な場所のため、差動ペア配線を開始することが出来ませんでした。"
 
-#: pcbnew/router/pns_diff_pair_placer.cpp:605
+#: kicad-6297/pcbnew/router/pns_diff_pair_placer.cpp:605
+#: kicad-6996/pcbnew/router/pns_diff_pair_placer.cpp:606
 msgid ""
 "Unable to find complementary differential pair net. Make sure the names of "
 "the nets belonging to a differential pair end with either _N/_P or +/-."
@@ -21004,22 +27538,27 @@ msgstr ""
 "差動ペアの片方が見つかりませんでした。差動ペアのネット名の最初に、_N/_P や "
 "+/- を設定して下さい。"
 
-#: pcbnew/router/pns_diff_pair_placer.cpp:622
+#: kicad-6297/pcbnew/router/pns_diff_pair_placer.cpp:622
+#: kicad-6996/pcbnew/router/pns_diff_pair_placer.cpp:623
 msgid "Current track/via gap setting violates design rules for this net."
 msgstr ""
 "現在のトラック／ビア間隔の設定は、このネットに対するデザイン ルールに違反して"
 "います。"
 
-#: pcbnew/router/pns_diff_pair_placer.cpp:629
+#: kicad-6297/pcbnew/router/pns_diff_pair_placer.cpp:629
+#: kicad-6996/pcbnew/router/pns_diff_pair_placer.cpp:630
 msgid "Current track width setting violates design rules."
 msgstr "現在のトラック幅の設定は、デザイン ルールに違反しています。"
 
-#: pcbnew/router/pns_dp_meander_placer.cpp:78
-#: pcbnew/router/pns_meander_placer.cpp:68
+#: kicad-6297/pcbnew/router/pns_dp_meander_placer.cpp:78
+#: kicad-6297/pcbnew/router/pns_meander_placer.cpp:68
+#: kicad-6996/pcbnew/router/pns_dp_meander_placer.cpp:77
+#: kicad-6996/pcbnew/router/pns_meander_placer.cpp:66
 msgid "Please select a track whose length you want to tune."
 msgstr "配線長を調整したい配線を選択して下さい。"
 
-#: pcbnew/router/pns_dp_meander_placer.cpp:95
+#: kicad-6297/pcbnew/router/pns_dp_meander_placer.cpp:95
+#: kicad-6996/pcbnew/router/pns_dp_meander_placer.cpp:94
 msgid ""
 "Unable to find complementary differential pair net for length tuning. Make "
 "sure the names of the nets belonging to a differential pair end with either "
@@ -21028,32 +27567,43 @@ msgstr ""
 "差動ペアの片方が見つかりませんでした。差動ペアのネット名の最初に、_N/_P や "
 "+/- を設定して下さい。"
 
-#: pcbnew/router/pns_dp_meander_placer.cpp:372
-#: pcbnew/router/pns_meander_placer.cpp:245
+#: kicad-6297/pcbnew/router/pns_dp_meander_placer.cpp:372
+#: kicad-6297/pcbnew/router/pns_meander_placer.cpp:245
+#: kicad-6996/pcbnew/router/pns_dp_meander_placer.cpp:371
+#: kicad-6996/pcbnew/router/pns_meander_placer.cpp:243
 msgid "Too long: "
 msgstr "長すぎます:"
 
-#: pcbnew/router/pns_dp_meander_placer.cpp:375
-#: pcbnew/router/pns_meander_placer.cpp:248
+#: kicad-6297/pcbnew/router/pns_dp_meander_placer.cpp:375
+#: kicad-6297/pcbnew/router/pns_meander_placer.cpp:248
+#: kicad-6996/pcbnew/router/pns_dp_meander_placer.cpp:374
+#: kicad-6996/pcbnew/router/pns_meander_placer.cpp:246
 msgid "Too short: "
 msgstr "短すぎます:"
 
-#: pcbnew/router/pns_dp_meander_placer.cpp:378
-#: pcbnew/router/pns_meander_placer.cpp:251
+#: kicad-6297/pcbnew/router/pns_dp_meander_placer.cpp:378
+#: kicad-6297/pcbnew/router/pns_meander_placer.cpp:251
+#: kicad-6996/pcbnew/router/pns_dp_meander_placer.cpp:377
+#: kicad-6996/pcbnew/router/pns_meander_placer.cpp:249
 msgid "Tuned: "
 msgstr "調整:"
 
-#: pcbnew/router/pns_dp_meander_placer.cpp:381
-#: pcbnew/router/pns_meander_placer.cpp:254
-#: pcbnew/router/pns_meander_skew_placer.cpp:165
+#: kicad-6297/pcbnew/router/pns_dp_meander_placer.cpp:381
+#: kicad-6297/pcbnew/router/pns_meander_placer.cpp:254
+#: kicad-6297/pcbnew/router/pns_meander_skew_placer.cpp:165
+#: kicad-6996/pcbnew/router/pns_dp_meander_placer.cpp:380
+#: kicad-6996/pcbnew/router/pns_meander_placer.cpp:252
+#: kicad-6996/pcbnew/router/pns_meander_skew_placer.cpp:163
 msgid "?"
 msgstr "?"
 
-#: pcbnew/router/pns_meander_skew_placer.cpp:55
+#: kicad-6297/pcbnew/router/pns_meander_skew_placer.cpp:55
+#: kicad-6996/pcbnew/router/pns_meander_skew_placer.cpp:53
 msgid "Please select a differential pair trace you want to tune."
 msgstr "調整したい差動ペアを選択してください。"
 
-#: pcbnew/router/pns_meander_skew_placer.cpp:74
+#: kicad-6297/pcbnew/router/pns_meander_skew_placer.cpp:74
+#: kicad-6996/pcbnew/router/pns_meander_skew_placer.cpp:72
 msgid ""
 "Unable to find complementary differential pair net for skew tuning. Make "
 "sure the names of the nets belonging to a differential pair end with either "
@@ -21062,123 +27612,153 @@ msgstr ""
 "遅延(スキュー)を調整する差動ペアが見つかりませんでした。差動ペアのネット名"
 "は、_N/_P または +/-から始めるようにしてください。"
 
-#: pcbnew/router/pns_meander_skew_placer.cpp:156
+#: kicad-6297/pcbnew/router/pns_meander_skew_placer.cpp:156
+#: kicad-6996/pcbnew/router/pns_meander_skew_placer.cpp:154
 msgid "Too long: skew "
 msgstr "長すぎます: 遅延(スキュー)"
 
-#: pcbnew/router/pns_meander_skew_placer.cpp:159
+#: kicad-6297/pcbnew/router/pns_meander_skew_placer.cpp:159
+#: kicad-6996/pcbnew/router/pns_meander_skew_placer.cpp:157
 msgid "Too short: skew "
 msgstr "短すぎます: 遅延(スキュー)"
 
-#: pcbnew/router/pns_meander_skew_placer.cpp:162
+#: kicad-6297/pcbnew/router/pns_meander_skew_placer.cpp:162
+#: kicad-6996/pcbnew/router/pns_meander_skew_placer.cpp:160
 msgid "Tuned: skew "
 msgstr "調整済: 遅延(スキュー)"
 
-#: pcbnew/router/pns_tool_base.cpp:61
+#: kicad-6297/pcbnew/router/pns_tool_base.cpp:61
+#: kicad-6996/pcbnew/router/pns_tool_base.cpp:61
 msgid "Routing Options..."
 msgstr "配線オプション..."
 
-#: pcbnew/router/pns_tool_base.cpp:62
+#: kicad-6297/pcbnew/router/pns_tool_base.cpp:62
+#: kicad-6996/pcbnew/router/pns_tool_base.cpp:62
 msgid "Shows a dialog containing router options."
 msgstr "ルーター オプションのダイアログを表示"
 
-#: pcbnew/router/router_tool.cpp:67
+#: kicad-6297/pcbnew/router/router_tool.cpp:67
+#: kicad-6996/pcbnew/router/router_tool.cpp:67
 msgid "Stops laying the current track."
 msgstr "現在の配線を終了"
 
-#: pcbnew/router/router_tool.cpp:70
+#: kicad-6297/pcbnew/router/router_tool.cpp:70
+#: kicad-6996/pcbnew/router/router_tool.cpp:70
 msgid "Auto-end Track"
 msgstr "配線を自動的に終了"
 
-#: pcbnew/router/router_tool.cpp:70
+#: kicad-6297/pcbnew/router/router_tool.cpp:70
+#: kicad-6996/pcbnew/router/router_tool.cpp:70
 msgid "Automagically finishes currently routed track."
 msgstr "現在の配線を自動的に終了する."
 
-#: pcbnew/router/router_tool.cpp:74
+#: kicad-6297/pcbnew/router/router_tool.cpp:74
+#: kicad-6996/pcbnew/router/router_tool.cpp:74
 msgid "Drag Track/Via"
 msgstr "配線/ビアのドラッグ"
 
-#: pcbnew/router/router_tool.cpp:74
+#: kicad-6297/pcbnew/router/router_tool.cpp:74
+#: kicad-6996/pcbnew/router/router_tool.cpp:74
 msgid "Drags a track or a via."
 msgstr "配線/ビアのドラッグ"
 
-#: pcbnew/router/router_tool.cpp:79
+#: kicad-6297/pcbnew/router/router_tool.cpp:79
+#: kicad-6996/pcbnew/router/router_tool.cpp:79
 msgid "Adds a through-hole via at the end of currently routed track."
 msgstr "配線の最後に貫通ビアを追加する"
 
-#: pcbnew/router/router_tool.cpp:85
+#: kicad-6297/pcbnew/router/router_tool.cpp:85
+#: kicad-6996/pcbnew/router/router_tool.cpp:85
 msgid "Adds a blind or buried via at the end of currently routed track."
 msgstr "配線の最後にブラインド/ベリッドビアを追加する"
 
-#: pcbnew/router/router_tool.cpp:90
+#: kicad-6297/pcbnew/router/router_tool.cpp:90
+#: kicad-6996/pcbnew/router/router_tool.cpp:90
 msgid "Place Microvia"
 msgstr "マイクロビアの配置"
 
-#: pcbnew/router/router_tool.cpp:90
+#: kicad-6297/pcbnew/router/router_tool.cpp:90
+#: kicad-6996/pcbnew/router/router_tool.cpp:90
 msgid "Adds a microvia at the end of currently routed track."
 msgstr "配線の最後にマイクロビアを追加する"
 
-#: pcbnew/router/router_tool.cpp:95
+#: kicad-6297/pcbnew/router/router_tool.cpp:95
+#: kicad-6996/pcbnew/router/router_tool.cpp:95
 msgid "Custom Track/Via Size"
 msgstr "カスタム配線幅とビアサイズ"
 
-#: pcbnew/router/router_tool.cpp:96
+#: kicad-6297/pcbnew/router/router_tool.cpp:96
+#: kicad-6996/pcbnew/router/router_tool.cpp:96
 msgid "Shows a dialog for changing the track width and via size."
 msgstr "配線幅とビア サイズ設定のダイアログを表示"
 
-#: pcbnew/router/router_tool.cpp:102
-msgid "Switches posture of the currenly routed track."
+#: kicad-6297/pcbnew/router/router_tool.cpp:102
+#: kicad-6996/pcbnew/router/router_tool.cpp:102
+msgid "Switches posture of the currently routed track."
 msgstr "作業中の配線の形を変更する。"
 
-#: pcbnew/router/router_tool.cpp:107
+#: kicad-6297/pcbnew/router/router_tool.cpp:107
+#: kicad-6996/pcbnew/router/router_tool.cpp:107
 msgid "Differential Pair Dimensions..."
 msgstr "差動ペアの寸法"
 
-#: pcbnew/router/router_tool.cpp:108
+#: kicad-6297/pcbnew/router/router_tool.cpp:108
+#: kicad-6996/pcbnew/router/router_tool.cpp:108
 msgid "Sets the width and gap of the currently routed differential pair."
 msgstr "差動ペア配線の幅とギャップを設定する"
 
-#: pcbnew/router/router_tool.cpp:131
+#: kicad-6297/pcbnew/router/router_tool.cpp:131
+#: kicad-6996/pcbnew/router/router_tool.cpp:131
 msgid "Custom size"
 msgstr "ユーザ定義サイズ"
 
-#: pcbnew/router/router_tool.cpp:134
+#: kicad-6297/pcbnew/router/router_tool.cpp:134
+#: kicad-6996/pcbnew/router/router_tool.cpp:134
 msgid "Use the starting track width"
 msgstr "開始トラック幅を使用"
 
-#: pcbnew/router/router_tool.cpp:135
+#: kicad-6297/pcbnew/router/router_tool.cpp:135
+#: kicad-6996/pcbnew/router/router_tool.cpp:135
 msgid "Route using the width of the starting track."
 msgstr "配線開始時の配線幅でルーティングを行う。"
 
-#: pcbnew/router/router_tool.cpp:137
+#: kicad-6297/pcbnew/router/router_tool.cpp:137
+#: kicad-6996/pcbnew/router/router_tool.cpp:137
 msgid "Use net class values"
 msgstr "ネットクラスの値を使う"
 
-#: pcbnew/router/router_tool.cpp:138
+#: kicad-6297/pcbnew/router/router_tool.cpp:138
+#: kicad-6996/pcbnew/router/router_tool.cpp:138
 msgid "Use track and via sizes from the net class"
 msgstr "ネットクラスの値の配線とビア径を使う"
 
-#: pcbnew/router/router_tool.cpp:205
+#: kicad-6297/pcbnew/router/router_tool.cpp:205
+#: kicad-6996/pcbnew/router/router_tool.cpp:205
 msgid "Interactive Router"
 msgstr "インタラクティブ配線"
 
-#: pcbnew/router/router_tool.cpp:218
+#: kicad-6297/pcbnew/router/router_tool.cpp:218
+#: kicad-6996/pcbnew/router/router_tool.cpp:218
 msgid "Select Track/Via Width"
 msgstr "配線/ビア幅の選択"
 
-#: pcbnew/router/router_tool.cpp:404
+#: kicad-6297/pcbnew/router/router_tool.cpp:404
+#: kicad-6996/pcbnew/router/router_tool.cpp:404
 msgid "Blind/buried vias have to be enabled in the design settings."
 msgstr "ブラインド/ベリッド ビアは、設計時の設定で有効にしなければなりません。"
 
-#: pcbnew/router/router_tool.cpp:410
+#: kicad-6297/pcbnew/router/router_tool.cpp:410
+#: kicad-6996/pcbnew/router/router_tool.cpp:410
 msgid "Microvias have to be enabled in the design settings."
 msgstr "マイクロビアは、設計時の設定で有効にしなければなりません。"
 
-#: pcbnew/router/router_tool.cpp:417
+#: kicad-6297/pcbnew/router/router_tool.cpp:417
+#: kicad-6996/pcbnew/router/router_tool.cpp:417
 msgid "Only through vias are allowed on 2 layer boards."
 msgstr "単なる貫通穴は、2層基板で有効です。"
 
-#: pcbnew/router/router_tool.cpp:424
+#: kicad-6297/pcbnew/router/router_tool.cpp:424
+#: kicad-6996/pcbnew/router/router_tool.cpp:424
 msgid ""
 "Microvias can be placed only between the outer layers (F.Cu/B.Cu) and the "
 "ones directly adjacent to them."
@@ -21186,35 +27766,44 @@ msgstr ""
 "マイクロ ビアは外層レイヤ (F.Cu/B.Cu) の間にだけ配置できます。また、直接、外"
 "層レイヤに隣接したものとなります。"
 
-#: pcbnew/router/router_tool.cpp:649
+#: kicad-6297/pcbnew/router/router_tool.cpp:651
+#: kicad-6996/pcbnew/router/router_tool.cpp:654
 msgid "Route Track"
 msgstr "配線"
 
-#: pcbnew/router/router_tool.cpp:656
+#: kicad-6297/pcbnew/router/router_tool.cpp:658
+#: kicad-6996/pcbnew/router/router_tool.cpp:661
 msgid "Router Differential Pair"
 msgstr "差動ペアの配線"
 
 # この訳は本当？
 # 2014.03.08 Zenyouji
-#: pcbnew/sel_layer.cpp:301
+#: kicad-6297/pcbnew/sel_layer.cpp:301 kicad-6996/pcbnew/sel_layer.cpp:301
 msgid "Warning: The Top Layer and Bottom Layer are same."
 msgstr "警告: ペア層に同じレイヤが指定されています。"
 
-#: pcbnew/specctra_export.cpp:202
+#: kicad-6297/pcbnew/specctra_export.cpp:202
+#: kicad-6996/pcbnew/specctra_export.cpp:202
 msgid "BOARD exported OK."
 msgstr "ボードは正しくエクスポートされました。"
 
-#: pcbnew/specctra_export.cpp:207
+#: kicad-6297/pcbnew/specctra_export.cpp:207
+#: kicad-6996/pcbnew/specctra_export.cpp:207
 msgid "Unable to export, please fix and try again."
 msgstr "エクスポートできません。問題点を修正してやり直してください。"
 
-#: pcbnew/specctra_export.cpp:1025 pcbnew/specctra_export.cpp:1132
-#: pcbnew/specctra_export.cpp:1268
+#: kicad-6297/pcbnew/specctra_export.cpp:1034
+#: kicad-6297/pcbnew/specctra_export.cpp:1141
+#: kicad-6297/pcbnew/specctra_export.cpp:1277
+#: kicad-6996/pcbnew/specctra_export.cpp:1030
+#: kicad-6996/pcbnew/specctra_export.cpp:1137
+#: kicad-6996/pcbnew/specctra_export.cpp:1273
 #, c-format
 msgid "Unsupported DRAWSEGMENT type %s"
 msgstr "%s はサポートされていないDRAWSEGMENTタイプです"
 
-#: pcbnew/specctra_export.cpp:1157
+#: kicad-6297/pcbnew/specctra_export.cpp:1166
+#: kicad-6996/pcbnew/specctra_export.cpp:1162
 #, c-format
 msgid ""
 "Unable to find the next boundary segment with an endpoint of (%s mm, %s "
@@ -21224,7 +27813,8 @@ msgstr ""
 "終点 (%s mm, %s mm) で次の境界線が見つかりませんでした.\n"
 "基板外形図で、外形線を互いに隣接するように編集してください."
 
-#: pcbnew/specctra_export.cpp:1293
+#: kicad-6297/pcbnew/specctra_export.cpp:1302
+#: kicad-6996/pcbnew/specctra_export.cpp:1298
 #, c-format
 msgid ""
 "Unable to find the next keepout segment with an endpoint of (%s mm, %s mm).\n"
@@ -21233,216 +27823,262 @@ msgstr ""
 "終点 (%s mm, %s mm) で次の禁止領域の境界線が見つかりませんでした.\n"
 "基板外形図で、内部の境界線を互いに隣接するように編集してください."
 
-#: pcbnew/specctra_export.cpp:1452
+#: kicad-6297/pcbnew/specctra_export.cpp:1461
+#: kicad-6996/pcbnew/specctra_export.cpp:1457
 #, c-format
 msgid "Component with value of '%s' has empty reference id."
 msgstr "定数 \"%s\" のコンポーネントのリファレンスIDが空です。"
 
-#: pcbnew/specctra_export.cpp:1460
+#: kicad-6297/pcbnew/specctra_export.cpp:1469
+#: kicad-6996/pcbnew/specctra_export.cpp:1465
 #, c-format
 msgid "Multiple components have identical reference IDs of '%s'."
 msgstr "複数のコンポーネントが同一のリファレンスID '%s' を持っています。"
 
-#: pcbnew/specctra_import.cpp:84
+#: kicad-6297/pcbnew/specctra_import.cpp:84
+#: kicad-6996/pcbnew/specctra_import.cpp:84
 msgid "Merge Specctra Session file:"
 msgstr "Spectra セッションファイルのマージ"
 
-#: pcbnew/specctra_import.cpp:108
+#: kicad-6297/pcbnew/specctra_import.cpp:108
+#: kicad-6996/pcbnew/specctra_import.cpp:108
 msgid "BOARD may be corrupted, do not save it."
 msgstr "ボードが壊れているかもしれません、保存しないでください。"
 
-#: pcbnew/specctra_import.cpp:110
+#: kicad-6297/pcbnew/specctra_import.cpp:110
+#: kicad-6996/pcbnew/specctra_import.cpp:110
 msgid "Fix problem and try again."
 msgstr "問題を修正してやり直してください。"
 
-#: pcbnew/specctra_import.cpp:128
+#: kicad-6297/pcbnew/specctra_import.cpp:128
+#: kicad-6996/pcbnew/specctra_import.cpp:128
 msgid "Session file imported and merged OK."
 msgstr "セッション ファイルはインポートされ、正常にマージできました。"
 
-#: pcbnew/specctra_import.cpp:200 pcbnew/specctra_import.cpp:312
+#: kicad-6297/pcbnew/specctra_import.cpp:200
+#: kicad-6297/pcbnew/specctra_import.cpp:312
+#: kicad-6996/pcbnew/specctra_import.cpp:200
+#: kicad-6996/pcbnew/specctra_import.cpp:312
 #, c-format
 msgid "Session file uses invalid layer id \"%s\""
 msgstr "セッションファイルで不正なレイヤID \"%s\" が使用されています"
 
-#: pcbnew/specctra_import.cpp:253
+#: kicad-6297/pcbnew/specctra_import.cpp:253
+#: kicad-6996/pcbnew/specctra_import.cpp:253
 msgid "Session via padstack has no shapes"
 msgstr "セッション ビアのパッドスタックの形状がありません"
 
-#: pcbnew/specctra_import.cpp:260 pcbnew/specctra_import.cpp:278
-#: pcbnew/specctra_import.cpp:303
+#: kicad-6297/pcbnew/specctra_import.cpp:260
+#: kicad-6297/pcbnew/specctra_import.cpp:278
+#: kicad-6297/pcbnew/specctra_import.cpp:303
+#: kicad-6996/pcbnew/specctra_import.cpp:260
+#: kicad-6996/pcbnew/specctra_import.cpp:278
+#: kicad-6996/pcbnew/specctra_import.cpp:303
 #, c-format
 msgid "Unsupported via shape: %s"
 msgstr "サポートされていないビアの形: %s"
 
-#: pcbnew/specctra_import.cpp:359
+#: kicad-6297/pcbnew/specctra_import.cpp:359
+#: kicad-6996/pcbnew/specctra_import.cpp:359
 msgid "Session file is missing the \"session\" section"
 msgstr "セッションファイルに \"session\" セクションが見つかりません"
 
-#: pcbnew/specctra_import.cpp:367
+#: kicad-6297/pcbnew/specctra_import.cpp:367
+#: kicad-6996/pcbnew/specctra_import.cpp:367
 msgid "Session file is missing the \"routes\" section"
 msgstr "セッションファイルに \"routes\" セクションが見つかりません"
 
-#: pcbnew/specctra_import.cpp:370
+#: kicad-6297/pcbnew/specctra_import.cpp:370
+#: kicad-6996/pcbnew/specctra_import.cpp:370
 msgid "Session file is missing the \"library_out\" section"
 msgstr "セッションファイルに \"library_out\" セクションが見つかりません"
 
-#: pcbnew/specctra_import.cpp:397
+#: kicad-6297/pcbnew/specctra_import.cpp:397
+#: kicad-6996/pcbnew/specctra_import.cpp:396
 #, c-format
 msgid "Session file has 'reference' to non-existent component \"%s\""
 msgstr "セッションファイルが存在しないコンポーネント \"%s\" を参照しています。"
 
-#: pcbnew/specctra_import.cpp:545
+#: kicad-6297/pcbnew/specctra_import.cpp:545
+#: kicad-6996/pcbnew/specctra_import.cpp:543
 #, c-format
 msgid "A wire_via references a missing padstack \"%s\""
 msgstr "wire_via が失われたパッドスタック \"%s\" を参照しています"
 
-#: pcbnew/swap_layers.cpp:93
+#: kicad-6297/pcbnew/swap_layers.cpp:93 kicad-6996/pcbnew/swap_layers.cpp:93
 msgid "Swap Layers:"
 msgstr "レイヤの入替:"
 
-#: pcbnew/swap_layers.cpp:244 pcbnew/swap_layers.cpp:251
-#: pcbnew/swap_layers.cpp:329
+#: kicad-6297/pcbnew/swap_layers.cpp:244 kicad-6297/pcbnew/swap_layers.cpp:251
+#: kicad-6297/pcbnew/swap_layers.cpp:329 kicad-6996/pcbnew/swap_layers.cpp:244
+#: kicad-6996/pcbnew/swap_layers.cpp:251 kicad-6996/pcbnew/swap_layers.cpp:329
 msgid "No Change"
 msgstr "変更なし"
 
-#: pcbnew/swap_layers.cpp:284
+#: kicad-6297/pcbnew/swap_layers.cpp:284 kicad-6996/pcbnew/swap_layers.cpp:284
 msgid "&OK"
 msgstr "&OK"
 
-#: pcbnew/swap_layers.cpp:288
+#: kicad-6297/pcbnew/swap_layers.cpp:288 kicad-6996/pcbnew/swap_layers.cpp:288
 msgid "&Cancel"
 msgstr "キャンセル(&C)"
 
-#: pcbnew/tool_modedit.cpp:62
+#: kicad-6297/pcbnew/tool_modedit.cpp:62 kicad-6996/pcbnew/tool_modedit.cpp:62
 msgid "Create new library and save current footprint"
 msgstr "新規ライブラリを作成して現在のフットプリントを保存"
 
-#: pcbnew/tool_modedit.cpp:65 pcbnew/tool_pcb.cpp:237
+#: kicad-6297/pcbnew/tool_modedit.cpp:65 kicad-6297/pcbnew/tool_pcb.cpp:237
+#: kicad-6996/pcbnew/tool_modedit.cpp:65 kicad-6996/pcbnew/tool_pcb.cpp:237
 msgid "Open footprint viewer"
 msgstr "フットプリント ビューアを開く"
 
-#: pcbnew/tool_modedit.cpp:69
+#: kicad-6297/pcbnew/tool_modedit.cpp:69 kicad-6996/pcbnew/tool_modedit.cpp:69
 msgid "Delete part from active library"
 msgstr "アクティブなライブラリからパーツを削除"
 
-#: pcbnew/tool_modedit.cpp:73
+#: kicad-6297/pcbnew/tool_modedit.cpp:73 kicad-6996/pcbnew/tool_modedit.cpp:73
 msgid "New footprint"
 msgstr "新規フットプリント"
 
-#: pcbnew/tool_modedit.cpp:78
+#: kicad-6297/pcbnew/tool_modedit.cpp:78 kicad-6996/pcbnew/tool_modedit.cpp:78
 msgid "New footprint using the footprint wizard"
 msgstr "新しいフットプリントにフットプリント ウィザードを使用"
 
-#: pcbnew/tool_modedit.cpp:84
+#: kicad-6297/pcbnew/tool_modedit.cpp:84 kicad-6996/pcbnew/tool_modedit.cpp:84
 msgid "Load footprint from library"
 msgstr "ライブラリからフットプリントを開く"
 
-#: pcbnew/tool_modedit.cpp:89
+#: kicad-6297/pcbnew/tool_modedit.cpp:89 kicad-6996/pcbnew/tool_modedit.cpp:89
 msgid "Load footprint from current board"
 msgstr "現在のボードからフットプリントを読み込む"
 
-#: pcbnew/tool_modedit.cpp:93
+#: kicad-6297/pcbnew/tool_modedit.cpp:93 kicad-6996/pcbnew/tool_modedit.cpp:93
 msgid "Update footprint in current board"
 msgstr "現在のボードのフットプリントを更新"
 
-#: pcbnew/tool_modedit.cpp:97
+#: kicad-6297/pcbnew/tool_modedit.cpp:97 kicad-6996/pcbnew/tool_modedit.cpp:97
 msgid "Insert footprint into current board"
 msgstr "現在のボードへフットプリントを挿入"
 
-#: pcbnew/tool_modedit.cpp:101
+#: kicad-6297/pcbnew/tool_modedit.cpp:101
+#: kicad-6996/pcbnew/tool_modedit.cpp:101
 msgid "Import footprint"
 msgstr "フットプリントのインポート"
 
-#: pcbnew/tool_modedit.cpp:104
+#: kicad-6297/pcbnew/tool_modedit.cpp:104
+#: kicad-6996/pcbnew/tool_modedit.cpp:104
 msgid "Export footprint"
 msgstr "フットプリントのエクスポート"
 
-#: pcbnew/tool_modedit.cpp:109 pcbnew/help_common_strings.h:15
+#: kicad-6297/pcbnew/tool_modedit.cpp:109
+#: kicad-6996/pcbnew/tool_modedit.cpp:109
+#: kicad-6297/pcbnew/help_common_strings.h:15
+#: kicad-6996/pcbnew/help_common_strings.h:15
 msgid "Undo last edition"
 msgstr "一つ前の編集を元に戻す"
 
-#: pcbnew/tool_modedit.cpp:116
+#: kicad-6297/pcbnew/tool_modedit.cpp:116
+#: kicad-6996/pcbnew/tool_modedit.cpp:116
 msgid "Footprint properties"
 msgstr "フットプリントのプロパティ"
 
-#: pcbnew/tool_modedit.cpp:120
+#: kicad-6297/pcbnew/tool_modedit.cpp:120
+#: kicad-6996/pcbnew/tool_modedit.cpp:120
 msgid "Print footprint"
 msgstr "フットプリントを印刷"
 
-#: pcbnew/tool_modedit.cpp:144
+#: kicad-6297/pcbnew/tool_modedit.cpp:144
+#: kicad-6996/pcbnew/tool_modedit.cpp:144
 msgid "Check footprint"
 msgstr "フットプリントの確認"
 
-#: pcbnew/tool_modedit.cpp:166 pcbnew/tools/common_actions.cpp:418
-#: pcbnew/tools/module_tools.cpp:106
+#: kicad-6297/pcbnew/tool_modedit.cpp:166
+#: kicad-6297/pcbnew/tools/common_actions.cpp:422
+#: kicad-6297/pcbnew/tools/module_tools.cpp:106
+#: kicad-6996/pcbnew/tool_modedit.cpp:169
+#: kicad-6996/pcbnew/tools/common_actions.cpp:431
+#: kicad-6996/pcbnew/tools/module_tools.cpp:106
 msgid "Add pads"
 msgstr "パッドを追加"
 
-#: pcbnew/tool_modedit.cpp:183
+#: kicad-6297/pcbnew/tool_modedit.cpp:183
+#: kicad-6996/pcbnew/tool_modedit.cpp:186
 msgid "Place the footprint reference anchor"
 msgstr "フットプリントのアンカー (基準点) を配置"
 
-#: pcbnew/tool_modedit.cpp:212
+#: kicad-6297/pcbnew/tool_modedit.cpp:212
+#: kicad-6996/pcbnew/tool_modedit.cpp:215
 msgid "Display Polar Coord ON"
 msgstr "極座標表示 ON"
 
-#: pcbnew/tool_modedit.cpp:224
+#: kicad-6297/pcbnew/tool_modedit.cpp:224
+#: kicad-6996/pcbnew/tool_modedit.cpp:228
 msgid "Change Cursor Shape"
 msgstr "カーソルの形状を変更"
 
-#: pcbnew/tool_modedit.cpp:229
+#: kicad-6297/pcbnew/tool_modedit.cpp:229
+#: kicad-6996/pcbnew/tool_modedit.cpp:234
 msgid "Show Pads Sketch"
 msgstr "パッドのスケッチ表示"
 
-#: pcbnew/tool_modedit.cpp:233
+#: kicad-6297/pcbnew/tool_modedit.cpp:233
+#: kicad-6996/pcbnew/tool_modedit.cpp:238
 msgid "Show Texts Sketch"
 msgstr "テキストのスケッチ表示"
 
-#: pcbnew/tool_modedit.cpp:237
+#: kicad-6297/pcbnew/tool_modedit.cpp:237
+#: kicad-6996/pcbnew/tool_modedit.cpp:242
 msgid "Show Edges Sketch"
 msgstr "エッジのスケッチ表示"
 
-#: pcbnew/tool_modedit.cpp:241 pcbnew/tool_pcb.cpp:390
+#: kicad-6297/pcbnew/tool_modedit.cpp:241 kicad-6297/pcbnew/tool_pcb.cpp:390
+#: kicad-6996/pcbnew/tool_modedit.cpp:246 kicad-6996/pcbnew/tool_pcb.cpp:389
 msgid "Enable high contrast display mode"
 msgstr "ハイコントラスト表示モードを有効化"
 
-#: pcbnew/tool_modview.cpp:62
+#: kicad-6297/pcbnew/tool_modview.cpp:62 kicad-6996/pcbnew/tool_modview.cpp:62
 msgid "Select footprint to browse"
 msgstr "参照するパーツの選択"
 
-#: pcbnew/tool_modview.cpp:67
+#: kicad-6297/pcbnew/tool_modview.cpp:67 kicad-6996/pcbnew/tool_modview.cpp:67
 msgid "Display previous footprint"
 msgstr "前のフットプリントの表示"
 
-#: pcbnew/tool_modview.cpp:71
+#: kicad-6297/pcbnew/tool_modview.cpp:71 kicad-6996/pcbnew/tool_modview.cpp:71
 msgid "Display next footprint"
 msgstr "次のフットプリントを表示"
 
-#: pcbnew/tool_modview.cpp:104
+#: kicad-6297/pcbnew/tool_modview.cpp:104
+#: kicad-6996/pcbnew/tool_modview.cpp:104
 msgid "Insert footprint in board"
 msgstr "ボードへフットプリントを挿入"
 
-#: pcbnew/tool_modview.cpp:151
+#: kicad-6297/pcbnew/tool_modview.cpp:151
+#: kicad-6996/pcbnew/tool_modview.cpp:151
 msgid "Close footprint viewer"
 msgstr "フットプリント ビューアを閉じる"
 
-#: pcbnew/tool_modview.cpp:177
+#: kicad-6297/pcbnew/tool_modview.cpp:177
+#: kicad-6996/pcbnew/tool_modview.cpp:177
 msgid "3&D Viewer"
 msgstr "3Dビューア(&3)"
 
-#: pcbnew/tool_modview.cpp:190
+#: kicad-6297/pcbnew/tool_modview.cpp:190
+#: kicad-6996/pcbnew/tool_modview.cpp:187
 msgid "Open the Pcbnew manual"
 msgstr "Pcbnew のマニュアルを開く"
 
-#: pcbnew/tool_modview.cpp:201
+#: kicad-6297/pcbnew/tool_modview.cpp:201
+#: kicad-6996/pcbnew/tool_modview.cpp:198
 msgid "&About Pcbnew"
 msgstr "Pcbnew について(&A)"
 
-#: pcbnew/tool_modview.cpp:202
+#: kicad-6297/pcbnew/tool_modview.cpp:202
+#: kicad-6996/pcbnew/tool_modview.cpp:199
 msgid "About Pcbnew PCB designer"
 msgstr "Pcbnew PCBデザイナーについて"
 
-#: pcbnew/tool_pcb.cpp:54
+#: kicad-6297/pcbnew/tool_pcb.cpp:54 kicad-6996/pcbnew/tool_pcb.cpp:54
 msgid ""
 "Show active layer selections\n"
 "and select layer pair for route and place via"
@@ -21450,103 +28086,115 @@ msgstr ""
 "ペア レイヤの設定\n"
 "配線及びビア配置に使用するペア層を選択します"
 
-#: pcbnew/tool_pcb.cpp:218
+#: kicad-6297/pcbnew/tool_pcb.cpp:218 kicad-6996/pcbnew/tool_pcb.cpp:218
 msgid "New board"
 msgstr "新規ボード"
 
-#: pcbnew/tool_pcb.cpp:220
+#: kicad-6297/pcbnew/tool_pcb.cpp:220 kicad-6996/pcbnew/tool_pcb.cpp:220
 msgid "Open existing board"
 msgstr "既存のボードを開く"
 
-#: pcbnew/tool_pcb.cpp:224
+#: kicad-6297/pcbnew/tool_pcb.cpp:224 kicad-6996/pcbnew/tool_pcb.cpp:224
 msgid "Save board"
 msgstr "ボードの保存"
 
-#: pcbnew/tool_pcb.cpp:233
+#: kicad-6297/pcbnew/tool_pcb.cpp:233 kicad-6996/pcbnew/tool_pcb.cpp:233
 msgid "Open footprint editor"
 msgstr "フットプリント エディタを開く"
 
-#: pcbnew/tool_pcb.cpp:249
+#: kicad-6297/pcbnew/tool_pcb.cpp:249 kicad-6996/pcbnew/tool_pcb.cpp:249
 msgid "Plot (HPGL, PostScript, or GERBER format)"
 msgstr "プロット (HGPL, PostScript, GERBER フォーマット)"
 
-#: pcbnew/tool_pcb.cpp:271
+#: kicad-6297/pcbnew/tool_pcb.cpp:271 kicad-6996/pcbnew/tool_pcb.cpp:271
 msgid "Read netlist"
 msgstr "ネットリストの読込み"
 
-#: pcbnew/tool_pcb.cpp:293
+#: kicad-6297/pcbnew/tool_pcb.cpp:293 kicad-6996/pcbnew/tool_pcb.cpp:293
 msgid "Mode footprint: manual and automatic movement and placement"
 msgstr "フットプリント モード：手動/自動での配置と移動 "
 
-#: pcbnew/tool_pcb.cpp:296
+#: kicad-6297/pcbnew/tool_pcb.cpp:296 kicad-6996/pcbnew/tool_pcb.cpp:296
 msgid "Mode track: autorouting"
 msgstr "配線モード: 自動配線"
 
-#: pcbnew/tool_pcb.cpp:302
+#: kicad-6297/pcbnew/tool_pcb.cpp:302 kicad-6996/pcbnew/tool_pcb.cpp:302
 msgid "Fast access to the FreeROUTE external advanced router"
 msgstr "外部ルータ Freerouter とのデータ交換"
 
-#: pcbnew/tool_pcb.cpp:312
+#: kicad-6297/pcbnew/tool_pcb.cpp:312 kicad-6996/pcbnew/tool_pcb.cpp:312
 msgid "Show/Hide the Python Scripting console"
 msgstr "Python スクリプト コンソールの表示/非表示"
 
-#: pcbnew/tool_pcb.cpp:333 pcbnew/toolbars_update_user_interface.cpp:135
+#: kicad-6297/pcbnew/tool_pcb.cpp:333
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:135
+#: kicad-6996/pcbnew/tool_pcb.cpp:333
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:139
 msgid "Enable design rule checking"
 msgstr "デザインルール チェックを有効化"
 
-#: pcbnew/tool_pcb.cpp:352 pcbnew/toolbars_update_user_interface.cpp:144
+#: kicad-6297/pcbnew/tool_pcb.cpp:352
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:144
+#: kicad-6996/pcbnew/tool_pcb.cpp:355
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:148
 msgid "Show board ratsnest"
 msgstr "ボードのラッツネストを表示"
 
-#: pcbnew/tool_pcb.cpp:355
+#: kicad-6297/pcbnew/tool_pcb.cpp:355
 msgid "Show footprint ratsnest when moving"
 msgstr "移動時にフットプリントのラッツネストを表示する"
 
-#: pcbnew/tool_pcb.cpp:361
+#: kicad-6297/pcbnew/tool_pcb.cpp:361 kicad-6996/pcbnew/tool_pcb.cpp:360
 msgid "Enable automatic track deletion"
 msgstr "自動的な配線削除を有効化"
 
-#: pcbnew/tool_pcb.cpp:369
+#: kicad-6297/pcbnew/tool_pcb.cpp:369 kicad-6996/pcbnew/tool_pcb.cpp:368
 msgid "Do not show filled areas in zones"
 msgstr "ゾーンの塗りつぶし領域を非表示"
 
-#: pcbnew/tool_pcb.cpp:372
+#: kicad-6297/pcbnew/tool_pcb.cpp:372 kicad-6996/pcbnew/tool_pcb.cpp:371
 msgid "Show outlines of filled areas only in zones"
 msgstr "ゾーンの塗りつぶし領域をアウトラインで表示"
 
-#: pcbnew/tool_pcb.cpp:381 pcbnew/toolbars_update_user_interface.cpp:175
+#: kicad-6297/pcbnew/tool_pcb.cpp:381
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:175
+#: kicad-6996/pcbnew/tool_pcb.cpp:380
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:168
 msgid "Show vias in outline mode"
 msgstr "アウトライン モードでビアを表示"
 
-#: pcbnew/tool_pcb.cpp:385 pcbnew/toolbars_update_user_interface.cpp:186
+#: kicad-6297/pcbnew/tool_pcb.cpp:385
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:186
+#: kicad-6996/pcbnew/tool_pcb.cpp:384
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:179
 msgid "Show tracks in outline mode"
 msgstr "アウトライン モードで配線を表示"
 
-#: pcbnew/tool_pcb.cpp:432
+#: kicad-6297/pcbnew/tool_pcb.cpp:432 kicad-6996/pcbnew/tool_pcb.cpp:435
 msgid "Display local ratsnest"
 msgstr "ローカル ラッツネストの表示"
 
-#: pcbnew/tool_pcb.cpp:503
+#: kicad-6297/pcbnew/tool_pcb.cpp:503 kicad-6996/pcbnew/tool_pcb.cpp:506
 msgid "Create line of specified length for microwave applications"
 msgstr "高周波設計用の指定長の線を作成"
 
-#: pcbnew/tool_pcb.cpp:508
+#: kicad-6297/pcbnew/tool_pcb.cpp:508 kicad-6996/pcbnew/tool_pcb.cpp:511
 msgid "Create gap of specified length for microwave applications"
 msgstr "高周波設計用の指定長のギャップを作成"
 
-#: pcbnew/tool_pcb.cpp:515
+#: kicad-6297/pcbnew/tool_pcb.cpp:515 kicad-6996/pcbnew/tool_pcb.cpp:518
 msgid "Create stub of specified length for microwave applications"
 msgstr "高周波設計用の指定長のスタブを作成"
 
-#: pcbnew/tool_pcb.cpp:520
+#: kicad-6297/pcbnew/tool_pcb.cpp:520 kicad-6996/pcbnew/tool_pcb.cpp:523
 msgid "Create stub (arc) of specified length for microwave applications"
 msgstr "高周波設計用の指定長のスタブ (円弧) を作成"
 
-#: pcbnew/tool_pcb.cpp:525
+#: kicad-6297/pcbnew/tool_pcb.cpp:525 kicad-6996/pcbnew/tool_pcb.cpp:528
 msgid "Create a polynomial shape for microwave applications"
 msgstr "高周波設計用の多節形を作成"
 
-#: pcbnew/tool_pcb.cpp:578
+#: kicad-6297/pcbnew/tool_pcb.cpp:578 kicad-6996/pcbnew/tool_pcb.cpp:581
 msgid ""
 "Auto track width: when starting on an existing track use its width\n"
 "otherwise, use current width setting"
@@ -21555,510 +28203,613 @@ msgstr ""
 "既に存在する配線がある場合には、その配線幅を使用します。\n"
 "それ以外の場合には、現在の幅の設定値を使用します。"
 
-#: pcbnew/tool_pcb.cpp:623
+#: kicad-6297/pcbnew/tool_pcb.cpp:623 kicad-6996/pcbnew/tool_pcb.cpp:626
 #, c-format
 msgid "Track: %.3f mm (%.2f mils)"
 msgstr "配線: %.3f mm (%.2f mils)"
 
-#: pcbnew/tool_pcb.cpp:626
+#: kicad-6297/pcbnew/tool_pcb.cpp:626 kicad-6996/pcbnew/tool_pcb.cpp:629
 #, c-format
 msgid "Track: %.2f mils (%.3f mm)"
 msgstr "配線: %.2f mils (%.3f mm)"
 
-#: pcbnew/tool_pcb.cpp:661
+#: kicad-6297/pcbnew/tool_pcb.cpp:661 kicad-6996/pcbnew/tool_pcb.cpp:664
 #, c-format
 msgid "Via: %.2f mm (%.1f mils)"
 msgstr "ビア: %.2f mm (%.1f mils)"
 
-#: pcbnew/tool_pcb.cpp:664
+#: kicad-6297/pcbnew/tool_pcb.cpp:664 kicad-6996/pcbnew/tool_pcb.cpp:667
 #, c-format
 msgid "Via: %.1f mils (%.2f mm)"
 msgstr "ビア: %.1f mils (%.2f mm)"
 
-#: pcbnew/tool_pcb.cpp:677
+#: kicad-6297/pcbnew/tool_pcb.cpp:677 kicad-6996/pcbnew/tool_pcb.cpp:680
 #, c-format
 msgid "%.2f mm (%.1f mils)"
 msgstr "%.2f mm (%.1f mils)"
 
-#: pcbnew/tool_pcb.cpp:680
+#: kicad-6297/pcbnew/tool_pcb.cpp:680 kicad-6996/pcbnew/tool_pcb.cpp:683
 #, c-format
 msgid "%.1f mils (%.2f mm)"
 msgstr "%.1f mils (%.2f mm)"
 
-#: pcbnew/tool_pcb.cpp:705
+#: kicad-6297/pcbnew/tool_pcb.cpp:705 kicad-6996/pcbnew/tool_pcb.cpp:708
 msgid "+/- to switch"
 msgstr "+/- でスイッチします"
 
-#: pcbnew/toolbars_update_user_interface.cpp:134
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:134
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:138
 msgid "Disable design rule checking"
 msgstr "デザインルール チェックを無効化"
 
-#: pcbnew/toolbars_update_user_interface.cpp:143
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:143
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:147
 msgid "Hide board ratsnest"
 msgstr "ボードのラッツネストを非表示"
 
-#: pcbnew/toolbars_update_user_interface.cpp:154
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:154
 msgid "Hide footprint ratsnest"
 msgstr "フットプリントのラッツネストを非表示"
 
-#: pcbnew/toolbars_update_user_interface.cpp:155
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:155
 msgid "Show footprint ratsnest"
 msgstr "フットプリントのラッツネストを表示"
 
-#: pcbnew/toolbars_update_user_interface.cpp:164
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:164
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:157
 msgid "Disable auto delete old track"
 msgstr "古い配線の自動削除を無効化"
 
-#: pcbnew/toolbars_update_user_interface.cpp:165
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:165
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:158
 msgid "Enable auto delete old track"
 msgstr "古い配線の自動削除を有効化"
 
-#: pcbnew/toolbars_update_user_interface.cpp:176
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:176
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:169
 msgid "Show vias in fill mode"
 msgstr "フィル モードでビアを表示"
 
-#: pcbnew/toolbars_update_user_interface.cpp:187
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:187
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:180
 msgid "Show tracks in fill mode"
 msgstr "フィル モードで配線を表示"
 
-#: pcbnew/toolbars_update_user_interface.cpp:197
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:197
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:190
 msgid "Normal contrast display mode"
 msgstr "ノーマル コントラスト表示モード"
 
-#: pcbnew/toolbars_update_user_interface.cpp:198
+#: kicad-6297/pcbnew/toolbars_update_user_interface.cpp:198
+#: kicad-6996/pcbnew/toolbars_update_user_interface.cpp:191
 msgid "High contrast display mode"
 msgstr "ハイ コントラスト表示モード"
 
-#: pcbnew/tools/common_actions.cpp:58
+#: kicad-6297/pcbnew/tools/common_actions.cpp:58
+#: kicad-6996/pcbnew/tools/common_actions.cpp:59
 msgid "trivial connection"
 msgstr "普通の接続"
 
-#: pcbnew/tools/common_actions.cpp:58
+#: kicad-6297/pcbnew/tools/common_actions.cpp:58
+#: kicad-6996/pcbnew/tools/common_actions.cpp:59
 msgid "Selects a connection between two junctions."
 msgstr "２つのジャンクション(接続点)間の接続を選択する"
 
-#: pcbnew/tools/common_actions.cpp:62
+#: kicad-6297/pcbnew/tools/common_actions.cpp:62
+#: kicad-6996/pcbnew/tools/common_actions.cpp:63
 msgid "copper connection"
 msgstr "導体の接続点まで"
 
 # コネクション→一連のネットの意であればそのまま用語として残す
-#: pcbnew/tools/common_actions.cpp:62
+#: kicad-6297/pcbnew/tools/common_actions.cpp:62
+#: kicad-6996/pcbnew/tools/common_actions.cpp:63
 msgid "Selects whole copper connection."
 msgstr "全てのコネクションを選択する."
 
-#: pcbnew/tools/common_actions.cpp:66
+#: kicad-6297/pcbnew/tools/common_actions.cpp:66
+#: kicad-6996/pcbnew/tools/common_actions.cpp:67
 msgid "whole net"
 msgstr "ネット全体"
 
-#: pcbnew/tools/common_actions.cpp:66
+#: kicad-6297/pcbnew/tools/common_actions.cpp:66
+#: kicad-6996/pcbnew/tools/common_actions.cpp:67
 msgid "Selects all tracks & vias belonging to the same net."
 msgstr "同じネットに属する全ての配線とビアを選択する."
 
-#: pcbnew/tools/common_actions.cpp:70
+#: kicad-6297/pcbnew/tools/common_actions.cpp:70
+#: kicad-6996/pcbnew/tools/common_actions.cpp:71
 msgid "Find an item"
 msgstr "アイテムの検索"
 
-#: pcbnew/tools/common_actions.cpp:70
+#: kicad-6297/pcbnew/tools/common_actions.cpp:70
+#: kicad-6996/pcbnew/tools/common_actions.cpp:71
 msgid "Searches the document for an item"
 msgstr "アイテムのドキュメントを検索する"
 
-#: pcbnew/tools/common_actions.cpp:79
+#: kicad-6297/pcbnew/tools/common_actions.cpp:79
+#: kicad-6996/pcbnew/tools/common_actions.cpp:80
 msgid "Open in Footprint Editor"
 msgstr "フットプリント エディタで開く"
 
-#: pcbnew/tools/common_actions.cpp:80
+#: kicad-6297/pcbnew/tools/common_actions.cpp:80
+#: kicad-6996/pcbnew/tools/common_actions.cpp:81
 msgid "Opens the selected footprint in the Footprint Editor"
 msgstr "フットプリント エディタで選択したフットプリントを開く."
 
-#: pcbnew/tools/common_actions.cpp:85
+#: kicad-6297/pcbnew/tools/common_actions.cpp:85
+#: kicad-6996/pcbnew/tools/common_actions.cpp:86
 msgid "Copy pad settings to Current Settings"
 msgstr "パッドの設定を現在の設定にコピー"
 
-#: pcbnew/tools/common_actions.cpp:86
+#: kicad-6297/pcbnew/tools/common_actions.cpp:86
+#: kicad-6996/pcbnew/tools/common_actions.cpp:87
 msgid ""
 "Copies the properties of selected pad to the current template pad settings."
 msgstr "選択したパッドの設定を現在のパッドの設定へコピーする"
 
-#: pcbnew/tools/common_actions.cpp:90
+#: kicad-6297/pcbnew/tools/common_actions.cpp:90
+#: kicad-6996/pcbnew/tools/common_actions.cpp:91
 msgid "Copy Current Settings to pads"
 msgstr "このパッドに現在の設定をコピー"
 
-#: pcbnew/tools/common_actions.cpp:91
+#: kicad-6297/pcbnew/tools/common_actions.cpp:91
+#: kicad-6996/pcbnew/tools/common_actions.cpp:92
 msgid "Copies the current template pad settings to the selected pad(s)."
 msgstr "現在のパッドを選択したパッドへコピーする"
 
-#: pcbnew/tools/common_actions.cpp:95
+#: kicad-6297/pcbnew/tools/common_actions.cpp:95
+#: kicad-6996/pcbnew/tools/common_actions.cpp:96
 msgid "Global Pad Edition"
 msgstr "グローバルパッド編集"
 
-#: pcbnew/tools/common_actions.cpp:96
+#: kicad-6297/pcbnew/tools/common_actions.cpp:96
+#: kicad-6996/pcbnew/tools/common_actions.cpp:97
 msgid "Changes pad properties globally."
 msgstr "パッドのグローバル設定を変更する."
 
-#: pcbnew/tools/common_actions.cpp:100
+#: kicad-6297/pcbnew/tools/common_actions.cpp:100
+#: kicad-6996/pcbnew/tools/common_actions.cpp:101
 msgid "Moves the selected item(s)"
 msgstr "選択したアイテムを移動"
 
-#: pcbnew/tools/common_actions.cpp:104 pcbnew/tools/common_actions.cpp:108
+#: kicad-6297/pcbnew/tools/common_actions.cpp:104
+#: kicad-6297/pcbnew/tools/common_actions.cpp:108
+#: kicad-6996/pcbnew/tools/common_actions.cpp:105
+#: kicad-6996/pcbnew/tools/common_actions.cpp:109
 msgid "Duplicate"
 msgstr "複製"
 
-#: pcbnew/tools/common_actions.cpp:104
+#: kicad-6297/pcbnew/tools/common_actions.cpp:104
+#: kicad-6996/pcbnew/tools/common_actions.cpp:105
 msgid "Duplicates the selected item(s)"
 msgstr "選択したアイテムを複製"
 
-#: pcbnew/tools/common_actions.cpp:108
+#: kicad-6297/pcbnew/tools/common_actions.cpp:108
+#: kicad-6996/pcbnew/tools/common_actions.cpp:109
 msgid "Duplicates the selected item(s), incrementing pad numbers"
 msgstr "選択したアイテムを複製、パッド番号をインクリメント"
 
-#: pcbnew/tools/common_actions.cpp:112
+#: kicad-6297/pcbnew/tools/common_actions.cpp:112
+#: kicad-6996/pcbnew/tools/common_actions.cpp:113
 msgid "Move Exactly..."
 msgstr "距離を指定して移動..."
 
-#: pcbnew/tools/common_actions.cpp:112
+#: kicad-6297/pcbnew/tools/common_actions.cpp:112
+#: kicad-6996/pcbnew/tools/common_actions.cpp:113
 msgid "Moves the selected item(s) by an exact amount"
 msgstr "数値を指定して選択中のアイテムを移動"
 
-#: pcbnew/tools/common_actions.cpp:117
+#: kicad-6297/pcbnew/tools/common_actions.cpp:117
+#: kicad-6996/pcbnew/tools/common_actions.cpp:118
 msgid "Create array"
 msgstr "配列を作成"
 
-#: pcbnew/tools/common_actions.cpp:121
+#: kicad-6297/pcbnew/tools/common_actions.cpp:121
+#: kicad-6996/pcbnew/tools/common_actions.cpp:122
 msgid "Rotates selected item(s)"
 msgstr "選択したアイテムを回転"
 
-#: pcbnew/tools/common_actions.cpp:125
+#: kicad-6297/pcbnew/tools/common_actions.cpp:125
+#: kicad-6996/pcbnew/tools/common_actions.cpp:126
 msgid "Flips selected item(s)"
 msgstr "選択したアイテムを反転"
 
-#: pcbnew/tools/common_actions.cpp:129
+#: kicad-6297/pcbnew/tools/common_actions.cpp:129
+#: kicad-6996/pcbnew/tools/common_actions.cpp:130
 msgid "Deletes selected item(s)"
 msgstr "選択したアイテムを削除"
 
-#: pcbnew/tools/common_actions.cpp:133
+#: kicad-6297/pcbnew/tools/common_actions.cpp:133
+#: kicad-6996/pcbnew/tools/common_actions.cpp:134
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#: pcbnew/tools/common_actions.cpp:133
+#: kicad-6297/pcbnew/tools/common_actions.cpp:133
+#: kicad-6996/pcbnew/tools/common_actions.cpp:134
 msgid "Displays item properties dialog"
 msgstr "プロパティダイアログにアイテムを表示"
 
-#: pcbnew/tools/common_actions.cpp:139
+#: kicad-6297/pcbnew/tools/common_actions.cpp:139
+#: kicad-6996/pcbnew/tools/common_actions.cpp:140
 msgid "Draw a line"
 msgstr "図形線を描画"
 
-#: pcbnew/tools/common_actions.cpp:143
+#: kicad-6297/pcbnew/tools/common_actions.cpp:143
+#: kicad-6996/pcbnew/tools/common_actions.cpp:144
 msgid "Draw a circle"
 msgstr "円を描画"
 
-#: pcbnew/tools/common_actions.cpp:147
+#: kicad-6297/pcbnew/tools/common_actions.cpp:147
+#: kicad-6996/pcbnew/tools/common_actions.cpp:148
 msgid "Draw an arc"
 msgstr "円弧を描画"
 
-#: pcbnew/tools/common_actions.cpp:151
+#: kicad-6297/pcbnew/tools/common_actions.cpp:151
+#: kicad-6996/pcbnew/tools/common_actions.cpp:152
 msgid "Add a text"
 msgstr "テキストを追加"
 
-#: pcbnew/tools/common_actions.cpp:155
+#: kicad-6297/pcbnew/tools/common_actions.cpp:155
+#: kicad-6996/pcbnew/tools/common_actions.cpp:156
 msgid "Add a dimension"
 msgstr "寸法線を追加"
 
-#: pcbnew/tools/common_actions.cpp:159
+#: kicad-6297/pcbnew/tools/common_actions.cpp:159
+#: kicad-6996/pcbnew/tools/common_actions.cpp:160
 msgid "Add a filled zone"
 msgstr "塗りつぶしゾーンを追加"
 
-#: pcbnew/tools/common_actions.cpp:163
+#: kicad-6297/pcbnew/tools/common_actions.cpp:163
+#: kicad-6996/pcbnew/tools/common_actions.cpp:164
 msgid "Add a keepout area"
 msgstr "キープアウト(禁止)エリアを追加"
 
-#: pcbnew/tools/common_actions.cpp:171 pcbnew/tools/drawing_tool.cpp:601
+#: kicad-6297/pcbnew/tools/common_actions.cpp:171
+#: kicad-6297/pcbnew/tools/drawing_tool.cpp:601
+#: kicad-6996/pcbnew/tools/common_actions.cpp:172
+#: kicad-6996/pcbnew/tools/drawing_tool.cpp:600
 msgid "Place the footprint anchor"
 msgstr "フットプリントのアンカー (基準点) を配置"
 
-#: pcbnew/tools/common_actions.cpp:176
+#: kicad-6297/pcbnew/tools/common_actions.cpp:176
+#: kicad-6996/pcbnew/tools/common_actions.cpp:177
 msgid "Increase the line width"
 msgstr "線幅を太く"
 
-#: pcbnew/tools/common_actions.cpp:180
+#: kicad-6297/pcbnew/tools/common_actions.cpp:180
+#: kicad-6996/pcbnew/tools/common_actions.cpp:181
 msgid "Decrease the line width"
 msgstr "線幅を細く"
 
-#: pcbnew/tools/common_actions.cpp:184
+#: kicad-6297/pcbnew/tools/common_actions.cpp:184
+#: kicad-6996/pcbnew/tools/common_actions.cpp:185
 msgid "Switch the arc posture"
 msgstr "円弧の形状を変更"
 
-#: pcbnew/tools/common_actions.cpp:190
-msgid "Zoom In"
-msgstr "ズーム イン"
-
-#: pcbnew/tools/common_actions.cpp:194
-msgid "Zoom Out"
-msgstr "ズーム アウト"
-
-#: pcbnew/tools/common_actions.cpp:363
+#: kicad-6297/pcbnew/tools/common_actions.cpp:367
+#: kicad-6996/pcbnew/tools/common_actions.cpp:368
 msgid "Fill"
 msgstr "塗りつぶし"
 
-#: pcbnew/tools/common_actions.cpp:363
+#: kicad-6297/pcbnew/tools/common_actions.cpp:367
+#: kicad-6996/pcbnew/tools/common_actions.cpp:368
 msgid "Fill zone(s)"
 msgstr "ゾーンの塗りつぶし"
 
-#: pcbnew/tools/common_actions.cpp:367
+#: kicad-6297/pcbnew/tools/common_actions.cpp:371
+#: kicad-6996/pcbnew/tools/common_actions.cpp:372
 msgid "Fill all"
 msgstr "全て塗りつぶし"
 
-#: pcbnew/tools/common_actions.cpp:367
+#: kicad-6297/pcbnew/tools/common_actions.cpp:371
+#: kicad-6996/pcbnew/tools/common_actions.cpp:372
 msgid "Fill all zones"
 msgstr "全ゾーンの塗りつぶし"
 
-#: pcbnew/tools/common_actions.cpp:371
+#: kicad-6297/pcbnew/tools/common_actions.cpp:375
+#: kicad-6996/pcbnew/tools/common_actions.cpp:376
 msgid "Unfill"
 msgstr "塗りつぶしを削除"
 
-#: pcbnew/tools/common_actions.cpp:371
+#: kicad-6297/pcbnew/tools/common_actions.cpp:375
+#: kicad-6996/pcbnew/tools/common_actions.cpp:376
 msgid "Unfill zone(s)"
 msgstr "ゾーンの塗りつぶしを削除"
 
-#: pcbnew/tools/common_actions.cpp:375
+#: kicad-6297/pcbnew/tools/common_actions.cpp:379
+#: kicad-6996/pcbnew/tools/common_actions.cpp:380
 msgid "Unfill all"
 msgstr "塗りつぶしを全て削除"
 
-#: pcbnew/tools/common_actions.cpp:375
+#: kicad-6297/pcbnew/tools/common_actions.cpp:379
+#: kicad-6996/pcbnew/tools/common_actions.cpp:380
 msgid "Unfill all zones"
 msgstr "全ゾーンの塗りつぶしを削除"
 
-#: pcbnew/tools/common_actions.cpp:379
+#: kicad-6297/pcbnew/tools/common_actions.cpp:383
+#: kicad-6996/pcbnew/tools/common_actions.cpp:384
 msgid "Merge zones"
 msgstr "ゾーンを結合"
 
-#: pcbnew/tools/common_actions.cpp:422
+#: kicad-6297/pcbnew/tools/common_actions.cpp:426
+#: kicad-6996/pcbnew/tools/common_actions.cpp:435
 msgid "Enumerate pads"
 msgstr "パッドを列挙"
 
-#: pcbnew/tools/common_actions.cpp:426
+#: kicad-6297/pcbnew/tools/common_actions.cpp:430
+#: kicad-6996/pcbnew/tools/common_actions.cpp:439
 msgid "Copy items"
 msgstr "アイテムをコピー"
 
-#: pcbnew/tools/common_actions.cpp:430
+#: kicad-6297/pcbnew/tools/common_actions.cpp:434
+#: kicad-6996/pcbnew/tools/common_actions.cpp:443
 msgid "Paste items"
 msgstr "アイテムをペースト"
 
-#: pcbnew/tools/common_actions.cpp:510 pcbnew/tools/common_actions.cpp:511
+#: kicad-6297/pcbnew/tools/common_actions.cpp:514
+#: kicad-6297/pcbnew/tools/common_actions.cpp:515
+#: kicad-6996/pcbnew/tools/common_actions.cpp:527
+#: kicad-6996/pcbnew/tools/common_actions.cpp:528
 msgid "Run push & shove router (single tracks)"
 msgstr "押しのけ配線の実行(単線(シングル))"
 
-#: pcbnew/tools/common_actions.cpp:515 pcbnew/tools/common_actions.cpp:516
+#: kicad-6297/pcbnew/tools/common_actions.cpp:519
+#: kicad-6297/pcbnew/tools/common_actions.cpp:520
+#: kicad-6996/pcbnew/tools/common_actions.cpp:532
+#: kicad-6996/pcbnew/tools/common_actions.cpp:533
 msgid "Run push & shove router (differential pairs)"
 msgstr "押しのけ配線の実行(差動ペア)"
 
-#: pcbnew/tools/common_actions.cpp:520 pcbnew/tools/common_actions.cpp:521
+#: kicad-6297/pcbnew/tools/common_actions.cpp:524
+#: kicad-6297/pcbnew/tools/common_actions.cpp:525
+#: kicad-6996/pcbnew/tools/common_actions.cpp:537
+#: kicad-6996/pcbnew/tools/common_actions.cpp:538
 msgid "Open Interactive Router settings"
 msgstr "インタラクティブ ルーターの設定を開く"
 
-#: pcbnew/tools/common_actions.cpp:525 pcbnew/tools/common_actions.cpp:526
+#: kicad-6297/pcbnew/tools/common_actions.cpp:529
+#: kicad-6297/pcbnew/tools/common_actions.cpp:530
+#: kicad-6996/pcbnew/tools/common_actions.cpp:542
+#: kicad-6996/pcbnew/tools/common_actions.cpp:543
 msgid "Open Differential Pair Dimension settings"
 msgstr "差動ペアの寸法設定を開く"
 
-#: pcbnew/tools/common_actions.cpp:538
+#: kicad-6297/pcbnew/tools/common_actions.cpp:542
+#: kicad-6996/pcbnew/tools/common_actions.cpp:555
 msgid "Tune skew of a differential pair"
 msgstr "差動ペアの遅延(スキュー)調整"
 
-#: pcbnew/tools/common_actions.cpp:551
+#: kicad-6297/pcbnew/tools/common_actions.cpp:555
+#: kicad-6996/pcbnew/tools/common_actions.cpp:568
 msgid "Create corner"
 msgstr "角を作成"
 
-#: pcbnew/tools/common_actions.cpp:555
+#: kicad-6297/pcbnew/tools/common_actions.cpp:559
+#: kicad-6996/pcbnew/tools/common_actions.cpp:572
 msgid "Remove corner"
 msgstr "角を削除"
 
-#: pcbnew/tools/common_actions.cpp:560
+#: kicad-6297/pcbnew/tools/common_actions.cpp:564
+#: kicad-6996/pcbnew/tools/common_actions.cpp:577
 msgid "Align items to the top"
 msgstr "アイテムを上へ整列"
 
-#: pcbnew/tools/common_actions.cpp:561
+#: kicad-6297/pcbnew/tools/common_actions.cpp:565
+#: kicad-6996/pcbnew/tools/common_actions.cpp:578
 msgid "Aligns selected items to the top edge"
 msgstr "選択したアイテムを上辺へ整列"
 
-#: pcbnew/tools/common_actions.cpp:565
+#: kicad-6297/pcbnew/tools/common_actions.cpp:569
+#: kicad-6996/pcbnew/tools/common_actions.cpp:582
 msgid "Align items to the bottom"
 msgstr "アイテムを下へ整列"
 
-#: pcbnew/tools/common_actions.cpp:566
+#: kicad-6297/pcbnew/tools/common_actions.cpp:570
+#: kicad-6996/pcbnew/tools/common_actions.cpp:583
 msgid "Aligns selected items to the bottom edge"
 msgstr "選択したアイテムを下辺へ整列"
 
-#: pcbnew/tools/common_actions.cpp:570
+#: kicad-6297/pcbnew/tools/common_actions.cpp:574
+#: kicad-6996/pcbnew/tools/common_actions.cpp:587
 msgid "Align items to the left"
 msgstr "アイテムを左へ整列"
 
-#: pcbnew/tools/common_actions.cpp:571
+#: kicad-6297/pcbnew/tools/common_actions.cpp:575
+#: kicad-6996/pcbnew/tools/common_actions.cpp:588
 msgid "Aligns selected items to the left edge"
 msgstr "選択したアイテムを左辺へ整列"
 
-#: pcbnew/tools/common_actions.cpp:575
+#: kicad-6297/pcbnew/tools/common_actions.cpp:579
+#: kicad-6996/pcbnew/tools/common_actions.cpp:592
 msgid "Align items to the right"
 msgstr "アイテムを右へ整列"
 
-#: pcbnew/tools/common_actions.cpp:576
+#: kicad-6297/pcbnew/tools/common_actions.cpp:580
+#: kicad-6996/pcbnew/tools/common_actions.cpp:593
 msgid "Aligns selected items to the right edge"
 msgstr "選択したアイテムを右辺へ整列"
 
-#: pcbnew/tools/common_actions.cpp:580
+#: kicad-6297/pcbnew/tools/common_actions.cpp:584
+#: kicad-6996/pcbnew/tools/common_actions.cpp:597
 msgid "Distribute horizontally"
 msgstr "水平方向に配置"
 
-#: pcbnew/tools/common_actions.cpp:581
+#: kicad-6297/pcbnew/tools/common_actions.cpp:585
+#: kicad-6996/pcbnew/tools/common_actions.cpp:598
 msgid "Distributes selected items along the horizontal axis"
 msgstr "選択したアイテムを水平方向に配置"
 
-#: pcbnew/tools/common_actions.cpp:585
+#: kicad-6297/pcbnew/tools/common_actions.cpp:589
+#: kicad-6996/pcbnew/tools/common_actions.cpp:602
 msgid "Distribute vertically"
 msgstr "垂直方向に配置"
 
-#: pcbnew/tools/common_actions.cpp:586
+#: kicad-6297/pcbnew/tools/common_actions.cpp:590
+#: kicad-6996/pcbnew/tools/common_actions.cpp:603
 msgid "Distributes selected items along the vertical axis"
 msgstr "選択したアイテムを垂直方向に配置"
 
-#: pcbnew/tools/edit_tool.cpp:582
+#: kicad-6297/pcbnew/tools/edit_tool.cpp:582
+#: kicad-6996/pcbnew/tools/edit_tool.cpp:581
 msgid "Cannot delete component reference."
 msgstr "コンポーネントのリファレンスは削除できません。"
 
-#: pcbnew/tools/edit_tool.cpp:586
+#: kicad-6297/pcbnew/tools/edit_tool.cpp:586
+#: kicad-6996/pcbnew/tools/edit_tool.cpp:585
 msgid "Cannot delete component value."
 msgstr "コンポーネントの定数は削除できません。"
 
-#: pcbnew/tools/edit_tool.cpp:781
+#: kicad-6297/pcbnew/tools/edit_tool.cpp:784
+#: kicad-6996/pcbnew/tools/edit_tool.cpp:783
 #, c-format
 msgid "Duplicated %d item(s)"
 msgstr "重複した%dアイテム"
 
-#: pcbnew/tools/module_tools.cpp:229
+#: kicad-6297/pcbnew/tools/module_tools.cpp:228
+#: kicad-6996/pcbnew/tools/module_tools.cpp:228
 msgid "Hold left mouse button and move cursor over pads to enumerate them"
 msgstr "列挙するためにマウスの左ボタンを押したままパッド上へカーソルを動かす"
 
-#: pcbnew/tools/module_tools.cpp:346
+#: kicad-6297/pcbnew/tools/module_tools.cpp:345
+#: kicad-6996/pcbnew/tools/module_tools.cpp:348
 msgid "Select reference point"
 msgstr "基準点を選択"
 
-#: pcbnew/tools/module_tools.cpp:397
+#: kicad-6297/pcbnew/tools/module_tools.cpp:396
+#: kicad-6996/pcbnew/tools/module_tools.cpp:399
 #, c-format
 msgid "Copied %d item(s)"
 msgstr "%d のアイテムをコピーしました"
 
-#: pcbnew/tools/module_tools.cpp:421
+#: kicad-6297/pcbnew/tools/module_tools.cpp:420
+#: kicad-6996/pcbnew/tools/module_tools.cpp:423
 msgid "Invalid clipboard contents"
 msgstr "不正なクリップボードのデータ"
 
-#: pcbnew/tools/pcbnew_control.cpp:735
+#: kicad-6297/pcbnew/tools/pcbnew_control.cpp:744
+#: kicad-6996/pcbnew/tools/pcbnew_control.cpp:742
 msgid "Are you sure you want to delete item?"
 msgstr "本当にアイテムを削除してもよろしいですか？"
 
-#: pcbnew/tools/pcbnew_control.cpp:918
+#: kicad-6297/pcbnew/tools/pcbnew_control.cpp:927
+#: kicad-6996/pcbnew/tools/pcbnew_control.cpp:925
 msgid "Not available in OpenGL/Cairo canvases."
 msgstr "OpenGL(3D)/Cairo(2D) キャンバスでは無効."
 
-#: pcbnew/tools/placement_tool.cpp:68
+#: kicad-6297/pcbnew/tools/placement_tool.cpp:68
+#: kicad-6996/pcbnew/tools/placement_tool.cpp:67
 msgid "Align/distribute"
 msgstr "整列/均等配置"
 
-#: pcbnew/tools/selection_tool.cpp:99
+#: kicad-6297/pcbnew/tools/selection_tool.cpp:99
+#: kicad-6996/pcbnew/tools/selection_tool.cpp:98
 msgid "Select..."
 msgstr "選択..."
 
-#: pcbnew/tools/selection_tool.cpp:113
+#: kicad-6297/pcbnew/tools/selection_tool.cpp:113
+#: kicad-6996/pcbnew/tools/selection_tool.cpp:112
 msgid "Zoom"
 msgstr "ズーム"
 
-#: pcbnew/tools/selection_tool.cpp:536
+#: kicad-6297/pcbnew/tools/selection_tool.cpp:559
+#: kicad-6996/pcbnew/tools/selection_tool.cpp:560
 msgid "Selection contains locked items. Do you want to continue?"
 msgstr "ロックされたアイテムを含んで選択しています。続けますか？"
 
-#: pcbnew/tools/selection_tool.cpp:785
+#: kicad-6297/pcbnew/tools/selection_tool.cpp:795
+#: kicad-6996/pcbnew/tools/selection_tool.cpp:796
 msgid "Clarify selection"
 msgstr "明示的な選択"
 
-#: pcbnew/tools/size_menu.cpp:45
+#: kicad-6297/pcbnew/tools/size_menu.cpp:45
+#: kicad-6996/pcbnew/tools/size_menu.cpp:45
 msgid "Track "
 msgstr "配線"
 
-#: pcbnew/tools/size_menu.cpp:48
+#: kicad-6297/pcbnew/tools/size_menu.cpp:48
+#: kicad-6996/pcbnew/tools/size_menu.cpp:48
 msgid "net class width"
 msgstr "ネット クラスの幅"
 
-#: pcbnew/tools/size_menu.cpp:64
+#: kicad-6297/pcbnew/tools/size_menu.cpp:64
+#: kicad-6996/pcbnew/tools/size_menu.cpp:64
 msgid "Via "
 msgstr "ビア"
 
-#: pcbnew/tools/size_menu.cpp:68
+#: kicad-6297/pcbnew/tools/size_menu.cpp:68
+#: kicad-6996/pcbnew/tools/size_menu.cpp:68
 msgid "net class size"
 msgstr "ネット クラスのサイズ"
 
-#: pcbnew/tools/size_menu.cpp:77
+#: kicad-6297/pcbnew/tools/size_menu.cpp:77
+#: kicad-6996/pcbnew/tools/size_menu.cpp:77
 msgid ", drill: default"
 msgstr ", ドリル: デフォルト"
 
-#: pcbnew/tools/size_menu.cpp:79
+#: kicad-6297/pcbnew/tools/size_menu.cpp:79
+#: kicad-6996/pcbnew/tools/size_menu.cpp:79
 msgid ", drill: "
 msgstr ", ドリル: "
 
-#: pcbnew/tools/zoom_menu.cpp:48
+#: kicad-6297/pcbnew/tools/zoom_menu.cpp:48
+#: kicad-6996/pcbnew/tools/zoom_menu.cpp:49
 #, c-format
 msgid "Zoom: %.2f"
 msgstr "ズーム: %.2f"
 
-#: pcbnew/xchgmod.cpp:123
+#: kicad-6297/pcbnew/xchgmod.cpp:123 kicad-6996/pcbnew/xchgmod.cpp:123
 #, c-format
 msgid "Change footprint of '%s'"
 msgstr "フットプリント '%s' の変更"
 
-#: pcbnew/xchgmod.cpp:131
+#: kicad-6297/pcbnew/xchgmod.cpp:131 kicad-6996/pcbnew/xchgmod.cpp:131
 #, c-format
 msgid "Change footprints '%s'"
 msgstr "フットプリント '%s' の変更"
 
-#: pcbnew/xchgmod.cpp:217
+#: kicad-6297/pcbnew/xchgmod.cpp:217 kicad-6996/pcbnew/xchgmod.cpp:212
 #, c-format
 msgid "File '%s' created\n"
 msgstr "ファイル '%s' が生成されました。\n"
 
-#: pcbnew/xchgmod.cpp:222
+#: kicad-6297/pcbnew/xchgmod.cpp:222 kicad-6996/pcbnew/xchgmod.cpp:217
 #, c-format
 msgid "** Could not create file '%s' ***\n"
 msgstr "** ファイル '%s' が生成できませんでした ***\n"
 
-#: pcbnew/xchgmod.cpp:282
+#: kicad-6297/pcbnew/xchgmod.cpp:282 kicad-6996/pcbnew/xchgmod.cpp:260
 #, c-format
 msgid "Change footprint %s -> %s (for value = %s)?"
 msgstr "フットプリントを変更しますか？ %s → %s (定数 = %s)"
 
-#: pcbnew/xchgmod.cpp:289
+#: kicad-6297/pcbnew/xchgmod.cpp:289 kicad-6996/pcbnew/xchgmod.cpp:267
 #, c-format
 msgid "Change footprint %s -> %s ?"
 msgstr "フットプリントを変更しますか？ %s → %s"
 
-#: pcbnew/xchgmod.cpp:344
+#: kicad-6297/pcbnew/xchgmod.cpp:344 kicad-6996/pcbnew/xchgmod.cpp:315
 msgid "Are you sure you want to change all footprints?"
 msgstr "本当に全てのフットプリントを変更してもよろしいですか？"
 
-#: pcbnew/xchgmod.cpp:394
+#: kicad-6297/pcbnew/xchgmod.cpp:394 kicad-6996/pcbnew/xchgmod.cpp:356
 #, c-format
 msgid "Change footprint '%s' (from '%s') to '%s'"
 msgstr "フットプリント '%s' の値を '%s' から '%s' に変更"
 
-#: pcbnew/xchgmod.cpp:501
+#: kicad-6297/pcbnew/xchgmod.cpp:501 kicad-6996/pcbnew/xchgmod.cpp:462
 msgid "No footprints!"
 msgstr "フットプリントがありません！"
 
-#: pcbnew/xchgmod.cpp:512
+#: kicad-6297/pcbnew/xchgmod.cpp:512 kicad-6996/pcbnew/xchgmod.cpp:473
 msgid "Save Footprint Association File"
 msgstr "フットプリントの関連付けファイルの保存"
 
-#: pcbnew/xchgmod.cpp:523
+#: kicad-6297/pcbnew/xchgmod.cpp:523 kicad-6996/pcbnew/xchgmod.cpp:484
 #, c-format
 msgid "Could not create file '%s'"
 msgstr "ファイル '%s' が作成できません"
 
-#: pcbnew/zones_by_polygon.cpp:131
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:131
 msgid ""
 "The duplicated zone is on the same layer as the initial zone, which has no "
 "sense.\n"
@@ -22067,214 +28818,1945 @@ msgstr ""
 "重複したゾーンが同じレイヤに既に存在するので、意味がありません.\n"
 "新しいゾーンには別のレイヤを選んでください"
 
-#: pcbnew/zones_by_polygon.cpp:162
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:162
 msgid "The outline of the duplicated zone fails DRC check!"
 msgstr "重複したゾーンの外形線が DRC で不正となりました！"
 
-#: pcbnew/zones_by_polygon.cpp:364 pcbnew/zones_by_polygon.cpp:422
-#: pcbnew/zones_by_polygon.cpp:809
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:364
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:422
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:812
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:362
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:420
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:810
 msgid "Area: DRC outline error"
 msgstr "エリア: DRCアウトライン エラー"
 
-#: pcbnew/zones_by_polygon.cpp:537
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:537
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:535
 msgid "Error: a keepout area is allowed only on copper layers"
 msgstr "エラー: キープアウト(禁止)エリアは導体レイヤ上のみに配置できます"
 
-#: pcbnew/zones_by_polygon.cpp:684
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:687
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:685
 msgid "DRC error: this start point is inside or too close an other area"
 msgstr "DRCエラー: 開始点が内部にあるか、他のエリアに近すぎます"
 
-#: pcbnew/zones_by_polygon.cpp:743
-msgid "DRC error: closing this area creates a drc error with an other area"
+#: kicad-6297/pcbnew/zones_by_polygon.cpp:746
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:744
+msgid "DRC error: closing this area creates a DRC error with an other area"
 msgstr "DRCエラー: このゾーンを閉じると他のエリアとのDRCエラーが発生します"
 
-#: pcbnew/zones_by_polygon_fill_functions.cpp:46
+#: kicad-6297/pcbnew/zones_by_polygon_fill_functions.cpp:46
+#: kicad-6996/pcbnew/zones_by_polygon_fill_functions.cpp:46
 #, c-format
 msgid "Filling zone %d out of %d (net %s)..."
 msgstr "ゾーンの塗りつぶし中 %d out of %d (ネット %s)..."
 
-#: pcbnew/zones_by_polygon_fill_functions.cpp:140
+#: kicad-6297/pcbnew/zones_by_polygon_fill_functions.cpp:140
+#: kicad-6996/pcbnew/zones_by_polygon_fill_functions.cpp:140
 msgid "Fill All Zones"
 msgstr "全ゾーンを塗りつぶし"
 
-#: pcbnew/zones_by_polygon_fill_functions.cpp:146
+#: kicad-6297/pcbnew/zones_by_polygon_fill_functions.cpp:146
+#: kicad-6996/pcbnew/zones_by_polygon_fill_functions.cpp:146
 msgid "Starting zone fill..."
 msgstr "ゾーンの塗りつぶしを開始しています..."
 
-#: pcbnew/zones_by_polygon_fill_functions.cpp:175
+#: kicad-6297/pcbnew/zones_by_polygon_fill_functions.cpp:175
+#: kicad-6996/pcbnew/zones_by_polygon_fill_functions.cpp:175
 msgid "Updating ratsnest..."
 msgstr "ラッツネストを更新中..."
 
-#: 3d-viewer/dialogs/dialog_3D_view_option_base.h:79
-msgid "3D Display Options"
-msgstr "3D表示オプション"
+#: kicad-6996/3d-viewer/3d_cache/3d_cache.cpp:526
+msgid "path exists but is not a regular file"
+msgstr "パスは存在しますが、あるべきファイルがありません"
 
-#: bitmap2component/bitmap2cmp_gui_base.h:92
-msgid "Bitmap to Component Converter"
-msgstr "ビットマップ - コンポーネント変換"
+#: kicad-6996/3d-viewer/3d_cache/3d_cache.cpp:561
+msgid "failed to create 3D configuration directory"
+msgstr "3D設定ディレクトリの作成に失敗しました"
 
-#: common/dialog_about/dialog_about_base.h:51
-msgid "About..."
-msgstr "このソフトウェアについて"
+#: kicad-6996/3d-viewer/3d_cache/3d_cache.cpp:563
+msgid "config directory"
+msgstr "コンフィグ ディレクトリ"
 
-#: common/dialogs/dialog_env_var_config_base.h:56
-msgid "Path Configuration"
-msgstr "環境変数の設定"
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:470
+msgid "The given path does not exist"
+msgstr "入力されたパスは存在しません"
 
-#: common/dialogs/dialog_hotkeys_editor_base.h:53
-msgid "Hotkeys Editor"
-msgstr "ホットキー エディタ"
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:473
+msgid "3D model search path"
+msgstr "3D モデルの検索パス"
 
-#: common/dialogs/dialog_image_editor_base.h:64
-msgid "Image Editor"
-msgstr "イメージ エディタ"
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:499
+msgid "Alias: "
+msgstr "エイリアス: "
 
-#: common/dialogs/dialog_page_settings_base.h:121
-msgid "Page Settings"
-msgstr "ページ設定"
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:502
+msgid "This path: "
+msgstr "このパス:"
 
-#: cvpcb/common_help_msg.h:28
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:505
+msgid "Existing path: "
+msgstr "存在するパス: "
+
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:507
+msgid "Bad alias (duplicate name)"
+msgstr "不正なエイリアス (名前の重複)"
+
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:632
+msgid "3D configuration directory is unknown"
+msgstr "3D設定ディレクトリが未定義です"
+
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:635
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:656
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:665
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:687
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:712
+msgid "Write 3D search path list"
+msgstr "3D 検索パスのリストを書き込み"
+
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:655
+msgid ""
+"3D search path list is empty;\n"
+"continue to write empty file?"
+msgstr ""
+"3D 検索パス一覧が空です;\n"
+"空ファイルを書き込んで続行しますか?"
+
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:664
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:684
+msgid "Could not open configuration file"
+msgstr "設定ファイルを開くことができません"
+
+#: kicad-6996/3d-viewer/3d_cache/3d_filename_resolver.cpp:711
+msgid "Problems writing configuration file"
+msgstr "設定ファイルの書き込みで問題"
+
+#: kicad-6996/3d-viewer/3d_cache/3d_plugin_manager.cpp:50
+msgid "All Files (*.*)|*.*"
+msgstr "全てのファイル (*.*)|*.*"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:134
+msgid "[BUG] No valid resolver; data will not be updated"
+msgstr "[BUG] 無効なリゾルバ; データは更新されません"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:135
+msgid "Update 3D search path list"
+msgstr "3D 検索パスのリストを更新"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:194
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:234
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:275
+msgid "No entry selected"
+msgstr "エントリが選択されていません"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:194
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:201
+msgid "Delete alias entry"
+msgstr "エイリアス エントリを削除"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:200
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:240
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:281
+msgid ""
+"Multiple entries selected; please\n"
+"select only one entry"
+msgstr ""
+"複数のエントリが選択されています; 一つのエントリ\n"
+"だけを選択して下さい"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:234
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:241
+msgid "Move alias up"
+msgstr "エイリアスを上へ移動"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:275
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:282
+msgid "Move alias down"
+msgstr "エイリアスを下へ移動"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:371
+msgid ""
+"Enter the name and path for each 3D alias variable.<br>KiCad environment "
+"variables and their values are shown for reference only and cannot be edited."
+msgstr ""
+"各 3D エイリアス変数への名前とパスを入力<br>KiCad 環境変数とその他の変数は参"
+"照のみで編集できません。"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.cpp:375
+msgid "Alias names may not contain any of the characters "
+msgstr "エイリアス名はいかなる文字も含んでいません"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:35
+msgid "Env Var"
+msgstr "環境変数"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:53
+msgid "Config Env"
+msgstr "環境設定"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:104
+msgid "Add Alias"
+msgstr "エイリアスを追加"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.cpp:107
+msgid "Remove Alias"
+msgstr "エイリアスを削除"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp:50
+msgid "Select 3D Model"
+msgstr "3D モデルを選択"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp:137
+msgid "Paths:"
+msgstr "パス:"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp:138
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:327
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:262
+msgid "Configure Paths"
+msgstr "パスを設定"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp:133
+msgid "3D Preview"
+msgstr "3D プレビュー"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp:142
+msgid "Scale"
+msgstr "スケール"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp:143
+msgid "Rotation (degrees)"
+msgstr "回転 (度)"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp:145
+msgid "Offset "
+msgstr "オフセット "
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp:271
+msgid "Change to isometric perspective"
+msgstr "等角透視図法へ切り替え"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp:275
+msgid "Reload board and 3D models"
+msgstr "ボードと 3D モデルを再読み込み"
+
+#: kicad-6996/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp:694
+msgid "[INFO] invalid scale values; setting invalid to 1.0"
+msgstr "[INFO] 不正なスケール値; 不正な値は 1.0 として設定されます"
+
+#: kicad-6996/3d-viewer/3d_cache/sg/ifsg_api.cpp:153
+#: kicad-6996/3d-viewer/3d_cache/sg/ifsg_api.cpp:313
+#: kicad-6996/3d-viewer/3d_cache/sg/ifsg_api.cpp:393
+msgid "failed to open file"
+msgstr "ファイルが開けませんでした"
+
+#: kicad-6996/3d-viewer/3d_cache/sg/ifsg_api.cpp:180
+msgid "problems encountered writing file"
+msgstr "ファイル書き込み中に問題が発生しました"
+
+#: kicad-6996/3d-viewer/3d_cache/sg/ifsg_api.cpp:284
+msgid "file exists; not overwriting"
+msgstr "既にファイルがあります; 上書きされません"
+
+#: kicad-6996/3d-viewer/3d_cache/sg/ifsg_api.cpp:297
+msgid "specified path is a directory"
+msgstr "指定のパスはディレクトリです"
+
+#: kicad-6996/3d-viewer/3d_cache/sg/ifsg_api.cpp:361
+msgid "no such file"
+msgstr "そのようなファイルはありません"
+
+#: kicad-6996/3d-viewer/3d_canvas/cinfo3d_visu.cpp:457
+msgid "Create layers"
+msgstr "レイヤの作成"
+
+#: kicad-6996/3d-viewer/3d_canvas/cinfo3d_visu.cpp:486
+msgid "Unable to calculate the board outlines."
+msgstr "基板の外形を計算できません。"
+
+#: kicad-6996/3d-viewer/3d_canvas/cinfo3d_visu.cpp:488
+msgid "Therefore use the board boundary box."
+msgstr "そのためバウンダリ ボックスを使用します。"
+
+#: kicad-6996/3d-viewer/3d_canvas/create_layer_items.cpp:1217
+msgid "Create tracks and vias"
+msgstr "配線とビアを作成"
+
+#: kicad-6996/3d-viewer/3d_canvas/create_layer_items.cpp:1755
+msgid "Create zones"
+msgstr "ゾーンを作成"
+
+#: kicad-6996/3d-viewer/3d_canvas/create_layer_items.cpp:1764
+#, c-format
+msgid "Create zones of layer %s"
+msgstr "レイヤのゾーンを作成 %s"
+
+#: kicad-6996/3d-viewer/3d_canvas/create_layer_items.cpp:1831
+msgid "Simplifying polygons"
+msgstr "単純化したポリゴン"
+
+#: kicad-6996/3d-viewer/3d_canvas/create_layer_items.cpp:1862
+msgid "Simplify holes contours"
+msgstr "穴の輪郭を簡略化する"
+
+#: kicad-6996/3d-viewer/3d_canvas/create_layer_items.cpp:1909
+msgid "Build Tech layers"
+msgstr "ビルド  Tech レイヤ"
+
+#: kicad-6996/3d-viewer/3d_canvas/eda_3d_canvas.cpp:403
+#, c-format
+msgid "Render time %.0f ms ( %.1f fps)"
+msgstr "レンダリング時間 %.0f ms ( %.1f fps)"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:365
+msgid "Load OpenGL: board"
+msgstr "OpenGL をロード: ボード"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:436
+msgid "Load OpenGL: holes and vias"
+msgstr "OpenGLをロード: 単純な穴とスルーホール"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:535
+msgid "Load OpenGL: layers"
+msgstr "OpenGLをロード: レイヤー"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:640
+msgid "Loading 3D models"
+msgstr "3D モデルを読込み"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:664
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp:917
+#, c-format
+msgid "Reload time %.3f s"
+msgstr "再読込み時間 %.3f s"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp:477
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:168
+msgid "Loading..."
+msgstr "読込み中..."
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:345
+#, c-format
+msgid "Rendering time %.3f s"
+msgstr "レンダリング時間 %.3f s"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:395
+#, c-format
+msgid "Rendering: %.0f %%"
+msgstr "レンダリング: %.0f %%"
+
+#: kicad-6996/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:1119
+msgid "Rendering: Post processing shader"
+msgstr "レンダリング: 後処理用シェーダー"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:67
+msgid "Render current view using Raytracing"
+msgstr "レイトレーシングを使って現在のビューをレンダリング"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:145
+msgid "Create Image (png format)"
+msgstr "画像を作成 (png 形式)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:149
+msgid "Create Image (jpeg format)"
+msgstr "画像を作成 (jpeg 形式)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:176
+msgid "Render Engine"
+msgstr "レンダリング エンジン"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:179
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:183
+msgid "Raytracing"
+msgstr "レイトレーシング"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:204
+msgid "Material Properties"
+msgstr "マテリアルのプロパティ"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:207
+msgid "Use all properties"
+msgstr "全てのプロパティを使用"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:208
+msgid "Use all material properties from each 3D model file"
+msgstr "各 3D モデル ファイルから全てのマテリアル プロパティを使用"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:211
+msgid "Use diffuse only"
+msgstr "ディフューズ (拡散) のみを使用"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:212
+msgid "Use only the diffuse color property from model 3D model file "
+msgstr ""
+"3D モデル ファイルからディフューズ カラー(拡散反射色)のプロパティのみを使用"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:215
+msgid "CAD color style"
+msgstr "CAD カラー スタイル"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:216
+msgid "Use a CAD color style based on the diffuse color of the material"
+msgstr "マテリアルのディフューズ カラーに基づいた CAD  カラー スタイルを使用"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:223
+msgid "OpenGL Options"
+msgstr "OpenGL オプション"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:226
+msgid "Show Copper Thickness"
+msgstr "銅箔の厚みを表示"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:227
+msgid "Shows the copper thickness on copper layers (slower loading)"
+msgstr "配線層に銅箔厚を表示する (読み込みが遅くなります)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:239
+msgid "Raytracing Options"
+msgstr "レイトレーシング オプション"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:246
+msgid "Add floor"
+msgstr "床面を追加"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:247
+msgid "Adds a floor plane below the board (slow)"
+msgstr "基板の下に床面を追加する (遅い)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:251
+msgid "Refractions"
+msgstr "屈折"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:252
+msgid "Render materials with refractions properties on final render (slow)"
+msgstr "仕上げ時に屈折プロパティをマテリアルに適用してレンダリングする (遅い)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:256
+msgid "Reflections"
+msgstr "反射"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:257
+msgid "Render materials with reflections properties on final render (slow)"
+msgstr "仕上げ時に反射プロパティをマテリアルに適用してレンダリングする (遅い)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:261
+msgid "Anti-aliasing"
+msgstr "アンチ-エイリアス"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:262
+msgid "Render with improoved quality on final render (slow)"
+msgstr "仕上げ時に高品質でレンダリングする (遅い)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:266
+msgid "Post-processing"
+msgstr "後処理"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:267
+msgid ""
+"Apply Screen Space Ambient Occlusion and Global Illumination reflections on "
+"final render (slow)"
+msgstr ""
+"仕上げ時にアンビエント オクルージョン (SSAO) とグローバル イルミネーション "
+"(GI) 反射を適用する (遅い)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:349
+msgid "Footprint Properties -> Attributes -> Normal (eg: THT parts)"
+msgstr "フットプリント プロパティ -> 属性 -> 標準 (例: THT 部品)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:353
+msgid "Footprint Properties -> Attributes -> Normal+Insert (eg: SMD parts)"
+msgstr "フットプリント プロパティ -> 属性 -> 標準+挿入 (例: SMD 部品)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:357
+msgid ""
+"Footprint Properties -> Attributes -> Virtual (eg: edge connectors, test "
+"points, mechanical parts)"
+msgstr ""
+"フットプリント プロパティ -> 属性 -> 仮想 (例: 基板端コネクタ, テスト ポイン"
+"ト, 機構部品)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:382
+msgid "Show &Comments and Drawings Layers"
+msgstr "コメント/図面描画レイヤの表示 (&C)"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:392
+msgid "Reset to default settings"
+msgstr "デフォルト値にリセット"
+
+#: kicad-6996/3d-viewer/3d_viewer/3d_toolbar.cpp:400
+#: kicad-6996/eeschema/menubar.cpp:512
+#: kicad-6996/eeschema/menubar_libedit.cpp:265
+#: kicad-6996/gerbview/menubar.cpp:233 kicad-6996/kicad/menubar.cpp:418
+#: kicad-6996/pagelayout_editor/menubar.cpp:160
+#: kicad-6996/pcbnew/menubar_modedit.cpp:347
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:650
+msgid "&List Hotkeys"
+msgstr "ホットキーの一覧(&L)"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1164
+msgid "Center pivot rotation (Middle mouse click)"
+msgstr "中心を軸に回転 (マウスの中ボタン クリック)"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1165
+msgid "Move board Left"
+msgstr "基板を左へ移動"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1166
+msgid "Move board Right"
+msgstr "基板を右へ移動"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1167
+msgid "Move board Up"
+msgstr "基板を上に移動"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1168
+msgid "Move board Down"
+msgstr "基板を下へ移動"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1169
+msgid "Home view"
+msgstr "表示をホームへ"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1170
+msgid "Reset view"
+msgstr "表示をリセット"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1172
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1176
+msgid "View Top"
+msgstr "上を表示"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1173
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1177
+msgid "View Bot"
+msgstr "下を表示"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1174
+msgid "View Left"
+msgstr "左を表示"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1175
+msgid "View Right"
+msgstr "右を表示"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1179
+msgid "Rotate 45 degrees over Z axis"
+msgstr "Z軸上で 45 度回転"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1180
+msgid "Zoom in "
+msgstr "ズーム イン"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1182
+msgid "Toggle 3D models with attributes Normal (eg: THT)"
+msgstr "3D モデルをトグル 標準 属性 (例: THT)"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1183
+msgid "Toggle 3D models with attributes Normal+Insert (eg: SMD)"
+msgstr "3D モデルをトグル 標準+挿入 属性 (例: SMD)"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1184
+msgid "Toggle 3D models with attributes Virtual"
+msgstr "3D モデルをトグル 仮想 属性"
+
+#: kicad-6996/3d-viewer/3d_viewer/eda_3d_viewer.cpp:1186
+msgid "Viewer 3D"
+msgstr "ビューア 3D"
+
+#: kicad-6996/common/common.cpp:187
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:96
+msgid "degrees"
+msgstr "角度"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:156
+msgid "Our official Repository for component and footprint libraries"
+msgstr "コンポーネントとフットプリントのライブラリ用 KiCad 公式リポジトリ"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:160
+msgid "Non official repositories"
+msgstr "非公式リポジトリ"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:164
+msgid "Additional component libraries repository (kicadlib)"
+msgstr "追加のコンポーネント ライブラリ用リポジトリ (kicadlib)"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:168
+msgid "Additional component libraries repository (smisioto)"
+msgstr "追加のコンポーネント ライブラリ用リポジトリ (smisioto)"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:174
+msgid "Bug tracker"
+msgstr "バグ トラッカー"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:181
+msgid "Report or examine bugs"
+msgstr "バグを調査または報告する"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:186
+msgid "KiCad user group and community"
+msgstr "KiCad ユーザー グループとコミュニティ"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:192
+msgid "KiCad user group"
+msgstr "KiCad ユーザー グループ"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:197
+msgid "KiCad forum"
+msgstr "KiCad フォーラム"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:406
+msgid "Others"
+msgstr "その他"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:421
+msgid "Icons by"
+msgstr "アイコン by"
+
+#: kicad-6996/common/dialog_about/AboutDialog_main.cpp:436
+msgid "3D models by"
+msgstr "3D モデル by"
+
+#: kicad-6996/common/dialog_about/dialog_about.cpp:539
+msgid "Copied..."
+msgstr "コピーしました..."
+
+#: kicad-6996/common/dialog_about/dialog_about_base.cpp:70
+msgid "Copy Version Info"
+msgstr "バージョン情報をコピー"
+
+#: kicad-6996/common/dialogs/dialog_hotkeys_editor_base.cpp:18
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:248
+msgid "Double-click to edit"
+msgstr "編集にはダブル クリック"
+
+#: kicad-6996/common/dialogs/dialog_hotkeys_editor_base.cpp:31
+msgid "Defaults"
+msgstr "デフォルト"
+
+#: kicad-6996/common/kiway.cpp:176
+#, c-format
+msgid "Failed to load kiface library '%s'."
+msgstr "kiface ライブラリのロードに失敗しました '%s'。"
+
+#: kicad-6996/common/kiway.cpp:185
+#, c-format
+msgid ""
+"Could not read instance name and version symbol form kiface library '%s'."
+msgstr ""
+"kiface ライブラリからインスタンス名とバージョン シンボルを読み込めませんでし"
+"た '%s'."
+
+#: kicad-6996/common/kiway.cpp:219
+#, c-format
+msgid ""
+"Fatal Installation Bug. File:\n"
+"'%s'\n"
+"could not be loaded\n"
+msgstr ""
+"致命的なインストール バグ. ファイル:\n"
+"'%s'\n"
+"ロードされませんでした\n"
+
+#: kicad-6996/common/kiway.cpp:223
+msgid "It is missing.\n"
+msgstr "見つかりません。\n"
+
+#: kicad-6996/common/kiway.cpp:225
+msgid "Perhaps a shared library (.dll or .so) file is missing.\n"
+msgstr "共有ライブラリ (.dll or .so) と思われるファイルが見つかりません。\n"
+
+#: kicad-6996/common/kiway.cpp:227
+msgid ""
+"From command line: argv[0]:\n"
+"'"
+msgstr ""
+"コマンドラインから: argv[0]:\n"
+"'"
+
+#: kicad-6996/common/pgm_base.cpp:189
+msgid "Slovak"
+msgstr "スロバキア語"
+
+#: kicad-6996/common/pgm_base.cpp:277
+msgid "Lithuanian"
+msgstr "リトアニア語"
+
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:111
+msgid "Press a new hotkey, or press Esc to cancel..."
+msgstr "新しいホットキーを押すか、Esc を押してキャンセル..."
+
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:118
+msgid "Command:"
+msgstr "コマンド:"
+
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:126
+msgid "Current key:"
+msgstr "現在のキー:"
+
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:220
+msgid "Set Hotkey"
+msgstr "ホットキーを設定"
+
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:386
+msgid "Edit..."
+msgstr "編集..."
+
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:390
+msgid "Reset all"
+msgstr "全てリセット"
+
+#: kicad-6996/common/widgets/widget_hotkey_list.cpp:391
+msgid "Reset all to default"
+msgstr "全てデフォルトにリセット"
+
+#: kicad-6996/cvpcb/cvpcb_mainframe.cpp:707
+msgid "name"
+msgstr "名前"
+
+#: kicad-6996/cvpcb/menubar.cpp:65
+msgid "&Save Footprint Association\tCtrl+S"
+msgstr "フットプリントの関連付けを保存\tCtrl+S"
+
+#: kicad-6996/cvpcb/menubar.cpp:66 kicad-6297/cvpcb/common_help_msg.h:28
+#: kicad-6996/cvpcb/common_help_msg.h:28
 msgid "Save footprint association in schematic component footprint fields"
 msgstr ""
 "回路図のコンポーネントのフットプリント フィールドへ関連付けてフットプリントを"
 "保存する"
 
-#: cvpcb/dialogs/dialog_display_options_base.h:63
-#: pcbnew/dialogs/dialog_display_options_base.h:72
-msgid "Display Options"
-msgstr "表示オプション"
+#: kicad-6996/cvpcb/readwrite_dlgs.cpp:379
+msgid "Footprint association sent to Eeschema"
+msgstr "フットプリントの関連付けを Eeschema へ送る"
 
-#: eeschema/dialogs/dialog_annotate_base.h:89
-msgid "Annotate Schematic"
-msgstr "回路図のアノテーション"
+#: kicad-6996/cvpcb/tool_cvpcb.cpp:90
+msgid "Filter footprint list by schematic components keywords"
+msgstr "回路図コンポーネントのキーワードでフットプリント一覧を絞込み"
 
-#: eeschema/dialogs/dialog_bom_base.h:93
-msgid "Bill of Material"
-msgstr "部品表(BOM)"
+#: kicad-6996/cvpcb/tool_cvpcb.cpp:110
+msgid "Filter footprint list using a partial name or a pattern"
+msgstr "名前の一部またはパターンでフットプリント一覧を絞込み"
 
-#: eeschema/dialogs/dialog_color_config_base.h:47
-msgid "EESchema Colors"
-msgstr "Eeschema カラー"
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:58
+msgid "Labels are similar (lower/upper case difference only)"
+msgstr "同じようなラベルです (大文字/小文字だけ相違)"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h:103
-#: eeschema/dialogs/dialog_lib_new_component_base.h:62
-msgid "Component Properties"
-msgstr "コンポーネント プロパティ"
+#: kicad-6996/eeschema/class_drc_erc_item.cpp:60
+msgid "Global labels are similar (lower/upper case difference only)"
+msgstr "同じようなグローバル ラベルです (大文字/小文字だけ相違)"
 
-#: eeschema/dialogs/dialog_edit_label_base.h:70
-msgid "Text Editor"
-msgstr "テキスト エディタ"
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:98
+msgid "Show console window"
+msgstr "コンソール ウィンドウを表示"
 
-#: eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h:87
-msgid "Field Properties"
-msgstr "フィールドのプロパティ"
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.cpp:100
+msgid ""
+"By default, command line runs with hidden console window and output is "
+"redirected to \"Plugin info\" field. Set this option to show the window of "
+"the running command."
+msgstr ""
+"既定では、コマンド ラインは隠れたコンソール ウィンドウで実行され、出力が"
+"\"Plugin info\"フィールドへ反映されます。コマンド実行のウィンドウを表示するに"
+"は、このオプションをセットします。"
 
-#: eeschema/dialogs/dialog_eeschema_options_base.h:139
-msgid "Schematic Editor Options"
-msgstr "回路図エディタ オプション"
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:866
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:686
+msgid "Show Datasheet"
+msgstr "データシートを表示"
 
-#: eeschema/dialogs/dialog_erc_base.h:83
-msgid "Electrical Rules Checker"
-msgstr "エレクトリカル ルール チェック(ERC)"
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:873
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:693
+msgid "Browse Footprints"
+msgstr "フットプリントを表示"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.h:59
-msgid "Drawing Properties"
-msgstr "図形のプロパティ"
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:875
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:695
+msgid "Open the footprint browser to choose a footprint and assign it."
+msgstr "フットプリントを選択/配置するためにフットプリント ブラウザを開く。"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_base.h:99
-msgid "Pin Properties"
-msgstr "ピンのプロパティ"
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic.cpp:881
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp:701
+msgid "Used only for fields Footprint and Datasheet."
+msgstr "フットプリントとデータシート フィールドだけを使用"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.h:48
-msgid "Pin Table"
-msgstr "ピン一覧"
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:55
+msgid "&Bus thickness:"
+msgstr "バス線幅(&B):"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.h:69
-msgid "Library Text Properties"
-msgstr "ライブラリ テキスト プロパティ"
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:66
+msgid "&Line thickness:"
+msgstr "線幅(&L):"
 
-#: eeschema/dialogs/dialog_libedit_options_base.h:80
-msgid "Library Editor Options"
-msgstr "コンポーネント ライブラリ エディタ オプション"
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:77
+msgid "&Part ID notation:"
+msgstr "部品IDの表記方法(&P):"
 
-#: eeschema/dialogs/dialog_netlist_base.h:78
-#: pcbnew/dialogs/dialog_netlist_fbp.h:84
-msgid "Netlist"
-msgstr "ネットリスト"
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:105
+msgid "S&how hidden pins"
+msgstr "非表示ピンを表示(&h)"
 
-#: eeschema/dialogs/dialog_netlist_base.h:119
-msgid "Plugins:"
-msgstr "プラグイン ファイル:"
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:176
+msgid "Def&ault text size:"
+msgstr "デフォルトのテキストサイズ(&a):"
 
-#: eeschema/dialogs/dialog_plot_schematic_base.h:86
-msgid "Plot Schematic"
-msgstr "回路図のプロット"
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:207
+msgid "A&utomatically place component fields"
+msgstr "コンポーネント フィールドを自動配置(&u)"
 
-#: eeschema/dialogs/dialog_rescue_each_base.h:65
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:210
+msgid "A&llow field autoplace to change justification"
+msgstr "揃えの変更によるフィールドの自動配置を許可 (&l)"
+
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:213
+msgid "Al&ways align autoplaced fields to the 50 mil grid"
+msgstr "常に 50 mil グリッドへ自動配置フィールドを整列(&w)"
+
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:223
+msgid "Editing"
+msgstr "編集中"
+
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:244
+msgid "Hotkeys:"
+msgstr "ホットキー:"
+
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:258
+msgid "Cen&ter and warp cursor on zoom"
+msgstr "拡大縮小時にカーソルを中心へ移動(&t)"
+
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:278
+msgid "Controls"
+msgstr "コントロール"
+
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:343
+msgid "De&lete"
+msgstr "削除(&l)"
+
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.cpp:356
+msgid "Default Fields"
+msgstr "デフォルトのフィールド"
+
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:94
+msgid "Delete Markers"
+msgstr "マーカーを削除"
+
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:97
+msgid "Run"
+msgstr "実行"
+
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:119
+msgid "Pin to pin connections"
+msgstr "ピンとピンの接続"
+
+# コネクション→一連のネットの意であればそのまま用語として残す
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:129
+msgid "Label to label connections"
+msgstr "ラベルとラベルの接続"
+
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:133
+msgid "Test similar labels"
+msgstr "同じようなラベルを確認"
+
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:134
+msgid ""
+"Similar labels are labels (inside a sheet) which differs only by upper/lower "
+"case"
+msgstr ""
+"同じようなラベルとは、大文字/小文字だけが違っているような (シート内の) ラベル"
+"です"
+
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:138
+msgid "Test unique global labels"
+msgstr "グローバル ラベルの重複を確認"
+
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.cpp:139
+msgid ""
+"Global labels are used to connect signals across the full hierarchy.\n"
+"They are expected to be at least two labels with the same name."
+msgstr ""
+"グローバル ラベルは全ての階層に渡って信号を接続するために用いられます。\n"
+"これらは少なくとも２つのラベルが同じ名前であることを想定しています。"
+
+#: kicad-6996/eeschema/dialogs/dialog_print_using_printer.cpp:256
+msgid "Print preview error!"
+msgstr "印刷プレビューのエラー！"
+
+#: kicad-6996/eeschema/dialogs/dialog_schematic_find_base.cpp:94
+msgid "Search the current &sheet only"
+msgstr "現在のシートのみを検索(&s)"
+
+#: kicad-6996/eeschema/erc.cpp:825
+#, c-format
+msgid "Global label '%s' (sheet '%s') looks like:"
+msgstr "グローバル ラベル '%s' (シート '%s') のようなものです:"
+
+#: kicad-6996/eeschema/erc.cpp:826
+#, c-format
+msgid "Local label '%s' (sheet '%s') looks like:"
+msgstr "ローカル ラベル '%s' (シート '%s') のようなものです:"
+
+#: kicad-6996/eeschema/erc.cpp:834
+#, c-format
+msgid "Global label '%s' (sheet '%s')"
+msgstr "グローバル ラベル '%s' (シート '%s')"
+
+#: kicad-6996/eeschema/erc.cpp:835
+#, c-format
+msgid "Local label '%s' (sheet '%s')"
+msgstr "ローカル ラベル '%s' (シート '%s')"
+
+#: kicad-6996/eeschema/files-io.cpp:123
+#, c-format
+msgid ""
+"Error saving schematic file '%s'.\n"
+"%s"
+msgstr ""
+"回路図保存中のエラー '%s'\n"
+"%s"
+
+#: kicad-6996/eeschema/files-io.cpp:127
+#, c-format
+msgid "Failed to save '%s'"
+msgstr "'%s' の保存に失敗しました"
+
+#: kicad-6996/eeschema/files-io.cpp:338
+#, c-format
+msgid ""
+"Error loading schematic file '%s'.\n"
+"%s"
+msgstr ""
+"回路図読込み中のエラー '%s'\n"
+"%s"
+
+#: kicad-6996/eeschema/files-io.cpp:342
+#, c-format
+msgid "Failed to load '%s'"
+msgstr "'%s' が開けませんでした"
+
+#: kicad-6996/eeschema/hotkeys.cpp:211 kicad-6996/gerbview/hotkeys.cpp:65
+#: kicad-6996/pagelayout_editor/hotkeys.cpp:80
+#: kicad-6996/pcbnew/hotkeys.cpp:101
+msgid "Zoom to Selection"
+msgstr "ズームの選択"
+
+#: kicad-6996/eeschema/hotkeys.cpp:224 kicad-6996/eeschema/onrightclick.cpp:397
+msgid "Autoplace Fields"
+msgstr "フィールドを自動配置"
+
+#: kicad-6996/eeschema/hotkeys.cpp:227 kicad-6996/eeschema/menubar.cpp:428
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:596
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb_base.h:55
+msgid "Update PCB from Schematics"
+msgstr "回路図から基板を更新"
+
+#: kicad-6996/eeschema/libeditframe.cpp:1106
+#: kicad-6996/eeschema/schedit.cpp:533 kicad-6996/eeschema/tool_lib.cpp:65
+#: kicad-6996/eeschema/tool_sch.cpp:194
+#: kicad-6996/gerbview/events_called_functions.cpp:197
+#: kicad-6996/gerbview/toolbars_gerber.cpp:157
+#: kicad-6996/pagelayout_editor/events_functions.cpp:132
+#: kicad-6996/pagelayout_editor/toolbars_pl_editor.cpp:97
+#: kicad-6996/pcbnew/edit.cpp:1435 kicad-6996/pcbnew/modedit.cpp:953
+#: kicad-6996/pcbnew/tool_modedit.cpp:165 kicad-6996/pcbnew/tool_pcb.cpp:426
+#: kicad-6996/pcbnew/tools/common_actions.cpp:496
+#: kicad-6996/pcbnew/tools/zoom_tool.cpp:49
+msgid "Zoom to selection"
+msgstr "ズームの選択"
+
+#: kicad-6996/eeschema/menubar.cpp:101
+msgid "Imp&ort Schematic Sheet Content"
+msgstr "回路図のインポート (&o)"
+
+#: kicad-6996/eeschema/menubar.cpp:102
+msgid ""
+"Import a schematic sheet content from an other project in the current sheet"
+msgstr "現在のシートへ別のプロジェクトから回路図シートの内容をインポート"
+
+#: kicad-6996/eeschema/menubar.cpp:421
+msgid "&Import and export"
+msgstr "インポートとエクスポート(&I)"
+
+#: kicad-6996/eeschema/menubar.cpp:422
+msgid "Import and export settings"
+msgstr "インポートとエクスポートの設定"
+
+#: kicad-6996/eeschema/menubar.cpp:432
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:597
+msgid "Updates the PCB design with the current schematic (forward annotation)."
+msgstr "現在の回路図で基板 (PCB) デザインを更新 (フォワード アノテーション)"
+
+#: kicad-6996/eeschema/menubar.cpp:438
+msgid "&Open PCB Editor"
+msgstr "基板エディタを開く(&O)"
+
+#: kicad-6996/eeschema/menubar.cpp:491
+msgid "A&ssign Component Footprints"
+msgstr "コンポーネントにフットプリントを割付け(&s)"
+
+#: kicad-6996/eeschema/project_rescue.cpp:527
+#: kicad-6996/eeschema/project_rescue.cpp:542
+#: kicad-6297/eeschema/dialogs/dialog_rescue_each_base.h:65
+#: kicad-6996/eeschema/dialogs/dialog_rescue_each_base.h:65
 msgid "Project Rescue Helper"
 msgstr "プロジェクト レスキュー ヘルパー"
 
-#: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h:56
+#: kicad-6996/eeschema/sch_io_mgr.cpp:84
+#, c-format
+msgid "Unknown SCH_FILE_T value: %d"
+msgstr "未知の SCH_FILE_T の値: %d"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:113
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:158
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:206
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:252
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:292
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:304
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:355
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:368
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:387
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:790
+msgid "unexpected end of line"
+msgstr "予期しない行の終端"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:255
+msgid "expected single character token"
+msgstr "一文字のトークンを期待"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:315
+msgid "expected unquoted string"
+msgstr "引用符で囲まれていない文字列を期待"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:373
+msgid "expecting opening quote"
+msgstr "引用符の始まりを期待"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:410
+msgid "expected quoted string"
+msgstr "引用符で囲まれた文字列を期待"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:413
+msgid "no closing quote for string found"
+msgstr "文字列に引用符の終わりが見つかりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:593
+#, c-format
+msgid "'%s' does not appear to be an Eeschema file"
+msgstr "'%s' は Eeschema のファイルではありません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:621
+msgid "Missing 'EELAYER END'"
+msgstr "'EELAYER END' が見つかりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:640
+msgid "invalid page size"
+msgstr "不正なページ サイズ"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:666
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:928
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:936
+msgid "unexpected end of file"
+msgstr "予期しないファイルの終端"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:722
+msgid "missing 'EndDescr'"
+msgstr "'EndDescr' が見つかりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:814
+msgid "invalid sheet pin type"
+msgstr "不正なシート ピン タイプ"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:835
+msgid "invalid sheet pin side"
+msgstr "不正なシート ピン サイド"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:857
+msgid "missing '$EndSheet`"
+msgstr "'$EndSheet` が見つかりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:895
+msgid "Unexpected end of file"
+msgstr "予期しないファイルの終端"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1116
+msgid "invalid label type"
+msgstr "不正なラベル タイプ"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1127
+msgid "expected 'Italics' or '~'"
+msgstr "'Italics' or '~' を期待"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1308
+msgid "component field text horizontal justification must be L, R, or C"
+msgstr ""
+"コンポーネント フィールド テキストの水平位置揃えは、L, R または C でなければ"
+"なりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1318
+msgid "component field text vertical justification must be B, T, or C"
+msgstr ""
+"コンポーネント フィールド テキストの垂直位置揃えは、B, T または C でなければ"
+"なりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1323
+msgid "component field text attributes must be 3 characters wide"
+msgstr ""
+"コンポーネント フィールド テキストの属性は、３文字幅でなければなりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1329
+msgid "component field text italics indicator must be I or N"
+msgstr ""
+"コンポーネント フィールド テキストの斜字指標は、 I または N でなければなりま"
+"せん"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1335
+msgid "component field text bold indicator must be B or N"
+msgstr ""
+"コンポーネント フィールド テキストの太字指標は、 B または N でなければなりま"
+"せん"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1349
+msgid "component field orientation must be H or V"
+msgstr "コンポーネント フィールド の方向は、 H または V でなければなりません"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1377
+msgid "invalid component X1 transform value"
+msgstr "不正なコンポーネント X1 変換値"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1382
+msgid "invalid component Y1 transform value"
+msgstr "不正なコンポーネント Y1 変換値"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1387
+msgid "invalid component X2 transform value"
+msgstr "不正なコンポーネント X2 変換値"
+
+#: kicad-6996/eeschema/sch_legacy_plugin.cpp:1392
+msgid "invalid component Y2 transform value"
+msgstr "不正なコンポーネント Y2 変換値"
+
+#: kicad-6996/eeschema/sch_plugin.cpp:123
+msgid "Enable <b>debug</b> logging for Symbol*() functions in this SCH_PLUGIN."
+msgstr "この SCH_PLUGIN で Symbol*() 関数の<b>debug</b>ログを有効にします"
+
+#: kicad-6996/eeschema/sch_plugin.cpp:127
+msgid "Regular expression <b>symbol name</b> filter."
+msgstr "正規表現で<b>symbol name</b>を絞込み。"
+
+#: kicad-6996/eeschema/sch_plugin.cpp:148
+msgid ""
+"Enter the python symbol which implements the SCH_PLUGIN::Symbol*() functions."
+msgstr ""
+"SCH_PLUGIN::Symbol*() 関数が定義されている Python シンボルを入力して下さい。"
+
+#: kicad-6996/eeschema/schframe.cpp:838
+msgid ""
+"Cannot update the PCB, because the Schematic Editor is opened in stand-alone "
+"mode. In order to create/update PCBs from schematics, you need to launch "
+"Kicad shell and create a PCB project."
+msgstr ""
+"回路図エディタがスタンド アロン モードで開かれているため、基板 (PCB) を更新で"
+"きません。回路図から基板を作成・更新するには、Kicad シェルから起動し、基板プ"
+"ロジェクトを作成する必要があります。"
+
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:532
+#, c-format
+msgid "Pad: '%s' (Cmp: '%s')"
+msgstr "パッド: '%s' (部品: '%s')"
+
+#: kicad-6996/gerbview/class_gerber_draw_item.cpp:544
+msgid "Cmp reference:"
+msgstr "コンポーネントのリファレンス"
+
+#: kicad-6996/gerbview/class_gerber_file_image_list.cpp:169
+#, c-format
+msgid "%d %s"
+msgstr "%d %s"
+
+#: kicad-6996/gerbview/class_gerber_file_image_list.cpp:172
+#, c-format
+msgid "Graphic layer %d"
+msgstr "図形レイヤ %d"
+
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:25
+#: kicad-6996/gerbview/dialogs/dialog_print_using_printer_base.cpp:30
+msgid "Graphic layers:"
+msgstr "図形レイヤ:"
+
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:192
+msgid "Error reading EXCELLON drill file"
+msgstr "EXCELLON ドリル ファイルの読込みエラー"
+
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:484
+msgid "Tool definition shape not found"
+msgstr "ツール定義 shape が見つかりません"
+
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:487
+#, c-format
+msgid "Tool definition '%c' not supported"
+msgstr "ツール定義 '%c' はサポートされていません"
+
+#: kicad-6996/gerbview/excellon_read_drill_file.cpp:540
+#, c-format
+msgid "Tool %d not defined"
+msgstr "ツール %d は定義されていません"
+
+#: kicad-6996/gerbview/gerbview_frame.cpp:495
+#, c-format
+msgid "Drawing layer %d not in use"
+msgstr "描画レイヤ %d は未使用です"
+
+#: kicad-6996/kicad/mainframe.cpp:309
+msgid "Eeschema failed to load:\n"
+msgstr "Eeschema の読込みエラー:\n"
+
+#: kicad-6996/kicad/mainframe.cpp:310 kicad-6996/kicad/mainframe.cpp:352
+#: kicad-6996/kicad/mainframe.cpp:378 kicad-6996/kicad/mainframe.cpp:425
+msgid "KiCad Error"
+msgstr "KiCad エラー"
+
+#: kicad-6996/kicad/mainframe.cpp:351
+msgid "Component library editor failed to load:\n"
+msgstr "コンポーネント ライブラリ エディタの読込みに失敗しました:\n"
+
+#: kicad-6996/kicad/mainframe.cpp:378
+msgid "Pcbnew failed to load:\n"
+msgstr "Pcbnew はロードに失敗しました:\n"
+
+#: kicad-6996/kicad/mainframe.cpp:424
+msgid "Footprint library editor failed to load:\n"
+msgstr "フットプリント ライブラリ エディタの読込みに失敗しました:\n"
+
+#: kicad-6996/pcb_calculator/UnitSelector.cpp:75
+msgid "oz/ft^2"
+msgstr "oz/ft^2"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:130
+#, c-format
+msgid "Add component %s, footprint: %s.\n"
+msgstr "コンポーネント %s, フットプリント: %s を追加します。\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:155
+#, c-format
+msgid "Cannot add component %s due to missing footprint %s.\n"
+msgstr ""
+"コンポーネント %s を追加できませんでした。これは フットプリント %s が見つから"
+"なかったことに起因します。\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:189
+#, c-format
+msgid "Change component %s footprint from %s to %s.\n"
+msgstr "コンポーネント %s フットプリント %s - %s を置換します\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:226
+#, c-format
+msgid "Cannot change component %s footprint due to missing footprint %s.\n"
+msgstr ""
+"コンポーネント %s を変更できませんでした。これは フットプリント %s が見つから"
+"なかったことに起因します。\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:260
+#, c-format
+msgid "Change component %s reference to %s.\n"
+msgstr "コンポーネント %s を変更 (%s を参照)\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:283
+#, c-format
+msgid "Change component %s value from %s to %s.\n"
+msgstr "コンポーネント %s の値を %s から %s に変更\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:344
+#, c-format
+msgid "Disconnect component %s pin %s.\n"
+msgstr "コンポーネント %s のピン %s の接続を削除します。\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:380
+#, c-format
+msgid "Add net %s.\n"
+msgstr "ネット %s を追加\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:388
+#, c-format
+msgid "Reconnect component %s pin %s from net %s to net %s.\n"
+msgstr ""
+"コンポーネント %s ピン %s をネット %s からネット %s に接続変更します\n"
+"\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:395
+#, c-format
+msgid "Connect component %s pin %s to net %s.\n"
+msgstr "コンポーネント %s ピン %s をネット %s へ接続します\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:450
+#, c-format
+msgid "Remove component %s."
+msgstr "コンポーネント %s を削除"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:521
+#, c-format
+msgid "Remove single pad net %s."
+msgstr "孤立したパッド ネット %s を削除"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:590
+#, c-format
+msgid "Component %s pad %s not found in footprint %s\n"
+msgstr "コンポーネント %s パッド %s がフットプリント %s に見つかりません\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:611
+#, c-format
+msgid "Copper zone (net name %s): net has no pads connected."
+msgstr "導体ゾーン(ネット名 %s): ネットがパッドへ接続されていません。"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:639
+#, c-format
+msgid "Processing component \"%s:%s:%s\".\n"
+msgstr "コンポーネント  \"%s:%s:%s\" を処理中\n"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:696
+#, c-format
+msgid "Total warnings: %d, errors: %d."
+msgstr "合計　警告: %d, エラー: %d."
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:705
+msgid ""
+"Errors occured during the netlist update. Unless you fix them, your board "
+"will not be consistent with the schematics."
+msgstr ""
+"ネットリストの更新中にエラーが発生しました。これを修正しなければ、あなたの基"
+"板は回路図との一貫性を保てません。"
+
+#: kicad-6996/pcbnew/board_netlist_updater.cpp:711
+msgid "Netlist update successful!"
+msgstr "ネットリストの更新に成功！"
+
+#: kicad-6996/pcbnew/class_module.cpp:545
+msgid "Back (Flipped)"
+msgstr "裏面 (裏返し)"
+
+#: kicad-6996/pcbnew/class_pad.cpp:889
+msgid "Roundrect"
+msgstr "角を丸めた長方形"
+
+#: kicad-6996/pcbnew/cross-probing.cpp:254
+msgid "EEschema netlist"
+msgstr "EEschema ネットリスト"
+
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:145
+msgid "Default pad connection:"
+msgstr "デフォルトのパッド接続:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:147
+msgid ""
+"Default pad connection type to zone.\n"
+"This setting can be overridden by local  pad settings"
+msgstr ""
+"既定のパッド接続タイプはゾーンです。\n"
+"この設定はローカル パッド設定で上書きできます"
+
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.cpp:187
+msgid "Zone priority level:"
+msgstr "ゾーン優先度:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:232
+#, c-format
+msgid "Unrecognised numbering scheme: %d"
+msgstr "不正なパッド ナンバリングの方式: %d"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:246
+#, c-format
+msgid ""
+"Could not determine numbering start from \"%s\": expected value consistent "
+"with alphabet \"%s\""
+msgstr ""
+"\"%s\" から開始するナンバリングを実行できません: 期待される値は英文字 \"%s\" "
+"での一貫性が必要です"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:275
+#, c-format
+msgid "Bad numeric value for %s: %s"
+msgstr "%s に対する不正な数値: %s"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:298
+msgid "horizontal count"
+msgstr "横方向の数"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:300
+msgid "vertical count"
+msgstr "縦方向の数"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:310
+msgid "stagger"
+msgstr "配置シフトの間隔"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:359
+msgid "point count"
+msgstr "ピン数"
+
+#: kicad-6996/pcbnew/dialogs/dialog_create_array.cpp:372
+msgid "numbering start"
+msgstr "ナンバリングの開始"
+
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp:499
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp:348
+msgid "Invalid filename: "
+msgstr "不正なファイル名:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:70
+msgid "Rotation (-360 to 360):"
+msgstr "回転角 (-360 ～ 360):"
+
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp:348
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp:283
+msgid "3D Settings"
+msgstr "3D 設定"
+
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.cpp:124
+msgid "Rotation (-90.0 to 90.0)"
+msgstr "回転角 (-90.0 ～ 90.0)"
+
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:54
+msgid "Ascii"
+msgstr "Ascii"
+
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:54
+msgid "CSV"
+msgstr "CSV"
+
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.cpp:56
+msgid "Format:"
+msgstr "フォーマット:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:86
+msgid ""
+"Not recommended.\n"
+"Used mostly by users who make the boards themselves."
+msgstr ""
+"推奨されません。\n"
+"基板自体を作成したユーザーが使用して下さい。"
+
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:91
+msgid ""
+"Not recommended.\n"
+"Only use for board houses which do not accept fully featured headers."
+msgstr ""
+"推奨されません。\n"
+"フル機能のヘッダを受け付けない基板メーカー用にのみ使用して下さい。"
+
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.cpp:96
+msgid ""
+"Not recommended.\n"
+"Only use for board houses which ask for merged PTH and NPTH into a single "
+"file."
+msgstr ""
+"推奨されません。\n"
+"PTHとNPTH穴データを一つのファイルにマージしたものを受け付ける基板メーカー用に"
+"のみ使用して下さい。"
+
+#: kicad-6996/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp:35
+msgid "Available:"
+msgstr "利用可能なモード:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.cpp:45
+msgid "&Text line width"
+msgstr "テキスト線幅(&T)"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:854
+msgid "Incorrect corner size value"
+msgstr "無効なコーナー サイズ値です"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:858
+msgid "Incorrect (negative) corner size value"
+msgstr "不正な (負の) コーナー サイズ 値"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties.cpp:860
+msgid "Corner size value must be smaller than 50%"
+msgstr "コーナーサイズは 50% より小さくなければなりません。"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:66
+msgid "Rounded Rectangle"
+msgstr "角を丸めた長方形"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:226
+msgid "Corner size ( percent of width):"
+msgstr "コーナー サイズ (幅に対するパーセント):"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:228
+msgid ""
+"Corner radius in percent  of the pad width.\n"
+"The width is the smaller value between size X and size Y\n"
+"The max value is 50 percent "
+msgstr ""
+"パッド幅のパーセント表記のコーナー半径。\n"
+"幅はサイズ X, Y の間でより小さな値をとる\n"
+"最大値は 50 % "
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:239
+msgid "Corner radius:"
+msgstr "コーナー半径"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:241
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.cpp:247
+msgid ""
+"Corner radius.\n"
+"Can be no more than half pad width.\n"
+"The width is the smaller value between size X and size Y\n"
+"Note: IPC norm gives a max value = 0.25mm"
+msgstr ""
+"コーナー半径。\n"
+"パッド幅の半分の値を超えることはできない\n"
+"幅はサイズ X, Y の間でより小さな値をとる\n"
+"Note: IPC 標準での最大値 = 0.25mm"
+
+#: kicad-6996/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp:115
+msgid "Orientation (deg):"
+msgstr "方向 (度):"
+
+#: kicad-6996/pcbnew/dialogs/dialog_plot_base.cpp:361
+msgid "Run DRC"
+msgstr "DRC の実行"
+
+#: kicad-6996/pcbnew/dialogs/dialog_print_using_printer_base.cpp:42
+msgid "Technical layers:"
+msgstr "テクニカル レイヤ:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_select_net_from_list.cpp:150
+#, c-format
+msgid "net %.3d"
+msgstr "ネット %.3d"
+
+#: kicad-6996/pcbnew/dialogs/dialog_select_net_from_list_base.cpp:25
+msgid "Net name filter"
+msgstr "ネット名フィルタ"
+
+#: kicad-6996/pcbnew/dialogs/dialog_select_net_from_list_base.cpp:32
+msgid "Show zero pad nets"
+msgstr "ゼロ パッド ネットを表示"
+
+#: kicad-6996/pcbnew/dialogs/dialog_select_net_from_list_base.cpp:55
+msgid "Number of pads"
+msgstr "パッドの数"
+
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:132
+msgid "Dots"
+msgstr "ドット"
+
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.cpp:134
+msgid "Style (OpenGL && Cairo)"
+msgstr "スタイル (OpenGL && Cairo)"
+
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb.cpp:21
+msgid "Changes to be applied:"
+msgstr "適用された変更:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb.cpp:67
+msgid ""
+"Failed to load one or more footprints. Please add the missing libraries in "
+"PCBNew configuration. The PCB will not update completely."
+msgstr ""
+"１つ以上のフットプリントの読み込みに失敗しました。 PCBNew の設定で見つからな"
+"いライブラリを追加して下さい。基板は完全に更新されません。"
+
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb.cpp:126
+msgid "Update complete"
+msgstr "更新の終了"
+
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb.cpp:143
+msgid "Changes applied to the PCB:"
+msgstr "基板への変更を適用:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb_base.cpp:26
+msgid "Match components by:"
+msgstr "一致したコンポーネント by:"
+
+#: kicad-6996/pcbnew/dialogs/dialog_update_pcb_base.cpp:59
+msgid "Perform PCB Update"
+msgstr "基板の更新を実行"
+
+#: kicad-6996/pcbnew/files.cpp:136 kicad-6996/pcbnew/menubar_pcbframe.cpp:106
+msgid "Import Non Kicad Board File"
+msgstr "Kicad 以外のボード ファイルをインポート"
+
+#: kicad-6996/pcbnew/github/github_getliblist.cpp:235
+#, c-format
+msgid ""
+"Error fetching JSON data from URL '%s'.\n"
+"Reason: '%s'"
+msgstr ""
+"エラー JSON データを取得できませんでした URL '%s'\n"
+"理由: '%s'"
+
+#: kicad-6996/pcbnew/github/github_plugin.cpp:561
+#, c-format
+msgid ""
+"Cannot download library '%s'.\n"
+"The library does not exist on the server"
+msgstr ""
+"ライブラリ '%s' をダウンロードできません。\n"
+"ライブラリはサーバーに存在しません"
+
+#: kicad-6996/pcbnew/hotkeys.cpp:135
+msgid "Switch to Legacy Canvas"
+msgstr "描画キャンバスを 互換 に切替"
+
+#: kicad-6996/pcbnew/kicad_plugin.cpp:1754
+msgid "this file does not contain a PCB"
+msgstr "このファイルは基板 (PCB) を含んでいません"
+
+#: kicad-6996/pcbnew/layer_widget.cpp:434
+msgid ""
+"Left double click or middle click for color change, right click for menu"
+msgstr "左ダブルクリックまたは中クリックで色の変更, 右クリックでメニュー"
+
+#: kicad-6996/pcbnew/layer_widget.cpp:470
+msgid "Left double click or middle click for color change"
+msgstr "左ダブルクリックまたは中クリックで色の変更"
+
+#: kicad-6996/pcbnew/menubar_modedit.cpp:242
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:364
+msgid "&Switch Canvas to Legacy"
+msgstr "描画キャンバスを 互換 に切替 (&S)"
+
+#: kicad-6996/pcbnew/menubar_modedit.cpp:246
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:368
+msgid "Switch the canvas implementation to Legacy"
+msgstr "描画キャンバスを互換へ切替"
+
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:69
+msgid "&New Board"
+msgstr "新規ボード (&N)"
+
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:73
+msgid "&Open Board"
+msgstr "ボード ファイルを開く (&O)"
+
+#: kicad-6996/pcbnew/menubar_pcbframe.cpp:107
+msgid "Load a non KiCad board file and convert it to a .kicad_pcb file"
+msgstr "KiCad 以外の基板ファイルを読み込んで .kicad_pcb ファイルへ変換する"
+
+#: kicad-6996/pcbnew/pcbframe.cpp:1085
+msgid ""
+"Cannot update the PCB, because the Kicad is opened in stand-alone mode. In "
+"order to create/update PCBs from schematics, you need to launch Kicad shell "
+"and create a PCB project."
+msgstr ""
+"回路図エディタがスタンド アロン モードで開かれているため、基板 (PCB) を更新で"
+"きません。回路図から基板を作成・更新するには、Kicad シェルから起動し、基板プ"
+"ロジェクトを作成する必要があります。"
+
+#: kicad-6996/pcbnew/tools/common_actions.cpp:409
+msgid "Lock"
+msgstr "ロック"
+
+#: kicad-6996/pcbnew/tools/common_actions.cpp:413
+msgid "Unlock"
+msgstr "ロック解除"
+
+#: kicad-6996/pcbnew/tools/pcb_editor_control.cpp:140
+msgid "Locking"
+msgstr "ロック中"
+
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:131
+msgid "The duplicated zone cannot be on the same layer as the original zone."
+msgstr "重複したゾーンは同じレイヤーに配置できません"
+
+#: kicad-6996/pcbnew/zones_by_polygon.cpp:160
+msgid "Warning: The new zone fails DRC"
+msgstr "警告: 新しいゾーンは DRC に違反しています"
+
+#: kicad-6996/plugins/3d/vrml/vrml.cpp:187
+msgid " * [INFO] load failed: input line too long\n"
+msgstr " * [INFO] ロードに失敗しました: 入力行が長すぎます\n"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:104
+msgid "incompatible plugin (missing function 'GetNExtensions')"
+msgstr ""
+"互換性のないプラグイン (ファンクション 'GetNExtensions' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:117
+msgid "incompatible plugin (missing function 'GetModelExtension')"
+msgstr ""
+"互換性のないプラグイン (ファンクション 'GetModelExtension' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:126
+msgid "missing function 'GetModelExtension'"
+msgstr "ファンクション 'GetModelExtension' が見つかりません"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:138
+msgid "incompatible plugin (missing function 'GetNFilters')"
+msgstr "互換性のないプラグイン (ファンクション 'GetNFilters' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:147
+msgid "missing function 'GetNFilters'"
+msgstr "ファンクション 'GetNFilters' が見つかりません"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:159
+msgid "incompatible plugin (missing function 'GetFileFilter')"
+msgstr ""
+"互換性のないプラグイン (ファンクション 'GetFileFilter' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:168
+msgid "missing function 'GetFileFilter'"
+msgstr "ファンクション 'GetFileFilter' が見つかりません"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:180
+msgid "incompatible plugin (missing function 'CanRender')"
+msgstr "互換性のないプラグイン (ファンクション 'CanRender' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:189
+msgid "missing function 'CanRender'"
+msgstr "ファンクション 'CanRender' が見つかりません"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:201
+msgid "incompatible plugin (missing function 'Load')"
+msgstr "互換性のないプラグイン (ファンクション 'Load' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/3d/pluginldr3D.cpp:209
+msgid "missing function 'Load'"
+msgstr "ファンクション 'Load' が見つかりません"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:92
+msgid "incompatible plugin (missing function 'GetKicadPluginClass')"
+msgstr ""
+"互換性のないプラグイン (ファンクション 'GetKicadPluginClass' が見つかりませ"
+"ん)"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:105
+msgid "incompatible plugin (missing function 'GetClassVersion')"
+msgstr ""
+"互換性のないプラグイン (ファンクション 'GetClassVersion' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:114
+msgid "missing function 'GetClassVersion'"
+msgstr "ファンクション 'GetClassVersion' が見つかりません"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:126
+msgid "incompatible plugin (missing function 'CheckClassVersion')"
+msgstr ""
+"互換性のないプラグイン (ファンクション 'CheckClassVersion' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:135
+msgid "missing function 'CheckClassVersion'"
+msgstr "ファンクション 'CheckClassVersion' が見つかりません"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:147
+msgid "incompatible plugin (missing function 'GetKicadPluginName')"
+msgstr ""
+"互換性のないプラグイン (ファンクション 'GetKicadPluginName' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:156
+msgid "missing function 'GetKicadPluginName'"
+msgstr "ファンクション 'GetKicadPluginName' が見つかりません"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:168
+msgid "incompatible plugin (missing function 'GetVersion')"
+msgstr "互換性のないプラグイン (ファンクション 'GetVersion' が見つかりません)"
+
+#: kicad-6996/plugins/ldr/pluginldr.cpp:176
+msgid "missing function 'GetVersion'"
+msgstr "ファンクション 'GetVersion' が見つかりません"
+
+#: kicad-6297/3d-viewer/dialogs/dialog_3D_view_option_base.h:79
+#: kicad-6996/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h:79
+msgid "3D Display Options"
+msgstr "3D表示オプション"
+
+#: kicad-6297/bitmap2component/bitmap2cmp_gui_base.h:92
+#: kicad-6996/bitmap2component/bitmap2cmp_gui_base.h:92
+msgid "Bitmap to Component Converter"
+msgstr "ビットマップ - コンポーネント変換"
+
+#: kicad-6297/common/dialog_about/dialog_about_base.h:51
+msgid "About..."
+msgstr "このソフトウェアについて"
+
+#: kicad-6297/common/dialogs/dialog_env_var_config_base.h:56
+#: kicad-6996/common/dialogs/dialog_env_var_config_base.h:56
+msgid "Path Configuration"
+msgstr "環境変数の設定"
+
+#: kicad-6297/common/dialogs/dialog_hotkeys_editor_base.h:53
+#: kicad-6996/common/dialogs/dialog_hotkeys_editor_base.h:55
+msgid "Hotkeys Editor"
+msgstr "ホットキー エディタ"
+
+#: kicad-6297/common/dialogs/dialog_image_editor_base.h:64
+#: kicad-6996/common/dialogs/dialog_image_editor_base.h:64
+msgid "Image Editor"
+msgstr "イメージ エディタ"
+
+#: kicad-6297/common/dialogs/dialog_page_settings_base.h:121
+#: kicad-6996/common/dialogs/dialog_page_settings_base.h:121
+msgid "Page Settings"
+msgstr "ページ設定"
+
+#: kicad-6297/cvpcb/dialogs/dialog_display_options_base.h:63
+#: kicad-6297/pcbnew/dialogs/dialog_display_options_base.h:72
+#: kicad-6996/cvpcb/dialogs/dialog_display_options_base.h:60
+#: kicad-6996/pcbnew/dialogs/dialog_display_options_base.h:70
+msgid "Display Options"
+msgstr "表示オプション"
+
+#: kicad-6297/eeschema/dialogs/dialog_annotate_base.h:89
+#: kicad-6996/eeschema/dialogs/dialog_annotate_base.h:89
+msgid "Annotate Schematic"
+msgstr "回路図のアノテーション"
+
+#: kicad-6297/eeschema/dialogs/dialog_bom_base.h:93
+#: kicad-6996/eeschema/dialogs/dialog_bom_base.h:97
+msgid "Bill of Material"
+msgstr "部品表(BOM)"
+
+#: kicad-6297/eeschema/dialogs/dialog_color_config_base.h:47
+msgid "EESchema Colors"
+msgstr "Eeschema カラー"
+
+#: kicad-6297/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h:104
+#: kicad-6297/eeschema/dialogs/dialog_lib_new_component_base.h:62
+#: kicad-6996/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h:104
+#: kicad-6996/eeschema/dialogs/dialog_lib_new_component_base.h:62
+msgid "Component Properties"
+msgstr "コンポーネント プロパティ"
+
+#: kicad-6297/eeschema/dialogs/dialog_edit_label_base.h:70
+#: kicad-6996/eeschema/dialogs/dialog_edit_label_base.h:70
+msgid "Text Editor"
+msgstr "テキスト エディタ"
+
+#: kicad-6297/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h:87
+#: kicad-6996/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h:87
+msgid "Field Properties"
+msgstr "フィールドのプロパティ"
+
+#: kicad-6297/eeschema/dialogs/dialog_eeschema_options_base.h:140
+#: kicad-6996/eeschema/dialogs/dialog_eeschema_options_base.h:129
+msgid "Schematic Editor Options"
+msgstr "回路図エディタ オプション"
+
+#: kicad-6297/eeschema/dialogs/dialog_erc_base.h:83
+#: kicad-6996/eeschema/dialogs/dialog_erc_base.h:90
+msgid "Electrical Rules Checker"
+msgstr "エレクトリカル ルール チェック(ERC)"
+
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_draw_item_base.h:62
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_draw_item_base.h:62
+msgid "Drawing Properties"
+msgstr "図形のプロパティ"
+
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_base.h:99
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_base.h:101
+msgid "Pin Properties"
+msgstr "ピンのプロパティ"
+
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_pin_table_base.h:48
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_pin_table_base.h:50
+msgid "Pin Table"
+msgstr "ピン一覧"
+
+#: kicad-6297/eeschema/dialogs/dialog_lib_edit_text_base.h:69
+#: kicad-6996/eeschema/dialogs/dialog_lib_edit_text_base.h:69
+msgid "Library Text Properties"
+msgstr "ライブラリ テキスト プロパティ"
+
+#: kicad-6297/eeschema/dialogs/dialog_libedit_options_base.h:80
+#: kicad-6996/eeschema/dialogs/dialog_libedit_options_base.h:77
+msgid "Library Editor Options"
+msgstr "コンポーネント ライブラリ エディタ オプション"
+
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.h:78
+#: kicad-6297/pcbnew/dialogs/dialog_netlist_fbp.h:84
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.h:78
+#: kicad-6996/pcbnew/dialogs/dialog_netlist_fbp.h:84
+msgid "Netlist"
+msgstr "ネットリスト"
+
+#: kicad-6297/eeschema/dialogs/dialog_netlist_base.h:119
+#: kicad-6996/eeschema/dialogs/dialog_netlist_base.h:119
+msgid "Plugins:"
+msgstr "プラグイン ファイル:"
+
+#: kicad-6297/eeschema/dialogs/dialog_plot_schematic_base.h:86
+#: kicad-6996/eeschema/dialogs/dialog_plot_schematic_base.h:85
+msgid "Plot Schematic"
+msgstr "回路図のプロット"
+
+#: kicad-6297/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h:56
+#: kicad-6996/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h:56
 msgid "Sheet Pin Properties"
 msgstr "シート ピン プロパティ"
 
-#: eeschema/dialogs/dialog_sch_sheet_props_base.h:60
+#: kicad-6297/eeschema/dialogs/dialog_sch_sheet_props_base.h:60
+#: kicad-6996/eeschema/dialogs/dialog_sch_sheet_props_base.h:60
 msgid "Schematic Sheet Properties"
 msgstr "回路図 シート プロパティ"
 
-#: eeschema/help_common_strings.h:41
+#: kicad-6297/eeschema/help_common_strings.h:41
+#: kicad-6996/eeschema/help_common_strings.h:41
 msgid "Redo last command"
 msgstr "一つ前のコマンドをやり直し"
 
-#: eeschema/help_common_strings.h:45
+#: kicad-6297/eeschema/help_common_strings.h:45
+#: kicad-6996/eeschema/help_common_strings.h:45
 msgid "Fit schematic sheet on screen"
 msgstr "回路図表示を画面サイズに合わせる"
 
-#: eeschema/help_common_strings.h:46
+#: kicad-6297/eeschema/help_common_strings.h:46
+#: kicad-6996/eeschema/help_common_strings.h:46
 msgid "Redraw schematic view"
 msgstr "回路図ビューの再描画"
 
-#: eeschema/help_common_strings.h:51
+#: kicad-6297/eeschema/help_common_strings.h:51
+#: kicad-6996/eeschema/help_common_strings.h:51
 msgid "Find components and text"
 msgstr "コンポーネントとテキストの検索"
 
-#: eeschema/help_common_strings.h:52
+#: kicad-6297/eeschema/help_common_strings.h:52
+#: kicad-6996/eeschema/help_common_strings.h:52
 msgid "Find and replace text in schematic items"
 msgstr "回路図アイテム中のテキストの置換"
 
-#: eeschema/help_common_strings.h:53
+#: kicad-6297/eeschema/help_common_strings.h:53
+#: kicad-6996/eeschema/help_common_strings.h:53
 msgid "Place component"
 msgstr "コンポーネントを配置"
 
-#: eeschema/help_common_strings.h:54
+#: kicad-6297/eeschema/help_common_strings.h:54
+#: kicad-6996/eeschema/help_common_strings.h:54
 msgid "Place power port"
 msgstr "電源ポートを配置"
 
-#: eeschema/help_common_strings.h:55
+#: kicad-6297/eeschema/help_common_strings.h:55
+#: kicad-6996/eeschema/help_common_strings.h:55
 msgid "Place wire"
 msgstr "ワイヤを配置"
 
-#: eeschema/help_common_strings.h:56
+#: kicad-6297/eeschema/help_common_strings.h:56
+#: kicad-6996/eeschema/help_common_strings.h:56
 msgid "Place bus"
 msgstr "バスを配置"
 
-#: eeschema/help_common_strings.h:57
+#: kicad-6297/eeschema/help_common_strings.h:57
+#: kicad-6996/eeschema/help_common_strings.h:57
 msgid "Place wire to bus entry"
 msgstr "ワイヤ-バスエントリを配置"
 
-#: eeschema/help_common_strings.h:58
+#: kicad-6297/eeschema/help_common_strings.h:58
+#: kicad-6996/eeschema/help_common_strings.h:58
 msgid "Place bus to bus entry"
 msgstr "バス-バスエントリを配置"
 
-#: eeschema/help_common_strings.h:59
+#: kicad-6297/eeschema/help_common_strings.h:59
+#: kicad-6996/eeschema/help_common_strings.h:59
 msgid "Place not-connected flag"
 msgstr "空き端子フラグを配置"
 
-#: eeschema/help_common_strings.h:61
+#: kicad-6297/eeschema/help_common_strings.h:61
+#: kicad-6996/eeschema/help_common_strings.h:61
 msgid "Place net name - local label"
 msgstr "ネット名(ローカル ラベル)を配置"
 
-#: eeschema/help_common_strings.h:64
+#: kicad-6297/eeschema/help_common_strings.h:64
+#: kicad-6996/eeschema/help_common_strings.h:64
 msgid ""
 "Place global label.\n"
 "Warning: inside global hierarchy , all global labels with same name are "
@@ -22283,7 +30765,8 @@ msgstr ""
 "グローバル ラベルを配置 \n"
 "同名の全てのグローバル ラベルは全ての階層内で接続されます"
 
-#: eeschema/help_common_strings.h:66
+#: kicad-6297/eeschema/help_common_strings.h:66
+#: kicad-6996/eeschema/help_common_strings.h:66
 msgid ""
 "Place a hierarchical label. Label will be seen as a hierarchical pin in the "
 "sheet symbol"
@@ -22291,122 +30774,145 @@ msgstr ""
 "階層ラベルを配置\n"
 "このラベルはシート シンボル中で階層ピンとして見えます"
 
-#: eeschema/help_common_strings.h:68
+#: kicad-6297/eeschema/help_common_strings.h:68
+#: kicad-6996/eeschema/help_common_strings.h:68
 msgid "Place junction"
 msgstr "ジャンクション(接続点)を配置"
 
-#: eeschema/help_common_strings.h:69
+#: kicad-6297/eeschema/help_common_strings.h:69
+#: kicad-6996/eeschema/help_common_strings.h:69
 msgid "Create hierarchical sheet"
 msgstr "階層シートの作成"
 
-#: eeschema/help_common_strings.h:71
+#: kicad-6297/eeschema/help_common_strings.h:71
+#: kicad-6996/eeschema/help_common_strings.h:71
 msgid ""
 "Place hierarchical pin imported from the corresponding hierarchical label"
 msgstr "シート内の対応する階層ラベルからインポートされた階層ピンを配置"
 
-#: eeschema/help_common_strings.h:72
+#: kicad-6297/eeschema/help_common_strings.h:72
+#: kicad-6996/eeschema/help_common_strings.h:72
 msgid "Place hierarchical pin in sheet"
 msgstr "シートに階層ピンを配置"
 
-#: eeschema/help_common_strings.h:73
+#: kicad-6297/eeschema/help_common_strings.h:73
+#: kicad-6996/eeschema/help_common_strings.h:73
 msgid "Place graphic lines or polygons"
 msgstr "図形ラインまたはポリゴンを配置"
 
-#: eeschema/help_common_strings.h:74
+#: kicad-6297/eeschema/help_common_strings.h:74
+#: kicad-6996/eeschema/help_common_strings.h:74
 msgid "Place text"
 msgstr "テキストを配置"
 
-#: eeschema/help_common_strings.h:76
+#: kicad-6297/eeschema/help_common_strings.h:76
+#: kicad-6996/eeschema/help_common_strings.h:76
 msgid "Annotate schematic components"
 msgstr "回路図のアノテーション"
 
-#: eeschema/help_common_strings.h:77
+#: kicad-6297/eeschema/help_common_strings.h:77
+#: kicad-6996/eeschema/help_common_strings.h:77
 msgid "Library Editor - Create/edit components"
 msgstr "コンポーネント ライブラリ エディタ - コンポーネントの作成と編集"
 
-#: eeschema/help_common_strings.h:78
+#: kicad-6297/eeschema/help_common_strings.h:78
+#: kicad-6996/eeschema/help_common_strings.h:78
 msgid "Library Browser - Browse components"
 msgstr "ライブラリ ブラウザ - コンポーネントの参照"
 
-#: eeschema/help_common_strings.h:79
+#: kicad-6297/eeschema/help_common_strings.h:79
+#: kicad-6996/eeschema/help_common_strings.h:79
 msgid "Generate bill of materials and/or cross references"
 msgstr "部品表の生成"
 
-#: eeschema/help_common_strings.h:81
+#: kicad-6297/eeschema/help_common_strings.h:81
+#: kicad-6996/eeschema/help_common_strings.h:81
 msgid "Back-import component footprint fields via CvPcb .cmp file"
 msgstr ""
-"CvPcb の.cmp ファイルより、コンポーネント フットプリント フィールド情報をバッ"
-"クインポート"
+"CvPcb .cmp ファイルよりコンポーネント フットプリント フィールド情報をバックイ"
+"ンポート"
 
-#: eeschema/help_common_strings.h:84
+#: kicad-6297/eeschema/help_common_strings.h:84
+#: kicad-6996/eeschema/help_common_strings.h:84
 msgid "Add pins to component"
 msgstr "コンポーネントにピンを追加"
 
-#: eeschema/help_common_strings.h:85
+#: kicad-6297/eeschema/help_common_strings.h:85
+#: kicad-6996/eeschema/help_common_strings.h:85
 msgid "Add text to component body"
 msgstr "コンポーネントのボディにテキストを追加"
 
-#: eeschema/help_common_strings.h:86
+#: kicad-6297/eeschema/help_common_strings.h:86
+#: kicad-6996/eeschema/help_common_strings.h:86
 msgid "Add graphic rectangle to component body"
 msgstr "コンポーネントのボディに矩形を追加"
 
-#: eeschema/help_common_strings.h:87
+#: kicad-6297/eeschema/help_common_strings.h:87
+#: kicad-6996/eeschema/help_common_strings.h:87
 msgid "Add circles to component body"
 msgstr "コンポーネントのボディに円を追加"
 
-#: eeschema/help_common_strings.h:88
+#: kicad-6297/eeschema/help_common_strings.h:88
+#: kicad-6996/eeschema/help_common_strings.h:88
 msgid "Add arcs to component body"
 msgstr "コンポーネントのボディに円弧を追加"
 
-#: eeschema/help_common_strings.h:89
+#: kicad-6297/eeschema/help_common_strings.h:89
+#: kicad-6996/eeschema/help_common_strings.h:89
 msgid "Add lines and polygons to component body"
 msgstr "コンポーネントのボディに直線、ポリゴンを追加"
 
-#: eeschema/sch_bitmap.h:127
+#: kicad-6297/eeschema/sch_bitmap.h:127 kicad-6996/eeschema/sch_bitmap.h:131
 msgid "Image"
 msgstr "画像"
 
-#: eeschema/sch_marker.h:100
+#: kicad-6297/eeschema/sch_marker.h:100 kicad-6996/eeschema/sch_marker.h:100
 msgid "ERC Marker"
 msgstr "ERCマーカー"
 
-#: eeschema/sch_no_connect.h:88
+#: kicad-6297/eeschema/sch_no_connect.h:88
+#: kicad-6996/eeschema/sch_no_connect.h:88
 msgid "No Connect"
 msgstr "未接続"
 
-#: gerbview/dialogs/dialog_show_page_borders_base.h:50
+#: kicad-6297/gerbview/dialogs/dialog_show_page_borders_base.h:50
+#: kicad-6996/gerbview/dialogs/dialog_show_page_borders_base.h:50
 msgid "Page Borders"
 msgstr "ページ境界線"
 
-#: gerbview/dialogs/gerbview_dialog_display_options_frame_base.h:65
+#: kicad-6297/gerbview/dialogs/gerbview_dialog_display_options_frame_base.h:66
+#: kicad-6996/gerbview/dialogs/gerbview_dialog_display_options_frame_base.h:63
 msgid "Gerbview Options"
 msgstr "Gerbview オプション"
 
-#: include/class_drc_item.h:164
+#: kicad-6297/include/class_drc_item.h:164
+#: kicad-6996/include/class_drc_item.h:164
 #, c-format
 msgid "ErrType(%d): <b>%s</b><ul><li> %s </li></ul>"
 msgstr "エラータイプ(%d): <b>%s</b><ul><li> %s </li></ul>"
 
-#: include/class_drc_item.h:177
+#: kicad-6297/include/class_drc_item.h:177
+#: kicad-6996/include/class_drc_item.h:177
 #, c-format
 msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
 msgstr "エラータイプ(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
 
-#: include/class_drc_item.h:185
+#: kicad-6297/include/class_drc_item.h:185
+#: kicad-6996/include/class_drc_item.h:185
 #, c-format
 msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
 msgstr "エラータイプ(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
 
-#: include/common.h:307
+#: kicad-6297/include/common.h:266 kicad-6996/include/common.h:272
 #, c-format
 msgid " (%s):"
 msgstr " (%s):"
 
-#: include/kiway_player.h:260
+#: kicad-6297/include/kiway_player.h:260 kicad-6996/include/kiway_player.h:260
 msgid "This file is already open."
 msgstr "このファイルは既に開かれています。"
 
-#: include/richio.h:77
+#: kicad-6297/include/richio.h:77 kicad-6996/include/richio.h:77
 #, c-format
 msgid ""
 "IO_ERROR: %s\n"
@@ -22415,7 +30921,7 @@ msgstr ""
 "I/Oエラー: %s\n"
 "%s : %s"
 
-#: include/richio.h:78
+#: kicad-6297/include/richio.h:78
 #, c-format
 msgid ""
 "PARSE_ERROR: %s in input/source\n"
@@ -22430,200 +30936,265 @@ msgstr ""
 "位置 %d\n"
 "%s : %s"
 
-#: kicad/dialogs/dialog_template_selector_base.h:68
+#: kicad-6297/include/richio.h:220 kicad-6996/include/richio.h:220
+#, c-format
+msgid ""
+"KiCad was unable to open this file, as it was created with a more recent "
+"version than the one you are running. To open it, you'll need to upgrade "
+"KiCad to a more recent version.\n"
+"\n"
+"Date of KiCad version required (or newer): %s\n"
+"\n"
+"Full error text:\n"
+"%s"
+msgstr ""
+"KiCad は現在使っているバージョンより新しいバージョンで作られたこのファイルを"
+"開くことができません。このファイルを開くためには KiCad を新しいバージョンへ"
+"アップグレードする必要があります。\n"
+"\n"
+"必要とされる KiCad バージョンの日付 (または以降): %s\n"
+"\n"
+"エラーの全文:\n"
+"%s"
+
+#: kicad-6297/kicad/dialogs/dialog_template_selector_base.h:68
+#: kicad-6996/kicad/dialogs/dialog_template_selector_base.h:68
 msgid "Project Template Selector"
 msgstr "プロジェクト テンプレートの選択"
 
-#: pagelayout_editor/dialogs/dialog_new_dataitem_base.h:71
+#: kicad-6297/pagelayout_editor/dialogs/dialog_new_dataitem_base.h:71
+#: kicad-6996/pagelayout_editor/dialogs/dialog_new_dataitem_base.h:71
 msgid "New Item"
 msgstr "新規アイテム"
 
-#: pcb_calculator/dialogs/dialog_regulator_data_base.h:62
+#: kicad-6297/pcb_calculator/dialogs/dialog_regulator_data_base.h:62
+#: kicad-6996/pcb_calculator/dialogs/dialog_regulator_data_base.h:63
 msgid "Regulator Parameters"
 msgstr "レギュレータのパラメータ"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.h:304
+#: kicad-6297/pcb_calculator/dialogs/pcb_calculator_frame_base.h:304
+#: kicad-6996/pcb_calculator/dialogs/pcb_calculator_frame_base.h:308
 msgid "PCB Calculator"
 msgstr "Pcb Calculator"
 
-#: pcbnew/dialogs/dialog_SVG_print_base.h:73
+#: kicad-6297/pcbnew/dialogs/dialog_SVG_print_base.h:73
+#: kicad-6996/pcbnew/dialogs/dialog_SVG_print_base.h:76
 msgid "Export SVG file"
 msgstr "SVGファイルのエクスポート"
 
-#: pcbnew/dialogs/dialog_cleaning_options_base.h:54
+#: kicad-6297/pcbnew/dialogs/dialog_cleaning_options_base.h:54
+#: kicad-6996/pcbnew/dialogs/dialog_cleaning_options_base.h:54
 msgid "Cleaning Options"
 msgstr "削除設定"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.h:130
+#: kicad-6297/pcbnew/dialogs/dialog_copper_zones_base.h:130
+#: kicad-6996/pcbnew/dialogs/dialog_copper_zones_base.h:130
 msgid "Copper Zone Properties"
 msgstr "導体ゾーンのプロパティ"
 
-#: pcbnew/dialogs/dialog_create_array_base.h:114
-msgid "Create Array"
-msgstr "配列の作成"
-
-#: pcbnew/dialogs/dialog_design_rules_base.h:112
+#: kicad-6297/pcbnew/dialogs/dialog_design_rules_base.h:112
+#: kicad-6996/pcbnew/dialogs/dialog_design_rules_base.h:112
 msgid "Design Rules Editor"
 msgstr "デザインルール エディタ"
 
-#: pcbnew/dialogs/dialog_dimension_editor_base.h:70
+#: kicad-6297/pcbnew/dialogs/dialog_dimension_editor_base.h:70
+#: kicad-6996/pcbnew/dialogs/dialog_dimension_editor_base.h:69
 msgid "Dimension Properties"
 msgstr "寸法線のプロパティ"
 
-#: pcbnew/dialogs/dialog_drc_base.h:103
+#: kicad-6297/pcbnew/dialogs/dialog_drc_base.h:107
+#: kicad-6996/pcbnew/dialogs/dialog_drc_base.h:107
 msgid "DRC Control"
 msgstr "DRC"
 
-#: pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h:140
-#: pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h:122
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h:140
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h:122
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h:133
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h:116
 msgid "Footprint Properties"
 msgstr "フットプリントのプロパティ"
 
-#: pcbnew/dialogs/dialog_edit_module_text_base.h:70
+#: kicad-6297/pcbnew/dialogs/dialog_edit_module_text_base.h:72
+#: kicad-6996/pcbnew/dialogs/dialog_edit_module_text_base.h:76
 msgid "Footprint Text Properties"
 msgstr "フットプリント テキストのプロパティ"
 
-#: pcbnew/dialogs/dialog_enum_pads_base.h:53
+#: kicad-6297/pcbnew/dialogs/dialog_enum_pads_base.h:53
+#: kicad-6996/pcbnew/dialogs/dialog_enum_pads_base.h:53
 msgid "Pad enumeration settings"
 msgstr "パッド配置の設定"
 
-#: pcbnew/dialogs/dialog_exchange_modules_base.h:71
+#: kicad-6297/pcbnew/dialogs/dialog_exchange_modules_base.h:71
+#: kicad-6996/pcbnew/dialogs/dialog_exchange_modules_base.h:71
 msgid "Change Footprint"
 msgstr "フットプリントの変更"
 
-#: pcbnew/dialogs/dialog_export_idf_base.h:62
+#: kicad-6297/pcbnew/dialogs/dialog_export_idf_base.h:62
+#: kicad-6996/pcbnew/dialogs/dialog_export_idf_base.h:62
 msgid "Export IDFv3"
 msgstr "IDFv3のエクスポート"
 
-#: pcbnew/dialogs/dialog_export_vrml_base.h:76
+#: kicad-6297/pcbnew/dialogs/dialog_export_vrml_base.h:76
+#: kicad-6996/pcbnew/dialogs/dialog_export_vrml_base.h:76
 msgid "VRML Export Options"
 msgstr "VRML エクスポート オプション"
 
-#: pcbnew/dialogs/dialog_footprint_wizard_list_base.h:51
+#: kicad-6297/pcbnew/dialogs/dialog_footprint_wizard_list_base.h:51
+#: kicad-6996/pcbnew/dialogs/dialog_footprint_wizard_list_base.h:51
 msgid "Footprint Generators"
 msgstr "フットプリント作成ツール"
 
-#: pcbnew/dialogs/dialog_fp_lib_table_base.h:81
+#: kicad-6297/pcbnew/dialogs/dialog_fp_lib_table_base.h:81
+#: kicad-6996/pcbnew/dialogs/dialog_fp_lib_table_base.h:81
 msgid "PCB Library Tables"
 msgstr "PCBライブラリ一覧"
 
-#: pcbnew/dialogs/dialog_gen_module_position_file_base.h:62
+#: kicad-6297/pcbnew/dialogs/dialog_gen_module_position_file_base.h:62
+#: kicad-6996/pcbnew/dialogs/dialog_gen_module_position_file_base.h:61
 msgid "Generate Component Position Files"
 msgstr "コンポーネント 座標 ファイルの作成"
 
-#: pcbnew/dialogs/dialog_gendrill_base.h:80
+#: kicad-6297/pcbnew/dialogs/dialog_gendrill_base.h:80
+#: kicad-6996/pcbnew/dialogs/dialog_gendrill_base.h:80
 msgid "Drill Files Generation"
 msgstr "ドリル ファイルの生成"
 
-#: pcbnew/dialogs/dialog_global_deletion_base.h:75
+#: kicad-6297/pcbnew/dialogs/dialog_global_deletion_base.h:75
+#: kicad-6996/pcbnew/dialogs/dialog_global_deletion_base.h:75
 msgid "Delete Items"
 msgstr "アイテムを削除"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h:69
+#: kicad-6297/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h:69
+#: kicad-6996/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h:71
 msgid "Global Edition of Tracks and Vias"
 msgstr "配線とビアのグローバル編集"
 
-#: pcbnew/dialogs/dialog_global_modules_fields_edition_base.h:68
+#: kicad-6297/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h:68
+#: kicad-6996/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h:68
 msgid "Set Text Size"
 msgstr "テキスト サイズの設定"
 
-#: pcbnew/dialogs/dialog_global_pads_edition_base.h:58
+#: kicad-6297/pcbnew/dialogs/dialog_global_pads_edition_base.h:58
+#: kicad-6996/pcbnew/dialogs/dialog_global_pads_edition_base.h:58
 msgid "Global Pads Edition"
 msgstr "グローバル パッド編集"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.h:79
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_item_properties_base.h:79
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_item_properties_base.h:78
 msgid "Graphic Item Properties"
 msgstr "図形のプロパティ"
 
-#: pcbnew/dialogs/dialog_graphic_items_options_base.h:71
+#: kicad-6297/pcbnew/dialogs/dialog_graphic_items_options_base.h:72
+#: kicad-6996/pcbnew/dialogs/dialog_graphic_items_options_base.h:72
 msgid "Text and Drawings"
 msgstr "テキストと図形"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.h:70
+#: kicad-6297/pcbnew/dialogs/dialog_keepout_area_properties_base.h:70
+#: kicad-6996/pcbnew/dialogs/dialog_keepout_area_properties_base.h:68
 msgid "Keepout Area Properties"
 msgstr "キープアウト(禁止)エリアのプロパティ"
 
-#: pcbnew/dialogs/dialog_layer_selection_base.h:81
+#: kicad-6297/pcbnew/dialogs/dialog_layer_selection_base.h:81
+#: kicad-6996/pcbnew/dialogs/dialog_layer_selection_base.h:81
 msgid "Select Copper Layer Pair:"
 msgstr "導体ペア レイヤの選択:"
 
-#: pcbnew/dialogs/dialog_layers_setup_base.h:418
+#: kicad-6297/pcbnew/dialogs/dialog_layers_setup_base.h:418
+#: kicad-6996/pcbnew/dialogs/dialog_layers_setup_base.h:418
 msgid "Layer Setup"
 msgstr "レイヤ セットアップ"
 
-#: pcbnew/dialogs/dialog_mask_clearance_base.h:74
+#: kicad-6297/pcbnew/dialogs/dialog_mask_clearance_base.h:74
+#: kicad-6996/pcbnew/dialogs/dialog_mask_clearance_base.h:74
 msgid "Pads Mask Clearance"
 msgstr "パッド - レジストのクリアランス"
 
-#: pcbnew/dialogs/dialog_modedit_options_base.h:86
+#: kicad-6297/pcbnew/dialogs/dialog_modedit_options_base.h:86
+#: kicad-6996/pcbnew/dialogs/dialog_modedit_options_base.h:80
 msgid "Footprint Editor Options"
 msgstr "フットプリント エディタ オプション"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.h:67
+#: kicad-6297/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h:67
+#: kicad-6996/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h:67
 msgid "Non Copper Zones Properties"
 msgstr "テクニカル層のゾーンのプロパティ"
 
-#: pcbnew/dialogs/dialog_orient_footprints_base.h:53
+#: kicad-6297/pcbnew/dialogs/dialog_orient_footprints_base.h:53
 msgid "Footprints Orientation"
 msgstr "フットプリントの角度"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:167
+#: kicad-6297/pcbnew/dialogs/dialog_pad_properties_base.h:167
+#: kicad-6996/pcbnew/dialogs/dialog_pad_properties_base.h:177
 msgid "Pad Properties"
 msgstr "パッド プロパティ"
 
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h:64
+#: kicad-6297/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h:64
+#: kicad-6996/pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h:64
 msgid "Differential Pair Dimensions"
 msgstr "差動ペアの寸法"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h:79
+#: kicad-6297/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h:79
+#: kicad-6996/pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h:79
 msgid "Trace length tuning"
 msgstr "配線長の調整"
 
-#: pcbnew/dialogs/dialog_pns_settings_base.h:71
+#: kicad-6297/pcbnew/dialogs/dialog_pns_settings_base.h:71
+#: kicad-6996/pcbnew/dialogs/dialog_pns_settings_base.h:71
 msgid "Interactive Router Settings"
 msgstr "インタラクティブ ルーターの設定"
 
-#: pcbnew/dialogs/dialog_select_pretty_lib_base.h:59
+#: kicad-6297/pcbnew/dialogs/dialog_select_pretty_lib_base.h:59
+#: kicad-6996/pcbnew/dialogs/dialog_select_pretty_lib_base.h:59
 msgid "Select Footprint Library Folder"
 msgstr "フットプリント ライブラリのフォルダを指定"
 
-#: pcbnew/dialogs/dialog_set_grid_base.h:70
+#: kicad-6297/pcbnew/dialogs/dialog_set_grid_base.h:71
+#: kicad-6996/pcbnew/dialogs/dialog_set_grid_base.h:72
 msgid "Grid Properties"
 msgstr "グリッド プロパティ"
 
-#: pcbnew/dialogs/dialog_target_properties_base.h:61
+#: kicad-6297/pcbnew/dialogs/dialog_target_properties_base.h:61
+#: kicad-6996/pcbnew/dialogs/dialog_target_properties_base.h:61
 msgid "Target Properties"
 msgstr "ターゲットのプロパティ"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.h:92
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_properties_base.h:94
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_properties_base.h:95
 msgid "Track & Via Properties"
 msgstr "配線とビアのプロパティ"
 
-#: pcbnew/dialogs/dialog_track_via_size_base.h:57
+#: kicad-6297/pcbnew/dialogs/dialog_track_via_size_base.h:62
+#: kicad-6996/pcbnew/dialogs/dialog_track_via_size_base.h:62
 msgid "Track width and via size"
 msgstr "配線幅とビアサイズ"
 
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.h:82
+#: kicad-6297/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.h:82
+#: kicad-6996/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.h:82
 msgid "Add 3D Shape Libraries Wizard"
 msgstr "3D シェイプ ライブラリの追加ウイザード"
 
-#: pcbnew/dialogs/wizard_add_fplib_base.h:88
+#: kicad-6297/pcbnew/dialogs/wizard_add_fplib_base.h:88
+#: kicad-6996/pcbnew/dialogs/wizard_add_fplib_base.h:88
 msgid "Add Footprint Libraries Wizard"
 msgstr "フットプリント ライブラリの追加ウィザード"
 
-#: pcbnew/help_common_strings.h:17
+#: kicad-6297/pcbnew/help_common_strings.h:17
+#: kicad-6996/pcbnew/help_common_strings.h:17
 msgid "Find components and text in current loaded board"
 msgstr "現在の基板からコンポーネントとテキストを検索"
 
-#: pcbnew/help_common_strings.h:21
+#: kicad-6297/pcbnew/help_common_strings.h:21
+#: kicad-6996/pcbnew/help_common_strings.h:21
 msgid "Zoom to fit the board on the screen"
 msgstr "スクリーンに合わせてボードをズーム"
 
-#: pcbnew/help_common_strings.h:22
+#: kicad-6297/pcbnew/help_common_strings.h:22
+#: kicad-6996/pcbnew/help_common_strings.h:22
 msgid "Redraw the current screen"
 msgstr "現在のスクリーンを再描画"
 
-#: pcbnew/help_common_strings.h:26
+#: kicad-6297/pcbnew/help_common_strings.h:26
+#: kicad-6996/pcbnew/help_common_strings.h:26
 msgid ""
 "Show/hide the microwave toolbar\n"
 "This is a experimental feature (under development)"
@@ -22631,881 +31202,28 @@ msgstr ""
 "高周波設計支援ツールバーの表示/非表示\n"
 "これは将来に向けた開発中の機能です"
 
-#: pcbnew/import_dxf/dialog_dxf_import_base.h:72
+#: kicad-6297/pcbnew/import_dxf/dialog_dxf_import_base.h:72
+#: kicad-6996/pcbnew/import_dxf/dialog_dxf_import_base.h:72
 msgid "Import DXF File"
 msgstr "DXFファイルのインポート"
 
-#~ msgid "The original site of the initiator of KiCad"
-#~ msgstr "KiCad 創始者のオリジナル サイト"
-
-#~ msgid "Project on Launchpad"
-#~ msgstr "Launchpad上のプロジェクト"
-
-#~ msgid "The new KiCad site"
-#~ msgstr "新しいKiCadのWebサイト"
-
-#~ msgid "GNU General Public License (GPL) version 2 or any later version"
-#~ msgstr "GNU 一般公衆ライセンス (GPL) バージョン 2 以降"
-
-#~ msgid "Top side"
-#~ msgstr "上側:"
-
-#~ msgid "Bottom side"
-#~ msgstr "下側:"
-
-#~ msgid "Side"
-#~ msgstr "横"
-
-#~ msgid "Other rotation"
-#~ msgstr "他の回転角"
-
-#~ msgid "Lock module"
-#~ msgstr "モジュールをロック"
-
-#~ msgid "Add module"
-#~ msgstr "モジュールを追加"
-
-#~ msgid "No modules for automated placement."
-#~ msgstr "自動配置するモジュールがありません。"
-
-#~ msgid "Unknown padshape '%c=0x%02x' on line: %d of module: '%s'"
-#~ msgstr "未知のパッド形状 '%c=0x%02x' %d 行目 (モジュール '%s')"
-
-#~ msgid "OK to delete module %s in library '%s'"
-#~ msgstr "モジュール '%s' をライブラリ '%s' から削除します。よろしいですか？"
-
-#~ msgid "Modules [%u items]"
-#~ msgstr "モジュール [%u アイテム]"
-
-#~ msgid "Module"
-#~ msgstr "モジュール"
-
-#~ msgid "Create a new library and save current module into it"
-#~ msgstr "新規ライブラリを作成して現在のモジュールを保存"
-
-#~ msgid "(Re)create components file (*.cmp) for CvPcb"
-#~ msgstr "CvPcb用のコンポーネント ファイル(*.cmp)を(再)作成"
-
-#~ msgid "Delete Footprint %s (value %s) ?"
-#~ msgstr "フットプリント %s (定数 %s) を削除しますか？"
-
-#~ msgid "cannot handle module text type %s"
-#~ msgstr "モジュールのテキストタイプ %s は扱うことが出来ません。"
-
-#~ msgid "Your BOARD has a bad layer number for module %s"
-#~ msgstr "ボードがモジュール %s に対して不正なレイヤ番号を持っています"
-
-#~ msgid "Add modules"
-#~ msgstr "モジュールを追加"
-
-#~ msgid "The original site of the initiator of Kicad"
-#~ msgstr "KiCad 創始者のオリジナルサイト"
-
-#~ msgid "About Kicad"
-#~ msgstr "Kicad について"
-
-#~ msgid "About KiCad project manager"
-#~ msgstr "KiCad プロジェクト マネージャーについて"
-
-#~ msgid "<b>Current general settings:</b><br>"
-#~ msgstr "<b>現在の全般設定:</b><br>"
-
-#~ msgid "Minimum value for tracks width: <b>%s</b><br>\n"
-#~ msgstr "配線の最小幅: <b>%s</b> <br>\n"
-
-#~ msgid "Minimum value for vias diameter: <b>%s</b><br>\n"
-#~ msgstr "ビアの最小径: <b>%s</b> <br>\n"
-
-#~ msgid "Minimum value for microvias diameter: <b>%s</b><br>\n"
-#~ msgstr "マイクロビアの最小径: <b>%s</b> <br>\n"
-
-#~ msgid "Errors detected, Abort"
-#~ msgstr "エラーを検出しました, 中止します"
-
-#~ msgid "This NetClass is already existing, cannot add it; Aborted"
-#~ msgstr "このネットクラスは既に存在するため、追加できません; 中止します"
-
-#~ msgid "The default Netclass cannot be removed"
-#~ msgstr "デフォルトのネットクラスは削除できません"
-
-#~ msgid ""
-#~ "Enable/disable the DRC control.\n"
-#~ "When DRC is disable, all connections are allowed."
-#~ msgstr ""
-#~ "DRC監視の有効化/無効化。\n"
-#~ "DRCの無効化中はどんな接続でも許可されます。"
-
-#~ msgid "&Switch canvas to default"
-#~ msgstr "描画キャンバスを標準へ切替(&S)"
-
-#~ msgid "Switch canvas to Open&GL"
-#~ msgstr "描画キャンバスを OpenGL(3D) へ切替(&G)"
-
-#~ msgid "Switch canvas to &Cairo"
-#~ msgstr "描画キャンバスを Cairo(2D) へ切替(&C)"
-
-#~ msgid "Select default parameters values in Footprint Editor"
-#~ msgstr "フットプリント エディタでのデフォルト値を選択"
-
-#~ msgid "I&DFv3 Export"
-#~ msgstr "IDFv3 エクスポート(&D)"
-
-#~ msgid "&Archive New Footprints"
-#~ msgstr "フットプリントを新規にアーカイブ(&A)"
-
-#~ msgid ""
-#~ "Archive new footprints only in a library (keep other footprints in this "
-#~ "lib)"
-#~ msgstr ""
-#~ "(このライブラリ中の他のフットプリントを維持したまま) ライブラリ中の新規"
-#~ "フットプリントをアーカイブ"
-
-#~ msgid "&Create Footprint Archive"
-#~ msgstr "フットプリント アーカイブの作成(&C)"
-
-#~ msgid "Archive all footprints in a library (old library will be deleted)"
-#~ msgstr ""
-#~ "ライブラリ中の全てのフットプリントをアーカイブ (古いライブラリは削除されま"
-#~ "す)"
-
-#~ msgid "Configure Interactive Routing."
-#~ msgstr "インタラクティブ ルーターの設定"
-
-#~ msgid "Fast access to the Web Based FreeROUTE advanced router"
-#~ msgstr "外部ルータ Freerouter とのデータ交換"
-
-#~ msgid "P&cbnew Manual"
-#~ msgstr "Pcbnew マニュアル(&c)"
-
-#~ msgid "Apply a grid/cloud textures to Board, Solder Mask and Silkscreen"
-#~ msgstr ""
-#~ "基板、半田マスク、シルクスクリーンに対してグリッド/クラウド テクスチャを適"
-#~ "用します"
-
-#~ msgid "Show 3D F&ootprints"
-#~ msgstr "3Dフットプリントを表示(&o)"
-
-#~ msgid "Show &Silkscreen Layer"
-#~ msgstr "シルクスクリーン レイヤを表示(&S)"
-
-#~ msgid "Show &Comments and Drawings Layer"
-#~ msgstr "コメント/図面描画レイヤを表示(&C)"
-
-#~ msgid "Show component 3D shapes"
-#~ msgstr "コンポーネントの3D形状を表示"
-
-#~ msgid "File '%s' could not be created"
-#~ msgstr "ファイル '%s' を作成できません"
-
-#~ msgid "Create a lib file for Eeschema"
-#~ msgstr "Eeschema 用 lib ファイルを作成"
-
-#~ msgid "Create a footprint file for PcbNew"
-#~ msgstr "Pcbnew 用 フットプリント ファイルを作成"
-
-#~ msgid "Equ file '%s' could not be found in the default search paths."
-#~ msgstr "Equファイル '%s' はデフォルトの検索パス中にありませんでした。"
-
-#~ msgid "Error opening equ file '%s'."
-#~ msgstr "Equファイル '%s' を開く際にエラーが発生しました。"
-
-#~ msgid "Equ files Load Error"
-#~ msgstr "Equファイルの読み込みエラー"
-
-#~ msgid "%d footprint/cmp equivalences found."
-#~ msgstr "%d フットプリント/コンポーネントの関連付けが見つかりました."
-
-#~ msgid "&CvPcb Manual"
-#~ msgstr "CvPcb マニュアル(&C)"
-
-#~ msgid "Open CvPcb manual"
-#~ msgstr "CvPcb マニュアルを開く"
-
-#~ msgid "&About CvPcb"
-#~ msgstr "CvPcb について(&A)"
-
-#~ msgid "About CvPcb footprint selector"
-#~ msgstr "CvPcb フットプリント セレクタについて"
-
-#~ msgid "Eesc&hema Manual"
-#~ msgstr "Eeschema マニュアル(&h)"
-
-#~ msgid "&Contents"
-#~ msgstr "目次(&C)"
-
-#~ msgid "Open the Eeschema manual"
-#~ msgstr "Eeschema マニュアルを開く"
-
-#~ msgid "OK to change the existing file ?"
-#~ msgstr "既存のファイルを変更します。よろしいですか？"
-
-#~ msgid "Open the GerbView handbook"
-#~ msgstr "GerbView マニュアルを開く"
-
-#~ msgid "&About GerbView"
-#~ msgstr "GerbView について(&A)"
-
-#~ msgid "About GerbView gerber and drill viewer"
-#~ msgstr "GerbView ガーバー&ドリルデータビューアについて"
-
-#~ msgid "(%d bytes, compressed %d bytes)\n"
-#~ msgstr "(%d bytes, %d bytes 圧縮)\n"
-
-#~ msgid "%s opened [pid=%ld]\n"
-#~ msgstr "%s の起動 [pid=%ld]\n"
-
-#~ msgid "&About Page Layout Editor"
-#~ msgstr "図枠エディタについて(&A)"
-
-#~ msgid "About page layout description editor"
-#~ msgstr "図枠エディタについて"
-
-#~ msgid "Unable to create file "
-#~ msgstr "ファイルを作成できません "
-
-#~ msgid "Tracks, vias and pads are allowed. The keepout is useless"
-#~ msgstr "配線とビアの配置が可能です。禁止エリアではありません。"
-
-#~ msgid "No Tracks"
-#~ msgstr "配線禁止"
-
-#~ msgid "No Vias"
-#~ msgstr "ビア禁止"
-
-#~ msgid "No Copper Pour"
-#~ msgstr "塗りつぶし禁止"
-
-#~ msgid "Library Path (.pretty will be appended to folder)"
-#~ msgstr "ライブラリ パス (.pretty フォルダ)"
-
-#~ msgid ""
-#~ "invalid PFID in\n"
-#~ "file: <%s>\n"
-#~ "line: %d\n"
-#~ "offset: %d"
-#~ msgstr ""
-#~ "不正なPFIDが見つかりました: \n"
-#~ "ファイル:<%s>\n"
-#~ "%d 行目\n"
-#~ "%d 文字目"
-
-#~ msgid "Modules [%d items]"
-#~ msgstr "モジュール [%d アイテム]"
-
-#~ msgid ""
-#~ "Clean stubs, vias, delete break points, or connect dangling tracks to "
-#~ "pads and vias"
-#~ msgstr ""
-#~ "パッドやビアに接続している浮き配線、スタブ、ビア、ブレークポイントをクリア"
-
-#~ msgid "&Reset Footprint Field Sizes"
-#~ msgstr "フットプリント フィールドのサイズをリセット(&R)"
-
-#~ msgid ""
-#~ "Reset text size and width of all footprint fields to current defaults"
-#~ msgstr ""
-#~ "全フットプリントの定数の文字サイズ、文字太さを現在のデフォルト値にリセット"
-
-#~ msgid "Open the Pcbnew handbook"
-#~ msgstr "Pcbnew マニュアルを開く"
-
-#~ msgid "About Pcbnew printed circuit board designer"
-#~ msgstr "Pcbnew プリント基板デザイナーについて"
-
-#~ msgid ""
-#~ "invalid PFID in\n"
-#~ "file: <%s>\n"
-#~ "line: %d"
-#~ msgstr ""
-#~ "不正なPFIDが見つかりました: \n"
-#~ "ファイル:<%s>\n"
-#~ "%d行目"
-
-#~ msgid "Footprint Wizards"
-#~ msgstr "フットプリント ウイザード"
-
-#~ msgid "Redraw the screen of the board"
-#~ msgstr "スクリーン上のボードを再描画"
-
-#~ msgid ""
-#~ "Show/hide the toolbar for microwave tools\n"
-#~ "This is a experimental feature (under development)"
-#~ msgstr ""
-#~ "高周波設計支援ツールバーの表示/非表示\n"
-#~ "これは将来に向けた開発中の機能です"
-
-#~ msgid "Select wizard to use"
-#~ msgstr "参照するウィザードの選択"
-
-#~ msgid "Select previous editable item"
-#~ msgstr "前の編集可能アイテムを選択"
-
-#~ msgid "Select next editable item"
-#~ msgstr "次の編集可能アイテムを選択"
-
-#~ msgid "Add footprint to board"
-#~ msgstr "ボードへフットプリントを挿入"
-
-#~ msgid "New footprint using wizard"
-#~ msgstr "ウィザードを使用して新規フットプリントを作成"
-
-#~ msgid "Tracks and vias:"
-#~ msgstr "配線とビア"
-
-#~ msgid "Tracks sketch mode"
-#~ msgstr "配線をスケッチモードで表示"
-
-#~ msgid "Vias sketch mode"
-#~ msgstr "ビアをスケッチモードで表示"
-
-#~ msgid ""
-#~ "Show (or not) via holes.\n"
-#~ "If Defined Holes is selected, only the non default size holes are shown"
-#~ msgstr ""
-#~ "ビア穴の表示設定\n"
-#~ "\"定義された穴のみ\"を選択した場合、デフォルト径以外の穴のみ表示します"
-
-#~ msgid "Routing help:"
-#~ msgstr "配線のヘルプ:"
-
-#~ msgid "Show or not net names on pads and/or tracks"
-#~ msgstr "パッド/配線のネット名を表示/非表示"
-
-#~ msgid "Show Tracks Clearance:"
-#~ msgstr "配線クリアランスの表示 "
-
-#~ msgid ""
-#~ "Show( or not) tracks clearance area.\n"
-#~ "If New track is selected,  track clearance area is shown only when "
-#~ "creating the track."
-#~ msgstr ""
-#~ "配線のクリアランス エリアの表示設定\n"
-#~ "新しい配線が選択された場合、クリアランス エリアは配線が作成されたときのみ"
-#~ "表示されます"
-
-#~ msgid "Outlines sketch mode"
-#~ msgstr "外形をスケッチモードで表示"
-
-#~ msgid "Pads sketch mode"
-#~ msgstr "パッドをスケッチモードで表示"
-
-#~ msgid "Show pad NoConnect"
-#~ msgstr "未接続パッドの表示"
-
-#~ msgid "Others:"
-#~ msgstr "その他"
-
-#~ msgid "Auto Adjust"
-#~ msgstr "自動設定"
-
-#~ msgid "X ref:"
-#~ msgstr "X ref:"
-
-#~ msgid "Clear Board"
-#~ msgstr "ボードをクリア"
-
-#~ msgid "Start point X"
-#~ msgstr "始点 X"
-
-#~ msgid "Start point Y"
-#~ msgstr "始点 Y"
-
-#~ msgid "End point X"
-#~ msgstr "終点 X"
-
-#~ msgid "End point Y"
-#~ msgstr "終点 Y"
-
-#~ msgid "Graphic segm Width"
-#~ msgstr "図形セグメントの幅"
-
-#~ msgid "Board Edges Width"
-#~ msgstr "ボード エッジの幅"
-
-#~ msgid "Copper Text Width"
-#~ msgstr "テキストの幅"
-
-#~ msgid "Text Size V"
-#~ msgstr "テキストの縦幅"
-
-#~ msgid "Text Size H"
-#~ msgstr "テキストの横幅"
-
-#~ msgid "Edges Width"
-#~ msgstr "エッジの幅"
-
-#~ msgid "Circular shape"
-#~ msgstr "円形シェイプ"
-
-#~ msgid "Oval shape"
-#~ msgstr "楕円形シェイプ"
-
-#~ msgid "Rectangular shape"
-#~ msgstr "長方形シェイプ"
-
-#~ msgid "Trapezoidal shape"
-#~ msgstr "台形シェイプ"
-
-#~ msgid "Trap. delta dim:"
-#~ msgstr "台形作成時の短辺長:"
-
-#~ msgid "Trap. direction:"
-#~ msgstr "台形作成時の方向:"
-
-#~ msgid "Position X"
-#~ msgstr "ポジション X"
-
-#~ msgid "Position Y"
-#~ msgstr "ポジション Y"
-
-#~ msgid "Polyline at (%s, %s) with %zu points"
-#~ msgstr "ポリライン (%s, %s)  %zu 個の構成点"
-
-#~ msgid ""
-#~ "Select one of %zu components to delete\n"
-#~ "from library '%s'."
-#~ msgstr ""
-#~ "削除するコンポーネント(1 of %zu )を選択\n"
-#~ "(ライブラリ '%s' )."
-
-#~ msgid "Net count = %zu"
-#~ msgstr "ネット数 = %zu"
-
-#~ msgid "No Connect Symbol"
-#~ msgstr "空き端子フラグ"
-
-#~ msgid "Erc warning"
-#~ msgstr "ERC 警告"
-
-#~ msgid "Erc error"
-#~ msgstr "ERC エラー"
-
-#~ msgid ""
-#~ "Warning:\n"
-#~ "Some items have the same color as the background\n"
-#~ "and they will not be seen on screen"
-#~ msgstr ""
-#~ "警告:\n"
-#~ "いくつかのアイテムが背景色と同色です\n"
-#~ "それらは画面上で見えないかもしれません"
-
-#~ msgid "Check for cache/library conflicts at schematic load"
-#~ msgstr "回路図の読込み時にキャッシュ/ライブラリの衝突をチェック"
-
-#~ msgid "Texts and Drawings"
-#~ msgstr "テキストと図形"
-
-#~ msgid "No Modules!"
-#~ msgstr "モジュールがありません！"
-
-#~ msgid "Change modules %s -> %s ?"
-#~ msgstr "モジュールを変更しますか？ %s → %s"
-
-#~ msgid "Change ALL modules ?"
-#~ msgstr "全てのモジュールを変更しますか？"
-
-#~ msgid "Save Component Files"
-#~ msgstr "コンポーネント ファイルの保存"
-
-#~ msgid "Size X"
-#~ msgstr "サイズ X"
-
-#~ msgid "Size Y"
-#~ msgstr "サイズ Y"
-
-#~ msgid "Change same footprint"
-#~ msgstr "同じフットプリントを変更"
-
-#~ msgid "Change all"
-#~ msgstr "全てを変更"
-
-#~ msgid "Export .cmp List"
-#~ msgstr ".cmpファイルへエクスポート"
-
-#~ msgid "Browse FP List"
-#~ msgstr "フットプリント一覧の表示"
-
-#~ msgid "FP Viewer"
-#~ msgstr "フットプリントビューアを開く"
-
-#~ msgid "Create .dsn File and Launch FreeRouter"
-#~ msgstr ".dsnファイルを生成し、FreeRouterを起動します"
-
-#~ msgid "Create .dsn File"
-#~ msgstr ".dsnファイルの作成"
-
-#~ msgid "Polar"
-#~ msgstr "極座標系"
-
-#~ msgid "Use legacy zone filling algorithm"
-#~ msgstr "ゾーンの塗りつぶしに古いアルゴリズムを使用する"
-
-#~ msgid "Text size V"
-#~ msgstr "テキストの縦幅"
-
-#~ msgid "Text size H"
-#~ msgstr "テキストの横幅"
-
-#~ msgid "Display all messages"
-#~ msgstr "全てのメッセージを表示"
-
-#~ msgid ""
-#~ "Messages filter:\n"
-#~ "If checked: show all messages when reading the netlist\n"
-#~ "If not checked: show only warning or error messages"
-#~ msgstr ""
-#~ "メッセージフィルタ:\n"
-#~ "チェックされている場合: ネットリスト読み込みに関する全てのメッセージを表示"
-#~ "します。\n"
-#~ "チェックされていない場合: 警告とエラーメッセージのみが表示されます。"
-
-#~ msgid ""
-#~ "VRML Export Failed:\n"
-#~ "Could not add outline to contours."
-#~ msgstr ""
-#~ "VRMLエクスポートエラー:\n"
-#~ "外形を追加することが出来ませんでした。"
-
-#~ msgid "Right top corner"
-#~ msgstr "右上角"
-
-#~ msgid "Middle"
-#~ msgstr "中間点"
-
-# orペア下層
-#~ msgid "Right bottom corner"
-#~ msgstr "左下の角"
-
-#~ msgid "Board layer for import:"
-#~ msgstr "インポートするボードレイヤ:"
-
-#~ msgid ""
-#~ "\n"
-#~ " >> Errors ERC: %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ " > > ERCエラー: %d\n"
-
-#~ msgid "Default &bus width:"
-#~ msgstr "デフォルトのバス線幅(&B):"
-
-#~ msgid "Repeat draw item &horizontal displacement:"
-#~ msgstr "アイテムを水平方向にリピート(&H)"
-
-#~ msgid "Repeat draw item &vertical displacement:"
-#~ msgstr "アイテムを垂直方向にリピート(&V)"
-
-#~ msgid "&Repeat label increment:"
-#~ msgstr "ラベルのカウントアップリピート(&R):"
-
-#~ msgid "Show gr&id"
-#~ msgstr "グリッドの表示"
-
-#~ msgid "Show hi&dden pins"
-#~ msgstr "非表示ピンの表示 (&D)"
-
-#~ msgid "Do not center and &warp cursor on zoom"
-#~ msgstr "拡大縮小時にカーソルを中心へ移動させない(&W)"
-
-#~ msgid "Use &middle mouse button to pan"
-#~ msgstr "マウスの中ボタンを、画面のパンに利用する"
-
-#~ msgid "Show p&age limits"
-#~ msgstr "ページの境界を表示(&A)"
-
-#~ msgid "25"
-#~ msgstr "25"
-
-#~ msgid "Current graphic &line width:"
-#~ msgstr "現在の図形ライン幅(&L) :"
-
-#~ msgid "Current graphic text &size:"
-#~ msgstr "現在の図形テキストサイズ(&S):"
-
-#~ msgid "Current &pin lenght:"
-#~ msgstr "現在のピンの長さ(&P)"
-
-#~ msgid "Current pin name size:"
-#~ msgstr "現在のピン名サイズ:"
-
-#~ msgid "Current pin number size:"
-#~ msgstr "現在のピン番号サイズ:"
-
-#~ msgid "&Repeat pin number increment:"
-#~ msgstr "ピン番号をカウントアップリピート(&R):"
-
-#~ msgid "Save as Default"
-#~ msgstr "標準設定として保存"
-
-#~ msgid "Repeat pin displacement"
-#~ msgstr "ピンの置換をリピート"
-
-#~ msgid "Large"
-#~ msgstr "大"
-
-#~ msgid ""
-#~ "Path configuration names cannot have a number as the first character."
-#~ msgstr "パス設定では、最初の文字に数字を使用することができません。"
-
-#~ msgid "<br><b>I = K * dT<sup>0.44</sup> * (W*H)<sup>0.725</sup></b></br>"
-#~ msgstr "<br><b>I = K * dT<sup>0.44</sup> * (W*H)<sup>0.725</sup></b></br>"
-
-#~ msgid "<br>Internal traces : <b>K = 0.024</b></br>"
-#~ msgstr "<br>内層 : <b>K = 0.024</b></br>"
-
-#~ msgid "<br>External traces: <b>K = 0.048</b></br>"
-#~ msgstr "<br>外層: <b>K = 0.048</b></br>"
-
-#~ msgid "<br>where:</br>"
-#~ msgstr "<br>場所:</br>"
-
-#~ msgid "Z0e (Zdiff)"
-#~ msgstr "Z0e (Zdiff)"
-
-#~ msgid "Z0o (Z0)"
-#~ msgstr "Z0o (Z0)"
-
-#~ msgid "Odd-Mode impedance"
-#~ msgstr "奇数モードインピーダンス"
-
-#~ msgid ""
-#~ "Valid max values:\n"
-#~ "35A for external traces and 17.5A for internal.\n"
-#~ "400mil widths.\n"
-#~ "Maximum temperature rise of 100 deg C."
-#~ msgstr ""
-#~ "有効な最大値:\n"
-#~ "外層パターンで35A、内層パターンで17.5A\n"
-#~ "最大幅は400mil(10.16mm)\n"
-#~ "最大温度上昇は100℃です."
-
-#~ msgid "Cu thickness"
-#~ msgstr "銅箔厚"
-
-#~ msgid "Track Characteristics (External Layers):"
-#~ msgstr "配線の特性（外層）:"
-
-#~ msgid "Required trace width"
-#~ msgstr "必要な配線幅"
-
-#~ msgid "Loss"
-#~ msgstr "損失"
-
-#~ msgid "Track Characteristics (Internal Layers):"
-#~ msgstr "配線の特性（内層）:"
-
-#~ msgid "Import DXF file"
-#~ msgstr "DXFファイルのインポート"
-
-#~ msgid "CvPcb - Associate footprint to components"
-#~ msgstr "CvPcb - コンポーネントとフットプリントの関連付け設定"
-
-#~ msgid "Quit KiCad"
-#~ msgstr "KiCadの終了"
-
-#~ msgid "(Default)"
-#~ msgstr "(標準)"
-
-#~ msgid "Quit Pcbnew"
-#~ msgstr "PCBNewを終了"
-
-#~ msgid "Design Rules"
-#~ msgstr "デザインルール"
-
-#~ msgid "&Route"
-#~ msgstr "配線(&R)"
-
-#~ msgid "Cannot open file %s for reading."
-#~ msgstr "読み込み用にファイル %s を開けません。"
-
-#~ msgid "x Count:"
-#~ msgstr "横(X)方向の数:"
-
-#~ msgid "y Count:"
-#~ msgstr "縦(Y)方向の数:"
-
-#~ msgid "x Spacing:"
-#~ msgstr "横(X)方向の間隔:"
-
-#~ msgid "y Spacing:"
-#~ msgstr "縦(Y)方向の間隔:"
-
-#~ msgid "x Offset:"
-#~ msgstr "横(X)オフセット:"
-
-#~ msgid "y Offset:"
-#~ msgstr "縦(Y)オフセット:"
-
-#~ msgid "x Centre:"
-#~ msgstr "X軸中心:"
-
-#~ msgid "y Centre:"
-#~ msgstr "Y軸中心:"
-
-#~ msgid "User"
-#~ msgstr "ユーザ"
-
-#~ msgid "Rebuild .cmp List"
-#~ msgstr ".cmpファイルの再構築"
-
-#~ msgid "Plot: %s OK\n"
-#~ msgstr "プロット: %s OK\n"
-
-#~ msgid "HPGL plot files (.plt)|*.plt"
-#~ msgstr "HPGLプロット ファイル (.plt)|*.plt"
-
-#~ msgid "Gerber files (.pho)|*.pho"
-#~ msgstr "ガーバー ファイル (.pho)|*.pho)"
-
-#~ msgid "DXF files (.dxf)|*.dxf"
-#~ msgstr "DXFファイル (.dxf)|*.dxf"
-
-#, fuzzy
-#~ msgid "Using component footprint link file \"%s\".\n"
-#~ msgstr ""
-#~ "コンポーネントとフットプリントの関連付けファイル \"%s\" を利用します"
-
-#, fuzzy
-#~ msgid "Using time stamps to select footprints in file \"%s\".\n"
-#~ msgstr ""
-#~ "コンポーネントとフットプリントの関連付けファイル \"%s\" を利用します"
-
-#~ msgid "From netlist"
-#~ msgstr "ネットリスト"
-
-#~ msgid "From separate .cmp file"
-#~ msgstr "外部の.cmpファイル"
-
-#~ msgid "Footprint Name Source"
-#~ msgstr "フットプリントの命名元"
-
-#~ msgid ""
-#~ "Source of footprints names for component:\n"
-#~ "- the netlist (if you have filled the footprint field of each component  "
-#~ "in schematic)\n"
-#~ "- the .cmp file created by CvPcb"
-#~ msgstr ""
-#~ "コンポーネントに対するフットプリントの指定は下記の2通りが可能です:\n"
-#~ "- ネットリストより生成(フットプリントが回路図上から完全に指定されている必"
-#~ "要があります)\n"
-#~ "- (CvPcbにより生成された)外部の.cmpファイル"
-
-#~ msgid "** Unable to create '%s'**\n"
-#~ msgstr "** '%s' が生成できませんでした ***\n"
-
-#~ msgid "Settings are incorrect"
-#~ msgstr "不正な設定です"
-
-#~ msgid "Footprint count %d\n"
-#~ msgstr "フットプリント数 %d\n"
-
-#~ msgid "Custom Track Width"
-#~ msgstr "カスタム配線幅"
-
-#~ msgid " (from netclass)"
-#~ msgstr "(ネットクラスを使う)"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "未だ実装されていません。"
-
-#~ msgid ""
-#~ "Some items are not annotated\n"
-#~ "Do you want to annotate schematic?"
-#~ msgstr ""
-#~ "幾つかのアイテムはアノテートされません。\n"
-#~ "回路図をアノテートしますか？"
-
-#~ msgid "Unable to create '%s'\n"
-#~ msgstr "'%s' を作成できません\n"
-
-#~ msgid "Plot: <%s> OK\n"
-#~ msgstr "プロット: <%s> 完了\n"
-
-#~ msgid "Error creating file '%s'\n"
-#~ msgstr "ファイル'%s'生成中にエラーが発生しました\n"
-
-#~ msgid "File '%s' OK\n"
-#~ msgstr "ファイル <%s> OK\n"
-
-#~ msgid "Unable to create <%s>\n"
-#~ msgstr "<%s> を作成できません\n"
-
-#~ msgid "Edit document file"
-#~ msgstr "ドキュメント ファイルの編集"
-
-#~ msgid "Automatically close this dialog"
-#~ msgstr "ダイアログを自動的に閉じる"
-
-#~ msgid "Problem when saving file, exit anyway ?"
-#~ msgstr "ファイル保存中に問題が発生しました。このまま終了しますか？"
-
-#~ msgid "Open Net List"
-#~ msgstr "ネットリストを開く"
-
-#~ msgid "Project: '%s'  (netlist: '%s')"
-#~ msgstr "プロジェクト: '%s'  (ネットリスト: '%s')"
-
-#~ msgid "Unknown netlist format."
-#~ msgstr "不明なネットリストフォーマット。"
-
-#~ msgid "&Open Netlist"
-#~ msgstr "ネットリストを開く(&O)"
-
-#~ msgid "Open recent netlist"
-#~ msgstr "最近開いたネットリストを開く"
-
-#~ msgid "Save Cmp File &As...\tCtrl+Shift+S"
-#~ msgstr "名前を付けてCmpファイルを保存...(&A)\tCtrl+Shift+S"
-
-#~ msgid "Quit CvPcb"
-#~ msgstr "CvPcbの終了"
-
-#~ msgid "Save Component Footprint Link File"
-#~ msgstr "コンポーネント-フットプリントの関連付けファイルの保存"
-
-#~ msgid "Unable to create component footprint link file '%s'"
-#~ msgstr ""
-#~ "コンポーネント-フットプリントの関連付けファイル '%s' が作成出来ませんでし"
-#~ "た"
-
-#~ msgid "E&xit"
-#~ msgstr "終了 (&X)"
-
-#~ msgid "Quit GerbView"
-#~ msgstr "GerbViewの終了"
-
-#~ msgid "<-"
-#~ msgstr "<-"
-
-#~ msgid "Mur"
-#~ msgstr "Mur"
-
-#~ msgid "MurC"
-#~ msgstr "MurC"
-
-#~ msgid "Quit Pl_Editor"
-#~ msgstr "図枠エディタの終了"
-
-#~ msgid "&About Pl_Editor"
-#~ msgstr "図枠エディタについて(&A)"
-
-#~ msgid "Position Files:"
-#~ msgstr "ポジション ファイル:"
-
-#, fuzzy
-#~ msgid "Allows to specify any track/via size"
-#~ msgstr "配線時やアイテムの移動時の自動視点移動を許可"
-
-#, fuzzy
-#~ msgid "Route using the width of the starting track"
-#~ msgstr "配線開始時の配線幅でルーティングを行う。"
-
-#~ msgid "Open netlist file"
-#~ msgstr "ネットリストファイルを開く"
-
-#~ msgid "Save component/footprint link file (.cmp file)"
-#~ msgstr "コンポーネント-フットプリント関連付けファイル(.cmp)を保存"
-
-#~ msgid "Save component/footprint link file (.cmp file) with new name"
-#~ msgstr ""
-#~ "名前をつけてコンポーネント-フットプリント関連付けファイル(.cmp)を保存"
+#: kicad-6996/3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig_base.h:64
+msgid "3D Search Path Configuration"
+msgstr "3D 検索パスの設定"
+
+#: kicad-6996/common/dialog_about/dialog_about_base.h:50
+msgid "About"
+msgstr "このソフトウェアについて"
+
+#: kicad-6996/include/richio.h:78
+#, c-format
+msgid ""
+"PARSE_ERROR: %s in input/source\n"
+"'%s'\n"
+"line %d  offset %d\n"
+"from %s : %s"
+msgstr ""
+"PARSE_ERROR: %s in input/source\n"
+"'%s'\n"
+"行 %d  オフセット %d\n"
+"から %s : %s"