diff --git a/zh_CN/kicad.po b/zh_CN/kicad.po
index 2e7ca768ec..0718f213ef 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.23\n"
+"Project-Id-Version: KiCad_zh_CN_Master_v0.0.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-23 22:25+0800\n"
-"PO-Revision-Date: 2020-06-23 22:25+0800\n"
+"POT-Creation-Date: 2020-07-16 23:17+0800\n"
+"PO-Revision-Date: 2020-07-16 23:17+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\n"
+"X-Generator: Poedit 2.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: .\n"
@@ -104,7 +104,8 @@ msgid "Z:"
 msgstr "Z："
 
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:65
-#: gerbview/gerber_draw_item.cpp:701
+#: gerbview/gerber_draw_item.cpp:701 pcbnew/class_module.cpp:690
+#: pcbnew/class_pad.cpp:733
 msgid "Rotation"
 msgstr "旋转"
 
@@ -140,15 +141,15 @@ msgstr "没有此类文件"
 msgid "failed to open file"
 msgstr "无法打开文件"
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:430
+#: 3d-viewer/3d_canvas/board_adapter.cpp:425
 msgid "Build board body"
 msgstr "构造电路板"
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:433
+#: 3d-viewer/3d_canvas/board_adapter.cpp:428
 msgid "Board outline is not closed"
 msgstr "电路板轮廓未闭合"
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:443
+#: 3d-viewer/3d_canvas/board_adapter.cpp:438
 msgid "Create layers"
 msgstr "创建图层"
 
@@ -160,23 +161,23 @@ msgstr "创建导线和过孔"
 msgid "Create zones"
 msgstr "创建覆铜"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:752
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:766
 msgid "Simplifying copper layers polygons"
 msgstr "简化铜层多边形"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:796
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:810
 msgid "Simplify holes contours"
 msgstr "简化孔轮廓"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:838
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:852
 msgid "Build Tech layers"
 msgstr "构造工艺层"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:1034
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:1048
 msgid "Build BVH for holes and vias"
 msgstr "为孔和过孔构造 BVH (盲埋孔)"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:477
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:489
 #, c-format
 msgid "Render time %.0f ms ( %.1f fps)"
 msgstr "渲染时间 %.0f ms ( %.1f fps)"
@@ -189,26 +190,26 @@ msgstr "载入 OpenGL：电路板"
 msgid "Load OpenGL: holes and vias"
 msgstr "载入 OpenGL：开孔和过孔"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:527
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:519
 msgid "Load OpenGL: layers"
 msgstr "载入 OpenGL：层"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:627
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:619
 msgid "Loading 3D models"
 msgstr "载入 3D 模型"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:651
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:643
 #: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp:1050
 #, c-format
 msgid "Reload time %.3f s"
 msgstr "重新载入时间 %.3f s"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:922
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:914
 #, 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_ogl_legacy/c3d_render_ogl_legacy.cpp:543
 #: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:178
 #: common/widgets/footprint_preview_widget.cpp:100
 msgid "Loading..."
@@ -237,8 +238,8 @@ 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:511 pcbnew/footprint_viewer_frame.cpp:898
-#: pcbnew/pcb_base_frame.cpp:386
+#: common/tool/actions.cpp:515 pcbnew/footprint_viewer_frame.cpp:898
+#: pcbnew/pcb_base_frame.cpp:364
 msgid "3D Viewer"
 msgstr "3D 查看器"
 
@@ -248,9 +249,9 @@ msgstr "复制 3D 图像"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:171
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:270
-#: eeschema/eeschema_config.cpp:231 eeschema/eeschema_config.cpp:517
-#: gerbview/gerbview_frame.cpp:1138 pagelayout_editor/pl_editor_frame.cpp:410
-#: pcbnew/footprint_edit_frame.cpp:835 pcbnew/pcbnew_config.cpp:65
+#: eeschema/eeschema_config.cpp:226 eeschema/eeschema_config.cpp:431
+#: gerbview/gerbview_frame.cpp:1143 pagelayout_editor/pl_editor_frame.cpp:409
+#: pcbnew/footprint_edit_frame.cpp:830 pcbnew/pcbnew_config.cpp:72
 msgid "Display Options"
 msgstr "显示选项"
 
@@ -343,7 +344,7 @@ 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:249 kicad/menubar.cpp:149
-#: pagelayout_editor/menubar.cpp:174 pcbnew/menubar_footprint_editor.cpp:283
+#: pagelayout_editor/menubar.cpp:174 pcbnew/menubar_footprint_editor.cpp:286
 #: pcbnew/menubar_pcb_editor.cpp:534
 msgid "Preferences...\tCTRL+,"
 msgstr "首选项...\tCTRL+,"
@@ -351,33 +352,33 @@ 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:250 kicad/menubar.cpp:150
-#: pagelayout_editor/menubar.cpp:175 pcbnew/menubar_footprint_editor.cpp:284
+#: pagelayout_editor/menubar.cpp:175 pcbnew/menubar_footprint_editor.cpp:287
 #: pcbnew/menubar_pcb_editor.cpp:535
 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:141 gerbview/menubar.cpp:264
+#: eeschema/toolbars_lib_view.cpp:138 gerbview/menubar.cpp:264
 #: kicad/menubar.cpp:160 pagelayout_editor/menubar.cpp:185
-#: pcbnew/menubar_footprint_editor.cpp:298 pcbnew/menubar_pcb_editor.cpp:549
-#: pcbnew/toolbars_footprint_viewer.cpp:192
+#: pcbnew/menubar_footprint_editor.cpp:301 pcbnew/menubar_pcb_editor.cpp:549
+#: pcbnew/toolbars_footprint_viewer.cpp:189
 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:299
+#: pagelayout_editor/menubar.cpp:186 pcbnew/menubar_footprint_editor.cpp:302
 #: pcbnew/menubar_pcb_editor.cpp:550
 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:142 gerbview/menubar.cpp:265
+#: eeschema/toolbars_lib_view.cpp:139 gerbview/menubar.cpp:265
 #: kicad/menubar.cpp:161 pagelayout_editor/menubar.cpp:187
-#: pcbnew/menubar_footprint_editor.cpp:300 pcbnew/menubar_pcb_editor.cpp:551
-#: pcbnew/toolbars_footprint_viewer.cpp:193
+#: pcbnew/menubar_footprint_editor.cpp:303 pcbnew/menubar_pcb_editor.cpp:551
+#: pcbnew/toolbars_footprint_viewer.cpp:190
 msgid "&View"
 msgstr "视图 (&V)"
 
@@ -390,15 +391,15 @@ msgstr "首选项 (&P)"
 msgid "Reload board"
 msgstr "重新载入电路板"
 
-#: 3d-viewer/3d_viewer/3d_toolbar.cpp:59
+#: 3d-viewer/3d_viewer/3d_toolbar.cpp:58
 msgid "Copy 3D image to clipboard"
 msgstr "复制 3D 图像到剪贴板"
 
-#: 3d-viewer/3d_viewer/3d_toolbar.cpp:65
+#: 3d-viewer/3d_viewer/3d_toolbar.cpp:63
 msgid "Set display options, and some layers visibility"
 msgstr "设置显示选项和图层可见性"
 
-#: 3d-viewer/3d_viewer/3d_toolbar.cpp:70
+#: 3d-viewer/3d_viewer/3d_toolbar.cpp:68
 msgid "Render current view using Raytracing"
 msgstr "使用光线追踪渲染当前视图"
 
@@ -476,7 +477,7 @@ msgid "Rotation Increment:"
 msgstr "旋转增量："
 
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:231
-#: common/base_units.cpp:523 pcbnew/dialogs/dialog_copper_zones_base.cpp:268
+#: common/base_units.cpp:552 pcbnew/dialogs/dialog_copper_zones_base.cpp:273
 #: 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
@@ -612,7 +613,7 @@ msgstr ""
 "%s"
 
 #: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:684 common/confirm.cpp:124
-#: common/confirm.cpp:256 common/dialogs/panel_setup_severities.cpp:40
+#: 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"
@@ -892,12 +893,12 @@ msgstr "切换 ECO 层显示"
 msgid "Toggle display of ECO layers"
 msgstr "切换 ECO 层的显示"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:154 common/base_units.cpp:509
+#: bitmap2component/bitmap2cmp_gui.cpp:154 common/base_units.cpp:538
 #: common/dialogs/dialog_grid_settings_base.cpp:41
 #: common/dialogs/dialog_grid_settings_base.cpp:52
 #: common/dialogs/dialog_grid_settings_base.cpp:98
 #: common/dialogs/dialog_grid_settings_base.cpp:109
-#: common/eda_draw_frame.cpp:511 eeschema/dialogs/dialog_edit_label_base.cpp:91
+#: common/eda_draw_frame.cpp:501 eeschema/dialogs/dialog_edit_label_base.cpp:91
 #: eeschema/dialogs/dialog_edit_sheet_pin_base.cpp:60
 #: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:32
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:109
@@ -924,7 +925,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:670 pcb_calculator/UnitSelector.cpp:34
+#: pagelayout_editor/pl_editor_frame.cpp:661 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
@@ -989,14 +990,14 @@ msgid "DPI"
 msgstr "DPI"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:330
-#: eeschema/tools/sch_drawing_tools.cpp:356
-#: pagelayout_editor/pl_editor_frame.cpp:780
+#: eeschema/tools/sch_drawing_tools.cpp:355
+#: pagelayout_editor/pl_editor_frame.cpp:771
 msgid "Choose Image"
 msgstr "选择图片"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:331
-#: eeschema/tools/sch_drawing_tools.cpp:357
-#: pagelayout_editor/pl_editor_frame.cpp:781
+#: eeschema/tools/sch_drawing_tools.cpp:356
+#: pagelayout_editor/pl_editor_frame.cpp:772
 msgid "Image Files "
 msgstr "图片文件 "
 
@@ -1034,9 +1035,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:353
-#: gerbview/files.cpp:468 gerbview/readgerb.cpp:72
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1045
+#: eeschema/dialogs/dialog_erc_base.cpp:70 gerbview/files.cpp:363
+#: gerbview/files.cpp:478 gerbview/readgerb.cpp:72
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1049
 #: pcbnew/dialogs/dialog_drc_base.cpp:177
 msgid "Errors"
 msgstr "错误"
@@ -1195,7 +1196,223 @@ msgstr ""
 msgid "Bitmap to Component Converter"
 msgstr "将位图转换成元件"
 
-#: common/base_units.cpp:479
+#: common/base_struct.cpp:750
+msgid "Screen"
+msgstr "屏幕"
+
+#: common/base_struct.cpp:752 common/template_fieldnames.cpp:49
+#: eeschema/sch_component.cpp:1230 pcbnew/class_edge_mod.cpp:119
+#: pcbnew/class_pad.cpp:670 pcbnew/class_text_mod.cpp:293
+#: pcbnew/load_select_footprint.cpp:352
+msgid "Footprint"
+msgstr "封装"
+
+#: common/base_struct.cpp:753 pcbnew/class_pad.cpp:672
+#: pcbnew/dialogs/dialog_board_statistics.cpp:486
+msgid "Pad"
+msgstr "焊盘"
+
+#: common/base_struct.cpp:754 common/page_layout/ws_draw_item.cpp:111
+#: eeschema/pin_shape.cpp:45 gerbview/gerber_draw_item.cpp:230
+#: pcbnew/class_board_item.cpp:43
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:123
+#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
+msgid "Line"
+msgstr "线"
+
+#: common/base_struct.cpp:755
+msgid "Board Text"
+msgstr "电路板文本"
+
+#: common/base_struct.cpp:756
+msgid "Footprint Text"
+msgstr "封装文本"
+
+#: common/base_struct.cpp:757
+msgid "Footprint Graphics"
+msgstr "封装图形"
+
+#: common/base_struct.cpp:758 pcbnew/class_track.cpp:578
+msgid "Track"
+msgstr "布线"
+
+#: common/base_struct.cpp:759 pcbnew/dialogs/dialog_board_statistics.cpp:486
+msgid "Via"
+msgstr "过孔"
+
+#: common/base_struct.cpp:760
+msgid "Board Marker"
+msgstr "电路板标记"
+
+#: common/base_struct.cpp:761 pcbnew/class_pcb_text.cpp:118
+msgid "Dimension"
+msgstr "尺寸"
+
+#: common/base_struct.cpp:762
+msgid "Target"
+msgstr "目标"
+
+#: common/base_struct.cpp:763
+msgid "Zone"
+msgstr "区域"
+
+#: common/base_struct.cpp:764
+msgid "Item List"
+msgstr "项目列表"
+
+#: common/base_struct.cpp:765
+msgid "Net Info"
+msgstr "网络信息"
+
+#: common/base_struct.cpp:767
+msgid "Schematic Marker"
+msgstr "原理图标记"
+
+#: common/base_struct.cpp:768 common/layer_id.cpp:40 eeschema/sch_junction.h:90
+msgid "Junction"
+msgstr "连接点"
+
+#: common/base_struct.cpp:769
+msgid "No-Connect Flag"
+msgstr "不连接标志"
+
+#: common/base_struct.cpp:770
+msgid "Wire Entry"
+msgstr "连接线入口"
+
+#: common/base_struct.cpp:771
+msgid "Bus Entry"
+msgstr "总线入口"
+
+#: common/base_struct.cpp:772
+msgid "Graphic Line"
+msgstr "图形线"
+
+#: common/base_struct.cpp:773 eeschema/sch_bitmap.cpp:201
+msgid "Bitmap"
+msgstr "位图"
+
+#: common/base_struct.cpp:774
+msgid "Schematic Text"
+msgstr "原理图文本"
+
+#: common/base_struct.cpp:775
+msgid "Net Label"
+msgstr "网络标签"
+
+#: common/base_struct.cpp:776 eeschema/sch_text.cpp:675
+msgid "Global Label"
+msgstr "全局标签"
+
+#: common/base_struct.cpp:777 eeschema/sch_text.cpp:676
+msgid "Hierarchical Label"
+msgstr "层次标签"
+
+#: common/base_struct.cpp:778
+msgid "Schematic Field"
+msgstr "原理图字段"
+
+#: common/base_struct.cpp:779
+msgid "Component"
+msgstr "元件"
+
+#: common/base_struct.cpp:780
+msgid "Sheet Pin"
+msgstr "图框引脚"
+
+#: common/base_struct.cpp:781 eeschema/dialogs/dialog_migrate_buses.cpp:101
+#: pcbnew/tools/pcb_actions.cpp:1072
+msgid "Sheet"
+msgstr "图框"
+
+#: common/base_struct.cpp:783
+msgid "Field Locate Reference"
+msgstr "字段定位参考"
+
+#: common/base_struct.cpp:784
+msgid "Field Locate Value"
+msgstr "字段定位值"
+
+#: common/base_struct.cpp:785
+msgid "Field Locate Footprint"
+msgstr "字段定位封装"
+
+#: common/base_struct.cpp:787
+msgid "SCH Screen"
+msgstr "原理图屏幕"
+
+#: common/base_struct.cpp:789
+#: 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:790 common/dialogs/dialog_configure_paths_base.cpp:92
+msgid "Alias"
+msgstr "别名"
+
+#: common/base_struct.cpp:791 eeschema/lib_arc.h:70
+#: gerbview/gerber_draw_item.cpp:233 pcbnew/class_board_item.cpp:45
+#: pcbnew/class_drawsegment.cpp:432
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:114
+#: pcbnew/dialogs/dialog_pad_properties.cpp:725
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1875
+msgid "Arc"
+msgstr "弧"
+
+#: common/base_struct.cpp:792 eeschema/lib_circle.h:52
+#: gerbview/gerber_draw_item.cpp:236 pcbnew/class_board_item.cpp:46
+#: pcbnew/class_drawsegment.cpp:425 pcbnew/class_pad.cpp:946
+#: pcbnew/class_pad.cpp:1233
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:137
+msgid "Circle"
+msgstr "圆形"
+
+#: common/base_struct.cpp:793
+msgid "Symbol Text"
+msgstr "符号文本"
+
+#: common/base_struct.cpp:794 common/page_layout/ws_draw_item.cpp:115
+#: eeschema/lib_rectangle.h:54 pcbnew/class_drawsegment.cpp:455
+#: pcbnew/class_pad.cpp:1234
+msgid "Rectangle"
+msgstr "矩形"
+
+#: common/base_struct.cpp:795
+msgid "Polyline"
+msgstr "多段线"
+
+#: common/base_struct.cpp:796 eeschema/lib_bezier.h:54
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:101
+#: pcbnew/dialogs/dialog_pad_properties.cpp:719
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1875
+msgid "Bezier"
+msgstr "贝塞尔曲线"
+
+#: common/base_struct.cpp:797 common/layer_id.cpp:79 eeschema/lib_pin.h:107
+msgid "Pin"
+msgstr "引脚"
+
+#: common/base_struct.cpp:798
+msgid "Symbol Field"
+msgstr "符号字段"
+
+#: common/base_struct.cpp:800
+msgid "Gerber Layout"
+msgstr "Gerber 布局"
+
+#: common/base_struct.cpp:801
+msgid "Draw Item"
+msgstr "绘制项目"
+
+#: common/base_struct.cpp:802 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
 #: 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
@@ -1217,35 +1434,35 @@ msgstr "将位图转换成元件"
 msgid "mils"
 msgstr "mils"
 
-#: common/base_units.cpp:481
+#: common/base_units.cpp:510
 msgid "sq. mils"
 msgstr "sq. mils"
 
-#: common/base_units.cpp:483
+#: common/base_units.cpp:512
 msgid "cu. mils"
 msgstr "cu. mils"
 
-#: common/base_units.cpp:494
+#: common/base_units.cpp:523
 msgid "in"
 msgstr "英寸"
 
-#: common/base_units.cpp:496
+#: common/base_units.cpp:525
 msgid "sq. in"
 msgstr "sq. in"
 
-#: common/base_units.cpp:498
+#: common/base_units.cpp:527
 msgid "cu. in"
 msgstr "cu. in"
 
-#: common/base_units.cpp:511
+#: common/base_units.cpp:540
 msgid "sq. mm"
 msgstr "sq. mm"
 
-#: common/base_units.cpp:513
+#: common/base_units.cpp:542
 msgid "cu. mm"
 msgstr "cu. mm"
 
-#: common/base_units.cpp:517
+#: 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
@@ -1259,23 +1476,23 @@ msgstr "cu. mm"
 msgid "%"
 msgstr "%"
 
-#: common/common.cpp:521
+#: common/common.cpp:529
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
 msgstr "环境变量扩展失败：缺少 \"%c\" , 位置 \"%u\" （在 \"%s\" 内）。"
 
-#: common/common.cpp:607
+#: common/common.cpp:615
 #, c-format
 msgid "Cannot make path \"%s\" absolute with respect to \"%s\"."
 msgstr "不能设置 \"%s\" 为绝对路径 \"%s\"。"
 
-#: common/common.cpp:625
+#: common/common.cpp:633
 #, c-format
 msgid "Output directory \"%s\" created.\n"
 msgstr "输出目录 \"%s\" 已创建。\n"
 
-#: common/common.cpp:634
+#: common/common.cpp:642
 #, c-format
 msgid "Cannot create output directory \"%s\".\n"
 msgstr "无法创建输出目录 \"%s\"。\n"
@@ -1294,11 +1511,11 @@ msgid "Question"
 msgstr "问题"
 
 #: common/confirm.cpp:123 common/confirm.cpp:244
-#: common/dialogs/panel_setup_severities.cpp:40
-#: eeschema/dialogs/panel_eeschema_color_settings.cpp:151
-#: eeschema/libedit/libedit.cpp:568 eeschema/libedit/symbedit.cpp:96
-#: eeschema/sheet.cpp:641 pcbnew/dialogs/dialog_export_vrml.cpp:182
-#: pcbnew/import_gfx/dialog_import_gfx.cpp:299 pcbnew/pcb_parser.cpp:641
+#: 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/sheet.cpp:640 pcbnew/dialogs/dialog_export_vrml.cpp:183
+#: pcbnew/import_gfx/dialog_import_gfx.cpp:299 pcbnew/pcb_parser.cpp:642
 msgid "Warning"
 msgstr "警告"
 
@@ -1307,7 +1524,7 @@ 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:432 eeschema/widgets/tuner_slider_base.cpp:66
+#: eeschema/libedit/libedit.cpp:433 eeschema/widgets/tuner_slider_base.cpp:66
 #: pcbnew/footprint_libraries_utils.cpp:875
 msgid "Save"
 msgstr "保存"
@@ -1329,8 +1546,8 @@ msgid "Revert"
 msgstr "恢复"
 
 #: common/confirm.cpp:195 common/tool/actions.cpp:120
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:181
-#: pcbnew/microwave/microwave_polygon.cpp:125 pcbnew/pcb_parser.cpp:644
+#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:185
+#: pcbnew/microwave/microwave_polygon.cpp:125 pcbnew/pcb_parser.cpp:645
 msgid "Cancel"
 msgstr "取消"
 
@@ -1338,26 +1555,24 @@ msgstr "取消"
 msgid "Info"
 msgstr "信息"
 
-#: common/confirm.cpp:285 eeschema/dialogs/dialog_annotate.cpp:209
-#: eeschema/dialogs/dialog_annotate.cpp:255
-#: eeschema/dialogs/dialog_update_from_pcb.cpp:113
-#: eeschema/libedit/lib_export.cpp:156 eeschema/tools/lib_pin_tool.cpp:164
-#: kicad/import_project.cpp:102 kicad/tools/kicad_manager_control.cpp:259
-#: pcbnew/dialogs/dialog_export_idf.cpp:164
+#: common/confirm.cpp:285 eeschema/libedit/lib_export.cpp:156
+#: eeschema/tools/lib_pin_tool.cpp:164 kicad/import_project.cpp:97
+#: 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:1058
-#: pcbnew/router/router_tool.cpp:1237 pcbnew/router/router_tool.cpp:1320
-#: pcbnew/zone_filler.cpp:256
+#: pcbnew/footprint_libraries_utils.cpp:947 pcbnew/router/router_tool.cpp:1191
+#: pcbnew/router/router_tool.cpp:1370 pcbnew/router/router_tool.cpp:1453
+#: pcbnew/zone_filler.cpp:295
 msgid "Confirmation"
 msgstr "确认"
 
 #: common/dialog_about/AboutDialog_main.cpp:115
 #: common/dialogs/dialog_configure_paths_base.cpp:94
-#: common/lib_tree_model_adapter.cpp:270 eeschema/lib_view_frame.cpp:297
-#: eeschema/libedit/libedit.cpp:420 eeschema/libedit/symbedit.cpp:241
-#: eeschema/sch_component.cpp:1235 include/lib_table_grid.h:189
+#: 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
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:44
 #: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:40
 #: pcbnew/footprint_libraries_utils.cpp:863
@@ -1408,8 +1623,8 @@ msgid "The complete KiCad EDA Suite is released under the"
 msgstr "完整的 KiCad EDA 套件发布于"
 
 #: common/dialog_about/AboutDialog_main.cpp:182
-msgid "GNU Affero General Public License (AGPL) version 3 or any later version"
-msgstr "GNU Affero 通用公共许可证 (AGPL) 第3版或更高版本"
+msgid "GNU General Public License (GPL) version 3 or any later version"
+msgstr "GNU 通用公共许可证（GPL）版本 3 或任何更高版本"
 
 #: common/dialog_about/AboutDialog_main.cpp:380
 msgid "Others"
@@ -1469,15 +1684,15 @@ msgstr "打包"
 msgid "License"
 msgstr "许可证"
 
-#: common/dialog_about/dialog_about.cpp:438
+#: common/dialog_about/dialog_about.cpp:451
 msgid "Could not open clipboard to write version information."
 msgstr "无法打开剪贴板写入版本信息。"
 
-#: common/dialog_about/dialog_about.cpp:439
+#: common/dialog_about/dialog_about.cpp:452
 msgid "Clipboard Error"
 msgstr "剪贴板错误"
 
-#: common/dialog_about/dialog_about.cpp:447
+#: common/dialog_about/dialog_about.cpp:460
 msgid "Copied..."
 msgstr "已复制..."
 
@@ -1509,7 +1724,7 @@ msgstr "复制 KiCad 版本信息到剪贴板"
 msgid "&Report Bug"
 msgstr "报告 Bug (&R)"
 
-#: common/dialog_about/dialog_about_base.cpp:64 common/tool/actions.cpp:611
+#: common/dialog_about/dialog_about_base.cpp:64 common/tool/actions.cpp:615
 msgid "Report a problem with KiCad"
 msgstr "报告 KiCad 的问题"
 
@@ -1550,7 +1765,6 @@ msgstr "饱和度："
 
 # 明度（V, Value）
 #: common/dialogs/dialog_color_picker_base.cpp:114
-#: eeschema/dialogs/dialog_edit_one_field.cpp:89
 #: eeschema/dialogs/dialog_spice_model_base.cpp:45
 #: eeschema/dialogs/dialog_spice_model_base.cpp:637
 #: pcbnew/dialogs/dialog_text_properties.cpp:106
@@ -1578,27 +1792,27 @@ msgstr "预览 (旧/新)："
 msgid "Reset to Default"
 msgstr "重置为默认值"
 
-#: common/dialogs/dialog_configure_paths.cpp:236
-#: common/dialogs/dialog_configure_paths.cpp:306
+#: common/dialogs/dialog_configure_paths.cpp:238
+#: common/dialogs/dialog_configure_paths.cpp:308
 msgid "Environment variable name cannot be empty."
 msgstr "环境变量名称不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:244
-#: common/dialogs/dialog_configure_paths.cpp:308
+#: common/dialogs/dialog_configure_paths.cpp:246
+#: common/dialogs/dialog_configure_paths.cpp:310
 msgid "Environment variable path cannot be empty."
 msgstr "环境变量路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:271
-#: common/dialogs/dialog_configure_paths.cpp:313
+#: common/dialogs/dialog_configure_paths.cpp:273
+#: common/dialogs/dialog_configure_paths.cpp:315
 msgid "3D search path alias cannot be empty."
 msgstr "3D 搜索路径别名不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:279
-#: common/dialogs/dialog_configure_paths.cpp:315
+#: common/dialogs/dialog_configure_paths.cpp:281
+#: common/dialogs/dialog_configure_paths.cpp:317
 msgid "3D search path cannot be empty."
 msgstr "3D 搜索路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:328
+#: common/dialogs/dialog_configure_paths.cpp:330
 msgid ""
 "This path was defined  externally to the running process and\n"
 "will only be temporarily overwritten."
@@ -1606,7 +1820,7 @@ msgstr ""
 "此路径是在运行进程外部定义的\n"
 "只会被暂时覆盖。"
 
-#: common/dialogs/dialog_configure_paths.cpp:330
+#: common/dialogs/dialog_configure_paths.cpp:332
 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"
@@ -1619,21 +1833,21 @@ msgstr ""
 "如果你不想这样, 请重命名任何冲突\n"
 "的条目或删除系统中的外部环境变量。"
 
-#: common/dialogs/dialog_configure_paths.cpp:345
+#: common/dialogs/dialog_configure_paths.cpp:347
 #, c-format
 msgid "The name %s is reserved, and cannot be used here"
 msgstr "名称 %s 是保留的，不能在此处使用"
 
-#: common/dialogs/dialog_configure_paths.cpp:481
+#: common/dialogs/dialog_configure_paths.cpp:483
 msgid "File Browser..."
 msgstr "文件浏览器..."
 
-#: common/dialogs/dialog_configure_paths.cpp:484
+#: common/dialogs/dialog_configure_paths.cpp:486
 #: common/widgets/grid_text_button_helpers.cpp:354
 msgid "Select Path"
 msgstr "选择路径"
 
-#: common/dialogs/dialog_configure_paths.cpp:564
+#: common/dialogs/dialog_configure_paths.cpp:566
 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.  "
@@ -1644,7 +1858,7 @@ msgstr ""
 "为每个环境变量输入名称和路径。灰色条目为系统或用户级外部定义的名称。在系统或"
 "用户级定义的环境变量优先于该表中定义。这意味着该表中的值将被忽略。"
 
-#: common/dialogs/dialog_configure_paths.cpp:570
+#: common/dialogs/dialog_configure_paths.cpp:572
 msgid ""
 "To ensure environment variable names are valid on all platforms, the name "
 "field will only accept upper case letters, digits, and the underscore "
@@ -1653,7 +1867,7 @@ msgstr ""
 "为了确保环境变量名称在所有平台上有效的，名称字段只接受大写字母，数字和下划线"
 "字符。"
 
-#: common/dialogs/dialog_configure_paths.cpp:585
+#: common/dialogs/dialog_configure_paths.cpp:587
 msgid "Environment Variable Help"
 msgstr "环境变量帮助"
 
@@ -1662,6 +1876,7 @@ msgid "Environment Variables"
 msgstr "环境变量"
 
 #: common/dialogs/dialog_configure_paths_base.cpp:39
+#: common/dialogs/panel_setup_netclasses_base.cpp:40
 #: 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
@@ -1670,15 +1885,15 @@ msgstr "环境变量"
 #: 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:1427
+#: 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:1203 eeschema/sch_component.cpp:1250
-#: eeschema/widgets/tuner_slider_base.cpp:20
+#: eeschema/sch_component.cpp:1201 eeschema/sch_component.cpp:1248
+#: eeschema/widgets/tuner_slider_base.cpp:20 pcbnew/class_pad.cpp:1248
+#: pcbnew/class_zone.cpp:688
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:43
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:56
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:55
 #: pcbnew/dialogs/panel_fp_lib_table.cpp:434
 #: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:38
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:50
 msgid "Name"
 msgstr "名称"
 
@@ -1692,10 +1907,6 @@ msgstr "路径"
 msgid "3D Search Paths"
 msgstr "3D 搜索路径"
 
-#: common/dialogs/dialog_configure_paths_base.cpp:92
-msgid "Alias"
-msgstr "别名"
-
 #: common/dialogs/dialog_global_lib_table_config.cpp:39
 #, c-format
 msgid "Configure Global %s Library Table"
@@ -1799,7 +2010,7 @@ msgstr "网格原点"
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:692
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:714
 #: pcbnew/dialogs/panel_display_options_base.cpp:28
-#: pcbnew/dialogs/panel_display_options_base.cpp:77
+#: pcbnew/dialogs/panel_display_options_base.cpp:97
 #: pcbnew/dialogs/panel_edit_options_base.cpp:80
 #: pcbnew/dialogs/panel_edit_options_base.cpp:198
 msgid "a page"
@@ -1850,17 +2061,17 @@ msgstr "网格设置"
 msgid "Hotkey List"
 msgstr "快捷键列表"
 
-#: common/dialogs/dialog_image_editor.cpp:72
+#: common/dialogs/dialog_image_editor.cpp:74
 msgid "Incorrect scale number"
 msgstr "错误的比例数值"
 
-#: common/dialogs/dialog_image_editor.cpp:82
+#: common/dialogs/dialog_image_editor.cpp:84
 #, c-format
 msgid ""
 "This scale results in an image which is too small (%.2f mm or %.1f mil)."
 msgstr "此比例的图像尺寸太小 (%.2f mm 或 %.1f mil)"
 
-#: common/dialogs/dialog_image_editor.cpp:93
+#: common/dialogs/dialog_image_editor.cpp:95
 #, c-format
 msgid ""
 "This scale results in an image which is very large (%.1f mm or %.2f in). Are "
@@ -1879,16 +2090,6 @@ msgstr "图像比例："
 msgid "Image Editor"
 msgstr "图像编辑器"
 
-#: common/dialogs/dialog_list_selector_base.cpp:22
-msgid "Items:"
-msgstr "项目："
-
-#: common/dialogs/dialog_list_selector_base.cpp:34
-#: eeschema/dialogs/dialog_erc_base.cpp:28
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1529
-msgid "Messages:"
-msgstr "信息："
-
 #: common/dialogs/dialog_migrate_settings.cpp:29
 msgid "Quit KiCad"
 msgstr "退出 KiCad"
@@ -2035,7 +2236,7 @@ msgstr "虚拟文本"
 #: 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:261
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:266
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:100
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:179
 msgid "Orientation:"
@@ -2173,7 +2374,7 @@ msgid "Revision:"
 msgstr "修订："
 
 #: common/dialogs/dialog_page_settings_base.cpp:200
-#: eeschema/dialogs/dialog_netlist.cpp:356
+#: eeschema/dialogs/dialog_netlist.cpp:360
 msgid "Title:"
 msgstr "标题："
 
@@ -2230,7 +2431,7 @@ msgstr "浏览..."
 #: 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:717
+#: kicad/tree_project_frame.cpp:761
 msgid "Print"
 msgstr "打印"
 
@@ -2240,19 +2441,19 @@ msgid "Print Preview"
 msgstr "打印预览"
 
 #: common/dialogs/dialog_print_generic.cpp:42
-#: eeschema/dialogs/dialog_annotate.cpp:110 eeschema/dialogs/dialog_bom.cpp:239
-#: eeschema/dialogs/dialog_erc.cpp:78 eeschema/dialogs/dialog_netlist.cpp:297
+#: 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_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:63
+#: eeschema/dialogs/dialog_update_from_pcb.cpp:54
 #: pcbnew/dialogs/dialog_board_statistics.cpp:126
 #: pcbnew/dialogs/dialog_drc.cpp:77
 #: pcbnew/dialogs/dialog_exchange_footprints.cpp:152
-#: pcbnew/dialogs/dialog_export_step.cpp:128
+#: 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:92
+#: pcbnew/dialogs/dialog_gendrill.cpp:76 pcbnew/dialogs/dialog_netlist.cpp:93
 #: pcbnew/dialogs/dialog_plot.cpp:62 pcbnew/dialogs/dialog_update_pcb.cpp:74
 #: pcbnew/exporters/gen_footprints_placefile.cpp:68
 msgid "Close"
@@ -2315,6 +2516,7 @@ msgid "Output mode:"
 msgstr "输出模式："
 
 #: common/dialogs/dialog_print_generic_base.cpp:34
+#: 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
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:101
@@ -2361,39 +2563,52 @@ msgstr "图框设置..."
 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
+msgid "Filter"
+msgstr "筛选"
+
+#: common/dialogs/eda_list_dialog_base.cpp:22
+msgid "Items:"
+msgstr "项目："
+
 #: common/dialogs/panel_color_settings.cpp:49
 msgid "Reveal Themes in Finder"
 msgstr "在筛选器中显示主题"
 
-#: common/dialogs/panel_color_settings.cpp:101
+#: common/dialogs/panel_color_settings.cpp:110
 msgid "New theme name:"
 msgstr "新主题名称："
 
-#: common/dialogs/panel_color_settings.cpp:101
+#: common/dialogs/panel_color_settings.cpp:110
 msgid "Add Color Theme"
 msgstr "添加颜色主题"
 
-#: common/dialogs/panel_color_settings.cpp:113
+#: common/dialogs/panel_color_settings.cpp:122
 msgid "Theme already exists!"
 msgstr "主题已存在！"
 
-#: common/dialogs/panel_color_settings.cpp:168
-#: common/dialogs/panel_color_settings.cpp:185
+#: common/dialogs/panel_color_settings.cpp:177
+#: common/dialogs/panel_color_settings.cpp:194
 msgid "New Theme..."
 msgstr "新主题..."
 
-#: common/dialogs/panel_color_settings.cpp:231
+#: common/dialogs/panel_color_settings.cpp:240
 msgid "Copy color"
 msgstr "复制颜色"
 
-#: common/dialogs/panel_color_settings.cpp:234
+#: common/dialogs/panel_color_settings.cpp:243
 msgid "Paste color"
 msgstr "粘贴颜色"
 
-#: common/dialogs/panel_color_settings.cpp:237
+#: common/dialogs/panel_color_settings.cpp:246
 msgid "Revert to saved color"
 msgstr "恢复为已保存的颜色"
 
+#: common/dialogs/panel_color_settings.h:50
+msgid "Reset all colors in this theme to the KiCad defaults"
+msgstr "将此主题中的所有颜色重置为 KiCad 默认值"
+
 #: common/dialogs/panel_color_settings_base.cpp:19
 #: eeschema/dialogs/panel_libedit_color_settings_base.cpp:29
 #: pagelayout_editor/dialogs/panel_pl_editor_color_settings_base.cpp:21
@@ -2415,18 +2630,10 @@ msgid ""
 msgstr "即使属性中设置了特定的颜色，也要以默认颜色显示所有项目。"
 
 #: common/dialogs/panel_color_settings_base.cpp:42
-msgid "&Reset to Defaults"
-msgstr "重置为默认值 (&R)"
-
-#: common/dialogs/panel_color_settings_base.cpp:43
-msgid "Reset all colors in this theme to the KiCad defaults"
-msgstr "将此主题中的所有颜色重置为 KiCad 默认值"
-
-#: common/dialogs/panel_color_settings_base.cpp:47
 msgid "Open Theme Folder"
 msgstr "打开主题文件夹"
 
-#: common/dialogs/panel_color_settings_base.cpp:48
+#: common/dialogs/panel_color_settings_base.cpp:43
 msgid "Open the folder containing color themes"
 msgstr "打开包含颜色主题的文件夹"
 
@@ -2459,11 +2666,11 @@ msgstr ""
 "\n"
 "在某些平台上，自动值不正确，应手动设置。"
 
-#: common/dialogs/panel_common_settings.cpp:231
+#: common/dialogs/panel_common_settings.cpp:245
 msgid "Executable files ("
 msgstr "可执行文件 ("
 
-#: common/dialogs/panel_common_settings.cpp:236
+#: common/dialogs/panel_common_settings.cpp:250
 msgid "Select Preferred PDF Browser"
 msgstr "选择默认 PDF 浏览器"
 
@@ -2480,6 +2687,7 @@ msgstr ""
 "如果设置为 0，则禁用自动备份"
 
 #: common/dialogs/panel_common_settings_base.cpp:39
+#: common/dialogs/panel_common_settings_base.cpp:239
 msgid "minutes"
 msgstr "分钟"
 
@@ -2590,36 +2798,93 @@ msgid ""
 "relevant tool was not previously selected."
 msgstr "如果未选中，热键将立即执行操作，即使之前未选择相关工具也是如此。"
 
+#: common/dialogs/panel_common_settings_base.cpp:195
+msgid "Project Backup"
+msgstr "工程备份"
+
+#: common/dialogs/panel_common_settings_base.cpp:202
+msgid "Automatically backup projects"
+msgstr "自动备份工程"
+
+#: common/dialogs/panel_common_settings_base.cpp:203
+msgid ""
+"Automatically create backup archives of the current project when saving files"
+msgstr "保存文件时自动创建当前项目的备份压缩"
+
+#: common/dialogs/panel_common_settings_base.cpp:207
+msgid "Create backups when auto save occurs"
+msgstr "在进行自动保存时创建备份"
+
+#: common/dialogs/panel_common_settings_base.cpp:208
+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
+msgid "Maximum backups to keep:"
+msgstr "保留的最大备份数："
+
+#: common/dialogs/panel_common_settings_base.cpp:214
+msgid "How many backup files total to keep (set to 0 for no limit)"
+msgstr "总共要保留多少个备份文件(设置为 0 表示没有限制)"
+
+#: common/dialogs/panel_common_settings_base.cpp:221
+msgid "Maximum backups per day:"
+msgstr "每天最大备份数："
+
+#: common/dialogs/panel_common_settings_base.cpp:223
+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
+msgid "Minimum time between backups:"
+msgstr "备份之间的最短时间："
+
+#: common/dialogs/panel_common_settings_base.cpp:232
+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
+msgid "Maximum total backup size:"
+msgstr "最大总备份大小："
+
+#: common/dialogs/panel_common_settings_base.cpp:245
+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
+msgid "MB"
+msgstr "MB"
+
 #: common/dialogs/panel_hotkeys_editor.cpp:72
 msgid "Type filter text"
 msgstr "筛选器文本框"
 
-#: common/dialogs/panel_hotkeys_editor.cpp:110
+#: common/dialogs/panel_hotkeys_editor.cpp:116
 msgid "Undo All Changes"
 msgstr "撤销所有更改"
 
-#: common/dialogs/panel_hotkeys_editor.cpp:111
+#: common/dialogs/panel_hotkeys_editor.cpp:117
 msgid "Undo all changes made so far in this dialog"
 msgstr "在此对话框中撤消到目前为止所做的所有更改"
 
-#: common/dialogs/panel_hotkeys_editor.cpp:118
-msgid "Restore All to Defaults"
-msgstr "全部还原为默认值"
-
-#: common/dialogs/panel_hotkeys_editor.cpp:119
-msgid "Set all hotkeys to the built-in KiCad defaults"
-msgstr "将所有快捷键设置为 KiCad 内置的默认值"
-
-#: common/dialogs/panel_hotkeys_editor.cpp:126
+#: common/dialogs/panel_hotkeys_editor.cpp:124
 msgid "Import Hotkeys..."
 msgstr "导入快捷键..."
 
-#: common/dialogs/panel_hotkeys_editor.cpp:127
+#: common/dialogs/panel_hotkeys_editor.cpp:125
 msgid ""
 "Import hotkey definitions from an external file, replacing the current values"
 msgstr "从外部文件导入快捷键定义，来替换当前值"
 
-#: common/dialogs/panel_hotkeys_editor.cpp:177
+#: common/dialogs/panel_hotkeys_editor.cpp:175
 msgid "Import Hotkeys File:"
 msgstr "导入快捷键文件："
 
@@ -2758,7 +3023,178 @@ msgid ""
 "Pan the canvas left and right when scrolling left to right on the touchpad"
 msgstr "在触摸板上从左到右滚动时，将画布向左和向右平移"
 
-#: common/dialogs/panel_setup_severities.cpp:40
+#: 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
+#: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
+#: pcbnew/class_zone.cpp:692 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
+msgid "Solid"
+msgstr "实心"
+
+#: common/dialogs/panel_setup_netclasses.cpp:85
+#: eeschema/dialogs/dialog_edit_line_style.cpp:49
+#: 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
+#: 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
+#: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
+msgid "Dash-Dot"
+msgstr "点划线"
+
+#: common/dialogs/panel_setup_netclasses.cpp:396
+msgid "Netclass must have a name."
+msgstr "网络类必须要有一个名称。"
+
+#: common/dialogs/panel_setup_netclasses.cpp:405
+msgid "Netclass name already in use."
+msgstr "网络类名称已经在使用。"
+
+#: common/dialogs/panel_setup_netclasses.cpp:471
+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
+msgid "Net Classes"
+msgstr "网络类表"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:41 pcbnew/class_zone.cpp:1386
+msgid "Clearance"
+msgstr "间隙"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:42
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:537
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:197
+msgid "Track Width"
+msgstr "布线宽度"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:43
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:869
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:198
+msgid "Via Size"
+msgstr "过孔外径"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:44
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:199
+msgid "Via Drill"
+msgstr "过孔内径"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:45
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:200
+msgid "uVia Size"
+msgstr "微孔外径"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:46
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:201
+msgid "uVia Drill"
+msgstr "微孔内径"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:47
+msgid "DP Width"
+msgstr "DP（差分对）宽度"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:48
+msgid "DP Gap"
+msgstr "DP（差分对）间距"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:49
+msgid "Wire Thickness"
+msgstr "线宽"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:50
+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:785
+msgid "Line Style"
+msgstr "线型"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:58 common/pgm_base.cpp:76
+#: common/widgets/footprint_select_widget.cpp:226
+#: 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
+msgid "Default"
+msgstr "默认"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:65
+#: pcbnew/dialogs/panel_modedit_defaults_base.cpp:144
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:67
+msgid "Net Class parameters"
+msgstr "网络类参数"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:92
+msgid "Net Class Memberships"
+msgstr "网络类成员资格"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:98
+msgid "Filter Nets"
+msgstr "筛选网络"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:103
+msgid "Net class filter:"
+msgstr "网络类筛选："
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:120
+#: pcbnew/dialogs/dialog_select_net_from_list_base.cpp:22
+msgid "Net name filter:"
+msgstr "网络名称筛选："
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:135
+msgid "Show All Nets"
+msgstr "显示所有网络"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:141
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:60
+msgid "Apply Filters"
+msgstr "应用筛选"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:151
+msgid "Assign Net Class"
+msgstr "分配网络类"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:156
+msgid "New net class:"
+msgstr "新网络类："
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:173
+msgid "Assign To Listed Nets"
+msgstr "分配到列表中的网络"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:179
+msgid "Assign To Selected Nets"
+msgstr "分配给选择的网络"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:207
+#: pcbnew/board_connected_item.cpp:225 pcbnew/class_pad.cpp:677
+#: pcbnew/class_track.cpp:726 pcbnew/class_zone.cpp:660
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:33
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:54
+msgid "Net"
+msgstr "网络"
+
+#: common/dialogs/panel_setup_netclasses_base.cpp:208
+msgid "Net Class"
+msgstr "网络类"
+
+#: common/dialogs/panel_setup_severities.cpp:39
 #: common/dialogs/panel_setup_severities.cpp:89
 msgid "Ignore"
 msgstr "忽略"
@@ -2796,7 +3232,7 @@ msgid "Info: "
 msgstr "信息： "
 
 #: common/dialogs/wx_html_report_panel.cpp:315
-#: eeschema/dialogs/dialog_erc.cpp:570 pcbnew/dialogs/dialog_drc.cpp:448
+#: eeschema/dialogs/dialog_erc.cpp:573 pcbnew/dialogs/dialog_drc.cpp:448
 msgid "Save Report to File"
 msgstr "保存报告到文件"
 
@@ -2845,12 +3281,7 @@ msgstr "相关信息"
 msgid "Save..."
 msgstr "保存..."
 
-#: common/displlst.cpp:52 common/widgets/lib_tree.cpp:118
-#: pcbnew/footprint_viewer_frame.cpp:141 pcbnew/footprint_viewer_frame.cpp:156
-msgid "Filter"
-msgstr "筛选"
-
-#: common/draw_panel_gal.cpp:225 common/draw_panel_gal.cpp:384
+#: common/draw_panel_gal.cpp:235 common/draw_panel_gal.cpp:397
 msgid "Could not use OpenGL, falling back to software rendering"
 msgstr "无法使用 OpenGL，回退到软件渲染"
 
@@ -2906,53 +3337,53 @@ msgstr "无效的大小 %lld: 太大"
 msgid "Invalid Arc with radius %f and angle %f"
 msgstr "半径为 %f 且角度为 %f 的无效圆弧"
 
-#: common/eda_base_frame.cpp:309
+#: common/eda_base_frame.cpp:312
 msgid "&About KiCad"
 msgstr "关于 KiCad (&A)"
 
-#: common/eda_base_frame.cpp:311
+#: common/eda_base_frame.cpp:314
 msgid "&Help"
 msgstr "帮助 (&H)"
 
-#: common/eda_base_frame.cpp:620
+#: common/eda_base_frame.cpp:623
 #, c-format
 msgid "File \"%s\" was not found."
 msgstr "没有找到文件 \"%s\"。"
 
-#: common/eda_base_frame.cpp:665
+#: common/eda_base_frame.cpp:668
 msgid "Preferences"
 msgstr "首选项"
 
-#: common/eda_base_frame.cpp:668 common/hotkey_store.cpp:65
+#: common/eda_base_frame.cpp:671 common/hotkey_store.cpp:65
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:20
 msgid "Common"
 msgstr "常规"
 
-#: common/eda_base_frame.cpp:670
+#: common/eda_base_frame.cpp:673
 msgid "Mouse and Touchpad"
 msgstr "鼠标和触摸板"
 
-#: common/eda_base_frame.cpp:673
+#: common/eda_base_frame.cpp:676
 msgid "Hotkeys"
 msgstr "快捷键"
 
-#: common/eda_base_frame.cpp:717
+#: common/eda_base_frame.cpp:720
 #, c-format
 msgid "You do not have write permissions to folder \"%s\"."
 msgstr "你没有 \"%s\" 文件夹的写入权限。"
 
-#: common/eda_base_frame.cpp:722
+#: common/eda_base_frame.cpp:725
 #, c-format
 msgid "You do not have write permissions to save file \"%s\" to folder \"%s\"."
 msgstr "你没有写入权限保存文件 \"%s\" 到文件夹 \"%s\"。"
 
-#: common/eda_base_frame.cpp:727
+#: common/eda_base_frame.cpp:730
 #: pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp:1206
 #, c-format
 msgid "You do not have write permissions to save file \"%s\"."
 msgstr "你没有写入权限来保存文件 \"%s\"。"
 
-#: common/eda_base_frame.cpp:757
+#: common/eda_base_frame.cpp:760
 #, c-format
 msgid ""
 "Well this is potentially embarrassing!\n"
@@ -2966,12 +3397,7 @@ msgstr ""
 "\"%s\"\n"
 "后没有正确保存它, 你是否希望恢复上次保存的修改内容？"
 
-#: common/eda_base_frame.cpp:781
-#, c-format
-msgid "Could not create backup file \"%s\""
-msgstr "不能创建备份文件 \"%s\""
-
-#: common/eda_base_frame.cpp:789
+#: common/eda_base_frame.cpp:775
 msgid "The auto save file could not be renamed to the board file name."
 msgstr "自动保存文件不能重命名为电路板文件名称。"
 
@@ -2989,9 +3415,9 @@ msgstr "Doc 文件 \"%s\" 没有找到"
 msgid "Unknown MIME type for doc file \"%s\""
 msgstr "文档文件 \"%s\" 的 MIME 类型未知"
 
-#: common/eda_draw_frame.cpp:129 common/eda_draw_frame.cpp:510
+#: 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:151
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:56
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:108
 #: pcbnew/dialogs/dialog_plot_base.cpp:331
@@ -3001,20 +3427,20 @@ msgstr "文档文件 \"%s\" 的 MIME 类型未知"
 msgid "Inches"
 msgstr "英寸"
 
-#: common/eda_draw_frame.cpp:258
+#: common/eda_draw_frame.cpp:248
 msgid "Edit User Grid..."
 msgstr "编辑用户网格..."
 
-#: common/eda_draw_frame.cpp:367
+#: common/eda_draw_frame.cpp:357
 msgid "Zoom Auto"
 msgstr "自动缩放"
 
-#: common/eda_draw_frame.cpp:374
+#: common/eda_draw_frame.cpp:364
 #, c-format
 msgid "Zoom %.2f"
 msgstr "缩放 %.2f"
 
-#: common/eda_draw_frame.cpp:512
+#: common/eda_draw_frame.cpp:502
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:25
 #: gerbview/dialogs/panel_gerbview_settings_base.cpp:30
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:58
@@ -3023,12 +3449,12 @@ msgstr "缩放 %.2f"
 msgid "Units"
 msgstr "单元"
 
-#: common/eda_draw_frame.cpp:885 eeschema/dialogs/panel_sym_lib_table.cpp:417
+#: common/eda_draw_frame.cpp:873 eeschema/dialogs/panel_sym_lib_table.cpp:417
 #: pcbnew/footprint_libraries_utils.cpp:1116
 msgid "Select Library"
 msgstr "选择库"
 
-#: common/eda_draw_frame.cpp:885
+#: common/eda_draw_frame.cpp:873
 msgid "New Library"
 msgstr "新建库"
 
@@ -3041,21 +3467,21 @@ msgid " Y:"
 msgstr " Y："
 
 #: common/eda_text.cpp:490 eeschema/dialogs/dialog_edit_label_base.cpp:124
-#: eeschema/libedit/symbedit.cpp:231 eeschema/sch_text.cpp:697
+#: eeschema/libedit/symbedit.cpp:231 eeschema/sch_text.cpp:694
 #: gerbview/gerber_file_image.cpp:353 gerbview/gerber_file_image.cpp:357
-#: gerbview/gerber_file_image.cpp:360 pcbnew/class_module.cpp:590
+#: gerbview/gerber_file_image.cpp:360 pcbnew/class_module.cpp:681
 #: pcbnew/microwave/microwave_polygon.cpp:132
 msgid "Normal"
 msgstr "正常"
 
-#: common/eda_text.cpp:491
+#: common/eda_text.cpp:491 common/eda_text.cpp:634
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:61
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:53
 #: eeschema/dialogs/dialog_edit_label_base.cpp:124
 #: 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:697
+#: eeschema/fields_grid_table.cpp:200 eeschema/sch_text.cpp:694
 #: 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
@@ -3068,14 +3494,14 @@ msgstr "正常"
 msgid "Italic"
 msgstr "斜体"
 
-#: common/eda_text.cpp:492
+#: common/eda_text.cpp:492 common/eda_text.cpp:636
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:62
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:54
 #: eeschema/dialogs/dialog_edit_label_base.cpp:124
 #: 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:697
+#: eeschema/fields_grid_table.cpp:201 eeschema/sch_text.cpp:694
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:101
 msgid "Bold"
 msgstr "粗体"
@@ -3084,6 +3510,129 @@ msgstr "粗体"
 msgid "Bold+Italic"
 msgstr "粗体+斜体"
 
+#: common/eda_text.cpp:620 eeschema/dialogs/dialog_edit_label_base.cpp:118
+#: 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
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:92
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
+msgid "Left"
+msgstr "向左"
+
+#: common/eda_text.cpp:621 common/eda_text.cpp:625 common/tool/actions.cpp:291
+#: common/widgets/mathplot.cpp:1727
+#: 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
+#: 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_pad_basicshapes_properties.cpp:117
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
+msgid "Center"
+msgstr "居中"
+
+#: common/eda_text.cpp:622 eeschema/dialogs/dialog_edit_label_base.cpp:118
+#: 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
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:92
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
+msgid "Right"
+msgstr "向右"
+
+#: common/eda_text.cpp:624
+#: 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
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:108
+msgid "Top"
+msgstr "上对齐"
+
+#: common/eda_text.cpp:626
+#: 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
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:108
+msgid "Bottom"
+msgstr "下对齐"
+
+#: common/eda_text.cpp:630 common/page_layout/ws_draw_item.cpp:120
+#: 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/dialogs/dialog_global_deletion_base.cpp:28
+msgid "Text"
+msgstr "文本"
+
+#: common/eda_text.cpp:632
+#: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:86
+#: pcbnew/class_drawsegment.cpp:1189 pcbnew/class_pcb_text.cpp:133
+#: pcbnew/class_text_mod.cpp:322
+#: 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
+msgid "Thickness"
+msgstr "线宽"
+
+#: common/eda_text.cpp:638 pcbnew/dialogs/dialog_text_properties_base.cpp:205
+#: pcbnew/microwave/microwave_polygon.cpp:132
+msgid "Mirrored"
+msgstr "镜像"
+
+#: common/eda_text.cpp:640 eeschema/dialogs/dialog_lib_edit_text_base.cpp:84
+#: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:44
+#: eeschema/lib_pin.cpp:1454
+#: 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:642 eeschema/lib_field.cpp:437
+#: eeschema/sch_bitmap.cpp:203 pcbnew/class_drawsegment.cpp:458
+#: pcbnew/class_drawsegment.cpp:508 pcbnew/class_pad.cpp:718
+#: 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:996 pcbnew/class_track.cpp:1015
+#: 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
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:161
+#: pcbnew/text_mod_grid_table.cpp:90
+msgid "Width"
+msgstr "宽度"
+
+#: common/eda_text.cpp:644 eeschema/lib_field.cpp:440
+#: eeschema/sch_bitmap.cpp:205 pcbnew/class_drawsegment.cpp:461
+#: pcbnew/class_pad.cpp:721 pcbnew/class_pcb_text.cpp:139
+#: pcbnew/class_text_mod.cpp:328
+#: 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
+msgid "Height"
+msgstr "高度"
+
+#: common/eda_text.cpp:646
+msgid "Horizontal Justification"
+msgstr "水平对齐"
+
+#: common/eda_text.cpp:648
+msgid "Vertical Justification"
+msgstr "垂直对齐"
+
 #: common/env_vars.cpp:72
 msgid ""
 "The base path of locally installed system footprint libraries (.pretty "
@@ -3211,7 +3760,7 @@ msgstr "无法打开配置文件"
 msgid "Problems writing configuration file"
 msgstr "编写配置文件时出错"
 
-#: common/footprint_info.cpp:90 cvpcb/cvpcb_mainframe.cpp:760
+#: common/footprint_info.cpp:90 cvpcb/cvpcb_mainframe.cpp:762
 msgid "Load Error"
 msgstr "载入错误"
 
@@ -3233,7 +3782,7 @@ msgstr "fp-lib-table 文件不包含昵称为 \"%s\" 的库"
 
 #: common/fp_lib_table.cpp:479
 #: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:110
-#: eeschema/symbol_lib_table.cpp:469
+#: eeschema/symbol_lib_table.cpp:468
 #: pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp:110
 #, c-format
 msgid "Cannot create global library table path \"%s\"."
@@ -3270,7 +3819,7 @@ msgstr ""
 "未知文件类型。"
 
 #: common/gestfich.cpp:372 eeschema/eeschema.cpp:339 eeschema/eeschema.cpp:371
-#: gerbview/gerbview.cpp:235 kicad/project_template.cpp:242
+#: gerbview/gerbview.cpp:235 kicad/project_template.cpp:243
 #: pcbnew/pcbnew.cpp:467
 #, c-format
 msgid "Cannot copy file \"%s\"."
@@ -3345,22 +3894,22 @@ msgid "Ignore Other Snaps"
 msgstr "忽略其他快照"
 
 #: common/hotkey_store.cpp:66
-msgid "Kicad Manager"
-msgstr "KiCad 管理器"
+msgid "Project Manager"
+msgstr "工程管理"
 
-#: common/hotkey_store.cpp:67 eeschema/eeschema_config.cpp:230
-#: eeschema/menubar.cpp:126 eeschema/sch_edit_frame.cpp:980
-#: eeschema/sch_edit_frame.cpp:987
+#: common/hotkey_store.cpp:67 eeschema/eeschema_config.cpp:225
+#: eeschema/menubar.cpp:126 eeschema/sch_edit_frame.cpp:986
+#: eeschema/sch_edit_frame.cpp:993
 msgid "Eeschema"
 msgstr "Eeschema"
 
-#: common/hotkey_store.cpp:68 pcbnew/menubar_pcb_editor.cpp:209
-#: pcbnew/pcb_edit_frame.cpp:887 pcbnew/pcbnew_config.cpp:64
+#: common/hotkey_store.cpp:68 pcbnew/menubar_pcb_editor.cpp:204
+#: pcbnew/pcb_edit_frame.cpp:928 pcbnew/pcbnew_config.cpp:71
 msgid "Pcbnew"
 msgstr "Pcbnew"
 
 #: common/hotkey_store.cpp:69 pagelayout_editor/menubar.cpp:84
-#: pagelayout_editor/pl_editor_frame.cpp:497
+#: pagelayout_editor/pl_editor_frame.cpp:496
 msgid "Page Layout Editor"
 msgstr "图框编辑器"
 
@@ -3368,18 +3917,18 @@ msgstr "图框编辑器"
 msgid "Gestures"
 msgstr "手势"
 
-#: common/kiway.cpp:225
+#: common/kiway.cpp:226
 #, c-format
 msgid "Failed to load kiface library \"%s\"."
 msgstr "加载 kiface 库 \"%s\" 失败。"
 
-#: common/kiway.cpp:234
+#: common/kiway.cpp:235
 #, c-format
 msgid ""
 "Could not read instance name and version symbol form kiface library \"%s\"."
 msgstr "无法从 kiface 库 \"%s\" 读取实例名和版本符号。"
 
-#: common/kiway.cpp:268
+#: common/kiway.cpp:269
 #, c-format
 msgid ""
 "Fatal Installation Bug. File:\n"
@@ -3390,15 +3939,15 @@ msgstr ""
 "\"%s\"\n"
 "无法加载\n"
 
-#: common/kiway.cpp:272
+#: common/kiway.cpp:273
 msgid "It is missing.\n"
 msgstr "它是缺少的。\n"
 
-#: common/kiway.cpp:274
+#: common/kiway.cpp:275
 msgid "Perhaps a shared library (.dll or .so) file is missing.\n"
 msgstr "可能缺少共享库文件（.dll 或 .so）。\n"
 
-#: common/kiway.cpp:276
+#: common/kiway.cpp:277
 msgid ""
 "From command line: argv[0]:\n"
 "'"
@@ -3406,15 +3955,21 @@ msgstr ""
 "从命令行：argv[0]:\n"
 "'"
 
+#: common/kiway.cpp:382 common/kiway.cpp:386
+msgid "Error loading editor"
+msgstr "加载编辑器时出错"
+
 #: common/languages_menu.cpp:53
 msgid "Set Language"
 msgstr "设置语言"
 
-#: common/layer_id.cpp:31 eeschema/sch_bus_entry.cpp:401
+#: common/layer_id.cpp:31 eeschema/sch_bus_entry.cpp:414
+#: eeschema/sch_line.cpp:773
 msgid "Wire"
 msgstr "连线"
 
-#: common/layer_id.cpp:34 eeschema/sch_bus_entry.cpp:402
+#: common/layer_id.cpp:34 eeschema/sch_bus_entry.cpp:415
+#: eeschema/sch_line.cpp:774
 msgid "Bus"
 msgstr "总线"
 
@@ -3422,11 +3977,7 @@ msgstr "总线"
 msgid "Bus Junction"
 msgstr "总线连接点"
 
-#: common/layer_id.cpp:40 eeschema/sch_junction.h:85
-msgid "Junction"
-msgstr "连接点"
-
-#: common/layer_id.cpp:43 eeschema/sch_text.cpp:677
+#: common/layer_id.cpp:43 eeschema/sch_text.cpp:674
 msgid "Label"
 msgstr "标签"
 
@@ -3470,14 +4021,10 @@ msgstr "符号主体填充"
 msgid "Notes"
 msgstr "注意"
 
-#: common/layer_id.cpp:76 pcbnew/dialogs/dialog_select_net_from_list.cpp:855
+#: common/layer_id.cpp:76 pcbnew/dialogs/dialog_select_net_from_list.cpp:968
 msgid "Net name"
 msgstr "网络名称"
 
-#: common/layer_id.cpp:79 eeschema/lib_pin.h:107
-msgid "Pin"
-msgstr "引脚"
-
 #: common/layer_id.cpp:82
 msgid "Sheet border"
 msgstr "图框边框"
@@ -3602,7 +4149,7 @@ msgstr "通孔焊盘"
 msgid "Tracks"
 msgstr "布线"
 
-#: common/layer_id.cpp:168 pcbnew/class_track.cpp:659
+#: common/layer_id.cpp:168 pcbnew/class_track.cpp:653
 #: pcbnew/pcb_layer_widget.cpp:65
 msgid "Through Via"
 msgstr "通孔"
@@ -3611,7 +4158,7 @@ msgstr "通孔"
 msgid "Bl/Buried Via"
 msgstr "盲/埋孔"
 
-#: common/layer_id.cpp:174 pcbnew/class_track.cpp:649
+#: common/layer_id.cpp:174 pcbnew/class_track.cpp:643
 #: pcbnew/pcb_layer_widget.cpp:67
 msgid "Micro Via"
 msgstr "微孔"
@@ -3669,7 +4216,7 @@ msgstr "在修订版本找到非法字符"
 msgid "Unit"
 msgstr "单位"
 
-#: common/lib_tree_model_adapter.cpp:269
+#: common/lib_tree_model_adapter.cpp:275
 msgid "Item"
 msgstr "项目"
 
@@ -3683,36 +4230,10 @@ msgstr "文件 \"%s\" 没有被完全读取"
 msgid "Error writing page layout design file"
 msgstr "写入图框设计文件错误"
 
-#: common/page_layout/ws_draw_item.cpp:111 eeschema/pin_shape.cpp:45
-#: gerbview/gerber_draw_item.cpp:230 pcbnew/class_board_item.cpp:43
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:123
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
-msgid "Line"
-msgstr "线"
-
-#: common/page_layout/ws_draw_item.cpp:115 eeschema/lib_rectangle.h:54
-#: pcbnew/class_drawsegment.cpp:390
-msgid "Rectangle"
-msgstr "矩形"
-
-#: common/page_layout/ws_draw_item.cpp:120
-#: 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:298 pcbnew/class_text_mod.cpp:305
-#: pcbnew/dialogs/dialog_global_deletion_base.cpp:28
-msgid "Text"
-msgstr "文本"
-
 #: common/page_layout/ws_draw_item.cpp:124
 msgid "Imported Shape"
 msgstr "导入的形状"
 
-#: common/page_layout/ws_draw_item.cpp:128 eeschema/sch_bitmap.h:133
-msgid "Image"
-msgstr "图片"
-
 #: common/page_layout/ws_draw_item.cpp:134
 msgid "First Page Only"
 msgstr "仅第一页"
@@ -3771,13 +4292,6 @@ msgstr "连线从 (%s,%s) 到 (%s,%s)"
 msgid "Image at (%s, %s)"
 msgstr "图像在 ( %s, %s)"
 
-#: common/pgm_base.cpp:76 common/widgets/footprint_select_widget.cpp:226
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:195
-#: eeschema/dialogs/dialog_edit_line_style.cpp:62
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:65
-msgid "Default"
-msgstr "默认"
-
 #: common/pgm_base.cpp:78
 msgid "French"
 msgstr "法语"
@@ -3883,24 +4397,47 @@ msgstr "选择首选编辑器"
 msgid "%s is already running. Continue?"
 msgstr "%s 正在运行, 是否打开新窗口运行?"
 
-#: common/project.cpp:297
-#, c-format
-msgid "Unable to find \"%s\" template config file."
-msgstr "无法找到 \"%s\" 模板配置文件。"
-
-#: common/project.cpp:300
-msgid "Error copying project file template"
-msgstr "复制工程文件模板错误"
-
-#: common/project.cpp:321
-#, c-format
-msgid "Cannot create prj file \"%s\" (Directory not writable)"
-msgstr "无法创建工程文件 \"%s\" (目录不可写)"
-
-#: common/project.cpp:488 common/project.cpp:493
+#: common/project.cpp:311 common/project.cpp:316
 msgid "Error loading project footprint library table"
 msgstr "加载工程封装库表时出错"
 
+#: common/project/project_archiver.cpp:89
+msgid "Could not open archive file\n"
+msgstr "无法打开压缩文件\n"
+
+#: common/project/project_archiver.cpp:98
+msgid "Invalid archive file format\n"
+msgstr "无效的压缩文件格式\n"
+
+#: common/project/project_archiver.cpp:109
+#, c-format
+msgid "Extracting file \"%s\"\n"
+msgstr "正在解压文件 \"%s\"\n"
+
+#: common/project/project_archiver.cpp:145
+msgid "Error extracting file!\n"
+msgstr "解压文件时出错！\n"
+
+#: common/project/project_archiver.cpp:193
+#, c-format
+msgid "Unable to create archive file \"%s\"\n"
+msgstr "无法创建压缩文件 \"%s\"\n"
+
+#: common/project/project_archiver.cpp:233
+#, c-format
+msgid "Archive file \"%s\"\n"
+msgstr "压缩文件 \"%s\"\n"
+
+#: common/project/project_archiver.cpp:243
+#, c-format
+msgid "Archive file \"%s\": Failed!\n"
+msgstr "压缩文件 \"%s\"：错误！\n"
+
+#: common/project/project_archiver.cpp:269
+#, c-format
+msgid "Zip archive \"%s\" created (%s uncompressed, %s compressed)\n"
+msgstr "Zip 压缩 \"%s\" 创建 (%s 未压缩，%s 已压缩)\n"
+
 #: common/rc_item.cpp:270
 msgid "Excluded "
 msgstr "排除 "
@@ -3922,13 +4459,13 @@ msgstr "超出了线路长度"
 msgid "OUTPUTSTREAM_OUTPUTFORMATTER write error"
 msgstr "输出流_输出格式器写入错误"
 
-#: common/settings/color_settings.cpp:277
+#: common/settings/color_settings.cpp:310
 msgid " (Footprints)"
 msgstr " (封装)"
 
 #: common/template_fieldnames.cpp:47
-#: eeschema/dialogs/dialog_rescue_each.cpp:130 eeschema/sch_component.cpp:1190
-#: eeschema/sch_component.cpp:1245
+#: eeschema/dialogs/dialog_rescue_each.cpp:130 eeschema/sch_component.cpp:1188
+#: eeschema/sch_component.cpp:1243 pcbnew/class_module.cpp:1644
 msgid "Reference"
 msgstr "参考"
 
@@ -3940,24 +4477,18 @@ msgstr "参考"
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:51
 #: eeschema/dialogs/panel_sym_lib_table.cpp:286
 #: eeschema/fields_grid_table.cpp:196 eeschema/lib_field.cpp:446
-#: eeschema/sch_component.cpp:1193 eeschema/sch_component.cpp:1248
-#: pcbnew/class_text_mod.cpp:298
+#: eeschema/sch_component.cpp:1191 eeschema/sch_component.cpp:1246
+#: pcbnew/class_module.cpp:1646 pcbnew/class_text_mod.cpp:289
 #: 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_modedit_defaults.cpp:61
+#: 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
 msgid "Value"
 msgstr "值"
 
-#: common/template_fieldnames.cpp:49 eeschema/sch_component.cpp:1232
-#: pcbnew/class_edge_mod.cpp:132 pcbnew/class_pad.cpp:720
-#: pcbnew/class_text_mod.cpp:302 pcbnew/load_select_footprint.cpp:352
-msgid "Footprint"
-msgstr "封装"
-
 #: common/template_fieldnames.cpp:50 eeschema/libedit/symbedit.cpp:243
 msgid "Datasheet"
 msgstr "数据手册"
@@ -4039,7 +4570,7 @@ msgstr "图框设置..."
 msgid "Settings for paper size and title block info"
 msgstr "图框大小和标题块信息的设置"
 
-#: common/tool/actions.cpp:101 kicad/tree_project_frame.cpp:715
+#: common/tool/actions.cpp:101 kicad/tree_project_frame.cpp:759
 msgid "Print..."
 msgstr "打印..."
 
@@ -4088,7 +4619,7 @@ msgstr "重做"
 msgid "Redo last edit"
 msgstr "重做上一次编辑"
 
-#: common/tool/actions.cpp:152 pcbnew/tools/edit_tool.cpp:1050
+#: common/tool/actions.cpp:152 pcbnew/tools/edit_tool.cpp:1079
 msgid "Cut"
 msgstr "剪切"
 
@@ -4128,8 +4659,8 @@ msgstr "重复"
 msgid "Duplicates the selected item(s)"
 msgstr "复制选择项"
 
-#: common/tool/actions.cpp:181 kicad/tree_project_frame.cpp:707
-#: pcbnew/pcb_parser.cpp:644 pcbnew/tools/edit_tool.cpp:1052
+#: common/tool/actions.cpp:181 kicad/tree_project_frame.cpp:751
+#: pcbnew/pcb_parser.cpp:645 pcbnew/tools/edit_tool.cpp:1081
 msgid "Delete"
 msgstr "删除"
 
@@ -4216,24 +4747,6 @@ msgstr "放大"
 msgid "Zoom Out"
 msgstr "缩小"
 
-#: common/tool/actions.cpp:291 common/widgets/mathplot.cpp:1727
-#: 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
-#: 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_pad_basicshapes_properties.cpp:120
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
-msgid "Center"
-msgstr "居中"
-
 #: common/tool/actions.cpp:297
 msgid "Zoom to Selection"
 msgstr "缩放至选区大小"
@@ -4406,152 +4919,160 @@ msgstr "高对比度模式"
 msgid "Use high contrast display mode"
 msgstr "使用高对比度显示模式"
 
+#: common/tool/actions.cpp:494
+msgid "High Contrast Mode (3-state)"
+msgstr "高对比度模式 (三态)"
+
 #: common/tool/actions.cpp:495
+msgid "Toggle inactive layers between normal, dimmed, and hidden"
+msgstr "在正常、暗显和隐藏之间切换非活动图层"
+
+#: common/tool/actions.cpp:499
 msgid "Select item(s)"
 msgstr "选择项目"
 
-#: common/tool/actions.cpp:502
+#: common/tool/actions.cpp:506
 msgid "Measure Tool"
 msgstr "测量工具"
 
-#: common/tool/actions.cpp:502
+#: common/tool/actions.cpp:506
 msgid "Interactively measure distance between points"
 msgstr "交互测量点之间的距离"
 
-#: common/tool/actions.cpp:511
+#: common/tool/actions.cpp:515
 msgid "Show 3D viewer window"
 msgstr "显示3D 查看器窗口"
 
-#: common/tool/actions.cpp:516 eeschema/lib_view_frame.cpp:101
+#: common/tool/actions.cpp:520 eeschema/lib_view_frame.cpp:101
 msgid "Symbol Library Browser"
 msgstr "符号库浏览器"
 
-#: common/tool/actions.cpp:516
+#: common/tool/actions.cpp:520
 msgid "Browse symbol libraries"
 msgstr "浏览符号库"
 
-#: common/tool/actions.cpp:521 eeschema/eeschema_config.cpp:516
-#: eeschema/libedit/libedit.cpp:49
+#: common/tool/actions.cpp:525 eeschema/eeschema_config.cpp:430
+#: eeschema/libedit/libedit.cpp:50
 msgid "Symbol Editor"
 msgstr "符号编辑器"
 
-#: common/tool/actions.cpp:521
+#: common/tool/actions.cpp:525
 msgid "Create, delete and edit symbols"
 msgstr "创建，删除和编辑符号"
 
-#: common/tool/actions.cpp:526 pcbnew/footprint_viewer_frame.cpp:107
+#: common/tool/actions.cpp:530 pcbnew/footprint_viewer_frame.cpp:107
 #: pcbnew/footprint_viewer_frame.cpp:934
 msgid "Footprint Library Browser"
 msgstr "封装库浏览"
 
-#: common/tool/actions.cpp:526
+#: common/tool/actions.cpp:530
 msgid "Browse footprint libraries"
 msgstr "浏览封装库"
 
-#: common/tool/actions.cpp:531 pcbnew/footprint_edit_frame.cpp:662
-#: pcbnew/footprint_edit_frame.cpp:834 pcbnew/menubar_footprint_editor.cpp:108
+#: common/tool/actions.cpp:535 pcbnew/footprint_edit_frame.cpp:657
+#: pcbnew/footprint_edit_frame.cpp:829 pcbnew/menubar_footprint_editor.cpp:105
 msgid "Footprint Editor"
 msgstr "封装编辑器"
 
-#: common/tool/actions.cpp:531
+#: common/tool/actions.cpp:535
 msgid "Create, delete and edit footprints"
 msgstr "创建，删除和编辑封装"
 
-#: common/tool/actions.cpp:537
+#: common/tool/actions.cpp:541
 msgid "Update PCB from Schematic..."
 msgstr "从原理图更新 PCB..."
 
-#: common/tool/actions.cpp:537
+#: common/tool/actions.cpp:541
 msgid "Push changes from schematic to PCB"
 msgstr "将更改从原理图推送到 PCB"
 
-#: common/tool/actions.cpp:541
+#: common/tool/actions.cpp:545
 msgid "Update Schematic from PCB..."
 msgstr "从 PCB 更新原理图..."
 
-#: common/tool/actions.cpp:542
+#: common/tool/actions.cpp:546
 msgid "Push changes from PCB to Schematic"
 msgstr "将更改从 PCB 推送到原理图"
 
-#: common/tool/actions.cpp:552
+#: common/tool/actions.cpp:556
 msgid "Accelerated Graphics"
 msgstr "图形加速"
 
-#: common/tool/actions.cpp:552
+#: common/tool/actions.cpp:556
 msgid "Use hardware-accelerated graphics (recommended)"
 msgstr "使用硬件加速图形 (推荐)"
 
-#: common/tool/actions.cpp:563
+#: common/tool/actions.cpp:567
 msgid "Standard Graphics"
 msgstr "标准图形"
 
-#: common/tool/actions.cpp:563
+#: common/tool/actions.cpp:567
 msgid "Use software graphics (fall-back)"
 msgstr "使用软件图形 (回退)"
 
-#: common/tool/actions.cpp:568
+#: 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
 msgid "Configure Paths..."
 msgstr "配置路径..."
 
-#: common/tool/actions.cpp:568
+#: common/tool/actions.cpp:572
 msgid "Edit path configuration environment variables"
 msgstr "编辑路劲配置环境变量"
 
-#: common/tool/actions.cpp:573
+#: common/tool/actions.cpp:577
 msgid "Manage Symbol Libraries..."
 msgstr "管理符号库..."
 
-#: common/tool/actions.cpp:574
+#: common/tool/actions.cpp:578
 msgid "Edit the global and project symbol library lists"
 msgstr "编辑全局和工程符号库表"
 
-#: common/tool/actions.cpp:579
+#: common/tool/actions.cpp:583
 msgid "Manage Footprint Libraries..."
 msgstr "管理封装库..."
 
-#: common/tool/actions.cpp:580
+#: common/tool/actions.cpp:584
 msgid "Edit the global and project footprint library lists"
 msgstr "编辑全局和项目封装库列表"
 
-#: common/tool/actions.cpp:585
+#: common/tool/actions.cpp:589
 msgid "Getting Started with KiCad"
 msgstr "KiCad 入门指南"
 
-#: common/tool/actions.cpp:586
+#: common/tool/actions.cpp:590
 msgid "Open \"Getting Started in KiCad\" guide for beginners"
 msgstr "打开“KiCad 入门指南”手册"
 
-#: common/tool/actions.cpp:591
+#: common/tool/actions.cpp:595
 msgid "Help"
 msgstr "帮助"
 
-#: common/tool/actions.cpp:592
+#: common/tool/actions.cpp:596
 msgid "Open product documentation in a web browser"
 msgstr "在 Web 浏览器中打开产品文档"
 
-#: common/tool/actions.cpp:598
+#: common/tool/actions.cpp:602
 msgid "List Hotkeys..."
 msgstr "快捷键列表..."
 
-#: common/tool/actions.cpp:599
+#: common/tool/actions.cpp:603
 msgid "Displays current hotkeys table and corresponding commands"
 msgstr "显示当前快捷键表和相应命令"
 
-#: common/tool/actions.cpp:604
+#: common/tool/actions.cpp:608
 msgid "Get Involved"
 msgstr "参与 KiCad"
 
-#: common/tool/actions.cpp:605
+#: common/tool/actions.cpp:609
 msgid "Open \"Contribute to KiCad\" in a web browser"
 msgstr "在 Web 浏览器中打开“参与 KiCad”"
 
-#: common/tool/actions.cpp:610
+#: common/tool/actions.cpp:614
 msgid "Report Bug"
 msgstr "报告 Bug"
 
-#: common/tool/common_control.cpp:197
+#: common/tool/common_control.cpp:196
 #, c-format
 msgid ""
 "Html or pdf help file \n"
@@ -4564,12 +5085,12 @@ msgstr ""
 " 或\n"
 "\"%s\" 没有被找到。"
 
-#: common/tool/common_control.cpp:211
+#: common/tool/common_control.cpp:210
 #, c-format
 msgid "Help file \"%s\" could not be found."
 msgstr "无法找到帮助文件 \"%s\" 。"
 
-#: common/tool/common_control.cpp:234
+#: common/tool/common_control.cpp:233
 #, c-format
 msgid ""
 "Could not launch the default browser.\n"
@@ -4578,7 +5099,7 @@ msgstr ""
 "无法启动默认浏览器。\n"
 "有关如何帮助 KiCad 项目的信息，请访问 %s"
 
-#: common/tool/common_control.cpp:237
+#: common/tool/common_control.cpp:236
 msgid "Get involved with KiCad"
 msgstr "参与 KiCad"
 
@@ -4633,6 +5154,18 @@ msgstr "符号库标识符 \"%s\" 无效。"
 msgid "Library Identifier Validation Error"
 msgstr "库标识符验证错误"
 
+#: common/validators.cpp:356
+msgid "Invalid signal name"
+msgstr "无效的信号名称"
+
+#: common/validators.cpp:367
+msgid "Signal names cannot contain CR or LF characters"
+msgstr "信号名称不能包含 CR 或 LF 字符"
+
+#: common/validators.cpp:370
+msgid "Signal names cannot contain spaces"
+msgstr "信号名称不能包含空格"
+
 #: common/view/view.cpp:567
 msgid "Mirroring for Y axis is not supported yet"
 msgstr "Y 轴的镜像尚不支持"
@@ -4641,8 +5174,8 @@ msgstr "Y 轴的镜像尚不支持"
 msgid "Footprint not found"
 msgstr "封装没有找到"
 
-#: common/widgets/footprint_select_widget.cpp:77 cvpcb/cvpcb_mainframe.cpp:695
-#: pcbnew/footprint_edit_frame.cpp:734 pcbnew/load_select_footprint.cpp:207
+#: common/widgets/footprint_select_widget.cpp:77 cvpcb/cvpcb_mainframe.cpp:697
+#: pcbnew/footprint_edit_frame.cpp:729 pcbnew/load_select_footprint.cpp:207
 msgid "Loading Footprint Libraries"
 msgstr "载入封装库"
 
@@ -4745,17 +5278,25 @@ msgid "<create net>"
 msgstr "< 创建网络 >"
 
 #: common/widgets/net_selector.cpp:75
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:567
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:606
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:564
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:603
 msgid "Filter:"
 msgstr "筛选："
 
-#: common/widgets/unit_binder.cpp:184
+#: common/widgets/paged_dialog.cpp:61
+#: 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
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1386
+msgid "Reset to Defaults"
+msgstr "重置为默认值"
+
+#: common/widgets/unit_binder.cpp:195
 #, c-format
 msgid "%s must be at least %s."
 msgstr "%s 必须至少为 %s 。"
 
-#: common/widgets/unit_binder.cpp:197
+#: common/widgets/unit_binder.cpp:209
 #, c-format
 msgid "%s must be less than %s."
 msgstr "%s 必须小于 %s 。"
@@ -4781,7 +5322,6 @@ msgid "Edit..."
 msgstr "编辑..."
 
 #: common/widgets/widget_hotkey_list.cpp:401
-#: eeschema/dialogs/dialog_edit_components_libid_base.cpp:64
 msgid "Undo Changes"
 msgstr "撤销更改"
 
@@ -4816,242 +5356,245 @@ msgstr "(双击编辑)"
 msgid "Hotkey"
 msgstr "快捷键"
 
-#: common/wildcards_and_files_ext.cpp:167
+#: common/wildcards_and_files_ext.cpp:171
 msgid "All files"
 msgstr "所有文件"
 
-#: common/wildcards_and_files_ext.cpp:173
+#: common/wildcards_and_files_ext.cpp:177
 msgid "KiCad drawing symbol files"
 msgstr "KiCad 图形符号文件"
 
-#: common/wildcards_and_files_ext.cpp:179
+#: common/wildcards_and_files_ext.cpp:183
 msgid "KiCad symbol library files"
 msgstr "KiCad 符号库文件"
 
-#: common/wildcards_and_files_ext.cpp:185
+#: common/wildcards_and_files_ext.cpp:189
 msgid "KiCad legacy symbol library files"
 msgstr "KiCad 旧版符号库文件"
 
-#: common/wildcards_and_files_ext.cpp:191
+#: common/wildcards_and_files_ext.cpp:195
 msgid "KiCad project files"
 msgstr "KiCad 工程文件"
 
-#: common/wildcards_and_files_ext.cpp:197
+#: common/wildcards_and_files_ext.cpp:201
+msgid "KiCad legacy project files"
+msgstr "KiCad 旧工程文件"
+
+#: common/wildcards_and_files_ext.cpp:207
+msgid "All KiCad project files"
+msgstr "所有 KiCad 工程文件"
+
+#: common/wildcards_and_files_ext.cpp:213
 msgid "KiCad legacy schematic files"
 msgstr "KiCad 旧版原理图文件"
 
-#: common/wildcards_and_files_ext.cpp:203
+#: common/wildcards_and_files_ext.cpp:219
 msgid "KiCad s-expression schematic files"
 msgstr "KiCad “S-表达式”原理图文件"
 
-#: common/wildcards_and_files_ext.cpp:209
+#: common/wildcards_and_files_ext.cpp:225
 msgid "Eagle XML schematic files"
 msgstr "Eagle XML 原理图文件"
 
-#: common/wildcards_and_files_ext.cpp:215
+#: common/wildcards_and_files_ext.cpp:231
 msgid "Eagle XML files"
 msgstr "Eagle XML 文件"
 
-#: common/wildcards_and_files_ext.cpp:221
+#: common/wildcards_and_files_ext.cpp:237
 msgid "KiCad netlist files"
 msgstr "KiCad 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:227 gerbview/files.cpp:49
+#: common/wildcards_and_files_ext.cpp:243 gerbview/files.cpp:49
 msgid "Gerber files"
 msgstr "Gerber 文件"
 
-#: common/wildcards_and_files_ext.cpp:233
-#: common/wildcards_and_files_ext.cpp:265
+#: common/wildcards_and_files_ext.cpp:249
+#: common/wildcards_and_files_ext.cpp:281
 msgid "KiCad printed circuit board files"
 msgstr "KiCad PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:239
+#: common/wildcards_and_files_ext.cpp:255
 msgid "Eagle ver. 6.x XML PCB files"
 msgstr "Eagle ver. 6.x XML PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:245
+#: common/wildcards_and_files_ext.cpp:261
 msgid "P-Cad 200x ASCII PCB files"
 msgstr "P-Cad 200x ASCII PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:250
+#: common/wildcards_and_files_ext.cpp:266
 msgid "Altium Designer PCB files"
 msgstr "Altium Designer PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:255
+#: common/wildcards_and_files_ext.cpp:271
 msgid "Altium Circuit Studio PCB files"
 msgstr "Altium Circuit Studio PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:260
+#: common/wildcards_and_files_ext.cpp:276
 msgid "Altium Circuit Maker PCB files"
 msgstr "Altium Circuit Maker PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:271
+#: common/wildcards_and_files_ext.cpp:287
 msgid "KiCad footprint files"
 msgstr "KiCad 封装文件"
 
-#: common/wildcards_and_files_ext.cpp:277
+#: common/wildcards_and_files_ext.cpp:293
 msgid "KiCad footprint library paths"
 msgstr "KiCad 封装库路径"
 
-#: common/wildcards_and_files_ext.cpp:283
+#: common/wildcards_and_files_ext.cpp:299
 msgid "Legacy footprint library files"
 msgstr "旧的封装库文件"
 
-#: common/wildcards_and_files_ext.cpp:289
+#: common/wildcards_and_files_ext.cpp:305
 msgid "Eagle ver. 6.x XML library files"
 msgstr "Eagle ver. 6.x XML 库文件"
 
-#: common/wildcards_and_files_ext.cpp:295
+#: common/wildcards_and_files_ext.cpp:311
 msgid "Geda PCB footprint library files"
 msgstr "Geda PCB 封装库文件"
 
-#: common/wildcards_and_files_ext.cpp:301
+#: common/wildcards_and_files_ext.cpp:317
 msgid "Page layout design files"
 msgstr "图框设计文件"
 
-#: common/wildcards_and_files_ext.cpp:308
+#: common/wildcards_and_files_ext.cpp:324
 msgid "KiCad symbol footprint link files"
 msgstr "KiCad 符号封装链接文件"
 
-#: common/wildcards_and_files_ext.cpp:315 gerbview/files.cpp:68
+#: common/wildcards_and_files_ext.cpp:331 gerbview/files.cpp:68
 msgid "Drill files"
 msgstr "钻孔文件"
 
-#: common/wildcards_and_files_ext.cpp:321
+#: common/wildcards_and_files_ext.cpp:337
 msgid "SVG files"
 msgstr "SVG 文件"
 
-#: common/wildcards_and_files_ext.cpp:327
+#: common/wildcards_and_files_ext.cpp:343
 msgid "HTML files"
 msgstr "HTML 文件"
 
-#: common/wildcards_and_files_ext.cpp:333
+#: common/wildcards_and_files_ext.cpp:349
 msgid "CSV Files"
 msgstr "CSV 文件"
 
-#: common/wildcards_and_files_ext.cpp:339
+#: common/wildcards_and_files_ext.cpp:355
 msgid "Portable document format files"
 msgstr "便携式文档格式文件 (*.PDF)"
 
-#: common/wildcards_and_files_ext.cpp:345
+#: common/wildcards_and_files_ext.cpp:361
 msgid "PostScript files"
 msgstr "PostScript 文件"
 
-#: common/wildcards_and_files_ext.cpp:351
+#: common/wildcards_and_files_ext.cpp:367
 msgid "Report files"
 msgstr "报告文件"
 
-#: common/wildcards_and_files_ext.cpp:357
+#: common/wildcards_and_files_ext.cpp:373
 msgid "Footprint place files"
 msgstr "封装位置文件"
 
-#: common/wildcards_and_files_ext.cpp:363
+#: common/wildcards_and_files_ext.cpp:379
 msgid "VRML and X3D files"
 msgstr "VRML 和 X3D 文件"
 
-#: common/wildcards_and_files_ext.cpp:369
+#: common/wildcards_and_files_ext.cpp:385
 msgid "IDFv3 footprint files"
 msgstr "IDFv3 封装文件"
 
-#: common/wildcards_and_files_ext.cpp:375
+#: common/wildcards_and_files_ext.cpp:391
 msgid "Text files"
 msgstr "文本文件"
 
-#: common/wildcards_and_files_ext.cpp:381
+#: common/wildcards_and_files_ext.cpp:397
 msgid "Legacy footprint export files"
 msgstr "旧的封装导出文件"
 
-#: common/wildcards_and_files_ext.cpp:387
+#: common/wildcards_and_files_ext.cpp:403
 msgid "Electronic rule check file"
 msgstr "电气规则检查文件"
 
-#: common/wildcards_and_files_ext.cpp:393
+#: common/wildcards_and_files_ext.cpp:409
 msgid "Spice library file"
 msgstr "Spice 库文件"
 
-#: common/wildcards_and_files_ext.cpp:399
+#: common/wildcards_and_files_ext.cpp:415
 msgid "SPICE netlist file"
 msgstr "SPICE 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:405
+#: common/wildcards_and_files_ext.cpp:421
 msgid "CadStar netlist file"
 msgstr "CadStar 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:411
+#: common/wildcards_and_files_ext.cpp:427
 msgid "Symbol footprint association files"
 msgstr "符号封装关联文件"
 
-#: common/wildcards_and_files_ext.cpp:417
+#: common/wildcards_and_files_ext.cpp:433
 msgid "Zip file"
 msgstr "Zip 文件"
 
-#: common/wildcards_and_files_ext.cpp:423
+#: common/wildcards_and_files_ext.cpp:439
 msgid "GenCAD 1.4 board files"
 msgstr "GenCAD 1.4 线路板文件"
 
-#: common/wildcards_and_files_ext.cpp:429
+#: common/wildcards_and_files_ext.cpp:445
 msgid "DXF Files"
 msgstr "DXF 文件"
 
-#: common/wildcards_and_files_ext.cpp:435
+#: common/wildcards_and_files_ext.cpp:451
 msgid "Gerber job file"
 msgstr "Gerber 工作文件"
 
-#: common/wildcards_and_files_ext.cpp:441
+#: common/wildcards_and_files_ext.cpp:457
 msgid "Specctra DSN file"
 msgstr "Specctra DSN 文件"
 
-#: common/wildcards_and_files_ext.cpp:447
+#: common/wildcards_and_files_ext.cpp:463
 msgid "IPC-D-356 Test Files"
 msgstr "IPC-D-356 测试文件"
 
-#: common/wildcards_and_files_ext.cpp:453
+#: common/wildcards_and_files_ext.cpp:469
 msgid "Workbook file"
 msgstr "工作簿文件"
 
-#: common/wildcards_and_files_ext.cpp:459
+#: common/wildcards_and_files_ext.cpp:475
 msgid "PNG file"
 msgstr "PNG 文件"
 
-#: common/wildcards_and_files_ext.cpp:465
+#: common/wildcards_and_files_ext.cpp:481
 msgid "Jpeg file"
 msgstr "JPEG 文件"
 
-#: cvpcb/auto_associate.cpp:102
+#: cvpcb/auto_associate.cpp:104
 #, c-format
 msgid "Equivalence file \"%s\" could not be found in the default search paths."
 msgstr "在默认路径没有找到等价文件 \"%s\"。"
 
-#: cvpcb/auto_associate.cpp:123
+#: cvpcb/auto_associate.cpp:125
 #, c-format
 msgid "Error opening equivalence file \"%s\"."
 msgstr "打开等效文件 \"%s\" 时出现错误。"
 
-#: cvpcb/auto_associate.cpp:174
+#: cvpcb/auto_associate.cpp:176
 msgid "Equivalence File Load Error"
 msgstr "等效文件载入错误"
 
-#: cvpcb/auto_associate.cpp:182
+#: cvpcb/auto_associate.cpp:184
 #, c-format
 msgid "%lu footprint/cmp equivalences found."
 msgstr "%lu 找到了等价的封装/元件。"
 
-#: cvpcb/auto_associate.cpp:257
+#: cvpcb/auto_associate.cpp:259
 #, c-format
 msgid ""
 "Component %s: footprint %s not found in any of the project footprint "
 "libraries."
 msgstr "元件 %s： 没有在任何工程封装库中找到封装 %s 。"
 
-#: cvpcb/auto_associate.cpp:302
+#: cvpcb/auto_associate.cpp:304
 msgid "CvPcb Warning"
 msgstr "CvPcb 警告"
 
-#: cvpcb/cfg.cpp:68
-#, c-format
-msgid "Project file \"%s\" is not writable"
-msgstr "工程文件 \"%s\" 不可写"
-
 #: cvpcb/cvpcb.cpp:154
 msgid ""
 "You have run CvPcb for the first time using the new footprint library table "
@@ -5101,60 +5644,60 @@ msgstr "封装更改的符号未保存"
 msgid "Symbol to Footprint links have been modified. Save changes?"
 msgstr "符号和封装关联已经更改。保存更改吗?"
 
-#: cvpcb/cvpcb_mainframe.cpp:440 cvpcb/tools/cvpcb_association_tool.cpp:224
+#: cvpcb/cvpcb_mainframe.cpp:435 cvpcb/tools/cvpcb_association_tool.cpp:224
 #, c-format
 msgid "\"%s\" is not a valid footprint."
 msgstr "\"%s\" 不是有效的封装。"
 
-#: cvpcb/cvpcb_mainframe.cpp:592
+#: cvpcb/cvpcb_mainframe.cpp:583
 msgid "key words"
 msgstr "关键词"
 
-#: cvpcb/cvpcb_mainframe.cpp:605
+#: cvpcb/cvpcb_mainframe.cpp:599
 msgid "pin count"
 msgstr "引脚数"
 
-#: cvpcb/cvpcb_mainframe.cpp:615
+#: cvpcb/cvpcb_mainframe.cpp:612
 msgid "library"
 msgstr "库"
 
-#: cvpcb/cvpcb_mainframe.cpp:623
+#: cvpcb/cvpcb_mainframe.cpp:625
 msgid "search text"
 msgstr "搜索文本"
 
-#: cvpcb/cvpcb_mainframe.cpp:627
+#: cvpcb/cvpcb_mainframe.cpp:629
 msgid "No filtering"
 msgstr "不筛选"
 
-#: cvpcb/cvpcb_mainframe.cpp:629
+#: cvpcb/cvpcb_mainframe.cpp:631
 #, c-format
 msgid "Filtered by %s"
 msgstr "筛选 %s"
 
-#: cvpcb/cvpcb_mainframe.cpp:643
+#: cvpcb/cvpcb_mainframe.cpp:645
 #, c-format
 msgid "Description: %s;  Key words: %s"
 msgstr "描述：%s；  关键字：%s"
 
-#: cvpcb/cvpcb_mainframe.cpp:675
+#: cvpcb/cvpcb_mainframe.cpp:677
 #, c-format
 msgid "Library location: %s"
 msgstr "库位置：%s"
 
-#: cvpcb/cvpcb_mainframe.cpp:677
+#: cvpcb/cvpcb_mainframe.cpp:679
 msgid "Library location: unknown"
 msgstr "库位置：未知"
 
-#: cvpcb/cvpcb_mainframe.cpp:690
+#: cvpcb/cvpcb_mainframe.cpp:692
 msgid ""
 "No PCB footprint libraries are listed in the current footprint library table."
 msgstr "在当前封装库表中没有列出 PCB 封装库。"
 
-#: cvpcb/cvpcb_mainframe.cpp:691
+#: cvpcb/cvpcb_mainframe.cpp:693
 msgid "Configuration Error"
 msgstr "配置错误"
 
-#: cvpcb/cvpcb_mainframe.cpp:758
+#: cvpcb/cvpcb_mainframe.cpp:760
 #, c-format
 msgid ""
 "Error loading schematic.\n"
@@ -5163,20 +5706,20 @@ msgstr ""
 "加载原理图时出错。\n"
 "%s"
 
-#: cvpcb/dialogs/dialog_config_equfiles.cpp:47
+#: cvpcb/dialogs/dialog_config_equfiles.cpp:49
 #, c-format
 msgid "Project file: \"%s\""
 msgstr "工程文件：\"%s\""
 
-#: cvpcb/dialogs/dialog_config_equfiles.cpp:91
+#: cvpcb/dialogs/dialog_config_equfiles.cpp:102
 msgid "No editor defined in KiCad. Please choose it."
 msgstr "在 KiCad 中没有定义编辑器，请选择。"
 
-#: cvpcb/dialogs/dialog_config_equfiles.cpp:236
+#: cvpcb/dialogs/dialog_config_equfiles.cpp:249
 msgid "Footprint Association File"
 msgstr "封装关联文件"
 
-#: cvpcb/dialogs/dialog_config_equfiles.cpp:281
+#: cvpcb/dialogs/dialog_config_equfiles.cpp:294
 #, c-format
 msgid "File \"%s\" already exists in list"
 msgstr "文件 \"%s\" 已经存在于列表中"
@@ -5189,7 +5732,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:670
+#: eeschema/libedit/lib_edit_frame.cpp:669
 msgid "Add"
 msgstr "添加"
 
@@ -5256,38 +5799,38 @@ msgstr ""
 msgid "Footprint Assignment Conflicts"
 msgstr "封装分配冲突"
 
-#: cvpcb/display_footprints_frame.cpp:66 eeschema/toolbars_lib_view.cpp:109
-#: pcbnew/toolbars_footprint_viewer.cpp:171
+#: cvpcb/display_footprints_frame.cpp:66 eeschema/toolbars_lib_view.cpp:106
+#: pcbnew/toolbars_footprint_viewer.cpp:168
 msgid "Footprint Viewer"
 msgstr "封装浏览"
 
-#: cvpcb/display_footprints_frame.cpp:329
+#: cvpcb/display_footprints_frame.cpp:328
 #, c-format
 msgid "Footprint ID \"%s\" is not valid."
 msgstr "封装 ID \"%s\" 无效。"
 
-#: cvpcb/display_footprints_frame.cpp:344
+#: cvpcb/display_footprints_frame.cpp:343
 #, c-format
 msgid "Library \"%s\" is not in the footprint library table."
 msgstr "在封装库表中未找到 \"%s\" 库。"
 
-#: cvpcb/display_footprints_frame.cpp:353
-#: cvpcb/display_footprints_frame.cpp:375
+#: cvpcb/display_footprints_frame.cpp:352
+#: cvpcb/display_footprints_frame.cpp:374
 #, c-format
 msgid "Footprint \"%s\" not found."
 msgstr "封装 \"%s\" 没有找到。"
 
-#: cvpcb/display_footprints_frame.cpp:405 pcbnew/class_module.cpp:598
+#: cvpcb/display_footprints_frame.cpp:404 pcbnew/class_module.cpp:692
 #, c-format
 msgid "Footprint: %s"
 msgstr "封装：%s"
 
-#: cvpcb/display_footprints_frame.cpp:416
+#: cvpcb/display_footprints_frame.cpp:415
 #, c-format
 msgid "Lib: %s"
 msgstr "库：%s"
 
-#: cvpcb/readwrite_dlgs.cpp:120
+#: cvpcb/readwrite_dlgs.cpp:118
 msgid ""
 "Some of the assigned footprints are legacy entries (are missing lib "
 "nicknames). Would you like CvPcb to attempt to convert them to the new "
@@ -5298,27 +5841,27 @@ msgstr ""
 "的 LIB_ID 格式吗？（如果你回答否，这些分配将被清除，你将必须自己重新指定这些"
 "封装。）"
 
-#: cvpcb/readwrite_dlgs.cpp:153
+#: cvpcb/readwrite_dlgs.cpp:151
 #, 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:161
+#: cvpcb/readwrite_dlgs.cpp:159
 #, 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:174
+#: cvpcb/readwrite_dlgs.cpp:172
 msgid "First check your footprint library table entries."
 msgstr "首先检查封装库表条目。"
 
-#: cvpcb/readwrite_dlgs.cpp:176
+#: cvpcb/readwrite_dlgs.cpp:174
 msgid "Problematic Footprint Library Tables"
 msgstr "有问题的封装库表"
 
-#: cvpcb/readwrite_dlgs.cpp:184
+#: cvpcb/readwrite_dlgs.cpp:182
 msgid ""
 "The following errors occurred attempting to convert the footprint "
 "assignments:\n"
@@ -5327,7 +5870,7 @@ msgstr ""
 "试图转换封装分配时发生下列错误：\n"
 "\n"
 
-#: cvpcb/readwrite_dlgs.cpp:187
+#: cvpcb/readwrite_dlgs.cpp:185
 msgid ""
 "\n"
 "You will need to reassign them manually if you want them to be updated "
@@ -5336,7 +5879,7 @@ msgstr ""
 "\n"
 "如果你希望下次在 Pcbnew 中导入网表时正确更新它们，则需要手动重新分配它们。"
 
-#: cvpcb/readwrite_dlgs.cpp:304
+#: cvpcb/readwrite_dlgs.cpp:302
 msgid "Schematic saved"
 msgstr "保存原理图"
 
@@ -5431,44 +5974,36 @@ msgstr "按库筛选"
 msgid "Filter footprint list by library"
 msgstr "按库筛选封装列表"
 
-#: cvpcb/tools/cvpcb_actions.cpp:157
-msgid "Filter by display name"
-msgstr "按名称筛选字段"
-
-#: cvpcb/tools/cvpcb_actions.cpp:158
-msgid "Filter footprint list using plain text matching or regular expressions"
-msgstr "使用纯文本匹配或正则表达式筛选封装列表"
-
 #: cvpcb/tools/cvpcb_association_tool.cpp:273
 msgid "Delete all associations?"
 msgstr "是否删除所有关联？"
 
-#: eeschema/annotate.cpp:116
+#: eeschema/annotate.cpp:130
 #, c-format
 msgid "%d duplicate time stamps were found and replaced."
 msgstr "找到并替换 %d 个重复的时间戳。"
 
-#: eeschema/annotate.cpp:202
+#: eeschema/annotate.cpp:220
 #, c-format
 msgid "Updated %s (unit %s) from %s to %s"
 msgstr "更新 %s， (单元 %s) 从 %s 到 %s"
 
-#: eeschema/annotate.cpp:207
+#: eeschema/annotate.cpp:226
 #, c-format
 msgid "Updated %s from %s to %s"
 msgstr "更新 %s， 从 %s 到 %s"
 
-#: eeschema/annotate.cpp:214
+#: eeschema/annotate.cpp:234
 #, c-format
 msgid "Annotated %s (unit %s) as %s"
 msgstr "标注 %s (单元 %s)为 %s"
 
-#: eeschema/annotate.cpp:219
+#: eeschema/annotate.cpp:239
 #, c-format
 msgid "Annotated %s as %s"
 msgstr "标注 %s 为 %s"
 
-#: eeschema/annotate.cpp:229
+#: eeschema/annotate.cpp:249
 msgid "Annotation complete."
 msgstr "标注完成。"
 
@@ -5483,7 +6018,7 @@ msgstr ""
 "%s\n"
 "没有找到。脚本不可用。"
 
-#: eeschema/class_library.cpp:54
+#: eeschema/class_library.cpp:55
 #, c-format
 msgid ""
 "Library \"%s\" has duplicate entry name \"%s\".\n"
@@ -5493,21 +6028,16 @@ msgstr ""
 "库 \"%s\" 有重复的条目名 \"%s\"。\n"
 "在载入元件到原理图时,可能会导致一些异常情况。"
 
-#: eeschema/class_library.cpp:478
-#, c-format
-msgid "Unable to load project's \"%s\" file"
-msgstr "无法加载工程文件 %s"
-
-#: eeschema/class_library.cpp:518 eeschema/libedit/lib_edit_frame.cpp:597
+#: eeschema/class_library.cpp:497 eeschema/libedit/lib_edit_frame.cpp:596
 #: eeschema/symbol_tree_model_adapter.cpp:63
 msgid "Loading Symbol Libraries"
 msgstr "加载符号库"
 
-#: eeschema/class_library.cpp:535
+#: eeschema/class_library.cpp:514
 msgid "Loading "
 msgstr "载入中 "
 
-#: eeschema/class_library.cpp:578
+#: eeschema/class_library.cpp:557
 #, c-format
 msgid ""
 "Symbol library \"%s\" failed to load. Error:\n"
@@ -5516,7 +6046,7 @@ msgstr ""
 "符号库 \"%s\" 载入失败。错误：\n"
 " %s"
 
-#: eeschema/class_library.cpp:602
+#: eeschema/class_library.cpp:581
 #, c-format
 msgid ""
 "Symbol library \"%s\" failed to load.\n"
@@ -5557,94 +6087,49 @@ 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:124
+#: eeschema/cross-probing.cpp:150
 #, c-format
 msgid "pin %s"
 msgstr "引脚 %s"
 
-#: eeschema/cross-probing.cpp:126
+#: eeschema/cross-probing.cpp:152
 msgid "component"
 msgstr "元件"
 
-#: eeschema/cross-probing.cpp:131
+#: eeschema/cross-probing.cpp:157
 #, c-format
 msgid "%s %s found"
 msgstr "%s %s 找到"
 
-#: eeschema/cross-probing.cpp:133
+#: eeschema/cross-probing.cpp:159
 #, c-format
 msgid "%s found but %s not found"
 msgstr "找到 %s 但 %s 未找到"
 
-#: eeschema/cross-probing.cpp:136
+#: eeschema/cross-probing.cpp:162
 #, c-format
 msgid "Component %s not found"
 msgstr "元件 %s 没有找到"
 
-#: eeschema/cross-probing.cpp:179
+#: eeschema/cross-probing.cpp:210
 msgid "Selected net: "
 msgstr "选择网络： "
 
-#: eeschema/dialogs/dialog_annotate.cpp:105
+#: eeschema/dialogs/dialog_annotate.cpp:97
 msgid "Annotation Messages:"
 msgstr "标注信息："
 
-#: eeschema/dialogs/dialog_annotate.cpp:109
+#: eeschema/dialogs/dialog_annotate.cpp:101
 msgid "Annotate"
 msgstr "标注"
 
-#: eeschema/dialogs/dialog_annotate.cpp:203
-msgid "Clear and annotate all of the symbols on the entire schematic?"
-msgstr "清除并标注整个原理图中的所有符号？"
-
-#: eeschema/dialogs/dialog_annotate.cpp:205
-msgid "Clear and annotate all of the symbols on the current sheet?"
-msgstr "清除并标注当前图框中所有符号?"
-
-#: eeschema/dialogs/dialog_annotate.cpp:207
-msgid ""
-"\n"
-"\n"
-"This operation will change the current annotation and cannot be undone."
-msgstr ""
-"\n"
-"\n"
-"该操作将改变当前标注并且不可撤销。"
-
-#: eeschema/dialogs/dialog_annotate.cpp:210
-msgid "Clear and Annotate"
-msgstr "清除与标注"
-
-#: eeschema/dialogs/dialog_annotate.cpp:249
-msgid "Clear the existing annotation for the entire schematic?"
-msgstr "要清除整个原理图的现有的标注吗？"
-
-#: eeschema/dialogs/dialog_annotate.cpp:251
-msgid "Clear the existing annotation for the current sheet?"
-msgstr "要清除当前图框的现有的标注吗？"
-
-#: eeschema/dialogs/dialog_annotate.cpp:253
-msgid ""
-"\n"
-"\n"
-"This operation will clear the existing annotation and cannot be undone."
-msgstr ""
-"\n"
-"\n"
-"该操作将清除已有的标注, 并且不可恢复。"
-
-#: eeschema/dialogs/dialog_annotate.cpp:256
-#: eeschema/dialogs/dialog_annotate_base.cpp:126
-msgid "Clear Annotation"
-msgstr "清除批注"
+#: eeschema/dialogs/dialog_annotate_base.cpp:38
+msgid "Entire schematic"
+msgstr "整个原理图"
 
 #: eeschema/dialogs/dialog_annotate_base.cpp:38
-msgid "Use the entire schematic"
-msgstr "使用整个原理图"
-
-#: eeschema/dialogs/dialog_annotate_base.cpp:38
-msgid "Use the current page only"
-msgstr "仅使用当前图框"
+msgid "Current sheet only"
+msgstr "仅当前图框"
 
 #: eeschema/dialogs/dialog_annotate_base.cpp:40
 msgid "Scope:"
@@ -5696,6 +6181,10 @@ msgstr "参考编号 X 100"
 msgid "First free after sheet number X 1000"
 msgstr "参考编号 X 1000"
 
+#: eeschema/dialogs/dialog_annotate_base.cpp:126
+msgid "Clear Annotation"
+msgstr "清除批注"
+
 #: eeschema/dialogs/dialog_annotate_base.h:79
 msgid "Annotate Schematic"
 msgstr "标注原理图"
@@ -5717,7 +6206,7 @@ msgstr "添加生成器"
 msgid "Nickname \"%s\" already in use."
 msgstr "昵称 \"%s\" 已经被占用了。"
 
-#: eeschema/dialogs/dialog_bom.cpp:558 eeschema/dialogs/dialog_netlist.cpp:679
+#: eeschema/dialogs/dialog_bom.cpp:558 eeschema/dialogs/dialog_netlist.cpp:687
 msgid "Generator files:"
 msgstr "生成钻孔文件："
 
@@ -6188,7 +6677,7 @@ msgid "Invalid footprint specified"
 msgstr "指定的封装无效"
 
 #: eeschema/dialogs/dialog_choose_component.cpp:434
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:780
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:739
 #: eeschema/generate_alias_info.cpp:81
 #, c-format
 msgid ""
@@ -6228,29 +6717,29 @@ msgid "Delete alternate body style (DeMorgan) draw items from symbol?"
 msgstr "确定从符号中删除备用主体样式 (德摩根) 的图形项目？"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib.cpp:290
-#: eeschema/libedit/libedit.cpp:520
+#: eeschema/libedit/libedit.cpp:521
 #, 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:383
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:575
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:380
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:579
 #, c-format
 msgid "The name '%s' is already in use."
 msgstr "名称 '%s' 已经在使用中。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:450
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:625
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:447
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:629
 #: eeschema/dialogs/dialog_sch_sheet_props.cpp:660
 #, c-format
 msgid "The first %d fields are mandatory."
 msgstr "首字段 %d 是必填字段。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:567
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:564
 msgid "Add Footprint Filter"
 msgstr "添加封装筛选"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:606
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:603
 msgid "Edit Footprint Filter"
 msgstr "编辑封装筛选"
 
@@ -6269,7 +6758,7 @@ msgstr "字段"
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:431
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:54
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:335
-#: pcbnew/dialogs/panel_modedit_defaults.cpp:50
+#: pcbnew/dialogs/panel_modedit_defaults.cpp:51
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:46
 #: pcbnew/text_mod_grid_table.cpp:89
 msgid "Show"
@@ -6303,8 +6792,9 @@ msgstr "文本大小"
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:80
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:48
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:58
-#: eeschema/fields_grid_table.cpp:203 eeschema/lib_pin.cpp:1442
-#: eeschema/sch_text.cpp:695
+#: eeschema/fields_grid_table.cpp:203 eeschema/lib_pin.cpp:1461
+#: eeschema/sch_text.cpp:692 pcbnew/class_module.cpp:1648
+#: pcbnew/class_pad.cpp:1249
 #: 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
@@ -6399,12 +6889,6 @@ msgstr ""
 "派生自另一个符号或他们单独作为\n"
 "根符号。"
 
-#: 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 "符号"
-
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:168
 msgid "Has alternate symbol (DeMorgan)"
 msgstr "有备用符号 (德摩根)"
@@ -6504,8 +6988,9 @@ msgstr ""
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:189
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:214
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:227
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:279
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:290
+#: 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
@@ -6514,7 +6999,7 @@ msgid "units"
 msgstr "单元"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:266
-#: eeschema/dialogs/dialog_schematic_setup.cpp:55
+#: eeschema/dialogs/dialog_schematic_setup.cpp:65
 #: 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
@@ -6570,19 +7055,21 @@ msgid "Symbol \"%s\" not found in library \"%s\"."
 msgstr "符号 \"%s\" 在库中 \"%s\" 没有找到。"
 
 #: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:428
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:709
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:713
+#: eeschema/tools/sch_edit_tool.cpp:1298
 #, c-format
 msgid "'%s' is not a valid library indentifier."
 msgstr "'%s' 不是有效的库标识符。"
 
 #: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:438
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:719
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:723
+#: eeschema/tools/sch_edit_tool.cpp:1308
 #, c-format
 msgid "Symbol '%s' not found in symbol library '%s'."
 msgstr "符号 \"%s\" 在符号库中 \"%s\" 没有找到。"
 
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:103
-#: eeschema/tools/ee_actions.cpp:402
+#: eeschema/tools/ee_actions.cpp:396
 msgid "Update Fields from Library..."
 msgstr "从库中更新字段..."
 
@@ -6718,32 +7205,32 @@ msgstr "标识符号的唯一 ID"
 msgid "Symbol Properties"
 msgstr "符号属性"
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:565
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:547
 #, c-format
 msgid "Symbol library identifier \"%s\" is not valid."
 msgstr "符号库标识符 \"%s\" 无效."
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:683
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:643
 #, c-format
 msgid "Available Candidates for %s "
 msgstr "\"%s\" 的可用候选 "
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:687
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:647
 #, c-format
 msgid "Candidates count %d "
 msgstr "候选计数：%d "
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:697
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:657
 #, c-format
 msgid "%u link(s) mapped, %u not found"
 msgstr "已映射 %u 链接，未找到 %u"
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:702
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:662
 #, c-format
 msgid "All %u link(s) resolved"
 msgstr "所有 %u 链接已解决"
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:733
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:693
 msgid "Invalid symbol library identifier"
 msgstr "无效的符号库标识符"
 
@@ -6761,15 +7248,10 @@ msgid "New Library Reference"
 msgstr "新的库参考"
 
 #: eeschema/dialogs/dialog_edit_components_libid_base.cpp:58
-msgid ""
-"Warning: changes made from this dialog cannot be undone after closing it."
-msgstr "警告：关闭对话框后所作的更改无法撤消。"
-
-#: eeschema/dialogs/dialog_edit_components_libid_base.cpp:76
 msgid "Map Orphans"
 msgstr "映射到孤立的元件"
 
-#: eeschema/dialogs/dialog_edit_components_libid_base.cpp:77
+#: eeschema/dialogs/dialog_edit_components_libid_base.cpp:59
 msgid ""
 "If some components are orphan (the linked symbol is found nowhere),\n"
 "try to find a candidate having the same name in one of loaded symbol "
@@ -6778,7 +7260,7 @@ msgstr ""
 "如果某些元件是孤立的（无法找到链接的符号），\n"
 "尝试在加载的符号库之中找到具有相同名称的候选者。"
 
-#: eeschema/dialogs/dialog_edit_components_libid_base.h:62
+#: eeschema/dialogs/dialog_edit_components_libid_base.h:55
 msgid "Symbol Library References"
 msgstr "符号库参考"
 
@@ -6848,34 +7330,12 @@ msgstr ""
 "文字周围的边距由文字偏移率控制\n"
 "在 “原理图设置” > “常规” > “格式” 中。"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:118
-#: 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
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:92
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
-msgid "Left"
-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
 msgid "Up"
 msgstr "向上"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:118
-#: 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
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:92
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
-msgid "Right"
-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
@@ -6888,26 +7348,26 @@ msgstr "加粗斜体"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:126
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:119
-#: eeschema/lib_field.cpp:434 eeschema/lib_pin.cpp:1432
-#: eeschema/sch_text.cpp:706
+#: eeschema/lib_field.cpp:434 eeschema/lib_pin.cpp:1451
+#: eeschema/sch_text.cpp:703
 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:467
+#: eeschema/sch_text.cpp:464
 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:468
+#: eeschema/sch_text.cpp:465
 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:469
+#: eeschema/sch_text.cpp:466
 msgid "Bidirectional"
 msgstr "双向"
 
@@ -6919,12 +7379,13 @@ 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:471
+#: eeschema/sch_text.cpp:468
 msgid "Passive"
 msgstr "无源"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:132
-#: pcbnew/class_drawsegment.cpp:355
+#: pcbnew/class_drawsegment.cpp:420 pcbnew/class_pad.cpp:1245
+#: pcbnew/class_pcb_target.cpp:158
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:231
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:100
 msgid "Shape"
@@ -6934,31 +7395,8 @@ msgstr "形状"
 msgid "Text Editor"
 msgstr "文本编辑器"
 
-#: eeschema/dialogs/dialog_edit_line_style.cpp:48
-#: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
-#: pcbnew/class_zone.cpp:660 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
-msgid "Solid"
-msgstr "实心"
-
-#: eeschema/dialogs/dialog_edit_line_style.cpp:49
-#: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
-msgid "Dashed"
-msgstr "虚线"
-
-#: eeschema/dialogs/dialog_edit_line_style.cpp:50
-#: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
-msgid "Dotted"
-msgstr "点线"
-
-#: eeschema/dialogs/dialog_edit_line_style.cpp:51
-#: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
-msgid "Dash-Dot"
-msgstr "点划线"
-
 #: eeschema/dialogs/dialog_edit_line_style_base.cpp:43
+#: eeschema/dialogs/dialog_junction_props_base.cpp:36
 msgid "Color:"
 msgstr "颜色："
 
@@ -6971,34 +7409,16 @@ msgstr "样式："
 msgid "Combo!"
 msgstr "组合！"
 
-#: eeschema/dialogs/dialog_edit_line_style_base.h:72
-msgid "Line Style"
-msgstr "线型"
-
-#: eeschema/dialogs/dialog_edit_one_field.cpp:88
-#: pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp:28
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:66
-msgid "Reference designator:"
-msgstr "参考标识符："
-
-#: eeschema/dialogs/dialog_edit_one_field.cpp:90
-msgid "Footprint ID:"
-msgstr "封装 ID："
-
-#: eeschema/dialogs/dialog_edit_one_field.cpp:91
-msgid "Datasheet URL:"
-msgstr "数据手册 URL："
-
-#: eeschema/dialogs/dialog_edit_one_field.cpp:227
+#: eeschema/dialogs/dialog_edit_one_field.cpp:218
 msgid "Illegal reference designator value!"
 msgstr "非法引用指示符值！"
 
-#: eeschema/dialogs/dialog_edit_one_field.cpp:235
+#: 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:436
+#: eeschema/dialogs/dialog_netlist_base.cpp:85 eeschema/libedit/libedit.cpp:437
 #: 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
@@ -7027,132 +7447,133 @@ msgstr "运行"
 msgid "Annotation required!"
 msgstr "需要注释！"
 
-#: eeschema/dialogs/dialog_erc.cpp:204
+#: eeschema/dialogs/dialog_erc.cpp:205
 msgid "Checking sheet names...\n"
 msgstr "检查图框名称...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:210
+#: eeschema/dialogs/dialog_erc.cpp:211
 msgid "Checking bus conflicts...\n"
 msgstr "检查总线冲突...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:215
+#: eeschema/dialogs/dialog_erc.cpp:216
 msgid "Checking conflicts...\n"
 msgstr "正在检查冲突...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:222
+#: eeschema/dialogs/dialog_erc.cpp:223
 msgid "Checking footprints...\n"
 msgstr "检查封装...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:245
+#: eeschema/dialogs/dialog_erc.cpp:246
 msgid "Checking connections...\n"
 msgstr "检查连接...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:292
+#: eeschema/dialogs/dialog_erc.cpp:293
 #, c-format
 msgid "Pin %s is connected to both %s and %s"
 msgstr "引脚 %s 同时连接到 %s 和 %s"
 
-#: eeschema/dialogs/dialog_erc.cpp:321
+#: eeschema/dialogs/dialog_erc.cpp:322
 msgid "Checking labels...\n"
 msgstr "检查标签...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:343 pcbnew/drc/drc.cpp:478
+#: eeschema/dialogs/dialog_erc.cpp:347 pcbnew/drc/drc.cpp:445
+#: qa/drc_proto/drc.cpp:478
 msgid "Finished"
 msgstr "完成"
 
-#: eeschema/dialogs/dialog_erc.cpp:405 pcbnew/dialogs/dialog_drc.cpp:288
+#: eeschema/dialogs/dialog_erc.cpp:409 pcbnew/dialogs/dialog_drc.cpp:288
 msgid "errors"
 msgstr "错误"
 
-#: eeschema/dialogs/dialog_erc.cpp:406 pcbnew/dialogs/dialog_drc.cpp:289
+#: eeschema/dialogs/dialog_erc.cpp:410 pcbnew/dialogs/dialog_drc.cpp:289
 msgid "warnings"
 msgstr "警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:407 pcbnew/dialogs/dialog_drc.cpp:290
+#: eeschema/dialogs/dialog_erc.cpp:411 pcbnew/dialogs/dialog_drc.cpp:290
 msgid "appropriate"
 msgstr "适当"
 
-#: eeschema/dialogs/dialog_erc.cpp:412 pcbnew/dialogs/dialog_drc.cpp:295
+#: eeschema/dialogs/dialog_erc.cpp:416 pcbnew/dialogs/dialog_drc.cpp:295
 msgid "Remove exclusion for this violation"
 msgstr "不再排除此违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:413 pcbnew/dialogs/dialog_drc.cpp:296
+#: eeschema/dialogs/dialog_erc.cpp:417 pcbnew/dialogs/dialog_drc.cpp:296
 #, c-format
 msgid "It will be placed back in the %s list"
 msgstr "它将放回 %s 列表中"
 
-#: eeschema/dialogs/dialog_erc.cpp:417 pcbnew/dialogs/dialog_drc.cpp:300
+#: eeschema/dialogs/dialog_erc.cpp:421 pcbnew/dialogs/dialog_drc.cpp:300
 msgid "Exclude this violation"
 msgstr "排除此违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:418 pcbnew/dialogs/dialog_drc.cpp:301
+#: eeschema/dialogs/dialog_erc.cpp:422 pcbnew/dialogs/dialog_drc.cpp:301
 #, c-format
 msgid "It will be excluded from the %s list"
 msgstr "它将从 %s 列表中排除"
 
-#: eeschema/dialogs/dialog_erc.cpp:430 pcbnew/dialogs/dialog_drc.cpp:308
+#: eeschema/dialogs/dialog_erc.cpp:434 pcbnew/dialogs/dialog_drc.cpp:308
 #, c-format
 msgid "Change severity to Error for all '%s' violations"
 msgstr "将所有 \"%s\" 违规的严重性更改为错误"
 
-#: eeschema/dialogs/dialog_erc.cpp:432 eeschema/dialogs/dialog_erc.cpp:438
+#: eeschema/dialogs/dialog_erc.cpp:436 eeschema/dialogs/dialog_erc.cpp:442
 #: pcbnew/dialogs/dialog_drc.cpp:310 pcbnew/dialogs/dialog_drc.cpp:317
 msgid "Violation severities can also be edited in the Board Setup... dialog"
 msgstr "违规严重程度也可以在“电路板设置...”对话框中进行编辑"
 
-#: eeschema/dialogs/dialog_erc.cpp:436 pcbnew/dialogs/dialog_drc.cpp:315
+#: eeschema/dialogs/dialog_erc.cpp:440 pcbnew/dialogs/dialog_drc.cpp:315
 #, c-format
 msgid "Change severity to Warning for all '%s' violations"
 msgstr "将所有 \"%s\" 违规的严重程度更改为警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:441 pcbnew/dialogs/dialog_drc.cpp:321
+#: eeschema/dialogs/dialog_erc.cpp:445 pcbnew/dialogs/dialog_drc.cpp:321
 #, c-format
 msgid "Ignore all '%s' violations"
 msgstr "忽略所有 \"%s\" 违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:443 pcbnew/dialogs/dialog_drc.cpp:323
+#: eeschema/dialogs/dialog_erc.cpp:446 pcbnew/dialogs/dialog_drc.cpp:323
 msgid "Violations will not be checked or reported"
 msgstr "违规将不会被检查或报告"
 
-#: eeschema/dialogs/dialog_erc.cpp:450
+#: eeschema/dialogs/dialog_erc.cpp:453
 msgid "Edit pin-to-pin conflict map..."
 msgstr "编辑引脚到引脚冲突映射..."
 
-#: eeschema/dialogs/dialog_erc.cpp:454 pcbnew/dialogs/dialog_drc.cpp:328
+#: eeschema/dialogs/dialog_erc.cpp:457 pcbnew/dialogs/dialog_drc.cpp:328
 msgid "Edit violation severities..."
 msgstr "编辑违规严重性......"
 
-#: eeschema/dialogs/dialog_erc.cpp:455
+#: eeschema/dialogs/dialog_erc.cpp:458
 msgid "Open the Schematic Setup... dialog"
 msgstr "打开“原理图设置...”对话框"
 
-#: eeschema/dialogs/dialog_erc.cpp:513
-#: eeschema/dialogs/dialog_schematic_setup.cpp:61
+#: eeschema/dialogs/dialog_erc.cpp:516
+#: eeschema/dialogs/dialog_schematic_setup.cpp:71
 msgid "Pin Conflicts Map"
 msgstr "引脚冲突映射"
 
-#: eeschema/dialogs/dialog_erc.cpp:517
-#: eeschema/dialogs/dialog_schematic_setup.cpp:60
-#: pcbnew/dialogs/dialog_board_setup.cpp:76 pcbnew/dialogs/dialog_drc.cpp:395
+#: eeschema/dialogs/dialog_erc.cpp:520
+#: eeschema/dialogs/dialog_schematic_setup.cpp:70
+#: pcbnew/dialogs/dialog_board_setup.cpp:84 pcbnew/dialogs/dialog_drc.cpp:395
 msgid "Violation Severity"
 msgstr "违规严重程度"
 
-#: eeschema/dialogs/dialog_erc.cpp:589 pcbnew/dialogs/dialog_drc.cpp:467
+#: eeschema/dialogs/dialog_erc.cpp:592 pcbnew/dialogs/dialog_drc.cpp:467
 #, c-format
 msgid "Report file '%s' created\n"
 msgstr "创建报告文件 \"%s\"\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:594 pcbnew/dialogs/dialog_drc.cpp:472
+#: eeschema/dialogs/dialog_erc.cpp:597 pcbnew/dialogs/dialog_drc.cpp:472
 #, c-format
 msgid "Unable to create report file '%s'"
 msgstr "无法创建报告文件 \"%s\""
 
-#: eeschema/dialogs/dialog_erc.cpp:607
+#: eeschema/dialogs/dialog_erc.cpp:610
 #, c-format
 msgid "ERC report (%s, Encoding UTF8)\n"
 msgstr "ERC 报告（%s，编码 UTF8）\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:620
+#: eeschema/dialogs/dialog_erc.cpp:625
 #, c-format
 msgid ""
 "\n"
@@ -7161,7 +7582,7 @@ msgstr ""
 "\n"
 "***** 图框 %s\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:642
+#: eeschema/dialogs/dialog_erc.cpp:647
 #, c-format
 msgid ""
 "\n"
@@ -7170,6 +7591,11 @@ msgstr ""
 "\n"
 " ** ERC 信息: %d  错误 %d  警告 %d\n"
 
+#: eeschema/dialogs/dialog_erc_base.cpp:28
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1529
+msgid "Messages:"
+msgstr "信息："
+
 #: eeschema/dialogs/dialog_erc_base.cpp:45
 msgid "Violations:"
 msgstr "违规："
@@ -7213,7 +7639,7 @@ msgid "Show datasheet in browser"
 msgstr "在浏览器中显示数据书册"
 
 #: eeschema/dialogs/dialog_fields_editor_global.cpp:112
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:1041
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:1037
 msgid "The Reference column cannot be hidden."
 msgstr "无法隐藏“参考”列。"
 
@@ -7230,19 +7656,19 @@ msgstr "字段"
 msgid "Group By"
 msgstr "分组依据"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:979
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:975
 msgid "New field name:"
 msgstr "新字段名称："
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:979
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:975
 msgid "Add Field"
 msgstr "添加字段"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:988
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:984
 msgid "Field must have a name."
 msgstr "字段必须要有一个名称。"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:996
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:992
 #, c-format
 msgid "Field name \"%s\" already in use."
 msgstr "字段名称 \"%s\" 已经在使用。"
@@ -7356,13 +7782,12 @@ 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_global_edit_text_and_graphics_base.cpp:246
-#: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:653
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:665
 #: 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:532
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:534
 msgid "..."
 msgstr "..."
 
@@ -7378,22 +7803,6 @@ msgstr "可见(仅限字段)"
 msgid "V Alignment (fields only):"
 msgstr "V 对齐(仅限字段)："
 
-#: 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
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:108
-msgid "Top"
-msgstr "上对齐"
-
-#: 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
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:108
-msgid "Bottom"
-msgstr "下对齐"
-
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:282
 #: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:25
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:343
@@ -7483,6 +7892,14 @@ msgstr ""
 "\n"
 "%s"
 
+#: eeschema/dialogs/dialog_junction_props_base.cpp:25
+msgid "Diameter:"
+msgstr "直径："
+
+#: eeschema/dialogs/dialog_junction_props_base.h:58
+msgid "Junction Properties"
+msgstr "节点属性"
+
 #: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:39
 msgid "Do not fill"
 msgstr "不填充"
@@ -7512,7 +7929,7 @@ msgstr "所有主体风格 (德摩根) 共用 (&S)"
 msgid "Drawing Properties"
 msgstr "图形特性"
 
-#: eeschema/dialogs/dialog_lib_edit_pin.cpp:135
+#: 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"
@@ -7581,7 +7998,7 @@ msgstr "引脚属性"
 
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:76
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:44
-#: eeschema/lib_pin.cpp:1428
+#: eeschema/lib_pin.cpp:1447
 msgid "Number"
 msgstr "编号"
 
@@ -7607,9 +8024,9 @@ msgstr "名称文本尺寸"
 
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:83
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:51
-#: eeschema/lib_pin.cpp:1439 pcbnew/class_drawsegment.cpp:379
-#: pcbnew/class_drawsegment.cpp:404 pcbnew/class_track.cpp:609
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:61
+#: eeschema/lib_pin.cpp:1458 pcbnew/class_drawsegment.cpp:444
+#: pcbnew/class_drawsegment.cpp:469 pcbnew/class_track.cpp:603
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:60
 msgid "Length"
 msgstr "长度"
 
@@ -7629,14 +8046,6 @@ msgstr "引脚列表"
 msgid "(Power symbol value field text cannot be changed.)"
 msgstr "(不能更改电源符号值字段文本。)"
 
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:84
-#: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:44
-#: eeschema/lib_pin.cpp:1435
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:130
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:118
-msgid "Visible"
-msgstr "可见"
-
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:95
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:60
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:192
@@ -7646,14 +8055,14 @@ 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:613
+#: eeschema/fields_grid_table.cpp:513 eeschema/sch_line.cpp:594
 #: 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:611
+#: eeschema/fields_grid_table.cpp:515 eeschema/sch_line.cpp:592
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:137
 msgid "Vertical"
 msgstr "垂直"
@@ -7752,11 +8161,6 @@ msgstr "引脚名称在内部"
 msgid "New Symbol"
 msgstr "新建符号"
 
-#: eeschema/dialogs/dialog_migrate_buses.cpp:101
-#: pcbnew/tools/pcb_actions.cpp:1065
-msgid "Sheet"
-msgstr "图框"
-
 #: eeschema/dialogs/dialog_migrate_buses.cpp:102
 msgid "Conflicting Labels"
 msgstr "相互冲突的标签"
@@ -7765,8 +8169,8 @@ msgstr "相互冲突的标签"
 msgid "New Label"
 msgstr "新的标签"
 
-#: eeschema/dialogs/dialog_migrate_buses.cpp:104 pcbnew/class_module.cpp:585
-#: pcbnew/class_track.cpp:766
+#: eeschema/dialogs/dialog_migrate_buses.cpp:104 pcbnew/class_module.cpp:676
+#: pcbnew/class_track.cpp:760
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:193
 msgid "Status"
 msgstr "状态"
@@ -7807,49 +8211,49 @@ msgstr "迁移总线"
 msgid "Default format"
 msgstr "默认格式"
 
-#: eeschema/dialogs/dialog_netlist.cpp:296
+#: eeschema/dialogs/dialog_netlist.cpp:298
 #: eeschema/dialogs/dialog_netlist_base.h:67
 msgid "Export Netlist"
 msgstr "导出网表"
 
-#: eeschema/dialogs/dialog_netlist.cpp:313
+#: eeschema/dialogs/dialog_netlist.cpp:317
 msgid "Reformat passive symbol values"
 msgstr "重新格式化无源符号值"
 
-#: eeschema/dialogs/dialog_netlist.cpp:314
+#: eeschema/dialogs/dialog_netlist.cpp:318
 msgid "Reformat passive symbol values e.g. 1M -> 1Meg"
 msgstr "重新格式化无源符号值 e.g. 1M -> 1Meg"
 
-#: eeschema/dialogs/dialog_netlist.cpp:366
+#: eeschema/dialogs/dialog_netlist.cpp:370
 msgid "Netlist command:"
 msgstr "网表命令："
 
-#: eeschema/dialogs/dialog_netlist.cpp:433
+#: eeschema/dialogs/dialog_netlist.cpp:441
 msgid "Save Netlist File"
 msgstr "保存网表文件"
 
-#: eeschema/dialogs/dialog_netlist.cpp:472
+#: eeschema/dialogs/dialog_netlist.cpp:480
 #, c-format
 msgid "%s Export"
 msgstr "导出 %s"
 
-#: eeschema/dialogs/dialog_netlist.cpp:504
+#: eeschema/dialogs/dialog_netlist.cpp:512
 msgid "Schematic netlist not available"
 msgstr "原理图网络列表不可用"
 
-#: eeschema/dialogs/dialog_netlist.cpp:628
+#: eeschema/dialogs/dialog_netlist.cpp:636
 msgid "This plugin already exists."
 msgstr "此插件已存在。"
 
-#: eeschema/dialogs/dialog_netlist.cpp:656
+#: eeschema/dialogs/dialog_netlist.cpp:664
 msgid "Error. You must provide a command String"
 msgstr "错误。你必须提供一个命令字符串"
 
-#: eeschema/dialogs/dialog_netlist.cpp:662
+#: eeschema/dialogs/dialog_netlist.cpp:670
 msgid "Error. You must provide a Title"
 msgstr "错误。你必须提供一个标题"
 
-#: eeschema/dialogs/dialog_netlist.cpp:706
+#: eeschema/dialogs/dialog_netlist.cpp:714
 msgid "Do not forget to choose a title for this netlist control page"
 msgstr "不要忘记为这个网表控制页选择一个标题"
 
@@ -7897,7 +8301,7 @@ msgstr "绘制所有页"
 msgid "Plot Current Page"
 msgstr "绘制当前页"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:148
+#: 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
@@ -7905,7 +8309,7 @@ msgstr "绘制当前页"
 msgid "Select Output Directory"
 msgstr "选择输出目录"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:158
+#: eeschema/dialogs/dialog_plot_schematic.cpp:159
 #: pcbnew/dialogs/dialog_gendrill.cpp:308 pcbnew/dialogs/dialog_plot.cpp:365
 #, c-format
 msgid ""
@@ -7913,8 +8317,8 @@ msgid ""
 "\"%s\""
 msgstr "你想使用 \"%s\" 的相对路径吗?"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:160
-#: eeschema/dialogs/dialog_plot_schematic.cpp:168
+#: eeschema/dialogs/dialog_plot_schematic.cpp:161
+#: eeschema/dialogs/dialog_plot_schematic.cpp:169
 #: pcbnew/dialogs/dialog_export_svg.cpp:204
 #: pcbnew/dialogs/dialog_export_svg.cpp:215
 #: pcbnew/dialogs/dialog_gendrill.cpp:310
@@ -7925,40 +8329,40 @@ msgstr "你想使用 \"%s\" 的相对路径吗?"
 msgid "Plot Output Directory"
 msgstr "绘制输出目录"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:167
+#: 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:212
+#: eeschema/dialogs/dialog_plot_schematic.cpp:213
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:61
 msgid "Schematic size"
 msgstr "图框大小"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:218
-#: eeschema/dialogs/dialog_plot_schematic.cpp:233
+#: eeschema/dialogs/dialog_plot_schematic.cpp:219
+#: eeschema/dialogs/dialog_plot_schematic.cpp:234
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:61
 msgid "A4"
 msgstr "A4"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:219
+#: eeschema/dialogs/dialog_plot_schematic.cpp:220
 msgid "A3"
 msgstr "A3"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:220
+#: eeschema/dialogs/dialog_plot_schematic.cpp:221
 msgid "A2"
 msgstr "A2"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:221
+#: eeschema/dialogs/dialog_plot_schematic.cpp:222
 msgid "A1"
 msgstr "A1"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:222
+#: eeschema/dialogs/dialog_plot_schematic.cpp:223
 msgid "A0"
 msgstr "A0"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:223
-#: eeschema/dialogs/dialog_plot_schematic.cpp:234
+#: eeschema/dialogs/dialog_plot_schematic.cpp:224
+#: eeschema/dialogs/dialog_plot_schematic.cpp:235
 #: 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
@@ -7967,23 +8371,23 @@ msgstr "A0"
 msgid "A"
 msgstr "A"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:224
+#: eeschema/dialogs/dialog_plot_schematic.cpp:225
 msgid "B"
 msgstr "B"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:225
+#: eeschema/dialogs/dialog_plot_schematic.cpp:226
 msgid "C"
 msgstr "C"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:226
+#: eeschema/dialogs/dialog_plot_schematic.cpp:227
 msgid "D"
 msgstr "D"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:227
+#: eeschema/dialogs/dialog_plot_schematic.cpp:228
 msgid "E"
 msgstr "E"
 
-#: eeschema/dialogs/dialog_plot_schematic.cpp:358
+#: eeschema/dialogs/dialog_plot_schematic.cpp:361
 #: 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
@@ -8220,7 +8624,7 @@ msgid "Project Rescue Helper"
 msgstr "工程恢复助手"
 
 #: eeschema/dialogs/dialog_sch_import_settings.cpp:42
-#: eeschema/dialogs/dialog_sch_import_settings_base.h:60
+#: eeschema/dialogs/dialog_sch_import_settings_base.h:61
 #: pcbnew/dialogs/dialog_import_settings.cpp:42
 #: pcbnew/dialogs/dialog_import_settings_base.h:63
 msgid "Import Settings"
@@ -8268,11 +8672,16 @@ msgid "Pin conflict map"
 msgstr "引脚冲突映射"
 
 #: eeschema/dialogs/dialog_sch_import_settings_base.cpp:57
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:66
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:63
 msgid "Violation severities"
 msgstr "违规严重程度"
 
-#: eeschema/dialogs/dialog_sch_import_settings_base.cpp:65
+#: eeschema/dialogs/dialog_sch_import_settings_base.cpp:60
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:66
+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"
@@ -8313,7 +8722,7 @@ msgid "Invalid Schematic File"
 msgstr "无效的原理图文件"
 
 #: eeschema/dialogs/dialog_sch_sheet_props.cpp:405
-#: kicad/tools/kicad_manager_control.cpp:510
+#: kicad/tools/kicad_manager_control.cpp:511
 #, c-format
 msgid "\"%s\" already exists."
 msgstr "\"%s\" 已经存在。"
@@ -8447,40 +8856,48 @@ msgstr "替换 (&R)"
 msgid "Replace &All"
 msgstr "替换所有 (&A)"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:35
+#: eeschema/dialogs/dialog_schematic_setup.cpp:39
 msgid "Schematic Setup"
 msgstr "原理图设置"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:36
-#: pcbnew/dialogs/dialog_board_setup.cpp:38
+#: eeschema/dialogs/dialog_schematic_setup.cpp:40
 msgid "Import Settings from Another Project..."
 msgstr "从另一个项目导入设置..."
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:56
+#: eeschema/dialogs/dialog_schematic_setup.cpp:66
 msgid "Formatting"
 msgstr "格式化"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:57
-#: eeschema/eeschema_config.cpp:235
+#: eeschema/dialogs/dialog_schematic_setup.cpp:67
+#: eeschema/eeschema_config.cpp:230
 msgid "Field Name Templates"
 msgstr "字段名称模板"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:59
+#: eeschema/dialogs/dialog_schematic_setup.cpp:69
 msgid "Electrical Rules"
 msgstr "电气规则"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:63
-#: eeschema/libedit/lib_edit_frame.cpp:662
-#: pcbnew/dialogs/dialog_board_setup.cpp:78
+#: 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
 msgid "Project"
 msgstr "工程"
 
-#: eeschema/dialogs/dialog_schematic_setup.cpp:64
-#: pcbnew/dialogs/dialog_board_setup.cpp:79
+#: eeschema/dialogs/dialog_schematic_setup.cpp:75
+#: pcbnew/dialogs/dialog_board_setup.cpp:88
 msgid "Text Variables"
 msgstr "文本变量"
 
+#: eeschema/dialogs/dialog_schematic_setup.cpp:146
+#, c-format
+msgid ""
+"Error importing settings from project:\n"
+"Project file %s could not be loaded"
+msgstr ""
+"从项目导入设置时出错：\n"
+"无法加载项目文件 %s"
+
 #: eeschema/dialogs/dialog_signal_list_base.cpp:24
 msgid "Add signal by name:"
 msgstr "按名称添加信号："
@@ -8700,7 +9117,7 @@ msgstr "Spice 指令："
 msgid "Load directives from schematic"
 msgstr "从原理图加载命令"
 
-#: eeschema/dialogs/dialog_sim_settings_base.cpp:436
+#: eeschema/dialogs/dialog_sim_settings_base.cpp:436 pcbnew/class_pad.cpp:1239
 msgid "Custom"
 msgstr "自定义"
 
@@ -9230,14 +9647,14 @@ msgstr "替代节点序列："
 msgid "Spice Model Editor"
 msgstr "Spice 模型编辑器"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:56
+#: eeschema/dialogs/dialog_symbol_remap.cpp:57
 #, c-format
 msgid ""
 "Remapping is not possible because you do not have write privileges to the "
 "project folder \"%s\"."
 msgstr "由于你对工程文件夹 \"%s\" 没有写入权限, 因此无法重新映射。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:65
+#: eeschema/dialogs/dialog_symbol_remap.cpp:66
 msgid ""
 "This schematic currently uses the project symbol library list look up method "
 "for loading library symbols.  KiCad will attempt to map the existing symbols "
@@ -9253,17 +9670,17 @@ msgstr ""
 "兼容。 如果需要还原任何更改, 则所有更改的文件都将备份到项目文件夹中的  "
 "\"remap_backup \" 文件夹中。 如果选择跳过此步骤, 你将负责手动重新映射符号。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:206
+#: eeschema/dialogs/dialog_symbol_remap.cpp:207
 #, c-format
 msgid "Adding library \"%s\", file \"%s\" to project symbol library table."
 msgstr "添加库 \"%s\"，文件\"%s\"到工程符号库表。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:215
+#: eeschema/dialogs/dialog_symbol_remap.cpp:216
 #, c-format
 msgid "Library \"%s\" not found."
 msgstr "库 \"%s\" 未找到。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:232
+#: eeschema/dialogs/dialog_symbol_remap.cpp:233
 #, c-format
 msgid ""
 "Failed to write project symbol library table. Error:\n"
@@ -9273,70 +9690,70 @@ msgstr ""
 " \n"
 "%s"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:237
+#: eeschema/dialogs/dialog_symbol_remap.cpp:238
 msgid "Created project symbol library table.\n"
 msgstr "创建工程符号库表。\n"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:258
+#: eeschema/dialogs/dialog_symbol_remap.cpp:259
 #, c-format
 msgid "No symbol \"%s\" found in symbol library table."
 msgstr "在符号库表中找不到符号 \"%s\" 。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:264
+#: eeschema/dialogs/dialog_symbol_remap.cpp:265
 #, c-format
 msgid "Symbol \"%s\" mapped to symbol library \"%s\"."
 msgstr "符号 \"%s\" 映射到符号库 \"%s\"。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:273
+#: eeschema/dialogs/dialog_symbol_remap.cpp:274
 msgid "Symbol library table mapping complete!"
 msgstr "符号库表映射完成！"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:343
+#: eeschema/dialogs/dialog_symbol_remap.cpp:344
 #, c-format
 msgid "Cannot create project remap back up folder \"%s\"."
 msgstr "无法创建工程重新映射备份文件夹 \"%s\"。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:346
-#: eeschema/dialogs/dialog_symbol_remap.cpp:489
+#: eeschema/dialogs/dialog_symbol_remap.cpp:347
+#: eeschema/dialogs/dialog_symbol_remap.cpp:490
 msgid "Backup Error"
 msgstr "备份错误"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:348
-#: eeschema/dialogs/dialog_symbol_remap.cpp:493
+#: eeschema/dialogs/dialog_symbol_remap.cpp:349
+#: eeschema/dialogs/dialog_symbol_remap.cpp:494
 msgid "Continue with Rescue"
 msgstr "继续恢复"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:349
-#: eeschema/dialogs/dialog_symbol_remap.cpp:494
+#: eeschema/dialogs/dialog_symbol_remap.cpp:350
+#: eeschema/dialogs/dialog_symbol_remap.cpp:495
 msgid "Abort Rescue"
 msgstr "停止恢复"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:366
-#: eeschema/dialogs/dialog_symbol_remap.cpp:399
-#: eeschema/dialogs/dialog_symbol_remap.cpp:423
-#: eeschema/dialogs/dialog_symbol_remap.cpp:443
-#: eeschema/dialogs/dialog_symbol_remap.cpp:458
-#: eeschema/dialogs/dialog_symbol_remap.cpp:474
+#: eeschema/dialogs/dialog_symbol_remap.cpp:367
+#: eeschema/dialogs/dialog_symbol_remap.cpp:400
+#: eeschema/dialogs/dialog_symbol_remap.cpp:424
+#: eeschema/dialogs/dialog_symbol_remap.cpp:444
+#: eeschema/dialogs/dialog_symbol_remap.cpp:459
+#: eeschema/dialogs/dialog_symbol_remap.cpp:475
 #, c-format
 msgid "Backing up file \"%s\" to file \"%s\"."
 msgstr "备份文件 \"%s\" 到 \"%s\"。"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:373
-#: eeschema/dialogs/dialog_symbol_remap.cpp:413
-#: eeschema/dialogs/dialog_symbol_remap.cpp:430
-#: eeschema/dialogs/dialog_symbol_remap.cpp:450
-#: eeschema/dialogs/dialog_symbol_remap.cpp:466
-#: eeschema/dialogs/dialog_symbol_remap.cpp:482
+#: eeschema/dialogs/dialog_symbol_remap.cpp:374
+#: eeschema/dialogs/dialog_symbol_remap.cpp:414
+#: eeschema/dialogs/dialog_symbol_remap.cpp:431
+#: eeschema/dialogs/dialog_symbol_remap.cpp:451
+#: eeschema/dialogs/dialog_symbol_remap.cpp:467
+#: eeschema/dialogs/dialog_symbol_remap.cpp:483
 #, c-format
 msgid "Failed to back up file \"%s\".\n"
 msgstr "无法备份文件 \"%s\"。\n"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:405
+#: eeschema/dialogs/dialog_symbol_remap.cpp:406
 #, c-format
 msgid "Failed to create backup folder \"%s\"\n"
 msgstr "无法创建备份文件夹 \"%s\"\n"
 
-#: eeschema/dialogs/dialog_symbol_remap.cpp:488
+#: eeschema/dialogs/dialog_symbol_remap.cpp:489
 msgid "Some of the project files could not be backed up."
 msgstr "某些项目文件无法备份。"
 
@@ -9385,29 +9802,15 @@ msgstr "重置字段位置"
 msgid "Update Symbol Fields"
 msgstr "更新符号字段"
 
-#: eeschema/dialogs/dialog_update_from_pcb.cpp:51
-#: pcbnew/dialogs/dialog_netlist.cpp:85 pcbnew/dialogs/dialog_update_pcb.cpp:62
+#: eeschema/dialogs/dialog_update_from_pcb.cpp:41
+#: pcbnew/dialogs/dialog_netlist.cpp:86 pcbnew/dialogs/dialog_update_pcb.cpp:62
 msgid "Changes To Be Applied"
 msgstr "应用变更"
 
-#: eeschema/dialogs/dialog_update_from_pcb.cpp:62
+#: eeschema/dialogs/dialog_update_from_pcb.cpp:53
 msgid "Update Schematic"
 msgstr "更新原理图"
 
-#: eeschema/dialogs/dialog_update_from_pcb.cpp:112
-msgid ""
-"\n"
-"\n"
-"This operation will change the existing annotation and cannot be undone."
-msgstr ""
-"\n"
-"\n"
-"此操作将更改现有批注，并且无法撤消。"
-
-#: eeschema/dialogs/dialog_update_from_pcb.cpp:114
-msgid "Back annotate"
-msgstr "反向标注"
-
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:32
 msgid "Update reference designators"
 msgstr "更新参考标识符"
@@ -9449,11 +9852,15 @@ msgid ""
 "with different footprints in PCB."
 msgstr "更新其封装已替换为 PCB 中不同封装的符号的封装关联。"
 
-#: eeschema/dialogs/dialog_update_from_pcb_base.h:54
+#: eeschema/dialogs/dialog_update_from_pcb_base.cpp:59
+msgid "Update net names"
+msgstr "更新网络名称"
+
+#: eeschema/dialogs/dialog_update_from_pcb_base.h:55
 msgid "Update Schematic from PCB"
 msgstr "从 PCB 更新原理图"
 
-#: eeschema/dialogs/panel_eeschema_color_settings.cpp:147
+#: eeschema/dialogs/panel_eeschema_color_settings.cpp:149
 msgid ""
 "Some items have the same color as the background\n"
 "and they will not be seen on the screen.  Are you\n"
@@ -9463,7 +9870,7 @@ msgstr ""
 "在屏幕上它们将不可见。\n"
 "你确定要使用这些颜色吗？"
 
-#: eeschema/dialogs/panel_eeschema_color_settings.cpp:201
+#: eeschema/dialogs/panel_eeschema_color_settings.cpp:203
 msgid " (symbol editor only)"
 msgstr " （仅限符号编辑器）"
 
@@ -9508,12 +9915,36 @@ msgstr "高亮厚度 (&H)："
 msgid "(highlight color can be edited in the \"Colors\" page)"
 msgstr "（可以在“颜色”页面中编辑高亮颜色）"
 
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:78
+#: pcbnew/dialogs/panel_display_options_base.cpp:74
+msgid "Cross-probing"
+msgstr "交叉探测"
+
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:80
+#: pcbnew/dialogs/panel_display_options_base.cpp:76
+msgid "Center view on cross-probed items"
+msgstr "交叉探测项目的中心视图"
+
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:84
+#: pcbnew/dialogs/panel_display_options_base.cpp:80
+msgid "Zoom to fit cross-probed items"
+msgstr "缩放以适合交叉探测的项目"
+
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:88
+#: pcbnew/dialogs/panel_display_options_base.cpp:84
+msgid "Highlight cross-probed nets"
+msgstr "高亮交叉探针网络"
+
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:90
+msgid "Highlight nets when they are highlighted in the PCB editor"
+msgstr "当网络在 PCB 编辑器中高亮显示时，将其高亮显示"
+
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:27
 msgid "&Measurement units:"
 msgstr "测量单位 (&M)："
 
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:31
-#: pagelayout_editor/pl_editor_frame.cpp:667
+#: pagelayout_editor/pl_editor_frame.cpp:660
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:143
 msgid "inches"
 msgstr "英寸"
@@ -9728,7 +10159,6 @@ msgid "Pin symbol size:"
 msgstr "引脚符号大小："
 
 #: eeschema/dialogs/panel_setup_formatting_base.cpp:119
-#: eeschema/sch_line.cpp:809
 msgid "Connections"
 msgstr "连接"
 
@@ -9744,15 +10174,15 @@ msgstr "线宽 (&W)："
 msgid "Junction size:"
 msgstr "连接点尺寸："
 
-#: eeschema/dialogs/panel_setup_pinmap.cpp:201
+#: eeschema/dialogs/panel_setup_pinmap.cpp:189
 msgid "No error or warning"
 msgstr "没有错误或警告"
 
-#: eeschema/dialogs/panel_setup_pinmap.cpp:206
+#: eeschema/dialogs/panel_setup_pinmap.cpp:194
 msgid "Generate warning"
 msgstr "生成警告"
 
-#: eeschema/dialogs/panel_setup_pinmap.cpp:211
+#: eeschema/dialogs/panel_setup_pinmap.cpp:199
 msgid "Generate error"
 msgstr "生成错误"
 
@@ -9760,14 +10190,6 @@ msgstr "生成错误"
 msgid "Pin to Pin Connections"
 msgstr "引脚与引脚连接"
 
-#: eeschema/dialogs/panel_setup_pinmap_base.cpp:34
-#: 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
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1386
-msgid "Reset to Defaults"
-msgstr "重置为默认值"
-
 #: eeschema/dialogs/panel_sym_lib_table.cpp:343
 #: pcbnew/dialogs/panel_fp_lib_table.cpp:521
 #, c-format
@@ -9806,7 +10228,7 @@ msgid "Please change the library nickname after adding this library."
 msgstr "请在添加此库后更改库昵称。"
 
 #: eeschema/dialogs/panel_sym_lib_table.cpp:451
-#: eeschema/libedit/lib_edit_frame.cpp:669
+#: eeschema/libedit/lib_edit_frame.cpp:668
 #: pcbnew/dialogs/panel_fp_lib_table.cpp:842
 msgid "Skip"
 msgstr "跳过"
@@ -9842,9 +10264,9 @@ msgstr ""
 "%s"
 
 #: eeschema/dialogs/panel_sym_lib_table.cpp:827
-#: eeschema/dialogs/panel_sym_lib_table.cpp:840 eeschema/sch_base_frame.cpp:248
-#: eeschema/sch_base_frame.cpp:264 pcbnew/dialogs/panel_fp_lib_table.cpp:1029
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:1042 pcbnew/files.cpp:975
+#: eeschema/dialogs/panel_sym_lib_table.cpp:840 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:981
 msgid "File Save Error"
 msgstr "文件保存错误"
 
@@ -9922,20 +10344,20 @@ msgstr ""
 "试图加载全局符号库表时出错。\n"
 "请在首选项菜单中编辑这个全局符号库表。"
 
-#: eeschema/eeschema_config.cpp:232 eeschema/eeschema_config.cpp:518
-#: gerbview/gerbview_frame.cpp:1139
+#: eeschema/eeschema_config.cpp:227 eeschema/eeschema_config.cpp:432
+#: gerbview/gerbview_frame.cpp:1144
 #: pcbnew/dialogs/panel_edit_options_base.cpp:40
-#: pcbnew/footprint_edit_frame.cpp:837 pcbnew/pcbnew_config.cpp:67
+#: pcbnew/footprint_edit_frame.cpp:832 pcbnew/pcbnew_config.cpp:74
 msgid "Editing Options"
 msgstr "编辑选项"
 
-#: eeschema/eeschema_config.cpp:233 eeschema/eeschema_config.cpp:519
-#: pagelayout_editor/pl_editor_frame.cpp:411
-#: pcbnew/footprint_edit_frame.cpp:836 pcbnew/pcbnew_config.cpp:66
+#: eeschema/eeschema_config.cpp:228 eeschema/eeschema_config.cpp:433
+#: pagelayout_editor/pl_editor_frame.cpp:410
+#: pcbnew/footprint_edit_frame.cpp:831 pcbnew/pcbnew_config.cpp:73
 msgid "Colors"
 msgstr "颜色"
 
-#: eeschema/eeschema_config.cpp:558 eeschema/sheet.cpp:307
+#: eeschema/eeschema_config.cpp:472 eeschema/sheet.cpp:306
 #, c-format
 msgid "An error occurred loading the symbol library table \"%s\"."
 msgstr "加载符号库表 \"%s\" 时发生错误。"
@@ -9984,115 +10406,108 @@ msgstr "发射极开路"
 msgid "No Connection"
 msgstr "未连接"
 
-#: eeschema/erc.cpp:289 pcbnew/drc/drc_textvar_tester.cpp:102
+#: eeschema/erc.cpp:231 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:318
+#: eeschema/erc.cpp:260
 #, c-format
 msgid "Bus alias %s has conflicting definitions on %s and %s"
 msgstr "总线别名 %s 在 %s 和 %s 上的定义冲突"
 
-#: eeschema/erc.cpp:386
+#: eeschema/erc.cpp:330
 #, c-format
 msgid "Different footprints assigned to %s and %s"
 msgstr "分配给 %s 和 %s 的封装不同"
 
-#: eeschema/erc_item.cpp:42
-msgid "ERC err unspecified"
-msgstr "ERC 不明错误"
+#: eeschema/erc.cpp:559
+msgid "Pins with \"no connection\" type are connected"
+msgstr "连接了“无连接”类型的管脚"
 
-#: eeschema/erc_item.cpp:45
+#: eeschema/erc_item.cpp:41
 msgid "Duplicate sheet names within a given sheet"
 msgstr "给定的图框中重复图框名称"
 
-#: eeschema/erc_item.cpp:48
+#: eeschema/erc_item.cpp:45
 msgid "Pin not connected"
 msgstr "引脚未连接"
 
-#: eeschema/erc_item.cpp:51
+#: eeschema/erc_item.cpp:49
 msgid "Pin connected to other pins, but not driven by any pin"
 msgstr "引脚连接其他引脚，但不受任何引脚驱动"
 
-#: eeschema/erc_item.cpp:55
+#: eeschema/erc_item.cpp:53 eeschema/erc_item.cpp:57
 msgid "Conflict problem between pins"
 msgstr "引脚之间的冲突问题"
 
-#: eeschema/erc_item.cpp:58
+#: eeschema/erc_item.cpp:61
 msgid "Mismatch between hierarchical labels and pins sheets"
 msgstr "层次结构标签和图框引脚不匹配"
 
-#: eeschema/erc_item.cpp:61
+#: eeschema/erc_item.cpp:65
 msgid "A pin with a \"no connection\" flag is connected"
 msgstr "带有“不连接”标记的一个引脚是连接着的"
 
-#: eeschema/erc_item.cpp:64
+#: eeschema/erc_item.cpp:69
 msgid "Unconnected \"no connection\" flag"
 msgstr "未连接的“无连接”标志"
 
-#: eeschema/erc_item.cpp:67
+#: eeschema/erc_item.cpp:73
 msgid "Label not connected anywhere else in the schematic"
 msgstr "原理图中任何其他位置未连接的标签"
 
-#: eeschema/erc_item.cpp:70
+#: eeschema/erc_item.cpp:77
+msgid "Global label not connected anywhere else in the schematic"
+msgstr "在原理图中的任何其他位置都未连接全局标签"
+
+#: eeschema/erc_item.cpp:81
 msgid "Labels are similar (lower/upper case difference only)"
 msgstr "标签相似（只有大小写的区别）"
 
-#: eeschema/erc_item.cpp:73
+#: eeschema/erc_item.cpp:85
 msgid "Different footprint assigned in another unit of the same component"
 msgstr "在相同元件的另一个单元中分配不同的封装"
 
-#: eeschema/erc_item.cpp:76
+#: eeschema/erc_item.cpp:89
 msgid ""
 "Different net assigned to a shared pin in another unit of the same component"
 msgstr "在同一元件的另一个单元中分配给共用引脚的不同网络"
 
-#: eeschema/erc_item.cpp:79
+#: eeschema/erc_item.cpp:93
 msgid "Conflict between bus alias definitions across schematic sheets"
 msgstr "原理图图框中总线别名定义之间的冲突"
 
-#: eeschema/erc_item.cpp:82
+#: eeschema/erc_item.cpp:97
 msgid "More than one name given to this bus or net"
 msgstr "这个总线或网络的名字不止一个"
 
-#: eeschema/erc_item.cpp:85
+#: eeschema/erc_item.cpp:101
 msgid "Net is graphically connected to a bus but not a bus member"
 msgstr "网络以图形方式连接到总线, 但不是总线成员"
 
-#: eeschema/erc_item.cpp:88
+#: eeschema/erc_item.cpp:105
 msgid "Label attached to bus item does not describe a bus"
 msgstr "附加到总线项目的标签不描述总线"
 
-#: eeschema/erc_item.cpp:91
+#: eeschema/erc_item.cpp:109
 msgid "Buses are graphically connected but share no bus members"
 msgstr "总线以图形方式连接，但不共享总线成员"
 
-#: eeschema/erc_item.cpp:94
+#: eeschema/erc_item.cpp:113
 msgid "Invalid connection between bus and net items"
 msgstr "总线和净项目之间的连接无效"
 
-#: eeschema/erc_item.cpp:97
-msgid "Global label not connected anywhere else in the schematic"
-msgstr "在原理图中的任何其他位置都未连接全局标签"
-
-#: eeschema/erc_item.cpp:100 pcbnew/drc/drc_item.cpp:132
+#: eeschema/erc_item.cpp:117 pcbnew/drc/drc_item.cpp:159
+#: qa/drc_proto/drc_item.cpp:142
 msgid "Unresolved text variable"
 msgstr "未解析的文字变量"
 
-#: eeschema/erc_item.cpp:104
-msgid "Unknown ERC violation"
-msgstr "未知的 ERC 违规"
-
-#: eeschema/fields_grid_table.cpp:132 eeschema/files-io.cpp:86
+#: eeschema/fields_grid_table.cpp:132 eeschema/files-io.cpp:91
 msgid "Schematic Files"
 msgstr "原理图文件"
 
-#: eeschema/files-io.cpp:115
-#, c-format
-msgid "Could not save backup of file \"%s\""
-msgstr "无法保存备份文件 \"%s\""
-
-#: eeschema/files-io.cpp:140
+#: eeschema/files-io.cpp:126
 #, c-format
 msgid ""
 "Error saving schematic file \"%s\".\n"
@@ -10101,12 +10516,12 @@ msgstr ""
 "保存原理图文件 \"%s\" 发生错误。\n"
 "%s"
 
-#: eeschema/files-io.cpp:144 pcbnew/files.cpp:766
+#: eeschema/files-io.cpp:130 pcbnew/files.cpp:761
 #, c-format
 msgid "Failed to create temporary file \"%s\""
 msgstr "无法创建临时文件 \"%s\""
 
-#: eeschema/files-io.cpp:160
+#: eeschema/files-io.cpp:146
 #, c-format
 msgid ""
 "Error saving schematic file \"%s\".\n"
@@ -10115,42 +10530,42 @@ msgstr ""
 "保存原理图文件 \"%s\" 时出错。\n"
 "重命名临时文件 %s 失败"
 
-#: eeschema/files-io.cpp:165 pcbnew/files.cpp:785
+#: eeschema/files-io.cpp:151 pcbnew/files.cpp:780
 #, c-format
 msgid "Failed to rename temporary file \"%s\""
 msgstr "重命名临时文件 \"%s\" 失败"
 
-#: eeschema/files-io.cpp:195
+#: eeschema/files-io.cpp:181
 #, c-format
 msgid "File %s saved"
 msgstr "保存文件 %s"
 
-#: eeschema/files-io.cpp:200
+#: eeschema/files-io.cpp:186
 msgid "File write operation failed."
 msgstr "文件存储失败。"
 
-#: eeschema/files-io.cpp:254 eeschema/files-io.cpp:800
+#: eeschema/files-io.cpp:240 eeschema/files-io.cpp:813
 #, c-format
 msgid "Schematic file \"%s\" is already open."
 msgstr "电路图文件 \"%s\" 已经打开。"
 
-#: eeschema/files-io.cpp:271
+#: eeschema/files-io.cpp:259
 #, c-format
 msgid "Schematic \"%s\" does not exist.  Do you wish to create it?"
 msgstr "原理图 \"%s\" 不存在。你想创建它吗？"
 
-#: eeschema/files-io.cpp:333
+#: eeschema/files-io.cpp:327
 msgid "Schematic file changes are unsaved"
 msgstr "原理图文件更改未保存"
 
-#: eeschema/files-io.cpp:360
+#: eeschema/files-io.cpp:351
 msgid ""
 "The entire schematic could not be loaded.  Errors occurred attempting to "
 "load \n"
 "hierarchical sheet schematics."
 msgstr "整个原理图不能被加载。 尝试加载层次原理图时发生错误。"
 
-#: eeschema/files-io.cpp:373
+#: eeschema/files-io.cpp:364
 #, c-format
 msgid ""
 "Error loading schematic file \"%s\".\n"
@@ -10159,12 +10574,12 @@ msgstr ""
 "加载原理图文件 \"%s\" 时出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:377 eeschema/files-io.cpp:885
+#: eeschema/files-io.cpp:368 eeschema/files-io.cpp:897
 #, c-format
 msgid "Failed to load \"%s\""
 msgstr "无法加载 \"%s\""
 
-#: eeschema/files-io.cpp:390
+#: eeschema/files-io.cpp:381
 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 "
@@ -10173,15 +10588,15 @@ msgstr ""
 "加载已自动修复的原理图时发现错误。 请保存原理图以修复损坏的文件，否则可能无法"
 "与其他版本的 KiCad 一起使用。"
 
-#: eeschema/files-io.cpp:425
+#: eeschema/files-io.cpp:416
 msgid "Illegal entry found in project file symbol library list."
 msgstr "在项目文件符号库列表中找到非法条目。"
 
-#: eeschema/files-io.cpp:426 eeschema/files-io.cpp:458
+#: eeschema/files-io.cpp:417 eeschema/files-io.cpp:449
 msgid "Project Load Warning"
 msgstr "项目加载警告"
 
-#: eeschema/files-io.cpp:429
+#: eeschema/files-io.cpp:420
 msgid ""
 "Symbol libraries defined in the project file symbol library list are no "
 "longer supported and will be\n"
@@ -10191,15 +10606,15 @@ msgstr ""
 "项目文件符号库列表中定义的符号库不再受支持,并且将\n"
 "删除。 在某些情况下,这可能会导致符号库链接断开。"
 
-#: eeschema/files-io.cpp:432 eeschema/files-io.cpp:464
+#: eeschema/files-io.cpp:423 eeschema/files-io.cpp:455
 msgid "Do not show this dialog again."
 msgstr "不再显示。"
 
-#: eeschema/files-io.cpp:457
+#: eeschema/files-io.cpp:448
 msgid "The schematic file will be converted to the new file format on save."
 msgstr "原理图文件将在保存时转换为新的文件格式。"
 
-#: eeschema/files-io.cpp:461
+#: eeschema/files-io.cpp:452
 msgid ""
 "This schematic was saved in the legacy file format which is no longer "
 "supported and will be saved\n"
@@ -10209,11 +10624,11 @@ msgstr ""
 "此逻辑示意图以不再受支持的旧文件格式保存，将被保存。\n"
 "使用新的文件格式。新文件格式无法使用早期版本的 KiCad 打开。"
 
-#: eeschema/files-io.cpp:550
+#: eeschema/files-io.cpp:545
 msgid "Append Schematic"
 msgstr "添加原理图"
 
-#: eeschema/files-io.cpp:579
+#: eeschema/files-io.cpp:574
 msgid ""
 "This operation cannot be undone.\n"
 "\n"
@@ -10223,25 +10638,25 @@ msgstr ""
 "\n"
 "是否在执行该操作前保存当前原理图？"
 
-#: eeschema/files-io.cpp:599
+#: eeschema/files-io.cpp:594
 msgid "Import Schematic"
 msgstr "导入原理图"
 
-#: eeschema/files-io.cpp:631
+#: eeschema/files-io.cpp:634
 #, c-format
 msgid "Directory \"%s\" is not writable."
 msgstr "目录 \"%s\" 不可写入。"
 
-#: eeschema/files-io.cpp:669
+#: eeschema/files-io.cpp:672
 msgid ""
 "Saving the project to the new file format will overwrite existing files."
 msgstr "将项目保存为新文件格式将覆盖现有文件。"
 
-#: eeschema/files-io.cpp:670
+#: eeschema/files-io.cpp:673
 msgid "Project Save Warning"
 msgstr "工程保存警告"
 
-#: eeschema/files-io.cpp:673
+#: eeschema/files-io.cpp:676
 #, c-format
 msgid ""
 "The following files will be overwritten:\n"
@@ -10252,15 +10667,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/files-io.cpp:674
+#: eeschema/files-io.cpp:677
 msgid "Overwrite Files"
 msgstr "覆盖文件"
 
-#: eeschema/files-io.cpp:675
+#: eeschema/files-io.cpp:678
 msgid "Abort Project Save"
 msgstr "中止工程保存"
 
-#: eeschema/files-io.cpp:882
+#: eeschema/files-io.cpp:894
 #, c-format
 msgid ""
 "Error loading schematic \"%s\".\n"
@@ -10269,11 +10684,11 @@ msgstr ""
 "加载原理图 \"%s\" 出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:908
+#: eeschema/files-io.cpp:920
 msgid "The current schematic has been modified.  Save changes?"
 msgstr "当前原理图已被修改。是否保存更改？"
 
-#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1214
+#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1212
 msgid "Alias of"
 msgstr "别名的"
 
@@ -10282,8 +10697,8 @@ msgid "Key words:"
 msgstr "关键字："
 
 #: eeschema/generate_alias_info.cpp:122 eeschema/sim/spice_simulator.cpp:81
-#: pcbnew/class_module.cpp:567 pcbnew/class_zone.cpp:662
-#: pcbnew/tools/pcbnew_control.cpp:990
+#: pcbnew/class_module.cpp:658 pcbnew/class_zone.cpp:694
+#: pcbnew/tools/pcbnew_control.cpp:1016
 msgid "Unknown"
 msgstr "未知"
 
@@ -10335,23 +10750,8 @@ msgstr "边界框"
 msgid "Arc center (%s, %s), radius %s"
 msgstr "圆弧中心 (%s, %s), 半径 %s"
 
-#: eeschema/lib_arc.h:70 gerbview/gerber_draw_item.cpp:233
-#: pcbnew/class_board_item.cpp:45 pcbnew/class_drawsegment.cpp:367
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:117
-#: pcbnew/dialogs/dialog_pad_properties.cpp:726
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1913
-msgid "Arc"
-msgstr "弧"
-
-#: eeschema/lib_bezier.h:54
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:104
-#: pcbnew/dialogs/dialog_pad_properties.cpp:720
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1913
-msgid "Bezier"
-msgstr "贝塞尔曲线"
-
-#: eeschema/lib_circle.cpp:255 pcbnew/class_drawsegment.cpp:363
-#: pcbnew/class_drawsegment.cpp:372
+#: eeschema/lib_circle.cpp:255 pcbnew/class_drawsegment.cpp:428
+#: pcbnew/class_drawsegment.cpp:437
 #: pcbnew/dialogs/dialog_graphic_item_properties.cpp:166
 msgid "Radius"
 msgstr "半径"
@@ -10361,48 +10761,20 @@ msgstr "半径"
 msgid "Circle center (%s, %s), radius %s"
 msgstr "圆中心 (%s, %s), 半径 %s"
 
-#: eeschema/lib_circle.h:52 gerbview/gerber_draw_item.cpp:236
-#: pcbnew/class_board_item.cpp:46 pcbnew/class_drawsegment.cpp:360
-#: pcbnew/class_pad.cpp:960
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:140
-msgid "Circle"
-msgstr "圆形"
-
 #: eeschema/lib_field.cpp:408 eeschema/sch_field.cpp:414
 #, c-format
 msgid "Field %s (%s)"
 msgstr "字段 %s (%s)"
 
-#: eeschema/lib_field.cpp:437 eeschema/sch_bitmap.cpp:203
-#: pcbnew/class_drawsegment.cpp:393 pcbnew/class_drawsegment.cpp:443
-#: pcbnew/class_pad.cpp:768 pcbnew/class_pcb_text.cpp:140
-#: pcbnew/class_text_mod.cpp:334 pcbnew/class_track.cpp:597
-#: 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
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:161
-#: pcbnew/text_mod_grid_table.cpp:90
-msgid "Width"
-msgstr "宽度"
-
-#: eeschema/lib_field.cpp:440 eeschema/sch_bitmap.cpp:205
-#: pcbnew/class_drawsegment.cpp:396 pcbnew/class_pad.cpp:771
-#: pcbnew/class_pcb_text.cpp:143 pcbnew/class_text_mod.cpp:337
-#: 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
-msgid "Height"
-msgstr "高度"
-
-#: eeschema/lib_item.cpp:56 eeschema/lib_pin.cpp:1429
-#: eeschema/libedit/symbedit.cpp:240 eeschema/sch_text.cpp:712
+#: eeschema/lib_item.cpp:56 eeschema/lib_pin.cpp:1448
+#: eeschema/libedit/symbedit.cpp:240 eeschema/sch_text.cpp:709
 #: 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:353 pcbnew/class_marker_pcb.cpp:104
-#: pcbnew/class_text_mod.cpp:308 pcbnew/class_track.cpp:584
-#: pcbnew/class_track.cpp:667 pcbnew/class_zone.cpp:601
+#: pcbnew/class_drawsegment.cpp:418 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:616
 msgid "Type"
 msgstr "类型"
 
@@ -10418,31 +10790,31 @@ msgstr "是"
 msgid "Converted"
 msgstr "转换"
 
-#: eeschema/lib_pin.cpp:1434 gerbview/gerber_draw_item.cpp:709
+#: eeschema/lib_pin.cpp:1453 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:131 pcbnew/class_text_mod.cpp:313
-#: pcbnew/class_text_mod.cpp:321
+#: pcbnew/class_pcb_text.cpp:127 pcbnew/class_text_mod.cpp:304
+#: pcbnew/class_text_mod.cpp:312
 msgid "Yes"
 msgstr "是"
 
-#: eeschema/lib_pin.cpp:1434 gerbview/gerber_draw_item.cpp:709
-#: gerbview/gerber_draw_item.cpp:710 pcbnew/class_pcb_text.cpp:129
-#: pcbnew/class_text_mod.cpp:311 pcbnew/class_text_mod.cpp:323
+#: 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
 msgid "No"
 msgstr "否"
 
-#: eeschema/lib_pin.cpp:1456 eeschema/lib_pin.cpp:1476
+#: eeschema/lib_pin.cpp:1475 eeschema/lib_pin.cpp:1495
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:1372
 msgid "Pos X"
 msgstr "X 位置"
 
-#: eeschema/lib_pin.cpp:1459 eeschema/lib_pin.cpp:1479
+#: eeschema/lib_pin.cpp:1478 eeschema/lib_pin.cpp:1498
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:1373
 msgid "Pos Y"
 msgstr "Y 位置"
 
-#: eeschema/lib_pin.cpp:1660
+#: eeschema/lib_pin.cpp:1685
 #, c-format
 msgid "Pin %s, %s, %s"
 msgstr "引脚 %s, %s, %s"
@@ -10456,7 +10828,7 @@ msgstr "多线段在 (%s, %s) 与 %d 点"
 msgid "PolyLine"
 msgstr "多段线"
 
-#: eeschema/lib_text.cpp:386 eeschema/sch_text.cpp:571
+#: eeschema/lib_text.cpp:386 eeschema/sch_text.cpp:568
 #, c-format
 msgid "Graphic Text \"%s\""
 msgstr "图形文本 \"%s\""
@@ -10470,7 +10842,7 @@ msgid "Parent"
 msgstr "父级"
 
 #: eeschema/lib_view_frame.cpp:298 eeschema/libedit/symbedit.cpp:242
-#: eeschema/sch_component.cpp:1237
+#: eeschema/sch_component.cpp:1235
 msgid "Key words"
 msgstr "关键词"
 
@@ -10489,7 +10861,7 @@ msgstr ""
 msgid "Symbol library not found."
 msgstr "符号库未找到。"
 
-#: eeschema/lib_view_frame.cpp:328 eeschema/libedit/lib_edit_frame.cpp:850
+#: eeschema/lib_view_frame.cpp:328 eeschema/libedit/lib_edit_frame.cpp:849
 #, c-format
 msgid ""
 "The library with the nickname \"%s\" is not enabled\n"
@@ -10500,7 +10872,7 @@ msgstr ""
 "使用管理符号库\n"
 "来编辑封装。"
 
-#: eeschema/lib_view_frame.cpp:331 eeschema/libedit/lib_edit_frame.cpp:853
+#: eeschema/lib_view_frame.cpp:331 eeschema/libedit/lib_edit_frame.cpp:852
 msgid "Symbol library not enabled."
 msgstr "符号库未启用。"
 
@@ -10547,27 +10919,27 @@ msgstr "无法创建元件库文件 \"%s\""
 msgid "Library Editor"
 msgstr "库编辑器"
 
-#: eeschema/libedit/lib_edit_frame.cpp:152
+#: eeschema/libedit/lib_edit_frame.cpp:151
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:194
-#: pcbnew/footprint_edit_frame.cpp:211 pcbnew/footprint_edit_frame.cpp:635
+#: pcbnew/footprint_edit_frame.cpp:210 pcbnew/footprint_edit_frame.cpp:630
 msgid "Libraries"
 msgstr "库"
 
-#: eeschema/libedit/lib_edit_frame.cpp:187
+#: eeschema/libedit/lib_edit_frame.cpp:186
 msgid "Library changes are unsaved"
 msgstr "库更改未保存"
 
-#: eeschema/libedit/lib_edit_frame.cpp:313 eeschema/tools/sch_edit_tool.cpp:105
+#: eeschema/libedit/lib_edit_frame.cpp:312 eeschema/tools/sch_edit_tool.cpp:109
 #, c-format
 msgid "Unit %s"
 msgstr "单元 %s"
 
-#: eeschema/libedit/lib_edit_frame.cpp:509
+#: eeschema/libedit/lib_edit_frame.cpp:508
 #, c-format
 msgid "Library \"%s\" already exists"
 msgstr "库 \"%s\" 已经存在"
 
-#: eeschema/libedit/lib_edit_frame.cpp:523
+#: eeschema/libedit/lib_edit_frame.cpp:522
 #, c-format
 msgid ""
 "Could not create the library file '%s'.\n"
@@ -10576,36 +10948,36 @@ msgstr ""
 "无法创建库文件 \"%s\"。\n"
 "请检查写入权限。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:533 eeschema/libedit/lib_export.cpp:204
+#: eeschema/libedit/lib_edit_frame.cpp:532 eeschema/libedit/lib_export.cpp:204
 msgid "Could not open the library file."
 msgstr "无法打开库文件。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:602
+#: eeschema/libedit/lib_edit_frame.cpp:601
 #: eeschema/symbol_tree_model_adapter.cpp:73
 #, c-format
 msgid "Loading library \"%s\""
 msgstr "加载库 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:661
+#: eeschema/libedit/lib_edit_frame.cpp:660
 #: pcbnew/footprint_libraries_utils.cpp:495
 msgid "Global"
 msgstr "全局"
 
-#: eeschema/libedit/lib_edit_frame.cpp:664
+#: eeschema/libedit/lib_edit_frame.cpp:663
 #: pcbnew/footprint_libraries_utils.cpp:499
 msgid "Choose the Library Table to add the library to:"
 msgstr "选择库表添加到以下库："
 
-#: eeschema/libedit/lib_edit_frame.cpp:665
+#: eeschema/libedit/lib_edit_frame.cpp:664
 msgid "Add To Library Table"
 msgstr "添加到库表"
 
-#: eeschema/libedit/lib_edit_frame.cpp:697
+#: eeschema/libedit/lib_edit_frame.cpp:696
 #, c-format
 msgid "Failed to save backup to \"%s\""
 msgstr "未能将备份保存到 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:839
+#: eeschema/libedit/lib_edit_frame.cpp:838
 #, c-format
 msgid ""
 "The current configuration does not include the symbol library\n"
@@ -10616,7 +10988,7 @@ msgstr ""
 "\"%s\"。\n"
 "使用管理符号库来编辑配置。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:842
+#: eeschema/libedit/lib_edit_frame.cpp:841
 msgid "Library not found in symbol library table."
 msgstr "在符号库表中找不到库。"
 
@@ -10658,8 +11030,8 @@ msgid "Symbol \"%s\" already exists in \"%s\"."
 msgstr "符号 <%s> 已经在<%s>中存在。"
 
 #: eeschema/libedit/lib_export.cpp:157
-#: kicad/tools/kicad_manager_control.cpp:261
-#: pcbnew/dialogs/dialog_export_idf.cpp:165
+#: 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
@@ -10726,57 +11098,57 @@ msgstr ""
 "并非所有符号库都可以加载。  使用管理符号。\n"
 "用于调整路径和添加或删除库的“库”对话框。"
 
-#: eeschema/libedit/libedit.cpp:81
+#: eeschema/libedit/libedit.cpp:82
 msgid "No symbol libraries are loaded."
 msgstr "没有符号库被加载。"
 
-#: eeschema/libedit/libedit.cpp:87 eeschema/sch_component.cpp:1218
-#: eeschema/sch_component.cpp:1223 eeschema/sch_component.cpp:1256
-#: eeschema/sch_component.cpp:1261 pcbnew/tools/pcbnew_control.cpp:979
+#: 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:1005
 msgid "Library"
 msgstr "库"
 
-#: eeschema/libedit/libedit.cpp:103
+#: eeschema/libedit/libedit.cpp:104
 msgid "Select Symbol Library"
 msgstr "选择符号库"
 
-#: eeschema/libedit/libedit.cpp:151
+#: eeschema/libedit/libedit.cpp:152
 msgid "The current symbol has been modified.  Save changes?"
 msgstr "当前符号已被修改。是否保存更改？"
 
-#: eeschema/libedit/libedit.cpp:177
+#: eeschema/libedit/libedit.cpp:178
 #, c-format
 msgid "Error occurred loading symbol \"%s\" from library \"%s\"."
 msgstr "从库中%s加载符号%s发生错误。"
 
-#: eeschema/libedit/libedit.cpp:274
+#: eeschema/libedit/libedit.cpp:275
 msgid "This new symbol has no name and cannot be created."
 msgstr "此新符号没有名称, 无法创建。"
 
-#: eeschema/libedit/libedit.cpp:285 eeschema/libedit/libedit.cpp:491
+#: eeschema/libedit/libedit.cpp:286 eeschema/libedit/libedit.cpp:492
 #, c-format
 msgid "Symbol \"%s\" already exists in library \"%s\""
 msgstr "符号 \"%s\" 已经在库 \"%s\" 中存在"
 
-#: eeschema/libedit/libedit.cpp:419 include/lib_table_grid.h:183
+#: eeschema/libedit/libedit.cpp:420 include/lib_table_grid.h:183
 #: pcbnew/footprint_libraries_utils.cpp:862
 #: pcbnew/footprint_libraries_utils.cpp:1098
 msgid "Nickname"
 msgstr "昵称"
 
-#: eeschema/libedit/libedit.cpp:430
+#: eeschema/libedit/libedit.cpp:431
 msgid "Save Copy of Symbol"
 msgstr "保存符号副本"
 
-#: eeschema/libedit/libedit.cpp:431 pcbnew/footprint_libraries_utils.cpp:874
+#: eeschema/libedit/libedit.cpp:432 pcbnew/footprint_libraries_utils.cpp:874
 msgid "Save in library:"
 msgstr "保存在库："
 
-#: eeschema/libedit/libedit.cpp:463
+#: eeschema/libedit/libedit.cpp:464
 msgid "No library specified.  Symbol could not be saved."
 msgstr "没有指定库，符号无法保存。"
 
-#: eeschema/libedit/libedit.cpp:472
+#: eeschema/libedit/libedit.cpp:473
 msgid ""
 "Derived symbols must be save in the same library\n"
 "that the parent symbol exists."
@@ -10784,11 +11156,11 @@ msgstr ""
 "派生符号必须保存在父级符号\n"
 "所在的同一库中。"
 
-#: eeschema/libedit/libedit.cpp:484
+#: eeschema/libedit/libedit.cpp:485
 msgid "No symbol name specified.  Symbol could not be saved."
 msgstr "没有指定符号名称, 符号无法保存。"
 
-#: eeschema/libedit/libedit.cpp:560
+#: eeschema/libedit/libedit.cpp:563
 #, c-format
 msgid ""
 "The symbol \"%s\" is used to derive other symbols.\n"
@@ -10801,81 +11173,81 @@ msgstr ""
 "\n"
 "是否要删除此符号及其所有派生符号？"
 
-#: eeschema/libedit/libedit.cpp:565 eeschema/tools/ee_actions.cpp:126
+#: eeschema/libedit/libedit.cpp:568 eeschema/tools/ee_actions.cpp:126
 msgid "Delete Symbol"
 msgstr "删除符号"
 
-#: eeschema/libedit/libedit.cpp:566
+#: eeschema/libedit/libedit.cpp:569
 msgid "Keep Symbol"
 msgstr "保留符号"
 
-#: eeschema/libedit/libedit.cpp:702 pcbnew/footprint_libraries_utils.cpp:976
+#: eeschema/libedit/libedit.cpp:705 pcbnew/footprint_libraries_utils.cpp:976
 #, c-format
 msgid "Revert \"%s\" to last version saved?"
 msgstr "是否将\"%s\"还原为上次保存的版本？"
 
-#: eeschema/libedit/libedit.cpp:771
+#: eeschema/libedit/libedit.cpp:774
 #, c-format
 msgid "Symbol name \"%s\" not found in library \"%s\""
 msgstr "在库 \"%s\" 中找不到符号 \"%s\" ！"
 
-#: eeschema/libedit/libedit.cpp:797
+#: eeschema/libedit/libedit.cpp:800
 msgid "No library specified."
 msgstr "没有指定库。"
 
-#: eeschema/libedit/libedit.cpp:816
+#: eeschema/libedit/libedit.cpp:819
 #, c-format
 msgid "Save Library \"%s\" As..."
 msgstr "另存为库 \"%s\"..."
 
-#: eeschema/libedit/libedit.cpp:846
+#: eeschema/libedit/libedit.cpp:849
 #, c-format
 msgid "Failed to save changes to symbol library file \"%s\""
 msgstr "无法将更改保存到符号库文件%s"
 
-#: eeschema/libedit/libedit.cpp:848
+#: eeschema/libedit/libedit.cpp:851
 msgid "Error saving library"
 msgstr "保存库时出错"
 
-#: eeschema/libedit/libedit.cpp:856
+#: eeschema/libedit/libedit.cpp:859
 #, c-format
 msgid "Symbol library file \"%s\" saved"
 msgstr "符号库文件 \"%s\" 已保存"
 
-#: eeschema/libedit/libedit.cpp:881 eeschema/sch_edit_frame.cpp:499
-#: pagelayout_editor/pl_editor_frame.cpp:291
-#: pcbnew/footprint_edit_frame.cpp:524 pcbnew/pcb_edit_frame.cpp:544
+#: eeschema/libedit/libedit.cpp:884 eeschema/sch_edit_frame.cpp:503
+#: pagelayout_editor/pl_editor_frame.cpp:290
+#: pcbnew/footprint_edit_frame.cpp:517 pcbnew/pcb_edit_frame.cpp:566
 #, c-format
 msgid "Save changes to \"%s\" before closing?"
 msgstr "是否在 \"%s\" 关闭之前保存更改？"
 
 #: eeschema/libedit/menubar_libedit.cpp:81 eeschema/menubar.cpp:111
-#: pcbnew/dialogs/dialog_export_step.cpp:129
+#: pcbnew/dialogs/dialog_export_step.cpp:130
 #: pcbnew/dialogs/dialog_export_svg.cpp:93
-#: pcbnew/menubar_footprint_editor.cpp:94 pcbnew/menubar_pcb_editor.cpp:138
+#: pcbnew/menubar_footprint_editor.cpp:91 pcbnew/menubar_pcb_editor.cpp:133
 msgid "Export"
 msgstr "导出"
 
 #: eeschema/libedit/menubar_libedit.cpp:161 eeschema/menubar.cpp:219
-#: gerbview/menubar.cpp:204 pcbnew/menubar_footprint_editor.cpp:194
-#: pcbnew/menubar_pcb_editor.cpp:356
+#: gerbview/menubar.cpp:204 pcbnew/menubar_footprint_editor.cpp:195
+#: pcbnew/menubar_pcb_editor.cpp:351
 msgid "&Units"
 msgstr "单位 (&U)"
 
 #: eeschema/libedit/menubar_libedit.cpp:228 eeschema/menubar.cpp:341
-#: pagelayout_editor/menubar.cpp:188 pcbnew/menubar_footprint_editor.cpp:301
+#: pagelayout_editor/menubar.cpp:188 pcbnew/menubar_footprint_editor.cpp:304
 #: pcbnew/menubar_pcb_editor.cpp:552
 msgid "&Place"
 msgstr "放置 (&P)"
 
 #: eeschema/libedit/menubar_libedit.cpp:229 eeschema/menubar.cpp:342
-#: pagelayout_editor/menubar.cpp:189 pcbnew/menubar_footprint_editor.cpp:302
+#: pagelayout_editor/menubar.cpp:189 pcbnew/menubar_footprint_editor.cpp:305
 #: pcbnew/menubar_pcb_editor.cpp:554
 msgid "&Inspect"
 msgstr "检查 (&I)"
 
 #: eeschema/libedit/menubar_libedit.cpp:230 eeschema/menubar.cpp:344
-#: pagelayout_editor/menubar.cpp:190 pcbnew/menubar_footprint_editor.cpp:304
+#: pagelayout_editor/menubar.cpp:190 pcbnew/menubar_footprint_editor.cpp:307
 #: pcbnew/menubar_pcb_editor.cpp:556
 msgid "P&references"
 msgstr "首选项 (&R)"
@@ -10933,8 +11305,8 @@ msgid ""
 "Append schematic sheet content from another project to the current sheet"
 msgstr "将其它项目中的原理图添加到当前图页中"
 
-#: eeschema/menubar.cpp:98 pcbnew/menubar_footprint_editor.cpp:83
-#: pcbnew/menubar_pcb_editor.cpp:117
+#: eeschema/menubar.cpp:98 pcbnew/menubar_footprint_editor.cpp:80
+#: pcbnew/menubar_pcb_editor.cpp:112
 msgid "Import"
 msgstr "导入"
 
@@ -10948,7 +11320,7 @@ msgid ""
 msgstr "将当前的原理图页替换为从另一个应用程序导入的原理图页"
 
 #: eeschema/menubar.cpp:343 gerbview/menubar.cpp:266 kicad/menubar.cpp:162
-#: pcbnew/menubar_footprint_editor.cpp:303 pcbnew/menubar_pcb_editor.cpp:555
+#: pcbnew/menubar_footprint_editor.cpp:306 pcbnew/menubar_pcb_editor.cpp:555
 msgid "&Tools"
 msgstr "工具 (&T)"
 
@@ -10963,24 +11335,24 @@ msgstr "创建文件 \"%s\" 失败"
 msgid "Could not find library file %s"
 msgstr "无法找到库文件 \"%s\""
 
-#: eeschema/netlist_generator.cpp:117
+#: eeschema/netlist_generator.cpp:121
 msgid "Run command:"
 msgstr "运行命令："
 
-#: eeschema/netlist_generator.cpp:123
+#: eeschema/netlist_generator.cpp:127
 #, c-format
 msgid "Command error. Return code %d"
 msgstr "命令错误。返回代码 %d"
 
-#: eeschema/netlist_generator.cpp:126
+#: eeschema/netlist_generator.cpp:130
 msgid "Success"
 msgstr "成功"
 
-#: eeschema/netlist_generator.cpp:131
+#: eeschema/netlist_generator.cpp:135
 msgid "Info messages:"
 msgstr "提示信息："
 
-#: eeschema/netlist_generator.cpp:141
+#: eeschema/netlist_generator.cpp:145
 msgid "Error messages:"
 msgstr "错误信息："
 
@@ -10988,15 +11360,15 @@ msgstr "错误信息："
 msgid "Exporting the netlist requires a completely annotated schematic."
 msgstr "导出网表需要一个完整标注的原理图。"
 
-#: eeschema/netlist_generator.cpp:192
+#: eeschema/netlist_generator.cpp:194
 msgid "Error: duplicate sheet names. Continue?"
 msgstr "错误：重复的图页名称。要继续吗？"
 
-#: eeschema/netlist_generator.cpp:230
+#: eeschema/netlist_generator.cpp:232
 msgid "No Objects"
 msgstr "没有对象"
 
-#: eeschema/netlist_generator.cpp:234
+#: eeschema/netlist_generator.cpp:236
 #, c-format
 msgid "Net count = %d"
 msgstr "网络计数 = %d"
@@ -11114,7 +11486,7 @@ msgstr "保存项目特定的符号库表时出错。"
 msgid "Error loading symbol '%s' from library '%s'."
 msgstr "加载符号 \"%s\" 时出错，来自于库 \"%s\"。"
 
-#: eeschema/sch_base_frame.cpp:247
+#: eeschema/sch_base_frame.cpp:234
 #, c-format
 msgid ""
 "Error saving global symbol library table:\n"
@@ -11123,7 +11495,7 @@ msgstr ""
 "保存全局符号库表时出错：\n"
 "%s"
 
-#: eeschema/sch_base_frame.cpp:263
+#: eeschema/sch_base_frame.cpp:250
 #, c-format
 msgid ""
 "Error saving project-specific symbol library table:\n"
@@ -11132,65 +11504,61 @@ msgstr ""
 "保存项目特定符号库表时出错：\n"
 "%s"
 
-#: eeschema/sch_bitmap.cpp:201
-msgid "Bitmap"
-msgstr "位图"
-
-#: eeschema/sch_bus_entry.cpp:312
+#: eeschema/sch_bus_entry.cpp:346
 msgid "Bus to Wire Entry"
 msgstr "总线到连线入口"
 
-#: eeschema/sch_bus_entry.cpp:318
+#: eeschema/sch_bus_entry.cpp:352
 msgid "Bus to Bus Entry"
 msgstr "总线到总线入口"
 
-#: eeschema/sch_bus_entry.cpp:405
+#: eeschema/sch_bus_entry.cpp:418
 msgid "Bus Entry Type"
 msgstr "总线输入类型"
 
-#: eeschema/sch_component.cpp:1193
+#: eeschema/sch_component.cpp:1191
 msgid "Power symbol"
 msgstr "电源符号"
 
-#: eeschema/sch_component.cpp:1198
+#: eeschema/sch_component.cpp:1196
 msgid "flags"
 msgstr "标志"
 
-#: eeschema/sch_component.cpp:1207
+#: eeschema/sch_component.cpp:1205
 msgid "Missing parent"
 msgstr "缺少父级"
 
-#: eeschema/sch_component.cpp:1223
+#: eeschema/sch_component.cpp:1221
 msgid "Undefined!!!"
 msgstr "未定义!!!"
 
-#: eeschema/sch_component.cpp:1230
+#: eeschema/sch_component.cpp:1228
 msgid "<Unknown>"
 msgstr "<未知>"
 
-#: eeschema/sch_component.cpp:1256
+#: eeschema/sch_component.cpp:1254
 msgid "No library defined!"
 msgstr "未定义库!"
 
-#: eeschema/sch_component.cpp:1260
+#: eeschema/sch_component.cpp:1258
 #, c-format
 msgid "Symbol not found in %s!"
 msgstr "在 %s 中找不到符号!"
 
-#: eeschema/sch_component.cpp:1448
+#: eeschema/sch_component.cpp:1446
 #, c-format
 msgid "Symbol %s, %s"
 msgstr "符号 %s, %s"
 
-#: eeschema/sch_connection.cpp:334
+#: eeschema/sch_connection.cpp:333
 msgid "Connection Name"
 msgstr "连接名称"
 
-#: eeschema/sch_connection.cpp:343 pcbnew/netinfo_item.cpp:87
+#: eeschema/sch_connection.cpp:342 pcbnew/netinfo_item.cpp:87
 msgid "Net Code"
 msgstr "网络码"
 
-#: eeschema/sch_connection.cpp:349 eeschema/sch_connection.cpp:364
+#: eeschema/sch_connection.cpp:348 eeschema/sch_connection.cpp:363
 #, c-format
 msgid "Bus Alias %s Members"
 msgstr "总线别名 %s 成员"
@@ -11220,19 +11588,19 @@ msgstr "在导入的库中找不到 %s"
 msgid "Bus Entry needed"
 msgstr "需要总线入口"
 
-#: eeschema/sch_edit_frame.cpp:162 pcbnew/board_connected_item.h:140
+#: eeschema/sch_edit_frame.cpp:164 pcbnew/board_connected_item.h:145
 msgid "Not Found"
 msgstr "未找到"
 
-#: eeschema/sch_edit_frame.cpp:164
+#: eeschema/sch_edit_frame.cpp:166
 msgid "The following libraries were not found:"
 msgstr "未找到以下库："
 
-#: eeschema/sch_edit_frame.cpp:289
+#: eeschema/sch_edit_frame.cpp:292
 msgid "New schematic file is unsaved"
 msgstr "新原理图文件未保存"
 
-#: eeschema/sch_edit_frame.cpp:601
+#: eeschema/sch_edit_frame.cpp:605
 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 "
@@ -11241,33 +11609,33 @@ msgstr ""
 "无法更新 PCB,因为架构编辑器在独立模式下打开。为了从原理图创建/更新 PCB,请启"
 "动 KiCad Shell 并创建项目。"
 
-#: eeschema/sch_edit_frame.cpp:709
+#: eeschema/sch_edit_frame.cpp:716
 msgid "Schematic"
 msgstr "原理图"
 
-#: eeschema/sch_edit_frame.cpp:726
+#: eeschema/sch_edit_frame.cpp:733
 msgid "New Schematic"
 msgstr "新建原理图"
 
-#: eeschema/sch_edit_frame.cpp:738
+#: eeschema/sch_edit_frame.cpp:745
 #, c-format
 msgid "Schematic file \"%s\" already exists."
 msgstr "原理图文件 \"%s\" 已经存在。"
 
-#: eeschema/sch_edit_frame.cpp:759
+#: eeschema/sch_edit_frame.cpp:766
 msgid "Open Schematic"
 msgstr "打开原理图"
 
-#: eeschema/sch_edit_frame.cpp:840
+#: eeschema/sch_edit_frame.cpp:847
 msgid "Could not open CvPcb"
 msgstr "不能打开 CvPcb"
 
-#: eeschema/sch_edit_frame.cpp:980 eeschema/sch_edit_frame.cpp:998
+#: eeschema/sch_edit_frame.cpp:986 eeschema/sch_edit_frame.cpp:1004
 msgid " [no file]"
 msgstr " [没有文件]"
 
-#: eeschema/sch_edit_frame.cpp:995 kicad/kicad_manager_frame.cpp:212
-#: pcbnew/pcb_edit_frame.cpp:883
+#: eeschema/sch_edit_frame.cpp:1001 kicad/kicad_manager_frame.cpp:215
+#: pcbnew/pcb_edit_frame.cpp:924
 msgid " [Read Only]"
 msgstr " [只读]"
 
@@ -11330,7 +11698,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:1401
+#: eeschema/sch_legacy_plugin.cpp:2564 eeschema/sch_sexpr_plugin.cpp:1413
 #, c-format
 msgid "Library file \"%s\" not found."
 msgstr "未找到库文件 \"%s\"。"
@@ -11344,59 +11712,59 @@ msgstr "用户没有权限读取库文档 \"%s\""
 msgid "symbol document library file is empty"
 msgstr "符号文档库文件为空"
 
-#: eeschema/sch_legacy_plugin.cpp:4296 eeschema/sch_sexpr_plugin.cpp:1929
+#: eeschema/sch_legacy_plugin.cpp:4296 eeschema/sch_sexpr_plugin.cpp:1941
 #, 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:2101
+#: eeschema/sch_legacy_plugin.cpp:4479 eeschema/sch_sexpr_plugin.cpp:2113
 #, 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:2129
-#: pcbnew/legacy_plugin.cpp:3401
+#: eeschema/sch_legacy_plugin.cpp:4507 eeschema/sch_sexpr_plugin.cpp:2141
+#: pcbnew/legacy_plugin.cpp:3407
 #, c-format
 msgid "library \"%s\" cannot be deleted"
 msgstr "不能删除库 \"%s\""
 
-#: eeschema/sch_line.cpp:617
+#: eeschema/sch_line.cpp:598
 #, c-format
 msgid "%s Graphic Line from (%s, %s) to (%s, %s)"
 msgstr "%s 图形线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:618
+#: eeschema/sch_line.cpp:599
 #, c-format
 msgid "%s Wire from (%s, %s) to (%s, %s)"
 msgstr "%s 连线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:619
+#: eeschema/sch_line.cpp:600
 #, c-format
 msgid "%s Bus from (%s, %s) to (%s, %s)"
 msgstr "%s 总线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:620
+#: eeschema/sch_line.cpp:601
 #, c-format
 msgid "%s Line on Unknown Layer from (%s, %s) to (%s, %s)"
 msgstr "%s 线在未知层从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:791
-msgid "Net Wire"
-msgstr "网络连线"
-
-#: eeschema/sch_line.cpp:792
-msgid "Bus Wire"
-msgstr "总线连线"
-
-#: eeschema/sch_line.cpp:793
+#: eeschema/sch_line.cpp:775
 msgid "Graphical"
 msgstr "图形"
 
-#: eeschema/sch_line.cpp:796
+#: eeschema/sch_line.cpp:778
 msgid "Line Type"
 msgstr "线类型"
 
-#: eeschema/sch_marker.cpp:137
+#: eeschema/sch_line.cpp:781
+msgid "from netclass"
+msgstr "从网络类"
+
+#: eeschema/sch_line.cpp:801 eeschema/sch_text.cpp:730
+msgid "Assigned Netclass"
+msgstr "分配的网络类"
+
+#: eeschema/sch_marker.cpp:138
 msgid "Electronics Rule Check Error"
 msgstr "ERC 错误"
 
@@ -11435,41 +11803,41 @@ msgid ""
 "Enter the python symbol which implements the SCH_PLUGIN::Symbol*() functions."
 msgstr "输入实现 SCH_PLUGIN::Symbol*() 函数的 Python 符号。"
 
-#: eeschema/sch_screen.cpp:562 eeschema/sch_screen.cpp:656
+#: eeschema/sch_screen.cpp:561 eeschema/sch_screen.cpp:655
 #, c-format
 msgid "Setting schematic symbol '%s %s' library identifier to '%s'. "
 msgstr "正在将原理图符号 '%s %s' 库标识符设置为 '%s'。 "
 
-#: eeschema/sch_screen.cpp:579
+#: eeschema/sch_screen.cpp:578
 #, c-format
 msgid ""
 "Schematic symbol reference '%s' library identifier is not valid.  Unable to "
 "link library symbol."
 msgstr "原理图符号引用 '%s' 库标识符无效。无法链接库符号。"
 
-#: eeschema/sch_screen.cpp:595
+#: eeschema/sch_screen.cpp:594
 #, 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:612
+#: eeschema/sch_screen.cpp:611
 #, c-format
 msgid "I/O error %s resolving library symbol %s"
 msgstr "I/O 错误 %s 正在解析库符号 %s"
 
-#: eeschema/sch_screen.cpp:635
+#: eeschema/sch_screen.cpp:634
 #, c-format
 msgid "Falling back to cache to set symbol '%s:%s' link '%s'."
 msgstr "正在回退到缓存以设置符号 '%s:%s' 链接 '%s'。"
 
-#: eeschema/sch_screen.cpp:667
+#: eeschema/sch_screen.cpp:666
 #, c-format
 msgid "No library symbol found for schematic symbol '%s %s'. "
 msgstr "找不到原理图符号 '%s %s' 的库符号。 "
 
-#: eeschema/sch_sexpr_parser.cpp:144
+#: eeschema/sch_sexpr_parser.cpp:143
 #, c-format
 msgid ""
 "Invalid symbol name in\n"
@@ -11482,7 +11850,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:155
+#: eeschema/sch_sexpr_parser.cpp:154
 #, c-format
 msgid ""
 "Invalid library identifier in\n"
@@ -11495,7 +11863,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:203
+#: eeschema/sch_sexpr_parser.cpp:202
 #, c-format
 msgid ""
 "Invalid symbol extends name in\n"
@@ -11508,7 +11876,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:214
+#: eeschema/sch_sexpr_parser.cpp:213
 #, c-format
 msgid ""
 "No parent for extended symbol %s in\n"
@@ -11521,7 +11889,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:231
+#: eeschema/sch_sexpr_parser.cpp:230
 #, c-format
 msgid ""
 "Invalid symbol unit name in\n"
@@ -11534,7 +11902,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:241
+#: eeschema/sch_sexpr_parser.cpp:240
 #, c-format
 msgid ""
 "Invalid symbol unit name prefix %s in\n"
@@ -11547,7 +11915,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:254
+#: eeschema/sch_sexpr_parser.cpp:253
 #, c-format
 msgid ""
 "Invalid symbol unit name suffix %s in\n"
@@ -11560,7 +11928,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:263
+#: eeschema/sch_sexpr_parser.cpp:262
 #, c-format
 msgid ""
 "Invalid symbol unit number %s in\n"
@@ -11573,7 +11941,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:273
+#: eeschema/sch_sexpr_parser.cpp:272
 #, c-format
 msgid ""
 "Invalid symbol convert number %s in\n"
@@ -11586,7 +11954,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:398 pcbnew/pcb_parser.cpp:161
+#: eeschema/sch_sexpr_parser.cpp:397 pcbnew/pcb_parser.cpp:161
 #, c-format
 msgid ""
 "Invalid floating point number in\n"
@@ -11599,7 +11967,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:407 pcbnew/pcb_parser.cpp:170
+#: eeschema/sch_sexpr_parser.cpp:406 pcbnew/pcb_parser.cpp:170
 #, c-format
 msgid ""
 "Missing floating point number in\n"
@@ -11612,7 +11980,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:696
+#: eeschema/sch_sexpr_parser.cpp:695
 #, c-format
 msgid ""
 "Invalid symbol names definition in\n"
@@ -11625,7 +11993,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:719 eeschema/sch_sexpr_parser.cpp:1659
+#: eeschema/sch_sexpr_parser.cpp:718 eeschema/sch_sexpr_parser.cpp:1658
 #, c-format
 msgid ""
 "Invalid property name in\n"
@@ -11638,7 +12006,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:728 eeschema/sch_sexpr_parser.cpp:1668
+#: eeschema/sch_sexpr_parser.cpp:727 eeschema/sch_sexpr_parser.cpp:1667
 #, c-format
 msgid ""
 "Empty property name in\n"
@@ -11651,7 +12019,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:738 eeschema/sch_sexpr_parser.cpp:1677
+#: eeschema/sch_sexpr_parser.cpp:737 eeschema/sch_sexpr_parser.cpp:1676
 #, c-format
 msgid ""
 "Invalid property value in\n"
@@ -11664,7 +12032,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1239
+#: eeschema/sch_sexpr_parser.cpp:1238
 #, c-format
 msgid ""
 "Invalid pin name in\n"
@@ -11677,7 +12045,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1274
+#: eeschema/sch_sexpr_parser.cpp:1273
 #, c-format
 msgid ""
 "Invalid pin number in\n"
@@ -11690,7 +12058,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1451
+#: eeschema/sch_sexpr_parser.cpp:1450
 #, c-format
 msgid ""
 "Invalid text string in\n"
@@ -11703,12 +12071,12 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1500 pcbnew/pcb_parser.cpp:810
+#: eeschema/sch_sexpr_parser.cpp:1499 pcbnew/pcb_parser.cpp:811
 #, c-format
 msgid "Page type \"%s\" is not valid "
 msgstr "图框类型 \"%s\" 无效 "
 
-#: eeschema/sch_sexpr_parser.cpp:1738
+#: eeschema/sch_sexpr_parser.cpp:1737
 #, c-format
 msgid ""
 "Invalid sheet pin name in\n"
@@ -11721,7 +12089,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1747
+#: eeschema/sch_sexpr_parser.cpp:1746
 #, c-format
 msgid ""
 "Empty sheet pin name in\n"
@@ -11781,11 +12149,11 @@ msgstr "UUID"
 msgid "Hierarchical Sheet %s"
 msgstr "层次分页 %s"
 
-#: eeschema/sch_sheet_path.cpp:58 pcbnew/class_board.cpp:70
+#: eeschema/sch_sheet_path.cpp:58 pcbnew/class_board.cpp:64
 msgid "(Deleted Item)"
 msgstr "(删除项)"
 
-#: eeschema/sch_sheet_path.cpp:192
+#: eeschema/sch_sheet_path.cpp:224
 msgid "<root_sheet>"
 msgstr "<根_图框>"
 
@@ -11794,68 +12162,60 @@ msgstr "<根_图框>"
 msgid "Hierarchical Sheet Pin %s"
 msgstr "层次图框引脚 %s"
 
-#: eeschema/sch_text.cpp:470
+#: eeschema/sch_text.cpp:467
 msgid "Tri-State"
 msgstr "三态"
 
-#: eeschema/sch_text.cpp:676
+#: eeschema/sch_text.cpp:673
 msgid "Graphic Text"
 msgstr "图形文本"
 
-#: eeschema/sch_text.cpp:678
-msgid "Global Label"
-msgstr "全局标签"
-
-#: eeschema/sch_text.cpp:679
-msgid "Hierarchical Label"
-msgstr "层次标签"
-
-#: eeschema/sch_text.cpp:680
+#: eeschema/sch_text.cpp:677
 msgid "Hierarchical Sheet Pin"
 msgstr "层次图框引脚"
 
-#: eeschema/sch_text.cpp:688
+#: eeschema/sch_text.cpp:685
 msgid "Horizontal left"
 msgstr "水平向左"
 
-#: eeschema/sch_text.cpp:689
+#: eeschema/sch_text.cpp:686
 msgid "Vertical up"
 msgstr "垂直向上"
 
-#: eeschema/sch_text.cpp:690
+#: eeschema/sch_text.cpp:687
 msgid "Horizontal right"
 msgstr "水平向右"
 
-#: eeschema/sch_text.cpp:691
+#: eeschema/sch_text.cpp:688
 msgid "Vertical down"
 msgstr "垂直向下"
 
-#: eeschema/sch_text.cpp:697
+#: eeschema/sch_text.cpp:694
 msgid "Bold Italic"
 msgstr "加粗斜体"
 
-#: eeschema/sch_text.cpp:717
+#: eeschema/sch_text.cpp:714 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:840
+#: eeschema/sch_text.cpp:842
 #, c-format
 msgid "Label %s"
 msgstr "标签 %s"
 
-#: eeschema/sch_text.cpp:1082
+#: eeschema/sch_text.cpp:1084
 #, c-format
 msgid "Global Label %s"
 msgstr "全局标签 %s"
 
-#: eeschema/sch_text.cpp:1271
+#: eeschema/sch_text.cpp:1273
 #, c-format
 msgid "Hierarchical Label %s"
 msgstr "层次标签 %s"
 
-#: eeschema/sch_text.cpp:1284
+#: eeschema/sch_text.cpp:1286
 msgid ""
 "<table>   <tr>      <th>Markup</th>      <th></th>      <th>Result</th>   </"
 "tr>   <tr>      <td>&nbsp;<br><samp>^{superscript}</samp></td>      <td></"
@@ -11955,104 +12315,92 @@ 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:1409 pcbnew/dialogs/panel_setup_rules.cpp:268
+#: eeschema/sch_text.cpp:1411 pcbnew/dialogs/panel_setup_rules.cpp:268
 msgid "Syntax Help"
 msgstr "语法帮助"
 
-#: eeschema/sch_validators.cpp:99
+#: eeschema/sch_validators.cpp:100
 #, c-format
 msgid "The reference designator cannot contain %s character(s)."
 msgstr "引用指示符不能包含 %s 字符。"
 
-#: eeschema/sch_validators.cpp:103
+#: eeschema/sch_validators.cpp:104
 #, c-format
 msgid "The value field cannot contain %s character(s)."
 msgstr "值字段不能包含 %s 字符。"
 
-#: eeschema/sch_validators.cpp:107
+#: eeschema/sch_validators.cpp:108
 #, c-format
 msgid "The footprint field cannot contain %s character(s)."
 msgstr "封装字段不能包含 %s 字符。"
 
-#: eeschema/sch_validators.cpp:111
+#: eeschema/sch_validators.cpp:112
 #, c-format
 msgid "The datasheet field cannot contain %s character(s)."
 msgstr "数据手册字段不能包含 %s 字符。"
 
-#: eeschema/sch_validators.cpp:115
+#: eeschema/sch_validators.cpp:116
 #, c-format
 msgid "The sheet name cannot contain %s character(s)."
 msgstr "图框名称不能包含 %s 个字符。"
 
-#: eeschema/sch_validators.cpp:119
+#: eeschema/sch_validators.cpp:120
 #, c-format
 msgid "The sheet filename cannot contain %s character(s)."
 msgstr "图框文件名不能包含 %s 个字符。"
 
-#: eeschema/sch_validators.cpp:123
+#: eeschema/sch_validators.cpp:124
 #, c-format
 msgid "The field cannot contain %s character(s)."
 msgstr "该字段不能包含 %s 字符。"
 
-#: eeschema/sch_validators.cpp:135
+#: eeschema/sch_validators.cpp:136
 msgid "The name of the field cannot be empty."
 msgstr "字段的名称不能为空。"
 
-#: eeschema/sch_validators.cpp:137
+#: eeschema/sch_validators.cpp:138
 msgid "The value of the field cannot be empty."
 msgstr "字段的值不能为空。"
 
-#: eeschema/sch_validators.cpp:148
+#: eeschema/sch_validators.cpp:149
 msgid "carriage return"
 msgstr "回车符"
 
-#: eeschema/sch_validators.cpp:150
+#: eeschema/sch_validators.cpp:151
 msgid "line feed"
 msgstr "制表"
 
-#: eeschema/sch_validators.cpp:152
+#: eeschema/sch_validators.cpp:153
 msgid "tab"
 msgstr "制表"
 
-#: eeschema/sch_validators.cpp:154
+#: eeschema/sch_validators.cpp:155
 msgid "space"
 msgstr "空格"
 
-#: eeschema/sch_validators.cpp:161
+#: eeschema/sch_validators.cpp:162
 #, c-format
 msgid "%s or %s"
 msgstr "%s 或 %s"
 
-#: eeschema/sch_validators.cpp:163
+#: eeschema/sch_validators.cpp:164
 #, c-format
 msgid "%s, %s, or %s"
 msgstr "%s, %s, 或 %s"
 
-#: eeschema/sch_validators.cpp:165
+#: eeschema/sch_validators.cpp:166
 #, c-format
 msgid "%s, %s, %s, or %s"
 msgstr "%s, %s, %s, 或 %s"
 
-#: eeschema/sch_validators.cpp:177
+#: eeschema/sch_validators.cpp:178
 msgid "Field Validation Error"
 msgstr "字段验证错误"
 
-#: eeschema/sch_validators.cpp:245
-msgid "Invalid signal name"
-msgstr "无效的信号名称"
-
-#: eeschema/sch_validators.cpp:260
+#: eeschema/sch_validators.cpp:194
 msgid "Signal name contains '[' or ']' but is not a valid vector bus name"
 msgstr "信号名称包含 \"[\" 或 \"]\", 但不是有效的矢量总线名称"
 
-#: eeschema/sch_validators.cpp:263
-msgid "Signal names cannot contain CR or LF characters"
-msgstr "信号名称不能包含 CR 或 LF 字符"
-
-#: eeschema/sch_validators.cpp:266
-msgid "Signal names cannot contain spaces"
-msgstr "信号名称不能包含空格"
-
 #: eeschema/sheet.cpp:62
 #, c-format
 msgid ""
@@ -12073,39 +12421,39 @@ msgstr ""
 "原理图 \"%s\" 没有将其符号库链接重新映射到符号库表。 必须先重新映射此原理图所"
 "属的项目,然后才能将其导入当前项目。"
 
-#: eeschema/sheet.cpp:147
+#: eeschema/sheet.cpp:146
 msgid ""
 "The entire schematic could not be loaded.  Errors occurred attempting to "
 "load hierarchical sheet schematics."
 msgstr "无法加载全部原理图。 尝试加载层次原理图时发生错误。"
 
-#: eeschema/sheet.cpp:150
+#: eeschema/sheet.cpp:149
 msgid "Schematic Load Error"
 msgstr "原理图加载错误"
 
-#: eeschema/sheet.cpp:153
+#: eeschema/sheet.cpp:152
 msgid "Use partial schematic"
 msgstr "使用部分原理图"
 
-#: eeschema/sheet.cpp:162
+#: eeschema/sheet.cpp:161
 #, c-format
 msgid "Error occurred loading schematic file \"%s\"."
 msgstr "载入原理图文件 \"%s\" 发生错误。"
 
-#: eeschema/sheet.cpp:165
+#: eeschema/sheet.cpp:164
 #, c-format
 msgid "Failed to load schematic \"%s\""
 msgstr "无法加载原理图 \"%s\""
 
-#: eeschema/sheet.cpp:229
+#: eeschema/sheet.cpp:228
 msgid "Continue Load"
 msgstr "继续加载"
 
-#: eeschema/sheet.cpp:230
+#: eeschema/sheet.cpp:229
 msgid "Cancel Load"
 msgstr "取消加载"
 
-#: eeschema/sheet.cpp:247
+#: eeschema/sheet.cpp:246
 msgid ""
 "There are library names in the loaded schematic that are missing from the "
 "project library table.  This may result in broken symbol library links for "
@@ -12114,12 +12462,12 @@ msgstr ""
 "加载的原理图中缺少项目库表中的库名称。 这可能会导致加载的原理图的符号库链接断"
 "开。 是否要继续？"
 
-#: eeschema/sheet.cpp:250 eeschema/sheet.cpp:291 eeschema/sheet.cpp:341
-#: eeschema/sheet.cpp:402
+#: eeschema/sheet.cpp:249 eeschema/sheet.cpp:290 eeschema/sheet.cpp:340
+#: eeschema/sheet.cpp:401
 msgid "Continue Load Schematic"
 msgstr "继续加载原理图"
 
-#: eeschema/sheet.cpp:287
+#: eeschema/sheet.cpp:286
 #, c-format
 msgid ""
 "The project library table \"%s\" does not exist or cannot be read.  This may "
@@ -12128,7 +12476,7 @@ msgstr ""
 "项目库表 \"%s\" 不存在或无法读取。 这可能会导致原理图的符号链接断开。 是否要"
 "继续？"
 
-#: eeschema/sheet.cpp:337
+#: eeschema/sheet.cpp:336
 msgid ""
 "There are library names in the loaded schematic that are missing from the "
 "loaded schematic project library table.  This may result in broken symbol "
@@ -12137,7 +12485,7 @@ msgstr ""
 "加载的原理图中缺少加载的原理图项目库中的库名称。 这可能会导致原理图的符号库链"
 "接断开。 是否要继续？"
 
-#: eeschema/sheet.cpp:398
+#: eeschema/sheet.cpp:397
 msgid ""
 "A duplicate library name that references a different library exists in the "
 "current library table.  This conflict cannot be resolved and may result in "
@@ -12146,7 +12494,7 @@ msgstr ""
 "引用其他库的重复库名称存在于当前库表中。 无法解决此冲突,并可能导致原理图的符"
 "号库链接断开。 是否要继续？"
 
-#: eeschema/sheet.cpp:634
+#: eeschema/sheet.cpp:633
 #, c-format
 msgid ""
 "The file name \"%s\" can cause issues with an existing file name\n"
@@ -12164,15 +12512,15 @@ msgstr ""
 "\n"
 "你想继续吗？"
 
-#: eeschema/sheet.cpp:643
+#: eeschema/sheet.cpp:642
 msgid "Do not show this message again."
 msgstr "不再显示此消息。"
 
-#: eeschema/sheet.cpp:644
+#: eeschema/sheet.cpp:643
 msgid "Create New Sheet"
 msgstr "创建新图纸"
 
-#: eeschema/sheet.cpp:645
+#: eeschema/sheet.cpp:644
 msgid "Discard New Sheet"
 msgstr "丢弃新图纸"
 
@@ -12476,15 +12824,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/toolbars_lib_view.cpp:51
+#: eeschema/toolbars_lib_view.cpp:48
 msgid "Select symbol to browse"
 msgstr "选择要浏览的符号"
 
-#: eeschema/toolbars_lib_view.cpp:56
+#: eeschema/toolbars_lib_view.cpp:53
 msgid "Display previous symbol"
 msgstr "显示上一个符号"
 
-#: eeschema/toolbars_lib_view.cpp:60
+#: eeschema/toolbars_lib_view.cpp:57
 msgid "Display next symbol"
 msgstr "显示下一个符号"
 
@@ -12517,25 +12865,11 @@ msgstr "修改可见性"
 msgid "Failed to open component-footprint link file \"%s\""
 msgstr "无法打开元件封装链接文件 \"%s\""
 
-#: eeschema/tools/backannotate.cpp:66
-msgid "Select at least one property to back annotate"
-msgstr "选择至少一个要反向标注的属性"
+#: eeschema/tools/backannotate.cpp:69
+msgid "Select at least one property to back annotate."
+msgstr "选择至少一个要反向标注的属性。"
 
-#: eeschema/tools/backannotate.cpp:89
-#, c-format
-msgid "Schematic is back-annotated. %d changes applied."
-msgstr "原理图已添加反向标注。已应用 %d 个更改。"
-
-#: eeschema/tools/backannotate.cpp:94
-msgid "No errors during dry run. Ready to go."
-msgstr "试运行期间没有错误。准备运行。"
-
-#: eeschema/tools/backannotate.cpp:98
-#, c-format
-msgid "Found %d errors. Fix them and run back annotation."
-msgstr "找到 %d 错误。修复它们并运行反向注释。"
-
-#: eeschema/tools/backannotate.cpp:111
+#: eeschema/tools/backannotate.cpp:93
 msgid ""
 "Cannot fetch PCB netlist because eeschema is opened in stand-alone mode.\n"
 "You must launch the KiCad project manager and create a project."
@@ -12543,31 +12877,27 @@ msgstr ""
 "无法获取 PCB 网表，因为 eesschema 是在独立模式下打开的。\n"
 "您必须启动 KiCad 项目管理器并创建一个项目。"
 
-#: eeschema/tools/backannotate.cpp:123
-msgid "Please open Pcbnew and run back annotation again"
-msgstr "请打开 Pcbnew 并再次运行反向注释"
-
-#: eeschema/tools/backannotate.cpp:153
+#: eeschema/tools/backannotate.cpp:149
 #, c-format
 msgid "Footprint \"%s\" has no symbol associated."
 msgstr "封装 \"%s\" 没有关联的符号。"
 
-#: eeschema/tools/backannotate.cpp:171
+#: eeschema/tools/backannotate.cpp:181
 #, c-format
 msgid "Pcb footprints \"%s\" and \"%s\" linked to same symbol"
 msgstr "链接到同一符号的 PCB 封装 \"%s\" 和 \"%s\""
 
-#: eeschema/tools/backannotate.cpp:226
+#: eeschema/tools/backannotate.cpp:238
 #, c-format
 msgid "Cannot find symbol for \"%s\" footprint"
 msgstr "找不到 \"%s\" 封装的符号"
 
-#: eeschema/tools/backannotate.cpp:255
+#: eeschema/tools/backannotate.cpp:263
 #, c-format
 msgid "Cannot find footprint for \"%s\" symbol"
 msgstr "找不到 \"%s\" 符号的封装"
 
-#: eeschema/tools/backannotate.cpp:315
+#: eeschema/tools/backannotate.cpp:317
 #, c-format
 msgid ""
 "\"%s\" and \"%s\" use the same schematic symbol.\n"
@@ -12576,34 +12906,57 @@ msgstr ""
 "\"%s\" 和 \"%s\" 使用相同的原理图符号。\n"
 "它们不能有不同的封装或值。"
 
-#: eeschema/tools/backannotate.cpp:333
+#: eeschema/tools/backannotate.cpp:342
 #, c-format
 msgid ""
 "Unable to change \"%s\" footprint or value because associated symbol is "
 "reused in the another project"
 msgstr "无法更改 \"%s\" 封装或值，因为关联的符号在另一个项目中重复使用"
 
-#: eeschema/tools/backannotate.cpp:364
+#: eeschema/tools/backannotate.cpp:373
 #, c-format
 msgid "Change \"%s\" reference designator to \"%s\"."
 msgstr "更改 \"%s\" 的参考指示符为 \"%s\"。"
 
-#: eeschema/tools/backannotate.cpp:373
+#: eeschema/tools/backannotate.cpp:390
 #: pcbnew/netlist_reader/board_netlist_updater.cpp:221
 #, c-format
 msgid "Change %s footprint from \"%s\" to \"%s\"."
 msgstr "%s 的封装从 \"%s\" 更改为 \"%s\"。"
 
 # 可能会出现语序问题。待测试。
-#: eeschema/tools/backannotate.cpp:384
+#: eeschema/tools/backannotate.cpp:408
 #, c-format
-msgid "Change \"%s\" value from \"%s\" to \"\"%s\"."
-msgstr "将 \"%s\" 值从 \"%s\" 更改为 \"%s\"。"
+msgid "Change %s value from \"%s\" to \"%s\"."
+msgstr "将 %s 值从 \"%s\" 更改为 \"%s\"。"
 
-#: eeschema/tools/backannotate.cpp:394
+# 可能会出现语序问题。待测试。
+#: eeschema/tools/backannotate.cpp:476
 #, c-format
-msgid "%d symbols left unchanged"
-msgstr "%d 符号保持不变"
+msgid "Change \"%s\" labels to \"%s\"."
+msgstr "将 \"%s\" 标签更改为 \"%s\"。"
+
+# 可能会出现语序问题。待测试。
+#: eeschema/tools/backannotate.cpp:500
+#, c-format
+msgid "Change \"%s\" global labels to \"%s\"."
+msgstr "将 \"%s\" 全局标签更改为 \"%s\"。"
+
+#: eeschema/tools/backannotate.cpp:513 eeschema/tools/backannotate.cpp:539
+#, c-format
+msgid "Change \"%s\" hierarchical label to \"%s\"."
+msgstr "将 \"%s\" 分层标签更改为 \"%s\"。"
+
+#: eeschema/tools/backannotate.cpp:563
+#, 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:581
+#, c-format
+msgid "Add label \"%s\" to net \"%s\"."
+msgstr "将标签 \"%s\" 添加到网络 \"%s\"。"
 
 #: eeschema/tools/ee_actions.cpp:44
 msgid "Perform electrical rules check"
@@ -12621,19 +12974,19 @@ msgstr "SPICE 中的模拟电路"
 msgid "Opens the datasheet in a browser"
 msgstr "在浏览器中打开数据表"
 
-#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1004
+#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1011
 msgid "Create Corner"
 msgstr "创建拐角"
 
-#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1004
+#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1011
 msgid "Create a corner"
 msgstr "建立拐角"
 
-#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1008
+#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1015
 msgid "Remove Corner"
 msgstr "移除拐角"
 
-#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1008
+#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1015
 msgid "Remove corner"
 msgstr "移除拐角"
 
@@ -12763,7 +13116,7 @@ msgstr "添加引脚"
 msgid "Add a pin"
 msgstr "添加引脚"
 
-#: eeschema/tools/ee_actions.cpp:198 eeschema/tools/ee_actions.cpp:325
+#: 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
 msgid "Add Text"
 msgstr "添加文本"
@@ -12797,11 +13150,11 @@ msgstr "添加圆弧"
 msgid "Add an arc"
 msgstr "添加一个圆弧"
 
-#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:651
+#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:646
 msgid "Add Lines"
 msgstr "添加线"
 
-#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:651
+#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:646
 msgid "Add connected graphic lines"
 msgstr "添加连接的图形线"
 
@@ -12882,549 +13235,541 @@ msgid "Add a wire entry to a bus"
 msgstr "添加导线入口到总线"
 
 #: eeschema/tools/ee_actions.cpp:285
-msgid "Add Bus to Bus Entry"
-msgstr "添加总线到总线入口"
-
-#: eeschema/tools/ee_actions.cpp:285
-msgid "Add a bus entry to a bus"
-msgstr "添加总线入口到总线"
-
-#: eeschema/tools/ee_actions.cpp:291
 msgid "Add Label"
 msgstr "添加标签"
 
-#: eeschema/tools/ee_actions.cpp:291
+#: eeschema/tools/ee_actions.cpp:285
 msgid "Add a net label"
 msgstr "添加网络标签"
 
-#: eeschema/tools/ee_actions.cpp:297
+#: eeschema/tools/ee_actions.cpp:291
 msgid "Add Hierarchical Label"
 msgstr "添加层次标签"
 
-#: eeschema/tools/ee_actions.cpp:297
+#: eeschema/tools/ee_actions.cpp:291
 msgid "Add a hierarchical sheet label"
 msgstr "添加分层图框标签"
 
-#: eeschema/tools/ee_actions.cpp:303
+#: eeschema/tools/ee_actions.cpp:297
 msgid "Add Sheet"
 msgstr "添加图页"
 
-#: eeschema/tools/ee_actions.cpp:303
+#: eeschema/tools/ee_actions.cpp:297
 msgid "Add a hierarchical sheet"
 msgstr "添加分层图框"
 
-#: eeschema/tools/ee_actions.cpp:308
+#: eeschema/tools/ee_actions.cpp:302
 msgid "Add Sheet Pin"
 msgstr "添加图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:308
+#: eeschema/tools/ee_actions.cpp:302
 msgid "Add a sheet pin"
 msgstr "添加图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:313
+#: eeschema/tools/ee_actions.cpp:307
 msgid "Import Sheet Pin"
 msgstr "导入图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:313
+#: eeschema/tools/ee_actions.cpp:307
 msgid "Import a hierarchical sheet pin"
 msgstr "导入分层图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:319
+#: eeschema/tools/ee_actions.cpp:313
 msgid "Add Global Label"
 msgstr "添加全局标签"
 
-#: eeschema/tools/ee_actions.cpp:319
+#: eeschema/tools/ee_actions.cpp:313
 msgid "Add a global label"
 msgstr "添加全局标签"
 
-#: eeschema/tools/ee_actions.cpp:325
+#: eeschema/tools/ee_actions.cpp:319
 msgid "Add text"
 msgstr "文本"
 
-#: eeschema/tools/ee_actions.cpp:330
+#: eeschema/tools/ee_actions.cpp:324
 msgid "Add Image"
 msgstr "添加图片"
 
-#: eeschema/tools/ee_actions.cpp:330
+#: eeschema/tools/ee_actions.cpp:324
 msgid "Add bitmap image"
 msgstr "添加图片"
 
-#: eeschema/tools/ee_actions.cpp:335
+#: eeschema/tools/ee_actions.cpp:329
 msgid "Finish Sheet"
 msgstr "完成图框"
 
-#: eeschema/tools/ee_actions.cpp:335
+#: eeschema/tools/ee_actions.cpp:329
 msgid "Finish drawing sheet"
 msgstr "完成图框"
 
-#: eeschema/tools/ee_actions.cpp:344
+#: eeschema/tools/ee_actions.cpp:338
 msgid "Repeat Last Item"
 msgstr "重复最后项"
 
-#: eeschema/tools/ee_actions.cpp:344
+#: eeschema/tools/ee_actions.cpp:338
 msgid "Duplicates the last drawn item"
 msgstr "复制最后绘制的项目"
 
-#: eeschema/tools/ee_actions.cpp:349 pcbnew/tools/pcb_actions.cpp:228
+#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:233
 msgid "Rotate Clockwise"
 msgstr "顺时针旋转"
 
-#: eeschema/tools/ee_actions.cpp:349 pcbnew/tools/pcb_actions.cpp:228
+#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:233
 msgid "Rotates selected item(s) clockwise"
 msgstr "将选中的项目顺时针旋转"
 
-#: eeschema/tools/ee_actions.cpp:355 pcbnew/tools/edit_tool.cpp:697
+#: eeschema/tools/ee_actions.cpp:349 pcbnew/tools/edit_tool.cpp:726
 msgid "Rotate"
 msgstr "旋转"
 
-#: eeschema/tools/ee_actions.cpp:355
+#: eeschema/tools/ee_actions.cpp:349
 msgid "Rotates selected item(s) counter-clockwise"
 msgstr "逆时针旋转所选项目"
 
-#: eeschema/tools/ee_actions.cpp:361
+#: eeschema/tools/ee_actions.cpp:355
 msgid "Mirror Around Horizontal Axis"
 msgstr "围绕水平轴(X)镜像"
 
-#: eeschema/tools/ee_actions.cpp:361
+#: eeschema/tools/ee_actions.cpp:355
 msgid "Flips selected item(s) from top to bottom"
 msgstr "从上到下翻转选定的项目"
 
-#: eeschema/tools/ee_actions.cpp:367
+#: eeschema/tools/ee_actions.cpp:361
 msgid "Mirror Around Vertical Axis"
 msgstr "围绕垂直轴(Y)镜像"
 
-#: eeschema/tools/ee_actions.cpp:367
+#: eeschema/tools/ee_actions.cpp:361
 msgid "Flips selected item(s) from left to right"
 msgstr "从左到右翻转选定的项目"
 
-#: eeschema/tools/ee_actions.cpp:373 pcbnew/tools/pcb_actions.cpp:261
+#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:266
 msgid "Properties..."
 msgstr "属性..."
 
-#: eeschema/tools/ee_actions.cpp:373 pcbnew/tools/pcb_actions.cpp:261
+#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:266
 msgid "Displays item properties dialog"
 msgstr "显示项属性对话框"
 
-#: eeschema/tools/ee_actions.cpp:379
+#: eeschema/tools/ee_actions.cpp:373
 msgid "Edit Reference Designator..."
 msgstr "编辑参考指示符..."
 
-#: eeschema/tools/ee_actions.cpp:379
+#: eeschema/tools/ee_actions.cpp:373
 msgid "Displays reference designator dialog"
 msgstr "显示参考指示符对话框"
 
-#: eeschema/tools/ee_actions.cpp:385
+#: eeschema/tools/ee_actions.cpp:379
 msgid "Edit Value..."
 msgstr "编辑值..."
 
-#: eeschema/tools/ee_actions.cpp:385
+#: eeschema/tools/ee_actions.cpp:379
 msgid "Displays value field dialog"
 msgstr "显示值字段对话框"
 
-#: eeschema/tools/ee_actions.cpp:391
+#: eeschema/tools/ee_actions.cpp:385
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:255
 msgid "Edit Footprint..."
 msgstr "编辑封装..."
 
-#: eeschema/tools/ee_actions.cpp:391
+#: eeschema/tools/ee_actions.cpp:385
 msgid "Displays footprint field dialog"
 msgstr "显示封装字段对话框"
 
-#: eeschema/tools/ee_actions.cpp:397
+#: eeschema/tools/ee_actions.cpp:391
 msgid "Autoplace Fields"
 msgstr "自动放置字段"
 
-#: eeschema/tools/ee_actions.cpp:397
+#: eeschema/tools/ee_actions.cpp:391
 msgid "Runs the automatic placement algorithm on the symbol's fields"
 msgstr "在符号的字段上运行自动放置算法"
 
-#: eeschema/tools/ee_actions.cpp:402
+#: eeschema/tools/ee_actions.cpp:396
 msgid "Sets symbol fields to original library values"
 msgstr "将符号字段设置为原始库值"
 
-#: eeschema/tools/ee_actions.cpp:407
+#: eeschema/tools/ee_actions.cpp:401
+msgid "Assign Netclass..."
+msgstr "分配网络类..."
+
+#: eeschema/tools/ee_actions.cpp:401
+msgid "Assign a netclass to the net of the selected wire"
+msgstr "将网络类分配给选定导线的网络"
+
+#: eeschema/tools/ee_actions.cpp:406
 msgid "DeMorgan Conversion"
 msgstr "德摩根转换"
 
-#: eeschema/tools/ee_actions.cpp:407
+#: eeschema/tools/ee_actions.cpp:406
 msgid "Switch between DeMorgan representations"
 msgstr "在德摩根表示之间切换"
 
-#: eeschema/tools/ee_actions.cpp:412
+#: eeschema/tools/ee_actions.cpp:411
 msgid "DeMorgan Standard"
 msgstr "德摩根标准"
 
-#: eeschema/tools/ee_actions.cpp:412
+#: eeschema/tools/ee_actions.cpp:411
 msgid "Switch to standard DeMorgan representation"
 msgstr "切换到标准的德摩根表示"
 
-#: eeschema/tools/ee_actions.cpp:417
+#: eeschema/tools/ee_actions.cpp:416
 msgid "DeMorgan Alternate"
 msgstr "德摩根备用"
 
-#: eeschema/tools/ee_actions.cpp:417
+#: eeschema/tools/ee_actions.cpp:416
 msgid "Switch to alternate DeMorgan representation"
 msgstr "切换到备用德摩根表示"
 
-#: eeschema/tools/ee_actions.cpp:422
-msgid "Set Bus Entry Shape /"
-msgstr "设置总线入口方向 /"
-
-#: eeschema/tools/ee_actions.cpp:422
-msgid "Change the bus entry shape to /"
-msgstr "将总线入口形状更改为 /"
-
-#: eeschema/tools/ee_actions.cpp:427
-msgid "Set Bus Entry Shape \\"
-msgstr "设置总线入口方向 \\"
-
-#: eeschema/tools/ee_actions.cpp:427
-msgid "Change the bus entry shape to \\"
-msgstr "将总线入口形状更改为 \\"
-
-#: eeschema/tools/ee_actions.cpp:432
+#: eeschema/tools/ee_actions.cpp:421
 msgid "Change to Label"
 msgstr "修改为标签"
 
-#: eeschema/tools/ee_actions.cpp:432
+#: eeschema/tools/ee_actions.cpp:421
 msgid "Change existing item to a label"
 msgstr "将现有项目更改为标签"
 
-#: eeschema/tools/ee_actions.cpp:437
+#: eeschema/tools/ee_actions.cpp:426
 msgid "Change to Hierarchical Label"
 msgstr "修改为层次标签"
 
-#: eeschema/tools/ee_actions.cpp:437
+#: eeschema/tools/ee_actions.cpp:426
 msgid "Change existing item to a hierarchical label"
 msgstr "将现有项目更改为分层标签"
 
-#: eeschema/tools/ee_actions.cpp:442
+#: eeschema/tools/ee_actions.cpp:431
 msgid "Change to Global Label"
 msgstr "修改为全局标签"
 
-#: eeschema/tools/ee_actions.cpp:442
+#: eeschema/tools/ee_actions.cpp:431
 msgid "Change existing item to a global label"
 msgstr "将现有项目更改为全局标签"
 
-#: eeschema/tools/ee_actions.cpp:447
+#: eeschema/tools/ee_actions.cpp:436
 msgid "Change to Text"
 msgstr "改为注释文字"
 
-#: eeschema/tools/ee_actions.cpp:447
+#: eeschema/tools/ee_actions.cpp:436
 msgid "Change existing item to a text comment"
 msgstr "将现有项目更改为文本注释"
 
-#: eeschema/tools/ee_actions.cpp:452
+#: eeschema/tools/ee_actions.cpp:441
 msgid "Cleanup Sheet Pins"
 msgstr "清除图页连接"
 
-#: eeschema/tools/ee_actions.cpp:452
+#: eeschema/tools/ee_actions.cpp:441
 msgid "Delete unreferenced sheet pins"
 msgstr "删除未引用的图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:457 pcbnew/tools/pcb_actions.cpp:403
+#: eeschema/tools/ee_actions.cpp:446 pcbnew/tools/pcb_actions.cpp:378
 msgid "Edit Text & Graphics Properties..."
 msgstr "编辑文本与图形属性..."
 
-#: eeschema/tools/ee_actions.cpp:458
+#: eeschema/tools/ee_actions.cpp:447
 msgid "Edit text and graphics properties globally across schematic"
 msgstr "在原理图中全局编辑文本和图形属性"
 
-#: eeschema/tools/ee_actions.cpp:463
+#: eeschema/tools/ee_actions.cpp:452
 msgid "Symbol Properties..."
 msgstr "符号属性..."
 
-#: eeschema/tools/ee_actions.cpp:463
+#: eeschema/tools/ee_actions.cpp:452
 msgid "Displays symbol properties dialog"
 msgstr "显示符号属性对话框"
 
-#: eeschema/tools/ee_actions.cpp:468
+#: eeschema/tools/ee_actions.cpp:457
 msgid "Pin Table..."
 msgstr "引脚列表..."
 
-#: eeschema/tools/ee_actions.cpp:468
+#: eeschema/tools/ee_actions.cpp:457
 msgid "Displays pin table for bulk editing of pins"
 msgstr "显示引脚表, 用于批量编辑引脚"
 
-#: eeschema/tools/ee_actions.cpp:473
+#: eeschema/tools/ee_actions.cpp:462
 msgid "Break Wire"
 msgstr "分割连线"
 
-#: eeschema/tools/ee_actions.cpp:473
+#: eeschema/tools/ee_actions.cpp:462
 msgid "Divide a wire into segments which can be dragged independently"
 msgstr "将导线分成可以独立拖动的线段"
 
-#: eeschema/tools/ee_actions.cpp:478
+#: eeschema/tools/ee_actions.cpp:467
 msgid "Break Bus"
 msgstr "分割总线"
 
-#: eeschema/tools/ee_actions.cpp:478
+#: eeschema/tools/ee_actions.cpp:467
 msgid "Divide a bus into segments which can be dragged independently"
 msgstr "将总线划分为可以独立拖动的段"
 
-#: eeschema/tools/ee_actions.cpp:489
+#: eeschema/tools/ee_actions.cpp:478
 msgid "Add a simulator probe"
 msgstr "添加仿真器探针"
 
-#: eeschema/tools/ee_actions.cpp:493
+#: eeschema/tools/ee_actions.cpp:482
 msgid "Select a value to be tuned"
 msgstr "选择要调整的值"
 
-#: eeschema/tools/ee_actions.cpp:498 gerbview/tools/gerbview_actions.cpp:93
-#: pcbnew/tools/pcb_actions.cpp:626
+#: eeschema/tools/ee_actions.cpp:487 gerbview/tools/gerbview_actions.cpp:93
+#: pcbnew/tools/pcb_actions.cpp:607 pcbnew/tools/pcb_actions.cpp:627
 msgid "Highlight Net"
 msgstr "高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:498
+#: eeschema/tools/ee_actions.cpp:487
 msgid "Highlight net under cursor"
 msgstr "在光标下高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:509 pcbnew/tools/pcb_actions.cpp:619
+#: eeschema/tools/ee_actions.cpp:498 pcbnew/tools/pcb_actions.cpp:620
 msgid "Highlight Nets"
 msgstr "高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:509
+#: eeschema/tools/ee_actions.cpp:498
 msgid "Highlight wires and pins of a net"
 msgstr "高亮网络的电线和引脚"
 
-#: eeschema/tools/ee_actions.cpp:515
+#: eeschema/tools/ee_actions.cpp:504
 msgid "Edit with Symbol Editor"
 msgstr "用符号编辑器来编辑"
 
-#: eeschema/tools/ee_actions.cpp:515
+#: eeschema/tools/ee_actions.cpp:504
 msgid "Open the symbol editor to edit the symbol"
 msgstr "打开符号编辑器以编辑符号"
 
-#: eeschema/tools/ee_actions.cpp:520
+#: eeschema/tools/ee_actions.cpp:509
 msgid "Edit Symbol Fields..."
 msgstr "编辑符号字段..."
 
-#: eeschema/tools/ee_actions.cpp:520
+#: eeschema/tools/ee_actions.cpp:509
 msgid "Bulk-edit fields of all symbols in schematic"
 msgstr "原理图中所有符号的批量编辑字段"
 
-#: eeschema/tools/ee_actions.cpp:525
+#: eeschema/tools/ee_actions.cpp:514
 msgid "Edit Symbol Library Links..."
 msgstr "编辑符号库链接..."
 
-#: eeschema/tools/ee_actions.cpp:525
+#: eeschema/tools/ee_actions.cpp:514
 msgid "Edit links between schematic and library symbols"
 msgstr "编辑原理图和库符号之间的链接"
 
-#: eeschema/tools/ee_actions.cpp:530
+#: eeschema/tools/ee_actions.cpp:519
 msgid "Assign Footprints..."
 msgstr "分配封装..."
 
-#: eeschema/tools/ee_actions.cpp:530
+#: eeschema/tools/ee_actions.cpp:519
 msgid "Run Cvpcb"
 msgstr "运行 Cvpcb"
 
-#: eeschema/tools/ee_actions.cpp:535
+#: eeschema/tools/ee_actions.cpp:524
 msgid "Import Footprint Assignments..."
 msgstr "导入封装分配..."
 
-#: eeschema/tools/ee_actions.cpp:536
+#: eeschema/tools/ee_actions.cpp:525
 msgid "Import symbol footprint assignments from .cmp file created by Pcbnew"
 msgstr "从 Pcbnew 创建的 .cmp 文件中导入符号封装分配"
 
-#: eeschema/tools/ee_actions.cpp:541
+#: eeschema/tools/ee_actions.cpp:530
 msgid "Annotate Schematic..."
 msgstr "标注原理图..."
 
-#: eeschema/tools/ee_actions.cpp:541
+#: eeschema/tools/ee_actions.cpp:530
 msgid "Fill in schematic symbol reference designators"
 msgstr "填写原理图符号参考指示符"
 
-#: eeschema/tools/ee_actions.cpp:546
+#: eeschema/tools/ee_actions.cpp:535
 msgid "Schematic Setup..."
 msgstr "原理图设置..."
 
-#: eeschema/tools/ee_actions.cpp:547
+#: eeschema/tools/ee_actions.cpp:536
 msgid "Edit schematic setup including annotation styles and electrical rules"
 msgstr "编辑原理图设置，包括注释样式和电气规则"
 
-#: eeschema/tools/ee_actions.cpp:552
+#: eeschema/tools/ee_actions.cpp:541
 msgid "Rescue Symbols..."
 msgstr "恢复符号..."
 
-#: eeschema/tools/ee_actions.cpp:553
+#: eeschema/tools/ee_actions.cpp:542
 msgid "Find old symbols in project and rename/rescue them"
 msgstr "在工程中找到旧的符号重命名或恢复它们"
 
-#: eeschema/tools/ee_actions.cpp:558
+#: eeschema/tools/ee_actions.cpp:547
 msgid "Remap Symbols..."
 msgstr "重新映射符号..."
 
-#: eeschema/tools/ee_actions.cpp:559
+#: eeschema/tools/ee_actions.cpp:548
 msgid "Remap legacy library symbols to symbol library table"
 msgstr "将传统库符号重新映射到符号库表"
 
-#: eeschema/tools/ee_actions.cpp:564
+#: eeschema/tools/ee_actions.cpp:553
+msgid "Update from Symbol Library"
+msgstr "从符号库更新"
+
+#: eeschema/tools/ee_actions.cpp:554
+msgid "Update from the symbol library using the library identifier"
+msgstr "使用库标识符从符号库更新"
+
+#: eeschema/tools/ee_actions.cpp:559
 msgid "Bus Definitions..."
 msgstr "总线定义..."
 
-#: eeschema/tools/ee_actions.cpp:564
+#: eeschema/tools/ee_actions.cpp:559
 msgid "Manage bus definitions"
 msgstr "管理总线定义"
 
-#: eeschema/tools/ee_actions.cpp:569
+#: eeschema/tools/ee_actions.cpp:564
 msgid "Export Drawing to Clipboard"
 msgstr "将绘图导出到剪贴板"
 
-#: eeschema/tools/ee_actions.cpp:569
+#: eeschema/tools/ee_actions.cpp:564
 msgid "Export drawing of current sheet to clipboard"
 msgstr "将当前图框的绘图导出到剪贴板"
 
-#: eeschema/tools/ee_actions.cpp:574
+#: eeschema/tools/ee_actions.cpp:569
 msgid "Switch to PCB Editor"
 msgstr "切换到 PCB 编辑器"
 
-#: eeschema/tools/ee_actions.cpp:574
+#: eeschema/tools/ee_actions.cpp:569
 msgid "Open PCB in Pcbnew"
 msgstr "打开 Pcbnew 中的 PCB"
 
-#: eeschema/tools/ee_actions.cpp:579
+#: eeschema/tools/ee_actions.cpp:574
 msgid "Export Netlist..."
 msgstr "导出网表..."
 
-#: eeschema/tools/ee_actions.cpp:579
+#: eeschema/tools/ee_actions.cpp:574
 msgid "Export file containing netlist in one of several formats"
 msgstr "导出包含某种格式的网表的文件"
 
-#: eeschema/tools/ee_actions.cpp:584
+#: eeschema/tools/ee_actions.cpp:579
 msgid "Generate BOM..."
 msgstr "生成 BOM..."
 
-#: eeschema/tools/ee_actions.cpp:584
+#: eeschema/tools/ee_actions.cpp:579
 msgid "Generate a bill of materials for the current schematic"
 msgstr "生成当前原理图的 BOM"
 
-#: eeschema/tools/ee_actions.cpp:589
+#: eeschema/tools/ee_actions.cpp:584
 msgid "Enter Sheet"
 msgstr "进入分页"
 
-#: eeschema/tools/ee_actions.cpp:589
+#: eeschema/tools/ee_actions.cpp:584
 msgid "Display the selected sheet's contents in the Eeschema window"
 msgstr "在 Eeschema 窗口中显示所选图框的内容"
 
-#: eeschema/tools/ee_actions.cpp:595
+#: eeschema/tools/ee_actions.cpp:590
 msgid "Leave Sheet"
 msgstr "离开分页"
 
-#: eeschema/tools/ee_actions.cpp:595
+#: eeschema/tools/ee_actions.cpp:590
 msgid "Display the parent sheet in the Eeschema window"
 msgstr "在 Eeschema 窗口中显示父级图框"
 
-#: eeschema/tools/ee_actions.cpp:600
+#: eeschema/tools/ee_actions.cpp:595
 msgid "Show Hierarchy Navigator"
 msgstr "显示层次结构导航器"
 
-#: eeschema/tools/ee_actions.cpp:605
+#: eeschema/tools/ee_actions.cpp:600
 msgid "Highlight on PCB"
 msgstr "高亮 PCB"
 
-#: eeschema/tools/ee_actions.cpp:605
+#: eeschema/tools/ee_actions.cpp:600
 msgid "Highlight corresponding items in PCBNew"
 msgstr "高亮显示 PCBNew 中的相应项目"
 
-#: eeschema/tools/ee_actions.cpp:610
+#: eeschema/tools/ee_actions.cpp:605
 msgid "Show Hidden Pins"
 msgstr "显示隐藏引脚"
 
-#: eeschema/tools/ee_actions.cpp:615
+#: eeschema/tools/ee_actions.cpp:610
 msgid "Show Hidden Fields"
 msgstr "显示隐藏字段"
 
-#: eeschema/tools/ee_actions.cpp:620
+#: eeschema/tools/ee_actions.cpp:615
 msgid "Force H/V Wires and Buses"
 msgstr "强制水平或垂直绘制连线和总线"
 
-#: eeschema/tools/ee_actions.cpp:628
+#: eeschema/tools/ee_actions.cpp:623
 msgid "Add Junctions to Selection where needed"
 msgstr "根据需要将连接点添加到选择"
 
-#: eeschema/tools/ee_actions.cpp:633
+#: eeschema/tools/ee_actions.cpp:628
 msgid "Add Wire"
 msgstr "添加连线"
 
-#: eeschema/tools/ee_actions.cpp:633
+#: eeschema/tools/ee_actions.cpp:628
 msgid "Add a wire"
 msgstr "添加连线"
 
-#: eeschema/tools/ee_actions.cpp:639
+#: eeschema/tools/ee_actions.cpp:634
 msgid "Add Bus"
 msgstr "添加总线"
 
-#: eeschema/tools/ee_actions.cpp:639
+#: eeschema/tools/ee_actions.cpp:634
 msgid "Add a bus"
 msgstr "添加总线"
 
-#: eeschema/tools/ee_actions.cpp:645
+#: eeschema/tools/ee_actions.cpp:640
 #: 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:645
+#: eeschema/tools/ee_actions.cpp:640
 msgid "Break a wire out of a bus"
 msgstr "断开总线上的连线"
 
-#: eeschema/tools/ee_actions.cpp:657
+#: eeschema/tools/ee_actions.cpp:652
 msgid "Finish Wire or Bus"
 msgstr "结束电线或总线"
 
-#: eeschema/tools/ee_actions.cpp:657
+#: eeschema/tools/ee_actions.cpp:652
 msgid "Complete drawing at current segment"
 msgstr "在当前线段处结束绘制"
 
-#: eeschema/tools/ee_actions.cpp:662
+#: eeschema/tools/ee_actions.cpp:657
 msgid "Finish Wire"
 msgstr "结束连线"
 
-#: eeschema/tools/ee_actions.cpp:662
+#: eeschema/tools/ee_actions.cpp:657
 msgid "Complete wire with current segment"
 msgstr "结束连线并保留当前连线线段"
 
-#: eeschema/tools/ee_actions.cpp:667
+#: eeschema/tools/ee_actions.cpp:662
 msgid "Finish Bus"
 msgstr "结束总线"
 
-#: eeschema/tools/ee_actions.cpp:667
+#: eeschema/tools/ee_actions.cpp:662
 msgid "Complete bus with current segment"
 msgstr "结束总线并保留当前总线线段"
 
-#: eeschema/tools/ee_actions.cpp:672
+#: eeschema/tools/ee_actions.cpp:667
 msgid "Finish Lines"
 msgstr "完成线"
 
-#: eeschema/tools/ee_actions.cpp:672
+#: eeschema/tools/ee_actions.cpp:667
 msgid "Complete connected lines with current segment"
 msgstr "完成与当前段的连接线"
 
-#: eeschema/tools/ee_actions.cpp:681 pagelayout_editor/tools/pl_actions.cpp:67
+#: eeschema/tools/ee_actions.cpp:676 pagelayout_editor/tools/pl_actions.cpp:67
 #: pcbnew/dialogs/panel_edit_options_base.cpp:176
 #: pcbnew/tools/pcb_actions.cpp:199
 msgid "Move"
 msgstr "移动"
 
-#: eeschema/tools/ee_actions.cpp:681 pagelayout_editor/tools/pl_actions.cpp:67
+#: eeschema/tools/ee_actions.cpp:676 pagelayout_editor/tools/pl_actions.cpp:67
 #: pcbnew/tools/pcb_actions.cpp:199
 msgid "Moves the selected item(s)"
 msgstr "移动选择项"
 
-#: eeschema/tools/ee_actions.cpp:686 pcbnew/tools/edit_tool.cpp:556
+#: eeschema/tools/ee_actions.cpp:681 pcbnew/tools/edit_tool.cpp:581
 msgid "Drag"
 msgstr "拖动"
 
-#: eeschema/tools/ee_actions.cpp:686
+#: eeschema/tools/ee_actions.cpp:681
 msgid "Drags the selected item(s)"
 msgstr "拖动所选项目"
 
-#: eeschema/tools/ee_actions.cpp:690
+#: eeschema/tools/ee_actions.cpp:685
 msgid "Move Activate"
 msgstr "移动激活"
 
-#: eeschema/tools/ee_actions.cpp:694
+#: eeschema/tools/ee_actions.cpp:689
 msgid "Symbol Move Activate"
 msgstr "符号移动激活"
 
@@ -13480,17 +13825,16 @@ msgstr "  标准"
 msgid "No off grid or duplicate pins were found."
 msgstr "没有发现网格外或重复的引脚。"
 
-#: eeschema/tools/ee_selection_tool.cpp:518
-#: pagelayout_editor/tools/pl_selection_tool.cpp:233
-#: pcbnew/tools/selection_tool.cpp:450
-msgid "Clarify Selection"
-msgstr "明确选择"
-
-#: eeschema/tools/ee_selection_tool.cpp:1111
-#: pcbnew/tools/selection_tool.cpp:1398
+#: eeschema/tools/ee_selection_tool.cpp:1130
+#: pcbnew/tools/selection_tool.cpp:1528
 msgid "Select &All\tA"
 msgstr "全选 (&A)\tA"
 
+#: eeschema/tools/ee_selection_tool.cpp:1133
+#: pcbnew/tools/selection_tool.cpp:1531
+msgid "&Expand Selection\tE"
+msgstr "展开选定内容 (&E)\tE"
+
 #: eeschema/tools/lib_control.cpp:318 eeschema/tools/lib_control.cpp:358
 msgid "No symbol to export"
 msgstr "没有要导出的符号"
@@ -13516,7 +13860,7 @@ msgstr "当前没有打开原理图。"
 msgid "Edit Component Name"
 msgstr "编辑元件名称"
 
-#: eeschema/tools/lib_edit_tool.cpp:485 eeschema/tools/sch_edit_tool.cpp:1107
+#: eeschema/tools/lib_edit_tool.cpp:485 eeschema/tools/sch_edit_tool.cpp:1128
 #, c-format
 msgid "Edit %s Field"
 msgstr "编辑 %s 字段"
@@ -13530,67 +13874,83 @@ msgstr "这个位置已经被另一个引脚占用, 在单元 %d。"
 msgid "Place Pin Anyway"
 msgstr "任意位置放置引脚"
 
-#: eeschema/tools/sch_drawing_tools.cpp:372
-#: pagelayout_editor/pl_editor_frame.cpp:790
-#: pagelayout_editor/pl_editor_frame.cpp:798
+#: eeschema/tools/sch_drawing_tools.cpp:371
+#: pagelayout_editor/pl_editor_frame.cpp:781
+#: pagelayout_editor/pl_editor_frame.cpp:789
 #, c-format
 msgid "Couldn't load image from \"%s\""
 msgstr "无法从 \"%s\" 加载图片"
 
-#: eeschema/tools/sch_drawing_tools.cpp:829
+#: eeschema/tools/sch_drawing_tools.cpp:813
 msgid "Click over a sheet."
 msgstr "单击图框。"
 
-#: eeschema/tools/sch_drawing_tools.cpp:842
+#: eeschema/tools/sch_drawing_tools.cpp:826
 msgid "No new hierarchical labels found."
 msgstr "没有找到新的层次标签。"
 
-#: eeschema/tools/sch_edit_tool.cpp:68
+#: eeschema/tools/sch_edit_tool.cpp:72
 msgid "Symbol Unit"
 msgstr "符号单元"
 
-#: eeschema/tools/sch_edit_tool.cpp:88
+#: eeschema/tools/sch_edit_tool.cpp:92
 msgid "no symbol selected"
 msgstr "没有选择符号"
 
-#: eeschema/tools/sch_edit_tool.cpp:97
+#: eeschema/tools/sch_edit_tool.cpp:101
 msgid "symbol is not multi-unit"
 msgstr "符号不是多单元"
 
-#: eeschema/tools/sch_edit_tool.cpp:1048 pcbnew/tools/pcbnew_control.cpp:450
+#: eeschema/tools/sch_edit_tool.cpp:1069 pcbnew/tools/pcbnew_control.cpp:474
 msgid "Item locked."
 msgstr "项目已锁定。"
 
-#: eeschema/tools/sch_edit_tool.cpp:1588
+#: eeschema/tools/sch_edit_tool.cpp:1678
 msgid "There are no unreferenced pins in this sheet to remove."
 msgstr "此图框中没有要删除的未引用引脚。"
 
-#: eeschema/tools/sch_edit_tool.cpp:1592
+#: eeschema/tools/sch_edit_tool.cpp:1682
 msgid "Do you wish to delete the unreferenced pins from this sheet?"
 msgstr "您是否希望从此表中删除未引用的引脚？"
 
-#: eeschema/tools/sch_editor_control.cpp:454
+#: eeschema/tools/sch_editor_control.cpp:455
 msgid "Reached end of schematic."
 msgstr "到达原理图的末尾。"
 
-#: eeschema/tools/sch_editor_control.cpp:455
+#: eeschema/tools/sch_editor_control.cpp:456
 msgid "Reached end of sheet."
 msgstr "到达图框的末尾。"
 
-#: eeschema/tools/sch_editor_control.cpp:458
+#: eeschema/tools/sch_editor_control.cpp:459
 msgid " Find again to wrap around to the start."
 msgstr " 再次查找到开始。"
 
-#: eeschema/tools/sch_editor_control.cpp:836
+#: eeschema/tools/sch_editor_control.cpp:839
 msgid "Error: duplicate sub-sheet names found in current sheet."
 msgstr "错误：在当前图框中找到重复的子图框名称。"
 
-#: eeschema/tools/sch_editor_control.cpp:865
+#: eeschema/tools/sch_editor_control.cpp:873
 #, c-format
 msgid "Highlighted net: %s"
 msgstr "高亮网络：%s"
 
-#: eeschema/tools/sch_editor_control.cpp:1302
+#: eeschema/tools/sch_editor_control.cpp:927
+msgid "Net must be labelled to assign a netclass."
+msgstr "网络必须加上标签才能分配网络类。"
+
+#: eeschema/tools/sch_editor_control.cpp:938
+msgid "Netclasses"
+msgstr "网络类"
+
+#: eeschema/tools/sch_editor_control.cpp:951
+msgid "Assign Netclass"
+msgstr "分配网络类"
+
+#: eeschema/tools/sch_editor_control.cpp:952
+msgid "Select netclass:"
+msgstr "选择网络类："
+
+#: eeschema/tools/sch_editor_control.cpp:1392
 #, c-format
 msgid ""
 "The pasted sheet \"%s\"\n"
@@ -13605,8 +13965,8 @@ msgid "No bus selected"
 msgstr "未选择总线"
 
 #: eeschema/tools/sch_line_wire_bus_tool.cpp:139
-msgid "Bus has no connections"
-msgstr "总线无连接"
+msgid "Bus has no members"
+msgstr "总线没有成员"
 
 #: eeschema/widgets/tuner_slider_base.cpp:24
 msgid " X "
@@ -13706,35 +14066,39 @@ msgstr "全选"
 msgid "Deselect all"
 msgstr "取消全选"
 
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:108
+#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:109
 msgid "Select Layer:"
 msgstr "选择层："
 
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:148
-#: gerbview/select_layers_to_pcb.cpp:305 gerbview/select_layers_to_pcb.cpp:352
+#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:152
+#: gerbview/select_layers_to_pcb.cpp:337 gerbview/select_layers_to_pcb.cpp:384
 msgid "Hole data"
 msgstr "通孔数据"
 
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:156
-#: gerbview/select_layers_to_pcb.cpp:191 gerbview/select_layers_to_pcb.cpp:300
-#: gerbview/select_layers_to_pcb.cpp:344
+#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:160
+#: gerbview/select_layers_to_pcb.cpp:177 gerbview/select_layers_to_pcb.cpp:231
+#: gerbview/select_layers_to_pcb.cpp:286 gerbview/select_layers_to_pcb.cpp:332
+#: gerbview/select_layers_to_pcb.cpp:376
 msgid "Do not export"
 msgstr "不导出"
 
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:164
+#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:168
+#: pcbnew/board_connected_item.cpp:221 pcbnew/board_connected_item.cpp:222
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:62
-#: pcbnew/class_drawsegment.cpp:440 pcbnew/class_pad.cpp:738
-#: pcbnew/class_pcb_text.cpp:126 pcbnew/class_text_mod.cpp:318
-#: pcbnew/class_zone.cpp:656 pcbnew/dialogs/dialog_copper_zones_base.cpp:22
+#: pcbnew/class_board_item.cpp:169 pcbnew/class_drawsegment.cpp:505
+#: pcbnew/class_module.cpp:1639 pcbnew/class_module.cpp:1642
+#: pcbnew/class_pad.cpp:688 pcbnew/class_pcb_text.cpp:122
+#: pcbnew/class_text_mod.cpp:309 pcbnew/class_track.cpp:1020
+#: pcbnew/class_zone.cpp:685 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:51
+#: pcbnew/dialogs/panel_modedit_defaults.cpp:52
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:47
 #: pcbnew/text_mod_grid_table.cpp:94
 msgid "Layer"
 msgstr "层"
 
-#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:177
+#: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:181
 #: pcbnew/microwave/microwave_polygon.cpp:122
 msgid "OK"
 msgstr "确定"
@@ -13836,7 +14200,7 @@ msgstr "没有定义编辑器, 请选择一个"
 msgid "No file loaded on the active layer %d"
 msgstr "没有文件加载到当前工作层 %d"
 
-#: gerbview/events_called_functions.cpp:282 pcbnew/pcb_edit_frame.cpp:814
+#: gerbview/events_called_functions.cpp:282 pcbnew/pcb_edit_frame.cpp:851
 msgid "Visibles"
 msgstr "可见"
 
@@ -13980,35 +14344,45 @@ msgstr "载入 Gerber 文件..."
 msgid "Loading %u/%zu %s"
 msgstr "加载 %u/%zu %s"
 
-#: gerbview/files.cpp:402
+#: gerbview/files.cpp:324
+#, c-format
+msgid "<b>A gerber job file cannot be loaded as a plot file</b> <i>%s</i>"
+msgstr "<b>Gerber 作业文件无法作为绘制文件加载</b><i>%s</i>"
+
+#: gerbview/files.cpp:412
 msgid "Open NC (Excellon) Drill File(s)"
 msgstr "打开 NC (Excellon) 钻孔文件"
 
-#: gerbview/files.cpp:499
+#: gerbview/files.cpp:509
 #, c-format
 msgid "Zip file \"%s\" cannot be opened"
 msgstr "无法打开 Zip 文件 \"%s\""
 
-#: gerbview/files.cpp:541
+#: gerbview/files.cpp:551
 #, c-format
 msgid "Info: skip file \"%s\" (unknown type)\n"
 msgstr "信息: 跳过文件 \"%s\"（未知类型）\n"
 
-#: gerbview/files.cpp:582
+#: gerbview/files.cpp:563
+#, c-format
+msgid "Info: skip file \"%s\" (gerber job file)\n"
+msgstr "信息: 跳过文件 \"%s\"（Gerber 作业文件）\n"
+
+#: gerbview/files.cpp:604
 #, c-format
 msgid "<b>Unable to create temporary file \"%s\"</b>\n"
 msgstr "<b>无法创建临时文件 \"%s\"<b>\n"
 
-#: gerbview/files.cpp:612
+#: gerbview/files.cpp:634
 #, c-format
 msgid "<b>unzipped file %s read error</b>\n"
 msgstr "<b>解压缩文件 %s 读取错误</b>\n"
 
-#: gerbview/files.cpp:647
+#: gerbview/files.cpp:669
 msgid "Open Zip File"
 msgstr "打开 Zip 文件"
 
-#: gerbview/files.cpp:681 gerbview/job_file_reader.cpp:236
+#: gerbview/files.cpp:703 gerbview/job_file_reader.cpp:236
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:91
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:206
 msgid "Messages"
@@ -14043,9 +14417,9 @@ msgstr "黑"
 msgid "Polarity"
 msgstr "极性"
 
-#: gerbview/gerber_draw_item.cpp:711 pcbnew/class_pcb_text.cpp:129
-#: pcbnew/class_pcb_text.cpp:131 pcbnew/class_text_mod.cpp:325
-#: pcbnew/tools/edit_tool.cpp:829 pcbnew/tools/pcb_actions.cpp:245
+#: 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:858 pcbnew/tools/pcb_actions.cpp:250
 msgid "Mirror"
 msgstr "镜像"
 
@@ -14053,7 +14427,8 @@ msgstr "镜像"
 msgid "AB axis"
 msgstr "AB 轴"
 
-#: gerbview/gerber_draw_item.cpp:727 gerbview/toolbars_gerber.cpp:120
+#: gerbview/gerber_draw_item.cpp:727 gerbview/toolbars_gerber.cpp:132
+#: gerbview/toolbars_gerber.cpp:135
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:25
 msgid "Net:"
 msgstr "网络："
@@ -14118,12 +14493,12 @@ msgstr "清除最近的钻孔文件"
 msgid "Clear Recent Job Files"
 msgstr "清除最近的作业文件"
 
-#: gerbview/gerbview_frame.cpp:136 pcbnew/footprint_edit_frame.cpp:216
-#: pcbnew/footprint_edit_frame.cpp:639 pcbnew/pcb_edit_frame.cpp:248
+#: gerbview/gerbview_frame.cpp:140 pcbnew/footprint_edit_frame.cpp:215
+#: pcbnew/footprint_edit_frame.cpp:634 pcbnew/pcb_edit_frame.cpp:249
 msgid "Layers Manager"
 msgstr "层管理器"
 
-#: gerbview/gerbview_frame.cpp:154 pcbnew/pcb_edit_frame.cpp:278
+#: gerbview/gerbview_frame.cpp:158 pcbnew/pcb_edit_frame.cpp:287
 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 "
@@ -14141,49 +14516,49 @@ msgstr ""
 "\n"
 "如果以后要选择, 请在 \"首选项\" 菜单中选择 \"显卡加速\"。"
 
-#: gerbview/gerbview_frame.cpp:161 pcbnew/pcb_edit_frame.cpp:285
+#: gerbview/gerbview_frame.cpp:165 pcbnew/pcb_edit_frame.cpp:294
 msgid "Enable Graphics Acceleration"
 msgstr "启用显卡加速"
 
-#: gerbview/gerbview_frame.cpp:163 pcbnew/pcb_edit_frame.cpp:287
+#: gerbview/gerbview_frame.cpp:167 pcbnew/pcb_edit_frame.cpp:296
 msgid "&Enable Acceleration"
 msgstr "启用加速 (&E)"
 
-#: gerbview/gerbview_frame.cpp:163 pcbnew/pcb_edit_frame.cpp:287
+#: gerbview/gerbview_frame.cpp:167 pcbnew/pcb_edit_frame.cpp:296
 msgid "&No Thanks"
 msgstr "不，谢谢 (&N)"
 
-#: gerbview/gerbview_frame.cpp:593
+#: gerbview/gerbview_frame.cpp:597
 msgid "D Codes"
 msgstr "D 码"
 
-#: gerbview/gerbview_frame.cpp:701
+#: gerbview/gerbview_frame.cpp:705
 #, c-format
 msgid "Drawing layer %d not in use"
 msgstr "绘图层 %d 没有使用"
 
-#: gerbview/gerbview_frame.cpp:713 gerbview/menubar.cpp:141
+#: gerbview/gerbview_frame.cpp:717 gerbview/menubar.cpp:141
 msgid "GerbView"
 msgstr "GerbView"
 
-#: gerbview/gerbview_frame.cpp:715
+#: gerbview/gerbview_frame.cpp:719
 msgid " (with X2 attributes)"
 msgstr " (X2 属性)"
 
-#: gerbview/gerbview_frame.cpp:723
+#: gerbview/gerbview_frame.cpp:727
 #, c-format
 msgid "Image name: \"%s\"  Layer name: \"%s\""
 msgstr "图片名称：\"%s\" 图层名称 \"%s\""
 
-#: gerbview/gerbview_frame.cpp:739
+#: gerbview/gerbview_frame.cpp:743
 msgid "X2 attr"
 msgstr "X2 属性"
 
-#: gerbview/gerbview_frame.cpp:1137
+#: gerbview/gerbview_frame.cpp:1142
 msgid "Gerbview"
 msgstr "GerbView"
 
-#: gerbview/gerbview_layer_widget.cpp:81 pcbnew/class_track.cpp:681
+#: gerbview/gerbview_layer_widget.cpp:81 pcbnew/class_track.cpp:675
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:46 pcbnew/layer_widget.cpp:525
 #: pcbnew/pcb_layer_widget.cpp:326
 msgid "Layers"
@@ -14369,68 +14744,73 @@ msgstr "RS274X: 命令 \"IR\" 旋转值不允许"
 msgid "RS274X: Command KNOCKOUT ignored by GerbView"
 msgstr "RS274X: GerbView 命令 KNOCKOUT 被忽略"
 
-#: gerbview/select_layers_to_pcb.cpp:159
+#: gerbview/select_layers_to_pcb.cpp:151
 #, c-format
 msgid "Layer %d"
 msgstr "层 %d"
 
-#: gerbview/select_layers_to_pcb.cpp:393
+#: gerbview/select_layers_to_pcb.cpp:218
+msgid "Gerbers with known layers: "
+msgstr "已知层的 Gerbers： "
+
+#: gerbview/select_layers_to_pcb.cpp:220
+msgid "Automatic Layer Assignment"
+msgstr "自动指定图层"
+
+#: gerbview/select_layers_to_pcb.cpp:425
 msgid ""
 "Exported board does not have enough copper layers to handle selected inner "
 "layers"
 msgstr "导出的电路板没有足够的铜层来处理选定的内层"
 
-#: gerbview/toolbars_gerber.cpp:53
+#: gerbview/toolbars_gerber.cpp:58
 msgid "Clear all layers"
 msgstr "清除所有层"
 
-#: gerbview/toolbars_gerber.cpp:57
+#: gerbview/toolbars_gerber.cpp:62
 msgid "Reload all layers"
 msgstr "重新加载所有图层"
 
-#: gerbview/toolbars_gerber.cpp:64
-msgid "Print layers"
-msgstr "打印"
-
-#: gerbview/toolbars_gerber.cpp:107
-msgid "Highlight items belonging to this component"
-msgstr "高亮显示属于此元件的项目"
-
-#: gerbview/toolbars_gerber.cpp:108
+#: gerbview/toolbars_gerber.cpp:118 gerbview/toolbars_gerber.cpp:121
 msgid "Cmp: "
 msgstr "元件： "
 
-#: gerbview/toolbars_gerber.cpp:119
+#: gerbview/toolbars_gerber.cpp:120
+msgid "Highlight items belonging to this component"
+msgstr "高亮显示属于此元件的项目"
+
+#: gerbview/toolbars_gerber.cpp:134
 msgid "Highlight items belonging to this net"
 msgstr "高亮显示属于此网络的项目"
 
-#: gerbview/toolbars_gerber.cpp:131
-msgid "Highlight items with this aperture attribute"
-msgstr "高亮显示此光圈属性"
-
-#: gerbview/toolbars_gerber.cpp:132
+#: gerbview/toolbars_gerber.cpp:146 gerbview/toolbars_gerber.cpp:149
 msgid "Attr:"
 msgstr "属性："
 
-#: gerbview/toolbars_gerber.cpp:143
+#: gerbview/toolbars_gerber.cpp:148
+msgid "Highlight items with this aperture attribute"
+msgstr "高亮显示此光圈属性"
+
+#: gerbview/toolbars_gerber.cpp:160 gerbview/toolbars_gerber.cpp:162
 msgid "DCode:"
 msgstr "D 码："
 
-#: gerbview/toolbars_gerber.cpp:242
+#: gerbview/toolbars_gerber.cpp:258
 msgid "Show/hide the layers manager toolbar"
 msgstr "显示/隐藏层管理工具栏"
 
-#: gerbview/toolbars_gerber.cpp:249
+#: gerbview/toolbars_gerber.cpp:265
 msgid "<No selection>"
 msgstr "<没有选择>"
 
 #: gerbview/tools/gerbview_actions.cpp:60
-msgid "Open Gerber File(s)..."
-msgstr "打开 Gerber 文件..."
+msgid "Open Gerber Plot File(s)..."
+msgstr "打开 Gerber 绘制文件..."
 
 #: gerbview/tools/gerbview_actions.cpp:61
-msgid "Open Gerber file(s) on the current layer. Previous data will be deleted"
-msgstr "打开当前图层上的 Gerber 文件。 以前的数据将被删除"
+msgid ""
+"Open Gerber plot file(s) on the current layer. Previous data will be deleted"
+msgstr "打开当前图层上的 Gerber 绘制文件。 以前的数据将被删除"
 
 #: gerbview/tools/gerbview_actions.cpp:66
 msgid "Open Excellon Drill File(s)..."
@@ -14447,16 +14827,16 @@ msgid "Open Gerber Job File..."
 msgstr "打开 Gerber 工作文件..."
 
 #: gerbview/tools/gerbview_actions.cpp:73
-msgid "Open a Gerber job file and its associated gerber files"
-msgstr "打开 Gerber 作业文件及其关联的 Gerber 文件"
+msgid "Open a Gerber job file and its associated gerber plot files"
+msgstr "打开 Gerber 作业文件及其关联的 Gerber 绘制文件"
 
 #: gerbview/tools/gerbview_actions.cpp:78
 msgid "Open Zip Archive File..."
-msgstr "打开 Zip 归档文件..."
+msgstr "打开 Zip 压缩文件..."
 
 #: gerbview/tools/gerbview_actions.cpp:79
 msgid "Open a zipped archive (Gerber and Drill) file"
-msgstr "打开一个压缩归档 (Gerber 和钻孔) 文件"
+msgstr "打开一个 Zip 压缩 (Gerber 和钻孔) 文件"
 
 #: gerbview/tools/gerbview_actions.cpp:88
 msgid "Clear Highlight"
@@ -14530,22 +14910,22 @@ msgstr "在比较模式下显示图层"
 msgid "Highlight"
 msgstr "高亮"
 
-#: gerbview/tools/gerbview_selection_tool.cpp:71
+#: gerbview/tools/gerbview_selection_tool.cpp:73
 #, c-format
 msgid "Highlight Items of Component \"%s\""
 msgstr "高亮元件 \"%s\""
 
-#: gerbview/tools/gerbview_selection_tool.cpp:79
+#: gerbview/tools/gerbview_selection_tool.cpp:81
 #, c-format
 msgid "Highlight Items of Net \"%s\""
 msgstr "高亮网络 \"%s\""
 
-#: gerbview/tools/gerbview_selection_tool.cpp:89
+#: gerbview/tools/gerbview_selection_tool.cpp:91
 #, c-format
 msgid "Highlight Aperture Type \"%s\""
 msgstr "高亮光圈类型 \"%s\""
 
-#: gerbview/tools/gerbview_selection_tool.cpp:421
+#: gerbview/tools/gerbview_selection_tool.cpp:423
 msgid "Clarify selection"
 msgstr "明确选择"
 
@@ -14577,10 +14957,23 @@ msgstr "插件类型"
 msgid "Active"
 msgstr "活动的"
 
+#: include/netclass.h:161
+#, c-format
+msgid "'%s' netclass"
+msgstr "'%s' 网络类"
+
+#: include/panel_hotkeys_editor.h:63
+msgid "Reset all hotkeys to the built-in KiCad defaults"
+msgstr "将所有快捷键设置为 KiCad 的默认值"
+
 #: include/widgets/infobar.h:98
 msgid "Hide this message."
 msgstr "隐藏此消息。"
 
+#: include/widgets/resettable_panel.h:54
+msgid "Reset all settings on this page to their default"
+msgstr "将此页面上的所有设置重置为其默认值"
+
 #: kicad/dialogs/dialog_template_selector.cpp:125
 msgid "<html><h1>Template Selector</h1></html>"
 msgstr "<html><h1>选择模板</h1></html>"
@@ -14612,15 +15005,15 @@ msgstr "工程模板标题"
 msgid "Project Template Selector"
 msgstr "选择工程模板"
 
-#: kicad/files-io.cpp:49
+#: kicad/files-io.cpp:42
 msgid "KiCad project file"
 msgstr "KiCad 工程文件"
 
-#: kicad/files-io.cpp:108
+#: kicad/files-io.cpp:62
 msgid "Unzip Project"
 msgstr "解压工程"
 
-#: kicad/files-io.cpp:115
+#: kicad/files-io.cpp:69
 #, c-format
 msgid ""
 "\n"
@@ -14629,69 +15022,28 @@ msgstr ""
 "\n"
 "打开 \"%s\"\n"
 
-#: kicad/files-io.cpp:118
+#: kicad/files-io.cpp:72
 msgid "Target Directory"
 msgstr "目标目录"
 
-#: kicad/files-io.cpp:124
+#: kicad/files-io.cpp:78
 #, c-format
 msgid "Unzipping project in \"%s\"\n"
 msgstr "解压工程到 \"%s\"\n"
 
-#: kicad/files-io.cpp:143
-#, c-format
-msgid "Extract file \"%s\""
-msgstr "解压文件 \"%s\""
-
-#: kicad/files-io.cpp:178
-msgid " OK\n"
-msgstr " 确定\n"
-
-#: kicad/files-io.cpp:181
-msgid " *ERROR*\n"
-msgstr " *错误*\n"
-
-#: kicad/files-io.cpp:225
+#: kicad/files-io.cpp:113
 msgid "Archive Project Files"
-msgstr "归档工程文件"
+msgstr "压缩工程文件"
 
-#: kicad/files-io.cpp:249
-#, c-format
-msgid "Unable to create zip archive file \"%s\""
-msgstr "无法创建 zip 归档文件 \"%s\""
-
-#: kicad/files-io.cpp:276
-#, c-format
-msgid "Archive file \"%s\""
-msgstr "归档文件 \"%s\""
-
-#: kicad/files-io.cpp:290
-#, c-format
-msgid "(%lu bytes, compressed %d bytes)\n"
-msgstr "(%lu 字节, 压缩 %d 字节)\n"
-
-#: kicad/files-io.cpp:296
-msgid " >>Error\n"
-msgstr " >>错误\n"
-
-#: kicad/files-io.cpp:303
-#, c-format
-msgid ""
-"\n"
-"Zip archive \"%s\" created (%d bytes)"
-msgstr ""
-"\n"
-"Zip 归档 \"%s\" 创建 (%d 字节)"
-
-#: kicad/import_project.cpp:61
+#: kicad/import_project.cpp:56
 msgid "Import Eagle Project Files"
 msgstr "导入 Eagle 工程文件"
 
-#: kicad/import_project.cpp:82
+#: kicad/import_project.cpp:77
 msgid "KiCad Project Destination"
 msgstr "KiCad 工程目标"
 
-#: kicad/import_project.cpp:98
+#: kicad/import_project.cpp:93
 msgid ""
 "The selected directory is not empty.  We recommend you create projects in "
 "their own clean directory.\n"
@@ -14702,25 +15054,11 @@ msgstr ""
 "\n"
 "您要创建一个与工程同名的新目录吗?"
 
-#: kicad/import_project.cpp:139 pcbnew/pcb_edit_frame.cpp:1127
-msgid "Eeschema failed to load:\n"
-msgstr "Eeschema 无法加载:\n"
-
-#: kicad/import_project.cpp:140 kicad/import_project.cpp:174
-#: kicad/tools/kicad_manager_control.cpp:594 pcbnew/pcb_edit_frame.cpp:1098
-#: pcbnew/pcb_edit_frame.cpp:1128
-msgid "KiCad Error"
-msgstr "KiCad 错误"
-
-#: kicad/import_project.cpp:174
-msgid "Pcbnew failed to load:\n"
-msgstr "Pcbnew 无法加载：\n"
-
-#: kicad/kicad_manager_frame.cpp:441
+#: kicad/kicad_manager_frame.cpp:472
 msgid "Load File to Edit"
 msgstr "打开文件编辑"
 
-#: kicad/kicad_manager_frame.cpp:537
+#: kicad/kicad_manager_frame.cpp:565
 #, c-format
 msgid ""
 "Project name:\n"
@@ -14743,11 +15081,11 @@ msgstr "导入 EAGLE CAD XML 原理图和电路板"
 
 #: kicad/menubar.cpp:87
 msgid "&Archive Project..."
-msgstr "归档工程... (&A)"
+msgstr "压缩工程... (&A)"
 
 #: kicad/menubar.cpp:88
 msgid "Archive all needed project files into zip archive"
-msgstr "把当前工程归档成 Zip 文件"
+msgstr "把当前工程压缩成 Zip 文件"
 
 #: kicad/menubar.cpp:92
 msgid "&Unarchive Project..."
@@ -14775,7 +15113,7 @@ msgstr "在文本编辑器中编辑本地文件"
 
 #: kicad/menubar.cpp:190
 msgid "Archive all project files"
-msgstr "归档全部工程文件"
+msgstr "压缩全部工程文件"
 
 #: kicad/menubar.cpp:203
 msgid "Reveal project folder in Finder"
@@ -14785,19 +15123,19 @@ msgstr "在查找器中显示工程文件夹"
 msgid "Open project directory in file explorer"
 msgstr "在文件资源管理器中打开工程目录"
 
-#: kicad/project_template.cpp:51
+#: kicad/project_template.cpp:52
 msgid "Could open the template path! "
 msgstr "可以打开模板路径！ "
 
-#: kicad/project_template.cpp:56
+#: kicad/project_template.cpp:57
 msgid "Couldn't open the meta information directory for this template! "
 msgstr "无法打开此模板的元信息目录！ "
 
-#: kicad/project_template.cpp:62
+#: kicad/project_template.cpp:63
 msgid "Cound't find the meta HTML information file for this template!"
 msgstr "找不到此模板的元 HTML 信息文件！"
 
-#: kicad/project_template.cpp:223
+#: kicad/project_template.cpp:224
 #, c-format
 msgid "Cannot create folder \"%s\"."
 msgstr "无法创建文件夹 \"%s\"。"
@@ -14887,8 +15225,8 @@ msgid "Create New Project"
 msgstr "新建工程"
 
 #: kicad/tools/kicad_manager_control.cpp:118
-#: kicad/tools/kicad_manager_control.cpp:216
-#: kicad/tools/kicad_manager_control.cpp:517
+#: kicad/tools/kicad_manager_control.cpp:215
+#: kicad/tools/kicad_manager_control.cpp:518
 #, c-format
 msgid ""
 "Directory \"%s\" could not be created.\n"
@@ -14926,66 +15264,71 @@ msgstr "未选中工程模板。无法生成新的工程。"
 msgid "New Project Folder"
 msgstr "新建工程文件夹"
 
-#: kicad/tools/kicad_manager_control.cpp:228
-#: kicad/tools/kicad_manager_control.cpp:526
+#: kicad/tools/kicad_manager_control.cpp:227
+#: kicad/tools/kicad_manager_control.cpp:527
 #, c-format
 msgid "Cannot write to folder \"%s\"."
 msgstr "无法写入到文件夹 \"%s\"。"
 
-#: kicad/tools/kicad_manager_control.cpp:229
-#: kicad/tools/kicad_manager_control.cpp:527
+#: kicad/tools/kicad_manager_control.cpp:228
+#: kicad/tools/kicad_manager_control.cpp:528
 msgid "Error!"
 msgstr "错误!"
 
-#: kicad/tools/kicad_manager_control.cpp:230
-#: kicad/tools/kicad_manager_control.cpp:528
+#: kicad/tools/kicad_manager_control.cpp:229
+#: kicad/tools/kicad_manager_control.cpp:529
 msgid "Please check your access permissions to this folder and try again."
 msgstr "请检查你对此文件夹的访问权限, 然后重试。"
 
-#: kicad/tools/kicad_manager_control.cpp:253
+#: kicad/tools/kicad_manager_control.cpp:252
 msgid "Overwriting files:"
 msgstr "覆盖文件："
 
-#: kicad/tools/kicad_manager_control.cpp:258
+#: kicad/tools/kicad_manager_control.cpp:257
 msgid "Similar files already exist in the destination folder."
 msgstr "目标文件夹中已存在类似文件。"
 
-#: kicad/tools/kicad_manager_control.cpp:276
+#: kicad/tools/kicad_manager_control.cpp:275
 msgid "A problem occurred creating new project from template!"
 msgstr "从模板创建工程出现问题!"
 
-#: kicad/tools/kicad_manager_control.cpp:277
+#: kicad/tools/kicad_manager_control.cpp:276
 msgid "Template Error"
 msgstr "模板错误"
 
-#: kicad/tools/kicad_manager_control.cpp:296
+#: kicad/tools/kicad_manager_control.cpp:298
 msgid "Open Existing Project"
 msgstr "打开已有工程"
 
-#: kicad/tools/kicad_manager_control.cpp:465
+#: kicad/tools/kicad_manager_control.cpp:466
 #, c-format
 msgid "Cannot copy folder \"%s\"."
 msgstr "无法复制 \"%s\" 文件夹。"
 
-#: kicad/tools/kicad_manager_control.cpp:497
+#: kicad/tools/kicad_manager_control.cpp:498
 msgid "Save Project To"
 msgstr "将工程保存到"
 
-#: kicad/tools/kicad_manager_control.cpp:594
+#: kicad/tools/kicad_manager_control.cpp:595
 msgid "Application failed to load:\n"
 msgstr "应用程序加载失败：\n"
 
-#: kicad/tools/kicad_manager_control.cpp:660
+#: kicad/tools/kicad_manager_control.cpp:595 pcbnew/pcb_edit_frame.cpp:1139
+#: pcbnew/pcb_edit_frame.cpp:1169
+msgid "KiCad Error"
+msgstr "KiCad 错误"
+
+#: kicad/tools/kicad_manager_control.cpp:661
 #, c-format
 msgid "%s closed [pid=%d]\n"
 msgstr "%s 关闭 [PID = %d]\n"
 
-#: kicad/tools/kicad_manager_control.cpp:720
+#: kicad/tools/kicad_manager_control.cpp:721
 #, c-format
 msgid "%s %s opened [pid=%ld]\n"
 msgstr "%s %s 打开 [PID = %ld]\n"
 
-#: kicad/tree_project_frame.cpp:249
+#: kicad/tree_project_frame.cpp:250
 #, c-format
 msgid ""
 "Current project directory:\n"
@@ -14994,122 +15337,122 @@ msgstr ""
 "当前工程目录：\n"
 "%s"
 
-#: kicad/tree_project_frame.cpp:250
+#: kicad/tree_project_frame.cpp:251
 msgid "Create New Directory"
 msgstr "创建新目录"
 
-#: kicad/tree_project_frame.cpp:629
+#: kicad/tree_project_frame.cpp:673
 msgid "Switch to this Project"
 msgstr "切换到此工程"
 
-#: kicad/tree_project_frame.cpp:630
+#: kicad/tree_project_frame.cpp:674
 msgid "Close all editors, and switch to the selected project"
 msgstr "关闭所有编辑器，然后切换到所选工程"
 
-#: kicad/tree_project_frame.cpp:637
+#: kicad/tree_project_frame.cpp:681
 msgid "New Directory..."
 msgstr "新目录..."
 
-#: kicad/tree_project_frame.cpp:638
+#: kicad/tree_project_frame.cpp:682
 msgid "Create a New Directory"
 msgstr "创建一个新目录"
 
-#: kicad/tree_project_frame.cpp:646 kicad/tree_project_frame.cpp:656
+#: kicad/tree_project_frame.cpp:690 kicad/tree_project_frame.cpp:700
 msgid "Reveal in Finder"
 msgstr "在查找器中显示"
 
-#: kicad/tree_project_frame.cpp:647
+#: kicad/tree_project_frame.cpp:691
 msgid "Reveals the directory in a Finder window"
 msgstr "在查找器窗口中显示目录"
 
-#: kicad/tree_project_frame.cpp:649
+#: kicad/tree_project_frame.cpp:693
 msgid "Open Directory in File Explorer"
 msgstr "在文件资源管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:650
+#: kicad/tree_project_frame.cpp:694
 msgid "Opens the directory in the default system file manager"
 msgstr "在默认系统文件管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:657
+#: kicad/tree_project_frame.cpp:701
 msgid "Reveals the directories in a Finder window"
 msgstr "在查找器窗口中显示目录"
 
-#: kicad/tree_project_frame.cpp:659
+#: kicad/tree_project_frame.cpp:703
 msgid "Open Directories in File Explorer"
 msgstr "在文件资源管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:660
+#: kicad/tree_project_frame.cpp:704
 msgid "Opens the directories in the default system file manager"
 msgstr "在默认系统文件管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:671
+#: kicad/tree_project_frame.cpp:715
 msgid "Open the file in a Text Editor"
 msgstr "在文本编辑器打开文件"
 
-#: kicad/tree_project_frame.cpp:673
+#: kicad/tree_project_frame.cpp:717
 msgid "Open files in a Text Editor"
 msgstr "在文本编辑器中打开文件"
 
-#: kicad/tree_project_frame.cpp:675
+#: kicad/tree_project_frame.cpp:719
 msgid "Edit in a Text Editor"
 msgstr "在文本编辑器中编辑"
 
-#: kicad/tree_project_frame.cpp:683
+#: kicad/tree_project_frame.cpp:727
 msgid "Rename File..."
 msgstr "重命名文件..."
 
-#: kicad/tree_project_frame.cpp:684
+#: kicad/tree_project_frame.cpp:728
 msgid "Rename file"
 msgstr "重命名"
 
-#: kicad/tree_project_frame.cpp:688
+#: kicad/tree_project_frame.cpp:732
 msgid "Rename Files..."
 msgstr "重命名文件..."
 
-#: kicad/tree_project_frame.cpp:689
+#: kicad/tree_project_frame.cpp:733
 msgid "Rename files"
 msgstr "重命名文件"
 
-#: kicad/tree_project_frame.cpp:698
+#: kicad/tree_project_frame.cpp:742
 msgid "Delete the file and its content"
 msgstr "删除文件及其内容"
 
-#: kicad/tree_project_frame.cpp:700
+#: kicad/tree_project_frame.cpp:744
 msgid "Delete the files and their contents"
 msgstr "删除文件及其内容"
 
-#: kicad/tree_project_frame.cpp:719
+#: kicad/tree_project_frame.cpp:763
 msgid "Print the contents of the file"
 msgstr "打印文件的内容"
 
-#: kicad/tree_project_frame.cpp:762
+#: kicad/tree_project_frame.cpp:806
 #, c-format
 msgid "Are you sure you want to delete '%s'?"
 msgstr "确定要删除 \"%s\"？"
 
-#: kicad/tree_project_frame.cpp:763
+#: kicad/tree_project_frame.cpp:807
 msgid "Delete Directory"
 msgstr "删除目录"
 
-#: kicad/tree_project_frame.cpp:763
+#: kicad/tree_project_frame.cpp:807
 msgid "Delete File"
 msgstr "删除文件"
 
-#: kicad/tree_project_frame.cpp:768
+#: kicad/tree_project_frame.cpp:812
 #, c-format
 msgid "Are you sure you want to delete %lu items?"
 msgstr "您确定要删除 %lu 个项目吗？"
 
-#: kicad/tree_project_frame.cpp:769
+#: kicad/tree_project_frame.cpp:813
 msgid "Delete Multiple Items"
 msgstr "删除多个项目"
 
-#: kicad/tree_project_frame.cpp:801
+#: kicad/tree_project_frame.cpp:845
 #, c-format
 msgid "Change filename: \"%s\""
 msgstr "修改文件名称：\"%s\""
 
-#: kicad/tree_project_frame.cpp:803
+#: kicad/tree_project_frame.cpp:847
 msgid "Change filename"
 msgstr "修改文件名称"
 
@@ -15157,7 +15500,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:426
+#: pcbnew/class_drawsegment.cpp:491
 msgid "Origin"
 msgstr "原点"
 
@@ -15405,48 +15748,48 @@ msgstr "文件 \"%s\" 写入"
 msgid "Save As"
 msgstr "另存为"
 
-#: pagelayout_editor/files.cpp:202 pcbnew/exporters/export_gencad.cpp:297
+#: pagelayout_editor/files.cpp:202 pcbnew/exporters/export_gencad.cpp:261
 #: pcbnew/exporters/gen_footprints_placefile.cpp:535
 #, c-format
 msgid "Unable to create \"%s\""
 msgstr "\"%s\" 无法建立"
 
-#: pagelayout_editor/pl_editor_frame.cpp:149
+#: pagelayout_editor/pl_editor_frame.cpp:148
 msgid "coord origin: Right Bottom page corner"
 msgstr "原点位置：图框左下角"
 
-#: pagelayout_editor/pl_editor_frame.cpp:174
+#: pagelayout_editor/pl_editor_frame.cpp:173
 msgid "Properties"
 msgstr "属性"
 
-#: pagelayout_editor/pl_editor_frame.cpp:251
+#: pagelayout_editor/pl_editor_frame.cpp:250
 #, c-format
 msgid "Error when loading file \"%s\""
 msgstr "<%s> 文件加载错误"
 
-#: pagelayout_editor/pl_editor_frame.cpp:357
+#: pagelayout_editor/pl_editor_frame.cpp:356
 msgid "Error Init Printer info"
 msgstr "初始化打印机信息出现错误"
 
-#: pagelayout_editor/pl_editor_frame.cpp:498
+#: pagelayout_editor/pl_editor_frame.cpp:497
 msgid "no file selected"
 msgstr "没有选中的文件"
 
-#: pagelayout_editor/pl_editor_frame.cpp:660
+#: pagelayout_editor/pl_editor_frame.cpp:654
 #, c-format
 msgid "Page size: width %.4g height %.4g"
 msgstr "图框尺寸: 宽 %.4g 高 %.4g"
 
-#: pagelayout_editor/pl_editor_frame.cpp:702
+#: pagelayout_editor/pl_editor_frame.cpp:693
 #, c-format
 msgid "coord origin: %s"
 msgstr "坐标原点: %s"
 
-#: pagelayout_editor/pl_editor_frame.cpp:836
+#: pagelayout_editor/pl_editor_frame.cpp:827
 msgid "New page layout file is unsaved"
 msgstr "新图框文件未保存"
 
-#: pagelayout_editor/pl_editor_frame.cpp:840
+#: pagelayout_editor/pl_editor_frame.cpp:831
 msgid "Page layout changes are unsaved"
 msgstr "图框更改未保存"
 
@@ -15558,6 +15901,10 @@ msgstr "编辑图框大小和标题块的预览数据"
 msgid "Error writing objects to clipboard"
 msgstr "将对象写入剪贴板时出错"
 
+#: pagelayout_editor/tools/pl_selection_tool.cpp:233
+msgid "Clarify Selection"
+msgstr "明确选择"
+
 #: pcb_calculator/UnitSelector.cpp:35 pcb_calculator/UnitSelector.cpp:67
 msgid "um"
 msgstr "um"
@@ -15973,12 +16320,6 @@ msgstr "W"
 msgid "Internal layer traces:"
 msgstr "内层布线："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:537
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:197
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:52
-msgid "Track Width"
-msgstr "布线宽度"
-
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:551
 msgid "Finished hole diameter (D):"
 msgstr "成品孔直径 (D)："
@@ -16084,7 +16425,7 @@ msgstr "热阻："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:760
 msgid "Using thermal conductivity value 401 Watts/(meter-Kelvin)"
-msgstr "使用导热系数 401 W/(米-开尔文)"
+msgstr "使用导热系数 401 瓦特/(米-开尔文)"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:768
 msgid "deg C/Watt"
@@ -16158,12 +16499,6 @@ msgstr ""
 "无法为过孔计算某些参数\n"
 "在铜区内。"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:869
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:198
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:53
-msgid "Via Size"
-msgstr "过孔外径"
-
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:885
 msgid "Voltage > 500V:"
 msgstr "电压 > 500V："
@@ -16410,8 +16745,9 @@ msgid "Z"
 msgstr "Z"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1297
-#: pcbnew/class_drawsegment.cpp:369 pcbnew/class_drawsegment.cpp:410
-#: pcbnew/class_pcb_text.cpp:134 pcbnew/class_text_mod.cpp:328
+#: pcbnew/class_drawsegment.cpp:434 pcbnew/class_drawsegment.cpp:475
+#: pcbnew/class_drawsegment.cpp:1192 pcbnew/class_pcb_text.cpp:130
+#: pcbnew/class_text_mod.cpp:319
 msgid "Angle"
 msgstr "角度"
 
@@ -17135,29 +17471,43 @@ msgstr "自动放置元件"
 msgid "Autoplace components"
 msgstr "自动放置元件"
 
-#: pcbnew/board_connected_item.cpp:136 pcbnew/class_track.cpp:165
-#: pcbnew/class_track.cpp:183 pcbnew/drc/drc_clearance_test_functions.cpp:201
+#: 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
+#: 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:150 pcbnew/drc/drc.cpp:536
-#: pcbnew/drc/drc_clearance_test_functions.cpp:623
+#: pcbnew/board_connected_item.cpp:151 pcbnew/drc/drc.cpp:503
+#: pcbnew/drc/drc_clearance_test_functions.cpp:481 qa/drc_proto/drc.cpp:536
+#: qa/drc_proto/drc_clearance_test_functions.cpp:623
 msgid "board edge"
 msgstr "电路板边缘"
 
-#: pcbnew/board_connected_item.cpp:173 pcbnew/class_track.cpp:150
-#: pcbnew/class_track.cpp:176 pcbnew/class_zone.cpp:395
-#: pcbnew/drc/drc_clearance_test_functions.cpp:398
+#: pcbnew/board_connected_item.cpp:174 pcbnew/class_track.cpp:144
+#: pcbnew/class_track.cpp:170 pcbnew/class_zone.cpp:402
+#: 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
+#: 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
 #, c-format
 msgid "'%s' rule"
 msgstr "'%s' 规则"
 
+#: pcbnew/board_connected_item.cpp:227 pcbnew/class_pad.cpp:686
+#: pcbnew/class_track.cpp:729 pcbnew/class_zone.cpp:663
+msgid "NetClass"
+msgstr "网络类"
+
 #: pcbnew/board_stackup_manager/class_board_stackup.cpp:303
 #, c-format
 msgid "Dielectric %d"
@@ -17248,12 +17598,12 @@ msgstr "图层 \"%s\"（子层 %d/%d）"
 msgid "Dielectric Layers List"
 msgstr "电介质层列表"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:612
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:614
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:137
 msgid "Copper"
 msgstr "铜层"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:884
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:881
 msgid "Stackup not up to date. Verify it"
 msgstr "堆叠不是最新的。请验证它"
 
@@ -17274,7 +17624,7 @@ msgstr "损耗切线的不正确值（如果不使用，则损耗切线必须为
 msgid "A layer thickness is < 0. Fix it"
 msgstr "层厚度为 < 0。修复它"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1028
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1032
 #, c-format
 msgid ""
 "Board thickness %s differs from stackup thickness %s\n"
@@ -17283,7 +17633,7 @@ msgstr ""
 "板厚度 %s 不同于堆叠厚度 %s\n"
 "允许的最大误差 %s"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1166
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1170
 msgid ""
 "A locked dielectric thickness is < 0\n"
 "Unlock it or change its thickness"
@@ -17291,7 +17641,7 @@ msgstr ""
 "锁定的介电厚度为 < 0\n"
 "解锁或更改其厚度"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1177
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1181
 msgid ""
 "Cannot calculate dielectric thickness\n"
 "At least one dielectric layer must be not locked"
@@ -17299,7 +17649,7 @@ msgstr ""
 "无法计算介质厚度。\n"
 "必须至少有一个介电层未锁定"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1186
+#: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1190
 msgid ""
 "Cannot calculate dielectric thickness\n"
 "Fixed thickness too big or board thickness too small"
@@ -17332,14 +17682,6 @@ msgstr ""
 msgid "Id"
 msgstr "ID"
 
-#: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:86
-#: pcbnew/class_pcb_text.cpp:137 pcbnew/class_text_mod.cpp:331
-#: 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
-msgid "Thickness"
-msgstr "线宽"
-
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:125
 msgid "No constraint"
 msgstr "无约束"
@@ -17483,7 +17825,7 @@ msgstr "保存材料清单"
 
 #: pcbnew/build_BOM_from_board.cpp:107
 #: pcbnew/dialogs/dialog_board_statistics.cpp:647
-#: pcbnew/dialogs/dialog_export_vrml.cpp:258
+#: pcbnew/dialogs/dialog_export_vrml.cpp:259
 #, c-format
 msgid "Unable to create file \"%s\""
 msgstr "无法创建文件 \"%s\""
@@ -17508,22 +17850,22 @@ msgstr "名称"
 msgid "Supplier and ref"
 msgstr "供应商和参考"
 
-#: pcbnew/class_board.cpp:128
+#: pcbnew/class_board.cpp:132
 msgid "This is the default net class."
 msgstr "这是默认网络类。"
 
-#: pcbnew/class_board.cpp:690
+#: pcbnew/class_board.cpp:750
 msgid "PCB"
 msgstr "PCB"
 
-#: pcbnew/class_board.cpp:891
+#: pcbnew/class_board.cpp:948
 #: 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:995
+#: pcbnew/ratsnest/ratsnest.cpp:55 pcbnew/tools/pcbnew_control.cpp:1021
 msgid "Pads"
 msgstr "焊盘"
 
-#: pcbnew/class_board.cpp:894
+#: pcbnew/class_board.cpp:951
 #: 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
@@ -17533,24 +17875,24 @@ msgstr "焊盘"
 msgid "Vias"
 msgstr "过孔"
 
-#: pcbnew/class_board.cpp:897 pcbnew/pcb_draw_panel_gal.cpp:385
+#: pcbnew/class_board.cpp:954 pcbnew/pcb_draw_panel_gal.cpp:385
 msgid "Track Segments"
 msgstr "布线分段数"
 
-#: pcbnew/class_board.cpp:900 pcbnew/pcb_draw_panel_gal.cpp:388
+#: pcbnew/class_board.cpp:957 pcbnew/pcb_draw_panel_gal.cpp:388
 msgid "Nodes"
 msgstr "节点"
 
-#: pcbnew/class_board.cpp:903 pcbnew/pcb_draw_panel_gal.cpp:391
+#: pcbnew/class_board.cpp:960 pcbnew/pcb_draw_panel_gal.cpp:391
 #: pcbnew/ratsnest/ratsnest.cpp:58
 msgid "Nets"
 msgstr "网络"
 
-#: pcbnew/class_board.cpp:906 pcbnew/pcb_draw_panel_gal.cpp:394
+#: pcbnew/class_board.cpp:963 pcbnew/pcb_draw_panel_gal.cpp:394
 msgid "Unrouted"
 msgstr "未布线"
 
-#: pcbnew/class_board_item.cpp:44 pcbnew/class_pad.cpp:962
+#: pcbnew/class_board_item.cpp:44 pcbnew/class_pad.cpp:948
 msgid "Rect"
 msgstr "矩形"
 
@@ -17558,8 +17900,8 @@ msgstr "矩形"
 msgid "Bezier Curve"
 msgstr "贝塞尔曲线"
 
-#: pcbnew/class_board_item.cpp:48 pcbnew/class_drawsegment.cpp:383
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1914
+#: pcbnew/class_board_item.cpp:48 pcbnew/class_drawsegment.cpp:448
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1876
 msgid "Polygon"
 msgstr "多边形"
 
@@ -17576,460 +17918,539 @@ msgstr " 和其它"
 msgid "no layers"
 msgstr "没有层"
 
-#: pcbnew/class_dimension.cpp:468
+#: pcbnew/class_board_item.cpp:165 pcbnew/class_track.cpp:998
+msgid "Position X"
+msgstr "位置 X"
+
+#: pcbnew/class_board_item.cpp:167 pcbnew/class_track.cpp:1001
+msgid "Position Y"
+msgstr "位置 Y"
+
+#: pcbnew/class_board_item.cpp:171
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:35
+msgid "Locked"
+msgstr "锁定"
+
+#: pcbnew/class_dimension.cpp:461
 #, c-format
 msgid "Dimension \"%s\" on %s"
 msgstr "尺寸 \"%s\" 在 %s"
 
-#: pcbnew/class_drawsegment.cpp:351
+#: pcbnew/class_drawsegment.cpp:416
 msgid "Drawing"
 msgstr "图形"
 
-#: pcbnew/class_drawsegment.cpp:376
+#: pcbnew/class_drawsegment.cpp:441
 msgid "Curve"
 msgstr "曲线"
 
-#: pcbnew/class_drawsegment.cpp:386
+#: pcbnew/class_drawsegment.cpp:451
 msgid "Points"
 msgstr "点"
 
-#: pcbnew/class_drawsegment.cpp:401
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:87
-#: pcbnew/dialogs/dialog_pad_properties.cpp:714
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1913
+#: pcbnew/class_drawsegment.cpp:466
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:84
+#: pcbnew/dialogs/dialog_pad_properties.cpp:713
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1875
 msgid "Segment"
 msgstr "线段"
 
-#: pcbnew/class_drawsegment.cpp:415
+#: pcbnew/class_drawsegment.cpp:480
 msgid "Unrecognized"
 msgstr "无法识别"
 
-#: pcbnew/class_drawsegment.cpp:780
+#: pcbnew/class_drawsegment.cpp:875
 #, c-format
 msgid "Pcb Graphic %s on %s"
 msgstr "Pcb 图形 %s（位于 %s 上）"
 
-#: pcbnew/class_edge_mod.cpp:141
+#: pcbnew/class_drawsegment.cpp:1196 pcbnew/class_track.cpp:1004
+msgid "End X"
+msgstr "结束点 X"
+
+#: pcbnew/class_drawsegment.cpp:1198 pcbnew/class_track.cpp:1006
+msgid "End Y"
+msgstr "结束点 Y"
+
+#: pcbnew/class_edge_mod.cpp:128
 #, c-format
 msgid "Graphic %s of %s on %s"
 msgstr "图形 %s %s 在 %s"
 
-#: pcbnew/class_marker_pcb.cpp:104
+#: pcbnew/class_marker_pcb.cpp:105
 msgid "Marker"
 msgstr "标记"
 
-#: pcbnew/class_marker_pcb.cpp:105
+#: pcbnew/class_marker_pcb.cpp:106
 msgid "Violation"
 msgstr "违规"
 
-#: pcbnew/class_marker_pcb.cpp:147
+#: pcbnew/class_marker_pcb.cpp:148
 #, c-format
 msgid "Marker (%s)"
 msgstr "标记 （%s）"
 
-#: pcbnew/class_module.cpp:569 pcbnew/tools/pcbnew_control.cpp:992
+#: pcbnew/class_module.cpp:660 pcbnew/tools/pcbnew_control.cpp:1018
 msgid "Last Change"
 msgstr "最后修改"
 
-#: pcbnew/class_module.cpp:573
+#: pcbnew/class_module.cpp:664
 msgid "Board Side"
 msgstr "PCB 板面"
 
-#: pcbnew/class_module.cpp:573
+#: pcbnew/class_module.cpp:664
 msgid "Back (Flipped)"
 msgstr "背面(翻转)"
 
-#: pcbnew/class_module.cpp:574
+#: pcbnew/class_module.cpp:665
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:140
 msgid "Front"
 msgstr "正面"
 
-#: pcbnew/class_module.cpp:591
+#: pcbnew/class_module.cpp:682
 msgid "Insert"
 msgstr "插入"
 
-#: pcbnew/class_module.cpp:592
+#: 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:596
+#: pcbnew/class_module.cpp:687
 msgid "Attributes"
 msgstr "属性"
 
-#: pcbnew/class_module.cpp:600
+#: pcbnew/class_module.cpp:694
 #, c-format
 msgid "3D-Shape: %s"
 msgstr "3D 形状： %s"
 
-#: pcbnew/class_module.cpp:601
+#: pcbnew/class_module.cpp:695
 msgid "none"
 msgstr "无"
 
-#: pcbnew/class_module.cpp:604 pcbnew/tools/pcbnew_control.cpp:998
+#: pcbnew/class_module.cpp:698 pcbnew/tools/pcbnew_control.cpp:1024
 #, c-format
 msgid "Doc: %s"
 msgstr "文档：%s"
 
-#: pcbnew/class_module.cpp:605
+#: pcbnew/class_module.cpp:699
 #, c-format
 msgid "Keywords: %s"
 msgstr "关键字：%s"
 
-#: pcbnew/class_module.cpp:858
+#: pcbnew/class_module.cpp:952
 msgid "<no reference designator>"
 msgstr "< 无参考标识符 >"
 
-#: pcbnew/class_module.cpp:860
+#: pcbnew/class_module.cpp:954
 #, c-format
 msgid "Footprint %s on %s"
 msgstr "封装 %s 在 %s 层"
 
-#: pcbnew/class_module.cpp:1502
+#: pcbnew/class_module.cpp:1593
 #, c-format
 msgid "Processing courtyard of \"%s\": %s"
 msgstr "处理外框 \"%s\"：%s"
 
-#: pcbnew/class_module.h:233
+#: pcbnew/class_module.cpp:1652 pcbnew/class_pad.cpp:1255
+msgid "Local Solderpaste Margin"
+msgstr "锡膏间隙"
+
+#: pcbnew/class_module.cpp:1654 pcbnew/class_pad.cpp:1257
+msgid "Local Solderpaste Margin Ratio"
+msgstr "局部焊锡边率"
+
+#: pcbnew/class_module.cpp:1656 pcbnew/class_pad.cpp:1259
+msgid "Thermal Width"
+msgstr "热宽度"
+
+#: pcbnew/class_module.cpp:1658 pcbnew/class_pad.cpp:1261
+msgid "Thermal Gap"
+msgstr "热间距"
+
+#: pcbnew/class_module.h:243
 #, c-format
 msgid "footprint %s"
 msgstr "封装 %s"
 
-#: pcbnew/class_pad.cpp:573
+#: pcbnew/class_pad.cpp:523
 #, c-format
 msgid "pad %s"
 msgstr "焊盘 %s"
 
-#: pcbnew/class_pad.cpp:722 pcbnew/dialogs/dialog_board_statistics.cpp:486
-msgid "Pad"
-msgstr "焊盘"
-
-#: pcbnew/class_pad.cpp:725
+#: pcbnew/class_pad.cpp:675
 msgid "Pin Name"
 msgstr "引脚名称"
 
-#: pcbnew/class_pad.cpp:727 pcbnew/class_track.cpp:732
-#: pcbnew/class_zone.cpp:645 pcbnew/dialogs/dialog_copper_zones_base.cpp:33
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:55
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:214
-msgid "Net"
-msgstr "网络"
-
-#: pcbnew/class_pad.cpp:736 pcbnew/class_track.cpp:735
-#: pcbnew/class_zone.cpp:648
-msgid "NetClass"
-msgstr "网络类"
-
-#: pcbnew/class_pad.cpp:749
+#: pcbnew/class_pad.cpp:699
 msgid "BGA"
 msgstr "BGA"
 
-#: pcbnew/class_pad.cpp:750
+#: pcbnew/class_pad.cpp:700
 msgid "Fiducial global"
 msgstr "基准全局"
 
-#: pcbnew/class_pad.cpp:751
+#: pcbnew/class_pad.cpp:701
 msgid "Fiducial local"
 msgstr "基准本地"
 
-#: pcbnew/class_pad.cpp:752
+#: pcbnew/class_pad.cpp:702
 msgid "Test point"
 msgstr "测试点"
 
-#: pcbnew/class_pad.cpp:753
+#: pcbnew/class_pad.cpp:703
 msgid "Heat sink"
 msgstr "散热片"
 
-#: pcbnew/class_pad.cpp:754
+#: pcbnew/class_pad.cpp:704
 msgid "Castellated"
 msgstr "邮票孔"
 
-#: pcbnew/class_pad.cpp:763 pcbnew/class_track.cpp:687
+#: pcbnew/class_pad.cpp:713 pcbnew/class_track.cpp:681
+#: pcbnew/class_track.cpp:1016
 msgid "Diameter"
 msgstr "直径"
 
-#: pcbnew/class_pad.cpp:777
+#: pcbnew/class_pad.cpp:738
 msgid "Length in Package"
 msgstr "封装长度"
 
-#: pcbnew/class_pad.cpp:784 pcbnew/class_track.cpp:692
+#: pcbnew/class_pad.cpp:745 pcbnew/class_track.cpp:686
+#: pcbnew/class_track.cpp:1018
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:102
 msgid "Drill"
 msgstr "钻孔"
 
-#: pcbnew/class_pad.cpp:791
+#: pcbnew/class_pad.cpp:752
 msgid "Drill X / Y"
 msgstr "钻孔 X / Y"
 
-#: pcbnew/class_pad.cpp:797 pcbnew/class_track.cpp:623
-#: pcbnew/class_track.cpp:696 pcbnew/class_zone.cpp:673
+#: pcbnew/class_pad.cpp:758 pcbnew/class_track.cpp:617
+#: pcbnew/class_track.cpp:690 pcbnew/class_zone.cpp:705
 #, c-format
 msgid "Min Clearance: %s"
 msgstr "最小间距：%s"
 
-#: pcbnew/class_pad.cpp:798 pcbnew/class_track.cpp:624
-#: pcbnew/class_track.cpp:631 pcbnew/class_track.cpp:697
-#: pcbnew/class_track.cpp:703 pcbnew/class_zone.cpp:674
+#: pcbnew/class_pad.cpp:759 pcbnew/class_track.cpp:618
+#: pcbnew/class_track.cpp:625 pcbnew/class_track.cpp:691
+#: pcbnew/class_track.cpp:697 pcbnew/class_zone.cpp:706
 #, c-format
 msgid "(from %s)"
 msgstr "(从 %s)"
 
-#: pcbnew/class_pad.cpp:961 pcbnew/dialogs/dialog_pad_properties_base.cpp:104
+#: pcbnew/class_pad.cpp:947 pcbnew/class_pad.cpp:1235
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:104
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:364
 msgid "Oval"
 msgstr "椭圆"
 
-#: pcbnew/class_pad.cpp:963
+#: pcbnew/class_pad.cpp:949
 msgid "Trap"
 msgstr "凹槽"
 
-#: pcbnew/class_pad.cpp:964
+#: pcbnew/class_pad.cpp:950
 msgid "Roundrect"
 msgstr "圆角矩形"
 
-#: pcbnew/class_pad.cpp:965
+#: pcbnew/class_pad.cpp:951
 msgid "Chamferedrect"
 msgstr "倒角"
 
-#: pcbnew/class_pad.cpp:966
+#: pcbnew/class_pad.cpp:952
 msgid "CustomShape"
 msgstr "自定义形状"
 
-#: pcbnew/class_pad.cpp:976
+#: pcbnew/class_pad.cpp:962
 msgid "Std"
 msgstr "标准"
 
-#: pcbnew/class_pad.cpp:977 pcbnew/dialogs/dialog_pad_properties_base.cpp:40
+#: pcbnew/class_pad.cpp:963 pcbnew/dialogs/dialog_pad_properties_base.cpp:40
 msgid "SMD"
 msgstr "贴片"
 
-#: pcbnew/class_pad.cpp:978
+#: pcbnew/class_pad.cpp:964
 msgid "Conn"
 msgstr "连接器"
 
-#: pcbnew/class_pad.cpp:979
+#: pcbnew/class_pad.cpp:965
 msgid "Not Plated"
 msgstr "非金属化"
 
-#: pcbnew/class_pad.cpp:989
+#: pcbnew/class_pad.cpp:975
 #, c-format
 msgid "Pad of %s on %s"
 msgstr "焊盘 %s - %s"
 
-#: pcbnew/class_pad.cpp:995
+#: pcbnew/class_pad.cpp:981
 #, c-format
 msgid "Pad %s of %s on %s"
 msgstr "焊盘　%s (%s) - %s"
 
-#: pcbnew/class_pcb_target.cpp:128
+#: pcbnew/class_pad.cpp:1236
+msgid "Trapezoid"
+msgstr "梯形"
+
+#: pcbnew/class_pad.cpp:1237
+msgid "Rounded Rectangle"
+msgstr "圆角矩形"
+
+#: pcbnew/class_pad.cpp:1238
+msgid "Chamfered Rectangle"
+msgstr "倒角矩形"
+
+# DIe 芯片
+#: pcbnew/class_pad.cpp:1251 pcbnew/class_track.cpp:608
+msgid "Pad To Die Length"
+msgstr "焊盘到芯片长度"
+
+#: pcbnew/class_pad.cpp:1253
+msgid "Local Soldermask Margin"
+msgstr "阻焊间隙"
+
+#: pcbnew/class_pad.cpp:1264
+msgid "Round Radius Ratio"
+msgstr "圆半径比"
+
+#: pcbnew/class_pcb_target.cpp:122
 #, c-format
 msgid "Target size %s"
 msgstr "目标尺寸 %s"
 
-#: pcbnew/class_pcb_text.cpp:122
-msgid "Dimension"
-msgstr "尺寸"
-
-#: pcbnew/class_pcb_text.cpp:124
+#: pcbnew/class_pcb_text.cpp:120
 msgid "PCB Text"
 msgstr "PCB 文本"
 
-#: pcbnew/class_pcb_text.cpp:200
+#: pcbnew/class_pcb_text.cpp:196
 #, c-format
 msgid "Pcb Text \"%s\" on %s"
 msgstr "电路板上的文字 \"%s\" (%s)"
 
 # 此处需要查证。
-#: pcbnew/class_text_mod.cpp:298
+#: pcbnew/class_text_mod.cpp:289
 msgid "Ref."
 msgstr "参考."
 
-#: pcbnew/class_text_mod.cpp:315
+#: pcbnew/class_text_mod.cpp:306
 msgid "Display"
 msgstr "显示"
 
-#: pcbnew/class_text_mod.cpp:346
+#: pcbnew/class_text_mod.cpp:337
 #, c-format
 msgid "Reference %s"
 msgstr "参考编号 %s"
 
-#: pcbnew/class_text_mod.cpp:350
+#: pcbnew/class_text_mod.cpp:341
 #, c-format
 msgid "Value %s of %s"
 msgstr "值 %s (%s)"
 
-#: pcbnew/class_text_mod.cpp:355
+#: pcbnew/class_text_mod.cpp:346
 #, c-format
 msgid "Text \"%s\" of %s on %s"
 msgstr "文本 \"%s\" (%s) - %s"
 
-#: pcbnew/class_track.cpp:86
+#: pcbnew/class_track.cpp:80
 #, c-format
 msgid "Blind/Buried Via %s %s on %s - %s"
 msgstr "盲孔/埋孔 %s %s 在 %s - %s上"
 
-#: pcbnew/class_track.cpp:89
+#: pcbnew/class_track.cpp:83
 #, c-format
 msgid "Micro Via %s %s on %s - %s"
 msgstr "微孔 %s %s 在 %s - %s上"
 
-#: pcbnew/class_track.cpp:93
+#: pcbnew/class_track.cpp:87
 #, c-format
 msgid "Via %s %s on %s - %s"
 msgstr "过孔 %s %s 在 %s - %s上"
 
-#: pcbnew/class_track.cpp:584
-msgid "Track"
-msgstr "布线"
-
-#: pcbnew/class_track.cpp:614
-msgid "Pad To Die Length"
-msgstr "焊盘到裸铜长度"
-
-#: pcbnew/class_track.cpp:617
+#: pcbnew/class_track.cpp:611
 msgid "Full Length"
 msgstr "全长"
 
-#: pcbnew/class_track.cpp:630
+#: pcbnew/class_track.cpp:624
 #, c-format
 msgid "Min Width: %s"
 msgstr "最小宽度：%s"
 
-#: pcbnew/class_track.cpp:654
+#: pcbnew/class_track.cpp:648
 msgid "Blind/Buried Via"
 msgstr "盲孔/埋孔"
 
-#: pcbnew/class_track.cpp:702
+#: pcbnew/class_track.cpp:696
 #, c-format
 msgid "Min Annulus: %s"
 msgstr "最小环面：%s"
 
-#: pcbnew/class_track.cpp:743
+#: pcbnew/class_track.cpp:737
 msgid "NetCode"
 msgstr "网络代码"
 
-#: pcbnew/class_track.cpp:870
+#: pcbnew/class_track.cpp:864
 #, c-format
 msgid "Track %s %s on %s, length: %s"
 msgstr "布线 %s %s 在 %s 上， 长度：%s"
 
-#: pcbnew/class_zone.cpp:372
+#: pcbnew/class_track.cpp:986
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
+msgid "Through"
+msgstr "通孔"
+
+#: pcbnew/class_track.cpp:987
+msgid "Blind/Buried"
+msgstr "盲孔/埋孔"
+
+#: pcbnew/class_track.cpp:988
+msgid "Microvia"
+msgstr "微孔"
+
+#: pcbnew/class_track.cpp:999
+msgid "Origin X"
+msgstr "原点 X"
+
+#: pcbnew/class_track.cpp:1002
+msgid "Origin Y"
+msgstr "原点 Y"
+
+#: pcbnew/class_track.cpp:1021
+msgid "Layer Top"
+msgstr "图层顶部"
+
+#: pcbnew/class_track.cpp:1023
+msgid "Layer Bottom"
+msgstr "图层底部"
+
+#: pcbnew/class_track.cpp:1025
+msgid "Via Type"
+msgstr "过孔类型"
+
+#: pcbnew/class_zone.cpp:379
 msgid "zone properties"
 msgstr "区域属性"
 
-#: pcbnew/class_zone.cpp:546
+#: pcbnew/class_zone.cpp:553
 msgid "zone"
 msgstr "区域"
 
-#: pcbnew/class_zone.cpp:589
+#: pcbnew/class_zone.cpp:604
 msgid "Keepout Area"
 msgstr "禁布区"
 
-#: pcbnew/class_zone.cpp:591
+#: pcbnew/class_zone.cpp:606
 msgid "Copper Zone"
 msgstr "铜区"
 
-#: pcbnew/class_zone.cpp:593
+#: pcbnew/class_zone.cpp:608
 msgid "Non-copper Zone"
 msgstr "非铜区"
 
-#: pcbnew/class_zone.cpp:599
+#: pcbnew/class_zone.cpp:614
 msgid "Cutout"
 msgstr "挖空"
 
-#: pcbnew/class_zone.cpp:608
+#: pcbnew/class_zone.cpp:623
 msgid "No vias"
 msgstr "无过孔"
 
-#: pcbnew/class_zone.cpp:611
+#: pcbnew/class_zone.cpp:626
 msgid "No tracks"
 msgstr "无布线"
 
-#: pcbnew/class_zone.cpp:614
+#: pcbnew/class_zone.cpp:629
 msgid "No pads"
 msgstr "无焊盘"
 
-#: pcbnew/class_zone.cpp:617
+#: pcbnew/class_zone.cpp:632
 msgid "No copper zones"
 msgstr "无铜区"
 
-#: pcbnew/class_zone.cpp:620
+#: pcbnew/class_zone.cpp:635
 msgid "No footprints"
 msgstr "没有封装"
 
-#: pcbnew/class_zone.cpp:622
+#: pcbnew/class_zone.cpp:637
 msgid "Keepout"
 msgstr "禁止布线"
 
-#: pcbnew/class_zone.cpp:653
+#: pcbnew/class_zone.cpp:668 pcbnew/class_zone.cpp:1388
 msgid "Priority"
 msgstr "优先"
 
-#: pcbnew/class_zone.cpp:661 pcbnew/dialogs/dialog_copper_zones_base.cpp:123
+#: pcbnew/class_zone.cpp:683 pcbnew/class_zone.cpp:939
+#, c-format
+msgid "%s and %d more"
+msgstr "%s 和 %d 更多"
+
+#: pcbnew/class_zone.cpp:693 pcbnew/dialogs/dialog_copper_zones_base.cpp:123
 #: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:52
 msgid "Hatched"
 msgstr "阴影线"
 
-#: pcbnew/class_zone.cpp:665
+#: pcbnew/class_zone.cpp:697
 msgid "Fill Mode"
 msgstr "填充模式"
 
-#: pcbnew/class_zone.cpp:668
+#: pcbnew/class_zone.cpp:700
 msgid "Filled Area"
 msgstr "填充区域"
 
-#: pcbnew/class_zone.cpp:680
+#: pcbnew/class_zone.cpp:712
 msgid "Hatch Lines"
 msgstr "线宽"
 
-#: pcbnew/class_zone.cpp:685
+#: pcbnew/class_zone.cpp:727
 msgid "Corner Count"
 msgstr "拐角数"
 
-#: pcbnew/class_zone.cpp:866
+#: pcbnew/class_zone.cpp:920
 msgid "(Cutout)"
 msgstr "(挖空)"
 
-#: pcbnew/class_zone.cpp:869
+#: pcbnew/class_zone.cpp:923
 msgid "(Keepout)"
 msgstr "(禁布区)"
 
-#: pcbnew/class_zone.cpp:873
+#: pcbnew/class_zone.cpp:941
 #, c-format
 msgid "Zone Outline %s on %s"
 msgstr "在 %s 区域边线 %s 上"
 
-#: pcbnew/cleanup_item.cpp:46
+#: pcbnew/class_zone.cpp:1392
+msgid "Min Thickness"
+msgstr "最小线宽"
+
+#: pcbnew/cleanup_item.cpp:46 qa/drc_proto/drc_item.cpp:133
 msgid "Remove track shorting two nets"
 msgstr "删除短路两个网络的布线"
 
-#: pcbnew/cleanup_item.cpp:47
+#: pcbnew/cleanup_item.cpp:47 qa/drc_proto/drc_item.cpp:134
 msgid "Remove redundant via"
 msgstr "删除多余的通孔"
 
-#: pcbnew/cleanup_item.cpp:48
+#: pcbnew/cleanup_item.cpp:48 qa/drc_proto/drc_item.cpp:135
 msgid "Remove duplicate track"
 msgstr "删除重复的布线"
 
-#: pcbnew/cleanup_item.cpp:49
+#: pcbnew/cleanup_item.cpp:49 qa/drc_proto/drc_item.cpp:136
 msgid "Merge co-linear tracks"
 msgstr "合并共线布线"
 
-#: pcbnew/cleanup_item.cpp:50
+#: pcbnew/cleanup_item.cpp:50 qa/drc_proto/drc_item.cpp:137
 msgid "Remove dangling track"
 msgstr "删除悬空的布线"
 
-#: pcbnew/cleanup_item.cpp:51
+#: pcbnew/cleanup_item.cpp:51 qa/drc_proto/drc_item.cpp:138
 msgid "Remove dangling via"
 msgstr "删除悬空的通孔"
 
-#: pcbnew/cleanup_item.cpp:52
+#: pcbnew/cleanup_item.cpp:52 qa/drc_proto/drc_item.cpp:139
 msgid "Remove zero-length track"
 msgstr "删除零长度布线"
 
-#: pcbnew/cleanup_item.cpp:53
+#: pcbnew/cleanup_item.cpp:53 qa/drc_proto/drc_item.cpp:140
 msgid "Remove track inside pad"
 msgstr "删除焊盘内的轨道"
 
@@ -18055,83 +18476,99 @@ msgstr "未知的清除操作"
 msgid "Unable to find segment with an endpoint of (%s, %s)."
 msgstr "无法找到端点为 (%s, %s) 的线段。"
 
-#: pcbnew/cross-probing.cpp:157 pcbnew/cross-probing.cpp:176
+#: pcbnew/cross-probing.cpp:161 pcbnew/cross-probing.cpp:180
 #, c-format
 msgid "%s not found"
 msgstr "未找到 %s"
 
-#: pcbnew/cross-probing.cpp:159
+#: pcbnew/cross-probing.cpp:163
 #, c-format
 msgid "%s pin %s not found"
 msgstr "%s 引脚 %s 未找到"
 
-#: pcbnew/cross-probing.cpp:161
+#: pcbnew/cross-probing.cpp:165
 #, c-format
 msgid "%s pin %s found"
 msgstr "%s 引脚 %s 被找到"
 
-#: pcbnew/cross-probing.cpp:174
+#: pcbnew/cross-probing.cpp:178
 #, c-format
 msgid "%s found"
 msgstr "找到 %s"
 
-#: pcbnew/cross-probing.cpp:182
+#: pcbnew/cross-probing.cpp:186
 #, c-format
 msgid "Selecting all from sheet \"%s\""
 msgstr "从图框 \"%s\" 中选择所有。"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:38
+#: pcbnew/dialogs/dialog_board_setup.cpp:44
 msgid "Board Setup"
 msgstr "电路板设置"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:61
+#: pcbnew/dialogs/dialog_board_setup.cpp:44
+msgid "Import Settings from Another Board..."
+msgstr "从另一个电路板导入设置..."
+
+#: pcbnew/dialogs/dialog_board_setup.cpp:70
 msgid "Board Stackup"
 msgstr "电路板堆叠"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:62
+#: pcbnew/dialogs/dialog_board_setup.cpp:71
 msgid "Board Editor Layers"
 msgstr "电路板板编辑器图层"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:63
+#: pcbnew/dialogs/dialog_board_setup.cpp:72
 msgid "Physical Stackup"
 msgstr "物理堆叠"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:67
+#: pcbnew/dialogs/dialog_board_setup.cpp:76
 msgid "Defaults"
 msgstr "默认"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:68
+#: pcbnew/dialogs/dialog_board_setup.cpp:77
 msgid "Text & Graphics"
 msgstr "文本与图形"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:69 pcbnew/edit_track_width.cpp:207
+#: pcbnew/dialogs/dialog_board_setup.cpp:78 pcbnew/edit_track_width.cpp:207
 #: pcbnew/edit_track_width.cpp:225
 msgid "Tracks & Vias"
 msgstr "导线和过孔"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:70
+#: pcbnew/dialogs/dialog_board_setup.cpp:79
 msgid "Solder Mask/Paste"
 msgstr "阻焊/锡膏"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:72
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:54
+#: pcbnew/dialogs/dialog_board_setup.cpp:81
 msgid "Design Rules"
 msgstr "设计规则"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:73
+#: pcbnew/dialogs/dialog_board_setup.cpp:82
 msgid "Constraints"
 msgstr "约束"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:74
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:57
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:24
-msgid "Net Classes"
-msgstr "网络类表"
-
-#: pcbnew/dialogs/dialog_board_setup.cpp:75 pcbnew/drc/drc.cpp:208
+#: pcbnew/dialogs/dialog_board_setup.cpp:83 pcbnew/drc/drc.cpp:209
+#: qa/drc_proto/drc.cpp:208
 msgid "Rules"
 msgstr "规则"
 
+#: pcbnew/dialogs/dialog_board_setup.cpp:146
+#, c-format
+msgid ""
+"Error importing settings from board:\n"
+"Associated project file %s could not be loaded"
+msgstr ""
+"从电路板导入设置错误：\n"
+"无法加载关联项目文件 %s"
+
+#: pcbnew/dialogs/dialog_board_setup.cpp:169 pcbnew/files.cpp:577
+#, c-format
+msgid ""
+"Error loading board file:\n"
+"%s"
+msgstr ""
+"电路板文件载入错误：\n"
+"%s"
+
 #: pcbnew/dialogs/dialog_board_statistics.cpp:87
 #: pcbnew/dialogs/dialog_board_statistics.cpp:691
 msgid "Front Side"
@@ -18230,10 +18667,6 @@ msgstr "金属化 (PTH)"
 msgid "NPTH"
 msgstr "非金属化 (NPTH)"
 
-#: pcbnew/dialogs/dialog_board_statistics.cpp:486
-msgid "Via"
-msgstr "过孔"
-
 #: pcbnew/dialogs/dialog_board_statistics.cpp:631
 msgid "Save Report File"
 msgstr "保存报告文件"
@@ -18381,7 +18814,7 @@ msgstr "更新封装"
 
 #: pcbnew/dialogs/dialog_cleanup_graphics.cpp:43
 #: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:53
-#: pcbnew/dialogs/dialog_netlist.cpp:90 pcbnew/dialogs/dialog_update_pcb.cpp:73
+#: pcbnew/dialogs/dialog_netlist.cpp:91 pcbnew/dialogs/dialog_update_pcb.cpp:73
 msgid "Update PCB"
 msgstr "更新 PCB"
 
@@ -18457,24 +18890,24 @@ msgstr "删除在焊盘内同时具有起始位置和结束位置的布线"
 msgid "Cleanup Tracks and Vias"
 msgstr "清除布线和过孔"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:258
+#: pcbnew/dialogs/dialog_copper_zones.cpp:296
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:142
 #: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:106
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:186
 msgid "Chamfer distance:"
 msgstr "倒角距离："
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:260
+#: pcbnew/dialogs/dialog_copper_zones.cpp:298
 #: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:108
 msgid "Fillet radius:"
 msgstr "圆角半径："
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:384
+#: pcbnew/dialogs/dialog_copper_zones.cpp:422
 msgid "Thermal spoke width cannot be smaller than the minimum width."
 msgstr "热风焊盘辐射线不能小于最小宽度。"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:410
-#: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:281
+#: pcbnew/dialogs/dialog_copper_zones.cpp:452
+#: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:272
 msgid "No layer selected."
 msgstr "没有图层被选择。"
 
@@ -18506,11 +18939,6 @@ msgstr ""
 "用于筛选筛选列表中的网络名称的模式。\n"
 "仅显示与此模式匹配的网络名称。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:60
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:148
-msgid "Apply Filters"
-msgstr "应用筛选"
-
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:66
 msgid "Show all nets"
 msgstr "显示所有网络"
@@ -18629,42 +19057,51 @@ msgstr "防散热导线宽度："
 msgid "Width of copper in thermal reliefs."
 msgstr "防散热 (花焊盘) 连接线的宽度。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:240
-#: pcbnew/tools/pcb_actions.cpp:1085
+#: 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
 msgid "Fill"
 msgstr "填充"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:248
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:256
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:87
 msgid "Fill type:"
 msgstr "填充类型:"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:252
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:260
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:91
 msgid "Solid shape"
 msgstr "实体形状"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:252
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:260
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:91
 msgid "Hatch pattern"
 msgstr "阴影图案"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:272
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:277
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:111
 msgid "Hatch width:"
 msgstr "阴影宽度："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:283
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:288
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:122
 msgid "Hatch gap:"
 msgstr "阴影间隙："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:294
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:299
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:133
 msgid "Smoothing effort:"
 msgstr "平滑效果："
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:296
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:301
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:135
 msgid ""
 "Value of smoothing effort\n"
@@ -18679,12 +19116,12 @@ msgstr ""
 "2 = 圆角\n"
 "3 = 圆角 (更精细)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:306
+#: 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:308
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:310
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:147
 msgid ""
 "Ratio between smoothed corners size and the gap between lines\n"
@@ -18695,17 +19132,51 @@ msgstr ""
 "0 = 无平滑\n"
 "1.0 = 最大径向/倒角大小 (半间隙值)"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:331
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:318
+msgid "Remove islands:"
+msgstr "删除孤铜："
+
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:320
+msgid "Choose what to do with unconnected copper islands"
+msgstr "选择如何处理未连接的孤铜"
+
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:324
+#: 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/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
+msgid "Below area limit"
+msgstr "低于区域限制"
+
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:330
+msgid "Minimum island size:"
+msgstr "最小孤铜尺寸："
+
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:333
+msgid "Isolated islands smaller than this will be removed"
+msgstr "小于此的孤铜将被移除"
+
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:362
 msgid "Export Settings to Other Zones"
 msgstr "导出设置到其他区域"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:332
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:363
 msgid ""
 "Export this zone setup (excluding layer and net selection) to all other "
 "copper zones."
 msgstr "导出该区域设置 (除层和网络选择) 到所有其它铜区。"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.h:134
+#: pcbnew/dialogs/dialog_copper_zones_base.h:141
 msgid "Copper Zone Properties"
 msgstr "铜区属性"
 
@@ -18905,7 +19376,7 @@ msgstr "半径："
 
 #: pcbnew/dialogs/dialog_create_array_base.cpp:241
 #: pcbnew/dialogs/dialog_move_exact.cpp:199
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:123
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:120
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:331
 #: pcbnew/dialogs/dialog_position_relative.cpp:157
 msgid "Angle:"
@@ -19140,7 +19611,7 @@ msgstr "参考和值是强制的。"
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:53
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:53
-#: pcbnew/dialogs/panel_modedit_defaults.cpp:49
+#: pcbnew/dialogs/panel_modedit_defaults.cpp:50
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:45
 #: pcbnew/text_mod_grid_table.cpp:88
 msgid "Text Items"
@@ -19166,7 +19637,7 @@ msgstr "Y 偏移"
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:69
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:69
-#: pcbnew/dialogs/panel_modedit_defaults.cpp:60
+#: pcbnew/dialogs/panel_modedit_defaults.cpp:61
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:53
 #: pcbnew/text_mod_grid_table.cpp:108
 msgid "Reference designator"
@@ -19244,7 +19715,7 @@ msgid "Update Footprint from Library..."
 msgstr "从库中更新封装..."
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:252
-#: pcbnew/tools/pcb_actions.cpp:383
+#: pcbnew/tools/pcb_actions.cpp:358
 msgid "Change Footprint..."
 msgstr "修改封装..."
 
@@ -19640,13 +20111,13 @@ msgstr "重置 3D 模型"
 msgid "%s"
 msgstr "%s"
 
-#: pcbnew/dialogs/dialog_export_idf.cpp:163
+#: pcbnew/dialogs/dialog_export_idf.cpp:164
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:119
 #, c-format
 msgid "File %s already exists."
 msgstr "文件 \"%s\" 已经存在。"
 
-#: pcbnew/dialogs/dialog_export_idf.cpp:225
+#: pcbnew/dialogs/dialog_export_idf.cpp:226
 msgid "Unable to create "
 msgstr "无法创建 "
 
@@ -19704,20 +20175,20 @@ msgstr "输出单位："
 msgid "Export IDFv3"
 msgstr "导出 IDFv3"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:206
+#: pcbnew/dialogs/dialog_export_step.cpp:207
 msgid "STEP export failed!  Please save the PCB and try again"
 msgstr "STEP 导出失败！ 请保存 PCB 并再次尝试"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:250
+#: pcbnew/dialogs/dialog_export_step.cpp:251
 msgid "Cannot determine the board outline."
 msgstr "无法确定电路板的边框。"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:258
+#: pcbnew/dialogs/dialog_export_step.cpp:259
 #, c-format
 msgid "File '%s' already exists. Do you want overwrite this file?"
 msgstr "文件 \"%s\" 已经存在，你想覆盖它吗？"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:261
+#: pcbnew/dialogs/dialog_export_step.cpp:262
 msgid "STEP Export"
 msgstr "导出 STEP"
 
@@ -19815,7 +20286,7 @@ msgstr "无法使用相对路径（目标卷不同于电路板文件卷）"
 msgid "Exported \"%s\"."
 msgstr "输出 \"%s\"。"
 
-#: pcbnew/dialogs/dialog_export_svg.cpp:269 pcbnew/dialogs/dialog_plot.cpp:877
+#: 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
 #, c-format
@@ -19911,11 +20382,11 @@ msgstr "页码"
 msgid "Export SVG File"
 msgstr "导出 SVG 文件"
 
-#: pcbnew/dialogs/dialog_export_vrml.cpp:181
+#: pcbnew/dialogs/dialog_export_vrml.cpp:182
 msgid "Are you sure you want to overwrite the existing file?"
 msgstr "你确定要覆盖现有的文件吗？"
 
-#: pcbnew/dialogs/dialog_export_vrml.cpp:249
+#: pcbnew/dialogs/dialog_export_vrml.cpp:250
 #, c-format
 msgid "Unable to create directory \"%s\""
 msgstr "无法创建目录 \"%s\""
@@ -20138,9 +20609,10 @@ msgstr "导出 GenCAD 设置"
 msgid "Select a GenCAD export filename"
 msgstr "选择 GenCAD 导出文件名"
 
+# Padstack: 焊盘和过孔
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:135
 msgid "Flip bottom footprint padstacks"
-msgstr "翻转底层封装焊盘堆"
+msgstr "翻转底层封装焊盘和过孔"
 
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:136
 msgid "Generate unique pin names"
@@ -20354,6 +20826,11 @@ msgstr "埋孔："
 msgid "Generate Drill Files"
 msgstr "生成钻孔文件"
 
+#: pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp:28
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:66
+msgid "Reference designator:"
+msgstr "参考标识符："
+
 #: pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp:35
 msgid "(specify multiple items separated by spaces for successive placement)"
 msgstr "（指定多个项目，并用空格隔开以进行连续放置）"
@@ -20380,7 +20857,7 @@ msgid "Items to Delete:"
 msgstr "删除项："
 
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:25
-#: pcbnew/tools/pcb_editor_control.cpp:71
+#: pcbnew/tools/pcb_editor_control.cpp:74
 msgid "Zones"
 msgstr "覆铜"
 
@@ -20564,21 +21041,6 @@ msgstr "禁止倒置"
 msgid "Set to layer default values:"
 msgstr "设置为图层默认值："
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:199
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:54
-msgid "Via Drill"
-msgstr "过孔内径"
-
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:200
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:55
-msgid "uVia Size"
-msgstr "微孔外径"
-
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:201
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:56
-msgid "uVia Drill"
-msgstr "微孔内径"
-
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:270
 msgid "Some items failed DRC and were not modified."
 msgstr "有些项目 DRC 失败，未被修改。"
@@ -20734,22 +21196,26 @@ msgid "Layers setup"
 msgstr "层设置"
 
 #: pcbnew/dialogs/dialog_import_settings_base.cpp:51
-msgid "Text && Graphics default properties"
+msgid "Text and graphics default properties"
 msgstr "文本与图形默认属性"
 
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:60
-msgid "Predefined Track and Via dimensions"
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:54
+msgid "Design rules"
+msgstr "设计规则"
+
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:57
+msgid "Predefined track and via dimensions"
 msgstr "预定义的布线和通孔尺寸"
 
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:63
-msgid "Solder Mask/Paste defaults"
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:60
+msgid "Solder mask/paste defaults"
 msgstr "阻焊/锡膏默认值"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:161
+#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:163
 msgid "Tracks, vias, and pads are allowed. The keepout will have no effect."
 msgstr "允许导线，过孔和焊盘，该禁布区无效。"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:167
+#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:169
 msgid "No layers selected."
 msgstr "没有选择层。"
 
@@ -20781,7 +21247,11 @@ msgstr "保留封装"
 msgid "Constrain outline to H, V and 45 deg"
 msgstr "限制轮廓线方向水平，垂直或 45 度"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.h:62
+#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:84
+msgid "Keepout name:"
+msgstr "禁止名称："
+
+#: pcbnew/dialogs/dialog_keepout_area_properties_base.h:65
 msgid "Keepout Area Properties"
 msgstr "禁布区属性"
 
@@ -20853,50 +21323,50 @@ msgstr "使用极坐标"
 msgid "Move Item"
 msgstr "移动项目"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:91
+#: pcbnew/dialogs/dialog_netlist.cpp:92
 msgid "Rebuild Ratsnest"
 msgstr "重建飞线"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:137
+#: pcbnew/dialogs/dialog_netlist.cpp:138
 msgid "Select Netlist"
 msgstr "选择网表"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:154
+#: pcbnew/dialogs/dialog_netlist.cpp:155
 msgid "Please, choose a valid netlist file."
 msgstr "请选择一个有效的网表文件。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:160 pcbnew/dialogs/dialog_netlist.cpp:227
+#: pcbnew/dialogs/dialog_netlist.cpp:161 pcbnew/dialogs/dialog_netlist.cpp:228
 msgid "The netlist file does not exist."
 msgstr "网表文件不存在。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:165
+#: pcbnew/dialogs/dialog_netlist.cpp:166
 msgid ""
 "The changes made cannot be undone.  Are you sure you want to update the PCB?"
 msgstr "所做的更改不能撤销。你确定要更新 PCB 吗？"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:168
+#: pcbnew/dialogs/dialog_netlist.cpp:169
 #: pcbnew/dialogs/dialog_update_pcb.cpp:146
 msgid "Changes Applied To PCB"
 msgstr "更改应用于 PCB"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:180
+#: pcbnew/dialogs/dialog_netlist.cpp:181
 msgid "No footprints."
 msgstr "没有封装。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:191
+#: pcbnew/dialogs/dialog_netlist.cpp:192
 msgid "Check footprints"
 msgstr "检查封装"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:276
+#: pcbnew/dialogs/dialog_netlist.cpp:277
 #, c-format
 msgid "Reading netlist file \"%s\".\n"
 msgstr "读取网表文件 \"%s\"\n"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:280
+#: pcbnew/dialogs/dialog_netlist.cpp:281
 msgid "Using reference designators to match components and footprints.\n"
 msgstr "使用参考标识符来匹配元件和封装。\n"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:282
+#: pcbnew/dialogs/dialog_netlist.cpp:283
 msgid "Using tstamps (unique IDs) to match components and footprints.\n"
 msgstr "使用时间戳（唯一ID） 来匹配元件和封装。\n"
 
@@ -20991,35 +21461,35 @@ msgstr "轮廓平滑："
 msgid "Non Copper Zones Properties"
 msgstr "非铜区属性"
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:138
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:135
 msgid "Ring"
 msgstr "环"
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:148
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:145
 msgid "Center:"
 msgstr "居中："
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:329
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:321
 msgid "Polygon must have at least 3 corners"
 msgstr "多边形必须至少有 3个角"
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:350
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:336
 msgid "Polygon must have at least 3 corners after simplification"
 msgstr "多边形化简后必须至少有 3个角"
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:356
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:342
 msgid "Polygon can not be self-intersecting"
 msgstr "多边形不能自相交"
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:374
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:360
 msgid "Note: redundant corners removed"
 msgstr "注意：已移除多余的角"
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:400
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:386
 msgid "Select a corner to add the new corner after."
 msgstr "选择一个角落后添加新的拐角。"
 
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:434
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:420
 msgid "Select a corner to delete."
 msgstr "选择要删除的拐角。"
 
@@ -21044,100 +21514,97 @@ msgid "%s, rotated %.1f deg"
 msgstr "%s，旋转 %.1f 度"
 
 #: pcbnew/dialogs/dialog_pad_properties.cpp:708
-#, c-format
-msgid "width %s"
-msgstr "宽度 %s"
+msgid "width "
+msgstr "宽度 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:715
-#: pcbnew/dialogs/dialog_pad_properties.cpp:721
+#: pcbnew/dialogs/dialog_pad_properties.cpp:714
+#: pcbnew/dialogs/dialog_pad_properties.cpp:720
 msgid "from "
 msgstr "来自 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:716
-#: pcbnew/dialogs/dialog_pad_properties.cpp:722
+#: pcbnew/dialogs/dialog_pad_properties.cpp:715
+#: pcbnew/dialogs/dialog_pad_properties.cpp:721
 msgid "to "
 msgstr "到 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:727
+#: pcbnew/dialogs/dialog_pad_properties.cpp:726
 msgid "center "
 msgstr "中心 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:728
+#: pcbnew/dialogs/dialog_pad_properties.cpp:727
 msgid "start "
 msgstr "开始 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:729
-#, c-format
-msgid "angle %s"
-msgstr "角度 %s"
+#: pcbnew/dialogs/dialog_pad_properties.cpp:728
+msgid "angle "
+msgstr "角度 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:734
+#: pcbnew/dialogs/dialog_pad_properties.cpp:733
 msgid "ring"
 msgstr "环"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:736
+#: pcbnew/dialogs/dialog_pad_properties.cpp:735
 msgid "circle"
 msgstr "圆圈"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:739
-#, c-format
-msgid "radius %s"
-msgstr "半径 %s"
+#: pcbnew/dialogs/dialog_pad_properties.cpp:738
+msgid "radius "
+msgstr "半径 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:745
+#: pcbnew/dialogs/dialog_pad_properties.cpp:743
 #, c-format
 msgid "corners count %d"
 msgstr "拐角计数 %d"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1059
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1056
 msgid "Pad size must be greater than zero"
 msgstr "焊盘尺寸必须大于 0"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1065
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1062
 msgid "Incorrect value for pad drill: pad drill bigger than pad size"
 msgstr "钻孔值不正确: 钻孔尺寸超过了焊盘尺寸"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1072
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1069
 msgid "Pad local clearance must be zero or greater than zero"
 msgstr "焊盘局部间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1083
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1080
 msgid "Pad local solder mask clearance must be zero or greater than zero"
 msgstr "焊盘局部阻焊间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1091
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1088
 #, c-format
 msgid "Pad local solder mask clearance must be greater than %s"
 msgstr "焊盘局部阻焊间隙必须大于 %s"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1106
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1103
 msgid "Error: pad has no layer"
 msgstr "错误：焊盘没有层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1113
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1110
 msgid "Error: the pad is not on a copper layer and has a hole"
 msgstr "错误：焊盘没有在铜层并且有一个孔"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1118
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1115
 msgid ""
 "For NPTH pad, set pad size value to pad drill value, if you do not want this "
 "pad plotted in gerber files"
 msgstr ""
 "对于非金属化焊盘，设置焊盘尺寸值到焊盘钻孔的值，如果你不想要这个焊盘光绘文件"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1137
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1134
 msgid "Incorrect value for pad offset"
 msgstr "焊盘偏移数值不正确"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1142
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1139
 msgid "Too large value for pad delta size"
 msgstr "焊盘增量尺寸值太大"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1150
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1147
 msgid "Error: Through hole pad: drill diameter set to 0"
 msgstr "错误：通孔焊盘：钻孔直径设置为 0"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1155
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1152
 msgid ""
 "Error: Connector pads are not on the solder paste layer\n"
 "Use SMD pads instead"
@@ -21145,61 +21612,61 @@ msgstr ""
 "错误：焊盘连接不是在锡膏层\n"
 "使用贴片焊盘替代"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1165
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1162
 msgid "Error: only one external copper layer allowed for SMD or Connector pads"
 msgstr "错误：允许贴片或连接焊盘只有一个外部铜层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1172
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1169
 msgid "Property cannot be set for NPTH"
 msgstr "无法为非金属化孔设置属性"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1176
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1173
 msgid "Castellated property can be set only for PTH"
 msgstr "只能为金属化孔设置邮票孔属性"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1180
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1177
 msgid "BGA property can be set only for SMD pads"
 msgstr "BGA 属性只能为贴片焊盘设置"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1190
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1187
 msgid "Incorrect corner size value"
 msgstr "不正确的拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1194
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1191
 msgid "Incorrect (negative) corner size value"
 msgstr "不正确的（负）拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1196
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1193
 msgid "Corner size value must be smaller than 50%"
 msgstr "转角值必须小于 50%"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1206
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1203
 msgid "Incorrect pad shape: the shape must be equivalent to only one polygon"
 msgstr "错误的焊盘形状：该形状必须相当于只有一个多边形"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1212
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1209
 msgid "Pad setup errors list"
 msgstr "焊盘设置错误列表"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1476
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1438
 msgid "Modify pad"
 msgstr "修改焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1824
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1961
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1996
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1786
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1924
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1958
 msgid "No shape selected"
 msgstr "未选择形状"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1914
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1876
 msgid "Ring/Circle"
 msgstr "圆"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1916
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1878
 msgid "Shape type:"
 msgstr "形状类型："
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1916
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1878
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:818
 msgid "Add Primitive"
 msgstr "添加图元"
@@ -21229,6 +21696,8 @@ msgid "Pad number:"
 msgstr "焊盘编号："
 
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:53
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:832
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:886
 msgid "Net name:"
 msgstr "网络名称："
 
@@ -21383,9 +21852,10 @@ msgstr "从通孔偏移形状"
 msgid ":"
 msgstr "："
 
+# DIe 芯片
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:454
 msgid "Specify pad to die length"
-msgstr "指定焊盘到裸铜长度"
+msgstr "指定焊盘到芯片长度"
 
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:492
 msgid ""
@@ -21705,7 +22175,7 @@ msgstr "警告：缩放选项设置为一个很小的值"
 msgid "Warning: Scale option set to a very large value"
 msgstr "警告：缩放选项设置为一个非常大的值"
 
-#: pcbnew/dialogs/dialog_plot.cpp:872
+#: pcbnew/dialogs/dialog_plot.cpp:873
 #, c-format
 msgid "Plot file \"%s\" created."
 msgstr "创建绘制文件 \"%s\"。"
@@ -22408,66 +22878,85 @@ msgstr "运行 (&R)"
 msgid "Scripting Test Window"
 msgstr "脚本测试窗口"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:57
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:56
 msgid "Pad Count"
 msgstr "焊盘计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:58
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:57
 msgid "Via Count"
 msgstr "过孔计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:59
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:58
 msgid "Board Length"
 msgstr "电路板长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:60
+# DIe 芯片
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:59
 msgid "Die Length"
-msgstr "裸板长度"
+msgstr "芯片长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:839
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:840
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:832
+msgid "New Net"
+msgstr "新建网络"
+
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:844
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:909
+#, c-format
+msgid "Net name '%s' is already in use."
+msgstr "网络名称 '%s' 已经在使用中。"
+
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:886
+msgid "Rename Net"
+msgstr "重命名网络"
+
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:899
+msgid "Net name cannot be empty."
+msgstr "网络名称变量名不能为空。"
+
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:938
+msgid "Net is in use.  Delete anyway?"
+msgstr "网络正在使用中。仍要删除吗？"
+
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:952
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:953
 msgid "Report file"
 msgstr "报告文件"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:855
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:968
 msgid "Net Id"
 msgstr "网络 ID"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:856
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:969
 msgid "Pad count"
 msgstr "焊盘计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:856
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:969
 msgid "Via count"
 msgstr "过孔计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:857
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:970
 msgid "Board length"
 msgstr "电路板长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:857
+# DIe 芯片
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:970
 msgid "Die length"
-msgstr "裸板长度"
+msgstr "芯片长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:857
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:970
 msgid "Net length"
 msgstr "网络长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list_base.cpp:22
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:127
-msgid "Net name filter:"
-msgstr "网络名称筛选："
-
 #: pcbnew/dialogs/dialog_select_net_from_list_base.cpp:32
 msgid "Show zero pad nets"
 msgstr "显示 0 焊盘网络"
 
-#: pcbnew/dialogs/dialog_select_net_from_list_base.cpp:47
+#: pcbnew/dialogs/dialog_select_net_from_list_base.cpp:62
 msgid "Create Report..."
 msgstr "创建报告..."
 
-#: pcbnew/dialogs/dialog_select_net_from_list_base.h:59
-#: pcbnew/tools/pcb_actions.cpp:654
+#: pcbnew/dialogs/dialog_select_net_from_list_base.h:68
+#: pcbnew/tools/pcb_actions.cpp:661
 msgid "Net Inspector"
 msgstr "网络检查"
 
@@ -22572,11 +23061,6 @@ msgstr "文本方向"
 msgid "Text pos X"
 msgstr "文本位置 X"
 
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:205
-#: pcbnew/microwave/microwave_polygon.cpp:132
-msgid "Mirrored"
-msgstr "镜像"
-
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:206
 msgid "Mirror text"
 msgstr "镜像文本"
@@ -22636,10 +23120,6 @@ msgstr "过孔起始层和结束层不能相同"
 msgid "Edit track/via properties"
 msgstr "编辑布线/过孔属性"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:35
-msgid "Locked"
-msgstr "锁定"
-
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:49
 msgid "Start point X:"
 msgstr "起点 X："
@@ -22691,10 +23171,6 @@ msgstr "使用网络类尺寸"
 msgid "Via type:"
 msgstr "过孔类型："
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
-msgid "Through"
-msgstr "通孔"
-
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
 msgid "Micro"
 msgstr "微孔"
@@ -22799,7 +23275,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:716
+#: pcbnew/tools/pcb_actions.cpp:723
 msgid "Show pad numbers"
 msgstr "显示焊盘编号"
 
@@ -22843,6 +23319,10 @@ msgstr ""
 msgid "Show pad clearance"
 msgstr "显示焊盘间隙"
 
+#: pcbnew/dialogs/panel_display_options_base.cpp:86
+msgid "Highlight nets when they are highlighted in the schematic editor"
+msgstr "当网络在原理图编辑器中高亮显示时将其高亮显示"
+
 #: pcbnew/dialogs/panel_edit_options_base.cpp:27
 msgid ""
 "Set display of relative (dx/dy) coordinates to Cartesian (rectangular) or "
@@ -22893,23 +23373,11 @@ msgstr "吸附到焊盘："
 msgid "Capture cursor when the mouse enters a pad area"
 msgstr "当鼠标进入焊盘区域时捕捉光标"
 
-#: 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/panel_edit_options_base.cpp:100
 #: pcbnew/dialogs/panel_edit_options_base.cpp:114
 msgid "When creating tracks"
 msgstr "当创建新布线时"
 
-#: 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/panel_edit_options_base.cpp:108
 msgid "Snap to tracks:"
 msgstr "吸附到布线："
@@ -22937,7 +23405,7 @@ msgid "Always show selected ratsnest"
 msgstr "始终显示选定的飞线"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:151
-#: pcbnew/tools/pcb_actions.cpp:685
+#: pcbnew/tools/pcb_actions.cpp:692
 msgid "Show ratsnest with curved lines"
 msgstr "用曲线显示飞线"
 
@@ -22959,22 +23427,22 @@ msgid "Moves the track segment without moving connected tracks"
 msgstr "移动布线段而不移动连接的布线"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:181
-#: pcbnew/tools/pcb_actions.cpp:1208
+#: pcbnew/tools/pcb_actions.cpp:1215
 msgid "Drag (45 degree mode)"
 msgstr "拖动 (45 度模式)"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:182
-#: pcbnew/tools/pcb_actions.cpp:1209
+#: pcbnew/tools/pcb_actions.cpp:1216
 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:1215
+#: pcbnew/tools/pcb_actions.cpp:1222
 msgid "Drag (free angle)"
 msgstr "拖动(自由角度)"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:187
-#: pcbnew/tools/pcb_actions.cpp:1216
+#: pcbnew/tools/pcb_actions.cpp:1223
 msgid ""
 "Drags the nearest joint in the track without restricting the track angle."
 msgstr "在不限制布线角度的情况下，拖拽布线中最近的连接点。"
@@ -23009,7 +23477,7 @@ msgstr "无法打开目录以查找库"
 msgid "Add Existing"
 msgstr "添加现有"
 
-#: pcbnew/dialogs/panel_modedit_defaults.cpp:320
+#: pcbnew/dialogs/panel_modedit_defaults.cpp:321
 #: pcbnew/dialogs/panel_setup_text_and_graphics.cpp:161
 msgid ""
 "Text will not be readable with a thickness greater than\n"
@@ -23032,12 +23500,6 @@ msgstr "注意：空白的引用指示符或值将使用封装名称。"
 msgid "Default properties for new graphic items:"
 msgstr "新建图形项目的默认属性："
 
-#: pcbnew/dialogs/panel_modedit_defaults_base.cpp:144
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:72
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:67
-msgid "Net Class parameters"
-msgstr "网络类参数"
-
 #: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:36
 msgid "Icon"
 msgstr "图标"
@@ -23821,121 +24283,6 @@ msgstr ""
 "此值可以通过封装或焊盘局部值所取代。\n"
 "最终的间隙值是该值与间隙值的总和"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:296
-msgid "Netclass must have a name."
-msgstr "网络类必须要有一个名称。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:305
-msgid "Netclass name already in use."
-msgstr "网络类名称已经在使用。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:371
-msgid "The default net class is required."
-msgstr "默认的网络类是必需的。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:555
-#, c-format
-msgid "Clearance less than minimum clearance (%s)."
-msgstr "间隙小于最小间隙 （%s）。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:563
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:240
-#, c-format
-msgid "Track width less than minimum track width (%s)."
-msgstr "布线宽度小于最小线宽 (%s)。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:571
-#, c-format
-msgid "Differential pair width less than minimum track width (%s)."
-msgstr "差分对宽度小于最小布线宽度 (%s)。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:580
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:257
-#, c-format
-msgid "Via diameter less than minimum via diameter (%s)."
-msgstr "过孔外径小于最小过孔外径 (%s)。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:588
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:283
-msgid "Via drill larger than via diameter."
-msgstr "过孔内径大于过孔外径。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:596
-#, c-format
-msgid "Via diameter and drill leave via annulus less than minimum (%s)."
-msgstr "通孔直径和钻头通孔的环隙小于最小值 (%s)。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:604
-#, c-format
-msgid "Via drill less than minimum via drill (%s)."
-msgstr "过孔内径小于最小孔内径 (%s)。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:613
-#, c-format
-msgid "Microvia diameter less than minimum microvia diameter (%s)."
-msgstr "微孔外径小于最小微孔外径 (%s)。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:621
-msgid "Microvia drill larger than microvia diameter."
-msgstr "微孔内径大于微孔外径。"
-
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:628
-#, c-format
-msgid "Microvia drill less than minimum microvia drill (%s)."
-msgstr "微孔内径小于最小内径 (%s)。"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:51
-msgid "Clearance"
-msgstr "间隙"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:57
-msgid "DP Width"
-msgstr "DP（差分对）宽度"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:58
-msgid "DP Gap"
-msgstr "DP（差分对）间距"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:59
-msgid "DP Via Gap"
-msgstr "DP（差分对）过孔间距"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:99
-msgid "Net Class Memberships"
-msgstr "网络类成员资格"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:105
-msgid "Filter Nets"
-msgstr "筛选网络"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:110
-msgid "Net class filter:"
-msgstr "网络类筛选："
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:142
-msgid "Show All Nets"
-msgstr "显示所有网络"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:158
-msgid "Assign Net Class"
-msgstr "分配网络类"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:163
-msgid "New net class:"
-msgstr "新网络类："
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:180
-msgid "Assign To Listed Nets"
-msgstr "分配到列表中的网络"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:186
-msgid "Assign To Selected Nets"
-msgstr "分配给选择的网络"
-
-#: pcbnew/dialogs/panel_setup_netclasses_base.cpp:215
-msgid "Net Class"
-msgstr "网络类"
-
 #: pcbnew/dialogs/panel_setup_rules.cpp:195
 msgid "DRC rules"
 msgstr "DRC 规则"
@@ -23980,6 +24327,16 @@ msgstr "0.001 mm / 0.1 mil"
 msgid "0.0001mm / 0.01 mil"
 msgstr "0.0001mm / 0.01 mil"
 
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:240
+#, c-format
+msgid "Track width less than minimum track width (%s)."
+msgstr "布线宽度小于最小线宽 (%s)。"
+
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:257
+#, c-format
+msgid "Via diameter less than minimum via diameter (%s)."
+msgstr "过孔外径小于最小过孔外径 (%s)。"
+
 #: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:267
 msgid "No via drill defined."
 msgstr "没有定义过孔孔径。"
@@ -23989,6 +24346,10 @@ msgstr "没有定义过孔孔径。"
 msgid "Via drill less than minimum through hole (%s)."
 msgstr "通孔小于最小通孔 (%s)。"
 
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:283
+msgid "Via drill larger than via diameter."
+msgstr "过孔内径大于过孔外径。"
+
 #: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:291
 #, c-format
 msgid "Diameter and drill leave via annulus less than minimum (%s)."
@@ -24113,403 +24474,285 @@ msgstr "下载 3D 模型库："
 msgid "Add 3D Shape Libraries Wizard"
 msgstr "3D 模型库添加向导"
 
-#: pcbnew/drc/drc.cpp:246
+#: pcbnew/drc/drc.cpp:245 qa/drc_proto/drc.cpp:246
 msgid "Board Outline...\n"
 msgstr "电路板边框...\n"
 
-#: pcbnew/drc/drc.cpp:255
-msgid "Netclasses...\n"
-msgstr "网类...\n"
-
-#: pcbnew/drc/drc.cpp:271
-msgid "NETCLASS VIOLATIONS: Aborting DRC\n"
-msgstr "网络类违规：中止 DRC\n"
-
-#: pcbnew/drc/drc.cpp:288
+#: pcbnew/drc/drc.cpp:257 qa/drc_proto/drc.cpp:288
 msgid "Pad clearances...\n"
 msgstr "焊盘间距...\n"
 
-#: pcbnew/drc/drc.cpp:303
+#: pcbnew/drc/drc.cpp:271 qa/drc_proto/drc.cpp:303
 msgid "Drill sizes and clearances...\n"
 msgstr "钻头尺寸和间隙...\n"
 
-#: pcbnew/drc/drc.cpp:321
+#: pcbnew/drc/drc.cpp:289 qa/drc_proto/drc.cpp:321
 msgid "Refilling all zones...\n"
 msgstr "重新填充所有覆铜区域...\n"
 
-#: pcbnew/drc/drc.cpp:328
+#: pcbnew/drc/drc.cpp:296 qa/drc_proto/drc.cpp:328
 msgid "Checking zone fills...\n"
 msgstr "检查填充区域...\n"
 
-#: pcbnew/drc/drc.cpp:336
+#: pcbnew/drc/drc.cpp:304 qa/drc_proto/drc.cpp:336
 msgid "Track clearances...\n"
 msgstr "布线间距...\n"
 
-#: pcbnew/drc/drc.cpp:345
+#: pcbnew/drc/drc.cpp:313 qa/drc_proto/drc.cpp:345
 msgid "Zone to zone clearances...\n"
 msgstr "覆铜区域与覆铜区域间隙...\n"
 
-#: pcbnew/drc/drc.cpp:357
+#: pcbnew/drc/drc.cpp:325 qa/drc_proto/drc.cpp:357
 msgid "Unconnected pads...\n"
 msgstr "未连接焊盘...\n"
 
-#: pcbnew/drc/drc.cpp:369
+#: pcbnew/drc/drc.cpp:337 qa/drc_proto/drc.cpp:369
 msgid "Keepout areas ...\n"
 msgstr "禁布区...\n"
 
-#: pcbnew/drc/drc.cpp:387
+#: pcbnew/drc/drc.cpp:354 qa/drc_proto/drc.cpp:387
 msgid "Text and graphic clearances...\n"
 msgstr "文本和图形间隙...\n"
 
-#: pcbnew/drc/drc.cpp:403
+#: pcbnew/drc/drc.cpp:370 qa/drc_proto/drc.cpp:403
 msgid "Courtyard areas...\n"
 msgstr "封装外框...\n"
 
-#: pcbnew/drc/drc.cpp:425
+#: pcbnew/drc/drc.cpp:392 qa/drc_proto/drc.cpp:425
 msgid "Checking footprints against schematic...\n"
 msgstr "检查封装和原理图...\n"
 
-#: pcbnew/drc/drc.cpp:444
+#: pcbnew/drc/drc.cpp:411 qa/drc_proto/drc.cpp:444
 msgid "Items on disabled layers...\n"
 msgstr "禁用层上的项目...\n"
 
-#: pcbnew/drc/drc.cpp:455
+#: pcbnew/drc/drc.cpp:422 qa/drc_proto/drc.cpp:455
 msgid "Unresolved text variables...\n"
 msgstr "未解析的文本变量...\n"
 
-#: pcbnew/drc/drc.cpp:553 pcbnew/drc/drc.cpp:856 pcbnew/drc/drc.cpp:1057
-#: pcbnew/drc/drc.cpp:1114 pcbnew/drc/drc.cpp:1288 pcbnew/drc/drc.cpp:1317
-#: pcbnew/drc/drc.cpp:1366 pcbnew/drc/drc_clearance_test_functions.cpp:429
-#: pcbnew/drc/drc_clearance_test_functions.cpp:455
-#: pcbnew/drc/drc_clearance_test_functions.cpp:551
-#: pcbnew/drc/drc_clearance_test_functions.cpp:603
-#: pcbnew/drc/drc_clearance_test_functions.cpp:670
+#: pcbnew/drc/drc.cpp:522 pcbnew/drc/drc.cpp:825 pcbnew/drc/drc.cpp:946
+#: pcbnew/drc/drc.cpp:994 pcbnew/drc/drc.cpp:1152 pcbnew/drc/drc.cpp:1175
+#: pcbnew/drc/drc.cpp:1224 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:553
+#: qa/drc_proto/drc.cpp:856 qa/drc_proto/drc.cpp:1045 qa/drc_proto/drc.cpp:1103
+#: qa/drc_proto/drc.cpp:1277 qa/drc_proto/drc.cpp:1306
+#: qa/drc_proto/drc.cpp:1355 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:261
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:323
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:427
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:528
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:588
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:719
+#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:888
+#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:193
+#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:225
 #, c-format
 msgid " (%s clearance %s; actual %s)"
 msgstr " (%s 间隙 %s; 实际 %s)"
 
-#: pcbnew/drc/drc.cpp:591
+#: pcbnew/drc/drc.cpp:560 qa/drc_proto/drc.cpp:591
 msgid "Track clearances"
 msgstr "布线间距"
 
-#: pcbnew/drc/drc.cpp:1144 pcbnew/drc/drc_courtyard_tester.cpp:76
+#: pcbnew/drc/drc.cpp:1027 pcbnew/drc/drc_courtyard_tester.cpp:76
+#: qa/drc_proto/drc.cpp:1133 qa/drc_proto/drc_courtyard_tester.cpp:76
 msgid " (not a closed shape)"
 msgstr " (不是闭合形状)"
 
-#: pcbnew/drc/drc.cpp:1168 pcbnew/drc/drc.cpp:1188 pcbnew/drc/drc.cpp:1206
+#: pcbnew/drc/drc.cpp:1051 pcbnew/drc/drc.cpp:1071 pcbnew/drc/drc.cpp:1089
+#: qa/drc_proto/drc.cpp:1157 qa/drc_proto/drc.cpp:1177
+#: qa/drc_proto/drc.cpp:1195
 #, c-format
 msgid "layer %s"
 msgstr "层 %s"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:169
-#: pcbnew/drc/drc_clearance_test_functions.cpp:208
-#: pcbnew/drc/drc_clearance_test_functions.cpp:340
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:108
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:151
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:194
+#: pcbnew/drc/drc_clearance_test_functions.cpp:69
+#: pcbnew/drc/drc_clearance_test_functions.cpp:108
 #, c-format
-msgid " (%s %s; actual %s)"
-msgstr " (%s %s; 实际 %s)"
+msgid "Via annulus too small (%s %s; actual %s)"
+msgstr "过孔环隙太小 (%s %s; 实际 %s)"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:185
-#: pcbnew/drc/drc_clearance_test_functions.cpp:224
+#: 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
+#: 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:243
+#: pcbnew/drc/drc_clearance_test_functions.cpp:143
+#: qa/drc_proto/drc_clearance_test_functions.cpp:243
 #, c-format
 msgid " (diameter %s; drill %s)"
 msgstr " （直径 %s; 钻孔 %s）"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:259
-#: pcbnew/drc/drc_clearance_test_functions.cpp:272
-msgid " (board design rule constraints)"
-msgstr " (电路板设计规则约束)"
+#: pcbnew/drc/drc_clearance_test_functions.cpp:159
+msgid "Microvia not allowed (board design rule constraints)"
+msgstr "不允许微孔 (电路板设计规则约束)"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:302
+#: pcbnew/drc/drc_clearance_test_functions.cpp:172
+msgid "Blind/buried via not allowed (board design rule constraints)"
+msgstr "不允许盲孔/埋孔 (电路板设计规则约束)"
+
+#: pcbnew/drc/drc_clearance_test_functions.cpp:202
 #, c-format
-msgid " (%s and %s not adjacent)"
-msgstr " (%s 和 %s 不相邻)"
+msgid "Microvia through too many layers (%s and %s not adjacent)"
+msgstr "通过太多层的微孔(%s 和 %s 不相邻)"
 
-#: pcbnew/drc/drc_item.cpp:63
+#: 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
+#: 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
+#, c-format
+msgid " (%s %s; actual %s)"
+msgstr " (%s %s; 实际 %s)"
+
+#: pcbnew/drc/drc_item.cpp:43 qa/drc_proto/drc_item.cpp:63
 msgid "Unconnected items"
 msgstr "未连接的项目"
 
-#: pcbnew/drc/drc_item.cpp:64
-msgid "Track too close to hole"
-msgstr "布线太靠近通孔了"
+#: pcbnew/drc/drc_item.cpp:47
+msgid "Items not allowed"
+msgstr "不允许的项目"
 
-#: pcbnew/drc/drc_item.cpp:65
-msgid "Track too close to pad"
-msgstr "布线太靠近焊盘了"
+#: pcbnew/drc/drc_item.cpp:51
+msgid "Clearance violation"
+msgstr "间隙违规"
 
-#: pcbnew/drc/drc_item.cpp:66
-msgid "Track too close to via"
-msgstr "布线太靠近过孔了"
-
-#: pcbnew/drc/drc_item.cpp:67
-msgid "Vias too close"
-msgstr "过孔太靠近了"
-
-#: pcbnew/drc/drc_item.cpp:68
-msgid "Via too close to track"
-msgstr "过孔太靠近布线了"
-
-#: pcbnew/drc/drc_item.cpp:69
-msgid "Track ends too close"
-msgstr "布线结束处太靠近了"
-
-#: pcbnew/drc/drc_item.cpp:70
-msgid "Parallel tracks too close"
-msgstr "平行的布线太靠近了"
-
-#: pcbnew/drc/drc_item.cpp:71
+#: pcbnew/drc/drc_item.cpp:55 qa/drc_proto/drc_item.cpp:71
 msgid "Tracks crossing"
 msgstr "布线有交叉"
 
-#: pcbnew/drc/drc_item.cpp:72
-msgid "Track too close to copper area"
-msgstr "布线太靠近铜区了"
+#: pcbnew/drc/drc_item.cpp:59
+msgid "Board edge clearance violation"
+msgstr "电路板边缘间隙违规"
 
-#: pcbnew/drc/drc_item.cpp:73
-msgid "Pads too close"
-msgstr "焊盘太靠近了"
-
-#: pcbnew/drc/drc_item.cpp:74
-msgid "Via hole larger than diameter"
-msgstr "过孔内径大于过孔外径"
-
-#: pcbnew/drc/drc_item.cpp:75
-msgid "Micro via through too many layers"
-msgstr "过多层的微孔"
-
-#: pcbnew/drc/drc_item.cpp:76
-msgid "Micro via not allowed"
-msgstr "不允许微孔"
-
-#: pcbnew/drc/drc_item.cpp:77
-msgid "Buried via not allowed"
-msgstr "不允许埋孔"
-
-#: pcbnew/drc/drc_item.cpp:78
-msgid "Item on a disabled layer"
-msgstr "禁用层上的项目"
-
-#: pcbnew/drc/drc_item.cpp:79
+#: pcbnew/drc/drc_item.cpp:63 qa/drc_proto/drc_item.cpp:79
 msgid "Copper areas intersect"
 msgstr "覆铜区交叉"
 
-#: pcbnew/drc/drc_item.cpp:80
-msgid "Copper areas too close"
-msgstr "覆铜区过近"
-
-#: pcbnew/drc/drc_item.cpp:81
+#: pcbnew/drc/drc_item.cpp:67 qa/drc_proto/drc_item.cpp:81
 msgid "Copper zone net has no pads"
 msgstr "铜区没有焊盘连接"
 
-#: pcbnew/drc/drc_item.cpp:82
+#: pcbnew/drc/drc_item.cpp:71 qa/drc_proto/drc_item.cpp:82
 msgid "Via is not connected"
 msgstr "过孔未连接"
 
-#: pcbnew/drc/drc_item.cpp:83
+#: pcbnew/drc/drc_item.cpp:75 qa/drc_proto/drc_item.cpp:83
 msgid "Track has unconnected end"
 msgstr "布线有未连接端"
 
-#: pcbnew/drc/drc_item.cpp:84
-msgid "Hole too close to pad"
-msgstr "孔太靠近焊盘了"
-
-#: pcbnew/drc/drc_item.cpp:85
-msgid "Hole too close to track"
-msgstr "孔太靠近布线了"
-
-#: pcbnew/drc/drc_item.cpp:86
-msgid "Track width too small"
-msgstr "布线宽度太小"
-
-#: pcbnew/drc/drc_item.cpp:87
-msgid "Track width too large"
-msgstr "布线宽度过大"
-
-#: pcbnew/drc/drc_item.cpp:88
-msgid "Via size too small"
-msgstr "过孔外径太小"
-
-#: pcbnew/drc/drc_item.cpp:89
-msgid "Via annulus too small"
-msgstr "过孔环隙太小"
-
-#: pcbnew/drc/drc_item.cpp:90
-msgid "Micro via size too small"
-msgstr "微孔外径太小"
-
-#: pcbnew/drc/drc_item.cpp:91
-msgid "Via drill too small"
-msgstr "过孔内径太小"
-
-#: pcbnew/drc/drc_item.cpp:92
-msgid "Pad drill too small"
-msgstr "焊盘内径太小"
-
-#: pcbnew/drc/drc_item.cpp:93
-msgid "Micro via drill too small"
-msgstr "微孔内径太小"
-
-#: pcbnew/drc/drc_item.cpp:94
+#: pcbnew/drc/drc_item.cpp:79 qa/drc_proto/drc_item.cpp:94
 msgid "Drilled holes too close together"
 msgstr "钻孔太靠近了"
 
+#: pcbnew/drc/drc_item.cpp:83
+msgid "Track width outside allowed limits"
+msgstr "布线宽度超出允许的限制"
+
+#: pcbnew/drc/drc_item.cpp:87 qa/drc_proto/drc_item.cpp:88
+msgid "Via size too small"
+msgstr "过孔外径太小"
+
+#: pcbnew/drc/drc_item.cpp:91
+msgid "Via annulus"
+msgstr "通孔环"
+
 #: pcbnew/drc/drc_item.cpp:95
-msgid "Track too close to board edge"
-msgstr "布线太靠近板框了"
+msgid "Drill too small"
+msgstr "钻孔内径太小"
 
-#: pcbnew/drc/drc_item.cpp:96
-msgid "Via too close to board edge"
-msgstr "过孔太靠近电路板边缘了"
-
-#: pcbnew/drc/drc_item.cpp:97
-msgid "Pad too close to board edge"
-msgstr "焊盘太靠近电路板边缘了"
-
-#: pcbnew/drc/drc_item.cpp:98
-msgid "Board has malformed outline"
-msgstr "电路板的格式有误"
-
-#: pcbnew/drc/drc_item.cpp:100
-msgid "NetClass Track Width too small"
-msgstr "网络类布线宽度太小"
-
-#: pcbnew/drc/drc_item.cpp:101
-msgid "NetClass Clearance too small"
-msgstr "网络类间隙太小"
-
-#: pcbnew/drc/drc_item.cpp:102
-msgid "NetClass via annulus too small"
-msgstr "网络类过孔环隙太小"
+#: pcbnew/drc/drc_item.cpp:99 qa/drc_proto/drc_item.cpp:74
+msgid "Via hole larger than diameter"
+msgstr "过孔内径大于过孔外径"
 
+# Padstack: 焊盘和过孔
 #: pcbnew/drc/drc_item.cpp:103
-msgid "NetClass Via Dia too small"
-msgstr "网络类过孔外径太小"
+msgid "Padstack is not valid"
+msgstr "焊盘和过孔无效"
 
-#: pcbnew/drc/drc_item.cpp:104
-msgid "NetClass Via Drill too small"
-msgstr "网络类过孔内径太小"
+#: pcbnew/drc/drc_item.cpp:107 qa/drc_proto/drc_item.cpp:90
+msgid "Micro via size too small"
+msgstr "微孔外径太小"
 
-#: pcbnew/drc/drc_item.cpp:105
-msgid "NetClass uVia Dia too small"
-msgstr "网络类微孔外径太小"
-
-#: pcbnew/drc/drc_item.cpp:106
-msgid "NetClass uVia Drill too small"
-msgstr "网络类微孔内径太小"
-
-#: pcbnew/drc/drc_item.cpp:108
-msgid "Via inside keepout area"
-msgstr "过孔在禁布区内"
-
-#: pcbnew/drc/drc_item.cpp:109
-msgid "Micro via inside keepout area"
-msgstr "微孔在禁布区内"
-
-#: pcbnew/drc/drc_item.cpp:110
-msgid "Buried via inside keepout area"
-msgstr "埋孔在禁布区内"
-
-#: pcbnew/drc/drc_item.cpp:111
-msgid "Track inside keepout area"
-msgstr "布线在禁布区内"
-
-#: pcbnew/drc/drc_item.cpp:112
-msgid "Pad inside keepout area"
-msgstr "焊盘在禁布区内"
-
-#: pcbnew/drc/drc_item.cpp:113
-msgid "Footprint inside keepout area"
-msgstr "封装在禁布区内"
-
-#: pcbnew/drc/drc_item.cpp:114
-msgid "Hole inside keepout area"
-msgstr "通孔在禁布区内"
+#: pcbnew/drc/drc_item.cpp:111 qa/drc_proto/drc_item.cpp:93
+msgid "Micro via drill too small"
+msgstr "微孔内径太小"
 
 #: pcbnew/drc/drc_item.cpp:115
-msgid "Text inside keepout area"
-msgstr "文本在禁布区内"
+msgid "Keepout violation"
+msgstr "禁止违规"
 
-#: pcbnew/drc/drc_item.cpp:116
-msgid "Graphic inside keepout area"
-msgstr "图形在禁布区内"
-
-#: pcbnew/drc/drc_item.cpp:118
-msgid "Via too close to copper item"
-msgstr "过孔太靠近覆铜区项目"
-
-#: pcbnew/drc/drc_item.cpp:119
-msgid "Track too close to copper item"
-msgstr "布线太靠近覆铜区项目"
-
-#: pcbnew/drc/drc_item.cpp:120
-msgid "Pad too close to copper item"
-msgstr "焊盘太靠近覆铜区项目"
-
-#: pcbnew/drc/drc_item.cpp:122
+#: pcbnew/drc/drc_item.cpp:119 qa/drc_proto/drc_item.cpp:122
 msgid "Courtyards overlap"
 msgstr "外框重叠"
 
-#: pcbnew/drc/drc_item.cpp:123
+#: pcbnew/drc/drc_item.cpp:123 qa/drc_proto/drc_item.cpp:123
 msgid "Footprint has no courtyard defined"
 msgstr "封装没有定义外框"
 
-#: pcbnew/drc/drc_item.cpp:124
+#: pcbnew/drc/drc_item.cpp:127 qa/drc_proto/drc_item.cpp:124
 msgid "Footprint has malformed courtyard"
 msgstr "封装的外框有误"
 
-#: pcbnew/drc/drc_item.cpp:125
+#: pcbnew/drc/drc_item.cpp:131 qa/drc_proto/drc_item.cpp:125
 msgid "PTH inside courtyard"
 msgstr "PTH 在外框内"
 
-#: pcbnew/drc/drc_item.cpp:126
+#: pcbnew/drc/drc_item.cpp:135 qa/drc_proto/drc_item.cpp:126
 msgid "NPTH inside courtyard"
 msgstr "NPTH 在外框内"
 
-#: pcbnew/drc/drc_item.cpp:128
+#: pcbnew/drc/drc_item.cpp:139 qa/drc_proto/drc_item.cpp:78
+msgid "Item on a disabled layer"
+msgstr "禁用层上的项目"
+
+#: pcbnew/drc/drc_item.cpp:143 qa/drc_proto/drc_item.cpp:98
+msgid "Board has malformed outline"
+msgstr "电路板的格式有误"
+
+#: pcbnew/drc/drc_item.cpp:147 qa/drc_proto/drc_item.cpp:128
 msgid "Duplicate footprints"
 msgstr "重复的封装"
 
-#: pcbnew/drc/drc_item.cpp:129
+#: pcbnew/drc/drc_item.cpp:151 qa/drc_proto/drc_item.cpp:129
 msgid "Missing footprint"
 msgstr "错误的封装"
 
-#: pcbnew/drc/drc_item.cpp:130
+#: pcbnew/drc/drc_item.cpp:155 qa/drc_proto/drc_item.cpp:130
 msgid "Extra footprint"
 msgstr "多余的封装"
 
-#: pcbnew/drc/drc_item.cpp:136
-msgid "Unknown DRC violation"
-msgstr "未知的 DRC 违规"
-
-#: pcbnew/drc/drc_keepout_tester.cpp:101 pcbnew/drc/drc_keepout_tester.cpp:153
-#: pcbnew/drc/drc_keepout_tester.cpp:203 pcbnew/drc/drc_keepout_tester.cpp:254
-#: pcbnew/drc/drc_keepout_tester.cpp:281 pcbnew/drc/drc_keepout_tester.cpp:339
+#: 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:242
+#: pcbnew/drc/drc_keepout_tester.cpp:260 pcbnew/drc/drc_keepout_tester.cpp:311
+#: qa/drc_proto/drc_keepout_tester.cpp:101
+#: qa/drc_proto/drc_keepout_tester.cpp:153
+#: qa/drc_proto/drc_keepout_tester.cpp:203
+#: qa/drc_proto/drc_keepout_tester.cpp:254
+#: qa/drc_proto/drc_keepout_tester.cpp:281
+#: qa/drc_proto/drc_keepout_tester.cpp:339
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: pcbnew/drc/drc_netclass_tester.cpp:63 pcbnew/drc/drc_netclass_tester.cpp:77
-#: pcbnew/drc/drc_netclass_tester.cpp:91 pcbnew/drc/drc_netclass_tester.cpp:121
-#: pcbnew/drc/drc_netclass_tester.cpp:135
-#: pcbnew/drc/drc_netclass_tester.cpp:149
-#, c-format
-msgid " (board minimum %s; %s netclass %s)"
-msgstr " (电路板最小值 %s; %s 网络类 %s)"
-
-#: pcbnew/drc/drc_netclass_tester.cpp:105
-#, c-format
-msgid " (board min through hole %s; %s netclass %s)"
-msgstr " (电路板最小通孔 %s; %s 网络类 %s)"
-
-#: pcbnew/drc/drc_rule_parser.cpp:126
+#: pcbnew/drc/drc_rule_parser.cpp:126 qa/drc_proto/drc_rule_parser.cpp:108
 #, c-format
 msgid "Rule \"%s\" not found."
 msgstr "规则 \"%s\" 没有找到。"
@@ -24519,7 +24762,7 @@ msgstr "规则 \"%s\" 没有找到。"
 msgid "Layer \"%s\" not found."
 msgstr "层 \"%s\" 未找到。"
 
-#: pcbnew/drc/footprint_tester.cpp:64
+#: pcbnew/drc/footprint_tester.cpp:65 qa/drc_proto/footprint_tester.cpp:64
 #, c-format
 msgid "Missing footprint %s (%s)"
 msgstr "缺失的封装 %s (%s)"
@@ -24539,7 +24782,7 @@ msgstr "没有 \"%s\" 封装在库 \"%s\" 里"
 msgid "Unsupported Eagle layer '%s' (%d), converted to Dwgs.User layer"
 msgstr "不支持的边框层 \"%s\"(%d)，转换为 Dwgs.User 层"
 
-#: pcbnew/exporters/export_d356.cpp:376
+#: pcbnew/exporters/export_d356.cpp:374
 msgid "Export D-356 Test File"
 msgstr "导出 D-356 测试文件"
 
@@ -24563,7 +24806,7 @@ msgstr ""
 "它们已作为椭圆形焊盘导出器。"
 
 #: pcbnew/exporters/export_idf.cpp:629 pcbnew/exporters/export_idf.cpp:638
-#: pcbnew/exporters/export_idf.cpp:646 pcbnew/exporters/export_vrml.cpp:1694
+#: pcbnew/exporters/export_idf.cpp:646 pcbnew/exporters/export_vrml.cpp:1696
 msgid "IDF Export Failed:\n"
 msgstr "IDF 导出失败：\n"
 
@@ -24673,46 +24916,46 @@ msgstr ""
 "板堆叠设置不是最新的\n"
 "请修复堆叠"
 
-#: pcbnew/files.cpp:135
+#: pcbnew/files.cpp:140
 msgid "Open Board File"
 msgstr "打开电路板文件"
 
-#: pcbnew/files.cpp:135
+#: pcbnew/files.cpp:140
 msgid "Import Non KiCad Board File"
 msgstr "导入非 KiCad 电路板文件"
 
-#: pcbnew/files.cpp:171
+#: pcbnew/files.cpp:176
 msgid "Save Board File As"
 msgstr "另存文件"
 
-#: pcbnew/files.cpp:194
+#: pcbnew/files.cpp:199
 msgid "Printed circuit board"
 msgstr "印刷电路板"
 
-#: pcbnew/files.cpp:267
+#: pcbnew/files.cpp:263
 #, c-format
 msgid "Recovery file \"%s\" not found."
 msgstr "没有找到备份文件 \"%s\"。"
 
-#: pcbnew/files.cpp:272
+#: pcbnew/files.cpp:268
 #, c-format
-msgid "OK to load recovery or backup file \"%s\""
-msgstr "确认加载恢复文件或备份文件 \"%s\""
+msgid "OK to load recovery file \"%s\""
+msgstr "确定加载恢复文件 \"%s\""
 
-#: pcbnew/files.cpp:295
+#: pcbnew/files.cpp:291
 #, c-format
 msgid "Current board will be closed, save changes to \"%s\" before continuing?"
 msgstr "当前电路板将关闭，是否在继续之前保存对 \"%s\" 的更改？"
 
-#: pcbnew/files.cpp:303
+#: pcbnew/files.cpp:299
 msgid "Current Board will be closed. Continue?"
 msgstr "当前电路板将关闭。是否继续？"
 
-#: pcbnew/files.cpp:335
+#: pcbnew/files.cpp:343
 msgid "noname"
 msgstr "无名称"
 
-#: pcbnew/files.cpp:432
+#: pcbnew/files.cpp:441
 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"
@@ -24724,34 +24967,25 @@ msgstr ""
 "导致与之前使用的 KiCad 版本不同的填充\n"
 "板框图层上板边界的线宽。"
 
-#: pcbnew/files.cpp:436
+#: pcbnew/files.cpp:445
 msgid "Edge Clearance Warning"
 msgstr "边缘间隙警告"
 
-#: pcbnew/files.cpp:462
+#: pcbnew/files.cpp:471
 #, c-format
 msgid "PCB file \"%s\" is already open."
 msgstr "PCB 文件 \"%s\" 已经打开。"
 
-#: pcbnew/files.cpp:469
+#: pcbnew/files.cpp:478
 msgid "The current PCB has been modified.  Save changes?"
 msgstr "当前 PCB 已被修改。是否保存更改？"
 
-#: pcbnew/files.cpp:488
+#: pcbnew/files.cpp:497
 #, c-format
 msgid "PCB \"%s\" does not exist.  Do you wish to create it?"
 msgstr "PCB \"%s\" 不存在，你想创建它吗？"
 
-#: pcbnew/files.cpp:558
-#, c-format
-msgid ""
-"Error loading board file:\n"
-"%s"
-msgstr ""
-"电路板文件载入错误：\n"
-"%s"
-
-#: pcbnew/files.cpp:611
+#: pcbnew/files.cpp:619
 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."
@@ -24759,17 +24993,12 @@ msgstr ""
 "这个文件是由 Pcbnew 旧版本创建\n"
 "当您保存此文件，它会以新的文件格式存储。"
 
-#: pcbnew/files.cpp:692
-#, c-format
-msgid "Warning: unable to create backup file \"%s\""
-msgstr "警告: 未能创建备份文件 \"%s\""
-
-#: pcbnew/files.cpp:718 pcbnew/files.cpp:831
+#: pcbnew/files.cpp:697 pcbnew/files.cpp:830
 #, c-format
 msgid "No access rights to write to file \"%s\""
 msgstr "没有权限写入文件 \"%s\""
 
-#: pcbnew/files.cpp:761 pcbnew/files.cpp:855
+#: pcbnew/files.cpp:756 pcbnew/files.cpp:854
 #, c-format
 msgid ""
 "Error saving board file \"%s\".\n"
@@ -24778,7 +25007,7 @@ msgstr ""
 "保存电路板文件 \"%s\" 错误。\n"
 "%s"
 
-#: pcbnew/files.cpp:780
+#: pcbnew/files.cpp:775
 #, c-format
 msgid ""
 "Error saving board file \"%s\".\n"
@@ -24787,17 +25016,12 @@ msgstr ""
 "保存电路板文件 \"%s\" 时出错。\n"
 "重命名临时文件 \"%s\" 失败"
 
-#: pcbnew/files.cpp:809
-#, c-format
-msgid "Backup file: \"%s\""
-msgstr "备份文件：\"%s\""
-
-#: pcbnew/files.cpp:811
+#: pcbnew/files.cpp:810
 #, c-format
 msgid "Wrote board file: \"%s\""
 msgstr "写板文件：\"%s\""
 
-#: pcbnew/files.cpp:863
+#: pcbnew/files.cpp:862
 #, c-format
 msgid ""
 "Board copied to:\n"
@@ -24806,7 +25030,7 @@ msgstr ""
 "PCB 复制到：\n"
 "\"%s\""
 
-#: pcbnew/files.cpp:973
+#: pcbnew/files.cpp:979
 #, c-format
 msgid ""
 "Error occurred saving project specific footprint library table:\n"
@@ -24817,47 +25041,47 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/footprint_edit_frame.cpp:170 pcbnew/zone_settings.cpp:201
+#: pcbnew/footprint_edit_frame.cpp:170 pcbnew/zone_settings.cpp:204
 msgid "Inner layers"
 msgstr "内部图层"
 
-#: pcbnew/footprint_edit_frame.cpp:236
+#: pcbnew/footprint_edit_frame.cpp:235
 msgid "Footprint changes are unsaved"
 msgstr "封装更改未保存"
 
-#: pcbnew/footprint_edit_frame.cpp:686
+#: pcbnew/footprint_edit_frame.cpp:681
 msgid "[Read Only]"
 msgstr "[只读]"
 
-#: pcbnew/footprint_edit_frame.cpp:693
+#: pcbnew/footprint_edit_frame.cpp:688
 msgid "[Unsaved]"
 msgstr "[未保存]"
 
-#: pcbnew/footprint_edit_frame.cpp:758
+#: pcbnew/footprint_edit_frame.cpp:753
 msgid "Updating Footprint Libraries"
 msgstr "更新封装库"
 
-#: pcbnew/footprint_edit_frame.cpp:838
+#: pcbnew/footprint_edit_frame.cpp:833
 msgid "Default Values"
 msgstr "默认值"
 
-#: pcbnew/footprint_edit_frame.cpp:920
+#: pcbnew/footprint_edit_frame.cpp:915
 msgid "No footprint selected."
 msgstr "没有选择封装。"
 
-#: pcbnew/footprint_edit_frame.cpp:929
+#: pcbnew/footprint_edit_frame.cpp:924
 msgid "Footprint Image File Name"
 msgstr "封装图像文件名称"
 
-#: pcbnew/footprint_editor_utils.cpp:197 pcbnew/initpcb.cpp:107
+#: pcbnew/footprint_editor_utils.cpp:183 pcbnew/initpcb.cpp:103
 msgid "The current footprint has been modified.  Save changes?"
 msgstr "当前封装已被修改。是否保存更改？"
 
-#: pcbnew/footprint_editor_utils.cpp:418
+#: pcbnew/footprint_editor_utils.cpp:407
 msgid "Edit Zone"
 msgstr "编辑区域"
 
-#: pcbnew/footprint_editor_utils.cpp:488
+#: pcbnew/footprint_editor_utils.cpp:477
 #, c-format
 msgid ""
 "The current configuration does not include the footprint library\n"
@@ -24869,11 +25093,11 @@ msgstr ""
 "使用管理封装库来编辑配置。\n"
 "来编辑配置。"
 
-#: pcbnew/footprint_editor_utils.cpp:491
+#: pcbnew/footprint_editor_utils.cpp:480
 msgid "Library not found in footprint library table."
 msgstr "在封装库表中未找到库。"
 
-#: pcbnew/footprint_editor_utils.cpp:499 pcbnew/footprint_viewer_frame.cpp:869
+#: pcbnew/footprint_editor_utils.cpp:488 pcbnew/footprint_viewer_frame.cpp:869
 #, c-format
 msgid ""
 "The library with the nickname \"%s\" is not enabled\n"
@@ -24884,7 +25108,7 @@ msgstr ""
 "在当前配置中，使用封装库管理\n"
 "来编辑封装。"
 
-#: pcbnew/footprint_editor_utils.cpp:502 pcbnew/footprint_viewer_frame.cpp:872
+#: pcbnew/footprint_editor_utils.cpp:491 pcbnew/footprint_viewer_frame.cpp:872
 msgid "Footprint library not enabled."
 msgstr "封装库未启用。"
 
@@ -24978,7 +25202,7 @@ msgstr "封装 \"%s\" 删除来自库 '%s'"
 
 #: pcbnew/footprint_libraries_utils.cpp:612
 msgid "No footprints to archive!"
-msgstr "没有要归档的封装！"
+msgstr "没有要压缩的封装！"
 
 #: pcbnew/footprint_libraries_utils.cpp:767
 #: pcbnew/footprint_viewer_frame.cpp:677
@@ -25090,23 +25314,23 @@ msgstr "参数"
 msgid "ModView: 3D Viewer [%s]"
 msgstr "模型浏览：3D 查看器 [%s]"
 
-#: pcbnew/footprint_wizard_frame.cpp:601
+#: pcbnew/footprint_wizard_frame.cpp:600
 msgid "Select wizard script to run"
 msgstr "选择向导脚本运行"
 
-#: pcbnew/footprint_wizard_frame.cpp:606
+#: pcbnew/footprint_wizard_frame.cpp:605
 msgid "Reset wizard parameters to default"
 msgstr "重置向导参数为默认值"
 
-#: pcbnew/footprint_wizard_frame.cpp:611
+#: pcbnew/footprint_wizard_frame.cpp:610
 msgid "Select previous parameters page"
 msgstr "选择上一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:614
+#: pcbnew/footprint_wizard_frame.cpp:613
 msgid "Select next parameters page"
 msgstr "选择下一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:629
+#: pcbnew/footprint_wizard_frame.cpp:628
 msgid "Export footprint to editor"
 msgstr "导出封装到编辑器"
 
@@ -25246,7 +25470,7 @@ msgstr "未知标记 \"%s\""
 msgid "Element token contains %d parameters."
 msgstr "元素标记包含 %d 个参数。"
 
-#: pcbnew/gpcb_plugin.cpp:961 pcbnew/kicad_plugin.cpp:2264
+#: pcbnew/gpcb_plugin.cpp:961 pcbnew/kicad_plugin.cpp:2106
 #, c-format
 msgid "Library \"%s\" is read only"
 msgstr "\"%s\" 库为只读"
@@ -25345,7 +25569,7 @@ msgstr "导入比例："
 msgid "Import Vector Graphics File"
 msgstr "导入矢量图形文件"
 
-#: pcbnew/initpcb.cpp:47
+#: pcbnew/initpcb.cpp:50
 msgid ""
 "Current Board will be lost and this operation cannot be undone. Continue?"
 msgstr "当前电路板将丢失，此操作无法撤消。继续吗？"
@@ -25379,26 +25603,26 @@ msgstr "无法重命名临时文件 \"%s\" 到封装库文件 \"%s\""
 msgid "Footprint library path '%s' does not exist (or is not a directory)."
 msgstr "封装库路径 \"%s\" 不存在（或不是目录）。"
 
-#: pcbnew/kicad_plugin.cpp:1340 pcbnew/legacy_plugin.cpp:98
+#: pcbnew/kicad_plugin.cpp:1164 pcbnew/legacy_plugin.cpp:98
 #, c-format
 msgid "unknown pad type: %d"
 msgstr "未知焊盘类型：%d"
 
-#: pcbnew/kicad_plugin.cpp:1732
+#: pcbnew/kicad_plugin.cpp:1552
 #, c-format
 msgid "unknown via type %d"
 msgstr "未知过孔类型 %d"
 
-#: pcbnew/kicad_plugin.cpp:1895
+#: pcbnew/kicad_plugin.cpp:1718
 #, c-format
 msgid "unknown zone corner smoothing type %d"
 msgstr "未知铜区角平滑类型  %d"
 
-#: pcbnew/kicad_plugin.cpp:2111
+#: pcbnew/kicad_plugin.cpp:1953
 msgid "this file does not contain a PCB"
 msgstr "此文件不包含 PCB"
 
-#: pcbnew/kicad_plugin.cpp:2252
+#: pcbnew/kicad_plugin.cpp:2094
 #, c-format
 msgid ""
 "Library \"%s\" does not exist.\n"
@@ -25407,46 +25631,46 @@ msgstr ""
 "库 \"%s\" 不存在。\n"
 "是否要创建它？"
 
-#: pcbnew/kicad_plugin.cpp:2256
+#: pcbnew/kicad_plugin.cpp:2098
 msgid "Library Not Found"
 msgstr "未找到库"
 
-#: pcbnew/kicad_plugin.cpp:2295
+#: pcbnew/kicad_plugin.cpp:2137
 #, c-format
 msgid "Footprint file name \"%s\" is not valid."
 msgstr "无效的封装文件名称 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2301
+#: pcbnew/kicad_plugin.cpp:2143
 #, c-format
 msgid "No write permissions to delete file \"%s\""
 msgstr "没有写入权限来删除文件 \"%s\""
 
-#: pcbnew/kicad_plugin.cpp:2350
+#: pcbnew/kicad_plugin.cpp:2192
 #, c-format
 msgid "Library \"%s\" is read only."
 msgstr "\"%s\" 库为只读。"
 
-#: pcbnew/kicad_plugin.cpp:2369
+#: pcbnew/kicad_plugin.cpp:2211
 #, c-format
 msgid "Cannot overwrite library path \"%s\"."
 msgstr "不能覆盖库路径 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2394
+#: pcbnew/kicad_plugin.cpp:2236
 #, c-format
 msgid "User does not have permission to delete directory \"%s\"."
 msgstr "用户没有权限删除目录 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2402
+#: pcbnew/kicad_plugin.cpp:2244
 #, c-format
 msgid "Library directory \"%s\" has unexpected sub-directories."
 msgstr "库目录 \"%s\" 有额外的子目录。"
 
-#: pcbnew/kicad_plugin.cpp:2421
+#: pcbnew/kicad_plugin.cpp:2263
 #, c-format
 msgid "Unexpected file \"%s\" was found in library path \"%s\"."
 msgstr "在库路径 \"%s\" 中找到了额外的文件 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2437
+#: pcbnew/kicad_plugin.cpp:2279
 #, c-format
 msgid "Footprint library \"%s\" cannot be deleted."
 msgstr "封装库 \"%s\" 不能被删除。"
@@ -25498,37 +25722,37 @@ msgstr "未知焊盘属性：%d"
 msgid "Unknown sheet type \"%s\" on line:%d"
 msgstr "未知图框类型 \"%s\" 在线：%d"
 
-#: pcbnew/legacy_plugin.cpp:1381
+#: pcbnew/legacy_plugin.cpp:1386
 #, c-format
 msgid "Missing '$EndMODULE' for MODULE \"%s\""
 msgstr "模块 \"%s\" 缺少 '$EndMODULE'"
 
-#: pcbnew/legacy_plugin.cpp:1432
+#: pcbnew/legacy_plugin.cpp:1437
 #, c-format
 msgid "Unknown padshape '%c=0x%02x' on line: %d of footprint: \"%s\""
 msgstr "未知焊盘形状 '%c=0x%02x' 在 %d 行的封装：\"%s\""
 
-#: pcbnew/legacy_plugin.cpp:1635
+#: pcbnew/legacy_plugin.cpp:1640
 #, 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:2409
+#: pcbnew/legacy_plugin.cpp:2414
 #, c-format
 msgid "duplicate NETCLASS name \"%s\""
 msgstr "复制网络类名称 \"%s\""
 
-#: pcbnew/legacy_plugin.cpp:2488 pcbnew/legacy_plugin.cpp:2499
+#: pcbnew/legacy_plugin.cpp:2493 pcbnew/legacy_plugin.cpp:2504
 #, c-format
 msgid "Bad ZAux for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\"的错误 ZAux"
 
-#: pcbnew/legacy_plugin.cpp:2517
+#: pcbnew/legacy_plugin.cpp:2522
 #, c-format
 msgid "Bad ZSmoothing for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\"是坏的 ZSmoothing"
 
-#: pcbnew/legacy_plugin.cpp:2573 pcbnew/pcb_parser.cpp:3879
+#: pcbnew/legacy_plugin.cpp:2578 pcbnew/pcb_parser.cpp:3933
 msgid ""
 "The legacy segment fill mode is no longer supported.\n"
 "Convert zones to polygon fills?"
@@ -25536,16 +25760,16 @@ msgstr ""
 "不再支持旧段填充模式。\n"
 "是否将区域转换为多边形填充？"
 
-#: pcbnew/legacy_plugin.cpp:2575 pcbnew/pcb_parser.cpp:3881
+#: pcbnew/legacy_plugin.cpp:2580 pcbnew/pcb_parser.cpp:3935
 msgid "Legacy Zone Warning"
 msgstr "旧区警告"
 
-#: pcbnew/legacy_plugin.cpp:2612
+#: pcbnew/legacy_plugin.cpp:2617
 #, c-format
 msgid "Bad ZClearance padoption for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\" 的 ZClearance 选项不正确"
 
-#: pcbnew/legacy_plugin.cpp:2931 pcbnew/legacy_plugin.cpp:2968
+#: pcbnew/legacy_plugin.cpp:2937 pcbnew/legacy_plugin.cpp:2974
 #, c-format
 msgid ""
 "invalid float number in file: \"%s\"\n"
@@ -25554,7 +25778,7 @@ msgstr ""
 "文件中的浮点数字无效：\"%s\"\n"
 "行：%d, 偏移量：%d"
 
-#: pcbnew/legacy_plugin.cpp:2940 pcbnew/legacy_plugin.cpp:2976
+#: pcbnew/legacy_plugin.cpp:2946 pcbnew/legacy_plugin.cpp:2982
 #, c-format
 msgid ""
 "missing float number in file: \"%s\"\n"
@@ -25563,12 +25787,12 @@ msgstr ""
 "文件中缺少浮点数：\"%s\"\n"
 "行：%d，偏移量：%d"
 
-#: pcbnew/legacy_plugin.cpp:3176
+#: pcbnew/legacy_plugin.cpp:3182
 #, c-format
 msgid "File '%s' is empty."
 msgstr "文件 \"%s\" 为空。"
 
-#: pcbnew/legacy_plugin.cpp:3179
+#: pcbnew/legacy_plugin.cpp:3185
 #, c-format
 msgid "File '%s' is not a legacy library."
 msgstr "文件 \"%s\" 不是一个旧库。"
@@ -25593,43 +25817,43 @@ msgstr "封装 \"%s\" 保存"
 msgid "Footprint library \"%s\" saved as \"%s\"."
 msgstr "封装库 \"%s\" 另存为 \"%s\"。"
 
-#: pcbnew/menubar_footprint_editor.cpp:87
+#: pcbnew/menubar_footprint_editor.cpp:84
 msgid "&Import Graphics..."
 msgstr "导入图形... (&I)"
 
-#: pcbnew/menubar_footprint_editor.cpp:88
+#: pcbnew/menubar_footprint_editor.cpp:85
 msgid "Import 2D Drawing file to Footprint Editor on Drawings layer"
 msgstr "在绘制图层上将 2D 绘制导入到封装编辑器"
 
-#: pcbnew/menubar_footprint_editor.cpp:98
+#: pcbnew/menubar_footprint_editor.cpp:95
 msgid "Export View as &PNG..."
 msgstr "导出视图为 PNG... (&P)"
 
-#: pcbnew/menubar_footprint_editor.cpp:99
+#: pcbnew/menubar_footprint_editor.cpp:96
 msgid "Create a PNG file from the current view"
 msgstr "从当前视图创建一个 PNG 文件"
 
-#: pcbnew/menubar_footprint_editor.cpp:205 pcbnew/menubar_pcb_editor.cpp:371
+#: pcbnew/menubar_footprint_editor.cpp:206 pcbnew/menubar_pcb_editor.cpp:366
 msgid "&Drawing Mode"
 msgstr "绘制模式 (&D)"
 
-#: pcbnew/menubar_footprint_editor.cpp:214 pcbnew/menubar_pcb_editor.cpp:391
+#: pcbnew/menubar_footprint_editor.cpp:216 pcbnew/menubar_pcb_editor.cpp:386
 msgid "&Contrast Mode"
 msgstr "对比度模式 (&C)"
 
-#: pcbnew/menubar_footprint_editor.cpp:259
+#: pcbnew/menubar_footprint_editor.cpp:262
 msgid "&Load Footprint from PCB..."
 msgstr "从 PCB 载入封装... (&L)"
 
-#: pcbnew/menubar_footprint_editor.cpp:260
+#: pcbnew/menubar_footprint_editor.cpp:263
 msgid "Load a footprint from the current board into the editor"
 msgstr "将当前电路板的封装载入到编辑器中"
 
-#: pcbnew/menubar_footprint_editor.cpp:264
+#: pcbnew/menubar_footprint_editor.cpp:267
 msgid "&Insert Footprint on PCB"
 msgstr "在 PCB 上插入封装 (&I)"
 
-#: pcbnew/menubar_footprint_editor.cpp:265
+#: pcbnew/menubar_footprint_editor.cpp:268
 msgid "Insert footprint onto current board"
 msgstr "将封装插入到当前电路板"
 
@@ -25641,113 +25865,105 @@ msgstr "恢复 (&U)"
 msgid "Clear board and get last rescue file automatically saved by Pcbnew"
 msgstr "清除电路板以便恢复最后的自动备份 Pcbnew 文件"
 
-#: pcbnew/menubar_pcb_editor.cpp:110
-msgid "Revert to Last Backup"
-msgstr "恢复到上次备份"
-
-#: pcbnew/menubar_pcb_editor.cpp:111
-msgid "Clear board and get previous backup version of board"
-msgstr "清除更改并恢复到以前版本"
-
-#: pcbnew/menubar_pcb_editor.cpp:122
+#: pcbnew/menubar_pcb_editor.cpp:117
 msgid "Graphics..."
 msgstr "图形..."
 
-#: pcbnew/menubar_pcb_editor.cpp:122
+#: pcbnew/menubar_pcb_editor.cpp:117
 msgid "Import 2D drawing file"
 msgstr "导入2D 绘制文件"
 
-#: pcbnew/menubar_pcb_editor.cpp:127
+#: pcbnew/menubar_pcb_editor.cpp:122
 msgid "Non-KiCad Board File..."
 msgstr "非 KiCad 电路板文件..."
 
-#: pcbnew/menubar_pcb_editor.cpp:128
+#: pcbnew/menubar_pcb_editor.cpp:123
 msgid "Import board file from other applications"
 msgstr "从其它应用程序中导入板文件"
 
-#: pcbnew/menubar_pcb_editor.cpp:142
+#: pcbnew/menubar_pcb_editor.cpp:137
 msgid "GenCAD..."
 msgstr "GenCAD..."
 
-#: pcbnew/menubar_pcb_editor.cpp:142
+#: pcbnew/menubar_pcb_editor.cpp:137
 msgid "Export GenCAD board representation"
 msgstr "导出 GenCAD 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:144
+#: pcbnew/menubar_pcb_editor.cpp:139
 msgid "VRML..."
 msgstr "VRML..."
 
-#: pcbnew/menubar_pcb_editor.cpp:144
+#: pcbnew/menubar_pcb_editor.cpp:139
 msgid "Export VRML 3D board representation"
 msgstr "导出 VRML 3D 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:146
+#: pcbnew/menubar_pcb_editor.cpp:141
 msgid "IDFv3..."
 msgstr "IDFv3..."
 
-#: pcbnew/menubar_pcb_editor.cpp:146
+#: pcbnew/menubar_pcb_editor.cpp:141
 msgid "Export IDF 3D board representation"
 msgstr "导出 IDF 3D 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:148
+#: pcbnew/menubar_pcb_editor.cpp:143
 msgid "STEP..."
 msgstr "STEP..."
 
-#: pcbnew/menubar_pcb_editor.cpp:148
+#: pcbnew/menubar_pcb_editor.cpp:143
 msgid "Export STEP 3D board representation"
 msgstr "导出 STEP 3D 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:150
+#: pcbnew/menubar_pcb_editor.cpp:145
 msgid "SVG..."
 msgstr "SVG..."
 
-#: pcbnew/menubar_pcb_editor.cpp:150
+#: pcbnew/menubar_pcb_editor.cpp:145
 msgid "Export SVG board representation"
 msgstr "导出 SVG 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:152
+#: pcbnew/menubar_pcb_editor.cpp:147
 msgid "Footprint Association (.cmp) File..."
 msgstr "封装关联 (.cmp) 文件..."
 
-#: pcbnew/menubar_pcb_editor.cpp:153
+#: pcbnew/menubar_pcb_editor.cpp:148
 msgid "Export footprint association file (*.cmp) for schematic back annotation"
 msgstr "导出封装关联文件 (*.cmp) 用于原理图中反向批注"
 
-#: pcbnew/menubar_pcb_editor.cpp:155
+#: pcbnew/menubar_pcb_editor.cpp:150
 msgid "Hyperlynx..."
 msgstr "Hyperlynx..."
 
-#: pcbnew/menubar_pcb_editor.cpp:163
+#: pcbnew/menubar_pcb_editor.cpp:158
 msgid "Fabrication Outputs"
 msgstr "制造输出"
 
-#: pcbnew/menubar_pcb_editor.cpp:192
+#: pcbnew/menubar_pcb_editor.cpp:187
 msgid "Archive Footprints"
-msgstr "归档封装"
+msgstr "压缩封装"
 
-#: pcbnew/menubar_pcb_editor.cpp:195
+#: pcbnew/menubar_pcb_editor.cpp:190
 msgid "&Archive Footprints in Existing Library..."
-msgstr "归档封装到现有库中... (&A)"
+msgstr "压缩封装到现有库中... (&A)"
 
-#: pcbnew/menubar_pcb_editor.cpp:196
+#: pcbnew/menubar_pcb_editor.cpp:191
 msgid ""
 "Archive all footprints to existing library in footprint Lib table(does not "
 "remove other footprints in this library)"
-msgstr "将所有封装归档到现有库的封装库表中 (不会删除此库中的其他封装)"
+msgstr "将所有封装压缩到现有库的封装库表中 (不会删除此库中的其他封装)"
 
-#: pcbnew/menubar_pcb_editor.cpp:200
+#: pcbnew/menubar_pcb_editor.cpp:195
 msgid "&Create New Library and Archive Footprints..."
-msgstr "创建新库并归档封装... (&C)"
+msgstr "创建新库并压缩封装... (&C)"
 
-#: pcbnew/menubar_pcb_editor.cpp:201
+#: pcbnew/menubar_pcb_editor.cpp:196
 msgid ""
 "Archive all footprints to a new library\n"
 "(if the library already exists it will be replaced)"
 msgstr ""
-"归档所有的封装到新库\n"
+"压缩所有的封装到新库\n"
 "(如果这个库已经存在，将会被替换)"
 
-#: pcbnew/menubar_pcb_editor.cpp:434
+#: pcbnew/menubar_pcb_editor.cpp:430
 msgid "Auto-Place Footprints"
 msgstr "自动放置封装"
 
@@ -25864,11 +26080,6 @@ msgstr "形状不包含任何点!"
 msgid "Place microwave feature"
 msgstr "放置微波特征"
 
-#: pcbnew/netclass.h:165
-#, c-format
-msgid "'%s' netclass"
-msgstr "'%s' 网络类"
-
 #: pcbnew/netinfo_item.cpp:84
 msgid "Net Name"
 msgstr "网络名称"
@@ -26000,32 +26211,33 @@ msgstr "处理元件 \"%s:%s\"。"
 msgid "Multiple footprints found for \"%s\"."
 msgstr "找到 \"%s\" 的多个封装。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:830
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:841
+#, c-format
+msgid "Remove unused net \"%s\"."
+msgstr "删除未使用的网络 \"%s\"。"
+
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:848
 msgid "Update netlist"
 msgstr "更新网表"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:856
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:868
 #, c-format
 msgid "Total warnings: %d, errors: %d."
 msgstr "总计警告：%d，错误：%d。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:861
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:873
 msgid ""
 "Errors occurred during the netlist update. Unless you fix them your board "
 "will not be consistent with the schematics."
 msgstr "网表更新发生错误。如果不能解决这些问题，电路板将无法与原理图保持一致。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:867
-msgid "Netlist update successful!"
-msgstr "网表更新成功！"
-
 #: pcbnew/netlist_reader/kicad_netlist_reader.cpp:263
 #, c-format
 msgid "Cannot find component with reference designator \"%s\" in netlist."
 msgstr "未能在网表中找到元件参考指示符 \"%s\"。"
 
 #: pcbnew/netlist_reader/kicad_netlist_reader.cpp:390
-#: pcbnew/pcb_parser.cpp:2416
+#: pcbnew/pcb_parser.cpp:2469
 #, c-format
 msgid ""
 "Invalid footprint ID in\n"
@@ -26067,16 +26279,16 @@ msgstr "无法解析网络列表的元件部分的网络名称。"
 msgid "Cannot find symbol \"%s\" in footprint filter section of netlist."
 msgstr "无法在网络列表封装筛选中找到元件 \"%s\"。"
 
-#: pcbnew/netlist_reader/netlist.cpp:70
+#: pcbnew/netlist_reader/netlist.cpp:72
 #, c-format
 msgid "Cannot open netlist file \"%s\"."
 msgstr "不能打开网表 \"%s\"."
 
-#: pcbnew/netlist_reader/netlist.cpp:71
+#: pcbnew/netlist_reader/netlist.cpp:73
 msgid "Netlist Load Error."
 msgstr "网表载入错误."
 
-#: pcbnew/netlist_reader/netlist.cpp:81
+#: pcbnew/netlist_reader/netlist.cpp:83
 #, c-format
 msgid ""
 "Error loading netlist.\n"
@@ -26085,27 +26297,27 @@ msgstr ""
 "网表文件加载错误\n"
 " %s"
 
-#: pcbnew/netlist_reader/netlist.cpp:82
+#: pcbnew/netlist_reader/netlist.cpp:84
 msgid "Netlist Load Error"
 msgstr "网表载入错误"
 
-#: pcbnew/netlist_reader/netlist.cpp:159
+#: pcbnew/netlist_reader/netlist.cpp:164
 #, c-format
 msgid "No footprint defined for symbol \"%s\".\n"
 msgstr "没有为符号 \"%s\" 定义封装。\n"
 
-#: pcbnew/netlist_reader/netlist.cpp:177
+#: pcbnew/netlist_reader/netlist.cpp:182
 #, c-format
 msgid ""
 "Footprint of %s changed: board footprint \"%s\", netlist footprint \"%s\"."
 msgstr "\"%s\" 的封装发生了变化：电路板封装 \"%s\"，网表封装 \"%s\"。"
 
-#: pcbnew/netlist_reader/netlist.cpp:204
+#: pcbnew/netlist_reader/netlist.cpp:209
 #, c-format
 msgid "%s footprint ID \"%s\" is not valid."
 msgstr "%s的封装 ID \"%s\" 无效。"
 
-#: pcbnew/netlist_reader/netlist.cpp:221
+#: pcbnew/netlist_reader/netlist.cpp:226
 #, c-format
 msgid ""
 "%s footprint \"%s\" not found in any libraries in the footprint library "
@@ -26138,24 +26350,28 @@ msgstr "KiCad 仅支持 32 个信号层"
 msgid "Error loading project footprint libraries"
 msgstr "加载工程封装库时出错"
 
-#: pcbnew/pcb_edit_frame.cpp:318
+#: pcbnew/pcb_edit_frame.cpp:253
+msgid "Selection Filter"
+msgstr "选择筛选器"
+
+#: pcbnew/pcb_edit_frame.cpp:327
 msgid "New PCB file is unsaved"
 msgstr "新的 PCB 文件未保存"
 
-#: pcbnew/pcb_edit_frame.cpp:580
+#: pcbnew/pcb_edit_frame.cpp:602
 #, c-format
 msgid "The auto save file \"%s\" could not be removed!"
 msgstr "自动保存文件 \"%s\" 不能被删除！"
 
-#: pcbnew/pcb_edit_frame.cpp:747
+#: pcbnew/pcb_edit_frame.cpp:784
 msgid "PCB file changes are unsaved"
 msgstr "PCB 文件更改未保存"
 
-#: pcbnew/pcb_edit_frame.cpp:885
+#: pcbnew/pcb_edit_frame.cpp:926
 msgid " [Unsaved]"
 msgstr " [未保存]"
 
-#: pcbnew/pcb_edit_frame.cpp:1014
+#: pcbnew/pcb_edit_frame.cpp:1055
 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 "
@@ -26164,20 +26380,24 @@ msgstr ""
 "无法更新 PCB, 因为 Pcbnew 是在独立模式下打开的。为了从原理图创建或更新 PCB, "
 "您必须启动 KiCad 工程管理器并创建一个工程。"
 
-#: pcbnew/pcb_edit_frame.cpp:1037
+#: pcbnew/pcb_edit_frame.cpp:1078
 msgid "The schematic for this board cannot be found."
 msgstr "找不到该电路板的原理图。"
 
-#: pcbnew/pcb_edit_frame.cpp:1063
+#: pcbnew/pcb_edit_frame.cpp:1104
 msgid "Eeschema netlist"
 msgstr "Eeschema 网表"
 
-#: pcbnew/pcb_edit_frame.cpp:1097
+#: pcbnew/pcb_edit_frame.cpp:1138
 #, c-format
 msgid "Schematic file \"%s\" not found."
 msgstr "没有找到原理图文件 \"%s\"。"
 
-#: pcbnew/pcb_edit_frame.cpp:1283
+#: pcbnew/pcb_edit_frame.cpp:1168
+msgid "Eeschema failed to load:\n"
+msgstr "Eeschema 无法加载:\n"
+
+#: pcbnew/pcb_edit_frame.cpp:1324
 msgid "Export Hyperlynx Layout"
 msgstr "导出 Hyperlynx 布局"
 
@@ -26321,83 +26541,83 @@ msgstr "仅显示底层"
 msgid "Show Only Back Assembly Layers"
 msgstr "仅显示底装配层"
 
-#: pcbnew/pcb_layer_widget.cpp:500
+#: pcbnew/pcb_layer_widget.cpp:488
 msgid "Front copper layer"
 msgstr "顶层铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:504
+#: pcbnew/pcb_layer_widget.cpp:492
 msgid "Back copper layer"
 msgstr "底层铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:508
+#: pcbnew/pcb_layer_widget.cpp:496
 msgid "Inner copper layer"
 msgstr "内部铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:533
+#: pcbnew/pcb_layer_widget.cpp:521
 msgid "Adhesive on board's front"
 msgstr "顶层粘胶"
 
-#: pcbnew/pcb_layer_widget.cpp:534
+#: pcbnew/pcb_layer_widget.cpp:522
 msgid "Adhesive on board's back"
 msgstr "底层粘胶"
 
-#: pcbnew/pcb_layer_widget.cpp:535
+#: pcbnew/pcb_layer_widget.cpp:523
 msgid "Solder paste on board's front"
 msgstr "顶层锡膏"
 
-#: pcbnew/pcb_layer_widget.cpp:536
+#: pcbnew/pcb_layer_widget.cpp:524
 msgid "Solder paste on board's back"
 msgstr "底层锡膏"
 
-#: pcbnew/pcb_layer_widget.cpp:537
+#: pcbnew/pcb_layer_widget.cpp:525
 msgid "Silkscreen on board's front"
 msgstr "顶层丝印"
 
-#: pcbnew/pcb_layer_widget.cpp:538
+#: pcbnew/pcb_layer_widget.cpp:526
 msgid "Silkscreen on board's back"
 msgstr "底层丝印"
 
-#: pcbnew/pcb_layer_widget.cpp:539
+#: pcbnew/pcb_layer_widget.cpp:527
 msgid "Solder mask on board's front"
 msgstr "顶层阻焊"
 
-#: pcbnew/pcb_layer_widget.cpp:540
+#: pcbnew/pcb_layer_widget.cpp:528
 msgid "Solder mask on board's back"
 msgstr "底层阻焊"
 
-#: pcbnew/pcb_layer_widget.cpp:541
+#: pcbnew/pcb_layer_widget.cpp:529
 msgid "Explanatory drawings"
 msgstr "图形说明"
 
-#: pcbnew/pcb_layer_widget.cpp:542
+#: pcbnew/pcb_layer_widget.cpp:530
 msgid "Explanatory comments"
 msgstr "描述性注释"
 
-#: pcbnew/pcb_layer_widget.cpp:543 pcbnew/pcb_layer_widget.cpp:544
+#: pcbnew/pcb_layer_widget.cpp:531 pcbnew/pcb_layer_widget.cpp:532
 msgid "User defined meaning"
 msgstr "用户自定义"
 
-#: pcbnew/pcb_layer_widget.cpp:545
+#: pcbnew/pcb_layer_widget.cpp:533
 msgid "Board's perimeter definition"
 msgstr "定义电路板的边框轮廓"
 
-#: pcbnew/pcb_layer_widget.cpp:546
+#: pcbnew/pcb_layer_widget.cpp:534
 msgid "Board's edge setback outline"
 msgstr "电路板电气边界层"
 
-#: pcbnew/pcb_layer_widget.cpp:547
+#: pcbnew/pcb_layer_widget.cpp:535
 msgid "Footprint courtyards on board's front"
 msgstr "顶层上的封装外框"
 
-#: pcbnew/pcb_layer_widget.cpp:548
+#: pcbnew/pcb_layer_widget.cpp:536
 msgid "Footprint courtyards on board's back"
 msgstr "底层上的封装外框"
 
-#: pcbnew/pcb_layer_widget.cpp:549
+#: pcbnew/pcb_layer_widget.cpp:537
 msgid "Footprint assembly on board's front"
 msgstr "顶层封装装配"
 
-#: pcbnew/pcb_layer_widget.cpp:550
+#: pcbnew/pcb_layer_widget.cpp:538
 msgid "Footprint assembly on board's back"
 msgstr "底层封装装配"
 
@@ -26406,12 +26626,12 @@ msgstr "底层封装装配"
 msgid "Cannot interpret date code %d"
 msgstr "无法解释日期代码 %d"
 
-#: pcbnew/pcb_parser.cpp:512 pcbnew/pcb_parser.cpp:625
+#: pcbnew/pcb_parser.cpp:512 pcbnew/pcb_parser.cpp:626
 #, c-format
 msgid "Unknown token \"%s\""
 msgstr "未知标记 \"%s\""
 
-#: pcbnew/pcb_parser.cpp:634
+#: pcbnew/pcb_parser.cpp:635
 msgid ""
 "Items found on undefined layers.  Do you wish to\n"
 "rescue them to the Cmts.User layer?"
@@ -26419,35 +26639,35 @@ msgstr ""
 "在未定义的图层上找到的项目。 \n"
 "你想把他们恢复到 Cmts.User 层吗？"
 
-#: pcbnew/pcb_parser.cpp:636
+#: pcbnew/pcb_parser.cpp:637
 msgid "Undefined layers:"
 msgstr "未定义的层："
 
-#: pcbnew/pcb_parser.cpp:644
+#: pcbnew/pcb_parser.cpp:645
 msgid "Rescue"
 msgstr "恢复"
 
-#: pcbnew/pcb_parser.cpp:1322
+#: pcbnew/pcb_parser.cpp:1326
 #, 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:1359
+#: pcbnew/pcb_parser.cpp:1365
 #, c-format
 msgid "%d is not a valid layer count"
 msgstr "%d 不是一个有效的层数"
 
-#: pcbnew/pcb_parser.cpp:1936
+#: pcbnew/pcb_parser.cpp:1989
 #, c-format
 msgid "Duplicate NETCLASS name \"%s\" in file \"%s\" at line %d, offset %d"
 msgstr "重复网络类名称 \"%s\" 在文件 \"%s\" 的 %d,行 位移 %d"
 
-#: pcbnew/pcb_parser.cpp:2696
+#: pcbnew/pcb_parser.cpp:2749
 #, c-format
 msgid "Cannot handle footprint text type %s"
 msgstr "无法处理封装文本类型 %s"
 
-#: pcbnew/pcb_parser.cpp:3158
+#: pcbnew/pcb_parser.cpp:3211
 #, c-format
 msgid ""
 "Invalid net ID in\n"
@@ -26460,7 +26680,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:3174
+#: pcbnew/pcb_parser.cpp:3227
 #, c-format
 msgid ""
 "Net name doesn't match net ID in\n"
@@ -26473,8 +26693,8 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:3536 pcbnew/pcb_parser.cpp:3602
-#: pcbnew/pcb_parser.cpp:3685 pcbnew/pcb_parser.cpp:3756
+#: pcbnew/pcb_parser.cpp:3589 pcbnew/pcb_parser.cpp:3655
+#: pcbnew/pcb_parser.cpp:3738 pcbnew/pcb_parser.cpp:3811
 #, c-format
 msgid ""
 "Invalid net ID in\n"
@@ -26487,7 +26707,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:4166
+#: pcbnew/pcb_parser.cpp:4301
 #, c-format
 msgid ""
 "There is a zone that belongs to a not existing net\n"
@@ -26503,7 +26723,7 @@ msgstr ""
 "试图加载全局封装库表时出错：\n"
 "请在首选项菜单中编辑此全局封装库表。"
 
-#: pcbnew/pcbnew_config.cpp:69
+#: pcbnew/pcbnew_config.cpp:76
 msgid "Action Plugins"
 msgstr "活动插件"
 
@@ -26650,13 +26870,13 @@ msgstr "调整： "
 msgid "?"
 msgstr "？"
 
-#: pcbnew/router/pns_kicad_iface.cpp:725
+#: pcbnew/router/pns_kicad_iface.cpp:730
 #, c-format
 msgid "Malformed keep-out zone at (%d, %d)"
 msgstr "(%d, %d)处的禁止布线区形状异常"
 
 # 此zone经核查源码确认为禁止布线区
-#: pcbnew/router/pns_kicad_iface.cpp:728
+#: pcbnew/router/pns_kicad_iface.cpp:733
 #, c-format
 msgid ""
 "%s\n"
@@ -26667,7 +26887,7 @@ msgstr ""
 "布线工具无法处理此禁止布线区。\n"
 "请确保它不是自相交的多边形。"
 
-#: pcbnew/router/pns_kicad_iface.cpp:1291 pcbnew/router/router_tool.cpp:394
+#: pcbnew/router/pns_kicad_iface.cpp:1220 pcbnew/router/router_tool.cpp:394
 msgid "Interactive Router"
 msgstr "交互布线"
 
@@ -26863,42 +27083,42 @@ msgstr "，间隙 "
 msgid ", via gap "
 msgstr "，过孔间隙 "
 
-#: pcbnew/router/router_tool.cpp:577
+#: pcbnew/router/router_tool.cpp:704
 msgid ""
 "Blind/buried vias have to be enabled in Board Setup > Design Rules > "
 "Constraints."
 msgstr "必须在“电路板设置”>“设计规则”>“约束”中启用盲孔/埋孔。"
 
-#: pcbnew/router/router_tool.cpp:584
+#: pcbnew/router/router_tool.cpp:711
 msgid ""
 "Microvias have to be enabled in Board Setup > Design Rules > Constraints."
 msgstr "必须在“电路板设置”>“设计规则”>“约束”中启用微孔。"
 
-#: pcbnew/router/router_tool.cpp:591
+#: pcbnew/router/router_tool.cpp:718
 msgid "Only through vias are allowed on 2 layer boards."
 msgstr "2 层板上只允许通孔。"
 
-#: pcbnew/router/router_tool.cpp:599
+#: pcbnew/router/router_tool.cpp:726
 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:708
+#: pcbnew/router/router_tool.cpp:835
 msgid "Tracks on Copper layers only"
 msgstr "布线只能出现在铜层"
 
-#: pcbnew/router/router_tool.cpp:1058 pcbnew/router/router_tool.cpp:1237
-#: pcbnew/router/router_tool.cpp:1320
+#: pcbnew/router/router_tool.cpp:1191 pcbnew/router/router_tool.cpp:1370
+#: pcbnew/router/router_tool.cpp:1453
 msgid "The selected item is locked."
 msgstr "选择的项目被锁定。"
 
-#: pcbnew/router/router_tool.cpp:1060 pcbnew/router/router_tool.cpp:1239
+#: pcbnew/router/router_tool.cpp:1193 pcbnew/router/router_tool.cpp:1372
 msgid "Drag Anyway"
 msgstr "仍然拖动"
 
-#: pcbnew/router/router_tool.cpp:1322 pcbnew/tools/pcb_actions.cpp:1195
-#: pcbnew/tools/pcb_actions.cpp:1201
+#: pcbnew/router/router_tool.cpp:1455 pcbnew/tools/pcb_actions.cpp:1202
+#: pcbnew/tools/pcb_actions.cpp:1208
 msgid "Break Track"
 msgstr "分割布线"
 
@@ -26942,9 +27162,10 @@ msgstr "会话文件导入与合并完成。"
 msgid "Session file uses invalid layer id \"%s\""
 msgstr "会话文件使用了错误的层标识 \"%s\""
 
+# Padstack: 焊盘和过孔
 #: pcbnew/specctra_import_export/specctra_import.cpp:220
 msgid "Session via padstack has no shapes"
-msgstr "过孔焊盘的会话没有形状"
+msgstr "过孔焊盘和过孔的会话没有形状"
 
 #: pcbnew/specctra_import_export/specctra_import.cpp:227
 #: pcbnew/specctra_import_export/specctra_import.cpp:245
@@ -26973,7 +27194,7 @@ msgstr "未找到引用 \"%s\"。"
 #: pcbnew/specctra_import_export/specctra_import.cpp:498
 #, c-format
 msgid "A wire_via references a missing padstack \"%s\""
-msgstr "发现一个连线-过孔索引指向了丢失的焊盘栈 \"%s\""
+msgstr "发现一个导线_过孔索引指向了丢失的焊盘和过孔 \"%s\""
 
 #: pcbnew/swig/pcbnew_action_plugins.cpp:77
 msgid "Exception on python action plugin code"
@@ -27006,23 +27227,23 @@ msgstr "插入封装放置到当前电路板"
 msgid "Check footprint"
 msgstr "检查封装"
 
-#: pcbnew/toolbars_footprint_editor.cpp:202 pcbnew/toolbars_pcb_editor.cpp:598
+#: pcbnew/toolbars_footprint_editor.cpp:202 pcbnew/toolbars_pcb_editor.cpp:631
 msgid "+/- to switch"
 msgstr "+/- 切换"
 
-#: pcbnew/toolbars_footprint_viewer.cpp:56
+#: pcbnew/toolbars_footprint_viewer.cpp:54
 msgid "Display previous footprint"
 msgstr "显示上一个封装"
 
-#: pcbnew/toolbars_footprint_viewer.cpp:59
+#: pcbnew/toolbars_footprint_viewer.cpp:57
 msgid "Display next footprint"
 msgstr "显示下一个封装"
 
-#: pcbnew/toolbars_footprint_viewer.cpp:73
+#: pcbnew/toolbars_footprint_viewer.cpp:71
 msgid "Insert footprint in board"
 msgstr "将封装放置到电路板"
 
-#: pcbnew/toolbars_pcb_editor.cpp:51
+#: pcbnew/toolbars_pcb_editor.cpp:55
 msgid ""
 "Show active layer selections\n"
 "and select layer pair for route and place via"
@@ -27030,7 +27251,7 @@ msgstr ""
 "显示工作中的层\n"
 "选择布线和过孔的连接层"
 
-#: pcbnew/toolbars_pcb_editor.cpp:469
+#: pcbnew/toolbars_pcb_editor.cpp:502
 msgid ""
 "Auto track width: when starting on an existing track use its width\n"
 "otherwise, use current width setting"
@@ -27038,191 +27259,147 @@ msgstr ""
 "自动布线宽度：在开始现有的布线时使用它的宽度，\n"
 "否则，使用当前的宽度设置"
 
-#: pcbnew/toolbars_pcb_editor.cpp:517
+#: pcbnew/toolbars_pcb_editor.cpp:550
 #, c-format
 msgid "Track: %.3f mm (%.2f mils)"
 msgstr "布线：%.3f mm (%.2f mils)"
 
-#: pcbnew/toolbars_pcb_editor.cpp:519
+#: pcbnew/toolbars_pcb_editor.cpp:552
 #, c-format
 msgid "Track: %.2f mils (%.3f mm)"
 msgstr "布线: %.2f mils (%.3f mm)"
 
-#: pcbnew/toolbars_pcb_editor.cpp:531 pcbnew/toolbars_pcb_editor.cpp:583
+#: pcbnew/toolbars_pcb_editor.cpp:564 pcbnew/toolbars_pcb_editor.cpp:616
 msgid "Edit Pre-defined Sizes..."
 msgstr "编辑预定义尺寸..."
 
-#: pcbnew/toolbars_pcb_editor.cpp:559
+#: pcbnew/toolbars_pcb_editor.cpp:592
 #, c-format
 msgid "%.2f / %.2f mm"
 msgstr "%.2f / %.2f mm"
 
-#: pcbnew/toolbars_pcb_editor.cpp:561
+#: pcbnew/toolbars_pcb_editor.cpp:594
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: pcbnew/toolbars_pcb_editor.cpp:567
+#: pcbnew/toolbars_pcb_editor.cpp:600
 #, c-format
 msgid "%.1f / %.1f mils"
 msgstr "%.1f / %.1f mils"
 
-#: pcbnew/toolbars_pcb_editor.cpp:569
+#: pcbnew/toolbars_pcb_editor.cpp:602
 #, c-format
 msgid "%.1f mils"
 msgstr "%.1f mils"
 
-#: pcbnew/toolbars_pcb_editor.cpp:571
+#: pcbnew/toolbars_pcb_editor.cpp:604
 #, c-format
 msgid "Via: %s (%s)"
 msgstr "过孔：%s (%s)"
 
-#: pcbnew/tools/drawing_tool.cpp:170 pcbnew/tools/drawing_tool.cpp:1134
+#: pcbnew/tools/drawing_tool.cpp:166 pcbnew/tools/drawing_tool.cpp:1165
 msgid "Draw a line segment"
 msgstr "绘制线段"
 
-#: pcbnew/tools/drawing_tool.cpp:214 pcbnew/tools/pcb_actions.cpp:71
+#: pcbnew/tools/drawing_tool.cpp:210 pcbnew/tools/pcb_actions.cpp:71
 msgid "Draw a rectangle"
 msgstr "绘制矩形"
 
-#: pcbnew/tools/drawing_tool.cpp:256 pcbnew/tools/pcb_actions.cpp:77
+#: pcbnew/tools/drawing_tool.cpp:252 pcbnew/tools/pcb_actions.cpp:77
 msgid "Draw a circle"
 msgstr "绘制圆"
 
-#: pcbnew/tools/drawing_tool.cpp:295 pcbnew/tools/pcb_actions.cpp:83
+#: pcbnew/tools/drawing_tool.cpp:291 pcbnew/tools/pcb_actions.cpp:83
 msgid "Draw an arc"
 msgstr "绘制圆弧"
 
-#: pcbnew/tools/drawing_tool.cpp:470
+#: pcbnew/tools/drawing_tool.cpp:466
 msgid "Place a text"
 msgstr "放置文本"
 
-#: pcbnew/tools/drawing_tool.cpp:691
+#: pcbnew/tools/drawing_tool.cpp:687
 msgid "Draw a dimension"
 msgstr "绘制尺寸"
 
-#: pcbnew/tools/drawing_tool.cpp:772
+#: pcbnew/tools/drawing_tool.cpp:768
 msgid "No graphic items found in file to import"
 msgstr "在要导入的文件中找不到图形项目"
 
-#: pcbnew/tools/drawing_tool.cpp:802 pcbnew/tools/drawing_tool.cpp:882
+#: pcbnew/tools/drawing_tool.cpp:798 pcbnew/tools/drawing_tool.cpp:878
 msgid "Place a DXF_SVG drawing"
 msgstr "放置 DXF_SVG 图形"
 
-#: pcbnew/tools/drawing_tool.cpp:936
+#: pcbnew/tools/drawing_tool.cpp:932
 msgid "Move the footprint reference anchor"
 msgstr "移动封装参考锚点"
 
-#: pcbnew/tools/drawing_tool.cpp:1490
+#: pcbnew/tools/drawing_tool.cpp:1528
 msgid "Self-intersecting polygons are not allowed"
 msgstr "不允许自相交多边形"
 
-#: pcbnew/tools/drawing_tool.cpp:1943
+#: pcbnew/tools/drawing_tool.cpp:1980
 msgid "Place via"
 msgstr "放置过孔"
 
-#: pcbnew/tools/edit_tool.cpp:143
+#: pcbnew/tools/edit_tool.cpp:141
 msgid "Special Tools..."
 msgstr "特殊工具..."
 
-#: pcbnew/tools/edit_tool.cpp:605
+#: pcbnew/tools/edit_tool.cpp:483
+msgid "Select reference point for move..."
+msgstr "选择要移动的参考点..."
+
+#: pcbnew/tools/edit_tool.cpp:634
 msgid "Edit track width/via size"
 msgstr "编辑布线宽度/过孔尺寸"
 
-#: pcbnew/tools/edit_tool.cpp:880 pcbnew/tools/pcb_actions.cpp:240
+#: pcbnew/tools/edit_tool.cpp:909 pcbnew/tools/pcb_actions.cpp:245
 msgid "Flip"
 msgstr "翻转"
 
-#: pcbnew/tools/edit_tool.cpp:1024 pcbnew/tools/zone_filler_tool.cpp:130
+#: pcbnew/tools/edit_tool.cpp:1053 pcbnew/tools/zone_filler_tool.cpp:130
 msgid "Fill Zone"
 msgstr "填充覆铜"
 
-#: pcbnew/tools/edit_tool.cpp:1061
+#: pcbnew/tools/edit_tool.cpp:1090
 msgid "Delete again to remove locked items"
 msgstr "再次删除锁定的项目"
 
-#: pcbnew/tools/edit_tool.cpp:1148
+#: pcbnew/tools/edit_tool.cpp:1176
 msgid "Move exact"
 msgstr "精确移动"
 
-#: pcbnew/tools/edit_tool.cpp:1258
+#: pcbnew/tools/edit_tool.cpp:1286
 #, c-format
 msgid "Duplicated %d item(s)"
 msgstr "复制 %d 项"
 
-#: pcbnew/tools/edit_tool.cpp:1380
+#: pcbnew/tools/edit_tool.cpp:1460
 msgid "Select reference point for the copy..."
 msgstr "为副本选择参考点..."
 
-#: pcbnew/tools/edit_tool.cpp:1386
+#: pcbnew/tools/edit_tool.cpp:1461
 msgid "Selection copied."
 msgstr "选择项已复制。"
 
-#: pcbnew/tools/edit_tool.cpp:1400
+#: pcbnew/tools/edit_tool.cpp:1461
 msgid "Copy cancelled."
 msgstr "复制取消。"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:191
+#: pcbnew/tools/footprint_editor_tools.cpp:183
 msgid "_copy"
 msgstr "_copy"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:372
-msgid "Place pad"
-msgstr "放置焊盘"
-
-#: pcbnew/tools/footprint_editor_tools.cpp:421
-msgid "Explode pad to shapes"
-msgstr "将焊盘分解成形状"
-
-#: pcbnew/tools/footprint_editor_tools.cpp:490
-msgid ""
-"Cannot convert items to a custom-shaped pad:\n"
-"selection contains more than one reference pad."
-msgstr ""
-"无法将项目转换为自定义形状的焊盘：\n"
-"选择中包含多个参考焊盘。"
-
-#: pcbnew/tools/footprint_editor_tools.cpp:497
-msgid ""
-"Cannot convert items to a custom-shaped pad:\n"
-"selection contains unsupported items.\n"
-"Only graphical lines, circles, arcs and polygons are allowed."
-msgstr ""
-"无法将项目转换为自定义形状的焊盘：\n"
-"选择中有包含不受支持的项目。\n"
-"只允许图形线条，圆形，弧形和多边形。"
-
-#: pcbnew/tools/footprint_editor_tools.cpp:583
-msgid ""
-"Cannot convert items to a custom-shaped pad:\n"
-"unable to determine the anchor point position.\n"
-"Consider adding a small anchor pad to the selection and try again."
-msgstr ""
-"无法将项目转换为自定义形状的焊盘：\n"
-"无法确定锚点位置。\n"
-"考虑在选择中添加一个小锚点，然后重试。"
-
-#: pcbnew/tools/footprint_editor_tools.cpp:608
-msgid ""
-"Cannot convert items to a custom-shaped pad:\n"
-"selected items do not form a single solid shape."
-msgstr ""
-"无法将项目转换为自定义形状的焊盘：\n"
-"选定的项目不会形成单一的固定形状。"
-
-#: pcbnew/tools/footprint_editor_tools.cpp:622 pcbnew/tools/pcb_actions.cpp:343
-msgid "Create Pad from Selected Shapes"
-msgstr "从选定的形状创建焊盘"
-
-#: pcbnew/tools/pad_tool.cpp:108
+#: pcbnew/tools/pad_tool.cpp:125
 msgid "Paste Pad Properties"
 msgstr "粘贴焊盘属性"
 
-#: pcbnew/tools/pad_tool.cpp:226
+#: pcbnew/tools/pad_tool.cpp:243
 msgid "Push Pad Settings"
 msgstr "推挤焊盘设置"
 
-#: pcbnew/tools/pad_tool.cpp:275
+#: pcbnew/tools/pad_tool.cpp:291
 #, c-format
 msgid ""
 "Click on pad %s%d\n"
@@ -27231,10 +27408,32 @@ msgstr ""
 "单击焊盘 %s%d\n"
 "按 <esc> 以取消或双击提交"
 
-#: pcbnew/tools/pad_tool.cpp:295 pcbnew/tools/pad_tool.cpp:395
+#: pcbnew/tools/pad_tool.cpp:311 pcbnew/tools/pad_tool.cpp:411
 msgid "Renumber pads"
 msgstr "焊盘重新编号"
 
+#: pcbnew/tools/pad_tool.cpp:494
+msgid "Place pad"
+msgstr "放置焊盘"
+
+#: pcbnew/tools/pad_tool.cpp:530
+#, c-format
+msgid "Pad Edit Mode.  Press %s again to exit."
+msgstr "焊盘编辑模式。再次按 %s 退出。"
+
+#: pcbnew/tools/pad_tool.cpp:533
+#, c-format
+msgid "Pad Edit Mode.  Press %s to exit."
+msgstr "焊盘编辑模式。按 %s 退出。"
+
+#: pcbnew/tools/pad_tool.cpp:598
+msgid "Edit pad shapes"
+msgstr "编辑焊盘形状"
+
+#: pcbnew/tools/pad_tool.cpp:698
+msgid "Recombine pads"
+msgstr "重新组合焊盘"
+
 #: pcbnew/tools/pcb_actions.cpp:60
 msgid "Draw Line"
 msgstr "绘制线"
@@ -27381,455 +27580,463 @@ msgid ""
 "for moving"
 msgstr "按参考指示符选择封装，并将其放置在光标下以进行移动"
 
-#: pcbnew/tools/pcb_actions.cpp:209
+#: pcbnew/tools/pcb_actions.cpp:203
+msgid "Move with Reference"
+msgstr "随参考移动"
+
+#: pcbnew/tools/pcb_actions.cpp:204
+msgid "Moves the selected item(s) with a specified starting point"
+msgstr "移动具有指定精确的选定项目"
+
+#: pcbnew/tools/pcb_actions.cpp:214
 msgid "Duplicate and Increment"
 msgstr "重复和递增"
 
-#: pcbnew/tools/pcb_actions.cpp:209
+#: pcbnew/tools/pcb_actions.cpp:214
 msgid "Duplicates the selected item(s), incrementing pad numbers"
 msgstr "复制选择项目, 增量焊盘编号"
 
-#: pcbnew/tools/pcb_actions.cpp:215
+#: pcbnew/tools/pcb_actions.cpp:220
 msgid "Move Exactly..."
 msgstr "精确移动..."
 
-#: pcbnew/tools/pcb_actions.cpp:215
+#: pcbnew/tools/pcb_actions.cpp:220
 msgid "Moves the selected item(s) by an exact amount"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:221
+#: pcbnew/tools/pcb_actions.cpp:226
 msgid "Create Array..."
 msgstr "创建阵列..."
 
-#: pcbnew/tools/pcb_actions.cpp:221
+#: pcbnew/tools/pcb_actions.cpp:226
 msgid "Create array"
 msgstr "创建阵列"
 
-#: pcbnew/tools/pcb_actions.cpp:234
+#: pcbnew/tools/pcb_actions.cpp:239
 msgid "Rotate Counterclockwise"
 msgstr "逆时针旋转"
 
-#: pcbnew/tools/pcb_actions.cpp:234
+#: pcbnew/tools/pcb_actions.cpp:239
 msgid "Rotates selected item(s) counterclockwise"
 msgstr "将选中的项目逆时针旋转"
 
-#: pcbnew/tools/pcb_actions.cpp:240
+#: pcbnew/tools/pcb_actions.cpp:245
 msgid "Flips selected item(s) to opposite side of board"
 msgstr "将所选项目翻转到板的另一侧"
 
-#: pcbnew/tools/pcb_actions.cpp:245
+#: pcbnew/tools/pcb_actions.cpp:250
 msgid "Mirrors selected item"
 msgstr "镜像选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:250
+#: pcbnew/tools/pcb_actions.cpp:255
 msgid "Change Track Width"
 msgstr "调整布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:250
+#: pcbnew/tools/pcb_actions.cpp:255
 msgid "Updates selected track & via sizes"
 msgstr "更新选定的布线和过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:255
+#: pcbnew/tools/pcb_actions.cpp:260
 msgid "Delete Full Track"
 msgstr "删除整条布线"
 
-#: pcbnew/tools/pcb_actions.cpp:255
+#: pcbnew/tools/pcb_actions.cpp:260
 msgid "Deletes selected item(s) and copper connections"
 msgstr "删除所选项目和铜连接"
 
-#: pcbnew/tools/pcb_actions.cpp:272
+#: pcbnew/tools/pcb_actions.cpp:277
 msgid "Show Footprint Tree"
 msgstr "显示封装树"
 
-#: pcbnew/tools/pcb_actions.cpp:272
+#: pcbnew/tools/pcb_actions.cpp:277
 msgid "Toggles the footprint tree visibility"
 msgstr "切换封装树可见性"
 
-#: pcbnew/tools/pcb_actions.cpp:278
+#: pcbnew/tools/pcb_actions.cpp:283
 msgid "New Footprint..."
 msgstr "新建封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:278
+#: pcbnew/tools/pcb_actions.cpp:283
 msgid "Create a new, empty footprint"
 msgstr "创建一个新的空封装"
 
-#: pcbnew/tools/pcb_actions.cpp:283
+#: pcbnew/tools/pcb_actions.cpp:288
 msgid "Create Footprint..."
 msgstr "创建封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:283
+#: pcbnew/tools/pcb_actions.cpp:288
 msgid "Create a new footprint using the Footprint Wizard"
 msgstr "使用封装向导创建一个新的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:288
+#: pcbnew/tools/pcb_actions.cpp:293
 msgid "Save to Board"
 msgstr "保存电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:288
+#: pcbnew/tools/pcb_actions.cpp:293
 msgid "Update footprint on board"
 msgstr "更新在板上的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:293
+#: pcbnew/tools/pcb_actions.cpp:298
 msgid "Save to Library"
 msgstr "保存到库"
 
-#: pcbnew/tools/pcb_actions.cpp:293
+#: pcbnew/tools/pcb_actions.cpp:298
 msgid "Save changes to library"
 msgstr "保存更改到库"
 
-#: pcbnew/tools/pcb_actions.cpp:298
+#: pcbnew/tools/pcb_actions.cpp:303
 msgid "Edit Footprint"
 msgstr "编辑封装"
 
-#: pcbnew/tools/pcb_actions.cpp:298
+#: pcbnew/tools/pcb_actions.cpp:303
 msgid "Show selected footprint on editor canvas"
 msgstr "在编辑器画布上显示选定的轮廓线"
 
-#: pcbnew/tools/pcb_actions.cpp:303
+#: pcbnew/tools/pcb_actions.cpp:308
 msgid "Delete Footprint from Library"
 msgstr "从库中删除封装"
 
-#: pcbnew/tools/pcb_actions.cpp:308
+#: pcbnew/tools/pcb_actions.cpp:313
 msgid "Cut Footprint"
 msgstr "剪切封装"
 
-#: pcbnew/tools/pcb_actions.cpp:313
+#: pcbnew/tools/pcb_actions.cpp:318
 msgid "Copy Footprint"
 msgstr "复制封装"
 
-#: pcbnew/tools/pcb_actions.cpp:318
+#: pcbnew/tools/pcb_actions.cpp:323
 msgid "Paste Footprint"
 msgstr "粘贴封装"
 
-#: pcbnew/tools/pcb_actions.cpp:323
+#: pcbnew/tools/pcb_actions.cpp:328
 msgid "Import Footprint..."
 msgstr "导入封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:328
+#: pcbnew/tools/pcb_actions.cpp:333
 msgid "Export Footprint..."
 msgstr "导出封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:333
+#: pcbnew/tools/pcb_actions.cpp:338
 msgid "Footprint Properties..."
 msgstr "封装属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:338
-msgid "Add Pad"
-msgstr "添加焊盘"
-
-#: pcbnew/tools/pcb_actions.cpp:338
-msgid "Add a pad"
-msgstr "添加焊盘"
-
-#: pcbnew/tools/pcb_actions.cpp:344
-msgid "Creates a custom-shaped pads from a set of selected shapes"
-msgstr "从一组选定的形状创建自定义焊盘"
-
-#: pcbnew/tools/pcb_actions.cpp:349
-msgid "Explode Pad to Graphic Shapes"
-msgstr "将焊盘分解成图形形状"
-
-#: pcbnew/tools/pcb_actions.cpp:350
-msgid "Converts a custom-shaped pads to a set of graphical shapes"
-msgstr "将自定义焊盘转换为一组图形形状"
-
-#: pcbnew/tools/pcb_actions.cpp:355
-msgid "Default Pad Properties..."
-msgstr "默认焊盘属性..."
-
-#: pcbnew/tools/pcb_actions.cpp:355
-msgid "Edit the pad properties used when creating new pads"
-msgstr "编辑创建新焊盘时使用的焊盘属性"
-
-#: pcbnew/tools/pcb_actions.cpp:363
-msgid "Shape Properties..."
-msgstr "形状属性..."
-
-#: pcbnew/tools/pcb_actions.cpp:371
+#: pcbnew/tools/pcb_actions.cpp:346
 msgid "Update Footprint..."
 msgstr "更新封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:372
+#: pcbnew/tools/pcb_actions.cpp:347
 msgid "Update footprint to include any changes from the library"
 msgstr "更新封装以包含来自库的任何更改"
 
-#: pcbnew/tools/pcb_actions.cpp:377
+#: pcbnew/tools/pcb_actions.cpp:352
 msgid "Update Footprints from Library..."
 msgstr "从库中更新封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:378
+#: pcbnew/tools/pcb_actions.cpp:353
 msgid "Update footprints to include any changes from the library"
 msgstr "更新封装以包含来自库的任何更改"
 
-#: pcbnew/tools/pcb_actions.cpp:383
+#: pcbnew/tools/pcb_actions.cpp:358
 msgid "Assign a different footprint from the library"
 msgstr "从库中分配不同的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:388
+#: pcbnew/tools/pcb_actions.cpp:363
 msgid "Change Footprints..."
 msgstr "保存封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:388
+#: pcbnew/tools/pcb_actions.cpp:363
 msgid "Assign different footprints from the library"
 msgstr "从库中分配不同的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:393
+#: pcbnew/tools/pcb_actions.cpp:368
 msgid "Swap Layers..."
 msgstr "交换层..."
 
-#: pcbnew/tools/pcb_actions.cpp:393
+#: pcbnew/tools/pcb_actions.cpp:368
 msgid "Move tracks or drawings from one layer to another"
 msgstr "将布线或绘制从一层移到另一层"
 
-#: pcbnew/tools/pcb_actions.cpp:398
+#: pcbnew/tools/pcb_actions.cpp:373
 msgid "Edit Track & Via Properties..."
 msgstr "编辑布线与过孔属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:404
+#: pcbnew/tools/pcb_actions.cpp:379
 msgid "Edit Text and graphics properties globally across board"
 msgstr "全局编辑文本和图形属性"
 
-#: pcbnew/tools/pcb_actions.cpp:409
+#: pcbnew/tools/pcb_actions.cpp:384
 msgid "Global Deletions..."
 msgstr "全局删除..."
 
-#: pcbnew/tools/pcb_actions.cpp:410
+#: pcbnew/tools/pcb_actions.cpp:385
 msgid "Delete tracks, footprints and graphic items from board"
 msgstr "在板上删除布线, 封装和图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:415
+#: pcbnew/tools/pcb_actions.cpp:390
 msgid "Cleanup Tracks & Vias..."
 msgstr "清除布线和过孔..."
 
-#: pcbnew/tools/pcb_actions.cpp:416
+#: pcbnew/tools/pcb_actions.cpp:391
 msgid "Cleanup redundant items, shorting items, etc."
 msgstr "清理冗余项，短路项等。"
 
-#: pcbnew/tools/pcb_actions.cpp:421
+#: pcbnew/tools/pcb_actions.cpp:396
 msgid "Cleanup Graphics..."
 msgstr "清理图形..."
 
-#: pcbnew/tools/pcb_actions.cpp:422
+#: pcbnew/tools/pcb_actions.cpp:397
 msgid "Cleanup redundant items, etc."
 msgstr "清理冗余项等。"
 
-#: pcbnew/tools/pcb_actions.cpp:429
+#: pcbnew/tools/pcb_actions.cpp:404
 msgid "Add Microwave Gap"
 msgstr "添加微波间隙"
 
-#: pcbnew/tools/pcb_actions.cpp:429
+#: pcbnew/tools/pcb_actions.cpp:404
 msgid "Create gap of specified length for microwave applications"
 msgstr "创建指定长度的高频设计缺口"
 
-#: pcbnew/tools/pcb_actions.cpp:434
+#: pcbnew/tools/pcb_actions.cpp:409
 msgid "Add Microwave Stub"
 msgstr "添加微波存根"
 
-#: pcbnew/tools/pcb_actions.cpp:434
+#: pcbnew/tools/pcb_actions.cpp:409
 msgid "Create stub of specified length for microwave applications"
 msgstr "创建指定长度的高频设计短截线"
 
-#: pcbnew/tools/pcb_actions.cpp:439
+#: pcbnew/tools/pcb_actions.cpp:414
 msgid "Add Microwave Arc Stub"
 msgstr "添加微波弧形存根"
 
-#: pcbnew/tools/pcb_actions.cpp:439
+#: pcbnew/tools/pcb_actions.cpp:414
 msgid "Create stub (arc) of specified size for microwave applications"
 msgstr "为微波应用创建指定大小的存根(弧形)"
 
-#: pcbnew/tools/pcb_actions.cpp:444
+#: pcbnew/tools/pcb_actions.cpp:419
 msgid "Add Microwave Polygonal Shape"
 msgstr "添加微波多边形"
 
-#: pcbnew/tools/pcb_actions.cpp:444
+#: pcbnew/tools/pcb_actions.cpp:419
 msgid "Create a microwave polygonal shape from a list of vertices"
 msgstr "从顶点列表创建微波多边形形状"
 
-#: pcbnew/tools/pcb_actions.cpp:449
+#: pcbnew/tools/pcb_actions.cpp:424
 msgid "Add Microwave Line"
 msgstr "添加微波线"
 
-#: pcbnew/tools/pcb_actions.cpp:449
+#: pcbnew/tools/pcb_actions.cpp:424
 msgid "Create line of specified length for microwave applications"
 msgstr "创建指定长度的高频设计线"
 
-#: pcbnew/tools/pcb_actions.cpp:457
+#: pcbnew/tools/pcb_actions.cpp:432
 msgid "Copy Pad Properties to Default"
 msgstr "将焊盘属性复制到默认值"
 
-#: pcbnew/tools/pcb_actions.cpp:457
+#: pcbnew/tools/pcb_actions.cpp:432
 msgid "Copy current pad's properties"
 msgstr "复制当前焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:462
+#: pcbnew/tools/pcb_actions.cpp:437
 msgid "Paste Default Pad Properties to Selected"
 msgstr "将默认焊盘属性粘贴到选定项"
 
-#: pcbnew/tools/pcb_actions.cpp:463
+#: pcbnew/tools/pcb_actions.cpp:438
 msgid "Replace the current pad's properties with those copied earlier"
 msgstr "将先前复制的属性替换为当前焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:468
+#: pcbnew/tools/pcb_actions.cpp:443
 msgid "Push Pad Properties to Other Pads..."
 msgstr "将焊盘属性推送到其他焊盘."
 
-#: pcbnew/tools/pcb_actions.cpp:469
+#: pcbnew/tools/pcb_actions.cpp:444
 msgid "Copy the current pad's properties to other pads"
 msgstr "复制当前焊盘属性到其他焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:474
+#: pcbnew/tools/pcb_actions.cpp:449
 msgid "Renumber Pads..."
 msgstr "焊盘重新编号..."
 
-#: pcbnew/tools/pcb_actions.cpp:475
+#: pcbnew/tools/pcb_actions.cpp:450
 msgid "Renumber pads by clicking on them in the desired order"
 msgstr "按所需顺序单击它们重新编号"
 
-#: pcbnew/tools/pcb_actions.cpp:483
+#: pcbnew/tools/pcb_actions.cpp:455
+msgid "Add Pad"
+msgstr "添加焊盘"
+
+#: pcbnew/tools/pcb_actions.cpp:455
+msgid "Add a pad"
+msgstr "添加焊盘"
+
+#: pcbnew/tools/pcb_actions.cpp:461
+msgid "Edit Pad as Graphic Shapes"
+msgstr "将焊盘编辑为图形形状"
+
+#: pcbnew/tools/pcb_actions.cpp:462
+msgid "Ungroups a custom-shaped pad for editing as individual graphic shapes"
+msgstr "取消自定义形状焊盘的分组，以便作为单个图形形状进行编辑"
+
+#: pcbnew/tools/pcb_actions.cpp:468
+msgid "Finish Pad Edit"
+msgstr "完成焊盘编辑"
+
+#: pcbnew/tools/pcb_actions.cpp:469
+msgid "Regroups all touching graphic shapes into the edited pad"
+msgstr "将所有接触图形形状重新组合到已编辑的焊盘中"
+
+#: pcbnew/tools/pcb_actions.cpp:474
+msgid "Default Pad Properties..."
+msgstr "默认焊盘属性..."
+
+#: pcbnew/tools/pcb_actions.cpp:474
+msgid "Edit the pad properties used when creating new pads"
+msgstr "编辑创建新焊盘时使用的焊盘属性"
+
+#: pcbnew/tools/pcb_actions.cpp:482
 msgid "Board Setup..."
 msgstr "电路板设置..."
 
-#: pcbnew/tools/pcb_actions.cpp:484
+#: pcbnew/tools/pcb_actions.cpp:483
 msgid "Edit board setup including layers, design rules and various defaults"
 msgstr "编辑电路板设置，包括层、设计规则和各个默认值"
 
-#: pcbnew/tools/pcb_actions.cpp:489
+#: pcbnew/tools/pcb_actions.cpp:488
 msgid "Netlist..."
 msgstr "网表..."
 
-#: pcbnew/tools/pcb_actions.cpp:489
+#: pcbnew/tools/pcb_actions.cpp:488
 msgid "Read netlist and update board connectivity"
 msgstr "读取网络列表并更新电路板连接"
 
-#: pcbnew/tools/pcb_actions.cpp:494
+#: pcbnew/tools/pcb_actions.cpp:493
 msgid "Specctra Session..."
 msgstr "自动布线会话..."
 
-#: pcbnew/tools/pcb_actions.cpp:494
+#: pcbnew/tools/pcb_actions.cpp:493
 msgid "Import routed Specctra session (*.ses) file"
 msgstr "导入布线器会话(*.ses)文件"
 
-#: pcbnew/tools/pcb_actions.cpp:499
+#: pcbnew/tools/pcb_actions.cpp:498
 msgid "Specctra DSN..."
 msgstr "光绘 DSN..."
 
-#: pcbnew/tools/pcb_actions.cpp:499
+#: pcbnew/tools/pcb_actions.cpp:498
 msgid "Export Specctra DSN routing info"
 msgstr "导出光绘 DSN 路线信息"
 
-#: pcbnew/tools/pcb_actions.cpp:504
+#: pcbnew/tools/pcb_actions.cpp:503
 msgid "Gerbers (.gbr)..."
 msgstr "Gerbers (.gbr)..."
 
-#: pcbnew/tools/pcb_actions.cpp:504
+#: pcbnew/tools/pcb_actions.cpp:503
 msgid "Generate Gerbers for fabrication"
 msgstr "生成用于制造的 Gerbers"
 
-#: pcbnew/tools/pcb_actions.cpp:509
+#: pcbnew/tools/pcb_actions.cpp:508
 msgid "Drill Files (.drl)..."
 msgstr "钻孔文件 (.drl)..."
 
-#: pcbnew/tools/pcb_actions.cpp:509
+#: pcbnew/tools/pcb_actions.cpp:508
 msgid "Generate Excellon drill file(s)"
 msgstr "生成出色的钻取文件"
 
-#: pcbnew/tools/pcb_actions.cpp:514
+#: pcbnew/tools/pcb_actions.cpp:513
 msgid "Footprint Positions (.pos)..."
 msgstr "封装位置 (.pos)..."
 
-#: pcbnew/tools/pcb_actions.cpp:515
+#: pcbnew/tools/pcb_actions.cpp:514
 msgid "Generate footprint position file for pick and place"
 msgstr "生成封装拾取和放置位置的文件"
 
-#: pcbnew/tools/pcb_actions.cpp:520
+#: pcbnew/tools/pcb_actions.cpp:519
 msgid "Footprint Report (.rpt)..."
 msgstr "封装报告 (.rpt)..."
 
-#: pcbnew/tools/pcb_actions.cpp:521
+#: pcbnew/tools/pcb_actions.cpp:520
 msgid "Create report of all footprints from current board"
 msgstr "创建当前电路板所有封装报告"
 
-#: pcbnew/tools/pcb_actions.cpp:526
+#: pcbnew/tools/pcb_actions.cpp:525
 msgid "IPC-D-356 Netlist File..."
 msgstr "IPC-D-356 网络列表文件..."
 
-#: pcbnew/tools/pcb_actions.cpp:526
+#: pcbnew/tools/pcb_actions.cpp:525
 msgid "Generate IPC-D-356 netlist file"
 msgstr "创建 IPC-D-356 网络文件"
 
-#: pcbnew/tools/pcb_actions.cpp:531
+#: pcbnew/tools/pcb_actions.cpp:530
 msgid "BOM..."
 msgstr "BOM..."
 
-#: pcbnew/tools/pcb_actions.cpp:531
+#: pcbnew/tools/pcb_actions.cpp:530
 msgid "Create bill of materials from current schematic"
 msgstr "从当前原理图创建 BOM"
 
-#: pcbnew/tools/pcb_actions.cpp:538
+#: pcbnew/tools/pcb_actions.cpp:537
 msgid "Switch Track Width to Next"
 msgstr "切换下一个布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:543
+#: pcbnew/tools/pcb_actions.cpp:542
 msgid "Switch Track Width to Previous"
 msgstr "切换上一个布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:548
+#: pcbnew/tools/pcb_actions.cpp:547
 msgid "Increase Via Size"
 msgstr "增大过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:553
+#: pcbnew/tools/pcb_actions.cpp:552
 msgid "Decrease Via Size"
 msgstr "减小过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:562
+#: pcbnew/tools/pcb_actions.cpp:561
 msgid "Merge Zones"
 msgstr "合并区域"
 
-#: pcbnew/tools/pcb_actions.cpp:562 pcbnew/tools/pcb_editor_control.cpp:1051
+#: pcbnew/tools/pcb_actions.cpp:561 pcbnew/tools/pcb_editor_control.cpp:1071
 msgid "Merge zones"
 msgstr "合并覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:566
+#: pcbnew/tools/pcb_actions.cpp:565
 msgid "Duplicate Zone onto Layer..."
 msgstr "重复覆铜区域到层..."
 
-#: pcbnew/tools/pcb_actions.cpp:566
+#: pcbnew/tools/pcb_actions.cpp:565
 msgid "Duplicate zone outline onto a different layer"
 msgstr "复制覆铜轮廓到不同的层上"
 
-#: pcbnew/tools/pcb_actions.cpp:571
+#: pcbnew/tools/pcb_actions.cpp:570
 msgid "Add Layer Alignment Target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_actions.cpp:571
+#: pcbnew/tools/pcb_actions.cpp:570
 msgid "Add a layer alignment target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_actions.cpp:577
+#: pcbnew/tools/pcb_actions.cpp:576
 msgid "Add Footprint"
 msgstr "添加封装"
 
-#: pcbnew/tools/pcb_actions.cpp:577
+#: pcbnew/tools/pcb_actions.cpp:576
 msgid "Add a footprint"
 msgstr "添加封装"
 
-#: pcbnew/tools/pcb_actions.cpp:582
-msgid "Drill and Place Offset"
-msgstr "钻头和放置偏移"
+#: pcbnew/tools/pcb_actions.cpp:581
+msgid "Drill/Place File Origin"
+msgstr "钻孔/放置文件原点"
 
 #: pcbnew/tools/pcb_actions.cpp:582
-msgid "Place origin point for drill and place files"
-msgstr "为钻孔和位置文件放置原点"
+msgid "Place origin point for drill files and footprint position files"
+msgstr "放置钻孔文件和封装位置文件的原点"
 
 #: pcbnew/tools/pcb_actions.cpp:588
 msgid "Toggle Lock"
 msgstr "切换锁定"
 
-#: pcbnew/tools/pcb_actions.cpp:593 pcbnew/tools/pcb_editor_control.cpp:845
+#: pcbnew/tools/pcb_actions.cpp:593 pcbnew/tools/pcb_editor_control.cpp:865
 msgid "Lock"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_actions.cpp:598 pcbnew/tools/pcb_editor_control.cpp:846
+#: pcbnew/tools/pcb_actions.cpp:598 pcbnew/tools/pcb_editor_control.cpp:866
 msgid "Unlock"
 msgstr "解锁"
 
@@ -27837,63 +28044,83 @@ msgstr "解锁"
 msgid "Append Board..."
 msgstr "添加电路板..."
 
-#: pcbnew/tools/pcb_actions.cpp:611
+#: pcbnew/tools/pcb_actions.cpp:607
+msgid "Highlight the selected net"
+msgstr "高亮所选的网络"
+
+#: pcbnew/tools/pcb_actions.cpp:612
 msgid "Toggle Last Net Highlight"
 msgstr "切换最后一个网络高亮"
 
-#: pcbnew/tools/pcb_actions.cpp:611
+#: pcbnew/tools/pcb_actions.cpp:612
 msgid "Toggle between last two highlighted nets"
 msgstr "在最后两个突出显示的网之间切换"
 
-#: pcbnew/tools/pcb_actions.cpp:615
+#: pcbnew/tools/pcb_actions.cpp:616
 msgid "Clear Net Highlighting"
 msgstr "清除网络高亮"
 
-#: pcbnew/tools/pcb_actions.cpp:619 pcbnew/tools/pcb_actions.cpp:626
+#: pcbnew/tools/pcb_actions.cpp:620 pcbnew/tools/pcb_actions.cpp:627
 msgid "Highlight all copper items of a net"
 msgstr "高亮网络中的所有铜项目"
 
 #: pcbnew/tools/pcb_actions.cpp:634
+msgid "Hide Net"
+msgstr "隐藏网络"
+
+#: pcbnew/tools/pcb_actions.cpp:634
+msgid "Hide the ratsnest for the selected net"
+msgstr "显示所选网络的飞线"
+
+#: pcbnew/tools/pcb_actions.cpp:637
+msgid "Show Net"
+msgstr "显示网络"
+
+#: pcbnew/tools/pcb_actions.cpp:637
+msgid "Show the ratsnest for the selected net"
+msgstr "显示所选网络的飞线"
+
+#: pcbnew/tools/pcb_actions.cpp:641
 msgid "Switch to Schematic Editor"
 msgstr "切换到原理图编辑器"
 
-#: pcbnew/tools/pcb_actions.cpp:634
+#: pcbnew/tools/pcb_actions.cpp:641
 msgid "Open schematic in Eeschema"
 msgstr "在 Eeschema 中打开原理图"
 
-#: pcbnew/tools/pcb_actions.cpp:643
+#: pcbnew/tools/pcb_actions.cpp:650
 msgid "Highlight Ratsnest"
 msgstr "高亮飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:643
+#: pcbnew/tools/pcb_actions.cpp:650
 msgid "Show ratsnest of selected item(s)"
 msgstr "显示所选项目的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:654
+#: pcbnew/tools/pcb_actions.cpp:661
 msgid "Show the net inspector"
 msgstr "显示网络检查"
 
-#: pcbnew/tools/pcb_actions.cpp:659
+#: pcbnew/tools/pcb_actions.cpp:666
 msgid "Scripting Console"
 msgstr "脚本控制台"
 
-#: pcbnew/tools/pcb_actions.cpp:659
+#: pcbnew/tools/pcb_actions.cpp:666
 msgid "Show the Python scripting console"
 msgstr "显示 Python 脚本控制台"
 
-#: pcbnew/tools/pcb_actions.cpp:664
+#: pcbnew/tools/pcb_actions.cpp:671
 msgid "Show Layers Manager"
 msgstr "显示层管理"
 
-#: pcbnew/tools/pcb_actions.cpp:664
+#: pcbnew/tools/pcb_actions.cpp:671
 msgid "Show/hide the layers manager"
 msgstr "显示或隐藏层管理器"
 
-#: pcbnew/tools/pcb_actions.cpp:669
+#: pcbnew/tools/pcb_actions.cpp:676
 msgid "Show Microwave Toolbar"
 msgstr "显示微波工具栏"
 
-#: pcbnew/tools/pcb_actions.cpp:669
+#: pcbnew/tools/pcb_actions.cpp:676
 msgid ""
 "Show/hide microwave toolbar\n"
 "(Experimental feature)"
@@ -27901,522 +28128,522 @@ msgstr ""
 "显示或隐藏微波设计工具栏 \n"
 "(试验功能)"
 
-#: pcbnew/tools/pcb_actions.cpp:674
+#: pcbnew/tools/pcb_actions.cpp:681
 msgid "Flip Board View"
 msgstr "翻转电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:674
+#: pcbnew/tools/pcb_actions.cpp:681
 msgid "Flip (mirror) the board view"
 msgstr "翻转 (镜像) 板视图"
 
-#: pcbnew/tools/pcb_actions.cpp:680
+#: pcbnew/tools/pcb_actions.cpp:687
 msgid "Show Ratsnest"
 msgstr "显示飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:680
+#: pcbnew/tools/pcb_actions.cpp:687
 msgid "Show board ratsnest"
 msgstr "显示线路板飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:685
+#: pcbnew/tools/pcb_actions.cpp:692
 msgid "Curved Ratsnest Lines"
 msgstr "弯曲的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:691
+#: pcbnew/tools/pcb_actions.cpp:698
 msgid "Sketch Tracks"
 msgstr "布线草图"
 
-#: pcbnew/tools/pcb_actions.cpp:691
+#: pcbnew/tools/pcb_actions.cpp:698
 msgid "Show tracks in outline mode"
 msgstr "在轮廓模式下显示布线"
 
-#: pcbnew/tools/pcb_actions.cpp:696
+#: pcbnew/tools/pcb_actions.cpp:703
 msgid "Sketch Pads"
 msgstr "焊盘草图"
 
-#: pcbnew/tools/pcb_actions.cpp:696
+#: pcbnew/tools/pcb_actions.cpp:703
 msgid "Show pads in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:701
+#: pcbnew/tools/pcb_actions.cpp:708
 msgid "Sketch Vias"
 msgstr "过孔草图"
 
-#: pcbnew/tools/pcb_actions.cpp:701
+#: pcbnew/tools/pcb_actions.cpp:708
 msgid "Show vias in outline mode"
 msgstr "在轮廓模式下显示过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:706
+#: pcbnew/tools/pcb_actions.cpp:713
 msgid "Sketch Graphic Items"
 msgstr "草图图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:706
+#: pcbnew/tools/pcb_actions.cpp:713
 msgid "Show graphic items in outline mode"
 msgstr "在轮廓模式下显示图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:711
+#: pcbnew/tools/pcb_actions.cpp:718
 msgid "Sketch Text Items"
 msgstr "草图文本项"
 
-#: pcbnew/tools/pcb_actions.cpp:711
+#: pcbnew/tools/pcb_actions.cpp:718
 msgid "Show footprint texts in line mode"
 msgstr "在行模式下显示封装文本"
 
-#: pcbnew/tools/pcb_actions.cpp:721
+#: pcbnew/tools/pcb_actions.cpp:728
 msgid "Automatically zoom to fit"
 msgstr "自动缩放以适合"
 
-#: pcbnew/tools/pcb_actions.cpp:721
+#: pcbnew/tools/pcb_actions.cpp:728
 msgid "Zoom to fit when changing footprint"
 msgstr "更改封装时缩放至适合大小"
 
-#: pcbnew/tools/pcb_actions.cpp:726
+#: pcbnew/tools/pcb_actions.cpp:733
 msgid "Fill Zones"
 msgstr "填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:726
+#: pcbnew/tools/pcb_actions.cpp:733
 msgid "Show filled areas of zones"
 msgstr "显示覆铜填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:731
+#: pcbnew/tools/pcb_actions.cpp:738
 msgid "Wireframe Zones"
 msgstr "线框区域"
 
-#: pcbnew/tools/pcb_actions.cpp:731
+#: pcbnew/tools/pcb_actions.cpp:738
 msgid "Show only zone boundaries"
 msgstr "仅显示区域边界"
 
-#: pcbnew/tools/pcb_actions.cpp:736
+#: pcbnew/tools/pcb_actions.cpp:743
 msgid "Sketch Zones"
 msgstr "草图区域"
 
-#: pcbnew/tools/pcb_actions.cpp:736
+#: pcbnew/tools/pcb_actions.cpp:743
 msgid "Show solid areas of zones in outline mode"
 msgstr "在轮廓模式下显示区域的实心区域"
 
-#: pcbnew/tools/pcb_actions.cpp:742
+#: pcbnew/tools/pcb_actions.cpp:749
 msgid "Toggle Zone Display"
 msgstr "切换区域显示"
 
-#: pcbnew/tools/pcb_actions.cpp:743
+#: pcbnew/tools/pcb_actions.cpp:750
 msgid "Cycle between showing filled zones, wireframed zones and sketched zones"
 msgstr "在显示填充区域、线框区域和草图区域之间循环"
 
-#: pcbnew/tools/pcb_actions.cpp:751
+#: pcbnew/tools/pcb_actions.cpp:758
 msgid "Switch to Component (F.Cu) layer"
 msgstr "切换到元件层（顶层铜层）"
 
-#: pcbnew/tools/pcb_actions.cpp:757
+#: pcbnew/tools/pcb_actions.cpp:764
 msgid "Switch to Inner layer 1"
 msgstr "切换到内层 1"
 
-#: pcbnew/tools/pcb_actions.cpp:763
+#: pcbnew/tools/pcb_actions.cpp:770
 msgid "Switch to Inner layer 2"
 msgstr "切换到内层 2"
 
-#: pcbnew/tools/pcb_actions.cpp:769
+#: pcbnew/tools/pcb_actions.cpp:776
 msgid "Switch to Inner layer 3"
 msgstr "切换到内层 3"
 
-#: pcbnew/tools/pcb_actions.cpp:775
+#: pcbnew/tools/pcb_actions.cpp:782
 msgid "Switch to Inner layer 4"
 msgstr "切换到内层 4"
 
-#: pcbnew/tools/pcb_actions.cpp:781
+#: pcbnew/tools/pcb_actions.cpp:788
 msgid "Switch to Inner layer 5"
 msgstr "切换到内层 5"
 
-#: pcbnew/tools/pcb_actions.cpp:787
+#: pcbnew/tools/pcb_actions.cpp:794
 msgid "Switch to Inner layer 6"
 msgstr "切换到内层 6"
 
-#: pcbnew/tools/pcb_actions.cpp:792
+#: pcbnew/tools/pcb_actions.cpp:799
 msgid "Switch to Inner layer 7"
 msgstr "切换到内层 7"
 
-#: pcbnew/tools/pcb_actions.cpp:797
+#: pcbnew/tools/pcb_actions.cpp:804
 msgid "Switch to Inner layer 8"
 msgstr "切换到内层 8"
 
-#: pcbnew/tools/pcb_actions.cpp:802
+#: pcbnew/tools/pcb_actions.cpp:809
 msgid "Switch to Inner layer 9"
 msgstr "切换到内层 9"
 
-#: pcbnew/tools/pcb_actions.cpp:807
+#: pcbnew/tools/pcb_actions.cpp:814
 msgid "Switch to Inner layer 10"
 msgstr "切换到内层 10"
 
-#: pcbnew/tools/pcb_actions.cpp:812
+#: pcbnew/tools/pcb_actions.cpp:819
 msgid "Switch to Inner layer 11"
 msgstr "切换到内层 11"
 
-#: pcbnew/tools/pcb_actions.cpp:817
+#: pcbnew/tools/pcb_actions.cpp:824
 msgid "Switch to Inner layer 12"
 msgstr "切换到内层 12"
 
-#: pcbnew/tools/pcb_actions.cpp:822
+#: pcbnew/tools/pcb_actions.cpp:829
 msgid "Switch to Inner layer 13"
 msgstr "切换到内层 13"
 
-#: pcbnew/tools/pcb_actions.cpp:827
+#: pcbnew/tools/pcb_actions.cpp:834
 msgid "Switch to Inner layer 14"
 msgstr "切换到内层 14"
 
-#: pcbnew/tools/pcb_actions.cpp:832
+#: pcbnew/tools/pcb_actions.cpp:839
 msgid "Switch to Inner layer 15"
 msgstr "切换到内层 15"
 
-#: pcbnew/tools/pcb_actions.cpp:837
+#: pcbnew/tools/pcb_actions.cpp:844
 msgid "Switch to Inner layer 16"
 msgstr "切换到内层 16"
 
-#: pcbnew/tools/pcb_actions.cpp:842
+#: pcbnew/tools/pcb_actions.cpp:849
 msgid "Switch to Inner layer 17"
 msgstr "切换到内层 17"
 
-#: pcbnew/tools/pcb_actions.cpp:847
+#: pcbnew/tools/pcb_actions.cpp:854
 msgid "Switch to Inner layer 18"
 msgstr "切换到内层 18"
 
-#: pcbnew/tools/pcb_actions.cpp:852
+#: pcbnew/tools/pcb_actions.cpp:859
 msgid "Switch to Inner layer 19"
 msgstr "切换到内层 19"
 
-#: pcbnew/tools/pcb_actions.cpp:857
+#: pcbnew/tools/pcb_actions.cpp:864
 msgid "Switch to Inner layer 20"
 msgstr "切换到内层 20"
 
-#: pcbnew/tools/pcb_actions.cpp:862
+#: pcbnew/tools/pcb_actions.cpp:869
 msgid "Switch to Inner layer 21"
 msgstr "切换到内层 21"
 
-#: pcbnew/tools/pcb_actions.cpp:867
+#: pcbnew/tools/pcb_actions.cpp:874
 msgid "Switch to Inner layer 22"
 msgstr "切换到内层 22"
 
-#: pcbnew/tools/pcb_actions.cpp:872
+#: pcbnew/tools/pcb_actions.cpp:879
 msgid "Switch to Inner layer 23"
 msgstr "切换到内层 23"
 
-#: pcbnew/tools/pcb_actions.cpp:877
+#: pcbnew/tools/pcb_actions.cpp:884
 msgid "Switch to Inner layer 24"
 msgstr "切换到内层 24"
 
-#: pcbnew/tools/pcb_actions.cpp:882
+#: pcbnew/tools/pcb_actions.cpp:889
 msgid "Switch to Inner layer 25"
 msgstr "切换到内层 25"
 
-#: pcbnew/tools/pcb_actions.cpp:887
+#: pcbnew/tools/pcb_actions.cpp:894
 msgid "Switch to Inner layer 26"
 msgstr "切换到内层 26"
 
-#: pcbnew/tools/pcb_actions.cpp:892
+#: pcbnew/tools/pcb_actions.cpp:899
 msgid "Switch to Inner layer 27"
 msgstr "切换到内层 27"
 
-#: pcbnew/tools/pcb_actions.cpp:897
+#: pcbnew/tools/pcb_actions.cpp:904
 msgid "Switch to Inner layer 28"
 msgstr "切换到内层 28"
 
-#: pcbnew/tools/pcb_actions.cpp:902
+#: pcbnew/tools/pcb_actions.cpp:909
 msgid "Switch to Inner layer 29"
 msgstr "切换到内层 29"
 
-#: pcbnew/tools/pcb_actions.cpp:907
+#: pcbnew/tools/pcb_actions.cpp:914
 msgid "Switch to Inner layer 30"
 msgstr "切换到内层 30"
 
-#: pcbnew/tools/pcb_actions.cpp:913
+#: pcbnew/tools/pcb_actions.cpp:920
 msgid "Switch to Copper (B.Cu) layer"
 msgstr "切换到底层铜层"
 
-#: pcbnew/tools/pcb_actions.cpp:919
+#: pcbnew/tools/pcb_actions.cpp:926
 msgid "Switch to Next Layer"
 msgstr "切换到下一层"
 
-#: pcbnew/tools/pcb_actions.cpp:924
+#: pcbnew/tools/pcb_actions.cpp:931
 msgid "Switch to Previous Layer"
 msgstr "切换到上一层"
 
-#: pcbnew/tools/pcb_actions.cpp:929
+#: pcbnew/tools/pcb_actions.cpp:936
 msgid "Add Through Via"
 msgstr "添加通孔"
 
-#: pcbnew/tools/pcb_actions.cpp:935
+#: pcbnew/tools/pcb_actions.cpp:942
 msgid "Increase Layer Opacity"
 msgstr "增大图层不透明度"
 
-#: pcbnew/tools/pcb_actions.cpp:935 pcbnew/tools/pcb_actions.cpp:942
+#: pcbnew/tools/pcb_actions.cpp:942 pcbnew/tools/pcb_actions.cpp:949
 msgid "Make the current layer more transparent"
 msgstr "使当前层更加透明"
 
-#: pcbnew/tools/pcb_actions.cpp:942
+#: pcbnew/tools/pcb_actions.cpp:949
 msgid "Decrease Layer Opacity"
 msgstr "减小图层不透明度"
 
-#: pcbnew/tools/pcb_actions.cpp:952
+#: pcbnew/tools/pcb_actions.cpp:959
 msgid "Show Board Statistics"
 msgstr "显示板统计信息"
 
-#: pcbnew/tools/pcb_actions.cpp:953
+#: pcbnew/tools/pcb_actions.cpp:960
 msgid "Shows board statistics"
 msgstr "显示板统计信息"
 
-#: pcbnew/tools/pcb_actions.cpp:960
+#: pcbnew/tools/pcb_actions.cpp:967
 msgid "Align to Top"
 msgstr "顶部对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:961
+#: pcbnew/tools/pcb_actions.cpp:968
 msgid "Aligns selected items to the top edge"
 msgstr "对齐选择的项到顶边"
 
-#: pcbnew/tools/pcb_actions.cpp:965
+#: pcbnew/tools/pcb_actions.cpp:972
 msgid "Align to Bottom"
 msgstr "底部对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:966
+#: pcbnew/tools/pcb_actions.cpp:973
 msgid "Aligns selected items to the bottom edge"
 msgstr "对齐选择的项到底边"
 
-#: pcbnew/tools/pcb_actions.cpp:970
+#: pcbnew/tools/pcb_actions.cpp:977
 msgid "Align to Left"
 msgstr "左对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:971
+#: pcbnew/tools/pcb_actions.cpp:978
 msgid "Aligns selected items to the left edge"
 msgstr "对齐选择的项到左边"
 
-#: pcbnew/tools/pcb_actions.cpp:975
+#: pcbnew/tools/pcb_actions.cpp:982
 msgid "Align to Right"
 msgstr "右对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:976
+#: pcbnew/tools/pcb_actions.cpp:983
 msgid "Aligns selected items to the right edge"
 msgstr "对齐选择的项到右边"
 
-#: pcbnew/tools/pcb_actions.cpp:980
+#: pcbnew/tools/pcb_actions.cpp:987
 msgid "Align to Vertical Center"
 msgstr "与垂直中心对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:981
+#: pcbnew/tools/pcb_actions.cpp:988
 msgid "Aligns selected items to the vertical center"
 msgstr "将选定的项目垂直居中"
 
-#: pcbnew/tools/pcb_actions.cpp:985
+#: pcbnew/tools/pcb_actions.cpp:992
 msgid "Align to Horizontal Center"
 msgstr "与水平中心对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:986
+#: pcbnew/tools/pcb_actions.cpp:993
 msgid "Aligns selected items to the horizontal center"
 msgstr "将选定的项目水平居中"
 
-#: pcbnew/tools/pcb_actions.cpp:990
+#: pcbnew/tools/pcb_actions.cpp:997
 msgid "Distribute Horizontally"
 msgstr "水平分布"
 
-#: pcbnew/tools/pcb_actions.cpp:991
+#: pcbnew/tools/pcb_actions.cpp:998
 msgid "Distributes selected items along the horizontal axis"
 msgstr "所选项沿水平轴分布"
 
-#: pcbnew/tools/pcb_actions.cpp:995
+#: pcbnew/tools/pcb_actions.cpp:1002
 msgid "Distribute Vertically"
 msgstr "垂直分布"
 
-#: pcbnew/tools/pcb_actions.cpp:996
+#: pcbnew/tools/pcb_actions.cpp:1003
 msgid "Distributes selected items along the vertical axis"
 msgstr "所选项沿垂直轴分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1016
+#: pcbnew/tools/pcb_actions.cpp:1023
 msgid "Position Relative To..."
 msgstr "相対位置..."
 
-#: pcbnew/tools/pcb_actions.cpp:1017
+#: pcbnew/tools/pcb_actions.cpp:1024
 msgid "Positions the selected item(s) by an exact amount relative to another"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:1053
+#: pcbnew/tools/pcb_actions.cpp:1060
 msgid "Select/Expand Connection"
 msgstr "选择/扩展连接"
 
-#: pcbnew/tools/pcb_actions.cpp:1054
+#: pcbnew/tools/pcb_actions.cpp:1061
 msgid ""
 "Selects a connection or expands an existing selection to junctions, pads, or "
 "entire connections"
 msgstr "选择连接或将现有选择扩展到连接点、焊盘或整个连接"
 
-#: pcbnew/tools/pcb_actions.cpp:1059
+#: pcbnew/tools/pcb_actions.cpp:1066
 msgid "Select All Tracks in Net"
 msgstr "选择网中的所有布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1060
+#: pcbnew/tools/pcb_actions.cpp:1067
 msgid "Selects all tracks & vias belonging to the same net."
 msgstr "选择所有属于同一网络的布线与过孔。"
 
-#: pcbnew/tools/pcb_actions.cpp:1066
+#: pcbnew/tools/pcb_actions.cpp:1073
 msgid "Selects all modules and tracks in the schematic sheet"
 msgstr "选择原理图框中的所有模块和布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1071
+#: pcbnew/tools/pcb_actions.cpp:1078
 msgid "Items in Same Hierarchical Sheet"
 msgstr "同一层次图框中的项目"
 
-#: pcbnew/tools/pcb_actions.cpp:1072
+#: pcbnew/tools/pcb_actions.cpp:1079
 msgid "Selects all modules and tracks in the same schematic sheet"
 msgstr "选择同一原理图框中的所有模块和布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1077
+#: pcbnew/tools/pcb_actions.cpp:1084
 msgid "Filter Selection..."
 msgstr "筛选器选择..."
 
-#: pcbnew/tools/pcb_actions.cpp:1077
+#: pcbnew/tools/pcb_actions.cpp:1084
 msgid "Filter the types of items in the selection"
 msgstr "筛选选中的项目类型"
 
-#: pcbnew/tools/pcb_actions.cpp:1085
+#: pcbnew/tools/pcb_actions.cpp:1092
 msgid "Fill zone(s)"
 msgstr "填充覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:1091
+#: pcbnew/tools/pcb_actions.cpp:1098
 msgid "Fill All"
 msgstr "填充所有"
 
-#: pcbnew/tools/pcb_actions.cpp:1091
+#: pcbnew/tools/pcb_actions.cpp:1098
 msgid "Fill all zones"
 msgstr "填充所有区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1096
+#: pcbnew/tools/pcb_actions.cpp:1103
 msgid "Unfill"
 msgstr "取消填充"
 
-#: pcbnew/tools/pcb_actions.cpp:1096
+#: pcbnew/tools/pcb_actions.cpp:1103
 msgid "Unfill zone(s)"
 msgstr "取消填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1102
+#: pcbnew/tools/pcb_actions.cpp:1109
 msgid "Unfill All"
 msgstr "取消所有填充"
 
-#: pcbnew/tools/pcb_actions.cpp:1102
+#: pcbnew/tools/pcb_actions.cpp:1109
 msgid "Unfill all zones"
 msgstr "取消所有填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1110
+#: pcbnew/tools/pcb_actions.cpp:1117
 msgid "Place Selected Footprints"
 msgstr "放置选定的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:1111
+#: pcbnew/tools/pcb_actions.cpp:1118
 msgid "Performs automatic placement of selected components"
 msgstr "执行选定元件的自动放置"
 
-#: pcbnew/tools/pcb_actions.cpp:1116
+#: pcbnew/tools/pcb_actions.cpp:1123
 msgid "Place Off-Board Footprints"
 msgstr "放置板外封装"
 
-#: pcbnew/tools/pcb_actions.cpp:1117
+#: pcbnew/tools/pcb_actions.cpp:1124
 msgid "Performs automatic placement of components outside board area"
 msgstr "在板区域外执行元件的自动放置"
 
-#: pcbnew/tools/pcb_actions.cpp:1126
+#: pcbnew/tools/pcb_actions.cpp:1133
 msgid "Route Single Track"
 msgstr "单轨交互式布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1126
+#: pcbnew/tools/pcb_actions.cpp:1133
 msgid "Run push & shove router (single tracks)"
 msgstr "运行推挤布线(单轨布线)"
 
-#: pcbnew/tools/pcb_actions.cpp:1133
+#: pcbnew/tools/pcb_actions.cpp:1140
 msgid "Route Differential Pair"
 msgstr "差分对交互布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1133
+#: pcbnew/tools/pcb_actions.cpp:1140
 msgid "Run push & shove router (differential pairs)"
 msgstr "运行推挤布线(差分对布线)"
 
-#: pcbnew/tools/pcb_actions.cpp:1139
+#: pcbnew/tools/pcb_actions.cpp:1146
 msgid "Interactive Router Settings..."
 msgstr "交互式布线设置..."
 
-#: pcbnew/tools/pcb_actions.cpp:1139
+#: pcbnew/tools/pcb_actions.cpp:1146
 msgid "Open Interactive Router settings"
 msgstr "打开交互布线设置"
 
-#: pcbnew/tools/pcb_actions.cpp:1144
+#: pcbnew/tools/pcb_actions.cpp:1151
 msgid "Differential Pair Dimensions..."
 msgstr "差分对尺寸..."
 
-#: pcbnew/tools/pcb_actions.cpp:1144
+#: pcbnew/tools/pcb_actions.cpp:1151
 msgid "Open Differential Pair Dimension settings"
 msgstr "打开差分对尺寸设置"
 
-#: pcbnew/tools/pcb_actions.cpp:1149
+#: pcbnew/tools/pcb_actions.cpp:1156
 msgid "Router Highlight Mode"
 msgstr "布线高亮模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1149
+#: pcbnew/tools/pcb_actions.cpp:1156
 msgid "Switch router to highlight mode"
 msgstr "将布线切换到高亮模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1154
+#: pcbnew/tools/pcb_actions.cpp:1161
 msgid "Router Shove Mode"
 msgstr "布线推挤模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1154
+#: pcbnew/tools/pcb_actions.cpp:1161
 msgid "Switch router to shove mode"
 msgstr "将布线切换到推挤模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1159
+#: pcbnew/tools/pcb_actions.cpp:1166
 msgid "Router Walkaround Mode"
 msgstr "布线绕走模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1159
+#: pcbnew/tools/pcb_actions.cpp:1166
 msgid "Switch router to walkaround mode"
 msgstr "将布线切换到绕走模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1164
+#: pcbnew/tools/pcb_actions.cpp:1171
 msgid "Set Layer Pair..."
 msgstr "设置层对..."
 
-#: pcbnew/tools/pcb_actions.cpp:1164
+#: pcbnew/tools/pcb_actions.cpp:1171
 msgid "Change active layer pair for routing"
 msgstr "更改布线的活动层对"
 
-#: pcbnew/tools/pcb_actions.cpp:1171
+#: pcbnew/tools/pcb_actions.cpp:1178
 msgid "Tune length of a single track"
 msgstr "调整单轨布线长度"
 
-#: pcbnew/tools/pcb_actions.cpp:1178
+#: pcbnew/tools/pcb_actions.cpp:1185
 msgid "Tune length of a differential pair"
 msgstr "调整差分对布线长度"
 
-#: pcbnew/tools/pcb_actions.cpp:1185
+#: pcbnew/tools/pcb_actions.cpp:1192
 msgid "Tune skew of a differential pair"
 msgstr "调整差分对布线歪斜"
 
-#: pcbnew/tools/pcb_actions.cpp:1190
+#: pcbnew/tools/pcb_actions.cpp:1197
 msgid "Drag Track/Via"
 msgstr "拖拉 布线/过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:1190
+#: pcbnew/tools/pcb_actions.cpp:1197
 msgid "Drags tracks and vias without breaking connections"
 msgstr "拖动布线和过孔而不中断连接"
 
-#: pcbnew/tools/pcb_actions.cpp:1196 pcbnew/tools/pcb_actions.cpp:1202
+#: pcbnew/tools/pcb_actions.cpp:1203 pcbnew/tools/pcb_actions.cpp:1209
 msgid ""
 "Splits the track segment into two segments connected at the cursor position."
 msgstr "将布线拆分为在光标位置连接的两个段。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:131
+#: pcbnew/tools/pcb_editor_control.cpp:134
 msgid "Locking"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_editor_control.cpp:337
+#: pcbnew/tools/pcb_editor_control.cpp:340
 msgid "Merge Specctra Session file:"
 msgstr "合并布线器会话文件:"
 
-#: pcbnew/tools/pcb_editor_control.cpp:360
+#: pcbnew/tools/pcb_editor_control.cpp:363
 msgid "Specctra DSN File"
 msgstr "Specctra DSN 文件"
 
-#: pcbnew/tools/pcb_editor_control.cpp:411
+#: pcbnew/tools/pcb_editor_control.cpp:414
 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 "
@@ -28425,27 +28652,31 @@ msgstr ""
 "无法更新原理图，因为 Pcbnew 在独立模式下打开。为了从原理图创建或更新 PCB，您"
 "必须启动 KiCad 项目管理器并创建项目。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:758
+#: pcbnew/tools/pcb_editor_control.cpp:778
 msgid "Place a module"
 msgstr "放置模块"
 
-#: pcbnew/tools/pcb_editor_control.cpp:847
+#: pcbnew/tools/pcb_editor_control.cpp:867
 msgid "Toggle Locking"
 msgstr "切换锁定"
 
-#: pcbnew/tools/pcb_editor_control.cpp:934
+#: pcbnew/tools/pcb_editor_control.cpp:954
 msgid "Place a layer alignment target"
 msgstr "放置层对齐标记"
 
-#: pcbnew/tools/pcb_editor_control.cpp:1106
+#: pcbnew/tools/pcb_editor_control.cpp:1126
 msgid "Duplicate zone"
 msgstr "复制区域"
 
-#: pcbnew/tools/pcbnew_control.cpp:700
+#: pcbnew/tools/pcb_inspection_tool.cpp:52
+msgid "Net Tools"
+msgstr "网络工具"
+
+#: pcbnew/tools/pcbnew_control.cpp:724
 msgid "Invalid clipboard contents"
 msgstr "无效的剪贴板内容"
 
-#: pcbnew/tools/pcbnew_control.cpp:895 qa/qa_utils/pcb_test_frame.cpp:149
+#: pcbnew/tools/pcbnew_control.cpp:921 qa/qa_utils/pcb_test_frame.cpp:149
 #, c-format
 msgid ""
 "Error loading board.\n"
@@ -28454,15 +28685,15 @@ msgstr ""
 "电路板载入错误。\n"
 "%s"
 
-#: pcbnew/tools/pcbnew_control.cpp:965
+#: pcbnew/tools/pcbnew_control.cpp:991
 msgid "Selected Items"
 msgstr "选中项"
 
-#: pcbnew/tools/pcbnew_control.cpp:982
+#: pcbnew/tools/pcbnew_control.cpp:1008
 msgid "Footprint Name"
 msgstr "封装名称"
 
-#: pcbnew/tools/pcbnew_control.cpp:999
+#: pcbnew/tools/pcbnew_control.cpp:1025
 #, c-format
 msgid "Key Words: %s"
 msgstr "关键字：%s"
@@ -28503,27 +28734,27 @@ msgstr "水平分布"
 msgid "Distribute vertically"
 msgstr "垂直分布"
 
-#: pcbnew/tools/point_editor.cpp:257
+#: pcbnew/tools/point_editor.cpp:297
 msgid "Self-intersecting polygons are not allowed."
 msgstr "不允许自相交多边形。"
 
-#: pcbnew/tools/point_editor.cpp:266
+#: pcbnew/tools/point_editor.cpp:306
 msgid "pcbnew.InteractiveSelection tool is not available"
 msgstr "pcbnew 交互式选择工具不可用"
 
-#: pcbnew/tools/point_editor.cpp:400
+#: pcbnew/tools/point_editor.cpp:440
 msgid "Drag a corner"
 msgstr "拖动拐角"
 
-#: pcbnew/tools/point_editor.cpp:1089
+#: pcbnew/tools/point_editor.cpp:1304
 msgid "Add a zone corner"
 msgstr "添加覆铜区域拐角"
 
-#: pcbnew/tools/point_editor.cpp:1127
+#: pcbnew/tools/point_editor.cpp:1342
 msgid "Split segment"
 msgstr "分割线段"
 
-#: pcbnew/tools/point_editor.cpp:1198
+#: pcbnew/tools/point_editor.cpp:1413
 msgid "Remove a zone/polygon corner"
 msgstr "删除区域或多边形的拐角"
 
@@ -28539,19 +28770,19 @@ msgstr "选择参考项目..."
 msgid "Select"
 msgstr "选择"
 
-#: pcbnew/tools/selection_tool.cpp:670
+#: pcbnew/tools/selection_tool.cpp:693
 msgid "Selection contains locked items. Do you want to continue?"
 msgstr "选择包含锁定项, 你要继续吗?"
 
-#: pcbnew/tools/zone_create_helper.cpp:156
+#: pcbnew/tools/zone_create_helper.cpp:169
 msgid "Add a zone cutout"
 msgstr "添加挖空区域"
 
-#: pcbnew/tools/zone_create_helper.cpp:191
+#: pcbnew/tools/zone_create_helper.cpp:204
 msgid "Add a zone"
 msgstr "添加覆铜"
 
-#: pcbnew/tools/zone_create_helper.cpp:230
+#: pcbnew/tools/zone_create_helper.cpp:243
 msgid "Add a graphical polygon"
 msgstr "添加多边形图形"
 
@@ -28571,51 +28802,56 @@ msgstr "取消填充区域"
 msgid "Unfill All Zones"
 msgstr "取消填充所有区域"
 
-#: pcbnew/undo_redo.cpp:570
+#: pcbnew/undo_redo.cpp:571
 msgid "Incomplete undo/redo operation: some items not found"
 msgstr "不完整的撤消/重做操作：找不到某些项目"
 
-#: pcbnew/zone_filler.cpp:114
+#: pcbnew/widgets/panel_selection_filter.cpp:131
+#, c-format
+msgid "Only %s"
+msgstr "仅 %s"
+
+#: pcbnew/zone_filler.cpp:116
 msgid "Checking zone fills..."
 msgstr "检查填充区域..."
 
-#: pcbnew/zone_filler.cpp:114
+#: pcbnew/zone_filler.cpp:116
 msgid "Building zone fills..."
 msgstr "构造填充区域..."
 
-#: pcbnew/zone_filler.cpp:197
+#: pcbnew/zone_filler.cpp:219
 msgid "Removing insulated copper islands..."
 msgstr "移除死铜..."
 
-#: pcbnew/zone_filler.cpp:255
+#: pcbnew/zone_filler.cpp:294
 msgid "Zone fills are out-of-date. Refill?"
 msgstr "覆铜区域已失效，重新覆铜？"
 
-#: pcbnew/zone_filler.cpp:257
+#: pcbnew/zone_filler.cpp:296
 msgid "Refill"
 msgstr "重新覆铜"
 
-#: pcbnew/zone_filler.cpp:257
+#: pcbnew/zone_filler.cpp:296
 msgid "Continue without Refill"
 msgstr "取消覆铜"
 
-#: pcbnew/zone_filler.cpp:273
+#: pcbnew/zone_filler.cpp:312
 msgid "Performing polygon fills..."
 msgstr "执行多边形填充..."
 
-#: pcbnew/zone_filler.cpp:320
+#: pcbnew/zone_filler.cpp:359
 msgid "Committing changes..."
 msgstr "提交更改..."
 
-#: pcbnew/zone_filler.cpp:328
+#: pcbnew/zone_filler.cpp:367
 msgid "Fill Zone(s)"
 msgstr "填充区域"
 
-#: pcbnew/zones_by_polygon.cpp:93 pcbnew/zones_by_polygon.cpp:145
+#: pcbnew/zones_by_polygon.cpp:93 pcbnew/zones_by_polygon.cpp:146
 msgid "Modify zone properties"
 msgstr "修改区域属性"
 
-#: pcbnew/zones_by_polygon.cpp:139
+#: pcbnew/zones_by_polygon.cpp:140
 #, c-format
 msgid "Refill %d Zones"
 msgstr "重新填充 %d 覆铜"
@@ -28626,7 +28862,7 @@ msgstr " * [信息] 载入失败：输入行太长\n"
 
 #: qa/common_tools/tools/coroutines/coroutines.cpp:93
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:77
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:219
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:214
 #: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:91
 msgid "displays help on the command line parameters"
 msgstr "在命令行参数上显示帮助"
@@ -28640,13 +28876,13 @@ 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:227
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:222
 #: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:93
 msgid "print parsing information"
 msgstr "打印解析信息"
 
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:91
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:263
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:258
 #: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:94
 msgid "input file"
 msgstr "输入文件"
@@ -28655,27 +28891,232 @@ msgstr "输入文件"
 msgid "Tests parsing of S-Expression files"
 msgstr "测试解析表达式文件"
 
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:233
+#: qa/drc_proto/drc.cpp:255
+msgid "Netclasses...\n"
+msgstr "网类...\n"
+
+#: qa/drc_proto/drc.cpp:271
+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:64
+msgid "Track too close to hole"
+msgstr "布线太靠近通孔了"
+
+#: qa/drc_proto/drc_item.cpp:65
+msgid "Track too close to pad"
+msgstr "布线太靠近焊盘了"
+
+#: qa/drc_proto/drc_item.cpp:66
+msgid "Track too close to via"
+msgstr "布线太靠近过孔了"
+
+#: qa/drc_proto/drc_item.cpp:67
+msgid "Vias too close"
+msgstr "过孔太靠近了"
+
+#: qa/drc_proto/drc_item.cpp:68
+msgid "Via too close to track"
+msgstr "过孔太靠近布线了"
+
+#: qa/drc_proto/drc_item.cpp:69
+msgid "Track ends too close"
+msgstr "布线结束处太靠近了"
+
+#: qa/drc_proto/drc_item.cpp:70
+msgid "Parallel tracks too close"
+msgstr "平行的布线太靠近了"
+
+#: qa/drc_proto/drc_item.cpp:72
+msgid "Track too close to copper area"
+msgstr "布线太靠近铜区了"
+
+#: qa/drc_proto/drc_item.cpp:73
+msgid "Pads too close"
+msgstr "焊盘太靠近了"
+
+#: qa/drc_proto/drc_item.cpp:75
+msgid "Micro via through too many layers"
+msgstr "过多层的微孔"
+
+#: qa/drc_proto/drc_item.cpp:76
+msgid "Micro via not allowed"
+msgstr "不允许微孔"
+
+#: qa/drc_proto/drc_item.cpp:77
+msgid "Buried via not allowed"
+msgstr "不允许埋孔"
+
+#: qa/drc_proto/drc_item.cpp:80
+msgid "Copper areas too close"
+msgstr "覆铜区过近"
+
+#: qa/drc_proto/drc_item.cpp:84
+msgid "Hole too close to pad"
+msgstr "孔太靠近焊盘了"
+
+#: qa/drc_proto/drc_item.cpp:85
+msgid "Hole too close to track"
+msgstr "孔太靠近布线了"
+
+#: qa/drc_proto/drc_item.cpp:86
+msgid "Track width too small"
+msgstr "布线宽度太小"
+
+#: qa/drc_proto/drc_item.cpp:87
+msgid "Track width too large"
+msgstr "布线宽度过大"
+
+#: qa/drc_proto/drc_item.cpp:89
+msgid "Via annulus too small"
+msgstr "过孔环隙太小"
+
+#: qa/drc_proto/drc_item.cpp:91
+msgid "Via drill too small"
+msgstr "过孔内径太小"
+
+#: qa/drc_proto/drc_item.cpp:92
+msgid "Pad drill too small"
+msgstr "焊盘内径太小"
+
+#: qa/drc_proto/drc_item.cpp:95
+msgid "Track too close to board edge"
+msgstr "布线太靠近板框了"
+
+#: qa/drc_proto/drc_item.cpp:96
+msgid "Via too close to board edge"
+msgstr "过孔太靠近电路板边缘了"
+
+#: qa/drc_proto/drc_item.cpp:97
+msgid "Pad too close to board edge"
+msgstr "焊盘太靠近电路板边缘了"
+
+#: qa/drc_proto/drc_item.cpp:100
+msgid "NetClass Track Width too small"
+msgstr "网络类布线宽度太小"
+
+#: qa/drc_proto/drc_item.cpp:101
+msgid "NetClass Clearance too small"
+msgstr "网络类间隙太小"
+
+#: qa/drc_proto/drc_item.cpp:102
+msgid "NetClass via annulus too small"
+msgstr "网络类过孔环隙太小"
+
+#: qa/drc_proto/drc_item.cpp:103
+msgid "NetClass Via Dia too small"
+msgstr "网络类过孔外径太小"
+
+#: qa/drc_proto/drc_item.cpp:104
+msgid "NetClass Via Drill too small"
+msgstr "网络类过孔内径太小"
+
+#: qa/drc_proto/drc_item.cpp:105
+msgid "NetClass uVia Dia too small"
+msgstr "网络类微孔外径太小"
+
+#: qa/drc_proto/drc_item.cpp:106
+msgid "NetClass uVia Drill too small"
+msgstr "网络类微孔内径太小"
+
+#: qa/drc_proto/drc_item.cpp:108
+msgid "Via inside keepout area"
+msgstr "过孔在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:109
+msgid "Micro via inside keepout area"
+msgstr "微孔在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:110
+msgid "Buried via inside keepout area"
+msgstr "埋孔在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:111
+msgid "Track inside keepout area"
+msgstr "布线在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:112
+msgid "Pad inside keepout area"
+msgstr "焊盘在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:113
+msgid "Footprint inside keepout area"
+msgstr "封装在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:114
+msgid "Hole inside keepout area"
+msgstr "通孔在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:115
+msgid "Text inside keepout area"
+msgstr "文本在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:116
+msgid "Graphic inside keepout area"
+msgstr "图形在禁布区内"
+
+#: qa/drc_proto/drc_item.cpp:118
+msgid "Via too close to copper item"
+msgstr "过孔太靠近覆铜区项目"
+
+#: qa/drc_proto/drc_item.cpp:119
+msgid "Track too close to copper item"
+msgstr "布线太靠近覆铜区项目"
+
+#: qa/drc_proto/drc_item.cpp:120
+msgid "Pad too close to copper item"
+msgstr "焊盘太靠近覆铜区项目"
+
+#: qa/drc_proto/drc_item.cpp:146
+msgid "Unknown DRC violation"
+msgstr "未知的 DRC 违规"
+
+#: qa/drc_proto/drc_netclass_tester.cpp:63
+#: qa/drc_proto/drc_netclass_tester.cpp:77
+#: qa/drc_proto/drc_netclass_tester.cpp:91
+#: qa/drc_proto/drc_netclass_tester.cpp:121
+#: qa/drc_proto/drc_netclass_tester.cpp:135
+#: qa/drc_proto/drc_netclass_tester.cpp:149
+#, c-format
+msgid " (board minimum %s; %s netclass %s)"
+msgstr " (电路板最小值 %s; %s 网络类 %s)"
+
+#: qa/drc_proto/drc_netclass_tester.cpp:105
+#, c-format
+msgid " (board min through hole %s; %s netclass %s)"
+msgstr " (电路板最小通孔 %s; %s 网络类 %s)"
+
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:228
 msgid "print DRC timings"
 msgstr "打印 DRC 计时"
 
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:239
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:234
 msgid "print DRC marker information"
 msgstr "打印 DRC 标记信息"
 
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:245
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:240
 msgid "perform all available DRC checks"
 msgstr "执行所有可用的 DRC 检查"
 
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:251
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:246
 msgid "perform courtyard-overlap (and malformation) checking"
 msgstr "执行外框重叠 (和畸形) 检查"
 
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:257
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:252
 msgid "perform courtyard-missing checking"
 msgstr "执行外框缺失检查"
 
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:289
+#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:284
 msgid ""
 "This program runs DRC tools on given PCB files. This can be used for "
 "debugging, fuzz testing or development, etc."
@@ -28746,6 +29187,274 @@ msgstr ""
 "3D 搜索路径列表为空;\n"
 "继续写空文件？"
 
+#~ msgid "&Reset to Defaults"
+#~ msgstr "重置为默认值 (&R)"
+
+#~ msgid "Restore All to Defaults"
+#~ msgstr "全部还原为默认值"
+
+#, c-format
+#~ msgid "Could not create backup file \"%s\""
+#~ msgstr "不能创建备份文件 \"%s\""
+
+#~ msgid "Kicad Manager"
+#~ msgstr "KiCad 管理器"
+
+#, c-format
+#~ msgid "Unable to find \"%s\" template config file."
+#~ msgstr "无法找到 \"%s\" 模板配置文件。"
+
+#~ msgid "Error copying project file template"
+#~ msgstr "复制工程文件模板错误"
+
+#, c-format
+#~ msgid "Cannot create prj file \"%s\" (Directory not writable)"
+#~ msgstr "无法创建工程文件 \"%s\" (目录不可写)"
+
+#, c-format
+#~ msgid "Project file \"%s\" is not writable"
+#~ msgstr "工程文件 \"%s\" 不可写"
+
+#~ msgid "Filter by display name"
+#~ msgstr "按名称筛选字段"
+
+#~ msgid ""
+#~ "Filter footprint list using plain text matching or regular expressions"
+#~ msgstr "使用纯文本匹配或正则表达式筛选封装列表"
+
+#, c-format
+#~ msgid "Unable to load project's \"%s\" file"
+#~ msgstr "无法加载工程文件 %s"
+
+#~ msgid "Clear and annotate all of the symbols on the entire schematic?"
+#~ msgstr "清除并标注整个原理图中的所有符号？"
+
+#~ msgid "Clear and annotate all of the symbols on the current sheet?"
+#~ msgstr "清除并标注当前图框中所有符号?"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "This operation will change the current annotation and cannot be undone."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "该操作将改变当前标注并且不可撤销。"
+
+#~ msgid "Clear and Annotate"
+#~ msgstr "清除与标注"
+
+#~ msgid "Clear the existing annotation for the entire schematic?"
+#~ msgstr "要清除整个原理图的现有的标注吗？"
+
+#~ msgid "Clear the existing annotation for the current sheet?"
+#~ msgstr "要清除当前图框的现有的标注吗？"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "This operation will clear the existing annotation and cannot be undone."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "该操作将清除已有的标注, 并且不可恢复。"
+
+#~ msgid "Use the entire schematic"
+#~ msgstr "使用整个原理图"
+
+#~ msgid "Use the current page only"
+#~ msgstr "仅使用当前图框"
+
+#~ msgid ""
+#~ "Warning: changes made from this dialog cannot be undone after closing it."
+#~ msgstr "警告：关闭对话框后所作的更改无法撤消。"
+
+#~ msgid "Footprint ID:"
+#~ msgstr "封装 ID："
+
+#~ msgid "Datasheet URL:"
+#~ msgstr "数据手册 URL："
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "This operation will change the existing annotation and cannot be undone."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "此操作将更改现有批注，并且无法撤消。"
+
+#~ msgid "Back annotate"
+#~ msgstr "反向标注"
+
+#~ msgid "ERC err unspecified"
+#~ msgstr "ERC 不明错误"
+
+#~ msgid "Unknown ERC violation"
+#~ msgstr "未知的 ERC 违规"
+
+#, c-format
+#~ msgid "Could not save backup of file \"%s\""
+#~ msgstr "无法保存备份文件 \"%s\""
+
+#~ msgid "Net Wire"
+#~ msgstr "网络连线"
+
+#~ msgid "Bus Wire"
+#~ msgstr "总线连线"
+
+#, c-format
+#~ msgid "Schematic is back-annotated. %d changes applied."
+#~ msgstr "原理图已添加反向标注。已应用 %d 个更改。"
+
+#~ msgid "No errors during dry run. Ready to go."
+#~ msgstr "试运行期间没有错误。准备运行。"
+
+#, c-format
+#~ msgid "Found %d errors. Fix them and run back annotation."
+#~ msgstr "找到 %d 错误。修复它们并运行反向注释。"
+
+#~ msgid "Please open Pcbnew and run back annotation again"
+#~ msgstr "请打开 Pcbnew 并再次运行反向注释"
+
+#, c-format
+#~ msgid "%d symbols left unchanged"
+#~ msgstr "%d 符号保持不变"
+
+#~ msgid "Add Bus to Bus Entry"
+#~ msgstr "添加总线到总线入口"
+
+#~ msgid "Add a bus entry to a bus"
+#~ msgstr "添加总线入口到总线"
+
+#~ msgid "Set Bus Entry Shape /"
+#~ msgstr "设置总线入口方向 /"
+
+#~ msgid "Change the bus entry shape to /"
+#~ msgstr "将总线入口形状更改为 /"
+
+#~ msgid "Set Bus Entry Shape \\"
+#~ msgstr "设置总线入口方向 \\"
+
+#~ msgid "Change the bus entry shape to \\"
+#~ msgstr "将总线入口形状更改为 \\"
+
+#~ msgid "Bus has no connections"
+#~ msgstr "总线无连接"
+
+#~ msgid "Print layers"
+#~ msgstr "打印"
+
+#~ msgid " OK\n"
+#~ msgstr " 确定\n"
+
+#~ msgid " *ERROR*\n"
+#~ msgstr " *错误*\n"
+
+#, c-format
+#~ msgid "(%lu bytes, compressed %d bytes)\n"
+#~ msgstr "(%lu 字节, 压缩 %d 字节)\n"
+
+#~ msgid " >>Error\n"
+#~ msgstr " >>错误\n"
+
+#~ msgid "Pcbnew failed to load:\n"
+#~ msgstr "Pcbnew 无法加载：\n"
+
+#~ msgid "Predefined Track and Via dimensions"
+#~ msgstr "预定义的布线和通孔尺寸"
+
+#, c-format
+#~ msgid "Clearance less than minimum clearance (%s)."
+#~ msgstr "间隙小于最小间隙 （%s）。"
+
+#, c-format
+#~ msgid "Differential pair width less than minimum track width (%s)."
+#~ msgstr "差分对宽度小于最小布线宽度 (%s)。"
+
+#, c-format
+#~ msgid "Via diameter and drill leave via annulus less than minimum (%s)."
+#~ msgstr "通孔直径和钻头通孔的环隙小于最小值 (%s)。"
+
+#, c-format
+#~ msgid "Via drill less than minimum via drill (%s)."
+#~ msgstr "过孔内径小于最小孔内径 (%s)。"
+
+#, c-format
+#~ msgid "Microvia diameter less than minimum microvia diameter (%s)."
+#~ msgstr "微孔外径小于最小微孔外径 (%s)。"
+
+#~ msgid "Microvia drill larger than microvia diameter."
+#~ msgstr "微孔内径大于微孔外径。"
+
+#, c-format
+#~ msgid "Microvia drill less than minimum microvia drill (%s)."
+#~ msgstr "微孔内径小于最小内径 (%s)。"
+
+#~ msgid "DP Via Gap"
+#~ msgstr "DP（差分对）过孔间距"
+
+#, c-format
+#~ msgid "Warning: unable to create backup file \"%s\""
+#~ msgstr "警告: 未能创建备份文件 \"%s\""
+
+#, c-format
+#~ msgid "Backup file: \"%s\""
+#~ msgstr "备份文件：\"%s\""
+
+#~ msgid "Revert to Last Backup"
+#~ msgstr "恢复到上次备份"
+
+#~ msgid "Clear board and get previous backup version of board"
+#~ msgstr "清除更改并恢复到以前版本"
+
+#~ msgid "Netlist update successful!"
+#~ msgstr "网表更新成功！"
+
+#~ msgid ""
+#~ "Cannot convert items to a custom-shaped pad:\n"
+#~ "selection contains more than one reference pad."
+#~ msgstr ""
+#~ "无法将项目转换为自定义形状的焊盘：\n"
+#~ "选择中包含多个参考焊盘。"
+
+#~ msgid ""
+#~ "Cannot convert items to a custom-shaped pad:\n"
+#~ "selection contains unsupported items.\n"
+#~ "Only graphical lines, circles, arcs and polygons are allowed."
+#~ msgstr ""
+#~ "无法将项目转换为自定义形状的焊盘：\n"
+#~ "选择中有包含不受支持的项目。\n"
+#~ "只允许图形线条，圆形，弧形和多边形。"
+
+#~ msgid ""
+#~ "Cannot convert items to a custom-shaped pad:\n"
+#~ "unable to determine the anchor point position.\n"
+#~ "Consider adding a small anchor pad to the selection and try again."
+#~ msgstr ""
+#~ "无法将项目转换为自定义形状的焊盘：\n"
+#~ "无法确定锚点位置。\n"
+#~ "考虑在选择中添加一个小锚点，然后重试。"
+
+#~ msgid ""
+#~ "Cannot convert items to a custom-shaped pad:\n"
+#~ "selected items do not form a single solid shape."
+#~ msgstr ""
+#~ "无法将项目转换为自定义形状的焊盘：\n"
+#~ "选定的项目不会形成单一的固定形状。"
+
+#~ msgid "Create Pad from Selected Shapes"
+#~ msgstr "从选定的形状创建焊盘"
+
+#~ msgid "Creates a custom-shaped pads from a set of selected shapes"
+#~ msgstr "从一组选定的形状创建自定义焊盘"
+
+#~ msgid "Shape Properties..."
+#~ msgstr "形状属性..."
+
+#~ msgid "Drill and Place Offset"
+#~ msgstr "钻头和放置偏移"
+
 #~ msgid "Gray 1"
 #~ msgstr "灰色 1"
 
@@ -29109,9 +29818,6 @@ msgstr ""
 #~ msgid " (board min through hole %s; actual %s)"
 #~ msgstr " (电路板最小通孔 %s; 实际 %s)"
 
-#~ msgid "board edge clearance"
-#~ msgstr "电路板边缘间隙"
-
 #~ msgid "Sketch Footprint Graphic Items"
 #~ msgstr "草图封装图形项目"
 
@@ -29141,9 +29847,6 @@ msgstr ""
 #~ "默认参考文本\n"
 #~ "保留空白会使用封装名称"
 
-#~ msgid "SilkScreen"
-#~ msgstr "丝印"
-
 #~ msgid "Fab. Layer"
 #~ msgstr "制造层"
 
@@ -29919,10 +30622,6 @@ msgstr ""
 #~ msgid "Global label \"%s\" (sheet \"%s\")"
 #~ msgstr "全局标签 \"%s\" (图框 \"%s\")"
 
-#, c-format
-#~ msgid "Local label \"%s\" (sheet \"%s\")"
-#~ msgstr "局部标签 \"%s\" (图框 \"%s\")"
-
 #~ msgid "Show Marker Info"
 #~ msgstr "显示标记信息"
 
@@ -29935,9 +30634,6 @@ msgstr ""
 #~ msgid "Brightened"
 #~ msgstr "高亮"
 
-#~ msgid "Component"
-#~ msgstr "元件"
-
 #~ msgid "Miscellaneous"
 #~ msgstr "其他"
 
@@ -30234,9 +30930,6 @@ msgstr ""
 #~ msgid "Selects all connected tracks & vias."
 #~ msgstr "所有连接的布线与过孔。"
 
-#~ msgid "Expand Selected Connection"
-#~ msgstr "展开选定的连接"
-
 #~ msgid ""
 #~ "Expands the current selection to select a connection between two "
 #~ "junctions."
@@ -30347,9 +31040,6 @@ msgstr ""
 #~ msgid "PCB thickness:"
 #~ msgstr "PCB 厚度："
 
-#~ msgid "Items Not Handled"
-#~ msgstr "未处理的项目"
-
 #, c-format
 #~ msgid ""
 #~ "(PCB_EDIT_FRAME::OnActionPlugin) needs work: BOARD_ITEM type (%d) not "
@@ -30439,9 +31129,6 @@ msgstr ""
 #~ msgid "Close footprint viewer"
 #~ msgstr "关闭封装浏览器"
 
-#~ msgid "Delete Tool"
-#~ msgstr "删除工具"
-
 #~ msgid "&Open Directory in System"
 #~ msgstr "在系统中打开目录 (&O)"
 
@@ -30772,12 +31459,6 @@ msgstr ""
 #~ msgid "End Line Wire Bus"
 #~ msgstr "结束绘制总线"
 
-#~ msgid "Add Bus Entry"
-#~ msgstr "添加总线入口"
-
-#~ msgid "Add Wire Entry"
-#~ msgstr "添加连接线入口"
-
 #~ msgid "Add Graphic PolyLine"
 #~ msgstr "添加多段线图形"
 
@@ -30802,9 +31483,6 @@ msgstr ""
 #~ msgid "Move Schematic Item"
 #~ msgstr "移动原理图项目"
 
-#~ msgid "Drag Item"
-#~ msgstr "拖动项目"
-
 #~ msgid "Delete Item"
 #~ msgstr "删除项目"
 
@@ -30893,9 +31571,6 @@ msgstr ""
 #~ msgid "Add a hierarchical label to a wire or bus"
 #~ msgstr "向连线或总线添加分层标签"
 
-#~ msgid "Add a sheet pin to the selected sheet"
-#~ msgstr "将图框引脚添加到所选工作表"
-
 #~ msgid "Add Imported Sheet Pin"
 #~ msgstr "添加导入的图框引脚"
 
@@ -30932,9 +31607,6 @@ msgstr ""
 #~ msgid "Show Symbol Editor"
 #~ msgstr "显示符号编辑器"
 
-#~ msgid "Highlight specific net"
-#~ msgstr "高亮特定网络"
-
 #~ msgid "Drag Items"
 #~ msgstr "拖动项目"
 
@@ -31821,9 +32493,6 @@ msgstr ""
 #~ msgid "Bus &to Bus Entry"
 #~ msgstr "总线到总线入口 (&T)"
 
-#~ msgid "&No Connect Flag"
-#~ msgstr "不连接标记 (&N)"
-
 #~ msgid "&Junction"
 #~ msgstr "连接点 (&J)"
 
@@ -31953,9 +32622,6 @@ msgstr ""
 #~ msgid "Delete Drawing"
 #~ msgstr "删除图形"
 
-#~ msgid "Move Reference"
-#~ msgstr "移动参考编号"
-
 #~ msgid "Move Value"
 #~ msgstr "移动值"
 
@@ -31965,9 +32631,6 @@ msgstr ""
 #~ msgid "Move Field"
 #~ msgstr "移动字段"
 
-#~ msgid "Rotate Value"
-#~ msgstr "旋转值"
-
 #~ msgid "Rotate Footprint Field"
 #~ msgstr "旋转封装字段"
 
@@ -32079,9 +32742,6 @@ msgstr ""
 #~ msgid "Library:Symbol"
 #~ msgstr "库：符号"
 
-#~ msgid "New schematic"
-#~ msgstr "新建原理图"
-
 #~ msgid "Open schematic"
 #~ msgstr "打开原理图"
 
@@ -32272,9 +32932,6 @@ msgstr ""
 #~ msgid "Show polygons in fill mode"
 #~ msgstr "在填充模式下显示多边形"
 
-#~ msgid "Hide DCodes"
-#~ msgstr "隐藏 D 码"
-
 #~ msgid "Show negative objects in normal color"
 #~ msgstr "以标准颜色显示负片对象"
 
@@ -32317,12 +32974,6 @@ msgstr ""
 #~ msgid "Origin:"
 #~ msgstr "原点："
 
-#~ msgid "End X:"
-#~ msgstr "结束点 X："
-
-#~ msgid "End Y:"
-#~ msgstr "结束点 Y："
-
 #~ msgid "Repeat parameters:"
 #~ msgstr "重复参数："
 
@@ -32641,9 +33292,6 @@ msgstr ""
 #~ msgid "&3D Viewer"
 #~ msgstr "3D 查看器 (&3)"
 
-#~ msgid "Zoom to fit footprint"
-#~ msgstr "缩放封装至适合大小"
-
 #~ msgid "Grid &Settings..."
 #~ msgstr "网格设置... (&S)"