From 19d67db70e067359f399d7d518bdcf58e4a1422e Mon Sep 17 00:00:00 2001
From: taotieren <admin@taotieren.com>
Date: Mon, 31 Aug 2020 16:45:52 +0000
Subject: [PATCH] Update Simplified Chinese translation

---
 zh_CN/kicad.po | 10410 +++++++++++++++++++++++++++--------------------
 1 file changed, 6044 insertions(+), 4366 deletions(-)

diff --git a/zh_CN/kicad.po b/zh_CN/kicad.po
index 3055b4cfe2..fe236bff7b 100755
--- a/zh_CN/kicad.po
+++ b/zh_CN/kicad.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: KiCad_zh_CN_Master_v0.0.25\n"
+"Project-Id-Version: KiCad_zh_CN_Master_v0.0.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-03 22:56+0800\n"
-"PO-Revision-Date: 2020-08-03 23:39+0800\n"
+"POT-Creation-Date: 2020-08-31 19:52+0800\n"
+"PO-Revision-Date: 2020-09-01 00:44+0800\n"
 "Last-Translator: taotieren <admin@taotieren.com>\n"
 "Language-Team: kicad-cn\n"
 "Language: zh_CN\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-KeywordsList: _HKI;_\n"
 "X-Poedit-Basepath: ../../kicad-source-mirror\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: .\n"
@@ -46,7 +46,7 @@ msgid "Select 3D Model"
 msgstr "选择 3D 模型"
 
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:21
-#: common/dialogs/dialog_print_generic_base.cpp:55
+#: common/dialogs/dialog_print_generic_base.cpp:56
 msgid "Scale"
 msgstr "比例"
 
@@ -63,11 +63,11 @@ msgstr "比例"
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:85
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:111
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:420
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1046
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1072
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1098
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1124
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1237
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1065
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1091
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1117
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1143
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1256
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:63
 msgid "X:"
 msgstr "X："
@@ -88,11 +88,11 @@ msgstr "X："
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:320
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:381
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:431
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1057
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1083
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1109
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1135
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1248
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1076
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1102
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1128
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1154
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1267
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:80
 msgid "Y:"
 msgstr "Y："
@@ -104,8 +104,8 @@ msgid "Z:"
 msgstr "Z："
 
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:66
-#: gerbview/gerber_draw_item.cpp:701 pcbnew/class_module.cpp:690
-#: pcbnew/class_pad.cpp:805
+#: gerbview/gerber_draw_item.cpp:701 pcbnew/class_module.cpp:705
+#: pcbnew/class_pad.cpp:856
 msgid "Rotation"
 msgstr "旋转"
 
@@ -120,7 +120,7 @@ msgstr "不透明度"
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:171
 #: common/dialogs/dialog_page_settings_base.cpp:118
 #: eeschema/dialogs/dialog_print_using_printer.cpp:147
-#: eeschema/dialogs/dialog_print_using_printer.cpp:280
+#: eeschema/dialogs/dialog_print_using_printer.cpp:278
 #: pagelayout_editor/dialogs/dialogs_for_printing.cpp:243
 msgid "Preview"
 msgstr "预览"
@@ -141,39 +141,39 @@ msgstr "没有此类文件"
 msgid "failed to open file"
 msgstr "无法打开文件"
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:427
+#: 3d-viewer/3d_canvas/board_adapter.cpp:422
 msgid "Build board body"
 msgstr "构造电路板"
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:430
-msgid "Board outline is not closed"
-msgstr "电路板轮廓未闭合"
+#: 3d-viewer/3d_canvas/board_adapter.cpp:427
+msgid "Board outline is not closed: "
+msgstr "电路板轮廓未闭合：  "
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:440
+#: 3d-viewer/3d_canvas/board_adapter.cpp:432
 msgid "Create layers"
 msgstr "创建图层"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:213
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:203
 msgid "Create tracks and vias"
 msgstr "创建导线和过孔"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:704
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:644
 msgid "Create zones"
 msgstr "创建覆铜"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:787
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:714
 msgid "Simplifying copper layers polygons"
 msgstr "简化铜层多边形"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:831
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:753
 msgid "Simplify holes contours"
 msgstr "简化孔轮廓"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:874
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:784
 msgid "Build Tech layers"
 msgstr "构造工艺层"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:1070
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:958
 msgid "Build BVH for holes and vias"
 msgstr "为孔和过孔构造 BVH (盲埋孔)"
 
@@ -182,36 +182,36 @@ msgstr "为孔和过孔构造 BVH (盲埋孔)"
 msgid "Render time %.0f ms ( %.1f fps)"
 msgstr "渲染时间 %.0f ms ( %.1f fps)"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:365
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:353
 msgid "Load OpenGL: board"
 msgstr "载入 OpenGL：电路板"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:437
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:425
 msgid "Load OpenGL: holes and vias"
 msgstr "载入 OpenGL：开孔和过孔"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:529
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:517
 msgid "Load OpenGL: layers"
 msgstr "载入 OpenGL：层"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:629
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:609
 msgid "Loading 3D models"
 msgstr "载入 3D 模型"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:653
-#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp:1059
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:619
+#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp:983
 #, c-format
 msgid "Reload time %.3f s"
 msgstr "重新载入时间 %.3f s"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:924
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:890
 #, c-format
 msgid "Loading %s"
 msgstr "加载 %s"
 
 #: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp:544
 #: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:178
-#: common/widgets/footprint_preview_widget.cpp:100
+#: common/widgets/footprint_preview_widget.cpp:108
 msgid "Loading..."
 msgstr "载入中..."
 
@@ -233,157 +233,134 @@ msgstr "渲染：后处理着色器"
 msgid "Export Current View as PNG..."
 msgstr "导出当前视图为 PNG..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:53
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:55
 msgid "Export Current View as JPEG..."
 msgstr "导出当前视图为 JPEG..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:57 common/hotkey_store.cpp:70
-#: common/tool/actions.cpp:515 pcbnew/footprint_viewer_frame.cpp:898
-#: pcbnew/pcb_base_frame.cpp:364
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:61 common/hotkey_store.cpp:70
+#: common/tool/actions.cpp:523 pcbnew/footprint_viewer_frame.cpp:944
+#: pcbnew/pcb_base_frame.cpp:416
 msgid "3D Viewer"
 msgstr "3D 查看器"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:66
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:69
 msgid "Copy 3D Image"
 msgstr "复制 3D 图像"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:171
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:107
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:279
-#: eeschema/eeschema_config.cpp:225 eeschema/eeschema_config.cpp:431
-#: gerbview/gerbview_frame.cpp:1143 pagelayout_editor/pl_editor_frame.cpp:413
-#: pcbnew/footprint_edit_frame.cpp:830 pcbnew/pcbnew_config.cpp:72
+#: eeschema/eeschema_config.cpp:224 eeschema/eeschema_config.cpp:395
+#: gerbview/gerbview_frame.cpp:1142 pagelayout_editor/pl_editor_frame.cpp:451
+#: pcbnew/footprint_edit_frame.cpp:871 pcbnew/pcbnew_config.cpp:63
 msgid "Display Options"
 msgstr "显示选项"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:174
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:467
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:111
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:711
 msgid "Raytracing"
 msgstr "光线追踪"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:179
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:118
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:28
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:473
 msgid "Render Options"
 msgstr "渲染选项"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:184
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:123
 msgid "Material Properties"
 msgstr "材料属性"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:188
-msgid "Use All Properties"
-msgstr "使用所有属性"
-
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:189
-msgid "Use all material properties from each 3D model file"
-msgstr "使用每个 3D 模型文件中的所有材质属性"
-
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:193
-msgid "Use Diffuse Only"
-msgstr "只使用漫反射"
-
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:194
-msgid "Use only the diffuse color property from model 3D model file"
-msgstr "仅使用 3D 模型文件中的漫反射颜色属性"
-
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:198
-msgid "CAD Color Style"
-msgstr "CAD 颜色样式"
-
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:199
-msgid "Use a CAD color style based on the diffuse color of the material"
-msgstr "根据材质的漫反射颜色使用 CAD 颜色样式"
-
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:208
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:136
 msgid "Raytracing Options"
 msgstr "光线追踪选项"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:227
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:154
 msgid "Choose Colors"
 msgstr "选择颜色"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:230
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:157
 msgid "Background Top Color..."
 msgstr "背景上部颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:233
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:161
 msgid "Background Bottom Color..."
 msgstr "背景下部颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:236
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:165
 msgid "Silkscreen Color..."
 msgstr "丝印颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:239
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:169
 msgid "Solder Mask Color..."
 msgstr "阻焊颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:242
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:173
 msgid "Solder Paste Color..."
 msgstr "锡膏颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:245
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:177
 msgid "Copper/Surface Finish Color..."
 msgstr "铜/表面处理颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:248
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:181
 msgid "Board Body Color..."
 msgstr "电路板颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:254
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:188
 msgid "Get colors from physical stackup"
 msgstr "从物理堆叠中获取颜色"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:264
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:199
 msgid "3D Grid"
 msgstr "3D 网格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:303
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:211
 msgid "Reset to Default Settings"
 msgstr "重置为默认值"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:308 cvpcb/menubar.cpp:89
-#: eeschema/libedit/menubar_libedit.cpp:210 eeschema/menubar.cpp:323
-#: gerbview/menubar.cpp:253 kicad/menubar.cpp:149
-#: pagelayout_editor/menubar.cpp:174 pcbnew/menubar_footprint_editor.cpp:286
-#: pcbnew/menubar_pcb_editor.cpp:534
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:214 cvpcb/menubar.cpp:71
+#: eeschema/libedit/menubar_libedit.cpp:155 eeschema/menubar.cpp:263
+#: gerbview/menubar.cpp:234 kicad/menubar.cpp:152
+#: pagelayout_editor/menubar.cpp:145 pcbnew/menubar_footprint_editor.cpp:230
+#: pcbnew/menubar_pcb_editor.cpp:440
 msgid "Preferences...\tCTRL+,"
 msgstr "首选项...\tCTRL+,"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:309 cvpcb/menubar.cpp:90
-#: eeschema/libedit/menubar_libedit.cpp:211 eeschema/menubar.cpp:324
-#: gerbview/menubar.cpp:254 kicad/menubar.cpp:150
-#: pagelayout_editor/menubar.cpp:175 pcbnew/menubar_footprint_editor.cpp:287
-#: pcbnew/menubar_pcb_editor.cpp:535
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:215 cvpcb/menubar.cpp:72
+#: eeschema/libedit/menubar_libedit.cpp:156 eeschema/menubar.cpp:264
+#: gerbview/menubar.cpp:235 kicad/menubar.cpp:153
+#: pagelayout_editor/menubar.cpp:146 pcbnew/menubar_footprint_editor.cpp:231
+#: pcbnew/menubar_pcb_editor.cpp:441
 msgid "Show preferences for all open tools"
 msgstr "显示所有打开工具的首选项"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:317 cvpcb/menubar.cpp:102
-#: eeschema/libedit/menubar_libedit.cpp:225 eeschema/menubar.cpp:338
-#: eeschema/toolbars_lib_view.cpp:138 gerbview/menubar.cpp:268
-#: kicad/menubar.cpp:160 pagelayout_editor/menubar.cpp:185
-#: pcbnew/menubar_footprint_editor.cpp:301 pcbnew/menubar_pcb_editor.cpp:549
-#: pcbnew/toolbars_footprint_viewer.cpp:189
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:222 cvpcb/menubar.cpp:84
+#: eeschema/libedit/menubar_libedit.cpp:170 eeschema/menubar.cpp:278
+#: eeschema/toolbars_lib_view.cpp:128 gerbview/menubar.cpp:249
+#: kicad/menubar.cpp:163 pagelayout_editor/menubar.cpp:155
+#: pcbnew/menubar_footprint_editor.cpp:244 pcbnew/menubar_pcb_editor.cpp:455
+#: pcbnew/toolbars_footprint_viewer.cpp:165
 msgid "&File"
 msgstr "文件 (&F)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:318 cvpcb/menubar.cpp:103
-#: eeschema/libedit/menubar_libedit.cpp:226 eeschema/menubar.cpp:339
-#: pagelayout_editor/menubar.cpp:186 pcbnew/menubar_footprint_editor.cpp:302
-#: pcbnew/menubar_pcb_editor.cpp:550
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:223 cvpcb/menubar.cpp:85
+#: eeschema/libedit/menubar_libedit.cpp:171 eeschema/menubar.cpp:279
+#: pagelayout_editor/menubar.cpp:156 pcbnew/menubar_footprint_editor.cpp:245
+#: pcbnew/menubar_pcb_editor.cpp:456
 msgid "&Edit"
 msgstr "编辑 (&E)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:319
-#: eeschema/libedit/menubar_libedit.cpp:227 eeschema/menubar.cpp:340
-#: eeschema/toolbars_lib_view.cpp:139 gerbview/menubar.cpp:269
-#: kicad/menubar.cpp:161 pagelayout_editor/menubar.cpp:187
-#: pcbnew/menubar_footprint_editor.cpp:303 pcbnew/menubar_pcb_editor.cpp:551
-#: pcbnew/toolbars_footprint_viewer.cpp:190
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:224
+#: eeschema/libedit/menubar_libedit.cpp:172 eeschema/menubar.cpp:280
+#: eeschema/toolbars_lib_view.cpp:129 gerbview/menubar.cpp:250
+#: kicad/menubar.cpp:164 pagelayout_editor/menubar.cpp:157
+#: pcbnew/menubar_footprint_editor.cpp:246 pcbnew/menubar_pcb_editor.cpp:457
+#: pcbnew/toolbars_footprint_viewer.cpp:166
 msgid "&View"
 msgstr "视图 (&V)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:320 cvpcb/menubar.cpp:104
-#: gerbview/menubar.cpp:271 kicad/menubar.cpp:163
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:225 cvpcb/menubar.cpp:86
+#: gerbview/menubar.cpp:252 kicad/menubar.cpp:166
 msgid "&Preferences"
 msgstr "首选项 (&P)"
 
@@ -481,12 +458,12 @@ msgid "Rotation Increment:"
 msgstr "旋转增量："
 
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:240
-#: common/base_units.cpp:552 pcbnew/dialogs/dialog_copper_zones_base.cpp:273
+#: common/base_units.cpp:552 pcbnew/dialogs/dialog_copper_zones_base.cpp:298
 #: pcbnew/dialogs/dialog_create_array_base.cpp:250
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:152
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:59
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:342
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1269
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1288
 msgid "deg"
 msgstr "度"
 
@@ -511,8 +488,8 @@ msgid "Show copper thickness"
 msgstr "显示铜厚度"
 
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:320
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:443
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:239
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:449
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:257
 msgid "Anti-aliasing"
 msgstr "抗锯齿"
 
@@ -560,54 +537,159 @@ msgstr "禁用孔"
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:398
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:403
 msgid "Raytracing Render Options"
 msgstr "光线追踪渲染选项"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:408
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:414
 msgid "Shadows"
 msgstr "阴影"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:415
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:421
 msgid "Procedural textures"
 msgstr "过程纹理"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:422
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:428
 msgid "Add floor"
 msgstr "添加层"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:429
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:229
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:435
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:247
 msgid "Refractions"
 msgstr "折射"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:436
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:234
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:442
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:252
 msgid "Reflections"
 msgstr "反射"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:450
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:244
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:456
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:262
 msgid "Post-processing"
 msgstr "后期处理"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h:115
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:479
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:703
+msgid "Lights configuration"
+msgstr "灯光配置"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:487
+msgid "Ambient Camera Light"
+msgstr "环境光摄影机灯光"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:506
+msgid "Top Light"
+msgstr "顶灯"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:516
+msgid "Bottom Light"
+msgstr "底灯"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:540
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:557
+msgid "Elevation (degrees)"
+msgstr "海拔（度）"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:544
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:561
+msgid "Azimuth (degrees)"
+msgstr "方位角（度）"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:565
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:214
+#: pcbnew/dialogs/dialog_create_array_base.cpp:93
+#: pcbnew/dialogs/dialog_create_array_base.cpp:163
+#: pcbnew/dialogs/dialog_create_array_base.cpp:168
+#: pcbnew/dialogs/dialog_create_array_base.cpp:177
+#: pcbnew/dialogs/dialog_create_array_base.cpp:182
+#: pcbnew/dialogs/dialog_create_array_base.cpp:306
+#: pcbnew/dialogs/dialog_create_array_base.cpp:313
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1308
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:49
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:108
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:169
+msgid "1"
+msgstr "1"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:581
+#: pcbnew/dialogs/dialog_create_array_base.cpp:35
+#: pcbnew/dialogs/dialog_create_array_base.cpp:42
+#: pcbnew/dialogs/dialog_create_array_base.cpp:49
+#: pcbnew/dialogs/dialog_create_array_base.cpp:60
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:53
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:112
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:173
+msgid "5"
+msgstr "5"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:594
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:50
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:109
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:170
+msgid "2"
+msgstr "2"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:610
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:54
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:113
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:174
+msgid "6"
+msgstr "6"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:623
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:51
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:110
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:171
+msgid "3"
+msgstr "3"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:639
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:55
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:114
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:175
+msgid "7"
+msgstr "7"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:652
+#: pcbnew/dialogs/dialog_create_array_base.cpp:258
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:52
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:111
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:172
+msgid "4"
+msgstr "4"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:668
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:56
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:115
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:176
+msgid "8"
+msgstr "8"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:690
+msgid "Reset to defaults"
+msgstr "重置为默认值"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h:163
 msgid "3D Display Options"
 msgstr "3D 显示选项"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:260
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:326
 msgid "Background Color, Bottom"
 msgstr "背景下部颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:271
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:337
 msgid "Background Color, Top"
 msgstr "背景上部颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:664
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:757
 msgid "3D Image File Name"
 msgstr "3D 图像文件名称"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:685
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:778
 #, c-format
 msgid ""
 "Insufficient permissions required to save file\n"
@@ -616,38 +698,38 @@ msgstr ""
 "保存文件所需的权限不足。\n"
 "%s"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:686 common/confirm.cpp:124
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:779 common/confirm.cpp:124
 #: common/confirm.cpp:256 common/dialogs/panel_setup_severities.cpp:39
 #: kicad/tools/kicad_manager_control.cpp:174
 #: pcbnew/router/length_tuner_tool.cpp:174
 msgid "Error"
 msgstr "错误"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:717
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:810
 msgid "Failed to copy image to clipboard"
 msgstr "复制图像到剪贴板失败"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:728
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:821
 msgid "Can't save file"
 msgstr "无法保存文件"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:776
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:869
 msgid "Silkscreen Color"
 msgstr "丝印颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:806
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:899
 msgid "Solder Mask Color"
 msgstr "阻焊颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:826
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:919
 msgid "Copper Color"
 msgstr "铜箔颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:849
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:942
 msgid "Board Body Color"
 msgstr "电路板颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:867
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:960
 msgid "Solder Paste Color"
 msgstr "锡膏颜色"
 
@@ -767,133 +849,157 @@ msgstr "3D 网格 2.5mm"
 msgid "3D Grid 1mm"
 msgstr "3D 网格 1mm"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:192
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:187
+msgid "Use All Properties"
+msgstr "使用所有属性"
+
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:187
+msgid "Use all material properties from each 3D model file"
+msgstr "使用每个 3D 模型文件中的所有材质属性"
+
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:193
+msgid "Use Diffuse Only"
+msgstr "只使用漫反射"
+
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:193
+msgid "Use only the diffuse color property from model 3D model file"
+msgstr "仅使用 3D 模型文件中的漫反射颜色属性"
+
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:199
+msgid "CAD Color Style"
+msgstr "CAD 颜色样式"
+
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:199
+msgid "Use a CAD color style based on the diffuse color of the material"
+msgstr "根据材质的漫反射颜色使用 CAD 颜色样式"
+
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:210
 msgid "Toggle Through Hole 3D models"
 msgstr "切换 3D 通孔模型"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:192
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:210
 msgid "Toggle 3D models with 'Through hole' attribute"
 msgstr "切换通孔类型的 3D 模型"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:198
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:216
 msgid "Toggle SMD 3D models"
 msgstr "切换表面贴装 3D 模型"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:198
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:216
 msgid "Toggle 3D models with 'Surface mount' attribute"
 msgstr "切换表面贴装类型的 3D 模型"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:204
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:222
 msgid "Toggle Virtual 3D models"
 msgstr "切换虚拟 3D 模型"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:204
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:222
 msgid "Toggle 3D models with 'Virtual' attribute"
 msgstr "切换虚拟类型的 3D 模型"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:209
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:227
 msgid "Show Model Bounding Boxes"
 msgstr "显示模型边框"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:214
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:232
 msgid "Render Shadows"
 msgstr "渲染阴影"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:219
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:237
 msgid "Procedural Textures"
 msgstr "过程纹理"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:219
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:237
 msgid "Apply procedural textures to materials (slow)"
 msgstr "将过程纹理应用于材质（慢）"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:224
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:242
 msgid "Add Floor"
 msgstr "添加层"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:224
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:242
 msgid "Adds a floor plane below the board (slow)"
 msgstr "在线路板下面添加一块反光板 (慢)"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:229
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:247
 msgid "Render materials with refractive properties on final render (slow)"
 msgstr "在最终渲染中渲染具有折射属性的材质（慢）"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:234
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:252
 msgid "Render materials with reflective properties on final render (slow)"
 msgstr "在最终渲染中渲染具有反射属性的材质（慢）"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:239
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:257
 msgid "Render with improved quality on final render (slow)"
 msgstr "在最终渲染中以最高质量渲染 (慢)"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:245
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:263
 msgid ""
 "Apply Screen Space Ambient Occlusion and Global Illumination reflections on "
 "final render (slow)"
 msgstr "在最终渲染中，应用屏幕空间环境光遮蔽和全局光照反射 (慢)"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:250
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:268
 msgid "Toggle realistic mode"
 msgstr "切换真实模式"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:255
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:273
 msgid "Toggle board body display"
 msgstr "切换电路板显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:260
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:278
 msgid "Show 3D Axis"
 msgstr "显示 3D 轴线"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:265
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:283
 msgid "Toggle zone display"
 msgstr "切换区域显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:270
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:288
 msgid "Toggle adhesive display"
 msgstr "切换胶粘层显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:270
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:288
 msgid "Toggle display of adhesive layers"
 msgstr "切换胶粘层的显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:275
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:293
 msgid "Toggle silkscreen display"
 msgstr "切换丝印层显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:275
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:293
 msgid "Toggle display of silkscreen layers"
 msgstr "切换丝印层的显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:280
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:298
 msgid "Toggle solder mask display"
 msgstr "切换阻焊层显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:280
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:298
 msgid "Toggle display of solder mask layers"
 msgstr "切换阻焊层的显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:285
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:303
 msgid "Toggle solder paste display"
 msgstr "切换锡膏层显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:285
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:303
 msgid "Toggle display of solder paste layers"
 msgstr "切换锡膏层的显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:290
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:308
 msgid "Toggle comments display"
 msgstr "切换注释和绘图层显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:290
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:308
 msgid "Toggle display of comments and drawings layers"
 msgstr "切换注释和绘图层的显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:295
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:313
 msgid "Toggle ECO display"
 msgstr "切换 ECO 层显示"
 
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:295
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:313
 msgid "Toggle display of ECO layers"
 msgstr "切换 ECO 层的显示"
 
@@ -929,7 +1035,7 @@ msgstr "切换 ECO 层的显示"
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:635
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:659
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:669
-#: pagelayout_editor/pl_editor_frame.cpp:680 pcb_calculator/UnitSelector.cpp:34
+#: pagelayout_editor/pl_editor_frame.cpp:718 pcb_calculator/UnitSelector.cpp:34
 #: pcb_calculator/UnitSelector.cpp:66
 #: pcbnew/dialogs/dialog_create_array_base.cpp:52
 #: pcbnew/dialogs/dialog_create_array_base.cpp:63
@@ -961,18 +1067,18 @@ msgstr "切换 ECO 层的显示"
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:74
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:91
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:77
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:160
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:176
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:190
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:204
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:218
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:257
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:271
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:310
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:324
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:68
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:81
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:103
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:187
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:203
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:217
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:231
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:245
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:284
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:298
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:337
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:351
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:58
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:73
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:95
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:101
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:143
 msgid "mm"
@@ -980,11 +1086,11 @@ msgstr "mm"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:154
 #: pcbnew/dialogs/dialog_export_vrml_base.cpp:111
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:624
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:637
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:650
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:749
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:760
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:616
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:629
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:642
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:741
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:752
 #: pcbnew/dialogs/dialog_plot_base.cpp:351
 msgid "Inch"
 msgstr "Inch"
@@ -995,13 +1101,13 @@ msgstr "DPI"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:330
 #: eeschema/tools/sch_drawing_tools.cpp:355
-#: pagelayout_editor/pl_editor_frame.cpp:790
+#: pagelayout_editor/pl_editor_frame.cpp:834
 msgid "Choose Image"
 msgstr "选择图片"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:331
 #: eeschema/tools/sch_drawing_tools.cpp:356
-#: pagelayout_editor/pl_editor_frame.cpp:791
+#: pagelayout_editor/pl_editor_frame.cpp:835
 msgid "Image Files "
 msgstr "图片文件 "
 
@@ -1039,9 +1145,9 @@ msgstr "为 potrace 位图分配内存时出错"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:908
 #: common/dialogs/wx_html_report_panel_base.cpp:42
-#: eeschema/dialogs/dialog_erc_base.cpp:70 gerbview/files.cpp:363
+#: eeschema/dialogs/dialog_erc_base.cpp:77 gerbview/files.cpp:363
 #: gerbview/files.cpp:478 gerbview/readgerb.cpp:72
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1053
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1064
 #: pcbnew/dialogs/dialog_drc_base.cpp:177
 msgid "Errors"
 msgstr "错误"
@@ -1166,12 +1272,12 @@ msgid "Negative"
 msgstr "负片"
 
 #: bitmap2component/bitmap2cmp_gui_base.cpp:182
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:533
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:525
 msgid "Front silk screen"
 msgstr "顶层丝印"
 
 #: bitmap2component/bitmap2cmp_gui_base.cpp:182
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:539
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:531
 msgid "Front solder mask"
 msgstr "顶层阻焊"
 
@@ -1194,229 +1300,236 @@ msgid ""
 "layer (but will be marked invisible)."
 msgstr ""
 "选择要放置轮廓的电路板图层。\n"
-"参考指示符和值始终放置在丝印层上（但将标记为不可见）。"
+"位号和值始终放置在丝印层上（但将标记为不可见）。"
 
 #: bitmap2component/bitmap2cmp_gui_base.h:100
 msgid "Bitmap to Component Converter"
 msgstr "将位图转换成元件"
 
-#: common/base_struct.cpp:749
+#: common/base_struct.cpp:744
 msgid "Screen"
 msgstr "屏幕"
 
-#: common/base_struct.cpp:751 common/template_fieldnames.cpp:49
-#: eeschema/sch_component.cpp:1230 pcbnew/class_edge_mod.cpp:119
-#: pcbnew/class_pad.cpp:742 pcbnew/class_text_mod.cpp:293
-#: pcbnew/load_select_footprint.cpp:352
+#: common/base_struct.cpp:746 common/template_fieldnames.cpp:48
+#: eeschema/sch_component.cpp:1246 pcbnew/class_edge_mod.cpp:125
+#: pcbnew/class_pad.cpp:793 pcbnew/class_text_mod.cpp:289
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:132
+#: pcbnew/load_select_footprint.cpp:345
 msgid "Footprint"
 msgstr "封装"
 
-#: common/base_struct.cpp:752 pcbnew/class_pad.cpp:744
-#: pcbnew/dialogs/dialog_board_statistics.cpp:486
+#: common/base_struct.cpp:747 pcbnew/class_pad.cpp:795
+#: pcbnew/dialogs/dialog_board_statistics.cpp:484
 msgid "Pad"
 msgstr "焊盘"
 
-#: common/base_struct.cpp:753 common/page_layout/ws_draw_item.cpp:111
-#: eeschema/pin_shape.cpp:45 gerbview/gerber_draw_item.cpp:230
+#: common/base_struct.cpp:748 common/page_layout/ws_draw_item.cpp:111
+#: eeschema/pin_type.cpp:78 gerbview/gerber_draw_item.cpp:230
 #: pcbnew/class_board_item.cpp:37
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:123
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:144
 #: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:58
 msgid "Line"
 msgstr "线"
 
-#: common/base_struct.cpp:754
+#: common/base_struct.cpp:749
 msgid "Board Text"
 msgstr "电路板文本"
 
-#: common/base_struct.cpp:755
+#: common/base_struct.cpp:750 pcbnew/widgets/appearance_controls.cpp:295
 msgid "Footprint Text"
 msgstr "封装文本"
 
-#: common/base_struct.cpp:756
+#: common/base_struct.cpp:751
 msgid "Footprint Graphics"
 msgstr "封装图形"
 
-#: common/base_struct.cpp:757 pcbnew/class_track.cpp:578
+#: common/base_struct.cpp:752 pcbnew/class_track.cpp:649
 msgid "Track"
 msgstr "布线"
 
-#: common/base_struct.cpp:758 pcbnew/dialogs/dialog_board_statistics.cpp:486
+#: common/base_struct.cpp:753 pcbnew/dialogs/dialog_board_statistics.cpp:484
 msgid "Via"
 msgstr "过孔"
 
-#: common/base_struct.cpp:759
+#: common/base_struct.cpp:754
 msgid "Board Marker"
 msgstr "电路板标记"
 
-#: common/base_struct.cpp:760 pcbnew/class_pcb_text.cpp:118
+#: common/base_struct.cpp:755 pcbnew/class_pcb_text.cpp:114
 msgid "Dimension"
 msgstr "尺寸"
 
-#: common/base_struct.cpp:761
+#: common/base_struct.cpp:756
 msgid "Target"
 msgstr "目标"
 
-#: common/base_struct.cpp:762
+#: common/base_struct.cpp:757
 msgid "Zone"
 msgstr "区域"
 
-#: common/base_struct.cpp:763
+#: common/base_struct.cpp:758
 msgid "Item List"
 msgstr "项目列表"
 
-#: common/base_struct.cpp:764
+#: common/base_struct.cpp:759
 msgid "Net Info"
 msgstr "网络信息"
 
-#: common/base_struct.cpp:766
+#: common/base_struct.cpp:760 pcbnew/class_pcb_group.cpp:282
+#: pcbnew/tools/pcb_actions.cpp:632
+msgid "Group"
+msgstr "组"
+
+#: common/base_struct.cpp:762
 msgid "Schematic Marker"
 msgstr "原理图标记"
 
-#: common/base_struct.cpp:767 common/layer_id.cpp:40 eeschema/sch_junction.h:90
+#: common/base_struct.cpp:763 common/layer_id.cpp:94 eeschema/sch_junction.h:90
 msgid "Junction"
 msgstr "连接点"
 
-#: common/base_struct.cpp:768
+#: common/base_struct.cpp:764
 msgid "No-Connect Flag"
 msgstr "不连接标志"
 
-#: common/base_struct.cpp:769
+#: common/base_struct.cpp:765
 msgid "Wire Entry"
 msgstr "连接线入口"
 
-#: common/base_struct.cpp:770
+#: common/base_struct.cpp:766
 msgid "Bus Entry"
 msgstr "总线入口"
 
-#: common/base_struct.cpp:771
+#: common/base_struct.cpp:767
 msgid "Graphic Line"
 msgstr "图形线"
 
-#: common/base_struct.cpp:772 eeschema/sch_bitmap.cpp:201
+#: common/base_struct.cpp:768 eeschema/sch_bitmap.cpp:201
 msgid "Bitmap"
 msgstr "位图"
 
-#: common/base_struct.cpp:773
+#: common/base_struct.cpp:769
 msgid "Schematic Text"
 msgstr "原理图文本"
 
-#: common/base_struct.cpp:774
+#: common/base_struct.cpp:770
 msgid "Net Label"
 msgstr "网络标签"
 
-#: common/base_struct.cpp:775 eeschema/sch_text.cpp:656
+#: common/base_struct.cpp:771 eeschema/sch_text.cpp:627
 msgid "Global Label"
 msgstr "全局标签"
 
-#: common/base_struct.cpp:776 eeschema/sch_text.cpp:657
+#: common/base_struct.cpp:772 eeschema/sch_text.cpp:628
 msgid "Hierarchical Label"
 msgstr "层次标签"
 
-#: common/base_struct.cpp:777
+#: common/base_struct.cpp:773
 msgid "Schematic Field"
 msgstr "原理图字段"
 
-#: common/base_struct.cpp:778
+#: common/base_struct.cpp:774
 msgid "Component"
 msgstr "元件"
 
-#: common/base_struct.cpp:779
+#: common/base_struct.cpp:775
 msgid "Sheet Pin"
 msgstr "图框引脚"
 
-#: common/base_struct.cpp:780 eeschema/dialogs/dialog_migrate_buses.cpp:101
-#: pcbnew/tools/pcb_actions.cpp:1072
+#: common/base_struct.cpp:776 eeschema/dialogs/dialog_migrate_buses.cpp:101
+#: pcbnew/tools/pcb_actions.cpp:1144
 msgid "Sheet"
 msgstr "图框"
 
-#: common/base_struct.cpp:782
+#: common/base_struct.cpp:778
 msgid "Field Locate Reference"
 msgstr "字段定位参考"
 
-#: common/base_struct.cpp:783
+#: common/base_struct.cpp:779
 msgid "Field Locate Value"
 msgstr "字段定位值"
 
-#: common/base_struct.cpp:784
+#: common/base_struct.cpp:780
 msgid "Field Locate Footprint"
 msgstr "字段定位封装"
 
-#: common/base_struct.cpp:786
+#: common/base_struct.cpp:782
 msgid "SCH Screen"
 msgstr "原理图屏幕"
 
-#: common/base_struct.cpp:788
+#: common/base_struct.cpp:784
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:166
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:118
 #: eeschema/libedit/symbedit.cpp:238
 msgid "Symbol"
 msgstr "符号"
 
-#: common/base_struct.cpp:789 common/dialogs/dialog_configure_paths_base.cpp:92
+#: common/base_struct.cpp:785 common/dialogs/dialog_configure_paths_base.cpp:92
 msgid "Alias"
 msgstr "别名"
 
-#: common/base_struct.cpp:790 eeschema/lib_arc.h:70
+#: common/base_struct.cpp:786 eeschema/lib_arc.h:70
 #: gerbview/gerber_draw_item.cpp:233 pcbnew/class_board_item.cpp:39
-#: pcbnew/class_drawsegment.cpp:444
+#: pcbnew/class_drawsegment.cpp:475
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:114
-#: pcbnew/dialogs/dialog_pad_properties.cpp:718
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1869
+#: pcbnew/dialogs/dialog_pad_properties.cpp:731
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1994
 msgid "Arc"
 msgstr "弧"
 
-#: common/base_struct.cpp:791 eeschema/lib_circle.h:52
+#: common/base_struct.cpp:787 eeschema/lib_circle.h:53
 #: gerbview/gerber_draw_item.cpp:236 pcbnew/class_board_item.cpp:40
-#: pcbnew/class_drawsegment.cpp:437 pcbnew/class_pad.cpp:978
-#: pcbnew/class_pad.cpp:1274
+#: pcbnew/class_drawsegment.cpp:468 pcbnew/class_pad.cpp:1029
+#: pcbnew/class_pad.cpp:1329
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:137
 msgid "Circle"
 msgstr "圆形"
 
-#: common/base_struct.cpp:792
+#: common/base_struct.cpp:788
 msgid "Symbol Text"
 msgstr "符号文本"
 
-#: common/base_struct.cpp:793 common/page_layout/ws_draw_item.cpp:115
-#: eeschema/lib_rectangle.h:54 pcbnew/class_drawsegment.cpp:467
-#: pcbnew/class_pad.cpp:1275
+#: common/base_struct.cpp:789 common/page_layout/ws_draw_item.cpp:115
+#: eeschema/lib_rectangle.h:54 pcbnew/class_drawsegment.cpp:498
+#: pcbnew/class_pad.cpp:1330
 msgid "Rectangle"
 msgstr "矩形"
 
-#: common/base_struct.cpp:794
+#: common/base_struct.cpp:790
 msgid "Polyline"
 msgstr "多段线"
 
-#: common/base_struct.cpp:795 eeschema/lib_bezier.h:54
+#: common/base_struct.cpp:791 eeschema/lib_bezier.h:54
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:101
-#: pcbnew/dialogs/dialog_pad_properties.cpp:712
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1869
+#: pcbnew/dialogs/dialog_pad_properties.cpp:725
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1994
 msgid "Bezier"
 msgstr "贝塞尔曲线"
 
-#: common/base_struct.cpp:796 common/layer_id.cpp:79 eeschema/lib_pin.h:107
+#: common/base_struct.cpp:792 common/layer_id.cpp:107 eeschema/lib_pin.h:122
+#: eeschema/sch_pin.cpp:141
 msgid "Pin"
 msgstr "引脚"
 
-#: common/base_struct.cpp:797
+#: common/base_struct.cpp:793
 msgid "Symbol Field"
 msgstr "符号字段"
 
-#: common/base_struct.cpp:799
+#: common/base_struct.cpp:795
 msgid "Gerber Layout"
 msgstr "Gerber 布局"
 
-#: common/base_struct.cpp:800
+#: common/base_struct.cpp:796
 msgid "Draw Item"
 msgstr "绘制项目"
 
-#: common/base_struct.cpp:801 common/page_layout/ws_draw_item.cpp:128
+#: common/base_struct.cpp:797 common/page_layout/ws_draw_item.cpp:128
 #: eeschema/sch_bitmap.h:133
 msgid "Image"
 msgstr "图片"
 
-#: common/base_units.cpp:508 eeschema/dialogs/dialog_junction_props_base.cpp:32
+#: common/base_units.cpp:508 eeschema/dialogs/dialog_junction_props_base.cpp:34
 #: eeschema/dialogs/dialog_lib_new_component_base.cpp:101
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:137
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:148
@@ -1468,35 +1581,35 @@ msgstr "cu. mm"
 
 #: common/base_units.cpp:546
 #: eeschema/dialogs/panel_setup_formatting_base.cpp:71
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:366
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:270
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:391
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:295
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:163
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:201
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:251
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:292
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:663
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:655
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:151
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:116
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:108
 msgid "%"
 msgstr "%"
 
-#: common/common.cpp:529
+#: common/common.cpp:536
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
 msgstr "环境变量扩展失败：缺少 \"%c\" , 位置 \"%u\" （在 \"%s\" 内）。"
 
-#: common/common.cpp:615
+#: common/common.cpp:622
 #, c-format
 msgid "Cannot make path \"%s\" absolute with respect to \"%s\"."
 msgstr "不能设置 \"%s\" 为绝对路径 \"%s\"。"
 
-#: common/common.cpp:633
+#: common/common.cpp:640
 #, c-format
 msgid "Output directory \"%s\" created.\n"
 msgstr "输出目录 \"%s\" 已创建。\n"
 
-#: common/common.cpp:642
+#: common/common.cpp:649
 #, c-format
 msgid "Cannot create output directory \"%s\".\n"
 msgstr "无法创建输出目录 \"%s\"。\n"
@@ -1517,9 +1630,9 @@ msgstr "问题"
 #: common/confirm.cpp:123 common/confirm.cpp:244
 #: common/dialogs/panel_setup_severities.cpp:39
 #: eeschema/dialogs/panel_eeschema_color_settings.cpp:153
-#: eeschema/libedit/libedit.cpp:571 eeschema/libedit/symbedit.cpp:96
+#: eeschema/libedit/libedit.cpp:570 eeschema/libedit/symbedit.cpp:96
 #: eeschema/sheet.cpp:624 pcbnew/dialogs/dialog_export_vrml.cpp:183
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:299 pcbnew/pcb_parser.cpp:642
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:300 pcbnew/pcb_parser.cpp:656
 msgid "Warning"
 msgstr "警告"
 
@@ -1528,8 +1641,8 @@ msgid "If you don't save, all your changes will be permanently lost."
 msgstr "如果你不保存，你的所有更改将永久丢失。"
 
 #: common/confirm.cpp:155 common/confirm.cpp:182 common/tool/actions.cpp:65
-#: eeschema/libedit/libedit.cpp:433 eeschema/widgets/tuner_slider_base.cpp:66
-#: pcbnew/footprint_libraries_utils.cpp:875
+#: eeschema/libedit/libedit.cpp:432 eeschema/widgets/tuner_slider_base.cpp:66
+#: pcbnew/footprint_libraries_utils.cpp:890
 msgid "Save"
 msgstr "保存"
 
@@ -1551,7 +1664,7 @@ msgstr "恢复"
 
 #: common/confirm.cpp:195 common/tool/actions.cpp:120
 #: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:187
-#: pcbnew/microwave/microwave_polygon.cpp:125 pcbnew/pcb_parser.cpp:645
+#: pcbnew/microwave/microwave_polygon.cpp:125 pcbnew/pcb_parser.cpp:659
 msgid "Cancel"
 msgstr "取消"
 
@@ -1560,93 +1673,93 @@ msgid "Info"
 msgstr "信息"
 
 #: common/confirm.cpp:285 eeschema/libedit/lib_export.cpp:156
-#: eeschema/tools/lib_pin_tool.cpp:164 kicad/import_project.cpp:97
+#: eeschema/tools/lib_pin_tool.cpp:211 kicad/import_project.cpp:92
 #: kicad/tools/kicad_manager_control.cpp:258
 #: pcbnew/dialogs/dialog_export_idf.cpp:165
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:120
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:345
-#: pcbnew/footprint_libraries_utils.cpp:445
-#: pcbnew/footprint_libraries_utils.cpp:947 pcbnew/router/router_tool.cpp:1218
-#: pcbnew/router/router_tool.cpp:1399 pcbnew/router/router_tool.cpp:1528
-#: pcbnew/zone_filler.cpp:296
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:353
+#: pcbnew/footprint_libraries_utils.cpp:446
+#: pcbnew/footprint_libraries_utils.cpp:962 pcbnew/router/router_tool.cpp:1216
+#: pcbnew/router/router_tool.cpp:1397 pcbnew/router/router_tool.cpp:1553
+#: pcbnew/zone_filler.cpp:314
 msgid "Confirmation"
 msgstr "确认"
 
-#: common/dialog_about/AboutDialog_main.cpp:115
+#: common/dialog_about/AboutDialog_main.cpp:114
 #: common/dialogs/dialog_configure_paths_base.cpp:94
-#: common/lib_tree_model_adapter.cpp:276 eeschema/lib_view_frame.cpp:297
-#: eeschema/libedit/libedit.cpp:421 eeschema/libedit/symbedit.cpp:241
-#: eeschema/sch_component.cpp:1233 include/lib_table_grid.h:189
+#: common/lib_tree_model_adapter.cpp:275 eeschema/lib_view_frame.cpp:361
+#: eeschema/libedit/libedit.cpp:420 eeschema/libedit/symbedit.cpp:241
+#: eeschema/sch_component.cpp:1249 include/lib_table_grid.h:189
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:44
 #: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:40
-#: pcbnew/footprint_libraries_utils.cpp:863
-#: pcbnew/footprint_libraries_utils.cpp:1099
+#: pcbnew/footprint_libraries_utils.cpp:878
+#: pcbnew/footprint_libraries_utils.cpp:1114
 msgid "Description"
 msgstr "描述"
 
-#: common/dialog_about/AboutDialog_main.cpp:119
+#: common/dialog_about/AboutDialog_main.cpp:118
 msgid ""
 "The KiCad EDA Suite is a set of open source applications for the creation of "
 "electronic schematics and printed circuit boards."
 msgstr "KiCad EDA 套件是一套用于创建电路原理图和印刷电路板的开源应用软件。"
 
-#: common/dialog_about/AboutDialog_main.cpp:127
+#: common/dialog_about/AboutDialog_main.cpp:126
 msgid "KiCad on the web"
 msgstr "KiCad 相关站点"
 
-#: common/dialog_about/AboutDialog_main.cpp:133
+#: common/dialog_about/AboutDialog_main.cpp:132
 msgid "The official KiCad website - "
 msgstr "KiCad 官方网站 - "
 
-#: common/dialog_about/AboutDialog_main.cpp:137
+#: common/dialog_about/AboutDialog_main.cpp:136
 msgid "Developer website on Launchpad - "
 msgstr "在 Launchpad 上的开发者网站 - "
 
-#: common/dialog_about/AboutDialog_main.cpp:142
+#: common/dialog_about/AboutDialog_main.cpp:141
 msgid "Official KiCad library repositories - "
 msgstr "KiCad 官方库 - "
 
-#: common/dialog_about/AboutDialog_main.cpp:149
+#: common/dialog_about/AboutDialog_main.cpp:148
 msgid "Bug tracker"
 msgstr "Bug 追踪"
 
-#: common/dialog_about/AboutDialog_main.cpp:155
+#: common/dialog_about/AboutDialog_main.cpp:154
 msgid "Report or examine bugs - "
 msgstr "报告或检查 Bug - "
 
-#: common/dialog_about/AboutDialog_main.cpp:161
+#: common/dialog_about/AboutDialog_main.cpp:160
 msgid "KiCad user's groups and community"
 msgstr "KiCad 用户组和社区"
 
-#: common/dialog_about/AboutDialog_main.cpp:166
+#: common/dialog_about/AboutDialog_main.cpp:165
 msgid "KiCad forum - "
 msgstr "KiCad 用户论坛 - "
 
-#: common/dialog_about/AboutDialog_main.cpp:180
+#: common/dialog_about/AboutDialog_main.cpp:179
 msgid "The complete KiCad EDA Suite is released under the"
 msgstr "完整的 KiCad EDA 套件发布于"
 
-#: common/dialog_about/AboutDialog_main.cpp:182
+#: common/dialog_about/AboutDialog_main.cpp:181
 msgid "GNU General Public License (GPL) version 3 or any later version"
 msgstr "GNU 通用公共许可证（GPL）版本 3 或任何更高版本"
 
-#: common/dialog_about/AboutDialog_main.cpp:380
+#: common/dialog_about/AboutDialog_main.cpp:354
 msgid "Others"
 msgstr "其它"
 
-#: common/dialog_about/AboutDialog_main.cpp:399
+#: common/dialog_about/AboutDialog_main.cpp:373
 msgid "Icons by"
 msgstr "图标设计"
 
-#: common/dialog_about/AboutDialog_main.cpp:417
+#: common/dialog_about/AboutDialog_main.cpp:391
 msgid "3D models by"
 msgstr "3D 模型设计"
 
-#: common/dialog_about/AboutDialog_main.cpp:434
+#: common/dialog_about/AboutDialog_main.cpp:408
 msgid "Symbols by"
 msgstr "符号设计"
 
-#: common/dialog_about/AboutDialog_main.cpp:441
+#: common/dialog_about/AboutDialog_main.cpp:415
 msgid "Footprints by"
 msgstr "封装设计"
 
@@ -1728,7 +1841,7 @@ msgstr "复制 KiCad 版本信息到剪贴板"
 msgid "&Report Bug"
 msgstr "报告 Bug (&R)"
 
-#: common/dialog_about/dialog_about_base.cpp:64 common/tool/actions.cpp:615
+#: common/dialog_about/dialog_about_base.cpp:64 common/tool/actions.cpp:623
 msgid "Report a problem with KiCad"
 msgstr "报告 KiCad 的问题"
 
@@ -1736,6 +1849,10 @@ msgstr "报告 KiCad 的问题"
 msgid "&OK"
 msgstr "确定 (&O)"
 
+#: common/dialogs/dialog_color_picker.cpp:83
+msgid "Clear Color"
+msgstr "透明颜色"
+
 #: common/dialogs/dialog_color_picker_base.cpp:31
 msgid "RGB"
 msgstr "RGB"
@@ -1771,7 +1888,7 @@ msgstr "饱和度："
 #: common/dialogs/dialog_color_picker_base.cpp:114
 #: eeschema/dialogs/dialog_spice_model_base.cpp:45
 #: eeschema/dialogs/dialog_spice_model_base.cpp:637
-#: pcbnew/dialogs/dialog_text_properties.cpp:106
+#: pcbnew/dialogs/dialog_text_properties.cpp:110
 msgid "Value:"
 msgstr "值："
 
@@ -1796,27 +1913,27 @@ msgstr "预览 (旧/新)："
 msgid "Reset to Default"
 msgstr "重置为默认值"
 
-#: common/dialogs/dialog_configure_paths.cpp:238
-#: common/dialogs/dialog_configure_paths.cpp:308
+#: common/dialogs/dialog_configure_paths.cpp:241
+#: common/dialogs/dialog_configure_paths.cpp:311
 msgid "Environment variable name cannot be empty."
 msgstr "环境变量名称不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:246
-#: common/dialogs/dialog_configure_paths.cpp:310
+#: common/dialogs/dialog_configure_paths.cpp:249
+#: common/dialogs/dialog_configure_paths.cpp:313
 msgid "Environment variable path cannot be empty."
 msgstr "环境变量路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:273
-#: common/dialogs/dialog_configure_paths.cpp:315
+#: common/dialogs/dialog_configure_paths.cpp:276
+#: common/dialogs/dialog_configure_paths.cpp:318
 msgid "3D search path alias cannot be empty."
 msgstr "3D 搜索路径别名不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:281
-#: common/dialogs/dialog_configure_paths.cpp:317
+#: common/dialogs/dialog_configure_paths.cpp:284
+#: common/dialogs/dialog_configure_paths.cpp:320
 msgid "3D search path cannot be empty."
 msgstr "3D 搜索路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:330
+#: common/dialogs/dialog_configure_paths.cpp:333
 msgid ""
 "This path was defined  externally to the running process and\n"
 "will only be temporarily overwritten."
@@ -1824,7 +1941,7 @@ msgstr ""
 "此路径是在运行进程外部定义的\n"
 "只会被暂时覆盖。"
 
-#: common/dialogs/dialog_configure_paths.cpp:332
+#: common/dialogs/dialog_configure_paths.cpp:335
 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"
@@ -1837,21 +1954,21 @@ msgstr ""
 "如果你不想这样, 请重命名任何冲突\n"
 "的条目或删除系统中的外部环境变量。"
 
-#: common/dialogs/dialog_configure_paths.cpp:347
+#: common/dialogs/dialog_configure_paths.cpp:350
 #, c-format
 msgid "The name %s is reserved, and cannot be used here"
 msgstr "名称 %s 是保留的，不能在此处使用"
 
-#: common/dialogs/dialog_configure_paths.cpp:483
+#: common/dialogs/dialog_configure_paths.cpp:486
 msgid "File Browser..."
 msgstr "文件浏览器..."
 
-#: common/dialogs/dialog_configure_paths.cpp:486
+#: common/dialogs/dialog_configure_paths.cpp:489
 #: common/widgets/grid_text_button_helpers.cpp:354
 msgid "Select Path"
 msgstr "选择路径"
 
-#: common/dialogs/dialog_configure_paths.cpp:566
+#: common/dialogs/dialog_configure_paths.cpp:569
 msgid ""
 "Enter the name and value for each environment variable.  Grey entries are "
 "names that have been defined externally at the system or user level.  "
@@ -1862,7 +1979,7 @@ msgstr ""
 "为每个环境变量输入名称和路径。灰色条目为系统或用户级外部定义的名称。在系统或"
 "用户级定义的环境变量优先于该表中定义。这意味着该表中的值将被忽略。"
 
-#: common/dialogs/dialog_configure_paths.cpp:572
+#: common/dialogs/dialog_configure_paths.cpp:575
 msgid ""
 "To ensure environment variable names are valid on all platforms, the name "
 "field will only accept upper case letters, digits, and the underscore "
@@ -1871,7 +1988,7 @@ msgstr ""
 "为了确保环境变量名称在所有平台上有效的，名称字段只接受大写字母，数字和下划线"
 "字符。"
 
-#: common/dialogs/dialog_configure_paths.cpp:587
+#: common/dialogs/dialog_configure_paths.cpp:590
 msgid "Environment Variable Help"
 msgstr "环境变量帮助"
 
@@ -1884,25 +2001,28 @@ msgstr "环境变量"
 #: cvpcb/dialogs/dialog_config_equfiles_base.cpp:80
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:56
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:48
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:77
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:62
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:45
+#: eeschema/dialogs/dialog_sch_pin_table.cpp:99
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:39
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:50
 #: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:43
-#: eeschema/dialogs/panel_sym_lib_table.cpp:285
-#: eeschema/fields_grid_table.cpp:195 eeschema/lib_pin.cpp:1446
-#: eeschema/lib_view_frame.cpp:295 eeschema/libedit/symbedit.cpp:213
-#: eeschema/sch_component.cpp:1201 eeschema/sch_component.cpp:1248
-#: eeschema/widgets/tuner_slider_base.cpp:20 pcbnew/class_pad.cpp:1289
-#: pcbnew/class_zone.cpp:660
+#: eeschema/dialogs/panel_sym_lib_table.cpp:301
+#: eeschema/fields_grid_table.cpp:195 eeschema/lib_pin.cpp:984
+#: eeschema/lib_view_frame.cpp:359 eeschema/libedit/symbedit.cpp:213
+#: eeschema/sch_component.cpp:1217 eeschema/sch_component.cpp:1264
+#: eeschema/sch_pin.cpp:159 eeschema/widgets/tuner_slider_base.cpp:20
+#: pcbnew/class_pad.cpp:1344 pcbnew/class_zone.cpp:665
+#: pcbnew/class_zone.cpp:1381
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:43
 #: pcbnew/dialogs/dialog_select_net_from_list.cpp:55
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:434
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:451
 #: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:38
 msgid "Name"
 msgstr "名称"
 
 #: common/dialogs/dialog_configure_paths_base.cpp:40
-#: common/dialogs/dialog_configure_paths_base.cpp:93 eeschema/sch_sheet.cpp:722
+#: common/dialogs/dialog_configure_paths_base.cpp:93 eeschema/sch_sheet.cpp:718
 #: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:41
 msgid "Path"
 msgstr "路径"
@@ -2000,7 +2120,8 @@ msgstr "选择文件"
 msgid "Configure Global Library Table"
 msgstr "配置全局库表"
 
-#: common/dialogs/dialog_grid_settings_base.cpp:26 common/tool/actions.cpp:428
+#: common/dialogs/dialog_grid_settings_base.cpp:26 common/tool/actions.cpp:436
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:23
 msgid "Grid Origin"
 msgstr "网格原点"
 
@@ -2011,12 +2132,12 @@ msgstr "网格原点"
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:184
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:234
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:300
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:692
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:714
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:684
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:706
 #: pcbnew/dialogs/panel_display_options_base.cpp:28
 #: pcbnew/dialogs/panel_display_options_base.cpp:97
 #: pcbnew/dialogs/panel_edit_options_base.cpp:80
-#: pcbnew/dialogs/panel_edit_options_base.cpp:198
+#: pcbnew/dialogs/panel_edit_options_base.cpp:204
 msgid "a page"
 msgstr "图框"
 
@@ -2053,7 +2174,7 @@ msgstr "(快捷键)"
 msgid "Grid 2:"
 msgstr "网格 2："
 
-#: common/dialogs/dialog_grid_settings_base.cpp:173 common/tool/actions.cpp:434
+#: common/dialogs/dialog_grid_settings_base.cpp:173 common/tool/actions.cpp:442
 msgid "Reset Grid Origin"
 msgstr "复位网格原点"
 
@@ -2242,10 +2363,10 @@ msgstr "虚拟文本"
 
 #: common/dialogs/dialog_page_settings_base.cpp:45
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:180
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:103
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:115
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:266
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:100
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:104
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:291
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:126
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:179
 msgid "Orientation:"
 msgstr "方向："
@@ -2266,7 +2387,7 @@ msgstr "自定义图框高度。"
 
 #: common/dialogs/dialog_page_settings_base.cpp:84
 #: common/dialogs/dialog_page_settings_base.cpp:105
-#: eeschema/dialogs/dialog_edit_line_style_base.cpp:37
+#: eeschema/dialogs/dialog_edit_line_style_base.cpp:38
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:167
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:289
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:102
@@ -2276,12 +2397,12 @@ msgstr "自定义图框高度。"
 #: pcbnew/dialogs/dialog_drc_base.cpp:72
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:121
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:132
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:327
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:340
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:353
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:231
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:244
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:257
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:352
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:365
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:378
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:256
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:269
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:282
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:141
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:175
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:192
@@ -2295,19 +2416,19 @@ msgstr "自定义图框高度。"
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:118
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:129
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:163
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1053
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1064
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1079
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1090
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1105
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1116
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1131
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1142
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1156
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1179
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1244
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1255
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1420
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1072
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1083
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1098
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1109
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1124
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1135
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1150
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1161
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1175
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1198
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1263
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1274
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1439
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:76
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:105
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:116
@@ -2327,7 +2448,7 @@ msgid "unit"
 msgstr "单位"
 
 #: common/dialogs/dialog_page_settings_base.cpp:88
-#: eeschema/dialogs/dialog_edit_line_style_base.cpp:30
+#: eeschema/dialogs/dialog_edit_line_style_base.cpp:31
 #: pcbnew/dialogs/dialog_board_statistics.cpp:94
 #: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:25
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:124
@@ -2382,7 +2503,7 @@ msgid "Revision:"
 msgstr "修订："
 
 #: common/dialogs/dialog_page_settings_base.cpp:200
-#: eeschema/dialogs/dialog_netlist.cpp:360
+#: eeschema/dialogs/dialog_netlist.cpp:432
 msgid "Title:"
 msgstr "标题："
 
@@ -2434,31 +2555,33 @@ msgstr "图框描述文件"
 msgid "Browse..."
 msgstr "浏览..."
 
-#: common/dialogs/dialog_print_generic.cpp:40
-#: common/dialogs/dialog_print_generic.cpp:244
+#: common/dialogs/dialog_print_generic.cpp:42
+#: common/dialogs/dialog_print_generic.cpp:246
 #: common/dialogs/dialog_print_generic_base.h:78 common/tool/actions.cpp:101
 #: eeschema/dialogs/dialog_print_using_printer.cpp:146
-#: eeschema/dialogs/dialog_print_using_printer_base.h:63
-#: kicad/tree_project_frame.cpp:788
+#: eeschema/dialogs/dialog_print_using_printer_base.h:61
+#: kicad/tree_project_frame.cpp:795
 msgid "Print"
 msgstr "打印"
 
-#: common/dialogs/dialog_print_generic.cpp:41
-#: common/dialogs/dialog_print_generic.cpp:194
+#: common/dialogs/dialog_print_generic.cpp:43
+#: common/dialogs/dialog_print_generic.cpp:196
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: common/dialogs/dialog_print_generic.cpp:42
+#: common/dialogs/dialog_print_generic.cpp:44
 #: eeschema/dialogs/dialog_annotate.cpp:102 eeschema/dialogs/dialog_bom.cpp:239
-#: eeschema/dialogs/dialog_erc.cpp:78 eeschema/dialogs/dialog_netlist.cpp:299
+#: eeschema/dialogs/dialog_change_symbols.cpp:112
+#: eeschema/dialogs/dialog_erc.cpp:78 eeschema/dialogs/dialog_netlist.cpp:312
 #: eeschema/dialogs/dialog_plot_schematic.cpp:58
 #: eeschema/dialogs/dialog_print_using_printer.cpp:148
 #: eeschema/dialogs/dialog_schematic_find_base.cpp:130
 #: eeschema/dialogs/dialog_symbol_remap_base.cpp:33
 #: eeschema/dialogs/dialog_update_from_pcb.cpp:66
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:119
 #: pcbnew/dialogs/dialog_board_statistics.cpp:126
 #: pcbnew/dialogs/dialog_drc.cpp:77
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:152
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:154
 #: pcbnew/dialogs/dialog_export_step.cpp:129
 #: pcbnew/dialogs/dialog_export_svg.cpp:94
 #: pcbnew/dialogs/dialog_gendrill.cpp:76 pcbnew/dialogs/dialog_netlist.cpp:93
@@ -2467,11 +2590,11 @@ msgstr "打印预览"
 msgid "Close"
 msgstr "关闭"
 
-#: common/dialogs/dialog_print_generic.cpp:103
+#: common/dialogs/dialog_print_generic.cpp:105
 msgid "Warning: Bad scale number"
 msgstr "警告：缩放编号错误"
 
-#: common/dialogs/dialog_print_generic.cpp:112
+#: common/dialogs/dialog_print_generic.cpp:114
 #, c-format
 msgid ""
 "Warning: Scale option set to a very large value.\n"
@@ -2480,7 +2603,7 @@ msgstr ""
 "警告：缩放选项设置为非常大的值。\n"
 " 固定到 %f"
 
-#: common/dialogs/dialog_print_generic.cpp:120
+#: common/dialogs/dialog_print_generic.cpp:122
 #, c-format
 msgid ""
 "Warning: Scale option set to a very small value.\n"
@@ -2489,21 +2612,21 @@ msgstr ""
 "警告：缩放选项设置为一个很小的值。\n"
 " 固定到 %f"
 
-#: common/dialogs/dialog_print_generic.cpp:189
-#: common/dialogs/dialog_print_generic.cpp:236
+#: common/dialogs/dialog_print_generic.cpp:191
+#: common/dialogs/dialog_print_generic.cpp:238
 msgid "Nothing to print"
 msgstr "没有打印"
 
-#: common/dialogs/dialog_print_generic.cpp:227
-#: eeschema/dialogs/dialog_print_using_printer.cpp:317
+#: common/dialogs/dialog_print_generic.cpp:229
+#: eeschema/dialogs/dialog_print_using_printer.cpp:315
 msgid "Previous print job not yet complete."
 msgstr "上一个打印作业尚未完成。"
 
-#: common/dialogs/dialog_print_generic.cpp:251
+#: common/dialogs/dialog_print_generic.cpp:253
 msgid "There was a problem printing."
 msgstr "打印发生问题。"
 
-#: common/dialogs/dialog_print_generic.cpp:298
+#: common/dialogs/dialog_print_generic.cpp:300
 msgid "An error occurred initializing the printer information."
 msgstr "打印机初始化时发生错误。"
 
@@ -2511,19 +2634,21 @@ msgstr "打印机初始化时发生错误。"
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:50
 #: eeschema/dialogs/dialog_update_fields_base.cpp:47
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:25
-#: include/lib_table_grid.h:188 pcbnew/dialogs/dialog_export_svg_base.cpp:80
+#: include/lib_table_grid.h:188
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:197
+#: pcbnew/dialogs/dialog_export_svg_base.cpp:80
 #: pcbnew/dialogs/dialog_netlist_base.cpp:52
 #: pcbnew/dialogs/dialog_push_pad_properties_base.cpp:23
 #: pcbnew/dialogs/dialog_update_pcb_base.cpp:25
 msgid "Options"
 msgstr "选项"
 
-#: common/dialogs/dialog_print_generic_base.cpp:30
+#: common/dialogs/dialog_print_generic_base.cpp:31
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:74
 msgid "Output mode:"
 msgstr "输出模式："
 
-#: common/dialogs/dialog_print_generic_base.cpp:34
+#: common/dialogs/dialog_print_generic_base.cpp:35
 #: common/dialogs/panel_setup_netclasses_base.cpp:51
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:78
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:95
@@ -2531,48 +2656,48 @@ msgstr "输出模式："
 msgid "Color"
 msgstr "彩色"
 
-#: common/dialogs/dialog_print_generic_base.cpp:34
+#: common/dialogs/dialog_print_generic_base.cpp:35
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:101
 msgid "Black and white"
 msgstr "黑白"
 
-#: common/dialogs/dialog_print_generic_base.cpp:40
+#: common/dialogs/dialog_print_generic_base.cpp:41
 msgid "Print border and title block"
 msgstr "打印边框和标题栏"
 
-#: common/dialogs/dialog_print_generic_base.cpp:42
+#: common/dialogs/dialog_print_generic_base.cpp:43
 msgid "Print Frame references."
 msgstr "打印图框参考。"
 
-#: common/dialogs/dialog_print_generic_base.cpp:57
+#: common/dialogs/dialog_print_generic_base.cpp:58
 #: pcbnew/dialogs/dialog_plot_base.cpp:129
 msgid "1:1"
 msgstr "1:1"
 
-#: common/dialogs/dialog_print_generic_base.cpp:60
+#: common/dialogs/dialog_print_generic_base.cpp:64
 msgid "Fit to page"
 msgstr "适合图框"
 
-#: common/dialogs/dialog_print_generic_base.cpp:66
+#: common/dialogs/dialog_print_generic_base.cpp:70
 msgid "Custom:"
 msgstr "自定义："
 
-#: common/dialogs/dialog_print_generic_base.cpp:70
+#: common/dialogs/dialog_print_generic_base.cpp:74
 msgid "Set X scale adjust for exact scale plotting"
 msgstr "设置 X 方向调整比例使输出更精确"
 
-#: common/dialogs/dialog_print_generic_base.cpp:92
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:67
+#: common/dialogs/dialog_print_generic_base.cpp:96
+#: eeschema/dialogs/dialog_print_using_printer_base.cpp:62
 msgid "Page Setup..."
 msgstr "图框设置..."
 
 #: common/dialogs/dialog_text_entry_base.cpp:22
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1447
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1466
 msgid "MyLabel"
 msgstr "我的标签"
 
 #: common/dialogs/eda_list_dialog.cpp:48 common/widgets/lib_tree.cpp:118
-#: pcbnew/footprint_viewer_frame.cpp:141 pcbnew/footprint_viewer_frame.cpp:156
+#: pcbnew/footprint_viewer_frame.cpp:142 pcbnew/footprint_viewer_frame.cpp:157
 msgid "Filter"
 msgstr "筛选"
 
@@ -2580,6 +2705,11 @@ msgstr "筛选"
 msgid "Items:"
 msgstr "项目："
 
+#: common/dialogs/eda_view_switcher_base.cpp:19
+#: common/dialogs/eda_view_switcher_base.h:40
+msgid "View Preset Switcher"
+msgstr "视图预设切换器"
+
 #: common/dialogs/panel_color_settings.cpp:49
 msgid "Reveal Themes in Finder"
 msgstr "在筛选器中显示主题"
@@ -2674,11 +2804,11 @@ msgstr ""
 "\n"
 "在某些平台上，自动值不正确，应手动设置。"
 
-#: common/dialogs/panel_common_settings.cpp:267
+#: common/dialogs/panel_common_settings.cpp:274
 msgid "Executable files ("
 msgstr "可执行文件 ("
 
-#: common/dialogs/panel_common_settings.cpp:272
+#: common/dialogs/panel_common_settings.cpp:279
 msgid "Select Preferred PDF Browser"
 msgstr "选择默认 PDF 浏览器"
 
@@ -2695,7 +2825,7 @@ msgstr ""
 "如果设置为 0，则禁用自动备份"
 
 #: common/dialogs/panel_common_settings_base.cpp:39
-#: common/dialogs/panel_common_settings_base.cpp:239
+#: common/dialogs/panel_common_settings_base.cpp:258
 msgid "minutes"
 msgstr "分钟"
 
@@ -2703,174 +2833,205 @@ msgstr "分钟"
 msgid "File history size:"
 msgstr "历史文件大小："
 
-#: common/dialogs/panel_common_settings_base.cpp:54
-msgid "Accelerated graphics:"
-msgstr "加速图形："
+#: common/dialogs/panel_common_settings_base.cpp:57
+msgid ""
+"3D cache files older than this are deleted.\n"
+"If set to 0, cache clearing is disabled"
+msgstr ""
+"将删除大于此版本的 3D 缓存文件。\n"
+"如果设置为 0，则禁用缓存清除"
+
+#: common/dialogs/panel_common_settings_base.cpp:61
+msgid "Days"
+msgstr "天"
 
-#: common/dialogs/panel_common_settings_base.cpp:58
 #: common/dialogs/panel_common_settings_base.cpp:69
+msgid "Accelerated graphics:"
+msgstr "硬件加速图形："
+
+#: common/dialogs/panel_common_settings_base.cpp:73
+#: common/dialogs/panel_common_settings_base.cpp:84
 msgid "No Antialiasing"
 msgstr "无抗锯齿"
 
-#: common/dialogs/panel_common_settings_base.cpp:58
+#: common/dialogs/panel_common_settings_base.cpp:73
 msgid "Subpixel Antialiasing (High Quality)"
 msgstr "亚像素抗锯齿（高品质）"
 
-#: common/dialogs/panel_common_settings_base.cpp:58
+#: common/dialogs/panel_common_settings_base.cpp:73
 msgid "Subpixel Antialiasing (Ultra Quality)"
 msgstr "亚像素抗锯齿（超高品质）"
 
-#: common/dialogs/panel_common_settings_base.cpp:58
+#: common/dialogs/panel_common_settings_base.cpp:73
 msgid "Supersampling (2x)"
 msgstr "超级采样 (2x)"
 
-#: common/dialogs/panel_common_settings_base.cpp:58
+#: common/dialogs/panel_common_settings_base.cpp:73
 msgid "Supersampling (4x)"
 msgstr "超级采样 (4x)"
 
-#: common/dialogs/panel_common_settings_base.cpp:65
+#: common/dialogs/panel_common_settings_base.cpp:80
 msgid "Fallback graphics:"
-msgstr "回退图形："
+msgstr "软件加速图形："
 
-#: common/dialogs/panel_common_settings_base.cpp:69
+#: common/dialogs/panel_common_settings_base.cpp:84
 msgid "Fast Antialiasing"
 msgstr "快速抗锯齿"
 
-#: common/dialogs/panel_common_settings_base.cpp:69
+#: common/dialogs/panel_common_settings_base.cpp:84
 msgid "Balanced Antialiasing"
 msgstr "均衡抗锯齿"
 
-#: common/dialogs/panel_common_settings_base.cpp:69
+#: common/dialogs/panel_common_settings_base.cpp:84
 msgid "High Quality Antialiasing"
 msgstr "高品质抗锯齿"
 
-#: common/dialogs/panel_common_settings_base.cpp:81
+#: common/dialogs/panel_common_settings_base.cpp:90
+msgid "3D cache file duration:"
+msgstr "3D 缓存文件持续时间："
+
+#: common/dialogs/panel_common_settings_base.cpp:100
 msgid "Helper Applications"
 msgstr "应用程序助手"
 
-#: common/dialogs/panel_common_settings_base.cpp:90
+#: common/dialogs/panel_common_settings_base.cpp:109
 msgid "Text editor:"
 msgstr "文本编辑器："
 
-#: common/dialogs/panel_common_settings_base.cpp:102
+#: common/dialogs/panel_common_settings_base.cpp:121
 msgid "System default PDF viewer"
 msgstr "系统默认 PDF 浏览器"
 
-#: common/dialogs/panel_common_settings_base.cpp:105
+#: common/dialogs/panel_common_settings_base.cpp:124
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:175
 msgid "Other:"
 msgstr "其它："
 
-#: common/dialogs/panel_common_settings_base.cpp:125
+#: common/dialogs/panel_common_settings_base.cpp:144
 msgid "User Interface"
 msgstr "用户界面"
 
-#: common/dialogs/panel_common_settings_base.cpp:133
+#: common/dialogs/panel_common_settings_base.cpp:152
 msgid "Icon scale:"
 msgstr "图标缩放："
 
-#: common/dialogs/panel_common_settings_base.cpp:142
-#: common/dialogs/panel_common_settings_base.cpp:153
+#: common/dialogs/panel_common_settings_base.cpp:161
+#: common/dialogs/panel_common_settings_base.cpp:172
 #: common/dialogs/panel_mouse_settings_base.cpp:56
 msgid "Automatic"
 msgstr "自动"
 
-#: common/dialogs/panel_common_settings_base.cpp:145
+#: common/dialogs/panel_common_settings_base.cpp:164
 msgid "Canvas scale:"
 msgstr "画布缩放："
 
-#: common/dialogs/panel_common_settings_base.cpp:162
+#: common/dialogs/panel_common_settings_base.cpp:181
 msgid "Show icons in menus"
 msgstr "在菜单中显示图标"
 
-#: common/dialogs/panel_common_settings_base.cpp:178
+#: common/dialogs/panel_common_settings_base.cpp:197
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:41
 msgid "Editing"
 msgstr "编辑"
 
-#: common/dialogs/panel_common_settings_base.cpp:180
+#: common/dialogs/panel_common_settings_base.cpp:199
 msgid "Prefer selection to dragging"
 msgstr "优先选择拖动"
 
-#: common/dialogs/panel_common_settings_base.cpp:183
+#: common/dialogs/panel_common_settings_base.cpp:202
 msgid "Warp mouse to origin of moved object"
 msgstr "将鼠标扭曲到移动对象的原点"
 
-#: common/dialogs/panel_common_settings_base.cpp:186
+#: common/dialogs/panel_common_settings_base.cpp:205
 msgid "First hotkey selects tool"
 msgstr "第一个热键选择工具"
 
-#: common/dialogs/panel_common_settings_base.cpp:187
+#: common/dialogs/panel_common_settings_base.cpp:206
 msgid ""
 "If not checked, hotkeys will immediately perform an action even if the "
 "relevant tool was not previously selected."
 msgstr "如果未选中，热键将立即执行操作，即使之前未选择相关工具也是如此。"
 
-#: common/dialogs/panel_common_settings_base.cpp:195
+#: common/dialogs/panel_common_settings_base.cpp:214
 msgid "Project Backup"
 msgstr "工程备份"
 
-#: common/dialogs/panel_common_settings_base.cpp:202
+#: common/dialogs/panel_common_settings_base.cpp:221
 msgid "Automatically backup projects"
 msgstr "自动备份工程"
 
-#: common/dialogs/panel_common_settings_base.cpp:203
+#: common/dialogs/panel_common_settings_base.cpp:222
 msgid ""
 "Automatically create backup archives of the current project when saving files"
 msgstr "保存文件时自动创建当前项目的备份压缩"
 
-#: common/dialogs/panel_common_settings_base.cpp:207
+#: common/dialogs/panel_common_settings_base.cpp:226
 msgid "Create backups when auto save occurs"
 msgstr "在进行自动保存时创建备份"
 
-#: common/dialogs/panel_common_settings_base.cpp:208
+#: common/dialogs/panel_common_settings_base.cpp:227
 msgid ""
 "Create backups when the auto save feature is enabled.  If not checked, "
 "backups will only be created when you manually save a file."
 msgstr ""
 "启用自动保存功能后创建备份。 如果未选中，则仅在手动保存文件时创建备份。"
 
-#: common/dialogs/panel_common_settings_base.cpp:212
+#: common/dialogs/panel_common_settings_base.cpp:231
 msgid "Maximum backups to keep:"
 msgstr "保留的最大备份数："
 
-#: common/dialogs/panel_common_settings_base.cpp:214
+#: common/dialogs/panel_common_settings_base.cpp:233
 msgid "How many backup files total to keep (set to 0 for no limit)"
 msgstr "总共要保留多少个备份文件(设置为 0 表示没有限制)"
 
-#: common/dialogs/panel_common_settings_base.cpp:221
+#: common/dialogs/panel_common_settings_base.cpp:240
 msgid "Maximum backups per day:"
 msgstr "每天最大备份数："
 
-#: common/dialogs/panel_common_settings_base.cpp:223
+#: common/dialogs/panel_common_settings_base.cpp:242
 msgid "How many backup files to keep each day (set to 0 for no limit)"
 msgstr "每天要保留多少个备份文件(设置为 0 表示没有限制)"
 
-#: common/dialogs/panel_common_settings_base.cpp:230
+#: common/dialogs/panel_common_settings_base.cpp:249
 msgid "Minimum time between backups:"
 msgstr "备份之间的最短时间："
 
-#: common/dialogs/panel_common_settings_base.cpp:232
+#: common/dialogs/panel_common_settings_base.cpp:251
 msgid ""
 "Number of minutes since the last backup before another will be created the "
 "next time you save (set to 0 for no minimum)"
 msgstr ""
 "自上次备份后的分钟数，下次保存时将创建另一个备份(设置为 0 表示无最小值)"
 
-#: common/dialogs/panel_common_settings_base.cpp:243
+#: common/dialogs/panel_common_settings_base.cpp:262
 msgid "Maximum total backup size:"
 msgstr "最大总备份大小："
 
-#: common/dialogs/panel_common_settings_base.cpp:245
+#: common/dialogs/panel_common_settings_base.cpp:264
 msgid ""
 "If the total size of backup files grows above this limit, old backups will "
 "be deleted (set to 0 for no limit)"
 msgstr "如果备份文件的总大小超过此限制，旧备份将被删除(设置为 0 表示没有限制)"
 
-#: common/dialogs/panel_common_settings_base.cpp:252
+#: common/dialogs/panel_common_settings_base.cpp:271
 msgid "MB"
 msgstr "MB"
 
+#: common/dialogs/panel_common_settings_base.cpp:282
+msgid "Session"
+msgstr "会话"
+
+#: common/dialogs/panel_common_settings_base.cpp:284
+msgid "Remember open files for next project launch"
+msgstr "记住下次启动工程时打开的文件"
+
+#: common/dialogs/panel_common_settings_base.cpp:286
+msgid ""
+"If checked, launching a project will also launch tools such as eeschema and "
+"pcbnew with previously open files"
+msgstr ""
+"如果选中，启动工程还将启动包含以前打开的文件的工具，如 eesschema 和 pcbnew"
+
 #: common/dialogs/panel_hotkeys_editor.cpp:72
 msgid "Type filter text"
 msgstr "筛选器文本框"
@@ -2970,14 +3131,14 @@ msgstr "缩放"
 #: common/dialogs/panel_mouse_settings_base.cpp:139
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:164
 #: pcbnew/board_stackup_manager/stackup_predefined_prms.cpp:56
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:136
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:199
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:395
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:299
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:177
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:506
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:733
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:157
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:420
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:324
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:79
+#: pcbnew/dialogs/dialog_pad_properties.cpp:926
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:725
 #: pcbnew/dialogs/dialog_plot_base.cpp:119
 msgid "None"
 msgstr "无"
@@ -3031,57 +3192,54 @@ msgid ""
 "Pan the canvas left and right when scrolling left to right on the touchpad"
 msgstr "在触摸板上从左到右滚动时，将画布向左和向右平移"
 
-#: common/dialogs/panel_setup_netclasses.cpp:70
-msgid "<unassigned>"
-msgstr "<未分配>"
-
-#: common/dialogs/panel_setup_netclasses.cpp:83
-#: eeschema/dialogs/dialog_edit_line_style.cpp:48
+#: common/dialogs/panel_setup_netclasses.cpp:82
+#: eeschema/dialogs/dialog_edit_line_style.cpp:46
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
-#: pcbnew/class_zone.cpp:664 pcbnew/dialogs/dialog_copper_zones_base.cpp:199
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:395
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:299
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:733
+#: pcbnew/class_zone.cpp:669 pcbnew/dialogs/dialog_copper_zones_base.cpp:233
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:420
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:324
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:725
 msgid "Solid"
 msgstr "实心"
 
-#: common/dialogs/panel_setup_netclasses.cpp:85
-#: eeschema/dialogs/dialog_edit_line_style.cpp:49
+#: common/dialogs/panel_setup_netclasses.cpp:84
+#: eeschema/dialogs/dialog_edit_line_style.cpp:47
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
 msgid "Dashed"
 msgstr "虚线"
 
-#: common/dialogs/panel_setup_netclasses.cpp:87
-#: eeschema/dialogs/dialog_edit_line_style.cpp:50
+#: common/dialogs/panel_setup_netclasses.cpp:86
+#: eeschema/dialogs/dialog_edit_line_style.cpp:48
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
 msgid "Dotted"
 msgstr "点线"
 
-#: common/dialogs/panel_setup_netclasses.cpp:89
-#: eeschema/dialogs/dialog_edit_line_style.cpp:51
+#: common/dialogs/panel_setup_netclasses.cpp:88
+#: eeschema/dialogs/dialog_edit_line_style.cpp:49
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
 msgid "Dash-Dot"
 msgstr "点划线"
 
-#: common/dialogs/panel_setup_netclasses.cpp:397
+#: common/dialogs/panel_setup_netclasses.cpp:394
 msgid "Netclass must have a name."
 msgstr "网络类必须要有一个名称。"
 
-#: common/dialogs/panel_setup_netclasses.cpp:406
+#: common/dialogs/panel_setup_netclasses.cpp:403
 msgid "Netclass name already in use."
 msgstr "网络类名称已经在使用。"
 
-#: common/dialogs/panel_setup_netclasses.cpp:477
+#: common/dialogs/panel_setup_netclasses.cpp:474
 msgid "The default net class is required."
 msgstr "默认的网络类是必需的。"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:24
-#: eeschema/dialogs/dialog_schematic_setup.cpp:74
-#: pcbnew/dialogs/dialog_board_setup.cpp:87
+#: eeschema/dialogs/dialog_schematic_setup.cpp:75
+#: pcbnew/dialogs/dialog_board_setup.cpp:88
+#: pcbnew/widgets/appearance_controls.cpp:419
 msgid "Net Classes"
 msgstr "网络类表"
 
-#: common/dialogs/panel_setup_netclasses_base.cpp:41 pcbnew/class_zone.cpp:1358
+#: common/dialogs/panel_setup_netclasses_base.cpp:41 pcbnew/class_zone.cpp:1373
 msgid "Clearance"
 msgstr "间隙"
 
@@ -3129,16 +3287,17 @@ msgid "Bus Thickness"
 msgstr "总线宽"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:52
-#: eeschema/dialogs/dialog_edit_line_style_base.h:72 eeschema/sch_line.cpp:787
+#: eeschema/dialogs/dialog_edit_line_style_base.h:65 eeschema/sch_line.cpp:793
 msgid "Line Style"
 msgstr "线型"
 
-#: common/dialogs/panel_setup_netclasses_base.cpp:58 common/pgm_base.cpp:76
-#: common/widgets/footprint_select_widget.cpp:226
+#: common/dialogs/panel_setup_netclasses_base.cpp:58 common/pgm_base.cpp:73
+#: common/widgets/footprint_select_widget.cpp:229
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:195
-#: eeschema/dialogs/dialog_edit_line_style.cpp:62
-#: eeschema/dialogs/dialog_junction_props.cpp:52
-#: eeschema/tools/sch_editor_control.cpp:941
+#: eeschema/dialogs/dialog_edit_line_style.cpp:53
+#: eeschema/dialogs/dialog_edit_line_style.cpp:64
+#: eeschema/dialogs/dialog_junction_props.cpp:38
+#: eeschema/tools/sch_editor_control.cpp:933
 msgid "Default"
 msgstr "默认"
 
@@ -3191,8 +3350,8 @@ msgid "Assign To Selected Nets"
 msgstr "分配给选择的网络"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:207
-#: pcbnew/board_connected_item.cpp:225 pcbnew/class_pad.cpp:749
-#: pcbnew/class_track.cpp:726 pcbnew/class_zone.cpp:632
+#: pcbnew/board_connected_item.cpp:215 pcbnew/class_pad.cpp:800
+#: pcbnew/class_track.cpp:797 pcbnew/class_zone.cpp:637
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:33
 #: pcbnew/dialogs/dialog_select_net_from_list.cpp:54
 msgid "Net"
@@ -3203,11 +3362,11 @@ msgid "Net Class"
 msgstr "网络类"
 
 #: common/dialogs/panel_setup_severities.cpp:39
-#: common/dialogs/panel_setup_severities.cpp:89
+#: common/dialogs/panel_setup_severities.cpp:92
 msgid "Ignore"
 msgstr "忽略"
 
-#: common/dialogs/panel_setup_severities.cpp:89
+#: common/dialogs/panel_setup_severities.cpp:92
 msgid "From Pin Conflicts Map"
 msgstr "从引脚冲突映射"
 
@@ -3224,32 +3383,32 @@ msgstr "变量名"
 msgid "Text Substitution"
 msgstr "文本替换"
 
-#: common/dialogs/wx_html_report_panel.cpp:177
-#: common/dialogs/wx_html_report_panel.cpp:202 common/rc_item.cpp:295
+#: common/dialogs/wx_html_report_panel.cpp:179
+#: common/dialogs/wx_html_report_panel.cpp:204 common/rc_item.cpp:295
 msgid "Error: "
 msgstr "错误： "
 
-#: common/dialogs/wx_html_report_panel.cpp:181
-#: common/dialogs/wx_html_report_panel.cpp:204 common/rc_item.cpp:296
+#: common/dialogs/wx_html_report_panel.cpp:183
+#: common/dialogs/wx_html_report_panel.cpp:206 common/rc_item.cpp:296
 msgid "Warning: "
 msgstr "警告： "
 
-#: common/dialogs/wx_html_report_panel.cpp:184
-#: common/dialogs/wx_html_report_panel.cpp:206
+#: common/dialogs/wx_html_report_panel.cpp:186
+#: common/dialogs/wx_html_report_panel.cpp:208
 msgid "Info: "
 msgstr "信息： "
 
-#: common/dialogs/wx_html_report_panel.cpp:315
-#: eeschema/dialogs/dialog_erc.cpp:593 pcbnew/dialogs/dialog_drc.cpp:448
+#: common/dialogs/wx_html_report_panel.cpp:322
+#: eeschema/dialogs/dialog_erc.cpp:532 pcbnew/dialogs/dialog_drc.cpp:497
 msgid "Save Report to File"
 msgstr "保存报告到文件"
 
-#: common/dialogs/wx_html_report_panel.cpp:332
+#: common/dialogs/wx_html_report_panel.cpp:339
 #, c-format
 msgid "Cannot write report to file \"%s\"."
 msgstr "无法写入报告到文件 \"%s\"。"
 
-#: common/dialogs/wx_html_report_panel.cpp:334
+#: common/dialogs/wx_html_report_panel.cpp:341
 msgid "File save error"
 msgstr "文件保存错误"
 
@@ -3258,19 +3417,21 @@ msgid "Output Messages"
 msgstr "输出信息"
 
 #: common/dialogs/wx_html_report_panel_base.cpp:31
-#: eeschema/dialogs/dialog_erc_base.cpp:60
+#: eeschema/dialogs/dialog_erc_base.cpp:67
 #: pcbnew/dialogs/dialog_drc_base.cpp:167
 msgid "Show:"
 msgstr "显示："
 
 #: common/dialogs/wx_html_report_panel_base.cpp:35
-#: eeschema/dialogs/dialog_erc_base.cpp:64 eeschema/lib_item.cpp:59
+#: eeschema/dialogs/dialog_erc_base.cpp:71 eeschema/lib_item.cpp:59
+#: eeschema/sch_pin.cpp:144 pcbnew/dialogs/dialog_board_reannotate.cpp:82
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:170
 #: pcbnew/dialogs/dialog_drc_base.cpp:171
 msgid "All"
 msgstr "所有"
 
 #: common/dialogs/wx_html_report_panel_base.cpp:50
-#: eeschema/dialogs/dialog_erc_base.cpp:78
+#: eeschema/dialogs/dialog_erc_base.cpp:85
 #: pcbnew/dialogs/dialog_drc_base.cpp:185
 msgid "Warnings"
 msgstr "警告"
@@ -3284,12 +3445,12 @@ msgid "Infos"
 msgstr "相关信息"
 
 #: common/dialogs/wx_html_report_panel_base.cpp:70
-#: eeschema/dialogs/dialog_erc_base.cpp:95
+#: eeschema/dialogs/dialog_erc_base.cpp:102
 #: pcbnew/dialogs/dialog_drc_base.cpp:202
 msgid "Save..."
 msgstr "保存..."
 
-#: common/draw_panel_gal.cpp:235 common/draw_panel_gal.cpp:397
+#: common/draw_panel_gal.cpp:241 common/draw_panel_gal.cpp:403
 msgid "Could not use OpenGL, falling back to software rendering"
 msgstr "无法使用 OpenGL，回退到软件渲染"
 
@@ -3297,41 +3458,41 @@ msgstr "无法使用 OpenGL，回退到软件渲染"
 msgid "clipboard"
 msgstr "剪贴板"
 
-#: common/dsnlexer.cpp:356
+#: common/dsnlexer.cpp:329
 #, c-format
 msgid "Expecting %s"
 msgstr "预期 %s"
 
-#: common/dsnlexer.cpp:364
+#: common/dsnlexer.cpp:337
 #, c-format
 msgid "Expecting '%s'"
 msgstr "预期 '%s'"
 
-#: common/dsnlexer.cpp:372
+#: common/dsnlexer.cpp:345
 #, c-format
 msgid "Unexpected %s"
 msgstr "异常 %s"
 
-#: common/dsnlexer.cpp:380
+#: common/dsnlexer.cpp:353
 #, c-format
 msgid "%s is a duplicate"
 msgstr "%s 是重复的"
 
-#: common/dsnlexer.cpp:388
+#: common/dsnlexer.cpp:361
 #, c-format
 msgid "Unexpected '%s'"
 msgstr "异常 '%s'"
 
-#: common/dsnlexer.cpp:433
+#: common/dsnlexer.cpp:406
 #, c-format
 msgid "need a number for '%s'"
 msgstr "'%s' 需要一个数字"
 
-#: common/dsnlexer.cpp:705 common/dsnlexer.cpp:765
+#: common/dsnlexer.cpp:678 common/dsnlexer.cpp:738
 msgid "Un-terminated delimited string"
 msgstr "无结尾的分隔字符串"
 
-#: common/dsnlexer.cpp:727
+#: common/dsnlexer.cpp:700
 msgid "String delimiter must be a single character of ', \", or $"
 msgstr "字符串分割符号必须为 ' , \" , $ 之一的单字符"
 
@@ -3345,53 +3506,52 @@ msgstr "无效的大小 %lld: 太大"
 msgid "Invalid Arc with radius %f and angle %f"
 msgstr "半径为 %f 且角度为 %f 的无效圆弧"
 
-#: common/eda_base_frame.cpp:312
+#: common/eda_base_frame.cpp:419
 msgid "&About KiCad"
 msgstr "关于 KiCad (&A)"
 
-#: common/eda_base_frame.cpp:314
+#: common/eda_base_frame.cpp:421
 msgid "&Help"
 msgstr "帮助 (&H)"
 
-#: common/eda_base_frame.cpp:608
+#: common/eda_base_frame.cpp:742
 #, c-format
 msgid "File \"%s\" was not found."
 msgstr "没有找到文件 \"%s\"。"
 
-#: common/eda_base_frame.cpp:653
+#: common/eda_base_frame.cpp:787
 msgid "Preferences"
 msgstr "首选项"
 
-#: common/eda_base_frame.cpp:656 common/hotkey_store.cpp:65
+#: common/eda_base_frame.cpp:790 common/hotkey_store.cpp:65
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:20
 msgid "Common"
 msgstr "常规"
 
-#: common/eda_base_frame.cpp:658
+#: common/eda_base_frame.cpp:792
 msgid "Mouse and Touchpad"
 msgstr "鼠标和触摸板"
 
-#: common/eda_base_frame.cpp:661
+#: common/eda_base_frame.cpp:795
 msgid "Hotkeys"
 msgstr "快捷键"
 
-#: common/eda_base_frame.cpp:705
+#: common/eda_base_frame.cpp:839
 #, c-format
 msgid "You do not have write permissions to folder \"%s\"."
 msgstr "你没有 \"%s\" 文件夹的写入权限。"
 
-#: common/eda_base_frame.cpp:710
+#: common/eda_base_frame.cpp:844
 #, c-format
 msgid "You do not have write permissions to save file \"%s\" to folder \"%s\"."
 msgstr "你没有写入权限保存文件 \"%s\" 到文件夹 \"%s\"。"
 
-#: common/eda_base_frame.cpp:715
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1206
+#: common/eda_base_frame.cpp:849 pcbnew/plugins/altium/altium_pcb.cpp:1204
 #, c-format
 msgid "You do not have write permissions to save file \"%s\"."
 msgstr "你没有写入权限来保存文件 \"%s\"。"
 
-#: common/eda_base_frame.cpp:745
+#: common/eda_base_frame.cpp:879
 #, c-format
 msgid ""
 "Well this is potentially embarrassing!\n"
@@ -3405,7 +3565,7 @@ msgstr ""
 "\"%s\"\n"
 "后没有正确保存它, 你是否希望恢复上次保存的修改内容？"
 
-#: common/eda_base_frame.cpp:760
+#: common/eda_base_frame.cpp:894
 msgid "The auto save file could not be renamed to the board file name."
 msgstr "自动保存文件不能重命名为电路板文件名称。"
 
@@ -3425,7 +3585,7 @@ msgstr "文档文件 \"%s\" 的 MIME 类型未知"
 
 #: common/eda_draw_frame.cpp:129 common/eda_draw_frame.cpp:500
 #: gerbview/dialogs/panel_gerbview_settings_base.cpp:28
-#: pagelayout_editor/pl_editor_frame.cpp:152
+#: pagelayout_editor/pl_editor_frame.cpp:149
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:56
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:108
 #: pcbnew/dialogs/dialog_plot_base.cpp:331
@@ -3453,12 +3613,12 @@ msgstr "缩放 %.2f"
 #: gerbview/dialogs/panel_gerbview_settings_base.cpp:30
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:58
 #: pcbnew/dialogs/panel_edit_options_base.cpp:33
-#: pcbnew/footprint_wizard_frame.cpp:337
+#: pcbnew/footprint_wizard_frame.cpp:336
 msgid "Units"
 msgstr "单元"
 
-#: common/eda_draw_frame.cpp:873 eeschema/dialogs/panel_sym_lib_table.cpp:450
-#: pcbnew/footprint_libraries_utils.cpp:1116
+#: common/eda_draw_frame.cpp:873 eeschema/dialogs/panel_sym_lib_table.cpp:470
+#: pcbnew/footprint_libraries_utils.cpp:1131
 msgid "Select Library"
 msgstr "选择库"
 
@@ -3475,9 +3635,9 @@ msgid " Y:"
 msgstr " Y："
 
 #: common/eda_text.cpp:495 eeschema/dialogs/dialog_edit_label_base.cpp:124
-#: eeschema/libedit/symbedit.cpp:231 eeschema/sch_text.cpp:675
+#: eeschema/libedit/symbedit.cpp:231 eeschema/sch_text.cpp:646
 #: gerbview/gerber_file_image.cpp:353 gerbview/gerber_file_image.cpp:357
-#: gerbview/gerber_file_image.cpp:360 pcbnew/class_module.cpp:681
+#: gerbview/gerber_file_image.cpp:360
 #: pcbnew/microwave/microwave_polygon.cpp:132
 msgid "Normal"
 msgstr "正常"
@@ -3489,7 +3649,7 @@ msgstr "正常"
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:196
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:109
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:55
-#: eeschema/fields_grid_table.cpp:200 eeschema/sch_text.cpp:675
+#: eeschema/fields_grid_table.cpp:200 eeschema/sch_text.cpp:646
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:117
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:58
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:58
@@ -3509,7 +3669,7 @@ msgstr "斜体"
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:174
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:139
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:56
-#: eeschema/fields_grid_table.cpp:201 eeschema/sch_text.cpp:675
+#: eeschema/fields_grid_table.cpp:201 eeschema/sch_text.cpp:646
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:101
 msgid "Bold"
 msgstr "粗体"
@@ -3522,27 +3682,27 @@ msgstr "粗体+斜体"
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:184
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:224
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:149
-#: eeschema/fields_grid_table.cpp:156 eeschema/fields_grid_table.cpp:387
-#: eeschema/fields_grid_table.cpp:478 eeschema/lib_pin.cpp:121
+#: eeschema/fields_grid_table.cpp:156 eeschema/fields_grid_table.cpp:389
+#: eeschema/fields_grid_table.cpp:480 eeschema/pin_type.cpp:127
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:92
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:160
 msgid "Left"
 msgstr "向左"
 
-#: common/eda_text.cpp:640 common/eda_text.cpp:644 common/tool/actions.cpp:291
-#: common/widgets/mathplot.cpp:1760
+#: common/eda_text.cpp:640 common/eda_text.cpp:644 common/tool/actions.cpp:299
+#: common/widgets/mathplot.cpp:1725
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:224
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:246
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:149
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:179
 #: eeschema/fields_grid_table.cpp:149 eeschema/fields_grid_table.cpp:157
-#: eeschema/fields_grid_table.cpp:388 eeschema/fields_grid_table.cpp:398
-#: eeschema/fields_grid_table.cpp:480 eeschema/fields_grid_table.cpp:491
+#: eeschema/fields_grid_table.cpp:390 eeschema/fields_grid_table.cpp:400
+#: eeschema/fields_grid_table.cpp:482 eeschema/fields_grid_table.cpp:493
 #: gerbview/gerber_file_image.cpp:357 gerbview/gerber_file_image.cpp:360
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:92
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:108
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:165
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:172
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:175
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:183
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:117
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:160
 msgid "Center"
@@ -3552,8 +3712,8 @@ msgstr "居中"
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:184
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:224
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:149
-#: eeschema/fields_grid_table.cpp:158 eeschema/fields_grid_table.cpp:389
-#: eeschema/fields_grid_table.cpp:482 eeschema/lib_pin.cpp:120
+#: eeschema/fields_grid_table.cpp:158 eeschema/fields_grid_table.cpp:391
+#: eeschema/fields_grid_table.cpp:484 eeschema/pin_type.cpp:126
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:92
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:160
 msgid "Right"
@@ -3562,8 +3722,8 @@ msgstr "向右"
 #: common/eda_text.cpp:643
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:246
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:179
-#: eeschema/fields_grid_table.cpp:148 eeschema/fields_grid_table.cpp:397
-#: eeschema/fields_grid_table.cpp:489
+#: eeschema/fields_grid_table.cpp:148 eeschema/fields_grid_table.cpp:399
+#: eeschema/fields_grid_table.cpp:491
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:108
 msgid "Top"
 msgstr "上对齐"
@@ -3571,8 +3731,8 @@ msgstr "上对齐"
 #: common/eda_text.cpp:645
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:246
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:179
-#: eeschema/fields_grid_table.cpp:150 eeschema/fields_grid_table.cpp:399
-#: eeschema/fields_grid_table.cpp:493
+#: eeschema/fields_grid_table.cpp:150 eeschema/fields_grid_table.cpp:401
+#: eeschema/fields_grid_table.cpp:495
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:108
 msgid "Bottom"
 msgstr "下对齐"
@@ -3581,15 +3741,15 @@ msgstr "下对齐"
 #: eeschema/dialogs/panel_setup_formatting_base.cpp:43 eeschema/lib_text.h:59
 #: pagelayout_editor/dialogs/dialog_design_inspector_base.cpp:40
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:145
-#: pcbnew/class_text_mod.cpp:289 pcbnew/class_text_mod.cpp:296
+#: pcbnew/class_text_mod.cpp:285 pcbnew/class_text_mod.cpp:292
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:28
 msgid "Text"
 msgstr "文本"
 
 #: common/eda_text.cpp:651
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:86
-#: pcbnew/class_drawsegment.cpp:1233 pcbnew/class_pcb_text.cpp:133
-#: pcbnew/class_text_mod.cpp:322
+#: pcbnew/class_drawsegment.cpp:1268 pcbnew/class_pcb_text.cpp:129
+#: pcbnew/class_text_mod.cpp:318
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:57
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:57
 #: pcbnew/text_mod_grid_table.cpp:92
@@ -3603,18 +3763,18 @@ msgstr "镜像"
 
 #: common/eda_text.cpp:659 eeschema/dialogs/dialog_lib_edit_text_base.cpp:84
 #: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:44
-#: eeschema/lib_pin.cpp:1454
+#: eeschema/lib_pin.cpp:992 eeschema/sch_pin.cpp:167
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:130
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:118
 msgid "Visible"
 msgstr "可见"
 
 #: common/eda_text.cpp:661 eeschema/lib_field.cpp:437
-#: eeschema/sch_bitmap.cpp:203 pcbnew/class_drawsegment.cpp:470
-#: pcbnew/class_drawsegment.cpp:520 pcbnew/class_pad.cpp:790
-#: pcbnew/class_pcb_target.cpp:155 pcbnew/class_pcb_text.cpp:136
-#: pcbnew/class_text_mod.cpp:325 pcbnew/class_track.cpp:591
-#: pcbnew/class_track.cpp:1012 pcbnew/class_track.cpp:1031
+#: eeschema/sch_bitmap.cpp:203 pcbnew/class_drawsegment.cpp:501
+#: pcbnew/class_drawsegment.cpp:554 pcbnew/class_pad.cpp:841
+#: pcbnew/class_pcb_target.cpp:155 pcbnew/class_pcb_text.cpp:132
+#: pcbnew/class_text_mod.cpp:321 pcbnew/class_track.cpp:662
+#: pcbnew/class_track.cpp:1118 pcbnew/class_track.cpp:1137
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:55
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:55
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:43
@@ -3624,9 +3784,9 @@ msgid "Width"
 msgstr "宽度"
 
 #: common/eda_text.cpp:663 eeschema/lib_field.cpp:440
-#: eeschema/sch_bitmap.cpp:205 pcbnew/class_drawsegment.cpp:473
-#: pcbnew/class_pad.cpp:793 pcbnew/class_pcb_text.cpp:139
-#: pcbnew/class_text_mod.cpp:328
+#: eeschema/sch_bitmap.cpp:205 pcbnew/class_drawsegment.cpp:504
+#: pcbnew/class_pad.cpp:844 pcbnew/class_pcb_text.cpp:135
+#: pcbnew/class_text_mod.cpp:324
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:56
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:56
 #: pcbnew/text_mod_grid_table.cpp:91
@@ -3718,7 +3878,7 @@ msgstr ""
 "完整的错误文本：\n"
 "%s"
 
-#: common/filehistory.cpp:153
+#: common/filehistory.cpp:155
 msgid "No Files"
 msgstr "无文件"
 
@@ -3768,7 +3928,7 @@ msgstr "无法打开配置文件"
 msgid "Problems writing configuration file"
 msgstr "编写配置文件时出错"
 
-#: common/footprint_info.cpp:90 cvpcb/cvpcb_mainframe.cpp:762
+#: common/footprint_info.cpp:90 cvpcb/cvpcb_mainframe.cpp:808
 msgid "Load Error"
 msgstr "载入错误"
 
@@ -3776,19 +3936,19 @@ msgstr "载入错误"
 msgid "Errors were encountered loading footprints:"
 msgstr "加载封装时出现错误："
 
-#: common/fp_lib_table.cpp:200
+#: common/fp_lib_table.cpp:199
 #, c-format
 msgid ""
 "Duplicate library nickname \"%s\" found in footprint library table file line "
 "%d"
 msgstr "找到重复的库别名 \"%s\" ，在封装库表文件第 %d 行"
 
-#: common/fp_lib_table.cpp:292
+#: common/fp_lib_table.cpp:293
 #, c-format
 msgid "fp-lib-table files contain no library with nickname \"%s\""
 msgstr "fp-lib-table 文件不包含昵称为 \"%s\" 的库"
 
-#: common/fp_lib_table.cpp:481
+#: common/fp_lib_table.cpp:482
 #: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:110
 #: eeschema/symbol_lib_table.cpp:485
 #: pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp:110
@@ -3796,12 +3956,12 @@ msgstr "fp-lib-table 文件不包含昵称为 \"%s\" 的库"
 msgid "Cannot create global library table path \"%s\"."
 msgstr "无法创建全局库列表路径 \"%s\"。"
 
-#: common/gestfich.cpp:199
+#: common/gestfich.cpp:189
 #, c-format
 msgid "Command \"%s\" could not found"
 msgstr "没有找到命令 \"%s\""
 
-#: common/gestfich.cpp:242
+#: common/gestfich.cpp:232
 #, c-format
 msgid ""
 "Problem while running the PDF viewer\n"
@@ -3810,12 +3970,12 @@ msgstr ""
 "运行 PDF 浏览器出现问题\n"
 "命令是 \"%s\""
 
-#: common/gestfich.cpp:249
+#: common/gestfich.cpp:239
 #, c-format
 msgid "Unable to find a PDF viewer for \"%s\""
 msgstr "没有找到 PDF 浏览器 \"%s\""
 
-#: common/gestfich.cpp:343
+#: common/gestfich.cpp:333
 #, c-format
 msgid ""
 "Cannot print '%s'.\n"
@@ -3826,9 +3986,9 @@ msgstr ""
 "\n"
 "未知文件类型。"
 
-#: common/gestfich.cpp:372 eeschema/eeschema.cpp:339 eeschema/eeschema.cpp:371
+#: common/gestfich.cpp:362 eeschema/eeschema.cpp:339 eeschema/eeschema.cpp:371
 #: gerbview/gerbview.cpp:235 kicad/project_template.cpp:243
-#: pcbnew/pcbnew.cpp:467
+#: pcbnew/pcbnew.cpp:466
 #, c-format
 msgid "Cannot copy file \"%s\"."
 msgstr "无法复制文件 \"%s\"。"
@@ -3905,19 +4065,19 @@ msgstr "忽略其他快照"
 msgid "Project Manager"
 msgstr "工程管理"
 
-#: common/hotkey_store.cpp:67 eeschema/eeschema_config.cpp:224
-#: eeschema/menubar.cpp:126 eeschema/sch_edit_frame.cpp:988
-#: eeschema/sch_edit_frame.cpp:995
+#: common/hotkey_store.cpp:67 eeschema/eeschema_config.cpp:223
+#: eeschema/menubar.cpp:127 eeschema/sch_edit_frame.cpp:1100
+#: eeschema/sch_edit_frame.cpp:1107
 msgid "Eeschema"
 msgstr "Eeschema"
 
-#: common/hotkey_store.cpp:68 pcbnew/menubar_pcb_editor.cpp:204
-#: pcbnew/pcb_edit_frame.cpp:934 pcbnew/pcbnew_config.cpp:71
+#: common/hotkey_store.cpp:68 pcbnew/menubar_pcb_editor.cpp:197
+#: pcbnew/pcb_edit_frame.cpp:1156 pcbnew/pcbnew_config.cpp:62
 msgid "Pcbnew"
 msgstr "Pcbnew"
 
-#: common/hotkey_store.cpp:69 pagelayout_editor/menubar.cpp:84
-#: pagelayout_editor/pl_editor_frame.cpp:500
+#: common/hotkey_store.cpp:69 pagelayout_editor/menubar.cpp:86
+#: pagelayout_editor/pl_editor_frame.cpp:538
 msgid "Page Layout Editor"
 msgstr "图框编辑器"
 
@@ -3971,239 +4131,458 @@ msgstr "加载编辑器时出错"
 msgid "Set Language"
 msgstr "设置语言"
 
-#: common/layer_id.cpp:31 eeschema/sch_bus_entry.cpp:414
-#: eeschema/sch_line.cpp:775
+#: common/layer_id.cpp:29
+msgid "F.Cu"
+msgstr "顶层铜层"
+
+#: common/layer_id.cpp:30
+msgid "In1.Cu"
+msgstr "内层 1"
+
+#: common/layer_id.cpp:31
+msgid "In2.Cu"
+msgstr "内层 2"
+
+#: common/layer_id.cpp:32
+msgid "In3.Cu"
+msgstr "内层 3"
+
+#: common/layer_id.cpp:33
+msgid "In4.Cu"
+msgstr "内层 4"
+
+#: common/layer_id.cpp:34
+msgid "In5.Cu"
+msgstr "内层 5"
+
+#: common/layer_id.cpp:35
+msgid "In6.Cu"
+msgstr "内层 6"
+
+#: common/layer_id.cpp:36
+msgid "In7.Cu"
+msgstr "内层 7"
+
+#: common/layer_id.cpp:37
+msgid "In8.Cu"
+msgstr "内层 8"
+
+#: common/layer_id.cpp:38
+msgid "In9.Cu"
+msgstr "内层 9"
+
+#: common/layer_id.cpp:39
+msgid "In10.Cu"
+msgstr "内层 10"
+
+#: common/layer_id.cpp:40
+msgid "In11.Cu"
+msgstr "内层 11"
+
+#: common/layer_id.cpp:41
+msgid "In12.Cu"
+msgstr "内层 12"
+
+#: common/layer_id.cpp:42
+msgid "In13.Cu"
+msgstr "内层 13"
+
+#: common/layer_id.cpp:43
+msgid "In14.Cu"
+msgstr "内层 14"
+
+#: common/layer_id.cpp:44
+msgid "In15.Cu"
+msgstr "内层 15"
+
+#: common/layer_id.cpp:45
+msgid "In16.Cu"
+msgstr "内层 16"
+
+#: common/layer_id.cpp:46
+msgid "In17.Cu"
+msgstr "内层 17"
+
+#: common/layer_id.cpp:47
+msgid "In18.Cu"
+msgstr "内层 18"
+
+#: common/layer_id.cpp:48
+msgid "In19.Cu"
+msgstr "内层 19"
+
+#: common/layer_id.cpp:49
+msgid "In20.Cu"
+msgstr "内层 20"
+
+#: common/layer_id.cpp:50
+msgid "In21.Cu"
+msgstr "内层 21"
+
+#: common/layer_id.cpp:51
+msgid "In22.Cu"
+msgstr "内层 22"
+
+#: common/layer_id.cpp:52
+msgid "In23.Cu"
+msgstr "内层 23"
+
+#: common/layer_id.cpp:53
+msgid "In24.Cu"
+msgstr "内层 24"
+
+#: common/layer_id.cpp:54
+msgid "In25.Cu"
+msgstr "内层 25"
+
+#: common/layer_id.cpp:55
+msgid "In26.Cu"
+msgstr "内层 26"
+
+#: common/layer_id.cpp:56
+msgid "In27.Cu"
+msgstr "内层 27"
+
+#: common/layer_id.cpp:57
+msgid "In28.Cu"
+msgstr "内层 28"
+
+#: common/layer_id.cpp:58
+msgid "In29.Cu"
+msgstr "内层 29"
+
+#: common/layer_id.cpp:59
+msgid "In30.Cu"
+msgstr "内层 30"
+
+#: common/layer_id.cpp:60
+msgid "B.Cu"
+msgstr "底层铜层"
+
+#: common/layer_id.cpp:63
+msgid "B.Adhes"
+msgstr "底层胶粘层"
+
+#: common/layer_id.cpp:64
+msgid "F.Adhes"
+msgstr "顶层胶粘层"
+
+#: common/layer_id.cpp:65
+msgid "B.Paste"
+msgstr "底层锡膏层"
+
+#: common/layer_id.cpp:66
+msgid "F.Paste"
+msgstr "顶层锡膏层"
+
+#: common/layer_id.cpp:67
+msgid "B.SilkS"
+msgstr "底层丝印层"
+
+#: common/layer_id.cpp:68
+msgid "F.SilkS"
+msgstr "顶层丝印层"
+
+#: common/layer_id.cpp:69
+msgid "B.Mask"
+msgstr "底层阻焊层"
+
+#: common/layer_id.cpp:70
+msgid "F.Mask"
+msgstr "顶层阻焊层"
+
+#: common/layer_id.cpp:73
+msgid "Dwgs.User"
+msgstr "用户图纸层"
+
+#: common/layer_id.cpp:74
+msgid "Cmts.User"
+msgstr "用户注释层"
+
+#: common/layer_id.cpp:75
+msgid "Eco1.User"
+msgstr "用户自定义 1 层"
+
+#: common/layer_id.cpp:76
+msgid "Eco2.User"
+msgstr "用户自定义 2 层"
+
+#: common/layer_id.cpp:77
+msgid "Edge.Cuts"
+msgstr "电路板边框轮廓层"
+
+#: common/layer_id.cpp:78
+msgid "Margin"
+msgstr "电路板电气边界层"
+
+#: common/layer_id.cpp:81
+msgid "F.CrtYd"
+msgstr "顶层封装外框层"
+
+#: common/layer_id.cpp:82
+msgid "B.CrtYd"
+msgstr "底层封装外框层"
+
+#: common/layer_id.cpp:83
+msgid "F.Fab"
+msgstr "顶层制造层"
+
+#: common/layer_id.cpp:84
+msgid "B.Fab"
+msgstr "底层制造层"
+
+#: common/layer_id.cpp:87 pcbnew/pcb_parser.cpp:659
+msgid "Rescue"
+msgstr "恢复"
+
+#: common/layer_id.cpp:91 eeschema/sch_bus_entry.cpp:414
+#: eeschema/sch_line.cpp:781
 msgid "Wire"
 msgstr "连线"
 
-#: common/layer_id.cpp:34 eeschema/sch_bus_entry.cpp:415
-#: eeschema/sch_line.cpp:776
+#: common/layer_id.cpp:92 eeschema/sch_bus_entry.cpp:415
+#: eeschema/sch_line.cpp:782
 msgid "Bus"
 msgstr "总线"
 
-#: common/layer_id.cpp:37
+#: common/layer_id.cpp:93
 msgid "Bus Junction"
 msgstr "总线连接点"
 
-#: common/layer_id.cpp:43 eeschema/sch_text.cpp:655
+#: common/layer_id.cpp:95 eeschema/sch_text.cpp:626
 msgid "Label"
 msgstr "标签"
 
-#: common/layer_id.cpp:46
+#: common/layer_id.cpp:96
 msgid "Global label"
 msgstr "全局标签"
 
-#: common/layer_id.cpp:49
+#: common/layer_id.cpp:97
 msgid "Hierarchical label"
 msgstr "层次标签"
 
-#: common/layer_id.cpp:52
+#: common/layer_id.cpp:98
 msgid "Pin number"
 msgstr "引脚编号"
 
-#: common/layer_id.cpp:55
+#: common/layer_id.cpp:99
 msgid "Pin name"
 msgstr "引脚名称"
 
-#: common/layer_id.cpp:58
+#: common/layer_id.cpp:100
 msgid "Symbol reference"
 msgstr "符号引用"
 
-#: common/layer_id.cpp:61
+#: common/layer_id.cpp:101
 msgid "Symbol value"
 msgstr "符号值"
 
-#: common/layer_id.cpp:64
+#: common/layer_id.cpp:102
 msgid "Symbol fields"
 msgstr "符号字段"
 
-#: common/layer_id.cpp:67
+#: common/layer_id.cpp:103
 msgid "Symbol body outline"
 msgstr "符号主体轮廓"
 
-#: common/layer_id.cpp:70
+#: common/layer_id.cpp:104
 msgid "Symbol body fill"
 msgstr "符号主体填充"
 
-#: common/layer_id.cpp:73
+#: common/layer_id.cpp:105
 msgid "Notes"
 msgstr "注意"
 
-#: common/layer_id.cpp:76 pcbnew/dialogs/dialog_select_net_from_list.cpp:975
+#: common/layer_id.cpp:106 pcbnew/dialogs/dialog_select_net_from_list.cpp:977
 msgid "Net name"
 msgstr "网络名称"
 
-#: common/layer_id.cpp:82
+#: common/layer_id.cpp:108
 msgid "Sheet border"
 msgstr "图框边框"
 
-#: common/layer_id.cpp:85
+#: common/layer_id.cpp:109
 msgid "Sheet background"
 msgstr "图框背景"
 
-#: common/layer_id.cpp:88 eeschema/sch_sheet.cpp:56
+#: common/layer_id.cpp:110 eeschema/sch_sheet.cpp:55
 msgid "Sheet name"
 msgstr "图框名称"
 
-#: common/layer_id.cpp:91
+#: common/layer_id.cpp:111
 msgid "Sheet fields"
 msgstr "图框字段"
 
-#: common/layer_id.cpp:94
+#: common/layer_id.cpp:112
 msgid "Sheet file name"
 msgstr "图框文件名称"
 
-#: common/layer_id.cpp:97
+#: common/layer_id.cpp:113
 msgid "Sheet label"
 msgstr "图框标签"
 
-#: common/layer_id.cpp:100
+#: common/layer_id.cpp:114
 msgid "No connect symbol"
 msgstr "不连接符号"
 
-#: common/layer_id.cpp:103
+#: common/layer_id.cpp:115
 msgid "ERC warning"
 msgstr "ERC 警告"
 
-#: common/layer_id.cpp:106
+#: common/layer_id.cpp:116
 msgid "ERC error"
 msgstr "ERC 错误"
 
-#: common/layer_id.cpp:109 common/layer_id.cpp:207 common/tool/grid_menu.cpp:40
+#: common/layer_id.cpp:117 common/layer_id.cpp:152
+msgid "Helper items"
+msgstr "辅助项"
+
+#: common/layer_id.cpp:118 common/layer_id.cpp:153 common/tool/grid_menu.cpp:40
 #: gerbview/gerbview_layer_widget.cpp:105 pcbnew/pcb_layer_widget.cpp:79
+#: pcbnew/widgets/appearance_controls.cpp:306
 msgid "Grid"
 msgstr "网格"
 
-#: common/layer_id.cpp:112
+#: common/layer_id.cpp:119
 msgid "Axes"
 msgstr "轴"
 
-#: common/layer_id.cpp:115 common/layer_id.cpp:210
+#: common/layer_id.cpp:120 common/layer_id.cpp:155
 #: gerbview/gerbview_layer_widget.cpp:107 pcbnew/pcb_layer_widget.cpp:80
 msgid "Background"
 msgstr "背景"
 
-#: common/layer_id.cpp:118 common/layer_id.cpp:201
+#: common/layer_id.cpp:121 common/layer_id.cpp:151
 #: pcbnew/pcb_layer_widget.cpp:77
 msgid "Cursor"
 msgstr "光标"
 
-#: common/layer_id.cpp:121
+#: common/layer_id.cpp:122
 msgid "Highlighted items"
 msgstr "高亮项目"
 
-#: common/layer_id.cpp:124
+#: common/layer_id.cpp:123
 msgid "Hidden item"
 msgstr "隐藏项目"
 
-#: common/layer_id.cpp:127 common/layer_id.cpp:213
+#: common/layer_id.cpp:124 common/layer_id.cpp:156
 msgid "Selection highlight"
 msgstr "选择高亮"
 
-#: common/layer_id.cpp:130 common/layer_id.cpp:198
+#: common/layer_id.cpp:125 common/layer_id.cpp:150
 #: gerbview/gerbview_layer_widget.cpp:106 pcbnew/pcb_layer_widget.cpp:76
+#: pcbnew/widgets/appearance_controls.cpp:305
 msgid "Worksheet"
 msgstr "图框"
 
-#: common/layer_id.cpp:135 pcbnew/pcb_layer_widget.cpp:53
+#: common/layer_id.cpp:129 pcbnew/pcb_layer_widget.cpp:53
+#: pcbnew/widgets/appearance_controls.cpp:290
 msgid "Footprints Front"
 msgstr "封装顶层"
 
-#: common/layer_id.cpp:138 pcbnew/pcb_layer_widget.cpp:54
+#: common/layer_id.cpp:130 pcbnew/pcb_layer_widget.cpp:54
+#: pcbnew/widgets/appearance_controls.cpp:291
 msgid "Footprints Back"
 msgstr "封装底层"
 
-#: common/layer_id.cpp:141
+#: common/layer_id.cpp:131
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:28
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:69
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1482
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:30
-#: pcbnew/pcb_layer_widget.cpp:55
+#: pcbnew/pcb_layer_widget.cpp:55 pcbnew/widgets/appearance_controls.cpp:293
 msgid "Values"
 msgstr "值"
 
-#: common/layer_id.cpp:144 pcbnew/pcb_layer_widget.cpp:56
+#: common/layer_id.cpp:132 pcbnew/dialogs/dialog_board_reannotate_base.cpp:290
+#: pcbnew/pcb_layer_widget.cpp:56
 msgid "Reference Designators"
-msgstr "参考标识符"
+msgstr "位号"
 
-#: common/layer_id.cpp:147 pcbnew/pcb_layer_widget.cpp:57
+#: common/layer_id.cpp:133 pcbnew/pcb_layer_widget.cpp:57
 msgid "Footprint Text Front"
 msgstr "封装文本顶层"
 
-#: common/layer_id.cpp:150 pcbnew/pcb_layer_widget.cpp:58
+#: common/layer_id.cpp:134 pcbnew/pcb_layer_widget.cpp:58
 msgid "Footprint Text Back"
 msgstr "封装文本底层"
 
-#: common/layer_id.cpp:153 pcbnew/pcb_layer_widget.cpp:59
+#: common/layer_id.cpp:135 pcbnew/pcb_layer_widget.cpp:59
+#: pcbnew/widgets/appearance_controls.cpp:296
 msgid "Hidden Text"
 msgstr "隐藏文本"
 
-#: common/layer_id.cpp:156 pcbnew/pcb_layer_widget.cpp:60
+#: common/layer_id.cpp:136 pcbnew/pcb_layer_widget.cpp:60
 msgid "Pads Front"
 msgstr "顶层焊盘"
 
-#: common/layer_id.cpp:159 pcbnew/pcb_layer_widget.cpp:61
+#: common/layer_id.cpp:137 pcbnew/pcb_layer_widget.cpp:61
 msgid "Pads Back"
 msgstr "底层焊盘"
 
-#: common/layer_id.cpp:162 pcbnew/pcb_layer_widget.cpp:62
+#: common/layer_id.cpp:138 pcbnew/pcb_layer_widget.cpp:62
 msgid "Through Hole Pads"
 msgstr "通孔焊盘"
 
-#: common/layer_id.cpp:165 pcbnew/dialogs/dialog_global_deletion_base.cpp:40
+#: common/layer_id.cpp:139 pcbnew/dialogs/dialog_global_deletion_base.cpp:40
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:27
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:41
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:27
-#: pcbnew/pcb_layer_widget.cpp:64
+#: pcbnew/pcb_layer_widget.cpp:64 pcbnew/widgets/appearance_controls.cpp:285
 msgid "Tracks"
 msgstr "布线"
 
-#: common/layer_id.cpp:168 pcbnew/class_track.cpp:653
+#: common/layer_id.cpp:140 pcbnew/class_track.cpp:724
 #: pcbnew/pcb_layer_widget.cpp:65
 msgid "Through Via"
 msgstr "通孔"
 
-#: common/layer_id.cpp:171 pcbnew/pcb_layer_widget.cpp:66
+#: common/layer_id.cpp:141 pcbnew/pcb_layer_widget.cpp:66
 msgid "Bl/Buried Via"
 msgstr "盲/埋孔"
 
-#: common/layer_id.cpp:174 pcbnew/class_track.cpp:643
+#: common/layer_id.cpp:142 pcbnew/class_track.cpp:714
 #: pcbnew/pcb_layer_widget.cpp:67
 msgid "Micro Via"
 msgstr "微孔"
 
-#: common/layer_id.cpp:177 pcbnew/pcb_layer_widget.cpp:68
+#: common/layer_id.cpp:143 pcbnew/pcb_layer_widget.cpp:68
 msgid "Non Plated Holes"
 msgstr "非金属化孔"
 
-#: common/layer_id.cpp:180 pcbnew/dialogs/panel_edit_options_base.cpp:143
-#: pcbnew/pcb_layer_widget.cpp:70
+#: common/layer_id.cpp:144 pcbnew/dialogs/panel_edit_options_base.cpp:143
+#: pcbnew/pcb_layer_widget.cpp:70 pcbnew/widgets/appearance_controls.cpp:299
 msgid "Ratsnest"
 msgstr "飞线"
 
-#: common/layer_id.cpp:183 pcbnew/pcb_layer_widget.cpp:71
+#: common/layer_id.cpp:145 pcbnew/pcb_layer_widget.cpp:71
+#: pcbnew/widgets/appearance_controls.cpp:300
 msgid "No-Connects"
 msgstr "未连接"
 
-#: common/layer_id.cpp:186 pcbnew/pcb_layer_widget.cpp:72
+#: common/layer_id.cpp:146 pcbnew/pcb_layer_widget.cpp:72
+#: pcbnew/widgets/appearance_controls.cpp:301
 msgid "DRC Warnings"
 msgstr "DRC 警告"
 
-#: common/layer_id.cpp:189 pcbnew/pcb_layer_widget.cpp:73
+#: common/layer_id.cpp:147 pcbnew/pcb_layer_widget.cpp:73
+#: pcbnew/widgets/appearance_controls.cpp:302
 msgid "DRC Errors"
 msgstr "DRC 错误"
 
-#: common/layer_id.cpp:192 pcbnew/pcb_layer_widget.cpp:74
+#: common/layer_id.cpp:148 pcbnew/pcb_layer_widget.cpp:74
+#: pcbnew/widgets/appearance_controls.cpp:303
 msgid "DRC Exclusions"
 msgstr "DRC 排除"
 
-#: common/layer_id.cpp:195 pcbnew/pcb_layer_widget.cpp:75
+#: common/layer_id.cpp:149 pcbnew/pcb_layer_widget.cpp:75
+#: pcbnew/widgets/appearance_controls.cpp:304
 msgid "Anchors"
 msgstr "锚点"
 
-#: common/layer_id.cpp:204
-msgid "Helper items"
-msgstr "辅助项"
+#: common/layer_id.cpp:154
+msgid "Grid Axes"
+msgstr "网格轴"
 
 #: common/lib_id.cpp:284
 msgid "Illegal character found in logical library name"
@@ -4214,7 +4593,7 @@ msgid "Illegal character found in revision"
 msgstr "在修订版本找到非法字符"
 
 #: common/lib_tree_model.cpp:139 eeschema/lib_item.cpp:63
-#: eeschema/libedit/symbedit.cpp:226
+#: eeschema/libedit/symbedit.cpp:226 eeschema/sch_pin.cpp:148
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:56
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:67
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:78
@@ -4229,34 +4608,28 @@ msgstr "在修订版本找到非法字符"
 msgid "Unit"
 msgstr "单位"
 
-#: common/lib_tree_model_adapter.cpp:275
+#: common/lib_tree_model_adapter.cpp:274
 msgid "Item"
 msgstr "项目"
 
-#: common/libeval_compiler/libeval_compiler.cpp:502
+#: common/libeval_compiler/libeval_compiler.cpp:523
 #, c-format
 msgid "Unrecognized character '%c'"
 msgstr "无法识别的字符 '%c'"
 
-#: common/libeval_compiler/libeval_compiler.cpp:593
-#: pcbnew/drc/drc_rule_parser.cpp:62 qa/drc_proto/drc_rule_parser.cpp:51
-#, c-format
-msgid "ERROR: <a href='%d:%d'>%s</a>%s"
-msgstr "错误：<a href='%d:%d'>%s</a>%s"
-
-#: common/libeval_compiler/libeval_compiler.cpp:666
-#: common/libeval_compiler/libeval_compiler.cpp:689
-#: common/libeval_compiler/libeval_compiler.cpp:774
+#: common/libeval_compiler/libeval_compiler.cpp:759
+#: common/libeval_compiler/libeval_compiler.cpp:787
+#: common/libeval_compiler/libeval_compiler.cpp:886
 #, c-format
 msgid "Unrecognized item '%s'"
 msgstr "无法识别的项目 '%s'"
 
-#: common/libeval_compiler/libeval_compiler.cpp:673
+#: common/libeval_compiler/libeval_compiler.cpp:764
 #, c-format
 msgid "Unrecognized property '%s'"
 msgstr "无法识别的属性 '%s'"
 
-#: common/libeval_compiler/libeval_compiler.cpp:699
+#: common/libeval_compiler/libeval_compiler.cpp:798
 #, c-format
 msgid "Unrecognized function '%s'"
 msgstr "无法识别的功能 '%s'"
@@ -4333,112 +4706,28 @@ msgstr "连线从 (%s,%s) 到 (%s,%s)"
 msgid "Image at (%s, %s)"
 msgstr "图像在 ( %s, %s)"
 
-#: common/pgm_base.cpp:78
-msgid "French"
-msgstr "法语"
-
-#: common/pgm_base.cpp:79
-msgid "Finnish"
-msgstr "芬兰语"
-
-#: common/pgm_base.cpp:80
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: common/pgm_base.cpp:81
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#: common/pgm_base.cpp:82
-msgid "Italian"
-msgstr "意大利语"
-
-#: common/pgm_base.cpp:83
-msgid "German"
-msgstr "德语"
-
-#: common/pgm_base.cpp:84
-msgid "Greek"
-msgstr "希腊语"
-
-#: common/pgm_base.cpp:85
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
-
-#: common/pgm_base.cpp:86
-msgid "Slovak"
-msgstr "斯洛伐克语"
-
-#: common/pgm_base.cpp:87
-msgid "Hungarian"
-msgstr "匈牙利语"
-
-#: common/pgm_base.cpp:88
-msgid "Polish"
-msgstr "波兰语"
-
-#: common/pgm_base.cpp:89
-msgid "Czech"
-msgstr "捷克语"
-
-#: common/pgm_base.cpp:90
-msgid "Russian"
-msgstr "俄语"
-
-#: common/pgm_base.cpp:91
-msgid "Korean"
-msgstr "朝鲜语/韩语"
-
-#: common/pgm_base.cpp:93
-msgid "Chinese simplified"
-msgstr "简体中文"
-
-#: common/pgm_base.cpp:95
-msgid "Chinese traditional"
-msgstr "繁体中文"
-
-#: common/pgm_base.cpp:96
-msgid "Catalan"
-msgstr "加泰罗尼亚语"
-
-#: common/pgm_base.cpp:97
-msgid "Dutch"
-msgstr "荷兰语"
-
-#: common/pgm_base.cpp:98
-msgid "Japanese"
-msgstr "日语"
-
-#: common/pgm_base.cpp:99
-msgid "Bulgarian"
-msgstr "保加利亚语"
-
-#: common/pgm_base.cpp:100
-msgid "Lithuanian"
-msgstr "立陶宛语"
-
-#: common/pgm_base.cpp:174
+#: common/pgm_base.cpp:165
 msgid "No default editor found, you must choose it"
 msgstr "未找到默认编辑器，请先设置首选文本编辑器"
 
-#: common/pgm_base.cpp:194
+#: common/pgm_base.cpp:185
 msgid "Executable file (*.exe)|*.exe"
 msgstr "可执行文件 (*.exe)|*.exe"
 
-#: common/pgm_base.cpp:196
+#: common/pgm_base.cpp:187
 msgid "Executable file (*)|*"
 msgstr "可执行文件 (*)|*"
 
-#: common/pgm_base.cpp:206
+#: common/pgm_base.cpp:197
 msgid "Select Preferred Editor"
 msgstr "选择首选编辑器"
 
-#: common/pgm_base.cpp:225
+#: common/pgm_base.cpp:216
 #, c-format
 msgid "%s is already running. Continue?"
 msgstr "%s 正在运行, 是否打开新窗口运行?"
 
-#: common/project.cpp:312 common/project.cpp:317
+#: common/project.cpp:313 common/project.cpp:318
 msgid "Error loading project footprint library table"
 msgstr "加载工程封装库表时出错"
 
@@ -4500,45 +4789,53 @@ msgstr "超出了线路长度"
 msgid "OUTPUTSTREAM_OUTPUTFORMATTER write error"
 msgstr "输出流_输出格式器写入错误"
 
-#: common/settings/color_settings.cpp:311
+#: common/settings/color_settings.cpp:309
 msgid " (Footprints)"
 msgstr " (封装)"
 
-#: common/template_fieldnames.cpp:47
-#: eeschema/dialogs/dialog_rescue_each.cpp:130 eeschema/sch_component.cpp:1188
-#: eeschema/sch_component.cpp:1243 pcbnew/class_module.cpp:1674
+#: common/template_fieldnames.cpp:46
+#: eeschema/dialogs/dialog_rescue_each.cpp:130 eeschema/sch_component.cpp:1204
+#: eeschema/sch_component.cpp:1259 pcbnew/class_module.cpp:1715
 msgid "Reference"
 msgstr "参考"
 
-#: common/template_fieldnames.cpp:48
+#: common/template_fieldnames.cpp:47
 #: cvpcb/dialogs/dialog_config_equfiles_base.cpp:81
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:57
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:49
 #: eeschema/dialogs/dialog_rescue_each.cpp:134
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:51
-#: eeschema/dialogs/panel_sym_lib_table.cpp:286
+#: eeschema/dialogs/panel_sym_lib_table.cpp:302
 #: eeschema/fields_grid_table.cpp:196 eeschema/lib_field.cpp:446
-#: eeschema/sch_component.cpp:1191 eeschema/sch_component.cpp:1246
-#: pcbnew/class_module.cpp:1676 pcbnew/class_text_mod.cpp:289
+#: eeschema/sch_component.cpp:1207 eeschema/sch_component.cpp:1262
+#: pcbnew/class_module.cpp:1717 pcbnew/class_text_mod.cpp:285
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:70
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:70
 #: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:44
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:435
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:452
 #: pcbnew/dialogs/panel_modedit_defaults.cpp:62
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:54
-#: pcbnew/footprint_wizard_frame.cpp:336 pcbnew/text_mod_grid_table.cpp:109
+#: pcbnew/footprint_wizard_frame.cpp:335 pcbnew/text_mod_grid_table.cpp:109
 msgid "Value"
 msgstr "值"
 
-#: common/template_fieldnames.cpp:50 eeschema/libedit/symbedit.cpp:243
+#: common/template_fieldnames.cpp:49 eeschema/libedit/symbedit.cpp:243
 msgid "Datasheet"
 msgstr "数据手册"
 
-#: common/template_fieldnames.cpp:51 eeschema/sch_sheet.cpp:58
+#: common/template_fieldnames.cpp:50 eeschema/sch_sheet.cpp:57
 #, c-format
 msgid "Field%d"
 msgstr "字段 %d"
 
+#: common/tool/action_menu.cpp:206
+msgid "Close\tCTRL+W"
+msgstr "关闭\tCTRL+W"
+
+#: common/tool/action_menu.cpp:219 common/tool/actions.cpp:113
+msgid "Quit"
+msgstr "退出"
+
 #: common/tool/actions.cpp:41
 msgid "New..."
 msgstr "新建..."
@@ -4611,7 +4908,7 @@ msgstr "图框设置..."
 msgid "Settings for paper size and title block info"
 msgstr "图框大小和标题块信息的设置"
 
-#: common/tool/actions.cpp:101 kicad/tree_project_frame.cpp:786
+#: common/tool/actions.cpp:101 kicad/tree_project_frame.cpp:793
 msgid "Print..."
 msgstr "打印..."
 
@@ -4624,10 +4921,6 @@ msgstr "绘制..."
 msgid "Plot"
 msgstr "绘制"
 
-#: common/tool/actions.cpp:113 common/tool/conditional_menu.cpp:115
-msgid "Quit"
-msgstr "退出"
-
 #: common/tool/actions.cpp:113
 msgid "Close the current editor"
 msgstr "关闭当前编辑器"
@@ -4661,7 +4954,7 @@ msgid "Redo last edit"
 msgstr "重做上一次编辑"
 
 #: common/tool/actions.cpp:152 eeschema/tools/ee_actions.cpp:131
-#: pcbnew/tools/edit_tool.cpp:1078
+#: pcbnew/tools/edit_tool.cpp:1221
 msgid "Cut"
 msgstr "剪切"
 
@@ -4682,436 +4975,457 @@ msgid "Paste"
 msgstr "粘贴"
 
 #: common/tool/actions.cpp:164
-msgid "Paste clipboard into schematic"
-msgstr "将剪贴板粘贴到原理图中"
+msgid "Paste items(s) from clipboard"
+msgstr "从剪贴板粘贴项目"
 
-#: common/tool/actions.cpp:169
+#: common/tool/actions.cpp:170
+#: eeschema/dialogs/dialog_sch_import_settings_base.cpp:68
+#: eeschema/dialogs/dialog_update_fields_base.cpp:34
+#: pcbnew/dialogs/dialog_import_settings.cpp:53
+#: pcbnew/dialogs/dialog_import_settings.cpp:98
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:74
+msgid "Select All"
+msgstr "全选"
+
+#: common/tool/actions.cpp:170
+msgid "Select all items on screen"
+msgstr "选择屏幕上的所有项目"
+
+#: common/tool/actions.cpp:174
 msgid "Paste Special..."
 msgstr "特殊粘贴..."
 
-#: common/tool/actions.cpp:169
-msgid "Paste clipboard into schematic with options"
-msgstr "使用选项将剪贴板粘贴到原理图中"
+#: common/tool/actions.cpp:174
+msgid "Paste item(s) from clipboard with options"
+msgstr "使用选项从剪贴板粘贴项目"
 
-#: common/tool/actions.cpp:175 eeschema/tools/ee_actions.cpp:121
+#: common/tool/actions.cpp:180 eeschema/tools/ee_actions.cpp:121
 msgid "Duplicate"
 msgstr "重复"
 
-#: common/tool/actions.cpp:175
+#: common/tool/actions.cpp:180
 msgid "Duplicates the selected item(s)"
 msgstr "复制选择项"
 
-#: common/tool/actions.cpp:181 eeschema/tools/ee_actions.cpp:126
-#: kicad/tree_project_frame.cpp:778 pcbnew/pcb_parser.cpp:645
-#: pcbnew/tools/edit_tool.cpp:1080
+#: common/tool/actions.cpp:186 eeschema/tools/ee_actions.cpp:126
+#: kicad/tree_project_frame.cpp:785 pcbnew/pcb_parser.cpp:659
+#: pcbnew/tools/edit_tool.cpp:1223
 msgid "Delete"
 msgstr "删除"
 
-#: common/tool/actions.cpp:181
+#: common/tool/actions.cpp:186
 msgid "Deletes selected item(s)"
 msgstr "删除选择项"
 
-#: common/tool/actions.cpp:186
+#: common/tool/actions.cpp:191
 msgid "Interactive Delete Tool"
 msgstr "交互式删除工具"
 
-#: common/tool/actions.cpp:186
+#: common/tool/actions.cpp:191
 msgid "Delete clicked items"
 msgstr "删除单击的项目"
 
-#: common/tool/actions.cpp:195 eeschema/dialogs/dialog_schematic_find.cpp:33
+#: common/tool/actions.cpp:198
+msgid "Change Edit Method"
+msgstr "更改编辑方法"
+
+#: common/tool/actions.cpp:198
+msgid "Change edit method constraints"
+msgstr "更改编辑方法约束"
+
+#: common/tool/actions.cpp:203 eeschema/dialogs/dialog_schematic_find.cpp:33
 #: eeschema/dialogs/dialog_schematic_find_base.h:81
 msgid "Find"
 msgstr "查找"
 
-#: common/tool/actions.cpp:195
+#: common/tool/actions.cpp:203
 msgid "Find text"
 msgstr "查找文本"
 
-#: common/tool/actions.cpp:201 eeschema/dialogs/dialog_schematic_find.cpp:44
+#: common/tool/actions.cpp:209 eeschema/dialogs/dialog_schematic_find.cpp:44
 msgid "Find and Replace"
 msgstr "查找和替换"
 
-#: common/tool/actions.cpp:201
+#: common/tool/actions.cpp:209
 msgid "Find and replace text"
 msgstr "查找和替换文字"
 
-#: common/tool/actions.cpp:207
+#: common/tool/actions.cpp:215
 msgid "Find Next"
 msgstr "查找下一项"
 
-#: common/tool/actions.cpp:207
+#: common/tool/actions.cpp:215
 msgid "Find next match"
 msgstr "查找下一个匹配项"
 
-#: common/tool/actions.cpp:213
+#: common/tool/actions.cpp:221
 msgid "Find Next Marker"
 msgstr "查找下一项标记"
 
-#: common/tool/actions.cpp:219
+#: common/tool/actions.cpp:227
 msgid "Replace and Find Next"
 msgstr "替换并查找下一项"
 
-#: common/tool/actions.cpp:219
+#: common/tool/actions.cpp:227
 msgid "Replace current match and find next"
 msgstr "替换当前匹配并找到下一个"
 
-#: common/tool/actions.cpp:225
+#: common/tool/actions.cpp:233
 msgid "Replace All"
 msgstr "全部替换"
 
-#: common/tool/actions.cpp:225
+#: common/tool/actions.cpp:233
 msgid "Replace all matches"
 msgstr "替换所有匹配项"
 
-#: common/tool/actions.cpp:240
+#: common/tool/actions.cpp:248
 msgid "Refresh"
 msgstr "刷新"
 
-#: common/tool/actions.cpp:251
+#: common/tool/actions.cpp:259
 msgid "Zoom to Fit"
 msgstr "缩放以适应"
 
-#: common/tool/actions.cpp:262
+#: common/tool/actions.cpp:270
 msgid "Zoom In at Cursor"
 msgstr "在光标处放大"
 
-#: common/tool/actions.cpp:273
+#: common/tool/actions.cpp:281
 msgid "Zoom Out at Cursor"
 msgstr "在光标处缩小"
 
-#: common/tool/actions.cpp:279 common/widgets/mathplot.cpp:1762
+#: common/tool/actions.cpp:287 common/widgets/mathplot.cpp:1727
 #: eeschema/sim/sim_plot_frame_base.cpp:79
 msgid "Zoom In"
 msgstr "放大"
 
-#: common/tool/actions.cpp:285 common/widgets/mathplot.cpp:1763
+#: common/tool/actions.cpp:293 common/widgets/mathplot.cpp:1728
 #: eeschema/sim/sim_plot_frame_base.cpp:83
 msgid "Zoom Out"
 msgstr "缩小"
 
-#: common/tool/actions.cpp:297
+#: common/tool/actions.cpp:305
 msgid "Zoom to Selection"
 msgstr "缩放至选区大小"
 
-#: common/tool/actions.cpp:310
+#: common/tool/actions.cpp:318
 msgid "Cursor Up"
 msgstr "向上光标"
 
-#: common/tool/actions.cpp:316
+#: common/tool/actions.cpp:324
 msgid "Cursor Down"
 msgstr "向下光标"
 
-#: common/tool/actions.cpp:322
+#: common/tool/actions.cpp:330
 msgid "Cursor Left"
 msgstr "向左光标"
 
-#: common/tool/actions.cpp:328
+#: common/tool/actions.cpp:336
 msgid "Cursor Right"
 msgstr "向右光标"
 
-#: common/tool/actions.cpp:335
+#: common/tool/actions.cpp:343
 msgid "Cursor Up Fast"
 msgstr "快速向上光标"
 
-#: common/tool/actions.cpp:341
+#: common/tool/actions.cpp:349
 msgid "Cursor Down Fast"
 msgstr "快速向下光标"
 
-#: common/tool/actions.cpp:347
+#: common/tool/actions.cpp:355
 msgid "Cursor Left Fast"
 msgstr "快速向左光标"
 
-#: common/tool/actions.cpp:353
+#: common/tool/actions.cpp:361
 msgid "Cursor Right Fast"
 msgstr "快速向右光标"
 
-#: common/tool/actions.cpp:359
+#: common/tool/actions.cpp:367
 msgid "Click"
 msgstr "单击"
 
-#: common/tool/actions.cpp:359
+#: common/tool/actions.cpp:367
 msgid "Performs left mouse button click"
 msgstr "执行鼠标左键单击"
 
-#: common/tool/actions.cpp:365
+#: common/tool/actions.cpp:373
 msgid "Double-click"
 msgstr "双击"
 
-#: common/tool/actions.cpp:365
+#: common/tool/actions.cpp:373
 msgid "Performs left mouse button double-click"
 msgstr "执行鼠标左键双击"
 
-#: common/tool/actions.cpp:373
+#: common/tool/actions.cpp:381
 msgid "Pin Library"
 msgstr "引脚库"
 
-#: common/tool/actions.cpp:378
+#: common/tool/actions.cpp:386
 msgid "Unpin Library"
 msgstr "取消引脚库"
 
-#: common/tool/actions.cpp:384
+#: common/tool/actions.cpp:392
 msgid "Pan Up"
 msgstr "向上平移"
 
-#: common/tool/actions.cpp:390
+#: common/tool/actions.cpp:398
 msgid "Pan Down"
 msgstr "向下平移"
 
-#: common/tool/actions.cpp:396
+#: common/tool/actions.cpp:404
 msgid "Pan Left"
 msgstr "向左平移"
 
-#: common/tool/actions.cpp:402
+#: common/tool/actions.cpp:410
 msgid "Pan Right"
 msgstr "向右平移"
 
-#: common/tool/actions.cpp:409
+#: common/tool/actions.cpp:417
 msgid "Switch to Fast Grid 1"
 msgstr "切换到快速网格 1"
 
-#: common/tool/actions.cpp:414
+#: common/tool/actions.cpp:422
 msgid "Switch to Fast Grid 2"
 msgstr "切换到快速网格 2"
 
-#: common/tool/actions.cpp:419
+#: common/tool/actions.cpp:427
 msgid "Switch to Next Grid"
 msgstr "切换到下一个网格"
 
-#: common/tool/actions.cpp:423
+#: common/tool/actions.cpp:431
 msgid "Switch to Previous Grid"
 msgstr "切换到上一个网格"
 
-#: common/tool/actions.cpp:428
+#: common/tool/actions.cpp:436
 msgid "Set the grid origin point"
 msgstr "设置网格原点"
 
-#: common/tool/actions.cpp:441
+#: common/tool/actions.cpp:449
 msgid "Show Grid"
 msgstr "显示网格"
 
-#: common/tool/actions.cpp:441
+#: common/tool/actions.cpp:449
 msgid "Display grid dots or lines in the edit window"
 msgstr "在编辑窗口中显示网格点或线条"
 
-#: common/tool/actions.cpp:446
+#: common/tool/actions.cpp:454
 msgid "Grid Properties..."
 msgstr "网格属性..."
 
-#: common/tool/actions.cpp:446
+#: common/tool/actions.cpp:454
 msgid "Set grid dimensions"
 msgstr "设置网格尺寸"
 
-#: common/tool/actions.cpp:451
+#: common/tool/actions.cpp:459
 msgid "Imperial"
 msgstr "英制"
 
-#: common/tool/actions.cpp:451
+#: common/tool/actions.cpp:459
 msgid "Use inches and mils"
 msgstr "使用英寸和密耳 （mil）"
 
-#: common/tool/actions.cpp:456
+#: common/tool/actions.cpp:464
 msgid "Metric"
 msgstr "公制"
 
-#: common/tool/actions.cpp:456
+#: common/tool/actions.cpp:464
 msgid "Use millimeters"
 msgstr "使用毫米"
 
-#: common/tool/actions.cpp:462
+#: common/tool/actions.cpp:470
 msgid "Switch units"
 msgstr "切换单位"
 
-#: common/tool/actions.cpp:462
+#: common/tool/actions.cpp:470
 msgid "Switch between inches and millimeters"
 msgstr "在英寸和毫米之间切换"
 
-#: common/tool/actions.cpp:467
+#: common/tool/actions.cpp:475
 msgid "Polar Coordinates"
 msgstr "极坐标"
 
-#: common/tool/actions.cpp:467
+#: common/tool/actions.cpp:475
 msgid "Switch between polar and cartesian coordinate systems"
 msgstr "在极坐标系和笛卡尔坐标系之间切换"
 
-#: common/tool/actions.cpp:473
+#: common/tool/actions.cpp:481
 msgid "Reset Local Coordinates"
 msgstr "重置局部坐标"
 
-#: common/tool/actions.cpp:479
+#: common/tool/actions.cpp:487
 msgid "Always Show Cursor"
 msgstr "始终显示光标"
 
-#: common/tool/actions.cpp:479
+#: common/tool/actions.cpp:487
 msgid "Display crosshairs even in selection tool"
 msgstr "即使在选择工具中也显示十字线"
 
-#: common/tool/actions.cpp:484
+#: common/tool/actions.cpp:492
 msgid "Full-Window Crosshairs"
 msgstr "全屏十字光标"
 
-#: common/tool/actions.cpp:484
+#: common/tool/actions.cpp:492
 msgid "Switch display of full-window crosshairs"
 msgstr "开关全屏十字光标"
 
-#: common/tool/actions.cpp:490
+#: common/tool/actions.cpp:498
 msgid "High Contrast Mode"
 msgstr "高对比度模式"
 
-#: common/tool/actions.cpp:490
+#: common/tool/actions.cpp:498
 msgid "Use high contrast display mode"
 msgstr "使用高对比度显示模式"
 
-#: common/tool/actions.cpp:494
+#: common/tool/actions.cpp:502
 msgid "High Contrast Mode (3-state)"
 msgstr "高对比度模式 (三态)"
 
-#: common/tool/actions.cpp:495
+#: common/tool/actions.cpp:503
 msgid "Toggle inactive layers between normal, dimmed, and hidden"
 msgstr "在正常、暗显和隐藏之间切换非活动图层"
 
-#: common/tool/actions.cpp:499
+#: common/tool/actions.cpp:507
 msgid "Select item(s)"
 msgstr "选择项目"
 
-#: common/tool/actions.cpp:506
+#: common/tool/actions.cpp:514
 msgid "Measure Tool"
 msgstr "测量工具"
 
-#: common/tool/actions.cpp:506
+#: common/tool/actions.cpp:514
 msgid "Interactively measure distance between points"
 msgstr "交互测量点之间的距离"
 
-#: common/tool/actions.cpp:515
+#: common/tool/actions.cpp:523
 msgid "Show 3D viewer window"
 msgstr "显示3D 查看器窗口"
 
-#: common/tool/actions.cpp:520 eeschema/lib_view_frame.cpp:101
+#: common/tool/actions.cpp:528 eeschema/lib_view_frame.cpp:103
 msgid "Symbol Library Browser"
 msgstr "符号库浏览器"
 
-#: common/tool/actions.cpp:520
+#: common/tool/actions.cpp:528
 msgid "Browse symbol libraries"
 msgstr "浏览符号库"
 
-#: common/tool/actions.cpp:525 eeschema/eeschema_config.cpp:430
+#: common/tool/actions.cpp:533 eeschema/eeschema_config.cpp:394
 #: eeschema/libedit/libedit.cpp:50
 msgid "Symbol Editor"
 msgstr "符号编辑器"
 
-#: common/tool/actions.cpp:525
+#: common/tool/actions.cpp:533
 msgid "Create, delete and edit symbols"
 msgstr "创建，删除和编辑符号"
 
-#: common/tool/actions.cpp:530 pcbnew/footprint_viewer_frame.cpp:107
-#: pcbnew/footprint_viewer_frame.cpp:934
+#: common/tool/actions.cpp:538 pcbnew/footprint_viewer_frame.cpp:108
+#: pcbnew/footprint_viewer_frame.cpp:980
 msgid "Footprint Library Browser"
 msgstr "封装库浏览"
 
-#: common/tool/actions.cpp:530
+#: common/tool/actions.cpp:538
 msgid "Browse footprint libraries"
 msgstr "浏览封装库"
 
-#: common/tool/actions.cpp:535 pcbnew/footprint_edit_frame.cpp:657
-#: pcbnew/footprint_edit_frame.cpp:829 pcbnew/menubar_footprint_editor.cpp:105
+#: common/tool/actions.cpp:543 pcbnew/footprint_edit_frame.cpp:698
+#: pcbnew/footprint_edit_frame.cpp:870 pcbnew/menubar_footprint_editor.cpp:100
 msgid "Footprint Editor"
 msgstr "封装编辑器"
 
-#: common/tool/actions.cpp:535
+#: common/tool/actions.cpp:543
 msgid "Create, delete and edit footprints"
 msgstr "创建，删除和编辑封装"
 
-#: common/tool/actions.cpp:541
+#: common/tool/actions.cpp:549
 msgid "Update PCB from Schematic..."
 msgstr "从原理图更新 PCB..."
 
-#: common/tool/actions.cpp:541
+#: common/tool/actions.cpp:549
 msgid "Push changes from schematic to PCB"
 msgstr "将更改从原理图推送到 PCB"
 
-#: common/tool/actions.cpp:545
+#: common/tool/actions.cpp:553
 msgid "Update Schematic from PCB..."
 msgstr "从 PCB 更新原理图..."
 
-#: common/tool/actions.cpp:546
+#: common/tool/actions.cpp:554
 msgid "Push changes from PCB to Schematic"
 msgstr "将更改从 PCB 推送到原理图"
 
-#: common/tool/actions.cpp:556
+#: common/tool/actions.cpp:564
 msgid "Accelerated Graphics"
-msgstr "图形加速"
+msgstr "硬件加速图形"
 
-#: common/tool/actions.cpp:556
+#: common/tool/actions.cpp:564
 msgid "Use hardware-accelerated graphics (recommended)"
 msgstr "使用硬件加速图形 (推荐)"
 
-#: common/tool/actions.cpp:567
+#: common/tool/actions.cpp:575
 msgid "Standard Graphics"
 msgstr "标准图形"
 
-#: common/tool/actions.cpp:567
+#: common/tool/actions.cpp:575
 msgid "Use software graphics (fall-back)"
-msgstr "使用软件图形 (回退)"
+msgstr "使用软件图形 (软件加速)"
 
-#: common/tool/actions.cpp:572
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:465
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:367
+#: common/tool/actions.cpp:580
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:490
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:392
 msgid "Configure Paths..."
 msgstr "配置路径..."
 
-#: common/tool/actions.cpp:572
+#: common/tool/actions.cpp:580
 msgid "Edit path configuration environment variables"
 msgstr "编辑路劲配置环境变量"
 
-#: common/tool/actions.cpp:577
+#: common/tool/actions.cpp:585
 msgid "Manage Symbol Libraries..."
 msgstr "管理符号库..."
 
-#: common/tool/actions.cpp:578
+#: common/tool/actions.cpp:586
 msgid "Edit the global and project symbol library lists"
 msgstr "编辑全局和工程符号库表"
 
-#: common/tool/actions.cpp:583
+#: common/tool/actions.cpp:591
 msgid "Manage Footprint Libraries..."
 msgstr "管理封装库..."
 
-#: common/tool/actions.cpp:584
+#: common/tool/actions.cpp:592
 msgid "Edit the global and project footprint library lists"
 msgstr "编辑全局和项目封装库列表"
 
-#: common/tool/actions.cpp:589
+#: common/tool/actions.cpp:597
 msgid "Getting Started with KiCad"
 msgstr "KiCad 入门指南"
 
-#: common/tool/actions.cpp:590
+#: common/tool/actions.cpp:598
 msgid "Open \"Getting Started in KiCad\" guide for beginners"
 msgstr "打开“KiCad 入门指南”手册"
 
-#: common/tool/actions.cpp:595
+#: common/tool/actions.cpp:603
 msgid "Help"
 msgstr "帮助"
 
-#: common/tool/actions.cpp:596
+#: common/tool/actions.cpp:604
 msgid "Open product documentation in a web browser"
 msgstr "在 Web 浏览器中打开产品文档"
 
-#: common/tool/actions.cpp:602
+#: common/tool/actions.cpp:610
 msgid "List Hotkeys..."
 msgstr "快捷键列表..."
 
-#: common/tool/actions.cpp:603
+#: common/tool/actions.cpp:611
 msgid "Displays current hotkeys table and corresponding commands"
 msgstr "显示当前快捷键表和相应命令"
 
-#: common/tool/actions.cpp:608
+#: common/tool/actions.cpp:616
 msgid "Get Involved"
 msgstr "参与 KiCad"
 
-#: common/tool/actions.cpp:609
+#: common/tool/actions.cpp:617
 msgid "Open \"Contribute to KiCad\" in a web browser"
 msgstr "在 Web 浏览器中打开“参与 KiCad”"
 
-#: common/tool/actions.cpp:614
+#: common/tool/actions.cpp:622
 msgid "Report Bug"
 msgstr "报告 Bug"
 
@@ -5146,10 +5460,6 @@ msgstr ""
 msgid "Get involved with KiCad"
 msgstr "参与 KiCad"
 
-#: common/tool/conditional_menu.cpp:104
-msgid "Close\tCTRL+W"
-msgstr "关闭\tCTRL+W"
-
 #: common/tool/grid_menu.cpp:91
 #, c-format
 msgid "Grid: %.4f mm (%.2f mils)"
@@ -5209,25 +5519,25 @@ msgstr "信号名称不能包含 CR 或 LF 字符"
 msgid "Signal names cannot contain spaces"
 msgstr "信号名称不能包含空格"
 
-#: common/view/view.cpp:571
+#: common/view/view.cpp:566
 msgid "Mirroring for Y axis is not supported yet"
 msgstr "Y 轴的镜像尚不支持"
 
-#: common/widgets/footprint_preview_widget.cpp:96
+#: common/widgets/footprint_preview_widget.cpp:104
 msgid "Footprint not found"
 msgstr "封装没有找到"
 
-#: common/widgets/footprint_select_widget.cpp:77 cvpcb/cvpcb_mainframe.cpp:697
-#: pcbnew/footprint_edit_frame.cpp:729 pcbnew/load_select_footprint.cpp:207
+#: common/widgets/footprint_select_widget.cpp:80 cvpcb/cvpcb_mainframe.cpp:743
+#: pcbnew/footprint_edit_frame.cpp:770 pcbnew/load_select_footprint.cpp:207
 msgid "Loading Footprint Libraries"
 msgstr "载入封装库"
 
-#: common/widgets/footprint_select_widget.cpp:225
+#: common/widgets/footprint_select_widget.cpp:228
 msgid "No default footprint"
 msgstr "没有默认的封装"
 
-#: common/widgets/footprint_select_widget.cpp:230
-#: common/widgets/footprint_select_widget.cpp:231
+#: common/widgets/footprint_select_widget.cpp:233
+#: common/widgets/footprint_select_widget.cpp:234
 msgid "Other..."
 msgstr "其它..."
 
@@ -5292,23 +5602,23 @@ msgstr "始终显示十字光标"
 msgid "Select a File"
 msgstr "选择一个文件"
 
-#: common/widgets/mathplot.cpp:1760
+#: common/widgets/mathplot.cpp:1725
 msgid "Center plot view to this position"
 msgstr "居中绘制视图"
 
-#: common/widgets/mathplot.cpp:1761 eeschema/sim/sim_plot_frame_base.cpp:87
+#: common/widgets/mathplot.cpp:1726 eeschema/sim/sim_plot_frame_base.cpp:87
 msgid "Fit on Screen"
 msgstr "适应屏幕"
 
-#: common/widgets/mathplot.cpp:1761
+#: common/widgets/mathplot.cpp:1726
 msgid "Set plot view to show all items"
 msgstr "设置绘制视图以显示所有项目"
 
-#: common/widgets/mathplot.cpp:1762
+#: common/widgets/mathplot.cpp:1727
 msgid "Zoom in plot view."
 msgstr "放大绘制视图。"
 
-#: common/widgets/mathplot.cpp:1763
+#: common/widgets/mathplot.cpp:1728
 msgid "Zoom out plot view."
 msgstr "缩小绘制视图。"
 
@@ -5321,12 +5631,12 @@ msgid "<create net>"
 msgstr "< 创建网络 >"
 
 #: common/widgets/net_selector.cpp:75
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:564
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:603
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:597
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:636
 msgid "Filter:"
 msgstr "筛选："
 
-#: common/widgets/paged_dialog.cpp:104
+#: common/widgets/paged_dialog.cpp:66
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:191
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:527
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:859
@@ -5334,12 +5644,12 @@ msgstr "筛选："
 msgid "Reset to Defaults"
 msgstr "重置为默认值"
 
-#: common/widgets/unit_binder.cpp:195
+#: common/widgets/unit_binder.cpp:197
 #, c-format
 msgid "%s must be at least %s."
 msgstr "%s 必须至少为 %s 。"
 
-#: common/widgets/unit_binder.cpp:209
+#: common/widgets/unit_binder.cpp:211
 #, c-format
 msgid "%s must be less than %s."
 msgstr "%s 必须小于 %s 。"
@@ -5440,179 +5750,183 @@ msgid "KiCad s-expression schematic files"
 msgstr "KiCad “S-表达式”原理图文件"
 
 #: common/wildcards_and_files_ext.cpp:234
+msgid "Altium schematic files"
+msgstr "Altium 原理图文件"
+
+#: common/wildcards_and_files_ext.cpp:240
 msgid "Eagle XML schematic files"
 msgstr "Eagle XML 原理图文件"
 
-#: common/wildcards_and_files_ext.cpp:240
+#: common/wildcards_and_files_ext.cpp:246
 msgid "Eagle XML files"
 msgstr "Eagle XML 文件"
 
-#: common/wildcards_and_files_ext.cpp:246
+#: common/wildcards_and_files_ext.cpp:252
 msgid "KiCad netlist files"
 msgstr "KiCad 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:252 gerbview/files.cpp:49
+#: common/wildcards_and_files_ext.cpp:258 gerbview/files.cpp:49
 msgid "Gerber files"
 msgstr "Gerber 文件"
 
-#: common/wildcards_and_files_ext.cpp:258
-#: common/wildcards_and_files_ext.cpp:295
+#: common/wildcards_and_files_ext.cpp:264
+#: common/wildcards_and_files_ext.cpp:301
 msgid "KiCad printed circuit board files"
 msgstr "KiCad PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:264
+#: common/wildcards_and_files_ext.cpp:270
 msgid "Eagle ver. 6.x XML PCB files"
 msgstr "Eagle ver. 6.x XML PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:270
+#: common/wildcards_and_files_ext.cpp:276
 msgid "P-Cad 200x ASCII PCB files"
 msgstr "P-Cad 200x ASCII PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:275
+#: common/wildcards_and_files_ext.cpp:281
 msgid "Altium Designer PCB files"
 msgstr "Altium Designer PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:280
+#: common/wildcards_and_files_ext.cpp:286
 msgid "Altium Circuit Studio PCB files"
 msgstr "Altium Circuit Studio PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:285
+#: common/wildcards_and_files_ext.cpp:291
 msgid "Altium Circuit Maker PCB files"
 msgstr "Altium Circuit Maker PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:290
+#: common/wildcards_and_files_ext.cpp:296
 msgid "Fabmaster PCB files"
 msgstr "Fabmaster PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:301
+#: common/wildcards_and_files_ext.cpp:307
 msgid "KiCad footprint files"
 msgstr "KiCad 封装文件"
 
-#: common/wildcards_and_files_ext.cpp:307
+#: common/wildcards_and_files_ext.cpp:313
 msgid "KiCad footprint library paths"
 msgstr "KiCad 封装库路径"
 
-#: common/wildcards_and_files_ext.cpp:313
+#: common/wildcards_and_files_ext.cpp:319
 msgid "Legacy footprint library files"
 msgstr "旧的封装库文件"
 
-#: common/wildcards_and_files_ext.cpp:319
+#: common/wildcards_and_files_ext.cpp:325
 msgid "Eagle ver. 6.x XML library files"
 msgstr "Eagle ver. 6.x XML 库文件"
 
-#: common/wildcards_and_files_ext.cpp:325
+#: common/wildcards_and_files_ext.cpp:331
 msgid "Geda PCB footprint library files"
 msgstr "Geda PCB 封装库文件"
 
-#: common/wildcards_and_files_ext.cpp:331
+#: common/wildcards_and_files_ext.cpp:337
 msgid "Page layout design files"
 msgstr "图框设计文件"
 
-#: common/wildcards_and_files_ext.cpp:338
+#: common/wildcards_and_files_ext.cpp:344
 msgid "KiCad symbol footprint link files"
 msgstr "KiCad 符号封装链接文件"
 
-#: common/wildcards_and_files_ext.cpp:345 gerbview/files.cpp:68
+#: common/wildcards_and_files_ext.cpp:351 gerbview/files.cpp:68
 msgid "Drill files"
 msgstr "钻孔文件"
 
-#: common/wildcards_and_files_ext.cpp:351
+#: common/wildcards_and_files_ext.cpp:357
 msgid "SVG files"
 msgstr "SVG 文件"
 
-#: common/wildcards_and_files_ext.cpp:357
+#: common/wildcards_and_files_ext.cpp:363
 msgid "HTML files"
 msgstr "HTML 文件"
 
-#: common/wildcards_and_files_ext.cpp:363
+#: common/wildcards_and_files_ext.cpp:369
 msgid "CSV Files"
 msgstr "CSV 文件"
 
-#: common/wildcards_and_files_ext.cpp:369
+#: common/wildcards_and_files_ext.cpp:375
 msgid "Portable document format files"
 msgstr "便携式文档格式文件 (*.PDF)"
 
-#: common/wildcards_and_files_ext.cpp:375
+#: common/wildcards_and_files_ext.cpp:381
 msgid "PostScript files"
 msgstr "PostScript 文件"
 
-#: common/wildcards_and_files_ext.cpp:381
+#: common/wildcards_and_files_ext.cpp:387
 msgid "Report files"
 msgstr "报告文件"
 
-#: common/wildcards_and_files_ext.cpp:387
+#: common/wildcards_and_files_ext.cpp:393
 msgid "Footprint place files"
 msgstr "封装位置文件"
 
-#: common/wildcards_and_files_ext.cpp:393
+#: common/wildcards_and_files_ext.cpp:399
 msgid "VRML and X3D files"
 msgstr "VRML 和 X3D 文件"
 
-#: common/wildcards_and_files_ext.cpp:399
+#: common/wildcards_and_files_ext.cpp:405
 msgid "IDFv3 footprint files"
 msgstr "IDFv3 封装文件"
 
-#: common/wildcards_and_files_ext.cpp:405
+#: common/wildcards_and_files_ext.cpp:411
 msgid "Text files"
 msgstr "文本文件"
 
-#: common/wildcards_and_files_ext.cpp:411
+#: common/wildcards_and_files_ext.cpp:417
 msgid "Legacy footprint export files"
 msgstr "旧的封装导出文件"
 
-#: common/wildcards_and_files_ext.cpp:417
+#: common/wildcards_and_files_ext.cpp:423
 msgid "Electronic rule check file"
 msgstr "电气规则检查文件"
 
-#: common/wildcards_and_files_ext.cpp:423
+#: common/wildcards_and_files_ext.cpp:429
 msgid "Spice library file"
 msgstr "Spice 库文件"
 
-#: common/wildcards_and_files_ext.cpp:429
+#: common/wildcards_and_files_ext.cpp:435
 msgid "SPICE netlist file"
 msgstr "SPICE 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:435
+#: common/wildcards_and_files_ext.cpp:441
 msgid "CadStar netlist file"
 msgstr "CadStar 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:441
+#: common/wildcards_and_files_ext.cpp:447
 msgid "Symbol footprint association files"
 msgstr "符号封装关联文件"
 
-#: common/wildcards_and_files_ext.cpp:447
+#: common/wildcards_and_files_ext.cpp:453
 msgid "Zip file"
 msgstr "Zip 文件"
 
-#: common/wildcards_and_files_ext.cpp:453
+#: common/wildcards_and_files_ext.cpp:459
 msgid "GenCAD 1.4 board files"
 msgstr "GenCAD 1.4 线路板文件"
 
-#: common/wildcards_and_files_ext.cpp:459
+#: common/wildcards_and_files_ext.cpp:465
 msgid "DXF Files"
 msgstr "DXF 文件"
 
-#: common/wildcards_and_files_ext.cpp:465
+#: common/wildcards_and_files_ext.cpp:471
 msgid "Gerber job file"
 msgstr "Gerber 工作文件"
 
-#: common/wildcards_and_files_ext.cpp:471
+#: common/wildcards_and_files_ext.cpp:477
 msgid "Specctra DSN file"
 msgstr "Specctra DSN 文件"
 
-#: common/wildcards_and_files_ext.cpp:477
+#: common/wildcards_and_files_ext.cpp:483
 msgid "IPC-D-356 Test Files"
 msgstr "IPC-D-356 测试文件"
 
-#: common/wildcards_and_files_ext.cpp:483
+#: common/wildcards_and_files_ext.cpp:489
 msgid "Workbook file"
 msgstr "工作簿文件"
 
-#: common/wildcards_and_files_ext.cpp:489
+#: common/wildcards_and_files_ext.cpp:495
 msgid "PNG file"
 msgstr "PNG 文件"
 
-#: common/wildcards_and_files_ext.cpp:495
+#: common/wildcards_and_files_ext.cpp:501
 msgid "Jpeg file"
 msgstr "JPEG 文件"
 
@@ -5666,89 +5980,89 @@ msgstr ""
 msgid "An error occurred attempting to load the global footprint library table"
 msgstr "尝试加载全局封装库表时发生错误"
 
-#: cvpcb/cvpcb_mainframe.cpp:57 cvpcb/menubar.cpp:56
+#: cvpcb/cvpcb_mainframe.cpp:59 cvpcb/menubar.cpp:51
 msgid "Assign Footprints"
 msgstr "分配封装"
 
-#: cvpcb/cvpcb_mainframe.cpp:94 pcbnew/dialogs/panel_fp_lib_table.cpp:1010
+#: cvpcb/cvpcb_mainframe.cpp:98 pcbnew/dialogs/panel_fp_lib_table.cpp:1031
 msgid "Footprint Libraries"
 msgstr "封装库"
 
-#: cvpcb/cvpcb_mainframe.cpp:98
+#: cvpcb/cvpcb_mainframe.cpp:102
 msgid "Symbol : Footprint Assignments"
 msgstr "符号：封装分配"
 
-#: cvpcb/cvpcb_mainframe.cpp:101
+#: cvpcb/cvpcb_mainframe.cpp:105
 msgid "Filtered Footprints"
 msgstr "筛选的封装"
 
-#: cvpcb/cvpcb_mainframe.cpp:137
+#: cvpcb/cvpcb_mainframe.cpp:141
 #: eeschema/dialogs/dialog_fields_editor_global_base.cpp:105
 msgid "Apply, Save Schematic && Continue"
 msgstr "应用，保存原理图并继续"
 
-#: cvpcb/cvpcb_mainframe.cpp:169
+#: cvpcb/cvpcb_mainframe.cpp:170
 msgid "Symbol to footprint changes are unsaved"
 msgstr "封装更改的符号未保存"
 
-#: cvpcb/cvpcb_mainframe.cpp:303
+#: cvpcb/cvpcb_mainframe.cpp:348
 msgid "Symbol to Footprint links have been modified. Save changes?"
 msgstr "符号和封装关联已经更改。保存更改吗?"
 
-#: cvpcb/cvpcb_mainframe.cpp:435 cvpcb/tools/cvpcb_association_tool.cpp:224
+#: cvpcb/cvpcb_mainframe.cpp:481 cvpcb/tools/cvpcb_association_tool.cpp:218
 #, c-format
 msgid "\"%s\" is not a valid footprint."
 msgstr "\"%s\" 不是有效的封装。"
 
-#: cvpcb/cvpcb_mainframe.cpp:583
+#: cvpcb/cvpcb_mainframe.cpp:629
 msgid "key words"
 msgstr "关键词"
 
-#: cvpcb/cvpcb_mainframe.cpp:599
+#: cvpcb/cvpcb_mainframe.cpp:645
 msgid "pin count"
 msgstr "引脚数"
 
-#: cvpcb/cvpcb_mainframe.cpp:612
+#: cvpcb/cvpcb_mainframe.cpp:658
 msgid "library"
 msgstr "库"
 
-#: cvpcb/cvpcb_mainframe.cpp:625
+#: cvpcb/cvpcb_mainframe.cpp:671
 msgid "search text"
 msgstr "搜索文本"
 
-#: cvpcb/cvpcb_mainframe.cpp:629
+#: cvpcb/cvpcb_mainframe.cpp:675
 msgid "No filtering"
 msgstr "不筛选"
 
-#: cvpcb/cvpcb_mainframe.cpp:631
+#: cvpcb/cvpcb_mainframe.cpp:677
 #, c-format
 msgid "Filtered by %s"
 msgstr "筛选 %s"
 
-#: cvpcb/cvpcb_mainframe.cpp:645
+#: cvpcb/cvpcb_mainframe.cpp:691
 #, c-format
 msgid "Description: %s;  Key words: %s"
 msgstr "描述：%s；  关键字：%s"
 
-#: cvpcb/cvpcb_mainframe.cpp:677
+#: cvpcb/cvpcb_mainframe.cpp:723
 #, c-format
 msgid "Library location: %s"
 msgstr "库位置：%s"
 
-#: cvpcb/cvpcb_mainframe.cpp:679
+#: cvpcb/cvpcb_mainframe.cpp:725
 msgid "Library location: unknown"
 msgstr "库位置：未知"
 
-#: cvpcb/cvpcb_mainframe.cpp:692
+#: cvpcb/cvpcb_mainframe.cpp:738
 msgid ""
 "No PCB footprint libraries are listed in the current footprint library table."
 msgstr "在当前封装库表中没有列出 PCB 封装库。"
 
-#: cvpcb/cvpcb_mainframe.cpp:693
+#: cvpcb/cvpcb_mainframe.cpp:739
 msgid "Configuration Error"
 msgstr "配置错误"
 
-#: cvpcb/cvpcb_mainframe.cpp:760
+#: cvpcb/cvpcb_mainframe.cpp:806
 #, c-format
 msgid ""
 "Error loading schematic.\n"
@@ -5783,7 +6097,7 @@ msgstr "符号封装关联文件（.equ）"
 #: eeschema/dialogs/dialog_bus_manager.cpp:73
 #: eeschema/dialogs/dialog_bus_manager.cpp:107
 #: eeschema/dialogs/dialog_spice_model_base.cpp:651
-#: eeschema/libedit/lib_edit_frame.cpp:669
+#: eeschema/libedit/lib_edit_frame.cpp:861
 msgid "Add"
 msgstr "添加"
 
@@ -5850,33 +6164,33 @@ msgstr ""
 msgid "Footprint Assignment Conflicts"
 msgstr "封装分配冲突"
 
-#: cvpcb/display_footprints_frame.cpp:66 eeschema/toolbars_lib_view.cpp:106
-#: pcbnew/toolbars_footprint_viewer.cpp:168
+#: cvpcb/display_footprints_frame.cpp:68 eeschema/toolbars_lib_view.cpp:106
+#: pcbnew/toolbars_footprint_viewer.cpp:146
 msgid "Footprint Viewer"
 msgstr "封装浏览"
 
-#: cvpcb/display_footprints_frame.cpp:328
+#: cvpcb/display_footprints_frame.cpp:370
 #, c-format
 msgid "Footprint ID \"%s\" is not valid."
 msgstr "封装 ID \"%s\" 无效。"
 
-#: cvpcb/display_footprints_frame.cpp:343
+#: cvpcb/display_footprints_frame.cpp:385
 #, c-format
 msgid "Library \"%s\" is not in the footprint library table."
 msgstr "在封装库表中未找到 \"%s\" 库。"
 
-#: cvpcb/display_footprints_frame.cpp:352
-#: cvpcb/display_footprints_frame.cpp:374
+#: cvpcb/display_footprints_frame.cpp:394
+#: cvpcb/display_footprints_frame.cpp:416
 #, c-format
 msgid "Footprint \"%s\" not found."
 msgstr "封装 \"%s\" 没有找到。"
 
-#: cvpcb/display_footprints_frame.cpp:404 pcbnew/class_module.cpp:692
+#: cvpcb/display_footprints_frame.cpp:446 pcbnew/class_module.cpp:707
 #, c-format
 msgid "Footprint: %s"
 msgstr "封装：%s"
 
-#: cvpcb/display_footprints_frame.cpp:415
+#: cvpcb/display_footprints_frame.cpp:457
 #, c-format
 msgid "Lib: %s"
 msgstr "库：%s"
@@ -5892,27 +6206,27 @@ msgstr ""
 "的 LIB_ID 格式吗？（如果你回答否，这些分配将被清除，你将必须自己重新指定这些"
 "封装。）"
 
-#: cvpcb/readwrite_dlgs.cpp:151
+#: cvpcb/readwrite_dlgs.cpp:149
 #, 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:159
+#: cvpcb/readwrite_dlgs.cpp:157
 #, 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:172
+#: cvpcb/readwrite_dlgs.cpp:170
 msgid "First check your footprint library table entries."
 msgstr "首先检查封装库表条目。"
 
-#: cvpcb/readwrite_dlgs.cpp:174
+#: cvpcb/readwrite_dlgs.cpp:172
 msgid "Problematic Footprint Library Tables"
 msgstr "有问题的封装库表"
 
-#: cvpcb/readwrite_dlgs.cpp:182
+#: cvpcb/readwrite_dlgs.cpp:180
 msgid ""
 "The following errors occurred attempting to convert the footprint "
 "assignments:\n"
@@ -5921,7 +6235,7 @@ msgstr ""
 "试图转换封装分配时发生下列错误：\n"
 "\n"
 
-#: cvpcb/readwrite_dlgs.cpp:185
+#: cvpcb/readwrite_dlgs.cpp:183
 msgid ""
 "\n"
 "You will need to reassign them manually if you want them to be updated "
@@ -5930,7 +6244,7 @@ msgstr ""
 "\n"
 "如果你希望下次在 Pcbnew 中导入网表时正确更新它们，则需要手动重新分配它们。"
 
-#: cvpcb/readwrite_dlgs.cpp:302
+#: cvpcb/readwrite_dlgs.cpp:300
 msgid "Schematic saved"
 msgstr "保存原理图"
 
@@ -6025,36 +6339,36 @@ msgstr "按库筛选"
 msgid "Filter footprint list by library"
 msgstr "按库筛选封装列表"
 
-#: cvpcb/tools/cvpcb_association_tool.cpp:273
+#: cvpcb/tools/cvpcb_association_tool.cpp:267
 msgid "Delete all associations?"
 msgstr "是否删除所有关联？"
 
-#: eeschema/annotate.cpp:130
+#: eeschema/annotate.cpp:133
 #, c-format
 msgid "%d duplicate time stamps were found and replaced."
 msgstr "找到并替换 %d 个重复的时间戳。"
 
-#: eeschema/annotate.cpp:220
+#: eeschema/annotate.cpp:223
 #, c-format
 msgid "Updated %s (unit %s) from %s to %s"
 msgstr "更新 %s， (单元 %s) 从 %s 到 %s"
 
-#: eeschema/annotate.cpp:226
+#: eeschema/annotate.cpp:229
 #, c-format
 msgid "Updated %s from %s to %s"
 msgstr "更新 %s， 从 %s 到 %s"
 
-#: eeschema/annotate.cpp:234
+#: eeschema/annotate.cpp:237
 #, c-format
 msgid "Annotated %s (unit %s) as %s"
-msgstr "标注 %s (单元 %s)为 %s"
+msgstr "批注 %s (单元 %s)为 %s"
 
-#: eeschema/annotate.cpp:239
+#: eeschema/annotate.cpp:242
 #, c-format
 msgid "Annotated %s as %s"
-msgstr "标注 %s 为 %s"
+msgstr "批注 %s 为 %s"
 
-#: eeschema/annotate.cpp:249
+#: eeschema/annotate.cpp:252
 msgid "Annotation complete."
 msgstr "标注完成。"
 
@@ -6069,7 +6383,7 @@ msgstr ""
 "%s\n"
 "没有找到。脚本不可用。"
 
-#: eeschema/class_library.cpp:55
+#: eeschema/class_library.cpp:56
 #, c-format
 msgid ""
 "Library \"%s\" has duplicate entry name \"%s\".\n"
@@ -6079,16 +6393,16 @@ msgstr ""
 "库 \"%s\" 有重复的条目名 \"%s\"。\n"
 "在载入元件到原理图时,可能会导致一些异常情况。"
 
-#: eeschema/class_library.cpp:497 eeschema/libedit/lib_edit_frame.cpp:596
-#: eeschema/symbol_tree_model_adapter.cpp:63
+#: eeschema/class_library.cpp:498 eeschema/libedit/lib_edit_frame.cpp:771
+#: eeschema/symbol_tree_model_adapter.cpp:64
 msgid "Loading Symbol Libraries"
 msgstr "加载符号库"
 
-#: eeschema/class_library.cpp:514
+#: eeschema/class_library.cpp:516
 msgid "Loading "
 msgstr "载入中 "
 
-#: eeschema/class_library.cpp:557
+#: eeschema/class_library.cpp:559
 #, c-format
 msgid ""
 "Symbol library \"%s\" failed to load. Error:\n"
@@ -6097,7 +6411,7 @@ msgstr ""
 "符号库 \"%s\" 载入失败。错误：\n"
 " %s"
 
-#: eeschema/class_library.cpp:581
+#: eeschema/class_library.cpp:583
 #, c-format
 msgid ""
 "Symbol library \"%s\" failed to load.\n"
@@ -6109,12 +6423,12 @@ msgstr ""
 #: eeschema/component_references_lister.cpp:528
 #, c-format
 msgid "Item not annotated: %s%s (unit %d)\n"
-msgstr "未标注项目： %s%s(单元 %d)\n"
+msgstr "未批注项目： %s%s(单元 %d)\n"
 
 #: eeschema/component_references_lister.cpp:535
 #, c-format
 msgid "Item not annotated: %s%s\n"
-msgstr "未标注项目： %s%s\n"
+msgstr "未批注项目： %s%s\n"
 
 #: eeschema/component_references_lister.cpp:556
 #, c-format
@@ -6138,31 +6452,36 @@ msgstr "多重项目 %s%s\n"
 msgid "Different values for %s%d%s (%s) and %s%d%s (%s)"
 msgstr "不同的值：%s%d%s (%s) 和 %s%d%s (%s)"
 
-#: eeschema/cross-probing.cpp:150
+#: eeschema/connection_graph.cpp:2613
+#, c-format
+msgid "Sheet port %s has no matching hierarchical label inside the sheet"
+msgstr "图框端口 %s 在图框内没有匹配的分层标签"
+
+#: eeschema/cross-probing.cpp:143
 #, c-format
 msgid "pin %s"
 msgstr "引脚 %s"
 
-#: eeschema/cross-probing.cpp:152
+#: eeschema/cross-probing.cpp:145
 msgid "component"
 msgstr "元件"
 
-#: eeschema/cross-probing.cpp:157
+#: eeschema/cross-probing.cpp:150
 #, c-format
 msgid "%s %s found"
 msgstr "%s %s 找到"
 
-#: eeschema/cross-probing.cpp:159
+#: eeschema/cross-probing.cpp:152
 #, c-format
 msgid "%s found but %s not found"
 msgstr "找到 %s 但 %s 未找到"
 
-#: eeschema/cross-probing.cpp:162
+#: eeschema/cross-probing.cpp:155
 #, c-format
 msgid "Component %s not found"
 msgstr "元件 %s 没有找到"
 
-#: eeschema/cross-probing.cpp:210
+#: eeschema/cross-probing.cpp:203
 msgid "Selected net: "
 msgstr "选择网络： "
 
@@ -6172,7 +6491,7 @@ msgstr "标注信息："
 
 #: eeschema/dialogs/dialog_annotate.cpp:101
 msgid "Annotate"
-msgstr "标注"
+msgstr "批注"
 
 #: eeschema/dialogs/dialog_annotate_base.cpp:38
 msgid "Entire schematic"
@@ -6211,7 +6530,7 @@ msgid "Reset, but keep order of multi-unit parts"
 msgstr "重置，但保持多单元器件的顺序"
 
 #: eeschema/dialogs/dialog_annotate_base.cpp:82
-#: eeschema/dialogs/dialog_netlist.cpp:245
+#: eeschema/dialogs/dialog_netlist.cpp:258
 #: pcbnew/dialogs/dialog_pns_settings_base.cpp:26
 msgid "Options:"
 msgstr "选项："
@@ -6238,34 +6557,34 @@ msgstr "清除批注"
 
 #: eeschema/dialogs/dialog_annotate_base.h:79
 msgid "Annotate Schematic"
-msgstr "标注原理图"
+msgstr "批注原理图"
 
 #: eeschema/dialogs/dialog_bom.cpp:238
 msgid "Generate"
 msgstr "生成"
 
-#: eeschema/dialogs/dialog_bom.cpp:514 eeschema/dialogs/dialog_bom_base.cpp:43
+#: eeschema/dialogs/dialog_bom.cpp:513 eeschema/dialogs/dialog_bom_base.cpp:43
 msgid "Generator nickname:"
 msgstr "生成昵称："
 
-#: eeschema/dialogs/dialog_bom.cpp:514
+#: eeschema/dialogs/dialog_bom.cpp:513
 msgid "Add Generator"
 msgstr "添加生成器"
 
-#: eeschema/dialogs/dialog_bom.cpp:523
+#: eeschema/dialogs/dialog_bom.cpp:522
 #, c-format
 msgid "Nickname \"%s\" already in use."
 msgstr "昵称 \"%s\" 已经被占用了。"
 
-#: eeschema/dialogs/dialog_bom.cpp:558 eeschema/dialogs/dialog_netlist.cpp:687
+#: eeschema/dialogs/dialog_bom.cpp:557 eeschema/dialogs/dialog_netlist.cpp:761
 msgid "Generator files:"
 msgstr "生成钻孔文件："
 
-#: eeschema/dialogs/dialog_bom.cpp:577
+#: eeschema/dialogs/dialog_bom.cpp:576
 msgid "Generator file name not found."
 msgstr "找不到生成器文件名。"
 
-#: eeschema/dialogs/dialog_bom.cpp:587
+#: eeschema/dialogs/dialog_bom.cpp:586
 msgid "No text editor selected in KiCad.  Please choose one."
 msgstr "在 KiCad 中未选择任何文本编辑器，请选择一个。"
 
@@ -6686,6 +7005,87 @@ msgstr "总线别名名称"
 msgid "Net or Bus Name"
 msgstr "网络或总线名称"
 
+#: eeschema/dialogs/dialog_change_symbols.cpp:48
+#: eeschema/dialogs/dialog_change_symbols.cpp:310
+#: eeschema/dialogs/dialog_update_from_pcb_base.cpp:49
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:70
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:362
+#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:207
+msgid "Update"
+msgstr "更新"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:48
+#: eeschema/dialogs/dialog_change_symbols.cpp:310
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:70
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:362
+msgid "Change"
+msgstr "修改"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:55
+msgid "Update Symbol(s) from Library"
+msgstr "从库中更新符号"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:60
+msgid "Change Symbol(s)"
+msgstr "更改符号"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:309
+#, c-format
+msgid "%s %s \"%s\" from \"%s\" to \"%s\""
+msgstr "%s %s \"%s\" 从 \"%s\" 到 \"%s\""
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:311
+#: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:31
+msgid "symbol"
+msgstr "符号"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:311
+msgid "symbols"
+msgstr "符号"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:320
+msgid "*** symbol not found ***"
+msgstr "*** 符号没有找到 ***"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:329
+msgid "*** new symbol has too few units ***"
+msgstr "*** 新符号的单元太少 ***"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:24
+#, c-format
+msgid "%s all symbols in schematic"
+msgstr "%s 原理图中的所有符号"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:27
+#, c-format
+msgid "%s selected symbol"
+msgstr "%s 选择符号"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:30
+#, c-format
+msgid "%s by reference:"
+msgstr "%s (按引用)："
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:36
+#, c-format
+msgid "%s by value:"
+msgstr "%s (按值)："
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:42
+#, c-format
+msgid "%s by library indentifier:"
+msgstr "%s (按库标识符)："
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:60
+msgid "New library identifier:"
+msgstr "新库标识符："
+
+#: eeschema/dialogs/dialog_change_symbols_base.h:75
+#: pcbnew/dialogs/dialog_exchange_footprints_base.h:86
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 #: eeschema/dialogs/dialog_choose_component.cpp:127
 #: pcbnew/dialogs/dialog_choose_footprint.cpp:94
 msgid "Select with Browser"
@@ -6707,8 +7107,8 @@ msgstr "放置所有元件"
 msgid "Sequentially place all units of the symbol."
 msgstr "按顺序放置符号的所有单元。"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:374
-#: eeschema/widgets/symbol_preview_widget.cpp:165
+#: eeschema/dialogs/dialog_choose_component.cpp:385
+#: eeschema/widgets/symbol_preview_widget.cpp:178
 #, c-format
 msgid ""
 "Error loading symbol %s from library %s.\n"
@@ -6719,15 +7119,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:397
+#: eeschema/dialogs/dialog_choose_component.cpp:408
 msgid "No footprint specified"
 msgstr "没有指定封装"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:411
+#: eeschema/dialogs/dialog_choose_component.cpp:422
 msgid "Invalid footprint specified"
 msgstr "指定的封装无效"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:434
+#: eeschema/dialogs/dialog_choose_component.cpp:445
 #: eeschema/dialogs/dialog_edit_components_libid.cpp:739
 #: eeschema/generate_alias_info.cpp:81
 #, c-format
@@ -6740,57 +7140,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:496
+#: eeschema/dialogs/dialog_choose_component.cpp:507
 msgid "No symbol selected"
 msgstr "没有选择符号"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib.cpp:222
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:320
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:332
 msgid "References must start with a letter."
 msgstr "参考编号必须以字母开头。"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib.cpp:242
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:373
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:197
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:385
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:189
 msgid "Fields must have a name."
 msgstr "字段必须要有名称。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:254
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:259
+msgid "Aliased symbol must have a parent selected"
+msgstr "带别名的符号必须选择父级"
+
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:267
 msgid "Delete extra units from symbol?"
 msgstr "是否删除符号多余单元?"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:260
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:273
 msgid "Add new pins for alternate body style (DeMorgan) to symbol?"
 msgstr "添加新的引脚到符号的备用主体 (德摩根)？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:265
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:278
 msgid "Delete alternate body style (DeMorgan) draw items from symbol?"
 msgstr "确定从符号中删除备用主体样式 (德摩根) 的图形项目？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:290
-#: eeschema/libedit/libedit.cpp:521
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:303
+#: eeschema/libedit/libedit.cpp:520
 #, c-format
 msgid "The name '%s' conflicts with an existing entry in the library '%s'."
 msgstr "名称 \"%s\" 与库 \"%s\" 中的现有条目冲突。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:380
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:564
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:413
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:580
 #, c-format
 msgid "The name '%s' is already in use."
 msgstr "名称 '%s' 已经在使用中。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:447
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:614
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:660
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:480
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:630
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:652
 #, c-format
 msgid "The first %d fields are mandatory."
 msgstr "首字段 %d 是必填字段。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:564
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:597
 msgid "Add Footprint Filter"
 msgstr "添加封装筛选"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:603
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:636
 msgid "Edit Footprint Filter"
 msgstr "编辑封装筛选"
 
@@ -6806,9 +7210,9 @@ msgstr "字段"
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:52
 #: eeschema/fields_grid_table.cpp:197
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:54
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:431
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:456
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:54
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:335
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:360
 #: pcbnew/dialogs/panel_modedit_defaults.cpp:51
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:46
 #: pcbnew/text_mod_grid_table.cpp:89
@@ -6840,12 +7244,13 @@ msgstr "文本大小"
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:56
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:189
 #: eeschema/dialogs/dialog_edit_label_base.cpp:120
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:80
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:65
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:48
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:42
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:58
-#: eeschema/fields_grid_table.cpp:203 eeschema/lib_pin.cpp:1461
-#: eeschema/sch_text.cpp:673 pcbnew/class_module.cpp:1678
-#: pcbnew/class_pad.cpp:1290
+#: eeschema/fields_grid_table.cpp:203 eeschema/lib_pin.cpp:999
+#: eeschema/sch_pin.cpp:174 eeschema/sch_text.cpp:644
+#: pcbnew/class_module.cpp:1719 pcbnew/class_pad.cpp:1345
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:60
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:156
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:60
@@ -6855,8 +7260,9 @@ msgstr "方向"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:65
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:57
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:84
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:69
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:52
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:46
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:59
 #: eeschema/fields_grid_table.cpp:204
 msgid "X Position"
@@ -6864,8 +7270,9 @@ msgstr "X 坐标"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:66
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:58
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:85
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:70
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:53
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:47
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:60
 #: eeschema/fields_grid_table.cpp:205
 msgid "Y Position"
@@ -6983,8 +7390,8 @@ msgid ""
 msgstr "创建多单元符号时，勾选这个选项，所有单元都不能互换"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:208
-msgid "Pin Texts Options:"
-msgstr "引脚文本选项："
+msgid "Pin Text Options"
+msgstr "引脚文本选项"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:210
 msgid "Show pin number"
@@ -7028,33 +7435,34 @@ msgstr ""
 "通常设置为 10 到 40 是比较理想的。"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:243
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:110
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:114
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:118
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:122
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:126
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:111
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:115
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:119
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:123
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:127
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:124
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:149
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:176
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:189
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:170
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:201
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:214
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:227
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:284
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:295
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:342
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:65
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:118
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:129
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:193
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:248
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:261
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:309
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:320
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:367
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:71
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:92
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:144
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:155
 msgid "units"
 msgstr "单元"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:266
-#: eeschema/dialogs/dialog_schematic_setup.cpp:65
+#: eeschema/dialogs/dialog_schematic_setup.cpp:66
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:211
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:286
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:190
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:579
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:103
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:311
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:215
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:571
 msgid "General"
 msgstr "常规"
 
@@ -7088,7 +7496,6 @@ msgid "Footprint Filters"
 msgstr "封装筛选器"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:327
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:212
 msgid "Edit Spice Model..."
 msgstr "编辑 Spice 模型..."
 
@@ -7096,25 +7503,25 @@ msgstr "编辑 Spice 模型..."
 msgid "Library Symbol Properties"
 msgstr "库符号属性"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:332
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:344
 msgid "Library reference is not valid."
 msgstr "库参考无效。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:352
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:364
 #, c-format
 msgid "Symbol \"%s\" not found in library \"%s\"."
 msgstr "符号 \"%s\" 在库中 \"%s\" 没有找到。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:413
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:698
-#: eeschema/tools/sch_edit_tool.cpp:1298
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:426
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:714
+#: eeschema/tools/sch_edit_tool.cpp:1338
 #, c-format
 msgid "'%s' is not a valid library indentifier."
 msgstr "'%s' 不是有效的库标识符。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:423
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:708
-#: eeschema/tools/sch_edit_tool.cpp:1308
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:436
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:724
+#: eeschema/tools/sch_edit_tool.cpp:1348
 #, c-format
 msgid "Symbol '%s' not found in symbol library '%s'."
 msgstr "符号 \"%s\" 在符号库中 \"%s\" 没有找到。"
@@ -7182,7 +7589,7 @@ msgstr ""
 "不需要布局电路板，如机械插件和外壳"
 
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:187
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:103
+#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:97
 #: pcbnew/dialogs/dialog_create_array_base.cpp:71
 #: pcbnew/dialogs/dialog_create_array_base.cpp:82
 #: pcbnew/dialogs/dialog_create_array_base.cpp:211
@@ -7204,7 +7611,7 @@ msgstr ""
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:42
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:56
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:336
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1417
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1436
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:71
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:88
 msgid "0"
@@ -7243,7 +7650,16 @@ msgstr "方向"
 msgid "Pick the graphical transformation to be used when displaying the symbol"
 msgstr "指定元件显示图形变换时使用"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.h:86
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:212
+msgid "Spice Model..."
+msgstr "Spice 模型..."
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:217
+#: eeschema/tools/ee_actions.cpp:473
+msgid "Pin Table..."
+msgstr "引脚列表..."
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.h:88
 msgid "Symbol Properties"
 msgstr "符号属性"
 
@@ -7323,7 +7739,7 @@ msgid "Hierarchical Sheet Pin Properties"
 msgstr "层次分页引脚属性"
 
 #: eeschema/dialogs/dialog_edit_label.cpp:62
-#: pcbnew/dialogs/dialog_text_properties.cpp:116
+#: pcbnew/dialogs/dialog_text_properties.cpp:120
 #: pcbnew/dialogs/dialog_text_properties_base.h:97
 msgid "Text Properties"
 msgstr "文本属性"
@@ -7344,7 +7760,7 @@ msgstr "输入文本将在原理图中使用"
 #: eeschema/dialogs/dialog_edit_label_base.cpp:37
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:28
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:45
-#: pcbnew/dialogs/dialog_text_properties.cpp:107
+#: pcbnew/dialogs/dialog_text_properties.cpp:111
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:24
 msgid "Text:"
 msgstr "文本："
@@ -7374,13 +7790,13 @@ msgstr ""
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:118
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:184
-#: eeschema/lib_pin.cpp:122
+#: eeschema/pin_type.cpp:128
 msgid "Up"
 msgstr "向上"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:118
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:184
-#: eeschema/lib_pin.cpp:123
+#: eeschema/pin_type.cpp:129
 msgid "Down"
 msgstr "向下"
 
@@ -7390,46 +7806,47 @@ msgstr "加粗斜体"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:126
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:115
-#: eeschema/lib_field.cpp:434 eeschema/lib_pin.cpp:1451
-#: eeschema/sch_text.cpp:684
+#: eeschema/lib_field.cpp:434 eeschema/lib_pin.cpp:989 eeschema/sch_pin.cpp:164
+#: eeschema/sch_text.cpp:655
 msgid "Style"
 msgstr "样式"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:33 eeschema/pin_type.cpp:45
-#: eeschema/sch_text.cpp:464
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:33 eeschema/pin_type.cpp:52
+#: eeschema/sch_text.cpp:463
 msgid "Input"
 msgstr "输入"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:34 eeschema/pin_type.cpp:46
-#: eeschema/sch_text.cpp:465
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:34 eeschema/pin_type.cpp:53
+#: eeschema/sch_text.cpp:464
 msgid "Output"
 msgstr "输出"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:35 eeschema/pin_type.cpp:47
-#: eeschema/sch_text.cpp:466
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:35 eeschema/pin_type.cpp:54
+#: eeschema/sch_text.cpp:465
 msgid "Bidirectional"
 msgstr "双向"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:36 eeschema/pin_type.cpp:48
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:36 eeschema/pin_type.cpp:55
 msgid "Tri-state"
 msgstr "三态"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
 #: eeschema/dialogs/dialog_edit_sheet_pin.cpp:37
-#: eeschema/dialogs/dialog_spice_model_base.cpp:199 eeschema/pin_type.cpp:49
-#: eeschema/sch_text.cpp:468
+#: eeschema/dialogs/dialog_spice_model_base.cpp:199 eeschema/pin_type.cpp:56
+#: eeschema/sch_text.cpp:467
 msgid "Passive"
 msgstr "无源"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:132
-#: pcbnew/class_drawsegment.cpp:432 pcbnew/class_pad.cpp:1286
+#: pcbnew/class_drawsegment.cpp:463 pcbnew/class_pad.cpp:1341
 #: pcbnew/class_pcb_target.cpp:158
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:231
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:100
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:121
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:44
 msgid "Shape"
 msgstr "形状"
 
@@ -7437,33 +7854,37 @@ msgstr "形状"
 msgid "Text Editor"
 msgstr "文本编辑器"
 
-#: eeschema/dialogs/dialog_edit_line_style_base.cpp:43
-#: eeschema/dialogs/dialog_junction_props_base.cpp:36
+#: eeschema/dialogs/dialog_edit_line_style.cpp:54
+msgid "Leave unchanged"
+msgstr "保持不变"
+
+#: eeschema/dialogs/dialog_edit_line_style_base.cpp:44
+#: eeschema/dialogs/dialog_junction_props_base.cpp:38
 msgid "Color:"
 msgstr "颜色："
 
-#: eeschema/dialogs/dialog_edit_line_style_base.cpp:55
+#: eeschema/dialogs/dialog_edit_line_style_base.cpp:64
 msgid "Style:"
 msgstr "样式："
 
-#: eeschema/dialogs/dialog_edit_line_style_base.cpp:59
+#: eeschema/dialogs/dialog_edit_line_style_base.cpp:68
 #: eeschema/dialogs/dialog_lib_new_component_base.cpp:45
 msgid "Combo!"
 msgstr "组合！"
 
 #: eeschema/dialogs/dialog_edit_one_field.cpp:218
 msgid "Illegal reference designator value!"
-msgstr "非法引用指示符值！"
+msgstr "非法引用位号值！"
 
 #: eeschema/dialogs/dialog_edit_one_field.cpp:226
 msgid "Value may not be empty."
 msgstr "值不能是空的。"
 
 #: eeschema/dialogs/dialog_edit_sheet_pin_base.cpp:28
-#: eeschema/dialogs/dialog_netlist_base.cpp:85 eeschema/libedit/libedit.cpp:437
+#: eeschema/dialogs/dialog_netlist_base.cpp:85 eeschema/libedit/libedit.cpp:436
 #: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:27
 #: pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.cpp:35
-#: pcbnew/footprint_libraries_utils.cpp:879
+#: pcbnew/footprint_libraries_utils.cpp:894
 msgid "Name:"
 msgstr "名称："
 
@@ -7485,154 +7906,154 @@ msgstr "图框引脚属性"
 msgid "Run"
 msgstr "运行"
 
-#: eeschema/dialogs/dialog_erc.cpp:131 pcbnew/dialogs/dialog_drc.cpp:610
+#: eeschema/dialogs/dialog_erc.cpp:84 eeschema/dialogs/dialog_erc.cpp:215
+#: eeschema/dialogs/dialog_erc.cpp:230
+msgid "Some components are not annotated.  ERC cannot be run."
+msgstr "某些元件未添加批注。  无法运行 ERC。"
+
+#: eeschema/dialogs/dialog_erc.cpp:134
 msgid "Delete exclusions too?"
 msgstr "是否也删除排除项？"
 
-#: eeschema/dialogs/dialog_erc.cpp:131 pcbnew/dialogs/dialog_drc.cpp:610
+#: eeschema/dialogs/dialog_erc.cpp:134 pcbnew/dialogs/dialog_drc.cpp:661
 #: pcbnew/dialogs/dialog_drc_base.cpp:219
 msgid "Delete All Markers"
 msgstr "删除所有标记"
 
-#: eeschema/dialogs/dialog_erc.cpp:133 pcbnew/dialogs/dialog_drc.cpp:612
+#: eeschema/dialogs/dialog_erc.cpp:136
 msgid "Errors and Warnings Only"
 msgstr "仅限错误和警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:133 pcbnew/dialogs/dialog_drc.cpp:612
+#: eeschema/dialogs/dialog_erc.cpp:136
 msgid "Errors, Warnings and Exclusions"
 msgstr "错误，警告和排除"
 
-#: eeschema/dialogs/dialog_erc.cpp:212
-msgid "Annotation required!"
-msgstr "需要注释！"
+#: eeschema/dialogs/dialog_erc.cpp:218
+msgid "Some components are not annotated.  Open annotation dialog?"
+msgstr "某些元件未添加批注。  是否打开批注对话框？"
 
-#: eeschema/dialogs/dialog_erc.cpp:225
+#: eeschema/dialogs/dialog_erc.cpp:246
 msgid "Checking sheet names...\n"
 msgstr "检查图框名称...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:231
+#: eeschema/dialogs/dialog_erc.cpp:252
 msgid "Checking bus conflicts...\n"
 msgstr "检查总线冲突...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:236
+#: eeschema/dialogs/dialog_erc.cpp:257
 msgid "Checking conflicts...\n"
 msgstr "正在检查冲突...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:243
+#: eeschema/dialogs/dialog_erc.cpp:264
 msgid "Checking footprints...\n"
 msgstr "检查封装...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:266
-msgid "Checking connections...\n"
-msgstr "检查连接...\n"
+#: eeschema/dialogs/dialog_erc.cpp:268
+msgid "Checking pins...\n"
+msgstr "检查引脚...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:313
-#, c-format
-msgid "Pin %s is connected to both %s and %s"
-msgstr "引脚 %s 同时连接到 %s 和 %s"
-
-#: eeschema/dialogs/dialog_erc.cpp:342
+#: eeschema/dialogs/dialog_erc.cpp:281
 msgid "Checking labels...\n"
 msgstr "检查标签...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:367 pcbnew/drc/drc.cpp:442
+#: eeschema/dialogs/dialog_erc.cpp:306 pcbnew/drc/drc.cpp:436
 #: qa/drc_proto/drc.cpp:476
 msgid "Finished"
 msgstr "完成"
 
-#: eeschema/dialogs/dialog_erc.cpp:429 pcbnew/dialogs/dialog_drc.cpp:288
+#: eeschema/dialogs/dialog_erc.cpp:368 pcbnew/dialogs/dialog_drc.cpp:316
 msgid "errors"
 msgstr "错误"
 
-#: eeschema/dialogs/dialog_erc.cpp:430 pcbnew/dialogs/dialog_drc.cpp:289
+#: eeschema/dialogs/dialog_erc.cpp:369 pcbnew/dialogs/dialog_drc.cpp:317
 msgid "warnings"
 msgstr "警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:431 pcbnew/dialogs/dialog_drc.cpp:290
+#: eeschema/dialogs/dialog_erc.cpp:370 pcbnew/dialogs/dialog_drc.cpp:318
 msgid "appropriate"
 msgstr "适当"
 
-#: eeschema/dialogs/dialog_erc.cpp:436 pcbnew/dialogs/dialog_drc.cpp:295
+#: eeschema/dialogs/dialog_erc.cpp:375 pcbnew/dialogs/dialog_drc.cpp:323
 msgid "Remove exclusion for this violation"
 msgstr "不再排除此违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:437 pcbnew/dialogs/dialog_drc.cpp:296
+#: eeschema/dialogs/dialog_erc.cpp:376 pcbnew/dialogs/dialog_drc.cpp:324
 #, c-format
 msgid "It will be placed back in the %s list"
 msgstr "它将放回 %s 列表中"
 
-#: eeschema/dialogs/dialog_erc.cpp:441 pcbnew/dialogs/dialog_drc.cpp:300
+#: eeschema/dialogs/dialog_erc.cpp:380 pcbnew/dialogs/dialog_drc.cpp:328
 msgid "Exclude this violation"
 msgstr "排除此违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:442 pcbnew/dialogs/dialog_drc.cpp:301
+#: eeschema/dialogs/dialog_erc.cpp:381 pcbnew/dialogs/dialog_drc.cpp:329
 #, c-format
 msgid "It will be excluded from the %s list"
 msgstr "它将从 %s 列表中排除"
 
-#: eeschema/dialogs/dialog_erc.cpp:454 pcbnew/dialogs/dialog_drc.cpp:308
+#: eeschema/dialogs/dialog_erc.cpp:393 pcbnew/dialogs/dialog_drc.cpp:336
 #, c-format
 msgid "Change severity to Error for all '%s' violations"
 msgstr "将所有 \"%s\" 违规的严重性更改为错误"
 
-#: eeschema/dialogs/dialog_erc.cpp:456 eeschema/dialogs/dialog_erc.cpp:462
-#: pcbnew/dialogs/dialog_drc.cpp:310 pcbnew/dialogs/dialog_drc.cpp:317
+#: eeschema/dialogs/dialog_erc.cpp:395 eeschema/dialogs/dialog_erc.cpp:401
+#: pcbnew/dialogs/dialog_drc.cpp:338 pcbnew/dialogs/dialog_drc.cpp:345
 msgid "Violation severities can also be edited in the Board Setup... dialog"
 msgstr "违规严重程度也可以在“电路板设置...”对话框中进行编辑"
 
-#: eeschema/dialogs/dialog_erc.cpp:460 pcbnew/dialogs/dialog_drc.cpp:315
+#: eeschema/dialogs/dialog_erc.cpp:399 pcbnew/dialogs/dialog_drc.cpp:343
 #, c-format
 msgid "Change severity to Warning for all '%s' violations"
 msgstr "将所有 \"%s\" 违规的严重程度更改为警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:465 pcbnew/dialogs/dialog_drc.cpp:321
+#: eeschema/dialogs/dialog_erc.cpp:404 pcbnew/dialogs/dialog_drc.cpp:349
 #, c-format
 msgid "Ignore all '%s' violations"
 msgstr "忽略所有 \"%s\" 违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:466 pcbnew/dialogs/dialog_drc.cpp:323
+#: eeschema/dialogs/dialog_erc.cpp:405 pcbnew/dialogs/dialog_drc.cpp:351
 msgid "Violations will not be checked or reported"
 msgstr "违规将不会被检查或报告"
 
-#: eeschema/dialogs/dialog_erc.cpp:473
+#: eeschema/dialogs/dialog_erc.cpp:412
 msgid "Edit pin-to-pin conflict map..."
 msgstr "编辑引脚到引脚冲突映射..."
 
-#: eeschema/dialogs/dialog_erc.cpp:477 pcbnew/dialogs/dialog_drc.cpp:328
+#: eeschema/dialogs/dialog_erc.cpp:416 pcbnew/dialogs/dialog_drc.cpp:356
 msgid "Edit violation severities..."
 msgstr "编辑违规严重性......"
 
-#: eeschema/dialogs/dialog_erc.cpp:478
+#: eeschema/dialogs/dialog_erc.cpp:417
 msgid "Open the Schematic Setup... dialog"
 msgstr "打开“原理图设置...”对话框"
 
-#: eeschema/dialogs/dialog_erc.cpp:536
-#: eeschema/dialogs/dialog_schematic_setup.cpp:71
+#: eeschema/dialogs/dialog_erc.cpp:475
+#: eeschema/dialogs/dialog_schematic_setup.cpp:72
 msgid "Pin Conflicts Map"
 msgstr "引脚冲突映射"
 
-#: eeschema/dialogs/dialog_erc.cpp:540
-#: eeschema/dialogs/dialog_schematic_setup.cpp:70
-#: pcbnew/dialogs/dialog_board_setup.cpp:84 pcbnew/dialogs/dialog_drc.cpp:395
+#: eeschema/dialogs/dialog_erc.cpp:479
+#: eeschema/dialogs/dialog_schematic_setup.cpp:71
+#: pcbnew/dialogs/dialog_board_setup.cpp:85 pcbnew/dialogs/dialog_drc.cpp:444
 msgid "Violation Severity"
 msgstr "违规严重程度"
 
-#: eeschema/dialogs/dialog_erc.cpp:612 pcbnew/dialogs/dialog_drc.cpp:467
+#: eeschema/dialogs/dialog_erc.cpp:551 pcbnew/dialogs/dialog_drc.cpp:516
 #, c-format
 msgid "Report file '%s' created\n"
 msgstr "创建报告文件 \"%s\"\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:617 pcbnew/dialogs/dialog_drc.cpp:472
+#: eeschema/dialogs/dialog_erc.cpp:556 pcbnew/dialogs/dialog_drc.cpp:521
 #, c-format
 msgid "Unable to create report file '%s'"
 msgstr "无法创建报告文件 \"%s\""
 
-#: eeschema/dialogs/dialog_erc.cpp:630
+#: eeschema/dialogs/dialog_erc.cpp:569
 #, c-format
 msgid "ERC report (%s, Encoding UTF8)\n"
 msgstr "ERC 报告（%s，编码 UTF8）\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:645
+#: eeschema/dialogs/dialog_erc.cpp:584
 #, c-format
 msgid ""
 "\n"
@@ -7641,7 +8062,7 @@ msgstr ""
 "\n"
 "***** 图框 %s\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:667
+#: eeschema/dialogs/dialog_erc.cpp:606
 #, c-format
 msgid ""
 "\n"
@@ -7650,55 +8071,55 @@ msgstr ""
 "\n"
 " ** ERC 信息: %d  错误 %d  警告 %d\n"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:28
+#: eeschema/dialogs/dialog_erc_base.cpp:35
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1529
 msgid "Messages:"
 msgstr "信息："
 
-#: eeschema/dialogs/dialog_erc_base.cpp:45
+#: eeschema/dialogs/dialog_erc_base.cpp:52
 msgid "Violations:"
 msgstr "违规："
 
-#: eeschema/dialogs/dialog_erc_base.cpp:52
+#: eeschema/dialogs/dialog_erc_base.cpp:59
 #: pcbnew/dialogs/dialog_drc_base.cpp:125
 msgid "Click on items to highlight them on the board."
 msgstr "单击项目以在板上高亮它们。"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:86
+#: eeschema/dialogs/dialog_erc_base.cpp:93
 #: pcbnew/dialogs/dialog_drc_base.cpp:193
 msgid "Exclusions"
 msgstr "排除"
 
-#: eeschema/dialogs/dialog_erc_base.cpp:109
+#: eeschema/dialogs/dialog_erc_base.cpp:116
 msgid "Delete Markers"
 msgstr "删除标记"
 
-#: eeschema/dialogs/dialog_erc_base.h:78 eeschema/tools/ee_actions.cpp:44
+#: eeschema/dialogs/dialog_erc_base.h:82 eeschema/tools/ee_actions.cpp:44
 msgid "Electrical Rules Checker"
 msgstr "电气规则检查 (ERC)"
 
 #: eeschema/dialogs/dialog_fields_editor_global.cpp:71
-#: eeschema/fields_grid_table.cpp:574
+#: eeschema/fields_grid_table.cpp:576
 msgid "Select Footprint..."
 msgstr "选择封装..."
 
 #: eeschema/dialogs/dialog_fields_editor_global.cpp:72
-#: eeschema/fields_grid_table.cpp:575
+#: eeschema/fields_grid_table.cpp:577
 msgid "Browse for footprint"
 msgstr "浏览封装"
 
 #: eeschema/dialogs/dialog_fields_editor_global.cpp:77
-#: eeschema/fields_grid_table.cpp:580 eeschema/tools/ee_actions.cpp:55
+#: eeschema/fields_grid_table.cpp:582 eeschema/tools/ee_actions.cpp:55
 msgid "Show Datasheet"
 msgstr "显示数据手册"
 
 #: eeschema/dialogs/dialog_fields_editor_global.cpp:78
-#: eeschema/fields_grid_table.cpp:581
+#: eeschema/fields_grid_table.cpp:583
 msgid "Show datasheet in browser"
 msgstr "在浏览器中显示数据书册"
 
 #: eeschema/dialogs/dialog_fields_editor_global.cpp:112
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:1037
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:1038
 msgid "The Reference column cannot be hidden."
 msgstr "无法隐藏“参考”列。"
 
@@ -7715,23 +8136,29 @@ msgstr "字段"
 msgid "Group By"
 msgstr "分组依据"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:975
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:976
 msgid "New field name:"
 msgstr "新字段名称："
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:975
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:976
 msgid "Add Field"
 msgstr "添加字段"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:984
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:985
 msgid "Field must have a name."
 msgstr "字段必须要有一个名称。"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:992
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:993
 #, c-format
 msgid "Field name \"%s\" already in use."
 msgstr "字段名称 \"%s\" 已经在使用。"
 
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:1191
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:699
+#: eeschema/dialogs/dialog_sch_pin_table.cpp:397
+msgid "Save changes?"
+msgstr "保存更改吗？"
+
 #: eeschema/dialogs/dialog_fields_editor_global_base.cpp:31
 msgid "Group symbols"
 msgstr "分组符号"
@@ -7751,6 +8178,7 @@ msgstr "符号字段"
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:23
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:25
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:25
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:35
 msgid "Scope"
 msgstr "范围"
 
@@ -7758,7 +8186,7 @@ msgstr "范围"
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:58
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:27
 msgid "Reference designators"
-msgstr "参考标识符"
+msgstr "位号"
 
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:31
 msgid "Other symbol fields"
@@ -7812,7 +8240,7 @@ msgstr "按名称筛选字段："
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:94
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:72
 msgid "Filter items by parent reference designator:"
-msgstr "按父级参考指示符过滤项目："
+msgstr "按父级位号过滤项目："
 
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:102
 msgid "Filter items by parent symbol library id:"
@@ -7847,7 +8275,7 @@ msgstr "设置为"
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1004
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1014
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1026
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:534
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:537
 msgid "..."
 msgstr "..."
 
@@ -7886,10 +8314,6 @@ msgstr "图框背景颜色："
 msgid "Edit Text and Graphic Properties"
 msgstr "编辑文本和图形属性属性"
 
-#: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:31
-msgid "symbol"
-msgstr "符号"
-
 #: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:61
 #, c-format
 msgid ""
@@ -7952,11 +8376,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/dialog_junction_props_base.cpp:25
+#: eeschema/dialogs/dialog_junction_props_base.cpp:27
 msgid "Diameter:"
 msgstr "直径："
 
-#: eeschema/dialogs/dialog_junction_props_base.h:58
+#: eeschema/dialogs/dialog_junction_props_base.h:57
 msgid "Junction Properties"
 msgstr "节点属性"
 
@@ -7981,7 +8405,7 @@ msgid "Common to all &units in component"
 msgstr "元件中所有单元共用 (&U)"
 
 #: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:48
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:147
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:148
 msgid "Common to all body &styles (DeMorgan)"
 msgstr "所有主体风格 (德摩根) 共用 (&S)"
 
@@ -7989,116 +8413,63 @@ msgstr "所有主体风格 (德摩根) 共用 (&S)"
 msgid "Drawing Properties"
 msgstr "图形特性"
 
-#: eeschema/dialogs/dialog_lib_edit_pin.cpp:141
-#, c-format
-msgid ""
-"This pin is not on a %d mils grid which will make it\n"
-"difficult to connect to in the schematic.\n"
-"Do you want to continue?"
-msgstr ""
-"此引脚不在 %d mils 网格上\n"
-"在原理图中难以连接\n"
-"你想继续吗？"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:34
-msgid "Pin &name:"
-msgstr "引脚名称 (&N)："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:41
-msgid "Pin num&ber:"
-msgstr "引脚编号 (&B)："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:43
-msgid "Pin number: 1 to 4 ASCII letters and/or digits"
-msgstr "引脚数：1 至 4 个 ASCII 字母和/或数字"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:50
-msgid "&X position:"
-msgstr "X 坐标 (&X)："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:59
-msgid "&Y position:"
-msgstr "Y 坐标 (&Y)："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:66
-msgid "&Pin length:"
-msgstr "引脚长度 (&P)："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:73
-msgid "N&ame text size:"
-msgstr "名称尺寸 (&A)："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:80
-msgid "Number text si&ze:"
-msgstr "编号文本尺寸 (&Z)："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:87
-msgid "Electrical type:"
-msgstr "电气类型："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:89
-msgid "Used by the ERC."
-msgstr "由 ERC 使用。"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:96
-msgid "Graphic style:"
-msgstr "图形样式："
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:144
-msgid "Common to all &units in symbol"
-msgstr "适用于所有单元 (&U)"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:153
-msgid "&Visible"
-msgstr "可见 (&V)"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_base.h:85
-msgid "Pin Properties"
-msgstr "引脚属性"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:76
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:61
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:44
-#: eeschema/lib_pin.cpp:1447
+#: eeschema/dialogs/dialog_sch_pin_table.cpp:98
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:38 eeschema/lib_pin.cpp:985
+#: eeschema/sch_pin.cpp:160
 msgid "Number"
 msgstr "编号"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:78
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:63
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:46
+#: eeschema/dialogs/dialog_pin_properties.cpp:54
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:202
+#: eeschema/dialogs/dialog_sch_pin_table.cpp:100
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:40
 msgid "Electrical Type"
 msgstr "电气类型"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:79
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:64
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:47
+#: eeschema/dialogs/dialog_pin_properties.cpp:55
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:203
+#: eeschema/dialogs/dialog_sch_pin_table.cpp:101
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:41
 msgid "Graphic Style"
 msgstr "图形样式"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:81
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:66
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:49
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:43
 msgid "Number Text Size"
 msgstr "编号文本尺寸"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:82
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:67
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:50
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:44
 msgid "Name Text Size"
 msgstr "名称文本尺寸"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:83
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:68
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:51
-#: eeschema/lib_pin.cpp:1458 pcbnew/class_drawsegment.cpp:456
-#: pcbnew/class_drawsegment.cpp:481 pcbnew/class_track.cpp:603
+#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:45 eeschema/lib_pin.cpp:996
+#: eeschema/sch_pin.cpp:171 pcbnew/class_drawsegment.cpp:487
+#: pcbnew/class_drawsegment.cpp:512 pcbnew/class_track.cpp:674
 #: pcbnew/dialogs/dialog_select_net_from_list.cpp:60
 msgid "Length"
 msgstr "长度"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:88
+#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:84
 msgid "Group by name"
 msgstr "按名称分组"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:99
+#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:93
 msgid "Pin numbers:"
 msgstr "引脚编号："
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.h:72
+#: eeschema/dialogs/dialog_lib_edit_pin_table_base.h:70
+#: eeschema/dialogs/dialog_sch_pin_table_base.h:51
 msgid "Pin Table"
 msgstr "引脚列表"
 
@@ -8114,15 +8485,15 @@ msgid "Position X:"
 msgstr "位置 X："
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:119
-#: eeschema/fields_grid_table.cpp:164 eeschema/fields_grid_table.cpp:416
-#: eeschema/fields_grid_table.cpp:513 eeschema/sch_line.cpp:595
+#: eeschema/fields_grid_table.cpp:164 eeschema/fields_grid_table.cpp:418
+#: eeschema/fields_grid_table.cpp:515 eeschema/sch_line.cpp:628
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:137
 msgid "Horizontal"
 msgstr "水平"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:119
-#: eeschema/fields_grid_table.cpp:165 eeschema/fields_grid_table.cpp:417
-#: eeschema/fields_grid_table.cpp:515 eeschema/sch_line.cpp:593
+#: eeschema/fields_grid_table.cpp:165 eeschema/fields_grid_table.cpp:419
+#: eeschema/fields_grid_table.cpp:517 eeschema/sch_line.cpp:626
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:137
 msgid "Vertical"
 msgstr "垂直"
@@ -8179,7 +8550,7 @@ msgstr ""
 
 #: eeschema/dialogs/dialog_lib_new_component_base.cpp:50
 msgid "Default reference designator:"
-msgstr "默认参考指示符："
+msgstr "默认位号："
 
 #: eeschema/dialogs/dialog_lib_new_component_base.cpp:54
 msgid "U"
@@ -8229,8 +8600,7 @@ msgstr "相互冲突的标签"
 msgid "New Label"
 msgstr "新的标签"
 
-#: eeschema/dialogs/dialog_migrate_buses.cpp:104 pcbnew/class_module.cpp:676
-#: pcbnew/class_track.cpp:760
+#: eeschema/dialogs/dialog_migrate_buses.cpp:104 pcbnew/class_track.cpp:831
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:193
 msgid "Status"
 msgstr "状态"
@@ -8255,65 +8625,84 @@ msgstr ""
 "请为下面的每个总线选择一个新名称。\n"
 "已根据连接到总线的标签，推荐了一个名称。"
 
-#: eeschema/dialogs/dialog_migrate_buses_base.cpp:34
+#: eeschema/dialogs/dialog_migrate_buses_base.cpp:32
 msgid "Proposed new name:"
 msgstr "建议的新名称："
 
-#: eeschema/dialogs/dialog_migrate_buses_base.cpp:47
+#: eeschema/dialogs/dialog_migrate_buses_base.cpp:45
 msgid "Accept Name"
 msgstr "接受名称"
 
-#: eeschema/dialogs/dialog_migrate_buses_base.h:51
+#: eeschema/dialogs/dialog_migrate_buses_base.h:53
 msgid "Migrate Buses"
 msgstr "迁移总线"
 
-#: eeschema/dialogs/dialog_netlist.cpp:248
+#: eeschema/dialogs/dialog_netlist.cpp:261
 msgid "Default format"
 msgstr "默认格式"
 
-#: eeschema/dialogs/dialog_netlist.cpp:298
+#: eeschema/dialogs/dialog_netlist.cpp:311
 #: eeschema/dialogs/dialog_netlist_base.h:67
 msgid "Export Netlist"
 msgstr "导出网表"
 
-#: eeschema/dialogs/dialog_netlist.cpp:317
+#: eeschema/dialogs/dialog_netlist.cpp:347
+#: eeschema/dialogs/dialog_netlist.cpp:586
+msgid "Schematic netlist not available"
+msgstr "原理图网络列表不可用"
+
+#: eeschema/dialogs/dialog_netlist.cpp:370
 msgid "Reformat passive symbol values"
 msgstr "重新格式化无源符号值"
 
-#: eeschema/dialogs/dialog_netlist.cpp:318
+#: eeschema/dialogs/dialog_netlist.cpp:371
 msgid "Reformat passive symbol values e.g. 1M -> 1Meg"
 msgstr "重新格式化无源符号值 e.g. 1M -> 1Meg"
 
-#: eeschema/dialogs/dialog_netlist.cpp:370
+#: eeschema/dialogs/dialog_netlist.cpp:376
+msgid "External simulator command:"
+msgstr "外部仿真器命令："
+
+#: eeschema/dialogs/dialog_netlist.cpp:377
+msgid ""
+"Enter the command line to run spice\n"
+"Usually <path to spice binary> %I\n"
+"%I will be replaced by the actual spice netlist name"
+msgstr ""
+"输入命令行以运行 SPICE。\n"
+"通常 <SPICE 二进制路径> %I。\n"
+"%I 将被实际的 SPICE 网表名称替换"
+
+#: eeschema/dialogs/dialog_netlist.cpp:391
+msgid "Create Netlist and Run Simulator Command"
+msgstr "创建网表并运行仿真器命令"
+
+#: eeschema/dialogs/dialog_netlist.cpp:442
 msgid "Netlist command:"
 msgstr "网表命令："
 
-#: eeschema/dialogs/dialog_netlist.cpp:441
+#: eeschema/dialogs/dialog_netlist.cpp:515
 msgid "Save Netlist File"
 msgstr "保存网表文件"
 
-#: eeschema/dialogs/dialog_netlist.cpp:480
+#: eeschema/dialogs/dialog_netlist.cpp:554
 #, c-format
 msgid "%s Export"
 msgstr "导出 %s"
 
-#: eeschema/dialogs/dialog_netlist.cpp:512
-msgid "Schematic netlist not available"
-msgstr "原理图网络列表不可用"
-
-#: eeschema/dialogs/dialog_netlist.cpp:636
+#: eeschema/dialogs/dialog_netlist.cpp:710
 msgid "This plugin already exists."
 msgstr "此插件已存在。"
 
-#: eeschema/dialogs/dialog_netlist.cpp:664
+#: eeschema/dialogs/dialog_netlist.cpp:738
 msgid "Error. You must provide a command String"
 msgstr "错误。你必须提供一个命令字符串"
 
-#: eeschema/dialogs/dialog_netlist.cpp:670
+#: eeschema/dialogs/dialog_netlist.cpp:744
 msgid "Error. You must provide a Title"
 msgstr "错误。你必须提供一个标题"
 
-#: eeschema/dialogs/dialog_netlist.cpp:714
+#: eeschema/dialogs/dialog_netlist.cpp:788
 msgid "Do not forget to choose a title for this netlist control page"
 msgstr "不要忘记为这个网表控制页选择一个标题"
 
@@ -8349,6 +8738,90 @@ msgstr "即使现有标注是重复的也保留它们"
 msgid "Paste Special"
 msgstr "特殊粘贴"
 
+#: eeschema/dialogs/dialog_pin_properties.cpp:53
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:201
+msgid "Alternate Pin Name"
+msgstr "备用引脚号"
+
+#: eeschema/dialogs/dialog_pin_properties.cpp:269
+msgid "Alternate pin definitions must have a name."
+msgstr "备用引脚号定义必须有名称。"
+
+#: eeschema/dialogs/dialog_pin_properties.cpp:289
+#, c-format
+msgid ""
+"This pin is not on a %d mils grid which will make it\n"
+"difficult to connect to in the schematic.\n"
+"Do you want to continue?"
+msgstr ""
+"此引脚不在 %d mils 网格上\n"
+"在原理图中难以连接\n"
+"你想继续吗？"
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:35
+msgid "Pin &name:"
+msgstr "引脚名称 (&N)："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:42
+msgid "Pin num&ber:"
+msgstr "引脚编号 (&B)："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:44
+msgid "Pin number: 1 to 4 ASCII letters and/or digits"
+msgstr "引脚数：1 至 4 个 ASCII 字母和/或数字"
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:51
+msgid "&X position:"
+msgstr "X 坐标 (&X)："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:60
+msgid "&Y position:"
+msgstr "Y 坐标 (&Y)："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:67
+msgid "&Pin length:"
+msgstr "引脚长度 (&P)："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:74
+msgid "N&ame text size:"
+msgstr "名称尺寸 (&A)："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:81
+msgid "Number text si&ze:"
+msgstr "编号文本尺寸 (&Z)："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:88
+msgid "Electrical type:"
+msgstr "电气类型："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:90
+msgid "Used by the ERC."
+msgstr "由 ERC 使用。"
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:97
+msgid "Graphic style:"
+msgstr "图形样式："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:145
+msgid "Common to all &units in symbol"
+msgstr "适用于所有单元 (&U)"
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:154
+msgid "&Visible"
+msgstr "可见 (&V)"
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:161
+msgid "Preview:"
+msgstr "预览："
+
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:179
+msgid "Alternate pin definitions"
+msgstr "备用引脚号定义"
+
+#: eeschema/dialogs/dialog_pin_properties_base.h:101
+msgid "Pin Properties"
+msgstr "引脚属性"
+
 #: eeschema/dialogs/dialog_plot_schematic.cpp:56
 msgid "Plot All Pages"
 msgstr "绘制所有页"
@@ -8360,70 +8833,63 @@ msgstr "绘制当前页"
 #: eeschema/dialogs/dialog_plot_schematic.cpp:149
 #: pcbnew/dialogs/dialog_export_svg.cpp:197
 #: pcbnew/dialogs/dialog_gendrill.cpp:299 pcbnew/dialogs/dialog_plot.cpp:355
-#: pcbnew/exporters/gen_footprints_placefile.cpp:177
-#: pcbnew/exporters/gen_footprints_placefile.cpp:514
+#: pcbnew/exporters/gen_footprints_placefile.cpp:185
+#: pcbnew/exporters/gen_footprints_placefile.cpp:509
 msgid "Select Output Directory"
 msgstr "选择输出目录"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:159
-#: pcbnew/dialogs/dialog_gendrill.cpp:308 pcbnew/dialogs/dialog_plot.cpp:365
+#: eeschema/dialogs/dialog_plot_schematic.cpp:166
+#: pcbnew/dialogs/dialog_gendrill.cpp:308 pcbnew/dialogs/dialog_plot.cpp:372
 #, c-format
 msgid ""
 "Do you want to use a path relative to\n"
 "\"%s\""
 msgstr "你想使用 \"%s\" 的相对路径吗?"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:161
-#: eeschema/dialogs/dialog_plot_schematic.cpp:169
+#: eeschema/dialogs/dialog_plot_schematic.cpp:168
 #: pcbnew/dialogs/dialog_export_svg.cpp:204
 #: pcbnew/dialogs/dialog_export_svg.cpp:215
 #: pcbnew/dialogs/dialog_gendrill.cpp:310
-#: pcbnew/dialogs/dialog_gendrill.cpp:317 pcbnew/dialogs/dialog_plot.cpp:368
-#: pcbnew/dialogs/dialog_plot.cpp:375
-#: pcbnew/exporters/gen_footprints_placefile.cpp:185
-#: pcbnew/exporters/gen_footprints_placefile.cpp:194
+#: pcbnew/dialogs/dialog_gendrill.cpp:317 pcbnew/dialogs/dialog_plot.cpp:375
+#: pcbnew/exporters/gen_footprints_placefile.cpp:193
+#: pcbnew/exporters/gen_footprints_placefile.cpp:202
 msgid "Plot Output Directory"
 msgstr "绘制输出目录"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:168
-#: pcbnew/dialogs/dialog_gendrill.cpp:316 pcbnew/dialogs/dialog_plot.cpp:374
-msgid "Cannot make path relative (target volume different from file volume)!"
-msgstr "不能进行相对路径（目标卷从文件卷不同）！"
-
-#: eeschema/dialogs/dialog_plot_schematic.cpp:213
+#: eeschema/dialogs/dialog_plot_schematic.cpp:216
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:61
 msgid "Schematic size"
 msgstr "图框大小"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:219
+#: eeschema/dialogs/dialog_plot_schematic.cpp:222
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:924
 msgid "A5"
 msgstr "A5"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:220
-#: eeschema/dialogs/dialog_plot_schematic.cpp:235
+#: eeschema/dialogs/dialog_plot_schematic.cpp:223
+#: eeschema/dialogs/dialog_plot_schematic.cpp:238
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:61
 msgid "A4"
 msgstr "A4"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:221
+#: eeschema/dialogs/dialog_plot_schematic.cpp:224
 msgid "A3"
 msgstr "A3"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:222
+#: eeschema/dialogs/dialog_plot_schematic.cpp:225
 msgid "A2"
 msgstr "A2"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:223
+#: eeschema/dialogs/dialog_plot_schematic.cpp:226
 msgid "A1"
 msgstr "A1"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:224
+#: eeschema/dialogs/dialog_plot_schematic.cpp:227
 msgid "A0"
 msgstr "A0"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:225
-#: eeschema/dialogs/dialog_plot_schematic.cpp:236
+#: eeschema/dialogs/dialog_plot_schematic.cpp:228
+#: eeschema/dialogs/dialog_plot_schematic.cpp:239
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:61
 #: eeschema/dialogs/panel_setup_formatting_base.cpp:30
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:287
@@ -8432,26 +8898,26 @@ msgstr "A0"
 msgid "A"
 msgstr "A"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:226
+#: eeschema/dialogs/dialog_plot_schematic.cpp:229
 msgid "B"
 msgstr "B"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:227
+#: eeschema/dialogs/dialog_plot_schematic.cpp:230
 msgid "C"
 msgstr "C"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:228
+#: eeschema/dialogs/dialog_plot_schematic.cpp:231
 msgid "D"
 msgstr "D"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:229
+#: eeschema/dialogs/dialog_plot_schematic.cpp:232
 msgid "E"
 msgstr "E"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:362
-#: pcbnew/dialogs/dialog_export_svg.cpp:237 pcbnew/dialogs/dialog_plot.cpp:780
-#: pcbnew/exporters/gen_footprints_placefile.cpp:246
-#: pcbnew/exporters/gen_footprints_placefile.cpp:356
+#: eeschema/dialogs/dialog_plot_schematic.cpp:365
+#: pcbnew/dialogs/dialog_export_svg.cpp:237 pcbnew/dialogs/dialog_plot.cpp:784
+#: pcbnew/exporters/gen_footprints_placefile.cpp:254
+#: pcbnew/exporters/gen_footprints_placefile.cpp:351
 #, c-format
 msgid "Could not write plot files to folder \"%s\"."
 msgstr "无法写入绘制文件到文件夹 \"%s\"。"
@@ -8528,8 +8994,6 @@ msgid "Plot the background color if the output format supports it"
 msgstr "如果输出格式支持，则绘制背景颜色"
 
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:89
-#: eeschema/dialogs/dialog_print_using_printer_base.cpp:42
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:210
 msgid "Color theme:"
 msgstr "颜色主题："
 
@@ -8574,15 +9038,15 @@ msgstr "画笔宽度："
 msgid "Plot Schematic Options"
 msgstr "绘制原理图选项"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:332
+#: eeschema/dialogs/dialog_print_using_printer.cpp:330
 msgid "Print Schematic"
 msgstr "打印原理图"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:339
+#: eeschema/dialogs/dialog_print_using_printer.cpp:337
 msgid "An error occurred attempting to print the schematic."
 msgstr "打印原理图时出现错误。"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:363
+#: eeschema/dialogs/dialog_print_using_printer.cpp:361
 #, c-format
 msgid "Print page %d"
 msgstr "打印图框 %d"
@@ -8600,14 +9064,14 @@ msgid "Print in &black and white only"
 msgstr "仅黑白双色打印 (&B)"
 
 #: eeschema/dialogs/dialog_print_using_printer_base.cpp:32
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:200
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:206
 msgid "Print background color"
 msgstr "打印背景色"
 
 #: eeschema/dialogs/dialog_print_using_printer_base.cpp:35
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:204
-msgid "Use a different color theme for printing"
-msgstr "使用其他颜色主题进行打印"
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:211
+msgid "Use a different color theme for printing:"
+msgstr "使用不同的颜色主题进行打印："
 
 #: eeschema/dialogs/dialog_rescue_each.cpp:101
 msgid ""
@@ -8686,18 +9150,18 @@ msgstr "工程恢复助手"
 
 #: eeschema/dialogs/dialog_sch_import_settings.cpp:42
 #: eeschema/dialogs/dialog_sch_import_settings_base.h:61
-#: pcbnew/dialogs/dialog_import_settings.cpp:42
-#: pcbnew/dialogs/dialog_import_settings_base.h:63
+#: pcbnew/dialogs/dialog_import_settings.cpp:45
+#: pcbnew/dialogs/dialog_import_settings_base.h:64
 msgid "Import Settings"
 msgstr "导入设置"
 
 #: eeschema/dialogs/dialog_sch_import_settings.cpp:61
-#: pcbnew/dialogs/dialog_import_settings.cpp:61
+#: pcbnew/dialogs/dialog_import_settings.cpp:116
 msgid "Import Settings From"
 msgstr "导入设置"
 
 #: eeschema/dialogs/dialog_sch_import_settings.cpp:73
-#: pcbnew/dialogs/dialog_import_settings.cpp:73
+#: pcbnew/dialogs/dialog_import_settings.cpp:128
 msgid "File not found."
 msgstr "文件没有找到。"
 
@@ -8742,29 +9206,23 @@ msgstr "违规严重程度"
 msgid "Net classes"
 msgstr "网络类"
 
-#: eeschema/dialogs/dialog_sch_import_settings_base.cpp:68
-#: eeschema/dialogs/dialog_update_fields_base.cpp:34
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:74
-msgid "Select All"
-msgstr "全选"
-
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:253
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:245
 msgid "A sheet must have a valid file name."
 msgstr "图框必须具有有效的文件名。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:263
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:255
 msgid "Sheet file must have a '.kicad_sch' extension."
 msgstr "图框文件必须具有 '.kicad_sch' 扩展名。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:286
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:278
 msgid "Untitled Sheet"
 msgstr "无标题图框"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:312
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:304
 msgid "Note: item colors are overridden in the current color theme."
 msgstr "注意：项目颜色在当前颜色主题中被覆盖。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:314
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:306
 #, c-format
 msgid ""
 "To see individual item colors uncheck '%s'\n"
@@ -8773,59 +9231,59 @@ msgstr ""
 "要查看各个项目的颜色，请取消选中 \"%s\"\n"
 "在首选项 > Eeschema > 颜色中。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:350
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:342
 #, c-format
 msgid "The file \"%s\" does not appear to be a valid schematic file."
 msgstr "文件 \"%s\" 似乎不是有效的原理图文件。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:352
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:344
 msgid "Invalid Schematic File"
 msgstr "无效的原理图文件"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:405
-#: kicad/tools/kicad_manager_control.cpp:511
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:397
+#: kicad/tools/kicad_manager_control.cpp:517
 #, c-format
 msgid "\"%s\" already exists."
 msgstr "\"%s\" 已经存在。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:406
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:398
 #, c-format
 msgid "Link \"%s\" to this file?"
 msgstr "链接 \"%s\"到这个文件？"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:431
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:423
 #, c-format
 msgid "Change \"%s\" link from \"%s\" to \"%s\"?"
 msgstr "将 \"%s\" 链接从 \"%s\" 改为 \"%s\"?"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:435
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:427
 #, c-format
 msgid "Create new file \"%s\" with contents of \"%s\"?"
 msgstr "创建包含 \"%s\" 内容的新文件 \"%s\"？"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:438
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:430
 msgid "This action cannot be undone."
 msgstr "此操作无法撤销。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:503
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:495
 #, c-format
 msgid "Error occurred saving schematic file \"%s\"."
 msgstr "保存原理图文件 \"%s\" 发生错误。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:507
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:499
 #, c-format
 msgid "Failed to save schematic \"%s\""
 msgstr "无法保存原理图 \"%s\""
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:590
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:582
 msgid "A sheet must have a name."
 msgstr "图框必须要有一个名称。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:598
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:590
 msgid "A sheet must have a file specified."
 msgstr "图框必须具有指定的文件。"
 
-#: eeschema/dialogs/dialog_sch_sheet_props.cpp:607
+#: eeschema/dialogs/dialog_sch_sheet_props.cpp:599
 msgid "Sheet filename must have a '.kicad_sch' extension."
 msgstr "图框文件名必须具有 '.kicad_sch' 扩展名。"
 
@@ -8841,29 +9299,11 @@ msgstr "边框颜色："
 msgid "Background fill:"
 msgstr "背景背景填充："
 
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:156
-msgid "Remove Colors"
-msgstr "删除颜色"
-
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:157
-msgid ""
-"Remove the specified colors for this sheet (the current color theme will be "
-"used instead)"
-msgstr "删除此框图的指定颜色（将使用当前的颜色主题）"
-
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:179
+#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:174
 msgid "Hierarchical path:"
 msgstr "分层路径："
 
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:188
-msgid "Unique identifier:"
-msgstr "唯一标识符："
-
-#: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:194
-msgid "Unique ID that identifies the symbol"
-msgstr "标识符号的唯一 ID"
-
-#: eeschema/dialogs/dialog_sch_sheet_props_base.h:82
+#: eeschema/dialogs/dialog_sch_sheet_props_base.h:78
 msgid "Sheet Properties"
 msgstr "图框属性"
 
@@ -8917,7 +9357,7 @@ msgstr "仅搜索当前图框 (&S)"
 
 #: eeschema/dialogs/dialog_schematic_find_base.cpp:101
 msgid "Replace matches in reference designators"
-msgstr "替换引用指示符中的匹配项"
+msgstr "替换引用位号中的匹配项"
 
 #: eeschema/dialogs/dialog_schematic_find_base.cpp:115
 msgid "&Find"
@@ -8931,40 +9371,45 @@ msgstr "替换 (&R)"
 msgid "Replace &All"
 msgstr "替换所有 (&A)"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:39
+#: eeschema/dialogs/dialog_schematic_setup.cpp:40
 msgid "Schematic Setup"
 msgstr "原理图设置"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:40
+#: eeschema/dialogs/dialog_schematic_setup.cpp:41
 msgid "Import Settings from Another Project..."
 msgstr "从另一个项目导入设置..."
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:66
+#: eeschema/dialogs/dialog_schematic_setup.cpp:67
 msgid "Formatting"
 msgstr "格式化"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:67
-#: eeschema/eeschema_config.cpp:229
+#: eeschema/dialogs/dialog_schematic_setup.cpp:68
+#: eeschema/eeschema_config.cpp:228
 msgid "Field Name Templates"
 msgstr "字段名称模板"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:69
+#: eeschema/dialogs/dialog_schematic_setup.cpp:70
 msgid "Electrical Rules"
 msgstr "电气规则"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:73
-#: eeschema/libedit/lib_edit_frame.cpp:661
-#: pcbnew/dialogs/dialog_board_setup.cpp:86
-#: pcbnew/footprint_libraries_utils.cpp:496
+#: eeschema/dialogs/dialog_schematic_setup.cpp:74
+#: eeschema/libedit/lib_edit_frame.cpp:853
+#: pcbnew/dialogs/dialog_board_setup.cpp:87
+#: pcbnew/footprint_libraries_utils.cpp:504
 msgid "Project"
 msgstr "工程"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:75
-#: pcbnew/dialogs/dialog_board_setup.cpp:88
+#: eeschema/dialogs/dialog_schematic_setup.cpp:76
+#: pcbnew/dialogs/dialog_board_setup.cpp:89
 msgid "Text Variables"
 msgstr "文本变量"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:146
+#: eeschema/dialogs/dialog_schematic_setup.cpp:86
+#: pcbnew/dialogs/dialog_board_setup.cpp:99
+msgid "Project is missing or read-only. Changes will not be saved."
+msgstr "工程缺失或为只读。变更将不会保存。"
+
+#: eeschema/dialogs/dialog_schematic_setup.cpp:148
 #, c-format
 msgid ""
 "Error importing settings from project:\n"
@@ -8973,7 +9418,7 @@ msgstr ""
 "从项目导入设置时出错：\n"
 "无法加载项目文件 %s"
 
-#: eeschema/dialogs/dialog_signal_list_base.cpp:24
+#: eeschema/dialogs/dialog_signal_list_base.cpp:27
 msgid "Add signal by name:"
 msgstr "按名称添加信号："
 
@@ -9192,7 +9637,7 @@ msgstr "Spice 指令："
 msgid "Load directives from schematic"
 msgstr "从原理图加载命令"
 
-#: eeschema/dialogs/dialog_sim_settings_base.cpp:436 pcbnew/class_pad.cpp:1280
+#: eeschema/dialogs/dialog_sim_settings_base.cpp:436 pcbnew/class_pad.cpp:1335
 msgid "Custom"
 msgstr "自定义"
 
@@ -9205,7 +9650,7 @@ msgid "Add full path for .include library directives"
 msgstr "为 .include 库指令添加完整路径"
 
 #: eeschema/dialogs/dialog_sim_settings_base.h:131
-#: eeschema/sim/sim_plot_frame.cpp:186
+#: eeschema/sim/sim_plot_frame.cpp:185
 msgid "Simulation settings"
 msgstr "仿真设置"
 
@@ -9254,38 +9699,38 @@ msgstr "对于 MOSFET，引脚顺序为漏极，栅极，源极"
 msgid "For a JFET, pin order is drain, grid, source"
 msgstr "对于 JFET，引脚顺序为漏极，栅极，源极"
 
-#: eeschema/dialogs/dialog_spice_model.cpp:976
+#: eeschema/dialogs/dialog_spice_model.cpp:979
 msgid "Select library"
 msgstr "选择库"
 
-#: eeschema/dialogs/dialog_spice_model.cpp:1043
+#: eeschema/dialogs/dialog_spice_model.cpp:1046
 #: eeschema/dialogs/dialog_spice_model_base.cpp:890
 msgid "Range:"
 msgstr "范围："
 
-#: eeschema/dialogs/dialog_spice_model.cpp:1044
-#: eeschema/dialogs/dialog_spice_model.cpp:1056
-#: eeschema/dialogs/dialog_spice_model.cpp:1062
+#: eeschema/dialogs/dialog_spice_model.cpp:1047
+#: eeschema/dialogs/dialog_spice_model.cpp:1059
+#: eeschema/dialogs/dialog_spice_model.cpp:1065
 #: eeschema/dialogs/dialog_spice_model_base.cpp:676
 #: eeschema/dialogs/dialog_spice_model_base.cpp:782
 #: eeschema/dialogs/dialog_spice_model_base.cpp:900
 msgid "Offset:"
 msgstr "偏移："
 
-#: eeschema/dialogs/dialog_spice_model.cpp:1049
+#: eeschema/dialogs/dialog_spice_model.cpp:1052
 msgid "Standard deviation:"
 msgstr "标准偏差："
 
-#: eeschema/dialogs/dialog_spice_model.cpp:1050
-#: eeschema/dialogs/dialog_spice_model.cpp:1055
+#: eeschema/dialogs/dialog_spice_model.cpp:1053
+#: eeschema/dialogs/dialog_spice_model.cpp:1058
 msgid "Mean:"
 msgstr "意思："
 
-#: eeschema/dialogs/dialog_spice_model.cpp:1061
+#: eeschema/dialogs/dialog_spice_model.cpp:1064
 msgid "Lambda:"
 msgstr "Lambda:"
 
-#: eeschema/dialogs/dialog_spice_model.cpp:1066
+#: eeschema/dialogs/dialog_spice_model.cpp:1069
 msgid "type of random generator for source is invalid"
 msgstr "源的随机生成器类型无效"
 
@@ -9547,7 +9992,6 @@ msgstr "幅度："
 
 #: eeschema/dialogs/dialog_spice_model_base.cpp:490
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1116
-#: pcb_calculator/transline_ident.cpp:124
 msgid "Frequency:"
 msgstr "频率："
 
@@ -9890,7 +10334,7 @@ msgstr "更新原理图"
 #: pcbnew/dialogs/dialog_update_pcb_base.cpp:27
 msgid ""
 "Re-link footprints to schematic symbols based on their reference designators"
-msgstr "根据原理图的参考指示器将封装重新链接到原理图符号"
+msgstr "根据原理图的位号将封装重新链接到原理图符号"
 
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:33
 #: pcbnew/dialogs/dialog_update_pcb_base.cpp:28
@@ -9899,8 +10343,8 @@ msgid ""
 "Select this option only if you want to reset the footprint linkages based on "
 "their reference designators."
 msgstr ""
-"通常，封装通过其唯一 ID 链接到其符号。 仅当您要根据参考指示符封装链接时，才选"
-"择此选项。"
+"通常，封装通过其唯一 ID 链接到其符号。 仅当您要根据位号封装链接时，才选择此选"
+"项。"
 
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:37
 msgid "Ignore errors in shared schematic sheets"
@@ -9917,13 +10361,6 @@ msgstr ""
 "注释兼容。\n"
 "如果选择此选项，将禁用共享生成的错误。"
 
-#: eeschema/dialogs/dialog_update_from_pcb_base.cpp:49
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:69
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:359
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:207
-msgid "Update"
-msgstr "更新"
-
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:60
 msgid "Update references of symbols that have been changed in the PCB editor."
 msgstr "更新 PCB 编辑器中已更改的符号的引用。"
@@ -9964,7 +10401,17 @@ msgstr ""
 msgid " (symbol editor only)"
 msgstr " （仅限符号编辑器）"
 
+#: eeschema/dialogs/panel_eeschema_color_settings.cpp:228
+#: pcbnew/dialogs/panel_pcbnew_color_settings.cpp:499
+msgid "Color Preview"
+msgstr "颜色预览"
+
+#: eeschema/dialogs/panel_eeschema_color_settings.cpp:389
+msgid "/path/to/sheet"
+msgstr "/path/to/sheet"
+
 #: eeschema/dialogs/panel_eeschema_display_options_base.cpp:26
+#: pcbnew/pcb_edit_frame.cpp:260 pcbnew/pcb_edit_frame.cpp:1088
 msgid "Appearance"
 msgstr "外观"
 
@@ -9982,6 +10429,7 @@ msgstr "显示图框范围 (&T)"
 
 #: eeschema/dialogs/panel_eeschema_display_options_base.cpp:42
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:88
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:180
 msgid "Selection"
 msgstr "选择"
 
@@ -10034,7 +10482,7 @@ msgid "&Measurement units:"
 msgstr "测量单位 (&M)："
 
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:31
-#: pagelayout_editor/pl_editor_frame.cpp:679
+#: pagelayout_editor/pl_editor_frame.cpp:717
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:143
 msgid "inches"
 msgstr "英寸"
@@ -10138,7 +10586,7 @@ msgstr "全局字段名模板："
 msgid "Project field name templates:"
 msgstr "工程字段名模板："
 
-#: eeschema/dialogs/panel_eeschema_template_fieldnames.cpp:83
+#: eeschema/dialogs/panel_eeschema_template_fieldnames.cpp:85
 msgid "Untitled Field"
 msgstr "无标题字段"
 
@@ -10264,15 +10712,15 @@ msgstr "线宽 (&W)："
 msgid "Junction size:"
 msgstr "连接点尺寸："
 
-#: eeschema/dialogs/panel_setup_pinmap.cpp:189
+#: eeschema/dialogs/panel_setup_pinmap.cpp:188
 msgid "No error or warning"
 msgstr "没有错误或警告"
 
-#: eeschema/dialogs/panel_setup_pinmap.cpp:194
+#: eeschema/dialogs/panel_setup_pinmap.cpp:193
 msgid "Generate warning"
 msgstr "生成警告"
 
-#: eeschema/dialogs/panel_setup_pinmap.cpp:199
+#: eeschema/dialogs/panel_setup_pinmap.cpp:198
 msgid "Generate error"
 msgstr "生成错误"
 
@@ -10280,28 +10728,28 @@ msgstr "生成错误"
 msgid "Pin to Pin Connections"
 msgstr "引脚与引脚连接"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:343
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:521
+#: eeschema/dialogs/panel_sym_lib_table.cpp:357
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:536
 #, c-format
 msgid "Illegal character '%c' in Nickname: \"%s\""
 msgstr "非法字符 \"%c\" 在昵称: \"%s\""
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:354
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:532
+#: eeschema/dialogs/panel_sym_lib_table.cpp:368
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:547
 msgid "No Colon in Nicknames"
 msgstr "别名没有冒号"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:381
+#: eeschema/dialogs/panel_sym_lib_table.cpp:398
 #, c-format
 msgid "Duplicate Nickname: \"%s\"."
 msgstr "重复的昵称：\"%s\"。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:391
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:569
+#: eeschema/dialogs/panel_sym_lib_table.cpp:408
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:587
 msgid "Please Delete or Modify One"
 msgstr "请删除或修改一个"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:421
+#: eeschema/dialogs/panel_sym_lib_table.cpp:441
 #, c-format
 msgid ""
 "Symbol library \"%s\" failed to load.\n"
@@ -10310,38 +10758,38 @@ msgstr ""
 "符号库 \"%s\" 加载失败。\n"
 " %s"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:425
+#: eeschema/dialogs/panel_sym_lib_table.cpp:445
 msgid "Error Loading Library"
 msgstr "加载库时出错"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:463
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:826
+#: eeschema/dialogs/panel_sym_lib_table.cpp:483
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:844
 msgid "Warning: Duplicate Nickname"
 msgstr "警告：重复的别名"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:464
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:827
+#: eeschema/dialogs/panel_sym_lib_table.cpp:484
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:845
 #, c-format
 msgid "A library nicknamed \"%s\" already exists."
 msgstr "库别名 \"%s\" 已经存在。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:465
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:828
+#: eeschema/dialogs/panel_sym_lib_table.cpp:485
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:846
 msgid "Please change the library nickname after adding this library."
 msgstr "请在添加此库后更改库昵称。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:483
-#: eeschema/libedit/lib_edit_frame.cpp:668
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:842
+#: eeschema/dialogs/panel_sym_lib_table.cpp:503
+#: eeschema/libedit/lib_edit_frame.cpp:860
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:860
 msgid "Skip"
 msgstr "跳过"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:483
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:842
+#: eeschema/dialogs/panel_sym_lib_table.cpp:503
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:860
 msgid "Add Anyway"
 msgstr "仍然添加"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:822
+#: eeschema/dialogs/panel_sym_lib_table.cpp:849
 msgid ""
 "Modifications have been made to one or more symbol libraries.\n"
 "Changes must be saved or discarded before the symbol library table can be "
@@ -10350,12 +10798,12 @@ msgstr ""
 "已对一个或多个符号库进行了修改。\n"
 "必须先保存或丢弃更改,然后才能修改符号库表。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:836
+#: eeschema/dialogs/panel_sym_lib_table.cpp:863
 msgid "Symbol Libraries"
 msgstr "符号库"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:858
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:1028
+#: eeschema/dialogs/panel_sym_lib_table.cpp:885
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:1052
 #, c-format
 msgid ""
 "Error saving global library table:\n"
@@ -10366,15 +10814,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:859
-#: eeschema/dialogs/panel_sym_lib_table.cpp:872 eeschema/sch_base_frame.cpp:235
-#: eeschema/sch_base_frame.cpp:251 pcbnew/dialogs/panel_fp_lib_table.cpp:1029
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:1042 pcbnew/files.cpp:987
+#: eeschema/dialogs/panel_sym_lib_table.cpp:886
+#: eeschema/dialogs/panel_sym_lib_table.cpp:899 eeschema/sch_base_frame.cpp:235
+#: eeschema/sch_base_frame.cpp:251 pcbnew/dialogs/panel_fp_lib_table.cpp:1053
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:1066 pcbnew/files.cpp:989
 msgid "File Save Error"
 msgstr "文件保存错误"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:871
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:1041
+#: eeschema/dialogs/panel_sym_lib_table.cpp:898
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:1065
 #, c-format
 msgid ""
 "Error saving project-specific library table:\n"
@@ -10447,20 +10895,20 @@ msgstr ""
 "试图加载全局符号库表时出错。\n"
 "请在首选项菜单中编辑这个全局符号库表。"
 
-#: eeschema/eeschema_config.cpp:226 eeschema/eeschema_config.cpp:432
-#: gerbview/gerbview_frame.cpp:1144
+#: eeschema/eeschema_config.cpp:225 eeschema/eeschema_config.cpp:396
+#: gerbview/gerbview_frame.cpp:1143
 #: pcbnew/dialogs/panel_edit_options_base.cpp:40
-#: pcbnew/footprint_edit_frame.cpp:832 pcbnew/pcbnew_config.cpp:74
+#: pcbnew/footprint_edit_frame.cpp:873 pcbnew/pcbnew_config.cpp:64
 msgid "Editing Options"
 msgstr "编辑选项"
 
-#: eeschema/eeschema_config.cpp:227 eeschema/eeschema_config.cpp:433
-#: pagelayout_editor/pl_editor_frame.cpp:414
-#: pcbnew/footprint_edit_frame.cpp:831 pcbnew/pcbnew_config.cpp:73
+#: eeschema/eeschema_config.cpp:226 eeschema/eeschema_config.cpp:397
+#: pagelayout_editor/pl_editor_frame.cpp:452
+#: pcbnew/footprint_edit_frame.cpp:872 pcbnew/pcbnew_config.cpp:65
 msgid "Colors"
 msgstr "颜色"
 
-#: eeschema/eeschema_config.cpp:472 eeschema/sheet.cpp:282
+#: eeschema/eeschema_config.cpp:436 eeschema/sheet.cpp:282
 #, c-format
 msgid "An error occurred loading the symbol library table \"%s\"."
 msgstr "加载符号库表 \"%s\" 时发生错误。"
@@ -10509,25 +10957,35 @@ msgstr "发射极开路"
 msgid "No Connection"
 msgstr "未连接"
 
-#: eeschema/erc.cpp:237 pcbnew/drc/drc_textvar_tester.cpp:102
+#: eeschema/erc.cpp:241 pcbnew/drc/drc_textvar_tester.cpp:102
 #: qa/drc_proto/drc_textvar_tester.cpp:102
 msgid "Unresolved text variable in worksheet."
 msgstr "图框中未解析的文本变量。"
 
-#: eeschema/erc.cpp:266
+#: eeschema/erc.cpp:272
 #, c-format
 msgid "Bus alias %s has conflicting definitions on %s and %s"
 msgstr "总线别名 %s 在 %s 和 %s 上的定义冲突"
 
-#: eeschema/erc.cpp:336
+#: eeschema/erc.cpp:342
 #, c-format
 msgid "Different footprints assigned to %s and %s"
 msgstr "分配给 %s 和 %s 的封装不同"
 
-#: eeschema/erc.cpp:565
+#: eeschema/erc.cpp:391
 msgid "Pins with \"no connection\" type are connected"
 msgstr "连接了“无连接”类型的管脚"
 
+#: eeschema/erc.cpp:463
+#, c-format
+msgid "Pins of type %s and %s are connected"
+msgstr "类型为 %s 和 %s 的引脚已连接"
+
+#: eeschema/erc.cpp:517
+#, c-format
+msgid "Pin %s is connected to both %s and %s"
+msgstr "引脚 %s 同时连接到 %s 和 %s"
+
 #: eeschema/erc_item.cpp:41
 msgid "Duplicate sheet names within a given sheet"
 msgstr "给定的图框中重复图框名称"
@@ -10606,11 +11064,15 @@ msgstr "总线和净项目之间的连接无效"
 msgid "Unresolved text variable"
 msgstr "未解析的文字变量"
 
-#: eeschema/fields_grid_table.cpp:132 eeschema/files-io.cpp:92
+#: eeschema/erc_item.cpp:121
+msgid "Wires not connected to anything"
+msgstr "未连接到任何对象的导线"
+
+#: eeschema/fields_grid_table.cpp:132 eeschema/files-io.cpp:87
 msgid "Schematic Files"
 msgstr "原理图文件"
 
-#: eeschema/files-io.cpp:127
+#: eeschema/files-io.cpp:122
 #, c-format
 msgid ""
 "Error saving schematic file \"%s\".\n"
@@ -10619,12 +11081,12 @@ msgstr ""
 "保存原理图文件 \"%s\" 发生错误。\n"
 "%s"
 
-#: eeschema/files-io.cpp:131 pcbnew/files.cpp:767
+#: eeschema/files-io.cpp:126 pcbnew/files.cpp:769
 #, c-format
 msgid "Failed to create temporary file \"%s\""
 msgstr "无法创建临时文件 \"%s\""
 
-#: eeschema/files-io.cpp:147
+#: eeschema/files-io.cpp:142
 #, c-format
 msgid ""
 "Error saving schematic file \"%s\".\n"
@@ -10633,42 +11095,42 @@ msgstr ""
 "保存原理图文件 \"%s\" 时出错。\n"
 "重命名临时文件 %s 失败"
 
-#: eeschema/files-io.cpp:152 pcbnew/files.cpp:786
+#: eeschema/files-io.cpp:147 pcbnew/files.cpp:788
 #, c-format
 msgid "Failed to rename temporary file \"%s\""
 msgstr "重命名临时文件 \"%s\" 失败"
 
-#: eeschema/files-io.cpp:182
+#: eeschema/files-io.cpp:177
 #, c-format
 msgid "File %s saved"
 msgstr "保存文件 %s"
 
-#: eeschema/files-io.cpp:187
+#: eeschema/files-io.cpp:182
 msgid "File write operation failed."
 msgstr "文件存储失败。"
 
-#: eeschema/files-io.cpp:241 eeschema/files-io.cpp:827
+#: eeschema/files-io.cpp:236 eeschema/files-io.cpp:876
 #, c-format
 msgid "Schematic file \"%s\" is already open."
 msgstr "电路图文件 \"%s\" 已经打开。"
 
-#: eeschema/files-io.cpp:260
+#: eeschema/files-io.cpp:255
 #, c-format
 msgid "Schematic \"%s\" does not exist.  Do you wish to create it?"
 msgstr "原理图 \"%s\" 不存在。你想创建它吗？"
 
-#: eeschema/files-io.cpp:328
+#: eeschema/files-io.cpp:336
 msgid "Schematic file changes are unsaved"
 msgstr "原理图文件更改未保存"
 
-#: eeschema/files-io.cpp:356
+#: eeschema/files-io.cpp:364
 msgid ""
 "The entire schematic could not be loaded.  Errors occurred attempting to "
 "load \n"
 "hierarchical sheet schematics."
 msgstr "整个原理图不能被加载。 尝试加载层次原理图时发生错误。"
 
-#: eeschema/files-io.cpp:369
+#: eeschema/files-io.cpp:377
 #, c-format
 msgid ""
 "Error loading schematic file \"%s\".\n"
@@ -10677,12 +11139,12 @@ msgstr ""
 "加载原理图文件 \"%s\" 时出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:373 eeschema/files-io.cpp:911
+#: eeschema/files-io.cpp:381 eeschema/files-io.cpp:961
 #, c-format
 msgid "Failed to load \"%s\""
 msgstr "无法加载 \"%s\""
 
-#: eeschema/files-io.cpp:386
+#: eeschema/files-io.cpp:394
 msgid ""
 "An error was found when loading the schematic that has been automatically "
 "fixed.  Please save the schematic to repair the broken file or it may not be "
@@ -10691,15 +11153,15 @@ msgstr ""
 "加载已自动修复的原理图时发现错误。 请保存原理图以修复损坏的文件，否则可能无法"
 "与其他版本的 KiCad 一起使用。"
 
-#: eeschema/files-io.cpp:421
+#: eeschema/files-io.cpp:429
 msgid "Illegal entry found in project file symbol library list."
 msgstr "在项目文件符号库列表中找到非法条目。"
 
-#: eeschema/files-io.cpp:422 eeschema/files-io.cpp:454
+#: eeschema/files-io.cpp:430 eeschema/files-io.cpp:462
 msgid "Project Load Warning"
 msgstr "项目加载警告"
 
-#: eeschema/files-io.cpp:425
+#: eeschema/files-io.cpp:433
 msgid ""
 "Symbol libraries defined in the project file symbol library list are no "
 "longer supported and will be\n"
@@ -10709,15 +11171,15 @@ msgstr ""
 "项目文件符号库列表中定义的符号库不再受支持,并且将\n"
 "删除。 在某些情况下,这可能会导致符号库链接断开。"
 
-#: eeschema/files-io.cpp:428 eeschema/files-io.cpp:460
+#: eeschema/files-io.cpp:436 eeschema/files-io.cpp:468
 msgid "Do not show this dialog again."
 msgstr "不再显示。"
 
-#: eeschema/files-io.cpp:453
+#: eeschema/files-io.cpp:461
 msgid "The schematic file will be converted to the new file format on save."
 msgstr "原理图文件将在保存时转换为新的文件格式。"
 
-#: eeschema/files-io.cpp:457
+#: eeschema/files-io.cpp:465
 msgid ""
 "This schematic was saved in the legacy file format which is no longer "
 "supported and will be saved\n"
@@ -10727,11 +11189,11 @@ msgstr ""
 "此逻辑示意图以不再受支持的旧文件格式保存，将被保存。\n"
 "使用新的文件格式。新文件格式无法使用早期版本的 KiCad 打开。"
 
-#: eeschema/files-io.cpp:550
+#: eeschema/files-io.cpp:558
 msgid "Append Schematic"
 msgstr "添加原理图"
 
-#: eeschema/files-io.cpp:579
+#: eeschema/files-io.cpp:587
 msgid ""
 "This operation cannot be undone.\n"
 "\n"
@@ -10741,25 +11203,25 @@ msgstr ""
 "\n"
 "是否在执行该操作前保存当前原理图？"
 
-#: eeschema/files-io.cpp:599
+#: eeschema/files-io.cpp:626
 msgid "Import Schematic"
 msgstr "导入原理图"
 
-#: eeschema/files-io.cpp:639
+#: eeschema/files-io.cpp:686
 #, c-format
 msgid "Directory \"%s\" is not writable."
 msgstr "目录 \"%s\" 不可写入。"
 
-#: eeschema/files-io.cpp:677
+#: eeschema/files-io.cpp:724
 msgid ""
 "Saving the project to the new file format will overwrite existing files."
 msgstr "将项目保存为新文件格式将覆盖现有文件。"
 
-#: eeschema/files-io.cpp:678
+#: eeschema/files-io.cpp:725
 msgid "Project Save Warning"
 msgstr "工程保存警告"
 
-#: eeschema/files-io.cpp:681
+#: eeschema/files-io.cpp:728
 #, c-format
 msgid ""
 "The following files will be overwritten:\n"
@@ -10770,15 +11232,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/files-io.cpp:682
+#: eeschema/files-io.cpp:729
 msgid "Overwrite Files"
 msgstr "覆盖文件"
 
-#: eeschema/files-io.cpp:683
+#: eeschema/files-io.cpp:730
 msgid "Abort Project Save"
 msgstr "中止工程保存"
 
-#: eeschema/files-io.cpp:908
+#: eeschema/files-io.cpp:958
 #, c-format
 msgid ""
 "Error loading schematic \"%s\".\n"
@@ -10787,11 +11249,11 @@ msgstr ""
 "加载原理图 \"%s\" 出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:934
+#: eeschema/files-io.cpp:984
 msgid "The current schematic has been modified.  Save changes?"
 msgstr "当前原理图已被修改。是否保存更改？"
 
-#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1212
+#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1228
 msgid "Alias of"
 msgstr "别名的"
 
@@ -10800,8 +11262,8 @@ msgid "Key words:"
 msgstr "关键字："
 
 #: eeschema/generate_alias_info.cpp:122 eeschema/sim/spice_simulator.cpp:81
-#: pcbnew/class_module.cpp:658 pcbnew/class_zone.cpp:666
-#: pcbnew/tools/pcbnew_control.cpp:1024
+#: pcbnew/class_module.cpp:666 pcbnew/class_zone.cpp:671
+#: pcbnew/tools/pcbnew_control.cpp:1071
 msgid "Unknown"
 msgstr "未知"
 
@@ -10814,7 +11276,7 @@ msgstr "最近使用"
 msgid "Choose Power Symbol (%d items loaded)"
 msgstr "选择电源符号(%d 项加载完毕)"
 
-#: eeschema/getpart.cpp:152 eeschema/lib_view_frame.cpp:768
+#: eeschema/getpart.cpp:152 eeschema/lib_view_frame.cpp:832
 #, c-format
 msgid "Choose Symbol (%d items loaded)"
 msgstr "选择符号(共 %d 项)"
@@ -10832,30 +11294,30 @@ msgstr "导航"
 msgid "Root"
 msgstr "根"
 
-#: eeschema/lib_arc.cpp:410 eeschema/lib_bezier.cpp:343
+#: eeschema/lib_arc.cpp:404 eeschema/lib_bezier.cpp:343
 #: eeschema/lib_circle.cpp:252 eeschema/lib_polyline.cpp:343
 #: eeschema/lib_rectangle.cpp:200 eeschema/lib_text.cpp:355
-#: pcb_calculator/transline_ident.cpp:154
-#: pcb_calculator/transline_ident.cpp:184
-#: pcb_calculator/transline_ident.cpp:216
-#: pcb_calculator/transline_ident.cpp:319
-#: pcb_calculator/transline_ident.cpp:354
+#: pcb_calculator/transline_ident.cpp:169
+#: pcb_calculator/transline_ident.cpp:200
+#: pcb_calculator/transline_ident.cpp:233
+#: pcb_calculator/transline_ident.cpp:351
+#: pcb_calculator/transline_ident.cpp:396
 msgid "Line Width"
 msgstr "线宽"
 
-#: eeschema/lib_arc.cpp:415 eeschema/lib_bezier.cpp:351
+#: eeschema/lib_arc.cpp:409 eeschema/lib_bezier.cpp:351
 #: eeschema/lib_circle.cpp:263 eeschema/lib_polyline.cpp:348
 msgid "Bounding Box"
 msgstr "边界框"
 
-#: eeschema/lib_arc.cpp:421
+#: eeschema/lib_arc.cpp:415
 #, c-format
 msgid "Arc center (%s, %s), radius %s"
 msgstr "圆弧中心 (%s, %s), 半径 %s"
 
-#: eeschema/lib_circle.cpp:255 pcbnew/class_drawsegment.cpp:440
-#: pcbnew/class_drawsegment.cpp:449
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:166
+#: eeschema/lib_circle.cpp:255 pcbnew/class_drawsegment.cpp:471
+#: pcbnew/class_drawsegment.cpp:480
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:176
 msgid "Radius"
 msgstr "半径"
 
@@ -10869,55 +11331,57 @@ msgstr "圆中心 (%s, %s), 半径 %s"
 msgid "Field %s (%s)"
 msgstr "字段 %s (%s)"
 
-#: eeschema/lib_item.cpp:56 eeschema/lib_pin.cpp:1448
-#: eeschema/libedit/symbedit.cpp:240 eeschema/sch_text.cpp:690
+#: eeschema/lib_item.cpp:56 eeschema/lib_pin.cpp:986
+#: eeschema/libedit/symbedit.cpp:240 eeschema/sch_pin.cpp:141
+#: eeschema/sch_pin.cpp:161 eeschema/sch_text.cpp:661
 #: gerbview/gerber_draw_item.cpp:667
 #: pagelayout_editor/dialogs/dialog_design_inspector_base.cpp:37
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:25
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:74
-#: pcbnew/class_drawsegment.cpp:430 pcbnew/class_marker_pcb.cpp:105
-#: pcbnew/class_text_mod.cpp:299 pcbnew/class_track.cpp:578
-#: pcbnew/class_track.cpp:661 pcbnew/class_zone.cpp:588
+#: pcbnew/class_drawsegment.cpp:461 pcbnew/class_marker_pcb.cpp:93
+#: pcbnew/class_text_mod.cpp:295 pcbnew/class_track.cpp:649
+#: pcbnew/class_track.cpp:732 pcbnew/class_zone.cpp:593
 msgid "Type"
 msgstr "类型"
 
-#: eeschema/lib_item.cpp:66
+#: eeschema/lib_item.cpp:66 eeschema/sch_pin.cpp:151
 msgid "no"
 msgstr "否"
 
-#: eeschema/lib_item.cpp:68
+#: eeschema/lib_item.cpp:68 eeschema/sch_pin.cpp:153
 msgid "yes"
 msgstr "是"
 
-#: eeschema/lib_item.cpp:72
+#: eeschema/lib_item.cpp:72 eeschema/sch_pin.cpp:157
 msgid "Converted"
 msgstr "转换"
 
-#: eeschema/lib_pin.cpp:1453 gerbview/gerber_draw_item.cpp:709
-#: gerbview/gerber_draw_item.cpp:710
+#: eeschema/lib_pin.cpp:991 eeschema/sch_pin.cpp:166
+#: gerbview/gerber_draw_item.cpp:709 gerbview/gerber_draw_item.cpp:710
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:164
-#: pcbnew/class_pcb_text.cpp:127 pcbnew/class_text_mod.cpp:304
-#: pcbnew/class_text_mod.cpp:312
+#: pcbnew/class_pcb_text.cpp:123 pcbnew/class_text_mod.cpp:300
+#: pcbnew/class_text_mod.cpp:308
 msgid "Yes"
 msgstr "是"
 
-#: eeschema/lib_pin.cpp:1453 gerbview/gerber_draw_item.cpp:709
-#: gerbview/gerber_draw_item.cpp:710 pcbnew/class_pcb_text.cpp:125
-#: pcbnew/class_text_mod.cpp:302 pcbnew/class_text_mod.cpp:314
+#: eeschema/lib_pin.cpp:991 eeschema/sch_pin.cpp:166
+#: gerbview/gerber_draw_item.cpp:709 gerbview/gerber_draw_item.cpp:710
+#: pcbnew/class_pcb_text.cpp:121 pcbnew/class_text_mod.cpp:298
+#: pcbnew/class_text_mod.cpp:310
 msgid "No"
 msgstr "否"
 
-#: eeschema/lib_pin.cpp:1475 eeschema/lib_pin.cpp:1495
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1372
+#: eeschema/lib_pin.cpp:1006 eeschema/sch_pin.cpp:177
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1391
 msgid "Pos X"
 msgstr "X 位置"
 
-#: eeschema/lib_pin.cpp:1478 eeschema/lib_pin.cpp:1498
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1373
+#: eeschema/lib_pin.cpp:1009 eeschema/sch_pin.cpp:180
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1392
 msgid "Pos Y"
 msgstr "Y 位置"
 
-#: eeschema/lib_pin.cpp:1685
+#: eeschema/lib_pin.cpp:1140
 #, c-format
 msgid "Pin %s, %s, %s"
 msgstr "引脚 %s, %s, %s"
@@ -10931,25 +11395,25 @@ msgstr "多线段在 (%s, %s) 与 %d 点"
 msgid "PolyLine"
 msgstr "多段线"
 
-#: eeschema/lib_text.cpp:386 eeschema/sch_text.cpp:549
+#: eeschema/lib_text.cpp:386 eeschema/sch_text.cpp:548
 #, c-format
 msgid "Graphic Text \"%s\""
 msgstr "图形文本 \"%s\""
 
-#: eeschema/lib_view_frame.cpp:289
+#: eeschema/lib_view_frame.cpp:353
 msgid "<none>"
 msgstr "<无>"
 
-#: eeschema/lib_view_frame.cpp:296 eeschema/libedit/symbedit.cpp:220
+#: eeschema/lib_view_frame.cpp:360 eeschema/libedit/symbedit.cpp:220
 msgid "Parent"
 msgstr "父级"
 
-#: eeschema/lib_view_frame.cpp:298 eeschema/libedit/symbedit.cpp:242
-#: eeschema/sch_component.cpp:1235
+#: eeschema/lib_view_frame.cpp:362 eeschema/libedit/symbedit.cpp:242
+#: eeschema/sch_component.cpp:1251
 msgid "Key words"
 msgstr "关键词"
 
-#: eeschema/lib_view_frame.cpp:321
+#: eeschema/lib_view_frame.cpp:385
 #, c-format
 msgid ""
 "The current configuration does not include a library with the\n"
@@ -10960,11 +11424,11 @@ msgstr ""
 "昵称 \"%s\"。使用管理符号库\n"
 "来编辑配置。"
 
-#: eeschema/lib_view_frame.cpp:324
+#: eeschema/lib_view_frame.cpp:388
 msgid "Symbol library not found."
 msgstr "符号库未找到。"
 
-#: eeschema/lib_view_frame.cpp:328 eeschema/libedit/lib_edit_frame.cpp:849
+#: eeschema/lib_view_frame.cpp:392 eeschema/libedit/lib_edit_frame.cpp:1041
 #, c-format
 msgid ""
 "The library with the nickname \"%s\" is not enabled\n"
@@ -10975,21 +11439,21 @@ msgstr ""
 "使用管理符号库\n"
 "来编辑封装。"
 
-#: eeschema/lib_view_frame.cpp:331 eeschema/libedit/lib_edit_frame.cpp:852
+#: eeschema/lib_view_frame.cpp:395 eeschema/libedit/lib_edit_frame.cpp:1044
 msgid "Symbol library not enabled."
 msgstr "符号库未启用。"
 
-#: eeschema/lib_view_frame.cpp:391
+#: eeschema/lib_view_frame.cpp:455
 #, c-format
 msgid "Unit %c"
 msgstr "单元 %c"
 
-#: eeschema/lib_view_frame.cpp:833
+#: eeschema/lib_view_frame.cpp:897
 #, c-format
 msgid "Symbol Library Browser -- %s"
 msgstr "符号库浏览器 -- %s"
 
-#: eeschema/lib_view_frame.cpp:834 pcbnew/footprint_viewer_frame.cpp:935
+#: eeschema/lib_view_frame.cpp:898 pcbnew/footprint_viewer_frame.cpp:981
 msgid "no library selected"
 msgstr "没有选择库"
 
@@ -11017,32 +11481,32 @@ msgstr "创建符号库%s时发生错误。"
 msgid "Failed to save symbol library file \"%s\""
 msgstr "无法创建元件库文件 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:91
-#: eeschema/libedit/menubar_libedit.cpp:89
+#: eeschema/libedit/lib_edit_frame.cpp:93
+#: eeschema/libedit/menubar_libedit.cpp:73
 msgid "Library Editor"
 msgstr "库编辑器"
 
-#: eeschema/libedit/lib_edit_frame.cpp:151
+#: eeschema/libedit/lib_edit_frame.cpp:154
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:194
-#: pcbnew/footprint_edit_frame.cpp:210 pcbnew/footprint_edit_frame.cpp:630
+#: pcbnew/footprint_edit_frame.cpp:216 pcbnew/footprint_edit_frame.cpp:671
 msgid "Libraries"
 msgstr "库"
 
-#: eeschema/libedit/lib_edit_frame.cpp:186
+#: eeschema/libedit/lib_edit_frame.cpp:189
 msgid "Library changes are unsaved"
 msgstr "库更改未保存"
 
-#: eeschema/libedit/lib_edit_frame.cpp:312 eeschema/tools/sch_edit_tool.cpp:109
+#: eeschema/libedit/lib_edit_frame.cpp:475 eeschema/tools/sch_edit_tool.cpp:110
 #, c-format
 msgid "Unit %s"
 msgstr "单元 %s"
 
-#: eeschema/libedit/lib_edit_frame.cpp:508
+#: eeschema/libedit/lib_edit_frame.cpp:683
 #, c-format
 msgid "Library \"%s\" already exists"
 msgstr "库 \"%s\" 已经存在"
 
-#: eeschema/libedit/lib_edit_frame.cpp:522
+#: eeschema/libedit/lib_edit_frame.cpp:697
 #, c-format
 msgid ""
 "Could not create the library file '%s'.\n"
@@ -11051,36 +11515,44 @@ msgstr ""
 "无法创建库文件 \"%s\"。\n"
 "请检查写入权限。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:532 eeschema/libedit/lib_export.cpp:204
+#: eeschema/libedit/lib_edit_frame.cpp:707 eeschema/libedit/lib_export.cpp:204
 msgid "Could not open the library file."
 msgstr "无法打开库文件。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:601
-#: eeschema/symbol_tree_model_adapter.cpp:73
+#: eeschema/libedit/lib_edit_frame.cpp:776
+#: eeschema/symbol_tree_model_adapter.cpp:74
 #, c-format
 msgid "Loading library \"%s\""
 msgstr "加载库 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:660
-#: pcbnew/footprint_libraries_utils.cpp:495
+#: eeschema/libedit/lib_edit_frame.cpp:841
+msgid "Add the library to the global library table?"
+msgstr "是否将库添加到全局库表？"
+
+#: eeschema/libedit/lib_edit_frame.cpp:842
+msgid "Add To Global Library Table"
+msgstr "添加到全局库表"
+
+#: eeschema/libedit/lib_edit_frame.cpp:852
+#: pcbnew/footprint_libraries_utils.cpp:503
 msgid "Global"
 msgstr "全局"
 
-#: eeschema/libedit/lib_edit_frame.cpp:663
-#: pcbnew/footprint_libraries_utils.cpp:499
+#: eeschema/libedit/lib_edit_frame.cpp:855
+#: pcbnew/footprint_libraries_utils.cpp:507
 msgid "Choose the Library Table to add the library to:"
 msgstr "选择库表添加到以下库："
 
-#: eeschema/libedit/lib_edit_frame.cpp:664
+#: eeschema/libedit/lib_edit_frame.cpp:856
 msgid "Add To Library Table"
 msgstr "添加到库表"
 
-#: eeschema/libedit/lib_edit_frame.cpp:696
+#: eeschema/libedit/lib_edit_frame.cpp:888
 #, c-format
 msgid "Failed to save backup to \"%s\""
 msgstr "未能将备份保存到 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:838
+#: eeschema/libedit/lib_edit_frame.cpp:1030
 #, c-format
 msgid ""
 "The current configuration does not include the symbol library\n"
@@ -11091,7 +11563,7 @@ msgstr ""
 "\"%s\"。\n"
 "使用管理符号库来编辑配置。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:841
+#: eeschema/libedit/lib_edit_frame.cpp:1033
 msgid "Library not found in symbol library table."
 msgstr "在符号库表中找不到库。"
 
@@ -11136,8 +11608,8 @@ msgstr "符号 <%s> 已经在<%s>中存在。"
 #: kicad/tools/kicad_manager_control.cpp:260
 #: pcbnew/dialogs/dialog_export_idf.cpp:166
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:121
-#: pcbnew/footprint_libraries_utils.cpp:446
-#: pcbnew/footprint_libraries_utils.cpp:948
+#: pcbnew/footprint_libraries_utils.cpp:447
+#: pcbnew/footprint_libraries_utils.cpp:963
 msgid "Overwrite"
 msgstr "覆盖"
 
@@ -11205,9 +11677,9 @@ msgstr ""
 msgid "No symbol libraries are loaded."
 msgstr "没有符号库被加载。"
 
-#: eeschema/libedit/libedit.cpp:88 eeschema/sch_component.cpp:1216
-#: eeschema/sch_component.cpp:1221 eeschema/sch_component.cpp:1254
-#: eeschema/sch_component.cpp:1259 pcbnew/tools/pcbnew_control.cpp:1013
+#: eeschema/libedit/libedit.cpp:88 eeschema/sch_component.cpp:1232
+#: eeschema/sch_component.cpp:1237 eeschema/sch_component.cpp:1270
+#: eeschema/sch_component.cpp:1275 pcbnew/tools/pcbnew_control.cpp:1060
 msgid "Library"
 msgstr "库"
 
@@ -11224,34 +11696,34 @@ msgstr "当前符号已被修改。是否保存更改？"
 msgid "Error occurred loading symbol \"%s\" from library \"%s\"."
 msgstr "从库中%s加载符号%s发生错误。"
 
-#: eeschema/libedit/libedit.cpp:275
+#: eeschema/libedit/libedit.cpp:274
 msgid "This new symbol has no name and cannot be created."
 msgstr "此新符号没有名称, 无法创建。"
 
-#: eeschema/libedit/libedit.cpp:286 eeschema/libedit/libedit.cpp:492
+#: eeschema/libedit/libedit.cpp:285 eeschema/libedit/libedit.cpp:491
 #, c-format
 msgid "Symbol \"%s\" already exists in library \"%s\""
 msgstr "符号 \"%s\" 已经在库 \"%s\" 中存在"
 
-#: eeschema/libedit/libedit.cpp:420 include/lib_table_grid.h:183
-#: pcbnew/footprint_libraries_utils.cpp:862
-#: pcbnew/footprint_libraries_utils.cpp:1098
+#: eeschema/libedit/libedit.cpp:419 include/lib_table_grid.h:183
+#: pcbnew/footprint_libraries_utils.cpp:877
+#: pcbnew/footprint_libraries_utils.cpp:1113
 msgid "Nickname"
 msgstr "昵称"
 
-#: eeschema/libedit/libedit.cpp:431
+#: eeschema/libedit/libedit.cpp:430
 msgid "Save Copy of Symbol"
 msgstr "保存符号副本"
 
-#: eeschema/libedit/libedit.cpp:432 pcbnew/footprint_libraries_utils.cpp:874
+#: eeschema/libedit/libedit.cpp:431 pcbnew/footprint_libraries_utils.cpp:889
 msgid "Save in library:"
 msgstr "保存在库："
 
-#: eeschema/libedit/libedit.cpp:464
+#: eeschema/libedit/libedit.cpp:463
 msgid "No library specified.  Symbol could not be saved."
 msgstr "没有指定库，符号无法保存。"
 
-#: eeschema/libedit/libedit.cpp:473
+#: eeschema/libedit/libedit.cpp:472
 msgid ""
 "Derived symbols must be save in the same library\n"
 "that the parent symbol exists."
@@ -11259,11 +11731,11 @@ msgstr ""
 "派生符号必须保存在父级符号\n"
 "所在的同一库中。"
 
-#: eeschema/libedit/libedit.cpp:485
+#: eeschema/libedit/libedit.cpp:484
 msgid "No symbol name specified.  Symbol could not be saved."
 msgstr "没有指定符号名称, 符号无法保存。"
 
-#: eeschema/libedit/libedit.cpp:563
+#: eeschema/libedit/libedit.cpp:562
 #, c-format
 msgid ""
 "The symbol \"%s\" is used to derive other symbols.\n"
@@ -11276,82 +11748,82 @@ msgstr ""
 "\n"
 "是否要删除此符号及其所有派生符号？"
 
-#: eeschema/libedit/libedit.cpp:568
+#: eeschema/libedit/libedit.cpp:567
 msgid "Delete Symbol"
 msgstr "删除符号"
 
-#: eeschema/libedit/libedit.cpp:569
+#: eeschema/libedit/libedit.cpp:568
 msgid "Keep Symbol"
 msgstr "保留符号"
 
-#: eeschema/libedit/libedit.cpp:705 pcbnew/footprint_libraries_utils.cpp:976
+#: eeschema/libedit/libedit.cpp:704 pcbnew/footprint_libraries_utils.cpp:991
 #, c-format
 msgid "Revert \"%s\" to last version saved?"
 msgstr "是否将\"%s\"还原为上次保存的版本？"
 
-#: eeschema/libedit/libedit.cpp:774
+#: eeschema/libedit/libedit.cpp:773
 #, c-format
 msgid "Symbol name \"%s\" not found in library \"%s\""
 msgstr "在库 \"%s\" 中找不到符号 \"%s\" ！"
 
-#: eeschema/libedit/libedit.cpp:800
+#: eeschema/libedit/libedit.cpp:799
 msgid "No library specified."
 msgstr "没有指定库。"
 
-#: eeschema/libedit/libedit.cpp:819
+#: eeschema/libedit/libedit.cpp:818
 #, c-format
 msgid "Save Library \"%s\" As..."
 msgstr "另存为库 \"%s\"..."
 
-#: eeschema/libedit/libedit.cpp:851
+#: eeschema/libedit/libedit.cpp:850
 #, c-format
 msgid "Failed to save changes to symbol library file \"%s\""
 msgstr "无法将更改保存到符号库文件%s"
 
-#: eeschema/libedit/libedit.cpp:853
+#: eeschema/libedit/libedit.cpp:852
 msgid "Error saving library"
 msgstr "保存库时出错"
 
-#: eeschema/libedit/libedit.cpp:861
+#: eeschema/libedit/libedit.cpp:860
 #, c-format
 msgid "Symbol library file \"%s\" saved"
 msgstr "符号库文件 \"%s\" 已保存"
 
-#: eeschema/libedit/libedit.cpp:886 eeschema/sch_edit_frame.cpp:505
-#: pagelayout_editor/pl_editor_frame.cpp:291
-#: pcbnew/footprint_edit_frame.cpp:517 pcbnew/pcb_edit_frame.cpp:574
+#: eeschema/libedit/libedit.cpp:885 eeschema/sch_edit_frame.cpp:612
+#: pagelayout_editor/pl_editor_frame.cpp:343
+#: pcbnew/footprint_edit_frame.cpp:550 pcbnew/pcb_edit_frame.cpp:816
 #, c-format
 msgid "Save changes to \"%s\" before closing?"
 msgstr "是否在 \"%s\" 关闭之前保存更改？"
 
-#: eeschema/libedit/menubar_libedit.cpp:81 eeschema/menubar.cpp:111
+#: eeschema/libedit/menubar_libedit.cpp:65 eeschema/menubar.cpp:112
 #: pcbnew/dialogs/dialog_export_step.cpp:130
 #: pcbnew/dialogs/dialog_export_svg.cpp:93
-#: pcbnew/menubar_footprint_editor.cpp:91 pcbnew/menubar_pcb_editor.cpp:133
+#: pcbnew/menubar_footprint_editor.cpp:85 pcbnew/menubar_pcb_editor.cpp:133
 msgid "Export"
 msgstr "导出"
 
-#: eeschema/libedit/menubar_libedit.cpp:161 eeschema/menubar.cpp:219
-#: gerbview/menubar.cpp:207 pcbnew/menubar_footprint_editor.cpp:195
-#: pcbnew/menubar_pcb_editor.cpp:351
+#: eeschema/libedit/menubar_libedit.cpp:117 eeschema/menubar.cpp:181
+#: gerbview/menubar.cpp:190 pcbnew/menubar_footprint_editor.cpp:149
+#: pcbnew/menubar_pcb_editor.cpp:259
 msgid "&Units"
 msgstr "单位 (&U)"
 
-#: eeschema/libedit/menubar_libedit.cpp:228 eeschema/menubar.cpp:341
-#: pagelayout_editor/menubar.cpp:188 pcbnew/menubar_footprint_editor.cpp:304
-#: pcbnew/menubar_pcb_editor.cpp:552
+#: eeschema/libedit/menubar_libedit.cpp:173 eeschema/menubar.cpp:281
+#: pagelayout_editor/menubar.cpp:158 pcbnew/menubar_footprint_editor.cpp:247
+#: pcbnew/menubar_pcb_editor.cpp:458
 msgid "&Place"
 msgstr "放置 (&P)"
 
-#: eeschema/libedit/menubar_libedit.cpp:229 eeschema/menubar.cpp:342
-#: pagelayout_editor/menubar.cpp:189 pcbnew/menubar_footprint_editor.cpp:305
-#: pcbnew/menubar_pcb_editor.cpp:554
+#: eeschema/libedit/menubar_libedit.cpp:174 eeschema/menubar.cpp:282
+#: pagelayout_editor/menubar.cpp:159 pcbnew/menubar_footprint_editor.cpp:248
+#: pcbnew/menubar_pcb_editor.cpp:460
 msgid "&Inspect"
 msgstr "检查 (&I)"
 
-#: eeschema/libedit/menubar_libedit.cpp:230 eeschema/menubar.cpp:344
-#: pagelayout_editor/menubar.cpp:190 pcbnew/menubar_footprint_editor.cpp:307
-#: pcbnew/menubar_pcb_editor.cpp:556
+#: eeschema/libedit/menubar_libedit.cpp:175 eeschema/menubar.cpp:284
+#: pagelayout_editor/menubar.cpp:160 pcbnew/menubar_footprint_editor.cpp:250
+#: pcbnew/menubar_pcb_editor.cpp:462
 msgid "P&references"
 msgstr "首选项 (&R)"
 
@@ -11394,21 +11866,21 @@ msgstr "导入现有的图形"
 msgid "Export current drawing"
 msgstr "导出当前图形"
 
-#: eeschema/menubar.cpp:71 kicad/menubar.cpp:63
-#: pagelayout_editor/menubar.cpp:61 pcbnew/menubar_pcb_editor.cpp:76
+#: eeschema/menubar.cpp:64 kicad/menubar.cpp:63
+#: pagelayout_editor/menubar.cpp:57 pcbnew/menubar_pcb_editor.cpp:71
 msgid "Open Recent"
 msgstr "打开最近使用"
 
-#: eeschema/menubar.cpp:89
+#: eeschema/menubar.cpp:88
 msgid "Append Schematic Sheet Content..."
 msgstr "添加原理图内容..."
 
-#: eeschema/menubar.cpp:90
+#: eeschema/menubar.cpp:89
 msgid ""
 "Append schematic sheet content from another project to the current sheet"
 msgstr "将其它项目中的原理图添加到当前图页中"
 
-#: eeschema/menubar.cpp:98 pcbnew/menubar_footprint_editor.cpp:80
+#: eeschema/menubar.cpp:98 pcbnew/menubar_footprint_editor.cpp:73
 #: pcbnew/menubar_pcb_editor.cpp:112
 msgid "Import"
 msgstr "导入"
@@ -11422,8 +11894,8 @@ msgid ""
 "Replace current schematic sheet with one imported from another application"
 msgstr "将当前的原理图页替换为从另一个应用程序导入的原理图页"
 
-#: eeschema/menubar.cpp:343 gerbview/menubar.cpp:270 kicad/menubar.cpp:162
-#: pcbnew/menubar_footprint_editor.cpp:306 pcbnew/menubar_pcb_editor.cpp:555
+#: eeschema/menubar.cpp:283 gerbview/menubar.cpp:251 kicad/menubar.cpp:165
+#: pcbnew/menubar_footprint_editor.cpp:249 pcbnew/menubar_pcb_editor.cpp:461
 msgid "&Tools"
 msgstr "工具 (&T)"
 
@@ -11461,77 +11933,68 @@ msgstr "错误信息："
 
 #: eeschema/netlist_generator.cpp:182
 msgid "Exporting the netlist requires a completely annotated schematic."
-msgstr "导出网表需要一个完整标注的原理图。"
+msgstr "导出网表需要一个完整批注的原理图。"
 
 #: eeschema/netlist_generator.cpp:194
 msgid "Error: duplicate sheet names. Continue?"
 msgstr "错误：重复的图页名称。要继续吗？"
 
-#: eeschema/netlist_generator.cpp:232
-msgid "No Objects"
-msgstr "没有对象"
-
-#: eeschema/netlist_generator.cpp:236
-#, c-format
-msgid "Net count = %d"
-msgstr "网络计数 = %d"
-
-#: eeschema/pin_shape.cpp:46
-msgid "Inverted"
-msgstr "反相"
-
-#: eeschema/pin_shape.cpp:47
-msgid "Clock"
-msgstr "时钟"
-
-#: eeschema/pin_shape.cpp:48
-msgid "Inverted clock"
-msgstr "反相时钟"
-
-#: eeschema/pin_shape.cpp:49
-msgid "Input low"
-msgstr "输入低"
-
-#: eeschema/pin_shape.cpp:50
-msgid "Clock low"
-msgstr "时钟低"
-
-#: eeschema/pin_shape.cpp:51
-msgid "Output low"
-msgstr "输出低"
-
-#: eeschema/pin_shape.cpp:52
-msgid "Falling edge clock"
-msgstr "下降沿时钟"
-
-#: eeschema/pin_shape.cpp:53
-msgid "NonLogic"
-msgstr "非逻辑"
-
-#: eeschema/pin_type.cpp:50
+#: eeschema/pin_type.cpp:57
 msgid "Unspecified"
 msgstr "未指定"
 
-#: eeschema/pin_type.cpp:51
+#: eeschema/pin_type.cpp:58
 msgid "Power input"
 msgstr "电源输入"
 
-#: eeschema/pin_type.cpp:52
+#: eeschema/pin_type.cpp:59
 msgid "Power output"
 msgstr "电源输出"
 
-#: eeschema/pin_type.cpp:53
+#: eeschema/pin_type.cpp:60
 msgid "Open collector"
 msgstr "集电极开路"
 
-#: eeschema/pin_type.cpp:54
+#: eeschema/pin_type.cpp:61
 msgid "Open emitter"
 msgstr "发射极开路"
 
-#: eeschema/pin_type.cpp:55
+#: eeschema/pin_type.cpp:62
 msgid "Not connected"
 msgstr "未连接"
 
+#: eeschema/pin_type.cpp:79
+msgid "Inverted"
+msgstr "反相"
+
+#: eeschema/pin_type.cpp:80
+msgid "Clock"
+msgstr "时钟"
+
+#: eeschema/pin_type.cpp:81
+msgid "Inverted clock"
+msgstr "反相时钟"
+
+#: eeschema/pin_type.cpp:82
+msgid "Input low"
+msgstr "输入低"
+
+#: eeschema/pin_type.cpp:83
+msgid "Clock low"
+msgstr "时钟低"
+
+#: eeschema/pin_type.cpp:84
+msgid "Output low"
+msgstr "输出低"
+
+#: eeschema/pin_type.cpp:85
+msgid "Falling edge clock"
+msgstr "下降沿时钟"
+
+#: eeschema/pin_type.cpp:86
+msgid "NonLogic"
+msgstr "非逻辑"
+
 #: eeschema/plot_schematic_DXF.cpp:82 eeschema/plot_schematic_HPGL.cpp:156
 #: eeschema/plot_schematic_PDF.cpp:128 eeschema/plot_schematic_PS.cpp:106
 #: eeschema/plot_schematic_SVG.cpp:83
@@ -11623,36 +12086,36 @@ msgstr "总线到总线入口"
 msgid "Bus Entry Type"
 msgstr "总线输入类型"
 
-#: eeschema/sch_component.cpp:1191
+#: eeschema/sch_component.cpp:1207
 msgid "Power symbol"
 msgstr "电源符号"
 
-#: eeschema/sch_component.cpp:1196
+#: eeschema/sch_component.cpp:1212
 msgid "flags"
 msgstr "标志"
 
-#: eeschema/sch_component.cpp:1205
+#: eeschema/sch_component.cpp:1221
 msgid "Missing parent"
 msgstr "缺少父级"
 
-#: eeschema/sch_component.cpp:1221
+#: eeschema/sch_component.cpp:1237
 msgid "Undefined!!!"
 msgstr "未定义!!!"
 
-#: eeschema/sch_component.cpp:1228
+#: eeschema/sch_component.cpp:1244
 msgid "<Unknown>"
 msgstr "<未知>"
 
-#: eeschema/sch_component.cpp:1254
+#: eeschema/sch_component.cpp:1270
 msgid "No library defined!"
 msgstr "未定义库!"
 
-#: eeschema/sch_component.cpp:1258
+#: eeschema/sch_component.cpp:1274
 #, c-format
 msgid "Symbol not found in %s!"
 msgstr "在 %s 中找不到符号!"
 
-#: eeschema/sch_component.cpp:1446
+#: eeschema/sch_component.cpp:1462
 #, c-format
 msgid "Symbol %s, %s"
 msgstr "符号 %s, %s"
@@ -11670,8 +12133,8 @@ msgstr "网络码"
 msgid "Bus Alias %s Members"
 msgstr "总线别名 %s 成员"
 
-#: eeschema/sch_eagle_plugin.cpp:408 pcbnew/eagle_plugin.cpp:274
-#: pcbnew/eagle_plugin.cpp:2571
+#: eeschema/sch_eagle_plugin.cpp:408 pcbnew/eagle_plugin.cpp:335
+#: pcbnew/eagle_plugin.cpp:2624
 #, c-format
 msgid "Unable to read file \"%s\""
 msgstr "无法读取文件 \"%s\""
@@ -11688,26 +12151,26 @@ msgstr "解析 Eagle 文件时出错。  找不到 \"%s\" 实例, 但在原理
 msgid "Could not find %s in the imported library"
 msgstr "在导入的库中找不到 %s"
 
-#: eeschema/sch_eagle_plugin.cpp:2053 eeschema/sch_eagle_plugin.cpp:2091
-#: eeschema/sch_eagle_plugin.cpp:2133 eeschema/sch_eagle_plugin.cpp:2170
-#: eeschema/sch_eagle_plugin.cpp:2212 eeschema/sch_eagle_plugin.cpp:2244
-#: eeschema/sch_eagle_plugin.cpp:2283 eeschema/sch_eagle_plugin.cpp:2315
+#: eeschema/sch_eagle_plugin.cpp:2051 eeschema/sch_eagle_plugin.cpp:2089
+#: eeschema/sch_eagle_plugin.cpp:2131 eeschema/sch_eagle_plugin.cpp:2168
+#: eeschema/sch_eagle_plugin.cpp:2210 eeschema/sch_eagle_plugin.cpp:2242
+#: eeschema/sch_eagle_plugin.cpp:2281 eeschema/sch_eagle_plugin.cpp:2313
 msgid "Bus Entry needed"
 msgstr "需要总线入口"
 
-#: eeschema/sch_edit_frame.cpp:164 pcbnew/board_connected_item.h:144
+#: eeschema/sch_edit_frame.cpp:162 pcbnew/board_connected_item.h:144
 msgid "Not Found"
 msgstr "未找到"
 
-#: eeschema/sch_edit_frame.cpp:166
+#: eeschema/sch_edit_frame.cpp:164
 msgid "The following libraries were not found:"
 msgstr "未找到以下库："
 
-#: eeschema/sch_edit_frame.cpp:292
+#: eeschema/sch_edit_frame.cpp:294
 msgid "New schematic file is unsaved"
 msgstr "新原理图文件未保存"
 
-#: eeschema/sch_edit_frame.cpp:607
+#: eeschema/sch_edit_frame.cpp:719
 msgid ""
 "Cannot update the PCB, because the Schematic Editor is opened in stand-alone "
 "mode. In order to create/update PCBs from schematics, launch the Kicad shell "
@@ -11716,52 +12179,57 @@ msgstr ""
 "无法更新 PCB,因为架构编辑器在独立模式下打开。为了从原理图创建/更新 PCB,请启"
 "动 KiCad Shell 并创建项目。"
 
-#: eeschema/sch_edit_frame.cpp:718
+#: eeschema/sch_edit_frame.cpp:830
 msgid "Schematic"
 msgstr "原理图"
 
-#: eeschema/sch_edit_frame.cpp:735
+#: eeschema/sch_edit_frame.cpp:847
 msgid "New Schematic"
 msgstr "新建原理图"
 
-#: eeschema/sch_edit_frame.cpp:747
+#: eeschema/sch_edit_frame.cpp:859
 #, c-format
 msgid "Schematic file \"%s\" already exists."
 msgstr "原理图文件 \"%s\" 已经存在。"
 
-#: eeschema/sch_edit_frame.cpp:768
+#: eeschema/sch_edit_frame.cpp:880
 msgid "Open Schematic"
 msgstr "打开原理图"
 
-#: eeschema/sch_edit_frame.cpp:849
+#: eeschema/sch_edit_frame.cpp:961
 msgid "Could not open CvPcb"
 msgstr "不能打开 CvPcb"
 
-#: eeschema/sch_edit_frame.cpp:988 eeschema/sch_edit_frame.cpp:1006
+#: eeschema/sch_edit_frame.cpp:1100 eeschema/sch_edit_frame.cpp:1118
 msgid " [no file]"
 msgstr " [没有文件]"
 
-#: eeschema/sch_edit_frame.cpp:1003 kicad/kicad_manager_frame.cpp:217
-#: pcbnew/pcb_edit_frame.cpp:930
+#: eeschema/sch_edit_frame.cpp:1115 kicad/kicad_manager_frame.cpp:610
+#: pcbnew/pcb_edit_frame.cpp:1152
 msgid " [Read Only]"
 msgstr " [只读]"
 
+#: eeschema/sch_edit_frame.cpp:1193
+#, c-format
+msgid "Highlighted net: %s"
+msgstr "高亮网络：%s"
+
 #: eeschema/sch_field.cpp:174
 msgid "File: "
 msgstr "文件： "
 
-#: eeschema/sch_io_mgr.cpp:33 eeschema/sch_plugin.cpp:27 pcbnew/io_mgr.cpp:45
+#: eeschema/sch_io_mgr.cpp:34 eeschema/sch_plugin.cpp:27 pcbnew/io_mgr.cpp:45
 #: pcbnew/plugin.cpp:29
 #, c-format
 msgid "Plugin \"%s\" does not implement the \"%s\" function."
 msgstr "插件 \"%s\" 不能执行 \"%s\" 功能."
 
-#: eeschema/sch_io_mgr.cpp:34 pcbnew/io_mgr.cpp:46
+#: eeschema/sch_io_mgr.cpp:35 pcbnew/io_mgr.cpp:46
 #, c-format
 msgid "Plugin type \"%s\" is not found."
 msgstr "\"%s\" 类型插件没有找到。"
 
-#: eeschema/sch_io_mgr.cpp:90
+#: eeschema/sch_io_mgr.cpp:93
 #, c-format
 msgid "Unknown SCH_FILE_T value: %d"
 msgstr "未知 SCH_FILE_T 值：%d"
@@ -11805,7 +12273,7 @@ msgstr "需要“斜体”或 \"~\" 符号"
 msgid "component field text attributes must be 3 characters wide"
 msgstr "元件字段文本的属性必须是3个字符宽度"
 
-#: eeschema/sch_legacy_plugin.cpp:2564 eeschema/sch_sexpr_plugin.cpp:1414
+#: eeschema/sch_legacy_plugin.cpp:2564 eeschema/sch_sexpr_plugin.cpp:1402
 #, c-format
 msgid "Library file \"%s\" not found."
 msgstr "未找到库文件 \"%s\"。"
@@ -11819,55 +12287,55 @@ msgstr "用户没有权限读取库文档 \"%s\""
 msgid "symbol document library file is empty"
 msgstr "符号文档库文件为空"
 
-#: eeschema/sch_legacy_plugin.cpp:4296 eeschema/sch_sexpr_plugin.cpp:1942
+#: eeschema/sch_legacy_plugin.cpp:4259 eeschema/sch_sexpr_plugin.cpp:1938
 #, c-format
 msgid "library %s does not contain a symbol named %s"
 msgstr "库 %s 不包含名为 %s 的符号"
 
-#: eeschema/sch_legacy_plugin.cpp:4479 eeschema/sch_sexpr_plugin.cpp:2114
+#: eeschema/sch_legacy_plugin.cpp:4442 eeschema/sch_sexpr_plugin.cpp:2110
 #, c-format
 msgid "symbol library \"%s\" already exists, cannot create a new library"
 msgstr "符号库 \"%s\" 已经存在, 无法创建新的库"
 
-#: eeschema/sch_legacy_plugin.cpp:4507 eeschema/sch_sexpr_plugin.cpp:2142
-#: pcbnew/legacy_plugin.cpp:3418
+#: eeschema/sch_legacy_plugin.cpp:4470 eeschema/sch_sexpr_plugin.cpp:2138
+#: pcbnew/legacy_plugin.cpp:3420
 #, c-format
 msgid "library \"%s\" cannot be deleted"
 msgstr "不能删除库 \"%s\""
 
-#: eeschema/sch_line.cpp:599
+#: eeschema/sch_line.cpp:632
 #, c-format
 msgid "%s Graphic Line from (%s, %s) to (%s, %s)"
 msgstr "%s 图形线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:600
+#: eeschema/sch_line.cpp:633
 #, c-format
 msgid "%s Wire from (%s, %s) to (%s, %s)"
 msgstr "%s 连线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:601
+#: eeschema/sch_line.cpp:634
 #, c-format
 msgid "%s Bus from (%s, %s) to (%s, %s)"
 msgstr "%s 总线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:602
+#: eeschema/sch_line.cpp:635
 #, c-format
 msgid "%s Line on Unknown Layer from (%s, %s) to (%s, %s)"
 msgstr "%s 线在未知层从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:777
+#: eeschema/sch_line.cpp:783
 msgid "Graphical"
 msgstr "图形"
 
-#: eeschema/sch_line.cpp:780
+#: eeschema/sch_line.cpp:786
 msgid "Line Type"
 msgstr "线类型"
 
-#: eeschema/sch_line.cpp:783
+#: eeschema/sch_line.cpp:789
 msgid "from netclass"
 msgstr "从网络类"
 
-#: eeschema/sch_line.cpp:803 eeschema/sch_text.cpp:711
+#: eeschema/sch_line.cpp:810 eeschema/sch_text.cpp:682
 msgid "Assigned Netclass"
 msgstr "分配的网络类"
 
@@ -11910,36 +12378,42 @@ msgid ""
 "Enter the python symbol which implements the SCH_PLUGIN::Symbol*() functions."
 msgstr "输入实现 SCH_PLUGIN::Symbol*() 函数的 Python 符号。"
 
-#: eeschema/sch_screen.cpp:561 eeschema/sch_screen.cpp:655
+#: eeschema/sch_plugins/altium/sch_altium_plugin.cpp:227
+#: pcbnew/plugins/altium/altium_pcb.cpp:57
+#, c-format
+msgid "Cannot open file '%s'"
+msgstr "无法打开文件 ‘%s’"
+
+#: eeschema/sch_screen.cpp:585 eeschema/sch_screen.cpp:682
 #, c-format
 msgid "Setting schematic symbol '%s %s' library identifier to '%s'. "
 msgstr "正在将原理图符号 '%s %s' 库标识符设置为 '%s'。 "
 
-#: eeschema/sch_screen.cpp:578
+#: eeschema/sch_screen.cpp:602
 #, c-format
 msgid ""
 "Schematic symbol reference '%s' library identifier is not valid.  Unable to "
 "link library symbol."
 msgstr "原理图符号引用 '%s' 库标识符无效。无法链接库符号。"
 
-#: eeschema/sch_screen.cpp:594
+#: eeschema/sch_screen.cpp:618
 #, c-format
 msgid ""
 "Symbol library '%s' not found and no fallback cache library available.  "
 "Unable to link library symbol."
 msgstr "找不到符号库 '%s' ，并且没有可用的后备缓存库。  无法链接库符号。"
 
-#: eeschema/sch_screen.cpp:611
+#: eeschema/sch_screen.cpp:637
 #, c-format
 msgid "I/O error %s resolving library symbol %s"
 msgstr "I/O 错误 %s 正在解析库符号 %s"
 
-#: eeschema/sch_screen.cpp:634
+#: eeschema/sch_screen.cpp:661
 #, c-format
 msgid "Falling back to cache to set symbol '%s:%s' link '%s'."
 msgstr "正在回退到缓存以设置符号 '%s:%s' 链接 '%s'。"
 
-#: eeschema/sch_screen.cpp:666
+#: eeschema/sch_screen.cpp:693
 #, c-format
 msgid "No library symbol found for schematic symbol '%s %s'. "
 msgstr "找不到原理图符号 '%s %s' 的库符号。 "
@@ -12061,7 +12535,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:397 pcbnew/pcb_parser.cpp:161
+#: eeschema/sch_sexpr_parser.cpp:397 pcbnew/pcb_parser.cpp:149
 #, c-format
 msgid ""
 "Invalid floating point number in\n"
@@ -12074,7 +12548,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:406 pcbnew/pcb_parser.cpp:170
+#: eeschema/sch_sexpr_parser.cpp:406 pcbnew/pcb_parser.cpp:158
 #, c-format
 msgid ""
 "Missing floating point number in\n"
@@ -12087,7 +12561,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:695
+#: eeschema/sch_sexpr_parser.cpp:698
 #, c-format
 msgid ""
 "Invalid symbol names definition in\n"
@@ -12100,7 +12574,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:718 eeschema/sch_sexpr_parser.cpp:1658
+#: eeschema/sch_sexpr_parser.cpp:721 eeschema/sch_sexpr_parser.cpp:1641
 #, c-format
 msgid ""
 "Invalid property name in\n"
@@ -12113,7 +12587,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:727 eeschema/sch_sexpr_parser.cpp:1667
+#: eeschema/sch_sexpr_parser.cpp:730 eeschema/sch_sexpr_parser.cpp:1650
 #, c-format
 msgid ""
 "Empty property name in\n"
@@ -12126,7 +12600,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:737 eeschema/sch_sexpr_parser.cpp:1676
+#: eeschema/sch_sexpr_parser.cpp:740 eeschema/sch_sexpr_parser.cpp:1659
 #, c-format
 msgid ""
 "Invalid property value in\n"
@@ -12139,7 +12613,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1238
+#: eeschema/sch_sexpr_parser.cpp:1194
 #, c-format
 msgid ""
 "Invalid pin name in\n"
@@ -12152,7 +12626,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1273
+#: eeschema/sch_sexpr_parser.cpp:1229
 #, c-format
 msgid ""
 "Invalid pin number in\n"
@@ -12165,7 +12639,20 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1450
+#: eeschema/sch_sexpr_parser.cpp:1267
+#, c-format
+msgid ""
+"Invalid alternate pin name in\n"
+"file: \"%s\"\n"
+"line: %d\n"
+"offset: %d"
+msgstr ""
+"无效的备用引脚名在\n"
+"文件：\"%s\"\n"
+"行：%d\n"
+"偏移：%d"
+
+#: eeschema/sch_sexpr_parser.cpp:1433
 #, c-format
 msgid ""
 "Invalid text string in\n"
@@ -12178,12 +12665,12 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1499 pcbnew/pcb_parser.cpp:811
+#: eeschema/sch_sexpr_parser.cpp:1482 pcbnew/pcb_parser.cpp:890
 #, c-format
 msgid "Page type \"%s\" is not valid "
 msgstr "图框类型 \"%s\" 无效 "
 
-#: eeschema/sch_sexpr_parser.cpp:1737
+#: eeschema/sch_sexpr_parser.cpp:1720
 #, c-format
 msgid ""
 "Invalid sheet pin name in\n"
@@ -12196,7 +12683,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1746
+#: eeschema/sch_sexpr_parser.cpp:1729
 #, c-format
 msgid ""
 "Empty sheet pin name in\n"
@@ -12209,7 +12696,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:2076
+#: eeschema/sch_sexpr_parser.cpp:2059
 #, c-format
 msgid ""
 "Invalid symbol library name in\n"
@@ -12222,7 +12709,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:2098
+#: eeschema/sch_sexpr_parser.cpp:2081
 #, c-format
 msgid ""
 "Invalid symbol library ID in\n"
@@ -12235,28 +12722,28 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sheet.cpp:57
+#: eeschema/sch_sheet.cpp:56
 msgid "Sheet file"
 msgstr "图框文件"
 
-#: eeschema/sch_sheet.cpp:713
+#: eeschema/sch_sheet.cpp:709
 msgid "Sheet Name"
 msgstr "图框名称"
 
-#: eeschema/sch_sheet.cpp:714
+#: eeschema/sch_sheet.cpp:710
 msgid "File Name"
 msgstr "文件名称"
 
-#: eeschema/sch_sheet.cpp:721
+#: eeschema/sch_sheet.cpp:717
 msgid "UUID"
 msgstr "UUID"
 
-#: eeschema/sch_sheet.cpp:909
+#: eeschema/sch_sheet.cpp:905
 #, c-format
 msgid "Hierarchical Sheet %s"
 msgstr "层次分页 %s"
 
-#: eeschema/sch_sheet_path.cpp:58 include/class_board_item.h:391
+#: eeschema/sch_sheet_path.cpp:58 include/class_board_item.h:396
 msgid "(Deleted Item)"
 msgstr "(删除项)"
 
@@ -12269,60 +12756,60 @@ msgstr "<根_图框>"
 msgid "Hierarchical Sheet Pin %s"
 msgstr "层次图框引脚 %s"
 
-#: eeschema/sch_text.cpp:467
+#: eeschema/sch_text.cpp:466
 msgid "Tri-State"
 msgstr "三态"
 
-#: eeschema/sch_text.cpp:654
+#: eeschema/sch_text.cpp:625
 msgid "Graphic Text"
 msgstr "图形文本"
 
-#: eeschema/sch_text.cpp:658
+#: eeschema/sch_text.cpp:629
 msgid "Hierarchical Sheet Pin"
 msgstr "层次图框引脚"
 
-#: eeschema/sch_text.cpp:666
+#: eeschema/sch_text.cpp:637
 msgid "Horizontal left"
 msgstr "水平向左"
 
-#: eeschema/sch_text.cpp:667
+#: eeschema/sch_text.cpp:638
 msgid "Vertical up"
 msgstr "垂直向上"
 
-#: eeschema/sch_text.cpp:668
+#: eeschema/sch_text.cpp:639
 msgid "Horizontal right"
 msgstr "水平向右"
 
-#: eeschema/sch_text.cpp:669
+#: eeschema/sch_text.cpp:640
 msgid "Vertical down"
 msgstr "垂直向下"
 
-#: eeschema/sch_text.cpp:675
+#: eeschema/sch_text.cpp:646
 msgid "Bold Italic"
 msgstr "加粗斜体"
 
-#: eeschema/sch_text.cpp:695 pcbnew/class_pcb_target.cpp:153
+#: eeschema/sch_text.cpp:666 pcbnew/class_pcb_target.cpp:153
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:101
 #: pcbnew/microwave/microwave_polygon.cpp:140
 msgid "Size"
 msgstr "尺寸"
 
-#: eeschema/sch_text.cpp:823
+#: eeschema/sch_text.cpp:794
 #, c-format
 msgid "Label %s"
 msgstr "标签 %s"
 
-#: eeschema/sch_text.cpp:1065
+#: eeschema/sch_text.cpp:1036
 #, c-format
 msgid "Global Label %s"
 msgstr "全局标签 %s"
 
-#: eeschema/sch_text.cpp:1254
+#: eeschema/sch_text.cpp:1225
 #, c-format
 msgid "Hierarchical Label %s"
 msgstr "层次标签 %s"
 
-#: eeschema/sch_text.cpp:1267
+#: eeschema/sch_text.cpp:1238
 msgid ""
 "<table>   <tr>      <th>Markup</th>      <th></th>      <th>Result</th>   </"
 "tr>   <tr>      <td>&nbsp;<br><samp>^{superscript}</samp></td>      <td></"
@@ -12422,14 +12909,14 @@ msgstr ""
 "u></samp><br>         <samp>MEM.D<sub>1</sub>, MEM.D<sub>2</sub>, MEM.LATCH</"
 "samp>      </td>   </tr></table>"
 
-#: eeschema/sch_text.cpp:1392 pcbnew/dialogs/panel_setup_rules.cpp:370
+#: eeschema/sch_text.cpp:1363 pcbnew/dialogs/panel_setup_rules.cpp:409
 msgid "Syntax Help"
 msgstr "语法帮助"
 
 #: eeschema/sch_validators.cpp:100
 #, c-format
 msgid "The reference designator cannot contain %s character(s)."
-msgstr "引用指示符不能包含 %s 字符。"
+msgstr "位号不能包含 %s 字符。"
 
 #: eeschema/sch_validators.cpp:104
 #, c-format
@@ -12500,11 +12987,15 @@ msgstr "%s, %s, 或 %s"
 msgid "%s, %s, %s, or %s"
 msgstr "%s, %s, %s, 或 %s"
 
-#: eeschema/sch_validators.cpp:178
+#: eeschema/sch_validators.cpp:175
+msgid "The reference designator cannot contain text variable references"
+msgstr "位号不能包含文本变量引用"
+
+#: eeschema/sch_validators.cpp:182
 msgid "Field Validation Error"
 msgstr "字段验证错误"
 
-#: eeschema/sch_validators.cpp:194
+#: eeschema/sch_validators.cpp:198
 msgid "Signal name contains '[' or ']' but is not a valid vector bus name"
 msgstr "信号名称包含 \"[\" 或 \"]\", 但不是有效的矢量总线名称"
 
@@ -12640,100 +13131,100 @@ msgid ""
 "This simulation provide no plots. Please refer to console window for results"
 msgstr "此仿真不提供绘制。有关结果，请参阅控制台窗口"
 
-#: eeschema/sim/sim_plot_frame.cpp:177
+#: eeschema/sim/sim_plot_frame.cpp:176
 msgid "Run/Stop Simulation"
 msgstr "运行/停止仿真"
 
-#: eeschema/sim/sim_plot_frame.cpp:178 eeschema/sim/sim_plot_frame_base.cpp:51
+#: eeschema/sim/sim_plot_frame.cpp:177 eeschema/sim/sim_plot_frame_base.cpp:51
 msgid "Run Simulation"
 msgstr "运行仿真"
 
-#: eeschema/sim/sim_plot_frame.cpp:179
+#: eeschema/sim/sim_plot_frame.cpp:178
 msgid "Add Signals"
 msgstr "添加信号"
 
-#: eeschema/sim/sim_plot_frame.cpp:180
+#: eeschema/sim/sim_plot_frame.cpp:179
 msgid "Add signals to plot"
 msgstr "添加信号到绘制"
 
-#: eeschema/sim/sim_plot_frame.cpp:181
+#: eeschema/sim/sim_plot_frame.cpp:180
 msgid "Probe"
 msgstr "探针"
 
-#: eeschema/sim/sim_plot_frame.cpp:182
+#: eeschema/sim/sim_plot_frame.cpp:181
 msgid "Probe signals on the schematic"
 msgstr "在原理图上探测信号"
 
-#: eeschema/sim/sim_plot_frame.cpp:183 eeschema/sim/sim_plot_frame_base.cpp:233
+#: eeschema/sim/sim_plot_frame.cpp:182 eeschema/sim/sim_plot_frame_base.cpp:233
 msgid "Tune"
 msgstr "调整"
 
-#: eeschema/sim/sim_plot_frame.cpp:184
+#: eeschema/sim/sim_plot_frame.cpp:183
 msgid "Tune component values"
 msgstr "调整元件的值"
 
-#: eeschema/sim/sim_plot_frame.cpp:185
+#: eeschema/sim/sim_plot_frame.cpp:184
 msgid "Settings"
 msgstr "设置"
 
-#: eeschema/sim/sim_plot_frame.cpp:210
+#: eeschema/sim/sim_plot_frame.cpp:209
 msgid "Welcome!"
 msgstr "欢迎！"
 
-#: eeschema/sim/sim_plot_frame.cpp:449 eeschema/sim/sim_plot_frame.cpp:1299
+#: eeschema/sim/sim_plot_frame.cpp:448 eeschema/sim/sim_plot_frame.cpp:1298
 msgid "There were errors during netlist export, aborted."
 msgstr "在网表导出过程中出现错误，中止。"
 
-#: eeschema/sim/sim_plot_frame.cpp:455
+#: eeschema/sim/sim_plot_frame.cpp:454
 msgid "You need to select the simulation settings first."
 msgstr "你需要先选择仿真设置。"
 
-#: eeschema/sim/sim_plot_frame.cpp:506
+#: eeschema/sim/sim_plot_frame.cpp:505
 #, c-format
 msgid "Plot%u - "
 msgstr "绘制 %u - "
 
-#: eeschema/sim/sim_plot_frame.cpp:599
+#: eeschema/sim/sim_plot_frame.cpp:598
 msgid "Error: simulation type not defined!\n"
 msgstr "错误：未定义模拟类型！\n"
 
-#: eeschema/sim/sim_plot_frame.cpp:605
+#: eeschema/sim/sim_plot_frame.cpp:604
 msgid "Error: simulation type doesn't support plotting!\n"
 msgstr "错误：模拟类型不支持绘制！\n"
 
-#: eeschema/sim/sim_plot_frame.cpp:805 eeschema/sim/sim_plot_frame.cpp:1439
+#: eeschema/sim/sim_plot_frame.cpp:804 eeschema/sim/sim_plot_frame.cpp:1438
 msgid "Signal"
 msgstr "信号"
 
-#: eeschema/sim/sim_plot_frame.cpp:1048
+#: eeschema/sim/sim_plot_frame.cpp:1047
 msgid "Open simulation workbook"
 msgstr "打开仿真工作簿"
 
-#: eeschema/sim/sim_plot_frame.cpp:1057
+#: eeschema/sim/sim_plot_frame.cpp:1056
 msgid "There was an error while opening the workbook file"
 msgstr "打开工作簿文件时出现错误"
 
-#: eeschema/sim/sim_plot_frame.cpp:1066
+#: eeschema/sim/sim_plot_frame.cpp:1065
 msgid "Save Simulation Workbook"
 msgstr "保存仿真工作簿"
 
-#: eeschema/sim/sim_plot_frame.cpp:1075
+#: eeschema/sim/sim_plot_frame.cpp:1074
 msgid "There was an error while saving the workbook file"
 msgstr "保存工作簿文件时出现错误"
 
-#: eeschema/sim/sim_plot_frame.cpp:1084
+#: eeschema/sim/sim_plot_frame.cpp:1083
 msgid "Save Plot as Image"
 msgstr "另存绘制为图片"
 
-#: eeschema/sim/sim_plot_frame.cpp:1101
+#: eeschema/sim/sim_plot_frame.cpp:1100
 msgid "Save Plot Data"
 msgstr "保存绘制数据"
 
-#: eeschema/sim/sim_plot_frame.cpp:1333
+#: eeschema/sim/sim_plot_frame.cpp:1332
 msgid "You need to run plot-providing simulation first."
 msgstr "您需要先运行绘制提供仿真。"
 
-#: eeschema/sim/sim_plot_frame.cpp:1525
+#: eeschema/sim/sim_plot_frame.cpp:1524
 msgid ""
 "\n"
 "\n"
@@ -12745,19 +13236,19 @@ msgstr ""
 "仿真结果：\n"
 "\n"
 
-#: eeschema/sim/sim_plot_frame.cpp:1587
+#: eeschema/sim/sim_plot_frame.cpp:1586
 msgid "Hide Signal"
 msgstr "隐藏信号"
 
-#: eeschema/sim/sim_plot_frame.cpp:1588
+#: eeschema/sim/sim_plot_frame.cpp:1587
 msgid "Erase the signal from plot screen"
 msgstr "擦除绘制屏幕上的信号"
 
-#: eeschema/sim/sim_plot_frame.cpp:1594
+#: eeschema/sim/sim_plot_frame.cpp:1593
 msgid "Hide Cursor"
 msgstr "隐藏光标"
 
-#: eeschema/sim/sim_plot_frame.cpp:1596
+#: eeschema/sim/sim_plot_frame.cpp:1595
 msgid "Show Cursor"
 msgstr "显示光标"
 
@@ -12850,6 +13341,7 @@ msgid "Spice Simulator"
 msgstr "Spice 仿真器"
 
 #: eeschema/sim/sim_plot_panel.cpp:388 eeschema/sim/sim_plot_panel.cpp:401
+#: pcb_calculator/transline_ident.cpp:135
 msgid "Frequency"
 msgstr "频率"
 
@@ -12905,11 +13397,11 @@ msgstr "无效的 Spice 值字符串"
 msgid "Invalid unit prefix"
 msgstr "无效的单元前缀"
 
-#: eeschema/sim/spice_value.cpp:252
+#: eeschema/sim/spice_value.cpp:258
 msgid "Please, fill required fields"
 msgstr "请填写必填字段"
 
-#: eeschema/sim/spice_value.cpp:271
+#: eeschema/sim/spice_value.cpp:277
 #, c-format
 msgid "\"%s\" is not a valid Spice value"
 msgstr "\"%s\" 不是有效的 Spice 值"
@@ -12920,7 +13412,7 @@ msgid ""
 "Duplicate library nickname \"%s\" found in symbol library table file line %d"
 msgstr "找到重复的库别名 \"%s\" 在符号库表文件行 %d 中"
 
-#: eeschema/symbol_tree_model_adapter.cpp:103
+#: eeschema/symbol_tree_model_adapter.cpp:105
 #, c-format
 msgid ""
 "Error loading symbol library %s.\n"
@@ -12943,38 +13435,38 @@ msgstr "显示上一个符号"
 msgid "Display next symbol"
 msgstr "显示下一个符号"
 
-#: eeschema/tools/backanno.cpp:212
+#: eeschema/tools/backanno.cpp:206
 msgid "Load Symbol Footprint Link File"
 msgstr "载入符号封装链接文件"
 
-#: eeschema/tools/backanno.cpp:223
+#: eeschema/tools/backanno.cpp:217
 msgid "Keep existing footprint field visibility"
 msgstr "保持现有的封装字段可见性"
 
-#: eeschema/tools/backanno.cpp:224
+#: eeschema/tools/backanno.cpp:218
 msgid "Show all footprint fields"
 msgstr "显示封装所有字段"
 
-#: eeschema/tools/backanno.cpp:225
+#: eeschema/tools/backanno.cpp:219
 msgid "Hide all footprint fields"
 msgstr "隐藏封装所有字段"
 
-#: eeschema/tools/backanno.cpp:227
+#: eeschema/tools/backanno.cpp:221
 msgid "Select the footprint field visibility setting."
 msgstr "选择封装字段可见性设置。"
 
-#: eeschema/tools/backanno.cpp:228
+#: eeschema/tools/backanno.cpp:222
 msgid "Change Visibility"
 msgstr "修改可见性"
 
-#: eeschema/tools/backanno.cpp:238
+#: eeschema/tools/backanno.cpp:232
 #, c-format
 msgid "Failed to open component-footprint link file \"%s\""
 msgstr "无法打开元件封装链接文件 \"%s\""
 
 #: eeschema/tools/backannotate.cpp:70
 msgid "Select at least one property to back annotate."
-msgstr "选择至少一个要反向标注的属性。"
+msgstr "选择至少一个要反向批注的属性。"
 
 #: eeschema/tools/backannotate.cpp:94
 msgid ""
@@ -13006,7 +13498,7 @@ msgstr "找不到 \"%s\" 符号的封装"
 
 #: eeschema/tools/backannotate.cpp:292
 msgid "Cannot relink footprints because schematic is not fully annotated"
-msgstr "由于原理图未完全注释，因此无法重新链接封装"
+msgstr "由于原理图未完全批注，因此无法重新链接封装"
 
 #: eeschema/tools/backannotate.cpp:343
 #, c-format
@@ -13027,7 +13519,7 @@ msgstr "无法更改 \"%s\" 封装或值，因为关联的符号在另一个项
 #: eeschema/tools/backannotate.cpp:399
 #, c-format
 msgid "Change \"%s\" reference designator to \"%s\"."
-msgstr "更改 \"%s\" 的参考指示符为 \"%s\"。"
+msgstr "更改 \"%s\" 的位号为 \"%s\"。"
 
 #: eeschema/tools/backannotate.cpp:416
 #: pcbnew/netlist_reader/board_netlist_updater.cpp:221
@@ -13042,29 +13534,29 @@ msgid "Change %s value from \"%s\" to \"%s\"."
 msgstr "将 %s 值从 \"%s\" 更改为 \"%s\"。"
 
 # 可能会出现语序问题。待测试。
-#: eeschema/tools/backannotate.cpp:569
+#: eeschema/tools/backannotate.cpp:575
 #, c-format
 msgid "Change \"%s\" labels to \"%s\"."
 msgstr "将 \"%s\" 标签更改为 \"%s\"。"
 
 # 可能会出现语序问题。待测试。
-#: eeschema/tools/backannotate.cpp:593
+#: eeschema/tools/backannotate.cpp:599
 #, c-format
 msgid "Change \"%s\" global labels to \"%s\"."
 msgstr "将 \"%s\" 全局标签更改为 \"%s\"。"
 
-#: eeschema/tools/backannotate.cpp:606 eeschema/tools/backannotate.cpp:637
+#: eeschema/tools/backannotate.cpp:612 eeschema/tools/backannotate.cpp:643
 #, c-format
 msgid "Change \"%s\" hierarchical label to \"%s\"."
 msgstr "将 \"%s\" 分层标签更改为 \"%s\"。"
 
-#: eeschema/tools/backannotate.cpp:661
+#: eeschema/tools/backannotate.cpp:667
 #, c-format
 msgid ""
 "Net \"%s\" cannot be changed to \"%s\" because it is driven by a power pin."
 msgstr "网络 \"%s\" 无法更改为 \"%s\"，因为它由电源引脚驱动。"
 
-#: eeschema/tools/backannotate.cpp:671
+#: eeschema/tools/backannotate.cpp:677
 #, c-format
 msgid "Add label \"%s\" to net \"%s\"."
 msgstr "将标签 \"%s\" 添加到网络 \"%s\"。"
@@ -13085,19 +13577,19 @@ msgstr "SPICE 中的模拟电路"
 msgid "Opens the datasheet in a browser"
 msgstr "在浏览器中打开数据表"
 
-#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1011
+#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1083
 msgid "Create Corner"
 msgstr "创建拐角"
 
-#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1011
+#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1083
 msgid "Create a corner"
 msgstr "建立拐角"
 
-#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1015
+#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1087
 msgid "Remove Corner"
 msgstr "移除拐角"
 
-#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1015
+#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1087
 msgid "Remove corner"
 msgstr "移除拐角"
 
@@ -13171,7 +13663,7 @@ msgstr "显示引脚电气类型"
 
 #: eeschema/tools/ee_actions.cpp:161
 msgid "Annotate pins with their electrical types"
-msgstr "用它们的电气类型对引脚进行标注"
+msgstr "用它们的电气类型对引脚进行批注"
 
 #: eeschema/tools/ee_actions.cpp:166
 msgid "Show Symbol Tree"
@@ -13216,12 +13708,12 @@ msgid "Add a pin"
 msgstr "添加引脚"
 
 #: eeschema/tools/ee_actions.cpp:198 eeschema/tools/ee_actions.cpp:319
-#: pagelayout_editor/tools/pl_actions.cpp:53 pcbnew/tools/pcb_actions.cpp:89
+#: pagelayout_editor/tools/pl_actions.cpp:53 pcbnew/tools/pcb_actions.cpp:116
 msgid "Add Text"
 msgstr "添加文本"
 
 #: eeschema/tools/ee_actions.cpp:198 pagelayout_editor/tools/pl_actions.cpp:53
-#: pcbnew/tools/pcb_actions.cpp:89
+#: pcbnew/tools/pcb_actions.cpp:116
 msgid "Add a text item"
 msgstr "添加文本项"
 
@@ -13249,11 +13741,11 @@ msgstr "添加圆弧"
 msgid "Add an arc"
 msgstr "添加一个圆弧"
 
-#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:646
+#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:662
 msgid "Add Lines"
 msgstr "添加线"
 
-#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:646
+#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:662
 msgid "Add connected graphic lines"
 msgstr "添加连接的图形线"
 
@@ -13409,15 +13901,15 @@ msgstr "重复最后项"
 msgid "Duplicates the last drawn item"
 msgstr "复制最后绘制的项目"
 
-#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:233
+#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:256
 msgid "Rotate Clockwise"
 msgstr "顺时针旋转"
 
-#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:233
+#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:256
 msgid "Rotates selected item(s) clockwise"
 msgstr "将选中的项目顺时针旋转"
 
-#: eeschema/tools/ee_actions.cpp:349 pcbnew/tools/edit_tool.cpp:726
+#: eeschema/tools/ee_actions.cpp:349 pcbnew/tools/edit_tool.cpp:811
 msgid "Rotate"
 msgstr "旋转"
 
@@ -13441,21 +13933,21 @@ msgstr "围绕垂直轴(Y)镜像"
 msgid "Flips selected item(s) from left to right"
 msgstr "从左到右翻转选定的项目"
 
-#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:266
+#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:289
 msgid "Properties..."
 msgstr "属性..."
 
-#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:266
+#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:289
 msgid "Displays item properties dialog"
 msgstr "显示项属性对话框"
 
 #: eeschema/tools/ee_actions.cpp:373
 msgid "Edit Reference Designator..."
-msgstr "编辑参考指示符..."
+msgstr "编辑位号..."
 
 #: eeschema/tools/ee_actions.cpp:373
 msgid "Displays reference designator dialog"
-msgstr "显示参考指示符对话框"
+msgstr "显示位号对话框"
 
 #: eeschema/tools/ee_actions.cpp:379
 msgid "Edit Value..."
@@ -13486,389 +13978,417 @@ msgstr "在符号的字段上运行自动放置算法"
 msgid "Sets symbol fields to original library values"
 msgstr "将符号字段设置为原始库值"
 
+#: eeschema/tools/ee_actions.cpp:400
+msgid "Change Library Symbols..."
+msgstr "更改库符号..."
+
 #: eeschema/tools/ee_actions.cpp:401
+msgid "Change library symbols in schematic"
+msgstr "更改原理图中的库符号"
+
+#: eeschema/tools/ee_actions.cpp:404
+msgid "Update Library Symbols..."
+msgstr "更新库符号..."
+
+#: eeschema/tools/ee_actions.cpp:405
+msgid "Update library symbols in schematic"
+msgstr "更新原理图中的库符号"
+
+#: eeschema/tools/ee_actions.cpp:408
+msgid "Change Library Symbol..."
+msgstr "更改库符号..."
+
+#: eeschema/tools/ee_actions.cpp:409
+msgid "Change library symbol for selected symbol"
+msgstr "更改选定符号的库符号"
+
+#: eeschema/tools/ee_actions.cpp:412
+msgid "Update Library Symbol..."
+msgstr "更新库符号..."
+
+#: eeschema/tools/ee_actions.cpp:413
+msgid "Update library symbol for selected symbol"
+msgstr "更新所选符号的库符号"
+
+#: eeschema/tools/ee_actions.cpp:417
 msgid "Assign Netclass..."
 msgstr "分配网络类..."
 
-#: eeschema/tools/ee_actions.cpp:401
+#: eeschema/tools/ee_actions.cpp:417
 msgid "Assign a netclass to the net of the selected wire"
 msgstr "将网络类分配给选定导线的网络"
 
-#: eeschema/tools/ee_actions.cpp:406
+#: eeschema/tools/ee_actions.cpp:422
 msgid "DeMorgan Conversion"
 msgstr "德摩根转换"
 
-#: eeschema/tools/ee_actions.cpp:406
+#: eeschema/tools/ee_actions.cpp:422
 msgid "Switch between DeMorgan representations"
 msgstr "在德摩根表示之间切换"
 
-#: eeschema/tools/ee_actions.cpp:411
+#: eeschema/tools/ee_actions.cpp:427
 msgid "DeMorgan Standard"
 msgstr "德摩根标准"
 
-#: eeschema/tools/ee_actions.cpp:411
+#: eeschema/tools/ee_actions.cpp:427
 msgid "Switch to standard DeMorgan representation"
 msgstr "切换到标准的德摩根表示"
 
-#: eeschema/tools/ee_actions.cpp:416
+#: eeschema/tools/ee_actions.cpp:432
 msgid "DeMorgan Alternate"
 msgstr "德摩根备用"
 
-#: eeschema/tools/ee_actions.cpp:416
+#: eeschema/tools/ee_actions.cpp:432
 msgid "Switch to alternate DeMorgan representation"
 msgstr "切换到备用德摩根表示"
 
-#: eeschema/tools/ee_actions.cpp:421
+#: eeschema/tools/ee_actions.cpp:437
 msgid "Change to Label"
 msgstr "修改为标签"
 
-#: eeschema/tools/ee_actions.cpp:421
+#: eeschema/tools/ee_actions.cpp:437
 msgid "Change existing item to a label"
 msgstr "将现有项目更改为标签"
 
-#: eeschema/tools/ee_actions.cpp:426
+#: eeschema/tools/ee_actions.cpp:442
 msgid "Change to Hierarchical Label"
 msgstr "修改为层次标签"
 
-#: eeschema/tools/ee_actions.cpp:426
+#: eeschema/tools/ee_actions.cpp:442
 msgid "Change existing item to a hierarchical label"
 msgstr "将现有项目更改为分层标签"
 
-#: eeschema/tools/ee_actions.cpp:431
+#: eeschema/tools/ee_actions.cpp:447
 msgid "Change to Global Label"
 msgstr "修改为全局标签"
 
-#: eeschema/tools/ee_actions.cpp:431
+#: eeschema/tools/ee_actions.cpp:447
 msgid "Change existing item to a global label"
 msgstr "将现有项目更改为全局标签"
 
-#: eeschema/tools/ee_actions.cpp:436
+#: eeschema/tools/ee_actions.cpp:452
 msgid "Change to Text"
 msgstr "改为注释文字"
 
-#: eeschema/tools/ee_actions.cpp:436
+#: eeschema/tools/ee_actions.cpp:452
 msgid "Change existing item to a text comment"
 msgstr "将现有项目更改为文本注释"
 
-#: eeschema/tools/ee_actions.cpp:441
+#: eeschema/tools/ee_actions.cpp:457
 msgid "Cleanup Sheet Pins"
 msgstr "清除图页连接"
 
-#: eeschema/tools/ee_actions.cpp:441
+#: eeschema/tools/ee_actions.cpp:457
 msgid "Delete unreferenced sheet pins"
 msgstr "删除未引用的图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:446 pcbnew/tools/pcb_actions.cpp:378
+#: eeschema/tools/ee_actions.cpp:462 pcbnew/tools/pcb_actions.cpp:407
 msgid "Edit Text & Graphics Properties..."
 msgstr "编辑文本与图形属性..."
 
-#: eeschema/tools/ee_actions.cpp:447
+#: eeschema/tools/ee_actions.cpp:463
 msgid "Edit text and graphics properties globally across schematic"
 msgstr "在原理图中全局编辑文本和图形属性"
 
-#: eeschema/tools/ee_actions.cpp:452
+#: eeschema/tools/ee_actions.cpp:468
 msgid "Symbol Properties..."
 msgstr "符号属性..."
 
-#: eeschema/tools/ee_actions.cpp:452
+#: eeschema/tools/ee_actions.cpp:468
 msgid "Displays symbol properties dialog"
 msgstr "显示符号属性对话框"
 
-#: eeschema/tools/ee_actions.cpp:457
-msgid "Pin Table..."
-msgstr "引脚列表..."
-
-#: eeschema/tools/ee_actions.cpp:457
+#: eeschema/tools/ee_actions.cpp:473
 msgid "Displays pin table for bulk editing of pins"
 msgstr "显示引脚表, 用于批量编辑引脚"
 
-#: eeschema/tools/ee_actions.cpp:462
+#: eeschema/tools/ee_actions.cpp:478
 msgid "Break Wire"
 msgstr "分割连线"
 
-#: eeschema/tools/ee_actions.cpp:462
+#: eeschema/tools/ee_actions.cpp:478
 msgid "Divide a wire into segments which can be dragged independently"
 msgstr "将导线分成可以独立拖动的线段"
 
-#: eeschema/tools/ee_actions.cpp:467
+#: eeschema/tools/ee_actions.cpp:483
 msgid "Break Bus"
 msgstr "分割总线"
 
-#: eeschema/tools/ee_actions.cpp:467
+#: eeschema/tools/ee_actions.cpp:483
 msgid "Divide a bus into segments which can be dragged independently"
 msgstr "将总线划分为可以独立拖动的段"
 
-#: eeschema/tools/ee_actions.cpp:478
+#: eeschema/tools/ee_actions.cpp:494
 msgid "Add a simulator probe"
 msgstr "添加仿真器探针"
 
-#: eeschema/tools/ee_actions.cpp:482
+#: eeschema/tools/ee_actions.cpp:498
 msgid "Select a value to be tuned"
 msgstr "选择要调整的值"
 
-#: eeschema/tools/ee_actions.cpp:487 gerbview/tools/gerbview_actions.cpp:93
-#: pcbnew/tools/pcb_actions.cpp:607 pcbnew/tools/pcb_actions.cpp:627
+#: eeschema/tools/ee_actions.cpp:503 gerbview/tools/gerbview_actions.cpp:72
+#: pcbnew/tools/pcb_actions.cpp:666 pcbnew/tools/pcb_actions.cpp:686
 msgid "Highlight Net"
 msgstr "高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:487
+#: eeschema/tools/ee_actions.cpp:503
 msgid "Highlight net under cursor"
 msgstr "在光标下高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:498 pcbnew/tools/pcb_actions.cpp:620
+#: eeschema/tools/ee_actions.cpp:514 pcbnew/tools/pcb_actions.cpp:679
 msgid "Highlight Nets"
 msgstr "高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:498
+#: eeschema/tools/ee_actions.cpp:514
 msgid "Highlight wires and pins of a net"
 msgstr "高亮网络的电线和引脚"
 
-#: eeschema/tools/ee_actions.cpp:504
+#: eeschema/tools/ee_actions.cpp:520
 msgid "Edit with Symbol Editor"
 msgstr "用符号编辑器来编辑"
 
-#: eeschema/tools/ee_actions.cpp:504
+#: eeschema/tools/ee_actions.cpp:520
 msgid "Open the symbol editor to edit the symbol"
 msgstr "打开符号编辑器以编辑符号"
 
-#: eeschema/tools/ee_actions.cpp:509
+#: eeschema/tools/ee_actions.cpp:525
 msgid "Edit Symbol Fields..."
 msgstr "编辑符号字段..."
 
-#: eeschema/tools/ee_actions.cpp:509
+#: eeschema/tools/ee_actions.cpp:525
 msgid "Bulk-edit fields of all symbols in schematic"
 msgstr "原理图中所有符号的批量编辑字段"
 
-#: eeschema/tools/ee_actions.cpp:514
+#: eeschema/tools/ee_actions.cpp:530
 msgid "Edit Symbol Library Links..."
 msgstr "编辑符号库链接..."
 
-#: eeschema/tools/ee_actions.cpp:514
+#: eeschema/tools/ee_actions.cpp:530
 msgid "Edit links between schematic and library symbols"
 msgstr "编辑原理图和库符号之间的链接"
 
-#: eeschema/tools/ee_actions.cpp:519
+#: eeschema/tools/ee_actions.cpp:535
 msgid "Assign Footprints..."
 msgstr "分配封装..."
 
-#: eeschema/tools/ee_actions.cpp:519
+#: eeschema/tools/ee_actions.cpp:535
 msgid "Run Cvpcb"
 msgstr "运行 Cvpcb"
 
-#: eeschema/tools/ee_actions.cpp:524
+#: eeschema/tools/ee_actions.cpp:540
 msgid "Import Footprint Assignments..."
 msgstr "导入封装分配..."
 
-#: eeschema/tools/ee_actions.cpp:525
+#: eeschema/tools/ee_actions.cpp:541
 msgid "Import symbol footprint assignments from .cmp file created by Pcbnew"
 msgstr "从 Pcbnew 创建的 .cmp 文件中导入符号封装分配"
 
-#: eeschema/tools/ee_actions.cpp:530
+#: eeschema/tools/ee_actions.cpp:546
 msgid "Annotate Schematic..."
-msgstr "标注原理图..."
+msgstr "批注原理图..."
 
-#: eeschema/tools/ee_actions.cpp:530
+#: eeschema/tools/ee_actions.cpp:546
 msgid "Fill in schematic symbol reference designators"
-msgstr "填写原理图符号参考指示符"
+msgstr "填写原理图符号位号"
 
-#: eeschema/tools/ee_actions.cpp:535
+#: eeschema/tools/ee_actions.cpp:551
 msgid "Schematic Setup..."
 msgstr "原理图设置..."
 
-#: eeschema/tools/ee_actions.cpp:536
+#: eeschema/tools/ee_actions.cpp:552
 msgid "Edit schematic setup including annotation styles and electrical rules"
 msgstr "编辑原理图设置，包括注释样式和电气规则"
 
-#: eeschema/tools/ee_actions.cpp:541
+#: eeschema/tools/ee_actions.cpp:557
 msgid "Rescue Symbols..."
 msgstr "恢复符号..."
 
-#: eeschema/tools/ee_actions.cpp:542
+#: eeschema/tools/ee_actions.cpp:558
 msgid "Find old symbols in project and rename/rescue them"
 msgstr "在工程中找到旧的符号重命名或恢复它们"
 
-#: eeschema/tools/ee_actions.cpp:547
+#: eeschema/tools/ee_actions.cpp:563
 msgid "Remap Symbols..."
 msgstr "重新映射符号..."
 
-#: eeschema/tools/ee_actions.cpp:548
+#: eeschema/tools/ee_actions.cpp:564
 msgid "Remap legacy library symbols to symbol library table"
 msgstr "将传统库符号重新映射到符号库表"
 
-#: eeschema/tools/ee_actions.cpp:553
+#: eeschema/tools/ee_actions.cpp:569
 msgid "Update from Symbol Library"
 msgstr "从符号库更新"
 
-#: eeschema/tools/ee_actions.cpp:554
+#: eeschema/tools/ee_actions.cpp:570
 msgid "Update from the symbol library using the library identifier"
 msgstr "使用库标识符从符号库更新"
 
-#: eeschema/tools/ee_actions.cpp:559
+#: eeschema/tools/ee_actions.cpp:575
 msgid "Bus Definitions..."
 msgstr "总线定义..."
 
-#: eeschema/tools/ee_actions.cpp:559
+#: eeschema/tools/ee_actions.cpp:575
 msgid "Manage bus definitions"
 msgstr "管理总线定义"
 
-#: eeschema/tools/ee_actions.cpp:564
+#: eeschema/tools/ee_actions.cpp:580
 msgid "Export Drawing to Clipboard"
 msgstr "将绘图导出到剪贴板"
 
-#: eeschema/tools/ee_actions.cpp:564
+#: eeschema/tools/ee_actions.cpp:580
 msgid "Export drawing of current sheet to clipboard"
 msgstr "将当前图框的绘图导出到剪贴板"
 
-#: eeschema/tools/ee_actions.cpp:569
+#: eeschema/tools/ee_actions.cpp:585
 msgid "Switch to PCB Editor"
 msgstr "切换到 PCB 编辑器"
 
-#: eeschema/tools/ee_actions.cpp:569
+#: eeschema/tools/ee_actions.cpp:585
 msgid "Open PCB in Pcbnew"
 msgstr "打开 Pcbnew 中的 PCB"
 
-#: eeschema/tools/ee_actions.cpp:574
+#: eeschema/tools/ee_actions.cpp:590
 msgid "Export Netlist..."
 msgstr "导出网表..."
 
-#: eeschema/tools/ee_actions.cpp:574
+#: eeschema/tools/ee_actions.cpp:590
 msgid "Export file containing netlist in one of several formats"
 msgstr "导出包含某种格式的网表的文件"
 
-#: eeschema/tools/ee_actions.cpp:579
+#: eeschema/tools/ee_actions.cpp:595
 msgid "Generate BOM..."
 msgstr "生成 BOM..."
 
-#: eeschema/tools/ee_actions.cpp:579
+#: eeschema/tools/ee_actions.cpp:595
 msgid "Generate a bill of materials for the current schematic"
 msgstr "生成当前原理图的 BOM"
 
-#: eeschema/tools/ee_actions.cpp:584
+#: eeschema/tools/ee_actions.cpp:600
 msgid "Enter Sheet"
 msgstr "进入分页"
 
-#: eeschema/tools/ee_actions.cpp:584
+#: eeschema/tools/ee_actions.cpp:600
 msgid "Display the selected sheet's contents in the Eeschema window"
 msgstr "在 Eeschema 窗口中显示所选图框的内容"
 
-#: eeschema/tools/ee_actions.cpp:590
+#: eeschema/tools/ee_actions.cpp:606
 msgid "Leave Sheet"
 msgstr "离开分页"
 
-#: eeschema/tools/ee_actions.cpp:590
+#: eeschema/tools/ee_actions.cpp:606
 msgid "Display the parent sheet in the Eeschema window"
 msgstr "在 Eeschema 窗口中显示父级图框"
 
-#: eeschema/tools/ee_actions.cpp:595
+#: eeschema/tools/ee_actions.cpp:611
 msgid "Show Hierarchy Navigator"
 msgstr "显示层次结构导航器"
 
-#: eeschema/tools/ee_actions.cpp:600
+#: eeschema/tools/ee_actions.cpp:616
 msgid "Highlight on PCB"
 msgstr "高亮 PCB"
 
-#: eeschema/tools/ee_actions.cpp:600
+#: eeschema/tools/ee_actions.cpp:616
 msgid "Highlight corresponding items in PCBNew"
 msgstr "高亮显示 PCBNew 中的相应项目"
 
-#: eeschema/tools/ee_actions.cpp:605
+#: eeschema/tools/ee_actions.cpp:621
 msgid "Show Hidden Pins"
 msgstr "显示隐藏引脚"
 
-#: eeschema/tools/ee_actions.cpp:610
+#: eeschema/tools/ee_actions.cpp:626
 msgid "Show Hidden Fields"
 msgstr "显示隐藏字段"
 
-#: eeschema/tools/ee_actions.cpp:615
+#: eeschema/tools/ee_actions.cpp:631
 msgid "Force H/V Wires and Buses"
 msgstr "强制水平或垂直绘制连线和总线"
 
-#: eeschema/tools/ee_actions.cpp:623
+#: eeschema/tools/ee_actions.cpp:639
 msgid "Add Junctions to Selection where needed"
 msgstr "根据需要将连接点添加到选择"
 
-#: eeschema/tools/ee_actions.cpp:628
+#: eeschema/tools/ee_actions.cpp:644
 msgid "Add Wire"
 msgstr "添加连线"
 
-#: eeschema/tools/ee_actions.cpp:628
+#: eeschema/tools/ee_actions.cpp:644
 msgid "Add a wire"
 msgstr "添加连线"
 
-#: eeschema/tools/ee_actions.cpp:634
+#: eeschema/tools/ee_actions.cpp:650
 msgid "Add Bus"
 msgstr "添加总线"
 
-#: eeschema/tools/ee_actions.cpp:634
+#: eeschema/tools/ee_actions.cpp:650
 msgid "Add a bus"
 msgstr "添加总线"
 
-#: eeschema/tools/ee_actions.cpp:640
+#: eeschema/tools/ee_actions.cpp:656
 #: eeschema/tools/sch_line_wire_bus_tool.cpp:92
 #: eeschema/tools/sch_line_wire_bus_tool.cpp:148
 msgid "Unfold from Bus"
 msgstr "从总线上展开"
 
-#: eeschema/tools/ee_actions.cpp:640
+#: eeschema/tools/ee_actions.cpp:656
 msgid "Break a wire out of a bus"
 msgstr "断开总线上的连线"
 
-#: eeschema/tools/ee_actions.cpp:652
+#: eeschema/tools/ee_actions.cpp:668
 msgid "Finish Wire or Bus"
 msgstr "结束电线或总线"
 
-#: eeschema/tools/ee_actions.cpp:652
+#: eeschema/tools/ee_actions.cpp:668
 msgid "Complete drawing at current segment"
 msgstr "在当前线段处结束绘制"
 
-#: eeschema/tools/ee_actions.cpp:657
+#: eeschema/tools/ee_actions.cpp:673
 msgid "Finish Wire"
 msgstr "结束连线"
 
-#: eeschema/tools/ee_actions.cpp:657
+#: eeschema/tools/ee_actions.cpp:673
 msgid "Complete wire with current segment"
 msgstr "结束连线并保留当前连线线段"
 
-#: eeschema/tools/ee_actions.cpp:662
+#: eeschema/tools/ee_actions.cpp:678
 msgid "Finish Bus"
 msgstr "结束总线"
 
-#: eeschema/tools/ee_actions.cpp:662
+#: eeschema/tools/ee_actions.cpp:678
 msgid "Complete bus with current segment"
 msgstr "结束总线并保留当前总线线段"
 
-#: eeschema/tools/ee_actions.cpp:667
+#: eeschema/tools/ee_actions.cpp:683
 msgid "Finish Lines"
 msgstr "完成线"
 
-#: eeschema/tools/ee_actions.cpp:667
+#: eeschema/tools/ee_actions.cpp:683
 msgid "Complete connected lines with current segment"
 msgstr "完成与当前段的连接线"
 
-#: eeschema/tools/ee_actions.cpp:676 pagelayout_editor/tools/pl_actions.cpp:67
+#: eeschema/tools/ee_actions.cpp:692 pagelayout_editor/tools/pl_actions.cpp:67
 #: pcbnew/dialogs/panel_edit_options_base.cpp:176
-#: pcbnew/tools/pcb_actions.cpp:199
+#: pcbnew/tools/pcb_actions.cpp:226
 msgid "Move"
 msgstr "移动"
 
-#: eeschema/tools/ee_actions.cpp:676 pagelayout_editor/tools/pl_actions.cpp:67
-#: pcbnew/tools/pcb_actions.cpp:199
+#: eeschema/tools/ee_actions.cpp:692 pagelayout_editor/tools/pl_actions.cpp:67
+#: pcbnew/tools/pcb_actions.cpp:226
 msgid "Moves the selected item(s)"
 msgstr "移动选择项"
 
-#: eeschema/tools/ee_actions.cpp:681 pcbnew/tools/edit_tool.cpp:581
+#: eeschema/tools/ee_actions.cpp:697 pcbnew/tools/edit_tool.cpp:647
 msgid "Drag"
 msgstr "拖动"
 
-#: eeschema/tools/ee_actions.cpp:681
+#: eeschema/tools/ee_actions.cpp:697
 msgid "Drags the selected item(s)"
 msgstr "拖动所选项目"
 
-#: eeschema/tools/ee_actions.cpp:685
+#: eeschema/tools/ee_actions.cpp:701
 msgid "Move Activate"
 msgstr "移动激活"
 
-#: eeschema/tools/ee_actions.cpp:689
+#: eeschema/tools/ee_actions.cpp:705
 msgid "Symbol Move Activate"
 msgstr "符号移动激活"
 
@@ -13924,13 +14444,14 @@ msgstr "  标准"
 msgid "No off grid or duplicate pins were found."
 msgstr "没有发现网格外或重复的引脚。"
 
-#: eeschema/tools/ee_selection_tool.cpp:1130
-#: pcbnew/tools/selection_tool.cpp:1531
+#: eeschema/tools/ee_selection_tool.cpp:1159
+#: pagelayout_editor/tools/pl_selection_tool.cpp:558
+#: pcbnew/tools/selection_tool.cpp:1613
 msgid "Select &All\tA"
 msgstr "全选 (&A)\tA"
 
-#: eeschema/tools/ee_selection_tool.cpp:1133
-#: pcbnew/tools/selection_tool.cpp:1534
+#: eeschema/tools/ee_selection_tool.cpp:1162
+#: pcbnew/tools/selection_tool.cpp:1616
 msgid "&Expand Selection\tE"
 msgstr "展开选定内容 (&E)\tE"
 
@@ -13955,27 +14476,41 @@ msgstr "文件名："
 msgid "No schematic currently open."
 msgstr "当前没有打开原理图。"
 
-#: eeschema/tools/lib_edit_tool.cpp:483
+#: eeschema/tools/lib_edit_tool.cpp:495
 msgid "Edit Component Name"
 msgstr "编辑元件名称"
 
-#: eeschema/tools/lib_edit_tool.cpp:485 eeschema/tools/sch_edit_tool.cpp:1128
+#: eeschema/tools/lib_edit_tool.cpp:497 eeschema/tools/sch_edit_tool.cpp:1144
 #, c-format
 msgid "Edit %s Field"
 msgstr "编辑 %s 字段"
 
-#: eeschema/tools/lib_pin_tool.cpp:161
+#: eeschema/tools/lib_pin_tool.cpp:208
 #, c-format
 msgid "This position is already occupied by another pin, in unit %d."
 msgstr "这个位置已经被另一个引脚占用, 在单元 %d。"
 
-#: eeschema/tools/lib_pin_tool.cpp:165
+#: eeschema/tools/lib_pin_tool.cpp:212
 msgid "Place Pin Anyway"
 msgstr "任意位置放置引脚"
 
+#: eeschema/tools/reannotate.cpp:75
+msgid "Errors reported by Eeschema:\n"
+msgstr ""
+"Eesschema 报告的错误：\n"
+" \n"
+
+#: eeschema/tools/reannotate.cpp:77
+msgid ""
+"\n"
+"Annotation not performed!\n"
+msgstr ""
+"\n"
+"未执行批注！\n"
+
 #: eeschema/tools/sch_drawing_tools.cpp:371
-#: pagelayout_editor/pl_editor_frame.cpp:800
-#: pagelayout_editor/pl_editor_frame.cpp:808
+#: pagelayout_editor/pl_editor_frame.cpp:844
+#: pagelayout_editor/pl_editor_frame.cpp:852
 #, c-format
 msgid "Couldn't load image from \"%s\""
 msgstr "无法从 \"%s\" 加载图片"
@@ -13988,68 +14523,63 @@ msgstr "单击图框。"
 msgid "No new hierarchical labels found."
 msgstr "没有找到新的层次标签。"
 
-#: eeschema/tools/sch_edit_tool.cpp:72
+#: eeschema/tools/sch_edit_tool.cpp:73
 msgid "Symbol Unit"
 msgstr "符号单元"
 
-#: eeschema/tools/sch_edit_tool.cpp:92
+#: eeschema/tools/sch_edit_tool.cpp:93
 msgid "no symbol selected"
 msgstr "没有选择符号"
 
-#: eeschema/tools/sch_edit_tool.cpp:101
+#: eeschema/tools/sch_edit_tool.cpp:102
 msgid "symbol is not multi-unit"
 msgstr "符号不是多单元"
 
-#: eeschema/tools/sch_edit_tool.cpp:1069 pcbnew/tools/pcbnew_control.cpp:474
+#: eeschema/tools/sch_edit_tool.cpp:1085 pcbnew/tools/pcbnew_control.cpp:469
 msgid "Item locked."
 msgstr "项目已锁定。"
 
-#: eeschema/tools/sch_edit_tool.cpp:1678
+#: eeschema/tools/sch_edit_tool.cpp:1718
 msgid "There are no unreferenced pins in this sheet to remove."
 msgstr "此图框中没有要删除的未引用引脚。"
 
-#: eeschema/tools/sch_edit_tool.cpp:1682
+#: eeschema/tools/sch_edit_tool.cpp:1722
 msgid "Do you wish to delete the unreferenced pins from this sheet?"
 msgstr "您是否希望从此表中删除未引用的引脚？"
 
-#: eeschema/tools/sch_editor_control.cpp:455
+#: eeschema/tools/sch_editor_control.cpp:454
 msgid "Reached end of schematic."
 msgstr "到达原理图的末尾。"
 
-#: eeschema/tools/sch_editor_control.cpp:456
+#: eeschema/tools/sch_editor_control.cpp:455
 msgid "Reached end of sheet."
 msgstr "到达图框的末尾。"
 
-#: eeschema/tools/sch_editor_control.cpp:459
+#: eeschema/tools/sch_editor_control.cpp:458
 msgid " Find again to wrap around to the start."
 msgstr " 再次查找到开始。"
 
-#: eeschema/tools/sch_editor_control.cpp:839
+#: eeschema/tools/sch_editor_control.cpp:831
 msgid "Error: duplicate sub-sheet names found in current sheet."
 msgstr "错误：在当前图框中找到重复的子图框名称。"
 
-#: eeschema/tools/sch_editor_control.cpp:873
-#, c-format
-msgid "Highlighted net: %s"
-msgstr "高亮网络：%s"
-
-#: eeschema/tools/sch_editor_control.cpp:927
+#: eeschema/tools/sch_editor_control.cpp:919
 msgid "Net must be labelled to assign a netclass."
 msgstr "网络必须加上标签才能分配网络类。"
 
-#: eeschema/tools/sch_editor_control.cpp:938
+#: eeschema/tools/sch_editor_control.cpp:930
 msgid "Netclasses"
 msgstr "网络类"
 
-#: eeschema/tools/sch_editor_control.cpp:951
+#: eeschema/tools/sch_editor_control.cpp:943
 msgid "Assign Netclass"
 msgstr "分配网络类"
 
-#: eeschema/tools/sch_editor_control.cpp:952
+#: eeschema/tools/sch_editor_control.cpp:944
 msgid "Select netclass:"
 msgstr "选择网络类："
 
-#: eeschema/tools/sch_editor_control.cpp:1392
+#: eeschema/tools/sch_editor_control.cpp:1362
 #, c-format
 msgid ""
 "The pasted sheet \"%s\"\n"
@@ -14142,26 +14672,26 @@ msgstr "重置"
 msgid "Layer Selection"
 msgstr "层选择"
 
-#: gerbview/dialogs/dialog_print_gerbview.cpp:170
+#: gerbview/dialogs/dialog_print_gerbview.cpp:172
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:121
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:231
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:235
 msgid "Print mirrored"
 msgstr "镜像打印"
 
-#: gerbview/dialogs/dialog_print_gerbview.cpp:179
+#: gerbview/dialogs/dialog_print_gerbview.cpp:181
 #: pcbnew/dialogs/dialog_plot_base.cpp:56
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:254
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:261
 msgid "Included Layers"
 msgstr "包含图层"
 
-#: gerbview/dialogs/dialog_print_gerbview.cpp:192
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:281
+#: gerbview/dialogs/dialog_print_gerbview.cpp:194
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:291
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:137
 msgid "Select all"
 msgstr "全选"
 
-#: gerbview/dialogs/dialog_print_gerbview.cpp:193
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:282
+#: gerbview/dialogs/dialog_print_gerbview.cpp:195
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:292
 msgid "Deselect all"
 msgstr "取消全选"
 
@@ -14183,13 +14713,13 @@ msgid "Do not export"
 msgstr "不导出"
 
 #: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:170
-#: pcbnew/board_connected_item.cpp:221 pcbnew/board_connected_item.cpp:222
+#: pcbnew/board_connected_item.cpp:211 pcbnew/board_connected_item.cpp:212
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:62
-#: pcbnew/class_board_item.cpp:184 pcbnew/class_drawsegment.cpp:517
-#: pcbnew/class_module.cpp:1669 pcbnew/class_module.cpp:1672
-#: pcbnew/class_pad.cpp:760 pcbnew/class_pcb_text.cpp:122
-#: pcbnew/class_text_mod.cpp:309 pcbnew/class_track.cpp:1036
-#: pcbnew/class_zone.cpp:657 pcbnew/dialogs/dialog_copper_zones_base.cpp:22
+#: pcbnew/class_board_item.cpp:189 pcbnew/class_drawsegment.cpp:551
+#: pcbnew/class_module.cpp:1710 pcbnew/class_module.cpp:1713
+#: pcbnew/class_pad.cpp:811 pcbnew/class_pcb_text.cpp:118
+#: pcbnew/class_text_mod.cpp:305 pcbnew/class_track.cpp:1142
+#: pcbnew/class_zone.cpp:662 pcbnew/dialogs/dialog_copper_zones_base.cpp:22
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:59
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:59
 #: pcbnew/dialogs/panel_modedit_defaults.cpp:52
@@ -14286,21 +14816,21 @@ msgstr "图框尺寸"
 msgid "Show page limits"
 msgstr "显示图框限制"
 
-#: gerbview/events_called_functions.cpp:236
+#: gerbview/events_called_functions.cpp:204
 #, c-format
 msgid "Source file \"%s\" is not available"
 msgstr "源文件 \"%s\" 不可用"
 
-#: gerbview/events_called_functions.cpp:244
+#: gerbview/events_called_functions.cpp:212
 msgid "No editor defined. Please select one"
 msgstr "没有定义编辑器, 请选择一个"
 
-#: gerbview/events_called_functions.cpp:249
+#: gerbview/events_called_functions.cpp:217
 #, c-format
 msgid "No file loaded on the active layer %d"
 msgstr "没有文件加载到当前工作层 %d"
 
-#: gerbview/events_called_functions.cpp:282 pcbnew/pcb_edit_frame.cpp:857
+#: gerbview/events_called_functions.cpp:250
 msgid "Visibles"
 msgstr "可见"
 
@@ -14517,9 +15047,9 @@ msgstr "黑"
 msgid "Polarity"
 msgstr "极性"
 
-#: gerbview/gerber_draw_item.cpp:711 pcbnew/class_pcb_text.cpp:125
-#: pcbnew/class_pcb_text.cpp:127 pcbnew/class_text_mod.cpp:316
-#: pcbnew/tools/edit_tool.cpp:857 pcbnew/tools/pcb_actions.cpp:250
+#: gerbview/gerber_draw_item.cpp:711 pcbnew/class_pcb_text.cpp:121
+#: pcbnew/class_pcb_text.cpp:123 pcbnew/class_text_mod.cpp:312
+#: pcbnew/tools/edit_tool.cpp:949 pcbnew/tools/pcb_actions.cpp:273
 msgid "Mirror"
 msgstr "镜像"
 
@@ -14581,24 +15111,24 @@ msgstr "图像偏移对齐"
 msgid "Graphic layer %d"
 msgstr "图形层 %d"
 
-#: gerbview/gerbview_frame.cpp:66
+#: gerbview/gerbview_frame.cpp:68 gerbview/menubar.cpp:127
 msgid "Clear Recent Zip Files"
 msgstr "清除最近的 Zip 文件"
 
-#: gerbview/gerbview_frame.cpp:68
+#: gerbview/gerbview_frame.cpp:70 gerbview/menubar.cpp:89
 msgid "Clear Recent Drill Files"
 msgstr "清除最近的钻孔文件"
 
-#: gerbview/gerbview_frame.cpp:70
+#: gerbview/gerbview_frame.cpp:72 gerbview/menubar.cpp:108
 msgid "Clear Recent Job Files"
 msgstr "清除最近的作业文件"
 
-#: gerbview/gerbview_frame.cpp:140 pcbnew/footprint_edit_frame.cpp:215
-#: pcbnew/footprint_edit_frame.cpp:634 pcbnew/pcb_edit_frame.cpp:249
+#: gerbview/gerbview_frame.cpp:143 pcbnew/footprint_edit_frame.cpp:221
+#: pcbnew/footprint_edit_frame.cpp:675
 msgid "Layers Manager"
 msgstr "层管理器"
 
-#: gerbview/gerbview_frame.cpp:158 pcbnew/pcb_edit_frame.cpp:287
+#: gerbview/gerbview_frame.cpp:161 pcbnew/pcb_edit_frame.cpp:319
 msgid ""
 "KiCad can use your graphics card to give you a smoother and faster "
 "experience. This option is turned off by default since it is not compatible "
@@ -14609,22 +15139,20 @@ msgid ""
 "If you'd like to choose later, select Accelerated Graphics in the "
 "Preferences menu."
 msgstr ""
-"KiCad 可以使用您的显卡, 为您提供更流畅、更快速的体验。默认情况下, 此选项处于"
-"关闭状态, 因为不是所有计算机都与它兼容。\n"
-"\n"
-"是否要尝试启用显卡加速？\n"
-"\n"
-"如果以后要选择, 请在 \"首选项\" 菜单中选择 \"显卡加速\"。"
+"KiCad 可以使用您的显卡为您提供更流畅、更快速的体验。\n"
+"默认情况下，此选项处于关闭状态，因为它并不与所有计算机兼容。\n"
+"是否要尝试启用图形加速？\n"
+"如果您想稍后选择，请在首选项菜单中选择硬件加速图形。"
 
-#: gerbview/gerbview_frame.cpp:165 pcbnew/pcb_edit_frame.cpp:294
+#: gerbview/gerbview_frame.cpp:168 pcbnew/pcb_edit_frame.cpp:326
 msgid "Enable Graphics Acceleration"
 msgstr "启用显卡加速"
 
-#: gerbview/gerbview_frame.cpp:167 pcbnew/pcb_edit_frame.cpp:296
+#: gerbview/gerbview_frame.cpp:170 pcbnew/pcb_edit_frame.cpp:328
 msgid "&Enable Acceleration"
 msgstr "启用加速 (&E)"
 
-#: gerbview/gerbview_frame.cpp:167 pcbnew/pcb_edit_frame.cpp:296
+#: gerbview/gerbview_frame.cpp:170 pcbnew/pcb_edit_frame.cpp:328
 msgid "&No Thanks"
 msgstr "不，谢谢 (&N)"
 
@@ -14637,7 +15165,7 @@ msgstr "D 码"
 msgid "Drawing layer %d not in use"
 msgstr "绘图层 %d 没有使用"
 
-#: gerbview/gerbview_frame.cpp:717 gerbview/menubar.cpp:141
+#: gerbview/gerbview_frame.cpp:717 gerbview/menubar.cpp:158
 msgid "GerbView"
 msgstr "GerbView"
 
@@ -14654,11 +15182,11 @@ msgstr "图片名称：\"%s\" 图层名称 \"%s\""
 msgid "X2 attr"
 msgstr "X2 属性"
 
-#: gerbview/gerbview_frame.cpp:1142
+#: gerbview/gerbview_frame.cpp:1141
 msgid "Gerbview"
 msgstr "GerbView"
 
-#: gerbview/gerbview_layer_widget.cpp:81 pcbnew/class_track.cpp:675
+#: gerbview/gerbview_layer_widget.cpp:81 pcbnew/class_track.cpp:746
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:46 pcbnew/layer_widget.cpp:525
 #: pcbnew/pcb_layer_widget.cpp:327
 msgid "Layers"
@@ -14686,10 +15214,12 @@ msgid "Show negative objects in this color"
 msgstr "以此颜色显示负片"
 
 #: gerbview/gerbview_layer_widget.cpp:105 pcbnew/pcb_layer_widget.cpp:79
+#: pcbnew/widgets/appearance_controls.cpp:306
 msgid "Show the (x,y) grid dots"
 msgstr "(X,Y) 显示格点"
 
 #: gerbview/gerbview_layer_widget.cpp:106 pcbnew/pcb_layer_widget.cpp:76
+#: pcbnew/widgets/appearance_controls.cpp:305
 msgid "Show worksheet"
 msgstr "显示图框"
 
@@ -14698,10 +15228,12 @@ msgid "PCB Background"
 msgstr "PCB 背景"
 
 #: gerbview/gerbview_layer_widget.cpp:126 pcbnew/pcb_layer_widget.cpp:177
+#: pcbnew/widgets/appearance_controls.cpp:1193
 msgid "Show All Layers"
 msgstr "显示所有层"
 
 #: gerbview/gerbview_layer_widget.cpp:130
+#: pcbnew/widgets/appearance_controls.cpp:1180
 msgid "Hide All Layers But Active"
 msgstr "隐藏除当前工作层的所有层"
 
@@ -14710,6 +15242,7 @@ msgid "Always Hide All Layers But Active"
 msgstr "总是隐藏除当前工作层的所有层"
 
 #: gerbview/gerbview_layer_widget.cpp:137 pcbnew/pcb_layer_widget.cpp:179
+#: pcbnew/widgets/appearance_controls.cpp:1196
 msgid "Hide All Layers"
 msgstr "隐藏所有层"
 
@@ -14725,79 +15258,79 @@ msgstr "此作业文件使用过时的格式。 请重新创建它。"
 msgid "Open Gerber Job File"
 msgstr "打开 Gerber 工作文件"
 
-#: gerbview/menubar.cpp:56
-msgid "Clear Recent Gerber Files"
-msgstr "清除最近的 Gerber 文件"
-
-#: gerbview/menubar.cpp:65
+#: gerbview/menubar.cpp:66
 msgid "Open Recent Gerber File"
 msgstr "打开最近的 Gerber 文件"
 
-#: gerbview/menubar.cpp:78
+#: gerbview/menubar.cpp:70
+msgid "Clear Recent Gerber Files"
+msgstr "清除最近的 Gerber 文件"
+
+#: gerbview/menubar.cpp:85
 msgid "Open Recent Drill File"
 msgstr "打开最近的钻孔文件"
 
-#: gerbview/menubar.cpp:91
+#: gerbview/menubar.cpp:104
 msgid "Open Recent Job File"
 msgstr "打开最近的作业文件"
 
-#: gerbview/menubar.cpp:104
+#: gerbview/menubar.cpp:123
 msgid "Open Recent Zip File"
 msgstr "打开最近的 Zip 文件"
 
-#: gerbview/menubar.cpp:124
+#: gerbview/menubar.cpp:138
 msgid "Clear &All Layers"
 msgstr "清除所有层 (&A)"
 
-#: gerbview/menubar.cpp:125
+#: gerbview/menubar.cpp:139
 msgid "Clear all layers. All data will be deleted"
 msgstr "清除所有层，所有数据将被删除"
 
-#: gerbview/menubar.cpp:128
+#: gerbview/menubar.cpp:143
 msgid "Reload All Layers"
 msgstr "重新载入所有层"
 
-#: gerbview/menubar.cpp:129
+#: gerbview/menubar.cpp:144
 msgid "Reload all layers. All data will be reloaded"
 msgstr "重新加载所有层。 将重新加载所有数据"
 
-#: gerbview/menubar.cpp:133
+#: gerbview/menubar.cpp:149
 msgid "Export to Pcbnew..."
 msgstr "导出到 Pcbnew..."
 
-#: gerbview/menubar.cpp:134
+#: gerbview/menubar.cpp:150
 msgid "Export data in Pcbnew format"
 msgstr "将数据导出为 Pcbnew 格式"
 
-#: gerbview/menubar.cpp:191
+#: gerbview/menubar.cpp:166
 msgid "Show &Layers Manager"
 msgstr "显示层管理 (&L)"
 
-#: gerbview/menubar.cpp:191
+#: gerbview/menubar.cpp:167
 msgid "Show or hide the layer manager"
 msgstr "显示/隐藏层管理器"
 
-#: gerbview/menubar.cpp:229
+#: gerbview/menubar.cpp:212
 msgid "&List DCodes..."
 msgstr "D 码表... (&L)"
 
-#: gerbview/menubar.cpp:229
+#: gerbview/menubar.cpp:213
 msgid "List D-codes defined in Gerber files"
 msgstr "列出在 Gerber 文件中定义的 D 码"
 
-#: gerbview/menubar.cpp:232
+#: gerbview/menubar.cpp:217
 msgid "&Show Source..."
 msgstr "显示源码... (&S)"
 
-#: gerbview/menubar.cpp:232
+#: gerbview/menubar.cpp:218
 msgid "Show source file for the current layer"
 msgstr "当前层显示源码"
 
-#: gerbview/menubar.cpp:238
+#: gerbview/menubar.cpp:225
 msgid "Clear Current Layer..."
 msgstr "清除当前层..."
 
-#: gerbview/menubar.cpp:238
+#: gerbview/menubar.cpp:226
 msgid "Clear the selected graphic layer"
 msgstr "清除选定的图形图层"
 
@@ -14903,114 +15436,114 @@ msgstr "显示/隐藏层管理工具栏"
 msgid "<No selection>"
 msgstr "<没有选择>"
 
-#: gerbview/tools/gerbview_actions.cpp:60
+#: gerbview/tools/gerbview_actions.cpp:39
 msgid "Open Gerber Plot File(s)..."
 msgstr "打开 Gerber 绘制文件..."
 
-#: gerbview/tools/gerbview_actions.cpp:61
+#: gerbview/tools/gerbview_actions.cpp:40
 msgid ""
 "Open Gerber plot file(s) on the current layer. Previous data will be deleted"
 msgstr "打开当前图层上的 Gerber 绘制文件。 以前的数据将被删除"
 
-#: gerbview/tools/gerbview_actions.cpp:66
+#: gerbview/tools/gerbview_actions.cpp:45
 msgid "Open Excellon Drill File(s)..."
 msgstr "打开 Excellon 钻孔文件..."
 
-#: gerbview/tools/gerbview_actions.cpp:67
+#: gerbview/tools/gerbview_actions.cpp:46
 msgid ""
 "Open Excellon drill file(s) on the current layer. Previous data will be "
 "deleted"
 msgstr "在当前图层上打开 Excellon 钻取文件。 以前的数据将被删除"
 
-#: gerbview/tools/gerbview_actions.cpp:72
+#: gerbview/tools/gerbview_actions.cpp:51
 msgid "Open Gerber Job File..."
 msgstr "打开 Gerber 工作文件..."
 
-#: gerbview/tools/gerbview_actions.cpp:73
+#: gerbview/tools/gerbview_actions.cpp:52
 msgid "Open a Gerber job file and its associated gerber plot files"
 msgstr "打开 Gerber 作业文件及其关联的 Gerber 绘制文件"
 
-#: gerbview/tools/gerbview_actions.cpp:78
+#: gerbview/tools/gerbview_actions.cpp:57
 msgid "Open Zip Archive File..."
 msgstr "打开 Zip 压缩文件..."
 
-#: gerbview/tools/gerbview_actions.cpp:79
+#: gerbview/tools/gerbview_actions.cpp:58
 msgid "Open a zipped archive (Gerber and Drill) file"
 msgstr "打开一个 Zip 压缩 (Gerber 和钻孔) 文件"
 
-#: gerbview/tools/gerbview_actions.cpp:88
+#: gerbview/tools/gerbview_actions.cpp:67
 msgid "Clear Highlight"
 msgstr "清除高亮"
 
-#: gerbview/tools/gerbview_actions.cpp:98
+#: gerbview/tools/gerbview_actions.cpp:77
 msgid "Highlight Component"
 msgstr "高亮元件"
 
-#: gerbview/tools/gerbview_actions.cpp:103
+#: gerbview/tools/gerbview_actions.cpp:82
 msgid "Highlight Attribute"
 msgstr "高亮属性"
 
-#: gerbview/tools/gerbview_actions.cpp:109
+#: gerbview/tools/gerbview_actions.cpp:88
 msgid "Next Layer"
 msgstr "下一层"
 
-#: gerbview/tools/gerbview_actions.cpp:114
+#: gerbview/tools/gerbview_actions.cpp:93
 msgid "Previous Layer"
 msgstr "上一层"
 
-#: gerbview/tools/gerbview_actions.cpp:119
+#: gerbview/tools/gerbview_actions.cpp:98
 msgid "Sketch Lines"
 msgstr "线条草图"
 
-#: gerbview/tools/gerbview_actions.cpp:119
+#: gerbview/tools/gerbview_actions.cpp:98
 msgid "Show lines in outline mode"
 msgstr "在轮廓模式下显示线"
 
-#: gerbview/tools/gerbview_actions.cpp:125
+#: gerbview/tools/gerbview_actions.cpp:104
 msgid "Sketch Flashed Items"
 msgstr "项目快速草图"
 
-#: gerbview/tools/gerbview_actions.cpp:125
+#: gerbview/tools/gerbview_actions.cpp:104
 msgid "Show flashed items in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: gerbview/tools/gerbview_actions.cpp:131
+#: gerbview/tools/gerbview_actions.cpp:110
 msgid "Sketch Polygons"
 msgstr "多边形草图"
 
-#: gerbview/tools/gerbview_actions.cpp:131
+#: gerbview/tools/gerbview_actions.cpp:110
 msgid "Show polygons in outline mode"
 msgstr "在轮廓模式下显示多边形"
 
-#: gerbview/tools/gerbview_actions.cpp:137
+#: gerbview/tools/gerbview_actions.cpp:116
 msgid "Ghost Negative Objects"
 msgstr "显示负片对象"
 
-#: gerbview/tools/gerbview_actions.cpp:137
+#: gerbview/tools/gerbview_actions.cpp:116
 msgid "Show negative objects in ghost color"
 msgstr "以鬼影颜色显示负片对象"
 
-#: gerbview/tools/gerbview_actions.cpp:143
+#: gerbview/tools/gerbview_actions.cpp:122
 msgid "Show DCodes"
 msgstr "显示 D 码"
 
-#: gerbview/tools/gerbview_actions.cpp:143
+#: gerbview/tools/gerbview_actions.cpp:122
 msgid "Show dcode number"
 msgstr "显示 D 码编号"
 
-#: gerbview/tools/gerbview_actions.cpp:148
+#: gerbview/tools/gerbview_actions.cpp:127
 msgid "Show in Differential Mode"
 msgstr "以差异模式显示"
 
-#: gerbview/tools/gerbview_actions.cpp:148
+#: gerbview/tools/gerbview_actions.cpp:127
 msgid "Show layers in diff (compare) mode"
 msgstr "在比较模式下显示图层"
 
-#: gerbview/tools/gerbview_actions.cpp:153
+#: gerbview/tools/gerbview_actions.cpp:132
 msgid "Flip Gerber View"
 msgstr "翻转 Gerber 视图"
 
-#: gerbview/tools/gerbview_actions.cpp:153
+#: gerbview/tools/gerbview_actions.cpp:132
 msgid "Show as mirror image"
 msgstr "显示为镜像"
 
@@ -15143,15 +15676,15 @@ msgstr "解压工程到 \"%s\"\n"
 msgid "Archive Project Files"
 msgstr "压缩工程文件"
 
-#: kicad/import_project.cpp:56
+#: kicad/import_project.cpp:51
 msgid "Import Eagle Project Files"
 msgstr "导入 Eagle 工程文件"
 
-#: kicad/import_project.cpp:77
+#: kicad/import_project.cpp:72
 msgid "KiCad Project Destination"
 msgstr "KiCad 工程目标"
 
-#: kicad/import_project.cpp:93
+#: kicad/import_project.cpp:88
 msgid ""
 "The selected directory is not empty.  We recommend you create projects in "
 "their own clean directory.\n"
@@ -15162,11 +15695,11 @@ msgstr ""
 "\n"
 "您要创建一个与工程同名的新目录吗?"
 
-#: kicad/kicad_manager_frame.cpp:476
+#: kicad/kicad_manager_frame.cpp:540
 msgid "Load File to Edit"
 msgstr "打开文件编辑"
 
-#: kicad/kicad_manager_frame.cpp:569
+#: kicad/kicad_manager_frame.cpp:656
 #, c-format
 msgid ""
 "Project name:\n"
@@ -15175,59 +15708,68 @@ msgstr ""
 "工程文件:\n"
 "%s\n"
 
-#: kicad/menubar.cpp:53
+#: kicad/kicad_manager_frame.cpp:692
+msgid "Restoring session"
+msgstr "正在恢复会话"
+
+#: kicad/kicad_manager_frame.cpp:702
+#, c-format
+msgid "Restoring \"%s\""
+msgstr "正在恢复 \"%s\""
+
+#: kicad/menubar.cpp:54
 msgid "Clear Recent Projects"
 msgstr "清除最近的项目"
 
-#: kicad/menubar.cpp:81
+#: kicad/menubar.cpp:87
 msgid "Import EAGLE Project..."
 msgstr "导入 Eagle 工程..."
 
-#: kicad/menubar.cpp:82
+#: kicad/menubar.cpp:88
 msgid "Import EAGLE CAD XML schematic and board"
 msgstr "导入 EAGLE CAD XML 原理图和电路板"
 
-#: kicad/menubar.cpp:87
+#: kicad/menubar.cpp:93
 msgid "&Archive Project..."
 msgstr "压缩工程... (&A)"
 
-#: kicad/menubar.cpp:88
+#: kicad/menubar.cpp:94
 msgid "Archive all needed project files into zip archive"
 msgstr "把当前工程压缩成 Zip 文件"
 
-#: kicad/menubar.cpp:92
+#: kicad/menubar.cpp:98
 msgid "&Unarchive Project..."
 msgstr "解压工程... (&U)"
 
-#: kicad/menubar.cpp:93 kicad/menubar.cpp:194
+#: kicad/menubar.cpp:99 kicad/menubar.cpp:197
 msgid "Unarchive project files from zip archive"
 msgstr "选择一个 Zip 工程文件，并解压缩"
 
-#: kicad/menubar.cpp:110
+#: kicad/menubar.cpp:114
 msgid "Browse Project Files"
 msgstr "浏览工程文件"
 
-#: kicad/menubar.cpp:110
+#: kicad/menubar.cpp:115
 msgid "Open project directory in file browser"
 msgstr "在文件浏览器中打开工程目录"
 
-#: kicad/menubar.cpp:136
+#: kicad/menubar.cpp:140
 msgid "Edit Local File..."
 msgstr "编辑本地文件..."
 
-#: kicad/menubar.cpp:136
+#: kicad/menubar.cpp:141
 msgid "Edit local file in text editor"
 msgstr "在文本编辑器中编辑本地文件"
 
-#: kicad/menubar.cpp:190
+#: kicad/menubar.cpp:193
 msgid "Archive all project files"
 msgstr "压缩全部工程文件"
 
-#: kicad/menubar.cpp:203
+#: kicad/menubar.cpp:206
 msgid "Reveal project folder in Finder"
 msgstr "在查找器中显示工程文件夹"
 
-#: kicad/menubar.cpp:205
+#: kicad/menubar.cpp:208
 msgid "Open project directory in file explorer"
 msgstr "在文件资源管理器中打开工程目录"
 
@@ -15273,54 +15815,62 @@ msgid "Open an existing project"
 msgstr "打开一个现有工程"
 
 #: kicad/tools/kicad_manager_actions.cpp:59
+msgid "Close Project"
+msgstr "关闭工程"
+
+#: kicad/tools/kicad_manager_actions.cpp:59
+msgid "Close the current project"
+msgstr "关闭当前工程"
+
+#: kicad/tools/kicad_manager_actions.cpp:65
 msgid "Edit Schematic"
 msgstr "编辑原理图"
 
-#: kicad/tools/kicad_manager_actions.cpp:65
+#: kicad/tools/kicad_manager_actions.cpp:71
 msgid "Edit Schematic Symbols"
 msgstr "编辑原理图符号"
 
-#: kicad/tools/kicad_manager_actions.cpp:71
+#: kicad/tools/kicad_manager_actions.cpp:77
 msgid "Edit PCB"
 msgstr "编辑 PCB"
 
-#: kicad/tools/kicad_manager_actions.cpp:77
+#: kicad/tools/kicad_manager_actions.cpp:83
 msgid "Edit PCB Footprints"
 msgstr "编辑 PCB 封装"
 
-#: kicad/tools/kicad_manager_actions.cpp:83
+#: kicad/tools/kicad_manager_actions.cpp:89
 msgid "View Gerber Files"
 msgstr "查看 Gerber 文件"
 
-#: kicad/tools/kicad_manager_actions.cpp:89
+#: kicad/tools/kicad_manager_actions.cpp:95
 msgid "Convert Image"
 msgstr "图片转换"
 
-#: kicad/tools/kicad_manager_actions.cpp:89
+#: kicad/tools/kicad_manager_actions.cpp:95
 msgid "Convert bitmap images to schematic or PCB components"
 msgstr "将位图图像转换为原理图或 PCB 元件"
 
-#: kicad/tools/kicad_manager_actions.cpp:95
+#: kicad/tools/kicad_manager_actions.cpp:100
 msgid "Calculator Tools"
 msgstr "计算器工具"
 
-#: kicad/tools/kicad_manager_actions.cpp:95
+#: kicad/tools/kicad_manager_actions.cpp:100
 msgid "Run component calculations, track width calculations, etc."
 msgstr "运行元件计算，布线宽度计算等。"
 
-#: kicad/tools/kicad_manager_actions.cpp:101
+#: kicad/tools/kicad_manager_actions.cpp:106
 msgid "Edit Worksheet"
 msgstr "编辑图框"
 
-#: kicad/tools/kicad_manager_actions.cpp:101
+#: kicad/tools/kicad_manager_actions.cpp:106
 msgid "Edit worksheet graphics and text"
 msgstr "编辑图框图形和文本"
 
-#: kicad/tools/kicad_manager_actions.cpp:107
+#: kicad/tools/kicad_manager_actions.cpp:112
 msgid "Open Text Editor"
 msgstr "打开文本编辑器"
 
-#: kicad/tools/kicad_manager_actions.cpp:107
+#: kicad/tools/kicad_manager_actions.cpp:112
 msgid "Launch preferred text editor"
 msgstr "启动首选文本编辑器"
 
@@ -15334,7 +15884,7 @@ msgstr "新建工程"
 
 #: kicad/tools/kicad_manager_control.cpp:118
 #: kicad/tools/kicad_manager_control.cpp:215
-#: kicad/tools/kicad_manager_control.cpp:518
+#: kicad/tools/kicad_manager_control.cpp:524
 #, c-format
 msgid ""
 "Directory \"%s\" could not be created.\n"
@@ -15373,18 +15923,18 @@ msgid "New Project Folder"
 msgstr "新建工程文件夹"
 
 #: kicad/tools/kicad_manager_control.cpp:227
-#: kicad/tools/kicad_manager_control.cpp:527
+#: kicad/tools/kicad_manager_control.cpp:533
 #, c-format
 msgid "Cannot write to folder \"%s\"."
 msgstr "无法写入到文件夹 \"%s\"。"
 
 #: kicad/tools/kicad_manager_control.cpp:228
-#: kicad/tools/kicad_manager_control.cpp:528
+#: kicad/tools/kicad_manager_control.cpp:534
 msgid "Error!"
 msgstr "错误!"
 
 #: kicad/tools/kicad_manager_control.cpp:229
-#: kicad/tools/kicad_manager_control.cpp:529
+#: kicad/tools/kicad_manager_control.cpp:535
 msgid "Please check your access permissions to this folder and try again."
 msgstr "请检查你对此文件夹的访问权限, 然后重试。"
 
@@ -15408,30 +15958,30 @@ msgstr "模板错误"
 msgid "Open Existing Project"
 msgstr "打开已有工程"
 
-#: kicad/tools/kicad_manager_control.cpp:466
+#: kicad/tools/kicad_manager_control.cpp:472
 #, c-format
 msgid "Cannot copy folder \"%s\"."
 msgstr "无法复制 \"%s\" 文件夹。"
 
-#: kicad/tools/kicad_manager_control.cpp:498
+#: kicad/tools/kicad_manager_control.cpp:504
 msgid "Save Project To"
 msgstr "将工程保存到"
 
-#: kicad/tools/kicad_manager_control.cpp:595
+#: kicad/tools/kicad_manager_control.cpp:601
 msgid "Application failed to load:\n"
 msgstr "应用程序加载失败：\n"
 
-#: kicad/tools/kicad_manager_control.cpp:595 pcbnew/pcb_edit_frame.cpp:1145
-#: pcbnew/pcb_edit_frame.cpp:1175
+#: kicad/tools/kicad_manager_control.cpp:601 pcbnew/pcb_edit_frame.cpp:1387
+#: pcbnew/pcb_edit_frame.cpp:1417
 msgid "KiCad Error"
 msgstr "KiCad 错误"
 
-#: kicad/tools/kicad_manager_control.cpp:661
+#: kicad/tools/kicad_manager_control.cpp:667
 #, c-format
 msgid "%s closed [pid=%d]\n"
 msgstr "%s 关闭 [PID = %d]\n"
 
-#: kicad/tools/kicad_manager_control.cpp:721
+#: kicad/tools/kicad_manager_control.cpp:727
 #, c-format
 msgid "%s %s opened [pid=%ld]\n"
 msgstr "%s %s 打开 [PID = %ld]\n"
@@ -15449,122 +15999,122 @@ msgstr ""
 msgid "Create New Directory"
 msgstr "创建新目录"
 
-#: kicad/tree_project_frame.cpp:700
+#: kicad/tree_project_frame.cpp:707
 msgid "Switch to this Project"
 msgstr "切换到此工程"
 
-#: kicad/tree_project_frame.cpp:701
+#: kicad/tree_project_frame.cpp:708
 msgid "Close all editors, and switch to the selected project"
 msgstr "关闭所有编辑器，然后切换到所选工程"
 
-#: kicad/tree_project_frame.cpp:708
+#: kicad/tree_project_frame.cpp:715
 msgid "New Directory..."
 msgstr "新目录..."
 
-#: kicad/tree_project_frame.cpp:709
+#: kicad/tree_project_frame.cpp:716
 msgid "Create a New Directory"
 msgstr "创建一个新目录"
 
-#: kicad/tree_project_frame.cpp:717 kicad/tree_project_frame.cpp:727
+#: kicad/tree_project_frame.cpp:724 kicad/tree_project_frame.cpp:734
 msgid "Reveal in Finder"
 msgstr "在查找器中显示"
 
-#: kicad/tree_project_frame.cpp:718
+#: kicad/tree_project_frame.cpp:725
 msgid "Reveals the directory in a Finder window"
 msgstr "在查找器窗口中显示目录"
 
-#: kicad/tree_project_frame.cpp:720
+#: kicad/tree_project_frame.cpp:727
 msgid "Open Directory in File Explorer"
 msgstr "在文件资源管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:721
+#: kicad/tree_project_frame.cpp:728 pcbnew/menubar_pcb_editor.cpp:416
 msgid "Opens the directory in the default system file manager"
 msgstr "在默认系统文件管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:728
+#: kicad/tree_project_frame.cpp:735
 msgid "Reveals the directories in a Finder window"
 msgstr "在查找器窗口中显示目录"
 
-#: kicad/tree_project_frame.cpp:730
+#: kicad/tree_project_frame.cpp:737
 msgid "Open Directories in File Explorer"
 msgstr "在文件资源管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:731
+#: kicad/tree_project_frame.cpp:738
 msgid "Opens the directories in the default system file manager"
 msgstr "在默认系统文件管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:742
+#: kicad/tree_project_frame.cpp:749
 msgid "Open the file in a Text Editor"
 msgstr "在文本编辑器打开文件"
 
-#: kicad/tree_project_frame.cpp:744
+#: kicad/tree_project_frame.cpp:751
 msgid "Open files in a Text Editor"
 msgstr "在文本编辑器中打开文件"
 
-#: kicad/tree_project_frame.cpp:746
+#: kicad/tree_project_frame.cpp:753
 msgid "Edit in a Text Editor"
 msgstr "在文本编辑器中编辑"
 
-#: kicad/tree_project_frame.cpp:754
+#: kicad/tree_project_frame.cpp:761
 msgid "Rename File..."
 msgstr "重命名文件..."
 
-#: kicad/tree_project_frame.cpp:755
+#: kicad/tree_project_frame.cpp:762
 msgid "Rename file"
 msgstr "重命名"
 
-#: kicad/tree_project_frame.cpp:759
+#: kicad/tree_project_frame.cpp:766
 msgid "Rename Files..."
 msgstr "重命名文件..."
 
-#: kicad/tree_project_frame.cpp:760
+#: kicad/tree_project_frame.cpp:767
 msgid "Rename files"
 msgstr "重命名文件"
 
-#: kicad/tree_project_frame.cpp:769
+#: kicad/tree_project_frame.cpp:776
 msgid "Delete the file and its content"
 msgstr "删除文件及其内容"
 
-#: kicad/tree_project_frame.cpp:771
+#: kicad/tree_project_frame.cpp:778
 msgid "Delete the files and their contents"
 msgstr "删除文件及其内容"
 
-#: kicad/tree_project_frame.cpp:790
+#: kicad/tree_project_frame.cpp:797
 msgid "Print the contents of the file"
 msgstr "打印文件的内容"
 
-#: kicad/tree_project_frame.cpp:833
+#: kicad/tree_project_frame.cpp:840
 #, c-format
 msgid "Are you sure you want to delete '%s'?"
 msgstr "确定要删除 \"%s\"？"
 
-#: kicad/tree_project_frame.cpp:834
+#: kicad/tree_project_frame.cpp:841
 msgid "Delete Directory"
 msgstr "删除目录"
 
-#: kicad/tree_project_frame.cpp:834
+#: kicad/tree_project_frame.cpp:841
 msgid "Delete File"
 msgstr "删除文件"
 
-#: kicad/tree_project_frame.cpp:839
+#: kicad/tree_project_frame.cpp:846
 #, c-format
 msgid "Are you sure you want to delete %lu items?"
 msgstr "您确定要删除 %lu 个项目吗？"
 
-#: kicad/tree_project_frame.cpp:840
+#: kicad/tree_project_frame.cpp:847
 msgid "Delete Multiple Items"
 msgstr "删除多个项目"
 
-#: kicad/tree_project_frame.cpp:872
+#: kicad/tree_project_frame.cpp:879
 #, c-format
 msgid "Change filename: \"%s\""
 msgstr "修改文件名称：\"%s\""
 
-#: kicad/tree_project_frame.cpp:874
+#: kicad/tree_project_frame.cpp:881
 msgid "Change filename"
 msgstr "修改文件名称"
 
-#: kicad/treeproject_item.cpp:108
+#: kicad/treeproject_item.cpp:111
 msgid ""
 "Changing file extension will change file type.\n"
 "Do you want to continue ?"
@@ -15572,18 +16122,28 @@ msgstr ""
 "更改文件扩展名可能会导致文件不可用。\n"
 "你确定要更改吗?"
 
-#: kicad/treeproject_item.cpp:110
+#: kicad/treeproject_item.cpp:113
 msgid "Rename File"
 msgstr "重命名文件"
 
-#: kicad/treeproject_item.cpp:118
+#: kicad/treeproject_item.cpp:121
 msgid "Unable to rename file ... "
 msgstr "无法重命名文件... "
 
-#: kicad/treeproject_item.cpp:118
+#: kicad/treeproject_item.cpp:121
 msgid "Permission error?"
 msgstr "权限错误？"
 
+#: kicad/treeproject_item.cpp:136
+#, c-format
+msgid "Failed to delete '%s'"
+msgstr "无法删除 '%s'"
+
+#: libs/kiplatform/msw/environment.cpp:46
+#, c-format
+msgid "Error code: %d"
+msgstr "错误代码：%d"
+
 #: pagelayout_editor/design_inspector.cpp:219
 msgid "Layout"
 msgstr "布局"
@@ -15608,7 +16168,7 @@ msgstr "起点 X："
 
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:64
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:124
-#: pcbnew/class_drawsegment.cpp:503
+#: pcbnew/class_drawsegment.cpp:535
 msgid "Origin"
 msgstr "原点"
 
@@ -15729,7 +16289,7 @@ msgid "Set to 0 for default"
 msgstr "默认设置为 0"
 
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:364
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1259
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1278
 msgid "Rotation:"
 msgstr "旋转："
 
@@ -15857,99 +16417,83 @@ msgid "Save As"
 msgstr "另存为"
 
 #: pagelayout_editor/files.cpp:202 pcbnew/exporters/export_gencad.cpp:261
-#: pcbnew/exporters/gen_footprints_placefile.cpp:535
+#: pcbnew/exporters/gen_footprints_placefile.cpp:530
 #, c-format
 msgid "Unable to create \"%s\""
 msgstr "\"%s\" 无法建立"
 
-#: pagelayout_editor/pl_editor_frame.cpp:149
+#: pagelayout_editor/pl_editor_frame.cpp:146
 msgid "coord origin: Right Bottom page corner"
 msgstr "原点位置：图框左下角"
 
-#: pagelayout_editor/pl_editor_frame.cpp:174
+#: pagelayout_editor/pl_editor_frame.cpp:171
 msgid "Properties"
 msgstr "属性"
 
-#: pagelayout_editor/pl_editor_frame.cpp:251
+#: pagelayout_editor/pl_editor_frame.cpp:304
 #, c-format
 msgid "Error when loading file \"%s\""
 msgstr "<%s> 文件加载错误"
 
-#: pagelayout_editor/pl_editor_frame.cpp:360
+#: pagelayout_editor/pl_editor_frame.cpp:410
 msgid "Error Init Printer info"
 msgstr "初始化打印机信息出现错误"
 
-#: pagelayout_editor/pl_editor_frame.cpp:501
+#: pagelayout_editor/pl_editor_frame.cpp:539
 msgid "no file selected"
 msgstr "没有选中的文件"
 
-#: pagelayout_editor/pl_editor_frame.cpp:673
+#: pagelayout_editor/pl_editor_frame.cpp:711
 #, c-format
 msgid "Page size: width %.4g height %.4g"
 msgstr "图框尺寸: 宽 %.4g 高 %.4g"
 
-#: pagelayout_editor/pl_editor_frame.cpp:712
+#: pagelayout_editor/pl_editor_frame.cpp:750
 #, c-format
 msgid "coord origin: %s"
 msgstr "坐标原点: %s"
 
-#: pagelayout_editor/pl_editor_frame.cpp:846
+#: pagelayout_editor/pl_editor_frame.cpp:890
 msgid "New page layout file is unsaved"
 msgstr "新图框文件未保存"
 
-#: pagelayout_editor/pl_editor_frame.cpp:850
+#: pagelayout_editor/pl_editor_frame.cpp:894
 msgid "Page layout changes are unsaved"
 msgstr "图框更改未保存"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:67
-msgid ""
-"Show title block in preview mode:\n"
-"text placeholders will be replaced with preview data."
-msgstr ""
-"在预览模式下显示标题块:\n"
-"文本占位符将替换为预览数据。"
-
-#: pagelayout_editor/toolbars_pl_editor.cpp:72
-msgid ""
-"Show title block in edit mode:\n"
-"text placeholders are shown as ${keyword} tokens."
-msgstr ""
-"在编辑模式下显示标题块：\n"
-"文本占位符显示为 ${keyword} 标记。"
-
-#: pagelayout_editor/toolbars_pl_editor.cpp:80
+#: pagelayout_editor/toolbars_pl_editor.cpp:71
 msgid "Left Top paper corner"
 msgstr "图框左上角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:81
+#: pagelayout_editor/toolbars_pl_editor.cpp:72
 msgid "Right Bottom page corner"
 msgstr "图框右下角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:82
+#: pagelayout_editor/toolbars_pl_editor.cpp:73
 msgid "Left Bottom page corner"
 msgstr "图框左下角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:83
+#: pagelayout_editor/toolbars_pl_editor.cpp:74
 msgid "Right Top page corner"
 msgstr "图框右上角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:84
+#: pagelayout_editor/toolbars_pl_editor.cpp:75
 msgid "Left Top page corner"
 msgstr "图框左上角"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:90
+#: pagelayout_editor/toolbars_pl_editor.cpp:81
 msgid "Origin of coordinates displayed to the status bar"
 msgstr "状态栏显示坐标原点"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:103
+#: pagelayout_editor/toolbars_pl_editor.cpp:94
 msgid "Page 1"
 msgstr "第 1 页"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:104
+#: pagelayout_editor/toolbars_pl_editor.cpp:95
 msgid "Other pages"
 msgstr "其他图框"
 
-#: pagelayout_editor/toolbars_pl_editor.cpp:110
+#: pagelayout_editor/toolbars_pl_editor.cpp:101
 msgid ""
 "Simulate page 1 or other pages to show how items\n"
 "which are not on all page are displayed"
@@ -15982,30 +16526,46 @@ msgid "Append an existing page layout design file to current file"
 msgstr "添加现有的图框设计文件追加到当前文件"
 
 #: pagelayout_editor/tools/pl_actions.cpp:81
-msgid "Background White"
-msgstr "白色背景"
-
-#: pagelayout_editor/tools/pl_actions.cpp:81
-msgid "Switch between white and black background"
-msgstr "在白色和黑色背景之间切换"
-
-#: pagelayout_editor/tools/pl_actions.cpp:86
 msgid "Show Design Inspector"
 msgstr "显示设计检查器"
 
-#: pagelayout_editor/tools/pl_actions.cpp:86
+#: pagelayout_editor/tools/pl_actions.cpp:81
 msgid "Show the list of items in page layout"
 msgstr "在图框中显示项目列表"
 
-#: pagelayout_editor/tools/pl_actions.cpp:91
+#: pagelayout_editor/tools/pl_actions.cpp:86
 msgid "Page Preview Settings..."
 msgstr "图框预览设置..."
 
-#: pagelayout_editor/tools/pl_actions.cpp:91
+#: pagelayout_editor/tools/pl_actions.cpp:86
 msgid "Edit preview data for page size and title block"
 msgstr "编辑图框大小和标题块的预览数据"
 
-#: pagelayout_editor/tools/pl_edit_tool.cpp:460
+#: pagelayout_editor/tools/pl_actions.cpp:91
+msgid "Show title block in preview mode"
+msgstr "在预览模式下显示标题栏"
+
+#: pagelayout_editor/tools/pl_actions.cpp:92
+msgid ""
+"Show title block in preview mode:\n"
+"text placeholders will be replaced with preview data."
+msgstr ""
+"在预览模式下显示标题块:\n"
+"文本占位符将替换为预览数据。"
+
+#: pagelayout_editor/tools/pl_actions.cpp:98
+msgid "Show title block in edit mode"
+msgstr "在编辑模式下显示标题栏"
+
+#: pagelayout_editor/tools/pl_actions.cpp:99
+msgid ""
+"Show title block in edit mode:\n"
+"text placeholders are shown as ${keyword} tokens."
+msgstr ""
+"在编辑模式下显示标题块：\n"
+"文本占位符显示为 ${keyword} 标记。"
+
+#: pagelayout_editor/tools/pl_edit_tool.cpp:463
 msgid "Error writing objects to clipboard"
 msgstr "将对象写入剪贴板时出错"
 
@@ -16297,7 +16857,7 @@ msgid "Enter a new item to the current list of available regulators"
 msgstr "在当前列表中输入新的可用稳压器项"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:239
-#: pcb_calculator/regulators_funct.cpp:334
+#: pcb_calculator/regulators_funct.cpp:331
 msgid "Remove Regulator"
 msgstr "移除稳压器"
 
@@ -16461,13 +17021,6 @@ msgid "Diameter of clearance hole in ground plane(s)"
 msgstr "地平面过孔直径"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:619
-#: pcb_calculator/transline_ident.cpp:159
-#: pcb_calculator/transline_ident.cpp:191
-#: pcb_calculator/transline_ident.cpp:223
-#: pcb_calculator/transline_ident.cpp:256
-#: pcb_calculator/transline_ident.cpp:287
-#: pcb_calculator/transline_ident.cpp:359
-#: pcb_calculator/transline_ident.cpp:391
 msgid "Z0:"
 msgstr "Z0："
 
@@ -16490,7 +17043,6 @@ msgstr "电阻率 欧姆*米"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:656
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:997
-#: pcb_calculator/transline_ident.cpp:110
 msgid "Er:"
 msgstr "Er："
 
@@ -16748,42 +17300,26 @@ msgid "Substrate Parameters"
 msgstr "基板参数"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1007
-#: pcb_calculator/transline_ident.cpp:113
 msgid "TanD:"
 msgstr "介损："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1017
-#: pcb_calculator/transline_ident.cpp:118
 msgid "Rho:"
 msgstr "Rho："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1029
-#: pcb_calculator/transline_ident.cpp:139
-#: pcb_calculator/transline_ident.cpp:176
-#: pcb_calculator/transline_ident.cpp:208
-#: pcb_calculator/transline_ident.cpp:307
-#: pcb_calculator/transline_ident.cpp:343
 msgid "H:"
 msgstr "H："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1041
-#: pcb_calculator/transline_ident.cpp:141
-#: pcb_calculator/transline_ident.cpp:309
 msgid "H_t:"
 msgstr "H_t："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1053
-#: pcb_calculator/transline_ident.cpp:143
-#: pcb_calculator/transline_ident.cpp:178
-#: pcb_calculator/transline_ident.cpp:210
-#: pcb_calculator/transline_ident.cpp:311
-#: pcb_calculator/transline_ident.cpp:348
 msgid "T:"
 msgstr "T："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1065
-#: pcb_calculator/transline_ident.cpp:145
-#: pcb_calculator/transline_ident.cpp:313
 msgid "Rough:"
 msgstr "表面粗糙度："
 
@@ -16792,14 +17328,6 @@ msgid "mu Rel:"
 msgstr "mu Rel："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1089
-#: pcb_calculator/transline_ident.cpp:150
-#: pcb_calculator/transline_ident.cpp:180
-#: pcb_calculator/transline_ident.cpp:212
-#: pcb_calculator/transline_ident.cpp:245
-#: pcb_calculator/transline_ident.cpp:276
-#: pcb_calculator/transline_ident.cpp:315
-#: pcb_calculator/transline_ident.cpp:350
-#: pcb_calculator/transline_ident.cpp:378
 msgid "mu Rel C:"
 msgstr "mu Rel C："
 
@@ -16849,9 +17377,9 @@ msgid "Z"
 msgstr "Z"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1297
-#: pcbnew/class_drawsegment.cpp:446 pcbnew/class_drawsegment.cpp:487
-#: pcbnew/class_drawsegment.cpp:1236 pcbnew/class_pcb_text.cpp:130
-#: pcbnew/class_text_mod.cpp:319
+#: pcbnew/class_drawsegment.cpp:477 pcbnew/class_drawsegment.cpp:518
+#: pcbnew/class_drawsegment.cpp:1271 pcbnew/class_pcb_text.cpp:126
+#: pcbnew/class_text_mod.cpp:315
 msgid "Angle"
 msgstr "角度"
 
@@ -17016,7 +17544,7 @@ msgstr "电路板类别"
 msgid "PCB Calculator"
 msgstr "PCB 计算器"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:123
+#: pcb_calculator/pcb_calculator_frame.cpp:124
 msgid ""
 "Data modified, and no data filename to save modifications\n"
 "Do you want to exit and abandon your change?"
@@ -17024,11 +17552,11 @@ msgstr ""
 "更改后的数据不会被保存。\n"
 "你确定要退出并放弃更改？"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:125
+#: pcb_calculator/pcb_calculator_frame.cpp:126
 msgid "Regulator list change"
 msgstr "修改稳压器列表"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:136
+#: pcb_calculator/pcb_calculator_frame.cpp:137
 #, c-format
 msgid ""
 "Unable to write file \"%s\"\n"
@@ -17037,46 +17565,46 @@ msgstr ""
 "无法写入文件 \"%s\"\n"
 "是否退出并放弃修改？"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:140
+#: pcb_calculator/pcb_calculator_frame.cpp:141
 msgid "Write Data File Error"
 msgstr "写入数据文件时发生错误"
 
-#: pcb_calculator/regulators_funct.cpp:100
-#: pcb_calculator/regulators_funct.cpp:287
+#: pcb_calculator/regulators_funct.cpp:99
+#: pcb_calculator/regulators_funct.cpp:284
 msgid "Bad or missing parameters!"
 msgstr "参数缺失或不正确！"
 
-#: pcb_calculator/regulators_funct.cpp:240
+#: pcb_calculator/regulators_funct.cpp:237
 #, c-format
 msgid "PCB Calculator data file (*.%s)|*.%s"
 msgstr "PCB 计算器数据文件 (*.%s)|*.%s"
 
-#: pcb_calculator/regulators_funct.cpp:244
+#: pcb_calculator/regulators_funct.cpp:241
 msgid "Select PCB Calculator Data File"
 msgstr "选择 PCB 计算器数据文件"
 
-#: pcb_calculator/regulators_funct.cpp:259
+#: pcb_calculator/regulators_funct.cpp:256
 msgid "Do you want to load this file and replace current regulator list?"
 msgstr "你要加载该文件，并替换稳流器列表吗？"
 
-#: pcb_calculator/regulators_funct.cpp:275
+#: pcb_calculator/regulators_funct.cpp:272
 #, c-format
 msgid "Unable to read data file \"%s\""
 msgstr "无法读取数据文件 \"%s\""
 
-#: pcb_calculator/regulators_funct.cpp:306
+#: pcb_calculator/regulators_funct.cpp:303
 msgid "This regulator is already in list. Aborted"
 msgstr "这个稳压器已经在列表中"
 
-#: pcb_calculator/regulators_funct.cpp:410
+#: pcb_calculator/regulators_funct.cpp:407
 msgid "Vout must be greater than vref"
 msgstr "Vout 必须大于 Vref"
 
-#: pcb_calculator/regulators_funct.cpp:416
+#: pcb_calculator/regulators_funct.cpp:413
 msgid "Vref set to 0 !"
 msgstr "Vref 已经被设置为 0 ！"
 
-#: pcb_calculator/regulators_funct.cpp:422
+#: pcb_calculator/regulators_funct.cpp:419
 msgid "Incorrect value for R1 R2"
 msgstr "R1 R2 的值错误"
 
@@ -17121,318 +17649,300 @@ msgstr ""
 "__W，H__ = 以 mils 为布线的宽度和厚度 \n"
 "__K__ = 0.024 用于内部布线，0.048 表示外部布线\n"
 
-#: pcb_calculator/transline_dlg_funct.cpp:127 pcb_calculator/via.cpp:67
+#: pcb_calculator/transline_dlg_funct.cpp:128 pcb_calculator/via.cpp:67
 msgid "Relative Dielectric Constants"
 msgstr "相对介电常数"
 
-#: pcb_calculator/transline_dlg_funct.cpp:149
+#: pcb_calculator/transline_dlg_funct.cpp:150
 msgid "Dielectric Loss Factor"
 msgstr "介质损耗因数"
 
-#: pcb_calculator/transline_dlg_funct.cpp:171
+#: pcb_calculator/transline_dlg_funct.cpp:172
 msgid "Specific Resistance"
 msgstr "电阻系数"
 
-#: pcb_calculator/transline_ident.cpp:110
+#: pcb_calculator/transline_ident.cpp:119
+msgid "Er"
+msgstr "Er"
+
+#: pcb_calculator/transline_ident.cpp:120
 msgid "Epsilon R: substrate relative dielectric constant"
 msgstr "Epsilon R：相对介电常数"
 
-#: pcb_calculator/transline_ident.cpp:113
+#: pcb_calculator/transline_ident.cpp:123
+msgid "TanD"
+msgstr "介损"
+
+#: pcb_calculator/transline_ident.cpp:124
 msgid "Tangent delta: dielectric loss factor."
 msgstr "介质损耗：介质损耗因数。"
 
-#: pcb_calculator/transline_ident.cpp:119
+#: pcb_calculator/transline_ident.cpp:129
+msgid "Rho"
+msgstr "Rho"
+
+#: pcb_calculator/transline_ident.cpp:130
 msgid ""
 "Electrical resistivity or specific electrical resistance of conductor "
 "(Ohm*meter)"
 msgstr "电阻或导体的电阻率（Ω*米）"
 
-#: pcb_calculator/transline_ident.cpp:124
+#: pcb_calculator/transline_ident.cpp:136
 msgid "Frequency of the input signal"
 msgstr "输入信号的频率"
 
-#: pcb_calculator/transline_ident.cpp:133
-#: pcb_calculator/transline_ident.cpp:170
-#: pcb_calculator/transline_ident.cpp:202
-#: pcb_calculator/transline_ident.cpp:236
-#: pcb_calculator/transline_ident.cpp:267
-#: pcb_calculator/transline_ident.cpp:337
-#: pcb_calculator/transline_ident.cpp:370
+#: pcb_calculator/transline_ident.cpp:145
+#: pcb_calculator/transline_ident.cpp:185
+#: pcb_calculator/transline_ident.cpp:218
+#: pcb_calculator/transline_ident.cpp:253
+#: pcb_calculator/transline_ident.cpp:286
+#: pcb_calculator/transline_ident.cpp:374
+#: pcb_calculator/transline_ident.cpp:415
 msgid "ErEff:"
 msgstr "有效介电常数："
 
-#: pcb_calculator/transline_ident.cpp:134
-#: pcb_calculator/transline_ident.cpp:171
-#: pcb_calculator/transline_ident.cpp:203
-#: pcb_calculator/transline_ident.cpp:237
-#: pcb_calculator/transline_ident.cpp:268
-#: pcb_calculator/transline_ident.cpp:338
-#: pcb_calculator/transline_ident.cpp:371
+#: pcb_calculator/transline_ident.cpp:146
+#: pcb_calculator/transline_ident.cpp:186
+#: pcb_calculator/transline_ident.cpp:219
+#: pcb_calculator/transline_ident.cpp:254
+#: pcb_calculator/transline_ident.cpp:287
+#: pcb_calculator/transline_ident.cpp:375
+#: pcb_calculator/transline_ident.cpp:416
 msgid "Conductor Losses:"
 msgstr "导体损耗："
 
-#: pcb_calculator/transline_ident.cpp:135
-#: pcb_calculator/transline_ident.cpp:172
-#: pcb_calculator/transline_ident.cpp:204
-#: pcb_calculator/transline_ident.cpp:238
-#: pcb_calculator/transline_ident.cpp:269
-#: pcb_calculator/transline_ident.cpp:339
-#: pcb_calculator/transline_ident.cpp:372
+#: pcb_calculator/transline_ident.cpp:147
+#: pcb_calculator/transline_ident.cpp:187
+#: pcb_calculator/transline_ident.cpp:220
+#: pcb_calculator/transline_ident.cpp:255
+#: pcb_calculator/transline_ident.cpp:288
+#: pcb_calculator/transline_ident.cpp:376
+#: pcb_calculator/transline_ident.cpp:417
 msgid "Dielectric Losses:"
 msgstr "介电损耗："
 
-#: pcb_calculator/transline_ident.cpp:136
-#: pcb_calculator/transline_ident.cpp:173
-#: pcb_calculator/transline_ident.cpp:205
-#: pcb_calculator/transline_ident.cpp:304
-#: pcb_calculator/transline_ident.cpp:340
-#: pcb_calculator/transline_ident.cpp:373
+#: pcb_calculator/transline_ident.cpp:148
+#: pcb_calculator/transline_ident.cpp:188
+#: pcb_calculator/transline_ident.cpp:221
+#: pcb_calculator/transline_ident.cpp:330
+#: pcb_calculator/transline_ident.cpp:377
+#: pcb_calculator/transline_ident.cpp:418
 msgid "Skin Depth:"
 msgstr "趋肤深度："
 
-#: pcb_calculator/transline_ident.cpp:139
-#: pcb_calculator/transline_ident.cpp:176
-#: pcb_calculator/transline_ident.cpp:208
-#: pcb_calculator/transline_ident.cpp:307
-#: pcb_calculator/transline_ident.cpp:343
+#: pcb_calculator/transline_ident.cpp:151
+#: pcb_calculator/transline_ident.cpp:191
+#: pcb_calculator/transline_ident.cpp:224
+#: pcb_calculator/transline_ident.cpp:334
+#: pcb_calculator/transline_ident.cpp:381
 msgid "Height of Substrate"
 msgstr "基板高度"
 
-#: pcb_calculator/transline_ident.cpp:141
-#: pcb_calculator/transline_ident.cpp:309
+#: pcb_calculator/transline_ident.cpp:153
+#: pcb_calculator/transline_ident.cpp:337
 msgid "Height of Box Top"
 msgstr "方框高度"
 
-#: pcb_calculator/transline_ident.cpp:143
-#: pcb_calculator/transline_ident.cpp:178
-#: pcb_calculator/transline_ident.cpp:210
-#: pcb_calculator/transline_ident.cpp:311
-#: pcb_calculator/transline_ident.cpp:348
+#: pcb_calculator/transline_ident.cpp:156
+#: pcb_calculator/transline_ident.cpp:193
+#: pcb_calculator/transline_ident.cpp:226
+#: pcb_calculator/transline_ident.cpp:340
+#: pcb_calculator/transline_ident.cpp:388
 msgid "Strip Thickness"
 msgstr "板厚"
 
-#: pcb_calculator/transline_ident.cpp:145
-#: pcb_calculator/transline_ident.cpp:313
+#: pcb_calculator/transline_ident.cpp:158
+#: pcb_calculator/transline_ident.cpp:342
+msgid "Rough"
+msgstr "表面粗糙度"
+
+#: pcb_calculator/transline_ident.cpp:159
+#: pcb_calculator/transline_ident.cpp:343
 msgid "Conductor Roughness"
 msgstr "导体粗糙度"
 
-#: pcb_calculator/transline_ident.cpp:147
-msgid "mu Rel S:"
-msgstr "mu Rel S："
+#: pcb_calculator/transline_ident.cpp:161
+msgid "mu Rel S"
+msgstr "mu Rel S"
 
-#: pcb_calculator/transline_ident.cpp:148
+#: pcb_calculator/transline_ident.cpp:162
 msgid "Relative Permeability (mu) of Substrate"
 msgstr "基底相对磁导率"
 
-#: pcb_calculator/transline_ident.cpp:150
-#: pcb_calculator/transline_ident.cpp:180
-#: pcb_calculator/transline_ident.cpp:212
-#: pcb_calculator/transline_ident.cpp:245
-#: pcb_calculator/transline_ident.cpp:276
-#: pcb_calculator/transline_ident.cpp:315
-#: pcb_calculator/transline_ident.cpp:350
-#: pcb_calculator/transline_ident.cpp:378
+#: pcb_calculator/transline_ident.cpp:164
+#: pcb_calculator/transline_ident.cpp:195
+#: pcb_calculator/transline_ident.cpp:263
+#: pcb_calculator/transline_ident.cpp:296
+#: pcb_calculator/transline_ident.cpp:345
+#: pcb_calculator/transline_ident.cpp:390
+#: pcb_calculator/transline_ident.cpp:424
+msgid "mu Rel C"
+msgstr "mu Rel C"
+
+#: pcb_calculator/transline_ident.cpp:165
+#: pcb_calculator/transline_ident.cpp:196
+#: pcb_calculator/transline_ident.cpp:229
+#: pcb_calculator/transline_ident.cpp:264
+#: pcb_calculator/transline_ident.cpp:297
+#: pcb_calculator/transline_ident.cpp:346
+#: pcb_calculator/transline_ident.cpp:391
+#: pcb_calculator/transline_ident.cpp:425
 msgid "Relative Permeability (mu) of Conductor"
 msgstr "导体相对磁导率 (mu)"
 
-#: pcb_calculator/transline_ident.cpp:154
-#: pcb_calculator/transline_ident.cpp:184
-#: pcb_calculator/transline_ident.cpp:216
-#: pcb_calculator/transline_ident.cpp:319
-#: pcb_calculator/transline_ident.cpp:354
-msgid "W:"
-msgstr "W："
-
-#: pcb_calculator/transline_ident.cpp:156
-#: pcb_calculator/transline_ident.cpp:188
-#: pcb_calculator/transline_ident.cpp:220
-#: pcb_calculator/transline_ident.cpp:253
-#: pcb_calculator/transline_ident.cpp:284
-#: pcb_calculator/transline_ident.cpp:323
-#: pcb_calculator/transline_ident.cpp:356
-#: pcb_calculator/transline_ident.cpp:388
-msgid "L:"
-msgstr "L："
-
-#: pcb_calculator/transline_ident.cpp:156
-#: pcb_calculator/transline_ident.cpp:188
-#: pcb_calculator/transline_ident.cpp:220
-#: pcb_calculator/transline_ident.cpp:284
-#: pcb_calculator/transline_ident.cpp:323
-#: pcb_calculator/transline_ident.cpp:356
+#: pcb_calculator/transline_ident.cpp:171
+#: pcb_calculator/transline_ident.cpp:204
+#: pcb_calculator/transline_ident.cpp:237
+#: pcb_calculator/transline_ident.cpp:308
+#: pcb_calculator/transline_ident.cpp:357
+#: pcb_calculator/transline_ident.cpp:399
 msgid "Line Length"
 msgstr "线路长度"
 
-#: pcb_calculator/transline_ident.cpp:159
-#: pcb_calculator/transline_ident.cpp:191
-#: pcb_calculator/transline_ident.cpp:223
-#: pcb_calculator/transline_ident.cpp:256
-#: pcb_calculator/transline_ident.cpp:287
-#: pcb_calculator/transline_ident.cpp:359
-#: pcb_calculator/transline_ident.cpp:391
+#: pcb_calculator/transline_ident.cpp:174
+#: pcb_calculator/transline_ident.cpp:207
+#: pcb_calculator/transline_ident.cpp:240
+#: pcb_calculator/transline_ident.cpp:275
+#: pcb_calculator/transline_ident.cpp:312
+#: pcb_calculator/transline_ident.cpp:403
+#: pcb_calculator/transline_ident.cpp:443
 msgid "Characteristic Impedance"
 msgstr "阻抗特性"
 
-#: pcb_calculator/transline_ident.cpp:162
-#: pcb_calculator/transline_ident.cpp:194
-#: pcb_calculator/transline_ident.cpp:226
-#: pcb_calculator/transline_ident.cpp:259
-#: pcb_calculator/transline_ident.cpp:290
-#: pcb_calculator/transline_ident.cpp:330
-#: pcb_calculator/transline_ident.cpp:362
-#: pcb_calculator/transline_ident.cpp:394
-msgid "Ang_l:"
-msgstr "Ang_l："
-
-#: pcb_calculator/transline_ident.cpp:162
-#: pcb_calculator/transline_ident.cpp:194
-#: pcb_calculator/transline_ident.cpp:226
-#: pcb_calculator/transline_ident.cpp:259
-#: pcb_calculator/transline_ident.cpp:290
-#: pcb_calculator/transline_ident.cpp:330
-#: pcb_calculator/transline_ident.cpp:362
-#: pcb_calculator/transline_ident.cpp:394
+#: pcb_calculator/transline_ident.cpp:177
+#: pcb_calculator/transline_ident.cpp:210
+#: pcb_calculator/transline_ident.cpp:243
+#: pcb_calculator/transline_ident.cpp:278
+#: pcb_calculator/transline_ident.cpp:316
+#: pcb_calculator/transline_ident.cpp:367
+#: pcb_calculator/transline_ident.cpp:407
+#: pcb_calculator/transline_ident.cpp:447
 msgid "Electrical Length"
 msgstr "电气长度"
 
-#: pcb_calculator/transline_ident.cpp:186
-#: pcb_calculator/transline_ident.cpp:218
-#: pcb_calculator/transline_ident.cpp:321
-msgid "S:"
-msgstr "S："
-
-#: pcb_calculator/transline_ident.cpp:186
-#: pcb_calculator/transline_ident.cpp:218
-#: pcb_calculator/transline_ident.cpp:321
+#: pcb_calculator/transline_ident.cpp:202
+#: pcb_calculator/transline_ident.cpp:235
+#: pcb_calculator/transline_ident.cpp:354
 msgid "Gap Width"
 msgstr "间距宽度"
 
-#: pcb_calculator/transline_ident.cpp:235
+#: pcb_calculator/transline_ident.cpp:252
 msgid "ZF(H10) = Ey / Hx:"
 msgstr "ZF(H10) = Ey / Hx："
 
-#: pcb_calculator/transline_ident.cpp:239
-#: pcb_calculator/transline_ident.cpp:270
+#: pcb_calculator/transline_ident.cpp:256
+#: pcb_calculator/transline_ident.cpp:289
 msgid "TE-Modes:"
 msgstr "TE-模式："
 
-#: pcb_calculator/transline_ident.cpp:240
-#: pcb_calculator/transline_ident.cpp:271
+#: pcb_calculator/transline_ident.cpp:257
+#: pcb_calculator/transline_ident.cpp:290
 msgid "TM-Modes:"
 msgstr "TM-模式："
 
-#: pcb_calculator/transline_ident.cpp:243
-#: pcb_calculator/transline_ident.cpp:274
-msgid "mu Rel I:"
-msgstr "mu Rel I："
+#: pcb_calculator/transline_ident.cpp:260
+#: pcb_calculator/transline_ident.cpp:293
+msgid "mu Rel I"
+msgstr "mu Rel I"
 
-#: pcb_calculator/transline_ident.cpp:243
-#: pcb_calculator/transline_ident.cpp:274
+#: pcb_calculator/transline_ident.cpp:261
+#: pcb_calculator/transline_ident.cpp:294
 msgid "Relative Permeability (mu) of Insulator"
 msgstr "绝缘体的相对磁导率 (mu)"
 
-#: pcb_calculator/transline_ident.cpp:249
-#: pcb_calculator/transline_ident.cpp:345
-msgid "a:"
-msgstr "a:"
-
-#: pcb_calculator/transline_ident.cpp:249
+#: pcb_calculator/transline_ident.cpp:268
 msgid "Width of Waveguide"
 msgstr "波导管宽度"
 
-#: pcb_calculator/transline_ident.cpp:251
-msgid "b:"
-msgstr "b："
-
-#: pcb_calculator/transline_ident.cpp:251
+#: pcb_calculator/transline_ident.cpp:270
 msgid "Height of Waveguide"
 msgstr "波导管高度"
 
-#: pcb_calculator/transline_ident.cpp:253
+#: pcb_calculator/transline_ident.cpp:272
 msgid "Waveguide Length"
 msgstr "波导管长度"
 
-#: pcb_calculator/transline_ident.cpp:280
-#: pcb_calculator/transline_ident.cpp:384
-msgid "Din:"
-msgstr "Din："
+#: pcb_calculator/transline_ident.cpp:301
+#: pcb_calculator/transline_ident.cpp:432
+msgid "Din"
+msgstr "Din"
 
-#: pcb_calculator/transline_ident.cpp:280
-#: pcb_calculator/transline_ident.cpp:384
+#: pcb_calculator/transline_ident.cpp:302
+#: pcb_calculator/transline_ident.cpp:433
 msgid "Inner Diameter (conductor)"
 msgstr "内径（导体）"
 
-#: pcb_calculator/transline_ident.cpp:282
-#: pcb_calculator/transline_ident.cpp:386
-msgid "Dout:"
-msgstr "Dout："
+#: pcb_calculator/transline_ident.cpp:304
+#: pcb_calculator/transline_ident.cpp:435
+msgid "Dout"
+msgstr "Dout"
 
-#: pcb_calculator/transline_ident.cpp:282
-#: pcb_calculator/transline_ident.cpp:386
+#: pcb_calculator/transline_ident.cpp:305
+#: pcb_calculator/transline_ident.cpp:436
 msgid "Outer Diameter (insulator)"
 msgstr "外径（绝缘体）"
 
-#: pcb_calculator/transline_ident.cpp:298
+#: pcb_calculator/transline_ident.cpp:324
 msgid "ErEff Even:"
 msgstr "有效相对介电常数偶模："
 
-#: pcb_calculator/transline_ident.cpp:299
+#: pcb_calculator/transline_ident.cpp:325
 msgid "ErEff Odd:"
 msgstr "有效相对介电常数奇模："
 
-#: pcb_calculator/transline_ident.cpp:300
+#: pcb_calculator/transline_ident.cpp:326
 msgid "Conductor Losses Even:"
 msgstr "导体损耗偶模："
 
-#: pcb_calculator/transline_ident.cpp:301
+#: pcb_calculator/transline_ident.cpp:327
 msgid "Conductor Losses Odd:"
 msgstr "导体损耗奇模："
 
-#: pcb_calculator/transline_ident.cpp:302
+#: pcb_calculator/transline_ident.cpp:328
 msgid "Dielectric Losses Even:"
 msgstr "介电损耗偶模："
 
-#: pcb_calculator/transline_ident.cpp:303
+#: pcb_calculator/transline_ident.cpp:329
 msgid "Dielectric Losses Odd:"
 msgstr "介电损耗奇模："
 
-#: pcb_calculator/transline_ident.cpp:326
-msgid "Zeven:"
-msgstr "Zeven (偶模阻抗)："
+#: pcb_calculator/transline_ident.cpp:360
+msgid "Zeven"
+msgstr "Zeven (偶模阻抗)"
 
-#: pcb_calculator/transline_ident.cpp:326
+#: pcb_calculator/transline_ident.cpp:361
 msgid "Even mode impedance (lines driven by common voltages)"
 msgstr "奇模阻抗（由通用电压的线路驱动）"
 
-#: pcb_calculator/transline_ident.cpp:328
-msgid "Zodd:"
+#: pcb_calculator/transline_ident.cpp:363
+msgid "Zodd"
 msgstr "Zodd (奇模阻抗)"
 
-#: pcb_calculator/transline_ident.cpp:328
+#: pcb_calculator/transline_ident.cpp:364
 msgid "Odd mode impedance (lines driven by opposite (differential) voltages)"
 msgstr "奇模阻抗（通过驱动线相反 (差分) 电压）"
 
-#: pcb_calculator/transline_ident.cpp:345
+#: pcb_calculator/transline_ident.cpp:384
 msgid "distance between strip and top metal"
 msgstr "带状线和顶部导体的距离"
 
-#: pcb_calculator/transline_ident.cpp:376
-msgid "Twists:"
-msgstr "扭曲："
+#: pcb_calculator/transline_ident.cpp:421
+msgid "Twists"
+msgstr "扭曲"
 
-#: pcb_calculator/transline_ident.cpp:376
+#: pcb_calculator/transline_ident.cpp:422
 msgid "Number of Twists per Length"
 msgstr "每个长度的绞合数"
 
-#: pcb_calculator/transline_ident.cpp:381
-msgid "ErEnv:"
-msgstr "ErEnv："
+#: pcb_calculator/transline_ident.cpp:428
+msgid "ErEnv"
+msgstr "ErEnv"
 
-#: pcb_calculator/transline_ident.cpp:381
+#: pcb_calculator/transline_ident.cpp:429
 msgid "Relative Permittivity of Environment"
 msgstr "环境的相对介电常数"
 
-#: pcb_calculator/transline_ident.cpp:388
+#: pcb_calculator/transline_ident.cpp:439
 msgid "Cable Length"
 msgstr "电缆长度"
 
@@ -17440,129 +17950,15 @@ msgstr "电缆长度"
 msgid "Electrical Resistivity in Ohm*m"
 msgstr "电阻率（以 Ohm*m 为单位）"
 
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:57
-#, c-format
-msgid "Cannot open file '%s'"
-msgstr "无法打开文件 ‘%s’"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:453
-#, c-format
-msgid "File not found: '%s'"
-msgstr "文件没有找到：'%s'"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:909
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:984
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1062
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1085
-#, c-format
-msgid ""
-"Dimension on Altium layer %d has no KiCad equivalent. Put it on Eco1_User "
-"instead"
-msgstr ""
-"Altium 层 %d 上的 Dimension 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1181
-#, c-format
-msgid "Cannot create directory \"%s\" -> no 3D-models will be imported."
-msgstr "无法创建目录 \"%s\" -> 无法导入 3D 模型。"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1260
-#, c-format
-msgid "Polygon on Altium layer %d has no KiCad equivalent. Ignore it instead"
-msgstr "Altium 层 %d 上的 Polygon 没有任何 KiCad 等效项。 忽略它"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1446
-#, c-format
-msgid ""
-"Zone on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
-msgstr ""
-"Altium 层 %d 上的 Zone 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1471
-#, c-format
-msgid ""
-"Polygon on Altium layer %d has no KiCad equivalent. Put it on Eco1_User "
-"instead"
-msgstr ""
-"Altium 层 %d 上的 Polygon 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1586
-#, c-format
-msgid ""
-"Arc on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
-msgstr "Altium 层 %d 上的 Arc 没有 KiCad 等效项。改为将其放在 Eco1_User 上"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1759
-#, c-format
-msgid ""
-"Pad '%s' of Footprint %s has a square hole. KiCad does not support this yet"
-msgstr "焊盘 \"%s\"（封装 %s）有一个方孔。KiCad 目前还不支持此功能"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1780
-#, c-format
-msgid ""
-"Pad '%s' of Footprint %s has a hole-rotation of %f degree. KiCad only "
-"supports 90 degree angles"
-msgstr "焊盘 \"%s\"（封装 %s）有 %f 度的孔旋转。KiCad 仅支持 90 度角"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1809
-#, c-format
-msgid ""
-"Pad '%s' of Footprint %s uses a complex pad stack (kind %d), which is not "
-"supported yet"
-msgstr "焊盘 \"%s\"（封装 %s）使用复杂的焊盘堆叠（类型为 %d），尚不支持"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1899
-#, c-format
-msgid ""
-"Non-Copper Pad on Altium layer %d has no KiCad equivalent. Put it on "
-"Eco1_User instead"
-msgstr ""
-"Altium 层 %d 上的非铜焊盘没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1919
-#, c-format
-msgid ""
-"Non-Copper Pad '%s' uses a complex pad stack (kind %d). This should not "
-"happen"
-msgstr "非铜焊盘 \"%s\" 使用复杂的焊盘堆叠（类型为 %d）。这不应该发生"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:2155
-#, c-format
-msgid ""
-"Track on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
-msgstr ""
-"Altium 层 %d 上的 Track 没有任何 KiCad 等效项。 改为将其放在 Eco1_User 上"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:2228
-#, c-format
-msgid ""
-"Ignore Barcode on Altium layer %d because it is not supported right now."
-msgstr "忽略 Altium 层 %d 上的条形码，因为目前不支持该条形码。"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:2311
-#, c-format
-msgid ""
-"Text on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
-msgstr ""
-"Altium 层 %d 上的 Text 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
-
-#: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:2409
-#, c-format
-msgid ""
-"Fill on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
-msgstr ""
-"Altium 层 %d 上的 Fill 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
-
-#: pcbnew/array_creator.cpp:184
+#: pcbnew/array_creator.cpp:185
 msgid "Create an array"
 msgstr "创建阵列"
 
-#: pcbnew/autorouter/ar_autoplacer.cpp:954
+#: pcbnew/autorouter/ar_autoplacer.cpp:950
 msgid "Autoplacing components..."
 msgstr "自动放置元件..."
 
-#: pcbnew/autorouter/ar_autoplacer.cpp:971
+#: pcbnew/autorouter/ar_autoplacer.cpp:967
 #, c-format
 msgid "Autoplacing %s"
 msgstr "自动放置 %s"
@@ -17575,31 +17971,31 @@ msgstr "自动放置元件"
 msgid "Autoplace components"
 msgstr "自动放置元件"
 
-#: pcbnew/board_connected_item.cpp:137 pcbnew/class_track.cpp:159
-#: pcbnew/class_track.cpp:177 pcbnew/drc/drc_clearance_test_functions.cpp:101
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:95
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:138
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:181
-#: qa/drc_proto/drc_clearance_test_functions.cpp:201
+#: pcbnew/board_connected_item.cpp:126 pcbnew/class_track.cpp:166
+#: pcbnew/class_track.cpp:193 pcbnew/drc/drc_clearance_test_functions.cpp:254
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:108
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:159
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:211
+#: qa/drc_proto/drc_clearance_test_functions.cpp:353
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:95
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:138
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:181
 msgid "board minimum"
 msgstr "电路板最小值"
 
-#: pcbnew/board_connected_item.cpp:151 pcbnew/drc/drc.cpp:500
-#: pcbnew/drc/drc_clearance_test_functions.cpp:481 qa/drc_proto/drc.cpp:534
-#: qa/drc_proto/drc_clearance_test_functions.cpp:623
+#: pcbnew/board_connected_item.cpp:140 pcbnew/drc/drc.cpp:494
+#: pcbnew/drc/drc_clearance_test_functions.cpp:496 qa/drc_proto/drc.cpp:534
+#: qa/drc_proto/drc_clearance_test_functions.cpp:631
 msgid "board edge"
 msgstr "电路板边缘"
 
-#: pcbnew/board_connected_item.cpp:174 pcbnew/class_track.cpp:144
-#: pcbnew/class_track.cpp:170 pcbnew/class_zone.cpp:374
-#: pcbnew/drc/drc_clearance_test_functions.cpp:291
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:101
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:144
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:187
-#: qa/drc_proto/drc_clearance_test_functions.cpp:398
+#: pcbnew/board_connected_item.cpp:164 pcbnew/class_track.cpp:151
+#: pcbnew/class_track.cpp:186 pcbnew/class_zone.cpp:383
+#: pcbnew/drc/drc_clearance_test_functions.cpp:314
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:103
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:154
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:206
+#: qa/drc_proto/drc_clearance_test_functions.cpp:420
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:101
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:144
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:187
@@ -17607,12 +18003,12 @@ msgstr "电路板边缘"
 msgid "'%s' rule"
 msgstr "'%s' 规则"
 
-#: pcbnew/board_connected_item.cpp:227
+#: pcbnew/board_connected_item.cpp:217
 msgid "NetName"
 msgstr "网络名称"
 
-#: pcbnew/board_connected_item.cpp:229 pcbnew/class_pad.cpp:758
-#: pcbnew/class_track.cpp:729 pcbnew/class_zone.cpp:635
+#: pcbnew/board_connected_item.cpp:219 pcbnew/class_pad.cpp:809
+#: pcbnew/class_track.cpp:800 pcbnew/class_zone.cpp:640
 msgid "NetClass"
 msgstr "网络类"
 
@@ -17688,34 +18084,30 @@ msgstr "可用材料："
 msgid "Dielectric Materials"
 msgstr "电介质材料"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:107
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:110
 msgid "Core"
 msgstr "中心"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:108
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:111
 msgid "PrePreg"
 msgstr "预浸料"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:170
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:173
 #, c-format
 msgid "Layer \"%s\" (sublayer %d/%d)"
 msgstr "图层 \"%s\"（子层 %d/%d）"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:182
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:231
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:185
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:234
 msgid "Dielectric Layers List"
 msgstr "电介质层列表"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:614
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:137
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:617
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:164
 msgid "Copper"
 msgstr "铜层"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:881
-msgid "Stackup not up to date. Verify it"
-msgstr "堆叠不是最新的。请验证它"
-
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:927
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:938
 msgid ""
 "Incorrect value for Epsilon R (Epsilon R must be positive or null if not "
 "used)"
@@ -17723,16 +18115,16 @@ msgstr ""
 "Epsilon R（相对介电常数） 的值不正确（如果未使用，则 Epsilon R（相对介电常"
 "数） 必须为正数或空）"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:945
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:956
 msgid ""
 "Incorrect value for Loss tg (Loss tg must be positive or null if not used)"
 msgstr "损耗切线的不正确值（如果不使用，则损耗切线必须为正数或空）"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:992
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1003
 msgid "A layer thickness is < 0. Fix it"
 msgstr "层厚度为 < 0。修复它"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1036
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1047
 #, c-format
 msgid ""
 "Board thickness %s differs from stackup thickness %s\n"
@@ -17741,7 +18133,7 @@ msgstr ""
 "板厚度 %s 不同于堆叠厚度 %s\n"
 "允许的最大误差 %s"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1174
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1185
 msgid ""
 "A locked dielectric thickness is < 0\n"
 "Unlock it or change its thickness"
@@ -17749,7 +18141,7 @@ msgstr ""
 "锁定的介电厚度为 < 0\n"
 "解锁或更改其厚度"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1185
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1196
 msgid ""
 "Cannot calculate dielectric thickness\n"
 "At least one dielectric layer must be not locked"
@@ -17757,7 +18149,7 @@ msgstr ""
 "无法计算介质厚度。\n"
 "必须至少有一个介电层未锁定"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1194
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1205
 msgid ""
 "Cannot calculate dielectric thickness\n"
 "Fixed thickness too big or board thickness too small"
@@ -17765,6 +18157,18 @@ msgstr ""
 "无法计算介质厚度。\n"
 "固定厚度太大或板厚度太小"
 
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1537
+msgid "Physical stackup has not been updated to match layer count."
+msgstr "尚未更新物理堆叠以匹配层计数。"
+
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1538
+msgid "Update Physical Stackup"
+msgstr "更新物理堆叠"
+
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1540
+msgid "Update dielectric thickness from board thickness"
+msgstr "根据电路板厚度更新介质厚度"
+
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:20
 msgid "Board thickness:"
 msgstr "板厚度："
@@ -17786,7 +18190,7 @@ msgstr ""
 "对于所有未锁定的介电层，厚度将相同。"
 
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:68
-#: pcbnew/build_BOM_from_board.cpp:114
+#: pcbnew/build_BOM_from_board.cpp:109
 msgid "Id"
 msgstr "ID"
 
@@ -17923,84 +18327,118 @@ msgstr "黄色"
 msgid "Not specified"
 msgstr "未标明"
 
-#: pcbnew/build_BOM_from_board.cpp:84
+#: pcbnew/build_BOM_from_board.cpp:80
 msgid "Cannot export BOM: there are no footprints in the PCB"
 msgstr "无法导出 BOM：因为 PCB 上没有封装"
 
-#: pcbnew/build_BOM_from_board.cpp:94
+#: pcbnew/build_BOM_from_board.cpp:90
 msgid "Save Bill of Materials"
 msgstr "保存材料清单"
 
-#: pcbnew/build_BOM_from_board.cpp:107
-#: pcbnew/dialogs/dialog_board_statistics.cpp:647
+#: pcbnew/build_BOM_from_board.cpp:102
+#: pcbnew/dialogs/dialog_board_statistics.cpp:645
 #: pcbnew/dialogs/dialog_export_vrml.cpp:259
 #, c-format
 msgid "Unable to create file \"%s\""
 msgstr "无法创建文件 \"%s\""
 
-#: pcbnew/build_BOM_from_board.cpp:115
+#: pcbnew/build_BOM_from_board.cpp:110
 msgid "Designator"
 msgstr "指示符"
 
-#: pcbnew/build_BOM_from_board.cpp:116
+#: pcbnew/build_BOM_from_board.cpp:111
 msgid "Package"
 msgstr "包"
 
-#: pcbnew/build_BOM_from_board.cpp:117
+#: pcbnew/build_BOM_from_board.cpp:112
 msgid "Quantity"
 msgstr "数量"
 
-#: pcbnew/build_BOM_from_board.cpp:118
+#: pcbnew/build_BOM_from_board.cpp:113
 msgid "Designation"
 msgstr "名称"
 
-#: pcbnew/build_BOM_from_board.cpp:119
+#: pcbnew/build_BOM_from_board.cpp:114
 msgid "Supplier and ref"
 msgstr "供应商和参考"
 
-#: pcbnew/class_board.cpp:86
+#: pcbnew/class_board.cpp:85
 msgid "This is the default net class."
 msgstr "这是默认网络类。"
 
-#: pcbnew/class_board.cpp:704
+#: pcbnew/class_board.cpp:690
 msgid "PCB"
 msgstr "PCB"
 
-#: pcbnew/class_board.cpp:902
+#: pcbnew/class_board.cpp:922
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:77
-#: pcbnew/netinfo_item.cpp:110 pcbnew/pcb_draw_panel_gal.cpp:379
-#: pcbnew/ratsnest/ratsnest.cpp:55 pcbnew/tools/pcbnew_control.cpp:1029
+#: pcbnew/netinfo_item.cpp:110 pcbnew/pcb_draw_panel_gal.cpp:397
+#: pcbnew/ratsnest/ratsnest.cpp:55 pcbnew/tools/pcbnew_control.cpp:1076
+#: pcbnew/widgets/appearance_controls.cpp:287
 msgid "Pads"
 msgstr "焊盘"
 
-#: pcbnew/class_board.cpp:905
+#: pcbnew/class_board.cpp:925
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:156
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:68
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:31
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:154
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:84
-#: pcbnew/netinfo_item.cpp:130 pcbnew/pcb_draw_panel_gal.cpp:382
+#: pcbnew/netinfo_item.cpp:130 pcbnew/pcb_draw_panel_gal.cpp:400
+#: pcbnew/widgets/appearance_controls.cpp:286
 msgid "Vias"
 msgstr "过孔"
 
-#: pcbnew/class_board.cpp:908 pcbnew/pcb_draw_panel_gal.cpp:385
+#: pcbnew/class_board.cpp:928 pcbnew/pcb_draw_panel_gal.cpp:403
 msgid "Track Segments"
 msgstr "布线分段数"
 
-#: pcbnew/class_board.cpp:911 pcbnew/pcb_draw_panel_gal.cpp:388
+#: pcbnew/class_board.cpp:931 pcbnew/pcb_draw_panel_gal.cpp:406
 msgid "Nodes"
 msgstr "节点"
 
-#: pcbnew/class_board.cpp:914 pcbnew/pcb_draw_panel_gal.cpp:391
+#: pcbnew/class_board.cpp:934 pcbnew/pcb_draw_panel_gal.cpp:409
 #: pcbnew/ratsnest/ratsnest.cpp:58
 msgid "Nets"
 msgstr "网络"
 
-#: pcbnew/class_board.cpp:917 pcbnew/pcb_draw_panel_gal.cpp:394
+#: pcbnew/class_board.cpp:937 pcbnew/pcb_draw_panel_gal.cpp:412
 msgid "Unrouted"
 msgstr "未布线"
 
-#: pcbnew/class_board_item.cpp:38 pcbnew/class_pad.cpp:980
+#: pcbnew/class_board.cpp:1946
+#, c-format
+msgid "Group Uuid %s maps to 2 different BOARD_ITEMS: %p and %p"
+msgstr "组 UUID %s 映射到两个不同的 BOARD_ITEMS: %p 和 %p"
+
+#: pcbnew/class_board.cpp:1958
+#, c-format
+msgid "Two groups of identical name: %s"
+msgstr "两个同名的组：%s"
+
+#: pcbnew/class_board.cpp:1972
+#, c-format
+msgid "Group %s contains deleted item %s"
+msgstr "组 %s 包含已删除的项目 %s"
+
+#: pcbnew/class_board.cpp:1981
+#, c-format
+msgid "Uuid %s maps to 2 different BOARD_ITEMS: %s %p %s and %p %s"
+msgstr "UUID %s 映射到两个不同的 BOARD_ITEMS: %s %p %s 和 %p %s"
+
+#: pcbnew/class_board.cpp:1996
+#, c-format
+msgid ""
+"BOARD_ITEM %s appears multiple times in groups (either in the same group or "
+"in multiple groups) "
+msgstr "BOARD_ITEM %s 在组中多次出现 (在同一组中或在多个组中) "
+
+#: pcbnew/class_board.cpp:2025
+#, c-format
+msgid "Group must have at least one member: %s"
+msgstr "组必须至少有一个成员：%s"
+
+#: pcbnew/class_board_item.cpp:38 pcbnew/class_pad.cpp:1031
 msgid "Rect"
 msgstr "矩形"
 
@@ -18008,13 +18446,12 @@ msgstr "矩形"
 msgid "Bezier Curve"
 msgstr "贝塞尔曲线"
 
-#: pcbnew/class_board_item.cpp:42 pcbnew/class_drawsegment.cpp:460
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1870
+#: pcbnew/class_board_item.cpp:42 pcbnew/class_drawsegment.cpp:491
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1995
 msgid "Polygon"
 msgstr "多边形"
 
-#: pcbnew/class_board_item.cpp:78
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:506
+#: pcbnew/class_board_item.cpp:78 pcbnew/dialogs/dialog_pad_properties.cpp:921
 msgid "All copper layers"
 msgstr "所有铜层"
 
@@ -18026,15 +18463,15 @@ msgstr " 和其它"
 msgid "no layers"
 msgstr "没有层"
 
-#: pcbnew/class_board_item.cpp:180 pcbnew/class_track.cpp:1014
+#: pcbnew/class_board_item.cpp:185 pcbnew/class_track.cpp:1120
 msgid "Position X"
 msgstr "位置 X"
 
-#: pcbnew/class_board_item.cpp:182 pcbnew/class_track.cpp:1017
+#: pcbnew/class_board_item.cpp:187 pcbnew/class_track.cpp:1123
 msgid "Position Y"
 msgstr "位置 Y"
 
-#: pcbnew/class_board_item.cpp:186
+#: pcbnew/class_board_item.cpp:191
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:35
 msgid "Locked"
 msgstr "锁定"
@@ -18044,549 +18481,601 @@ msgstr "锁定"
 msgid "Dimension \"%s\" on %s"
 msgstr "尺寸 \"%s\" 在 %s"
 
-#: pcbnew/class_drawsegment.cpp:428
+#: pcbnew/class_drawsegment.cpp:459
 msgid "Drawing"
 msgstr "图形"
 
-#: pcbnew/class_drawsegment.cpp:453
+#: pcbnew/class_drawsegment.cpp:484
 msgid "Curve"
 msgstr "曲线"
 
-#: pcbnew/class_drawsegment.cpp:463
+#: pcbnew/class_drawsegment.cpp:494
 msgid "Points"
 msgstr "点"
 
-#: pcbnew/class_drawsegment.cpp:478
+#: pcbnew/class_drawsegment.cpp:509
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:84
-#: pcbnew/dialogs/dialog_pad_properties.cpp:706
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1869
+#: pcbnew/dialogs/dialog_pad_properties.cpp:719
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1994
 msgid "Segment"
 msgstr "线段"
 
-#: pcbnew/class_drawsegment.cpp:492
+#: pcbnew/class_drawsegment.cpp:523
 msgid "Unrecognized"
 msgstr "无法识别"
 
-#: pcbnew/class_drawsegment.cpp:887
+#: pcbnew/class_drawsegment.cpp:921
 #, c-format
 msgid "Pcb Graphic %s on %s"
 msgstr "Pcb 图形 %s（位于 %s 上）"
 
-#: pcbnew/class_drawsegment.cpp:1240 pcbnew/class_track.cpp:1020
+#: pcbnew/class_drawsegment.cpp:1275 pcbnew/class_track.cpp:1126
 msgid "End X"
 msgstr "结束点 X"
 
-#: pcbnew/class_drawsegment.cpp:1242 pcbnew/class_track.cpp:1022
+#: pcbnew/class_drawsegment.cpp:1277 pcbnew/class_track.cpp:1128
 msgid "End Y"
 msgstr "结束点 Y"
 
-#: pcbnew/class_edge_mod.cpp:128
+#: pcbnew/class_edge_mod.cpp:134
 #, c-format
 msgid "Graphic %s of %s on %s"
 msgstr "图形 %s %s 在 %s"
 
-#: pcbnew/class_marker_pcb.cpp:105
+#: pcbnew/class_marker_pcb.cpp:93
 msgid "Marker"
 msgstr "标记"
 
-#: pcbnew/class_marker_pcb.cpp:106
+#: pcbnew/class_marker_pcb.cpp:94
 msgid "Violation"
 msgstr "违规"
 
-#: pcbnew/class_marker_pcb.cpp:148
+#: pcbnew/class_marker_pcb.cpp:136
 #, c-format
 msgid "Marker (%s)"
 msgstr "标记 （%s）"
 
-#: pcbnew/class_module.cpp:660 pcbnew/tools/pcbnew_control.cpp:1026
+#: pcbnew/class_module.cpp:668 pcbnew/tools/pcbnew_control.cpp:1073
 msgid "Last Change"
 msgstr "最后修改"
 
-#: pcbnew/class_module.cpp:664
+#: pcbnew/class_module.cpp:672
 msgid "Board Side"
 msgstr "PCB 板面"
 
-#: pcbnew/class_module.cpp:664
+#: pcbnew/class_module.cpp:672
 msgid "Back (Flipped)"
 msgstr "背面(翻转)"
 
-#: pcbnew/class_module.cpp:665
+#: pcbnew/class_module.cpp:673
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:174
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:140
 msgid "Front"
 msgstr "正面"
 
-#: pcbnew/class_module.cpp:682
-msgid "Insert"
-msgstr "插入"
+#: pcbnew/class_module.cpp:688
+msgid "locked"
+msgstr "锁定"
 
-#: pcbnew/class_module.cpp:683
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:270
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:177
-msgid "Virtual"
-msgstr "虚拟"
-
-#: pcbnew/class_module.cpp:687
-msgid "Attributes"
-msgstr "属性"
+#: pcbnew/class_module.cpp:691
+msgid "autoplaced"
+msgstr "自动放置"
 
 #: pcbnew/class_module.cpp:694
+msgid "not in schematic"
+msgstr "不在原理图中"
+
+#: pcbnew/class_module.cpp:697
+msgid "exclude from pos files"
+msgstr "从 pos 文件中排除"
+
+#: pcbnew/class_module.cpp:700
+msgid "exclude from BOM"
+msgstr "从 BOM 中排除"
+
+#: pcbnew/class_module.cpp:702
+msgid "Status: "
+msgstr "状态： "
+
+#: pcbnew/class_module.cpp:702
+msgid "Attributes: "
+msgstr "属性： "
+
+#: pcbnew/class_module.cpp:709
 #, c-format
 msgid "3D-Shape: %s"
 msgstr "3D 形状： %s"
 
-#: pcbnew/class_module.cpp:695
+#: pcbnew/class_module.cpp:710
 msgid "none"
 msgstr "无"
 
-#: pcbnew/class_module.cpp:698 pcbnew/tools/pcbnew_control.cpp:1032
+#: pcbnew/class_module.cpp:713 pcbnew/tools/pcbnew_control.cpp:1079
 #, c-format
 msgid "Doc: %s"
 msgstr "文档：%s"
 
-#: pcbnew/class_module.cpp:699
+#: pcbnew/class_module.cpp:714
 #, c-format
 msgid "Keywords: %s"
 msgstr "关键字：%s"
 
-#: pcbnew/class_module.cpp:952
+#: pcbnew/class_module.cpp:967
 msgid "<no reference designator>"
-msgstr "< 无参考标识符 >"
+msgstr "< 无位号 >"
 
-#: pcbnew/class_module.cpp:954
+#: pcbnew/class_module.cpp:969
 #, c-format
 msgid "Footprint %s on %s"
 msgstr "封装 %s 在 %s 层"
 
-#: pcbnew/class_module.cpp:1593
+#: pcbnew/class_module.cpp:1626
 #, c-format
 msgid "Processing courtyard of \"%s\": %s"
 msgstr "处理外框 \"%s\"：%s"
 
-#: pcbnew/class_module.cpp:1680
+#: pcbnew/class_module.cpp:1721
 msgid "Local Clearance"
 msgstr "局部间隙"
 
-#: pcbnew/class_module.cpp:1682 pcbnew/class_pad.cpp:1296
+#: pcbnew/class_module.cpp:1723 pcbnew/class_pad.cpp:1351
 msgid "Local Solderpaste Margin"
 msgstr "锡膏间隙"
 
-#: pcbnew/class_module.cpp:1684 pcbnew/class_pad.cpp:1298
+#: pcbnew/class_module.cpp:1725 pcbnew/class_pad.cpp:1353
 msgid "Local Solderpaste Margin Ratio"
 msgstr "局部焊锡边率"
 
-#: pcbnew/class_module.cpp:1686 pcbnew/class_pad.cpp:1300
+#: pcbnew/class_module.cpp:1727 pcbnew/class_pad.cpp:1355
 msgid "Thermal Width"
 msgstr "热宽度"
 
-#: pcbnew/class_module.cpp:1688 pcbnew/class_pad.cpp:1302
+#: pcbnew/class_module.cpp:1729 pcbnew/class_pad.cpp:1357
 msgid "Thermal Gap"
 msgstr "热间距"
 
-#: pcbnew/class_module.h:246
+#: pcbnew/class_module.h:241
 #, c-format
 msgid "footprint %s"
 msgstr "封装 %s"
 
-#: pcbnew/class_pad.cpp:595
+#: pcbnew/class_pad.cpp:646
 #, c-format
 msgid "pad %s"
 msgstr "焊盘 %s"
 
-#: pcbnew/class_pad.cpp:747
+#: pcbnew/class_pad.cpp:798
 msgid "Pin Name"
 msgstr "引脚名称"
 
-#: pcbnew/class_pad.cpp:771
+#: pcbnew/class_pad.cpp:822
 msgid "BGA"
 msgstr "BGA"
 
-#: pcbnew/class_pad.cpp:772
+#: pcbnew/class_pad.cpp:823
 msgid "Fiducial global"
 msgstr "基准全局"
 
-#: pcbnew/class_pad.cpp:773
+#: pcbnew/class_pad.cpp:824
 msgid "Fiducial local"
 msgstr "基准本地"
 
-#: pcbnew/class_pad.cpp:774
+#: pcbnew/class_pad.cpp:825
 msgid "Test point"
 msgstr "测试点"
 
-#: pcbnew/class_pad.cpp:775
+#: pcbnew/class_pad.cpp:826
 msgid "Heat sink"
 msgstr "散热片"
 
-#: pcbnew/class_pad.cpp:776
+#: pcbnew/class_pad.cpp:827
 msgid "Castellated"
 msgstr "邮票孔"
 
-#: pcbnew/class_pad.cpp:785 pcbnew/class_track.cpp:681
-#: pcbnew/class_track.cpp:1032
+#: pcbnew/class_pad.cpp:836 pcbnew/class_track.cpp:752
+#: pcbnew/class_track.cpp:1138
 msgid "Diameter"
 msgstr "直径"
 
-#: pcbnew/class_pad.cpp:810
+#: pcbnew/class_pad.cpp:861
 msgid "Length in Package"
 msgstr "封装长度"
 
-#: pcbnew/class_pad.cpp:817 pcbnew/class_track.cpp:686
-#: pcbnew/class_track.cpp:1034
+#: pcbnew/class_pad.cpp:868 pcbnew/class_track.cpp:757
+#: pcbnew/class_track.cpp:1140
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:102
 msgid "Drill"
 msgstr "钻孔"
 
-#: pcbnew/class_pad.cpp:824
+#: pcbnew/class_pad.cpp:875
 msgid "Drill X / Y"
 msgstr "钻孔 X / Y"
 
-#: pcbnew/class_pad.cpp:830 pcbnew/class_track.cpp:617
-#: pcbnew/class_track.cpp:690 pcbnew/class_zone.cpp:677
+#: pcbnew/class_pad.cpp:881 pcbnew/class_track.cpp:688
+#: pcbnew/class_track.cpp:761 pcbnew/class_zone.cpp:682
 #, c-format
 msgid "Min Clearance: %s"
 msgstr "最小间距：%s"
 
-#: pcbnew/class_pad.cpp:831 pcbnew/class_track.cpp:618
-#: pcbnew/class_track.cpp:625 pcbnew/class_track.cpp:691
-#: pcbnew/class_track.cpp:697 pcbnew/class_zone.cpp:678
+#: pcbnew/class_pad.cpp:882 pcbnew/class_track.cpp:689
+#: pcbnew/class_track.cpp:696 pcbnew/class_track.cpp:762
+#: pcbnew/class_track.cpp:768 pcbnew/class_zone.cpp:683
 #, c-format
 msgid "(from %s)"
 msgstr "(从 %s)"
 
-#: pcbnew/class_pad.cpp:979 pcbnew/class_pad.cpp:1276
+#: pcbnew/class_pad.cpp:1030 pcbnew/class_pad.cpp:1331
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:104
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:364
 msgid "Oval"
 msgstr "椭圆"
 
-#: pcbnew/class_pad.cpp:981
+#: pcbnew/class_pad.cpp:1032
 msgid "Trap"
 msgstr "凹槽"
 
-#: pcbnew/class_pad.cpp:982
+#: pcbnew/class_pad.cpp:1033
 msgid "Roundrect"
 msgstr "圆角矩形"
 
-#: pcbnew/class_pad.cpp:983
+#: pcbnew/class_pad.cpp:1034
 msgid "Chamferedrect"
 msgstr "倒角"
 
-#: pcbnew/class_pad.cpp:984
+#: pcbnew/class_pad.cpp:1035
 msgid "CustomShape"
 msgstr "自定义形状"
 
-#: pcbnew/class_pad.cpp:994
+#: pcbnew/class_pad.cpp:1045
 msgid "Std"
 msgstr "标准"
 
-#: pcbnew/class_pad.cpp:995 pcbnew/dialogs/dialog_pad_properties_base.cpp:40
+#: pcbnew/class_pad.cpp:1046
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:280
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:187
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:40
 msgid "SMD"
 msgstr "贴片"
 
-#: pcbnew/class_pad.cpp:996
+#: pcbnew/class_pad.cpp:1047
 msgid "Conn"
 msgstr "连接器"
 
-#: pcbnew/class_pad.cpp:997
+#: pcbnew/class_pad.cpp:1048
 msgid "Not Plated"
 msgstr "非金属化"
 
-#: pcbnew/class_pad.cpp:1007
+#: pcbnew/class_pad.cpp:1058
 #, c-format
 msgid "Pad of %s on %s"
 msgstr "焊盘 %s - %s"
 
-#: pcbnew/class_pad.cpp:1013
+#: pcbnew/class_pad.cpp:1064
 #, c-format
 msgid "Pad %s of %s on %s"
 msgstr "焊盘　%s (%s) - %s"
 
-#: pcbnew/class_pad.cpp:1277
+#: pcbnew/class_pad.cpp:1332
 msgid "Trapezoid"
 msgstr "梯形"
 
-#: pcbnew/class_pad.cpp:1278
+#: pcbnew/class_pad.cpp:1333
 msgid "Rounded Rectangle"
 msgstr "圆角矩形"
 
-#: pcbnew/class_pad.cpp:1279
+#: pcbnew/class_pad.cpp:1334
 msgid "Chamfered Rectangle"
 msgstr "倒角矩形"
 
 # Die 裸芯片
-#: pcbnew/class_pad.cpp:1292 pcbnew/class_track.cpp:608
+#: pcbnew/class_pad.cpp:1347 pcbnew/class_track.cpp:679
 msgid "Pad To Die Length"
 msgstr "焊盘到裸芯片长度"
 
-#: pcbnew/class_pad.cpp:1294
+#: pcbnew/class_pad.cpp:1349
 msgid "Local Soldermask Margin"
 msgstr "阻焊间隙"
 
-#: pcbnew/class_pad.cpp:1305
+#: pcbnew/class_pad.cpp:1360
 msgid "Round Radius Ratio"
 msgstr "圆半径比"
 
+#: pcbnew/class_pcb_group.cpp:267
+#, c-format
+msgid "Anonymous group %s with %ld members"
+msgstr "匿名组 %s 有 %ld 个成员"
+
+#: pcbnew/class_pcb_group.cpp:270
+#, c-format
+msgid "Group \"%s\" with %ld members"
+msgstr "组 \"%s\" 有 %ld 个成员"
+
+#: pcbnew/class_pcb_group.cpp:282
+msgid "Anonymous"
+msgstr "匿名"
+
+#: pcbnew/class_pcb_group.cpp:284
+msgid "Members"
+msgstr "成员"
+
 #: pcbnew/class_pcb_target.cpp:122
 #, c-format
 msgid "Target size %s"
 msgstr "目标尺寸 %s"
 
-#: pcbnew/class_pcb_text.cpp:120
+#: pcbnew/class_pcb_text.cpp:116
 msgid "PCB Text"
 msgstr "PCB 文本"
 
-#: pcbnew/class_pcb_text.cpp:224
+#: pcbnew/class_pcb_text.cpp:220
 #, c-format
 msgid "Pcb Text \"%s\" on %s"
 msgstr "电路板上的文字 \"%s\" (%s)"
 
 # 此处需要查证。
-#: pcbnew/class_text_mod.cpp:289
+#: pcbnew/class_text_mod.cpp:285
 msgid "Ref."
 msgstr "参考."
 
-#: pcbnew/class_text_mod.cpp:306
+#: pcbnew/class_text_mod.cpp:302
 msgid "Display"
 msgstr "显示"
 
-#: pcbnew/class_text_mod.cpp:337
+#: pcbnew/class_text_mod.cpp:333
 #, c-format
 msgid "Reference %s"
 msgstr "参考编号 %s"
 
-#: pcbnew/class_text_mod.cpp:341
+#: pcbnew/class_text_mod.cpp:337
 #, c-format
 msgid "Value %s of %s"
 msgstr "值 %s (%s)"
 
-#: pcbnew/class_text_mod.cpp:346
+#: pcbnew/class_text_mod.cpp:342
 #, c-format
 msgid "Text \"%s\" of %s on %s"
 msgstr "文本 \"%s\" (%s) - %s"
 
-#: pcbnew/class_track.cpp:80
+#: pcbnew/class_track.cpp:86
 #, c-format
 msgid "Blind/Buried Via %s %s on %s - %s"
 msgstr "盲孔/埋孔 %s %s 在 %s - %s上"
 
-#: pcbnew/class_track.cpp:83
+#: pcbnew/class_track.cpp:89
 #, c-format
 msgid "Micro Via %s %s on %s - %s"
 msgstr "微孔 %s %s 在 %s - %s上"
 
-#: pcbnew/class_track.cpp:87
+#: pcbnew/class_track.cpp:93
 #, c-format
 msgid "Via %s %s on %s - %s"
 msgstr "过孔 %s %s 在 %s - %s上"
 
-#: pcbnew/class_track.cpp:611
+#: pcbnew/class_track.cpp:175
+msgid "removed annulus"
+msgstr "移除通孔环"
+
+#: pcbnew/class_track.cpp:682
 msgid "Full Length"
 msgstr "全长"
 
-#: pcbnew/class_track.cpp:624
+#: pcbnew/class_track.cpp:695
 #, c-format
 msgid "Min Width: %s"
 msgstr "最小宽度：%s"
 
-#: pcbnew/class_track.cpp:648
+#: pcbnew/class_track.cpp:719
 msgid "Blind/Buried Via"
 msgstr "盲孔/埋孔"
 
-#: pcbnew/class_track.cpp:696
+#: pcbnew/class_track.cpp:767
 #, c-format
 msgid "Min Annulus: %s"
 msgstr "最小环面：%s"
 
-#: pcbnew/class_track.cpp:737
+#: pcbnew/class_track.cpp:808
 msgid "NetCode"
 msgstr "网络代码"
 
-#: pcbnew/class_track.cpp:864
+#: pcbnew/class_track.cpp:933
 #, c-format
 msgid "Track %s %s on %s, length: %s"
 msgstr "布线 %s %s 在 %s 上， 长度：%s"
 
-#: pcbnew/class_track.cpp:1002
+#: pcbnew/class_track.cpp:1098
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
 msgid "Through"
 msgstr "通孔"
 
-#: pcbnew/class_track.cpp:1003
+#: pcbnew/class_track.cpp:1099
 msgid "Blind/Buried"
 msgstr "盲孔/埋孔"
 
-#: pcbnew/class_track.cpp:1004
+#: pcbnew/class_track.cpp:1100
 msgid "Microvia"
 msgstr "微孔"
 
-#: pcbnew/class_track.cpp:1015
+#: pcbnew/class_track.cpp:1121
 msgid "Origin X"
 msgstr "原点 X"
 
-#: pcbnew/class_track.cpp:1018
+#: pcbnew/class_track.cpp:1124
 msgid "Origin Y"
 msgstr "原点 Y"
 
-#: pcbnew/class_track.cpp:1037
+#: pcbnew/class_track.cpp:1143
 msgid "Layer Top"
 msgstr "图层顶部"
 
-#: pcbnew/class_track.cpp:1039
+#: pcbnew/class_track.cpp:1145
 msgid "Layer Bottom"
 msgstr "图层底部"
 
-#: pcbnew/class_track.cpp:1041
+#: pcbnew/class_track.cpp:1147
 msgid "Via Type"
 msgstr "过孔类型"
 
-#: pcbnew/class_zone.cpp:351
+#: pcbnew/class_zone.cpp:359
 msgid "zone properties"
 msgstr "区域属性"
 
-#: pcbnew/class_zone.cpp:525
+#: pcbnew/class_zone.cpp:529
 msgid "zone"
 msgstr "区域"
 
-#: pcbnew/class_zone.cpp:576
+#: pcbnew/class_zone.cpp:582
 msgid "Keepout Area"
 msgstr "禁布区"
 
-#: pcbnew/class_zone.cpp:578
+#: pcbnew/class_zone.cpp:584
 msgid "Copper Zone"
 msgstr "铜区"
 
-#: pcbnew/class_zone.cpp:580
+#: pcbnew/class_zone.cpp:586
 msgid "Non-copper Zone"
 msgstr "非铜区"
 
-#: pcbnew/class_zone.cpp:586
+#: pcbnew/class_zone.cpp:591
 msgid "Cutout"
 msgstr "挖空"
 
-#: pcbnew/class_zone.cpp:595
+#: pcbnew/class_zone.cpp:600
 msgid "No vias"
 msgstr "无过孔"
 
-#: pcbnew/class_zone.cpp:598
+#: pcbnew/class_zone.cpp:603
 msgid "No tracks"
 msgstr "无布线"
 
-#: pcbnew/class_zone.cpp:601
+#: pcbnew/class_zone.cpp:606
 msgid "No pads"
 msgstr "无焊盘"
 
-#: pcbnew/class_zone.cpp:604
+#: pcbnew/class_zone.cpp:609
 msgid "No copper zones"
 msgstr "无铜区"
 
-#: pcbnew/class_zone.cpp:607
+#: pcbnew/class_zone.cpp:612
 msgid "No footprints"
 msgstr "没有封装"
 
-#: pcbnew/class_zone.cpp:609
+#: pcbnew/class_zone.cpp:614
 msgid "Keepout"
 msgstr "禁止布线"
 
-#: pcbnew/class_zone.cpp:640 pcbnew/class_zone.cpp:1360
+#: pcbnew/class_zone.cpp:645 pcbnew/class_zone.cpp:1375
 msgid "Priority"
 msgstr "优先"
 
-#: pcbnew/class_zone.cpp:655 pcbnew/class_zone.cpp:911
+#: pcbnew/class_zone.cpp:660 pcbnew/class_zone.cpp:914
 #, c-format
 msgid "%s and %d more"
 msgstr "%s 和 %d 更多"
 
-#: pcbnew/class_zone.cpp:665 pcbnew/dialogs/dialog_copper_zones_base.cpp:123
+#: pcbnew/class_zone.cpp:670 pcbnew/dialogs/dialog_copper_zones_base.cpp:144
 #: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:58
 msgid "Hatched"
 msgstr "阴影线"
 
-#: pcbnew/class_zone.cpp:669
+#: pcbnew/class_zone.cpp:674
 msgid "Fill Mode"
 msgstr "填充模式"
 
-#: pcbnew/class_zone.cpp:672
+#: pcbnew/class_zone.cpp:677
 msgid "Filled Area"
 msgstr "填充区域"
 
-#: pcbnew/class_zone.cpp:684
-msgid "Hatch Lines"
-msgstr "线宽"
+#: pcbnew/class_zone.cpp:689
+msgid "HatchBorder Lines"
+msgstr "图案填充边框线"
 
-#: pcbnew/class_zone.cpp:699
+#: pcbnew/class_zone.cpp:704
 msgid "Corner Count"
 msgstr "拐角数"
 
-#: pcbnew/class_zone.cpp:892
+#: pcbnew/class_zone.cpp:895
 msgid "(Cutout)"
 msgstr "(挖空)"
 
-#: pcbnew/class_zone.cpp:895
+#: pcbnew/class_zone.cpp:898
 msgid "(Keepout)"
 msgstr "(禁布区)"
 
-#: pcbnew/class_zone.cpp:913
+#: pcbnew/class_zone.cpp:916
 #, c-format
 msgid "Zone Outline %s on %s"
 msgstr "在 %s 区域边线 %s 上"
 
-#: pcbnew/class_zone.cpp:1364
+#: pcbnew/class_zone.cpp:1379
 msgid "Min Thickness"
 msgstr "最小线宽"
 
-#: pcbnew/cleanup_item.cpp:47
+#: pcbnew/cleanup_item.cpp:47 pcbnew/zone_filler.cpp:119
+msgid "Checking zone fills..."
+msgstr "检查填充区域..."
+
+#: pcbnew/cleanup_item.cpp:48
 msgid "Remove track shorting two nets"
 msgstr "删除短路两个网络的布线"
 
-#: pcbnew/cleanup_item.cpp:48
+#: pcbnew/cleanup_item.cpp:49
+msgid "Remove via shorting two nets"
+msgstr "删除短路两个网络的过孔"
+
+#: pcbnew/cleanup_item.cpp:50
 msgid "Remove redundant via"
 msgstr "删除多余的通孔"
 
-#: pcbnew/cleanup_item.cpp:49
+#: pcbnew/cleanup_item.cpp:51
 msgid "Remove duplicate track"
 msgstr "删除重复的布线"
 
-#: pcbnew/cleanup_item.cpp:50
+#: pcbnew/cleanup_item.cpp:52
 msgid "Merge co-linear tracks"
 msgstr "合并共线布线"
 
-#: pcbnew/cleanup_item.cpp:51
-msgid "Remove dangling track"
-msgstr "删除悬空的布线"
-
-#: pcbnew/cleanup_item.cpp:52
-msgid "Remove dangling via"
-msgstr "删除悬空的通孔"
-
 #: pcbnew/cleanup_item.cpp:53
+msgid "Remove track not connected at both ends"
+msgstr "删除未连接端的布线"
+
+#: pcbnew/cleanup_item.cpp:54
+msgid "Remove via connected on fewer than two layers"
+msgstr "删除连接在两层以下的过孔"
+
+#: pcbnew/cleanup_item.cpp:55
 msgid "Remove zero-length track"
 msgstr "删除零长度布线"
 
-#: pcbnew/cleanup_item.cpp:54
+#: pcbnew/cleanup_item.cpp:56
 msgid "Remove track inside pad"
 msgstr "删除焊盘内的轨道"
 
-#: pcbnew/cleanup_item.cpp:57
+#: pcbnew/cleanup_item.cpp:59
 msgid "Remove zero-size graphic"
 msgstr "删除零尺寸图形"
 
-#: pcbnew/cleanup_item.cpp:58
+#: pcbnew/cleanup_item.cpp:60
 msgid "Remove duplicated graphic"
 msgstr "删除重复的图形"
 
-#: pcbnew/cleanup_item.cpp:59
+#: pcbnew/cleanup_item.cpp:61
 msgid "Convert lines to rectangle"
 msgstr "将直线转换为矩形"
 
-#: pcbnew/cleanup_item.cpp:63
+#: pcbnew/cleanup_item.cpp:65
 msgid "Unknown cleanup action"
 msgstr "未知的清除操作"
 
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:494
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:704
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:491
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:697
 #, c-format
-msgid "Unable to find segment with an endpoint of (%s, %s)."
-msgstr "无法找到端点为 (%s, %s) 的线段。"
+msgid "Unable to find edge with an endpoint of (%s, %s)."
+msgstr "无法找到端点为 (%s, %s) 的边。"
+
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:788
+msgid "No edges found on Edge.Cuts layer."
+msgstr "在电路板边框轮廓层上找不到边框。"
 
 #: pcbnew/cross-probing.cpp:163 pcbnew/cross-probing.cpp:182
 #, c-format
@@ -18613,57 +19102,528 @@ msgstr "找到 %s"
 msgid "Selecting all from sheet \"%s\""
 msgstr "从图框 \"%s\" 中选择所有。"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:44
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:83
+msgid "Only front"
+msgstr "仅顶层"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:84
+msgid "Only back"
+msgstr "仅底部"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:85
+msgid "Only selected"
+msgstr "仅选中"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:91
+msgid "Empty"
+msgstr "空"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:92
+msgid "Invalid"
+msgstr "无效"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:93
+msgid "Excluded"
+msgstr "排除"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:118
+msgid "Reannotate PCB"
+msgstr "重新批注 PCB"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:274
+msgid "No PCB to reannotate!"
+msgstr "没有 PCB 需要重新批注！"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:285
+msgid "PCB and schematic successfully reannotated"
+msgstr "PCB 和原理图已成功重新批注"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:300
+#, c-format
+msgid ""
+"\n"
+"%s footprints will be reannotated."
+msgstr ""
+"\n"
+"%s 原理图将被重新批注。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:305
+#, c-format
+msgid ""
+"\n"
+"Any reference types %s will not be annotated."
+msgstr ""
+"\n"
+"任何引用类型 %s 都不会被批注。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:310
+msgid ""
+"\n"
+"Locked footprints will not be annotated"
+msgstr ""
+"\n"
+"锁定的封装将不会被批注"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:314
+#, c-format
+msgid ""
+"\n"
+"Front footprints will start at %s"
+msgstr ""
+"\n"
+"顶层的封装将从 %s 开始"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:323
+#, c-format
+msgid ""
+"\n"
+"Back footprints will start at %s."
+msgstr ""
+"\n"
+"底层的封装将从 %s 开始。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:324
+msgid "the last front footprint + 1"
+msgstr "最后一个顶层封装 + 1"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:332
+#, c-format
+msgid ""
+"\n"
+"Front footprints starting with '%s' will have the prefix removed."
+msgstr ""
+"\n"
+"以 '%s' 开头的顶层封装将删除前缀。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:338
+#, c-format
+msgid ""
+"\n"
+"Front footprints will have '%s' inserted as a prefix."
+msgstr ""
+"\n"
+"顶层封装将插入 '%s' 作为前缀。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:348
+#, c-format
+msgid ""
+"\n"
+"Back footprints starting with '%s' will have the prefix removed."
+msgstr ""
+"\n"
+"以 '%s' 开头的底层封装将删除前缀。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:354
+#, c-format
+msgid ""
+"\n"
+"Back footprints will have '%s' inserted as a prefix."
+msgstr ""
+"\n"
+"底层封装将插入 '%s' 作为前缀。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:362
+#, c-format
+msgid ""
+"\n"
+"Prior to sorting by %s, the coordinates of which will be rounded to a %s, %s "
+"grid. "
+msgstr ""
+"\n"
+"在按 %s 排序之前，其坐标将四舍五入为 %s, %s 网格。  "
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:364
+msgid "footprint location"
+msgstr "封装位置"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:365
+msgid "reference designator location"
+msgstr "位号位置"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:370
+msgid ""
+"\n"
+"The schematic will be updated."
+msgstr ""
+"\n"
+"原理图将被更新。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:372
+msgid ""
+"\n"
+"The schematic will not be updated."
+msgstr ""
+"\n"
+"原理图将不被更新。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:522
+#, c-format
+msgid ""
+"\n"
+"\n"
+"There are %i types of reference designations\n"
+"**********************************************************\n"
+msgstr ""
+"\n"
+"\n"
+"有 %i 种类型的参考标号。\n"
+"**********************************************************\n"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:531
+msgid ""
+"\n"
+"Excluding: "
+msgstr ""
+"\n"
+"排除： "
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:534
+msgid ""
+" from reannotation\n"
+"\n"
+msgstr ""
+" 从批注记\n"
+"\n"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:537
+msgid ""
+"\n"
+"    Change Array\n"
+"***********************\n"
+msgstr ""
+"\n"
+"    变更阵列\n"
+"***********************\n"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:543
+msgid " will be ignored"
+msgstr "  将被忽略"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:557
+msgid ""
+"\n"
+"No modules"
+msgstr ""
+"\n"
+"无模块"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:563
+#, c-format
+msgid ""
+"\n"
+"*********** Sort on %s ***********"
+msgstr ""
+"\n"
+"*********** 对 %s 排序 ***********"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:564
+msgid "Footprint Coordinates"
+msgstr "封装坐标"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:565
+msgid "Reference Designator Coordinates"
+msgstr "位号坐标"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:567
+#, c-format
+msgid ""
+"\n"
+"Sort Code %d"
+msgstr ""
+"\n"
+"排序代码 %d"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:571
+#, c-format
+msgid ""
+"\n"
+"%d %s Uuid: [%s], X, Y: %s, Rounded X, Y, %s"
+msgstr ""
+"\n"
+"%d %s UUID: [%s], X, Y: %s, 四舍五入的 X, Y, %s"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:605
+#, c-format
+msgid ""
+"\n"
+"PCB has %d empty or invalid reference designations.\n"
+"Recommend you run DRC with 'Test footprints against schematic' checked.\n"
+msgstr ""
+"\n"
+"PCB 上有 %d 个空白或无效的参考名称。\n"
+"建议您运行 DRC 并选中“根据原理图测试封装”。\n"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:611
+#, c-format
+msgid ""
+"\n"
+"RefDes: %s Module: %s:%s at %s on PCB."
+msgstr ""
+"\n"
+"参考名称：%s 模块：%s：%s，位于 PCB 上的 %s。"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:619
+msgid "Reannotate anyway?"
+msgstr "无论如何都要重新批注吗？"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:652
+msgid ""
+"\n"
+"Reannotate failed!\n"
+msgstr ""
+"\n"
+"重新批注失败！\n"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:836
+msgid "Aborted: too many errors "
+msgstr "中止：错误太多 "
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:871
+msgid ""
+"\n"
+"\n"
+"Front Modules"
+msgstr ""
+"\n"
+"\n"
+"顶层模块"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:872
+msgid ""
+"\n"
+"\n"
+"Back Modules"
+msgstr ""
+"\n"
+"\n"
+"底层模块"
+
+#: pcbnew/dialogs/dialog_board_reannotate.cpp:936
+msgid "Module not found in changelist "
+msgstr "在变更列表中找不到模块 "
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:30
+msgid "Footprint Order"
+msgstr "封装外形顺序"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:42
+msgid "Horizontally: top left to bottom right"
+msgstr "水平方向：从左上到右下"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:53
+msgid "Horizontally: top right to bottom left"
+msgstr "水平方向：从右上到左下"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:64
+msgid "Horizontally: bottom left to top right"
+msgstr "水平方向：从左下到右上"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:75
+msgid "Horizontally:: bottom right to top left"
+msgstr "水平方向：从右下到左上"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:83
+msgid "Vertically: top left to bottom right"
+msgstr "垂直方向：从左上到右下"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:94
+msgid "Vertically: top right to bottom left"
+msgstr "垂直方向：从右上到左下"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:105
+msgid "Vertically: bottom left to top right"
+msgstr "垂直方向：从左下到右上"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:116
+msgid "Vertically: bottom right to top left"
+msgstr "垂直方向：从右下到左上"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:128
+msgid "Based on location of:"
+msgstr "基于位置："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:132
+msgid "Reference Designator"
+msgstr "位号"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:138
+msgid "Round locations to:"
+msgstr "四舍五入到："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:140
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:147
+msgid ""
+"Component position will be rounded\n"
+"to this grid before sorting.\n"
+"This helps with misaligned parts."
+msgstr ""
+"元件位置将进行四舍五入。\n"
+"在排序之前添加到此网格。\n"
+"这有助于处理未对齐的元件。"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:159
+msgid "Reannotation Scope"
+msgstr "重新批注范围"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:166
+msgid "Reannotate:"
+msgstr "重新批注："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:177
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:140
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:584
+msgid "Back"
+msgstr "背面"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:186
+msgid "Update schematic"
+msgstr "更新原理图"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:208
+msgid "Front reference start:"
+msgstr "顶层工位起点："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:210
+msgid "Starting reference designation for front."
+msgstr "顶层的起始工位。"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:215
+msgid "Default is 1"
+msgstr "默认是 1"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:220
+msgid "Back reference start:"
+msgstr "底层工位起点："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:222
+msgid ""
+"Blank continues from front or enter a number greater than the highest "
+"reference designation on the front."
+msgstr "空白从前面继续，或输入大于前面最高参考名称的数字。"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:227
+msgid ""
+"Leave blank or zero, or enter a number greater than the highest reference "
+"designation on the front."
+msgstr "留空或为零，或在前面输入一个大于最高参考名称的数字。"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:232
+msgid "Remove front prefix"
+msgstr "删除顶层前缀"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:233
+msgid ""
+"If checked will remove the front side prefix\n"
+"in the front prefix box if present"
+msgstr ""
+"如果选中，将删除前面的前缀\n"
+"在前面的前缀框中（如果有）"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:237
+msgid "Remove back prefix"
+msgstr "删除底层前缀"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:238
+msgid ""
+"If checked will remove the Back side prefix\n"
+"in the back prefix box if present"
+msgstr ""
+"如果选中，将删除背面前缀\n"
+"在后面的前缀框中（如果有）"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:242
+msgid "Front prefix:"
+msgstr "顶层前缀："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:244
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:249
+msgid "Optional prefix for component side reference designations (i.e. F_)"
+msgstr "元件侧工位的可选前缀 (例如：F_)"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:253
+msgid "Back prefix:"
+msgstr "底层前缀："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:255
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:260
+msgid "Optional prefix for solder side reference designations (i.e. B_)"
+msgstr "锡膏侧参考名称的可选前缀 (例如：B_)"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:264
+msgid "Exclude locked footprints"
+msgstr "排除锁定的封装"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:265
+msgid "Locked footprints will not be reannotated"
+msgstr "锁定的封装不会被重新批注"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:269
+msgid "Exclude references:"
+msgstr "排除工位："
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.cpp:271
+msgid ""
+"Do not re-annotate this type \n"
+"of reference (R means R*)"
+msgstr ""
+"不要重新批注此类型\n"
+"参考值（R 表示 R*）"
+
+#: pcbnew/dialogs/dialog_board_reannotate_base.h:107
+msgid "Geographical Reannotation"
+msgstr "位置重新批注"
+
+#: pcbnew/dialogs/dialog_board_setup.cpp:45
 msgid "Board Setup"
 msgstr "电路板设置"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:44
+#: pcbnew/dialogs/dialog_board_setup.cpp:45
 msgid "Import Settings from Another Board..."
 msgstr "从另一个电路板导入设置..."
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:70
+#: pcbnew/dialogs/dialog_board_setup.cpp:71
 msgid "Board Stackup"
 msgstr "电路板堆叠"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:71
+#: pcbnew/dialogs/dialog_board_setup.cpp:72
 msgid "Board Editor Layers"
 msgstr "电路板板编辑器图层"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:72
+#: pcbnew/dialogs/dialog_board_setup.cpp:73
 msgid "Physical Stackup"
 msgstr "物理堆叠"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:76
+#: pcbnew/dialogs/dialog_board_setup.cpp:77
 msgid "Defaults"
 msgstr "默认"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:77
+#: pcbnew/dialogs/dialog_board_setup.cpp:78
 msgid "Text & Graphics"
 msgstr "文本与图形"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:78 pcbnew/edit_track_width.cpp:207
+#: pcbnew/dialogs/dialog_board_setup.cpp:79 pcbnew/edit_track_width.cpp:207
 #: pcbnew/edit_track_width.cpp:225
 msgid "Tracks & Vias"
 msgstr "导线和过孔"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:79
+#: pcbnew/dialogs/dialog_board_setup.cpp:80
 msgid "Solder Mask/Paste"
 msgstr "阻焊/锡膏"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:81
+#: pcbnew/dialogs/dialog_board_setup.cpp:82
 msgid "Design Rules"
 msgstr "设计规则"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:82
+#: pcbnew/dialogs/dialog_board_setup.cpp:83
 msgid "Constraints"
 msgstr "约束"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:83 pcbnew/drc/drc.cpp:207
+#: pcbnew/dialogs/dialog_board_setup.cpp:84 pcbnew/drc/drc.cpp:204
 #: qa/drc_proto/drc.cpp:206
 msgid "Rules"
 msgstr "规则"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:146
+#: pcbnew/dialogs/dialog_board_setup.cpp:150
 #, c-format
 msgid ""
 "Error importing settings from board:\n"
@@ -18672,7 +19632,7 @@ msgstr ""
 "从电路板导入设置错误：\n"
 "无法加载关联项目文件 %s"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:169 pcbnew/files.cpp:583
+#: pcbnew/dialogs/dialog_board_setup.cpp:185 pcbnew/files.cpp:575
 #, c-format
 msgid ""
 "Error loading board file:\n"
@@ -18682,17 +19642,17 @@ msgstr ""
 "%s"
 
 #: pcbnew/dialogs/dialog_board_statistics.cpp:87
-#: pcbnew/dialogs/dialog_board_statistics.cpp:691
+#: pcbnew/dialogs/dialog_board_statistics.cpp:689
 msgid "Front Side"
 msgstr "前面"
 
 #: pcbnew/dialogs/dialog_board_statistics.cpp:89
-#: pcbnew/dialogs/dialog_board_statistics.cpp:691
+#: pcbnew/dialogs/dialog_board_statistics.cpp:689
 msgid "Back Side"
 msgstr "背面"
 
 #: pcbnew/dialogs/dialog_board_statistics.cpp:91
-#: pcbnew/dialogs/dialog_board_statistics.cpp:691
+#: pcbnew/dialogs/dialog_board_statistics.cpp:689
 msgid "Total"
 msgstr "合计"
 
@@ -18705,85 +19665,81 @@ msgid "THT:"
 msgstr "直插 (THT)："
 
 #: pcbnew/dialogs/dialog_board_statistics.cpp:136
-#: pcbnew/dialogs/dialog_board_statistics.cpp:141
+#: pcbnew/dialogs/dialog_board_statistics.cpp:140
 msgid "SMD:"
 msgstr "贴片 (SMD)："
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:137
-msgid "Virtual:"
-msgstr "虚拟："
-
-#: pcbnew/dialogs/dialog_board_statistics.cpp:140
+#: pcbnew/dialogs/dialog_board_statistics.cpp:139
 msgid "Through hole:"
 msgstr "通孔："
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:142
+#: pcbnew/dialogs/dialog_board_statistics.cpp:141
 msgid "Connector:"
 msgstr "连接器："
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:143
+#: pcbnew/dialogs/dialog_board_statistics.cpp:142
 msgid "NPTH:"
 msgstr "非金属化 (NPTH)："
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:146
+#: pcbnew/dialogs/dialog_board_statistics.cpp:145
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:169
 msgid "Through vias:"
 msgstr "通孔："
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:147
+#: pcbnew/dialogs/dialog_board_statistics.cpp:146
 msgid "Blind/buried:"
 msgstr "盲孔/埋孔："
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:148
+#: pcbnew/dialogs/dialog_board_statistics.cpp:147
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:177
 msgid "Micro vias:"
 msgstr "微孔："
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:366
-#: pcbnew/dialogs/dialog_board_statistics.cpp:381
-#: pcbnew/dialogs/dialog_board_statistics.cpp:405
+#: pcbnew/dialogs/dialog_board_statistics.cpp:364
+#: pcbnew/dialogs/dialog_board_statistics.cpp:379
+#: pcbnew/dialogs/dialog_board_statistics.cpp:403
 msgid "Total:"
 msgstr "总计："
 
+#: pcbnew/dialogs/dialog_board_statistics.cpp:424
+#: pcbnew/dialogs/dialog_board_statistics.cpp:425
 #: pcbnew/dialogs/dialog_board_statistics.cpp:426
-#: pcbnew/dialogs/dialog_board_statistics.cpp:427
-#: pcbnew/dialogs/dialog_board_statistics.cpp:428
+#: pcbnew/dialogs/dialog_board_statistics.cpp:669
+#: pcbnew/dialogs/dialog_board_statistics.cpp:670
 #: pcbnew/dialogs/dialog_board_statistics.cpp:671
-#: pcbnew/dialogs/dialog_board_statistics.cpp:672
-#: pcbnew/dialogs/dialog_board_statistics.cpp:673
 msgid "unknown"
 msgstr "未知"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:456
+#: pcbnew/dialogs/dialog_board_statistics.cpp:454
 msgid "Round"
 msgstr "圆角"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:459
+#: pcbnew/dialogs/dialog_board_statistics.cpp:457
 msgid "Slot"
 msgstr "插槽"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:462
+#: pcbnew/dialogs/dialog_board_statistics.cpp:460
 msgid "???"
 msgstr "???"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:467
-#: pcbnew/dialogs/dialog_board_statistics.cpp:472
+#: pcbnew/dialogs/dialog_board_statistics.cpp:465
+#: pcbnew/dialogs/dialog_board_statistics.cpp:470
 msgid "N/A"
 msgstr "N/A"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:484
+#: pcbnew/dialogs/dialog_board_statistics.cpp:482
 msgid "PTH"
 msgstr "金属化 (PTH)"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:484
+#: pcbnew/dialogs/dialog_board_statistics.cpp:482
 msgid "NPTH"
 msgstr "非金属化 (NPTH)"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:631
+#: pcbnew/dialogs/dialog_board_statistics.cpp:629
 msgid "Save Report File"
 msgstr "保存报告文件"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:652
+#: pcbnew/dialogs/dialog_board_statistics.cpp:650
 msgid ""
 "PCB statistics report\n"
 "====================="
@@ -18791,19 +19747,19 @@ msgstr ""
 "PCB 统计报告\n"
 "====================="
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:653
+#: pcbnew/dialogs/dialog_board_statistics.cpp:651
 msgid "- Date: "
 msgstr "- 日期：  "
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:654
+#: pcbnew/dialogs/dialog_board_statistics.cpp:652
 msgid "- Project: "
 msgstr "- 工程： "
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:655
+#: pcbnew/dialogs/dialog_board_statistics.cpp:653
 msgid "- Board name: "
 msgstr "- 电路板名称： "
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:658
+#: pcbnew/dialogs/dialog_board_statistics.cpp:656
 msgid ""
 "Board\n"
 "-----"
@@ -18811,22 +19767,22 @@ msgstr ""
 "电路板\n"
 "-----"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:662
-#: pcbnew/dialogs/dialog_board_statistics.cpp:671
+#: pcbnew/dialogs/dialog_board_statistics.cpp:660
+#: pcbnew/dialogs/dialog_board_statistics.cpp:669
 msgid "- Width: "
 msgstr "- 宽度： "
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:663
-#: pcbnew/dialogs/dialog_board_statistics.cpp:672
+#: pcbnew/dialogs/dialog_board_statistics.cpp:661
+#: pcbnew/dialogs/dialog_board_statistics.cpp:670
 msgid "- Height: "
 msgstr "- 高度： "
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:664
-#: pcbnew/dialogs/dialog_board_statistics.cpp:673
+#: pcbnew/dialogs/dialog_board_statistics.cpp:662
+#: pcbnew/dialogs/dialog_board_statistics.cpp:671
 msgid "- Area: "
 msgstr "- 区域： "
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:677
+#: pcbnew/dialogs/dialog_board_statistics.cpp:675
 msgid ""
 "Pads\n"
 "----"
@@ -18834,7 +19790,7 @@ msgstr ""
 "焊盘\n"
 "----"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:683
+#: pcbnew/dialogs/dialog_board_statistics.cpp:681
 msgid ""
 "Vias\n"
 "----"
@@ -18842,7 +19798,7 @@ msgstr ""
 "过孔\n"
 "----"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:719
+#: pcbnew/dialogs/dialog_board_statistics.cpp:717
 msgid ""
 "Components\n"
 "----------"
@@ -18850,7 +19806,7 @@ msgstr ""
 "元件\n"
 "----------"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:725
+#: pcbnew/dialogs/dialog_board_statistics.cpp:723
 msgid ""
 "Drill holes\n"
 "-----------"
@@ -18858,7 +19814,7 @@ msgstr ""
 "钻孔\n"
 "-----------"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:732
+#: pcbnew/dialogs/dialog_board_statistics.cpp:730
 #, c-format
 msgid "Error writing to file \"%s\""
 msgstr "写入文件 \"%s\" 时出错"
@@ -18925,12 +19881,12 @@ msgid "Update Footprint"
 msgstr "更新封装"
 
 #: pcbnew/dialogs/dialog_cleanup_graphics.cpp:43
-#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:54
+#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:56
 #: pcbnew/dialogs/dialog_netlist.cpp:91 pcbnew/dialogs/dialog_update_pcb.cpp:73
 msgid "Update PCB"
 msgstr "更新 PCB"
 
-#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:119
+#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:113
 msgid "Graphics cleanup"
 msgstr "图形清理"
 
@@ -18958,7 +19914,7 @@ msgstr "应用变更："
 msgid "Cleanup Graphics"
 msgstr "清理图形"
 
-#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:141
+#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:149
 msgid "Board cleanup"
 msgstr "清理电路板"
 
@@ -18975,7 +19931,7 @@ msgid "remove vias on through hole pads and superimposed vias"
 msgstr "去除通孔焊盘和重叠上的过孔"
 
 #: pcbnew/dialogs/dialog_cleanup_tracks_and_vias_base.cpp:32
-msgid "Delete vias connected only on one layer"
+msgid "Delete vias connected on only one layer"
 msgstr "删除仅在一个图层上连接的过孔"
 
 #: pcbnew/dialogs/dialog_cleanup_tracks_and_vias_base.cpp:35
@@ -19006,24 +19962,24 @@ msgstr "删除在焊盘内同时具有起始位置和结束位置的布线"
 msgid "Cleanup Tracks and Vias"
 msgstr "清除布线和过孔"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:296
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:142
+#: pcbnew/dialogs/dialog_copper_zones.cpp:282
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:163
 #: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:106
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:186
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:85
 msgid "Chamfer distance:"
 msgstr "倒角距离："
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:298
+#: pcbnew/dialogs/dialog_copper_zones.cpp:284
 #: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:108
 msgid "Fillet radius:"
 msgstr "圆角半径："
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:422
+#: pcbnew/dialogs/dialog_copper_zones.cpp:402
 msgid "Thermal spoke width cannot be smaller than the minimum width."
 msgstr "热风焊盘辐射线不能小于最小宽度。"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:452
-#: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:272
+#: pcbnew/dialogs/dialog_copper_zones.cpp:430
+#: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:258
 msgid "No layer selected."
 msgstr "没有图层被选择。"
 
@@ -19056,6 +20012,7 @@ msgstr ""
 "仅显示与此模式匹配的网络名称。"
 
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:66
+#: pcbnew/widgets/appearance_controls.cpp:633
 msgid "Show all nets"
 msgstr "显示所有网络"
 
@@ -19073,16 +20030,25 @@ msgstr ""
 "形成一片无任何电\n"
 "气连接的孤铜。"
 
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:105
+msgid "Zone name:"
+msgstr "区域名称："
+
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:107
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:45
+#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:86
+msgid "A unique name for this zone to identify it for DRC"
+msgstr "此区域的唯一名称，用于在 DRC 中对其进行标识"
+
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:128
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:51
 msgid "Constrain outline to H, V and 45 degrees"
 msgstr "限制轮廓线在水平，垂直和 45 度"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:110
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:131
 msgid "Zone priority level:"
 msgstr "区域优先级："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:112
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:133
 msgid ""
 "Zones are filled by priority level, level 3 has higher priority than level "
 "2.\n"
@@ -19095,53 +20061,53 @@ msgstr ""
 "* 如果优先级较高，则其轮廓将从其他区域中删除。\n"
 "* 如果其优先级相等，则设置 DRC 错误。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:119
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:140
 #: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:68
 msgid "Outline display:"
 msgstr "轮廓显示："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:123
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:144
 #: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:58
 msgid "Fully hatched"
 msgstr "完全填充"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:132
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:153
 msgid "Corner smoothing:"
 msgstr "转角处理："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:136
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:177
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:157
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:79
 msgid "Chamfer"
 msgstr "倒角"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:136
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:177
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:157
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:79
 msgid "Fillet"
 msgstr "圆角"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:162
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:187
 msgid "Electrical Properties"
 msgstr "电气特性"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:169
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:194
 msgid "Clearance:"
 msgstr "间隙："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:180
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:58
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:205
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:64
 msgid "Minimum width:"
 msgstr "最小宽度："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:182
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:207
 msgid "Minimum thickness of filled areas."
 msgstr "填充区域最小线宽。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:193
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:227
 msgid "Pad connections:"
 msgstr "焊盘连接："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:195
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:229
 msgid ""
 "Default pad connection type to zone.\n"
 "This setting can be overridden by local  pad settings"
@@ -19149,76 +20115,67 @@ msgstr ""
 "默认焊盘与覆铜区连接类型。\n"
 "该设置可以通过本地焊盘设置覆盖"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:199
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
 msgid "Thermal reliefs"
 msgstr "防散热 (花焊盘)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:199
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
 msgid "Reliefs for PTH"
 msgstr "金属化孔 (PTH) 防散热"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:205
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:239
 msgid "Thermal clearance:"
 msgstr "花焊盘到覆铜区间隙："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:210
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:244
 msgid "Clearance between pads in the same net and filled areas."
 msgstr "在同一网中的垫片和填充区域之间进行间隙处理。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:218
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:252
 msgid "Thermal spoke width:"
 msgstr "防散热导线宽度："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:223
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:257
 msgid "Width of copper in thermal reliefs."
 msgstr "防散热 (花焊盘) 连接线的宽度。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:231
-msgid "Zone name:"
-msgstr "区域名称："
-
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:86
-msgid "A unique name for this zone to identify it for DRC"
-msgstr "此区域的唯一名称，用于在 DRC 中对其进行标识"
-
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:249
-#: pcbnew/tools/pcb_actions.cpp:1092
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:274
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:105
+#: pcbnew/tools/pcb_actions.cpp:1164
 msgid "Fill"
 msgstr "填充"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:256
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:87
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:281
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:113
 msgid "Fill type:"
 msgstr "填充类型:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:260
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:91
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:285
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:117
 msgid "Solid shape"
 msgstr "实体形状"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:260
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:91
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:285
 msgid "Hatch pattern"
 msgstr "阴影图案"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:277
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:111
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:302
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:137
 msgid "Hatch width:"
 msgstr "阴影宽度："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:288
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:122
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:313
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:148
 msgid "Hatch gap:"
 msgstr "阴影间隙："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:299
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:133
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:324
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:159
 msgid "Smoothing effort:"
 msgstr "平滑效果："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:301
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:135
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:326
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:161
 msgid ""
 "Value of smoothing effort\n"
 "0 = no smoothing\n"
@@ -19232,13 +20189,12 @@ msgstr ""
 "2 = 圆角\n"
 "3 = 圆角 (更精细)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:308
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:145
-msgid "Smooth value (0..1):"
-msgstr "平滑值 (0..1):"
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:333
+msgid "Smoothing amount:"
+msgstr "平滑量："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:310
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:147
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:335
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:173
 msgid ""
 "Ratio between smoothed corners size and the gap between lines\n"
 "0 = no smoothing\n"
@@ -19248,51 +20204,51 @@ msgstr ""
 "0 = 无平滑\n"
 "1.0 = 最大径向/倒角大小 (半间隙值)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:318
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:343
 msgid "Remove islands:"
 msgstr "删除孤铜："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:320
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:345
 msgid "Choose what to do with unconnected copper islands"
 msgstr "选择如何处理未连接的孤铜"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:324
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
 #: pcbnew/dialogs/panel_edit_options_base.cpp:100
 #: pcbnew/dialogs/panel_edit_options_base.cpp:114
 #: pcbnew/dialogs/panel_edit_options_base.cpp:128
 msgid "Always"
 msgstr "总是"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:324
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
 #: pcbnew/dialogs/panel_edit_options_base.cpp:100
 #: pcbnew/dialogs/panel_edit_options_base.cpp:114
 #: pcbnew/dialogs/panel_edit_options_base.cpp:128
 msgid "Never"
 msgstr "从不"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:324
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
 msgid "Below area limit"
 msgstr "低于区域限制"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:330
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:355
 msgid "Minimum island size:"
 msgstr "最小孤铜尺寸："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:333
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:358
 msgid "Isolated islands smaller than this will be removed"
 msgstr "小于此的孤铜将被移除"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:362
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:387
 msgid "Export Settings to Other Zones"
 msgstr "导出设置到其他区域"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:363
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:388
 msgid ""
 "Export this zone setup (excluding layer and net selection) to all other "
 "copper zones."
 msgstr "导出该区域设置 (除层和网络选择) 到所有其它铜区。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.h:141
+#: pcbnew/dialogs/dialog_copper_zones_base.h:144
 msgid "Copper Zone Properties"
 msgstr "铜区属性"
 
@@ -19312,39 +20268,39 @@ msgstr "除 IOSQXY 以外的英文字母"
 msgid "Alphabet, full 26 characters"
 msgstr "全部英文字母"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:251
+#: pcbnew/dialogs/dialog_create_array.cpp:259
 #, c-format
 msgid "Bad numeric value for %s: %s"
 msgstr "%s 的值不是有效的数字：%s"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:289
+#: pcbnew/dialogs/dialog_create_array.cpp:297
 #, c-format
 msgid ""
 "Could not determine numbering start from \"%s\": expected value consistent "
 "with alphabet \"%s\""
 msgstr "无法确定由 \"%s\" 开关的编号：期望值与字母表一致的 \"%s\""
 
-#: pcbnew/dialogs/dialog_create_array.cpp:297
+#: pcbnew/dialogs/dialog_create_array.cpp:305
 msgid "step value"
 msgstr "脉冲值"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:319
+#: pcbnew/dialogs/dialog_create_array.cpp:327
 msgid "horizontal count"
 msgstr "水平计数"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:320
+#: pcbnew/dialogs/dialog_create_array.cpp:328
 msgid "vertical count"
 msgstr "垂直计数"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:328
+#: pcbnew/dialogs/dialog_create_array.cpp:336
 msgid "stagger"
 msgstr "交错"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:383
+#: pcbnew/dialogs/dialog_create_array.cpp:391
 msgid "point count"
 msgstr "点计数"
 
-#: pcbnew/dialogs/dialog_create_array.cpp:427
+#: pcbnew/dialogs/dialog_create_array.cpp:435
 msgid "Bad parameters"
 msgstr "参数不良或丢失"
 
@@ -19352,16 +20308,6 @@ msgstr "参数不良或丢失"
 msgid "Horizontal count:"
 msgstr "水平(X)方向计数："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:35
-#: pcbnew/dialogs/dialog_create_array_base.cpp:42
-#: pcbnew/dialogs/dialog_create_array_base.cpp:49
-#: pcbnew/dialogs/dialog_create_array_base.cpp:60
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:53
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:112
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:173
-msgid "5"
-msgstr "5"
-
 #: pcbnew/dialogs/dialog_create_array_base.cpp:38
 msgid "Vertical count:"
 msgstr "垂直(Y)方向计数："
@@ -19386,20 +20332,6 @@ msgstr "垂直偏移："
 msgid "Stagger:"
 msgstr "交错："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:93
-#: pcbnew/dialogs/dialog_create_array_base.cpp:163
-#: pcbnew/dialogs/dialog_create_array_base.cpp:168
-#: pcbnew/dialogs/dialog_create_array_base.cpp:177
-#: pcbnew/dialogs/dialog_create_array_base.cpp:182
-#: pcbnew/dialogs/dialog_create_array_base.cpp:306
-#: pcbnew/dialogs/dialog_create_array_base.cpp:313
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1289
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:49
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:108
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:169
-msgid "1"
-msgstr "1"
-
 #: pcbnew/dialogs/dialog_create_array_base.cpp:96
 msgid "Rows"
 msgstr "行"
@@ -19486,15 +20418,15 @@ msgid "Vertical center:"
 msgstr "垂直居中："
 
 #: pcbnew/dialogs/dialog_create_array_base.cpp:229
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1146
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1165
 msgid "Radius:"
 msgstr "半径："
 
 #: pcbnew/dialogs/dialog_create_array_base.cpp:241
-#: pcbnew/dialogs/dialog_move_exact.cpp:199
+#: pcbnew/dialogs/dialog_move_exact.cpp:203
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:120
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:331
-#: pcbnew/dialogs/dialog_position_relative.cpp:157
+#: pcbnew/dialogs/dialog_position_relative.cpp:161
 msgid "Angle:"
 msgstr "角度："
 
@@ -19508,14 +20440,6 @@ msgstr "正角表示一个逆时针旋转。 0° 角将产生一个平分到“
 msgid "Count:"
 msgstr "个数："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:258
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:52
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:111
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:172
-msgid "4"
-msgstr "4"
-
 #: pcbnew/dialogs/dialog_create_array_base.cpp:259
 msgid "How many items in the array."
 msgstr "阵列中有多少个项目。"
@@ -19551,25 +20475,24 @@ msgstr "创建阵列"
 msgid "Run DRC"
 msgstr "运行 DRC"
 
-#: pcbnew/dialogs/dialog_drc.cpp:246
-#, c-format
-msgid ""
-"Item not currently visible.\n"
-"Show the '%s' layer?"
-msgstr ""
-"该项目当前不可见。\n"
-"显示 \"%s\" 层？"
-
-#: pcbnew/dialogs/dialog_drc.cpp:328
+#: pcbnew/dialogs/dialog_drc.cpp:356
 msgid "Open the Board Setup... dialog"
 msgstr "打开“电路板设置...”对话框"
 
-#: pcbnew/dialogs/dialog_drc.cpp:649
+#: pcbnew/dialogs/dialog_drc.cpp:660
+msgid "Do you wish to delete excluded markers as well?"
+msgstr "是否也要删除排除的标记？"
+
+#: pcbnew/dialogs/dialog_drc.cpp:663
+msgid "Delete exclusions"
+msgstr "删除排除项"
+
+#: pcbnew/dialogs/dialog_drc.cpp:700
 msgid "not run"
 msgstr "不运行"
 
 #: pcbnew/dialogs/dialog_drc_base.cpp:33
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:167
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:194
 msgid "Minimum track width:"
 msgstr "最小布线宽度："
 
@@ -19657,67 +20580,40 @@ msgstr "删除标记"
 msgid "DRC Control"
 msgstr "DRC 控制"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:284
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:292
 msgid ""
 "Component can be freely moved and auto placed. User can arbitrarily select "
 "and edit component's pads."
 msgstr "元件可以自由移动和自动放置。用户可以任意选择和编辑元件的焊盘。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:286
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:294
 msgid ""
 "Component can be freely moved and auto placed, but its pads cannot be "
 "selected or edited."
 msgstr "元件可以自由移动和自动放置，但其焊盘不能被选择或编辑。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:288
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:296
 msgid "Component is locked: it cannot be freely moved or auto placed."
 msgstr "元件被锁定：它不能被自由移动和自动放置。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:294
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:226
-msgid ""
-"Use this attribute for most non SMD footprints\n"
-"Footprints with this option are not put in the footprint position list file"
-msgstr ""
-"对于大多数非贴片封装使用此属性\n"
-"使有此选项的封装不会放置在封装位置列表文件中"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:296
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:228
-msgid ""
-"Use this attribute for SMD footprints.\n"
-"Only footprints with this option are put in the footprint position list file"
-msgstr ""
-"贴片元件使用该属性\n"
-"只有使用此选项的元件放在封装位置列表文件"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:298
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:230
-msgid ""
-"Use this attribute for \"virtual\" footprints drawn on board\n"
-"such as an edge connector (old ISA PC bus for instance)"
-msgstr ""
-"该属性适用于绘制电路板上的 \"虚拟\" 封装\n"
-" 例如电路板插头<金手指>(如老式的 ISA PC 总线)"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:431
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:373
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:435
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:371
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "无效的文件名：%s"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:589
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:564
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:593
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:562
 msgid "Text items must have some content."
 msgstr "文本项必须包含一些内容。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:733
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:694
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:741
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:696
 msgid "Modify module properties"
 msgstr "修改模块属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:785
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:765
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:793
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:767
 msgid "Reference and value are mandatory."
 msgstr "参考和值是强制的。"
 
@@ -19753,7 +20649,7 @@ msgstr "Y 偏移"
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:53
 #: pcbnew/text_mod_grid_table.cpp:108
 msgid "Reference designator"
-msgstr "参考标识符"
+msgstr "位号"
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:105
 msgid "Position"
@@ -19763,11 +20659,6 @@ msgstr "坐标"
 msgid "Side:"
 msgstr "侧面："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:140
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:584
-msgid "Back"
-msgstr "背面"
-
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:163
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:186
 msgid "0.0"
@@ -19827,7 +20718,7 @@ msgid "Update Footprint from Library..."
 msgstr "从库中更新封装..."
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:252
-#: pcbnew/tools/pcb_actions.cpp:358
+#: pcbnew/tools/pcb_actions.cpp:387
 msgid "Change Footprint..."
 msgstr "修改封装..."
 
@@ -19835,55 +20726,75 @@ msgstr "修改封装..."
 msgid "Edit Library Footprint..."
 msgstr "编辑库封装..."
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:270
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:177
-msgid "Through hole"
-msgstr "通孔"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:270
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:177
-msgid "Surface mount"
-msgstr "表面贴装"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:272
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:179
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:271
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:178
 msgid "Fabrication Attributes"
 msgstr "制造属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:292
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:276
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:183
+msgid "Component:"
+msgstr "元件："
+
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:280
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:187
+msgid "Through hole"
+msgstr "通孔"
+
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:280
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:187
+msgid "Other"
+msgstr "其它"
+
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:289
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:196
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:588
+msgid "Not in schematic"
+msgstr "不在原理图中"
+
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:292
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:199
+msgid "Exclude from position files"
+msgstr "从位置文件中排除"
+
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:295
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:202
+msgid "Exclude from BOM"
+msgstr "从 BOM 中排除"
+
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:317
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:221
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:580
 msgid "Clearances"
 msgstr "间隙"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:294
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:319
 msgid "Set values to 0 to use Board Setup values."
 msgstr "设置值为 0，使用电路板设置值。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:300
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:204
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:597
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:23
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:325
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:229
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:589
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:54
 msgid ""
 "Positive clearance means area bigger than the pad (usual for mask clearance)."
 msgstr "正间隙指的是比焊盘大的区域（通常为阻焊间隙）"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:306
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:210
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:603
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:29
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:331
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:235
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:595
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:69
 msgid ""
 "Negative clearance means area smaller than the pad (usual for paste "
 "clearance)."
 msgstr "负间隙指的是比焊盘小的区域（通常为锡膏间隙）"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:318
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:222
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:615
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:343
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:247
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:607
 msgid "Pad clearance:"
 msgstr "焊盘间隙："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:320
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:345
 msgid ""
 "This is the local net clearance for all pad of this footprint\n"
 "If 0, the Netclass values are used\n"
@@ -19893,14 +20804,14 @@ msgstr ""
 "如果为 0, 即使用网络类值\n"
 "这个值可以被局部值所取代。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:331
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:235
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:628
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:59
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:356
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:260
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:620
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:47
 msgid "Solder mask clearance:"
 msgstr "阻焊间隙："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:333
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:358
 msgid ""
 "This is the local clearance between pads and the solder mask for this "
 "footprint.\n"
@@ -19911,14 +20822,14 @@ msgstr ""
 "这个值可以被焊盘局部值所取代。\n"
 "如果为0时，使用全局设置值。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:344
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:248
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:641
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:94
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:369
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:273
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:633
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:86
 msgid "Solder paste absolute clearance:"
 msgstr "焊膏绝对间隙："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:346
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:371
 msgid ""
 "This is the local clearance between pads and the solder paste for this "
 "footprint.\n"
@@ -19932,14 +20843,14 @@ msgstr ""
 "最终间隙值是此值与间隙值比率的总和\n"
 "负值表示比焊盘尺寸更小的阻焊尺寸。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:357
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:261
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:654
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:107
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:382
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:286
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:646
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:99
 msgid "Solder paste relative clearance:"
 msgstr "焊膏相对间隙："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:359
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:384
 msgid ""
 "This is the local clearance ratio in percent between pads and the solder "
 "paste for this footprint.\n"
@@ -19954,90 +20865,88 @@ msgstr ""
 "最终间隙值是该值与间隙值的总和。\n"
 "负值意味着比焊盘尺寸更小的阻焊尺寸。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:373
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:277
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:676
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:704
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:126
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:398
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:302
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:668
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:696
 msgid ""
 "Note: solder mask and paste values are used only for pads on copper layers."
 msgstr "注意：阻焊和锡膏值仅适用于铜层上的焊盘。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:379
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:283
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:682
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:132
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:404
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:308
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:674
 msgid ""
 "Note: solder paste clearances (absolute and relative) are added to determine "
 "the final clearance."
 msgstr "注意：添加焊膏间隙（绝对和相对）以确定最终间隙。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:389
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:293
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:721
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:414
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:318
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:713
 msgid "Connection to Copper Zones"
 msgstr "连接到铜区"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:391
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:295
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:416
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:320
 msgid "Pad connection to zones:"
 msgstr "焊盘连接到铜区："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:395
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:299
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:420
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:324
 msgid "Use zone setting"
 msgstr "使用区域设置"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:395
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:299
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:733
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:420
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:324
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:725
 msgid "Thermal relief"
 msgstr "防散热 (花焊盘)"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:408
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:312
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:787
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:433
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:337
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:779
 msgid "Local Clearance and Settings"
 msgstr "局部间隙和设置"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:430
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:334
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:455
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:359
 msgid "3D Model(s)"
 msgstr "3D 模型"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:483
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:385
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:508
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:410
 msgid "3D Settings"
 msgstr "3D 设置"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:496
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:521
 msgid "Library link:"
 msgstr "库链接："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:504
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:529
 msgid ""
 "The library ID and footprint ID currently assigned.  Use “Change Footprint…” "
 "to assign a different footprint."
 msgstr "当前分配的库 ID 和封装 ID。使用“更改封装…”来分配不同的封装。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h:144
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h:119
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h:149
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h:124
 msgid "Footprint Properties"
 msgstr "封装属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:220
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:222
 msgid "Enable hotkey move commands and Auto Placement"
 msgstr "允许快捷键移动和自动布局"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:221
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:223
 msgid "Disable hotkey move commands and Auto Placement"
 msgstr "不允许快捷键移动和自动布局"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:518
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:516
 msgid "Footprint must have a name."
 msgstr "封装必须要有一个名称。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:523
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:521
 #, c-format
 msgid "Footprint name may not contain \"%s\"."
 msgstr "封装名称可能不包含\"%s\"。"
@@ -20050,11 +20959,11 @@ msgstr "无约束的"
 msgid "Footprint name:"
 msgstr "封装名称："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:198
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:223
 msgid "Set values to 0 to use netclass values."
 msgstr "设置值为 0，使用网络类值。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:224
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:249
 msgid ""
 "This is the local net clearance for all pads of this footprint.\n"
 "If 0, the Netclass values are used.\n"
@@ -20065,7 +20974,7 @@ msgstr ""
 "如果为 0, 即使用网络类值\n"
 "在焊盘属性的局部间隙和设置 选项卡中，可以覆盖此值。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:237
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:262
 msgid ""
 "This is the local clearance between pads and the solder mask for \n"
 "this footprint.\n"
@@ -20077,7 +20986,7 @@ msgstr ""
 "如果为 0 时，使用全局设置值。\n"
 "在焊盘属性的局部间隙和设置 选项卡中，可以覆盖此值。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:250
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:275
 msgid ""
 "This is the local clearance between pads and the solder paste for\n"
 "this footprint.\n"
@@ -20094,7 +21003,7 @@ msgstr ""
 "该值可以在本地的一个 PAD-by-PAD 基础上重写。\n"
 "焊盘属性的“间隙和设置”选项卡。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:263
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:288
 msgid ""
 "This is the local clearance ratio in percent between pads and the\n"
 "solder paste for this footprint.\n"
@@ -20127,25 +21036,20 @@ msgstr "第一个焊盘编号："
 msgid "Pad Enumeration Settings"
 msgstr "焊盘枚举设置"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:68
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:69
 msgid "Update Footprints from Library"
 msgstr "从库中更新封装"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:68
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:69
 msgid "Change Footprints"
 msgstr "修改封装"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:69
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:359
-msgid "Change"
-msgstr "修改"
-
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:358
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:361
 #, c-format
 msgid "%s footprint \"%s\" (from \"%s\") to \"%s\""
 msgstr "%s 封装 \"%s\" (从 \"%s\")更改为 \"%s\""
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:368
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:371
 msgid "*** footprint not found ***"
 msgstr "***封装没有找到***"
 
@@ -20162,7 +21066,7 @@ msgstr "%s 选择封装"
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:30
 #, c-format
 msgid "%s footprints matching reference designator:"
-msgstr "%s 封装匹配的参考指示符："
+msgstr "%s 封装匹配的位号："
 
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:38
 #, c-format
@@ -20199,14 +21103,13 @@ msgid "Reset text sizes, styles and positions"
 msgstr "重置文本尺寸，样式和位置"
 
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:107
+msgid "Reset fabrication attributes"
+msgstr "重置制造属性"
+
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:110
 msgid "Reset 3D models"
 msgstr "重置 3D 模型"
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.h:85
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: pcbnew/dialogs/dialog_export_idf.cpp:164
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:119
 #, c-format
@@ -20367,12 +21270,12 @@ msgid "Export STEP"
 msgstr "导出 STEP"
 
 #: pcbnew/dialogs/dialog_export_svg.cpp:204
-#: pcbnew/exporters/gen_footprints_placefile.cpp:184
+#: pcbnew/exporters/gen_footprints_placefile.cpp:192
 msgid "Use a relative path?"
 msgstr "是否使用相对路径？"
 
 #: pcbnew/dialogs/dialog_export_svg.cpp:214
-#: pcbnew/exporters/gen_footprints_placefile.cpp:193
+#: pcbnew/exporters/gen_footprints_placefile.cpp:201
 msgid ""
 "Cannot make path relative (target volume different from board file volume)!"
 msgstr "无法使用相对路径（目标卷不同于电路板文件卷）"
@@ -20382,9 +21285,9 @@ msgstr "无法使用相对路径（目标卷不同于电路板文件卷）"
 msgid "Exported \"%s\"."
 msgstr "输出 \"%s\"。"
 
-#: pcbnew/dialogs/dialog_export_svg.cpp:269 pcbnew/dialogs/dialog_plot.cpp:878
-#: pcbnew/exporters/gen_footprints_placefile.cpp:285
-#: pcbnew/exporters/gen_footprints_placefile.cpp:434
+#: pcbnew/dialogs/dialog_export_svg.cpp:269 pcbnew/dialogs/dialog_plot.cpp:882
+#: pcbnew/exporters/gen_footprints_placefile.cpp:293
+#: pcbnew/exporters/gen_footprints_placefile.cpp:429
 #, c-format
 msgid "Unable to create file \"%s\"."
 msgstr "无法创建文件 \"%s\"。"
@@ -20398,14 +21301,15 @@ msgstr ""
 "仅限当前图框打印"
 
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:51
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:257
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:496
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:266
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:32
 msgid "Copper layers:"
 msgstr "铜层："
 
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:65
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:515
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:266
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:507
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:276
 msgid "Technical layers:"
 msgstr "工艺层："
 
@@ -20470,7 +21374,7 @@ msgid "All layers in a single file"
 msgstr "所有层在单文件中"
 
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:128
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:235
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:240
 msgid "Pagination"
 msgstr "页码"
 
@@ -20686,8 +21590,8 @@ msgstr ""
 "只创建一个包含所有封装放置文件\n"
 
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:76
-msgid "Include footprints with SMD pads even if not marked Surface Mount"
-msgstr "包括带有贴片焊盘的封装，即使没有标记表面安装"
+msgid "Exclude all footprints with through hole pads"
+msgstr "排除具有通孔焊盘的所有封装"
 
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:79
 msgid "Include board edge layer"
@@ -20735,6 +21639,10 @@ msgstr "生成钻孔文件"
 msgid "Generate Map File"
 msgstr "生成图文件"
 
+#: pcbnew/dialogs/dialog_gendrill.cpp:316
+msgid "Cannot make path relative (target volume different from file volume)!"
+msgstr "不能进行相对路径（目标卷从文件卷不同）！"
+
 #: pcbnew/dialogs/dialog_gendrill.cpp:386
 #, c-format
 msgid "Could not write drill and/or map files to folder \"%s\"."
@@ -20791,7 +21699,7 @@ msgid ""
 "Only use it for board houses which do not accept fully featured headers."
 msgstr ""
 "不推荐。\n"
-"仅用于没有全品类钻头的板厂。"
+"仅用于没有全品类钻头的电路板厂。"
 
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:64
 msgid "PTH and NPTH in single file"
@@ -20804,7 +21712,7 @@ msgid ""
 "file."
 msgstr ""
 "不推荐。\n"
-"仅用于要求将金属化孔 (PTH) 和非金属化孔 (NPTH) 合并为单个文件的板厂。"
+"仅用于要求将金属化孔 (PTH) 和非金属化孔 (NPTH) 合并为单个文件的电路板厂。"
 
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:69
 msgid "Use route command (recommended)"
@@ -20825,7 +21733,7 @@ msgid ""
 " \"Use alternate mode\" uses another drill/ route command (G85)\n"
 "(Use it only if the recommended command does not work)"
 msgstr ""
-"椭圆形孔经常给板厂造成问题。\n"
+"椭圆形孔经常给电路板厂造成问题。\n"
 "“使用路径命令”使用通常的 G00 路径命令（推荐）\n"
 "  “使用备用模式”使用另一个钻孔/路径命令（G85）\n"
 "（仅在推荐的命令不起作用时使用它）"
@@ -20869,8 +21777,8 @@ msgid "Drill Units"
 msgstr "钻孔单位"
 
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:114
-msgid "Decimal format (recommanded)"
-msgstr "十进制格式（重新命令）"
+msgid "Decimal format (recommended)"
+msgstr "十进制格式(推荐)"
 
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:114
 msgid "Suppress leading zeros"
@@ -20925,7 +21833,7 @@ msgstr "生成钻孔文件"
 #: pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp:28
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:66
 msgid "Reference designator:"
-msgstr "参考标识符："
+msgstr "位号："
 
 #: pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp:35
 msgid "(specify multiple items separated by spaces for successive placement)"
@@ -20936,7 +21844,7 @@ msgid "Available:"
 msgstr "可用："
 
 #: pcbnew/dialogs/dialog_get_footprint_by_name_base.h:56
-#: pcbnew/tools/pcb_actions.cpp:192
+#: pcbnew/tools/pcb_actions.cpp:219
 msgid "Get and Move Footprint"
 msgstr "获取和移动封装"
 
@@ -20953,7 +21861,8 @@ msgid "Items to Delete:"
 msgstr "删除项："
 
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:25
-#: pcbnew/tools/pcb_editor_control.cpp:74
+#: pcbnew/tools/pcb_editor_control.cpp:76
+#: pcbnew/widgets/appearance_controls.cpp:288
 msgid "Zones"
 msgstr "覆铜"
 
@@ -21112,6 +22021,7 @@ msgstr "按父级封装库 ID 筛选项目："
 
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:100
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:87
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:41
 msgid "Action"
 msgstr "活动"
 
@@ -21217,32 +22127,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:164
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:174
 msgid "Circle Properties"
 msgstr "圆属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:171
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:182
 msgid "Arc Properties"
 msgstr "圆弧属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:173
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:184
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:29
 msgid "Start Point"
 msgstr "起始点"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:179
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:190
 msgid "Polygon Properties"
 msgstr "多边形属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:184
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:195
 msgid "Rectangle Properties"
 msgstr "矩形属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:193
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:204
 msgid "Line Segment Properties"
 msgstr "线段属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:236
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:247
 msgid ""
 "This item was on a non-existing or forbidden layer.\n"
 "It has been moved to the first allowed layer. Please fix it."
@@ -21250,23 +22160,23 @@ msgstr ""
 "此项目在一个禁止层或不存在的层\n"
 "已经将它移动到第一个允许的层。请修复它。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:310
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:321
 msgid "Modify drawing properties"
 msgstr "修改图形属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:331
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:342
 msgid "The arc angle cannot be zero."
 msgstr "圆弧角度不能为 0。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:338
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:349
 msgid "The radius must be greater than zero."
 msgstr "半径必须大于 0。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:344
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:355
 msgid "The rectangle can not be empty."
 msgstr "矩形不能为空。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:360
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:371
 msgid "Error List"
 msgstr "错误列表"
 
@@ -21287,6 +22197,11 @@ msgstr "圆弧角度："
 msgid "Graphic Item Properties"
 msgstr "图形项属性"
 
+#: pcbnew/dialogs/dialog_import_settings.cpp:51
+#: pcbnew/dialogs/dialog_import_settings.cpp:100
+msgid "Deselect All"
+msgstr "取消所有"
+
 #: pcbnew/dialogs/dialog_import_settings_base.cpp:48
 msgid "Layers setup"
 msgstr "层设置"
@@ -21307,11 +22222,11 @@ msgstr "预定义的布线和通孔尺寸"
 msgid "Solder mask/paste defaults"
 msgstr "阻焊/锡膏默认值"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:163
+#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:157
 msgid "Tracks, vias, and pads are allowed. The keepout will have no effect."
 msgstr "允许导线，过孔和焊盘，该禁布区无效。"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:169
+#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:163
 msgid "No layers selected."
 msgstr "没有选择层。"
 
@@ -21367,40 +22282,40 @@ msgstr "选择层"
 msgid "Select Copper Layer Pair"
 msgstr "选择铜层对"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:95
+#: pcbnew/dialogs/dialog_move_exact.cpp:99
 msgid "Rotate around item anchor"
 msgstr "围绕锚点选择"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:98
+#: pcbnew/dialogs/dialog_move_exact.cpp:102
 msgid "Rotate around selection center"
 msgstr "围绕选择中心旋转"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:101
+#: pcbnew/dialogs/dialog_move_exact.cpp:105
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:69
 msgid "Rotate around local coordinates origin"
 msgstr "围绕本地坐标原点旋转"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:104
+#: pcbnew/dialogs/dialog_move_exact.cpp:108
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:69
 msgid "Rotate around drill/place origin"
 msgstr "围绕钻孔/原点选择"
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:198
-#: pcbnew/dialogs/dialog_position_relative.cpp:156
+#: pcbnew/dialogs/dialog_move_exact.cpp:202
+#: pcbnew/dialogs/dialog_position_relative.cpp:160
 msgid "Distance:"
 msgstr "距离："
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:204
+#: pcbnew/dialogs/dialog_move_exact.cpp:208
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:24
 msgid "Move X:"
 msgstr "移动 X："
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:205
+#: pcbnew/dialogs/dialog_move_exact.cpp:209
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:38
 msgid "Move Y:"
 msgstr "移动 Y："
 
-#: pcbnew/dialogs/dialog_move_exact.cpp:283
+#: pcbnew/dialogs/dialog_move_exact.cpp:287
 msgid ""
 "Invalid movement values.  Movement would place selection outside of the "
 "maximum board area."
@@ -21441,7 +22356,7 @@ msgid ""
 msgstr "所做的更改不能撤销。你确定要更新 PCB 吗？"
 
 #: pcbnew/dialogs/dialog_netlist.cpp:169
-#: pcbnew/dialogs/dialog_update_pcb.cpp:146
+#: pcbnew/dialogs/dialog_update_pcb.cpp:145
 msgid "Changes Applied To PCB"
 msgstr "更改应用于 PCB"
 
@@ -21460,7 +22375,7 @@ msgstr "读取网表文件 \"%s\"\n"
 
 #: pcbnew/dialogs/dialog_netlist.cpp:281
 msgid "Using reference designators to match components and footprints.\n"
-msgstr "使用参考标识符来匹配元件和封装。\n"
+msgstr "使用位号来匹配元件和封装。\n"
 
 #: pcbnew/dialogs/dialog_netlist.cpp:283
 msgid "Using tstamps (unique IDs) to match components and footprints.\n"
@@ -21476,7 +22391,7 @@ msgstr "使用元件时间戳（唯一ID）链接封装"
 
 #: pcbnew/dialogs/dialog_netlist_base.cpp:43
 msgid "Link footprints using reference designators"
-msgstr "使用参考指示符链接封装"
+msgstr "使用位号链接封装"
 
 #: pcbnew/dialogs/dialog_netlist_base.cpp:45
 msgid "Link Method"
@@ -21533,27 +22448,27 @@ msgstr "读取当前的网表文件并列出丢失和额外的封装"
 msgid "Import Netlist"
 msgstr "导入网表"
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:48
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:54
 msgid "Outline style:"
 msgstr "轮廓样式："
 
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:75
-msgid "Grid Style:"
-msgstr "网格样式："
-
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:107
-msgid "degree"
-msgstr "程度"
-
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:161
-msgid "Zone Outline Smooth:"
-msgstr "区域轮廓平滑:"
-
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:173
 msgid "Outline smooth:"
 msgstr "轮廓平滑："
 
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.h:86
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:117
+msgid "HatchBorder pattern"
+msgstr "填充边框图案"
+
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:133
+msgid "degree"
+msgstr "程度"
+
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:171
+msgid "Smooth amount:"
+msgstr "平滑量："
+
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.h:83
 msgid "Non Copper Zones Properties"
 msgstr "非铜区属性"
 
@@ -21589,118 +22504,121 @@ msgstr "选择一个角落后添加新的拐角。"
 msgid "Select a corner to delete."
 msgstr "选择要删除的拐角。"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:468
-#: pcbnew/dialogs/dialog_text_properties.cpp:441
-msgid "back side (mirrored)"
-msgstr "背面(镜像)"
-
-#: pcbnew/dialogs/dialog_pad_properties.cpp:468
-#: pcbnew/dialogs/dialog_text_properties.cpp:441
-msgid "front side"
-msgstr "正面"
-
-#: pcbnew/dialogs/dialog_pad_properties.cpp:469
+#: pcbnew/dialogs/dialog_pad_properties.cpp:479
 #, c-format
 msgid "Footprint %s (%s),"
 msgstr "封装 %s(%s),"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:470
+#: pcbnew/dialogs/dialog_pad_properties.cpp:482
 #, c-format
 msgid "%s, rotated %.1f deg"
 msgstr "%s，旋转 %.1f 度"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:701
+#: pcbnew/dialogs/dialog_pad_properties.cpp:483
+#: pcbnew/dialogs/dialog_text_properties.cpp:445
+msgid "back side (mirrored)"
+msgstr "背面(镜像)"
+
+#: pcbnew/dialogs/dialog_pad_properties.cpp:484
+#: pcbnew/dialogs/dialog_text_properties.cpp:445
+msgid "front side"
+msgstr "正面"
+
+#: pcbnew/dialogs/dialog_pad_properties.cpp:714
 msgid "width "
 msgstr "宽度 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:707
-#: pcbnew/dialogs/dialog_pad_properties.cpp:713
+#: pcbnew/dialogs/dialog_pad_properties.cpp:720
+#: pcbnew/dialogs/dialog_pad_properties.cpp:726
 msgid "from "
 msgstr "来自 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:708
-#: pcbnew/dialogs/dialog_pad_properties.cpp:714
+#: pcbnew/dialogs/dialog_pad_properties.cpp:721
+#: pcbnew/dialogs/dialog_pad_properties.cpp:727
 msgid "to "
 msgstr "到 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:719
+#: pcbnew/dialogs/dialog_pad_properties.cpp:732
 msgid "center "
 msgstr "中心 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:720
+#: pcbnew/dialogs/dialog_pad_properties.cpp:733
 msgid "start "
 msgstr "开始 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:721
+#: pcbnew/dialogs/dialog_pad_properties.cpp:734
 msgid "angle "
 msgstr "角度 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:726
+#: pcbnew/dialogs/dialog_pad_properties.cpp:739
 msgid "ring"
 msgstr "环"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:728
+#: pcbnew/dialogs/dialog_pad_properties.cpp:741
 msgid "circle"
 msgstr "圆圈"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:731
+#: pcbnew/dialogs/dialog_pad_properties.cpp:744
 msgid "radius "
 msgstr "半径 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:736
+#: pcbnew/dialogs/dialog_pad_properties.cpp:749
 #, c-format
 msgid "corners count %d"
 msgstr "拐角计数 %d"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1049
+#: pcbnew/dialogs/dialog_pad_properties.cpp:922
+#, c-format
+msgid "%s, %s and connected layers"
+msgstr "%s, %s 和连接的图层"
+
+#: pcbnew/dialogs/dialog_pad_properties.cpp:925
+msgid "Connected layers only"
+msgstr "仅连接层"
+
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1149
 msgid "Pad size must be greater than zero"
 msgstr "焊盘尺寸必须大于 0"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1055
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1155
 msgid "Incorrect value for pad drill: pad drill bigger than pad size"
 msgstr "钻孔值不正确: 钻孔尺寸超过了焊盘尺寸"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1062
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1162
 msgid "Pad local clearance must be zero or greater than zero"
 msgstr "焊盘局部间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1073
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1173
 msgid "Pad local solder mask clearance must be zero or greater than zero"
 msgstr "焊盘局部阻焊间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1081
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1181
 #, c-format
 msgid "Pad local solder mask clearance must be greater than %s"
 msgstr "焊盘局部阻焊间隙必须大于 %s"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1096
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1196
 msgid "Error: pad has no layer"
 msgstr "错误：焊盘没有层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1103
-msgid "Error: the pad is not on a copper layer and has a hole"
-msgstr "错误：焊盘没有在铜层并且有一个孔"
-
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1108
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1204
 msgid ""
-"For NPTH pad, set pad size value to pad drill value, if you do not want this "
-"pad plotted in gerber files"
-msgstr ""
-"对于非金属化焊盘，设置焊盘尺寸值到焊盘钻孔的值，如果你不想要这个焊盘光绘文件"
+"Error: plated through holes must have a copper pad on at least one layer"
+msgstr "错误：电镀通孔必须至少有一层铜焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1127
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1220
 msgid "Incorrect value for pad offset"
 msgstr "焊盘偏移数值不正确"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1132
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1225
 msgid "Too large value for pad delta size"
 msgstr "焊盘增量尺寸值太大"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1140
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1233
 msgid "Error: Through hole pad: drill diameter set to 0"
 msgstr "错误：通孔焊盘：钻孔直径设置为 0"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1145
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1238
 msgid ""
 "Error: Connector pads are not on the solder paste layer\n"
 "Use SMD pads instead"
@@ -21708,62 +22626,62 @@ msgstr ""
 "错误：焊盘连接不是在锡膏层\n"
 "使用贴片焊盘替代"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1155
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1248
 msgid "Error: only one external copper layer allowed for SMD or Connector pads"
 msgstr "错误：允许贴片或连接焊盘只有一个外部铜层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1162
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1255
 msgid "Property cannot be set for NPTH"
 msgstr "无法为非金属化孔设置属性"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1166
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1259
 msgid "Castellated property can be set only for PTH"
 msgstr "只能为金属化孔设置邮票孔属性"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1170
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1263
 msgid "BGA property can be set only for SMD pads"
 msgstr "BGA 属性只能为贴片焊盘设置"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1180
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1273
 msgid "Incorrect corner size value"
 msgstr "不正确的拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1184
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1277
 msgid "Incorrect (negative) corner size value"
 msgstr "不正确的（负）拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1186
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1279
 msgid "Corner size value must be smaller than 50%"
 msgstr "转角值必须小于 50%"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1196
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1290
 msgid "Incorrect pad shape: the shape must be equivalent to only one polygon"
 msgstr "错误的焊盘形状：该形状必须相当于只有一个多边形"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1202
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1296
 msgid "Pad setup errors list"
 msgstr "焊盘设置错误列表"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1432
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1526
 msgid "Modify pad"
 msgstr "修改焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1780
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1918
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1952
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1905
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2043
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2077
 msgid "No shape selected"
 msgstr "未选择形状"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1870
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1995
 msgid "Ring/Circle"
 msgstr "圆"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1872
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1997
 msgid "Shape type:"
 msgstr "形状类型："
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1872
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:818
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1997
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:810
 msgid "Add Primitive"
 msgstr "添加图元"
 
@@ -21792,8 +22710,8 @@ msgid "Pad number:"
 msgstr "焊盘编号："
 
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:53
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:839
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:893
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:841
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:895
 msgid "Net name:"
 msgstr "网络名称："
 
@@ -21953,7 +22871,7 @@ msgstr "："
 msgid "Specify pad to die length"
 msgstr "指定焊盘到裸芯片长度"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:492
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:489
 msgid ""
 "Parent footprint on board is flipped.\n"
 "Layers will be reversed."
@@ -21961,59 +22879,47 @@ msgstr ""
 "板上的父级封装被翻转。\n"
 "图层将被反转。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:502
-msgid "Copper:"
-msgstr "铜层："
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:506
-msgid "Front layer"
-msgstr "顶层"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:506
-msgid "Back layer"
-msgstr "底层"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:521
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:513
 msgid "Front adhesive"
 msgstr "顶层粘胶"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:524
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:516
 msgid "Back adhesive"
 msgstr "底层粘胶"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:527
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:519
 msgid "Front solder paste"
 msgstr "顶层锡膏"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:530
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:522
 msgid "Back solder paste"
 msgstr "底层锡膏"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:536
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:528
 msgid "Back silk screen"
 msgstr "底层丝印"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:542
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:534
 msgid "Back solder mask"
 msgstr "底层阻焊"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:545
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:537
 msgid "Drafting notes"
 msgstr "说明"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:548
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:540
 msgid "E.C.O.1"
 msgstr "E.C.O.1"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:551
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:543
 msgid "E.C.O.2"
 msgstr "E.C.O.2"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:557
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:549
 msgid "Fabrication Property:"
 msgstr "制造属性："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:559
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:551
 msgid ""
 "Optional property to specify a special purpose or constraint in fabrication "
 "files:\n"
@@ -22034,35 +22940,35 @@ msgstr ""
 "蜂窝状指定板边缘上蜂窝状的过孔焊盘\n"
 "此属性在 Gerber X2 文件中指定。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 msgid "BGA pad"
 msgstr "BGA 焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 msgid "Fiducial, local to footprint"
 msgstr "基准，局部到封装"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 msgid "Fiducial, global to board"
 msgstr "基准，全局到板"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 msgid "Test Point Pad"
 msgstr "测试点焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 msgid "Heatsink pad"
 msgstr "散热片焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 msgid "Castellated pad (through hole only)"
 msgstr "邮票孔（仅限通孔）"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:591
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:583
 msgid "Set values to 0 to use parent footprint or netclass values."
 msgstr "设置值为 0，使用父级封装或网络类值。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:617
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:609
 msgid ""
 "This is the local net clearance for this pad.\n"
 "If 0, the footprint local value or the Netclass value is used."
@@ -22070,7 +22976,7 @@ msgstr ""
 "这是此焊盘的局部网络间隙。\n"
 "如果为 0，则使用封装局部值或网络类值。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:630
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:622
 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."
@@ -22078,7 +22984,7 @@ msgstr ""
 "这个此焊盘与阻焊间的局部间隙。\n"
 "如果为 0, 则使用封装局部值或全局值。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:643
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:635
 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"
@@ -22091,7 +22997,7 @@ msgstr ""
 "最终间隙值是该值与间隙值比率的总和。\n"
 "负值表示比焊盘尺寸更小的阻焊尺寸。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:656
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:648
 msgid ""
 "This is the local clearance ratio in percent between this pad and the solder "
 "paste.\n"
@@ -22106,133 +23012,141 @@ msgstr ""
 "最终间隙值是该值与间隙值的总和。\n"
 "负值表示比焊盘尺寸更小的阻焊尺寸。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:729
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:721
 msgid "Pad connection:"
 msgstr "焊盘连接："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:733
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:725
 msgid "From parent footprint"
 msgstr "来自父级封装"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:742
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:734
 msgid "Thermal relief spoke width:"
 msgstr "防散热导线宽度："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:753
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:745
 msgid "Thermal relief gap:"
 msgstr "防散热间距："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:764
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:756
 msgid "Custom pad shape in zone:"
 msgstr "自定义焊盘形状："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:768
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:760
 msgid "Use pad shape"
 msgstr "使用焊盘形状"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:768
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:760
 msgid "Use pad convex hull"
 msgstr "使用焊盘凸包"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:794
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:786
 msgid "Primitives list:"
 msgstr "基本体列表："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:800
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:792
 msgid "Note: coordinates are relative to anchor pad, orientation 0."
 msgstr "注：坐标相对于锚焊盘，方向为 0。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:821
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:813
 msgid "Edit Primitive"
 msgstr "编辑图元"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:824
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:816
 msgid "Duplicate Primitive"
 msgstr "复制图元"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:827
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:819
 msgid "Transform Primitive"
 msgstr "转换图元"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:833
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:825
 msgid "Delete Primitive"
 msgstr "删除图元"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:846
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:838
 msgid "Custom Shape Primitives"
 msgstr "自定义形状"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:857
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:852
 msgid "Footprint name"
 msgstr "封装名称"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:863
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:858
 msgid "side and rotation"
 msgstr "侧面和旋转"
 
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:878
+msgid "Board View"
+msgstr "电路板视图"
+
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:896
+msgid "Stackup View"
+msgstr "堆叠视图"
+
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:900
 msgid "Show pad in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1042
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1061
 msgid "Start point"
 msgstr "起始点"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1068
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1087
 msgid "Control point 1"
 msgstr "控制点 1"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1094
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1113
 msgid "Control point 2"
 msgstr "控制点 2"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1120
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1139
 msgid "End point"
 msgstr "结束点"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1169
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1188
 #: pcbnew/dialogs/dialog_target_properties_base.cpp:39
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:166
 msgid "Thickness:"
 msgstr "线宽："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1189
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1208
 msgid "Set thickness to 0 for a filled circle."
 msgstr "设置线宽为 0 时，填充圆。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1233
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1252
 msgid "Move vector"
 msgstr "移动矢量"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1282
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1301
 msgid "Scaling factor:"
 msgstr "比例因子："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1304
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1323
 msgid "Duplicate:"
 msgstr "重复："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1413
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1432
 msgid "Outline thickness:"
 msgstr "轮廓线宽："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1475
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1494
 msgid "Coordinates are relative to anchor pad, rotated 0.0 deg."
 msgstr "坐标相对于锚焊盘，旋转 0.0 度。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1481
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1500
 msgid "Set thickness to 0 for a filled polygon."
 msgstr "设置线宽为 0 时，填充多边形。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:250
+#: pcbnew/dialogs/dialog_pad_properties_base.h:254
 msgid "Pad Properties"
 msgstr "焊盘属性"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:339
+#: pcbnew/dialogs/dialog_pad_properties_base.h:343
 msgid "Pad Custom Shape Geometry Transform"
 msgstr "焊盘自定义形状几何变换"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:379
+#: pcbnew/dialogs/dialog_pad_properties_base.h:383
 msgid "Basic Shape Polygon"
 msgstr "基本形状多边形"
 
@@ -22240,38 +23154,38 @@ msgstr "基本形状多边形"
 msgid "Generate Drill Files..."
 msgstr "生成钻孔文件..."
 
-#: pcbnew/dialogs/dialog_plot.cpp:642
+#: pcbnew/dialogs/dialog_plot.cpp:646
 msgid "HPGL pen size constrained."
 msgstr "HPGL 画笔尺寸限制。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:658
+#: pcbnew/dialogs/dialog_plot.cpp:662
 msgid "X scale constrained."
 msgstr "X 比例限制。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:670
+#: pcbnew/dialogs/dialog_plot.cpp:674
 msgid "Y scale constrained."
 msgstr "Y 比例限制。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:686
+#: pcbnew/dialogs/dialog_plot.cpp:690
 #, c-format
 msgid ""
 "Width correction constrained. The reasonable width correction value must be "
 "in a range of  [%s; %s] (%s) for current design rules."
 msgstr "宽度校正限制。目前的设计规则合理的宽度修正值必须在范围 [%s; %s] (%s)。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:766
+#: pcbnew/dialogs/dialog_plot.cpp:770
 msgid "No layer selected, Nothing to plot"
 msgstr "没有图层选择，没有绘制"
 
-#: pcbnew/dialogs/dialog_plot.cpp:822
+#: pcbnew/dialogs/dialog_plot.cpp:826
 msgid "Warning: Scale option set to a very small value"
 msgstr "警告：缩放选项设置为一个很小的值"
 
-#: pcbnew/dialogs/dialog_plot.cpp:825
+#: pcbnew/dialogs/dialog_plot.cpp:829
 msgid "Warning: Scale option set to a very large value"
 msgstr "警告：缩放选项设置为一个非常大的值"
 
-#: pcbnew/dialogs/dialog_plot.cpp:873
+#: pcbnew/dialogs/dialog_plot.cpp:877
 #, c-format
 msgid "Plot file \"%s\" created."
 msgstr "创建绘制文件 \"%s\"。"
@@ -22286,7 +23200,7 @@ msgstr "绘制封装值"
 
 #: pcbnew/dialogs/dialog_plot_base.cpp:86
 msgid "Plot reference designators"
-msgstr "绘制参考标识符"
+msgstr "绘制位号"
 
 #: pcbnew/dialogs/dialog_plot_base.cpp:90
 msgid "Force plotting of invisible values / refs"
@@ -22294,7 +23208,7 @@ msgstr "强制绘制隐藏的值或参考"
 
 #: pcbnew/dialogs/dialog_plot_base.cpp:91
 msgid "Force plot invisible footprint values and reference designators"
-msgstr "强制绘制隐藏的值或参考指示符"
+msgstr "强制绘制隐藏的值或位号"
 
 #: pcbnew/dialogs/dialog_plot_base.cpp:95
 msgid "Exclude PCB edge layer from other layers"
@@ -22325,7 +23239,7 @@ msgid "Use auxiliary axis as coordinates origin in plot files"
 msgstr "使用辅助轴为绘制文件坐标原点"
 
 #: pcbnew/dialogs/dialog_plot_base.cpp:115
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:223
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:226
 msgid "Drill marks:"
 msgstr "钻孔标记："
 
@@ -22390,7 +23304,7 @@ msgid ""
 "Use non 0 values only when required."
 msgstr ""
 "全局阻焊层的最小宽度和/或边距未设置为 0\n"
-"大多数电路板期望值为 0 并使用其约束，特别是对于最小宽度的阻焊层。\n"
+"大多数电路板厂期望值为 0 并使用其约束，特别是对于最小宽度的阻焊层。\n"
 "请确保阻焊层的最小宽度和边距值有效\n"
 "并仅在需要时使用非 0 值。"
 
@@ -22844,41 +23758,41 @@ msgstr "高"
 msgid "Interactive Router Settings"
 msgstr "交互式布线设置"
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:159
+#: pcbnew/dialogs/dialog_position_relative.cpp:163
 msgid "Reset to the current distance from the reference position."
 msgstr "从参考位置重置为当前距离。"
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:160
+#: pcbnew/dialogs/dialog_position_relative.cpp:164
 msgid "Reset to the current angle from the reference position."
 msgstr "从参考位置重置为当前角度。"
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:164
+#: pcbnew/dialogs/dialog_position_relative.cpp:168
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:67
 msgid "Offset X:"
 msgstr "偏移 X："
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:165
+#: pcbnew/dialogs/dialog_position_relative.cpp:169
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:84
 msgid "Offset Y:"
 msgstr "偏移 Y："
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:167
+#: pcbnew/dialogs/dialog_position_relative.cpp:171
 msgid "Reset to the current X offset from the reference position."
 msgstr "从参考位置重置为当前 X 偏移。"
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:168
+#: pcbnew/dialogs/dialog_position_relative.cpp:172
 msgid "Reset to the current Y offset from the reference position."
 msgstr "从参考位置重置为当前 Y 偏移。"
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:234
+#: pcbnew/dialogs/dialog_position_relative.cpp:238
 msgid "Reference location: grid origin"
 msgstr "参考位置：网格原点"
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:243
+#: pcbnew/dialogs/dialog_position_relative.cpp:247
 msgid "Reference location: local coordinates origin"
 msgstr "参考位置：本地坐标原点"
 
-#: pcbnew/dialogs/dialog_position_relative.cpp:249
+#: pcbnew/dialogs/dialog_position_relative.cpp:253
 msgid "<none selected>"
 msgstr "<选择>"
 
@@ -22910,31 +23824,35 @@ msgstr ""
 msgid "Position Relative To Reference Item"
 msgstr "相対于参考项目的位置"
 
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:225
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:201
+msgid "Print according to Items tab of Layers Manager"
+msgstr "根据“图层管理器”的“项目”选项卡进行打印"
+
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:227
 msgid "No drill mark"
 msgstr "无钻孔标记"
 
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:225
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:228
 msgid "Small mark"
 msgstr "小标记"
 
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:225
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:229
 msgid "Real drill"
 msgstr "实际钻孔尺寸"
 
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:234
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:238
 msgid "One page per layer"
 msgstr "每层一页"
 
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:234
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:239
 msgid "All layers on single page"
 msgstr "所有层在单页上"
 
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:295
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:305
 msgid "Exclude PCB edge layer"
 msgstr "排除 PCB 边框层"
 
-#: pcbnew/dialogs/dialog_print_pcbnew.cpp:296
+#: pcbnew/dialogs/dialog_print_pcbnew.cpp:306
 msgid "Exclude contents of Edges_Pcb layer from all other layers"
 msgstr "从所有其它图层排除电路板边界层内容"
 
@@ -22991,55 +23909,55 @@ msgstr "电路板长度"
 msgid "Die Length"
 msgstr "裸芯片长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:839
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:841
 msgid "New Net"
 msgstr "新建网络"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:851
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:916
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:853
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:918
 #, c-format
 msgid "Net name '%s' is already in use."
 msgstr "网络名称 '%s' 已经在使用中。"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:893
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:895
 msgid "Rename Net"
 msgstr "重命名网络"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:906
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:908
 msgid "Net name cannot be empty."
 msgstr "网络名称变量名不能为空。"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:945
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:947
 msgid "Net is in use.  Delete anyway?"
 msgstr "网络正在使用中。仍要删除吗？"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:959
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:960
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:961
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:962
 msgid "Report file"
 msgstr "报告文件"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:975
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:977
 msgid "Net Id"
 msgstr "网络 ID"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:976
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:978
 msgid "Pad count"
 msgstr "焊盘计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:976
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:978
 msgid "Via count"
 msgstr "过孔计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:977
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:979
 msgid "Board length"
 msgstr "电路板长度"
 
 # Die 裸芯片
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:977
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:979
 msgid "Die length"
 msgstr "裸芯片长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:977
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:979
 msgid "Net length"
 msgstr "网络长度"
 
@@ -23052,7 +23970,7 @@ msgid "Create Report..."
 msgstr "创建报告..."
 
 #: pcbnew/dialogs/dialog_select_net_from_list_base.h:68
-#: pcbnew/tools/pcb_actions.cpp:661
+#: pcbnew/tools/pcb_actions.cpp:720
 msgid "Net Inspector"
 msgstr "网络检查"
 
@@ -23088,24 +24006,24 @@ msgstr "X"
 msgid "Target Properties"
 msgstr "目标属性"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:73
+#: pcbnew/dialogs/dialog_text_properties.cpp:77
 msgid "Dimension Properties"
 msgstr "尺寸属性"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:98
+#: pcbnew/dialogs/dialog_text_properties.cpp:102
 msgid "Footprint Text Properties"
 msgstr "封装文本属性"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:105
+#: pcbnew/dialogs/dialog_text_properties.cpp:109
 msgid "Reference:"
 msgstr "参考编号："
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:438
+#: pcbnew/dialogs/dialog_text_properties.cpp:442
 #, c-format
 msgid "Footprint %s (%s), %s, rotated %.1f deg"
 msgstr "封装 %s (%s), %s, 旋转 %.1f°"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:454
+#: pcbnew/dialogs/dialog_text_properties.cpp:458
 msgid ""
 "This item was on a non-existing or forbidden layer.\n"
 "It has been moved to the first allowed layer."
@@ -23113,7 +24031,7 @@ msgstr ""
 "此项目在一个不存在或禁止的层上\n"
 "它以被移动到第一个允许的层。"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:563
+#: pcbnew/dialogs/dialog_text_properties.cpp:567
 msgid ""
 "The text thickness is too large for the text size.\n"
 "It will be clamped."
@@ -23121,7 +24039,7 @@ msgstr ""
 "文本宽度与高度比例不对。\n"
 "它将会变形，被挤在一起。"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:587
+#: pcbnew/dialogs/dialog_text_properties.cpp:591
 msgid "Change text properties"
 msgstr "更改文本属性"
 
@@ -23173,7 +24091,7 @@ msgstr "保持文本直立"
 msgid "Parent footprint description"
 msgstr "父级封装描述"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:319
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:327
 #, c-format
 msgid ""
 "This will change the net assigned to %s pad %s to %s.\n"
@@ -23182,7 +24100,7 @@ msgstr ""
 "将分配给%s焊盘%s的网络更改为%s。\n"
 "是否要继续？"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:329
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:337
 #, c-format
 msgid ""
 "This will change the net assigned to %s pad %s and %s pad %s to %s.\n"
@@ -23191,7 +24109,7 @@ msgstr ""
 "将分配给%s焊盘%s 和 %s焊盘%s的网络更改为%s。\n"
 "是否要继续？"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:339
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:347
 #, c-format
 msgid ""
 "This will change the net assigned to %lu connected pads to %s.\n"
@@ -23200,19 +24118,19 @@ msgstr ""
 "将分配给 %lu 个焊盘的网络更改为 %s。\n"
 "是否要继续？"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:346
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:354
 msgid "Continue"
 msgstr "继续"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:401
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:409
 msgid "Via drill size must be smaller than via diameter"
 msgstr "过孔内径尺寸必须小于过孔外径"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:410
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:418
 msgid "Via start layer and end layer cannot be the same"
 msgstr "过孔起始层和结束层不能相同"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:563
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:571
 msgid "Edit track/via properties"
 msgstr "编辑布线/过孔属性"
 
@@ -23295,6 +24213,38 @@ msgstr "过孔内径必须小于过孔外径"
 msgid "Track Width and Via Size"
 msgstr "布线宽度和过孔尺寸"
 
+#: pcbnew/dialogs/dialog_unused_pad_layers.cpp:155
+msgid "Set Unused Pad Properties"
+msgstr "设置未使用的焊盘属性"
+
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:33
+msgid "&Vias"
+msgstr "过孔 (&V)"
+
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:33
+msgid "&Pads"
+msgstr "焊盘 (&P)"
+
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:39
+msgid "&Remove Unused"
+msgstr "删除未使用的内容 (&R)"
+
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:39
+msgid "Reset &Unused"
+msgstr "重置未使用的内容 (&U)"
+
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:51
+msgid "&Selection only"
+msgstr "仅限选择 (&S)"
+
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.cpp:54
+msgid "&Keep pads at first and last layers"
+msgstr "在第一层和最后一层保留焊盘 (&K)"
+
+#: pcbnew/dialogs/dialog_unused_pad_layers_base.h:59
+msgid "Unused Pad Layers"
+msgstr "未使用的填充层"
+
 #: pcbnew/dialogs/dialog_update_pcb_base.cpp:32
 msgid "Delete footprints with no symbols"
 msgstr "删除不带符号的封装"
@@ -23357,7 +24307,7 @@ msgid "Show or hide net names on pads and/or tracks."
 msgstr "显示/隐藏焊盘或布线上的网络名称。"
 
 #: pcbnew/dialogs/panel_display_options_base.cpp:45
-#: pcbnew/tools/pcb_actions.cpp:723
+#: pcbnew/tools/pcb_actions.cpp:782
 msgid "Show pad numbers"
 msgstr "显示焊盘编号"
 
@@ -23487,7 +24437,7 @@ msgid "Always show selected ratsnest"
 msgstr "始终显示选定的飞线"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:151
-#: pcbnew/tools/pcb_actions.cpp:692
+#: pcbnew/tools/pcb_actions.cpp:751
 msgid "Show ratsnest with curved lines"
 msgstr "用曲线显示飞线"
 
@@ -23508,23 +24458,23 @@ msgstr "用鼠标拖动布线时选择要执行的操作"
 msgid "Moves the track segment without moving connected tracks"
 msgstr "移动布线段而不移动连接的布线"
 
-#: pcbnew/dialogs/panel_edit_options_base.cpp:181
-#: pcbnew/tools/pcb_actions.cpp:1215
+#: pcbnew/dialogs/panel_edit_options_base.cpp:184
+#: pcbnew/tools/pcb_actions.cpp:1285
 msgid "Drag (45 degree mode)"
 msgstr "拖动 (45 度模式)"
 
-#: pcbnew/dialogs/panel_edit_options_base.cpp:182
-#: pcbnew/tools/pcb_actions.cpp:1216
+#: pcbnew/dialogs/panel_edit_options_base.cpp:185
+#: pcbnew/tools/pcb_actions.cpp:1286
 msgid "Drags the track segment while keeping connected tracks at 45 degrees."
 msgstr "在保持连接布线 45 度的情况下拖动布线段。"
 
-#: pcbnew/dialogs/panel_edit_options_base.cpp:186
-#: pcbnew/tools/pcb_actions.cpp:1222
+#: pcbnew/dialogs/panel_edit_options_base.cpp:192
+#: pcbnew/tools/pcb_actions.cpp:1292
 msgid "Drag (free angle)"
 msgstr "拖动(自由角度)"
 
-#: pcbnew/dialogs/panel_edit_options_base.cpp:187
-#: pcbnew/tools/pcb_actions.cpp:1223
+#: pcbnew/dialogs/panel_edit_options_base.cpp:193
+#: pcbnew/tools/pcb_actions.cpp:1293
 msgid ""
 "Drags the nearest joint in the track without restricting the track angle."
 msgstr "在不限制布线角度的情况下，拖拽布线中最近的连接点。"
@@ -23537,21 +24487,21 @@ msgstr "编辑器选项..."
 msgid "Edit options"
 msgstr "编辑选项"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:559
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:577
 #, c-format
 msgid "Duplicate Nicknames \"%s\"."
 msgstr "重复的昵称 \"%s\"。"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:762
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:780
 #, c-format
 msgid "Select %s Library"
 msgstr "选择 %s 库"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:802
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:820
 msgid "The following directories could not be opened: \n"
 msgstr "无法打开以下目录：\n"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:807
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:825
 msgid "Failed to open directories to look for libraries"
 msgstr "无法打开目录以查找库"
 
@@ -23559,6 +24509,10 @@ msgstr "无法打开目录以查找库"
 msgid "Add Existing"
 msgstr "添加现有"
 
+#: pcbnew/dialogs/panel_modedit_color_settings.cpp:139
+msgid "Internal Layers"
+msgstr "内层"
+
 #: pcbnew/dialogs/panel_modedit_defaults.cpp:321
 #: pcbnew/dialogs/panel_setup_text_and_graphics.cpp:161
 msgid ""
@@ -23575,7 +24529,7 @@ msgstr "新封装的默认文本项："
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:87
 msgid ""
 "Note: a blank reference designator or value will use the footprint name."
-msgstr "注意：空白的引用指示符或值将使用封装名称。"
+msgstr "注意：空白的位号或值将使用封装名称。"
 
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:100
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:21
@@ -23594,6 +24548,54 @@ msgstr "按钮显示"
 msgid "Category"
 msgstr "类别"
 
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:23
+msgid "Page Origin"
+msgstr "图框原点"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:23
+msgid "Drill/Place Origin"
+msgstr "钻孔/放置原点"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:25
+msgid "Display Origin"
+msgstr "显示原点"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:27
+msgid "Select which origin is used for X,Y coordinate display."
+msgstr "选择用于 X，Y 坐标显示的原点。"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:37
+msgid "Increases Right"
+msgstr "向右增加"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:37
+msgid "Increases Left"
+msgstr "向左增加"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:39
+msgid "X Axis"
+msgstr "X 轴"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:41
+msgid "Select which the direction on the screen in which the X axis increases."
+msgstr "选择屏幕上 X 轴增加的方向。"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:45
+msgid "Increases Up"
+msgstr "向上增加"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:45
+msgid "Increases Down"
+msgstr "向下增加"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:47
+msgid "Y Axis"
+msgstr "Y 轴"
+
+#: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:49
+msgid "Select which the direction on the screen in which the Y axis increases."
+msgstr "选择屏幕上 Y 轴增加的方向。"
+
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:20
 msgid "Allowed features"
 msgstr "允许的功能"
@@ -23607,8 +24609,8 @@ msgid "Allow micro vias (uVias)"
 msgstr "允许微孔"
 
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:53
-msgid "Arc/circle drawing"
-msgstr "圆弧/圆图"
+msgid "Arc/circle approximated by segments"
+msgstr "圆弧/圆近似于线段"
 
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:68
 msgid "Maximum deviation:"
@@ -23623,55 +24625,68 @@ msgstr ""
 "这是圆和近似它的多边形之间的最大距离。\n"
 "最大误差定义此面的段数。"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:92
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:90
+#, c-format
+msgid ""
+"Value < %s  can be time consumming\n"
+"when filling zones."
+msgstr ""
+"值 < %s  可以是填充区域时\n"
+"耗费的时间。"
+
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:107
 msgid "Zone fill strategy"
 msgstr "区域填充策略"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:107
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:122
 msgid "Stroked outlines (legacy)"
 msgstr "描边轮廓 (旧版)"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:110
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:125
 msgid "Smoothed polygons (best performance)"
 msgstr "平滑多边形 (最佳性能)"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:153
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:141
+msgid "Allow fillets outside zone outline"
+msgstr "允许圆角超出区域轮廓"
+
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:180
 msgid "Minimum clearance:"
 msgstr "最小间隙："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:183
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:210
 msgid "Minimum via annulus:"
 msgstr "最小过孔环："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:197
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:224
 msgid "Minimum via diameter:"
 msgstr "最小过孔外径："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:211
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:238
 msgid "Copper edge clearance:"
 msgstr "铜边缘间隙:"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:234
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:261
 msgid "Holes"
 msgstr "过孔"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:250
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:277
 msgid "Minimum through hole:"
 msgstr "最小通孔："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:264
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:291
 msgid "Hole to hole clearance:"
 msgstr "孔对孔间隙："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:287
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:314
 msgid "uVias"
 msgstr "微孔"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:303
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:330
 msgid "Minimum uVia diameter:"
 msgstr "最小微孔外径："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:317
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:344
 msgid "Minimum uVia drill:"
 msgstr "最小微孔内径："
 
@@ -23706,24 +24721,40 @@ msgstr ""
 "在移除的图层上找到了项目。 该操作将删除已移除图层中的所有项目，并且不能撤"
 "消。 你想继续吗？"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:639
+#: pcbnew/dialogs/panel_setup_layers.cpp:647
 msgid "Layer must have a name."
 msgstr "层必须要有一个名称。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:645
+#: pcbnew/dialogs/panel_setup_layers.cpp:653
 #, c-format
 msgid "\"%s\" are forbidden in layer names."
 msgstr "\"%s\" 在层名称中是禁止的。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:652
+#: pcbnew/dialogs/panel_setup_layers.cpp:660
 msgid "Layer name \"signal\" is reserved."
 msgstr "“信号” 是保留层名称。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:660
+#: pcbnew/dialogs/panel_setup_layers.cpp:668
 #, c-format
 msgid "Layer name \"%s\" is already in use."
 msgstr "图层名称 \"%s\" 已经在使用中。"
 
+#: pcbnew/dialogs/panel_setup_layers.cpp:766
+#, c-format
+msgid ""
+"Imported settings have fewer copper layers than the current board (%i "
+"instead of %i).\n"
+"\n"
+"Continue and delete the extra inner copper layers from the current board?"
+msgstr ""
+"导入的设置的铜层比当前电路板少(%i 而不是 %i)。\n"
+"\n"
+"是否继续并从当前电路板中删除额外的内部铜层？"
+
+#: pcbnew/dialogs/panel_setup_layers.cpp:773
+msgid "Inner Layers To Be Deleted"
+msgstr "要删除的内部铜层"
+
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:23
 msgid "Custom layer set"
 msgstr "自定义图层设置"
@@ -23752,27 +24783,6 @@ msgstr "4 层板，元件在项层与底层上"
 msgid "All layers on"
 msgstr "开启所有层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:50
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:109
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:170
-msgid "2"
-msgstr "2"
-
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:54
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:113
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:174
-msgid "6"
-msgstr "6"
-
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:36
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:56
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:115
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:176
-msgid "8"
-msgstr "8"
-
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:36
 msgid "10"
 msgstr "10"
@@ -24308,85 +25318,90 @@ msgstr "开启/关闭 文档图形层"
 msgid "Drawings_layer"
 msgstr "图形层"
 
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:41
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:29
 msgid ""
-"Note: Set Solder mask minimum bridge width and Solder mask clearance to 0,\n"
-"unless your board house asks for a specific value"
+"Use your board house's recommendation for solder mask clearance and minimum "
+"bridge width.\n"
+"If none is provided, setting the values to zero is suggested."
 msgstr ""
-"注意：将阻焊剂最小桥宽和阻焊剂间隙设置为 0，\n"
-"除非您的电路板要求特定的值"
+"使用您的电路板厂推荐的焊罩间隙和最小桥宽。\n"
+"如果未提供，则建议将这些值设置为零。"
 
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:61
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:49
 msgid ""
-"This is the global clearance between pads and the solder mask\n"
+"Global clearance between pads and the solder mask.\n"
 "This value can be superseded by local values for a footprint or a pad."
 msgstr ""
-"这是焊盘与阻焊之间的局部间距值\n"
-"该值可以被局部封装和焊盘的值所取代。"
+"这是焊盘与阻焊之间的全局间间隙。\n"
+"该值可以被封装和焊盘的本地值所取代。"
 
 # 绿油桥宽：
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:72
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:62
 msgid "Solder mask minimum bridge width:"
 msgstr "阻焊（绿油）最小桥宽："
 
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:74
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:64
 msgid ""
-"Min dist between 2 pad areas.\n"
+"Min. dist between 2 pad areas.\n"
 "Two pad areas nearer than this value will be merged during plotting.\n"
-"This parameter is used only to plot solder mask layers.\n"
-"Leave it to 0, unless you know what you are doing."
+"This parameter is only used to plot solder mask layers.\n"
+"Leave at 0 unless you know what you are doing."
 msgstr ""
-"两个焊盘区域之间最小距离。\n"
+"最小值。在两个焊盘区域之间。\n"
 "两个焊盘区靠近并超过此值将会在绘制过程中合并。\n"
 "这个参数只用来绘制阻焊层。\n"
 "将其保留为 0，除非您知道自己在做什么。"
 
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:96
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:88
 msgid ""
-"This is the global clearance between pads and the solder paste\n"
+"Global clearance between pads and the solder paste.\n"
 "This value can be superseded by local values for a footprint or a pad.\n"
-"The final clearance value is the sum of this value and the clearance value "
-"ratio"
+"Final clearance value is the sum of this value and the clearance value ratio."
 msgstr ""
-"这是该焊盘的和焊盘的局部间距值设置\n"
-"该值可以由一个焊盘局部值所取代。\n"
-"最终的间距值是该值的总和，间距比值负值意味着更小的掩模尺寸更大的焊盘尺寸"
+"焊盘和焊膏之间的全局间隙。\n"
+"该值可以由一个焊盘本地值所取代。\n"
+"最终间隙值是该值与间隙值比率之和。"
 
-#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:109
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:101
 msgid ""
-"This is the global clearance ratio in per cent between pads and the solder "
-"paste\n"
-"A value of 10 means the clearance value is 10 per cent of the pad size\n"
+"Global clearance ratio in percent between pads and the solder paste.\n"
+"A value of 10 means the clearance value is 10 percent of the pad size.\n"
 "This value can be superseded by local values for a footprint or a pad.\n"
-"The final clearance value is the sum of this value and the clearance value"
+"Final clearance value is the sum of this value and the clearance value."
 msgstr ""
-"这是焊盘与焊锡膏之间间隙的全局百分之比\n"
-"如果为 10 则表示间隙值是焊盘尺寸的 10%\n"
-"此值可以通过封装或焊盘局部值所取代。\n"
-"最终的间隙值是该值与间隙值的总和"
+"焊盘和焊膏之间的全局间隙比(以百分比表示)。\n"
+"值 10 表示间隙值是焊盘大小的 10%。\n"
+"此值可以通过封装或焊盘本地值所取代。\n"
+"最终间距值是该值与间隙值之和。"
 
-#: pcbnew/dialogs/panel_setup_rules.cpp:239
-#: pcbnew/dialogs/panel_setup_rules.cpp:297
+#: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:118
+msgid ""
+"Note: Solder paste clearances (absolute and relative) are added to determine "
+"the final clearance."
+msgstr "注意：添加锡膏间隙（绝对和相对）以确定最终间隙。"
+
+#: pcbnew/dialogs/panel_setup_rules.cpp:268
+#: pcbnew/dialogs/panel_setup_rules.cpp:337
 msgid "DRC rules"
 msgstr "DRC 规则"
 
-#: pcbnew/dialogs/panel_setup_rules.cpp:322
+#: pcbnew/dialogs/panel_setup_rules.cpp:362
 msgid "Top-level Clauses"
 msgstr "顶级条款"
 
-#: pcbnew/dialogs/panel_setup_rules.cpp:327
+#: pcbnew/dialogs/panel_setup_rules.cpp:367
 msgid "Rule Clauses"
 msgstr "规则条款"
 
-#: pcbnew/dialogs/panel_setup_rules.cpp:335
-msgid "Item Types"
-msgstr "物料类型"
-
-#: pcbnew/dialogs/panel_setup_rules.cpp:343
+#: pcbnew/dialogs/panel_setup_rules.cpp:374
 msgid "Constraint Types"
 msgstr "约束类型"
 
-#: pcbnew/dialogs/panel_setup_rules.cpp:349
+#: pcbnew/dialogs/panel_setup_rules.cpp:380
+msgid "Item Types"
+msgstr "物料类型"
+
+#: pcbnew/dialogs/panel_setup_rules.cpp:388
 msgid "Examples"
 msgstr "例如"
 
@@ -24465,18 +25480,6 @@ msgstr "差分对过孔间隙小于最小间隙(%s)。"
 msgid "Pre-defined track and via dimensions:"
 msgstr "预定义布线和过孔直径："
 
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:51
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:110
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:171
-msgid "3"
-msgstr "3"
-
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:55
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:114
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:175
-msgid "7"
-msgstr "7"
-
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:143
 msgid "Differential Pairs"
 msgstr "差分对布线"
@@ -24561,160 +25564,149 @@ msgstr "下载 3D 模型库："
 msgid "Add 3D Shape Libraries Wizard"
 msgstr "3D 模型库添加向导"
 
-#: pcbnew/drc/drc.cpp:242 qa/drc_proto/drc.cpp:244
+#: pcbnew/drc/drc.cpp:239 qa/drc_proto/drc.cpp:244
 msgid "Board Outline...\n"
 msgstr "电路板边框...\n"
 
-#: pcbnew/drc/drc.cpp:254 qa/drc_proto/drc.cpp:286
+#: pcbnew/drc/drc.cpp:251 qa/drc_proto/drc.cpp:286
 msgid "Pad clearances...\n"
 msgstr "焊盘间距...\n"
 
-#: pcbnew/drc/drc.cpp:268 qa/drc_proto/drc.cpp:301
+#: pcbnew/drc/drc.cpp:265 qa/drc_proto/drc.cpp:301
 msgid "Drill sizes and clearances...\n"
 msgstr "钻头尺寸和间隙...\n"
 
-#: pcbnew/drc/drc.cpp:286 qa/drc_proto/drc.cpp:319
+#: pcbnew/drc/drc.cpp:283 qa/drc_proto/drc.cpp:319
 msgid "Refilling all zones...\n"
 msgstr "重新填充所有覆铜区域...\n"
 
-#: pcbnew/drc/drc.cpp:293 qa/drc_proto/drc.cpp:326
+#: pcbnew/drc/drc.cpp:290 qa/drc_proto/drc.cpp:326
 msgid "Checking zone fills...\n"
 msgstr "检查填充区域...\n"
 
-#: pcbnew/drc/drc.cpp:301 qa/drc_proto/drc.cpp:334
+#: pcbnew/drc/drc.cpp:298 qa/drc_proto/drc.cpp:334
 msgid "Track clearances...\n"
 msgstr "布线间距...\n"
 
-#: pcbnew/drc/drc.cpp:310 qa/drc_proto/drc.cpp:343
+#: pcbnew/drc/drc.cpp:307 qa/drc_proto/drc.cpp:343
 msgid "Zone to zone clearances...\n"
 msgstr "覆铜区域与覆铜区域间隙...\n"
 
-#: pcbnew/drc/drc.cpp:322 qa/drc_proto/drc.cpp:355
+#: pcbnew/drc/drc.cpp:319 qa/drc_proto/drc.cpp:355
 msgid "Unconnected pads...\n"
 msgstr "未连接焊盘...\n"
 
-#: pcbnew/drc/drc.cpp:334 qa/drc_proto/drc.cpp:367
+#: pcbnew/drc/drc.cpp:331 qa/drc_proto/drc.cpp:367
 msgid "Keepout areas ...\n"
 msgstr "禁布区...\n"
 
-#: pcbnew/drc/drc.cpp:351 qa/drc_proto/drc.cpp:385
+#: pcbnew/drc/drc.cpp:348 qa/drc_proto/drc.cpp:385
 msgid "Text and graphic clearances...\n"
 msgstr "文本和图形间隙...\n"
 
-#: pcbnew/drc/drc.cpp:367 qa/drc_proto/drc.cpp:401
+#: pcbnew/drc/drc.cpp:364 qa/drc_proto/drc.cpp:401
 msgid "Courtyard areas...\n"
 msgstr "封装外框...\n"
 
-#: pcbnew/drc/drc.cpp:389 qa/drc_proto/drc.cpp:423
+#: pcbnew/drc/drc.cpp:383 qa/drc_proto/drc.cpp:423
 msgid "Checking footprints against schematic...\n"
 msgstr "检查封装和原理图...\n"
 
-#: pcbnew/drc/drc.cpp:408 qa/drc_proto/drc.cpp:442
+#: pcbnew/drc/drc.cpp:402 qa/drc_proto/drc.cpp:442
 msgid "Items on disabled layers...\n"
 msgstr "禁用层上的项目...\n"
 
-#: pcbnew/drc/drc.cpp:419 qa/drc_proto/drc.cpp:453
+#: pcbnew/drc/drc.cpp:413 qa/drc_proto/drc.cpp:453
 msgid "Unresolved text variables...\n"
 msgstr "未解析的文本变量...\n"
 
-#: pcbnew/drc/drc.cpp:519 pcbnew/drc/drc.cpp:822 pcbnew/drc/drc.cpp:943
-#: pcbnew/drc/drc.cpp:988 pcbnew/drc/drc.cpp:1146 pcbnew/drc/drc.cpp:1169
-#: pcbnew/drc/drc.cpp:1227 pcbnew/drc/drc_clearance_test_functions.cpp:303
-#: pcbnew/drc/drc_clearance_test_functions.cpp:326
-#: pcbnew/drc/drc_clearance_test_functions.cpp:408
-#: pcbnew/drc/drc_clearance_test_functions.cpp:460
-#: pcbnew/drc/drc_clearance_test_functions.cpp:528 qa/drc_proto/drc.cpp:551
-#: qa/drc_proto/drc.cpp:854 qa/drc_proto/drc.cpp:1043 qa/drc_proto/drc.cpp:1101
-#: qa/drc_proto/drc.cpp:1275 qa/drc_proto/drc.cpp:1304
-#: qa/drc_proto/drc.cpp:1353 qa/drc_proto/drc_clearance_test_functions.cpp:429
-#: qa/drc_proto/drc_clearance_test_functions.cpp:455
-#: qa/drc_proto/drc_clearance_test_functions.cpp:551
-#: qa/drc_proto/drc_clearance_test_functions.cpp:603
-#: qa/drc_proto/drc_clearance_test_functions.cpp:670
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:220
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:265
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:368
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:455
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:512
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:643
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:812
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:218
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:263
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:366
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:453
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:510
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:633
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:802
-#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:287
-#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:318
+#: pcbnew/drc/drc.cpp:511 pcbnew/drc/drc.cpp:817 pcbnew/drc/drc.cpp:938
+#: pcbnew/drc/drc.cpp:983 pcbnew/drc/drc.cpp:1142 pcbnew/drc/drc.cpp:1166
+#: pcbnew/drc/drc.cpp:1227 pcbnew/drc/drc_clearance_test_functions.cpp:327
+#: pcbnew/drc/drc_clearance_test_functions.cpp:355
+#: pcbnew/drc/drc_clearance_test_functions.cpp:427
+#: pcbnew/drc/drc_clearance_test_functions.cpp:476
+#: pcbnew/drc/drc_clearance_test_functions.cpp:540 qa/drc_proto/drc.cpp:550
+#: qa/drc_proto/drc.cpp:862 qa/drc_proto/drc.cpp:1051 qa/drc_proto/drc.cpp:1109
+#: qa/drc_proto/drc.cpp:1283 qa/drc_proto/drc.cpp:1312
+#: qa/drc_proto/drc.cpp:1361 qa/drc_proto/drc_clearance_test_functions.cpp:450
+#: qa/drc_proto/drc_clearance_test_functions.cpp:476
+#: qa/drc_proto/drc_clearance_test_functions.cpp:562
+#: qa/drc_proto/drc_clearance_test_functions.cpp:611
+#: qa/drc_proto/drc_clearance_test_functions.cpp:677
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:221
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:266
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:369
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:456
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:513
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:644
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:810
+#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:147
+#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:290
+#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:321
 #, c-format
 msgid " (%s clearance %s; actual %s)"
 msgstr " (%s 间隙 %s; 实际 %s)"
 
-#: pcbnew/drc/drc.cpp:557 qa/drc_proto/drc.cpp:589
+#: pcbnew/drc/drc.cpp:549 qa/drc_proto/drc.cpp:588
 msgid "Track clearances"
 msgstr "布线间距"
 
-#: pcbnew/drc/drc.cpp:1021 pcbnew/drc/drc_courtyard_tester.cpp:76
-#: qa/drc_proto/drc.cpp:1131 qa/drc_proto/drc_courtyard_tester.cpp:76
+#: pcbnew/drc/drc.cpp:1016 pcbnew/drc/drc_courtyard_tester.cpp:76
+#: qa/drc_proto/drc.cpp:1139 qa/drc_proto/drc_courtyard_tester.cpp:76
 msgid " (not a closed shape)"
 msgstr " (不是闭合形状)"
 
-#: pcbnew/drc/drc.cpp:1045 pcbnew/drc/drc.cpp:1065 pcbnew/drc/drc.cpp:1083
-#: qa/drc_proto/drc.cpp:1155 qa/drc_proto/drc.cpp:1175
-#: qa/drc_proto/drc.cpp:1193
+#: pcbnew/drc/drc.cpp:1040 pcbnew/drc/drc.cpp:1060 pcbnew/drc/drc.cpp:1078
+#: qa/drc_proto/drc.cpp:1163 qa/drc_proto/drc.cpp:1183
+#: qa/drc_proto/drc.cpp:1201
 #, c-format
 msgid "layer %s"
 msgstr "层 %s"
 
-#: pcbnew/drc/drc.cpp:1200
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:610
+#: pcbnew/drc/drc.cpp:1197
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:611
 #, c-format
 msgid " (nets %s and %s)"
 msgstr " (网络 %s 和 %s)"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:69
-#: pcbnew/drc/drc_clearance_test_functions.cpp:108
-#, c-format
-msgid "Via annulus too small (%s %s; actual %s)"
-msgstr "过孔环隙太小 (%s %s; 实际 %s)"
-
-#: pcbnew/drc/drc_clearance_test_functions.cpp:85
-#: pcbnew/drc/drc_clearance_test_functions.cpp:124
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:269
-#: qa/drc_proto/drc_clearance_test_functions.cpp:185
-#: qa/drc_proto/drc_clearance_test_functions.cpp:224
+#: pcbnew/drc/drc_clearance_test_functions.cpp:49
+#: pcbnew/drc/drc_clearance_test_functions.cpp:66
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:293
+#: qa/drc_proto/drc_clearance_test_functions.cpp:150
+#: qa/drc_proto/drc_clearance_test_functions.cpp:167
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:269
 #, c-format
 msgid " (board minimum %s; actual %s)"
 msgstr " (电路板最小值 %s; 实际 %s)"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:143
-#: qa/drc_proto/drc_clearance_test_functions.cpp:243
+#: pcbnew/drc/drc_clearance_test_functions.cpp:85
+#: qa/drc_proto/drc_clearance_test_functions.cpp:186
 #, c-format
 msgid " (diameter %s; drill %s)"
 msgstr " （直径 %s; 钻孔 %s）"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:159
+#: pcbnew/drc/drc_clearance_test_functions.cpp:101
+#: qa/drc_proto/drc_clearance_test_functions.cpp:202
 msgid "Microvia not allowed (board design rule constraints)"
 msgstr "不允许微孔 (电路板设计规则约束)"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:172
+#: pcbnew/drc/drc_clearance_test_functions.cpp:114
+#: qa/drc_proto/drc_clearance_test_functions.cpp:215
 msgid "Blind/buried via not allowed (board design rule constraints)"
 msgstr "不允许盲孔/埋孔 (电路板设计规则约束)"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:202
+#: pcbnew/drc/drc_clearance_test_functions.cpp:146
+#: qa/drc_proto/drc_clearance_test_functions.cpp:245
 #, c-format
 msgid "Microvia through too many layers (%s and %s not adjacent)"
 msgstr "通过太多层的微孔(%s 和 %s 不相邻)"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:240
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:108
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:151
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:194
-#: qa/drc_proto/drc_clearance_test_functions.cpp:169
-#: qa/drc_proto/drc_clearance_test_functions.cpp:208
-#: qa/drc_proto/drc_clearance_test_functions.cpp:340
+#: pcbnew/drc/drc_clearance_test_functions.cpp:189
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:115
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:166
+#: pcbnew/drc/drc_drilled_hole_tester.cpp:218
+#: qa/drc_proto/drc_clearance_test_functions.cpp:288
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:108
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:151
 #: qa/drc_proto/drc_drilled_hole_tester.cpp:194
@@ -24722,6 +25714,14 @@ msgstr "通过太多层的微孔(%s 和 %s 不相邻)"
 msgid " (%s %s; actual %s)"
 msgstr " (%s %s; 实际 %s)"
 
+#: pcbnew/drc/drc_clearance_test_functions.cpp:237
+#: pcbnew/drc/drc_clearance_test_functions.cpp:261
+#: qa/drc_proto/drc_clearance_test_functions.cpp:336
+#: qa/drc_proto/drc_clearance_test_functions.cpp:360
+#, c-format
+msgid "Via annulus too small (%s %s; actual %s)"
+msgstr "过孔环隙太小 (%s %s; 实际 %s)"
+
 #: pcbnew/drc/drc_item.cpp:43 qa/drc_proto/drc_item.cpp:40
 msgid "Unconnected items"
 msgstr "未连接的项目"
@@ -24843,9 +25843,9 @@ msgstr "错误的封装"
 msgid "Extra footprint"
 msgstr "多余的封装"
 
-#: pcbnew/drc/drc_keepout_tester.cpp:99 pcbnew/drc/drc_keepout_tester.cpp:141
-#: pcbnew/drc/drc_keepout_tester.cpp:191 pcbnew/drc/drc_keepout_tester.cpp:241
-#: pcbnew/drc/drc_keepout_tester.cpp:259 pcbnew/drc/drc_keepout_tester.cpp:310
+#: pcbnew/drc/drc_keepout_tester.cpp:100 pcbnew/drc/drc_keepout_tester.cpp:142
+#: pcbnew/drc/drc_keepout_tester.cpp:195 pcbnew/drc/drc_keepout_tester.cpp:245
+#: pcbnew/drc/drc_keepout_tester.cpp:263 pcbnew/drc/drc_keepout_tester.cpp:314
 #: qa/drc_proto/drc_keepout_tester.cpp:101
 #: qa/drc_proto/drc_keepout_tester.cpp:153
 #: qa/drc_proto/drc_keepout_tester.cpp:203
@@ -24856,112 +25856,100 @@ msgstr "多余的封装"
 msgid " (%s)"
 msgstr " (%s)"
 
-#: pcbnew/drc/drc_rule_parser.cpp:100 pcbnew/drc/drc_rule_parser.cpp:172
-#: pcbnew/drc/drc_rule_parser.cpp:301 qa/drc_proto/drc_rule_parser.cpp:91
-#: qa/drc_proto/drc_rule_parser.cpp:212
+#: pcbnew/drc/drc_rule.cpp:126 pcbnew/drc/drc_rule_parser.cpp:60
+#: pcbnew/drc/drc_rule_parser.cpp:407 qa/drc_proto/drc_rule_parser.cpp:63
+#, c-format
+msgid "ERROR: <a href='%d:%d'>%s</a>%s"
+msgstr "错误：<a href='%d:%d'>%s</a>%s"
+
+#: pcbnew/drc/drc_rule_parser.cpp:98 pcbnew/drc/drc_rule_parser.cpp:178
+#: pcbnew/drc/drc_rule_parser.cpp:318 qa/drc_proto/drc_rule_parser.cpp:101
+#: qa/drc_proto/drc_rule_parser.cpp:177 qa/drc_proto/drc_rule_parser.cpp:308
 msgid "Missing '('."
 msgstr "缺少 '('。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:106 qa/drc_proto/drc_rule_parser.cpp:97
+#: pcbnew/drc/drc_rule_parser.cpp:104 qa/drc_proto/drc_rule_parser.cpp:107
 msgid "Missing version statement."
 msgstr "缺少版本说明。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:118 qa/drc_proto/drc_rule_parser.cpp:109
+#: pcbnew/drc/drc_rule_parser.cpp:116 qa/drc_proto/drc_rule_parser.cpp:119
 msgid "Missing version number."
 msgstr "缺少版本号。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:130 qa/drc_proto/drc_rule_parser.cpp:121
+#: pcbnew/drc/drc_rule_parser.cpp:128 qa/drc_proto/drc_rule_parser.cpp:131
 #, c-format
 msgid "Unrecognized item '%s'.| Expected version number"
 msgstr "无法识别的项目 '%s'。 | 应为版本号"
 
-#: pcbnew/drc/drc_rule_parser.cpp:136 pcbnew/drc/drc_rule_parser.cpp:211
-#: pcbnew/drc/drc_rule_parser.cpp:244 pcbnew/drc/drc_rule_parser.cpp:328
-#: pcbnew/drc/drc_rule_parser.cpp:353 pcbnew/drc/drc_rule_parser.cpp:378
-#: pcbnew/drc/drc_rule_parser.cpp:434 qa/drc_proto/drc_rule_parser.cpp:127
-#: qa/drc_proto/drc_rule_parser.cpp:241 qa/drc_proto/drc_rule_parser.cpp:261
-#: qa/drc_proto/drc_rule_parser.cpp:281 qa/drc_proto/drc_rule_parser.cpp:373
+#: pcbnew/drc/drc_rule_parser.cpp:134 pcbnew/drc/drc_rule_parser.cpp:211
+#: pcbnew/drc/drc_rule_parser.cpp:338 pcbnew/drc/drc_rule_parser.cpp:358
+#: pcbnew/drc/drc_rule_parser.cpp:378 pcbnew/drc/drc_rule_parser.cpp:455
+#: qa/drc_proto/drc_rule_parser.cpp:137 qa/drc_proto/drc_rule_parser.cpp:212
+#: qa/drc_proto/drc_rule_parser.cpp:328 qa/drc_proto/drc_rule_parser.cpp:348
+#: qa/drc_proto/drc_rule_parser.cpp:368 qa/drc_proto/drc_rule_parser.cpp:461
 #, c-format
 msgid "Unrecognized item '%s'."
 msgstr "无法识别的项目 '%s'。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:148
-#, c-format
-msgid "Unrecognized item '%s'.| Expected 'rule' or 'version'."
-msgstr "无法识别的项目 '%s' 。| 应为的“规则”或“版本”。"
+#: pcbnew/drc/drc_rule_parser.cpp:146 pcbnew/drc/drc_rule_parser.cpp:222
+#: pcbnew/drc/drc_rule_parser.cpp:385
+msgid "Incomplete statement."
+msgstr "声明不完整。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:165 qa/drc_proto/drc_rule_parser.cpp:205
+#: pcbnew/drc/drc_rule_parser.cpp:150 pcbnew/drc/drc_rule_parser.cpp:226
+#: pcbnew/drc/drc_rule_parser.cpp:267 pcbnew/drc/drc_rule_parser.cpp:299
+#: pcbnew/drc/drc_rule_parser.cpp:389 qa/drc_proto/drc_rule_parser.cpp:149
+#: qa/drc_proto/drc_rule_parser.cpp:223 qa/drc_proto/drc_rule_parser.cpp:265
+#: qa/drc_proto/drc_rule_parser.cpp:292 qa/drc_proto/drc_rule_parser.cpp:398
+#, c-format
+msgid "Unrecognized item '%s'.| Expected %s."
+msgstr "无法识别的项目 '%s'。 | 应为 %s。"
+
+#: pcbnew/drc/drc_rule_parser.cpp:158 qa/drc_proto/drc_rule_parser.cpp:157
+msgid "No errors found."
+msgstr "未发现错误。"
+
+#: pcbnew/drc/drc_rule_parser.cpp:171 qa/drc_proto/drc_rule_parser.cpp:170
 msgid "Missing rule name."
 msgstr "缺少规则名称。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:183
-msgid ""
-"Missing disallowed type.|  Expected 'track', 'via', 'micro_via', "
-"'blind_via', 'pad', 'zone', 'text', 'graphic' or 'hole'."
-msgstr ""
-"缺少不允许的类型。| 应为“布线”、“过孔”、“微孔”、“盲孔”、“焊盘”、“区域”、“文"
-"本”、“图形”或“通孔”。"
-
-#: pcbnew/drc/drc_rule_parser.cpp:201
-#, c-format
-msgid ""
-"Unrecognized item '%s'.|  Expected 'track', 'via', 'micro_via', 'blind_via', "
-"'pad', 'zone', 'text', 'graphic' or 'hole'."
-msgstr ""
-"无法识别的项目 ‘%s’。|应为“布线”、“过孔”、“微孔”、“盲孔”、“焊盘”、“区域”、“文"
-"本”、“图形”或“通孔”。"
-
-#: pcbnew/drc/drc_rule_parser.cpp:226
+#: pcbnew/drc/drc_rule_parser.cpp:193 qa/drc_proto/drc_rule_parser.cpp:192
 msgid "Missing condition expression."
 msgstr "缺少条件表达式。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:237
+#: pcbnew/drc/drc_rule_parser.cpp:204 qa/drc_proto/drc_rule_parser.cpp:205
 #, c-format
 msgid "Unrecognized item '%s'.| Expected quoted expression."
 msgstr "无法识别的项目 '%s'。|应为带引号的表达式。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:255
+#: pcbnew/drc/drc_rule_parser.cpp:235 pcbnew/drc/drc_rule_parser.cpp:295
+#: pcbnew/drc/drc_rule_parser.cpp:310 pcbnew/drc/drc_rule_parser.cpp:397
+msgid "Missing ')'."
+msgstr "缺少 ')'。"
+
+#: pcbnew/drc/drc_rule_parser.cpp:253 qa/drc_proto/drc_rule_parser.cpp:246
 #, c-format
-msgid ""
-"Unrecognized item '%s'.| Expected 'constraint', 'condition' or 'disallow'."
-msgstr "无法识别的项目 '%s'。|应为“约束”、“条件”或“禁用”。"
+msgid "Missing constraint type.|  Expected %s."
+msgstr "缺少约束类型。|  应为 %s。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:278
-msgid ""
-"Missing constraint type.|  Expected 'clearance', 'track_width', "
-"'annulus_width' or 'hole'."
-msgstr "缺少约束类型。|应为“间隙”、“布线宽度”、“环宽度”或“通孔”。"
-
-#: pcbnew/drc/drc_rule_parser.cpp:290
-#, c-format
-msgid ""
-"Unrecognized item '%s'.| Expected 'clearance', 'track_width', "
-"'annulus_width' or 'hole'."
-msgstr "无法识别的项目 '%s'。|应为“间隙”、“布线宽度”、“环宽度”或“通孔”。"
-
-#: pcbnew/drc/drc_rule_parser.cpp:312 qa/drc_proto/drc_rule_parser.cpp:232
+#: pcbnew/drc/drc_rule_parser.cpp:329 qa/drc_proto/drc_rule_parser.cpp:319
 msgid "Missing min value."
 msgstr "缺少最小值。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:339 qa/drc_proto/drc_rule_parser.cpp:272
+#: pcbnew/drc/drc_rule_parser.cpp:349 qa/drc_proto/drc_rule_parser.cpp:339
 msgid "Missing max value."
 msgstr "缺少最大值。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:364 qa/drc_proto/drc_rule_parser.cpp:252
+#: pcbnew/drc/drc_rule_parser.cpp:369 qa/drc_proto/drc_rule_parser.cpp:359
 msgid "Missing opt value."
 msgstr "缺少选择值。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:385 qa/drc_proto/drc_rule_parser.cpp:319
-#, c-format
-msgid "Unrecognized item '%s'.| Expected 'min', 'max' or 'opt'."
-msgstr "无法识别的项目 '%s'。|应为“最小值”、“最大值”或“选项”。"
-
-#: pcbnew/drc/drc_rule_parser.cpp:410 qa/drc_proto/drc_rule_parser.cpp:349
+#: pcbnew/drc/drc_rule_parser.cpp:431 qa/drc_proto/drc_rule_parser.cpp:437
 msgid "Missing layer name or type."
 msgstr "缺少图层名称或类型。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:427 pcbnew/pcb_expr_evaluator.cpp:53
-#: qa/drc_proto/drc_rule_parser.cpp:366
+#: pcbnew/drc/drc_rule_parser.cpp:448 pcbnew/pcb_expr_evaluator.cpp:52
+#: qa/drc_proto/drc_rule_parser.cpp:454
 #, c-format
 msgid "Unrecognized layer '%s' "
 msgstr "无法识别的图层 '%s' "
@@ -24971,20 +25959,20 @@ msgstr "无法识别的图层 '%s' "
 msgid "Missing footprint %s (%s)"
 msgstr "缺失的封装 %s (%s)"
 
-#: pcbnew/eagle_plugin.cpp:904
+#: pcbnew/eagle_plugin.cpp:956
 #, c-format
 msgid "<package> name: \"%s\" duplicated in eagle <library>: \"%s\""
 msgstr "<包> 名称: \"%s\" 在 eagle <库>: \"%s\" 有重复"
 
-#: pcbnew/eagle_plugin.cpp:982
+#: pcbnew/eagle_plugin.cpp:1033
 #, c-format
 msgid "No \"%s\" package in library \"%s\""
 msgstr "没有 \"%s\" 封装在库 \"%s\" 里"
 
-#: pcbnew/eagle_plugin.cpp:2476
+#: pcbnew/eagle_plugin.cpp:2530
 #, c-format
 msgid "Unsupported Eagle layer '%s' (%d), converted to Dwgs.User layer"
-msgstr "不支持的边框层 \"%s\"(%d)，转换为 Dwgs.User 层"
+msgstr "不支持的边框层 \"%s\"(%d)，转换为用户图纸层"
 
 #: pcbnew/exporters/export_d356.cpp:374
 msgid "Export D-356 Test File"
@@ -24999,7 +25987,7 @@ msgstr "保存封装关联文件"
 msgid "Could not create file \"%s\"."
 msgstr "无法创建文件 \"%s\"。"
 
-#: pcbnew/exporters/export_hyperlynx.cpp:191
+#: pcbnew/exporters/export_hyperlynx.cpp:187
 msgid ""
 "File contains pad shapes that are not supported by the Hyperlynx exporter\n"
 "(Supported shapes are oval, rectangle, circle.)\n"
@@ -25009,8 +25997,8 @@ msgstr ""
 "(支持的形状为椭圆形、矩形、圆形。）\n"
 "它们已作为椭圆形焊盘导出器。"
 
-#: pcbnew/exporters/export_idf.cpp:629 pcbnew/exporters/export_idf.cpp:638
-#: pcbnew/exporters/export_idf.cpp:646 pcbnew/exporters/export_vrml.cpp:1696
+#: pcbnew/exporters/export_idf.cpp:627 pcbnew/exporters/export_idf.cpp:636
+#: pcbnew/exporters/export_idf.cpp:644 pcbnew/exporters/export_vrml.cpp:1701
 msgid "IDF Export Failed:\n"
 msgstr "IDF 导出失败：\n"
 
@@ -25030,59 +26018,54 @@ msgstr "VRML 导出失败：轮廓上不能添加孔。"
 msgid "Generate Position File"
 msgstr "生成位置文件"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:264
-#: pcbnew/exporters/gen_footprints_placefile.cpp:391
+#: pcbnew/exporters/gen_footprints_placefile.cpp:272
+#: pcbnew/exporters/gen_footprints_placefile.cpp:386
 #, c-format
 msgid "Unable to create \"%s\"."
 msgstr "无法创建 \"%s\"。"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:270
-#: pcbnew/exporters/gen_footprints_placefile.cpp:400
+#: pcbnew/exporters/gen_footprints_placefile.cpp:278
+#: pcbnew/exporters/gen_footprints_placefile.cpp:395
 #, c-format
 msgid "Front side (top side) place file: \"%s\"."
 msgstr "前面 (顶面) 放置文件：\"%s\"。"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:273
-#: pcbnew/exporters/gen_footprints_placefile.cpp:295
-#: pcbnew/exporters/gen_footprints_placefile.cpp:404
-#: pcbnew/exporters/gen_footprints_placefile.cpp:446
+#: pcbnew/exporters/gen_footprints_placefile.cpp:281
+#: pcbnew/exporters/gen_footprints_placefile.cpp:303
+#: pcbnew/exporters/gen_footprints_placefile.cpp:399
+#: pcbnew/exporters/gen_footprints_placefile.cpp:441
 #, c-format
 msgid "Component count: %d."
 msgstr "元件计数：%d。"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:292
-#: pcbnew/exporters/gen_footprints_placefile.cpp:443
+#: pcbnew/exporters/gen_footprints_placefile.cpp:300
+#: pcbnew/exporters/gen_footprints_placefile.cpp:438
 #, c-format
 msgid "Back side (bottom side) place file: \"%s\"."
 msgstr "背面 (底部放置) 放置文件：\"%s\"。"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:300
-#: pcbnew/exporters/gen_footprints_placefile.cpp:454
+#: pcbnew/exporters/gen_footprints_placefile.cpp:308
+#: pcbnew/exporters/gen_footprints_placefile.cpp:449
 #, c-format
 msgid "Full component count: %d\n"
 msgstr "全部元件数量：%d\n"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:303
-#: pcbnew/exporters/gen_footprints_placefile.cpp:409
-#: pcbnew/exporters/gen_footprints_placefile.cpp:458
+#: pcbnew/exporters/gen_footprints_placefile.cpp:311
+#: pcbnew/exporters/gen_footprints_placefile.cpp:404
+#: pcbnew/exporters/gen_footprints_placefile.cpp:453
 msgid "Component Placement File generation OK."
 msgstr "元件放置文件生成完成。"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:329
+#: pcbnew/exporters/gen_footprints_placefile.cpp:336
 msgid "No footprint for automated placement."
 msgstr "没有封装被自动放置."
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:339
-#, c-format
-msgid "footprint %s (not set as SMD) forced in list"
-msgstr "封装外形 %s（未设置为 SMD）强制在列表中"
-
-#: pcbnew/exporters/gen_footprints_placefile.cpp:398
+#: pcbnew/exporters/gen_footprints_placefile.cpp:393
 #, c-format
 msgid "Place file: \"%s\"."
 msgstr "放置文件：\"%s\"。"
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:529
+#: pcbnew/exporters/gen_footprints_placefile.cpp:524
 #, c-format
 msgid ""
 "Footprint report file created:\n"
@@ -25091,7 +26074,7 @@ msgstr ""
 "生成封装报告文件：\n"
 "\"%s\""
 
-#: pcbnew/exporters/gen_footprints_placefile.cpp:530
+#: pcbnew/exporters/gen_footprints_placefile.cpp:525
 msgid "Footprint Report"
 msgstr "封装报告"
 
@@ -25112,7 +26095,7 @@ msgstr "无法创建工作文件 \"%s\"。"
 msgid "Create Gerber job file \"%s\""
 msgstr "创建 Gerber 工作文件 \"%s\""
 
-#: pcbnew/exporters/gerber_jobfile_writer.cpp:570
+#: pcbnew/exporters/gerber_jobfile_writer.cpp:575
 msgid ""
 "Board stackup settings not up to date\n"
 "Please fix the stackup"
@@ -25120,46 +26103,46 @@ msgstr ""
 "板堆叠设置不是最新的\n"
 "请修复堆叠"
 
-#: pcbnew/files.cpp:141
+#: pcbnew/files.cpp:134
 msgid "Open Board File"
 msgstr "打开电路板文件"
 
-#: pcbnew/files.cpp:141
+#: pcbnew/files.cpp:134
 msgid "Import Non KiCad Board File"
 msgstr "导入非 KiCad 电路板文件"
 
-#: pcbnew/files.cpp:177
+#: pcbnew/files.cpp:170
 msgid "Save Board File As"
 msgstr "另存文件"
 
-#: pcbnew/files.cpp:200
+#: pcbnew/files.cpp:193
 msgid "Printed circuit board"
 msgstr "印刷电路板"
 
-#: pcbnew/files.cpp:264
+#: pcbnew/files.cpp:257
 #, c-format
 msgid "Recovery file \"%s\" not found."
 msgstr "没有找到备份文件 \"%s\"。"
 
-#: pcbnew/files.cpp:269
+#: pcbnew/files.cpp:262
 #, c-format
 msgid "OK to load recovery file \"%s\""
 msgstr "确定加载恢复文件 \"%s\""
 
-#: pcbnew/files.cpp:292
+#: pcbnew/files.cpp:285
 #, c-format
 msgid "Current board will be closed, save changes to \"%s\" before continuing?"
 msgstr "当前电路板将关闭，是否在继续之前保存对 \"%s\" 的更改？"
 
-#: pcbnew/files.cpp:300
+#: pcbnew/files.cpp:293
 msgid "Current Board will be closed. Continue?"
 msgstr "当前电路板将关闭。是否继续？"
 
-#: pcbnew/files.cpp:344
+#: pcbnew/files.cpp:334
 msgid "noname"
 msgstr "无名称"
 
-#: pcbnew/files.cpp:442
+#: pcbnew/files.cpp:431
 msgid ""
 "If the zones on this board are refilled the Copper Edge Clearance\n"
 "setting will be used (see Board Setup > Design Rules).  This may\n"
@@ -25171,25 +26154,25 @@ msgstr ""
 "导致与之前使用的 KiCad 版本不同的填充\n"
 "板框图层上板边界的线宽。"
 
-#: pcbnew/files.cpp:446
+#: pcbnew/files.cpp:435
 msgid "Edge Clearance Warning"
 msgstr "边缘间隙警告"
 
-#: pcbnew/files.cpp:477
+#: pcbnew/files.cpp:466
 #, c-format
 msgid "PCB file \"%s\" is already open."
 msgstr "PCB 文件 \"%s\" 已经打开。"
 
-#: pcbnew/files.cpp:484
+#: pcbnew/files.cpp:473
 msgid "The current PCB has been modified.  Save changes?"
 msgstr "当前 PCB 已被修改。是否保存更改？"
 
-#: pcbnew/files.cpp:503
+#: pcbnew/files.cpp:492
 #, c-format
 msgid "PCB \"%s\" does not exist.  Do you wish to create it?"
 msgstr "PCB \"%s\" 不存在，你想创建它吗？"
 
-#: pcbnew/files.cpp:625
+#: pcbnew/files.cpp:617
 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."
@@ -25197,12 +26180,12 @@ msgstr ""
 "这个文件是由 Pcbnew 旧版本创建\n"
 "当您保存此文件，它会以新的文件格式存储。"
 
-#: pcbnew/files.cpp:703 pcbnew/files.cpp:836
+#: pcbnew/files.cpp:696 pcbnew/files.cpp:838
 #, c-format
 msgid "No access rights to write to file \"%s\""
 msgstr "没有权限写入文件 \"%s\""
 
-#: pcbnew/files.cpp:762 pcbnew/files.cpp:860
+#: pcbnew/files.cpp:764 pcbnew/files.cpp:862
 #, c-format
 msgid ""
 "Error saving board file \"%s\".\n"
@@ -25211,7 +26194,7 @@ msgstr ""
 "保存电路板文件 \"%s\" 错误。\n"
 "%s"
 
-#: pcbnew/files.cpp:781
+#: pcbnew/files.cpp:783
 #, c-format
 msgid ""
 "Error saving board file \"%s\".\n"
@@ -25220,12 +26203,12 @@ msgstr ""
 "保存电路板文件 \"%s\" 时出错。\n"
 "重命名临时文件 \"%s\" 失败"
 
-#: pcbnew/files.cpp:816
+#: pcbnew/files.cpp:818
 #, c-format
 msgid "Wrote board file: \"%s\""
 msgstr "写板文件：\"%s\""
 
-#: pcbnew/files.cpp:868
+#: pcbnew/files.cpp:870
 #, c-format
 msgid ""
 "Board copied to:\n"
@@ -25234,7 +26217,7 @@ msgstr ""
 "PCB 复制到：\n"
 "\"%s\""
 
-#: pcbnew/files.cpp:985
+#: pcbnew/files.cpp:987
 #, c-format
 msgid ""
 "Error occurred saving project specific footprint library table:\n"
@@ -25245,39 +26228,48 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/footprint_edit_frame.cpp:170 pcbnew/zone_settings.cpp:204
+#: pcbnew/footprint_edit_frame.cpp:167 pcbnew/zone_settings.cpp:218
 msgid "Inner layers"
 msgstr "内部图层"
 
-#: pcbnew/footprint_edit_frame.cpp:235
+#: pcbnew/footprint_edit_frame.cpp:226 pcbnew/pcb_edit_frame.cpp:265
+msgid "Selection Filter"
+msgstr "选择筛选器"
+
+#: pcbnew/footprint_edit_frame.cpp:249
 msgid "Footprint changes are unsaved"
 msgstr "封装更改未保存"
 
-#: pcbnew/footprint_edit_frame.cpp:681
+#: pcbnew/footprint_edit_frame.cpp:411
+#, c-format
+msgid "Editing %s from board.  Saving will update the board only."
+msgstr "正在从电路板编辑 %s。保存只会更新电路板。"
+
+#: pcbnew/footprint_edit_frame.cpp:722
 msgid "[Read Only]"
 msgstr "[只读]"
 
-#: pcbnew/footprint_edit_frame.cpp:688
+#: pcbnew/footprint_edit_frame.cpp:729
 msgid "[Unsaved]"
 msgstr "[未保存]"
 
-#: pcbnew/footprint_edit_frame.cpp:753
+#: pcbnew/footprint_edit_frame.cpp:794
 msgid "Updating Footprint Libraries"
 msgstr "更新封装库"
 
-#: pcbnew/footprint_edit_frame.cpp:833
+#: pcbnew/footprint_edit_frame.cpp:874
 msgid "Default Values"
 msgstr "默认值"
 
-#: pcbnew/footprint_edit_frame.cpp:915
+#: pcbnew/footprint_edit_frame.cpp:1055
 msgid "No footprint selected."
 msgstr "没有选择封装。"
 
-#: pcbnew/footprint_edit_frame.cpp:924
+#: pcbnew/footprint_edit_frame.cpp:1064
 msgid "Footprint Image File Name"
 msgstr "封装图像文件名称"
 
-#: pcbnew/footprint_editor_utils.cpp:183 pcbnew/initpcb.cpp:103
+#: pcbnew/footprint_editor_utils.cpp:183 pcbnew/initpcb.cpp:104
 msgid "The current footprint has been modified.  Save changes?"
 msgstr "当前封装已被修改。是否保存更改？"
 
@@ -25285,7 +26277,7 @@ msgstr "当前封装已被修改。是否保存更改？"
 msgid "Edit Zone"
 msgstr "编辑区域"
 
-#: pcbnew/footprint_editor_utils.cpp:477
+#: pcbnew/footprint_editor_utils.cpp:476
 #, c-format
 msgid ""
 "The current configuration does not include the footprint library\n"
@@ -25297,11 +26289,11 @@ msgstr ""
 "使用管理封装库来编辑配置。\n"
 "来编辑配置。"
 
-#: pcbnew/footprint_editor_utils.cpp:480
+#: pcbnew/footprint_editor_utils.cpp:479
 msgid "Library not found in footprint library table."
 msgstr "在封装库表中未找到库。"
 
-#: pcbnew/footprint_editor_utils.cpp:488 pcbnew/footprint_viewer_frame.cpp:869
+#: pcbnew/footprint_editor_utils.cpp:487 pcbnew/footprint_viewer_frame.cpp:915
 #, c-format
 msgid ""
 "The library with the nickname \"%s\" is not enabled\n"
@@ -25312,15 +26304,15 @@ msgstr ""
 "在当前配置中，使用封装库管理\n"
 "来编辑封装。"
 
-#: pcbnew/footprint_editor_utils.cpp:491 pcbnew/footprint_viewer_frame.cpp:872
+#: pcbnew/footprint_editor_utils.cpp:490 pcbnew/footprint_viewer_frame.cpp:918
 msgid "Footprint library not enabled."
 msgstr "封装库未启用。"
 
-#: pcbnew/footprint_info_impl.cpp:137
+#: pcbnew/footprint_info_impl.cpp:131
 msgid "Fetching Footprint Libraries"
 msgstr "获取封装库"
 
-#: pcbnew/footprint_info_impl.cpp:158
+#: pcbnew/footprint_info_impl.cpp:160
 msgid "Loading Footprints"
 msgstr "载入封装"
 
@@ -25375,45 +26367,45 @@ msgstr "无法创建或写入文件 \"%s\""
 msgid "Footprint exported to file \"%s\""
 msgstr "导出封装到文件 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:437
+#: pcbnew/footprint_libraries_utils.cpp:438
 #, c-format
 msgid "Library \"%s\" is read only, not writable"
 msgstr "\"%s\" 库为只读，不可写"
 
-#: pcbnew/footprint_libraries_utils.cpp:444
+#: pcbnew/footprint_libraries_utils.cpp:445
 #, c-format
 msgid "Library %s already exists."
 msgstr "库 \"%s\" 已经存在。"
 
-#: pcbnew/footprint_libraries_utils.cpp:498
+#: pcbnew/footprint_libraries_utils.cpp:506
 msgid "Select Library Table"
 msgstr "选择库表"
 
-#: pcbnew/footprint_libraries_utils.cpp:574
+#: pcbnew/footprint_libraries_utils.cpp:589
 #, c-format
 msgid "Library '%s' is read only"
 msgstr "库 '%s' 为只读"
 
-#: pcbnew/footprint_libraries_utils.cpp:580
+#: pcbnew/footprint_libraries_utils.cpp:595
 #, c-format
 msgid "Delete footprint '%s' from library '%s'?"
 msgstr "删除封装 '%s' 来自库 '%s'？"
 
-#: pcbnew/footprint_libraries_utils.cpp:597
+#: pcbnew/footprint_libraries_utils.cpp:612
 #, c-format
 msgid "Footprint '%s' deleted from library '%s'"
 msgstr "封装 \"%s\" 删除来自库 '%s'"
 
-#: pcbnew/footprint_libraries_utils.cpp:612
+#: pcbnew/footprint_libraries_utils.cpp:627
 msgid "No footprints to archive!"
 msgstr "没有要压缩的封装！"
 
-#: pcbnew/footprint_libraries_utils.cpp:767
-#: pcbnew/footprint_viewer_frame.cpp:677
+#: pcbnew/footprint_libraries_utils.cpp:782
+#: pcbnew/footprint_viewer_frame.cpp:723
 msgid "No board currently open."
 msgstr "当前没有打开的板。"
 
-#: pcbnew/footprint_libraries_utils.cpp:793
+#: pcbnew/footprint_libraries_utils.cpp:808
 msgid ""
 "Unable to find the footprint on the main board.\n"
 "Cannot save."
@@ -25421,50 +26413,50 @@ msgstr ""
 "无法在主电路板板上找到封装。\n"
 "无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:799
+#: pcbnew/footprint_libraries_utils.cpp:814
 msgid "Footprint already exists on board."
 msgstr "封装已经存在于电路板上。"
 
-#: pcbnew/footprint_libraries_utils.cpp:873
+#: pcbnew/footprint_libraries_utils.cpp:888
 msgid "Save Footprint"
 msgstr "保存封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:910
+#: pcbnew/footprint_libraries_utils.cpp:925
 msgid "No library specified.  Footprint could not be saved."
 msgstr "没有指定库，封装无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:920
+#: pcbnew/footprint_libraries_utils.cpp:935
 msgid "No footprint name specified.  Footprint could not be saved."
 msgstr "没有指定封装名称, 封装无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:944
+#: pcbnew/footprint_libraries_utils.cpp:959
 #, c-format
 msgid "Footprint %s already exists in %s."
 msgstr "封装 \"%s\" 已经存在于 \"%s\" 中。"
 
-#: pcbnew/footprint_libraries_utils.cpp:960
+#: pcbnew/footprint_libraries_utils.cpp:975
 #, c-format
 msgid "Component \"%s\" replaced in \"%s\""
 msgstr "元件 \"%s\" 替换为 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:961
+#: pcbnew/footprint_libraries_utils.cpp:976
 #, c-format
 msgid "Component \"%s\" added in  \"%s\""
 msgstr "元件 \"%s\" 添加到 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:1009
+#: pcbnew/footprint_libraries_utils.cpp:1024
 msgid "Enter footprint name:"
 msgstr "输入封装名称:"
 
-#: pcbnew/footprint_libraries_utils.cpp:1009
+#: pcbnew/footprint_libraries_utils.cpp:1024
 msgid "New Footprint"
 msgstr "新建封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:1022
+#: pcbnew/footprint_libraries_utils.cpp:1037
 msgid "No footprint name defined."
 msgstr "没有定义封装名称."
 
-#: pcbnew/footprint_viewer_frame.cpp:158
+#: pcbnew/footprint_viewer_frame.cpp:159
 msgid ""
 "Filter on footprint name, keywords, description and pad count.\n"
 "Search terms are separated by spaces.  All search terms must match.\n"
@@ -25474,7 +26466,7 @@ msgstr ""
 "搜索词按空格分隔。 所有搜索词必须匹配。\n"
 "数字的术语也将与焊盘计数匹配。"
 
-#: pcbnew/footprint_viewer_frame.cpp:625
+#: pcbnew/footprint_viewer_frame.cpp:673
 #, c-format
 msgid ""
 "Could not load footprint '%s' from library '%s'.\n"
@@ -25485,7 +26477,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/footprint_viewer_frame.cpp:862
+#: pcbnew/footprint_viewer_frame.cpp:908
 #, c-format
 msgid ""
 "The current configuration does not include a library with the\n"
@@ -25496,53 +26488,53 @@ msgstr ""
 "昵称 \"%s\"。使用封装库管理\n"
 "来编辑配置。"
 
-#: pcbnew/footprint_viewer_frame.cpp:865
+#: pcbnew/footprint_viewer_frame.cpp:911
 msgid "Footprint library not found."
 msgstr "封装库没有找到。"
 
-#: pcbnew/footprint_wizard_frame.cpp:83
-#: pcbnew/footprint_wizard_frame_functions.cpp:79
+#: pcbnew/footprint_wizard_frame.cpp:82
+#: pcbnew/footprint_wizard_frame_functions.cpp:80
 msgid "Footprint Wizard"
 msgstr "封装向导"
 
-#: pcbnew/footprint_wizard_frame.cpp:203
+#: pcbnew/footprint_wizard_frame.cpp:202
 msgid "Parameters"
 msgstr "参数"
 
-#: pcbnew/footprint_wizard_frame.cpp:335
+#: pcbnew/footprint_wizard_frame.cpp:334
 msgid "Parameter"
 msgstr "参数"
 
-#: pcbnew/footprint_wizard_frame.cpp:584
+#: pcbnew/footprint_wizard_frame.cpp:583
 #, c-format
 msgid "ModView: 3D Viewer [%s]"
 msgstr "模型浏览：3D 查看器 [%s]"
 
-#: pcbnew/footprint_wizard_frame.cpp:600
+#: pcbnew/footprint_wizard_frame.cpp:599
 msgid "Select wizard script to run"
 msgstr "选择向导脚本运行"
 
-#: pcbnew/footprint_wizard_frame.cpp:605
+#: pcbnew/footprint_wizard_frame.cpp:604
 msgid "Reset wizard parameters to default"
 msgstr "重置向导参数为默认值"
 
-#: pcbnew/footprint_wizard_frame.cpp:610
+#: pcbnew/footprint_wizard_frame.cpp:609
 msgid "Select previous parameters page"
 msgstr "选择上一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:613
+#: pcbnew/footprint_wizard_frame.cpp:612
 msgid "Select next parameters page"
 msgstr "选择下一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:628
+#: pcbnew/footprint_wizard_frame.cpp:627
 msgid "Export footprint to editor"
 msgstr "导出封装到编辑器"
 
-#: pcbnew/footprint_wizard_frame_functions.cpp:85
+#: pcbnew/footprint_wizard_frame_functions.cpp:86
 msgid "no wizard selected"
 msgstr "没有向导选择"
 
-#: pcbnew/footprint_wizard_frame_functions.cpp:141
+#: pcbnew/footprint_wizard_frame_functions.cpp:138
 msgid "Couldn't reload footprint wizard"
 msgstr "无法重复载入封装向导"
 
@@ -25574,7 +26566,7 @@ msgstr ""
 "不正确的 URL 格式：\n"
 "\"%s\""
 
-#: pcbnew/github/github_getliblist.cpp:234
+#: pcbnew/github/github_getliblist.cpp:232
 #, c-format
 msgid ""
 "Error fetching JSON data from URL \"%s\".\n"
@@ -25583,7 +26575,7 @@ msgstr ""
 "从 URL \"%s\" 获取 JSON 数据出错。\n"
 "原因：\"%s\""
 
-#: pcbnew/github/github_plugin.cpp:303
+#: pcbnew/github/github_plugin.cpp:300
 #, c-format
 msgid ""
 "Footprint\n"
@@ -25596,7 +26588,7 @@ msgstr ""
 "在 GitHub 库 \"%s\" \n"
 "是不可写的"
 
-#: pcbnew/github/github_plugin.cpp:353
+#: pcbnew/github/github_plugin.cpp:350
 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 "
@@ -25610,7 +26602,7 @@ msgstr ""
 "为更新发送给库的维护者。\n"
 "由于封装的格式为 pretty，<p>目录<b>必须</b>有一个<b>.pretty</b>的扩展名。</p>"
 
-#: pcbnew/github/github_plugin.cpp:408
+#: pcbnew/github/github_plugin.cpp:405
 #, c-format
 msgid ""
 "option \"%s\" for Github library \"%s\" must point to a writable directory "
@@ -25618,7 +26610,7 @@ msgid ""
 msgstr ""
 "选项 \"%s\" 对于 GitHub 库 \"%s\" 必须指向一个以 '.pretty' 结尾的可写目录。"
 
-#: pcbnew/github/github_plugin.cpp:564
+#: pcbnew/github/github_plugin.cpp:559
 #, c-format
 msgid ""
 "Unable to parse URL:\n"
@@ -25627,7 +26619,7 @@ msgstr ""
 "无法解析网址：\n"
 "\"%s\""
 
-#: pcbnew/github/github_plugin.cpp:588
+#: pcbnew/github/github_plugin.cpp:581
 #, c-format
 msgid ""
 "%s\n"
@@ -25640,7 +26632,7 @@ msgstr ""
 "从库路径：\"%s\"。\n"
 "原因：\"%s\""
 
-#: pcbnew/github/github_plugin.cpp:605
+#: pcbnew/github/github_plugin.cpp:598
 #, c-format
 msgid ""
 "Cannot download library \"%s\".\n"
@@ -25659,7 +26651,7 @@ msgstr "\"%s\" 无法转换为整数"
 msgid "footprint library path \"%s\" does not exist"
 msgstr "封装库路径 \"%s\" 不存在"
 
-#: pcbnew/gpcb_plugin.cpp:287 pcbnew/kicad_plugin.cpp:319
+#: pcbnew/gpcb_plugin.cpp:287 pcbnew/kicad_plugin.cpp:296
 #, c-format
 msgid "library \"%s\" has no footprint \"%s\" to delete"
 msgstr "库 \"%s\" 中没有封装 \"%s\" 可删除"
@@ -25674,7 +26666,7 @@ msgstr "未知标记 \"%s\""
 msgid "Element token contains %d parameters."
 msgstr "元素标记包含 %d 个参数。"
 
-#: pcbnew/gpcb_plugin.cpp:961 pcbnew/kicad_plugin.cpp:2117
+#: pcbnew/gpcb_plugin.cpp:961 pcbnew/kicad_plugin.cpp:2195
 #, c-format
 msgid "Library \"%s\" is read only"
 msgstr "\"%s\" 库为只读"
@@ -25699,27 +26691,27 @@ msgstr "在库路径 \"%s\" 中找到了额外的文件 \"%s\""
 msgid "footprint library \"%s\" cannot be deleted"
 msgstr "封装库 \"%s\" 不能被删除"
 
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:227
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:228
 msgid "All supported formats|"
 msgstr "所有支持的库格式|"
 
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:229
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:230
 msgid "Open File"
 msgstr "打开文件"
 
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:254
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:255
 msgid "No file selected!"
 msgstr "没有选中的文件！"
 
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:265
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:266
 msgid "Please select a valid layer."
 msgstr "请选择一个有效的层。"
 
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:300
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:301
 msgid "Items in the imported file could not be handled properly."
 msgstr "无法正确处理导入文件中的项目。"
 
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:308
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:309
 msgid "There is no plugin to handle this file type."
 msgstr "没有处理此文件类型的插件。"
 
@@ -25769,11 +26761,19 @@ msgstr "图形层："
 msgid "Import scale:"
 msgstr "导入比例："
 
-#: pcbnew/import_gfx/dialog_import_gfx_base.h:79
+#: pcbnew/import_gfx/dialog_import_gfx_base.cpp:181
+msgid "Group items"
+msgstr "组项目"
+
+#: pcbnew/import_gfx/dialog_import_gfx_base.cpp:182
+msgid "Add all imported items into a new group"
+msgstr "将所有导入的项目添加到新组中"
+
+#: pcbnew/import_gfx/dialog_import_gfx_base.h:84
 msgid "Import Vector Graphics File"
 msgstr "导入矢量图形文件"
 
-#: pcbnew/initpcb.cpp:50
+#: pcbnew/initpcb.cpp:51
 msgid ""
 "Current Board will be lost and this operation cannot be undone. Continue?"
 msgstr "当前电路板将丢失，此操作无法撤消。继续吗？"
@@ -25783,50 +26783,69 @@ msgstr "当前电路板将丢失，此操作无法撤消。继续吗？"
 msgid "UNKNOWN (%d)"
 msgstr "未知(%d)"
 
-#: pcbnew/kicad_clipboard.cpp:371
+#: pcbnew/kicad_clipboard.cpp:385
 msgid "Clipboard content is not KiCad compatible"
 msgstr "剪贴板内容不兼容 KiCad"
 
-#: pcbnew/kicad_plugin.cpp:190
+#: pcbnew/kicad_plugin.cpp:167
 #, c-format
 msgid "Cannot create footprint library path \"%s\""
 msgstr "不能创建封装库路径 \"%s\""
 
-#: pcbnew/kicad_plugin.cpp:196
+#: pcbnew/kicad_plugin.cpp:173
 #, c-format
 msgid "Footprint library path \"%s\" is read only"
 msgstr "封装库路径 \"%s\" 只读"
 
-#: pcbnew/kicad_plugin.cpp:235
+#: pcbnew/kicad_plugin.cpp:212
 #, c-format
 msgid "Cannot rename temporary file \"%s\" to footprint library file \"%s\""
 msgstr "无法重命名临时文件 \"%s\" 到封装库文件 \"%s\""
 
-#: pcbnew/kicad_plugin.cpp:262
+#: pcbnew/kicad_plugin.cpp:239
 #, c-format
 msgid "Footprint library path '%s' does not exist (or is not a directory)."
 msgstr "封装库路径 \"%s\" 不存在（或不是目录）。"
 
-#: pcbnew/kicad_plugin.cpp:1175 pcbnew/legacy_plugin.cpp:98
+#: pcbnew/kicad_plugin.cpp:340
+#, c-format
+msgid ""
+"Please report this bug.  Error validating group structure: %s\n"
+"\n"
+"Save anyway?"
+msgstr ""
+"请报告此错误。验证组结构时出错：%s。\n"
+"\n"
+"还是要保存吗？"
+
+#: pcbnew/kicad_plugin.cpp:342
+msgid "Internal group data structure corrupt"
+msgstr "内部组数据结构损坏"
+
+#: pcbnew/kicad_plugin.cpp:344
+msgid "Save Anyway"
+msgstr "仍要保存"
+
+#: pcbnew/kicad_plugin.cpp:1209 pcbnew/legacy_plugin.cpp:98
 #, c-format
 msgid "unknown pad type: %d"
 msgstr "未知焊盘类型：%d"
 
-#: pcbnew/kicad_plugin.cpp:1563
+#: pcbnew/kicad_plugin.cpp:1626
 #, c-format
 msgid "unknown via type %d"
 msgstr "未知过孔类型 %d"
 
-#: pcbnew/kicad_plugin.cpp:1729
+#: pcbnew/kicad_plugin.cpp:1794
 #, c-format
 msgid "unknown zone corner smoothing type %d"
 msgstr "未知铜区角平滑类型  %d"
 
-#: pcbnew/kicad_plugin.cpp:1964
+#: pcbnew/kicad_plugin.cpp:2046
 msgid "this file does not contain a PCB"
 msgstr "此文件不包含 PCB"
 
-#: pcbnew/kicad_plugin.cpp:2105
+#: pcbnew/kicad_plugin.cpp:2183
 #, c-format
 msgid ""
 "Library \"%s\" does not exist.\n"
@@ -25835,46 +26854,46 @@ msgstr ""
 "库 \"%s\" 不存在。\n"
 "是否要创建它？"
 
-#: pcbnew/kicad_plugin.cpp:2109
+#: pcbnew/kicad_plugin.cpp:2187
 msgid "Library Not Found"
 msgstr "未找到库"
 
-#: pcbnew/kicad_plugin.cpp:2148
+#: pcbnew/kicad_plugin.cpp:2226
 #, c-format
 msgid "Footprint file name \"%s\" is not valid."
 msgstr "无效的封装文件名称 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2154
+#: pcbnew/kicad_plugin.cpp:2232
 #, c-format
 msgid "No write permissions to delete file \"%s\""
 msgstr "没有写入权限来删除文件 \"%s\""
 
-#: pcbnew/kicad_plugin.cpp:2203
+#: pcbnew/kicad_plugin.cpp:2281
 #, c-format
 msgid "Library \"%s\" is read only."
 msgstr "\"%s\" 库为只读。"
 
-#: pcbnew/kicad_plugin.cpp:2222
+#: pcbnew/kicad_plugin.cpp:2300
 #, c-format
 msgid "Cannot overwrite library path \"%s\"."
 msgstr "不能覆盖库路径 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2247
+#: pcbnew/kicad_plugin.cpp:2325
 #, c-format
 msgid "User does not have permission to delete directory \"%s\"."
 msgstr "用户没有权限删除目录 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2255
+#: pcbnew/kicad_plugin.cpp:2333
 #, c-format
 msgid "Library directory \"%s\" has unexpected sub-directories."
 msgstr "库目录 \"%s\" 有额外的子目录。"
 
-#: pcbnew/kicad_plugin.cpp:2274
+#: pcbnew/kicad_plugin.cpp:2352
 #, c-format
 msgid "Unexpected file \"%s\" was found in library path \"%s\"."
 msgstr "在库路径 \"%s\" 中找到了额外的文件 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2290
+#: pcbnew/kicad_plugin.cpp:2368
 #, c-format
 msgid "Footprint library \"%s\" cannot be deleted."
 msgstr "封装库 \"%s\" 不能被删除。"
@@ -25887,7 +26906,10 @@ msgstr "更改层的颜色 "
 msgid "Change Render Color for "
 msgstr "更改渲染颜色 "
 
-#: pcbnew/layer_widget.cpp:337
+#: pcbnew/layer_widget.cpp:337 pcbnew/widgets/appearance_controls.cpp:675
+#: pcbnew/widgets/appearance_controls.cpp:1007
+#: pcbnew/widgets/appearance_controls.cpp:1488
+#: pcbnew/widgets/appearance_controls.cpp:1687
 msgid ""
 "Left double click or middle click for color change, right click for menu"
 msgstr "双击鼠标左键或点击中键修改颜色，单击右键弹出菜单"
@@ -25921,42 +26943,42 @@ msgstr "未知图形类型：%d"
 msgid "unknown pad attribute: %d"
 msgstr "未知焊盘属性：%d"
 
-#: pcbnew/legacy_plugin.cpp:715
+#: pcbnew/legacy_plugin.cpp:713
 #, c-format
 msgid "Unknown sheet type \"%s\" on line:%d"
 msgstr "未知图框类型 \"%s\" 在线：%d"
 
-#: pcbnew/legacy_plugin.cpp:1397
+#: pcbnew/legacy_plugin.cpp:1396
 #, c-format
 msgid "Missing '$EndMODULE' for MODULE \"%s\""
 msgstr "模块 \"%s\" 缺少 '$EndMODULE'"
 
-#: pcbnew/legacy_plugin.cpp:1448
+#: pcbnew/legacy_plugin.cpp:1447
 #, c-format
 msgid "Unknown padshape '%c=0x%02x' on line: %d of footprint: \"%s\""
 msgstr "未知焊盘形状 '%c=0x%02x' 在 %d 行的封装：\"%s\""
 
-#: pcbnew/legacy_plugin.cpp:1651
+#: pcbnew/legacy_plugin.cpp:1650
 #, c-format
 msgid "Unknown EDGE_MODULE type:'%c=0x%02x' on line:%d of footprint:\"%s\""
 msgstr "未知 EDGE_MODULE 类型 '%c=0x%02x' 在 %d 行的封装：\"%s\""
 
-#: pcbnew/legacy_plugin.cpp:2425
+#: pcbnew/legacy_plugin.cpp:2427
 #, c-format
 msgid "duplicate NETCLASS name \"%s\""
 msgstr "复制网络类名称 \"%s\""
 
-#: pcbnew/legacy_plugin.cpp:2504 pcbnew/legacy_plugin.cpp:2515
+#: pcbnew/legacy_plugin.cpp:2506 pcbnew/legacy_plugin.cpp:2517
 #, c-format
 msgid "Bad ZAux for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\"的错误 ZAux"
 
-#: pcbnew/legacy_plugin.cpp:2533
+#: pcbnew/legacy_plugin.cpp:2535
 #, c-format
 msgid "Bad ZSmoothing for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\"是坏的 ZSmoothing"
 
-#: pcbnew/legacy_plugin.cpp:2589 pcbnew/pcb_parser.cpp:3945
+#: pcbnew/legacy_plugin.cpp:2591 pcbnew/pcb_parser.cpp:4153
 msgid ""
 "The legacy segment fill mode is no longer supported.\n"
 "Convert zones to polygon fills?"
@@ -25964,16 +26986,16 @@ msgstr ""
 "不再支持旧段填充模式。\n"
 "是否将区域转换为多边形填充？"
 
-#: pcbnew/legacy_plugin.cpp:2591 pcbnew/pcb_parser.cpp:3947
+#: pcbnew/legacy_plugin.cpp:2593 pcbnew/pcb_parser.cpp:4155
 msgid "Legacy Zone Warning"
 msgstr "旧区警告"
 
-#: pcbnew/legacy_plugin.cpp:2628
+#: pcbnew/legacy_plugin.cpp:2630
 #, c-format
 msgid "Bad ZClearance padoption for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\" 的 ZClearance 选项不正确"
 
-#: pcbnew/legacy_plugin.cpp:2948 pcbnew/legacy_plugin.cpp:2985
+#: pcbnew/legacy_plugin.cpp:2950 pcbnew/legacy_plugin.cpp:2987
 #, c-format
 msgid ""
 "invalid float number in file: \"%s\"\n"
@@ -25982,7 +27004,7 @@ msgstr ""
 "文件中的浮点数字无效：\"%s\"\n"
 "行：%d, 偏移量：%d"
 
-#: pcbnew/legacy_plugin.cpp:2957 pcbnew/legacy_plugin.cpp:2993
+#: pcbnew/legacy_plugin.cpp:2959 pcbnew/legacy_plugin.cpp:2995
 #, c-format
 msgid ""
 "missing float number in file: \"%s\"\n"
@@ -25991,12 +27013,12 @@ msgstr ""
 "文件中缺少浮点数：\"%s\"\n"
 "行：%d，偏移量：%d"
 
-#: pcbnew/legacy_plugin.cpp:3193
+#: pcbnew/legacy_plugin.cpp:3195
 #, c-format
 msgid "File '%s' is empty."
 msgstr "文件 \"%s\" 为空。"
 
-#: pcbnew/legacy_plugin.cpp:3196
+#: pcbnew/legacy_plugin.cpp:3198
 #, c-format
 msgid "File '%s' is not a legacy library."
 msgstr "文件 \"%s\" 不是一个旧库。"
@@ -26006,66 +27028,66 @@ msgstr "文件 \"%s\" 不是一个旧库。"
 msgid "Choose Footprint (%d items loaded)"
 msgstr "选择封装(共 %d 项)"
 
-#: pcbnew/load_select_footprint.cpp:348
+#: pcbnew/load_select_footprint.cpp:341
 #, c-format
 msgid "Footprints [%u items]"
 msgstr "封装 [%u 项]"
 
-#: pcbnew/load_select_footprint.cpp:412
+#: pcbnew/load_select_footprint.cpp:405
 #, c-format
 msgid "Footprint \"%s\" saved"
 msgstr "封装 \"%s\" 保存"
 
-#: pcbnew/load_select_footprint.cpp:422
+#: pcbnew/load_select_footprint.cpp:415
 #, c-format
 msgid "Footprint library \"%s\" saved as \"%s\"."
 msgstr "封装库 \"%s\" 另存为 \"%s\"。"
 
-#: pcbnew/menubar_footprint_editor.cpp:84
+#: pcbnew/menubar_footprint_editor.cpp:77
 msgid "&Import Graphics..."
 msgstr "导入图形... (&I)"
 
-#: pcbnew/menubar_footprint_editor.cpp:85
+#: pcbnew/menubar_footprint_editor.cpp:78
 msgid "Import 2D Drawing file to Footprint Editor on Drawings layer"
 msgstr "在绘制图层上将 2D 绘制导入到封装编辑器"
 
-#: pcbnew/menubar_footprint_editor.cpp:95
+#: pcbnew/menubar_footprint_editor.cpp:89
 msgid "Export View as &PNG..."
 msgstr "导出视图为 PNG... (&P)"
 
-#: pcbnew/menubar_footprint_editor.cpp:96
+#: pcbnew/menubar_footprint_editor.cpp:90
 msgid "Create a PNG file from the current view"
 msgstr "从当前视图创建一个 PNG 文件"
 
-#: pcbnew/menubar_footprint_editor.cpp:206 pcbnew/menubar_pcb_editor.cpp:366
+#: pcbnew/menubar_footprint_editor.cpp:160 pcbnew/menubar_pcb_editor.cpp:274
 msgid "&Drawing Mode"
 msgstr "绘制模式 (&D)"
 
-#: pcbnew/menubar_footprint_editor.cpp:216 pcbnew/menubar_pcb_editor.cpp:386
+#: pcbnew/menubar_footprint_editor.cpp:170 pcbnew/menubar_pcb_editor.cpp:294
 msgid "&Contrast Mode"
 msgstr "对比度模式 (&C)"
 
-#: pcbnew/menubar_footprint_editor.cpp:262
+#: pcbnew/menubar_footprint_editor.cpp:213
 msgid "&Load Footprint from PCB..."
 msgstr "从 PCB 载入封装... (&L)"
 
-#: pcbnew/menubar_footprint_editor.cpp:263
+#: pcbnew/menubar_footprint_editor.cpp:214
 msgid "Load a footprint from the current board into the editor"
 msgstr "将当前电路板的封装载入到编辑器中"
 
-#: pcbnew/menubar_footprint_editor.cpp:267
+#: pcbnew/menubar_footprint_editor.cpp:218
 msgid "&Insert Footprint on PCB"
 msgstr "在 PCB 上插入封装 (&I)"
 
-#: pcbnew/menubar_footprint_editor.cpp:268
+#: pcbnew/menubar_footprint_editor.cpp:219
 msgid "Insert footprint onto current board"
 msgstr "将封装插入到当前电路板"
 
-#: pcbnew/menubar_pcb_editor.cpp:105
+#: pcbnew/menubar_pcb_editor.cpp:104
 msgid "Resc&ue"
 msgstr "恢复 (&U)"
 
-#: pcbnew/menubar_pcb_editor.cpp:106
+#: pcbnew/menubar_pcb_editor.cpp:105
 msgid "Clear board and get last rescue file automatically saved by Pcbnew"
 msgstr "清除电路板以便恢复最后的自动备份 Pcbnew 文件"
 
@@ -26141,25 +27163,25 @@ msgstr "Hyperlynx..."
 msgid "Fabrication Outputs"
 msgstr "制造输出"
 
-#: pcbnew/menubar_pcb_editor.cpp:187
+#: pcbnew/menubar_pcb_editor.cpp:180
 msgid "Archive Footprints"
 msgstr "压缩封装"
 
-#: pcbnew/menubar_pcb_editor.cpp:190
+#: pcbnew/menubar_pcb_editor.cpp:183
 msgid "&Archive Footprints in Existing Library..."
 msgstr "压缩封装到现有库中... (&A)"
 
-#: pcbnew/menubar_pcb_editor.cpp:191
+#: pcbnew/menubar_pcb_editor.cpp:184
 msgid ""
 "Archive all footprints to existing library in footprint Lib table(does not "
 "remove other footprints in this library)"
 msgstr "将所有封装压缩到现有库的封装库表中 (不会删除此库中的其他封装)"
 
-#: pcbnew/menubar_pcb_editor.cpp:195
+#: pcbnew/menubar_pcb_editor.cpp:188
 msgid "&Create New Library and Archive Footprints..."
 msgstr "创建新库并压缩封装... (&C)"
 
-#: pcbnew/menubar_pcb_editor.cpp:196
+#: pcbnew/menubar_pcb_editor.cpp:189
 msgid ""
 "Archive all footprints to a new library\n"
 "(if the library already exists it will be replaced)"
@@ -26167,31 +27189,43 @@ msgstr ""
 "压缩所有的封装到新库\n"
 "(如果这个库已经存在，将会被替换)"
 
-#: pcbnew/menubar_pcb_editor.cpp:430
+#: pcbnew/menubar_pcb_editor.cpp:336
 msgid "Auto-Place Footprints"
 msgstr "自动放置封装"
 
-#: pcbnew/menubar_pcb_editor.cpp:499
+#: pcbnew/menubar_pcb_editor.cpp:402
 msgid "External Plugins"
 msgstr "外部插件"
 
-#: pcbnew/menubar_pcb_editor.cpp:502
+#: pcbnew/menubar_pcb_editor.cpp:405
 msgid "Refresh Plugins"
 msgstr "刷新插件"
 
-#: pcbnew/menubar_pcb_editor.cpp:503
+#: pcbnew/menubar_pcb_editor.cpp:406
 msgid "Reload all python plugins and refresh plugin menus"
 msgstr "重新加载所有的 Python 插件并刷新插件菜单"
 
-#: pcbnew/menubar_pcb_editor.cpp:529
+#: pcbnew/menubar_pcb_editor.cpp:410
+msgid "Reveal Plugin Folder in Finder"
+msgstr "在查找器中显示插件文件夹"
+
+#: pcbnew/menubar_pcb_editor.cpp:411
+msgid "Reveals the plugins folder in a Finder window"
+msgstr "在查找器窗口中显示插件文件夹"
+
+#: pcbnew/menubar_pcb_editor.cpp:415
+msgid "Open Plugin Directory"
+msgstr "打开插件目录"
+
+#: pcbnew/menubar_pcb_editor.cpp:435
 msgid "Add &3D Shapes Libraries Wizard..."
 msgstr "3D 模型库添加向导... (&3)"
 
-#: pcbnew/menubar_pcb_editor.cpp:530
+#: pcbnew/menubar_pcb_editor.cpp:436
 msgid "Download 3D shape libraries from GitHub"
 msgstr "从 GitHub 下载 3D 模型封装库"
 
-#: pcbnew/menubar_pcb_editor.cpp:553
+#: pcbnew/menubar_pcb_editor.cpp:459
 msgid "Ro&ute"
 msgstr "布线 (&U)"
 
@@ -26328,7 +27362,7 @@ msgstr "无法更新 %s (封装 \"%s\" 未找到)."
 #: pcbnew/netlist_reader/board_netlist_updater.cpp:253
 #, c-format
 msgid "Change %s reference designator to %s."
-msgstr "更改 %s 的参考指示符为 %s。"
+msgstr "更改 %s 的位号为 %s。"
 
 #: pcbnew/netlist_reader/board_netlist_updater.cpp:268
 #, c-format
@@ -26340,96 +27374,111 @@ msgstr "\"%s\" 的值从 \"%s\" 更改为 \"%s\"。"
 msgid "Update %s symbol association from %s to %s."
 msgstr "更新 %s 符号关联从 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:341
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:299
+#, c-format
+msgid "Update %s properties."
+msgstr "更新 %s 属性。"
+
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:318
+#, c-format
+msgid "Setting %s 'exclude from BOM' fabrication attribute."
+msgstr "设置 %s “从 BOM 中排除”制造属性。"
+
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:324
+#, c-format
+msgid "Removing %s 'exclude from BOM' fabrication attribute."
+msgstr "正在删除 %s “从 BOM 中排除”制造属性。"
+
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:381
 #, c-format
 msgid "Disconnect %s pin %s."
 msgstr "断开 %s 引脚 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:349
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:389
 #, c-format
 msgid "No net for component %s pin %s."
 msgstr "元件 %s 引脚 %s 没有网络。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:399
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:439
 #, c-format
 msgid "Add net %s."
 msgstr "添加网络 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:407
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:447
 #, c-format
 msgid "Reconnect %s pin %s from %s to %s."
 msgstr "重新连接 %s 的引脚 %s 从 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:415
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:455
 #, c-format
 msgid "Connect %s pin %s to %s."
 msgstr "连接 %s 的引脚 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:489
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:527
 #, c-format
 msgid "Reconnect via from %s to %s."
 msgstr "重新连接过孔从 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:509
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:548
 #, c-format
 msgid "Via connected to unknown net (%s)."
 msgstr "过孔连接到未知网络 (%s)。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:550
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:587
 #, c-format
 msgid "Reconnect copper zone from %s to %s."
 msgstr "将铜区 %s 重新连接到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:571
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:608
 #, c-format
 msgid "Copper zone (%s) has no pads connected."
 msgstr "铜区 (%s)没有焊盘连接。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:600
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:639
 #, c-format
 msgid "Cannot remove unused footprint %s (locked)."
 msgstr "无法删除未使用的封装 %s (已锁定)。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:605
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:644
 #, c-format
 msgid "Remove unused footprint %s."
 msgstr "删除未使用封装 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:663
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:704
 #, c-format
 msgid "Remove single pad net %s."
 msgstr "删除单一焊盘网络 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:726
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:767
 #, c-format
 msgid "%s pad %s not found in %s."
 msgstr "%s 的焊盘 %s 在 %s 中未找到。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:765
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:809
 #, c-format
 msgid "Processing component \"%s:%s\"."
 msgstr "处理元件 \"%s:%s\"。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:817
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:861
 #, c-format
 msgid "Multiple footprints found for \"%s\"."
 msgstr "找到 \"%s\" 的多个封装。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:841
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:885
 #, c-format
 msgid "Remove unused net \"%s\"."
 msgstr "删除未使用的网络 \"%s\"。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:848
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:892
 msgid "Update netlist"
 msgstr "更新网表"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:868
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:912
 #, c-format
 msgid "Total warnings: %d, errors: %d."
 msgstr "总计警告：%d，错误：%d。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:873
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:917
 msgid ""
 "Errors occurred during the netlist update. Unless you fix them your board "
 "will not be consistent with the schematics."
@@ -26438,10 +27487,10 @@ msgstr "网表更新发生错误。如果不能解决这些问题，电路板将
 #: pcbnew/netlist_reader/kicad_netlist_reader.cpp:263
 #, c-format
 msgid "Cannot find component with reference designator \"%s\" in netlist."
-msgstr "未能在网表中找到元件参考指示符 \"%s\"。"
+msgstr "未能在网表中找到元件位号 \"%s\"。"
 
-#: pcbnew/netlist_reader/kicad_netlist_reader.cpp:390
-#: pcbnew/pcb_parser.cpp:2469
+#: pcbnew/netlist_reader/kicad_netlist_reader.cpp:425
+#: pcbnew/pcb_parser.cpp:2547
 #, c-format
 msgid ""
 "Invalid footprint ID in\n"
@@ -26464,7 +27513,7 @@ msgstr "无法解析网表的元件部分的封装名称。"
 
 #: pcbnew/netlist_reader/legacy_netlist_reader.cpp:143
 msgid "Cannot parse reference designator in symbol section of netlist."
-msgstr "无法解析网络列表的元件部分的参考指示符。"
+msgstr "无法解析网络列表的元件部分的位号。"
 
 #: pcbnew/netlist_reader/legacy_netlist_reader.cpp:153
 msgid "Cannot parse value in symbol section of netlist."
@@ -26483,16 +27532,16 @@ msgstr "无法解析网络列表的元件部分的网络名称。"
 msgid "Cannot find symbol \"%s\" in footprint filter section of netlist."
 msgstr "无法在网络列表封装筛选中找到元件 \"%s\"。"
 
-#: pcbnew/netlist_reader/netlist.cpp:72
+#: pcbnew/netlist_reader/netlist.cpp:67
 #, c-format
 msgid "Cannot open netlist file \"%s\"."
 msgstr "不能打开网表 \"%s\"."
 
-#: pcbnew/netlist_reader/netlist.cpp:73
+#: pcbnew/netlist_reader/netlist.cpp:68
 msgid "Netlist Load Error."
 msgstr "网表载入错误."
 
-#: pcbnew/netlist_reader/netlist.cpp:83
+#: pcbnew/netlist_reader/netlist.cpp:78
 #, c-format
 msgid ""
 "Error loading netlist.\n"
@@ -26501,27 +27550,27 @@ msgstr ""
 "网表文件加载错误\n"
 " %s"
 
-#: pcbnew/netlist_reader/netlist.cpp:84
+#: pcbnew/netlist_reader/netlist.cpp:79
 msgid "Netlist Load Error"
 msgstr "网表载入错误"
 
-#: pcbnew/netlist_reader/netlist.cpp:164
+#: pcbnew/netlist_reader/netlist.cpp:153
 #, c-format
 msgid "No footprint defined for symbol \"%s\".\n"
 msgstr "没有为符号 \"%s\" 定义封装。\n"
 
-#: pcbnew/netlist_reader/netlist.cpp:182
+#: pcbnew/netlist_reader/netlist.cpp:171
 #, c-format
 msgid ""
 "Footprint of %s changed: board footprint \"%s\", netlist footprint \"%s\"."
 msgstr "\"%s\" 的封装发生了变化：电路板封装 \"%s\"，网表封装 \"%s\"。"
 
-#: pcbnew/netlist_reader/netlist.cpp:209
+#: pcbnew/netlist_reader/netlist.cpp:194
 #, c-format
 msgid "%s footprint ID \"%s\" is not valid."
 msgstr "%s的封装 ID \"%s\" 无效。"
 
-#: pcbnew/netlist_reader/netlist.cpp:226
+#: pcbnew/netlist_reader/netlist.cpp:211
 #, c-format
 msgid ""
 "%s footprint \"%s\" not found in any libraries in the footprint library "
@@ -26550,32 +27599,32 @@ msgstr "未知的 PCad 层 %u"
 msgid "KiCad only supports 32 signal layers"
 msgstr "KiCad 仅支持 32 个信号层"
 
-#: pcbnew/pcb_base_frame.cpp:124
+#: pcbnew/pcb_base_frame.cpp:125
 msgid "Error loading project footprint libraries"
 msgstr "加载工程封装库时出错"
 
-#: pcbnew/pcb_edit_frame.cpp:253
-msgid "Selection Filter"
-msgstr "选择筛选器"
-
-#: pcbnew/pcb_edit_frame.cpp:327
+#: pcbnew/pcb_edit_frame.cpp:363
 msgid "New PCB file is unsaved"
 msgstr "新的 PCB 文件未保存"
 
-#: pcbnew/pcb_edit_frame.cpp:610
+#: pcbnew/pcb_edit_frame.cpp:859
 #, c-format
 msgid "The auto save file \"%s\" could not be removed!"
 msgstr "自动保存文件 \"%s\" 不能被删除！"
 
-#: pcbnew/pcb_edit_frame.cpp:790
+#: pcbnew/pcb_edit_frame.cpp:1048
 msgid "PCB file changes are unsaved"
 msgstr "PCB 文件更改未保存"
 
-#: pcbnew/pcb_edit_frame.cpp:932
+#: pcbnew/pcb_edit_frame.cpp:1154
 msgid " [Unsaved]"
 msgstr " [未保存]"
 
-#: pcbnew/pcb_edit_frame.cpp:1061
+#: pcbnew/pcb_edit_frame.cpp:1301
+msgid "The schematic for this board cannot be found."
+msgstr "找不到该电路板的原理图。"
+
+#: pcbnew/pcb_edit_frame.cpp:1334
 msgid ""
 "Cannot update the PCB because Pcbnew is opened in stand-alone mode. In order "
 "to create or update PCBs from schematics, you must launch the KiCad project "
@@ -26584,28 +27633,25 @@ msgstr ""
 "无法更新 PCB, 因为 Pcbnew 是在独立模式下打开的。为了从原理图创建或更新 PCB, "
 "您必须启动 KiCad 工程管理器并创建一个工程。"
 
-#: pcbnew/pcb_edit_frame.cpp:1084
-msgid "The schematic for this board cannot be found."
-msgstr "找不到该电路板的原理图。"
-
-#: pcbnew/pcb_edit_frame.cpp:1110
+#: pcbnew/pcb_edit_frame.cpp:1352
 msgid "Eeschema netlist"
 msgstr "Eeschema 网表"
 
-#: pcbnew/pcb_edit_frame.cpp:1144
+#: pcbnew/pcb_edit_frame.cpp:1386
 #, c-format
 msgid "Schematic file \"%s\" not found."
 msgstr "没有找到原理图文件 \"%s\"。"
 
-#: pcbnew/pcb_edit_frame.cpp:1174
+#: pcbnew/pcb_edit_frame.cpp:1416
 msgid "Eeschema failed to load:\n"
 msgstr "Eeschema 无法加载:\n"
 
-#: pcbnew/pcb_edit_frame.cpp:1333
+#: pcbnew/pcb_edit_frame.cpp:1626
 msgid "Export Hyperlynx Layout"
 msgstr "导出 Hyperlynx 布局"
 
-#: pcbnew/pcb_expr_evaluator.cpp:43 pcbnew/pcb_expr_evaluator.cpp:92
+#: pcbnew/pcb_expr_evaluator.cpp:42 pcbnew/pcb_expr_evaluator.cpp:91
+#: pcbnew/pcb_expr_evaluator.cpp:154
 #, c-format
 msgid "Missing argument to '%s'"
 msgstr "缺少 '%s' 的参数"
@@ -26614,21 +27660,21 @@ msgstr "缺少 '%s' 的参数"
 msgid "(not activated)"
 msgstr "(未激活)"
 
-#: pcbnew/pcb_layer_widget.cpp:53
+#: pcbnew/pcb_layer_widget.cpp:53 pcbnew/widgets/appearance_controls.cpp:290
 msgid "Show footprints that are on board's front"
 msgstr "在电路板的顶层显示封装"
 
-#: pcbnew/pcb_layer_widget.cpp:54
+#: pcbnew/pcb_layer_widget.cpp:54 pcbnew/widgets/appearance_controls.cpp:291
 msgid "Show footprints that are on board's back"
 msgstr "在电路板的底层显示封装"
 
-#: pcbnew/pcb_layer_widget.cpp:55
+#: pcbnew/pcb_layer_widget.cpp:55 pcbnew/widgets/appearance_controls.cpp:293
 msgid "Show footprint values"
 msgstr "显示封装值"
 
 #: pcbnew/pcb_layer_widget.cpp:56
 msgid "Show footprint reference designators"
-msgstr "显示封装参考指示符"
+msgstr "显示封装位号"
 
 #: pcbnew/pcb_layer_widget.cpp:57
 msgid "Show footprint text on board's front"
@@ -26638,7 +27684,7 @@ msgstr "电路板顶层显示封装文本"
 msgid "Show footprint text on board's back"
 msgstr "电路板底层显示封装文本"
 
-#: pcbnew/pcb_layer_widget.cpp:59
+#: pcbnew/pcb_layer_widget.cpp:59 pcbnew/widgets/appearance_controls.cpp:296
 msgid "Show footprint text marked as invisible"
 msgstr "显示隐藏的封装文本标记"
 
@@ -26654,7 +27700,7 @@ msgstr "电路板底层显示封装焊盘"
 msgid "Show through hole pads in specific color"
 msgstr "在特定颜色下显示通孔焊盘"
 
-#: pcbnew/pcb_layer_widget.cpp:64
+#: pcbnew/pcb_layer_widget.cpp:64 pcbnew/widgets/appearance_controls.cpp:285
 msgid "Show tracks"
 msgstr "显示布线"
 
@@ -26674,27 +27720,27 @@ msgstr "显示微孔"
 msgid "Show non plated holes in specific color"
 msgstr "在特定颜色下显示非金属化孔"
 
-#: pcbnew/pcb_layer_widget.cpp:70
+#: pcbnew/pcb_layer_widget.cpp:70 pcbnew/widgets/appearance_controls.cpp:299
 msgid "Show unconnected nets as a ratsnest"
 msgstr "显示未连接的网络飞线"
 
-#: pcbnew/pcb_layer_widget.cpp:71
+#: pcbnew/pcb_layer_widget.cpp:71 pcbnew/widgets/appearance_controls.cpp:300
 msgid "Show a marker on pads which have no net connected"
 msgstr "在没有网络连接的焊盘上显示一个标记"
 
-#: pcbnew/pcb_layer_widget.cpp:72
+#: pcbnew/pcb_layer_widget.cpp:72 pcbnew/widgets/appearance_controls.cpp:301
 msgid "DRC violations with a Warning severity"
 msgstr "具有警告严重性的 DRC 违规"
 
-#: pcbnew/pcb_layer_widget.cpp:73
+#: pcbnew/pcb_layer_widget.cpp:73 pcbnew/widgets/appearance_controls.cpp:302
 msgid "DRC violations with an Error severity"
 msgstr "具有错误严重性的 DRC 违规"
 
-#: pcbnew/pcb_layer_widget.cpp:74
+#: pcbnew/pcb_layer_widget.cpp:74 pcbnew/widgets/appearance_controls.cpp:303
 msgid "DRC violations which have been individually excluded"
 msgstr "违反 DRC 的行为已被单独排除"
 
-#: pcbnew/pcb_layer_widget.cpp:75
+#: pcbnew/pcb_layer_widget.cpp:75 pcbnew/widgets/appearance_controls.cpp:304
 msgid "Show footprint and text origins as a cross"
 msgstr "在封装和文字中央显示一个小十字"
 
@@ -26710,11 +27756,11 @@ msgstr "辅助项目"
 msgid "Auxiliary items (rulers, assistants, axes, etc.)"
 msgstr "辅助项目(标尺、辅助、坐标轴等)"
 
-#: pcbnew/pcb_layer_widget.cpp:151
+#: pcbnew/pcb_layer_widget.cpp:151 pcbnew/widgets/appearance_controls.cpp:1171
 msgid "Show All Copper Layers"
 msgstr "显示所有铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:154
+#: pcbnew/pcb_layer_widget.cpp:154 pcbnew/widgets/appearance_controls.cpp:1174
 msgid "Hide All Copper Layers"
 msgstr "隐藏所有铜层"
 
@@ -26726,161 +27772,193 @@ msgstr "隐藏当前工作层外的所有铜层"
 msgid "Always Hide All Copper Layers But Active"
 msgstr "总是隐藏当前工作层外的所有铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:169
+#: pcbnew/pcb_layer_widget.cpp:169 pcbnew/widgets/appearance_controls.cpp:1185
 msgid "Show All Non Copper Layers"
 msgstr "显示所有非铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:172
+#: pcbnew/pcb_layer_widget.cpp:172 pcbnew/widgets/appearance_controls.cpp:1188
 msgid "Hide All Non Copper Layers"
 msgstr "隐藏所有非铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:184
+#: pcbnew/pcb_layer_widget.cpp:184 pcbnew/widgets/appearance_controls.cpp:1202
 msgid "Show Only Front Assembly Layers"
 msgstr "仅显示顶装配层"
 
-#: pcbnew/pcb_layer_widget.cpp:187
+#: pcbnew/pcb_layer_widget.cpp:187 pcbnew/widgets/appearance_controls.cpp:1204
 msgid "Show Only Front Layers"
 msgstr "仅显示顶层"
 
-#: pcbnew/pcb_layer_widget.cpp:193
+#: pcbnew/pcb_layer_widget.cpp:193 pcbnew/widgets/appearance_controls.cpp:1210
 msgid "Show Only Inner Layers"
 msgstr "仅显示内层"
 
-#: pcbnew/pcb_layer_widget.cpp:197
+#: pcbnew/pcb_layer_widget.cpp:197 pcbnew/widgets/appearance_controls.cpp:1214
 msgid "Show Only Back Layers"
 msgstr "仅显示底层"
 
-#: pcbnew/pcb_layer_widget.cpp:200
+#: pcbnew/pcb_layer_widget.cpp:200 pcbnew/widgets/appearance_controls.cpp:1217
 msgid "Show Only Back Assembly Layers"
 msgstr "仅显示底装配层"
 
-#: pcbnew/pcb_layer_widget.cpp:489
+#: pcbnew/pcb_layer_widget.cpp:489 pcbnew/widgets/appearance_controls.cpp:1083
 msgid "Front copper layer"
 msgstr "顶层铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:493
+#: pcbnew/pcb_layer_widget.cpp:493 pcbnew/widgets/appearance_controls.cpp:1084
 msgid "Back copper layer"
 msgstr "底层铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:497
+#: pcbnew/pcb_layer_widget.cpp:497 pcbnew/widgets/appearance_controls.cpp:1085
 msgid "Inner copper layer"
 msgstr "内部铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:522
+#: pcbnew/pcb_layer_widget.cpp:522 pcbnew/widgets/appearance_controls.cpp:1114
 msgid "Adhesive on board's front"
 msgstr "顶层粘胶"
 
-#: pcbnew/pcb_layer_widget.cpp:523
+#: pcbnew/pcb_layer_widget.cpp:523 pcbnew/widgets/appearance_controls.cpp:1115
 msgid "Adhesive on board's back"
 msgstr "底层粘胶"
 
-#: pcbnew/pcb_layer_widget.cpp:524
+#: pcbnew/pcb_layer_widget.cpp:524 pcbnew/widgets/appearance_controls.cpp:1116
 msgid "Solder paste on board's front"
 msgstr "顶层锡膏"
 
-#: pcbnew/pcb_layer_widget.cpp:525
+#: pcbnew/pcb_layer_widget.cpp:525 pcbnew/widgets/appearance_controls.cpp:1117
 msgid "Solder paste on board's back"
 msgstr "底层锡膏"
 
-#: pcbnew/pcb_layer_widget.cpp:526
+#: pcbnew/pcb_layer_widget.cpp:526 pcbnew/widgets/appearance_controls.cpp:1118
 msgid "Silkscreen on board's front"
 msgstr "顶层丝印"
 
-#: pcbnew/pcb_layer_widget.cpp:527
+#: pcbnew/pcb_layer_widget.cpp:527 pcbnew/widgets/appearance_controls.cpp:1119
 msgid "Silkscreen on board's back"
 msgstr "底层丝印"
 
-#: pcbnew/pcb_layer_widget.cpp:528
+#: pcbnew/pcb_layer_widget.cpp:528 pcbnew/widgets/appearance_controls.cpp:1120
 msgid "Solder mask on board's front"
 msgstr "顶层阻焊"
 
-#: pcbnew/pcb_layer_widget.cpp:529
+#: pcbnew/pcb_layer_widget.cpp:529 pcbnew/widgets/appearance_controls.cpp:1121
 msgid "Solder mask on board's back"
 msgstr "底层阻焊"
 
-#: pcbnew/pcb_layer_widget.cpp:530
+#: pcbnew/pcb_layer_widget.cpp:530 pcbnew/widgets/appearance_controls.cpp:1122
 msgid "Explanatory drawings"
 msgstr "图形说明"
 
-#: pcbnew/pcb_layer_widget.cpp:531
+#: pcbnew/pcb_layer_widget.cpp:531 pcbnew/widgets/appearance_controls.cpp:1123
 msgid "Explanatory comments"
 msgstr "描述性注释"
 
 #: pcbnew/pcb_layer_widget.cpp:532 pcbnew/pcb_layer_widget.cpp:533
+#: pcbnew/widgets/appearance_controls.cpp:1124
+#: pcbnew/widgets/appearance_controls.cpp:1125
 msgid "User defined meaning"
 msgstr "用户自定义"
 
-#: pcbnew/pcb_layer_widget.cpp:534
+#: pcbnew/pcb_layer_widget.cpp:534 pcbnew/widgets/appearance_controls.cpp:1126
 msgid "Board's perimeter definition"
 msgstr "定义电路板的边框轮廓"
 
-#: pcbnew/pcb_layer_widget.cpp:535
+#: pcbnew/pcb_layer_widget.cpp:535 pcbnew/widgets/appearance_controls.cpp:1127
 msgid "Board's edge setback outline"
 msgstr "电路板电气边界层"
 
-#: pcbnew/pcb_layer_widget.cpp:536
+#: pcbnew/pcb_layer_widget.cpp:536 pcbnew/widgets/appearance_controls.cpp:1128
 msgid "Footprint courtyards on board's front"
 msgstr "顶层上的封装外框"
 
-#: pcbnew/pcb_layer_widget.cpp:537
+#: pcbnew/pcb_layer_widget.cpp:537 pcbnew/widgets/appearance_controls.cpp:1129
 msgid "Footprint courtyards on board's back"
 msgstr "底层上的封装外框"
 
-#: pcbnew/pcb_layer_widget.cpp:538
+#: pcbnew/pcb_layer_widget.cpp:538 pcbnew/widgets/appearance_controls.cpp:1130
 msgid "Footprint assembly on board's front"
 msgstr "顶层封装装配"
 
-#: pcbnew/pcb_layer_widget.cpp:539
+#: pcbnew/pcb_layer_widget.cpp:539 pcbnew/widgets/appearance_controls.cpp:1131
 msgid "Footprint assembly on board's back"
 msgstr "底层封装装配"
 
-#: pcbnew/pcb_parser.cpp:223
+#: pcbnew/pcb_parser.cpp:211
 #, c-format
 msgid "Cannot interpret date code %d"
 msgstr "无法解释日期代码 %d"
 
-#: pcbnew/pcb_parser.cpp:512 pcbnew/pcb_parser.cpp:626
+#: pcbnew/pcb_parser.cpp:515 pcbnew/pcb_parser.cpp:638
 #, c-format
 msgid "Unknown token \"%s\""
 msgstr "未知标记 \"%s\""
 
-#: pcbnew/pcb_parser.cpp:635
+#: pcbnew/pcb_parser.cpp:649
 msgid ""
 "Items found on undefined layers.  Do you wish to\n"
 "rescue them to the Cmts.User layer?"
 msgstr ""
 "在未定义的图层上找到的项目。 \n"
-"你想把他们恢复到 Cmts.User 层吗？"
+"你想把他们恢复到用户注释层吗？"
 
-#: pcbnew/pcb_parser.cpp:637
+#: pcbnew/pcb_parser.cpp:651
 msgid "Undefined layers:"
 msgstr "未定义的层："
 
-#: pcbnew/pcb_parser.cpp:645
-msgid "Rescue"
-msgstr "恢复"
+#: pcbnew/pcb_parser.cpp:747
+#, c-format
+msgid "Group %s not found in board"
+msgstr "电路板中未找到组 %s"
 
-#: pcbnew/pcb_parser.cpp:1326
+# padstack 焊盘槽/孔
+#: pcbnew/pcb_parser.cpp:762 pcbnew/pcb_parser.cpp:774
+#, c-format
+msgid "Group %s references missing item %s"
+msgstr "组 %s 引用缺少的项目 %s"
+
+#: pcbnew/pcb_parser.cpp:789
+#, c-format
+msgid ""
+"Error in group structure in file: %s\n"
+"\n"
+"Attempt repair?"
+msgstr ""
+"文件中的组结构出错：%s。\n"
+"\n"
+"是否尝试修复？"
+
+#: pcbnew/pcb_parser.cpp:790
+msgid "File data error"
+msgstr "数据错误文件"
+
+#: pcbnew/pcb_parser.cpp:791
+msgid "Attempt repair"
+msgstr "尝试修复"
+
+#: pcbnew/pcb_parser.cpp:794
+msgid "File read cancelled"
+msgstr "文件读取已取消"
+
+#: pcbnew/pcb_parser.cpp:1405
 #, 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:1365
+#: pcbnew/pcb_parser.cpp:1444
 #, c-format
 msgid "%d is not a valid layer count"
 msgstr "%d 不是一个有效的层数"
 
-#: pcbnew/pcb_parser.cpp:1989
+#: pcbnew/pcb_parser.cpp:2063
 #, c-format
 msgid "Duplicate NETCLASS name \"%s\" in file \"%s\" at line %d, offset %d"
 msgstr "重复网络类名称 \"%s\" 在文件 \"%s\" 的 %d,行 位移 %d"
 
-#: pcbnew/pcb_parser.cpp:2751
+#: pcbnew/pcb_parser.cpp:2861
 #, c-format
 msgid "Cannot handle footprint text type %s"
 msgstr "无法处理封装文本类型 %s"
 
-#: pcbnew/pcb_parser.cpp:3219
+#: pcbnew/pcb_parser.cpp:3336
 #, c-format
 msgid ""
 "Invalid net ID in\n"
@@ -26893,7 +27971,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:3235
+#: pcbnew/pcb_parser.cpp:3352
 #, c-format
 msgid ""
 "Net name doesn't match net ID in\n"
@@ -26906,8 +27984,8 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:3601 pcbnew/pcb_parser.cpp:3667
-#: pcbnew/pcb_parser.cpp:3750 pcbnew/pcb_parser.cpp:3823
+#: pcbnew/pcb_parser.cpp:3788 pcbnew/pcb_parser.cpp:3859
+#: pcbnew/pcb_parser.cpp:3947 pcbnew/pcb_parser.cpp:4036
 #, c-format
 msgid ""
 "Invalid net ID in\n"
@@ -26920,7 +27998,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:4313
+#: pcbnew/pcb_parser.cpp:4537
 #, c-format
 msgid ""
 "There is a zone that belongs to a not existing net\n"
@@ -26928,7 +28006,7 @@ msgid ""
 "you should verify and edit it (run DRC test)."
 msgstr "有一个区域属于不存在的网 \"%s\", 您应该验证和编辑它 (运行 DRC 测试)。"
 
-#: pcbnew/pcbnew.cpp:360
+#: pcbnew/pcbnew.cpp:359
 msgid ""
 "An error occurred attempting to load the global footprint library table.\n"
 "Please edit this global footprint library table in Preferences menu."
@@ -26936,11 +28014,15 @@ msgstr ""
 "试图加载全局封装库表时出错：\n"
 "请在首选项菜单中编辑此全局封装库表。"
 
-#: pcbnew/pcbnew_config.cpp:76
+#: pcbnew/pcbnew_config.cpp:67
 msgid "Action Plugins"
 msgstr "活动插件"
 
-#: pcbnew/pcbnew_printout.cpp:104
+#: pcbnew/pcbnew_config.cpp:69
+msgid "Origins & Axes"
+msgstr "原点和轴"
+
+#: pcbnew/pcbnew_printout.cpp:105
 msgid "Multiple Layers"
 msgstr "多层"
 
@@ -26957,6 +28039,115 @@ msgid ""
 "Enter the python module which implements the PLUGIN::Footprint*() functions."
 msgstr "PLUGIN::Footprint*() 输入已定义的 Python 函数模块。"
 
+#: pcbnew/plugins/altium/altium_pcb.cpp:453
+#, c-format
+msgid "File not found: '%s'"
+msgstr "文件没有找到：'%s'"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:907
+#: pcbnew/plugins/altium/altium_pcb.cpp:982
+#: pcbnew/plugins/altium/altium_pcb.cpp:1060
+#: pcbnew/plugins/altium/altium_pcb.cpp:1083
+#, c-format
+msgid ""
+"Dimension on Altium layer %d has no KiCad equivalent. Put it on Eco1_User "
+"instead"
+msgstr ""
+"Altium 层 %d 上的 Dimension 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1179
+#, c-format
+msgid "Cannot create directory \"%s\" -> no 3D-models will be imported."
+msgstr "无法创建目录 \"%s\" -> 无法导入 3D 模型。"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1258
+#, c-format
+msgid "Polygon on Altium layer %d has no KiCad equivalent. Ignore it instead"
+msgstr "Altium 层 %d 上的 Polygon 没有任何 KiCad 等效项。 忽略它"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1443
+#, c-format
+msgid ""
+"Zone on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
+msgstr ""
+"Altium 层 %d 上的 Zone 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1468
+#, c-format
+msgid ""
+"Polygon on Altium layer %d has no KiCad equivalent. Put it on Eco1_User "
+"instead"
+msgstr ""
+"Altium 层 %d 上的 Polygon 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1583
+#, c-format
+msgid ""
+"Arc on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
+msgstr "Altium 层 %d 上的 Arc 没有 KiCad 等效项。改为将其放在 Eco1_User 上"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1756
+#, c-format
+msgid ""
+"Pad '%s' of Footprint %s has a square hole. KiCad does not support this yet"
+msgstr "焊盘 \"%s\"（封装 %s）有一个方孔。KiCad 目前还不支持此功能"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1777
+#, c-format
+msgid ""
+"Pad '%s' of Footprint %s has a hole-rotation of %f degree. KiCad only "
+"supports 90 degree angles"
+msgstr "焊盘 \"%s\"（封装 %s）有 %f 度的孔旋转。KiCad 仅支持 90 度角"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1806
+#, c-format
+msgid ""
+"Pad '%s' of Footprint %s uses a complex pad stack (kind %d), which is not "
+"supported yet"
+msgstr "焊盘 \"%s\"（封装 %s）使用复杂的焊盘堆叠（类型为 %d），尚不支持"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1896
+#, c-format
+msgid ""
+"Non-Copper Pad on Altium layer %d has no KiCad equivalent. Put it on "
+"Eco1_User instead"
+msgstr ""
+"Altium 层 %d 上的非铜焊盘没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:1916
+#, c-format
+msgid ""
+"Non-Copper Pad '%s' uses a complex pad stack (kind %d). This should not "
+"happen"
+msgstr "非铜焊盘 \"%s\" 使用复杂的焊盘堆叠（类型为 %d）。这不应该发生"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:2152
+#, c-format
+msgid ""
+"Track on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
+msgstr ""
+"Altium 层 %d 上的 Track 没有任何 KiCad 等效项。 改为将其放在 Eco1_User 上"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:2226
+#, c-format
+msgid ""
+"Ignore Barcode on Altium layer %d because it is not supported right now."
+msgstr "忽略 Altium 层 %d 上的条形码，因为目前不支持该条形码。"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:2309
+#, c-format
+msgid ""
+"Text on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
+msgstr ""
+"Altium 层 %d 上的 Text 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
+
+#: pcbnew/plugins/altium/altium_pcb.cpp:2407
+#, c-format
+msgid ""
+"Fill on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
+msgstr ""
+"Altium 层 %d 上的 Fill 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
+
 #: pcbnew/router/length_tuner_tool.cpp:57
 msgid "New Track"
 msgstr "新布线"
@@ -27083,13 +28274,13 @@ msgstr "调整： "
 msgid "?"
 msgstr "？"
 
-#: pcbnew/router/pns_kicad_iface.cpp:737
+#: pcbnew/router/pns_kicad_iface.cpp:754
 #, c-format
 msgid "Malformed keep-out zone at (%d, %d)"
 msgstr "(%d, %d)处的禁止布线区形状异常"
 
 # 此zone经核查源码确认为禁止布线区
-#: pcbnew/router/pns_kicad_iface.cpp:740
+#: pcbnew/router/pns_kicad_iface.cpp:757
 #, c-format
 msgid ""
 "%s\n"
@@ -27100,7 +28291,7 @@ msgstr ""
 "布线工具无法处理此禁止布线区。\n"
 "请确保它不是自相交的多边形。"
 
-#: pcbnew/router/pns_kicad_iface.cpp:1229 pcbnew/router/router_tool.cpp:394
+#: pcbnew/router/pns_kicad_iface.cpp:1272 pcbnew/router/router_tool.cpp:395
 msgid "Interactive Router"
 msgstr "交互布线"
 
@@ -27133,205 +28324,205 @@ msgstr "调整：歪斜 "
 msgid "Cannot start routing inside a keepout area or board outline."
 msgstr "无法在禁止区或板框内开始布线。"
 
-#: pcbnew/router/router_tool.cpp:85
+#: pcbnew/router/router_tool.cpp:86
 msgid "Undo last segment"
 msgstr "撤消最后一段"
 
-#: pcbnew/router/router_tool.cpp:85 pcbnew/router/router_tool.cpp:91
+#: pcbnew/router/router_tool.cpp:86 pcbnew/router/router_tool.cpp:92
 msgid "Stops laying the current track."
 msgstr "停止当前布线。"
 
-#: pcbnew/router/router_tool.cpp:91
+#: pcbnew/router/router_tool.cpp:92
 msgid "Finish Track"
 msgstr "完成布线"
 
-#: pcbnew/router/router_tool.cpp:97
+#: pcbnew/router/router_tool.cpp:98
 msgid "Auto-finish Track"
 msgstr "自动完成布线"
 
-#: pcbnew/router/router_tool.cpp:97
+#: pcbnew/router/router_tool.cpp:98
 msgid "Automagically finishes laying the current track."
 msgstr "自动完成当前布线."
 
-#: pcbnew/router/router_tool.cpp:102
+#: pcbnew/router/router_tool.cpp:103
 msgid "Place Through Via"
 msgstr "放置通孔"
 
-#: pcbnew/router/router_tool.cpp:103
+#: pcbnew/router/router_tool.cpp:104
 msgid "Adds a through-hole via at the end of currently routed track."
 msgstr "添加通孔过孔并结束当前布线."
 
-#: pcbnew/router/router_tool.cpp:109
+#: pcbnew/router/router_tool.cpp:110
 msgid "Place Blind/Buried Via"
 msgstr "放置盲孔或埋孔"
 
-#: pcbnew/router/router_tool.cpp:110
+#: pcbnew/router/router_tool.cpp:111
 msgid "Adds a blind or buried via at the end of currently routed track."
 msgstr "添加埋孔或盲孔并结束当前布线."
 
-#: pcbnew/router/router_tool.cpp:116
+#: pcbnew/router/router_tool.cpp:117
 msgid "Place Microvia"
 msgstr "放置微孔"
 
-#: pcbnew/router/router_tool.cpp:116
+#: pcbnew/router/router_tool.cpp:117
 msgid "Adds a microvia at the end of currently routed track."
 msgstr "添加微孔并结束当前布线."
 
-#: pcbnew/router/router_tool.cpp:122
+#: pcbnew/router/router_tool.cpp:123
 msgid "Select Layer and Place Through Via..."
 msgstr "选择层并添加通孔..."
 
-#: pcbnew/router/router_tool.cpp:123
+#: pcbnew/router/router_tool.cpp:124
 msgid ""
 "Select a layer, then add a through-hole via at the end of currently routed "
 "track."
 msgstr "选择一个图层，然后在当前布线的末尾添加过孔。"
 
-#: pcbnew/router/router_tool.cpp:130
+#: pcbnew/router/router_tool.cpp:131
 msgid "Select Layer and Place Blind/Buried Via..."
 msgstr "选择层并放置盲/埋孔..."
 
-#: pcbnew/router/router_tool.cpp:131
+#: pcbnew/router/router_tool.cpp:132
 msgid ""
 "Select a layer, then add a blind or buried via at the end of currently "
 "routed track."
 msgstr "选择一个图层，然后在当前布线的末端添加一个盲孔或埋孔。"
 
-#: pcbnew/router/router_tool.cpp:138
+#: pcbnew/router/router_tool.cpp:139
 msgid "Custom Track/Via Size..."
 msgstr "自定义布线/过孔尺寸..."
 
-#: pcbnew/router/router_tool.cpp:139
+#: pcbnew/router/router_tool.cpp:140
 msgid "Shows a dialog for changing the track width and via size."
 msgstr "显示修改导线宽度和过孔尺寸的会话."
 
-#: pcbnew/router/router_tool.cpp:145
+#: pcbnew/router/router_tool.cpp:146
 msgid "Switch Track Posture"
 msgstr "切换布线状态"
 
-#: pcbnew/router/router_tool.cpp:146
+#: pcbnew/router/router_tool.cpp:147
 msgid "Switches posture of the currently routed track."
 msgstr "切换当前布线方向。"
 
-#: pcbnew/router/router_tool.cpp:152
+#: pcbnew/router/router_tool.cpp:153
 msgid "Switch Corner Rounding"
 msgstr "改变拐角类型"
 
-#: pcbnew/router/router_tool.cpp:153
+#: pcbnew/router/router_tool.cpp:154
 msgid "Switches the corner type of the currently routed track."
 msgstr "切换当前布线的拐角类型。"
 
-#: pcbnew/router/router_tool.cpp:174
+#: pcbnew/router/router_tool.cpp:175
 msgid "Select Track/Via Width"
 msgstr "选择 布线/过孔 宽度"
 
-#: pcbnew/router/router_tool.cpp:193
+#: pcbnew/router/router_tool.cpp:194
 msgid "Use Starting Track Width"
 msgstr "使用起始布线宽度"
 
-#: pcbnew/router/router_tool.cpp:194
+#: pcbnew/router/router_tool.cpp:195
 msgid "Route using the width of the starting track."
 msgstr "使用起始布线宽度。"
 
-#: pcbnew/router/router_tool.cpp:198 pcbnew/router/router_tool.cpp:319
+#: pcbnew/router/router_tool.cpp:199 pcbnew/router/router_tool.cpp:320
 msgid "Use Net Class Values"
 msgstr "使用网络类值"
 
-#: pcbnew/router/router_tool.cpp:199
+#: pcbnew/router/router_tool.cpp:200
 msgid "Use track and via sizes from the net class"
 msgstr "使用布线和过孔的网络类值"
 
-#: pcbnew/router/router_tool.cpp:203 pcbnew/router/router_tool.cpp:324
+#: pcbnew/router/router_tool.cpp:204 pcbnew/router/router_tool.cpp:325
 msgid "Use Custom Values..."
 msgstr "使用自定义值..."
 
-#: pcbnew/router/router_tool.cpp:204
+#: pcbnew/router/router_tool.cpp:205
 msgid "Specify custom track and via sizes"
 msgstr "指定自定义布线和过孔尺寸"
 
-#: pcbnew/router/router_tool.cpp:215
+#: pcbnew/router/router_tool.cpp:216
 msgid "Track netclass width"
 msgstr "布线网络类宽度"
 
-#: pcbnew/router/router_tool.cpp:217
+#: pcbnew/router/router_tool.cpp:218
 #, c-format
 msgid "Track %s"
 msgstr "布线 %s"
 
-#: pcbnew/router/router_tool.cpp:231
+#: pcbnew/router/router_tool.cpp:232
 msgid "Via netclass values"
 msgstr "过孔网络类值"
 
-#: pcbnew/router/router_tool.cpp:235
+#: pcbnew/router/router_tool.cpp:236
 #, c-format
 msgid "Via %s, drill %s"
 msgstr "过孔 %s，钻孔 %s"
 
-#: pcbnew/router/router_tool.cpp:239
+#: pcbnew/router/router_tool.cpp:240
 #, c-format
 msgid "Via %s"
 msgstr "过孔 %s"
 
-#: pcbnew/router/router_tool.cpp:303
+#: pcbnew/router/router_tool.cpp:304
 msgid "Select Differential Pair Dimensions"
 msgstr "选择差分对尺寸"
 
-#: pcbnew/router/router_tool.cpp:320
+#: pcbnew/router/router_tool.cpp:321
 msgid "Use differential pair dimensions from the net class"
 msgstr "使用网络类中的差分对尺寸"
 
-#: pcbnew/router/router_tool.cpp:325
+#: pcbnew/router/router_tool.cpp:326
 msgid "Specify custom differential pair dimensions"
 msgstr "指定自定义差分对尺寸"
 
-#: pcbnew/router/router_tool.cpp:338
+#: pcbnew/router/router_tool.cpp:339
 msgid "Width "
 msgstr "宽度 "
 
-#: pcbnew/router/router_tool.cpp:341
+#: pcbnew/router/router_tool.cpp:342
 msgid ", gap "
 msgstr "，间隙 "
 
-#: pcbnew/router/router_tool.cpp:344
+#: pcbnew/router/router_tool.cpp:345
 msgid ", via gap "
 msgstr "，过孔间隙 "
 
-#: pcbnew/router/router_tool.cpp:731
+#: pcbnew/router/router_tool.cpp:732
 msgid ""
 "Blind/buried vias have to be enabled in Board Setup > Design Rules > "
 "Constraints."
 msgstr "必须在“电路板设置”>“设计规则”>“约束”中启用盲孔/埋孔。"
 
-#: pcbnew/router/router_tool.cpp:738
+#: pcbnew/router/router_tool.cpp:739
 msgid ""
 "Microvias have to be enabled in Board Setup > Design Rules > Constraints."
 msgstr "必须在“电路板设置”>“设计规则”>“约束”中启用微孔。"
 
-#: pcbnew/router/router_tool.cpp:745
+#: pcbnew/router/router_tool.cpp:746
 msgid "Only through vias are allowed on 2 layer boards."
 msgstr "2 层板上只允许通孔。"
 
-#: pcbnew/router/router_tool.cpp:753
+#: pcbnew/router/router_tool.cpp:754
 msgid ""
 "Microvias can be placed only between the outer layers (F.Cu/B.Cu) and the "
 "ones directly adjacent to them."
 msgstr "微孔只能放在外层 (顶层铜层/底层铜层) 和与它们直接相邻的层之间。"
 
-#: pcbnew/router/router_tool.cpp:862
+#: pcbnew/router/router_tool.cpp:863
 msgid "Tracks on Copper layers only"
 msgstr "布线只能出现在铜层"
 
-#: pcbnew/router/router_tool.cpp:1218 pcbnew/router/router_tool.cpp:1399
-#: pcbnew/router/router_tool.cpp:1528
+#: pcbnew/router/router_tool.cpp:1216 pcbnew/router/router_tool.cpp:1397
+#: pcbnew/router/router_tool.cpp:1553
 msgid "The selected item is locked."
 msgstr "选择的项目被锁定。"
 
-#: pcbnew/router/router_tool.cpp:1220 pcbnew/router/router_tool.cpp:1401
+#: pcbnew/router/router_tool.cpp:1218 pcbnew/router/router_tool.cpp:1399
 msgid "Drag Anyway"
 msgstr "仍然拖动"
 
-#: pcbnew/router/router_tool.cpp:1530 pcbnew/tools/pcb_actions.cpp:1202
-#: pcbnew/tools/pcb_actions.cpp:1208
+#: pcbnew/router/router_tool.cpp:1555 pcbnew/tools/pcb_actions.cpp:1272
+#: pcbnew/tools/pcb_actions.cpp:1278
 msgid "Break Track"
 msgstr "分割布线"
 
@@ -27347,12 +28538,12 @@ msgstr "电路板导出成功。"
 msgid "Unable to export, please fix and try again"
 msgstr "无法导出，请修正错误后再试"
 
-#: pcbnew/specctra_import_export/specctra_export.cpp:912
+#: pcbnew/specctra_import_export/specctra_export.cpp:910
 #, c-format
 msgid "Symbol with value of \"%s\" has empty reference id."
 msgstr "符号 \"%s\" 的值有空的参考 ID。"
 
-#: pcbnew/specctra_import_export/specctra_export.cpp:920
+#: pcbnew/specctra_import_export/specctra_export.cpp:918
 #, c-format
 msgid "Multiple symbols have identical reference IDs of \"%s\"."
 msgstr "多个符号使用了相同的参考编号 \"%s\"。"
@@ -27410,17 +28601,17 @@ msgstr "未找到引用 \"%s\"。"
 msgid "A wire_via references a missing padstack \"%s\""
 msgstr "发现一个导线_过孔索引指向了丢失的焊盘槽/孔 \"%s\""
 
-#: pcbnew/swig/pcbnew_action_plugins.cpp:77
+#: pcbnew/swig/pcbnew_action_plugins.cpp:67
 msgid "Exception on python action plugin code"
 msgstr "Python 活动插件代码异常"
 
-#: pcbnew/swig/pcbnew_action_plugins.cpp:89
+#: pcbnew/swig/pcbnew_action_plugins.cpp:79
 #: pcbnew/swig/pcbnew_footprint_wizards.cpp:82
 #, c-format
 msgid "Method \"%s\" not found, or not callable"
 msgstr "方法为找到 \"%s\",或不可调用"
 
-#: pcbnew/swig/pcbnew_action_plugins.cpp:90
+#: pcbnew/swig/pcbnew_action_plugins.cpp:80
 #: pcbnew/swig/pcbnew_footprint_wizards.cpp:83
 msgid "Unknown Method"
 msgstr "未知方法"
@@ -27441,7 +28632,7 @@ msgstr "插入封装放置到当前电路板"
 msgid "Check footprint"
 msgstr "检查封装"
 
-#: pcbnew/toolbars_footprint_editor.cpp:202 pcbnew/toolbars_pcb_editor.cpp:631
+#: pcbnew/toolbars_footprint_editor.cpp:202 pcbnew/toolbars_pcb_editor.cpp:613
 msgid "+/- to switch"
 msgstr "+/- 切换"
 
@@ -27457,7 +28648,7 @@ msgstr "显示下一个封装"
 msgid "Insert footprint in board"
 msgstr "将封装放置到电路板"
 
-#: pcbnew/toolbars_pcb_editor.cpp:55
+#: pcbnew/toolbars_pcb_editor.cpp:57
 msgid ""
 "Show active layer selections\n"
 "and select layer pair for route and place via"
@@ -27465,7 +28656,7 @@ msgstr ""
 "显示工作中的层\n"
 "选择布线和过孔的连接层"
 
-#: pcbnew/toolbars_pcb_editor.cpp:502
+#: pcbnew/toolbars_pcb_editor.cpp:484
 msgid ""
 "Auto track width: when starting on an existing track use its width\n"
 "otherwise, use current width setting"
@@ -27473,58 +28664,78 @@ msgstr ""
 "自动布线宽度：在开始现有的布线时使用它的宽度，\n"
 "否则，使用当前的宽度设置"
 
-#: pcbnew/toolbars_pcb_editor.cpp:550
+#: pcbnew/toolbars_pcb_editor.cpp:532
 #, c-format
 msgid "Track: %.3f mm (%.2f mils)"
 msgstr "布线：%.3f mm (%.2f mils)"
 
-#: pcbnew/toolbars_pcb_editor.cpp:552
+#: pcbnew/toolbars_pcb_editor.cpp:534
 #, c-format
 msgid "Track: %.2f mils (%.3f mm)"
 msgstr "布线: %.2f mils (%.3f mm)"
 
-#: pcbnew/toolbars_pcb_editor.cpp:564 pcbnew/toolbars_pcb_editor.cpp:616
+#: pcbnew/toolbars_pcb_editor.cpp:546 pcbnew/toolbars_pcb_editor.cpp:598
 msgid "Edit Pre-defined Sizes..."
 msgstr "编辑预定义尺寸..."
 
-#: pcbnew/toolbars_pcb_editor.cpp:592
+#: pcbnew/toolbars_pcb_editor.cpp:574
 #, c-format
 msgid "%.2f / %.2f mm"
 msgstr "%.2f / %.2f mm"
 
-#: pcbnew/toolbars_pcb_editor.cpp:594
+#: pcbnew/toolbars_pcb_editor.cpp:576
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: pcbnew/toolbars_pcb_editor.cpp:600
+#: pcbnew/toolbars_pcb_editor.cpp:582
 #, c-format
 msgid "%.1f / %.1f mils"
 msgstr "%.1f / %.1f mils"
 
-#: pcbnew/toolbars_pcb_editor.cpp:602
+#: pcbnew/toolbars_pcb_editor.cpp:584
 #, c-format
 msgid "%.1f mils"
 msgstr "%.1f mils"
 
-#: pcbnew/toolbars_pcb_editor.cpp:604
+#: pcbnew/toolbars_pcb_editor.cpp:586
 #, c-format
 msgid "Via: %s (%s)"
 msgstr "过孔：%s (%s)"
 
-#: pcbnew/tools/drawing_tool.cpp:166 pcbnew/tools/drawing_tool.cpp:1165
+#: pcbnew/tools/convert_tool.cpp:76
+msgid "Convert..."
+msgstr "转换..."
+
+#: pcbnew/tools/convert_tool.cpp:186
+msgid "Convert shapes to polygon"
+msgstr "将形状转换为多边形"
+
+#: pcbnew/tools/convert_tool.cpp:217
+msgid "Convert shapes to zone"
+msgstr "将形状转换为区域"
+
+#: pcbnew/tools/convert_tool.cpp:472
+msgid "Convert polygons to lines"
+msgstr "将多边形转换为线"
+
+#: pcbnew/tools/convert_tool.cpp:555
+msgid "Create arc from line segment"
+msgstr "从线段创建圆弧"
+
+#: pcbnew/tools/drawing_tool.cpp:166 pcbnew/tools/drawing_tool.cpp:1176
 msgid "Draw a line segment"
 msgstr "绘制线段"
 
-#: pcbnew/tools/drawing_tool.cpp:210 pcbnew/tools/pcb_actions.cpp:71
+#: pcbnew/tools/drawing_tool.cpp:210 pcbnew/tools/pcb_actions.cpp:98
 msgid "Draw a rectangle"
 msgstr "绘制矩形"
 
-#: pcbnew/tools/drawing_tool.cpp:252 pcbnew/tools/pcb_actions.cpp:77
+#: pcbnew/tools/drawing_tool.cpp:252 pcbnew/tools/pcb_actions.cpp:104
 msgid "Draw a circle"
 msgstr "绘制圆"
 
-#: pcbnew/tools/drawing_tool.cpp:291 pcbnew/tools/pcb_actions.cpp:83
+#: pcbnew/tools/drawing_tool.cpp:291 pcbnew/tools/pcb_actions.cpp:110
 msgid "Draw an arc"
 msgstr "绘制圆弧"
 
@@ -27532,27 +28743,27 @@ msgstr "绘制圆弧"
 msgid "Place a text"
 msgstr "放置文本"
 
-#: pcbnew/tools/drawing_tool.cpp:687
+#: pcbnew/tools/drawing_tool.cpp:685
 msgid "Draw a dimension"
 msgstr "绘制尺寸"
 
-#: pcbnew/tools/drawing_tool.cpp:768
+#: pcbnew/tools/drawing_tool.cpp:762
 msgid "No graphic items found in file to import"
 msgstr "在要导入的文件中找不到图形项目"
 
-#: pcbnew/tools/drawing_tool.cpp:798 pcbnew/tools/drawing_tool.cpp:878
+#: pcbnew/tools/drawing_tool.cpp:804 pcbnew/tools/drawing_tool.cpp:889
 msgid "Place a DXF_SVG drawing"
 msgstr "放置 DXF_SVG 图形"
 
-#: pcbnew/tools/drawing_tool.cpp:932
+#: pcbnew/tools/drawing_tool.cpp:943
 msgid "Move the footprint reference anchor"
 msgstr "移动封装参考锚点"
 
-#: pcbnew/tools/drawing_tool.cpp:1528
+#: pcbnew/tools/drawing_tool.cpp:1537
 msgid "Self-intersecting polygons are not allowed"
 msgstr "不允许自相交多边形"
 
-#: pcbnew/tools/drawing_tool.cpp:1980
+#: pcbnew/tools/drawing_tool.cpp:1998
 msgid "Place via"
 msgstr "放置过孔"
 
@@ -27560,44 +28771,48 @@ msgstr "放置过孔"
 msgid "Special Tools..."
 msgstr "特殊工具..."
 
-#: pcbnew/tools/edit_tool.cpp:483
+#: pcbnew/tools/edit_tool.cpp:368
 msgid "Select reference point for move..."
 msgstr "选择要移动的参考点..."
 
-#: pcbnew/tools/edit_tool.cpp:634
+#: pcbnew/tools/edit_tool.cpp:702
 msgid "Edit track width/via size"
 msgstr "编辑布线宽度/过孔尺寸"
 
-#: pcbnew/tools/edit_tool.cpp:908 pcbnew/tools/pcb_actions.cpp:245
+#: pcbnew/tools/edit_tool.cpp:1014 pcbnew/tools/pcb_actions.cpp:268
 msgid "Flip"
 msgstr "翻转"
 
-#: pcbnew/tools/edit_tool.cpp:1052 pcbnew/tools/zone_filler_tool.cpp:130
+#: pcbnew/tools/edit_tool.cpp:1161 pcbnew/tools/zone_filler_tool.cpp:143
 msgid "Fill Zone"
 msgstr "填充覆铜"
 
-#: pcbnew/tools/edit_tool.cpp:1089
+#: pcbnew/tools/edit_tool.cpp:1229
+msgid "Remove of items in entered group resulted in inconsistent state: "
+msgstr "删除输入组中的项目导致状态不一致： "
+
+#: pcbnew/tools/edit_tool.cpp:1239
 msgid "Delete again to remove locked items"
 msgstr "再次删除锁定的项目"
 
-#: pcbnew/tools/edit_tool.cpp:1175
+#: pcbnew/tools/edit_tool.cpp:1342
 msgid "Move exact"
 msgstr "精确移动"
 
-#: pcbnew/tools/edit_tool.cpp:1285
+#: pcbnew/tools/edit_tool.cpp:1469
 #, c-format
 msgid "Duplicated %d item(s)"
 msgstr "复制 %d 项"
 
-#: pcbnew/tools/edit_tool.cpp:1459
+#: pcbnew/tools/edit_tool.cpp:1650
 msgid "Select reference point for the copy..."
 msgstr "为副本选择参考点..."
 
-#: pcbnew/tools/edit_tool.cpp:1460
+#: pcbnew/tools/edit_tool.cpp:1651
 msgid "Selection copied."
 msgstr "选择项已复制。"
 
-#: pcbnew/tools/edit_tool.cpp:1460
+#: pcbnew/tools/edit_tool.cpp:1652
 msgid "Copy cancelled."
 msgstr "复制取消。"
 
@@ -27648,693 +28863,770 @@ msgstr "编辑焊盘形状"
 msgid "Recombine pads"
 msgstr "重新组合焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:60
+#: pcbnew/tools/pcb_actions.cpp:58
+msgid "Convert to Polygon"
+msgstr "转换为多边形"
+
+#: pcbnew/tools/pcb_actions.cpp:59
+msgid "Creates a graphic polygon from the selection"
+msgstr "根据所选内容创建图形多边形"
+
+#: pcbnew/tools/pcb_actions.cpp:62
+msgid "Convert to Zone"
+msgstr "转换为区域"
+
+#: pcbnew/tools/pcb_actions.cpp:62
+msgid "Creates a copper zone from the selection"
+msgstr "从所选内容创建铜区"
+
+#: pcbnew/tools/pcb_actions.cpp:66
+msgid "Convert to Keepout"
+msgstr "转换为禁布区"
+
+#: pcbnew/tools/pcb_actions.cpp:67
+msgid "Creates a keepout zone from the selection"
+msgstr "从所选内容创建禁止区域"
+
+#: pcbnew/tools/pcb_actions.cpp:70
+msgid "Convert to Lines"
+msgstr "转换为线"
+
+#: pcbnew/tools/pcb_actions.cpp:70
+msgid "Creates graphic lines from the selection"
+msgstr "从所选内容创建图形线"
+
+#: pcbnew/tools/pcb_actions.cpp:74
+msgid "Convert to Arc"
+msgstr "转换为圆弧"
+
+#: pcbnew/tools/pcb_actions.cpp:74
+msgid "Converts selected line segment to an arc"
+msgstr "将选定的线段转换为圆弧"
+
+#: pcbnew/tools/pcb_actions.cpp:78
+msgid "Convert to Tracks"
+msgstr "转换为布线"
+
+#: pcbnew/tools/pcb_actions.cpp:79
+msgid "Converts selected graphic lines to tracks"
+msgstr "将选定的图形线转换为布线"
+
+#: pcbnew/tools/pcb_actions.cpp:87
 msgid "Draw Line"
 msgstr "绘制线"
 
-#: pcbnew/tools/pcb_actions.cpp:60
+#: pcbnew/tools/pcb_actions.cpp:87
 msgid "Draw a line"
 msgstr "绘制线"
 
-#: pcbnew/tools/pcb_actions.cpp:66
+#: pcbnew/tools/pcb_actions.cpp:93
 msgid "Draw Graphic Polygon"
 msgstr "绘制多边形"
 
-#: pcbnew/tools/pcb_actions.cpp:66
+#: pcbnew/tools/pcb_actions.cpp:93
 msgid "Draw a graphic polygon"
 msgstr "绘制多边形"
 
-#: pcbnew/tools/pcb_actions.cpp:71
+#: pcbnew/tools/pcb_actions.cpp:98
 msgid "Draw Rectangle"
 msgstr "绘制矩形"
 
-#: pcbnew/tools/pcb_actions.cpp:77
+#: pcbnew/tools/pcb_actions.cpp:104
 msgid "Draw Circle"
 msgstr "绘制圆"
 
-#: pcbnew/tools/pcb_actions.cpp:83
+#: pcbnew/tools/pcb_actions.cpp:110
 msgid "Draw Arc"
 msgstr "绘制圆弧"
 
-#: pcbnew/tools/pcb_actions.cpp:95
+#: pcbnew/tools/pcb_actions.cpp:122
 msgid "Add Dimension"
 msgstr "添加尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:95
+#: pcbnew/tools/pcb_actions.cpp:122
 msgid "Add a dimension"
 msgstr "添加尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:106
+#: pcbnew/tools/pcb_actions.cpp:133
 msgid "Add Filled Zone"
 msgstr "添加覆铜区域"
 
-#: pcbnew/tools/pcb_actions.cpp:106
+#: pcbnew/tools/pcb_actions.cpp:133
 msgid "Add a filled zone"
 msgstr "添加填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:112
+#: pcbnew/tools/pcb_actions.cpp:139
 msgid "Add Vias"
 msgstr "添加过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:112
+#: pcbnew/tools/pcb_actions.cpp:139
 msgid "Add free-standing vias"
 msgstr "添加独立的过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:118
+#: pcbnew/tools/pcb_actions.cpp:145
 msgid "Add Keepout Area"
 msgstr "添加禁布区"
 
-#: pcbnew/tools/pcb_actions.cpp:118
+#: pcbnew/tools/pcb_actions.cpp:145
 msgid "Add a keepout area"
 msgstr "添加禁布区"
 
-#: pcbnew/tools/pcb_actions.cpp:124
+#: pcbnew/tools/pcb_actions.cpp:151
 msgid "Add a Zone Cutout"
 msgstr "添加挖空区域"
 
-#: pcbnew/tools/pcb_actions.cpp:124
+#: pcbnew/tools/pcb_actions.cpp:151
 msgid "Add a cutout area of an existing zone"
 msgstr "添加挖空区域"
 
-#: pcbnew/tools/pcb_actions.cpp:130
+#: pcbnew/tools/pcb_actions.cpp:157
 msgid "Add a Similar Zone"
 msgstr "添加相似覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:130
+#: pcbnew/tools/pcb_actions.cpp:157
 msgid "Add a zone with the same settings as an existing zone"
 msgstr "添加与现有区域具有相同设置的区域"
 
-#: pcbnew/tools/pcb_actions.cpp:136
+#: pcbnew/tools/pcb_actions.cpp:163
 msgid "Place Imported Graphics"
 msgstr "放置导入的图形"
 
-#: pcbnew/tools/pcb_actions.cpp:142
+#: pcbnew/tools/pcb_actions.cpp:169
 msgid "Place the Footprint Anchor"
 msgstr "放置封装锚点"
 
-#: pcbnew/tools/pcb_actions.cpp:148
+#: pcbnew/tools/pcb_actions.cpp:175
 msgid "Increase Line Width"
 msgstr "增大线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:148
+#: pcbnew/tools/pcb_actions.cpp:175
 msgid "Increase the line width"
 msgstr "增加线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:153
+#: pcbnew/tools/pcb_actions.cpp:180
 msgid "Decrease Line Width"
 msgstr "减小线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:153
+#: pcbnew/tools/pcb_actions.cpp:180
 msgid "Decrease the line width"
 msgstr "减少线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:158
+#: pcbnew/tools/pcb_actions.cpp:185
 msgid "Switch Arc Posture"
 msgstr "切换弧形态"
 
-#: pcbnew/tools/pcb_actions.cpp:158
+#: pcbnew/tools/pcb_actions.cpp:185
 msgid "Switch the arc posture"
 msgstr "交换圆弧位置"
 
-#: pcbnew/tools/pcb_actions.cpp:163
+#: pcbnew/tools/pcb_actions.cpp:190
 msgid "Delete Last Point"
 msgstr "删除最后的点"
 
-#: pcbnew/tools/pcb_actions.cpp:163
+#: pcbnew/tools/pcb_actions.cpp:190
 msgid "Delete the last point added to the current item"
 msgstr "删除当前项目中添加的最后一个点"
 
-#: pcbnew/tools/pcb_actions.cpp:168
+#: pcbnew/tools/pcb_actions.cpp:195
 msgid "Close Outline"
 msgstr "闭合轮廓"
 
-#: pcbnew/tools/pcb_actions.cpp:168
+#: pcbnew/tools/pcb_actions.cpp:195
 msgid "Close the in progress outline"
 msgstr "闭合进行中的边界"
 
-#: pcbnew/tools/pcb_actions.cpp:176
+#: pcbnew/tools/pcb_actions.cpp:203
 msgid "Design Rules Checker"
 msgstr "设计规则检查"
 
-#: pcbnew/tools/pcb_actions.cpp:176
+#: pcbnew/tools/pcb_actions.cpp:203
 msgid "Show the design rules checker window"
 msgstr "显示设计规则检查器窗口"
 
-#: pcbnew/tools/pcb_actions.cpp:185
+#: pcbnew/tools/pcb_actions.cpp:212
 msgid "Open in Footprint Editor"
 msgstr "在封装编辑器中打开"
 
-#: pcbnew/tools/pcb_actions.cpp:186
+#: pcbnew/tools/pcb_actions.cpp:213
 msgid "Opens the selected footprint in the Footprint Editor"
 msgstr "在封装编辑器中打开选择的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:193
+#: pcbnew/tools/pcb_actions.cpp:220
 msgid ""
 "Selects a footprint by reference designator and places it under the cursor "
 "for moving"
-msgstr "按参考指示符选择封装，并将其放置在光标下以进行移动"
+msgstr "按位号选择封装，并将其放置在光标下以进行移动"
 
-#: pcbnew/tools/pcb_actions.cpp:203
+#: pcbnew/tools/pcb_actions.cpp:230
 msgid "Move with Reference"
 msgstr "随参考移动"
 
-#: pcbnew/tools/pcb_actions.cpp:204
+#: pcbnew/tools/pcb_actions.cpp:231
 msgid "Moves the selected item(s) with a specified starting point"
 msgstr "移动具有指定精确的选定项目"
 
-#: pcbnew/tools/pcb_actions.cpp:214
+#: pcbnew/tools/pcb_actions.cpp:237
 msgid "Duplicate and Increment"
 msgstr "重复和递增"
 
-#: pcbnew/tools/pcb_actions.cpp:214
+#: pcbnew/tools/pcb_actions.cpp:237
 msgid "Duplicates the selected item(s), incrementing pad numbers"
 msgstr "复制选择项目, 增量焊盘编号"
 
-#: pcbnew/tools/pcb_actions.cpp:220
+#: pcbnew/tools/pcb_actions.cpp:243
 msgid "Move Exactly..."
 msgstr "精确移动..."
 
-#: pcbnew/tools/pcb_actions.cpp:220
+#: pcbnew/tools/pcb_actions.cpp:243
 msgid "Moves the selected item(s) by an exact amount"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:226
+#: pcbnew/tools/pcb_actions.cpp:249
 msgid "Create Array..."
 msgstr "创建阵列..."
 
-#: pcbnew/tools/pcb_actions.cpp:226
+#: pcbnew/tools/pcb_actions.cpp:249
 msgid "Create array"
 msgstr "创建阵列"
 
-#: pcbnew/tools/pcb_actions.cpp:239
+#: pcbnew/tools/pcb_actions.cpp:262
 msgid "Rotate Counterclockwise"
 msgstr "逆时针旋转"
 
-#: pcbnew/tools/pcb_actions.cpp:239
+#: pcbnew/tools/pcb_actions.cpp:262
 msgid "Rotates selected item(s) counterclockwise"
 msgstr "将选中的项目逆时针旋转"
 
-#: pcbnew/tools/pcb_actions.cpp:245
+#: pcbnew/tools/pcb_actions.cpp:268
 msgid "Flips selected item(s) to opposite side of board"
 msgstr "将所选项目翻转到板的另一侧"
 
-#: pcbnew/tools/pcb_actions.cpp:250
+#: pcbnew/tools/pcb_actions.cpp:273
 msgid "Mirrors selected item"
 msgstr "镜像选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:255
+#: pcbnew/tools/pcb_actions.cpp:278
 msgid "Change Track Width"
 msgstr "调整布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:255
+#: pcbnew/tools/pcb_actions.cpp:278
 msgid "Updates selected track & via sizes"
 msgstr "更新选定的布线和过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:260
+#: pcbnew/tools/pcb_actions.cpp:283
 msgid "Delete Full Track"
 msgstr "删除整条布线"
 
-#: pcbnew/tools/pcb_actions.cpp:260
+#: pcbnew/tools/pcb_actions.cpp:283
 msgid "Deletes selected item(s) and copper connections"
 msgstr "删除所选项目和铜连接"
 
-#: pcbnew/tools/pcb_actions.cpp:277
+#: pcbnew/tools/pcb_actions.cpp:300
 msgid "Show Footprint Tree"
 msgstr "显示封装树"
 
-#: pcbnew/tools/pcb_actions.cpp:277
+#: pcbnew/tools/pcb_actions.cpp:300
 msgid "Toggles the footprint tree visibility"
 msgstr "切换封装树可见性"
 
-#: pcbnew/tools/pcb_actions.cpp:283
+#: pcbnew/tools/pcb_actions.cpp:306
 msgid "New Footprint..."
 msgstr "新建封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:283
+#: pcbnew/tools/pcb_actions.cpp:306
 msgid "Create a new, empty footprint"
 msgstr "创建一个新的空封装"
 
-#: pcbnew/tools/pcb_actions.cpp:288
+#: pcbnew/tools/pcb_actions.cpp:311
 msgid "Create Footprint..."
 msgstr "创建封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:288
+#: pcbnew/tools/pcb_actions.cpp:311
 msgid "Create a new footprint using the Footprint Wizard"
 msgstr "使用封装向导创建一个新的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:293
+#: pcbnew/tools/pcb_actions.cpp:316
 msgid "Save to Board"
 msgstr "保存电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:293
+#: pcbnew/tools/pcb_actions.cpp:316
 msgid "Update footprint on board"
 msgstr "更新在板上的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:298
+#: pcbnew/tools/pcb_actions.cpp:321
 msgid "Save to Library"
 msgstr "保存到库"
 
-#: pcbnew/tools/pcb_actions.cpp:298
+#: pcbnew/tools/pcb_actions.cpp:321
 msgid "Save changes to library"
 msgstr "保存更改到库"
 
-#: pcbnew/tools/pcb_actions.cpp:303
+#: pcbnew/tools/pcb_actions.cpp:326
 msgid "Edit Footprint"
 msgstr "编辑封装"
 
-#: pcbnew/tools/pcb_actions.cpp:303
+#: pcbnew/tools/pcb_actions.cpp:326
 msgid "Show selected footprint on editor canvas"
 msgstr "在编辑器画布上显示选定的轮廓线"
 
-#: pcbnew/tools/pcb_actions.cpp:308
+#: pcbnew/tools/pcb_actions.cpp:331
 msgid "Delete Footprint from Library"
 msgstr "从库中删除封装"
 
-#: pcbnew/tools/pcb_actions.cpp:313
+#: pcbnew/tools/pcb_actions.cpp:336
 msgid "Cut Footprint"
 msgstr "剪切封装"
 
-#: pcbnew/tools/pcb_actions.cpp:318
+#: pcbnew/tools/pcb_actions.cpp:341
 msgid "Copy Footprint"
 msgstr "复制封装"
 
-#: pcbnew/tools/pcb_actions.cpp:323
+#: pcbnew/tools/pcb_actions.cpp:346
 msgid "Paste Footprint"
 msgstr "粘贴封装"
 
-#: pcbnew/tools/pcb_actions.cpp:328
+#: pcbnew/tools/pcb_actions.cpp:351
 msgid "Import Footprint..."
 msgstr "导入封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:333
+#: pcbnew/tools/pcb_actions.cpp:356
 msgid "Export Footprint..."
 msgstr "导出封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:338
+#: pcbnew/tools/pcb_actions.cpp:361
 msgid "Footprint Properties..."
 msgstr "封装属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:346
+#: pcbnew/tools/pcb_actions.cpp:369
 msgid "Update Footprint..."
 msgstr "更新封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:347
+#: pcbnew/tools/pcb_actions.cpp:370
 msgid "Update footprint to include any changes from the library"
 msgstr "更新封装以包含来自库的任何更改"
 
-#: pcbnew/tools/pcb_actions.cpp:352
+#: pcbnew/tools/pcb_actions.cpp:375
 msgid "Update Footprints from Library..."
 msgstr "从库中更新封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:353
+#: pcbnew/tools/pcb_actions.cpp:376
 msgid "Update footprints to include any changes from the library"
 msgstr "更新封装以包含来自库的任何更改"
 
-#: pcbnew/tools/pcb_actions.cpp:358
+#: pcbnew/tools/pcb_actions.cpp:381
+msgid "Remove Unused Pads..."
+msgstr "删除未使用的焊盘..."
+
+#: pcbnew/tools/pcb_actions.cpp:382
+msgid ""
+"Remove or reset the unconnected inner layers on through hole pads and vias"
+msgstr "移除或重置通孔焊盘和通孔上未连接的内层"
+
+#: pcbnew/tools/pcb_actions.cpp:387
 msgid "Assign a different footprint from the library"
 msgstr "从库中分配不同的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:363
+#: pcbnew/tools/pcb_actions.cpp:392
 msgid "Change Footprints..."
 msgstr "保存封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:363
+#: pcbnew/tools/pcb_actions.cpp:392
 msgid "Assign different footprints from the library"
 msgstr "从库中分配不同的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:368
+#: pcbnew/tools/pcb_actions.cpp:397
 msgid "Swap Layers..."
 msgstr "交换层..."
 
-#: pcbnew/tools/pcb_actions.cpp:368
+#: pcbnew/tools/pcb_actions.cpp:397
 msgid "Move tracks or drawings from one layer to another"
 msgstr "将布线或绘制从一层移到另一层"
 
-#: pcbnew/tools/pcb_actions.cpp:373
+#: pcbnew/tools/pcb_actions.cpp:402
 msgid "Edit Track & Via Properties..."
 msgstr "编辑布线与过孔属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:379
+#: pcbnew/tools/pcb_actions.cpp:408
 msgid "Edit Text and graphics properties globally across board"
 msgstr "全局编辑文本和图形属性"
 
-#: pcbnew/tools/pcb_actions.cpp:384
+#: pcbnew/tools/pcb_actions.cpp:413
 msgid "Global Deletions..."
 msgstr "全局删除..."
 
-#: pcbnew/tools/pcb_actions.cpp:385
+#: pcbnew/tools/pcb_actions.cpp:414
 msgid "Delete tracks, footprints and graphic items from board"
 msgstr "在板上删除布线, 封装和图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:390
+#: pcbnew/tools/pcb_actions.cpp:419
 msgid "Cleanup Tracks & Vias..."
 msgstr "清除布线和过孔..."
 
-#: pcbnew/tools/pcb_actions.cpp:391
+#: pcbnew/tools/pcb_actions.cpp:420
 msgid "Cleanup redundant items, shorting items, etc."
 msgstr "清理冗余项，短路项等。"
 
-#: pcbnew/tools/pcb_actions.cpp:396
+#: pcbnew/tools/pcb_actions.cpp:425
 msgid "Cleanup Graphics..."
 msgstr "清理图形..."
 
-#: pcbnew/tools/pcb_actions.cpp:397
+#: pcbnew/tools/pcb_actions.cpp:426
 msgid "Cleanup redundant items, etc."
 msgstr "清理冗余项等。"
 
-#: pcbnew/tools/pcb_actions.cpp:404
+#: pcbnew/tools/pcb_actions.cpp:433
 msgid "Add Microwave Gap"
 msgstr "添加微波间隙"
 
-#: pcbnew/tools/pcb_actions.cpp:404
+#: pcbnew/tools/pcb_actions.cpp:433
 msgid "Create gap of specified length for microwave applications"
 msgstr "创建指定长度的高频设计缺口"
 
-#: pcbnew/tools/pcb_actions.cpp:409
+#: pcbnew/tools/pcb_actions.cpp:438
 msgid "Add Microwave Stub"
 msgstr "添加微波存根"
 
-#: pcbnew/tools/pcb_actions.cpp:409
+#: pcbnew/tools/pcb_actions.cpp:438
 msgid "Create stub of specified length for microwave applications"
 msgstr "创建指定长度的高频设计短截线"
 
-#: pcbnew/tools/pcb_actions.cpp:414
+#: pcbnew/tools/pcb_actions.cpp:443
 msgid "Add Microwave Arc Stub"
 msgstr "添加微波弧形存根"
 
-#: pcbnew/tools/pcb_actions.cpp:414
+#: pcbnew/tools/pcb_actions.cpp:443
 msgid "Create stub (arc) of specified size for microwave applications"
 msgstr "为微波应用创建指定大小的存根(弧形)"
 
-#: pcbnew/tools/pcb_actions.cpp:419
+#: pcbnew/tools/pcb_actions.cpp:448
 msgid "Add Microwave Polygonal Shape"
 msgstr "添加微波多边形"
 
-#: pcbnew/tools/pcb_actions.cpp:419
+#: pcbnew/tools/pcb_actions.cpp:448
 msgid "Create a microwave polygonal shape from a list of vertices"
 msgstr "从顶点列表创建微波多边形形状"
 
-#: pcbnew/tools/pcb_actions.cpp:424
+#: pcbnew/tools/pcb_actions.cpp:453
 msgid "Add Microwave Line"
 msgstr "添加微波线"
 
-#: pcbnew/tools/pcb_actions.cpp:424
+#: pcbnew/tools/pcb_actions.cpp:453
 msgid "Create line of specified length for microwave applications"
 msgstr "创建指定长度的高频设计线"
 
-#: pcbnew/tools/pcb_actions.cpp:432
+#: pcbnew/tools/pcb_actions.cpp:461
 msgid "Copy Pad Properties to Default"
 msgstr "将焊盘属性复制到默认值"
 
-#: pcbnew/tools/pcb_actions.cpp:432
+#: pcbnew/tools/pcb_actions.cpp:461
 msgid "Copy current pad's properties"
 msgstr "复制当前焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:437
+#: pcbnew/tools/pcb_actions.cpp:466
 msgid "Paste Default Pad Properties to Selected"
 msgstr "将默认焊盘属性粘贴到选定项"
 
-#: pcbnew/tools/pcb_actions.cpp:438
+#: pcbnew/tools/pcb_actions.cpp:467
 msgid "Replace the current pad's properties with those copied earlier"
 msgstr "将先前复制的属性替换为当前焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:443
+#: pcbnew/tools/pcb_actions.cpp:472
 msgid "Push Pad Properties to Other Pads..."
 msgstr "将焊盘属性推送到其他焊盘."
 
-#: pcbnew/tools/pcb_actions.cpp:444
+#: pcbnew/tools/pcb_actions.cpp:473
 msgid "Copy the current pad's properties to other pads"
 msgstr "复制当前焊盘属性到其他焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:449
+#: pcbnew/tools/pcb_actions.cpp:478
 msgid "Renumber Pads..."
 msgstr "焊盘重新编号..."
 
-#: pcbnew/tools/pcb_actions.cpp:450
+#: pcbnew/tools/pcb_actions.cpp:479
 msgid "Renumber pads by clicking on them in the desired order"
 msgstr "按所需顺序单击它们重新编号"
 
-#: pcbnew/tools/pcb_actions.cpp:455
+#: pcbnew/tools/pcb_actions.cpp:484
 msgid "Add Pad"
 msgstr "添加焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:455
+#: pcbnew/tools/pcb_actions.cpp:484
 msgid "Add a pad"
 msgstr "添加焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:461
+#: pcbnew/tools/pcb_actions.cpp:490
 msgid "Edit Pad as Graphic Shapes"
 msgstr "将焊盘编辑为图形形状"
 
-#: pcbnew/tools/pcb_actions.cpp:462
+#: pcbnew/tools/pcb_actions.cpp:491
 msgid "Ungroups a custom-shaped pad for editing as individual graphic shapes"
 msgstr "取消自定义形状焊盘的分组，以便作为单个图形形状进行编辑"
 
-#: pcbnew/tools/pcb_actions.cpp:468
+#: pcbnew/tools/pcb_actions.cpp:497
 msgid "Finish Pad Edit"
 msgstr "完成焊盘编辑"
 
-#: pcbnew/tools/pcb_actions.cpp:469
+#: pcbnew/tools/pcb_actions.cpp:498
 msgid "Regroups all touching graphic shapes into the edited pad"
 msgstr "将所有接触图形形状重新组合到已编辑的焊盘中"
 
-#: pcbnew/tools/pcb_actions.cpp:474
+#: pcbnew/tools/pcb_actions.cpp:503
 msgid "Default Pad Properties..."
 msgstr "默认焊盘属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:474
+#: pcbnew/tools/pcb_actions.cpp:503
 msgid "Edit the pad properties used when creating new pads"
 msgstr "编辑创建新焊盘时使用的焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:482
+#: pcbnew/tools/pcb_actions.cpp:511
 msgid "Board Setup..."
 msgstr "电路板设置..."
 
-#: pcbnew/tools/pcb_actions.cpp:483
+#: pcbnew/tools/pcb_actions.cpp:512
 msgid "Edit board setup including layers, design rules and various defaults"
 msgstr "编辑电路板设置，包括层、设计规则和各个默认值"
 
-#: pcbnew/tools/pcb_actions.cpp:488
+#: pcbnew/tools/pcb_actions.cpp:517
 msgid "Netlist..."
 msgstr "网表..."
 
-#: pcbnew/tools/pcb_actions.cpp:488
+#: pcbnew/tools/pcb_actions.cpp:517
 msgid "Read netlist and update board connectivity"
 msgstr "读取网络列表并更新电路板连接"
 
-#: pcbnew/tools/pcb_actions.cpp:493
+#: pcbnew/tools/pcb_actions.cpp:522
 msgid "Specctra Session..."
 msgstr "自动布线会话..."
 
-#: pcbnew/tools/pcb_actions.cpp:493
+#: pcbnew/tools/pcb_actions.cpp:522
 msgid "Import routed Specctra session (*.ses) file"
 msgstr "导入布线器会话(*.ses)文件"
 
-#: pcbnew/tools/pcb_actions.cpp:498
+#: pcbnew/tools/pcb_actions.cpp:527
 msgid "Specctra DSN..."
 msgstr "光绘 DSN..."
 
-#: pcbnew/tools/pcb_actions.cpp:498
+#: pcbnew/tools/pcb_actions.cpp:527
 msgid "Export Specctra DSN routing info"
 msgstr "导出光绘 DSN 路线信息"
 
-#: pcbnew/tools/pcb_actions.cpp:503
+#: pcbnew/tools/pcb_actions.cpp:532
 msgid "Gerbers (.gbr)..."
 msgstr "Gerbers (.gbr)..."
 
-#: pcbnew/tools/pcb_actions.cpp:503
+#: pcbnew/tools/pcb_actions.cpp:532
 msgid "Generate Gerbers for fabrication"
 msgstr "生成用于制造的 Gerbers"
 
-#: pcbnew/tools/pcb_actions.cpp:508
+#: pcbnew/tools/pcb_actions.cpp:537
 msgid "Drill Files (.drl)..."
 msgstr "钻孔文件 (.drl)..."
 
-#: pcbnew/tools/pcb_actions.cpp:508
+#: pcbnew/tools/pcb_actions.cpp:537
 msgid "Generate Excellon drill file(s)"
 msgstr "生成出色的钻取文件"
 
-#: pcbnew/tools/pcb_actions.cpp:513
+#: pcbnew/tools/pcb_actions.cpp:542
 msgid "Footprint Positions (.pos)..."
 msgstr "封装位置 (.pos)..."
 
-#: pcbnew/tools/pcb_actions.cpp:514
+#: pcbnew/tools/pcb_actions.cpp:543
 msgid "Generate footprint position file for pick and place"
 msgstr "生成封装拾取和放置位置的文件"
 
-#: pcbnew/tools/pcb_actions.cpp:519
+#: pcbnew/tools/pcb_actions.cpp:548
 msgid "Footprint Report (.rpt)..."
 msgstr "封装报告 (.rpt)..."
 
-#: pcbnew/tools/pcb_actions.cpp:520
+#: pcbnew/tools/pcb_actions.cpp:549
 msgid "Create report of all footprints from current board"
 msgstr "创建当前电路板所有封装报告"
 
-#: pcbnew/tools/pcb_actions.cpp:525
+#: pcbnew/tools/pcb_actions.cpp:554
 msgid "IPC-D-356 Netlist File..."
 msgstr "IPC-D-356 网络列表文件..."
 
-#: pcbnew/tools/pcb_actions.cpp:525
+#: pcbnew/tools/pcb_actions.cpp:554
 msgid "Generate IPC-D-356 netlist file"
 msgstr "创建 IPC-D-356 网络文件"
 
-#: pcbnew/tools/pcb_actions.cpp:530
+#: pcbnew/tools/pcb_actions.cpp:559
 msgid "BOM..."
 msgstr "BOM..."
 
-#: pcbnew/tools/pcb_actions.cpp:530
-msgid "Create bill of materials from current schematic"
-msgstr "从当前原理图创建 BOM"
+#: pcbnew/tools/pcb_actions.cpp:559
+msgid "Create bill of materials from board"
+msgstr "从电路板板创建 BOM"
 
-#: pcbnew/tools/pcb_actions.cpp:537
+#: pcbnew/tools/pcb_actions.cpp:566
 msgid "Switch Track Width to Next"
 msgstr "切换下一个布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:542
+#: pcbnew/tools/pcb_actions.cpp:571
 msgid "Switch Track Width to Previous"
 msgstr "切换上一个布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:547
+#: pcbnew/tools/pcb_actions.cpp:576
 msgid "Increase Via Size"
 msgstr "增大过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:552
+#: pcbnew/tools/pcb_actions.cpp:581
 msgid "Decrease Via Size"
 msgstr "减小过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:561
+#: pcbnew/tools/pcb_actions.cpp:590
 msgid "Merge Zones"
 msgstr "合并区域"
 
-#: pcbnew/tools/pcb_actions.cpp:561 pcbnew/tools/pcb_editor_control.cpp:1071
+#: pcbnew/tools/pcb_actions.cpp:590
 msgid "Merge zones"
 msgstr "合并覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:565
+#: pcbnew/tools/pcb_actions.cpp:594
 msgid "Duplicate Zone onto Layer..."
 msgstr "重复覆铜区域到层..."
 
-#: pcbnew/tools/pcb_actions.cpp:565
+#: pcbnew/tools/pcb_actions.cpp:594
 msgid "Duplicate zone outline onto a different layer"
 msgstr "复制覆铜轮廓到不同的层上"
 
-#: pcbnew/tools/pcb_actions.cpp:570
+#: pcbnew/tools/pcb_actions.cpp:599
 msgid "Add Layer Alignment Target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_actions.cpp:570
+#: pcbnew/tools/pcb_actions.cpp:599
 msgid "Add a layer alignment target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_actions.cpp:576
+#: pcbnew/tools/pcb_actions.cpp:605
 msgid "Add Footprint"
 msgstr "添加封装"
 
-#: pcbnew/tools/pcb_actions.cpp:576
+#: pcbnew/tools/pcb_actions.cpp:605
 msgid "Add a footprint"
 msgstr "添加封装"
 
-#: pcbnew/tools/pcb_actions.cpp:581
+#: pcbnew/tools/pcb_actions.cpp:610
 msgid "Drill/Place File Origin"
 msgstr "钻孔/放置文件原点"
 
-#: pcbnew/tools/pcb_actions.cpp:582
+#: pcbnew/tools/pcb_actions.cpp:611
 msgid "Place origin point for drill files and footprint position files"
 msgstr "放置钻孔文件和封装位置文件的原点"
 
-#: pcbnew/tools/pcb_actions.cpp:588
+#: pcbnew/tools/pcb_actions.cpp:617
 msgid "Toggle Lock"
 msgstr "切换锁定"
 
-#: pcbnew/tools/pcb_actions.cpp:593 pcbnew/tools/pcb_editor_control.cpp:865
+#: pcbnew/tools/pcb_actions.cpp:622 pcbnew/tools/pcb_editor_control.cpp:995
 msgid "Lock"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_actions.cpp:598 pcbnew/tools/pcb_editor_control.cpp:866
+#: pcbnew/tools/pcb_actions.cpp:627 pcbnew/tools/pcb_editor_control.cpp:996
 msgid "Unlock"
 msgstr "解锁"
 
-#: pcbnew/tools/pcb_actions.cpp:603
+#: pcbnew/tools/pcb_actions.cpp:637
+msgid "Merge"
+msgstr "合并"
+
+#: pcbnew/tools/pcb_actions.cpp:642
+msgid "Ungroup"
+msgstr "解组"
+
+#: pcbnew/tools/pcb_actions.cpp:647
+msgid "Remove Items"
+msgstr "删除项目"
+
+#: pcbnew/tools/pcb_actions.cpp:652
+msgid "Flatten"
+msgstr "扁平化"
+
+#: pcbnew/tools/pcb_actions.cpp:657
+msgid "Enter"
+msgstr "开始"
+
+#: pcbnew/tools/pcb_actions.cpp:662
 msgid "Append Board..."
 msgstr "添加电路板..."
 
-#: pcbnew/tools/pcb_actions.cpp:607
+#: pcbnew/tools/pcb_actions.cpp:666
 msgid "Highlight the selected net"
 msgstr "高亮所选的网络"
 
-#: pcbnew/tools/pcb_actions.cpp:612
+#: pcbnew/tools/pcb_actions.cpp:671
 msgid "Toggle Last Net Highlight"
 msgstr "切换最后一个网络高亮"
 
-#: pcbnew/tools/pcb_actions.cpp:612
+#: pcbnew/tools/pcb_actions.cpp:671
 msgid "Toggle between last two highlighted nets"
 msgstr "在最后两个突出显示的网之间切换"
 
-#: pcbnew/tools/pcb_actions.cpp:616
+#: pcbnew/tools/pcb_actions.cpp:675
 msgid "Clear Net Highlighting"
 msgstr "清除网络高亮"
 
-#: pcbnew/tools/pcb_actions.cpp:620 pcbnew/tools/pcb_actions.cpp:627
+#: pcbnew/tools/pcb_actions.cpp:679 pcbnew/tools/pcb_actions.cpp:686
 msgid "Highlight all copper items of a net"
 msgstr "高亮网络中的所有铜项目"
 
-#: pcbnew/tools/pcb_actions.cpp:634
+#: pcbnew/tools/pcb_actions.cpp:693
 msgid "Hide Net"
 msgstr "隐藏网络"
 
-#: pcbnew/tools/pcb_actions.cpp:634
+#: pcbnew/tools/pcb_actions.cpp:693
 msgid "Hide the ratsnest for the selected net"
 msgstr "显示所选网络的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:637
+#: pcbnew/tools/pcb_actions.cpp:696
 msgid "Show Net"
 msgstr "显示网络"
 
-#: pcbnew/tools/pcb_actions.cpp:637
+#: pcbnew/tools/pcb_actions.cpp:696
 msgid "Show the ratsnest for the selected net"
 msgstr "显示所选网络的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:641
+#: pcbnew/tools/pcb_actions.cpp:700
 msgid "Switch to Schematic Editor"
 msgstr "切换到原理图编辑器"
 
-#: pcbnew/tools/pcb_actions.cpp:641
+#: pcbnew/tools/pcb_actions.cpp:700
 msgid "Open schematic in Eeschema"
 msgstr "在 Eeschema 中打开原理图"
 
-#: pcbnew/tools/pcb_actions.cpp:650
+#: pcbnew/tools/pcb_actions.cpp:709
 msgid "Highlight Ratsnest"
 msgstr "高亮飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:650
+#: pcbnew/tools/pcb_actions.cpp:709
 msgid "Show ratsnest of selected item(s)"
 msgstr "显示所选项目的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:661
+#: pcbnew/tools/pcb_actions.cpp:720
 msgid "Show the net inspector"
 msgstr "显示网络检查"
 
-#: pcbnew/tools/pcb_actions.cpp:666
+#: pcbnew/tools/pcb_actions.cpp:725
 msgid "Scripting Console"
 msgstr "脚本控制台"
 
-#: pcbnew/tools/pcb_actions.cpp:666
+#: pcbnew/tools/pcb_actions.cpp:725
 msgid "Show the Python scripting console"
 msgstr "显示 Python 脚本控制台"
 
-#: pcbnew/tools/pcb_actions.cpp:671
+#: pcbnew/tools/pcb_actions.cpp:730
 msgid "Show Layers Manager"
 msgstr "显示层管理"
 
-#: pcbnew/tools/pcb_actions.cpp:671
+#: pcbnew/tools/pcb_actions.cpp:730
 msgid "Show/hide the layers manager"
 msgstr "显示或隐藏层管理器"
 
-#: pcbnew/tools/pcb_actions.cpp:676
+#: pcbnew/tools/pcb_actions.cpp:735
 msgid "Show Microwave Toolbar"
 msgstr "显示微波工具栏"
 
-#: pcbnew/tools/pcb_actions.cpp:676
+#: pcbnew/tools/pcb_actions.cpp:735
 msgid ""
 "Show/hide microwave toolbar\n"
 "(Experimental feature)"
@@ -28342,522 +29634,552 @@ msgstr ""
 "显示或隐藏微波设计工具栏 \n"
 "(试验功能)"
 
-#: pcbnew/tools/pcb_actions.cpp:681
+#: pcbnew/tools/pcb_actions.cpp:740
 msgid "Flip Board View"
 msgstr "翻转电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:681
+#: pcbnew/tools/pcb_actions.cpp:740
 msgid "Flip (mirror) the board view"
 msgstr "翻转 (镜像) 板视图"
 
-#: pcbnew/tools/pcb_actions.cpp:687
+#: pcbnew/tools/pcb_actions.cpp:746
 msgid "Show Ratsnest"
 msgstr "显示飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:687
+#: pcbnew/tools/pcb_actions.cpp:746
 msgid "Show board ratsnest"
 msgstr "显示线路板飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:692
+#: pcbnew/tools/pcb_actions.cpp:751
 msgid "Curved Ratsnest Lines"
 msgstr "弯曲的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:698
+#: pcbnew/tools/pcb_actions.cpp:757
 msgid "Sketch Tracks"
 msgstr "布线草图"
 
-#: pcbnew/tools/pcb_actions.cpp:698
+#: pcbnew/tools/pcb_actions.cpp:757
 msgid "Show tracks in outline mode"
 msgstr "在轮廓模式下显示布线"
 
-#: pcbnew/tools/pcb_actions.cpp:703
+#: pcbnew/tools/pcb_actions.cpp:762
 msgid "Sketch Pads"
 msgstr "焊盘草图"
 
-#: pcbnew/tools/pcb_actions.cpp:703
+#: pcbnew/tools/pcb_actions.cpp:762
 msgid "Show pads in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:708
+#: pcbnew/tools/pcb_actions.cpp:767
 msgid "Sketch Vias"
 msgstr "过孔草图"
 
-#: pcbnew/tools/pcb_actions.cpp:708
+#: pcbnew/tools/pcb_actions.cpp:767
 msgid "Show vias in outline mode"
 msgstr "在轮廓模式下显示过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:713
+#: pcbnew/tools/pcb_actions.cpp:772
 msgid "Sketch Graphic Items"
 msgstr "草图图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:713
+#: pcbnew/tools/pcb_actions.cpp:772
 msgid "Show graphic items in outline mode"
 msgstr "在轮廓模式下显示图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:718
+#: pcbnew/tools/pcb_actions.cpp:777
 msgid "Sketch Text Items"
 msgstr "草图文本项"
 
-#: pcbnew/tools/pcb_actions.cpp:718
+#: pcbnew/tools/pcb_actions.cpp:777
 msgid "Show footprint texts in line mode"
 msgstr "在行模式下显示封装文本"
 
-#: pcbnew/tools/pcb_actions.cpp:728
+#: pcbnew/tools/pcb_actions.cpp:787
 msgid "Automatically zoom to fit"
 msgstr "自动缩放以适合"
 
-#: pcbnew/tools/pcb_actions.cpp:728
+#: pcbnew/tools/pcb_actions.cpp:787
 msgid "Zoom to fit when changing footprint"
 msgstr "更改封装时缩放至适合大小"
 
-#: pcbnew/tools/pcb_actions.cpp:733
+#: pcbnew/tools/pcb_actions.cpp:792
 msgid "Fill Zones"
 msgstr "填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:733
+#: pcbnew/tools/pcb_actions.cpp:792
 msgid "Show filled areas of zones"
 msgstr "显示覆铜填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:738
+#: pcbnew/tools/pcb_actions.cpp:797
 msgid "Wireframe Zones"
 msgstr "线框区域"
 
-#: pcbnew/tools/pcb_actions.cpp:738
+#: pcbnew/tools/pcb_actions.cpp:797
 msgid "Show only zone boundaries"
 msgstr "仅显示区域边界"
 
-#: pcbnew/tools/pcb_actions.cpp:743
+#: pcbnew/tools/pcb_actions.cpp:802
 msgid "Sketch Zones"
 msgstr "草图区域"
 
-#: pcbnew/tools/pcb_actions.cpp:743
+#: pcbnew/tools/pcb_actions.cpp:802
 msgid "Show solid areas of zones in outline mode"
 msgstr "在轮廓模式下显示区域的实心区域"
 
-#: pcbnew/tools/pcb_actions.cpp:749
+#: pcbnew/tools/pcb_actions.cpp:808
 msgid "Toggle Zone Display"
 msgstr "切换区域显示"
 
-#: pcbnew/tools/pcb_actions.cpp:750
+#: pcbnew/tools/pcb_actions.cpp:809
 msgid "Cycle between showing filled zones, wireframed zones and sketched zones"
 msgstr "在显示填充区域、线框区域和草图区域之间循环"
 
-#: pcbnew/tools/pcb_actions.cpp:758
+#: pcbnew/tools/pcb_actions.cpp:817
 msgid "Switch to Component (F.Cu) layer"
 msgstr "切换到元件层（顶层铜层）"
 
-#: pcbnew/tools/pcb_actions.cpp:764
+#: pcbnew/tools/pcb_actions.cpp:823
 msgid "Switch to Inner layer 1"
 msgstr "切换到内层 1"
 
-#: pcbnew/tools/pcb_actions.cpp:770
+#: pcbnew/tools/pcb_actions.cpp:829
 msgid "Switch to Inner layer 2"
 msgstr "切换到内层 2"
 
-#: pcbnew/tools/pcb_actions.cpp:776
+#: pcbnew/tools/pcb_actions.cpp:835
 msgid "Switch to Inner layer 3"
 msgstr "切换到内层 3"
 
-#: pcbnew/tools/pcb_actions.cpp:782
+#: pcbnew/tools/pcb_actions.cpp:841
 msgid "Switch to Inner layer 4"
 msgstr "切换到内层 4"
 
-#: pcbnew/tools/pcb_actions.cpp:788
+#: pcbnew/tools/pcb_actions.cpp:847
 msgid "Switch to Inner layer 5"
 msgstr "切换到内层 5"
 
-#: pcbnew/tools/pcb_actions.cpp:794
+#: pcbnew/tools/pcb_actions.cpp:853
 msgid "Switch to Inner layer 6"
 msgstr "切换到内层 6"
 
-#: pcbnew/tools/pcb_actions.cpp:799
+#: pcbnew/tools/pcb_actions.cpp:858
 msgid "Switch to Inner layer 7"
 msgstr "切换到内层 7"
 
-#: pcbnew/tools/pcb_actions.cpp:804
+#: pcbnew/tools/pcb_actions.cpp:863
 msgid "Switch to Inner layer 8"
 msgstr "切换到内层 8"
 
-#: pcbnew/tools/pcb_actions.cpp:809
+#: pcbnew/tools/pcb_actions.cpp:868
 msgid "Switch to Inner layer 9"
 msgstr "切换到内层 9"
 
-#: pcbnew/tools/pcb_actions.cpp:814
+#: pcbnew/tools/pcb_actions.cpp:873
 msgid "Switch to Inner layer 10"
 msgstr "切换到内层 10"
 
-#: pcbnew/tools/pcb_actions.cpp:819
+#: pcbnew/tools/pcb_actions.cpp:878
 msgid "Switch to Inner layer 11"
 msgstr "切换到内层 11"
 
-#: pcbnew/tools/pcb_actions.cpp:824
+#: pcbnew/tools/pcb_actions.cpp:883
 msgid "Switch to Inner layer 12"
 msgstr "切换到内层 12"
 
-#: pcbnew/tools/pcb_actions.cpp:829
+#: pcbnew/tools/pcb_actions.cpp:888
 msgid "Switch to Inner layer 13"
 msgstr "切换到内层 13"
 
-#: pcbnew/tools/pcb_actions.cpp:834
+#: pcbnew/tools/pcb_actions.cpp:893
 msgid "Switch to Inner layer 14"
 msgstr "切换到内层 14"
 
-#: pcbnew/tools/pcb_actions.cpp:839
+#: pcbnew/tools/pcb_actions.cpp:898
 msgid "Switch to Inner layer 15"
 msgstr "切换到内层 15"
 
-#: pcbnew/tools/pcb_actions.cpp:844
+#: pcbnew/tools/pcb_actions.cpp:903
 msgid "Switch to Inner layer 16"
 msgstr "切换到内层 16"
 
-#: pcbnew/tools/pcb_actions.cpp:849
+#: pcbnew/tools/pcb_actions.cpp:908
 msgid "Switch to Inner layer 17"
 msgstr "切换到内层 17"
 
-#: pcbnew/tools/pcb_actions.cpp:854
+#: pcbnew/tools/pcb_actions.cpp:913
 msgid "Switch to Inner layer 18"
 msgstr "切换到内层 18"
 
-#: pcbnew/tools/pcb_actions.cpp:859
+#: pcbnew/tools/pcb_actions.cpp:918
 msgid "Switch to Inner layer 19"
 msgstr "切换到内层 19"
 
-#: pcbnew/tools/pcb_actions.cpp:864
+#: pcbnew/tools/pcb_actions.cpp:923
 msgid "Switch to Inner layer 20"
 msgstr "切换到内层 20"
 
-#: pcbnew/tools/pcb_actions.cpp:869
+#: pcbnew/tools/pcb_actions.cpp:928
 msgid "Switch to Inner layer 21"
 msgstr "切换到内层 21"
 
-#: pcbnew/tools/pcb_actions.cpp:874
+#: pcbnew/tools/pcb_actions.cpp:933
 msgid "Switch to Inner layer 22"
 msgstr "切换到内层 22"
 
-#: pcbnew/tools/pcb_actions.cpp:879
+#: pcbnew/tools/pcb_actions.cpp:938
 msgid "Switch to Inner layer 23"
 msgstr "切换到内层 23"
 
-#: pcbnew/tools/pcb_actions.cpp:884
+#: pcbnew/tools/pcb_actions.cpp:943
 msgid "Switch to Inner layer 24"
 msgstr "切换到内层 24"
 
-#: pcbnew/tools/pcb_actions.cpp:889
+#: pcbnew/tools/pcb_actions.cpp:948
 msgid "Switch to Inner layer 25"
 msgstr "切换到内层 25"
 
-#: pcbnew/tools/pcb_actions.cpp:894
+#: pcbnew/tools/pcb_actions.cpp:953
 msgid "Switch to Inner layer 26"
 msgstr "切换到内层 26"
 
-#: pcbnew/tools/pcb_actions.cpp:899
+#: pcbnew/tools/pcb_actions.cpp:958
 msgid "Switch to Inner layer 27"
 msgstr "切换到内层 27"
 
-#: pcbnew/tools/pcb_actions.cpp:904
+#: pcbnew/tools/pcb_actions.cpp:963
 msgid "Switch to Inner layer 28"
 msgstr "切换到内层 28"
 
-#: pcbnew/tools/pcb_actions.cpp:909
+#: pcbnew/tools/pcb_actions.cpp:968
 msgid "Switch to Inner layer 29"
 msgstr "切换到内层 29"
 
-#: pcbnew/tools/pcb_actions.cpp:914
+#: pcbnew/tools/pcb_actions.cpp:973
 msgid "Switch to Inner layer 30"
 msgstr "切换到内层 30"
 
-#: pcbnew/tools/pcb_actions.cpp:920
+#: pcbnew/tools/pcb_actions.cpp:979
 msgid "Switch to Copper (B.Cu) layer"
 msgstr "切换到底层铜层"
 
-#: pcbnew/tools/pcb_actions.cpp:926
+#: pcbnew/tools/pcb_actions.cpp:985
 msgid "Switch to Next Layer"
 msgstr "切换到下一层"
 
-#: pcbnew/tools/pcb_actions.cpp:931
+#: pcbnew/tools/pcb_actions.cpp:990
 msgid "Switch to Previous Layer"
 msgstr "切换到上一层"
 
-#: pcbnew/tools/pcb_actions.cpp:936
+#: pcbnew/tools/pcb_actions.cpp:995
 msgid "Add Through Via"
 msgstr "添加通孔"
 
-#: pcbnew/tools/pcb_actions.cpp:942
+#: pcbnew/tools/pcb_actions.cpp:1001
 msgid "Increase Layer Opacity"
 msgstr "增大图层不透明度"
 
-#: pcbnew/tools/pcb_actions.cpp:942 pcbnew/tools/pcb_actions.cpp:949
+#: pcbnew/tools/pcb_actions.cpp:1001 pcbnew/tools/pcb_actions.cpp:1008
 msgid "Make the current layer more transparent"
 msgstr "使当前层更加透明"
 
-#: pcbnew/tools/pcb_actions.cpp:949
+#: pcbnew/tools/pcb_actions.cpp:1008
 msgid "Decrease Layer Opacity"
 msgstr "减小图层不透明度"
 
-#: pcbnew/tools/pcb_actions.cpp:959
+#: pcbnew/tools/pcb_actions.cpp:1019
 msgid "Show Board Statistics"
 msgstr "显示板统计信息"
 
-#: pcbnew/tools/pcb_actions.cpp:960
+#: pcbnew/tools/pcb_actions.cpp:1019
 msgid "Shows board statistics"
 msgstr "显示板统计信息"
 
-#: pcbnew/tools/pcb_actions.cpp:967
+#: pcbnew/tools/pcb_actions.cpp:1025
+msgid "Geographical Reannotate..."
+msgstr "位置重新批注..."
+
+#: pcbnew/tools/pcb_actions.cpp:1025
+msgid "Reannotate PCB in geographical order"
+msgstr "按位置顺序重新批注 PCB"
+
+#: pcbnew/tools/pcb_actions.cpp:1030
+msgid "Repair Board"
+msgstr "修复电路板"
+
+#: pcbnew/tools/pcb_actions.cpp:1031
+msgid "Run various diagnostics and attempt to repair board"
+msgstr "运行各种诊断程序并尝试修复电路板"
+
+#: pcbnew/tools/pcb_actions.cpp:1039
 msgid "Align to Top"
 msgstr "顶部对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:968
+#: pcbnew/tools/pcb_actions.cpp:1040
 msgid "Aligns selected items to the top edge"
 msgstr "对齐选择的项到顶边"
 
-#: pcbnew/tools/pcb_actions.cpp:972
+#: pcbnew/tools/pcb_actions.cpp:1044
 msgid "Align to Bottom"
 msgstr "底部对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:973
+#: pcbnew/tools/pcb_actions.cpp:1045
 msgid "Aligns selected items to the bottom edge"
 msgstr "对齐选择的项到底边"
 
-#: pcbnew/tools/pcb_actions.cpp:977
+#: pcbnew/tools/pcb_actions.cpp:1049
 msgid "Align to Left"
 msgstr "左对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:978
+#: pcbnew/tools/pcb_actions.cpp:1050
 msgid "Aligns selected items to the left edge"
 msgstr "对齐选择的项到左边"
 
-#: pcbnew/tools/pcb_actions.cpp:982
+#: pcbnew/tools/pcb_actions.cpp:1054
 msgid "Align to Right"
 msgstr "右对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:983
+#: pcbnew/tools/pcb_actions.cpp:1055
 msgid "Aligns selected items to the right edge"
 msgstr "对齐选择的项到右边"
 
-#: pcbnew/tools/pcb_actions.cpp:987
+#: pcbnew/tools/pcb_actions.cpp:1059
 msgid "Align to Vertical Center"
 msgstr "与垂直中心对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:988
+#: pcbnew/tools/pcb_actions.cpp:1060
 msgid "Aligns selected items to the vertical center"
 msgstr "将选定的项目垂直居中"
 
-#: pcbnew/tools/pcb_actions.cpp:992
+#: pcbnew/tools/pcb_actions.cpp:1064
 msgid "Align to Horizontal Center"
 msgstr "与水平中心对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:993
+#: pcbnew/tools/pcb_actions.cpp:1065
 msgid "Aligns selected items to the horizontal center"
 msgstr "将选定的项目水平居中"
 
-#: pcbnew/tools/pcb_actions.cpp:997
+#: pcbnew/tools/pcb_actions.cpp:1069
 msgid "Distribute Horizontally"
 msgstr "水平分布"
 
-#: pcbnew/tools/pcb_actions.cpp:998
+#: pcbnew/tools/pcb_actions.cpp:1070
 msgid "Distributes selected items along the horizontal axis"
 msgstr "所选项沿水平轴分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1002
+#: pcbnew/tools/pcb_actions.cpp:1074
 msgid "Distribute Vertically"
 msgstr "垂直分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1003
+#: pcbnew/tools/pcb_actions.cpp:1075
 msgid "Distributes selected items along the vertical axis"
 msgstr "所选项沿垂直轴分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1023
+#: pcbnew/tools/pcb_actions.cpp:1095
 msgid "Position Relative To..."
 msgstr "相対位置..."
 
-#: pcbnew/tools/pcb_actions.cpp:1024
+#: pcbnew/tools/pcb_actions.cpp:1096
 msgid "Positions the selected item(s) by an exact amount relative to another"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:1060
+#: pcbnew/tools/pcb_actions.cpp:1132
 msgid "Select/Expand Connection"
 msgstr "选择/扩展连接"
 
-#: pcbnew/tools/pcb_actions.cpp:1061
+#: pcbnew/tools/pcb_actions.cpp:1133
 msgid ""
 "Selects a connection or expands an existing selection to junctions, pads, or "
 "entire connections"
 msgstr "选择连接或将现有选择扩展到连接点、焊盘或整个连接"
 
-#: pcbnew/tools/pcb_actions.cpp:1066
+#: pcbnew/tools/pcb_actions.cpp:1138
 msgid "Select All Tracks in Net"
 msgstr "选择网中的所有布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1067
+#: pcbnew/tools/pcb_actions.cpp:1139
 msgid "Selects all tracks & vias belonging to the same net."
 msgstr "选择所有属于同一网络的布线与过孔。"
 
-#: pcbnew/tools/pcb_actions.cpp:1073
+#: pcbnew/tools/pcb_actions.cpp:1145
 msgid "Selects all modules and tracks in the schematic sheet"
 msgstr "选择原理图框中的所有模块和布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1078
+#: pcbnew/tools/pcb_actions.cpp:1150
 msgid "Items in Same Hierarchical Sheet"
 msgstr "同一层次图框中的项目"
 
-#: pcbnew/tools/pcb_actions.cpp:1079
+#: pcbnew/tools/pcb_actions.cpp:1151
 msgid "Selects all modules and tracks in the same schematic sheet"
 msgstr "选择同一原理图框中的所有模块和布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1084
+#: pcbnew/tools/pcb_actions.cpp:1156
 msgid "Filter Selection..."
 msgstr "筛选器选择..."
 
-#: pcbnew/tools/pcb_actions.cpp:1084
+#: pcbnew/tools/pcb_actions.cpp:1156
 msgid "Filter the types of items in the selection"
 msgstr "筛选选中的项目类型"
 
-#: pcbnew/tools/pcb_actions.cpp:1092
+#: pcbnew/tools/pcb_actions.cpp:1164
 msgid "Fill zone(s)"
 msgstr "填充覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:1098
+#: pcbnew/tools/pcb_actions.cpp:1170
 msgid "Fill All"
 msgstr "填充所有"
 
-#: pcbnew/tools/pcb_actions.cpp:1098
+#: pcbnew/tools/pcb_actions.cpp:1170
 msgid "Fill all zones"
 msgstr "填充所有区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1103
+#: pcbnew/tools/pcb_actions.cpp:1175
 msgid "Unfill"
 msgstr "取消填充"
 
-#: pcbnew/tools/pcb_actions.cpp:1103
+#: pcbnew/tools/pcb_actions.cpp:1175
 msgid "Unfill zone(s)"
 msgstr "取消填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1109
+#: pcbnew/tools/pcb_actions.cpp:1181
 msgid "Unfill All"
 msgstr "取消所有填充"
 
-#: pcbnew/tools/pcb_actions.cpp:1109
+#: pcbnew/tools/pcb_actions.cpp:1181
 msgid "Unfill all zones"
 msgstr "取消所有填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1117
+#: pcbnew/tools/pcb_actions.cpp:1189
 msgid "Place Selected Footprints"
 msgstr "放置选定的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:1118
+#: pcbnew/tools/pcb_actions.cpp:1190
 msgid "Performs automatic placement of selected components"
 msgstr "执行选定元件的自动放置"
 
-#: pcbnew/tools/pcb_actions.cpp:1123
+#: pcbnew/tools/pcb_actions.cpp:1195
 msgid "Place Off-Board Footprints"
 msgstr "放置板外封装"
 
-#: pcbnew/tools/pcb_actions.cpp:1124
+#: pcbnew/tools/pcb_actions.cpp:1196
 msgid "Performs automatic placement of components outside board area"
 msgstr "在板区域外执行元件的自动放置"
 
-#: pcbnew/tools/pcb_actions.cpp:1133
+#: pcbnew/tools/pcb_actions.cpp:1205
 msgid "Route Single Track"
 msgstr "单轨交互式布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1133
+#: pcbnew/tools/pcb_actions.cpp:1205
 msgid "Run push & shove router (single tracks)"
 msgstr "运行推挤布线(单轨布线)"
 
-#: pcbnew/tools/pcb_actions.cpp:1140
+#: pcbnew/tools/pcb_actions.cpp:1212
 msgid "Route Differential Pair"
 msgstr "差分对交互布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1140
+#: pcbnew/tools/pcb_actions.cpp:1212
 msgid "Run push & shove router (differential pairs)"
 msgstr "运行推挤布线(差分对布线)"
 
-#: pcbnew/tools/pcb_actions.cpp:1146
+#: pcbnew/tools/pcb_actions.cpp:1218
 msgid "Interactive Router Settings..."
 msgstr "交互式布线设置..."
 
-#: pcbnew/tools/pcb_actions.cpp:1146
+#: pcbnew/tools/pcb_actions.cpp:1218
 msgid "Open Interactive Router settings"
 msgstr "打开交互布线设置"
 
-#: pcbnew/tools/pcb_actions.cpp:1151
+#: pcbnew/tools/pcb_actions.cpp:1223
 msgid "Differential Pair Dimensions..."
 msgstr "差分对尺寸..."
 
-#: pcbnew/tools/pcb_actions.cpp:1151
+#: pcbnew/tools/pcb_actions.cpp:1223
 msgid "Open Differential Pair Dimension settings"
 msgstr "打开差分对尺寸设置"
 
-#: pcbnew/tools/pcb_actions.cpp:1156
+#: pcbnew/tools/pcb_actions.cpp:1228
 msgid "Router Highlight Mode"
 msgstr "布线高亮模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1156
+#: pcbnew/tools/pcb_actions.cpp:1228
 msgid "Switch router to highlight mode"
 msgstr "将布线切换到高亮模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1161
+#: pcbnew/tools/pcb_actions.cpp:1233
 msgid "Router Shove Mode"
 msgstr "布线推挤模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1161
+#: pcbnew/tools/pcb_actions.cpp:1233
 msgid "Switch router to shove mode"
 msgstr "将布线切换到推挤模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1166
+#: pcbnew/tools/pcb_actions.cpp:1238
 msgid "Router Walkaround Mode"
 msgstr "布线绕走模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1166
+#: pcbnew/tools/pcb_actions.cpp:1238
 msgid "Switch router to walkaround mode"
 msgstr "将布线切换到绕走模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1171
+#: pcbnew/tools/pcb_actions.cpp:1243
 msgid "Set Layer Pair..."
 msgstr "设置层对..."
 
-#: pcbnew/tools/pcb_actions.cpp:1171
+#: pcbnew/tools/pcb_actions.cpp:1243
 msgid "Change active layer pair for routing"
 msgstr "更改布线的活动层对"
 
-#: pcbnew/tools/pcb_actions.cpp:1178
+#: pcbnew/tools/pcb_actions.cpp:1250
 msgid "Tune length of a single track"
 msgstr "调整单轨布线长度"
 
-#: pcbnew/tools/pcb_actions.cpp:1185
+#: pcbnew/tools/pcb_actions.cpp:1257
 msgid "Tune length of a differential pair"
 msgstr "调整差分对布线长度"
 
-#: pcbnew/tools/pcb_actions.cpp:1192
+#: pcbnew/tools/pcb_actions.cpp:1264
 msgid "Tune skew of a differential pair"
 msgstr "调整差分对布线歪斜"
 
-#: pcbnew/tools/pcb_actions.cpp:1197
-msgid "Drag Track/Via"
-msgstr "拖拉 布线/过孔"
-
-#: pcbnew/tools/pcb_actions.cpp:1197
-msgid "Drags tracks and vias without breaking connections"
-msgstr "拖动布线和过孔而不中断连接"
-
-#: pcbnew/tools/pcb_actions.cpp:1203 pcbnew/tools/pcb_actions.cpp:1209
+#: pcbnew/tools/pcb_actions.cpp:1273 pcbnew/tools/pcb_actions.cpp:1279
 msgid ""
 "Splits the track segment into two segments connected at the cursor position."
 msgstr "将布线拆分为在光标位置连接的两个段。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:134
+#: pcbnew/tools/pcb_editor_control.cpp:107
 msgid "Locking"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_editor_control.cpp:340
+#: pcbnew/tools/pcb_editor_control.cpp:127
+msgid "Grouping"
+msgstr "分组"
+
+#: pcbnew/tools/pcb_editor_control.cpp:151
+msgid "Group is in inconsistent state: "
+msgstr "组处于不一致状态： "
+
+#: pcbnew/tools/pcb_editor_control.cpp:362
 msgid "Merge Specctra Session file:"
 msgstr "合并布线器会话文件:"
 
-#: pcbnew/tools/pcb_editor_control.cpp:363
+#: pcbnew/tools/pcb_editor_control.cpp:385
 msgid "Specctra DSN File"
 msgstr "Specctra DSN 文件"
 
-#: pcbnew/tools/pcb_editor_control.cpp:414
+#: pcbnew/tools/pcb_editor_control.cpp:485
+#, c-format
+msgid "%d duplicate IDs replaced.\n"
+msgstr "已替换 %d 个重复 ID。\n"
+
+#: pcbnew/tools/pcb_editor_control.cpp:500
+#, c-format
+msgid "%d potential problems repaired."
+msgstr "已修复 %d 个潜在问题。"
+
+#: pcbnew/tools/pcb_editor_control.cpp:505
+msgid "No board problems found."
+msgstr "未发现电路板问题。"
+
+#: pcbnew/tools/pcb_editor_control.cpp:530
 msgid ""
 "Cannot update schematic because Pcbnew is opened in stand-alone mode. In "
 "order to create or update PCBs from schematics, you must launch the KiCad "
@@ -28866,19 +30188,54 @@ msgstr ""
 "无法更新原理图，因为 Pcbnew 在独立模式下打开。为了从原理图创建或更新 PCB，您"
 "必须启动 KiCad 项目管理器并创建项目。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:778
+#: pcbnew/tools/pcb_editor_control.cpp:908
 msgid "Place a module"
 msgstr "放置模块"
 
-#: pcbnew/tools/pcb_editor_control.cpp:867
+#: pcbnew/tools/pcb_editor_control.cpp:997
 msgid "Toggle Locking"
 msgstr "切换锁定"
 
-#: pcbnew/tools/pcb_editor_control.cpp:954
-msgid "Place a layer alignment target"
-msgstr "放置层对齐标记"
+#: pcbnew/tools/pcb_editor_control.cpp:1027
+#, c-format
+msgid "Item %s appears in selection multiple times"
+msgstr "项目 %s 多次出现在所选内容中"
 
-#: pcbnew/tools/pcb_editor_control.cpp:1126
+#: pcbnew/tools/pcb_editor_control.cpp:1033
+msgid "GroupCreate"
+msgstr "组创建"
+
+#: pcbnew/tools/pcb_editor_control.cpp:1035
+msgid "Group create resulted in inconsistent state: "
+msgstr "组创建导致状态不一致： "
+
+#: pcbnew/tools/pcb_editor_control.cpp:1073
+msgid "Group not found in selection though selection was checked"
+msgstr "虽然选中了选择，但在所选内容中找不到组"
+
+#: pcbnew/tools/pcb_editor_control.cpp:1085
+#, c-format
+msgid "Item %s is already in group for merge"
+msgstr "项目 %s 已在要合并的组中"
+
+#: pcbnew/tools/pcb_editor_control.cpp:1092
+#: pcbnew/tools/pcb_editor_control.cpp:1135
+msgid "Group merge resulted in inconsistent state: "
+msgstr "组合并导致状态不一致： "
+
+#: pcbnew/tools/pcb_editor_control.cpp:1123
+msgid "Selection for ungroup should only have groups in it - was checked."
+msgstr "解组的选择应仅包含组 - 已选中。"
+
+#: pcbnew/tools/pcb_editor_control.cpp:1170
+msgid "Group removeItems resulted in inconsistent state: "
+msgstr "组删除项导致状态不一致： "
+
+#: pcbnew/tools/pcb_editor_control.cpp:1240
+msgid "Group flatten resulted in inconsistent state: "
+msgstr "组扁平化导致状态不一致： "
+
+#: pcbnew/tools/pcb_editor_control.cpp:1518
 msgid "Duplicate zone"
 msgstr "复制区域"
 
@@ -28886,11 +30243,11 @@ msgstr "复制区域"
 msgid "Net Tools"
 msgstr "网络工具"
 
-#: pcbnew/tools/pcbnew_control.cpp:724
+#: pcbnew/tools/pcbnew_control.cpp:718
 msgid "Invalid clipboard contents"
 msgstr "无效的剪贴板内容"
 
-#: pcbnew/tools/pcbnew_control.cpp:929 qa/qa_utils/pcb_test_frame.cpp:149
+#: pcbnew/tools/pcbnew_control.cpp:969 qa/qa_utils/pcb_test_frame.cpp:149
 #, c-format
 msgid ""
 "Error loading board.\n"
@@ -28899,15 +30256,15 @@ msgstr ""
 "电路板载入错误。\n"
 "%s"
 
-#: pcbnew/tools/pcbnew_control.cpp:999
+#: pcbnew/tools/pcbnew_control.cpp:1046
 msgid "Selected Items"
 msgstr "选中项"
 
-#: pcbnew/tools/pcbnew_control.cpp:1016
+#: pcbnew/tools/pcbnew_control.cpp:1063
 msgid "Footprint Name"
 msgstr "封装名称"
 
-#: pcbnew/tools/pcbnew_control.cpp:1033
+#: pcbnew/tools/pcbnew_control.cpp:1080
 #, c-format
 msgid "Key Words: %s"
 msgstr "关键字：%s"
@@ -28948,27 +30305,27 @@ msgstr "水平分布"
 msgid "Distribute vertically"
 msgstr "垂直分布"
 
-#: pcbnew/tools/point_editor.cpp:297
+#: pcbnew/tools/point_editor.cpp:296
 msgid "Self-intersecting polygons are not allowed."
 msgstr "不允许自相交多边形。"
 
-#: pcbnew/tools/point_editor.cpp:306
+#: pcbnew/tools/point_editor.cpp:305
 msgid "pcbnew.InteractiveSelection tool is not available"
 msgstr "pcbnew 交互式选择工具不可用"
 
-#: pcbnew/tools/point_editor.cpp:440
+#: pcbnew/tools/point_editor.cpp:439
 msgid "Drag a corner"
 msgstr "拖动拐角"
 
-#: pcbnew/tools/point_editor.cpp:1304
+#: pcbnew/tools/point_editor.cpp:1814
 msgid "Add a zone corner"
 msgstr "添加覆铜区域拐角"
 
-#: pcbnew/tools/point_editor.cpp:1342
+#: pcbnew/tools/point_editor.cpp:1852
 msgid "Split segment"
 msgstr "分割线段"
 
-#: pcbnew/tools/point_editor.cpp:1413
+#: pcbnew/tools/point_editor.cpp:1923
 msgid "Remove a zone/polygon corner"
 msgstr "删除区域或多边形的拐角"
 
@@ -28984,19 +30341,23 @@ msgstr "选择参考项目..."
 msgid "Select"
 msgstr "选择"
 
-#: pcbnew/tools/selection_tool.cpp:696
+#: pcbnew/tools/selection_tool.cpp:331
+msgid "EnterGroup called when selection is not a single group"
+msgstr "当选择不是单个组时输入被叫组"
+
+#: pcbnew/tools/selection_tool.cpp:736
 msgid "Selection contains locked items. Do you want to continue?"
 msgstr "选择包含锁定项, 你要继续吗?"
 
-#: pcbnew/tools/zone_create_helper.cpp:169
+#: pcbnew/tools/zone_create_helper.cpp:177
 msgid "Add a zone cutout"
 msgstr "添加挖空区域"
 
-#: pcbnew/tools/zone_create_helper.cpp:204
+#: pcbnew/tools/zone_create_helper.cpp:214
 msgid "Add a zone"
 msgstr "添加覆铜"
 
-#: pcbnew/tools/zone_create_helper.cpp:243
+#: pcbnew/tools/zone_create_helper.cpp:253
 msgid "Add a graphical polygon"
 msgstr "添加多边形图形"
 
@@ -29004,100 +30365,258 @@ msgstr "添加多边形图形"
 msgid "Checking Zones"
 msgstr "检查区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:96
+#: pcbnew/tools/zone_filler_tool.cpp:73 pcbnew/tools/zone_filler_tool.cpp:106
+#: pcbnew/tools/zone_filler_tool.cpp:146
+msgid "Fill Zone(s)"
+msgstr "填充区域"
+
+#: pcbnew/tools/zone_filler_tool.cpp:102
 msgid "Fill All Zones"
 msgstr "填充所有区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:161
+#: pcbnew/tools/zone_filler_tool.cpp:178
 msgid "Unfill Zone"
 msgstr "取消填充区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:180
+#: pcbnew/tools/zone_filler_tool.cpp:197
 msgid "Unfill All Zones"
 msgstr "取消填充所有区域"
 
-#: pcbnew/undo_redo.cpp:571
+#: pcbnew/undo_redo.cpp:580
 msgid "Incomplete undo/redo operation: some items not found"
 msgstr "不完整的撤消/重做操作：找不到某些项目"
 
+#: pcbnew/widgets/appearance_controls.cpp:286
+msgid "Show all vias"
+msgstr "显示所有过孔"
+
+#: pcbnew/widgets/appearance_controls.cpp:287
+msgid "Show all pads"
+msgstr "显示所有焊盘"
+
+#: pcbnew/widgets/appearance_controls.cpp:288
+msgid "Show copper zones"
+msgstr "显示铜区"
+
+#: pcbnew/widgets/appearance_controls.cpp:292
+msgid "Through-hole Pads"
+msgstr "通孔焊盘"
+
+#: pcbnew/widgets/appearance_controls.cpp:292
+msgid "Show through-hole pads"
+msgstr "显示通孔焊盘"
+
+#: pcbnew/widgets/appearance_controls.cpp:294
+msgid "References"
+msgstr "参考"
+
+#: pcbnew/widgets/appearance_controls.cpp:294
+msgid "Show footprint references"
+msgstr "显示封装工位"
+
+#: pcbnew/widgets/appearance_controls.cpp:295
+msgid "Show footprint text"
+msgstr "显示封装文本"
+
+#: pcbnew/widgets/appearance_controls.cpp:311
+msgid "No Layers"
+msgstr "没有图层"
+
+#: pcbnew/widgets/appearance_controls.cpp:313
+msgid "All Layers"
+msgstr "所有图层"
+
+#: pcbnew/widgets/appearance_controls.cpp:315
+msgid "All Copper Layers"
+msgstr "所有铜层"
+
+#: pcbnew/widgets/appearance_controls.cpp:318
+msgid "Inner Copper Layers"
+msgstr "内部铜层"
+
+#: pcbnew/widgets/appearance_controls.cpp:321
+msgid "Front Layers"
+msgstr "顶层"
+
+#: pcbnew/widgets/appearance_controls.cpp:324
+msgid "Front Assembly View"
+msgstr "顶层装配视图"
+
+#: pcbnew/widgets/appearance_controls.cpp:327
+msgid "Back Layers"
+msgstr "底层"
+
+#: pcbnew/widgets/appearance_controls.cpp:330
+msgid "Back Assembly View"
+msgstr "底层装配视图"
+
+#: pcbnew/widgets/appearance_controls.cpp:362
+msgid "Filter nets"
+msgstr "筛选网络"
+
+#: pcbnew/widgets/appearance_controls.cpp:622
+msgid "Set net color"
+msgstr "设置网络颜色"
+
+#: pcbnew/widgets/appearance_controls.cpp:624
+#, c-format
+msgid "Highlight %s"
+msgstr "高亮 %s"
+
+#: pcbnew/widgets/appearance_controls.cpp:627
+#: pcbnew/widgets/appearance_controls.cpp:1741
+#, c-format
+msgid "Select tracks and vias in %s"
+msgstr "选择 %s 中的布线和过孔"
+
+#: pcbnew/widgets/appearance_controls.cpp:635
+msgid "Hide all other nets"
+msgstr "隐藏所有其他网络"
+
+#: pcbnew/widgets/appearance_controls.cpp:668
+#, c-format
+msgid "Click to hide ratsnest for %s"
+msgstr "单击以隐藏 %s 的飞线"
+
+#: pcbnew/widgets/appearance_controls.cpp:669
+#, c-format
+msgid "Click to show ratsnest for %s"
+msgstr "单击以显示 %s 的飞线"
+
+#: pcbnew/widgets/appearance_controls.cpp:1013
+msgid "Show or hide this layer"
+msgstr "显示或隐藏此层"
+
+#: pcbnew/widgets/appearance_controls.cpp:1508
+#, c-format
+msgid "Show or hide %s"
+msgstr "显示或隐藏 %s"
+
+#: pcbnew/widgets/appearance_controls.cpp:1549
+#, c-format
+msgid "Set opacity of %s"
+msgstr "设置 %s 的不透明度"
+
+#: pcbnew/widgets/appearance_controls.cpp:1702
+#, c-format
+msgid "Show or hide ratsnest for nets in %s"
+msgstr "显示或隐藏 %s 中的网络飞线"
+
+#: pcbnew/widgets/appearance_controls.cpp:1733
+msgid "Set netclass color"
+msgstr "设置网络类颜色"
+
+#: pcbnew/widgets/appearance_controls.cpp:1738
+#, c-format
+msgid "Highlight nets in %s"
+msgstr "高亮 %s 中的网络"
+
+#: pcbnew/widgets/appearance_controls.cpp:1748
+msgid "Show all netclasses"
+msgstr "显示所有网络类"
+
+#: pcbnew/widgets/appearance_controls.cpp:1751
+msgid "Hide all other netclasses"
+msgstr "隐藏所有其他网络类"
+
+#: pcbnew/widgets/appearance_controls.cpp:1806
+msgid "Save preset..."
+msgstr "保存预设..."
+
+#: pcbnew/widgets/appearance_controls.cpp:1807
+msgid "Delete preset..."
+msgstr "删除预设..."
+
+#: pcbnew/widgets/appearance_controls.cpp:1888
+msgid "Layer preset name:"
+msgstr "层预设名称："
+
+#: pcbnew/widgets/appearance_controls.cpp:1888
+msgid "Save Layer Preset"
+msgstr "保存层预设"
+
+#: pcbnew/widgets/appearance_controls.cpp:1923
+msgid "Presets"
+msgstr "预设"
+
+#: pcbnew/widgets/appearance_controls.cpp:1935
+msgid "Delete Preset"
+msgstr "删除预设"
+
+#: pcbnew/widgets/appearance_controls.cpp:1936
+msgid "Select preset:"
+msgstr "选择预设："
+
 #: pcbnew/widgets/panel_selection_filter.cpp:131
 #, c-format
 msgid "Only %s"
 msgstr "仅 %s"
 
-#: pcbnew/zone_filler.cpp:117
-msgid "Checking zone fills..."
-msgstr "检查填充区域..."
-
-#: pcbnew/zone_filler.cpp:117
+#: pcbnew/zone_filler.cpp:120
 msgid "Building zone fills..."
 msgstr "构造填充区域..."
 
-#: pcbnew/zone_filler.cpp:220
+#: pcbnew/zone_filler.cpp:231
 msgid "Removing insulated copper islands..."
 msgstr "移除死铜..."
 
-#: pcbnew/zone_filler.cpp:295
+#: pcbnew/zone_filler.cpp:313
 msgid "Zone fills are out-of-date. Refill?"
 msgstr "覆铜区域已失效，重新覆铜？"
 
-#: pcbnew/zone_filler.cpp:297
+#: pcbnew/zone_filler.cpp:315
 msgid "Refill"
 msgstr "重新覆铜"
 
-#: pcbnew/zone_filler.cpp:297
+#: pcbnew/zone_filler.cpp:315
 msgid "Continue without Refill"
 msgstr "取消覆铜"
 
-#: pcbnew/zone_filler.cpp:313
+#: pcbnew/zone_filler.cpp:325
 msgid "Performing polygon fills..."
 msgstr "执行多边形填充..."
 
-#: pcbnew/zone_filler.cpp:360
+#: pcbnew/zone_filler.cpp:385
 msgid "Committing changes..."
 msgstr "提交更改..."
 
-#: pcbnew/zone_filler.cpp:368
-msgid "Fill Zone(s)"
-msgstr "填充区域"
-
-#: pcbnew/zones_by_polygon.cpp:93 pcbnew/zones_by_polygon.cpp:146
+#: pcbnew/zones_by_polygon.cpp:93 pcbnew/zones_by_polygon.cpp:149
 msgid "Modify zone properties"
 msgstr "修改区域属性"
 
-#: pcbnew/zones_by_polygon.cpp:140
+#: pcbnew/zones_by_polygon.cpp:139
 #, c-format
 msgid "Refill %d Zones"
 msgstr "重新填充 %d 覆铜"
 
-#: plugins/3d/vrml/vrml.cpp:191
+#: plugins/3d/vrml/vrml.cpp:219
 msgid " * [INFO] load failed: input line too long\n"
 msgstr " * [信息] 载入失败：输入行太长\n"
 
-#: qa/common_tools/tools/coroutines/coroutines.cpp:93
+#: qa/common_tools/tools/coroutines/coroutines.cpp:85
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:77
 #: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:214
-#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:91
+#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:89
 msgid "displays help on the command line parameters"
 msgstr "在命令行参数上显示帮助"
 
-#: qa/common_tools/tools/coroutines/coroutines.cpp:101
+#: qa/common_tools/tools/coroutines/coroutines.cpp:93
 msgid "how high to count"
 msgstr "数多高"
 
-#: qa/common_tools/tools/coroutines/coroutines.cpp:113
+#: qa/common_tools/tools/coroutines/coroutines.cpp:105
 msgid "Test a simple coroutine that yields a given number of times"
 msgstr "测试生成给定次数的简单协同程序"
 
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:85
 #: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:222
-#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:93
+#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:91
 msgid "print parsing information"
 msgstr "打印解析信息"
 
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:91
 #: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:258
-#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:94
+#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:92
 msgid "input file"
 msgstr "输入文件"
 
@@ -29113,16 +30632,6 @@ msgstr "网类...\n"
 msgid "NETCLASS VIOLATIONS: Aborting DRC\n"
 msgstr "网络类违规：中止 DRC\n"
 
-#: qa/drc_proto/drc_clearance_test_functions.cpp:259
-#: qa/drc_proto/drc_clearance_test_functions.cpp:272
-msgid " (board design rule constraints)"
-msgstr " (电路板设计规则约束)"
-
-#: qa/drc_proto/drc_clearance_test_functions.cpp:302
-#, c-format
-msgid " (%s and %s not adjacent)"
-msgstr " (%s 和 %s 不相邻)"
-
 #: qa/drc_proto/drc_item.cpp:80
 msgid "Drilled hole clearance violation"
 msgstr "钻孔间隙违规"
@@ -29142,12 +30651,7 @@ msgstr " (电路板最小值 %s; %s 网络类 %s)"
 msgid " (board min through hole %s; %s netclass %s)"
 msgstr " (电路板最小通孔 %s; %s 网络类 %s)"
 
-#: qa/drc_proto/drc_rule_parser.cpp:147
-#, c-format
-msgid "Unrecognized item '%s'.| Expected 'rule', 'condition' or 'version'."
-msgstr "无法识别的项目 '%s'。|应为“规则”、“条件”或“版本”。"
-
-#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:399
+#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:402
 #, c-format
 msgid " (clearance %s; actual %s)"
 msgstr " (间隙 %s; 实际 %s)"
@@ -29160,6 +30664,16 @@ msgstr " (间隙 %s; 实际 %s)"
 msgid " (%s; actual %s)"
 msgstr " (%s; 实际 %s)"
 
+#: qa/pcbnew/group_saveload.cpp:79
+#, c-format
+msgid "group-%d"
+msgstr "组-%d"
+
+#: qa/pcbnew/group_saveload.cpp:90
+#, c-format
+msgid "some text-%d"
+msgstr "某些文本-%d"
+
 #: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:228
 msgid "print DRC timings"
 msgstr "打印 DRC 计时"
@@ -29187,7 +30701,7 @@ msgid ""
 msgstr ""
 "该程序在给定的 PCB 文件上运行 DRC 工具。 这可以用于调试，模糊测试或开发等。"
 
-#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:116
+#: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:114
 msgid ""
 "This program parses PCB files, either from the stdin stream or from the "
 "given filenames. This can be used either for standalone testing of the "
@@ -29251,6 +30765,271 @@ msgstr ""
 "3D 搜索路径列表为空;\n"
 "继续写空文件？"
 
+#~ msgid "<unassigned>"
+#~ msgstr "<未分配>"
+
+#~ msgid "French"
+#~ msgstr "法语"
+
+#~ msgid "Finnish"
+#~ msgstr "芬兰语"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙语"
+
+#~ msgid "Portuguese"
+#~ msgstr "葡萄牙语"
+
+#~ msgid "Italian"
+#~ msgstr "意大利语"
+
+#~ msgid "German"
+#~ msgstr "德语"
+
+#~ msgid "Greek"
+#~ msgstr "希腊语"
+
+#~ msgid "Slovenian"
+#~ msgstr "斯洛文尼亚语"
+
+#~ msgid "Slovak"
+#~ msgstr "斯洛伐克语"
+
+#~ msgid "Hungarian"
+#~ msgstr "匈牙利语"
+
+#~ msgid "Polish"
+#~ msgstr "波兰语"
+
+#~ msgid "Czech"
+#~ msgstr "捷克语"
+
+#~ msgid "Russian"
+#~ msgstr "俄语"
+
+#~ msgid "Korean"
+#~ msgstr "朝鲜语/韩语"
+
+#~ msgid "Chinese simplified"
+#~ msgstr "简体中文"
+
+#~ msgid "Chinese traditional"
+#~ msgstr "繁体中文"
+
+#~ msgid "Catalan"
+#~ msgstr "加泰罗尼亚语"
+
+#~ msgid "Dutch"
+#~ msgstr "荷兰语"
+
+#~ msgid "Japanese"
+#~ msgstr "日语"
+
+#~ msgid "Bulgarian"
+#~ msgstr "保加利亚语"
+
+#~ msgid "Lithuanian"
+#~ msgstr "立陶宛语"
+
+#~ msgid "Checking connections...\n"
+#~ msgstr "检查连接...\n"
+
+#~ msgid "Remove Colors"
+#~ msgstr "删除颜色"
+
+#~ msgid ""
+#~ "Remove the specified colors for this sheet (the current color theme will "
+#~ "be used instead)"
+#~ msgstr "删除此框图的指定颜色（将使用当前的颜色主题）"
+
+#~ msgid "Unique identifier:"
+#~ msgstr "唯一标识符："
+
+#~ msgid "Unique ID that identifies the symbol"
+#~ msgstr "标识符号的唯一 ID"
+
+#~ msgid "No Objects"
+#~ msgstr "没有对象"
+
+#, c-format
+#~ msgid "Net count = %d"
+#~ msgstr "网络计数 = %d"
+
+#~ msgid "Background White"
+#~ msgstr "白色背景"
+
+#~ msgid "Switch between white and black background"
+#~ msgstr "在白色和黑色背景之间切换"
+
+#~ msgid "W:"
+#~ msgstr "W："
+
+#~ msgid "L:"
+#~ msgstr "L："
+
+#~ msgid "Ang_l:"
+#~ msgstr "Ang_l："
+
+#~ msgid "S:"
+#~ msgstr "S："
+
+#~ msgid "a:"
+#~ msgstr "a:"
+
+#~ msgid "b:"
+#~ msgstr "b："
+
+#~ msgid "Stackup not up to date. Verify it"
+#~ msgstr "堆叠不是最新的。请验证它"
+
+#~ msgid "Insert"
+#~ msgstr "插入"
+
+#~ msgid "Virtual"
+#~ msgstr "虚拟"
+
+#~ msgid "Remove dangling track"
+#~ msgstr "删除悬空的布线"
+
+#~ msgid "Remove dangling via"
+#~ msgstr "删除悬空的通孔"
+
+#~ msgid "Virtual:"
+#~ msgstr "虚拟："
+
+#~ msgid "Smooth value (0..1):"
+#~ msgstr "平滑值 (0..1):"
+
+#, c-format
+#~ msgid ""
+#~ "Item not currently visible.\n"
+#~ "Show the '%s' layer?"
+#~ msgstr ""
+#~ "该项目当前不可见。\n"
+#~ "显示 \"%s\" 层？"
+
+#~ msgid ""
+#~ "Use this attribute for most non SMD footprints\n"
+#~ "Footprints with this option are not put in the footprint position list "
+#~ "file"
+#~ msgstr ""
+#~ "对于大多数非贴片封装使用此属性\n"
+#~ "使有此选项的封装不会放置在封装位置列表文件中"
+
+#~ msgid ""
+#~ "Use this attribute for SMD footprints.\n"
+#~ "Only footprints with this option are put in the footprint position list "
+#~ "file"
+#~ msgstr ""
+#~ "贴片元件使用该属性\n"
+#~ "只有使用此选项的元件放在封装位置列表文件"
+
+#~ msgid ""
+#~ "Use this attribute for \"virtual\" footprints drawn on board\n"
+#~ "such as an edge connector (old ISA PC bus for instance)"
+#~ msgstr ""
+#~ "该属性适用于绘制电路板上的 \"虚拟\" 封装\n"
+#~ " 例如电路板插头<金手指>(如老式的 ISA PC 总线)"
+
+#~ msgid "Surface mount"
+#~ msgstr "表面贴装"
+
+#~ msgid "Include footprints with SMD pads even if not marked Surface Mount"
+#~ msgstr "包括带有贴片焊盘的封装，即使没有标记表面安装"
+
+#~ msgid "Grid Style:"
+#~ msgstr "网格样式："
+
+#~ msgid "Zone Outline Smooth:"
+#~ msgstr "区域轮廓平滑:"
+
+#~ msgid "Error: the pad is not on a copper layer and has a hole"
+#~ msgstr "错误：焊盘没有在铜层并且有一个孔"
+
+#~ msgid ""
+#~ "For NPTH pad, set pad size value to pad drill value, if you do not want "
+#~ "this pad plotted in gerber files"
+#~ msgstr ""
+#~ "对于非金属化焊盘，设置焊盘尺寸值到焊盘钻孔的值，如果你不想要这个焊盘光绘文"
+#~ "件"
+
+#~ msgid "Copper:"
+#~ msgstr "铜层："
+
+#~ msgid "Arc/circle drawing"
+#~ msgstr "圆弧/圆图"
+
+#~ msgid ""
+#~ "Note: Set Solder mask minimum bridge width and Solder mask clearance to "
+#~ "0,\n"
+#~ "unless your board house asks for a specific value"
+#~ msgstr ""
+#~ "注意：将阻焊剂最小桥宽和阻焊剂间隙设置为 0，\n"
+#~ "除非您的电路板要求特定的值"
+
+#, c-format
+#~ msgid "Unrecognized item '%s'.| Expected 'rule' or 'version'."
+#~ msgstr "无法识别的项目 '%s' 。| 应为的“规则”或“版本”。"
+
+#~ msgid ""
+#~ "Missing disallowed type.|  Expected 'track', 'via', 'micro_via', "
+#~ "'blind_via', 'pad', 'zone', 'text', 'graphic' or 'hole'."
+#~ msgstr ""
+#~ "缺少不允许的类型。| 应为“布线”、“过孔”、“微孔”、“盲孔”、“焊盘”、“区"
+#~ "域”、“文本”、“图形”或“通孔”。"
+
+#, c-format
+#~ msgid ""
+#~ "Unrecognized item '%s'.|  Expected 'track', 'via', 'micro_via', "
+#~ "'blind_via', 'pad', 'zone', 'text', 'graphic' or 'hole'."
+#~ msgstr ""
+#~ "无法识别的项目 ‘%s’。|应为“布线”、“过孔”、“微孔”、“盲孔”、“焊盘”、“区"
+#~ "域”、“文本”、“图形”或“通孔”。"
+
+#, c-format
+#~ msgid ""
+#~ "Unrecognized item '%s'.| Expected 'constraint', 'condition' or 'disallow'."
+#~ msgstr "无法识别的项目 '%s'。|应为“约束”、“条件”或“禁用”。"
+
+#~ msgid ""
+#~ "Missing constraint type.|  Expected 'clearance', 'track_width', "
+#~ "'annulus_width' or 'hole'."
+#~ msgstr "缺少约束类型。|应为“间隙”、“布线宽度”、“环宽度”或“通孔”。"
+
+#, c-format
+#~ msgid ""
+#~ "Unrecognized item '%s'.| Expected 'clearance', 'track_width', "
+#~ "'annulus_width' or 'hole'."
+#~ msgstr "无法识别的项目 '%s'。|应为“间隙”、“布线宽度”、“环宽度”或“通孔”。"
+
+#, c-format
+#~ msgid "Unrecognized item '%s'.| Expected 'min', 'max' or 'opt'."
+#~ msgstr "无法识别的项目 '%s'。|应为“最小值”、“最大值”或“选项”。"
+
+#, c-format
+#~ msgid "footprint %s (not set as SMD) forced in list"
+#~ msgstr "封装外形 %s（未设置为 SMD）强制在列表中"
+
+#~ msgid "Drag Track/Via"
+#~ msgstr "拖拉 布线/过孔"
+
+#~ msgid "Drags tracks and vias without breaking connections"
+#~ msgstr "拖动布线和过孔而不中断连接"
+
+#~ msgid "Place a layer alignment target"
+#~ msgstr "放置层对齐标记"
+
+#~ msgid " (board design rule constraints)"
+#~ msgstr " (电路板设计规则约束)"
+
+#, c-format
+#~ msgid " (%s and %s not adjacent)"
+#~ msgstr " (%s 和 %s 不相邻)"
+
+#, c-format
+#~ msgid "Unrecognized item '%s'.| Expected 'rule', 'condition' or 'version'."
+#~ msgstr "无法识别的项目 '%s'。|应为“规则”、“条件”或“版本”。"
+
 #~ msgid "Unique ID:"
 #~ msgstr "唯一 ID："
 
@@ -29866,10 +31645,6 @@ msgstr ""
 #~ msgid "Invalid floating point number"
 #~ msgstr "无效的浮点数"
 
-#, c-format
-#~ msgid "Failed to create \"%s\""
-#~ msgstr "无法创建 \"%s\""
-
 #~ msgid "Clean stubs, vias, delete break points or unconnected tracks"
 #~ msgstr "清除残留，过孔，删除断点，或未连接的布线"
 
@@ -29961,9 +31736,6 @@ msgstr ""
 #~ msgid "Show texts in line mode"
 #~ msgstr "在线条模式下显示文本"
 
-#~ msgid "Show outlines in line mode"
-#~ msgstr "在线条模式下显示轮廓"
-
 #~ msgid "Display options"
 #~ msgstr "显示选项"
 
@@ -29988,10 +31760,6 @@ msgstr ""
 #~ msgid "pad %s clearance"
 #~ msgstr "焊盘 %s 间隙"
 
-#, c-format
-#~ msgid "%s footprint clearance"
-#~ msgstr "%s 封装间隙"
-
 #~ msgid "Pin fct"
 #~ msgstr "引脚功能测试"
 
@@ -30180,9 +31948,6 @@ msgstr ""
 #~ msgid "Pin Map"
 #~ msgstr "引脚映射"
 
-#~ msgid "Invalid filename"
-#~ msgstr "无效的文件名"
-
 #~ msgid "File must end in .json"
 #~ msgstr "文件必须以 .json 结尾"
 
@@ -30614,9 +32379,6 @@ msgstr ""
 #~ msgid "Left View\tShift+X"
 #~ msgstr "左视图\tShift+X"
 
-#~ msgid "Front View\tY"
-#~ msgstr "前视图\tY"
-
 #~ msgid "Back View\tShift+Y"
 #~ msgstr "后视图\tShift+Y"
 
@@ -30724,9 +32486,6 @@ msgstr ""
 #~ msgid "Pin %s of component %s has a no-connect marker but is connected"
 #~ msgstr "元件 %s 的引脚 %s 具有无连接标记, 但已连接"
 
-#~ msgid "No-connect marker is not connected to anything"
-#~ msgstr "无连接标记未连接到任何内容"
-
 #, c-format
 #~ msgid "%s %s is not connected anywhere else in the schematic."
 #~ msgstr "%s %s 未连接原理图中的任何其他位置。"
@@ -30805,9 +32564,6 @@ msgstr ""
 #~ msgid "Search all com&ponent fields"
 #~ msgstr "搜索所有元件字段 (&P)"
 
-#~ msgid "Update references"
-#~ msgstr "更新引用"
-
 #~ msgid "Dimensions"
 #~ msgstr "尺寸"
 
@@ -30934,9 +32690,6 @@ msgstr ""
 #~ msgid "Warn for no net pads"
 #~ msgstr "警告无网络焊盘"
 
-#~ msgid "Plot footprint references"
-#~ msgstr "绘制封装参考"
-
 #~ msgid "Update footprint references to match any changed symbol references"
 #~ msgstr "更新封装引用以匹配任何已更改的符号引用"
 
@@ -30975,9 +32728,6 @@ msgstr ""
 #~ msgid "Unknown DRC error code %d"
 #~ msgstr "未知的 DRC 错误码 %d"
 
-#~ msgid "References"
-#~ msgstr "参考"
-
 #~ msgid "Added a track"
 #~ msgstr "新增了一条布线"
 
@@ -31116,15 +32866,9 @@ msgstr ""
 #~ "determine final clearance."
 #~ msgstr "注意：添加焊膏间隙（绝对和相对）以确定最终间隙。"
 
-#~ msgid "Library reference:"
-#~ msgstr "库参考："
-
 #~ msgid "Marker found"
 #~ msgstr "找到标记"
 
-#~ msgid "No marker found"
-#~ msgstr "未找到标记"
-
 #~ msgid "Search for:"
 #~ msgstr "搜索："
 
@@ -31306,9 +33050,6 @@ msgstr ""
 #~ msgid "&Orientation:"
 #~ msgstr "方向 (&O)："
 
-#~ msgid "Simulator command:"
-#~ msgstr "仿真器命令："
-
 #~ msgid "&Run Simulator"
 #~ msgstr "运行仿真器 (&R)"
 
@@ -31330,9 +33071,6 @@ msgstr ""
 #~ msgid "Encoding UTF8"
 #~ msgstr "UTF8 编码"
 
-#~ msgid "reference %s"
-#~ msgstr "参考 %s"
-
 #~ msgid "value %s"
 #~ msgstr "值 %s"
 
@@ -31589,9 +33327,6 @@ msgstr ""
 #~ msgid "Draw line"
 #~ msgstr "绘制线"
 
-#~ msgid "Move Items"
-#~ msgstr "移动项目"
-
 #~ msgid "Drag Point"
 #~ msgstr "拖动点"
 
@@ -31625,9 +33360,6 @@ msgstr ""
 #~ msgid "Viewer 3D"
 #~ msgstr "3D 浏览器"
 
-#~ msgid "Save changes?"
-#~ msgstr "保存更改吗？"
-
 #~ msgid "Reset Hotkeys"
 #~ msgstr "重置快捷键"
 
@@ -31938,9 +33670,6 @@ msgstr ""
 #~ msgid "Run PlEditor"
 #~ msgstr "运行图框编辑器"
 
-#~ msgid "Open Project"
-#~ msgstr "打开工程"
-
 #~ msgid "&Project..."
 #~ msgstr "工程... (&P)"
 
@@ -32140,9 +33869,6 @@ msgstr ""
 #~ msgid "Edit default pad properties"
 #~ msgstr "编辑默认焊盘属性"
 
-#~ msgid "Delete the current footprint"
-#~ msgstr "删除当前封装"
-
 #~ msgid "Footprint &Library Browser"
 #~ msgstr "封装库浏览 (&L)"
 
@@ -32251,9 +33977,6 @@ msgstr ""
 #~ msgid "Not available in OpenGL/Cairo canvases."
 #~ msgstr "OpenGL/Cairo 绘图模式下无法使用."
 
-#~ msgid "Connected Tracks"
-#~ msgstr "连接布线"
-
 #~ msgid "Pcbnew &Manual"
 #~ msgstr "Pcbnew 手册 (&M)"
 
@@ -32402,9 +34125,6 @@ msgstr ""
 #~ msgid "Design rule check marker found in sheet %s at %s, %s"
 #~ msgstr "在图页 %s 的 %s，%s 中找到设计规则标记"
 
-#~ msgid "No more markers were found."
-#~ msgstr "没有找到更多标记。"
-
 #~ msgid "No item found matching %s."
 #~ msgstr "未找到匹配 %s 的项目。"
 
@@ -32467,9 +34187,6 @@ msgstr ""
 #~ msgid "Place hierarchical pin in sheet"
 #~ msgstr "添加图页层次引脚"
 
-#~ msgid "Place graphic lines or polygons"
-#~ msgstr "放置 图形线条或多边形"
-
 #~ msgid "Place text"
 #~ msgstr "放置文本"
 
@@ -32611,9 +34328,6 @@ msgstr ""
 #~ msgid "&Properties..."
 #~ msgstr "属性... (&P)"
 
-#~ msgid "Edit symbol properties"
-#~ msgstr "编辑符号属性"
-
 #~ msgid "Show pin table"
 #~ msgstr "显示引脚列表"
 
@@ -32632,9 +34346,6 @@ msgstr ""
 #~ msgid "Use metric units"
 #~ msgstr "使用公制单位"
 
-#~ msgid "Select which units are displayed"
-#~ msgstr "选择要显示的单元"
-
 #~ msgid "Full &Window Crosshair"
 #~ msgstr "十字光标全屏 (&W)"
 
@@ -32653,9 +34364,6 @@ msgstr ""
 #~ msgid "&Arc"
 #~ msgstr "圆弧 (&A)"
 
-#~ msgid "&Line or Polygon"
-#~ msgstr "线或多边形 (&L)"
-
 #~ msgid "Check duplicate and off grid pins"
 #~ msgstr "检查重复和关闭网格引脚"
 
@@ -32902,9 +34610,6 @@ msgstr ""
 #~ msgid "Delete Bus"
 #~ msgstr "删除总线"
 
-#~ msgid "Select Items On PCB"
-#~ msgstr "选择 PCB 上的项目"
-
 #~ msgid "Place"
 #~ msgstr "放置"
 
@@ -32971,9 +34676,6 @@ msgstr ""
 #~ msgid "Edit Page settings"
 #~ msgstr "编辑图框设置"
 
-#~ msgid "Plot schematic"
-#~ msgstr "绘制原理图"
-
 #~ msgid "Leave sheet"
 #~ msgstr "离开 图页"
 
@@ -33064,9 +34766,6 @@ msgstr ""
 #~ msgid "Show &DCodes"
 #~ msgstr "显示 D 码 (&D)"
 
-#~ msgid "Show or hide DCodes"
-#~ msgstr "显示或隐藏 D 码"
-
 #~ msgid "Show layers in differential mode"
 #~ msgstr "以差异模式显示图层"
 
@@ -33392,9 +35091,6 @@ msgstr ""
 #~ msgid "Warning: zone display is OFF!!!"
 #~ msgstr "警告：敷铜显示已关闭！！！"
 
-#~ msgid "Select rats nest"
-#~ msgstr "选择飞线"
-
 #~ msgid "Copper layer global delete not allowed!"
 #~ msgstr "铜层不允许全局删除!"
 
@@ -33695,9 +35391,6 @@ msgstr ""
 #~ msgid "Unable to drag this segment: two collinear segments"
 #~ msgstr "无法拖动该线段：因为是两条重合的线段"
 
-#~ msgid "Texts not allowed on Edge Cut layer"
-#~ msgstr "文本不允许出现在边界层"
-
 #~ msgid "Dimension not allowed on Copper or Edge Cut layers"
 #~ msgstr "尺寸不允许出现在铜层或边界层"
 
@@ -33725,9 +35418,6 @@ msgstr ""
 #~ msgid "Select Layer Pair for Vias..."
 #~ msgstr "为过孔选择层对…"
 
-#~ msgid "Footprint Documentation"
-#~ msgstr "封装文档文件"
-
 #~ msgid "Drag Via"
 #~ msgstr "拖动过孔"
 
@@ -33758,9 +35448,6 @@ msgstr ""
 #~ msgid "Delete Segment"
 #~ msgstr "删除线段"
 
-#~ msgid "Delete Net"
-#~ msgstr "删除网络"
-
 #~ msgid "Set Track and Via Sizes..."
 #~ msgstr "设置布线和过孔尺寸..."
 
@@ -33956,9 +35643,6 @@ msgstr ""
 #~ msgid "Show vias in fill mode"
 #~ msgstr "过孔显示填充模式"
 
-#~ msgid "Show tracks in fill mode"
-#~ msgstr "在填充模式下显示布线"
-
 #~ msgid "Normal contrast display mode"
 #~ msgstr "正常显示模式"
 
@@ -33974,12 +35658,6 @@ msgstr ""
 #~ msgid "Copy selected content to clipboard"
 #~ msgstr "将选定内容复制到剪贴板"
 
-#~ msgid "Cut selected content to clipboard"
-#~ msgstr "将选定的内容剪切到剪贴板"
-
-#~ msgid "Paste content from clipboard"
-#~ msgstr "从剪贴板粘贴内容"
-
 #~ msgid "Find Item..."
 #~ msgstr "查找项..."
 
@@ -34007,4 +35685,4 @@ msgstr ""
 #~ msgstr "DRC 错误：开始点位于另一区域之内或过于靠近另一区域"
 
 #~ msgid "DRC error: closing this area creates a DRC error with another area"
-#~ msgstr "DRC 错误：关闭该区域导致与其他区域发生 DRC 错误"
+#~ msgstr "DRC 错误：关闭该区域导致与其他区域发生 DRC 错误"
\ No newline at end of file