diff --git a/zh_CN/kicad.po b/zh_CN/kicad.po
index 26bebbe79e..41e4ff4604 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.28\n"
+"Project-Id-Version: KiCad_zh_CN_Master_v0.0.29\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-31 19:52+0800\n"
-"PO-Revision-Date: 2020-09-16 10:31+0800\n"
+"POT-Creation-Date: 2020-09-24 14:43+0800\n"
+"PO-Revision-Date: 2020-09-24 15:55+0800\n"
 "Last-Translator: taotieren <admin@taotieren.com>\n"
 "Language-Team: kicad-cn\n"
 "Language: zh_CN\n"
@@ -63,11 +63,11 @@ msgstr "比例"
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:85
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:111
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:420
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1065
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1091
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1117
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1143
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1256
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1139
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1165
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1191
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1217
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1330
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:63
 msgid "X:"
 msgstr "X："
@@ -88,11 +88,11 @@ msgstr "X："
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:320
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:381
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:431
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1076
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1102
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1128
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1154
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1267
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1150
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1176
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1202
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1228
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1341
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:80
 msgid "Y:"
 msgstr "Y："
@@ -104,8 +104,8 @@ msgid "Z:"
 msgstr "Z："
 
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:66
-#: gerbview/gerber_draw_item.cpp:701 pcbnew/class_module.cpp:705
-#: pcbnew/class_pad.cpp:856
+#: gerbview/gerber_draw_item.cpp:701 pcbnew/class_module.cpp:716
+#: pcbnew/class_pad.cpp:865
 msgid "Rotation"
 msgstr "旋转"
 
@@ -141,39 +141,39 @@ msgstr "没有此类文件"
 msgid "failed to open file"
 msgstr "无法打开文件"
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:422
+#: 3d-viewer/3d_canvas/board_adapter.cpp:424
 msgid "Build board body"
 msgstr "构造电路板"
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:427
+#: 3d-viewer/3d_canvas/board_adapter.cpp:429
 msgid "Board outline is not closed: "
 msgstr "电路板轮廓未闭合：  "
 
-#: 3d-viewer/3d_canvas/board_adapter.cpp:432
+#: 3d-viewer/3d_canvas/board_adapter.cpp:434
 msgid "Create layers"
 msgstr "创建图层"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:203
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:213
 msgid "Create tracks and vias"
 msgstr "创建导线和过孔"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:644
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:689
 msgid "Create zones"
 msgstr "创建覆铜"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:714
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:759
 msgid "Simplifying copper layers polygons"
 msgstr "简化铜层多边形"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:753
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:828
 msgid "Simplify holes contours"
 msgstr "简化孔轮廓"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:784
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:857
 msgid "Build Tech layers"
 msgstr "构造工艺层"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:958
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:1036
 msgid "Build BVH for holes and vias"
 msgstr "为孔和过孔构造 BVH (盲埋孔)"
 
@@ -182,34 +182,34 @@ msgstr "为孔和过孔构造 BVH (盲埋孔)"
 msgid "Render time %.0f ms ( %.1f fps)"
 msgstr "渲染时间 %.0f ms ( %.1f fps)"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:353
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:431
 msgid "Load OpenGL: board"
 msgstr "载入 OpenGL：电路板"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:425
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:503
 msgid "Load OpenGL: holes and vias"
 msgstr "载入 OpenGL：开孔和过孔"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:517
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:595
 msgid "Load OpenGL: layers"
 msgstr "载入 OpenGL：层"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:609
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:633
 msgid "Loading 3D models"
 msgstr "载入 3D 模型"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:619
-#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp:983
+#: 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:1018
 #, c-format
 msgid "Reload time %.3f s"
 msgstr "重新载入时间 %.3f s"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:890
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:900
 #, 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:574
 #: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:178
 #: common/widgets/footprint_preview_widget.cpp:108
 msgid "Loading..."
@@ -238,7 +238,7 @@ msgid "Export Current View as JPEG..."
 msgstr "导出当前视图为 JPEG..."
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:61 common/hotkey_store.cpp:70
-#: common/tool/actions.cpp:523 pcbnew/footprint_viewer_frame.cpp:944
+#: common/tool/actions.cpp:528 pcbnew/footprint_viewer_frame.cpp:944
 #: pcbnew/pcb_base_frame.cpp:416
 msgid "3D Viewer"
 msgstr "3D 查看器"
@@ -250,19 +250,19 @@ msgstr "复制 3D 图像"
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:107
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:279
 #: eeschema/eeschema_config.cpp:224 eeschema/eeschema_config.cpp:395
-#: gerbview/gerbview_frame.cpp:1142 pagelayout_editor/pl_editor_frame.cpp:451
-#: pcbnew/footprint_edit_frame.cpp:871 pcbnew/pcbnew_config.cpp:63
+#: gerbview/gerbview_frame.cpp:1144 pagelayout_editor/pl_editor_frame.cpp:447
+#: pcbnew/footprint_edit_frame.cpp:874 pcbnew/pcbnew_config.cpp:63
 msgid "Display Options"
 msgstr "显示选项"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:111
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:711
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:789
 msgid "Raytracing"
 msgstr "光线追踪"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:118
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:28
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:473
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:551
 msgid "Render Options"
 msgstr "渲染选项"
 
@@ -319,48 +319,48 @@ msgid "Reset to Default Settings"
 msgstr "重置为默认值"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:214 cvpcb/menubar.cpp:71
-#: eeschema/libedit/menubar_libedit.cpp:155 eeschema/menubar.cpp:263
+#: eeschema/libedit/menubar_libedit.cpp:160 eeschema/menubar.cpp:263
 #: gerbview/menubar.cpp:234 kicad/menubar.cpp:152
 #: pagelayout_editor/menubar.cpp:145 pcbnew/menubar_footprint_editor.cpp:230
-#: pcbnew/menubar_pcb_editor.cpp:440
+#: pcbnew/menubar_pcb_editor.cpp:447
 msgid "Preferences...\tCTRL+,"
 msgstr "首选项...\tCTRL+,"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:215 cvpcb/menubar.cpp:72
-#: eeschema/libedit/menubar_libedit.cpp:156 eeschema/menubar.cpp:264
+#: eeschema/libedit/menubar_libedit.cpp:161 eeschema/menubar.cpp:264
 #: gerbview/menubar.cpp:235 kicad/menubar.cpp:153
 #: pagelayout_editor/menubar.cpp:146 pcbnew/menubar_footprint_editor.cpp:231
-#: pcbnew/menubar_pcb_editor.cpp:441
+#: pcbnew/menubar_pcb_editor.cpp:448
 msgid "Show preferences for all open tools"
 msgstr "显示所有打开工具的首选项"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:222 cvpcb/menubar.cpp:84
-#: eeschema/libedit/menubar_libedit.cpp:170 eeschema/menubar.cpp:278
-#: eeschema/toolbars_lib_view.cpp:128 gerbview/menubar.cpp:249
+#: eeschema/libedit/menubar_libedit.cpp:177 eeschema/menubar.cpp:280
+#: eeschema/toolbars_lib_view.cpp:128 gerbview/menubar.cpp:251
 #: kicad/menubar.cpp:163 pagelayout_editor/menubar.cpp:155
-#: pcbnew/menubar_footprint_editor.cpp:244 pcbnew/menubar_pcb_editor.cpp:455
+#: pcbnew/menubar_footprint_editor.cpp:246 pcbnew/menubar_pcb_editor.cpp:464
 #: pcbnew/toolbars_footprint_viewer.cpp:165
 msgid "&File"
 msgstr "文件 (&F)"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:223 cvpcb/menubar.cpp:85
-#: eeschema/libedit/menubar_libedit.cpp:171 eeschema/menubar.cpp:279
-#: pagelayout_editor/menubar.cpp:156 pcbnew/menubar_footprint_editor.cpp:245
-#: pcbnew/menubar_pcb_editor.cpp:456
+#: eeschema/libedit/menubar_libedit.cpp:178 eeschema/menubar.cpp:281
+#: pagelayout_editor/menubar.cpp:156 pcbnew/menubar_footprint_editor.cpp:247
+#: pcbnew/menubar_pcb_editor.cpp:465
 msgid "&Edit"
 msgstr "编辑 (&E)"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:224
-#: eeschema/libedit/menubar_libedit.cpp:172 eeschema/menubar.cpp:280
-#: eeschema/toolbars_lib_view.cpp:129 gerbview/menubar.cpp:250
+#: eeschema/libedit/menubar_libedit.cpp:179 eeschema/menubar.cpp:282
+#: eeschema/toolbars_lib_view.cpp:129 gerbview/menubar.cpp:252
 #: kicad/menubar.cpp:164 pagelayout_editor/menubar.cpp:157
-#: pcbnew/menubar_footprint_editor.cpp:246 pcbnew/menubar_pcb_editor.cpp:457
+#: pcbnew/menubar_footprint_editor.cpp:248 pcbnew/menubar_pcb_editor.cpp:466
 #: pcbnew/toolbars_footprint_viewer.cpp:166
 msgid "&View"
 msgstr "视图 (&V)"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:225 cvpcb/menubar.cpp:86
-#: gerbview/menubar.cpp:252 kicad/menubar.cpp:166
+#: gerbview/menubar.cpp:254 kicad/menubar.cpp:166
 msgid "&Preferences"
 msgstr "首选项 (&P)"
 
@@ -393,7 +393,7 @@ msgid "Show filled areas in zones"
 msgstr "显示覆铜填充区域"
 
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:68
-#: pcbnew/dialogs/dialog_plot_base.cpp:194
+#: pcbnew/dialogs/dialog_plot_base.cpp:216
 msgid "Subtract soldermask from silkscreen"
 msgstr "从丝印中减去阻焊"
 
@@ -463,7 +463,7 @@ msgstr "旋转增量："
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:152
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:59
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:342
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1288
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1362
 msgid "deg"
 msgstr "度"
 
@@ -488,7 +488,7 @@ msgid "Show copper thickness"
 msgstr "显示铜厚度"
 
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:320
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:449
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:428
 #: 3d-viewer/3d_viewer/tools/3d_actions.cpp:257
 msgid "Anti-aliasing"
 msgstr "抗锯齿"
@@ -542,60 +542,104 @@ msgid "Raytracing Render Options"
 msgstr "光线追踪渲染选项"
 
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:414
-msgid "Shadows"
-msgstr "阴影"
-
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:421
 msgid "Procedural textures"
 msgstr "过程纹理"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:428
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:421
 msgid "Add floor"
 msgstr "添加层"
 
 #: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:435
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:247
-msgid "Refractions"
-msgstr "折射"
-
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:442
-#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:252
-msgid "Reflections"
-msgstr "反射"
-
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:456
 #: 3d-viewer/3d_viewer/tools/3d_actions.cpp:262
 msgid "Post-processing"
 msgstr "后期处理"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:479
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:703
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:456
+msgid "Number of Samples"
+msgstr "样本数量"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:460
+msgid "Spread Factor %"
+msgstr "扩散系数 %"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:464
+msgid "Recursive Level"
+msgstr "递归级"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:471
+msgid "Shadows"
+msgstr "阴影"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:476
+msgid ""
+"Number of rays that will be cast, into light direction, to evaluate a shadow "
+"point"
+msgstr "将投射到灯光方向以计算阴影点的光线数"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:482
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:503
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:526
+msgid "Random direction factor of the cast rays"
+msgstr "投射光线的随机方向因子"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:492
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:252
+msgid "Reflections"
+msgstr "反射"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:497
+msgid "Number of rays that will be cast to evaluate a reflection point"
+msgstr "将投射以计算反射点的光线数"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:508
+msgid ""
+"Interactions number that a ray can travel through objects. (higher number of "
+"levels improve results, specially on very transparent boards)"
+msgstr ""
+"光线可以通过对象传播的交互作用数。(级别数量越多，结果越好，特别是在非常透明的"
+"板上)"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:515
+#: 3d-viewer/3d_viewer/tools/3d_actions.cpp:247
+msgid "Refractions"
+msgstr "折射"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:520
+msgid "Number of rays that will be cast to evaluate a refraction point"
+msgstr "将投射以计算折射点的光线数"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:531
+msgid "Number of bounces that a ray can hit reflective objects"
+msgstr "光线可以击中反射对象的反弹次数"
+
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:557
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:781
 msgid "Lights configuration"
 msgstr "灯光配置"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:487
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:565
 msgid "Ambient Camera Light"
 msgstr "环境光摄影机灯光"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:506
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:584
 msgid "Top Light"
 msgstr "顶灯"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:516
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:594
 msgid "Bottom Light"
 msgstr "底灯"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:540
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:557
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:618
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:635
 msgid "Elevation (degrees)"
 msgstr "海拔（度）"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:544
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:561
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:622
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:639
 msgid "Azimuth (degrees)"
 msgstr "方位角（度）"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:565
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:643
 #: pcbnew/dialogs/dialog_board_reannotate_base.cpp:214
 #: pcbnew/dialogs/dialog_create_array_base.cpp:93
 #: pcbnew/dialogs/dialog_create_array_base.cpp:163
@@ -604,14 +648,14 @@ msgstr "方位角（度）"
 #: pcbnew/dialogs/dialog_create_array_base.cpp:182
 #: pcbnew/dialogs/dialog_create_array_base.cpp:306
 #: pcbnew/dialogs/dialog_create_array_base.cpp:313
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1308
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1382
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:49
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:108
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:169
 msgid "1"
 msgstr "1"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:581
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:659
 #: pcbnew/dialogs/dialog_create_array_base.cpp:35
 #: pcbnew/dialogs/dialog_create_array_base.cpp:42
 #: pcbnew/dialogs/dialog_create_array_base.cpp:49
@@ -622,7 +666,7 @@ msgstr "1"
 msgid "5"
 msgstr "5"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:594
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:672
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:36
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:50
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:109
@@ -630,7 +674,7 @@ msgstr "5"
 msgid "2"
 msgstr "2"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:610
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:688
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:36
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:54
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:113
@@ -638,21 +682,21 @@ msgstr "2"
 msgid "6"
 msgstr "6"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:623
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:701
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:51
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:110
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:171
 msgid "3"
 msgstr "3"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:639
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:717
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:55
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:114
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:175
 msgid "7"
 msgstr "7"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:652
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:730
 #: pcbnew/dialogs/dialog_create_array_base.cpp:258
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:36
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:52
@@ -661,7 +705,7 @@ msgstr "7"
 msgid "4"
 msgstr "4"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:668
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:746
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:36
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:56
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:115
@@ -669,27 +713,27 @@ msgstr "4"
 msgid "8"
 msgstr "8"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:690
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp:768
 msgid "Reset to defaults"
 msgstr "重置为默认值"
 
-#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h:163
+#: 3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h:175
 msgid "3D Display Options"
 msgstr "3D 显示选项"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:326
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:323
 msgid "Background Color, Bottom"
 msgstr "背景下部颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:337
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:334
 msgid "Background Color, Top"
 msgstr "背景上部颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:757
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:795
 msgid "3D Image File Name"
 msgstr "3D 图像文件名称"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:778
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:816
 #, c-format
 msgid ""
 "Insufficient permissions required to save file\n"
@@ -698,38 +742,38 @@ msgstr ""
 "保存文件所需的权限不足。\n"
 "%s"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:779 common/confirm.cpp:124
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:817 common/confirm.cpp:124
 #: common/confirm.cpp:256 common/dialogs/panel_setup_severities.cpp:39
 #: kicad/tools/kicad_manager_control.cpp:174
 #: pcbnew/router/length_tuner_tool.cpp:174
 msgid "Error"
 msgstr "错误"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:810
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:848
 msgid "Failed to copy image to clipboard"
 msgstr "复制图像到剪贴板失败"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:821
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:859
 msgid "Can't save file"
 msgstr "无法保存文件"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:869
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:910
 msgid "Silkscreen Color"
 msgstr "丝印颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:899
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:940
 msgid "Solder Mask Color"
 msgstr "阻焊颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:919
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:965
 msgid "Copper Color"
 msgstr "铜箔颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:942
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:988
 msgid "Board Body Color"
 msgstr "电路板颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:960
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1010
 msgid "Solder Paste Color"
 msgstr "锡膏颜色"
 
@@ -1008,7 +1052,7 @@ msgstr "切换 ECO 层的显示"
 #: 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:501 eeschema/dialogs/dialog_edit_label_base.cpp:91
+#: common/eda_draw_frame.cpp:500 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
@@ -1035,7 +1079,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:718 pcb_calculator/UnitSelector.cpp:34
+#: pagelayout_editor/pl_editor_frame.cpp:714 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
@@ -1062,20 +1106,20 @@ msgstr "切换 ECO 层的显示"
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:427
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:438
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:467
-#: pcbnew/dialogs/dialog_plot_base.cpp:236
-#: pcbnew/dialogs/dialog_plot_base.cpp:289
+#: pcbnew/dialogs/dialog_plot_base.cpp:258
+#: pcbnew/dialogs/dialog_plot_base.cpp:311
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:74
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:91
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:77
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:187
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:203
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:217
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:231
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:245
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:284
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:298
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:337
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:351
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:191
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:207
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:221
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:235
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:249
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:288
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:302
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:341
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:355
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:58
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:73
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:95
@@ -1091,7 +1135,7 @@ msgstr "mm"
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:642
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:741
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:752
-#: pcbnew/dialogs/dialog_plot_base.cpp:351
+#: pcbnew/dialogs/dialog_plot_base.cpp:373
 msgid "Inch"
 msgstr "Inch"
 
@@ -1101,13 +1145,13 @@ msgstr "DPI"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:330
 #: eeschema/tools/sch_drawing_tools.cpp:355
-#: pagelayout_editor/pl_editor_frame.cpp:834
+#: pagelayout_editor/pl_editor_frame.cpp:830
 msgid "Choose Image"
 msgstr "选择图片"
 
 #: bitmap2component/bitmap2cmp_gui.cpp:331
 #: eeschema/tools/sch_drawing_tools.cpp:356
-#: pagelayout_editor/pl_editor_frame.cpp:835
+#: pagelayout_editor/pl_editor_frame.cpp:831
 msgid "Image Files "
 msgstr "图片文件 "
 
@@ -1148,7 +1192,7 @@ msgstr "为 potrace 位图分配内存时出错"
 #: eeschema/dialogs/dialog_erc_base.cpp:77 gerbview/files.cpp:363
 #: gerbview/files.cpp:478 gerbview/readgerb.cpp:72
 #: pcbnew/board_stackup_manager/panel_board_stackup.cpp:1064
-#: pcbnew/dialogs/dialog_drc_base.cpp:177
+#: pcbnew/dialogs/dialog_drc_base.cpp:160
 msgid "Errors"
 msgstr "错误"
 
@@ -1306,231 +1350,246 @@ msgstr ""
 msgid "Bitmap to Component Converter"
 msgstr "将位图转换成元件"
 
-#: common/base_struct.cpp:744
+#: common/base_struct.cpp:783
 msgid "Screen"
 msgstr "屏幕"
 
-#: common/base_struct.cpp:746 common/template_fieldnames.cpp:48
-#: eeschema/sch_component.cpp:1246 pcbnew/class_edge_mod.cpp:125
-#: pcbnew/class_pad.cpp:793 pcbnew/class_text_mod.cpp:289
+#: common/base_struct.cpp:785 common/template_fieldnames.cpp:48
+#: eeschema/sch_component.cpp:1373 pcbnew/class_edge_mod.cpp:125
+#: pcbnew/class_pad.cpp:802 pcbnew/class_text_mod.cpp:289
 #: pcbnew/dialogs/dialog_board_reannotate_base.cpp:132
 #: pcbnew/load_select_footprint.cpp:345
 msgid "Footprint"
 msgstr "封装"
 
-#: common/base_struct.cpp:747 pcbnew/class_pad.cpp:795
+#: common/base_struct.cpp:786 pcbnew/class_pad.cpp:804
 #: pcbnew/dialogs/dialog_board_statistics.cpp:484
 msgid "Pad"
 msgstr "焊盘"
 
-#: common/base_struct.cpp:748 common/page_layout/ws_draw_item.cpp:111
+#: common/base_struct.cpp:787 common/page_layout/ws_draw_item.cpp:111
 #: eeschema/pin_type.cpp:78 gerbview/gerber_draw_item.cpp:230
 #: pcbnew/class_board_item.cpp:37
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:144
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:58
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:76
 msgid "Line"
 msgstr "线"
 
-#: common/base_struct.cpp:749
+#: common/base_struct.cpp:788
 msgid "Board Text"
 msgstr "电路板文本"
 
-#: common/base_struct.cpp:750 pcbnew/widgets/appearance_controls.cpp:295
+#: common/base_struct.cpp:789 pcbnew/widgets/appearance_controls.cpp:340
 msgid "Footprint Text"
 msgstr "封装文本"
 
-#: common/base_struct.cpp:751
+#: common/base_struct.cpp:790
 msgid "Footprint Graphics"
 msgstr "封装图形"
 
-#: common/base_struct.cpp:752 pcbnew/class_track.cpp:649
+#: common/base_struct.cpp:791 pcbnew/class_track.cpp:619
 msgid "Track"
 msgstr "布线"
 
-#: common/base_struct.cpp:753 pcbnew/dialogs/dialog_board_statistics.cpp:484
+#: common/base_struct.cpp:792 pcbnew/class_track.cpp:681
+#: pcbnew/dialogs/dialog_board_statistics.cpp:484
 msgid "Via"
 msgstr "过孔"
 
-#: common/base_struct.cpp:754
+#: common/base_struct.cpp:793
 msgid "Board Marker"
 msgstr "电路板标记"
 
-#: common/base_struct.cpp:755 pcbnew/class_pcb_text.cpp:114
-msgid "Dimension"
-msgstr "尺寸"
+#: common/base_struct.cpp:794
+msgid "Aligned Dimension"
+msgstr "对齐标注"
 
-#: common/base_struct.cpp:756
+#: common/base_struct.cpp:795
+msgid "Orthogonal Dimension"
+msgstr "正交标注"
+
+#: common/base_struct.cpp:796
+msgid "Center Dimension"
+msgstr "中心标注"
+
+#: common/base_struct.cpp:797
+msgid "Leader"
+msgstr "引线"
+
+#: common/base_struct.cpp:798 pcbnew/class_pcb_target.cpp:122
 msgid "Target"
 msgstr "目标"
 
-#: common/base_struct.cpp:757
+#: common/base_struct.cpp:799
 msgid "Zone"
 msgstr "区域"
 
-#: common/base_struct.cpp:758
+#: common/base_struct.cpp:800
 msgid "Item List"
 msgstr "项目列表"
 
-#: common/base_struct.cpp:759
+#: common/base_struct.cpp:801
 msgid "Net Info"
 msgstr "网络信息"
 
-#: common/base_struct.cpp:760 pcbnew/class_pcb_group.cpp:282
-#: pcbnew/tools/pcb_actions.cpp:632
+#: common/base_struct.cpp:802 pcbnew/class_pcb_group.cpp:293
+#: pcbnew/tools/pcb_actions.cpp:647
 msgid "Group"
 msgstr "组"
 
-#: common/base_struct.cpp:762
+#: common/base_struct.cpp:804
 msgid "Schematic Marker"
 msgstr "原理图标记"
 
-#: common/base_struct.cpp:763 common/layer_id.cpp:94 eeschema/sch_junction.h:90
+#: common/base_struct.cpp:805 common/layer_id.cpp:108
+#: eeschema/sch_junction.h:90
 msgid "Junction"
 msgstr "连接点"
 
-#: common/base_struct.cpp:764
+#: common/base_struct.cpp:806
 msgid "No-Connect Flag"
 msgstr "不连接标志"
 
-#: common/base_struct.cpp:765
+#: common/base_struct.cpp:807
 msgid "Wire Entry"
 msgstr "连接线入口"
 
-#: common/base_struct.cpp:766
+#: common/base_struct.cpp:808
 msgid "Bus Entry"
 msgstr "总线入口"
 
-#: common/base_struct.cpp:767
+#: common/base_struct.cpp:809
 msgid "Graphic Line"
 msgstr "图形线"
 
-#: common/base_struct.cpp:768 eeschema/sch_bitmap.cpp:201
+#: common/base_struct.cpp:810 eeschema/sch_bitmap.cpp:201
 msgid "Bitmap"
 msgstr "位图"
 
-#: common/base_struct.cpp:769
+#: common/base_struct.cpp:811
 msgid "Schematic Text"
 msgstr "原理图文本"
 
-#: common/base_struct.cpp:770
+#: common/base_struct.cpp:812
 msgid "Net Label"
 msgstr "网络标签"
 
-#: common/base_struct.cpp:771 eeschema/sch_text.cpp:627
+#: common/base_struct.cpp:813 eeschema/sch_text.cpp:628
 msgid "Global Label"
 msgstr "全局标签"
 
-#: common/base_struct.cpp:772 eeschema/sch_text.cpp:628
+#: common/base_struct.cpp:814 eeschema/sch_text.cpp:629
 msgid "Hierarchical Label"
 msgstr "层次标签"
 
-#: common/base_struct.cpp:773
+#: common/base_struct.cpp:815
 msgid "Schematic Field"
 msgstr "原理图字段"
 
-#: common/base_struct.cpp:774
+#: common/base_struct.cpp:816
 msgid "Component"
 msgstr "元件"
 
-#: common/base_struct.cpp:775
+#: common/base_struct.cpp:817
 msgid "Sheet Pin"
 msgstr "图框引脚"
 
-#: common/base_struct.cpp:776 eeschema/dialogs/dialog_migrate_buses.cpp:101
-#: pcbnew/tools/pcb_actions.cpp:1144
+#: common/base_struct.cpp:818 eeschema/dialogs/dialog_migrate_buses.cpp:101
+#: pcbnew/tools/pcb_actions.cpp:1183
 msgid "Sheet"
 msgstr "图框"
 
-#: common/base_struct.cpp:778
+#: common/base_struct.cpp:820
 msgid "Field Locate Reference"
 msgstr "字段定位位号"
 
-#: common/base_struct.cpp:779
+#: common/base_struct.cpp:821
 msgid "Field Locate Value"
 msgstr "字段定位值"
 
-#: common/base_struct.cpp:780
+#: common/base_struct.cpp:822
 msgid "Field Locate Footprint"
 msgstr "字段定位封装"
 
-#: common/base_struct.cpp:782
+#: common/base_struct.cpp:824
 msgid "SCH Screen"
 msgstr "原理图屏幕"
 
-#: common/base_struct.cpp:784
+#: common/base_struct.cpp:826
 #: 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:785 common/dialogs/dialog_configure_paths_base.cpp:92
+#: common/base_struct.cpp:827 common/dialogs/dialog_configure_paths_base.cpp:92
 msgid "Alias"
 msgstr "别名"
 
-#: common/base_struct.cpp:786 eeschema/lib_arc.h:70
+#: common/base_struct.cpp:828 eeschema/lib_arc.h:70
 #: gerbview/gerber_draw_item.cpp:233 pcbnew/class_board_item.cpp:39
 #: pcbnew/class_drawsegment.cpp:475
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:114
-#: pcbnew/dialogs/dialog_pad_properties.cpp:731
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1994
+#: pcbnew/dialogs/dialog_pad_properties.cpp:719
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2026
 msgid "Arc"
 msgstr "弧"
 
-#: common/base_struct.cpp:787 eeschema/lib_circle.h:53
+#: common/base_struct.cpp:829 eeschema/lib_circle.h:53
 #: gerbview/gerber_draw_item.cpp:236 pcbnew/class_board_item.cpp:40
-#: pcbnew/class_drawsegment.cpp:468 pcbnew/class_pad.cpp:1029
-#: pcbnew/class_pad.cpp:1329
+#: pcbnew/class_drawsegment.cpp:468 pcbnew/class_pad.cpp:1038
+#: pcbnew/class_pad.cpp:1338
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:43
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:137
 msgid "Circle"
 msgstr "圆形"
 
-#: common/base_struct.cpp:788
+#: common/base_struct.cpp:830
 msgid "Symbol Text"
 msgstr "符号文本"
 
-#: common/base_struct.cpp:789 common/page_layout/ws_draw_item.cpp:115
+#: common/base_struct.cpp:831 common/page_layout/ws_draw_item.cpp:115
 #: eeschema/lib_rectangle.h:54 pcbnew/class_drawsegment.cpp:498
-#: pcbnew/class_pad.cpp:1330
+#: pcbnew/class_pad.cpp:1339
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:43
 msgid "Rectangle"
 msgstr "矩形"
 
-#: common/base_struct.cpp:790
+#: common/base_struct.cpp:832
 msgid "Polyline"
 msgstr "多段线"
 
-#: common/base_struct.cpp:791 eeschema/lib_bezier.h:54
+#: common/base_struct.cpp:833 eeschema/lib_bezier.h:54
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:101
-#: pcbnew/dialogs/dialog_pad_properties.cpp:725
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1994
+#: pcbnew/dialogs/dialog_pad_properties.cpp:713
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2026
 msgid "Bezier"
 msgstr "贝塞尔曲线"
 
-#: common/base_struct.cpp:792 common/layer_id.cpp:107 eeschema/lib_pin.h:122
-#: eeschema/sch_pin.cpp:141
+#: common/base_struct.cpp:834 common/layer_id.cpp:121 eeschema/lib_pin.h:122
+#: eeschema/sch_pin.cpp:145
 msgid "Pin"
 msgstr "引脚"
 
-#: common/base_struct.cpp:793
+#: common/base_struct.cpp:835
 msgid "Symbol Field"
 msgstr "符号字段"
 
-#: common/base_struct.cpp:795
+#: common/base_struct.cpp:837
 msgid "Gerber Layout"
 msgstr "Gerber 布局"
 
-#: common/base_struct.cpp:796
+#: common/base_struct.cpp:838
 msgid "Draw Item"
 msgstr "绘制项目"
 
-#: common/base_struct.cpp:797 common/page_layout/ws_draw_item.cpp:128
-#: eeschema/sch_bitmap.h:133
+#: common/base_struct.cpp:839 common/page_layout/ws_draw_item.cpp:128
+#: common/page_layout/ws_draw_item.cpp:431 eeschema/sch_bitmap.h:133
 msgid "Image"
 msgstr "图片"
 
 #: common/base_units.cpp:508 eeschema/dialogs/dialog_junction_props_base.cpp:34
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:101
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:108
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:137
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:148
 #: eeschema/dialogs/panel_libedit_settings_base.cpp:36
@@ -1581,6 +1640,9 @@ msgstr "cu. mm"
 
 #: common/base_units.cpp:546
 #: eeschema/dialogs/panel_setup_formatting_base.cpp:71
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:528
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:548
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:568
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:391
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:295
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:163
@@ -1630,8 +1692,8 @@ msgstr "问题"
 #: common/confirm.cpp:123 common/confirm.cpp:244
 #: common/dialogs/panel_setup_severities.cpp:39
 #: eeschema/dialogs/panel_eeschema_color_settings.cpp:153
-#: eeschema/libedit/libedit.cpp:570 eeschema/libedit/symbedit.cpp:96
-#: eeschema/sheet.cpp:624 pcbnew/dialogs/dialog_export_vrml.cpp:183
+#: eeschema/libedit/libedit.cpp:605 eeschema/libedit/symbedit.cpp:96
+#: eeschema/sheet.cpp:623 pcbnew/dialogs/dialog_export_vrml.cpp:183
 #: pcbnew/import_gfx/dialog_import_gfx.cpp:300 pcbnew/pcb_parser.cpp:656
 msgid "Warning"
 msgstr "警告"
@@ -1641,8 +1703,8 @@ msgid "If you don't save, all your changes will be permanently lost."
 msgstr "如果你不保存，你的所有更改将永久丢失。"
 
 #: common/confirm.cpp:155 common/confirm.cpp:182 common/tool/actions.cpp:65
-#: eeschema/libedit/libedit.cpp:432 eeschema/widgets/tuner_slider_base.cpp:66
-#: pcbnew/footprint_libraries_utils.cpp:890
+#: eeschema/libedit/libedit.cpp:467 eeschema/widgets/tuner_slider_base.cpp:66
+#: pcbnew/footprint_libraries_utils.cpp:876
 msgid "Save"
 msgstr "保存"
 
@@ -1664,7 +1726,8 @@ msgstr "恢复"
 
 #: common/confirm.cpp:195 common/tool/actions.cpp:120
 #: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:187
-#: pcbnew/microwave/microwave_polygon.cpp:125 pcbnew/pcb_parser.cpp:659
+#: pcbnew/dialogs/dialog_drc.cpp:224 pcbnew/microwave/microwave_polygon.cpp:125
+#: pcbnew/pcb_parser.cpp:659
 msgid "Cancel"
 msgstr "取消"
 
@@ -1675,25 +1738,26 @@ msgstr "信息"
 #: common/confirm.cpp:285 eeschema/libedit/lib_export.cpp:156
 #: eeschema/tools/lib_pin_tool.cpp:211 kicad/import_project.cpp:92
 #: kicad/tools/kicad_manager_control.cpp:258
-#: pcbnew/dialogs/dialog_export_idf.cpp:165
+#: pcbnew/dialogs/dialog_export_idf.cpp:162
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:120
 #: pcbnew/dialogs/dialog_track_via_properties.cpp:353
-#: pcbnew/footprint_libraries_utils.cpp:446
-#: pcbnew/footprint_libraries_utils.cpp:962 pcbnew/router/router_tool.cpp:1216
-#: pcbnew/router/router_tool.cpp:1397 pcbnew/router/router_tool.cpp:1553
-#: pcbnew/zone_filler.cpp:314
+#: pcbnew/footprint_libraries_utils.cpp:445
+#: pcbnew/footprint_libraries_utils.cpp:948 pcbnew/router/router_tool.cpp:1213
+#: pcbnew/router/router_tool.cpp:1394 pcbnew/router/router_tool.cpp:1550
+#: pcbnew/zone_filler.cpp:414
 msgid "Confirmation"
 msgstr "确认"
 
 #: common/dialog_about/AboutDialog_main.cpp:114
 #: common/dialogs/dialog_configure_paths_base.cpp:94
-#: common/lib_tree_model_adapter.cpp:275 eeschema/lib_view_frame.cpp:361
-#: eeschema/libedit/libedit.cpp:420 eeschema/libedit/symbedit.cpp:241
-#: eeschema/sch_component.cpp:1249 include/lib_table_grid.h:189
+#: common/lib_tree_model_adapter.cpp:275
+#: common/widgets/widget_hotkey_list.cpp:458 eeschema/lib_view_frame.cpp:360
+#: eeschema/libedit/libedit.cpp:455 eeschema/libedit/symbedit.cpp:241
+#: eeschema/sch_component.cpp:1376 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:878
-#: pcbnew/footprint_libraries_utils.cpp:1114
+#: pcbnew/footprint_libraries_utils.cpp:864
+#: pcbnew/footprint_libraries_utils.cpp:1100
 msgid "Description"
 msgstr "描述"
 
@@ -1841,7 +1905,7 @@ msgstr "复制 KiCad 版本信息到剪贴板"
 msgid "&Report Bug"
 msgstr "报告 Bug (&R)"
 
-#: common/dialog_about/dialog_about_base.cpp:64 common/tool/actions.cpp:623
+#: common/dialog_about/dialog_about_base.cpp:64 common/tool/actions.cpp:616
 msgid "Report a problem with KiCad"
 msgstr "报告 KiCad 的问题"
 
@@ -1849,6 +1913,10 @@ msgstr "报告 KiCad 的问题"
 msgid "&OK"
 msgstr "确定 (&O)"
 
+#: common/dialogs/dialog_HTML_reporter_base.h:46
+msgid "Report"
+msgstr "报告"
+
 #: common/dialogs/dialog_color_picker.cpp:83
 msgid "Clear Color"
 msgstr "透明颜色"
@@ -1888,7 +1956,9 @@ msgstr "饱和度："
 #: common/dialogs/dialog_color_picker_base.cpp:114
 #: eeschema/dialogs/dialog_spice_model_base.cpp:45
 #: eeschema/dialogs/dialog_spice_model_base.cpp:637
-#: pcbnew/dialogs/dialog_text_properties.cpp:110
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:27
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:94
+#: pcbnew/dialogs/dialog_text_properties.cpp:81
 msgid "Value:"
 msgstr "值："
 
@@ -1913,27 +1983,27 @@ msgstr "预览 (旧/新)："
 msgid "Reset to Default"
 msgstr "重置为默认值"
 
-#: common/dialogs/dialog_configure_paths.cpp:241
-#: common/dialogs/dialog_configure_paths.cpp:311
+#: common/dialogs/dialog_configure_paths.cpp:247
+#: common/dialogs/dialog_configure_paths.cpp:317
 msgid "Environment variable name cannot be empty."
 msgstr "环境变量名称不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:249
-#: common/dialogs/dialog_configure_paths.cpp:313
+#: common/dialogs/dialog_configure_paths.cpp:255
+#: common/dialogs/dialog_configure_paths.cpp:319
 msgid "Environment variable path cannot be empty."
 msgstr "环境变量路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:276
-#: common/dialogs/dialog_configure_paths.cpp:318
+#: common/dialogs/dialog_configure_paths.cpp:282
+#: common/dialogs/dialog_configure_paths.cpp:324
 msgid "3D search path alias cannot be empty."
 msgstr "3D 搜索路径别名不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:284
-#: common/dialogs/dialog_configure_paths.cpp:320
+#: common/dialogs/dialog_configure_paths.cpp:290
+#: common/dialogs/dialog_configure_paths.cpp:326
 msgid "3D search path cannot be empty."
 msgstr "3D 搜索路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:333
+#: common/dialogs/dialog_configure_paths.cpp:339
 msgid ""
 "This path was defined  externally to the running process and\n"
 "will only be temporarily overwritten."
@@ -1941,7 +2011,7 @@ msgstr ""
 "此路径是在运行进程外部定义的\n"
 "只会被暂时覆盖。"
 
-#: common/dialogs/dialog_configure_paths.cpp:335
+#: common/dialogs/dialog_configure_paths.cpp:341
 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"
@@ -1954,21 +2024,21 @@ msgstr ""
 "如果你不想这样, 请重命名任何冲突\n"
 "的条目或删除系统中的外部环境变量。"
 
-#: common/dialogs/dialog_configure_paths.cpp:350
+#: common/dialogs/dialog_configure_paths.cpp:356
 #, c-format
 msgid "The name %s is reserved, and cannot be used here"
 msgstr "名称 %s 是保留的，不能在此处使用"
 
-#: common/dialogs/dialog_configure_paths.cpp:486
+#: common/dialogs/dialog_configure_paths.cpp:492
 msgid "File Browser..."
 msgstr "文件浏览器..."
 
-#: common/dialogs/dialog_configure_paths.cpp:489
-#: common/widgets/grid_text_button_helpers.cpp:354
+#: common/dialogs/dialog_configure_paths.cpp:495
+#: common/widgets/grid_text_button_helpers.cpp:374
 msgid "Select Path"
 msgstr "选择路径"
 
-#: common/dialogs/dialog_configure_paths.cpp:569
+#: common/dialogs/dialog_configure_paths.cpp:575
 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.  "
@@ -1979,7 +2049,7 @@ msgstr ""
 "为每个环境变量输入名称和路径。灰色条目为系统或用户级外部定义的名称。在系统或"
 "用户级定义的环境变量优先于该表中定义。这意味着该表中的值将被忽略。"
 
-#: common/dialogs/dialog_configure_paths.cpp:575
+#: common/dialogs/dialog_configure_paths.cpp:581
 msgid ""
 "To ensure environment variable names are valid on all platforms, the name "
 "field will only accept upper case letters, digits, and the underscore "
@@ -1988,7 +2058,7 @@ msgstr ""
 "为了确保环境变量名称在所有平台上有效的，名称字段只接受大写字母，数字和下划线"
 "字符。"
 
-#: common/dialogs/dialog_configure_paths.cpp:590
+#: common/dialogs/dialog_configure_paths.cpp:596
 msgid "Environment Variable Help"
 msgstr "环境变量帮助"
 
@@ -2000,23 +2070,21 @@ msgstr "环境变量"
 #: 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
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:53
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:62
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:45
-#: eeschema/dialogs/dialog_sch_pin_table.cpp:99
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:39
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:50
 #: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:43
-#: eeschema/dialogs/panel_sym_lib_table.cpp:301
-#: eeschema/fields_grid_table.cpp:195 eeschema/lib_pin.cpp:984
-#: eeschema/lib_view_frame.cpp:359 eeschema/libedit/symbedit.cpp:213
-#: eeschema/sch_component.cpp:1217 eeschema/sch_component.cpp:1264
-#: eeschema/sch_pin.cpp:159 eeschema/widgets/tuner_slider_base.cpp:20
-#: pcbnew/class_pad.cpp:1344 pcbnew/class_zone.cpp:665
-#: pcbnew/class_zone.cpp:1381
+#: eeschema/dialogs/panel_sym_lib_table.cpp:314
+#: eeschema/fields_grid_table.cpp:195 eeschema/lib_pin.cpp:1003
+#: eeschema/lib_view_frame.cpp:358 eeschema/libedit/symbedit.cpp:213
+#: eeschema/sch_component.cpp:1344 eeschema/sch_component.cpp:1386
+#: eeschema/sch_pin.cpp:163 eeschema/widgets/tuner_slider_base.cpp:20
+#: pcbnew/class_pad.cpp:1363 pcbnew/class_zone.cpp:611
+#: pcbnew/class_zone.cpp:1366
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:43
 #: pcbnew/dialogs/dialog_select_net_from_list.cpp:55
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:451
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:456
 #: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:38
 msgid "Name"
 msgstr "名称"
@@ -2120,13 +2188,14 @@ msgstr "选择文件"
 msgid "Configure Global Library Table"
 msgstr "配置全局库表"
 
-#: common/dialogs/dialog_grid_settings_base.cpp:26 common/tool/actions.cpp:436
+#: common/dialogs/dialog_grid_settings_base.cpp:26 common/tool/actions.cpp:441
 #: pcbnew/dialogs/panel_pcbnew_display_origin_base.cpp:23
 msgid "Grid Origin"
 msgstr "网格原点"
 
 #: common/dialogs/dialog_grid_settings_base.cpp:63
 #: common/dialogs/dialog_grid_settings_base.cpp:78
+#: pcbnew/dialogs/dialog_drc_base.cpp:88 pcbnew/dialogs/dialog_drc_base.cpp:140
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:115
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:147
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:184
@@ -2134,6 +2203,14 @@ msgstr "网格原点"
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:300
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:684
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:706
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:864
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:876
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:888
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:897
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:909
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:921
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:933
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:945
 #: pcbnew/dialogs/panel_display_options_base.cpp:28
 #: pcbnew/dialogs/panel_display_options_base.cpp:97
 #: pcbnew/dialogs/panel_edit_options_base.cpp:80
@@ -2174,7 +2251,7 @@ msgstr "(快捷键)"
 msgid "Grid 2:"
 msgstr "网格 2："
 
-#: common/dialogs/dialog_grid_settings_base.cpp:173 common/tool/actions.cpp:442
+#: common/dialogs/dialog_grid_settings_base.cpp:173 common/tool/actions.cpp:447
 msgid "Reset Grid Origin"
 msgstr "复位网格原点"
 
@@ -2366,8 +2443,9 @@ msgstr "虚拟文本"
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:115
 #: eeschema/dialogs/dialog_pin_properties_base.cpp:104
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:291
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:285
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:126
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:179
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:154
 msgid "Orientation:"
 msgstr "方向："
 
@@ -2377,7 +2455,8 @@ msgstr "自定义图框尺寸："
 
 #: common/dialogs/dialog_page_settings_base.cpp:67
 #: pcbnew/dialogs/dialog_board_statistics.cpp:96
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:143
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:246
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:118
 msgid "Height:"
 msgstr "高度："
 
@@ -2393,8 +2472,14 @@ msgstr "自定义图框高度。"
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:102
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:132
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:162
-#: pcbnew/dialogs/dialog_drc_base.cpp:42 pcbnew/dialogs/dialog_drc_base.cpp:57
-#: pcbnew/dialogs/dialog_drc_base.cpp:72
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:226
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:242
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:255
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:268
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:281
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:360
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:374
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:389
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:121
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:132
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:352
@@ -2416,42 +2501,45 @@ msgstr "自定义图框高度。"
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:118
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:129
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:163
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1072
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1083
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1098
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1109
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1124
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1135
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1150
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1161
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1175
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1146
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1157
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1172
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1183
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:1198
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1263
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1274
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1439
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1209
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1224
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1235
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1249
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1272
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1337
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1348
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1513
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:76
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:105
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:116
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:127
 #: pcbnew/dialogs/dialog_target_properties_base.cpp:35
 #: pcbnew/dialogs/dialog_target_properties_base.cpp:46
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:133
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:152
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:175
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:201
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:222
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:241
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:108
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:127
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:150
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:176
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:197
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:216
 #: pcbnew/dialogs/dialog_track_via_size_base.cpp:32
 #: pcbnew/dialogs/dialog_track_via_size_base.cpp:43
 #: pcbnew/dialogs/dialog_track_via_size_base.cpp:54
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:144
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:160
 msgid "unit"
 msgstr "单位"
 
 #: common/dialogs/dialog_page_settings_base.cpp:88
 #: eeschema/dialogs/dialog_edit_line_style_base.cpp:31
 #: pcbnew/dialogs/dialog_board_statistics.cpp:94
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:217
 #: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:25
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:124
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:99
 msgid "Width:"
 msgstr "宽度："
 
@@ -2571,8 +2659,8 @@ msgstr "打印预览"
 
 #: common/dialogs/dialog_print_generic.cpp:44
 #: eeschema/dialogs/dialog_annotate.cpp:102 eeschema/dialogs/dialog_bom.cpp:239
-#: eeschema/dialogs/dialog_change_symbols.cpp:112
-#: eeschema/dialogs/dialog_erc.cpp:78 eeschema/dialogs/dialog_netlist.cpp:312
+#: eeschema/dialogs/dialog_change_symbols.cpp:143
+#: eeschema/dialogs/dialog_erc.cpp:79 eeschema/dialogs/dialog_netlist.cpp:312
 #: eeschema/dialogs/dialog_plot_schematic.cpp:58
 #: eeschema/dialogs/dialog_print_using_printer.cpp:148
 #: eeschema/dialogs/dialog_schematic_find_base.cpp:130
@@ -2580,11 +2668,11 @@ msgstr "打印预览"
 #: eeschema/dialogs/dialog_update_from_pcb.cpp:66
 #: pcbnew/dialogs/dialog_board_reannotate.cpp:119
 #: pcbnew/dialogs/dialog_board_statistics.cpp:126
-#: pcbnew/dialogs/dialog_drc.cpp:77
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:154
+#: pcbnew/dialogs/dialog_drc.cpp:80 pcbnew/dialogs/dialog_drc.cpp:242
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:167
 #: pcbnew/dialogs/dialog_export_step.cpp:129
-#: pcbnew/dialogs/dialog_export_svg.cpp:94
-#: pcbnew/dialogs/dialog_gendrill.cpp:76 pcbnew/dialogs/dialog_netlist.cpp:93
+#: pcbnew/dialogs/dialog_export_svg.cpp:93
+#: pcbnew/dialogs/dialog_gendrill.cpp:74 pcbnew/dialogs/dialog_netlist.cpp:90
 #: pcbnew/dialogs/dialog_plot.cpp:62 pcbnew/dialogs/dialog_update_pcb.cpp:74
 #: pcbnew/exporters/gen_footprints_placefile.cpp:68
 msgid "Close"
@@ -2692,7 +2780,7 @@ msgid "Page Setup..."
 msgstr "图框设置..."
 
 #: common/dialogs/dialog_text_entry_base.cpp:22
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1466
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1540
 msgid "MyLabel"
 msgstr "我的标签"
 
@@ -2714,32 +2802,32 @@ msgstr "视图预设切换器"
 msgid "Reveal Themes in Finder"
 msgstr "在筛选器中显示主题"
 
-#: common/dialogs/panel_color_settings.cpp:110
+#: common/dialogs/panel_color_settings.cpp:129
 msgid "New theme name:"
 msgstr "新主题名称："
 
-#: common/dialogs/panel_color_settings.cpp:110
+#: common/dialogs/panel_color_settings.cpp:129
 msgid "Add Color Theme"
 msgstr "添加颜色主题"
 
-#: common/dialogs/panel_color_settings.cpp:122
+#: common/dialogs/panel_color_settings.cpp:141
 msgid "Theme already exists!"
 msgstr "主题已存在！"
 
-#: common/dialogs/panel_color_settings.cpp:174
-#: common/dialogs/panel_color_settings.cpp:191
+#: common/dialogs/panel_color_settings.cpp:198
+#: common/dialogs/panel_color_settings.cpp:215
 msgid "New Theme..."
 msgstr "新主题..."
 
-#: common/dialogs/panel_color_settings.cpp:246
+#: common/dialogs/panel_color_settings.cpp:270
 msgid "Copy color"
 msgstr "复制颜色"
 
-#: common/dialogs/panel_color_settings.cpp:249
+#: common/dialogs/panel_color_settings.cpp:273
 msgid "Paste color"
 msgstr "粘贴颜色"
 
-#: common/dialogs/panel_color_settings.cpp:252
+#: common/dialogs/panel_color_settings.cpp:276
 msgid "Revert to saved color"
 msgstr "恢复为已保存的颜色"
 
@@ -2753,25 +2841,21 @@ msgstr "将此主题中的所有颜色重置为 KiCad 默认值"
 msgid "Theme:"
 msgstr "主题："
 
-#: common/dialogs/panel_color_settings_base.cpp:23
-msgid "User"
-msgstr "用户"
-
-#: common/dialogs/panel_color_settings_base.cpp:34
+#: common/dialogs/panel_color_settings_base.cpp:33
 msgid "Override individual item colors"
 msgstr "覆盖单个项目的颜色"
 
-#: common/dialogs/panel_color_settings_base.cpp:35
+#: common/dialogs/panel_color_settings_base.cpp:34
 msgid ""
 "Show all items in their default color even if they have specific colors set "
 "in their properties."
 msgstr "即使属性中设置了特定的颜色，也要以默认颜色显示所有项目。"
 
-#: common/dialogs/panel_color_settings_base.cpp:42
+#: common/dialogs/panel_color_settings_base.cpp:41
 msgid "Open Theme Folder"
 msgstr "打开主题文件夹"
 
-#: common/dialogs/panel_color_settings_base.cpp:43
+#: common/dialogs/panel_color_settings_base.cpp:42
 msgid "Open the folder containing color themes"
 msgstr "打开包含颜色主题的文件夹"
 
@@ -2804,11 +2888,11 @@ msgstr ""
 "\n"
 "在某些平台上，自动值不正确，应手动设置。"
 
-#: common/dialogs/panel_common_settings.cpp:274
+#: common/dialogs/panel_common_settings.cpp:281
 msgid "Executable files ("
 msgstr "可执行文件 ("
 
-#: common/dialogs/panel_common_settings.cpp:279
+#: common/dialogs/panel_common_settings.cpp:286
 msgid "Select Preferred PDF Browser"
 msgstr "选择默认 PDF 浏览器"
 
@@ -2825,7 +2909,7 @@ msgstr ""
 "如果设置为 0，则禁用自动备份"
 
 #: common/dialogs/panel_common_settings_base.cpp:39
-#: common/dialogs/panel_common_settings_base.cpp:258
+#: common/dialogs/panel_common_settings_base.cpp:253
 msgid "minutes"
 msgstr "分钟"
 
@@ -2850,7 +2934,7 @@ msgid "Accelerated graphics:"
 msgstr "硬件加速图形："
 
 #: common/dialogs/panel_common_settings_base.cpp:73
-#: common/dialogs/panel_common_settings_base.cpp:84
+#: common/dialogs/panel_common_settings_base.cpp:83
 msgid "No Antialiasing"
 msgstr "无抗锯齿"
 
@@ -2870,162 +2954,164 @@ msgstr "超级采样 (2x)"
 msgid "Supersampling (4x)"
 msgstr "超级采样 (4x)"
 
-#: common/dialogs/panel_common_settings_base.cpp:80
+#: common/dialogs/panel_common_settings_base.cpp:79
 msgid "Fallback graphics:"
 msgstr "软件加速图形："
 
-#: common/dialogs/panel_common_settings_base.cpp:84
+#: common/dialogs/panel_common_settings_base.cpp:83
 msgid "Fast Antialiasing"
 msgstr "快速抗锯齿"
 
-#: common/dialogs/panel_common_settings_base.cpp:84
+#: common/dialogs/panel_common_settings_base.cpp:83
 msgid "Balanced Antialiasing"
 msgstr "均衡抗锯齿"
 
-#: common/dialogs/panel_common_settings_base.cpp:84
+#: common/dialogs/panel_common_settings_base.cpp:83
 msgid "High Quality Antialiasing"
 msgstr "高品质抗锯齿"
 
-#: common/dialogs/panel_common_settings_base.cpp:90
+#: common/dialogs/panel_common_settings_base.cpp:89
 msgid "3D cache file duration:"
 msgstr "3D 缓存文件持续时间："
 
-#: common/dialogs/panel_common_settings_base.cpp:100
+#: common/dialogs/panel_common_settings_base.cpp:99
 msgid "Helper Applications"
 msgstr "应用程序助手"
 
-#: common/dialogs/panel_common_settings_base.cpp:109
+#: common/dialogs/panel_common_settings_base.cpp:108
 msgid "Text editor:"
 msgstr "文本编辑器："
 
-#: common/dialogs/panel_common_settings_base.cpp:121
+#: common/dialogs/panel_common_settings_base.cpp:120
 msgid "System default PDF viewer"
 msgstr "系统默认 PDF 浏览器"
 
-#: common/dialogs/panel_common_settings_base.cpp:124
+#: common/dialogs/panel_common_settings_base.cpp:123
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:175
 msgid "Other:"
 msgstr "其它："
 
-#: common/dialogs/panel_common_settings_base.cpp:144
+#: common/dialogs/panel_common_settings_base.cpp:143
 msgid "User Interface"
 msgstr "用户界面"
 
-#: common/dialogs/panel_common_settings_base.cpp:152
+#: common/dialogs/panel_common_settings_base.cpp:150
 msgid "Icon scale:"
 msgstr "图标缩放："
 
-#: common/dialogs/panel_common_settings_base.cpp:161
-#: common/dialogs/panel_common_settings_base.cpp:172
+#: common/dialogs/panel_common_settings_base.cpp:159
+#: common/dialogs/panel_common_settings_base.cpp:170
 #: common/dialogs/panel_mouse_settings_base.cpp:56
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:120
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:87
 msgid "Automatic"
 msgstr "自动"
 
-#: common/dialogs/panel_common_settings_base.cpp:164
+#: common/dialogs/panel_common_settings_base.cpp:162
 msgid "Canvas scale:"
 msgstr "画布缩放："
 
-#: common/dialogs/panel_common_settings_base.cpp:181
+#: common/dialogs/panel_common_settings_base.cpp:173
 msgid "Show icons in menus"
 msgstr "在菜单中显示图标"
 
-#: common/dialogs/panel_common_settings_base.cpp:197
+#: common/dialogs/panel_common_settings_base.cpp:192
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:41
 msgid "Editing"
 msgstr "编辑"
 
-#: common/dialogs/panel_common_settings_base.cpp:199
+#: common/dialogs/panel_common_settings_base.cpp:194
 msgid "Prefer selection to dragging"
 msgstr "优先选择拖动"
 
-#: common/dialogs/panel_common_settings_base.cpp:202
+#: common/dialogs/panel_common_settings_base.cpp:197
 msgid "Warp mouse to origin of moved object"
 msgstr "将鼠标扭曲到移动对象的原点"
 
-#: common/dialogs/panel_common_settings_base.cpp:205
+#: common/dialogs/panel_common_settings_base.cpp:200
 msgid "First hotkey selects tool"
 msgstr "第一个热键选择工具"
 
-#: common/dialogs/panel_common_settings_base.cpp:206
+#: common/dialogs/panel_common_settings_base.cpp:201
 msgid ""
 "If not checked, hotkeys will immediately perform an action even if the "
 "relevant tool was not previously selected."
 msgstr "如果未选中，热键将立即执行操作，即使之前未选择相关工具也是如此。"
 
-#: common/dialogs/panel_common_settings_base.cpp:214
+#: common/dialogs/panel_common_settings_base.cpp:209
 msgid "Project Backup"
 msgstr "工程备份"
 
-#: common/dialogs/panel_common_settings_base.cpp:221
+#: common/dialogs/panel_common_settings_base.cpp:216
 msgid "Automatically backup projects"
 msgstr "自动备份工程"
 
-#: common/dialogs/panel_common_settings_base.cpp:222
+#: common/dialogs/panel_common_settings_base.cpp:217
 msgid ""
 "Automatically create backup archives of the current project when saving files"
 msgstr "保存文件时自动创建当前项目的备份压缩"
 
-#: common/dialogs/panel_common_settings_base.cpp:226
+#: common/dialogs/panel_common_settings_base.cpp:221
 msgid "Create backups when auto save occurs"
 msgstr "在进行自动保存时创建备份"
 
-#: common/dialogs/panel_common_settings_base.cpp:227
+#: common/dialogs/panel_common_settings_base.cpp:222
 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:231
+#: common/dialogs/panel_common_settings_base.cpp:226
 msgid "Maximum backups to keep:"
 msgstr "保留的最大备份数："
 
-#: common/dialogs/panel_common_settings_base.cpp:233
+#: common/dialogs/panel_common_settings_base.cpp:228
 msgid "How many backup files total to keep (set to 0 for no limit)"
 msgstr "总共要保留多少个备份文件(设置为 0 表示没有限制)"
 
-#: common/dialogs/panel_common_settings_base.cpp:240
+#: common/dialogs/panel_common_settings_base.cpp:235
 msgid "Maximum backups per day:"
 msgstr "每天最大备份数："
 
-#: common/dialogs/panel_common_settings_base.cpp:242
+#: common/dialogs/panel_common_settings_base.cpp:237
 msgid "How many backup files to keep each day (set to 0 for no limit)"
 msgstr "每天要保留多少个备份文件(设置为 0 表示没有限制)"
 
-#: common/dialogs/panel_common_settings_base.cpp:249
+#: common/dialogs/panel_common_settings_base.cpp:244
 msgid "Minimum time between backups:"
 msgstr "备份之间的最短时间："
 
-#: common/dialogs/panel_common_settings_base.cpp:251
+#: common/dialogs/panel_common_settings_base.cpp:246
 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:262
+#: common/dialogs/panel_common_settings_base.cpp:257
 msgid "Maximum total backup size:"
 msgstr "最大总备份大小："
 
-#: common/dialogs/panel_common_settings_base.cpp:264
+#: common/dialogs/panel_common_settings_base.cpp:259
 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:271
+#: common/dialogs/panel_common_settings_base.cpp:266
 msgid "MB"
 msgstr "MB"
 
-#: common/dialogs/panel_common_settings_base.cpp:282
+#: common/dialogs/panel_common_settings_base.cpp:277
 msgid "Session"
 msgstr "会话"
 
-#: common/dialogs/panel_common_settings_base.cpp:284
+#: common/dialogs/panel_common_settings_base.cpp:279
 msgid "Remember open files for next project launch"
 msgstr "记住下次启动工程时打开的文件"
 
-#: common/dialogs/panel_common_settings_base.cpp:286
+#: common/dialogs/panel_common_settings_base.cpp:281
 msgid ""
 "If checked, launching a project will also launch tools such as eeschema and "
 "pcbnew with previously open files"
@@ -3131,15 +3217,19 @@ msgstr "缩放"
 #: common/dialogs/panel_mouse_settings_base.cpp:139
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:164
 #: pcbnew/board_stackup_manager/stackup_predefined_prms.cpp:56
+#: pcbnew/class_pad.cpp:1347 pcbnew/class_zone.cpp:1354
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:157
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:43
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:420
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:324
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:79
-#: pcbnew/dialogs/dialog_pad_properties.cpp:926
+#: pcbnew/dialogs/dialog_pad_properties.cpp:911
+#: pcbnew/dialogs/dialog_pad_properties.cpp:920
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:725
 #: pcbnew/dialogs/dialog_plot_base.cpp:119
+#: pcbnew/widgets/appearance_controls.cpp:643
 msgid "None"
 msgstr "无"
 
@@ -3195,7 +3285,8 @@ msgstr "在触摸板上从左到右滚动时，将画布向左和向右平移"
 #: common/dialogs/panel_setup_netclasses.cpp:82
 #: eeschema/dialogs/dialog_edit_line_style.cpp:46
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:309
-#: pcbnew/class_zone.cpp:669 pcbnew/dialogs/dialog_copper_zones_base.cpp:233
+#: pcbnew/class_zone.cpp:615 pcbnew/class_zone.cpp:1356
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:420
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:324
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:725
@@ -3234,39 +3325,39 @@ msgstr "默认的网络类是必需的。"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:24
 #: eeschema/dialogs/dialog_schematic_setup.cpp:75
-#: pcbnew/dialogs/dialog_board_setup.cpp:88
-#: pcbnew/widgets/appearance_controls.cpp:419
+#: pcbnew/dialogs/dialog_board_setup.cpp:87
+#: pcbnew/widgets/appearance_controls.cpp:471
 msgid "Net Classes"
 msgstr "网络类表"
 
-#: common/dialogs/panel_setup_netclasses_base.cpp:41 pcbnew/class_zone.cpp:1373
+#: common/dialogs/panel_setup_netclasses_base.cpp:41 pcbnew/class_zone.cpp:1368
 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
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1716
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:191
 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
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1440
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:192
 msgid "Via Size"
 msgstr "过孔外径"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:44
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:199
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:193
 msgid "Via Drill"
 msgstr "过孔内径"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:45
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:200
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:194
 msgid "uVia Size"
 msgstr "微孔外径"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:46
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:201
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:195
 msgid "uVia Drill"
 msgstr "微孔内径"
 
@@ -3287,17 +3378,17 @@ msgid "Bus Thickness"
 msgstr "总线宽"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:52
-#: eeschema/dialogs/dialog_edit_line_style_base.h:65 eeschema/sch_line.cpp:793
+#: eeschema/dialogs/dialog_edit_line_style_base.h:65 eeschema/sch_line.cpp:823
 msgid "Line Style"
 msgstr "线型"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:58 common/pgm_base.cpp:73
 #: common/widgets/footprint_select_widget.cpp:229
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:195
 #: eeschema/dialogs/dialog_edit_line_style.cpp:53
 #: eeschema/dialogs/dialog_edit_line_style.cpp:64
+#: eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp:65
 #: eeschema/dialogs/dialog_junction_props.cpp:38
-#: eeschema/tools/sch_editor_control.cpp:933
+#: eeschema/tools/sch_editor_control.cpp:941
 msgid "Default"
 msgstr "默认"
 
@@ -3350,8 +3441,8 @@ msgid "Assign To Selected Nets"
 msgstr "分配给选择的网络"
 
 #: common/dialogs/panel_setup_netclasses_base.cpp:207
-#: pcbnew/board_connected_item.cpp:215 pcbnew/class_pad.cpp:800
-#: pcbnew/class_track.cpp:797 pcbnew/class_zone.cpp:637
+#: pcbnew/board_connected_item.cpp:150 pcbnew/class_pad.cpp:809
+#: pcbnew/class_track.cpp:740 pcbnew/class_zone.cpp:583
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:33
 #: pcbnew/dialogs/dialog_select_net_from_list.cpp:54
 msgid "Net"
@@ -3362,11 +3453,11 @@ msgid "Net Class"
 msgstr "网络类"
 
 #: common/dialogs/panel_setup_severities.cpp:39
-#: common/dialogs/panel_setup_severities.cpp:92
+#: common/dialogs/panel_setup_severities.cpp:93
 msgid "Ignore"
 msgstr "忽略"
 
-#: common/dialogs/panel_setup_severities.cpp:92
+#: common/dialogs/panel_setup_severities.cpp:93
 msgid "From Pin Conflicts Map"
 msgstr "从引脚冲突映射"
 
@@ -3384,12 +3475,12 @@ msgid "Text Substitution"
 msgstr "文本替换"
 
 #: common/dialogs/wx_html_report_panel.cpp:179
-#: common/dialogs/wx_html_report_panel.cpp:204 common/rc_item.cpp:295
+#: common/dialogs/wx_html_report_panel.cpp:204 common/rc_item.cpp:325
 msgid "Error: "
 msgstr "错误： "
 
 #: common/dialogs/wx_html_report_panel.cpp:183
-#: common/dialogs/wx_html_report_panel.cpp:206 common/rc_item.cpp:296
+#: common/dialogs/wx_html_report_panel.cpp:206 common/rc_item.cpp:326
 msgid "Warning: "
 msgstr "警告： "
 
@@ -3399,7 +3490,7 @@ msgid "Info: "
 msgstr "信息： "
 
 #: common/dialogs/wx_html_report_panel.cpp:322
-#: eeschema/dialogs/dialog_erc.cpp:532 pcbnew/dialogs/dialog_drc.cpp:497
+#: eeschema/dialogs/dialog_erc.cpp:540 pcbnew/dialogs/dialog_drc.cpp:552
 msgid "Save Report to File"
 msgstr "保存报告到文件"
 
@@ -3418,21 +3509,22 @@ msgstr "输出信息"
 
 #: common/dialogs/wx_html_report_panel_base.cpp:31
 #: eeschema/dialogs/dialog_erc_base.cpp:67
-#: pcbnew/dialogs/dialog_drc_base.cpp:167
+#: pcbnew/dialogs/dialog_drc_base.cpp:150
 msgid "Show:"
 msgstr "显示："
 
 #: common/dialogs/wx_html_report_panel_base.cpp:35
 #: eeschema/dialogs/dialog_erc_base.cpp:71 eeschema/lib_item.cpp:59
-#: eeschema/sch_pin.cpp:144 pcbnew/dialogs/dialog_board_reannotate.cpp:82
+#: eeschema/sch_pin.cpp:148 pcbnew/dialogs/dialog_board_reannotate.cpp:82
 #: pcbnew/dialogs/dialog_board_reannotate_base.cpp:170
-#: pcbnew/dialogs/dialog_drc_base.cpp:171
+#: pcbnew/dialogs/dialog_drc_base.cpp:154
+#: pcbnew/widgets/appearance_controls.cpp:630
 msgid "All"
 msgstr "所有"
 
 #: common/dialogs/wx_html_report_panel_base.cpp:50
 #: eeschema/dialogs/dialog_erc_base.cpp:85
-#: pcbnew/dialogs/dialog_drc_base.cpp:185
+#: pcbnew/dialogs/dialog_drc_base.cpp:168
 msgid "Warnings"
 msgstr "警告"
 
@@ -3446,14 +3538,18 @@ msgstr "相关信息"
 
 #: common/dialogs/wx_html_report_panel_base.cpp:70
 #: eeschema/dialogs/dialog_erc_base.cpp:102
-#: pcbnew/dialogs/dialog_drc_base.cpp:202
+#: pcbnew/dialogs/dialog_drc_base.cpp:185
 msgid "Save..."
 msgstr "保存..."
 
-#: common/draw_panel_gal.cpp:241 common/draw_panel_gal.cpp:403
+#: common/draw_panel_gal.cpp:241 common/draw_panel_gal.cpp:411
 msgid "Could not use OpenGL, falling back to software rendering"
 msgstr "无法使用 OpenGL，回退到软件渲染"
 
+#: common/draw_panel_gal.cpp:247 common/draw_panel_gal.cpp:418
+msgid "Could not use OpenGL"
+msgstr "无法使用 OpenGL"
+
 #: common/dsnlexer.cpp:39
 msgid "clipboard"
 msgstr "剪贴板"
@@ -3506,52 +3602,52 @@ msgstr "无效的大小 %lld: 太大"
 msgid "Invalid Arc with radius %f and angle %f"
 msgstr "半径为 %f 且角度为 %f 的无效圆弧"
 
-#: common/eda_base_frame.cpp:419
+#: common/eda_base_frame.cpp:384
 msgid "&About KiCad"
 msgstr "关于 KiCad (&A)"
 
-#: common/eda_base_frame.cpp:421
+#: common/eda_base_frame.cpp:386
 msgid "&Help"
 msgstr "帮助 (&H)"
 
-#: common/eda_base_frame.cpp:742
+#: common/eda_base_frame.cpp:725
 #, c-format
 msgid "File \"%s\" was not found."
 msgstr "没有找到文件 \"%s\"。"
 
-#: common/eda_base_frame.cpp:787
+#: common/eda_base_frame.cpp:770
 msgid "Preferences"
 msgstr "首选项"
 
-#: common/eda_base_frame.cpp:790 common/hotkey_store.cpp:65
+#: common/eda_base_frame.cpp:773 common/hotkey_store.cpp:65
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:20
 msgid "Common"
 msgstr "常规"
 
-#: common/eda_base_frame.cpp:792
+#: common/eda_base_frame.cpp:775
 msgid "Mouse and Touchpad"
 msgstr "鼠标和触摸板"
 
-#: common/eda_base_frame.cpp:795
+#: common/eda_base_frame.cpp:778
 msgid "Hotkeys"
 msgstr "快捷键"
 
-#: common/eda_base_frame.cpp:839
+#: common/eda_base_frame.cpp:822
 #, c-format
 msgid "You do not have write permissions to folder \"%s\"."
 msgstr "你没有 \"%s\" 文件夹的写入权限。"
 
-#: common/eda_base_frame.cpp:844
+#: common/eda_base_frame.cpp:827
 #, c-format
 msgid "You do not have write permissions to save file \"%s\" to folder \"%s\"."
 msgstr "你没有写入权限保存文件 \"%s\" 到文件夹 \"%s\"。"
 
-#: common/eda_base_frame.cpp:849 pcbnew/plugins/altium/altium_pcb.cpp:1204
+#: common/eda_base_frame.cpp:832 pcbnew/plugins/altium/altium_pcb.cpp:1207
 #, c-format
 msgid "You do not have write permissions to save file \"%s\"."
 msgstr "你没有写入权限来保存文件 \"%s\"。"
 
-#: common/eda_base_frame.cpp:879
+#: common/eda_base_frame.cpp:862
 #, c-format
 msgid ""
 "Well this is potentially embarrassing!\n"
@@ -3565,7 +3661,7 @@ msgstr ""
 "\"%s\"\n"
 "后没有正确保存它, 你是否希望恢复上次保存的修改内容？"
 
-#: common/eda_base_frame.cpp:894
+#: common/eda_base_frame.cpp:877
 msgid "The auto save file could not be renamed to the board file name."
 msgstr "自动保存文件不能重命名为电路板文件名称。"
 
@@ -3583,46 +3679,46 @@ 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:500
+#: common/eda_draw_frame.cpp:128 common/eda_draw_frame.cpp:499
 #: gerbview/dialogs/panel_gerbview_settings_base.cpp:28
-#: pagelayout_editor/pl_editor_frame.cpp:149
+#: pagelayout_editor/pl_editor_frame.cpp:145
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:120
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:56
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:108
-#: pcbnew/dialogs/dialog_plot_base.cpp:331
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:92
+#: pcbnew/dialogs/dialog_plot_base.cpp:353
 #: pcbnew/dialogs/panel_edit_options_base.cpp:31
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:87
 msgid "Inches"
 msgstr "英寸"
 
-#: common/eda_draw_frame.cpp:248
+#: common/eda_draw_frame.cpp:247
 msgid "Edit User Grid..."
 msgstr "编辑用户网格..."
 
-#: common/eda_draw_frame.cpp:357
+#: common/eda_draw_frame.cpp:356
 msgid "Zoom Auto"
 msgstr "自动缩放"
 
-#: common/eda_draw_frame.cpp:364
+#: common/eda_draw_frame.cpp:363
 #, c-format
 msgid "Zoom %.2f"
 msgstr "缩放 %.2f"
 
-#: common/eda_draw_frame.cpp:502
+#: common/eda_draw_frame.cpp:501
 #: 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
 #: pcbnew/dialogs/panel_edit_options_base.cpp:33
-#: pcbnew/footprint_wizard_frame.cpp:336
+#: pcbnew/footprint_wizard_frame.cpp:330
 msgid "Units"
 msgstr "单元"
 
-#: common/eda_draw_frame.cpp:873 eeschema/dialogs/panel_sym_lib_table.cpp:470
-#: pcbnew/footprint_libraries_utils.cpp:1131
+#: common/eda_draw_frame.cpp:871 eeschema/dialogs/panel_sym_lib_table.cpp:484
+#: pcbnew/footprint_libraries_utils.cpp:1117
 msgid "Select Library"
 msgstr "选择库"
 
-#: common/eda_draw_frame.cpp:873
+#: common/eda_draw_frame.cpp:871
 msgid "New Library"
 msgstr "新建库"
 
@@ -3635,27 +3731,29 @@ msgid " Y:"
 msgstr " Y："
 
 #: common/eda_text.cpp:495 eeschema/dialogs/dialog_edit_label_base.cpp:124
-#: eeschema/libedit/symbedit.cpp:231 eeschema/sch_text.cpp:646
+#: eeschema/libedit/symbedit.cpp:231 eeschema/sch_text.cpp:647
 #: gerbview/gerber_file_image.cpp:353 gerbview/gerber_file_image.cpp:357
 #: gerbview/gerber_file_image.cpp:360
 #: pcbnew/microwave/microwave_polygon.cpp:132
+#: pcbnew/widgets/appearance_controls.cpp:565
 msgid "Normal"
 msgstr "正常"
 
 #: common/eda_text.cpp:496 common/eda_text.cpp:653
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:61
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:53
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:58
 #: 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:646
+#: eeschema/fields_grid_table.cpp:200 eeschema/sch_text.cpp:647
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:117
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:298
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:58
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:58
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:236
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:182
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:137
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:112
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:126
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:48
 #: pcbnew/text_mod_grid_table.cpp:93
@@ -3664,12 +3762,12 @@ msgstr "斜体"
 
 #: common/eda_text.cpp:497 common/eda_text.cpp:655
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:62
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:54
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:59
 #: 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:646
+#: eeschema/fields_grid_table.cpp:201 eeschema/sch_text.cpp:647
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:101
 msgid "Bold"
 msgstr "粗体"
@@ -3685,12 +3783,13 @@ msgstr "粗体+斜体"
 #: eeschema/fields_grid_table.cpp:156 eeschema/fields_grid_table.cpp:389
 #: eeschema/fields_grid_table.cpp:480 eeschema/pin_type.cpp:127
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:92
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:315
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:135
 msgid "Left"
 msgstr "向左"
 
-#: common/eda_text.cpp:640 common/eda_text.cpp:644 common/tool/actions.cpp:299
-#: common/widgets/mathplot.cpp:1725
+#: common/eda_text.cpp:640 common/eda_text.cpp:644 common/tool/actions.cpp:304
+#: common/widgets/mathplot.cpp:1760
 #: 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
@@ -3701,10 +3800,11 @@ msgstr "向左"
 #: 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_dimension_properties_base.cpp:315
 #: pcbnew/dialogs/dialog_graphic_item_properties.cpp:175
 #: pcbnew/dialogs/dialog_graphic_item_properties.cpp:183
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:117
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:135
 msgid "Center"
 msgstr "居中"
 
@@ -3715,7 +3815,8 @@ msgstr "居中"
 #: eeschema/fields_grid_table.cpp:158 eeschema/fields_grid_table.cpp:391
 #: eeschema/fields_grid_table.cpp:484 eeschema/pin_type.cpp:126
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:92
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:160
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:315
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:135
 msgid "Right"
 msgstr "向右"
 
@@ -3748,7 +3849,7 @@ msgstr "文本"
 
 #: common/eda_text.cpp:651
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:86
-#: pcbnew/class_drawsegment.cpp:1268 pcbnew/class_pcb_text.cpp:129
+#: pcbnew/class_drawsegment.cpp:1267 pcbnew/class_pcb_text.cpp:128
 #: pcbnew/class_text_mod.cpp:318
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:57
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:57
@@ -3756,25 +3857,27 @@ msgstr "文本"
 msgid "Thickness"
 msgstr "线宽"
 
-#: common/eda_text.cpp:657 pcbnew/dialogs/dialog_text_properties_base.cpp:205
+#: common/eda_text.cpp:657
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:306
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:180
 #: pcbnew/microwave/microwave_polygon.cpp:132
 msgid "Mirrored"
 msgstr "镜像"
 
 #: common/eda_text.cpp:659 eeschema/dialogs/dialog_lib_edit_text_base.cpp:84
 #: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:44
-#: eeschema/lib_pin.cpp:992 eeschema/sch_pin.cpp:167
+#: eeschema/lib_pin.cpp:1011 eeschema/sch_pin.cpp:171
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:130
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:118
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:93
 msgid "Visible"
 msgstr "可见"
 
 #: common/eda_text.cpp:661 eeschema/lib_field.cpp:437
 #: eeschema/sch_bitmap.cpp:203 pcbnew/class_drawsegment.cpp:501
-#: pcbnew/class_drawsegment.cpp:554 pcbnew/class_pad.cpp:841
-#: pcbnew/class_pcb_target.cpp:155 pcbnew/class_pcb_text.cpp:132
-#: pcbnew/class_text_mod.cpp:321 pcbnew/class_track.cpp:662
-#: pcbnew/class_track.cpp:1118 pcbnew/class_track.cpp:1137
+#: pcbnew/class_drawsegment.cpp:554 pcbnew/class_pad.cpp:850
+#: pcbnew/class_pcb_target.cpp:155 pcbnew/class_pcb_text.cpp:131
+#: pcbnew/class_text_mod.cpp:321 pcbnew/class_track.cpp:629
+#: pcbnew/class_track.cpp:1068 pcbnew/class_track.cpp:1087
 #: 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
@@ -3785,7 +3888,7 @@ msgstr "宽度"
 
 #: common/eda_text.cpp:663 eeschema/lib_field.cpp:440
 #: eeschema/sch_bitmap.cpp:205 pcbnew/class_drawsegment.cpp:504
-#: pcbnew/class_pad.cpp:844 pcbnew/class_pcb_text.cpp:135
+#: pcbnew/class_pad.cpp:853 pcbnew/class_pcb_text.cpp:134
 #: pcbnew/class_text_mod.cpp:324
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:56
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:56
@@ -3928,7 +4031,7 @@ msgstr "无法打开配置文件"
 msgid "Problems writing configuration file"
 msgstr "编写配置文件时出错"
 
-#: common/footprint_info.cpp:90 cvpcb/cvpcb_mainframe.cpp:808
+#: common/footprint_info.cpp:90 cvpcb/cvpcb_mainframe.cpp:813
 msgid "Load Error"
 msgstr "载入错误"
 
@@ -3950,7 +4053,7 @@ msgstr "fp-lib-table 文件不包含昵称为 \"%s\" 的库"
 
 #: common/fp_lib_table.cpp:482
 #: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:110
-#: eeschema/symbol_lib_table.cpp:485
+#: eeschema/symbol_lib_table.cpp:498
 #: pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp:110
 #, c-format
 msgid "Cannot create global library table path \"%s\"."
@@ -3988,7 +4091,7 @@ msgstr ""
 
 #: common/gestfich.cpp:362 eeschema/eeschema.cpp:339 eeschema/eeschema.cpp:371
 #: gerbview/gerbview.cpp:235 kicad/project_template.cpp:243
-#: pcbnew/pcbnew.cpp:466
+#: pcbnew/pcbnew.cpp:474
 #, c-format
 msgid "Cannot copy file \"%s\"."
 msgstr "无法复制文件 \"%s\"。"
@@ -4033,7 +4136,7 @@ msgstr "向左/向右平移"
 msgid "Pan Up/Down"
 msgstr "向上/向下平移"
 
-#: common/hotkey_store.cpp:45 eeschema/tools/ee_actions.cpp:228
+#: common/hotkey_store.cpp:45 eeschema/tools/ee_actions.cpp:233
 msgid "Finish Drawing"
 msgstr "完成绘图"
 
@@ -4066,18 +4169,17 @@ msgid "Project Manager"
 msgstr "工程管理"
 
 #: common/hotkey_store.cpp:67 eeschema/eeschema_config.cpp:223
-#: eeschema/menubar.cpp:127 eeschema/sch_edit_frame.cpp:1100
-#: eeschema/sch_edit_frame.cpp:1107
+#: eeschema/menubar.cpp:127 eeschema/sch_edit_frame.cpp:1099
 msgid "Eeschema"
 msgstr "Eeschema"
 
-#: common/hotkey_store.cpp:68 pcbnew/menubar_pcb_editor.cpp:197
-#: pcbnew/pcb_edit_frame.cpp:1156 pcbnew/pcbnew_config.cpp:62
+#: common/hotkey_store.cpp:68 pcbnew/menubar_pcb_editor.cpp:196
+#: pcbnew/pcb_edit_frame.cpp:1179 pcbnew/pcbnew_config.cpp:62
 msgid "Pcbnew"
 msgstr "Pcbnew"
 
 #: common/hotkey_store.cpp:69 pagelayout_editor/menubar.cpp:86
-#: pagelayout_editor/pl_editor_frame.cpp:538
+#: pagelayout_editor/pl_editor_frame.cpp:534
 msgid "Page Layout Editor"
 msgstr "图框编辑器"
 
@@ -4085,18 +4187,18 @@ msgstr "图框编辑器"
 msgid "Gestures"
 msgstr "手势"
 
-#: common/kiway.cpp:226
+#: common/kiway.cpp:227
 #, c-format
 msgid "Failed to load kiface library \"%s\"."
 msgstr "加载 kiface 库 \"%s\" 失败。"
 
-#: common/kiway.cpp:235
+#: common/kiway.cpp:236
 #, c-format
 msgid ""
 "Could not read instance name and version symbol form kiface library \"%s\"."
 msgstr "无法从 kiface 库 \"%s\" 读取实例名和版本符号。"
 
-#: common/kiway.cpp:269
+#: common/kiway.cpp:270
 #, c-format
 msgid ""
 "Fatal Installation Bug. File:\n"
@@ -4107,15 +4209,15 @@ msgstr ""
 "\"%s\"\n"
 "无法加载\n"
 
-#: common/kiway.cpp:273
+#: common/kiway.cpp:274
 msgid "It is missing.\n"
 msgstr "它是缺少的。\n"
 
-#: common/kiway.cpp:275
+#: common/kiway.cpp:276
 msgid "Perhaps a shared library (.dll or .so) file is missing.\n"
 msgstr "可能缺少共享库文件（.dll 或 .so）。\n"
 
-#: common/kiway.cpp:277
+#: common/kiway.cpp:278
 msgid ""
 "From command line: argv[0]:\n"
 "'"
@@ -4123,464 +4225,506 @@ msgstr ""
 "从命令行：argv[0]:\n"
 "'"
 
-#: common/kiway.cpp:382 common/kiway.cpp:386
+#: common/kiway.cpp:383 common/kiway.cpp:387 common/kiway.cpp:391
 msgid "Error loading editor"
 msgstr "加载编辑器时出错"
 
-#: common/languages_menu.cpp:53
+#: common/kiway.cpp:476
+#, c-format
+msgid "Unable to switch language to %s"
+msgstr "无法将语言切换到 %s"
+
+#: common/languages_menu.cpp:51
 msgid "Set Language"
 msgstr "设置语言"
 
-#: common/layer_id.cpp:29
+#: common/layer_id.cpp:32
 msgid "F.Cu"
 msgstr "顶层铜层"
 
-#: common/layer_id.cpp:30
+#: common/layer_id.cpp:33
 msgid "In1.Cu"
 msgstr "内层 1"
 
-#: common/layer_id.cpp:31
+#: common/layer_id.cpp:34
 msgid "In2.Cu"
 msgstr "内层 2"
 
-#: common/layer_id.cpp:32
+#: common/layer_id.cpp:35
 msgid "In3.Cu"
 msgstr "内层 3"
 
-#: common/layer_id.cpp:33
+#: common/layer_id.cpp:36
 msgid "In4.Cu"
 msgstr "内层 4"
 
-#: common/layer_id.cpp:34
+#: common/layer_id.cpp:37
 msgid "In5.Cu"
 msgstr "内层 5"
 
-#: common/layer_id.cpp:35
+#: common/layer_id.cpp:38
 msgid "In6.Cu"
 msgstr "内层 6"
 
-#: common/layer_id.cpp:36
+#: common/layer_id.cpp:39
 msgid "In7.Cu"
 msgstr "内层 7"
 
-#: common/layer_id.cpp:37
+#: common/layer_id.cpp:40
 msgid "In8.Cu"
 msgstr "内层 8"
 
-#: common/layer_id.cpp:38
+#: common/layer_id.cpp:41
 msgid "In9.Cu"
 msgstr "内层 9"
 
-#: common/layer_id.cpp:39
+#: common/layer_id.cpp:42
 msgid "In10.Cu"
 msgstr "内层 10"
 
-#: common/layer_id.cpp:40
+#: common/layer_id.cpp:43
 msgid "In11.Cu"
 msgstr "内层 11"
 
-#: common/layer_id.cpp:41
+#: common/layer_id.cpp:44
 msgid "In12.Cu"
 msgstr "内层 12"
 
-#: common/layer_id.cpp:42
+#: common/layer_id.cpp:45
 msgid "In13.Cu"
 msgstr "内层 13"
 
-#: common/layer_id.cpp:43
+#: common/layer_id.cpp:46
 msgid "In14.Cu"
 msgstr "内层 14"
 
-#: common/layer_id.cpp:44
+#: common/layer_id.cpp:47
 msgid "In15.Cu"
 msgstr "内层 15"
 
-#: common/layer_id.cpp:45
+#: common/layer_id.cpp:48
 msgid "In16.Cu"
 msgstr "内层 16"
 
-#: common/layer_id.cpp:46
+#: common/layer_id.cpp:49
 msgid "In17.Cu"
 msgstr "内层 17"
 
-#: common/layer_id.cpp:47
+#: common/layer_id.cpp:50
 msgid "In18.Cu"
 msgstr "内层 18"
 
-#: common/layer_id.cpp:48
+#: common/layer_id.cpp:51
 msgid "In19.Cu"
 msgstr "内层 19"
 
-#: common/layer_id.cpp:49
+#: common/layer_id.cpp:52
 msgid "In20.Cu"
 msgstr "内层 20"
 
-#: common/layer_id.cpp:50
+#: common/layer_id.cpp:53
 msgid "In21.Cu"
 msgstr "内层 21"
 
-#: common/layer_id.cpp:51
+#: common/layer_id.cpp:54
 msgid "In22.Cu"
 msgstr "内层 22"
 
-#: common/layer_id.cpp:52
+#: common/layer_id.cpp:55
 msgid "In23.Cu"
 msgstr "内层 23"
 
-#: common/layer_id.cpp:53
+#: common/layer_id.cpp:56
 msgid "In24.Cu"
 msgstr "内层 24"
 
-#: common/layer_id.cpp:54
+#: common/layer_id.cpp:57
 msgid "In25.Cu"
 msgstr "内层 25"
 
-#: common/layer_id.cpp:55
+#: common/layer_id.cpp:58
 msgid "In26.Cu"
 msgstr "内层 26"
 
-#: common/layer_id.cpp:56
+#: common/layer_id.cpp:59
 msgid "In27.Cu"
 msgstr "内层 27"
 
-#: common/layer_id.cpp:57
+#: common/layer_id.cpp:60
 msgid "In28.Cu"
 msgstr "内层 28"
 
-#: common/layer_id.cpp:58
+#: common/layer_id.cpp:61
 msgid "In29.Cu"
 msgstr "内层 29"
 
-#: common/layer_id.cpp:59
+#: common/layer_id.cpp:62
 msgid "In30.Cu"
 msgstr "内层 30"
 
-#: common/layer_id.cpp:60
+#: common/layer_id.cpp:63
 msgid "B.Cu"
 msgstr "底层铜层"
 
-#: common/layer_id.cpp:63
-msgid "B.Adhes"
+#: common/layer_id.cpp:66
+msgid "B.Adhesive"
 msgstr "底层胶粘层"
 
-#: common/layer_id.cpp:64
-msgid "F.Adhes"
+#: common/layer_id.cpp:67
+msgid "F.Adhesive"
 msgstr "顶层胶粘层"
 
-#: common/layer_id.cpp:65
+#: common/layer_id.cpp:68
 msgid "B.Paste"
 msgstr "底层锡膏层"
 
-#: common/layer_id.cpp:66
+#: common/layer_id.cpp:69
 msgid "F.Paste"
 msgstr "顶层锡膏层"
 
-#: common/layer_id.cpp:67
-msgid "B.SilkS"
+#: common/layer_id.cpp:70
+msgid "B.Silkscreen"
 msgstr "底层丝印层"
 
-#: common/layer_id.cpp:68
-msgid "F.SilkS"
+#: common/layer_id.cpp:71
+msgid "F.Silkscreen"
 msgstr "顶层丝印层"
 
-#: common/layer_id.cpp:69
+#: common/layer_id.cpp:72
 msgid "B.Mask"
 msgstr "底层阻焊层"
 
-#: common/layer_id.cpp:70
+#: common/layer_id.cpp:73
 msgid "F.Mask"
 msgstr "顶层阻焊层"
 
-#: common/layer_id.cpp:73
-msgid "Dwgs.User"
-msgstr "用户图纸层"
-
-#: common/layer_id.cpp:74
-msgid "Cmts.User"
-msgstr "用户注释层"
-
-#: common/layer_id.cpp:75
-msgid "Eco1.User"
-msgstr "用户自定义 1 层"
-
 #: common/layer_id.cpp:76
-msgid "Eco2.User"
-msgstr "用户自定义 2 层"
+msgid "User.Drawings"
+msgstr "用户绘图层"
 
 #: common/layer_id.cpp:77
+msgid "User.Comments"
+msgstr "用户注释层"
+
+#: common/layer_id.cpp:78
+msgid "User.Eco1"
+msgstr "用户自定义 1 层"
+
+#: common/layer_id.cpp:79
+msgid "User.Eco2"
+msgstr "用户自定义 2 层"
+
+#: common/layer_id.cpp:80
 msgid "Edge.Cuts"
 msgstr "电路板边框轮廓层"
 
-#: common/layer_id.cpp:78
+#: common/layer_id.cpp:81 pcbnew/dialogs/panel_setup_layers_base.cpp:679
 msgid "Margin"
 msgstr "电路板电气边界层"
 
-#: common/layer_id.cpp:81
-msgid "F.CrtYd"
-msgstr "顶层封装外框层"
+#: common/layer_id.cpp:84
+msgid "F.Courtyard"
+msgstr "顶层外框层"
 
-#: common/layer_id.cpp:82
-msgid "B.CrtYd"
-msgstr "底层封装外框层"
+#: common/layer_id.cpp:85
+msgid "B.Courtyard"
+msgstr "底层外框层"
 
-#: common/layer_id.cpp:83
+#: common/layer_id.cpp:86
 msgid "F.Fab"
 msgstr "顶层制造层"
 
-#: common/layer_id.cpp:84
+#: common/layer_id.cpp:87
 msgid "B.Fab"
 msgstr "底层制造层"
 
-#: common/layer_id.cpp:87 pcbnew/pcb_parser.cpp:659
+#: common/layer_id.cpp:90
+msgid "User.1"
+msgstr "用户 1 层"
+
+#: common/layer_id.cpp:91
+msgid "User.2"
+msgstr "用户 2 层"
+
+#: common/layer_id.cpp:92
+msgid "User.3"
+msgstr "用户 3 层"
+
+#: common/layer_id.cpp:93
+msgid "User.4"
+msgstr "用户 4 层"
+
+#: common/layer_id.cpp:94
+msgid "User.5"
+msgstr "用户 5 层"
+
+#: common/layer_id.cpp:95
+msgid "User.6"
+msgstr "用户 6 层"
+
+#: common/layer_id.cpp:96
+msgid "User.7"
+msgstr "用户 7 层"
+
+#: common/layer_id.cpp:97
+msgid "User.8"
+msgstr "用户 8 层"
+
+#: common/layer_id.cpp:98
+msgid "User.9"
+msgstr "用户 9 层"
+
+#: common/layer_id.cpp:101 pcbnew/pcb_parser.cpp:659
 msgid "Rescue"
 msgstr "恢复"
 
-#: common/layer_id.cpp:91 eeschema/sch_bus_entry.cpp:414
-#: eeschema/sch_line.cpp:781
+#: common/layer_id.cpp:105 eeschema/sch_bus_entry.cpp:415
+#: eeschema/sch_line.cpp:811
 msgid "Wire"
 msgstr "连线"
 
-#: common/layer_id.cpp:92 eeschema/sch_bus_entry.cpp:415
-#: eeschema/sch_line.cpp:782
+#: common/layer_id.cpp:106 eeschema/sch_bus_entry.cpp:416
+#: eeschema/sch_line.cpp:812
 msgid "Bus"
 msgstr "总线"
 
-#: common/layer_id.cpp:93
+#: common/layer_id.cpp:107
 msgid "Bus Junction"
 msgstr "总线连接点"
 
-#: common/layer_id.cpp:95 eeschema/sch_text.cpp:626
+#: common/layer_id.cpp:109 eeschema/sch_text.cpp:627
 msgid "Label"
 msgstr "标签"
 
-#: common/layer_id.cpp:96
+#: common/layer_id.cpp:110
 msgid "Global label"
 msgstr "全局标签"
 
-#: common/layer_id.cpp:97
+#: common/layer_id.cpp:111
 msgid "Hierarchical label"
 msgstr "层次标签"
 
-#: common/layer_id.cpp:98
+#: common/layer_id.cpp:112
 msgid "Pin number"
 msgstr "引脚编号"
 
-#: common/layer_id.cpp:99
+#: common/layer_id.cpp:113
 msgid "Pin name"
 msgstr "引脚名称"
 
-#: common/layer_id.cpp:100
+#: common/layer_id.cpp:114
 msgid "Symbol reference"
 msgstr "符号位号"
 
-#: common/layer_id.cpp:101
+#: common/layer_id.cpp:115
 msgid "Symbol value"
 msgstr "符号值"
 
-#: common/layer_id.cpp:102
+#: common/layer_id.cpp:116
 msgid "Symbol fields"
 msgstr "符号字段"
 
-#: common/layer_id.cpp:103
+#: common/layer_id.cpp:117
 msgid "Symbol body outline"
 msgstr "符号主体轮廓"
 
-#: common/layer_id.cpp:104
+#: common/layer_id.cpp:118
 msgid "Symbol body fill"
 msgstr "符号主体填充"
 
-#: common/layer_id.cpp:105
+#: common/layer_id.cpp:119
 msgid "Notes"
 msgstr "注意"
 
-#: common/layer_id.cpp:106 pcbnew/dialogs/dialog_select_net_from_list.cpp:977
+#: common/layer_id.cpp:120 pcbnew/dialogs/dialog_select_net_from_list.cpp:984
 msgid "Net name"
 msgstr "网络名称"
 
-#: common/layer_id.cpp:108
+#: common/layer_id.cpp:122
 msgid "Sheet border"
 msgstr "图框边框"
 
-#: common/layer_id.cpp:109
+#: common/layer_id.cpp:123
 msgid "Sheet background"
 msgstr "图框背景"
 
-#: common/layer_id.cpp:110 eeschema/sch_sheet.cpp:55
+#: common/layer_id.cpp:124 eeschema/sch_sheet.cpp:55
 msgid "Sheet name"
 msgstr "图框名称"
 
-#: common/layer_id.cpp:111
+#: common/layer_id.cpp:125
 msgid "Sheet fields"
 msgstr "图框字段"
 
-#: common/layer_id.cpp:112
+#: common/layer_id.cpp:126
 msgid "Sheet file name"
 msgstr "图框文件名称"
 
-#: common/layer_id.cpp:113
+#: common/layer_id.cpp:127
 msgid "Sheet label"
 msgstr "图框标签"
 
-#: common/layer_id.cpp:114
+#: common/layer_id.cpp:128
 msgid "No connect symbol"
 msgstr "不连接符号"
 
-#: common/layer_id.cpp:115
+#: common/layer_id.cpp:129
 msgid "ERC warning"
 msgstr "ERC 警告"
 
-#: common/layer_id.cpp:116
+#: common/layer_id.cpp:130
 msgid "ERC error"
 msgstr "ERC 错误"
 
-#: common/layer_id.cpp:117 common/layer_id.cpp:152
+#: common/layer_id.cpp:131 common/layer_id.cpp:166
 msgid "Helper items"
 msgstr "辅助项"
 
-#: common/layer_id.cpp:118 common/layer_id.cpp:153 common/tool/grid_menu.cpp:40
+#: common/layer_id.cpp:132 common/layer_id.cpp:167 common/tool/grid_menu.cpp:40
 #: gerbview/gerbview_layer_widget.cpp:105 pcbnew/pcb_layer_widget.cpp:79
-#: pcbnew/widgets/appearance_controls.cpp:306
+#: pcbnew/widgets/appearance_controls.cpp:351
 msgid "Grid"
 msgstr "网格"
 
-#: common/layer_id.cpp:119
+#: common/layer_id.cpp:133
 msgid "Axes"
 msgstr "轴"
 
-#: common/layer_id.cpp:120 common/layer_id.cpp:155
+#: common/layer_id.cpp:134 common/layer_id.cpp:169
 #: gerbview/gerbview_layer_widget.cpp:107 pcbnew/pcb_layer_widget.cpp:80
 msgid "Background"
 msgstr "背景"
 
-#: common/layer_id.cpp:121 common/layer_id.cpp:151
+#: common/layer_id.cpp:135 common/layer_id.cpp:165
 #: pcbnew/pcb_layer_widget.cpp:77
 msgid "Cursor"
 msgstr "光标"
 
-#: common/layer_id.cpp:122
+#: common/layer_id.cpp:136
 msgid "Highlighted items"
 msgstr "高亮项目"
 
-#: common/layer_id.cpp:123
+#: common/layer_id.cpp:137
 msgid "Hidden item"
 msgstr "隐藏项目"
 
-#: common/layer_id.cpp:124 common/layer_id.cpp:156
+#: common/layer_id.cpp:138 common/layer_id.cpp:170
 msgid "Selection highlight"
 msgstr "选择高亮"
 
-#: common/layer_id.cpp:125 common/layer_id.cpp:150
+#: common/layer_id.cpp:139 common/layer_id.cpp:164
 #: gerbview/gerbview_layer_widget.cpp:106 pcbnew/pcb_layer_widget.cpp:76
-#: pcbnew/widgets/appearance_controls.cpp:305
+#: pcbnew/widgets/appearance_controls.cpp:350
 msgid "Worksheet"
 msgstr "图框"
 
-#: common/layer_id.cpp:129 pcbnew/pcb_layer_widget.cpp:53
-#: pcbnew/widgets/appearance_controls.cpp:290
+#: common/layer_id.cpp:143 pcbnew/pcb_layer_widget.cpp:53
+#: pcbnew/widgets/appearance_controls.cpp:335
 msgid "Footprints Front"
 msgstr "封装顶层"
 
-#: common/layer_id.cpp:130 pcbnew/pcb_layer_widget.cpp:54
-#: pcbnew/widgets/appearance_controls.cpp:291
+#: common/layer_id.cpp:144 pcbnew/pcb_layer_widget.cpp:54
+#: pcbnew/widgets/appearance_controls.cpp:336
 msgid "Footprints Back"
 msgstr "封装底层"
 
-#: common/layer_id.cpp:131
+#: common/layer_id.cpp:145
 #: eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp:28
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:69
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1482
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:347
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:30
-#: pcbnew/pcb_layer_widget.cpp:55 pcbnew/widgets/appearance_controls.cpp:293
+#: pcbnew/pcb_layer_widget.cpp:55 pcbnew/widgets/appearance_controls.cpp:338
 msgid "Values"
 msgstr "值"
 
-#: common/layer_id.cpp:132 pcbnew/dialogs/dialog_board_reannotate_base.cpp:290
+#: common/layer_id.cpp:146 pcbnew/dialogs/dialog_board_reannotate_base.cpp:290
 #: pcbnew/pcb_layer_widget.cpp:56
 msgid "Reference Designators"
 msgstr "位号"
 
-#: common/layer_id.cpp:133 pcbnew/pcb_layer_widget.cpp:57
+#: common/layer_id.cpp:147 pcbnew/pcb_layer_widget.cpp:57
 msgid "Footprint Text Front"
 msgstr "封装文本顶层"
 
-#: common/layer_id.cpp:134 pcbnew/pcb_layer_widget.cpp:58
+#: common/layer_id.cpp:148 pcbnew/pcb_layer_widget.cpp:58
 msgid "Footprint Text Back"
 msgstr "封装文本底层"
 
-#: common/layer_id.cpp:135 pcbnew/pcb_layer_widget.cpp:59
-#: pcbnew/widgets/appearance_controls.cpp:296
+#: common/layer_id.cpp:149 pcbnew/pcb_layer_widget.cpp:59
+#: pcbnew/widgets/appearance_controls.cpp:341
 msgid "Hidden Text"
 msgstr "隐藏文本"
 
-#: common/layer_id.cpp:136 pcbnew/pcb_layer_widget.cpp:60
+#: common/layer_id.cpp:150 pcbnew/pcb_layer_widget.cpp:60
 msgid "Pads Front"
 msgstr "顶层焊盘"
 
-#: common/layer_id.cpp:137 pcbnew/pcb_layer_widget.cpp:61
+#: common/layer_id.cpp:151 pcbnew/pcb_layer_widget.cpp:61
 msgid "Pads Back"
 msgstr "底层焊盘"
 
-#: common/layer_id.cpp:138 pcbnew/pcb_layer_widget.cpp:62
+#: common/layer_id.cpp:152 pcbnew/pcb_layer_widget.cpp:62
 msgid "Through Hole Pads"
 msgstr "通孔焊盘"
 
-#: common/layer_id.cpp:139 pcbnew/dialogs/dialog_global_deletion_base.cpp:40
+#: common/layer_id.cpp:153 pcbnew/dialogs/dialog_global_deletion_base.cpp:40
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:27
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:41
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:27
-#: pcbnew/pcb_layer_widget.cpp:64 pcbnew/widgets/appearance_controls.cpp:285
+#: pcbnew/pcb_layer_widget.cpp:64 pcbnew/widgets/appearance_controls.cpp:330
 msgid "Tracks"
 msgstr "布线"
 
-#: common/layer_id.cpp:140 pcbnew/class_track.cpp:724
+#: common/layer_id.cpp:154 pcbnew/class_track.cpp:680
 #: pcbnew/pcb_layer_widget.cpp:65
 msgid "Through Via"
 msgstr "通孔"
 
-#: common/layer_id.cpp:141 pcbnew/pcb_layer_widget.cpp:66
+#: common/layer_id.cpp:155 pcbnew/pcb_layer_widget.cpp:66
 msgid "Bl/Buried Via"
 msgstr "盲/埋孔"
 
-#: common/layer_id.cpp:142 pcbnew/class_track.cpp:714
+#: common/layer_id.cpp:156 pcbnew/class_track.cpp:678
 #: pcbnew/pcb_layer_widget.cpp:67
 msgid "Micro Via"
 msgstr "微孔"
 
-#: common/layer_id.cpp:143 pcbnew/pcb_layer_widget.cpp:68
+#: common/layer_id.cpp:157 pcbnew/pcb_layer_widget.cpp:68
 msgid "Non Plated Holes"
 msgstr "非金属化孔"
 
-#: common/layer_id.cpp:144 pcbnew/dialogs/panel_edit_options_base.cpp:143
-#: pcbnew/pcb_layer_widget.cpp:70 pcbnew/widgets/appearance_controls.cpp:299
+#: common/layer_id.cpp:158 pcbnew/dialogs/panel_edit_options_base.cpp:143
+#: pcbnew/pcb_layer_widget.cpp:70 pcbnew/widgets/appearance_controls.cpp:344
+#: pcbnew/widgets/appearance_controls.cpp:636
 msgid "Ratsnest"
 msgstr "飞线"
 
-#: common/layer_id.cpp:145 pcbnew/pcb_layer_widget.cpp:71
-#: pcbnew/widgets/appearance_controls.cpp:300
+#: common/layer_id.cpp:159 pcbnew/pcb_layer_widget.cpp:71
+#: pcbnew/widgets/appearance_controls.cpp:345
 msgid "No-Connects"
 msgstr "未连接"
 
-#: common/layer_id.cpp:146 pcbnew/pcb_layer_widget.cpp:72
-#: pcbnew/widgets/appearance_controls.cpp:301
+#: common/layer_id.cpp:160 pcbnew/pcb_layer_widget.cpp:72
+#: pcbnew/widgets/appearance_controls.cpp:346
 msgid "DRC Warnings"
 msgstr "DRC 警告"
 
-#: common/layer_id.cpp:147 pcbnew/pcb_layer_widget.cpp:73
-#: pcbnew/widgets/appearance_controls.cpp:302
+#: common/layer_id.cpp:161 pcbnew/pcb_layer_widget.cpp:73
+#: pcbnew/widgets/appearance_controls.cpp:347
 msgid "DRC Errors"
 msgstr "DRC 错误"
 
-#: common/layer_id.cpp:148 pcbnew/pcb_layer_widget.cpp:74
-#: pcbnew/widgets/appearance_controls.cpp:303
+#: common/layer_id.cpp:162 pcbnew/pcb_layer_widget.cpp:74
+#: pcbnew/widgets/appearance_controls.cpp:348
 msgid "DRC Exclusions"
 msgstr "DRC 排除"
 
-#: common/layer_id.cpp:149 pcbnew/pcb_layer_widget.cpp:75
-#: pcbnew/widgets/appearance_controls.cpp:304
+#: common/layer_id.cpp:163 pcbnew/pcb_layer_widget.cpp:75
+#: pcbnew/widgets/appearance_controls.cpp:349
 msgid "Anchors"
 msgstr "锚点"
 
-#: common/layer_id.cpp:154
+#: common/layer_id.cpp:168
 msgid "Grid Axes"
 msgstr "网格轴"
 
@@ -4593,7 +4737,7 @@ msgid "Illegal character found in revision"
 msgstr "在修订版本找到非法字符"
 
 #: common/lib_tree_model.cpp:139 eeschema/lib_item.cpp:63
-#: eeschema/libedit/symbedit.cpp:226 eeschema/sch_pin.cpp:148
+#: eeschema/libedit/symbedit.cpp:226 eeschema/sch_pin.cpp:152
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:56
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:67
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:78
@@ -4617,19 +4761,27 @@ msgstr "项目"
 msgid "Unrecognized character '%c'"
 msgstr "无法识别的字符 '%c'"
 
-#: common/libeval_compiler/libeval_compiler.cpp:759
-#: common/libeval_compiler/libeval_compiler.cpp:787
-#: common/libeval_compiler/libeval_compiler.cpp:886
+#: common/libeval_compiler/libeval_compiler.cpp:738
+msgid "Unknown parent of function parameters"
+msgstr "函数参数的父级未知"
+
+#: common/libeval_compiler/libeval_compiler.cpp:752
+msgid "Unknown parent of property"
+msgstr "属性的未知父级"
+
+#: common/libeval_compiler/libeval_compiler.cpp:769
+#: common/libeval_compiler/libeval_compiler.cpp:797
+#: common/libeval_compiler/libeval_compiler.cpp:902
 #, c-format
 msgid "Unrecognized item '%s'"
 msgstr "无法识别的项目 '%s'"
 
-#: common/libeval_compiler/libeval_compiler.cpp:764
+#: common/libeval_compiler/libeval_compiler.cpp:774
 #, c-format
 msgid "Unrecognized property '%s'"
 msgstr "无法识别的属性 '%s'"
 
-#: common/libeval_compiler/libeval_compiler.cpp:798
+#: common/libeval_compiler/libeval_compiler.cpp:808
 #, c-format
 msgid "Unrecognized function '%s'"
 msgstr "无法识别的功能 '%s'"
@@ -4645,6 +4797,7 @@ msgid "Error writing page layout design file"
 msgstr "写入图框设计文件错误"
 
 #: common/page_layout/ws_draw_item.cpp:124
+#: common/page_layout/ws_draw_item.cpp:289
 msgid "Imported Shape"
 msgstr "导入的形状"
 
@@ -4683,28 +4836,22 @@ msgstr "注释"
 
 #: common/page_layout/ws_draw_item.cpp:185
 #, c-format
-msgid "Text %s at (%s, %s)"
-msgstr "文本 %s 在 (%s, %s)"
+msgid "Text '%s'"
+msgstr "文本 '%s'"
 
-#: common/page_layout/ws_draw_item.cpp:291
+#: common/page_layout/ws_draw_item.cpp:348 eeschema/lib_rectangle.cpp:263
 #, c-format
-msgid "Imported shape at (%s, %s)"
-msgstr "导入的形状在 (%s, %s)"
+msgid "Rectangle, width %s height %s"
+msgstr "矩形，宽度 %s 高度 %s"
 
-#: common/page_layout/ws_draw_item.cpp:352 eeschema/lib_rectangle.cpp:263
+#: common/page_layout/ws_draw_item.cpp:381
 #, c-format
-msgid "Rectangle from (%s, %s) to (%s, %s)"
-msgstr "矩形坐标从 (%s, %s) 到  (%s, %s)"
+msgid "Line, length %s"
+msgstr "线，长度 %s"
 
-#: common/page_layout/ws_draw_item.cpp:387
-#, c-format
-msgid "Line from (%s, %s) to (%s, %s)"
-msgstr "连线从 (%s,%s) 到 (%s,%s)"
-
-#: common/page_layout/ws_draw_item.cpp:440
-#, c-format
-msgid "Image at (%s, %s)"
-msgstr "图像在 ( %s, %s)"
+#: common/page_layout/ws_draw_item.cpp:437
+msgid "Page Limits"
+msgstr "图框限制"
 
 #: common/pgm_base.cpp:165
 msgid "No default editor found, you must choose it"
@@ -4727,6 +4874,59 @@ msgstr "选择首选编辑器"
 msgid "%s is already running. Continue?"
 msgstr "%s 正在运行, 是否打开新窗口运行?"
 
+#: common/pgm_base.cpp:613
+msgid "This language is not supported by the operating system."
+msgstr "操作系统不支持此语言。"
+
+#: common/pgm_base.cpp:675
+msgid "The KiCad language file for this language is not installed."
+msgstr "未安装此语言的 KiCad 语言文件。"
+
+#: common/plugins/cadstar/cadstar_archive_parser.cpp:166
+#: eeschema/sch_plugins/altium/sch_altium_plugin.cpp:227
+#: pcbnew/plugins/altium/altium_pcb.cpp:57
+#, c-format
+msgid "Cannot open file '%s'"
+msgstr "无法打开文件 ‘%s’"
+
+#: common/plugins/cadstar/cadstar_archive_parser.cpp:182
+#: common/plugins/cadstar/cadstar_archive_parser.cpp:201
+#: common/plugins/cadstar/cadstar_archive_parser.cpp:217
+#: common/plugins/cadstar/cadstar_archive_parser.cpp:223
+#: common/plugins/cadstar/cadstar_archive_parser.cpp:229
+msgid "The selected file is not valid or might be corrupt!"
+msgstr "所选文件无效或可能已损坏！"
+
+#: common/plugins/cadstar/cadstar_archive_parser.cpp:314
+#, c-format
+msgid "Unexpected number of points in '%s'. Found %d but expected %d."
+msgstr "'%s' 中的意外点数。找到 %d，但需要 %d。"
+
+#: common/plugins/cadstar/cadstar_archive_parser.h:39
+#, c-format
+msgid "Missing node '%s' in '%s'"
+msgstr "缺少节点 '%s' (在 '%s' 中)"
+
+#: common/plugins/cadstar/cadstar_archive_parser.h:42
+#, c-format
+msgid "Unknown node '%s' in '%s'"
+msgstr "未知节点 '%s' (在 '%s' 中)"
+
+#: common/plugins/cadstar/cadstar_archive_parser.h:45
+#, c-format
+msgid "Missing Parameter '%s' in '%s'"
+msgstr "缺少参数 '%s' (在 '%s' 中)"
+
+#: common/plugins/cadstar/cadstar_archive_parser.h:48
+#, c-format
+msgid "Unknown Parameter '%s' in '%s'"
+msgstr "未知参数 '%s' (在 '%s' 中)"
+
+#: common/plugins/cadstar/cadstar_archive_parser.h:51
+#, c-format
+msgid "Unable to parse '%s' in '%s'"
+msgstr "无法分析 '%s' (在 '%s' 中)"
+
 #: common/project.cpp:313 common/project.cpp:318
 msgid "Error loading project footprint library table"
 msgstr "加载工程封装库表时出错"
@@ -4768,7 +4968,7 @@ msgstr "压缩文件 \"%s\"：错误！\n"
 msgid "Zip archive \"%s\" created (%s uncompressed, %s compressed)\n"
 msgstr "Zip 压缩 \"%s\" 创建 (%s 未压缩，%s 已压缩)\n"
 
-#: common/rc_item.cpp:291
+#: common/rc_item.cpp:321
 msgid "Excluded "
 msgstr "排除 "
 
@@ -4789,33 +4989,33 @@ msgstr "超出了线路长度"
 msgid "OUTPUTSTREAM_OUTPUTFORMATTER write error"
 msgstr "输出流_输出格式器写入错误"
 
-#: common/settings/color_settings.cpp:309
+#: common/settings/color_settings.cpp:307
 msgid " (Footprints)"
 msgstr " (封装)"
 
 #: common/template_fieldnames.cpp:46
-#: eeschema/dialogs/dialog_rescue_each.cpp:130 eeschema/sch_component.cpp:1204
-#: eeschema/sch_component.cpp:1259 pcbnew/class_module.cpp:1715
+#: eeschema/dialogs/dialog_rescue_each.cpp:130 eeschema/sch_component.cpp:1332
+#: eeschema/sch_component.cpp:1383 pcbnew/class_module.cpp:1735
 msgid "Reference"
 msgstr "位号"
 
 #: common/template_fieldnames.cpp:47
 #: cvpcb/dialogs/dialog_config_equfiles_base.cpp:81
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:57
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:49
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:54
 #: eeschema/dialogs/dialog_rescue_each.cpp:134
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:51
-#: eeschema/dialogs/panel_sym_lib_table.cpp:302
+#: eeschema/dialogs/panel_sym_lib_table.cpp:315
 #: eeschema/fields_grid_table.cpp:196 eeschema/lib_field.cpp:446
-#: eeschema/sch_component.cpp:1207 eeschema/sch_component.cpp:1262
-#: pcbnew/class_module.cpp:1717 pcbnew/class_text_mod.cpp:285
+#: eeschema/sch_component.cpp:1334 eeschema/sch_component.cpp:1385
+#: pcbnew/class_module.cpp:1737 pcbnew/class_text_mod.cpp:285
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:70
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:70
 #: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:44
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:452
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:457
 #: pcbnew/dialogs/panel_modedit_defaults.cpp:62
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:54
-#: pcbnew/footprint_wizard_frame.cpp:335 pcbnew/text_mod_grid_table.cpp:109
+#: pcbnew/footprint_wizard_frame.cpp:329 pcbnew/text_mod_grid_table.cpp:109
 msgid "Value"
 msgstr "值"
 
@@ -4828,11 +5028,11 @@ msgstr "数据手册"
 msgid "Field%d"
 msgstr "字段 %d"
 
-#: common/tool/action_menu.cpp:206
+#: common/tool/action_menu.cpp:205
 msgid "Close\tCTRL+W"
 msgstr "关闭\tCTRL+W"
 
-#: common/tool/action_menu.cpp:219 common/tool/actions.cpp:113
+#: common/tool/action_menu.cpp:218 common/tool/actions.cpp:113
 msgid "Quit"
 msgstr "退出"
 
@@ -4917,7 +5117,7 @@ msgid "Plot..."
 msgstr "绘制..."
 
 #: common/tool/actions.cpp:107 pcbnew/dialogs/dialog_plot.cpp:60
-#: pcbnew/dialogs/dialog_plot_base.h:148
+#: pcbnew/dialogs/dialog_plot_base.h:152
 msgid "Plot"
 msgstr "绘制"
 
@@ -4954,7 +5154,7 @@ msgid "Redo last edit"
 msgstr "重做上一次编辑"
 
 #: common/tool/actions.cpp:152 eeschema/tools/ee_actions.cpp:131
-#: pcbnew/tools/edit_tool.cpp:1221
+#: pcbnew/tools/edit_tool.cpp:1220
 msgid "Cut"
 msgstr "剪切"
 
@@ -4983,7 +5183,7 @@ msgstr "从剪贴板粘贴项目"
 #: eeschema/dialogs/dialog_update_fields_base.cpp:34
 #: pcbnew/dialogs/dialog_import_settings.cpp:53
 #: pcbnew/dialogs/dialog_import_settings.cpp:98
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:74
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:78
 msgid "Select All"
 msgstr "全选"
 
@@ -5009,7 +5209,7 @@ msgstr "复制选择项"
 
 #: common/tool/actions.cpp:186 eeschema/tools/ee_actions.cpp:126
 #: kicad/tree_project_frame.cpp:785 pcbnew/pcb_parser.cpp:659
-#: pcbnew/tools/edit_tool.cpp:1223
+#: pcbnew/tools/edit_tool.cpp:1222
 msgid "Delete"
 msgstr "删除"
 
@@ -5086,346 +5286,352 @@ msgstr "刷新"
 msgid "Zoom to Fit"
 msgstr "缩放以适应"
 
-#: common/tool/actions.cpp:270
+#: common/tool/actions.cpp:264
+msgid "Zoom to Objects"
+msgstr "缩放至对象"
+
+#: common/tool/actions.cpp:275
 msgid "Zoom In at Cursor"
 msgstr "在光标处放大"
 
-#: common/tool/actions.cpp:281
+#: common/tool/actions.cpp:286
 msgid "Zoom Out at Cursor"
 msgstr "在光标处缩小"
 
-#: common/tool/actions.cpp:287 common/widgets/mathplot.cpp:1727
+#: common/tool/actions.cpp:292 common/widgets/mathplot.cpp:1762
 #: eeschema/sim/sim_plot_frame_base.cpp:79
 msgid "Zoom In"
 msgstr "放大"
 
-#: common/tool/actions.cpp:293 common/widgets/mathplot.cpp:1728
+#: common/tool/actions.cpp:298 common/widgets/mathplot.cpp:1763
 #: eeschema/sim/sim_plot_frame_base.cpp:83
 msgid "Zoom Out"
 msgstr "缩小"
 
-#: common/tool/actions.cpp:305
+#: common/tool/actions.cpp:310
 msgid "Zoom to Selection"
 msgstr "缩放至选区大小"
 
-#: common/tool/actions.cpp:318
+#: common/tool/actions.cpp:323
 msgid "Cursor Up"
 msgstr "向上光标"
 
-#: common/tool/actions.cpp:324
+#: common/tool/actions.cpp:329
 msgid "Cursor Down"
 msgstr "向下光标"
 
-#: common/tool/actions.cpp:330
+#: common/tool/actions.cpp:335
 msgid "Cursor Left"
 msgstr "向左光标"
 
-#: common/tool/actions.cpp:336
+#: common/tool/actions.cpp:341
 msgid "Cursor Right"
 msgstr "向右光标"
 
-#: common/tool/actions.cpp:343
+#: common/tool/actions.cpp:348
 msgid "Cursor Up Fast"
 msgstr "快速向上光标"
 
-#: common/tool/actions.cpp:349
+#: common/tool/actions.cpp:354
 msgid "Cursor Down Fast"
 msgstr "快速向下光标"
 
-#: common/tool/actions.cpp:355
+#: common/tool/actions.cpp:360
 msgid "Cursor Left Fast"
 msgstr "快速向左光标"
 
-#: common/tool/actions.cpp:361
+#: common/tool/actions.cpp:366
 msgid "Cursor Right Fast"
 msgstr "快速向右光标"
 
-#: common/tool/actions.cpp:367
+#: common/tool/actions.cpp:372
 msgid "Click"
 msgstr "单击"
 
-#: common/tool/actions.cpp:367
+#: common/tool/actions.cpp:372
 msgid "Performs left mouse button click"
 msgstr "执行鼠标左键单击"
 
-#: common/tool/actions.cpp:373
+#: common/tool/actions.cpp:378
 msgid "Double-click"
 msgstr "双击"
 
-#: common/tool/actions.cpp:373
+#: common/tool/actions.cpp:378
 msgid "Performs left mouse button double-click"
 msgstr "执行鼠标左键双击"
 
-#: common/tool/actions.cpp:381
+#: common/tool/actions.cpp:386
 msgid "Pin Library"
 msgstr "引脚库"
 
-#: common/tool/actions.cpp:386
+#: common/tool/actions.cpp:391
 msgid "Unpin Library"
 msgstr "取消引脚库"
 
-#: common/tool/actions.cpp:392
+#: common/tool/actions.cpp:397
 msgid "Pan Up"
 msgstr "向上平移"
 
-#: common/tool/actions.cpp:398
+#: common/tool/actions.cpp:403
 msgid "Pan Down"
 msgstr "向下平移"
 
-#: common/tool/actions.cpp:404
+#: common/tool/actions.cpp:409
 msgid "Pan Left"
 msgstr "向左平移"
 
-#: common/tool/actions.cpp:410
+#: common/tool/actions.cpp:415
 msgid "Pan Right"
 msgstr "向右平移"
 
-#: common/tool/actions.cpp:417
+#: common/tool/actions.cpp:422
 msgid "Switch to Fast Grid 1"
 msgstr "切换到快速网格 1"
 
-#: common/tool/actions.cpp:422
+#: common/tool/actions.cpp:427
 msgid "Switch to Fast Grid 2"
 msgstr "切换到快速网格 2"
 
-#: common/tool/actions.cpp:427
+#: common/tool/actions.cpp:432
 msgid "Switch to Next Grid"
 msgstr "切换到下一个网格"
 
-#: common/tool/actions.cpp:431
+#: common/tool/actions.cpp:436
 msgid "Switch to Previous Grid"
 msgstr "切换到上一个网格"
 
-#: common/tool/actions.cpp:436
+#: common/tool/actions.cpp:441
 msgid "Set the grid origin point"
 msgstr "设置网格原点"
 
-#: common/tool/actions.cpp:449
+#: common/tool/actions.cpp:454
 msgid "Show Grid"
 msgstr "显示网格"
 
-#: common/tool/actions.cpp:449
+#: common/tool/actions.cpp:454
 msgid "Display grid dots or lines in the edit window"
 msgstr "在编辑窗口中显示网格点或线条"
 
-#: common/tool/actions.cpp:454
+#: common/tool/actions.cpp:459
 msgid "Grid Properties..."
 msgstr "网格属性..."
 
-#: common/tool/actions.cpp:454
-msgid "Set grid dimensions"
-msgstr "设置网格尺寸"
-
 #: common/tool/actions.cpp:459
+msgid "Set grid dimensions"
+msgstr "设置网格标注"
+
+#: common/tool/actions.cpp:464
 msgid "Imperial"
 msgstr "英制"
 
-#: common/tool/actions.cpp:459
+#: common/tool/actions.cpp:464
 msgid "Use inches and mils"
 msgstr "使用英寸和密耳 （mil）"
 
-#: common/tool/actions.cpp:464
+#: common/tool/actions.cpp:469
 msgid "Metric"
 msgstr "公制"
 
-#: common/tool/actions.cpp:464
+#: common/tool/actions.cpp:469
 msgid "Use millimeters"
 msgstr "使用毫米"
 
-#: common/tool/actions.cpp:470
+#: common/tool/actions.cpp:475
 msgid "Switch units"
 msgstr "切换单位"
 
-#: common/tool/actions.cpp:470
+#: common/tool/actions.cpp:475
 msgid "Switch between inches and millimeters"
 msgstr "在英寸和毫米之间切换"
 
-#: common/tool/actions.cpp:475
+#: common/tool/actions.cpp:480
 msgid "Polar Coordinates"
 msgstr "极坐标"
 
-#: common/tool/actions.cpp:475
+#: common/tool/actions.cpp:480
 msgid "Switch between polar and cartesian coordinate systems"
 msgstr "在极坐标系和笛卡尔坐标系之间切换"
 
-#: common/tool/actions.cpp:481
+#: common/tool/actions.cpp:486
 msgid "Reset Local Coordinates"
 msgstr "重置局部坐标"
 
-#: common/tool/actions.cpp:487
+#: common/tool/actions.cpp:492
 msgid "Always Show Cursor"
 msgstr "始终显示光标"
 
-#: common/tool/actions.cpp:487
+#: common/tool/actions.cpp:492
 msgid "Display crosshairs even in selection tool"
 msgstr "即使在选择工具中也显示十字线"
 
-#: common/tool/actions.cpp:492
+#: common/tool/actions.cpp:497
 msgid "Full-Window Crosshairs"
 msgstr "全屏十字光标"
 
-#: common/tool/actions.cpp:492
+#: common/tool/actions.cpp:497
 msgid "Switch display of full-window crosshairs"
 msgstr "开关全屏十字光标"
 
-#: common/tool/actions.cpp:498
+#: common/tool/actions.cpp:503
 msgid "High Contrast Mode"
 msgstr "高对比度模式"
 
-#: common/tool/actions.cpp:498
+#: common/tool/actions.cpp:503
 msgid "Use high contrast display mode"
 msgstr "使用高对比度显示模式"
 
-#: common/tool/actions.cpp:502
+#: common/tool/actions.cpp:507
 msgid "High Contrast Mode (3-state)"
 msgstr "高对比度模式 (三态)"
 
-#: common/tool/actions.cpp:503
+#: common/tool/actions.cpp:508
 msgid "Toggle inactive layers between normal, dimmed, and hidden"
 msgstr "在正常、暗显和隐藏之间切换非活动图层"
 
-#: common/tool/actions.cpp:507
+#: common/tool/actions.cpp:512
 msgid "Select item(s)"
 msgstr "选择项目"
 
-#: common/tool/actions.cpp:514
+#: common/tool/actions.cpp:519
 msgid "Measure Tool"
 msgstr "测量工具"
 
-#: common/tool/actions.cpp:514
+#: common/tool/actions.cpp:519
 msgid "Interactively measure distance between points"
 msgstr "交互测量点之间的距离"
 
-#: common/tool/actions.cpp:523
+#: common/tool/actions.cpp:528
 msgid "Show 3D viewer window"
 msgstr "显示3D 查看器窗口"
 
-#: common/tool/actions.cpp:528 eeschema/lib_view_frame.cpp:103
+#: common/tool/actions.cpp:533 eeschema/lib_view_frame.cpp:103
+#: eeschema/lib_view_frame.cpp:896
 msgid "Symbol Library Browser"
 msgstr "符号库浏览器"
 
-#: common/tool/actions.cpp:528
+#: common/tool/actions.cpp:533
 msgid "Browse symbol libraries"
 msgstr "浏览符号库"
 
-#: common/tool/actions.cpp:533 eeschema/eeschema_config.cpp:394
-#: eeschema/libedit/libedit.cpp:50
+#: common/tool/actions.cpp:538 eeschema/eeschema_config.cpp:394
+#: eeschema/libedit/libedit.cpp:68
 msgid "Symbol Editor"
 msgstr "符号编辑器"
 
-#: common/tool/actions.cpp:533
+#: common/tool/actions.cpp:538
 msgid "Create, delete and edit symbols"
 msgstr "创建，删除和编辑符号"
 
-#: common/tool/actions.cpp:538 pcbnew/footprint_viewer_frame.cpp:108
-#: pcbnew/footprint_viewer_frame.cpp:980
+#: common/tool/actions.cpp:543 pcbnew/footprint_viewer_frame.cpp:108
+#: pcbnew/footprint_viewer_frame.cpp:992
 msgid "Footprint Library Browser"
 msgstr "封装库浏览"
 
-#: common/tool/actions.cpp:538
+#: common/tool/actions.cpp:543
 msgid "Browse footprint libraries"
 msgstr "浏览封装库"
 
-#: common/tool/actions.cpp:543 pcbnew/footprint_edit_frame.cpp:698
-#: pcbnew/footprint_edit_frame.cpp:870 pcbnew/menubar_footprint_editor.cpp:100
+#: common/tool/actions.cpp:548 pcbnew/footprint_edit_frame.cpp:733
+#: pcbnew/footprint_edit_frame.cpp:873 pcbnew/menubar_footprint_editor.cpp:100
 msgid "Footprint Editor"
 msgstr "封装编辑器"
 
-#: common/tool/actions.cpp:543
+#: common/tool/actions.cpp:548
 msgid "Create, delete and edit footprints"
 msgstr "创建，删除和编辑封装"
 
-#: common/tool/actions.cpp:549
+#: common/tool/actions.cpp:554
 msgid "Update PCB from Schematic..."
 msgstr "从原理图更新 PCB..."
 
-#: common/tool/actions.cpp:549
+#: common/tool/actions.cpp:554
 msgid "Push changes from schematic to PCB"
 msgstr "将更改从原理图推送到 PCB"
 
-#: common/tool/actions.cpp:553
+#: common/tool/actions.cpp:558
 msgid "Update Schematic from PCB..."
 msgstr "从 PCB 更新原理图..."
 
-#: common/tool/actions.cpp:554
+#: common/tool/actions.cpp:559
 msgid "Push changes from PCB to Schematic"
 msgstr "将更改从 PCB 推送到原理图"
 
-#: common/tool/actions.cpp:564
+#: common/tool/actions.cpp:563
 msgid "Accelerated Graphics"
 msgstr "硬件加速图形"
 
-#: common/tool/actions.cpp:564
+#: common/tool/actions.cpp:563
 msgid "Use hardware-accelerated graphics (recommended)"
 msgstr "使用硬件加速图形 (推荐)"
 
-#: common/tool/actions.cpp:575
+#: common/tool/actions.cpp:568
 msgid "Standard Graphics"
 msgstr "标准图形"
 
-#: common/tool/actions.cpp:575
+#: common/tool/actions.cpp:568
 msgid "Use software graphics (fall-back)"
 msgstr "使用软件图形 (软件加速)"
 
-#: common/tool/actions.cpp:580
+#: common/tool/actions.cpp:573
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:490
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:392
 msgid "Configure Paths..."
 msgstr "配置路径..."
 
-#: common/tool/actions.cpp:580
+#: common/tool/actions.cpp:573
 msgid "Edit path configuration environment variables"
 msgstr "编辑路劲配置环境变量"
 
-#: common/tool/actions.cpp:585
+#: common/tool/actions.cpp:578
 msgid "Manage Symbol Libraries..."
 msgstr "管理符号库..."
 
-#: common/tool/actions.cpp:586
+#: common/tool/actions.cpp:579
 msgid "Edit the global and project symbol library lists"
 msgstr "编辑全局和工程符号库表"
 
-#: common/tool/actions.cpp:591
+#: common/tool/actions.cpp:584
 msgid "Manage Footprint Libraries..."
 msgstr "管理封装库..."
 
-#: common/tool/actions.cpp:592
+#: common/tool/actions.cpp:585
 msgid "Edit the global and project footprint library lists"
 msgstr "编辑全局和项目封装库列表"
 
-#: common/tool/actions.cpp:597
+#: common/tool/actions.cpp:590
 msgid "Getting Started with KiCad"
 msgstr "KiCad 入门指南"
 
-#: common/tool/actions.cpp:598
+#: common/tool/actions.cpp:591
 msgid "Open \"Getting Started in KiCad\" guide for beginners"
 msgstr "打开“KiCad 入门指南”手册"
 
-#: common/tool/actions.cpp:603
+#: common/tool/actions.cpp:596
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:594
 msgid "Help"
 msgstr "帮助"
 
-#: common/tool/actions.cpp:604
+#: common/tool/actions.cpp:597
 msgid "Open product documentation in a web browser"
 msgstr "在 Web 浏览器中打开产品文档"
 
-#: common/tool/actions.cpp:610
+#: common/tool/actions.cpp:603
 msgid "List Hotkeys..."
 msgstr "快捷键列表..."
 
-#: common/tool/actions.cpp:611
+#: common/tool/actions.cpp:604
 msgid "Displays current hotkeys table and corresponding commands"
 msgstr "显示当前快捷键表和相应命令"
 
-#: common/tool/actions.cpp:616
+#: common/tool/actions.cpp:609
 msgid "Get Involved"
 msgstr "参与 KiCad"
 
-#: common/tool/actions.cpp:617
+#: common/tool/actions.cpp:610
 msgid "Open \"Contribute to KiCad\" in a web browser"
 msgstr "在 Web 浏览器中打开“参与 KiCad”"
 
-#: common/tool/actions.cpp:622
+#: common/tool/actions.cpp:615
 msgid "Report Bug"
 msgstr "报告 Bug"
 
@@ -5527,8 +5733,8 @@ msgstr "Y 轴的镜像尚不支持"
 msgid "Footprint not found"
 msgstr "封装没有找到"
 
-#: common/widgets/footprint_select_widget.cpp:80 cvpcb/cvpcb_mainframe.cpp:743
-#: pcbnew/footprint_edit_frame.cpp:770 pcbnew/load_select_footprint.cpp:207
+#: common/widgets/footprint_select_widget.cpp:80 cvpcb/cvpcb_mainframe.cpp:748
+#: pcbnew/footprint_edit_frame.cpp:773 pcbnew/load_select_footprint.cpp:207
 msgid "Loading Footprint Libraries"
 msgstr "载入封装库"
 
@@ -5541,84 +5747,109 @@ msgstr "没有默认的封装"
 msgid "Other..."
 msgstr "其它..."
 
-#: common/widgets/gal_options_panel.cpp:73
+#: common/widgets/gal_options_panel.cpp:80
 msgid "Grid Options"
 msgstr "网格选项"
 
-#: common/widgets/gal_options_panel.cpp:78
+#: common/widgets/gal_options_panel.cpp:85
 msgid "Dots"
 msgstr "点"
 
-#: common/widgets/gal_options_panel.cpp:79
+#: common/widgets/gal_options_panel.cpp:86
 msgid "Lines"
 msgstr "线"
 
-#: common/widgets/gal_options_panel.cpp:80
+#: common/widgets/gal_options_panel.cpp:87
 msgid "Small crosses"
 msgstr "小十字"
 
-#: common/widgets/gal_options_panel.cpp:84
+#: common/widgets/gal_options_panel.cpp:91
 msgid "Grid Style"
 msgstr "网格样式"
 
-#: common/widgets/gal_options_panel.cpp:96
+#: common/widgets/gal_options_panel.cpp:103
 msgid "Grid thickness:"
 msgstr "网格大小："
 
-#: common/widgets/gal_options_panel.cpp:107
-#: common/widgets/gal_options_panel.cpp:123
+#: common/widgets/gal_options_panel.cpp:114
+#: common/widgets/gal_options_panel.cpp:130
+#: common/widgets/gal_options_panel.cpp:146
 msgid "px"
 msgstr "像素"
 
-#: common/widgets/gal_options_panel.cpp:112
+#: common/widgets/gal_options_panel.cpp:119
 msgid "Min grid spacing:"
 msgstr "最小网格间距："
 
-#: common/widgets/gal_options_panel.cpp:137
+#: common/widgets/gal_options_panel.cpp:134
+msgid "Snap to Grid:"
+msgstr "对齐网格："
+
+#: common/widgets/gal_options_panel.cpp:138
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
+#: pcbnew/dialogs/panel_edit_options_base.cpp:100
+#: pcbnew/dialogs/panel_edit_options_base.cpp:114
+#: pcbnew/dialogs/panel_edit_options_base.cpp:128
+msgid "Always"
+msgstr "总是"
+
+#: common/widgets/gal_options_panel.cpp:138
+msgid "When grid shown"
+msgstr "当网格显示时"
+
+#: common/widgets/gal_options_panel.cpp:138
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
+#: pcbnew/dialogs/panel_edit_options_base.cpp:100
+#: pcbnew/dialogs/panel_edit_options_base.cpp:114
+#: pcbnew/dialogs/panel_edit_options_base.cpp:128
+msgid "Never"
+msgstr "从不"
+
+#: common/widgets/gal_options_panel.cpp:163
 msgid "Cursor Options"
 msgstr "光标选项"
 
-#: common/widgets/gal_options_panel.cpp:142
+#: common/widgets/gal_options_panel.cpp:168
 msgid "Small crosshair"
 msgstr "小十字"
 
-#: common/widgets/gal_options_panel.cpp:143
+#: common/widgets/gal_options_panel.cpp:169
 msgid "Full window crosshair"
 msgstr "十字光标全屏"
 
-#: common/widgets/gal_options_panel.cpp:148
+#: common/widgets/gal_options_panel.cpp:174
 msgid "Cursor Shape"
 msgstr "光标形状"
 
-#: common/widgets/gal_options_panel.cpp:153
+#: common/widgets/gal_options_panel.cpp:179
 msgid "Cursor shape for drawing, placement and movement tools"
 msgstr "用于绘图，放置和移动工具的光标形状"
 
-#: common/widgets/gal_options_panel.cpp:156
+#: common/widgets/gal_options_panel.cpp:182
 msgid "Always show crosshairs"
 msgstr "始终显示十字光标"
 
-#: common/widgets/grid_text_button_helpers.cpp:343
+#: common/widgets/grid_text_button_helpers.cpp:348
 msgid "Select a File"
 msgstr "选择一个文件"
 
-#: common/widgets/mathplot.cpp:1725
+#: common/widgets/mathplot.cpp:1760
 msgid "Center plot view to this position"
 msgstr "居中绘制视图"
 
-#: common/widgets/mathplot.cpp:1726 eeschema/sim/sim_plot_frame_base.cpp:87
+#: common/widgets/mathplot.cpp:1761 eeschema/sim/sim_plot_frame_base.cpp:87
 msgid "Fit on Screen"
 msgstr "适应屏幕"
 
-#: common/widgets/mathplot.cpp:1726
+#: common/widgets/mathplot.cpp:1761
 msgid "Set plot view to show all items"
 msgstr "设置绘制视图以显示所有项目"
 
-#: common/widgets/mathplot.cpp:1727
+#: common/widgets/mathplot.cpp:1762
 msgid "Zoom in plot view."
 msgstr "放大绘制视图。"
 
-#: common/widgets/mathplot.cpp:1728
+#: common/widgets/mathplot.cpp:1763
 msgid "Zoom out plot view."
 msgstr "缩小绘制视图。"
 
@@ -5631,16 +5862,16 @@ msgid "<create net>"
 msgstr "< 创建网络 >"
 
 #: common/widgets/net_selector.cpp:75
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:597
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:636
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:602
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:641
 msgid "Filter:"
 msgstr "筛选："
 
-#: common/widgets/paged_dialog.cpp:66
+#: common/widgets/paged_dialog.cpp:68
 #: 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
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1098
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1430
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1706
 msgid "Reset to Defaults"
 msgstr "重置为默认值"
 
@@ -5654,58 +5885,58 @@ msgstr "%s 必须至少为 %s 。"
 msgid "%s must be less than %s."
 msgstr "%s 必须小于 %s 。"
 
-#: common/widgets/widget_hotkey_list.cpp:107
+#: common/widgets/widget_hotkey_list.cpp:93
 msgid "Press a new hotkey, or press Esc to cancel..."
 msgstr "按下新的快捷键，或按 ESC 取消..."
 
-#: common/widgets/widget_hotkey_list.cpp:114
+#: common/widgets/widget_hotkey_list.cpp:100
 msgid "Command:"
 msgstr "命令："
 
-#: common/widgets/widget_hotkey_list.cpp:122
+#: common/widgets/widget_hotkey_list.cpp:108
 msgid "Current key:"
 msgstr "当前快捷键："
 
-#: common/widgets/widget_hotkey_list.cpp:216
+#: common/widgets/widget_hotkey_list.cpp:202
 msgid "Set Hotkey"
 msgstr "设置快捷键"
 
-#: common/widgets/widget_hotkey_list.cpp:400
+#: common/widgets/widget_hotkey_list.cpp:384
 msgid "Edit..."
 msgstr "编辑..."
 
-#: common/widgets/widget_hotkey_list.cpp:401
+#: common/widgets/widget_hotkey_list.cpp:385
 msgid "Undo Changes"
 msgstr "撤销更改"
 
-#: common/widgets/widget_hotkey_list.cpp:402
+#: common/widgets/widget_hotkey_list.cpp:386
 msgid "Clear Assigned Hotkey"
 msgstr "清除分配的快捷键"
 
-#: common/widgets/widget_hotkey_list.cpp:403
+#: common/widgets/widget_hotkey_list.cpp:387
 msgid "Restore Default"
 msgstr "重置为默认值"
 
-#: common/widgets/widget_hotkey_list.cpp:527
+#: common/widgets/widget_hotkey_list.cpp:425
 #, c-format
 msgid ""
 "\"%s\" is already assigned to \"%s\" in section \"%s\". Are you sure you "
 "want to change its assignment?"
 msgstr "\"%s\" 已经指定给 \"%s\" ，在 \"%s\" 部分。你确定修改指定吗？"
 
-#: common/widgets/widget_hotkey_list.cpp:533
+#: common/widgets/widget_hotkey_list.cpp:431
 msgid "Confirm change"
 msgstr "确认修改"
 
-#: common/widgets/widget_hotkey_list.cpp:555
+#: common/widgets/widget_hotkey_list.cpp:451
 msgid "Command"
 msgstr "命令"
 
-#: common/widgets/widget_hotkey_list.cpp:558
+#: common/widgets/widget_hotkey_list.cpp:454
 msgid "(double-click to edit)"
 msgstr "(双击编辑)"
 
-#: common/widgets/widget_hotkey_list.cpp:561
+#: common/widgets/widget_hotkey_list.cpp:457
 msgid "Hotkey"
 msgstr "快捷键"
 
@@ -5770,7 +6001,7 @@ msgid "Gerber files"
 msgstr "Gerber 文件"
 
 #: common/wildcards_and_files_ext.cpp:264
-#: common/wildcards_and_files_ext.cpp:301
+#: common/wildcards_and_files_ext.cpp:305
 msgid "KiCad printed circuit board files"
 msgstr "KiCad PCB 文件"
 
@@ -5778,155 +6009,159 @@ msgstr "KiCad PCB 文件"
 msgid "Eagle ver. 6.x XML PCB files"
 msgstr "Eagle ver. 6.x XML PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:276
+#: common/wildcards_and_files_ext.cpp:275
+msgid "CADSTAR PCB Archive files"
+msgstr "CADSTAR PCB 压缩文件"
+
+#: common/wildcards_and_files_ext.cpp:280
 msgid "P-Cad 200x ASCII PCB files"
 msgstr "P-Cad 200x ASCII PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:281
+#: common/wildcards_and_files_ext.cpp:285
 msgid "Altium Designer PCB files"
 msgstr "Altium Designer PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:286
+#: common/wildcards_and_files_ext.cpp:290
 msgid "Altium Circuit Studio PCB files"
 msgstr "Altium Circuit Studio PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:291
+#: common/wildcards_and_files_ext.cpp:295
 msgid "Altium Circuit Maker PCB files"
 msgstr "Altium Circuit Maker PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:296
+#: common/wildcards_and_files_ext.cpp:300
 msgid "Fabmaster PCB files"
 msgstr "Fabmaster PCB 文件"
 
-#: common/wildcards_and_files_ext.cpp:307
+#: common/wildcards_and_files_ext.cpp:311
 msgid "KiCad footprint files"
 msgstr "KiCad 封装文件"
 
-#: common/wildcards_and_files_ext.cpp:313
+#: common/wildcards_and_files_ext.cpp:317
 msgid "KiCad footprint library paths"
 msgstr "KiCad 封装库路径"
 
-#: common/wildcards_and_files_ext.cpp:319
+#: common/wildcards_and_files_ext.cpp:323
 msgid "Legacy footprint library files"
 msgstr "旧的封装库文件"
 
-#: common/wildcards_and_files_ext.cpp:325
+#: common/wildcards_and_files_ext.cpp:329
 msgid "Eagle ver. 6.x XML library files"
 msgstr "Eagle ver. 6.x XML 库文件"
 
-#: common/wildcards_and_files_ext.cpp:331
+#: common/wildcards_and_files_ext.cpp:335
 msgid "Geda PCB footprint library files"
 msgstr "Geda PCB 封装库文件"
 
-#: common/wildcards_and_files_ext.cpp:337
+#: common/wildcards_and_files_ext.cpp:341
 msgid "Page layout design files"
 msgstr "图框设计文件"
 
-#: common/wildcards_and_files_ext.cpp:344
+#: common/wildcards_and_files_ext.cpp:348
 msgid "KiCad symbol footprint link files"
 msgstr "KiCad 符号封装链接文件"
 
-#: common/wildcards_and_files_ext.cpp:351 gerbview/files.cpp:68
+#: common/wildcards_and_files_ext.cpp:355 gerbview/files.cpp:68
 msgid "Drill files"
 msgstr "钻孔文件"
 
-#: common/wildcards_and_files_ext.cpp:357
+#: common/wildcards_and_files_ext.cpp:361
 msgid "SVG files"
 msgstr "SVG 文件"
 
-#: common/wildcards_and_files_ext.cpp:363
+#: common/wildcards_and_files_ext.cpp:367
 msgid "HTML files"
 msgstr "HTML 文件"
 
-#: common/wildcards_and_files_ext.cpp:369
+#: common/wildcards_and_files_ext.cpp:373
 msgid "CSV Files"
 msgstr "CSV 文件"
 
-#: common/wildcards_and_files_ext.cpp:375
+#: common/wildcards_and_files_ext.cpp:379
 msgid "Portable document format files"
 msgstr "便携式文档格式文件 (*.PDF)"
 
-#: common/wildcards_and_files_ext.cpp:381
+#: common/wildcards_and_files_ext.cpp:385
 msgid "PostScript files"
 msgstr "PostScript 文件"
 
-#: common/wildcards_and_files_ext.cpp:387
+#: common/wildcards_and_files_ext.cpp:391
 msgid "Report files"
 msgstr "报告文件"
 
-#: common/wildcards_and_files_ext.cpp:393
+#: common/wildcards_and_files_ext.cpp:397
 msgid "Footprint place files"
 msgstr "封装位置文件"
 
-#: common/wildcards_and_files_ext.cpp:399
+#: common/wildcards_and_files_ext.cpp:403
 msgid "VRML and X3D files"
 msgstr "VRML 和 X3D 文件"
 
-#: common/wildcards_and_files_ext.cpp:405
+#: common/wildcards_and_files_ext.cpp:409
 msgid "IDFv3 footprint files"
 msgstr "IDFv3 封装文件"
 
-#: common/wildcards_and_files_ext.cpp:411
+#: common/wildcards_and_files_ext.cpp:415
 msgid "Text files"
 msgstr "文本文件"
 
-#: common/wildcards_and_files_ext.cpp:417
+#: common/wildcards_and_files_ext.cpp:421
 msgid "Legacy footprint export files"
 msgstr "旧的封装导出文件"
 
-#: common/wildcards_and_files_ext.cpp:423
+#: common/wildcards_and_files_ext.cpp:427
 msgid "Electronic rule check file"
 msgstr "电气规则检查文件"
 
-#: common/wildcards_and_files_ext.cpp:429
+#: common/wildcards_and_files_ext.cpp:433
 msgid "Spice library file"
 msgstr "Spice 库文件"
 
-#: common/wildcards_and_files_ext.cpp:435
+#: common/wildcards_and_files_ext.cpp:439
 msgid "SPICE netlist file"
 msgstr "SPICE 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:441
+#: common/wildcards_and_files_ext.cpp:445
 msgid "CadStar netlist file"
 msgstr "CadStar 网表文件"
 
-#: common/wildcards_and_files_ext.cpp:447
+#: common/wildcards_and_files_ext.cpp:451
 msgid "Symbol footprint association files"
 msgstr "符号封装关联文件"
 
-#: common/wildcards_and_files_ext.cpp:453
+#: common/wildcards_and_files_ext.cpp:457
 msgid "Zip file"
 msgstr "Zip 文件"
 
-#: common/wildcards_and_files_ext.cpp:459
+#: common/wildcards_and_files_ext.cpp:463
 msgid "GenCAD 1.4 board files"
 msgstr "GenCAD 1.4 线路板文件"
 
-#: common/wildcards_and_files_ext.cpp:465
+#: common/wildcards_and_files_ext.cpp:469
 msgid "DXF Files"
 msgstr "DXF 文件"
 
-#: common/wildcards_and_files_ext.cpp:471
+#: common/wildcards_and_files_ext.cpp:475
 msgid "Gerber job file"
 msgstr "Gerber 工作文件"
 
-#: common/wildcards_and_files_ext.cpp:477
+#: common/wildcards_and_files_ext.cpp:481
 msgid "Specctra DSN file"
 msgstr "Specctra DSN 文件"
 
-#: common/wildcards_and_files_ext.cpp:483
+#: common/wildcards_and_files_ext.cpp:487
 msgid "IPC-D-356 Test Files"
 msgstr "IPC-D-356 测试文件"
 
-#: common/wildcards_and_files_ext.cpp:489
+#: common/wildcards_and_files_ext.cpp:493
 msgid "Workbook file"
 msgstr "工作簿文件"
 
-#: common/wildcards_and_files_ext.cpp:495
+#: common/wildcards_and_files_ext.cpp:499
 msgid "PNG file"
 msgstr "PNG 文件"
 
-#: common/wildcards_and_files_ext.cpp:501
+#: common/wildcards_and_files_ext.cpp:505
 msgid "Jpeg file"
 msgstr "JPEG 文件"
 
@@ -5980,89 +6215,89 @@ msgstr ""
 msgid "An error occurred attempting to load the global footprint library table"
 msgstr "尝试加载全局封装库表时发生错误"
 
-#: cvpcb/cvpcb_mainframe.cpp:59 cvpcb/menubar.cpp:51
+#: cvpcb/cvpcb_mainframe.cpp:60 cvpcb/menubar.cpp:51
 msgid "Assign Footprints"
 msgstr "分配封装"
 
-#: cvpcb/cvpcb_mainframe.cpp:98 pcbnew/dialogs/panel_fp_lib_table.cpp:1031
+#: cvpcb/cvpcb_mainframe.cpp:99 pcbnew/dialogs/panel_fp_lib_table.cpp:1033
 msgid "Footprint Libraries"
 msgstr "封装库"
 
-#: cvpcb/cvpcb_mainframe.cpp:102
+#: cvpcb/cvpcb_mainframe.cpp:103
 msgid "Symbol : Footprint Assignments"
 msgstr "符号：封装分配"
 
-#: cvpcb/cvpcb_mainframe.cpp:105
+#: cvpcb/cvpcb_mainframe.cpp:106
 msgid "Filtered Footprints"
 msgstr "筛选的封装"
 
-#: cvpcb/cvpcb_mainframe.cpp:141
+#: cvpcb/cvpcb_mainframe.cpp:142
 #: eeschema/dialogs/dialog_fields_editor_global_base.cpp:105
 msgid "Apply, Save Schematic && Continue"
 msgstr "应用，保存原理图并继续"
 
-#: cvpcb/cvpcb_mainframe.cpp:170
+#: cvpcb/cvpcb_mainframe.cpp:171
 msgid "Symbol to footprint changes are unsaved"
 msgstr "封装更改的符号未保存"
 
-#: cvpcb/cvpcb_mainframe.cpp:348
+#: cvpcb/cvpcb_mainframe.cpp:350
 msgid "Symbol to Footprint links have been modified. Save changes?"
 msgstr "符号和封装关联已经更改。保存更改吗?"
 
-#: cvpcb/cvpcb_mainframe.cpp:481 cvpcb/tools/cvpcb_association_tool.cpp:218
+#: cvpcb/cvpcb_mainframe.cpp:482 cvpcb/tools/cvpcb_association_tool.cpp:218
 #, c-format
 msgid "\"%s\" is not a valid footprint."
 msgstr "\"%s\" 不是有效的封装。"
 
-#: cvpcb/cvpcb_mainframe.cpp:629
+#: cvpcb/cvpcb_mainframe.cpp:634
 msgid "key words"
 msgstr "关键词"
 
-#: cvpcb/cvpcb_mainframe.cpp:645
+#: cvpcb/cvpcb_mainframe.cpp:650
 msgid "pin count"
 msgstr "引脚数"
 
-#: cvpcb/cvpcb_mainframe.cpp:658
+#: cvpcb/cvpcb_mainframe.cpp:663 eeschema/dialogs/dialog_change_symbols.cpp:57
 msgid "library"
 msgstr "库"
 
-#: cvpcb/cvpcb_mainframe.cpp:671
+#: cvpcb/cvpcb_mainframe.cpp:676
 msgid "search text"
 msgstr "搜索文本"
 
-#: cvpcb/cvpcb_mainframe.cpp:675
+#: cvpcb/cvpcb_mainframe.cpp:680
 msgid "No filtering"
 msgstr "不筛选"
 
-#: cvpcb/cvpcb_mainframe.cpp:677
+#: cvpcb/cvpcb_mainframe.cpp:682
 #, c-format
 msgid "Filtered by %s"
 msgstr "筛选 %s"
 
-#: cvpcb/cvpcb_mainframe.cpp:691
+#: cvpcb/cvpcb_mainframe.cpp:696
 #, c-format
 msgid "Description: %s;  Key words: %s"
 msgstr "描述：%s；  关键字：%s"
 
-#: cvpcb/cvpcb_mainframe.cpp:723
+#: cvpcb/cvpcb_mainframe.cpp:728
 #, c-format
 msgid "Library location: %s"
 msgstr "库位置：%s"
 
-#: cvpcb/cvpcb_mainframe.cpp:725
+#: cvpcb/cvpcb_mainframe.cpp:730
 msgid "Library location: unknown"
 msgstr "库位置：未知"
 
-#: cvpcb/cvpcb_mainframe.cpp:738
+#: cvpcb/cvpcb_mainframe.cpp:743
 msgid ""
 "No PCB footprint libraries are listed in the current footprint library table."
 msgstr "在当前封装库表中没有列出 PCB 封装库。"
 
-#: cvpcb/cvpcb_mainframe.cpp:739
+#: cvpcb/cvpcb_mainframe.cpp:744
 msgid "Configuration Error"
 msgstr "配置错误"
 
-#: cvpcb/cvpcb_mainframe.cpp:806
+#: cvpcb/cvpcb_mainframe.cpp:811
 #, c-format
 msgid ""
 "Error loading schematic.\n"
@@ -6097,7 +6332,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:861
+#: eeschema/libedit/lib_edit_frame.cpp:880
 msgid "Add"
 msgstr "添加"
 
@@ -6169,28 +6404,28 @@ msgstr "封装分配冲突"
 msgid "Footprint Viewer"
 msgstr "封装浏览"
 
-#: cvpcb/display_footprints_frame.cpp:370
+#: cvpcb/display_footprints_frame.cpp:365
 #, c-format
 msgid "Footprint ID \"%s\" is not valid."
 msgstr "封装 ID \"%s\" 无效。"
 
-#: cvpcb/display_footprints_frame.cpp:385
+#: cvpcb/display_footprints_frame.cpp:380
 #, c-format
 msgid "Library \"%s\" is not in the footprint library table."
 msgstr "在封装库表中未找到 \"%s\" 库。"
 
-#: cvpcb/display_footprints_frame.cpp:394
-#: cvpcb/display_footprints_frame.cpp:416
+#: cvpcb/display_footprints_frame.cpp:389
+#: cvpcb/display_footprints_frame.cpp:411
 #, c-format
 msgid "Footprint \"%s\" not found."
 msgstr "封装 \"%s\" 没有找到。"
 
-#: cvpcb/display_footprints_frame.cpp:446 pcbnew/class_module.cpp:707
+#: cvpcb/display_footprints_frame.cpp:441 pcbnew/class_module.cpp:718
 #, c-format
 msgid "Footprint: %s"
 msgstr "封装：%s"
 
-#: cvpcb/display_footprints_frame.cpp:457
+#: cvpcb/display_footprints_frame.cpp:452
 #, c-format
 msgid "Lib: %s"
 msgstr "库：%s"
@@ -6343,32 +6578,32 @@ msgstr "按库筛选封装列表"
 msgid "Delete all associations?"
 msgstr "是否删除所有关联？"
 
-#: eeschema/annotate.cpp:133
+#: eeschema/annotate.cpp:128
 #, c-format
 msgid "%d duplicate time stamps were found and replaced."
 msgstr "找到并替换 %d 个重复的时间戳。"
 
-#: eeschema/annotate.cpp:223
+#: eeschema/annotate.cpp:218
 #, c-format
 msgid "Updated %s (unit %s) from %s to %s"
 msgstr "更新 %s， (单元 %s) 从 %s 到 %s"
 
-#: eeschema/annotate.cpp:229
+#: eeschema/annotate.cpp:224
 #, c-format
 msgid "Updated %s from %s to %s"
 msgstr "更新 %s， 从 %s 到 %s"
 
-#: eeschema/annotate.cpp:237
+#: eeschema/annotate.cpp:232
 #, c-format
 msgid "Annotated %s (unit %s) as %s"
 msgstr "批注 %s (单元 %s)为 %s"
 
-#: eeschema/annotate.cpp:242
+#: eeschema/annotate.cpp:237
 #, c-format
 msgid "Annotated %s as %s"
 msgstr "批注 %s 为 %s"
 
-#: eeschema/annotate.cpp:252
+#: eeschema/annotate.cpp:247
 msgid "Annotation complete."
 msgstr "标注完成。"
 
@@ -6393,7 +6628,7 @@ msgstr ""
 "库 \"%s\" 有重复的条目名 \"%s\"。\n"
 "在载入元件到原理图时,可能会导致一些异常情况。"
 
-#: eeschema/class_library.cpp:498 eeschema/libedit/lib_edit_frame.cpp:771
+#: eeschema/class_library.cpp:498 eeschema/libedit/lib_edit_frame.cpp:790
 #: eeschema/symbol_tree_model_adapter.cpp:64
 msgid "Loading Symbol Libraries"
 msgstr "加载符号库"
@@ -6452,7 +6687,7 @@ 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/connection_graph.cpp:2613
+#: eeschema/connection_graph.cpp:2612
 #, c-format
 msgid "Sheet port %s has no matching hierarchical label inside the sheet"
 msgstr "图框端口 %s 在图框内没有匹配的分层标签"
@@ -7005,82 +7240,134 @@ msgstr "总线别名名称"
 msgid "Net or Bus Name"
 msgstr "网络或总线名称"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:48
-#: eeschema/dialogs/dialog_change_symbols.cpp:310
+#: eeschema/dialogs/dialog_change_symbols.cpp:55
+#: eeschema/dialogs/dialog_change_symbols.cpp:56
+#: eeschema/dialogs/dialog_change_symbols.cpp:354
 #: eeschema/dialogs/dialog_update_from_pcb_base.cpp:49
 #: pcbnew/dialogs/dialog_exchange_footprints.cpp:70
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:362
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:71
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:375
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:207
 msgid "Update"
 msgstr "更新"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:48
-#: eeschema/dialogs/dialog_change_symbols.cpp:310
+#: eeschema/dialogs/dialog_change_symbols.cpp:55
+#: eeschema/dialogs/dialog_change_symbols.cpp:354
 #: pcbnew/dialogs/dialog_exchange_footprints.cpp:70
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:362
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:375
 msgid "Change"
 msgstr "修改"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:55
+#: eeschema/dialogs/dialog_change_symbols.cpp:56
+#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:109
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:71
+#: pcbnew/dialogs/dialog_move_exact_base.cpp:35
+#: pcbnew/dialogs/dialog_move_exact_base.cpp:49
+#: pcbnew/dialogs/dialog_move_exact_base.cpp:63
+#: pcbnew/dialogs/dialog_position_relative_base.cpp:81
+#: pcbnew/dialogs/dialog_position_relative_base.cpp:98
+msgid "Reset"
+msgstr "重置"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:57
+msgid "new"
+msgstr "新的"
+
+#: eeschema/dialogs/dialog_change_symbols.cpp:64
 msgid "Update Symbol(s) from Library"
 msgstr "从库中更新符号"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:60
+#: eeschema/dialogs/dialog_change_symbols.cpp:69
 msgid "Change Symbol(s)"
 msgstr "更改符号"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:309
+#: eeschema/dialogs/dialog_change_symbols.cpp:353
 #, c-format
 msgid "%s %s \"%s\" from \"%s\" to \"%s\""
 msgstr "%s %s \"%s\" 从 \"%s\" 到 \"%s\""
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:311
+#: eeschema/dialogs/dialog_change_symbols.cpp:355
 #: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:31
 msgid "symbol"
 msgstr "符号"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:311
+#: eeschema/dialogs/dialog_change_symbols.cpp:355
 msgid "symbols"
 msgstr "符号"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:320
+#: eeschema/dialogs/dialog_change_symbols.cpp:364
 msgid "*** symbol not found ***"
 msgstr "*** 符号没有找到 ***"
 
-#: eeschema/dialogs/dialog_change_symbols.cpp:329
+#: eeschema/dialogs/dialog_change_symbols.cpp:373
 msgid "*** new symbol has too few units ***"
 msgstr "*** 新符号的单元太少 ***"
 
-#: eeschema/dialogs/dialog_change_symbols_base.cpp:24
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:27
 #, c-format
 msgid "%s all symbols in schematic"
 msgstr "%s 原理图中的所有符号"
 
-#: eeschema/dialogs/dialog_change_symbols_base.cpp:27
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:30
 #, c-format
 msgid "%s selected symbol"
 msgstr "%s 选择符号"
 
-#: eeschema/dialogs/dialog_change_symbols_base.cpp:30
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:33
 #, c-format
 msgid "%s by reference:"
 msgstr "%s (按位号)："
 
-#: eeschema/dialogs/dialog_change_symbols_base.cpp:36
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:39
 #, c-format
 msgid "%s by value:"
 msgstr "%s (按值)："
 
-#: eeschema/dialogs/dialog_change_symbols_base.cpp:42
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:45
 #, c-format
 msgid "%s by library indentifier:"
 msgstr "%s (按库标识符)："
 
-#: eeschema/dialogs/dialog_change_symbols_base.cpp:60
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:72
 msgid "New library identifier:"
 msgstr "新库标识符："
 
-#: eeschema/dialogs/dialog_change_symbols_base.h:75
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:91
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:94
+msgid "Update Options"
+msgstr "更新选项"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:93
+#, c-format
+msgid "Remove fields which are not in %s symbol"
+msgstr "删除不在 %s 符号中的字段"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:94
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:97
+msgid "Removes fields that do not occur in the original library symbols"
+msgstr "删除原始库符号中不存在的字段"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:98
+#, c-format
+msgid "Reset fields which are empty in %s symbol"
+msgstr "重置以 %s 符号为空的字段"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:104
+#, c-format
+msgid "%s field visibilities"
+msgstr "%s 字段可见性"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:107
+#, c-format
+msgid "%s field sizes and styles"
+msgstr "%s 字段大小和样式"
+
+#: eeschema/dialogs/dialog_change_symbols_base.cpp:110
+#, c-format
+msgid "%s field positions"
+msgstr "%s 字段位置"
+
+#: eeschema/dialogs/dialog_change_symbols_base.h:85
 #: pcbnew/dialogs/dialog_exchange_footprints_base.h:86
 #, c-format
 msgid "%s"
@@ -7108,7 +7395,7 @@ msgid "Sequentially place all units of the symbol."
 msgstr "按顺序放置符号的所有单元。"
 
 #: eeschema/dialogs/dialog_choose_component.cpp:385
-#: eeschema/widgets/symbol_preview_widget.cpp:178
+#: eeschema/widgets/symbol_preview_widget.cpp:182
 #, c-format
 msgid ""
 "Error loading symbol %s from library %s.\n"
@@ -7144,69 +7431,69 @@ msgstr ""
 msgid "No symbol selected"
 msgstr "没有选择符号"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:222
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:332
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:224
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:531
 msgid "References must start with a letter."
 msgstr "位号必须以字母开头。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:242
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:385
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:244
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:547
 #: eeschema/dialogs/dialog_sch_sheet_props.cpp:189
 msgid "Fields must have a name."
 msgstr "字段必须要有名称。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:259
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:261
 msgid "Aliased symbol must have a parent selected"
 msgstr "带别名的符号必须选择父级"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:267
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:269
 msgid "Delete extra units from symbol?"
 msgstr "是否删除符号多余单元?"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:273
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:275
 msgid "Add new pins for alternate body style (DeMorgan) to symbol?"
 msgstr "添加新的引脚到符号的备用主体 (德摩根)？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:278
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:280
 msgid "Delete alternate body style (DeMorgan) draw items from symbol?"
 msgstr "确定从符号中删除备用主体样式 (德摩根) 的图形项目？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:303
-#: eeschema/libedit/libedit.cpp:520
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:305
+#: eeschema/libedit/libedit.cpp:555
 #, 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:413
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:580
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:418
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:738
 #, c-format
 msgid "The name '%s' is already in use."
 msgstr "名称 '%s' 已经在使用中。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:480
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:630
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:485
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:788
 #: eeschema/dialogs/dialog_sch_sheet_props.cpp:652
 #, c-format
 msgid "The first %d fields are mandatory."
 msgstr "首字段 %d 是必填字段。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:597
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:602
 msgid "Add Footprint Filter"
 msgstr "添加封装筛选"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:636
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:641
 msgid "Edit Footprint Filter"
 msgstr "编辑封装筛选"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:30
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:22
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:27
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:24
 msgid "Fields"
 msgstr "字段"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:58
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:50
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:687
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:55
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:697
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:52
 #: eeschema/fields_grid_table.cpp:197
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:54
@@ -7220,37 +7507,35 @@ msgid "Show"
 msgstr "显示"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:59
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:51
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:56
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:53
 #: eeschema/fields_grid_table.cpp:198
 msgid "H Align"
 msgstr "水平排列"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:60
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:52
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:57
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:54
 #: eeschema/fields_grid_table.cpp:199
 msgid "V Align"
 msgstr "垂直排列"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:63
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:55
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:60
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:57
 #: eeschema/fields_grid_table.cpp:202
 msgid "Text Size"
 msgstr "文本大小"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:64
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:56
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:189
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:61
 #: eeschema/dialogs/dialog_edit_label_base.cpp:120
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:65
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:48
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:42
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:58
-#: eeschema/fields_grid_table.cpp:203 eeschema/lib_pin.cpp:999
-#: eeschema/sch_pin.cpp:174 eeschema/sch_text.cpp:644
-#: pcbnew/class_module.cpp:1719 pcbnew/class_pad.cpp:1345
+#: eeschema/fields_grid_table.cpp:203 eeschema/lib_pin.cpp:1018
+#: eeschema/sch_pin.cpp:178 eeschema/sch_text.cpp:645
+#: pcbnew/class_module.cpp:1739 pcbnew/class_pad.cpp:1365
 #: 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
@@ -7259,33 +7544,31 @@ msgid "Orientation"
 msgstr "方向"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:65
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:57
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:62
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:69
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:52
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:46
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:59
 #: eeschema/fields_grid_table.cpp:204
 msgid "X Position"
 msgstr "X 坐标"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:66
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:58
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:63
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:70
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:53
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:47
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:60
 #: eeschema/fields_grid_table.cpp:205
 msgid "Y Position"
 msgstr "Y 坐标"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:85
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:78
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:83
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:80
 msgid "Add field"
 msgstr "添加字段"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:90
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:83
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:88
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:85
 #: eeschema/dialogs/panel_sym_lib_table_base.cpp:147
 #: pcbnew/dialogs/panel_fp_lib_table_base.cpp:144
@@ -7293,7 +7576,7 @@ msgid "Move up"
 msgstr "上移"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:95
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:88
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:93
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:90
 #: eeschema/dialogs/panel_sym_lib_table_base.cpp:152
 #: pcbnew/dialogs/panel_fp_lib_table_base.cpp:149
@@ -7301,13 +7584,13 @@ msgid "Move down"
 msgstr "下移"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:103
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:96
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:101
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:98
 msgid "Delete field"
 msgstr "删除字段"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:123
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:32
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:33
 msgid "Symbol name:"
 msgstr "符号名称："
 
@@ -7348,8 +7631,8 @@ msgstr ""
 "根符号。"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:168
-msgid "Has alternate symbol (DeMorgan)"
-msgstr "有备用符号 (德摩根)"
+msgid "Has alternate body style (DeMorgan)"
+msgstr "有不同的主体风格 (德摩根)"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:169
 msgid "Check this option if the symbol has an alternate body style (De Morgan)"
@@ -7371,49 +7654,62 @@ msgstr ""
 "在 Eeschema 中编辑。 该符号将不包括在\n"
 "BOM 中，并且无法分配封装。"
 
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:178
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:80
+msgid "Exclude from schematic bill of materials"
+msgstr "从原理图 BOM 表中排除"
+
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:181
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:199
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:83
+msgid "Exclude from board"
+msgstr "从电路板中排除"
+
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:187
 msgid "Number of Units:"
 msgstr "单元数量："
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:183
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:189
 msgid "Enter the number of units for a symbol that contains more than one unit"
 msgstr "为包含多个单元的元件输入单元数量"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:193
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:199
 msgid "All units are not interchangeable"
 msgstr "所有单元不能互换"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:194
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:200
 msgid ""
 "Check this option when creating multiple unit symbols and all units are not "
 "interchangeable"
 msgstr "创建多单元符号时，勾选这个选项，所有单元都不能互换"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:208
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:214
 msgid "Pin Text Options"
 msgstr "引脚文本选项"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:210
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:216
 msgid "Show pin number"
 msgstr "显示引脚编号"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:212
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:218
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:178
 msgid "Show or hide pin numbers"
 msgstr "显示或隐藏引脚编号"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:216
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:222
 msgid "Show pin name"
 msgstr "显示引脚名称"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:218
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:224
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:184
 msgid "Show or hide pin names"
 msgstr "显示或隐藏引脚名称"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:225
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:231
 msgid "Place pin names inside"
 msgstr "将引脚名称放在里面"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:227
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:233
 msgid ""
 "Check this option to have pin names inside the body and pin number outside.\n"
 "If not checked pins names and pins numbers are outside."
@@ -7421,11 +7717,11 @@ msgstr ""
 "勾选此选项，引脚编号在符号主体外侧，引脚名称在内侧。\n"
 "如果未选中，引脚名称和编号都在外侧。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:234
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:240
 msgid "Position offset:"
 msgstr "位置偏移："
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:236
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:242
 msgid ""
 "Margin (in 0.001 inches) between a pin name position and the component "
 "body.\n"
@@ -7434,7 +7730,7 @@ msgstr ""
 "引脚名称的位置和元件主体之间距离。\n"
 "通常设置为 10 到 40 是比较理想的。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:243
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:249
 #: eeschema/dialogs/dialog_pin_properties_base.cpp:111
 #: eeschema/dialogs/dialog_pin_properties_base.cpp:115
 #: eeschema/dialogs/dialog_pin_properties_base.cpp:119
@@ -7456,7 +7752,9 @@ msgstr ""
 msgid "units"
 msgstr "单元"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:266
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:272
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:118
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:238
 #: eeschema/dialogs/dialog_schematic_setup.cpp:66
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:211
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:103
@@ -7466,11 +7764,11 @@ msgstr "单元"
 msgid "General"
 msgstr "常规"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:274
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:280
 msgid "Footprint filters:"
 msgstr "封装筛选器："
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:276
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:282
 msgid ""
 "A list of footprints names that can be used for this symbol.\n"
 "Footprints names can used wildcards like sm* to allow all footprints names "
@@ -7479,83 +7777,73 @@ msgstr ""
 "可以用于这个符号的封装名称列表。\n"
 "可以使用像 sm* 这样的通配符来允许所有以 sm 开头的封装名称。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:287
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:293
 msgid "Add footprint filter"
 msgstr "添加封装筛选器"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:292
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:298
 msgid "Edit footprint filter"
 msgstr "编辑封装筛选器"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:300
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:306
 msgid "Delete footprint filter"
 msgstr "删除封装筛选器"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:314
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:320
 msgid "Footprint Filters"
 msgstr "封装筛选器"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:327
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:333
 msgid "Edit Spice Model..."
 msgstr "编辑 Spice 模型..."
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.h:107
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.h:110
 msgid "Library Symbol Properties"
 msgstr "库符号属性"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:344
-msgid "Library reference is not valid."
-msgstr "库位号无效。"
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:133
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:61
+#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:44
+#: eeschema/lib_pin.cpp:1004 eeschema/sch_pin.cpp:164
+msgid "Number"
+msgstr "编号"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:364
-#, c-format
-msgid "Symbol \"%s\" not found in library \"%s\"."
-msgstr "符号 \"%s\" 在库中 \"%s\" 没有找到。"
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:134
+msgid "Base Name"
+msgstr "基名称"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:426
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:714
-#: eeschema/tools/sch_edit_tool.cpp:1338
-#, c-format
-msgid "'%s' is not a valid library indentifier."
-msgstr "'%s' 不是有效的库标识符。"
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:135
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:266
+msgid "Alternate Assignment"
+msgstr "备用分配"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:436
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:724
-#: eeschema/tools/sch_edit_tool.cpp:1348
-#, c-format
-msgid "Symbol '%s' not found in symbol library '%s'."
-msgstr "符号 \"%s\" 在符号库中 \"%s\" 没有找到。"
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:136
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:267
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:63
+#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:46
+#: eeschema/dialogs/dialog_pin_properties.cpp:54
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:202
+msgid "Electrical Type"
+msgstr "电气类型"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:103
-#: eeschema/tools/ee_actions.cpp:396
-msgid "Update Fields from Library..."
-msgstr "从库中更新字段..."
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:104
-msgid "Sets fields to the original library values"
-msgstr "将符号字段设置为原始库值"
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:137
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:268
+#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:64
+#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:47
+#: eeschema/dialogs/dialog_pin_properties.cpp:55
+#: eeschema/dialogs/dialog_pin_properties_base.cpp:203
+msgid "Graphic Style"
+msgstr "图形样式"
 
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:126
-msgid "Library Reference:"
-msgstr "库位号："
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:134
-msgid "Name of the symbol in the library to which this symbol is linked"
-msgstr "该符号链接到的库中的符号名称"
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:139
-msgid "Browse library"
-msgstr "浏览库"
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:146
 msgid "Unit:"
 msgstr "单元："
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:160
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:137
 msgid "Alternate symbol (DeMorgan)"
 msgstr "备用符号 (德摩根)"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:161
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:138
 msgid ""
 "Use the alternate shape of this symbol.\n"
 "For gates, this is the \"De Morgan\" conversion"
@@ -7563,32 +7851,16 @@ msgstr ""
 "使用此符号的备用形状。\n"
 "对于门而言，这是“德摩根”转换"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:168
-msgid "Exclude from bill of materials"
-msgstr "从物料清单中排除"
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:142
+#: pcbnew/dialogs/dialog_create_array_base.cpp:241
+#: pcbnew/dialogs/dialog_move_exact.cpp:203
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:120
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:331
+#: pcbnew/dialogs/dialog_position_relative.cpp:161
+msgid "Angle:"
+msgstr "角度："
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:169
-msgid ""
-"This is useful for adding symbols for board footprints such as fiducials\n"
-"and logos that you do not want to appear in the bill of materials export"
-msgstr ""
-"这对于为电路板封装（如基准点）添加符号很有用\n"
-"以及您不想在 BOM 导出中显示的 LOGO"
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:176
-msgid "Exclude from board"
-msgstr "从电路板中排除"
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:177
-msgid ""
-"This is useful for adding symbols that only get exported to the bill of "
-"materials but\n"
-"not required to layout the board such as mechanical fasteners and enclosures"
-msgstr ""
-"这对于添加仅导出到 BOM 表的符号非常有用，但是。\n"
-"不需要布局电路板，如机械插件和外壳"
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:187
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:146
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:97
 #: pcbnew/dialogs/dialog_create_array_base.cpp:71
 #: pcbnew/dialogs/dialog_create_array_base.cpp:82
@@ -7596,6 +7868,7 @@ msgstr ""
 #: pcbnew/dialogs/dialog_create_array_base.cpp:222
 #: pcbnew/dialogs/dialog_create_array_base.cpp:233
 #: pcbnew/dialogs/dialog_create_array_base.cpp:245
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:170
 #: pcbnew/dialogs/dialog_export_idf_base.cpp:64
 #: pcbnew/dialogs/dialog_export_idf_base.cpp:85
 #: pcbnew/dialogs/dialog_export_step_base.cpp:92
@@ -7611,55 +7884,126 @@ msgstr ""
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:42
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:56
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:336
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1436
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1510
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:71
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:88
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:129
 msgid "0"
 msgstr "0"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:187
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:146
 msgid "+90"
 msgstr "+90"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:187
-msgid "+180"
-msgstr "+180"
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:187
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:146
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:338
 msgid "-90"
 msgstr "-90"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:191
-msgid "Select if the symbol is to be rotated when drawn"
-msgstr "选择是否在绘制时旋转符号"
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:146
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:339
+msgid "180"
+msgstr "180"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:152
+msgid "Mirror:"
+msgstr "镜像："
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:156
+msgid "Not mirrored"
+msgstr "无镜像"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:156
+msgid "Around X axis"
+msgstr "围绕 X 轴"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:156
+msgid "Around Y axis"
+msgstr "围绕 Y 轴"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:174
+msgid "Pin Text"
+msgstr "热点文字"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:176
+msgid "Show pin numbers"
+msgstr "显示引脚编号"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:182
+msgid "Show pin names"
+msgstr "显示引脚名称"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:192
+msgid "Attributes"
+msgstr "属性"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:194
+msgid "Exclude from bill of materials"
+msgstr "从物料清单中排除"
 
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:195
-msgid "Mirror around X axis"
-msgstr "X 轴镜像"
+msgid ""
+"This is useful for adding symbols for board footprints such as fiducials\n"
+"and logos that you do not want to appear in the bill of materials export"
+msgstr ""
+"这对于为电路板封装（如基准点）添加符号很有用\n"
+"以及您不想在 BOM 导出中显示的 LOGO"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:195
-msgid "Mirror around Y axis"
-msgstr "Y 轴镜像"
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:200
+msgid ""
+"This is useful for adding symbols that only get exported to the bill of "
+"materials but\n"
+"not required to layout the board such as mechanical fasteners and enclosures"
+msgstr ""
+"这对于添加仅导出到 BOM 表的符号非常有用，但是。\n"
+"不需要布局电路板，如机械插件和外壳"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:197
-msgid "Aspect"
-msgstr "方向"
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:213
+msgid "Update Symbol from Library..."
+msgstr "更新库中的符号..."
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:199
-msgid "Pick the graphical transformation to be used when displaying the symbol"
-msgstr "指定元件显示图形变换时使用"
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:216
+#: eeschema/tools/ee_actions.cpp:417
+msgid "Change Symbol..."
+msgstr "更改符号..."
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:212
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:219
+msgid "Edit Symbol..."
+msgstr "编辑符号..."
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:225
+msgid "Edit Library Symbol..."
+msgstr "编辑库符号..."
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:264
+msgid "Pin Number"
+msgstr "引脚编号"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:265
+msgid "Base Pin Name"
+msgstr "基引脚名称"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:291
+msgid "Alternate Pin Assignments"
+msgstr "备用引脚分配"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:301
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:521
+msgid "Library link:"
+msgstr "库链接："
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:307
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:529
+msgid ""
+"The library ID and footprint ID currently assigned.  Use “Change Footprint…” "
+"to assign a different footprint."
+msgstr "当前分配的库 ID 和封装 ID。使用“更改封装…”来分配不同的封装。"
+
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:317
 msgid "Spice Model..."
 msgstr "Spice 模型..."
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:217
-#: eeschema/tools/ee_actions.cpp:473
-msgid "Pin Table..."
-msgstr "引脚列表..."
-
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.h:88
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.h:99
 msgid "Symbol Properties"
 msgstr "符号属性"
 
@@ -7722,29 +8066,29 @@ msgstr ""
 msgid "Symbol Library References"
 msgstr "符号库位号"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:58
+#: eeschema/dialogs/dialog_edit_label.cpp:60
 msgid "Global Label Properties"
 msgstr "全局标签属性"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:59
+#: eeschema/dialogs/dialog_edit_label.cpp:61
 msgid "Hierarchical Label Properties"
 msgstr "原理图层次标签属性"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:60
+#: eeschema/dialogs/dialog_edit_label.cpp:62
 msgid "Label Properties"
 msgstr "标签属性"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:61
+#: eeschema/dialogs/dialog_edit_label.cpp:63
 msgid "Hierarchical Sheet Pin Properties"
 msgstr "层次分页引脚属性"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:62
-#: pcbnew/dialogs/dialog_text_properties.cpp:120
-#: pcbnew/dialogs/dialog_text_properties_base.h:97
+#: eeschema/dialogs/dialog_edit_label.cpp:64
+#: pcbnew/dialogs/dialog_text_properties.cpp:90
+#: pcbnew/dialogs/dialog_text_properties_base.h:90
 msgid "Text Properties"
 msgstr "文本属性"
 
-#: eeschema/dialogs/dialog_edit_label.cpp:313
+#: eeschema/dialogs/dialog_edit_label.cpp:318
 msgid "Empty Text!"
 msgstr "文字为空！"
 
@@ -7760,7 +8104,7 @@ msgstr "输入文本将在原理图中使用"
 #: eeschema/dialogs/dialog_edit_label_base.cpp:37
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:28
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:45
-#: pcbnew/dialogs/dialog_text_properties.cpp:111
+#: pcbnew/dialogs/dialog_text_properties.cpp:82
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:24
 msgid "Text:"
 msgstr "文本："
@@ -7806,43 +8150,43 @@ msgstr "加粗斜体"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:126
 #: eeschema/dialogs/dialog_sch_sheet_props_base.cpp:115
-#: eeschema/lib_field.cpp:434 eeschema/lib_pin.cpp:989 eeschema/sch_pin.cpp:164
-#: eeschema/sch_text.cpp:655
+#: eeschema/lib_field.cpp:434 eeschema/lib_pin.cpp:1008
+#: eeschema/sch_pin.cpp:168 eeschema/sch_text.cpp:656
 msgid "Style"
 msgstr "样式"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:33 eeschema/pin_type.cpp:52
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:34 eeschema/pin_type.cpp:52
 #: eeschema/sch_text.cpp:463
 msgid "Input"
 msgstr "输入"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:34 eeschema/pin_type.cpp:53
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:35 eeschema/pin_type.cpp:53
 #: eeschema/sch_text.cpp:464
 msgid "Output"
 msgstr "输出"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:35 eeschema/pin_type.cpp:54
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:36 eeschema/pin_type.cpp:54
 #: eeschema/sch_text.cpp:465
 msgid "Bidirectional"
 msgstr "双向"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:36 eeschema/pin_type.cpp:55
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:37 eeschema/pin_type.cpp:55
 msgid "Tri-state"
 msgstr "三态"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:130
-#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:37
+#: eeschema/dialogs/dialog_edit_sheet_pin.cpp:38
 #: eeschema/dialogs/dialog_spice_model_base.cpp:199 eeschema/pin_type.cpp:56
 #: eeschema/sch_text.cpp:467
 msgid "Passive"
 msgstr "无源"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:132
-#: pcbnew/class_drawsegment.cpp:463 pcbnew/class_pad.cpp:1341
+#: pcbnew/class_drawsegment.cpp:463 pcbnew/class_pad.cpp:1359
 #: pcbnew/class_pcb_target.cpp:158
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:231
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:121
@@ -7868,7 +8212,7 @@ msgid "Style:"
 msgstr "样式："
 
 #: eeschema/dialogs/dialog_edit_line_style_base.cpp:68
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:45
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:46
 msgid "Combo!"
 msgstr "组合！"
 
@@ -7881,10 +8225,10 @@ 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:471
 #: 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:894
+#: pcbnew/footprint_libraries_utils.cpp:880
 msgid "Name:"
 msgstr "名称："
 
@@ -7902,158 +8246,157 @@ msgstr "连接类型："
 msgid "Sheet Pin Properties"
 msgstr "图框引脚属性"
 
-#: eeschema/dialogs/dialog_erc.cpp:77
+#: eeschema/dialogs/dialog_erc.cpp:78
 msgid "Run"
 msgstr "运行"
 
-#: eeschema/dialogs/dialog_erc.cpp:84 eeschema/dialogs/dialog_erc.cpp:215
-#: eeschema/dialogs/dialog_erc.cpp:230
+#: eeschema/dialogs/dialog_erc.cpp:85 eeschema/dialogs/dialog_erc.cpp:226
+#: eeschema/dialogs/dialog_erc.cpp:241
 msgid "Some components are not annotated.  ERC cannot be run."
 msgstr "某些元件未添加批注。  无法运行 ERC。"
 
-#: eeschema/dialogs/dialog_erc.cpp:134
+#: eeschema/dialogs/dialog_erc.cpp:141
 msgid "Delete exclusions too?"
 msgstr "是否也删除排除项？"
 
-#: eeschema/dialogs/dialog_erc.cpp:134 pcbnew/dialogs/dialog_drc.cpp:661
-#: pcbnew/dialogs/dialog_drc_base.cpp:219
+#: eeschema/dialogs/dialog_erc.cpp:141 pcbnew/dialogs/dialog_drc.cpp:749
+#: pcbnew/dialogs/dialog_drc_base.cpp:202
 msgid "Delete All Markers"
 msgstr "删除所有标记"
 
-#: eeschema/dialogs/dialog_erc.cpp:136
+#: eeschema/dialogs/dialog_erc.cpp:143
 msgid "Errors and Warnings Only"
 msgstr "仅限错误和警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:136
+#: eeschema/dialogs/dialog_erc.cpp:143
 msgid "Errors, Warnings and Exclusions"
 msgstr "错误，警告和排除"
 
-#: eeschema/dialogs/dialog_erc.cpp:218
+#: eeschema/dialogs/dialog_erc.cpp:229
 msgid "Some components are not annotated.  Open annotation dialog?"
 msgstr "某些元件未添加批注。  是否打开批注对话框？"
 
-#: eeschema/dialogs/dialog_erc.cpp:246
+#: eeschema/dialogs/dialog_erc.cpp:257
 msgid "Checking sheet names...\n"
 msgstr "检查图框名称...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:252
+#: eeschema/dialogs/dialog_erc.cpp:263
 msgid "Checking bus conflicts...\n"
 msgstr "检查总线冲突...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:257
+#: eeschema/dialogs/dialog_erc.cpp:268
 msgid "Checking conflicts...\n"
 msgstr "正在检查冲突...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:264
+#: eeschema/dialogs/dialog_erc.cpp:275
 msgid "Checking footprints...\n"
 msgstr "检查封装...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:268
+#: eeschema/dialogs/dialog_erc.cpp:279
 msgid "Checking pins...\n"
 msgstr "检查引脚...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:281
+#: eeschema/dialogs/dialog_erc.cpp:292
 msgid "Checking labels...\n"
 msgstr "检查标签...\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:306 pcbnew/drc/drc.cpp:436
-#: qa/drc_proto/drc.cpp:476
+#: eeschema/dialogs/dialog_erc.cpp:314
 msgid "Finished"
 msgstr "完成"
 
-#: eeschema/dialogs/dialog_erc.cpp:368 pcbnew/dialogs/dialog_drc.cpp:316
+#: eeschema/dialogs/dialog_erc.cpp:376 pcbnew/dialogs/dialog_drc.cpp:365
 msgid "errors"
 msgstr "错误"
 
-#: eeschema/dialogs/dialog_erc.cpp:369 pcbnew/dialogs/dialog_drc.cpp:317
+#: eeschema/dialogs/dialog_erc.cpp:377 pcbnew/dialogs/dialog_drc.cpp:366
 msgid "warnings"
 msgstr "警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:370 pcbnew/dialogs/dialog_drc.cpp:318
+#: eeschema/dialogs/dialog_erc.cpp:378 pcbnew/dialogs/dialog_drc.cpp:367
 msgid "appropriate"
 msgstr "适当"
 
-#: eeschema/dialogs/dialog_erc.cpp:375 pcbnew/dialogs/dialog_drc.cpp:323
+#: eeschema/dialogs/dialog_erc.cpp:383 pcbnew/dialogs/dialog_drc.cpp:372
 msgid "Remove exclusion for this violation"
 msgstr "不再排除此违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:376 pcbnew/dialogs/dialog_drc.cpp:324
+#: eeschema/dialogs/dialog_erc.cpp:384 pcbnew/dialogs/dialog_drc.cpp:373
 #, c-format
 msgid "It will be placed back in the %s list"
 msgstr "它将放回 %s 列表中"
 
-#: eeschema/dialogs/dialog_erc.cpp:380 pcbnew/dialogs/dialog_drc.cpp:328
+#: eeschema/dialogs/dialog_erc.cpp:388 pcbnew/dialogs/dialog_drc.cpp:377
 msgid "Exclude this violation"
 msgstr "排除此违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:381 pcbnew/dialogs/dialog_drc.cpp:329
+#: eeschema/dialogs/dialog_erc.cpp:389 pcbnew/dialogs/dialog_drc.cpp:378
 #, c-format
 msgid "It will be excluded from the %s list"
 msgstr "它将从 %s 列表中排除"
 
-#: eeschema/dialogs/dialog_erc.cpp:393 pcbnew/dialogs/dialog_drc.cpp:336
+#: eeschema/dialogs/dialog_erc.cpp:401 pcbnew/dialogs/dialog_drc.cpp:385
 #, c-format
 msgid "Change severity to Error for all '%s' violations"
 msgstr "将所有 \"%s\" 违规的严重性更改为错误"
 
-#: eeschema/dialogs/dialog_erc.cpp:395 eeschema/dialogs/dialog_erc.cpp:401
-#: pcbnew/dialogs/dialog_drc.cpp:338 pcbnew/dialogs/dialog_drc.cpp:345
+#: eeschema/dialogs/dialog_erc.cpp:403 eeschema/dialogs/dialog_erc.cpp:409
+#: pcbnew/dialogs/dialog_drc.cpp:387 pcbnew/dialogs/dialog_drc.cpp:394
 msgid "Violation severities can also be edited in the Board Setup... dialog"
 msgstr "违规严重程度也可以在“电路板设置...”对话框中进行编辑"
 
-#: eeschema/dialogs/dialog_erc.cpp:399 pcbnew/dialogs/dialog_drc.cpp:343
+#: eeschema/dialogs/dialog_erc.cpp:407 pcbnew/dialogs/dialog_drc.cpp:392
 #, c-format
 msgid "Change severity to Warning for all '%s' violations"
 msgstr "将所有 \"%s\" 违规的严重程度更改为警告"
 
-#: eeschema/dialogs/dialog_erc.cpp:404 pcbnew/dialogs/dialog_drc.cpp:349
+#: eeschema/dialogs/dialog_erc.cpp:412 pcbnew/dialogs/dialog_drc.cpp:398
 #, c-format
 msgid "Ignore all '%s' violations"
 msgstr "忽略所有 \"%s\" 违规"
 
-#: eeschema/dialogs/dialog_erc.cpp:405 pcbnew/dialogs/dialog_drc.cpp:351
+#: eeschema/dialogs/dialog_erc.cpp:413 pcbnew/dialogs/dialog_drc.cpp:400
 msgid "Violations will not be checked or reported"
 msgstr "违规将不会被检查或报告"
 
-#: eeschema/dialogs/dialog_erc.cpp:412
+#: eeschema/dialogs/dialog_erc.cpp:420
 msgid "Edit pin-to-pin conflict map..."
 msgstr "编辑引脚到引脚冲突映射..."
 
-#: eeschema/dialogs/dialog_erc.cpp:416 pcbnew/dialogs/dialog_drc.cpp:356
+#: eeschema/dialogs/dialog_erc.cpp:424 pcbnew/dialogs/dialog_drc.cpp:405
 msgid "Edit violation severities..."
 msgstr "编辑违规严重性......"
 
-#: eeschema/dialogs/dialog_erc.cpp:417
+#: eeschema/dialogs/dialog_erc.cpp:425
 msgid "Open the Schematic Setup... dialog"
 msgstr "打开“原理图设置...”对话框"
 
-#: eeschema/dialogs/dialog_erc.cpp:475
+#: eeschema/dialogs/dialog_erc.cpp:483
 #: eeschema/dialogs/dialog_schematic_setup.cpp:72
 msgid "Pin Conflicts Map"
 msgstr "引脚冲突映射"
 
-#: eeschema/dialogs/dialog_erc.cpp:479
+#: eeschema/dialogs/dialog_erc.cpp:487
 #: eeschema/dialogs/dialog_schematic_setup.cpp:71
-#: pcbnew/dialogs/dialog_board_setup.cpp:85 pcbnew/dialogs/dialog_drc.cpp:444
+#: pcbnew/dialogs/dialog_board_setup.cpp:84 pcbnew/dialogs/dialog_drc.cpp:499
 msgid "Violation Severity"
 msgstr "违规严重程度"
 
-#: eeschema/dialogs/dialog_erc.cpp:551 pcbnew/dialogs/dialog_drc.cpp:516
+#: eeschema/dialogs/dialog_erc.cpp:559 pcbnew/dialogs/dialog_drc.cpp:571
 #, c-format
 msgid "Report file '%s' created\n"
 msgstr "创建报告文件 \"%s\"\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:556 pcbnew/dialogs/dialog_drc.cpp:521
+#: eeschema/dialogs/dialog_erc.cpp:564 pcbnew/dialogs/dialog_drc.cpp:576
 #, c-format
 msgid "Unable to create report file '%s'"
 msgstr "无法创建报告文件 \"%s\""
 
-#: eeschema/dialogs/dialog_erc.cpp:569
+#: eeschema/dialogs/dialog_erc.cpp:577
 #, c-format
 msgid "ERC report (%s, Encoding UTF8)\n"
 msgstr "ERC 报告（%s，编码 UTF8）\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:584
+#: eeschema/dialogs/dialog_erc.cpp:592
 #, c-format
 msgid ""
 "\n"
@@ -8062,7 +8405,7 @@ msgstr ""
 "\n"
 "***** 图框 %s\n"
 
-#: eeschema/dialogs/dialog_erc.cpp:606
+#: eeschema/dialogs/dialog_erc.cpp:616
 #, c-format
 msgid ""
 "\n"
@@ -8072,7 +8415,7 @@ msgstr ""
 " ** ERC 信息: %d  错误 %d  警告 %d\n"
 
 #: eeschema/dialogs/dialog_erc_base.cpp:35
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1529
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:394
 msgid "Messages:"
 msgstr "信息："
 
@@ -8081,12 +8424,12 @@ msgid "Violations:"
 msgstr "违规："
 
 #: eeschema/dialogs/dialog_erc_base.cpp:59
-#: pcbnew/dialogs/dialog_drc_base.cpp:125
+#: pcbnew/dialogs/dialog_drc_base.cpp:100
 msgid "Click on items to highlight them on the board."
 msgstr "单击项目以在板上高亮它们。"
 
 #: eeschema/dialogs/dialog_erc_base.cpp:93
-#: pcbnew/dialogs/dialog_drc_base.cpp:193
+#: pcbnew/dialogs/dialog_drc_base.cpp:176
 msgid "Exclusions"
 msgstr "排除"
 
@@ -8119,7 +8462,7 @@ msgid "Show datasheet in browser"
 msgstr "在浏览器中显示数据书册"
 
 #: eeschema/dialogs/dialog_fields_editor_global.cpp:112
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:1038
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:1048
 msgid "The Reference column cannot be hidden."
 msgstr "无法隐藏“位号”列。"
 
@@ -8127,35 +8470,34 @@ msgstr "无法隐藏“位号”列。"
 msgid "Qty"
 msgstr "数量"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:686
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:696
 #: eeschema/lib_field.cpp:443 eeschema/lib_field.h:102
 msgid "Field"
 msgstr "字段"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:689
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:699
 msgid "Group By"
 msgstr "分组依据"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:976
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:986
 msgid "New field name:"
 msgstr "新字段名称："
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:976
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:986
 msgid "Add Field"
 msgstr "添加字段"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:985
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:995
 msgid "Field must have a name."
 msgstr "字段必须要有一个名称。"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:993
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:1003
 #, c-format
 msgid "Field name \"%s\" already in use."
 msgstr "字段名称 \"%s\" 已经在使用。"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:1191
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:1201
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:699
-#: eeschema/dialogs/dialog_sch_pin_table.cpp:397
 msgid "Save changes?"
 msgstr "保存更改吗？"
 
@@ -8270,11 +8612,11 @@ 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
-#: 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
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:716
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:726
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:738
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1224
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1236
 #: pcbnew/board_stackup_manager/panel_board_stackup.cpp:537
 msgid "..."
 msgstr "..."
@@ -8413,50 +8755,21 @@ msgstr "所有主体风格 (德摩根) 共用 (&S)"
 msgid "Drawing Properties"
 msgstr "图形特性"
 
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:61
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:44
-#: eeschema/dialogs/dialog_sch_pin_table.cpp:98
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:38 eeschema/lib_pin.cpp:985
-#: eeschema/sch_pin.cpp:160
-msgid "Number"
-msgstr "编号"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:63
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:46
-#: eeschema/dialogs/dialog_pin_properties.cpp:54
-#: eeschema/dialogs/dialog_pin_properties_base.cpp:202
-#: eeschema/dialogs/dialog_sch_pin_table.cpp:100
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:40
-msgid "Electrical Type"
-msgstr "电气类型"
-
-#: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:64
-#: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:47
-#: eeschema/dialogs/dialog_pin_properties.cpp:55
-#: eeschema/dialogs/dialog_pin_properties_base.cpp:203
-#: eeschema/dialogs/dialog_sch_pin_table.cpp:101
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:41
-msgid "Graphic Style"
-msgstr "图形样式"
-
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:66
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:49
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:43
 msgid "Number Text Size"
 msgstr "编号文本尺寸"
 
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:67
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:50
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:44
 msgid "Name Text Size"
 msgstr "名称文本尺寸"
 
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:68
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:51
-#: eeschema/dialogs/dialog_sch_pin_table_base.cpp:45 eeschema/lib_pin.cpp:996
-#: eeschema/sch_pin.cpp:171 pcbnew/class_drawsegment.cpp:487
-#: pcbnew/class_drawsegment.cpp:512 pcbnew/class_track.cpp:674
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:60
+#: eeschema/lib_pin.cpp:1015 eeschema/sch_pin.cpp:175
+#: pcbnew/class_drawsegment.cpp:487 pcbnew/class_drawsegment.cpp:512
+#: pcbnew/class_track.cpp:641 pcbnew/dialogs/dialog_select_net_from_list.cpp:60
 msgid "Length"
 msgstr "长度"
 
@@ -8469,7 +8782,6 @@ msgid "Pin numbers:"
 msgstr "引脚编号："
 
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.h:70
-#: eeschema/dialogs/dialog_sch_pin_table_base.h:51
 msgid "Pin Table"
 msgstr "引脚列表"
 
@@ -8478,28 +8790,30 @@ msgid "(Power symbol value field text cannot be changed.)"
 msgstr "(不能更改电源符号值字段文本。)"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:95
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:233
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:60
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:192
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:167
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:162
 msgid "Position X:"
 msgstr "位置 X："
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:119
 #: eeschema/fields_grid_table.cpp:164 eeschema/fields_grid_table.cpp:418
-#: eeschema/fields_grid_table.cpp:515 eeschema/sch_line.cpp:628
+#: eeschema/fields_grid_table.cpp:515
 #: 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:419
-#: eeschema/fields_grid_table.cpp:517 eeschema/sch_line.cpp:626
+#: eeschema/fields_grid_table.cpp:517
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:137
 msgid "Vertical"
 msgstr "垂直"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:125
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:213
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:259
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:188
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:173
 msgid "Position Y:"
 msgstr "位置 Y："
@@ -8524,7 +8838,7 @@ msgstr "适用于所有主体样式"
 msgid "Text Item Properties"
 msgstr "文本项属性"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:34
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:35
 msgid ""
 "This is the symbol name in library,\n"
 "and also the default component value when loaded in the schematic."
@@ -8532,11 +8846,11 @@ msgstr ""
 "这是库中的符号名称，\n"
 "以及在原理图中加载时的默认元件值。"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:41
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:42
 msgid "Derive from existing symbol:"
 msgstr "从现有符号派生："
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:46
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:47
 msgid ""
 "Select symbol in the current library as parent symbol.\n"
 "\n"
@@ -8548,47 +8862,47 @@ msgstr ""
 "这以前称为别名。 请勿选择\n"
 "现有符号来创建新的根符号。"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:50
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:51
 msgid "Default reference designator:"
 msgstr "默认位号："
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:54
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:55
 msgid "U"
 msgstr "U"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:57
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:58
 msgid "Number of units per package:"
 msgstr "每封装单元数："
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:70
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:71
 msgid "Units are not interchangeable"
 msgstr "单元不能互换"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:73
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:74
 msgid "Create symbol with alternate body style (DeMorgan)"
 msgstr "创建有备用主体样式的符号 (德摩根)"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:76
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:77
 msgid "Create symbol as power symbol"
 msgstr "创建符号作为电源符号"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:94
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:101
 msgid "Pin text position offset:"
 msgstr "引脚文字坐标偏移量："
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:111
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:118
 msgid "Show pin number text"
 msgstr "显示引脚编号文本"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:115
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:122
 msgid "Show pin name text"
 msgstr "显示引脚名称文本"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.cpp:119
+#: eeschema/dialogs/dialog_lib_new_component_base.cpp:126
 msgid "Pin name inside"
 msgstr "引脚名称在内部"
 
-#: eeschema/dialogs/dialog_lib_new_component_base.h:70
+#: eeschema/dialogs/dialog_lib_new_component_base.h:74
 msgid "New Symbol"
 msgstr "新建符号"
 
@@ -8600,7 +8914,7 @@ msgstr "相互冲突的标签"
 msgid "New Label"
 msgstr "新的标签"
 
-#: eeschema/dialogs/dialog_migrate_buses.cpp:104 pcbnew/class_track.cpp:831
+#: eeschema/dialogs/dialog_migrate_buses.cpp:104 pcbnew/class_track.cpp:774
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:193
 msgid "Status"
 msgstr "状态"
@@ -8811,6 +9125,7 @@ msgid "&Visible"
 msgstr "可见 (&V)"
 
 #: eeschema/dialogs/dialog_pin_properties_base.cpp:161
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:190
 msgid "Preview:"
 msgstr "预览："
 
@@ -8831,15 +9146,15 @@ msgid "Plot Current Page"
 msgstr "绘制当前页"
 
 #: eeschema/dialogs/dialog_plot_schematic.cpp:149
-#: pcbnew/dialogs/dialog_export_svg.cpp:197
-#: pcbnew/dialogs/dialog_gendrill.cpp:299 pcbnew/dialogs/dialog_plot.cpp:355
+#: pcbnew/dialogs/dialog_export_svg.cpp:196
+#: pcbnew/dialogs/dialog_gendrill.cpp:287 pcbnew/dialogs/dialog_plot.cpp:370
 #: pcbnew/exporters/gen_footprints_placefile.cpp:185
 #: pcbnew/exporters/gen_footprints_placefile.cpp:509
 msgid "Select Output Directory"
 msgstr "选择输出目录"
 
 #: eeschema/dialogs/dialog_plot_schematic.cpp:166
-#: pcbnew/dialogs/dialog_gendrill.cpp:308 pcbnew/dialogs/dialog_plot.cpp:372
+#: pcbnew/dialogs/dialog_gendrill.cpp:296 pcbnew/dialogs/dialog_plot.cpp:387
 #, c-format
 msgid ""
 "Do you want to use a path relative to\n"
@@ -8847,10 +9162,10 @@ msgid ""
 msgstr "你想使用 \"%s\" 的相对路径吗?"
 
 #: eeschema/dialogs/dialog_plot_schematic.cpp:168
-#: pcbnew/dialogs/dialog_export_svg.cpp:204
-#: pcbnew/dialogs/dialog_export_svg.cpp:215
-#: pcbnew/dialogs/dialog_gendrill.cpp:310
-#: pcbnew/dialogs/dialog_gendrill.cpp:317 pcbnew/dialogs/dialog_plot.cpp:375
+#: pcbnew/dialogs/dialog_export_svg.cpp:203
+#: pcbnew/dialogs/dialog_export_svg.cpp:214
+#: pcbnew/dialogs/dialog_gendrill.cpp:298
+#: pcbnew/dialogs/dialog_gendrill.cpp:305 pcbnew/dialogs/dialog_plot.cpp:390
 #: pcbnew/exporters/gen_footprints_placefile.cpp:193
 #: pcbnew/exporters/gen_footprints_placefile.cpp:202
 msgid "Plot Output Directory"
@@ -8862,7 +9177,7 @@ msgid "Schematic size"
 msgstr "图框大小"
 
 #: eeschema/dialogs/dialog_plot_schematic.cpp:222
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:924
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1771
 msgid "A5"
 msgstr "A5"
 
@@ -8892,9 +9207,9 @@ msgstr "A0"
 #: eeschema/dialogs/dialog_plot_schematic.cpp:239
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:61
 #: eeschema/dialogs/panel_setup_formatting_base.cpp:30
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:287
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:640
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:782
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1211
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1353
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1466
 msgid "A"
 msgstr "A"
 
@@ -8915,7 +9230,7 @@ msgid "E"
 msgstr "E"
 
 #: eeschema/dialogs/dialog_plot_schematic.cpp:365
-#: pcbnew/dialogs/dialog_export_svg.cpp:237 pcbnew/dialogs/dialog_plot.cpp:784
+#: pcbnew/dialogs/dialog_export_svg.cpp:236 pcbnew/dialogs/dialog_plot.cpp:803
 #: pcbnew/exporters/gen_footprints_placefile.cpp:254
 #: pcbnew/exporters/gen_footprints_placefile.cpp:351
 #, c-format
@@ -9012,7 +9327,7 @@ msgid ""
 msgstr "当线宽设置为 0 时,将选择默认的画笔用来绘制项。"
 
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:121
-#: pcbnew/dialogs/dialog_plot_base.cpp:227
+#: pcbnew/dialogs/dialog_plot_base.cpp:249
 msgid "HPGL Options"
 msgstr "HPGL 选项"
 
@@ -9151,17 +9466,17 @@ msgstr "工程恢复助手"
 #: eeschema/dialogs/dialog_sch_import_settings.cpp:42
 #: eeschema/dialogs/dialog_sch_import_settings_base.h:61
 #: pcbnew/dialogs/dialog_import_settings.cpp:45
-#: pcbnew/dialogs/dialog_import_settings_base.h:64
+#: pcbnew/dialogs/dialog_import_settings_base.h:66
 msgid "Import Settings"
 msgstr "导入设置"
 
 #: eeschema/dialogs/dialog_sch_import_settings.cpp:61
-#: pcbnew/dialogs/dialog_import_settings.cpp:116
+#: pcbnew/dialogs/dialog_import_settings.cpp:115
 msgid "Import Settings From"
 msgstr "导入设置"
 
 #: eeschema/dialogs/dialog_sch_import_settings.cpp:73
-#: pcbnew/dialogs/dialog_import_settings.cpp:128
+#: pcbnew/dialogs/dialog_import_settings.cpp:127
 msgid "File not found."
 msgstr "文件没有找到。"
 
@@ -9180,7 +9495,7 @@ msgid ""
 msgstr "绘制文件输出目录。允许绝对或相对路径。"
 
 #: eeschema/dialogs/dialog_sch_import_settings_base.cpp:44
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:44
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:47
 msgid "Import:"
 msgstr "导入："
 
@@ -9197,12 +9512,12 @@ msgid "Pin conflict map"
 msgstr "引脚冲突映射"
 
 #: eeschema/dialogs/dialog_sch_import_settings_base.cpp:57
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:63
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:66
 msgid "Violation severities"
 msgstr "违规严重程度"
 
 #: eeschema/dialogs/dialog_sch_import_settings_base.cpp:60
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:66
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:69
 msgid "Net classes"
 msgstr "网络类"
 
@@ -9393,19 +9708,19 @@ msgid "Electrical Rules"
 msgstr "电气规则"
 
 #: eeschema/dialogs/dialog_schematic_setup.cpp:74
-#: eeschema/libedit/lib_edit_frame.cpp:853
-#: pcbnew/dialogs/dialog_board_setup.cpp:87
-#: pcbnew/footprint_libraries_utils.cpp:504
+#: eeschema/libedit/lib_edit_frame.cpp:872
+#: pcbnew/dialogs/dialog_board_setup.cpp:86
+#: pcbnew/footprint_libraries_utils.cpp:503
 msgid "Project"
 msgstr "工程"
 
 #: eeschema/dialogs/dialog_schematic_setup.cpp:76
-#: pcbnew/dialogs/dialog_board_setup.cpp:89
+#: pcbnew/dialogs/dialog_board_setup.cpp:88
 msgid "Text Variables"
 msgstr "文本变量"
 
 #: eeschema/dialogs/dialog_schematic_setup.cpp:86
-#: pcbnew/dialogs/dialog_board_setup.cpp:99
+#: pcbnew/dialogs/dialog_board_setup.cpp:98
 msgid "Project is missing or read-only. Changes will not be saved."
 msgstr "工程缺失或为只读。变更将不会保存。"
 
@@ -9637,7 +9952,7 @@ msgstr "Spice 指令："
 msgid "Load directives from schematic"
 msgstr "从原理图加载命令"
 
-#: eeschema/dialogs/dialog_sim_settings_base.cpp:436 pcbnew/class_pad.cpp:1335
+#: eeschema/dialogs/dialog_sim_settings_base.cpp:436 pcbnew/class_pad.cpp:1344
 msgid "Custom"
 msgstr "自定义"
 
@@ -9991,7 +10306,7 @@ msgid "Amplitude:"
 msgstr "幅度："
 
 #: eeschema/dialogs/dialog_spice_model_base.cpp:490
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1116
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:828
 msgid "Frequency:"
 msgstr "频率："
 
@@ -10322,7 +10637,7 @@ msgid "Update Symbol Fields"
 msgstr "更新符号字段"
 
 #: eeschema/dialogs/dialog_update_from_pcb.cpp:41
-#: pcbnew/dialogs/dialog_netlist.cpp:86 pcbnew/dialogs/dialog_update_pcb.cpp:62
+#: pcbnew/dialogs/dialog_netlist.cpp:83 pcbnew/dialogs/dialog_update_pcb.cpp:62
 msgid "Changes To Be Applied"
 msgstr "应用变更"
 
@@ -10402,7 +10717,7 @@ msgid " (symbol editor only)"
 msgstr " （仅限符号编辑器）"
 
 #: eeschema/dialogs/panel_eeschema_color_settings.cpp:228
-#: pcbnew/dialogs/panel_pcbnew_color_settings.cpp:499
+#: pcbnew/dialogs/panel_pcbnew_color_settings.cpp:492
 msgid "Color Preview"
 msgstr "颜色预览"
 
@@ -10411,7 +10726,7 @@ msgid "/path/to/sheet"
 msgstr "/path/to/sheet"
 
 #: eeschema/dialogs/panel_eeschema_display_options_base.cpp:26
-#: pcbnew/pcb_edit_frame.cpp:260 pcbnew/pcb_edit_frame.cpp:1088
+#: pcbnew/pcb_edit_frame.cpp:261 pcbnew/pcb_edit_frame.cpp:1111
 msgid "Appearance"
 msgstr "外观"
 
@@ -10482,7 +10797,7 @@ msgid "&Measurement units:"
 msgstr "测量单位 (&M)："
 
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:31
-#: pagelayout_editor/pl_editor_frame.cpp:717
+#: pagelayout_editor/pl_editor_frame.cpp:713
 #: pcbnew/import_gfx/dialog_import_gfx_base.cpp:143
 msgid "inches"
 msgstr "英寸"
@@ -10728,28 +11043,28 @@ msgstr "生成错误"
 msgid "Pin to Pin Connections"
 msgstr "引脚与引脚连接"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:357
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:536
+#: eeschema/dialogs/panel_sym_lib_table.cpp:370
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:541
 #, c-format
 msgid "Illegal character '%c' in Nickname: \"%s\""
 msgstr "非法字符 \"%c\" 在昵称: \"%s\""
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:368
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:547
+#: eeschema/dialogs/panel_sym_lib_table.cpp:381
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:552
 msgid "No Colon in Nicknames"
 msgstr "别名没有冒号"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:398
+#: eeschema/dialogs/panel_sym_lib_table.cpp:411
 #, c-format
 msgid "Duplicate Nickname: \"%s\"."
 msgstr "重复的昵称：\"%s\"。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:408
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:587
+#: eeschema/dialogs/panel_sym_lib_table.cpp:421
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:592
 msgid "Please Delete or Modify One"
 msgstr "请删除或修改一个"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:441
+#: eeschema/dialogs/panel_sym_lib_table.cpp:454
 #, c-format
 msgid ""
 "Symbol library \"%s\" failed to load.\n"
@@ -10758,38 +11073,38 @@ msgstr ""
 "符号库 \"%s\" 加载失败。\n"
 " %s"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:445
+#: eeschema/dialogs/panel_sym_lib_table.cpp:458
 msgid "Error Loading Library"
 msgstr "加载库时出错"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:483
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:844
+#: eeschema/dialogs/panel_sym_lib_table.cpp:497
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:848
 msgid "Warning: Duplicate Nickname"
 msgstr "警告：重复的别名"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:484
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:845
+#: eeschema/dialogs/panel_sym_lib_table.cpp:498
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:849
 #, c-format
 msgid "A library nicknamed \"%s\" already exists."
 msgstr "库别名 \"%s\" 已经存在。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:485
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:846
+#: eeschema/dialogs/panel_sym_lib_table.cpp:499
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:850
 msgid "Please change the library nickname after adding this library."
 msgstr "请在添加此库后更改库昵称。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:503
-#: eeschema/libedit/lib_edit_frame.cpp:860
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:860
+#: eeschema/dialogs/panel_sym_lib_table.cpp:517
+#: eeschema/libedit/lib_edit_frame.cpp:879
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:864
 msgid "Skip"
 msgstr "跳过"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:503
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:860
+#: eeschema/dialogs/panel_sym_lib_table.cpp:517
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:864
 msgid "Add Anyway"
 msgstr "仍然添加"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:849
+#: eeschema/dialogs/panel_sym_lib_table.cpp:863
 msgid ""
 "Modifications have been made to one or more symbol libraries.\n"
 "Changes must be saved or discarded before the symbol library table can be "
@@ -10798,12 +11113,12 @@ msgstr ""
 "已对一个或多个符号库进行了修改。\n"
 "必须先保存或丢弃更改,然后才能修改符号库表。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:863
+#: eeschema/dialogs/panel_sym_lib_table.cpp:877
 msgid "Symbol Libraries"
 msgstr "符号库"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:885
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:1052
+#: eeschema/dialogs/panel_sym_lib_table.cpp:899
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:1054
 #, c-format
 msgid ""
 "Error saving global library table:\n"
@@ -10814,15 +11129,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:886
-#: eeschema/dialogs/panel_sym_lib_table.cpp:899 eeschema/sch_base_frame.cpp:235
-#: eeschema/sch_base_frame.cpp:251 pcbnew/dialogs/panel_fp_lib_table.cpp:1053
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:1066 pcbnew/files.cpp:989
+#: eeschema/dialogs/panel_sym_lib_table.cpp:900
+#: eeschema/dialogs/panel_sym_lib_table.cpp:913 eeschema/sch_base_frame.cpp:235
+#: eeschema/sch_base_frame.cpp:251 pcbnew/dialogs/panel_fp_lib_table.cpp:1055
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:1068 pcbnew/files.cpp:1067
 msgid "File Save Error"
 msgstr "文件保存错误"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:898
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:1065
+#: eeschema/dialogs/panel_sym_lib_table.cpp:912
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:1067
 #, c-format
 msgid ""
 "Error saving project-specific library table:\n"
@@ -10896,19 +11211,19 @@ msgstr ""
 "请在首选项菜单中编辑这个全局符号库表。"
 
 #: eeschema/eeschema_config.cpp:225 eeschema/eeschema_config.cpp:396
-#: gerbview/gerbview_frame.cpp:1143
+#: gerbview/gerbview_frame.cpp:1145
 #: pcbnew/dialogs/panel_edit_options_base.cpp:40
-#: pcbnew/footprint_edit_frame.cpp:873 pcbnew/pcbnew_config.cpp:64
+#: pcbnew/footprint_edit_frame.cpp:876 pcbnew/pcbnew_config.cpp:64
 msgid "Editing Options"
 msgstr "编辑选项"
 
 #: eeschema/eeschema_config.cpp:226 eeschema/eeschema_config.cpp:397
-#: pagelayout_editor/pl_editor_frame.cpp:452
-#: pcbnew/footprint_edit_frame.cpp:872 pcbnew/pcbnew_config.cpp:65
+#: pagelayout_editor/pl_editor_frame.cpp:448
+#: pcbnew/footprint_edit_frame.cpp:875 pcbnew/pcbnew_config.cpp:65
 msgid "Colors"
 msgstr "颜色"
 
-#: eeschema/eeschema_config.cpp:436 eeschema/sheet.cpp:282
+#: eeschema/eeschema_config.cpp:436 eeschema/sheet.cpp:281
 #, c-format
 msgid "An error occurred loading the symbol library table \"%s\"."
 msgstr "加载符号库表 \"%s\" 时发生错误。"
@@ -10957,31 +11272,30 @@ msgstr "发射极开路"
 msgid "No Connection"
 msgstr "未连接"
 
-#: eeschema/erc.cpp:241 pcbnew/drc/drc_textvar_tester.cpp:102
-#: qa/drc_proto/drc_textvar_tester.cpp:102
+#: eeschema/erc.cpp:247
 msgid "Unresolved text variable in worksheet."
 msgstr "图框中未解析的文本变量。"
 
-#: eeschema/erc.cpp:272
+#: eeschema/erc.cpp:278
 #, c-format
 msgid "Bus alias %s has conflicting definitions on %s and %s"
 msgstr "总线别名 %s 在 %s 和 %s 上的定义冲突"
 
-#: eeschema/erc.cpp:342
+#: eeschema/erc.cpp:348
 #, c-format
 msgid "Different footprints assigned to %s and %s"
 msgstr "分配给 %s 和 %s 的封装不同"
 
-#: eeschema/erc.cpp:391
+#: eeschema/erc.cpp:397
 msgid "Pins with \"no connection\" type are connected"
 msgstr "连接了“无连接”类型的管脚"
 
-#: eeschema/erc.cpp:463
+#: eeschema/erc.cpp:469
 #, c-format
 msgid "Pins of type %s and %s are connected"
 msgstr "类型为 %s 和 %s 的引脚已连接"
 
-#: eeschema/erc.cpp:517
+#: eeschema/erc.cpp:523
 #, c-format
 msgid "Pin %s is connected to both %s and %s"
 msgstr "引脚 %s 同时连接到 %s 和 %s"
@@ -11059,8 +11373,7 @@ msgstr "总线以图形方式连接，但不共享总线成员"
 msgid "Invalid connection between bus and net items"
 msgstr "总线和净项目之间的连接无效"
 
-#: eeschema/erc_item.cpp:117 pcbnew/drc/drc_item.cpp:163
-#: qa/drc_proto/drc_item.cpp:160
+#: eeschema/erc_item.cpp:117 pcbnew/drc/drc_item.cpp:166
 msgid "Unresolved text variable"
 msgstr "未解析的文字变量"
 
@@ -11081,7 +11394,7 @@ msgstr ""
 "保存原理图文件 \"%s\" 发生错误。\n"
 "%s"
 
-#: eeschema/files-io.cpp:126 pcbnew/files.cpp:769
+#: eeschema/files-io.cpp:126 pcbnew/files.cpp:817
 #, c-format
 msgid "Failed to create temporary file \"%s\""
 msgstr "无法创建临时文件 \"%s\""
@@ -11095,7 +11408,7 @@ msgstr ""
 "保存原理图文件 \"%s\" 时出错。\n"
 "重命名临时文件 %s 失败"
 
-#: eeschema/files-io.cpp:147 pcbnew/files.cpp:788
+#: eeschema/files-io.cpp:147 pcbnew/files.cpp:836
 #, c-format
 msgid "Failed to rename temporary file \"%s\""
 msgstr "重命名临时文件 \"%s\" 失败"
@@ -11109,7 +11422,7 @@ msgstr "保存文件 %s"
 msgid "File write operation failed."
 msgstr "文件存储失败。"
 
-#: eeschema/files-io.cpp:236 eeschema/files-io.cpp:876
+#: eeschema/files-io.cpp:236 eeschema/files-io.cpp:877
 #, c-format
 msgid "Schematic file \"%s\" is already open."
 msgstr "电路图文件 \"%s\" 已经打开。"
@@ -11123,14 +11436,14 @@ msgstr "原理图 \"%s\" 不存在。你想创建它吗？"
 msgid "Schematic file changes are unsaved"
 msgstr "原理图文件更改未保存"
 
-#: eeschema/files-io.cpp:364
+#: eeschema/files-io.cpp:365
 msgid ""
 "The entire schematic could not be loaded.  Errors occurred attempting to "
 "load \n"
 "hierarchical sheet schematics."
 msgstr "整个原理图不能被加载。 尝试加载层次原理图时发生错误。"
 
-#: eeschema/files-io.cpp:377
+#: eeschema/files-io.cpp:378
 #, c-format
 msgid ""
 "Error loading schematic file \"%s\".\n"
@@ -11139,12 +11452,12 @@ msgstr ""
 "加载原理图文件 \"%s\" 时出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:381 eeschema/files-io.cpp:961
+#: eeschema/files-io.cpp:382 eeschema/files-io.cpp:962
 #, c-format
 msgid "Failed to load \"%s\""
 msgstr "无法加载 \"%s\""
 
-#: eeschema/files-io.cpp:394
+#: eeschema/files-io.cpp:395
 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 "
@@ -11153,15 +11466,15 @@ msgstr ""
 "加载已自动修复的原理图时发现错误。 请保存原理图以修复损坏的文件，否则可能无法"
 "与其他版本的 KiCad 一起使用。"
 
-#: eeschema/files-io.cpp:429
+#: eeschema/files-io.cpp:430
 msgid "Illegal entry found in project file symbol library list."
 msgstr "在项目文件符号库列表中找到非法条目。"
 
-#: eeschema/files-io.cpp:430 eeschema/files-io.cpp:462
+#: eeschema/files-io.cpp:431 eeschema/files-io.cpp:463
 msgid "Project Load Warning"
 msgstr "项目加载警告"
 
-#: eeschema/files-io.cpp:433
+#: eeschema/files-io.cpp:434
 msgid ""
 "Symbol libraries defined in the project file symbol library list are no "
 "longer supported and will be\n"
@@ -11171,15 +11484,15 @@ msgstr ""
 "项目文件符号库列表中定义的符号库不再受支持,并且将\n"
 "删除。 在某些情况下,这可能会导致符号库链接断开。"
 
-#: eeschema/files-io.cpp:436 eeschema/files-io.cpp:468
+#: eeschema/files-io.cpp:437 eeschema/files-io.cpp:469
 msgid "Do not show this dialog again."
 msgstr "不再显示。"
 
-#: eeschema/files-io.cpp:461
+#: eeschema/files-io.cpp:462
 msgid "The schematic file will be converted to the new file format on save."
 msgstr "原理图文件将在保存时转换为新的文件格式。"
 
-#: eeschema/files-io.cpp:465
+#: eeschema/files-io.cpp:466
 msgid ""
 "This schematic was saved in the legacy file format which is no longer "
 "supported and will be saved\n"
@@ -11189,11 +11502,11 @@ msgstr ""
 "此逻辑示意图以不再受支持的旧文件格式保存，将被保存。\n"
 "使用新的文件格式。新文件格式无法使用早期版本的 KiCad 打开。"
 
-#: eeschema/files-io.cpp:558
+#: eeschema/files-io.cpp:559
 msgid "Append Schematic"
 msgstr "添加原理图"
 
-#: eeschema/files-io.cpp:587
+#: eeschema/files-io.cpp:588
 msgid ""
 "This operation cannot be undone.\n"
 "\n"
@@ -11203,25 +11516,25 @@ msgstr ""
 "\n"
 "是否在执行该操作前保存当前原理图？"
 
-#: eeschema/files-io.cpp:626
+#: eeschema/files-io.cpp:627
 msgid "Import Schematic"
 msgstr "导入原理图"
 
-#: eeschema/files-io.cpp:686
+#: eeschema/files-io.cpp:687
 #, c-format
 msgid "Directory \"%s\" is not writable."
 msgstr "目录 \"%s\" 不可写入。"
 
-#: eeschema/files-io.cpp:724
+#: eeschema/files-io.cpp:725
 msgid ""
 "Saving the project to the new file format will overwrite existing files."
 msgstr "将项目保存为新文件格式将覆盖现有文件。"
 
-#: eeschema/files-io.cpp:725
+#: eeschema/files-io.cpp:726
 msgid "Project Save Warning"
 msgstr "工程保存警告"
 
-#: eeschema/files-io.cpp:728
+#: eeschema/files-io.cpp:729
 #, c-format
 msgid ""
 "The following files will be overwritten:\n"
@@ -11232,15 +11545,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/files-io.cpp:729
+#: eeschema/files-io.cpp:730
 msgid "Overwrite Files"
 msgstr "覆盖文件"
 
-#: eeschema/files-io.cpp:730
+#: eeschema/files-io.cpp:731
 msgid "Abort Project Save"
 msgstr "中止工程保存"
 
-#: eeschema/files-io.cpp:958
+#: eeschema/files-io.cpp:959
 #, c-format
 msgid ""
 "Error loading schematic \"%s\".\n"
@@ -11249,11 +11562,11 @@ msgstr ""
 "加载原理图 \"%s\" 出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:984
+#: eeschema/files-io.cpp:985
 msgid "The current schematic has been modified.  Save changes?"
 msgstr "当前原理图已被修改。是否保存更改？"
 
-#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1228
+#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1355
 msgid "Alias of"
 msgstr "别名的"
 
@@ -11262,8 +11575,8 @@ msgid "Key words:"
 msgstr "关键字："
 
 #: eeschema/generate_alias_info.cpp:122 eeschema/sim/spice_simulator.cpp:81
-#: pcbnew/class_module.cpp:666 pcbnew/class_zone.cpp:671
-#: pcbnew/tools/pcbnew_control.cpp:1071
+#: pcbnew/class_module.cpp:677 pcbnew/class_zone.cpp:617
+#: pcbnew/tools/pcbnew_control.cpp:1084
 msgid "Unknown"
 msgstr "未知"
 
@@ -11276,7 +11589,7 @@ msgstr "最近使用"
 msgid "Choose Power Symbol (%d items loaded)"
 msgstr "选择电源符号(%d 项加载完毕)"
 
-#: eeschema/getpart.cpp:152 eeschema/lib_view_frame.cpp:832
+#: eeschema/getpart.cpp:152 eeschema/lib_view_frame.cpp:831
 #, c-format
 msgid "Choose Symbol (%d items loaded)"
 msgstr "选择符号(共 %d 项)"
@@ -11286,17 +11599,17 @@ msgstr "选择符号(共 %d 项)"
 msgid "No alternate body style found for symbol \"%s\" in library \"%s\"."
 msgstr "在库 \"%s\" 中找不到符号 \"%s\" 的替代正文样式。"
 
-#: eeschema/hierarch.cpp:85
+#: eeschema/hierarch.cpp:84
 msgid "Navigator"
 msgstr "导航"
 
-#: eeschema/hierarch.cpp:96
+#: eeschema/hierarch.cpp:95
 msgid "Root"
 msgstr "根"
 
 #: eeschema/lib_arc.cpp:404 eeschema/lib_bezier.cpp:343
 #: eeschema/lib_circle.cpp:252 eeschema/lib_polyline.cpp:343
-#: eeschema/lib_rectangle.cpp:200 eeschema/lib_text.cpp:355
+#: eeschema/lib_rectangle.cpp:200 eeschema/lib_text.cpp:356
 #: pcb_calculator/transline_ident.cpp:169
 #: pcb_calculator/transline_ident.cpp:200
 #: pcb_calculator/transline_ident.cpp:233
@@ -11312,8 +11625,8 @@ msgstr "边界框"
 
 #: eeschema/lib_arc.cpp:415
 #, c-format
-msgid "Arc center (%s, %s), radius %s"
-msgstr "圆弧中心 (%s, %s), 半径 %s"
+msgid "Arc, radius %s"
+msgstr "弧形，半径 %s"
 
 #: eeschema/lib_circle.cpp:255 pcbnew/class_drawsegment.cpp:471
 #: pcbnew/class_drawsegment.cpp:480
@@ -11323,97 +11636,97 @@ msgstr "半径"
 
 #: eeschema/lib_circle.cpp:269
 #, c-format
-msgid "Circle center (%s, %s), radius %s"
-msgstr "圆中心 (%s, %s), 半径 %s"
+msgid "Circle, radius %s"
+msgstr "圆形，半径 %s"
 
-#: eeschema/lib_field.cpp:408 eeschema/sch_field.cpp:432
-#, c-format
-msgid "Field %s (%s)"
-msgstr "字段 %s (%s)"
-
-#: eeschema/lib_item.cpp:56 eeschema/lib_pin.cpp:986
-#: eeschema/libedit/symbedit.cpp:240 eeschema/sch_pin.cpp:141
-#: eeschema/sch_pin.cpp:161 eeschema/sch_text.cpp:661
+#: eeschema/lib_item.cpp:56 eeschema/lib_pin.cpp:1005
+#: eeschema/libedit/symbedit.cpp:240 eeschema/sch_pin.cpp:145
+#: eeschema/sch_pin.cpp:165 eeschema/sch_text.cpp:662
 #: 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:461 pcbnew/class_marker_pcb.cpp:93
-#: pcbnew/class_text_mod.cpp:295 pcbnew/class_track.cpp:649
-#: pcbnew/class_track.cpp:732 pcbnew/class_zone.cpp:593
+#: pcbnew/class_text_mod.cpp:295 pcbnew/class_track.cpp:619
+#: pcbnew/class_track.cpp:684 pcbnew/class_zone.cpp:538
 msgid "Type"
 msgstr "类型"
 
-#: eeschema/lib_item.cpp:66 eeschema/sch_pin.cpp:151
+#: eeschema/lib_item.cpp:66 eeschema/sch_pin.cpp:155
 msgid "no"
 msgstr "否"
 
-#: eeschema/lib_item.cpp:68 eeschema/sch_pin.cpp:153
+#: eeschema/lib_item.cpp:68 eeschema/sch_pin.cpp:157
 msgid "yes"
 msgstr "是"
 
-#: eeschema/lib_item.cpp:72 eeschema/sch_pin.cpp:157
+#: eeschema/lib_item.cpp:72 eeschema/sch_pin.cpp:161
 msgid "Converted"
 msgstr "转换"
 
-#: eeschema/lib_pin.cpp:991 eeschema/sch_pin.cpp:166
+#: eeschema/lib_pin.cpp:1010 eeschema/sch_pin.cpp:170
 #: 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:123 pcbnew/class_text_mod.cpp:300
+#: pcbnew/class_pcb_text.cpp:122 pcbnew/class_text_mod.cpp:300
 #: pcbnew/class_text_mod.cpp:308
 msgid "Yes"
 msgstr "是"
 
-#: eeschema/lib_pin.cpp:991 eeschema/sch_pin.cpp:166
+#: eeschema/lib_pin.cpp:1010 eeschema/sch_pin.cpp:170
 #: gerbview/gerber_draw_item.cpp:709 gerbview/gerber_draw_item.cpp:710
-#: pcbnew/class_pcb_text.cpp:121 pcbnew/class_text_mod.cpp:298
+#: pcbnew/class_pcb_text.cpp:120 pcbnew/class_text_mod.cpp:298
 #: pcbnew/class_text_mod.cpp:310
 msgid "No"
 msgstr "否"
 
-#: eeschema/lib_pin.cpp:1006 eeschema/sch_pin.cpp:177
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1391
+#: eeschema/lib_pin.cpp:1025 eeschema/sch_pin.cpp:181
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1465
 msgid "Pos X"
 msgstr "X 位置"
 
-#: eeschema/lib_pin.cpp:1009 eeschema/sch_pin.cpp:180
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1392
+#: eeschema/lib_pin.cpp:1028 eeschema/sch_pin.cpp:184
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1466
 msgid "Pos Y"
 msgstr "Y 位置"
 
-#: eeschema/lib_pin.cpp:1140
+#: eeschema/lib_pin.cpp:1161
 #, c-format
-msgid "Pin %s, %s, %s"
-msgstr "引脚 %s, %s, %s"
+msgid "Pin %s [%s, %s, %s]"
+msgstr "引脚 %s [%s, %s, %s]"
+
+#: eeschema/lib_pin.cpp:1169
+#, c-format
+msgid "Pin %s [%s, %s]"
+msgstr "引脚 %s [%s, %s]"
 
 #: eeschema/lib_polyline.cpp:354
 #, c-format
-msgid "Polyline at (%s, %s) with %d points"
-msgstr "多线段在 (%s, %s) 与 %d 点"
+msgid "Polyline, %d points"
+msgstr "多段线，%d 点"
 
 #: eeschema/lib_polyline.h:53
 msgid "PolyLine"
 msgstr "多段线"
 
-#: eeschema/lib_text.cpp:386 eeschema/sch_text.cpp:548
+#: eeschema/lib_text.cpp:387 eeschema/sch_text.cpp:548
 #, c-format
-msgid "Graphic Text \"%s\""
-msgstr "图形文本 \"%s\""
+msgid "Graphic Text '%s'"
+msgstr "图形文本 '%s'"
 
-#: eeschema/lib_view_frame.cpp:353
+#: eeschema/lib_view_frame.cpp:352
 msgid "<none>"
 msgstr "<无>"
 
-#: eeschema/lib_view_frame.cpp:360 eeschema/libedit/symbedit.cpp:220
+#: eeschema/lib_view_frame.cpp:359 eeschema/libedit/symbedit.cpp:220
 msgid "Parent"
 msgstr "父级"
 
-#: eeschema/lib_view_frame.cpp:362 eeschema/libedit/symbedit.cpp:242
-#: eeschema/sch_component.cpp:1251
+#: eeschema/lib_view_frame.cpp:361 eeschema/libedit/symbedit.cpp:242
+#: eeschema/sch_component.cpp:1378
 msgid "Key words"
 msgstr "关键词"
 
-#: eeschema/lib_view_frame.cpp:385
+#: eeschema/lib_view_frame.cpp:384
 #, c-format
 msgid ""
 "The current configuration does not include a library with the\n"
@@ -11424,11 +11737,11 @@ msgstr ""
 "昵称 \"%s\"。使用管理符号库\n"
 "来编辑配置。"
 
-#: eeschema/lib_view_frame.cpp:388
+#: eeschema/lib_view_frame.cpp:387
 msgid "Symbol library not found."
 msgstr "符号库未找到。"
 
-#: eeschema/lib_view_frame.cpp:392 eeschema/libedit/lib_edit_frame.cpp:1041
+#: eeschema/lib_view_frame.cpp:391 eeschema/libedit/lib_edit_frame.cpp:1060
 #, c-format
 msgid ""
 "The library with the nickname \"%s\" is not enabled\n"
@@ -11439,21 +11752,16 @@ msgstr ""
 "使用管理符号库\n"
 "来编辑封装。"
 
-#: eeschema/lib_view_frame.cpp:395 eeschema/libedit/lib_edit_frame.cpp:1044
+#: eeschema/lib_view_frame.cpp:394 eeschema/libedit/lib_edit_frame.cpp:1063
 msgid "Symbol library not enabled."
 msgstr "符号库未启用。"
 
-#: eeschema/lib_view_frame.cpp:455
+#: eeschema/lib_view_frame.cpp:454
 #, c-format
 msgid "Unit %c"
 msgstr "单元 %c"
 
-#: eeschema/lib_view_frame.cpp:897
-#, c-format
-msgid "Symbol Library Browser -- %s"
-msgstr "符号库浏览器 -- %s"
-
-#: eeschema/lib_view_frame.cpp:898 pcbnew/footprint_viewer_frame.cpp:981
+#: eeschema/lib_view_frame.cpp:897 pcbnew/footprint_viewer_frame.cpp:980
 msgid "no library selected"
 msgstr "没有选择库"
 
@@ -11481,32 +11789,38 @@ msgstr "创建符号库%s时发生错误。"
 msgid "Failed to save symbol library file \"%s\""
 msgstr "无法创建元件库文件 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:93
-#: eeschema/libedit/menubar_libedit.cpp:73
+#: eeschema/libedit/lib_edit_frame.cpp:96
+#: eeschema/libedit/menubar_libedit.cpp:78
 msgid "Library Editor"
 msgstr "库编辑器"
 
-#: eeschema/libedit/lib_edit_frame.cpp:154
+#: eeschema/libedit/lib_edit_frame.cpp:158
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:194
-#: pcbnew/footprint_edit_frame.cpp:216 pcbnew/footprint_edit_frame.cpp:671
+#: pcbnew/footprint_edit_frame.cpp:217 pcbnew/footprint_edit_frame.cpp:672
 msgid "Libraries"
 msgstr "库"
 
-#: eeschema/libedit/lib_edit_frame.cpp:189
+#: eeschema/libedit/lib_edit_frame.cpp:192
 msgid "Library changes are unsaved"
 msgstr "库更改未保存"
 
-#: eeschema/libedit/lib_edit_frame.cpp:475 eeschema/tools/sch_edit_tool.cpp:110
+#: eeschema/libedit/lib_edit_frame.cpp:491 eeschema/tools/sch_edit_tool.cpp:111
 #, c-format
 msgid "Unit %s"
 msgstr "单元 %s"
 
-#: eeschema/libedit/lib_edit_frame.cpp:683
+#: eeschema/libedit/lib_edit_frame.cpp:626
+#, c-format
+msgid ""
+"Editing symbol %s from schematic.  Saving will update the schematic only."
+msgstr "从原理图编辑符号 %s。  保存将仅更新原理图。"
+
+#: eeschema/libedit/lib_edit_frame.cpp:702
 #, c-format
 msgid "Library \"%s\" already exists"
 msgstr "库 \"%s\" 已经存在"
 
-#: eeschema/libedit/lib_edit_frame.cpp:697
+#: eeschema/libedit/lib_edit_frame.cpp:716
 #, c-format
 msgid ""
 "Could not create the library file '%s'.\n"
@@ -11515,44 +11829,44 @@ msgstr ""
 "无法创建库文件 \"%s\"。\n"
 "请检查写入权限。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:707 eeschema/libedit/lib_export.cpp:204
+#: eeschema/libedit/lib_edit_frame.cpp:726 eeschema/libedit/lib_export.cpp:204
 msgid "Could not open the library file."
 msgstr "无法打开库文件。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:776
+#: eeschema/libedit/lib_edit_frame.cpp:795
 #: eeschema/symbol_tree_model_adapter.cpp:74
 #, c-format
 msgid "Loading library \"%s\""
 msgstr "加载库 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:841
+#: eeschema/libedit/lib_edit_frame.cpp:860
 msgid "Add the library to the global library table?"
 msgstr "是否将库添加到全局库表？"
 
-#: eeschema/libedit/lib_edit_frame.cpp:842
+#: eeschema/libedit/lib_edit_frame.cpp:861
 msgid "Add To Global Library Table"
 msgstr "添加到全局库表"
 
-#: eeschema/libedit/lib_edit_frame.cpp:852
-#: pcbnew/footprint_libraries_utils.cpp:503
+#: eeschema/libedit/lib_edit_frame.cpp:871
+#: pcbnew/footprint_libraries_utils.cpp:502
 msgid "Global"
 msgstr "全局"
 
-#: eeschema/libedit/lib_edit_frame.cpp:855
-#: pcbnew/footprint_libraries_utils.cpp:507
+#: eeschema/libedit/lib_edit_frame.cpp:874
+#: pcbnew/footprint_libraries_utils.cpp:506
 msgid "Choose the Library Table to add the library to:"
 msgstr "选择库表添加到以下库："
 
-#: eeschema/libedit/lib_edit_frame.cpp:856
+#: eeschema/libedit/lib_edit_frame.cpp:875
 msgid "Add To Library Table"
 msgstr "添加到库表"
 
-#: eeschema/libedit/lib_edit_frame.cpp:888
+#: eeschema/libedit/lib_edit_frame.cpp:907
 #, c-format
 msgid "Failed to save backup to \"%s\""
 msgstr "未能将备份保存到 \"%s\""
 
-#: eeschema/libedit/lib_edit_frame.cpp:1030
+#: eeschema/libedit/lib_edit_frame.cpp:1049
 #, c-format
 msgid ""
 "The current configuration does not include the symbol library\n"
@@ -11563,7 +11877,7 @@ msgstr ""
 "\"%s\"。\n"
 "使用管理符号库来编辑配置。"
 
-#: eeschema/libedit/lib_edit_frame.cpp:1033
+#: eeschema/libedit/lib_edit_frame.cpp:1052
 msgid "Library not found in symbol library table."
 msgstr "在符号库表中找不到库。"
 
@@ -11606,10 +11920,10 @@ msgstr "符号 <%s> 已经在<%s>中存在。"
 
 #: eeschema/libedit/lib_export.cpp:157
 #: kicad/tools/kicad_manager_control.cpp:260
-#: pcbnew/dialogs/dialog_export_idf.cpp:166
+#: pcbnew/dialogs/dialog_export_idf.cpp:163
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:121
-#: pcbnew/footprint_libraries_utils.cpp:447
-#: pcbnew/footprint_libraries_utils.cpp:963
+#: pcbnew/footprint_libraries_utils.cpp:446
+#: pcbnew/footprint_libraries_utils.cpp:949
 msgid "Overwrite"
 msgstr "覆盖"
 
@@ -11638,11 +11952,11 @@ msgstr "符号 \"%s\" 保存到库中 \"%s\""
 msgid "Cannot find library \"%s\" in the Symbol Library Table (%s)"
 msgstr "在符号库表中找不到库 \"%s\"（%s）"
 
-#: eeschema/libedit/lib_manager.cpp:339
+#: eeschema/libedit/lib_manager.cpp:347
 msgid "Symbol not found."
 msgstr "没有找到符号。"
 
-#: eeschema/libedit/lib_manager.cpp:370
+#: eeschema/libedit/lib_manager.cpp:378
 #, c-format
 msgid "Error loading symbol \"%s\" from library \"%s\". (%s)"
 msgstr ""
@@ -11650,17 +11964,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/libedit/lib_manager.cpp:556
+#: eeschema/libedit/lib_manager.cpp:564
 #, c-format
 msgid "Cannot load symbol \"%s\" from library \"%s\" (%s)"
 msgstr "无法从库 \"%s\"(%s) 加载符号 \"%s\""
 
-#: eeschema/libedit/lib_manager.cpp:704
+#: eeschema/libedit/lib_manager.cpp:712
 #, c-format
 msgid "Cannot enumerate library \"%s\" (%s)"
 msgstr "无法枚举库 \"%s\"(%s)"
 
-#: eeschema/libedit/lib_manager.cpp:965
+#: eeschema/libedit/lib_manager.cpp:973
 #, c-format
 msgid "An error \"%s\" occurred saving symbol \"%s\" to library \"%s\""
 msgstr "错误 \"%s\" 发生保存符号 \"%s\" 到库 \"%s\""
@@ -11673,57 +11987,66 @@ msgstr ""
 "并非所有符号库都可以加载。  使用管理符号。\n"
 "用于调整路径和添加或删除库的“库”对话框。"
 
-#: eeschema/libedit/libedit.cpp:82
+#: eeschema/libedit/libedit.cpp:56
+#, c-format
+msgid "%s from schematic"
+msgstr "%s 来自原理图"
+
+#: eeschema/libedit/libedit.cpp:65
+msgid "[Read Only Library]"
+msgstr "[只读库]"
+
+#: eeschema/libedit/libedit.cpp:93
 msgid "No symbol libraries are loaded."
 msgstr "没有符号库被加载。"
 
-#: eeschema/libedit/libedit.cpp:88 eeschema/sch_component.cpp:1232
-#: eeschema/sch_component.cpp:1237 eeschema/sch_component.cpp:1270
-#: eeschema/sch_component.cpp:1275 pcbnew/tools/pcbnew_control.cpp:1060
+#: eeschema/libedit/libedit.cpp:99 eeschema/sch_component.cpp:1359
+#: eeschema/sch_component.cpp:1364 eeschema/sch_component.cpp:1392
+#: eeschema/sch_component.cpp:1397 pcbnew/tools/pcbnew_control.cpp:1073
 msgid "Library"
 msgstr "库"
 
-#: eeschema/libedit/libedit.cpp:104
+#: eeschema/libedit/libedit.cpp:115
 msgid "Select Symbol Library"
 msgstr "选择符号库"
 
-#: eeschema/libedit/libedit.cpp:152
+#: eeschema/libedit/libedit.cpp:163
 msgid "The current symbol has been modified.  Save changes?"
 msgstr "当前符号已被修改。是否保存更改？"
 
-#: eeschema/libedit/libedit.cpp:178
+#: eeschema/libedit/libedit.cpp:189
 #, c-format
 msgid "Error occurred loading symbol \"%s\" from library \"%s\"."
 msgstr "从库中%s加载符号%s发生错误。"
 
-#: eeschema/libedit/libedit.cpp:274
+#: eeschema/libedit/libedit.cpp:307
 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:318 eeschema/libedit/libedit.cpp:526
 #, c-format
 msgid "Symbol \"%s\" already exists in library \"%s\""
 msgstr "符号 \"%s\" 已经在库 \"%s\" 中存在"
 
-#: eeschema/libedit/libedit.cpp:419 include/lib_table_grid.h:183
-#: pcbnew/footprint_libraries_utils.cpp:877
-#: pcbnew/footprint_libraries_utils.cpp:1113
+#: eeschema/libedit/libedit.cpp:454 include/lib_table_grid.h:183
+#: pcbnew/footprint_libraries_utils.cpp:863
+#: pcbnew/footprint_libraries_utils.cpp:1099
 msgid "Nickname"
 msgstr "昵称"
 
-#: eeschema/libedit/libedit.cpp:430
+#: eeschema/libedit/libedit.cpp:465
 msgid "Save Copy of Symbol"
 msgstr "保存符号副本"
 
-#: eeschema/libedit/libedit.cpp:431 pcbnew/footprint_libraries_utils.cpp:889
+#: eeschema/libedit/libedit.cpp:466 pcbnew/footprint_libraries_utils.cpp:875
 msgid "Save in library:"
 msgstr "保存在库："
 
-#: eeschema/libedit/libedit.cpp:463
+#: eeschema/libedit/libedit.cpp:498
 msgid "No library specified.  Symbol could not be saved."
 msgstr "没有指定库，符号无法保存。"
 
-#: eeschema/libedit/libedit.cpp:472
+#: eeschema/libedit/libedit.cpp:507
 msgid ""
 "Derived symbols must be save in the same library\n"
 "that the parent symbol exists."
@@ -11731,11 +12054,7 @@ msgstr ""
 "派生符号必须保存在父级符号\n"
 "所在的同一库中。"
 
-#: eeschema/libedit/libedit.cpp:484
-msgid "No symbol name specified.  Symbol could not be saved."
-msgstr "没有指定符号名称, 符号无法保存。"
-
-#: eeschema/libedit/libedit.cpp:562
+#: eeschema/libedit/libedit.cpp:597
 #, c-format
 msgid ""
 "The symbol \"%s\" is used to derive other symbols.\n"
@@ -11748,82 +12067,82 @@ msgstr ""
 "\n"
 "是否要删除此符号及其所有派生符号？"
 
-#: eeschema/libedit/libedit.cpp:567
+#: eeschema/libedit/libedit.cpp:602
 msgid "Delete Symbol"
 msgstr "删除符号"
 
-#: eeschema/libedit/libedit.cpp:568
+#: eeschema/libedit/libedit.cpp:603
 msgid "Keep Symbol"
 msgstr "保留符号"
 
-#: eeschema/libedit/libedit.cpp:704 pcbnew/footprint_libraries_utils.cpp:991
+#: eeschema/libedit/libedit.cpp:739 pcbnew/footprint_libraries_utils.cpp:977
 #, c-format
 msgid "Revert \"%s\" to last version saved?"
 msgstr "是否将\"%s\"还原为上次保存的版本？"
 
-#: eeschema/libedit/libedit.cpp:773
+#: eeschema/libedit/libedit.cpp:808
 #, c-format
 msgid "Symbol name \"%s\" not found in library \"%s\""
 msgstr "在库 \"%s\" 中找不到符号 \"%s\" ！"
 
-#: eeschema/libedit/libedit.cpp:799
+#: eeschema/libedit/libedit.cpp:834
 msgid "No library specified."
 msgstr "没有指定库。"
 
-#: eeschema/libedit/libedit.cpp:818
+#: eeschema/libedit/libedit.cpp:853
 #, c-format
 msgid "Save Library \"%s\" As..."
 msgstr "另存为库 \"%s\"..."
 
-#: eeschema/libedit/libedit.cpp:850
+#: eeschema/libedit/libedit.cpp:885
 #, c-format
 msgid "Failed to save changes to symbol library file \"%s\""
 msgstr "无法将更改保存到符号库文件%s"
 
-#: eeschema/libedit/libedit.cpp:852
+#: eeschema/libedit/libedit.cpp:887
 msgid "Error saving library"
 msgstr "保存库时出错"
 
-#: eeschema/libedit/libedit.cpp:860
+#: eeschema/libedit/libedit.cpp:895
 #, c-format
 msgid "Symbol library file \"%s\" saved"
 msgstr "符号库文件 \"%s\" 已保存"
 
-#: eeschema/libedit/libedit.cpp:885 eeschema/sch_edit_frame.cpp:612
-#: pagelayout_editor/pl_editor_frame.cpp:343
-#: pcbnew/footprint_edit_frame.cpp:550 pcbnew/pcb_edit_frame.cpp:816
+#: eeschema/libedit/libedit.cpp:920 eeschema/sch_edit_frame.cpp:613
+#: pagelayout_editor/pl_editor_frame.cpp:339
+#: pcbnew/footprint_edit_frame.cpp:551 pcbnew/pcb_edit_frame.cpp:834
 #, c-format
 msgid "Save changes to \"%s\" before closing?"
 msgstr "是否在 \"%s\" 关闭之前保存更改？"
 
-#: eeschema/libedit/menubar_libedit.cpp:65 eeschema/menubar.cpp:112
+#: eeschema/libedit/menubar_libedit.cpp:70 eeschema/menubar.cpp:112
 #: pcbnew/dialogs/dialog_export_step.cpp:130
-#: pcbnew/dialogs/dialog_export_svg.cpp:93
-#: pcbnew/menubar_footprint_editor.cpp:85 pcbnew/menubar_pcb_editor.cpp:133
+#: pcbnew/dialogs/dialog_export_svg.cpp:92
+#: pcbnew/menubar_footprint_editor.cpp:85 pcbnew/menubar_pcb_editor.cpp:132
 msgid "Export"
 msgstr "导出"
 
-#: eeschema/libedit/menubar_libedit.cpp:117 eeschema/menubar.cpp:181
+#: eeschema/libedit/menubar_libedit.cpp:122 eeschema/menubar.cpp:180
 #: gerbview/menubar.cpp:190 pcbnew/menubar_footprint_editor.cpp:149
-#: pcbnew/menubar_pcb_editor.cpp:259
+#: pcbnew/menubar_pcb_editor.cpp:258
 msgid "&Units"
 msgstr "单位 (&U)"
 
-#: eeschema/libedit/menubar_libedit.cpp:173 eeschema/menubar.cpp:281
-#: pagelayout_editor/menubar.cpp:158 pcbnew/menubar_footprint_editor.cpp:247
-#: pcbnew/menubar_pcb_editor.cpp:458
+#: eeschema/libedit/menubar_libedit.cpp:180 eeschema/menubar.cpp:283
+#: pagelayout_editor/menubar.cpp:158 pcbnew/menubar_footprint_editor.cpp:249
+#: pcbnew/menubar_pcb_editor.cpp:467
 msgid "&Place"
 msgstr "放置 (&P)"
 
-#: eeschema/libedit/menubar_libedit.cpp:174 eeschema/menubar.cpp:282
-#: pagelayout_editor/menubar.cpp:159 pcbnew/menubar_footprint_editor.cpp:248
-#: pcbnew/menubar_pcb_editor.cpp:460
+#: eeschema/libedit/menubar_libedit.cpp:181 eeschema/menubar.cpp:284
+#: pagelayout_editor/menubar.cpp:159 pcbnew/menubar_footprint_editor.cpp:250
+#: pcbnew/menubar_pcb_editor.cpp:469
 msgid "&Inspect"
 msgstr "检查 (&I)"
 
-#: eeschema/libedit/menubar_libedit.cpp:175 eeschema/menubar.cpp:284
-#: pagelayout_editor/menubar.cpp:160 pcbnew/menubar_footprint_editor.cpp:250
-#: pcbnew/menubar_pcb_editor.cpp:462
+#: eeschema/libedit/menubar_libedit.cpp:182 eeschema/menubar.cpp:286
+#: pagelayout_editor/menubar.cpp:160 pcbnew/menubar_footprint_editor.cpp:252
+#: pcbnew/menubar_pcb_editor.cpp:471
 msgid "P&references"
 msgstr "首选项 (&R)"
 
@@ -11867,7 +12186,7 @@ msgid "Export current drawing"
 msgstr "导出当前图形"
 
 #: eeschema/menubar.cpp:64 kicad/menubar.cpp:63
-#: pagelayout_editor/menubar.cpp:57 pcbnew/menubar_pcb_editor.cpp:71
+#: pagelayout_editor/menubar.cpp:57 pcbnew/menubar_pcb_editor.cpp:70
 msgid "Open Recent"
 msgstr "打开最近使用"
 
@@ -11881,7 +12200,7 @@ msgid ""
 msgstr "将其它项目中的原理图添加到当前图页中"
 
 #: eeschema/menubar.cpp:98 pcbnew/menubar_footprint_editor.cpp:73
-#: pcbnew/menubar_pcb_editor.cpp:112
+#: pcbnew/menubar_pcb_editor.cpp:111
 msgid "Import"
 msgstr "导入"
 
@@ -11894,8 +12213,8 @@ msgid ""
 "Replace current schematic sheet with one imported from another application"
 msgstr "将当前的原理图页替换为从另一个应用程序导入的原理图页"
 
-#: eeschema/menubar.cpp:283 gerbview/menubar.cpp:251 kicad/menubar.cpp:165
-#: pcbnew/menubar_footprint_editor.cpp:249 pcbnew/menubar_pcb_editor.cpp:461
+#: eeschema/menubar.cpp:285 gerbview/menubar.cpp:253 kicad/menubar.cpp:165
+#: pcbnew/menubar_footprint_editor.cpp:251 pcbnew/menubar_pcb_editor.cpp:470
 msgid "&Tools"
 msgstr "工具 (&T)"
 
@@ -12074,57 +12393,57 @@ msgstr ""
 "保存项目特定符号库表时出错：\n"
 "%s"
 
-#: eeschema/sch_bus_entry.cpp:346
+#: eeschema/sch_bus_entry.cpp:345
 msgid "Bus to Wire Entry"
 msgstr "总线到连线入口"
 
-#: eeschema/sch_bus_entry.cpp:352
+#: eeschema/sch_bus_entry.cpp:351
 msgid "Bus to Bus Entry"
 msgstr "总线到总线入口"
 
-#: eeschema/sch_bus_entry.cpp:418
+#: eeschema/sch_bus_entry.cpp:419
 msgid "Bus Entry Type"
 msgstr "总线输入类型"
 
-#: eeschema/sch_component.cpp:1207
+#: eeschema/sch_component.cpp:1334
 msgid "Power symbol"
 msgstr "电源符号"
 
-#: eeschema/sch_component.cpp:1212
+#: eeschema/sch_component.cpp:1339
 msgid "flags"
 msgstr "标志"
 
-#: eeschema/sch_component.cpp:1221
+#: eeschema/sch_component.cpp:1348
 msgid "Missing parent"
 msgstr "缺少父级"
 
-#: eeschema/sch_component.cpp:1237
+#: eeschema/sch_component.cpp:1364
 msgid "Undefined!!!"
 msgstr "未定义!!!"
 
-#: eeschema/sch_component.cpp:1244
+#: eeschema/sch_component.cpp:1371
 msgid "<Unknown>"
 msgstr "<未知>"
 
-#: eeschema/sch_component.cpp:1270
+#: eeschema/sch_component.cpp:1392
 msgid "No library defined!"
 msgstr "未定义库!"
 
-#: eeschema/sch_component.cpp:1274
+#: eeschema/sch_component.cpp:1396
 #, c-format
 msgid "Symbol not found in %s!"
 msgstr "在 %s 中找不到符号!"
 
-#: eeschema/sch_component.cpp:1462
+#: eeschema/sch_component.cpp:1588
 #, c-format
-msgid "Symbol %s, %s"
-msgstr "符号 %s, %s"
+msgid "Symbol %s [%s]"
+msgstr "符号 %s [%s]"
 
 #: eeschema/sch_connection.cpp:336
 msgid "Connection Name"
 msgstr "连接名称"
 
-#: eeschema/sch_connection.cpp:345 pcbnew/netinfo_item.cpp:87
+#: eeschema/sch_connection.cpp:345 pcbnew/netinfo_item.cpp:81
 msgid "Net Code"
 msgstr "网络码"
 
@@ -12134,7 +12453,7 @@ msgid "Bus Alias %s Members"
 msgstr "总线别名 %s 成员"
 
 #: eeschema/sch_eagle_plugin.cpp:408 pcbnew/eagle_plugin.cpp:335
-#: pcbnew/eagle_plugin.cpp:2624
+#: pcbnew/eagle_plugin.cpp:2609
 #, c-format
 msgid "Unable to read file \"%s\""
 msgstr "无法读取文件 \"%s\""
@@ -12158,19 +12477,19 @@ msgstr "在导入的库中找不到 %s"
 msgid "Bus Entry needed"
 msgstr "需要总线入口"
 
-#: eeschema/sch_edit_frame.cpp:162 pcbnew/board_connected_item.h:144
+#: eeschema/sch_edit_frame.cpp:163 pcbnew/board_connected_item.h:145
 msgid "Not Found"
 msgstr "未找到"
 
-#: eeschema/sch_edit_frame.cpp:164
+#: eeschema/sch_edit_frame.cpp:165
 msgid "The following libraries were not found:"
 msgstr "未找到以下库："
 
-#: eeschema/sch_edit_frame.cpp:294
+#: eeschema/sch_edit_frame.cpp:295
 msgid "New schematic file is unsaved"
 msgstr "新原理图文件未保存"
 
-#: eeschema/sch_edit_frame.cpp:719
+#: eeschema/sch_edit_frame.cpp:720
 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 "
@@ -12179,37 +12498,36 @@ msgstr ""
 "无法更新 PCB,因为架构编辑器在独立模式下打开。为了从原理图创建/更新 PCB,请启"
 "动 KiCad Shell 并创建项目。"
 
-#: eeschema/sch_edit_frame.cpp:830
+#: eeschema/sch_edit_frame.cpp:832
 msgid "Schematic"
 msgstr "原理图"
 
-#: eeschema/sch_edit_frame.cpp:847
+#: eeschema/sch_edit_frame.cpp:849
 msgid "New Schematic"
 msgstr "新建原理图"
 
-#: eeschema/sch_edit_frame.cpp:859
+#: eeschema/sch_edit_frame.cpp:861
 #, c-format
 msgid "Schematic file \"%s\" already exists."
 msgstr "原理图文件 \"%s\" 已经存在。"
 
-#: eeschema/sch_edit_frame.cpp:880
+#: eeschema/sch_edit_frame.cpp:882
 msgid "Open Schematic"
 msgstr "打开原理图"
 
-#: eeschema/sch_edit_frame.cpp:961
+#: eeschema/sch_edit_frame.cpp:963
 msgid "Could not open CvPcb"
 msgstr "不能打开 CvPcb"
 
-#: eeschema/sch_edit_frame.cpp:1100 eeschema/sch_edit_frame.cpp:1118
-msgid " [no file]"
-msgstr " [没有文件]"
+#: eeschema/sch_edit_frame.cpp:1098
+msgid "[no file]"
+msgstr "[没有文件]"
 
-#: eeschema/sch_edit_frame.cpp:1115 kicad/kicad_manager_frame.cpp:610
-#: pcbnew/pcb_edit_frame.cpp:1152
-msgid " [Read Only]"
-msgstr " [只读]"
+#: eeschema/sch_edit_frame.cpp:1113 pcbnew/footprint_edit_frame.cpp:723
+msgid "[Read Only] "
+msgstr "[只读] "
 
-#: eeschema/sch_edit_frame.cpp:1193
+#: eeschema/sch_edit_frame.cpp:1196
 #, c-format
 msgid "Highlighted net: %s"
 msgstr "高亮网络：%s"
@@ -12218,13 +12536,13 @@ msgstr "高亮网络：%s"
 msgid "File: "
 msgstr "文件： "
 
-#: eeschema/sch_io_mgr.cpp:34 eeschema/sch_plugin.cpp:27 pcbnew/io_mgr.cpp:45
+#: eeschema/sch_io_mgr.cpp:34 eeschema/sch_plugin.cpp:27 pcbnew/io_mgr.cpp:46
 #: pcbnew/plugin.cpp:29
 #, c-format
 msgid "Plugin \"%s\" does not implement the \"%s\" function."
 msgstr "插件 \"%s\" 不能执行 \"%s\" 功能."
 
-#: eeschema/sch_io_mgr.cpp:35 pcbnew/io_mgr.cpp:46
+#: eeschema/sch_io_mgr.cpp:35 pcbnew/io_mgr.cpp:47
 #, c-format
 msgid "Plugin type \"%s\" is not found."
 msgstr "\"%s\" 类型插件没有找到。"
@@ -12273,7 +12591,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:1402
+#: eeschema/sch_legacy_plugin.cpp:2564 eeschema/sch_sexpr_plugin.cpp:1390
 #, c-format
 msgid "Library file \"%s\" not found."
 msgstr "未找到库文件 \"%s\"。"
@@ -12287,55 +12605,81 @@ msgstr "用户没有权限读取库文档 \"%s\""
 msgid "symbol document library file is empty"
 msgstr "符号文档库文件为空"
 
-#: eeschema/sch_legacy_plugin.cpp:4259 eeschema/sch_sexpr_plugin.cpp:1938
+#: eeschema/sch_legacy_plugin.cpp:4262 eeschema/sch_sexpr_plugin.cpp:1929
 #, c-format
 msgid "library %s does not contain a symbol named %s"
 msgstr "库 %s 不包含名为 %s 的符号"
 
-#: eeschema/sch_legacy_plugin.cpp:4442 eeschema/sch_sexpr_plugin.cpp:2110
+#: eeschema/sch_legacy_plugin.cpp:4445 eeschema/sch_sexpr_plugin.cpp:2101
 #, c-format
 msgid "symbol library \"%s\" already exists, cannot create a new library"
 msgstr "符号库 \"%s\" 已经存在, 无法创建新的库"
 
-#: eeschema/sch_legacy_plugin.cpp:4470 eeschema/sch_sexpr_plugin.cpp:2138
-#: pcbnew/legacy_plugin.cpp:3420
+#: eeschema/sch_legacy_plugin.cpp:4473 eeschema/sch_sexpr_plugin.cpp:2129
+#: pcbnew/legacy_plugin.cpp:3415
 #, c-format
 msgid "library \"%s\" cannot be deleted"
 msgstr "不能删除库 \"%s\""
 
-#: eeschema/sch_line.cpp:632
+#: eeschema/sch_line.cpp:648
 #, c-format
-msgid "%s Graphic Line from (%s, %s) to (%s, %s)"
-msgstr "%s 图形线从 (%s,%s) 到 (%s,%s)"
+msgid "Vertical Wire, length %s"
+msgstr "垂直线，长度 %s"
 
-#: eeschema/sch_line.cpp:633
+#: eeschema/sch_line.cpp:649
 #, c-format
-msgid "%s Wire from (%s, %s) to (%s, %s)"
-msgstr "%s 连线从 (%s,%s) 到 (%s,%s)"
+msgid "Vertical Bus, length %s"
+msgstr "垂直总线，长度 %s"
 
-#: eeschema/sch_line.cpp:634
+#: eeschema/sch_line.cpp:650
 #, c-format
-msgid "%s Bus from (%s, %s) to (%s, %s)"
-msgstr "%s 总线从 (%s,%s) 到 (%s,%s)"
+msgid "Vertical Graphic Line, length %s"
+msgstr "垂直图形线，长度 %s"
 
-#: eeschema/sch_line.cpp:635
+#: eeschema/sch_line.cpp:657
 #, c-format
-msgid "%s Line on Unknown Layer from (%s, %s) to (%s, %s)"
-msgstr "%s 线在未知层从 (%s,%s) 到 (%s,%s)"
+msgid "Horizontal Wire, length %s"
+msgstr "水平线，长度 %s"
 
-#: eeschema/sch_line.cpp:783
+#: eeschema/sch_line.cpp:658
+#, c-format
+msgid "Horizontal Bus, length %s"
+msgstr "水平总线，长度 %s"
+
+#: eeschema/sch_line.cpp:659
+#, c-format
+msgid "Horizontal Graphic Line, length %s"
+msgstr "水平图形线，长度 %s"
+
+# Die 裸芯片
+#: eeschema/sch_line.cpp:666
+#, c-format
+msgid "Wire, length %s"
+msgstr "线，长度 %s"
+
+#: eeschema/sch_line.cpp:667
+#, c-format
+msgid "Bus, length %s"
+msgstr "总线，长度 %s"
+
+#: eeschema/sch_line.cpp:668
+#, c-format
+msgid "Graphic Line, length %s"
+msgstr "图形线，长度 %s"
+
+#: eeschema/sch_line.cpp:813
 msgid "Graphical"
 msgstr "图形"
 
-#: eeschema/sch_line.cpp:786
+#: eeschema/sch_line.cpp:816
 msgid "Line Type"
 msgstr "线类型"
 
-#: eeschema/sch_line.cpp:789
+#: eeschema/sch_line.cpp:819
 msgid "from netclass"
 msgstr "从网络类"
 
-#: eeschema/sch_line.cpp:810 eeschema/sch_text.cpp:682
+#: eeschema/sch_line.cpp:840 eeschema/sch_text.cpp:683
 msgid "Assigned Netclass"
 msgstr "分配的网络类"
 
@@ -12378,42 +12722,36 @@ msgid ""
 "Enter the python symbol which implements the SCH_PLUGIN::Symbol*() functions."
 msgstr "输入实现 SCH_PLUGIN::Symbol*() 函数的 Python 符号。"
 
-#: eeschema/sch_plugins/altium/sch_altium_plugin.cpp:227
-#: pcbnew/plugins/altium/altium_pcb.cpp:57
-#, c-format
-msgid "Cannot open file '%s'"
-msgstr "无法打开文件 ‘%s’"
-
-#: eeschema/sch_screen.cpp:585 eeschema/sch_screen.cpp:682
+#: eeschema/sch_screen.cpp:589 eeschema/sch_screen.cpp:686
 #, c-format
 msgid "Setting schematic symbol '%s %s' library identifier to '%s'. "
 msgstr "正在将原理图符号 '%s %s' 库标识符设置为 '%s'。 "
 
-#: eeschema/sch_screen.cpp:602
+#: eeschema/sch_screen.cpp:606
 #, c-format
 msgid ""
 "Schematic symbol reference '%s' library identifier is not valid.  Unable to "
 "link library symbol."
 msgstr "原理图符号引用 '%s' 库标识符无效。无法链接库符号。"
 
-#: eeschema/sch_screen.cpp:618
+#: eeschema/sch_screen.cpp:622
 #, 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:637
+#: eeschema/sch_screen.cpp:641
 #, c-format
 msgid "I/O error %s resolving library symbol %s"
 msgstr "I/O 错误 %s 正在解析库符号 %s"
 
-#: eeschema/sch_screen.cpp:661
+#: eeschema/sch_screen.cpp:665
 #, c-format
 msgid "Falling back to cache to set symbol '%s:%s' link '%s'."
 msgstr "正在回退到缓存以设置符号 '%s:%s' 链接 '%s'。"
 
-#: eeschema/sch_screen.cpp:693
+#: eeschema/sch_screen.cpp:697
 #, c-format
 msgid "No library symbol found for schematic symbol '%s %s'. "
 msgstr "找不到原理图符号 '%s %s' 的库符号。 "
@@ -12444,7 +12782,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:202
+#: eeschema/sch_sexpr_parser.cpp:212
 #, c-format
 msgid ""
 "Invalid symbol extends name in\n"
@@ -12457,7 +12795,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:213
+#: eeschema/sch_sexpr_parser.cpp:223
 #, c-format
 msgid ""
 "No parent for extended symbol %s in\n"
@@ -12470,7 +12808,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:230
+#: eeschema/sch_sexpr_parser.cpp:240
 #, c-format
 msgid ""
 "Invalid symbol unit name in\n"
@@ -12483,7 +12821,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:240
+#: eeschema/sch_sexpr_parser.cpp:250
 #, c-format
 msgid ""
 "Invalid symbol unit name prefix %s in\n"
@@ -12496,7 +12834,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:253
+#: eeschema/sch_sexpr_parser.cpp:263
 #, c-format
 msgid ""
 "Invalid symbol unit name suffix %s in\n"
@@ -12509,7 +12847,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:262
+#: eeschema/sch_sexpr_parser.cpp:272
 #, c-format
 msgid ""
 "Invalid symbol unit number %s in\n"
@@ -12522,7 +12860,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:272
+#: eeschema/sch_sexpr_parser.cpp:282
 #, c-format
 msgid ""
 "Invalid symbol convert number %s in\n"
@@ -12535,7 +12873,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:397 pcbnew/pcb_parser.cpp:149
+#: eeschema/sch_sexpr_parser.cpp:407 pcbnew/pcb_parser.cpp:149
 #, c-format
 msgid ""
 "Invalid floating point number in\n"
@@ -12548,7 +12886,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:406 pcbnew/pcb_parser.cpp:158
+#: eeschema/sch_sexpr_parser.cpp:416 pcbnew/pcb_parser.cpp:158
 #, c-format
 msgid ""
 "Missing floating point number in\n"
@@ -12561,7 +12899,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:698
+#: eeschema/sch_sexpr_parser.cpp:708
 #, c-format
 msgid ""
 "Invalid symbol names definition in\n"
@@ -12574,7 +12912,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:721 eeschema/sch_sexpr_parser.cpp:1641
+#: eeschema/sch_sexpr_parser.cpp:731 eeschema/sch_sexpr_parser.cpp:1651
 #, c-format
 msgid ""
 "Invalid property name in\n"
@@ -12587,7 +12925,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:730 eeschema/sch_sexpr_parser.cpp:1650
+#: eeschema/sch_sexpr_parser.cpp:740 eeschema/sch_sexpr_parser.cpp:1660
 #, c-format
 msgid ""
 "Empty property name in\n"
@@ -12600,7 +12938,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:740 eeschema/sch_sexpr_parser.cpp:1659
+#: eeschema/sch_sexpr_parser.cpp:750 eeschema/sch_sexpr_parser.cpp:1669
 #, c-format
 msgid ""
 "Invalid property value in\n"
@@ -12613,7 +12951,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1194
+#: eeschema/sch_sexpr_parser.cpp:1204
 #, c-format
 msgid ""
 "Invalid pin name in\n"
@@ -12626,7 +12964,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1229
+#: eeschema/sch_sexpr_parser.cpp:1239
 #, c-format
 msgid ""
 "Invalid pin number in\n"
@@ -12639,7 +12977,7 @@ msgstr ""
 "行：%d\n"
 "位移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1267
+#: eeschema/sch_sexpr_parser.cpp:1277
 #, c-format
 msgid ""
 "Invalid alternate pin name in\n"
@@ -12652,7 +12990,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1433
+#: eeschema/sch_sexpr_parser.cpp:1443
 #, c-format
 msgid ""
 "Invalid text string in\n"
@@ -12665,12 +13003,12 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1482 pcbnew/pcb_parser.cpp:890
+#: eeschema/sch_sexpr_parser.cpp:1492 pcbnew/pcb_parser.cpp:899
 #, c-format
 msgid "Page type \"%s\" is not valid "
 msgstr "图框类型 \"%s\" 无效 "
 
-#: eeschema/sch_sexpr_parser.cpp:1720
+#: eeschema/sch_sexpr_parser.cpp:1730
 #, c-format
 msgid ""
 "Invalid sheet pin name in\n"
@@ -12683,7 +13021,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:1729
+#: eeschema/sch_sexpr_parser.cpp:1739
 #, c-format
 msgid ""
 "Empty sheet pin name in\n"
@@ -12696,7 +13034,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:2059
+#: eeschema/sch_sexpr_parser.cpp:2081
 #, c-format
 msgid ""
 "Invalid symbol library name in\n"
@@ -12709,7 +13047,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: eeschema/sch_sexpr_parser.cpp:2081
+#: eeschema/sch_sexpr_parser.cpp:2103
 #, c-format
 msgid ""
 "Invalid symbol library ID in\n"
@@ -12738,12 +13076,12 @@ msgstr "文件名称"
 msgid "UUID"
 msgstr "UUID"
 
-#: eeschema/sch_sheet.cpp:905
+#: eeschema/sch_sheet.cpp:909
 #, c-format
 msgid "Hierarchical Sheet %s"
 msgstr "层次分页 %s"
 
-#: eeschema/sch_sheet_path.cpp:58 include/class_board_item.h:396
+#: eeschema/sch_sheet_path.cpp:58 include/class_board_item.h:419
 msgid "(Deleted Item)"
 msgstr "(删除项)"
 
@@ -12760,56 +13098,56 @@ msgstr "层次图框引脚 %s"
 msgid "Tri-State"
 msgstr "三态"
 
-#: eeschema/sch_text.cpp:625
+#: eeschema/sch_text.cpp:626
 msgid "Graphic Text"
 msgstr "图形文本"
 
-#: eeschema/sch_text.cpp:629
+#: eeschema/sch_text.cpp:630
 msgid "Hierarchical Sheet Pin"
 msgstr "层次图框引脚"
 
-#: eeschema/sch_text.cpp:637
+#: eeschema/sch_text.cpp:638
 msgid "Horizontal left"
 msgstr "水平向左"
 
-#: eeschema/sch_text.cpp:638
+#: eeschema/sch_text.cpp:639
 msgid "Vertical up"
 msgstr "垂直向上"
 
-#: eeschema/sch_text.cpp:639
+#: eeschema/sch_text.cpp:640
 msgid "Horizontal right"
 msgstr "水平向右"
 
-#: eeschema/sch_text.cpp:640
+#: eeschema/sch_text.cpp:641
 msgid "Vertical down"
 msgstr "垂直向下"
 
-#: eeschema/sch_text.cpp:646
+#: eeschema/sch_text.cpp:647
 msgid "Bold Italic"
 msgstr "加粗斜体"
 
-#: eeschema/sch_text.cpp:666 pcbnew/class_pcb_target.cpp:153
+#: eeschema/sch_text.cpp:667 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:794
+#: eeschema/sch_text.cpp:795
 #, c-format
-msgid "Label %s"
-msgstr "标签 %s"
+msgid "Label '%s'"
+msgstr "标签 '%s'"
 
-#: eeschema/sch_text.cpp:1036
+#: eeschema/sch_text.cpp:1037
 #, c-format
-msgid "Global Label %s"
-msgstr "全局标签 %s"
+msgid "Global Label '%s'"
+msgstr "全局标签 '%s'"
 
-#: eeschema/sch_text.cpp:1225
+#: eeschema/sch_text.cpp:1226
 #, c-format
-msgid "Hierarchical Label %s"
-msgstr "层次标签 %s"
+msgid "Hierarchical Label '%s'"
+msgstr "层次标签 '%s'"
 
-#: eeschema/sch_text.cpp:1238
+#: eeschema/sch_text.cpp:1239
 msgid ""
 "<table>   <tr>      <th>Markup</th>      <th></th>      <th>Result</th>   </"
 "tr>   <tr>      <td>&nbsp;<br><samp>^{superscript}</samp></td>      <td></"
@@ -12909,7 +13247,7 @@ 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:1363 pcbnew/dialogs/panel_setup_rules.cpp:409
+#: eeschema/sch_text.cpp:1364 pcbnew/dialogs/panel_setup_rules.cpp:407
 msgid "Syntax Help"
 msgstr "语法帮助"
 
@@ -13043,15 +13381,15 @@ msgstr "载入原理图文件 \"%s\" 发生错误。"
 msgid "Failed to load schematic \"%s\""
 msgstr "无法加载原理图 \"%s\""
 
-#: eeschema/sheet.cpp:204
+#: eeschema/sheet.cpp:203
 msgid "Continue Load"
 msgstr "继续加载"
 
-#: eeschema/sheet.cpp:205
+#: eeschema/sheet.cpp:204
 msgid "Cancel Load"
 msgstr "取消加载"
 
-#: eeschema/sheet.cpp:222
+#: eeschema/sheet.cpp:221
 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 "
@@ -13060,12 +13398,12 @@ msgstr ""
 "加载的原理图中缺少项目库表中的库名称。 这可能会导致加载的原理图的符号库链接断"
 "开。 是否要继续？"
 
-#: eeschema/sheet.cpp:225 eeschema/sheet.cpp:266 eeschema/sheet.cpp:316
-#: eeschema/sheet.cpp:377
+#: eeschema/sheet.cpp:224 eeschema/sheet.cpp:265 eeschema/sheet.cpp:315
+#: eeschema/sheet.cpp:376
 msgid "Continue Load Schematic"
 msgstr "继续加载原理图"
 
-#: eeschema/sheet.cpp:262
+#: eeschema/sheet.cpp:261
 #, c-format
 msgid ""
 "The project library table \"%s\" does not exist or cannot be read.  This may "
@@ -13074,7 +13412,7 @@ msgstr ""
 "项目库表 \"%s\" 不存在或无法读取。 这可能会导致原理图的符号链接断开。 是否要"
 "继续？"
 
-#: eeschema/sheet.cpp:312
+#: eeschema/sheet.cpp:311
 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 "
@@ -13083,7 +13421,7 @@ msgstr ""
 "加载的原理图中缺少加载的原理图项目库中的库名称。 这可能会导致原理图的符号库链"
 "接断开。 是否要继续？"
 
-#: eeschema/sheet.cpp:373
+#: eeschema/sheet.cpp:372
 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 "
@@ -13092,7 +13430,7 @@ msgstr ""
 "引用其他库的重复库名称存在于当前库表中。 无法解决此冲突,并可能导致原理图的符"
 "号库链接断开。 是否要继续？"
 
-#: eeschema/sheet.cpp:617
+#: eeschema/sheet.cpp:616
 #, c-format
 msgid ""
 "The file name \"%s\" can cause issues with an existing file name\n"
@@ -13110,15 +13448,15 @@ msgstr ""
 "\n"
 "你想继续吗？"
 
-#: eeschema/sheet.cpp:626
+#: eeschema/sheet.cpp:625
 msgid "Do not show this message again."
 msgstr "不再显示此消息。"
 
-#: eeschema/sheet.cpp:627
+#: eeschema/sheet.cpp:626
 msgid "Create New Sheet"
 msgstr "创建新图纸"
 
-#: eeschema/sheet.cpp:628
+#: eeschema/sheet.cpp:627
 msgid "Discard New Sheet"
 msgstr "丢弃新图纸"
 
@@ -13406,7 +13744,7 @@ msgstr "请填写必填字段"
 msgid "\"%s\" is not a valid Spice value"
 msgstr "\"%s\" 不是有效的 Spice 值"
 
-#: eeschema/symbol_lib_table.cpp:230
+#: eeschema/symbol_lib_table.cpp:232
 #, c-format
 msgid ""
 "Duplicate library nickname \"%s\" found in symbol library table file line %d"
@@ -13423,6 +13761,10 @@ msgstr ""
 "\n"
 "%s"
 
+#: eeschema/symbol_tree_synchronizing_adapter.cpp:249
+msgid "(failed to load) "
+msgstr "(加载失败)  "
+
 #: eeschema/toolbars_lib_view.cpp:48
 msgid "Select symbol to browse"
 msgstr "选择要浏览的符号"
@@ -13435,31 +13777,31 @@ msgstr "显示上一个符号"
 msgid "Display next symbol"
 msgstr "显示下一个符号"
 
-#: eeschema/tools/backanno.cpp:206
+#: eeschema/tools/backanno.cpp:208
 msgid "Load Symbol Footprint Link File"
 msgstr "载入符号封装链接文件"
 
-#: eeschema/tools/backanno.cpp:217
+#: eeschema/tools/backanno.cpp:219
 msgid "Keep existing footprint field visibility"
 msgstr "保持现有的封装字段可见性"
 
-#: eeschema/tools/backanno.cpp:218
+#: eeschema/tools/backanno.cpp:220
 msgid "Show all footprint fields"
 msgstr "显示封装所有字段"
 
-#: eeschema/tools/backanno.cpp:219
+#: eeschema/tools/backanno.cpp:221
 msgid "Hide all footprint fields"
 msgstr "隐藏封装所有字段"
 
-#: eeschema/tools/backanno.cpp:221
+#: eeschema/tools/backanno.cpp:223
 msgid "Select the footprint field visibility setting."
 msgstr "选择封装字段可见性设置。"
 
-#: eeschema/tools/backanno.cpp:222
+#: eeschema/tools/backanno.cpp:224
 msgid "Change Visibility"
 msgstr "修改可见性"
 
-#: eeschema/tools/backanno.cpp:232
+#: eeschema/tools/backanno.cpp:234
 #, c-format
 msgid "Failed to open component-footprint link file \"%s\""
 msgstr "无法打开元件封装链接文件 \"%s\""
@@ -13468,7 +13810,7 @@ msgstr "无法打开元件封装链接文件 \"%s\""
 msgid "Select at least one property to back annotate."
 msgstr "选择至少一个要反向批注的属性。"
 
-#: eeschema/tools/backannotate.cpp:94
+#: 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."
@@ -13476,87 +13818,71 @@ msgstr ""
 "无法获取 PCB 网表，因为 eesschema 是在独立模式下打开的。\n"
 "您必须启动 KiCad 项目管理器并创建一个项目。"
 
-#: eeschema/tools/backannotate.cpp:161
+#: eeschema/tools/backannotate.cpp:160
 #, c-format
 msgid "Footprint \"%s\" has no symbol associated."
 msgstr "封装 \"%s\" 没有关联的符号。"
 
-#: eeschema/tools/backannotate.cpp:193
+#: eeschema/tools/backannotate.cpp:192
 #, c-format
 msgid "Pcb footprints \"%s\" and \"%s\" linked to same symbol"
 msgstr "链接到同一符号的 PCB 封装 \"%s\" 和 \"%s\""
 
-#: eeschema/tools/backannotate.cpp:258
+#: eeschema/tools/backannotate.cpp:257
 #, c-format
 msgid "Cannot find symbol for \"%s\" footprint"
 msgstr "找不到 \"%s\" 封装的符号"
 
-#: eeschema/tools/backannotate.cpp:283
+#: eeschema/tools/backannotate.cpp:282
 #, c-format
 msgid "Cannot find footprint for \"%s\" symbol"
 msgstr "找不到 \"%s\" 符号的封装"
 
-#: eeschema/tools/backannotate.cpp:292
+#: eeschema/tools/backannotate.cpp:291
 msgid "Cannot relink footprints because schematic is not fully annotated"
 msgstr "由于原理图未完全批注，因此无法重新链接封装"
 
-#: eeschema/tools/backannotate.cpp:343
-#, c-format
-msgid ""
-"\"%s\" and \"%s\" use the same schematic symbol.\n"
-"They cannot have different footprints or values."
-msgstr ""
-"\"%s\" 和 \"%s\" 使用相同的原理图符号。\n"
-"它们不能有不同的封装或值。"
-
-#: eeschema/tools/backannotate.cpp:368
-#, 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:399
+#: eeschema/tools/backannotate.cpp:316
 #, c-format
 msgid "Change \"%s\" reference designator to \"%s\"."
 msgstr "更改 \"%s\" 的位号为 \"%s\"。"
 
-#: eeschema/tools/backannotate.cpp:416
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:221
+#: eeschema/tools/backannotate.cpp:333
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:222
 #, c-format
 msgid "Change %s footprint from \"%s\" to \"%s\"."
 msgstr "%s 的封装从 \"%s\" 更改为 \"%s\"。"
 
 # 可能会出现语序问题。待测试。
-#: eeschema/tools/backannotate.cpp:434
+#: eeschema/tools/backannotate.cpp:351
 #, c-format
 msgid "Change %s value from \"%s\" to \"%s\"."
 msgstr "将 %s 值从 \"%s\" 更改为 \"%s\"。"
 
 # 可能会出现语序问题。待测试。
-#: eeschema/tools/backannotate.cpp:575
+#: eeschema/tools/backannotate.cpp:492
 #, c-format
 msgid "Change \"%s\" labels to \"%s\"."
 msgstr "将 \"%s\" 标签更改为 \"%s\"。"
 
 # 可能会出现语序问题。待测试。
-#: eeschema/tools/backannotate.cpp:599
+#: eeschema/tools/backannotate.cpp:516
 #, c-format
 msgid "Change \"%s\" global labels to \"%s\"."
 msgstr "将 \"%s\" 全局标签更改为 \"%s\"。"
 
-#: eeschema/tools/backannotate.cpp:612 eeschema/tools/backannotate.cpp:643
+#: eeschema/tools/backannotate.cpp:529 eeschema/tools/backannotate.cpp:560
 #, c-format
 msgid "Change \"%s\" hierarchical label to \"%s\"."
 msgstr "将 \"%s\" 分层标签更改为 \"%s\"。"
 
-#: eeschema/tools/backannotate.cpp:667
+#: eeschema/tools/backannotate.cpp:584
 #, 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:677
+#: eeschema/tools/backannotate.cpp:594
 #, c-format
 msgid "Add label \"%s\" to net \"%s\"."
 msgstr "将标签 \"%s\" 添加到网络 \"%s\"。"
@@ -13577,19 +13903,19 @@ msgstr "SPICE 中的模拟电路"
 msgid "Opens the datasheet in a browser"
 msgstr "在浏览器中打开数据表"
 
-#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1083
+#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1116
 msgid "Create Corner"
 msgstr "创建拐角"
 
-#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1083
+#: eeschema/tools/ee_actions.cpp:63 pcbnew/tools/pcb_actions.cpp:1116
 msgid "Create a corner"
 msgstr "建立拐角"
 
-#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1087
+#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1120
 msgid "Remove Corner"
 msgstr "移除拐角"
 
-#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1087
+#: eeschema/tools/ee_actions.cpp:68 pcbnew/tools/pcb_actions.cpp:1120
 msgid "Remove corner"
 msgstr "移除拐角"
 
@@ -13699,699 +14025,717 @@ msgstr ""
 "启用后将所有更改（引脚编号除外）传播到其他单元。\n"
 "默认情况下启用具有可互换单元的多单元元件。"
 
-#: eeschema/tools/ee_actions.cpp:193
+#: eeschema/tools/ee_actions.cpp:189
+msgid "Save In Schematic"
+msgstr "保存到原理图"
+
+#: eeschema/tools/ee_actions.cpp:189
+msgid "Save the current symbol in the schematic"
+msgstr "将当前符号保存在原理图中"
+
+#: eeschema/tools/ee_actions.cpp:198
 msgid "Add Pin"
 msgstr "添加引脚"
 
-#: eeschema/tools/ee_actions.cpp:193
+#: eeschema/tools/ee_actions.cpp:198
 msgid "Add a pin"
 msgstr "添加引脚"
 
-#: eeschema/tools/ee_actions.cpp:198 eeschema/tools/ee_actions.cpp:319
+#: eeschema/tools/ee_actions.cpp:203 eeschema/tools/ee_actions.cpp:323
 #: pagelayout_editor/tools/pl_actions.cpp:53 pcbnew/tools/pcb_actions.cpp:116
 msgid "Add Text"
 msgstr "添加文本"
 
-#: eeschema/tools/ee_actions.cpp:198 pagelayout_editor/tools/pl_actions.cpp:53
+#: eeschema/tools/ee_actions.cpp:203 pagelayout_editor/tools/pl_actions.cpp:53
 #: pcbnew/tools/pcb_actions.cpp:116
 msgid "Add a text item"
 msgstr "添加文本项"
 
-#: eeschema/tools/ee_actions.cpp:203 pagelayout_editor/tools/pl_actions.cpp:48
+#: eeschema/tools/ee_actions.cpp:208 pagelayout_editor/tools/pl_actions.cpp:48
 msgid "Add Rectangle"
 msgstr "添加矩形"
 
-#: eeschema/tools/ee_actions.cpp:203 pagelayout_editor/tools/pl_actions.cpp:48
+#: eeschema/tools/ee_actions.cpp:208 pagelayout_editor/tools/pl_actions.cpp:48
 msgid "Add a rectangle"
 msgstr "添加一个矩形"
 
-#: eeschema/tools/ee_actions.cpp:208
+#: eeschema/tools/ee_actions.cpp:213
 msgid "Add Circle"
 msgstr "添加圆"
 
-#: eeschema/tools/ee_actions.cpp:208
+#: eeschema/tools/ee_actions.cpp:213
 msgid "Add a circle"
 msgstr "添加一个圆"
 
-#: eeschema/tools/ee_actions.cpp:213
+#: eeschema/tools/ee_actions.cpp:218
 msgid "Add Arc"
 msgstr "添加圆弧"
 
-#: eeschema/tools/ee_actions.cpp:213
+#: eeschema/tools/ee_actions.cpp:218
 msgid "Add an arc"
 msgstr "添加一个圆弧"
 
-#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:662
+#: eeschema/tools/ee_actions.cpp:223 eeschema/tools/ee_actions.cpp:674
 msgid "Add Lines"
 msgstr "添加线"
 
-#: eeschema/tools/ee_actions.cpp:218 eeschema/tools/ee_actions.cpp:662
+#: eeschema/tools/ee_actions.cpp:223 eeschema/tools/ee_actions.cpp:674
 msgid "Add connected graphic lines"
 msgstr "添加连接的图形线"
 
-#: eeschema/tools/ee_actions.cpp:223
+#: eeschema/tools/ee_actions.cpp:228
 msgid "Move Symbol Anchor"
 msgstr "移动符号锚点"
 
-#: eeschema/tools/ee_actions.cpp:223
+#: eeschema/tools/ee_actions.cpp:228
 msgid "Specify a new location for the symbol anchor"
 msgstr "为符号锚点指定新位置"
 
-#: eeschema/tools/ee_actions.cpp:228
+#: eeschema/tools/ee_actions.cpp:233
 msgid "Finish drawing shape"
 msgstr "完成绘图形状"
 
-#: eeschema/tools/ee_actions.cpp:236
+#: eeschema/tools/ee_actions.cpp:240
 msgid "Push Pin Length"
 msgstr "推送引脚长度"
 
-#: eeschema/tools/ee_actions.cpp:236
+#: eeschema/tools/ee_actions.cpp:240
 msgid "Copy pin length to other pins in symbol"
 msgstr "将引脚长度复制到符号中的其他引脚"
 
-#: eeschema/tools/ee_actions.cpp:241
+#: eeschema/tools/ee_actions.cpp:245
 msgid "Push Pin Name Size"
 msgstr "推送引脚名称大小"
 
-#: eeschema/tools/ee_actions.cpp:241
+#: eeschema/tools/ee_actions.cpp:245
 msgid "Copy pin name size to other pins in symbol"
 msgstr "将引脚名称大小复制到符号中的其他引脚"
 
-#: eeschema/tools/ee_actions.cpp:246
+#: eeschema/tools/ee_actions.cpp:250
 msgid "Push Pin Number Size"
 msgstr "推送引脚编号大小"
 
-#: eeschema/tools/ee_actions.cpp:246
+#: eeschema/tools/ee_actions.cpp:250
 msgid "Copy pin number size to other pins in symbol"
 msgstr "将引脚编号大小复制到符号中的其他引脚"
 
-#: eeschema/tools/ee_actions.cpp:255
+#: eeschema/tools/ee_actions.cpp:259
 msgid "Add Symbol"
 msgstr "添加符号"
 
-#: eeschema/tools/ee_actions.cpp:255
+#: eeschema/tools/ee_actions.cpp:259
 msgid "Add a symbol"
 msgstr "添加符号"
 
-#: eeschema/tools/ee_actions.cpp:261
+#: eeschema/tools/ee_actions.cpp:265
 msgid "Add Power"
 msgstr "添加电源端口"
 
-#: eeschema/tools/ee_actions.cpp:261
+#: eeschema/tools/ee_actions.cpp:265
 msgid "Add a power port"
 msgstr "添加电源端口"
 
-#: eeschema/tools/ee_actions.cpp:267
+#: eeschema/tools/ee_actions.cpp:271
 msgid "Add No Connect Flag"
 msgstr "添加不连接标记"
 
-#: eeschema/tools/ee_actions.cpp:267
+#: eeschema/tools/ee_actions.cpp:271
 msgid "Add a no-connection flag"
 msgstr "添加无连接标志"
 
-#: eeschema/tools/ee_actions.cpp:273
+#: eeschema/tools/ee_actions.cpp:277
 msgid "Add Junction"
 msgstr "添加连接点"
 
-#: eeschema/tools/ee_actions.cpp:273
+#: eeschema/tools/ee_actions.cpp:277
 msgid "Add a junction"
 msgstr "添加连接点"
 
-#: eeschema/tools/ee_actions.cpp:279
+#: eeschema/tools/ee_actions.cpp:283
 msgid "Add Wire to Bus Entry"
 msgstr "添加连线和总线入口"
 
-#: eeschema/tools/ee_actions.cpp:279
+#: eeschema/tools/ee_actions.cpp:283
 msgid "Add a wire entry to a bus"
 msgstr "添加导线入口到总线"
 
-#: eeschema/tools/ee_actions.cpp:285
+#: eeschema/tools/ee_actions.cpp:289
 msgid "Add Label"
 msgstr "添加标签"
 
-#: eeschema/tools/ee_actions.cpp:285
+#: eeschema/tools/ee_actions.cpp:289
 msgid "Add a net label"
 msgstr "添加网络标签"
 
-#: eeschema/tools/ee_actions.cpp:291
+#: eeschema/tools/ee_actions.cpp:295
 msgid "Add Hierarchical Label"
 msgstr "添加层次标签"
 
-#: eeschema/tools/ee_actions.cpp:291
+#: eeschema/tools/ee_actions.cpp:295
 msgid "Add a hierarchical sheet label"
 msgstr "添加分层图框标签"
 
-#: eeschema/tools/ee_actions.cpp:297
+#: eeschema/tools/ee_actions.cpp:301
 msgid "Add Sheet"
 msgstr "添加图页"
 
-#: eeschema/tools/ee_actions.cpp:297
+#: eeschema/tools/ee_actions.cpp:301
 msgid "Add a hierarchical sheet"
 msgstr "添加分层图框"
 
-#: eeschema/tools/ee_actions.cpp:302
+#: eeschema/tools/ee_actions.cpp:306
 msgid "Add Sheet Pin"
 msgstr "添加图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:302
+#: eeschema/tools/ee_actions.cpp:306
 msgid "Add a sheet pin"
 msgstr "添加图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:307
+#: eeschema/tools/ee_actions.cpp:311
 msgid "Import Sheet Pin"
 msgstr "导入图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:307
+#: eeschema/tools/ee_actions.cpp:311
 msgid "Import a hierarchical sheet pin"
 msgstr "导入分层图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:313
+#: eeschema/tools/ee_actions.cpp:317
 msgid "Add Global Label"
 msgstr "添加全局标签"
 
-#: eeschema/tools/ee_actions.cpp:313
+#: eeschema/tools/ee_actions.cpp:317
 msgid "Add a global label"
 msgstr "添加全局标签"
 
-#: eeschema/tools/ee_actions.cpp:319
+#: eeschema/tools/ee_actions.cpp:323
 msgid "Add text"
 msgstr "文本"
 
-#: eeschema/tools/ee_actions.cpp:324
+#: eeschema/tools/ee_actions.cpp:328
 msgid "Add Image"
 msgstr "添加图片"
 
-#: eeschema/tools/ee_actions.cpp:324
+#: eeschema/tools/ee_actions.cpp:328
 msgid "Add bitmap image"
 msgstr "添加图片"
 
-#: eeschema/tools/ee_actions.cpp:329
+#: eeschema/tools/ee_actions.cpp:333
 msgid "Finish Sheet"
 msgstr "完成图框"
 
-#: eeschema/tools/ee_actions.cpp:329
+#: eeschema/tools/ee_actions.cpp:333
 msgid "Finish drawing sheet"
 msgstr "完成图框"
 
-#: eeschema/tools/ee_actions.cpp:338
+#: eeschema/tools/ee_actions.cpp:342
 msgid "Repeat Last Item"
 msgstr "重复最后项"
 
-#: eeschema/tools/ee_actions.cpp:338
+#: eeschema/tools/ee_actions.cpp:342
 msgid "Duplicates the last drawn item"
 msgstr "复制最后绘制的项目"
 
-#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:256
+#: eeschema/tools/ee_actions.cpp:347 pcbnew/tools/pcb_actions.cpp:271
 msgid "Rotate Clockwise"
 msgstr "顺时针旋转"
 
-#: eeschema/tools/ee_actions.cpp:343 pcbnew/tools/pcb_actions.cpp:256
+#: eeschema/tools/ee_actions.cpp:347 pcbnew/tools/pcb_actions.cpp:271
 msgid "Rotates selected item(s) clockwise"
 msgstr "将选中的项目顺时针旋转"
 
-#: eeschema/tools/ee_actions.cpp:349 pcbnew/tools/edit_tool.cpp:811
+#: eeschema/tools/ee_actions.cpp:353 pcbnew/tools/edit_tool.cpp:810
 msgid "Rotate"
 msgstr "旋转"
 
-#: eeschema/tools/ee_actions.cpp:349
+#: eeschema/tools/ee_actions.cpp:353
 msgid "Rotates selected item(s) counter-clockwise"
 msgstr "逆时针旋转所选项目"
 
-#: eeschema/tools/ee_actions.cpp:355
+#: eeschema/tools/ee_actions.cpp:359
 msgid "Mirror Around Horizontal Axis"
 msgstr "围绕水平轴(X)镜像"
 
-#: eeschema/tools/ee_actions.cpp:355
+#: eeschema/tools/ee_actions.cpp:359
 msgid "Flips selected item(s) from top to bottom"
 msgstr "从上到下翻转选定的项目"
 
-#: eeschema/tools/ee_actions.cpp:361
+#: eeschema/tools/ee_actions.cpp:365
 msgid "Mirror Around Vertical Axis"
 msgstr "围绕垂直轴(Y)镜像"
 
-#: eeschema/tools/ee_actions.cpp:361
+#: eeschema/tools/ee_actions.cpp:365
 msgid "Flips selected item(s) from left to right"
 msgstr "从左到右翻转选定的项目"
 
-#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:289
+#: eeschema/tools/ee_actions.cpp:371 pcbnew/tools/pcb_actions.cpp:304
 msgid "Properties..."
 msgstr "属性..."
 
-#: eeschema/tools/ee_actions.cpp:367 pcbnew/tools/pcb_actions.cpp:289
+#: eeschema/tools/ee_actions.cpp:371 pcbnew/tools/pcb_actions.cpp:304
 msgid "Displays item properties dialog"
 msgstr "显示项属性对话框"
 
-#: eeschema/tools/ee_actions.cpp:373
+#: eeschema/tools/ee_actions.cpp:377
 msgid "Edit Reference Designator..."
 msgstr "编辑位号..."
 
-#: eeschema/tools/ee_actions.cpp:373
+#: eeschema/tools/ee_actions.cpp:377
 msgid "Displays reference designator dialog"
 msgstr "显示位号对话框"
 
-#: eeschema/tools/ee_actions.cpp:379
+#: eeschema/tools/ee_actions.cpp:383
 msgid "Edit Value..."
 msgstr "编辑值..."
 
-#: eeschema/tools/ee_actions.cpp:379
+#: eeschema/tools/ee_actions.cpp:383
 msgid "Displays value field dialog"
 msgstr "显示值字段对话框"
 
-#: eeschema/tools/ee_actions.cpp:385
+#: eeschema/tools/ee_actions.cpp:389
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:255
 msgid "Edit Footprint..."
 msgstr "编辑封装..."
 
-#: eeschema/tools/ee_actions.cpp:385
+#: eeschema/tools/ee_actions.cpp:389
 msgid "Displays footprint field dialog"
 msgstr "显示封装字段对话框"
 
-#: eeschema/tools/ee_actions.cpp:391
+#: eeschema/tools/ee_actions.cpp:395
 msgid "Autoplace Fields"
 msgstr "自动放置字段"
 
-#: eeschema/tools/ee_actions.cpp:391
+#: eeschema/tools/ee_actions.cpp:395
 msgid "Runs the automatic placement algorithm on the symbol's fields"
 msgstr "在符号的字段上运行自动放置算法"
 
-#: eeschema/tools/ee_actions.cpp:396
+#: eeschema/tools/ee_actions.cpp:400
+msgid "Update Fields from Library..."
+msgstr "从库中更新字段..."
+
+#: eeschema/tools/ee_actions.cpp:400
 msgid "Sets symbol fields to original library values"
 msgstr "将符号字段设置为原始库值"
 
-#: eeschema/tools/ee_actions.cpp:400
-msgid "Change Library Symbols..."
-msgstr "更改库符号..."
-
-#: eeschema/tools/ee_actions.cpp:401
-msgid "Change library symbols in schematic"
-msgstr "更改原理图中的库符号"
-
-#: eeschema/tools/ee_actions.cpp:404
-msgid "Update Library Symbols..."
-msgstr "更新库符号..."
-
 #: eeschema/tools/ee_actions.cpp:405
-msgid "Update library symbols in schematic"
-msgstr "更新原理图中的库符号"
+msgid "Change Symbols..."
+msgstr "更改符号..."
 
-#: eeschema/tools/ee_actions.cpp:408
-msgid "Change Library Symbol..."
-msgstr "更改库符号..."
+#: eeschema/tools/ee_actions.cpp:406
+msgid "Assign different symbols from the library"
+msgstr "从库中分配不同的符号"
 
-#: eeschema/tools/ee_actions.cpp:409
-msgid "Change library symbol for selected symbol"
-msgstr "更改选定符号的库符号"
+#: eeschema/tools/ee_actions.cpp:411
+msgid "Update Symbols from Library..."
+msgstr "从库更新符号..."
 
 #: eeschema/tools/ee_actions.cpp:412
-msgid "Update Library Symbol..."
-msgstr "更新库符号..."
+msgid "Update symbols to include any changes from the library"
+msgstr "更新符号以包含库中的任何更改"
 
-#: eeschema/tools/ee_actions.cpp:413
-msgid "Update library symbol for selected symbol"
-msgstr "更新所选符号的库符号"
+#: eeschema/tools/ee_actions.cpp:418
+msgid "Assign a different symbol from the library"
+msgstr "从库中分配不同的符号"
 
-#: eeschema/tools/ee_actions.cpp:417
+#: eeschema/tools/ee_actions.cpp:423
+msgid "Update Symbol..."
+msgstr "更新符号..."
+
+#: eeschema/tools/ee_actions.cpp:424
+msgid "Update symbol to include any changes from the library"
+msgstr "更新符号以包含库中的任何更改"
+
+#: eeschema/tools/ee_actions.cpp:429
 msgid "Assign Netclass..."
 msgstr "分配网络类..."
 
-#: eeschema/tools/ee_actions.cpp:417
+#: eeschema/tools/ee_actions.cpp:429
 msgid "Assign a netclass to the net of the selected wire"
 msgstr "将网络类分配给选定导线的网络"
 
-#: eeschema/tools/ee_actions.cpp:422
+#: eeschema/tools/ee_actions.cpp:434
 msgid "DeMorgan Conversion"
 msgstr "德摩根转换"
 
-#: eeschema/tools/ee_actions.cpp:422
+#: eeschema/tools/ee_actions.cpp:434
 msgid "Switch between DeMorgan representations"
 msgstr "在德摩根表示之间切换"
 
-#: eeschema/tools/ee_actions.cpp:427
+#: eeschema/tools/ee_actions.cpp:439
 msgid "DeMorgan Standard"
 msgstr "德摩根标准"
 
-#: eeschema/tools/ee_actions.cpp:427
+#: eeschema/tools/ee_actions.cpp:439
 msgid "Switch to standard DeMorgan representation"
 msgstr "切换到标准的德摩根表示"
 
-#: eeschema/tools/ee_actions.cpp:432
+#: eeschema/tools/ee_actions.cpp:444
 msgid "DeMorgan Alternate"
 msgstr "德摩根备用"
 
-#: eeschema/tools/ee_actions.cpp:432
+#: eeschema/tools/ee_actions.cpp:444
 msgid "Switch to alternate DeMorgan representation"
 msgstr "切换到备用德摩根表示"
 
-#: eeschema/tools/ee_actions.cpp:437
+#: eeschema/tools/ee_actions.cpp:449
 msgid "Change to Label"
 msgstr "修改为标签"
 
-#: eeschema/tools/ee_actions.cpp:437
+#: eeschema/tools/ee_actions.cpp:449
 msgid "Change existing item to a label"
 msgstr "将现有项目更改为标签"
 
-#: eeschema/tools/ee_actions.cpp:442
+#: eeschema/tools/ee_actions.cpp:454
 msgid "Change to Hierarchical Label"
 msgstr "修改为层次标签"
 
-#: eeschema/tools/ee_actions.cpp:442
+#: eeschema/tools/ee_actions.cpp:454
 msgid "Change existing item to a hierarchical label"
 msgstr "将现有项目更改为分层标签"
 
-#: eeschema/tools/ee_actions.cpp:447
+#: eeschema/tools/ee_actions.cpp:459
 msgid "Change to Global Label"
 msgstr "修改为全局标签"
 
-#: eeschema/tools/ee_actions.cpp:447
+#: eeschema/tools/ee_actions.cpp:459
 msgid "Change existing item to a global label"
 msgstr "将现有项目更改为全局标签"
 
-#: eeschema/tools/ee_actions.cpp:452
+#: eeschema/tools/ee_actions.cpp:464
 msgid "Change to Text"
 msgstr "改为注释文字"
 
-#: eeschema/tools/ee_actions.cpp:452
+#: eeschema/tools/ee_actions.cpp:464
 msgid "Change existing item to a text comment"
 msgstr "将现有项目更改为文本注释"
 
-#: eeschema/tools/ee_actions.cpp:457
+#: eeschema/tools/ee_actions.cpp:469
 msgid "Cleanup Sheet Pins"
 msgstr "清除图页连接"
 
-#: eeschema/tools/ee_actions.cpp:457
+#: eeschema/tools/ee_actions.cpp:469
 msgid "Delete unreferenced sheet pins"
 msgstr "删除未引用的图框引脚"
 
-#: eeschema/tools/ee_actions.cpp:462 pcbnew/tools/pcb_actions.cpp:407
+#: eeschema/tools/ee_actions.cpp:474 pcbnew/tools/pcb_actions.cpp:422
 msgid "Edit Text & Graphics Properties..."
 msgstr "编辑文本与图形属性..."
 
-#: eeschema/tools/ee_actions.cpp:463
+#: eeschema/tools/ee_actions.cpp:475
 msgid "Edit text and graphics properties globally across schematic"
 msgstr "在原理图中全局编辑文本和图形属性"
 
-#: eeschema/tools/ee_actions.cpp:468
+#: eeschema/tools/ee_actions.cpp:480
 msgid "Symbol Properties..."
 msgstr "符号属性..."
 
-#: eeschema/tools/ee_actions.cpp:468
+#: eeschema/tools/ee_actions.cpp:480
 msgid "Displays symbol properties dialog"
 msgstr "显示符号属性对话框"
 
-#: eeschema/tools/ee_actions.cpp:473
+#: eeschema/tools/ee_actions.cpp:485
+msgid "Pin Table..."
+msgstr "引脚列表..."
+
+#: eeschema/tools/ee_actions.cpp:485
 msgid "Displays pin table for bulk editing of pins"
 msgstr "显示引脚表, 用于批量编辑引脚"
 
-#: eeschema/tools/ee_actions.cpp:478
+#: eeschema/tools/ee_actions.cpp:490
 msgid "Break Wire"
 msgstr "分割连线"
 
-#: eeschema/tools/ee_actions.cpp:478
+#: eeschema/tools/ee_actions.cpp:490
 msgid "Divide a wire into segments which can be dragged independently"
 msgstr "将导线分成可以独立拖动的线段"
 
-#: eeschema/tools/ee_actions.cpp:483
+#: eeschema/tools/ee_actions.cpp:495
 msgid "Break Bus"
 msgstr "分割总线"
 
-#: eeschema/tools/ee_actions.cpp:483
+#: eeschema/tools/ee_actions.cpp:495
 msgid "Divide a bus into segments which can be dragged independently"
 msgstr "将总线划分为可以独立拖动的段"
 
-#: eeschema/tools/ee_actions.cpp:494
+#: eeschema/tools/ee_actions.cpp:506
 msgid "Add a simulator probe"
 msgstr "添加仿真器探针"
 
-#: eeschema/tools/ee_actions.cpp:498
+#: eeschema/tools/ee_actions.cpp:510
 msgid "Select a value to be tuned"
 msgstr "选择要调整的值"
 
-#: eeschema/tools/ee_actions.cpp:503 gerbview/tools/gerbview_actions.cpp:72
-#: pcbnew/tools/pcb_actions.cpp:666 pcbnew/tools/pcb_actions.cpp:686
+#: eeschema/tools/ee_actions.cpp:515 gerbview/tools/gerbview_actions.cpp:72
+#: pcbnew/tools/pcb_actions.cpp:686 pcbnew/tools/pcb_actions.cpp:706
 msgid "Highlight Net"
 msgstr "高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:503
+#: eeschema/tools/ee_actions.cpp:515
 msgid "Highlight net under cursor"
 msgstr "在光标下高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:514 pcbnew/tools/pcb_actions.cpp:679
+#: eeschema/tools/ee_actions.cpp:526 pcbnew/tools/pcb_actions.cpp:699
 msgid "Highlight Nets"
 msgstr "高亮网络"
 
-#: eeschema/tools/ee_actions.cpp:514
+#: eeschema/tools/ee_actions.cpp:526
 msgid "Highlight wires and pins of a net"
 msgstr "高亮网络的电线和引脚"
 
-#: eeschema/tools/ee_actions.cpp:520
+#: eeschema/tools/ee_actions.cpp:532
 msgid "Edit with Symbol Editor"
 msgstr "用符号编辑器来编辑"
 
-#: eeschema/tools/ee_actions.cpp:520
+#: eeschema/tools/ee_actions.cpp:532
 msgid "Open the symbol editor to edit the symbol"
 msgstr "打开符号编辑器以编辑符号"
 
-#: eeschema/tools/ee_actions.cpp:525
+#: eeschema/tools/ee_actions.cpp:537
 msgid "Edit Symbol Fields..."
 msgstr "编辑符号字段..."
 
-#: eeschema/tools/ee_actions.cpp:525
+#: eeschema/tools/ee_actions.cpp:537
 msgid "Bulk-edit fields of all symbols in schematic"
 msgstr "原理图中所有符号的批量编辑字段"
 
-#: eeschema/tools/ee_actions.cpp:530
+#: eeschema/tools/ee_actions.cpp:542
 msgid "Edit Symbol Library Links..."
 msgstr "编辑符号库链接..."
 
-#: eeschema/tools/ee_actions.cpp:530
+#: eeschema/tools/ee_actions.cpp:542
 msgid "Edit links between schematic and library symbols"
 msgstr "编辑原理图和库符号之间的链接"
 
-#: eeschema/tools/ee_actions.cpp:535
+#: eeschema/tools/ee_actions.cpp:547
 msgid "Assign Footprints..."
 msgstr "分配封装..."
 
-#: eeschema/tools/ee_actions.cpp:535
+#: eeschema/tools/ee_actions.cpp:547
 msgid "Run Cvpcb"
 msgstr "运行 Cvpcb"
 
-#: eeschema/tools/ee_actions.cpp:540
+#: eeschema/tools/ee_actions.cpp:552
 msgid "Import Footprint Assignments..."
 msgstr "导入封装分配..."
 
-#: eeschema/tools/ee_actions.cpp:541
+#: eeschema/tools/ee_actions.cpp:553
 msgid "Import symbol footprint assignments from .cmp file created by Pcbnew"
 msgstr "从 Pcbnew 创建的 .cmp 文件中导入符号封装分配"
 
-#: eeschema/tools/ee_actions.cpp:546
+#: eeschema/tools/ee_actions.cpp:558
 msgid "Annotate Schematic..."
 msgstr "批注原理图..."
 
-#: eeschema/tools/ee_actions.cpp:546
+#: eeschema/tools/ee_actions.cpp:558
 msgid "Fill in schematic symbol reference designators"
 msgstr "填写原理图符号位号"
 
-#: eeschema/tools/ee_actions.cpp:551
+#: eeschema/tools/ee_actions.cpp:563
 msgid "Schematic Setup..."
 msgstr "原理图设置..."
 
-#: eeschema/tools/ee_actions.cpp:552
+#: eeschema/tools/ee_actions.cpp:564
 msgid "Edit schematic setup including annotation styles and electrical rules"
 msgstr "编辑原理图设置，包括注释样式和电气规则"
 
-#: eeschema/tools/ee_actions.cpp:557
+#: eeschema/tools/ee_actions.cpp:569
 msgid "Rescue Symbols..."
 msgstr "恢复符号..."
 
-#: eeschema/tools/ee_actions.cpp:558
+#: eeschema/tools/ee_actions.cpp:570
 msgid "Find old symbols in project and rename/rescue them"
 msgstr "在工程中找到旧的符号重命名或恢复它们"
 
-#: eeschema/tools/ee_actions.cpp:563
-msgid "Remap Symbols..."
-msgstr "重新映射符号..."
+#: eeschema/tools/ee_actions.cpp:575
+msgid "Remap Legacy Library Symbols..."
+msgstr "重新映射旧库符号..."
 
-#: eeschema/tools/ee_actions.cpp:564
-msgid "Remap legacy library symbols to symbol library table"
-msgstr "将传统库符号重新映射到符号库表"
+#: eeschema/tools/ee_actions.cpp:576
+msgid ""
+"Remap library symbol references in legacy schematics to the symbol library "
+"table"
+msgstr "将旧图中旧原理图中的库符号引用重新映射到符号库表"
 
-#: eeschema/tools/ee_actions.cpp:569
+#: eeschema/tools/ee_actions.cpp:581
 msgid "Update from Symbol Library"
 msgstr "从符号库更新"
 
-#: eeschema/tools/ee_actions.cpp:570
+#: eeschema/tools/ee_actions.cpp:582
 msgid "Update from the symbol library using the library identifier"
 msgstr "使用库标识符从符号库更新"
 
-#: eeschema/tools/ee_actions.cpp:575
+#: eeschema/tools/ee_actions.cpp:587
 msgid "Bus Definitions..."
 msgstr "总线定义..."
 
-#: eeschema/tools/ee_actions.cpp:575
+#: eeschema/tools/ee_actions.cpp:587
 msgid "Manage bus definitions"
 msgstr "管理总线定义"
 
-#: eeschema/tools/ee_actions.cpp:580
+#: eeschema/tools/ee_actions.cpp:592
 msgid "Export Drawing to Clipboard"
 msgstr "将绘图导出到剪贴板"
 
-#: eeschema/tools/ee_actions.cpp:580
+#: eeschema/tools/ee_actions.cpp:592
 msgid "Export drawing of current sheet to clipboard"
 msgstr "将当前图框的绘图导出到剪贴板"
 
-#: eeschema/tools/ee_actions.cpp:585
+#: eeschema/tools/ee_actions.cpp:597
 msgid "Switch to PCB Editor"
 msgstr "切换到 PCB 编辑器"
 
-#: eeschema/tools/ee_actions.cpp:585
+#: eeschema/tools/ee_actions.cpp:597
 msgid "Open PCB in Pcbnew"
 msgstr "打开 Pcbnew 中的 PCB"
 
-#: eeschema/tools/ee_actions.cpp:590
+#: eeschema/tools/ee_actions.cpp:602
 msgid "Export Netlist..."
 msgstr "导出网表..."
 
-#: eeschema/tools/ee_actions.cpp:590
+#: eeschema/tools/ee_actions.cpp:602
 msgid "Export file containing netlist in one of several formats"
 msgstr "导出包含某种格式的网表的文件"
 
-#: eeschema/tools/ee_actions.cpp:595
+#: eeschema/tools/ee_actions.cpp:607
 msgid "Generate BOM..."
 msgstr "生成 BOM..."
 
-#: eeschema/tools/ee_actions.cpp:595
+#: eeschema/tools/ee_actions.cpp:607
 msgid "Generate a bill of materials for the current schematic"
 msgstr "生成当前原理图的 BOM"
 
-#: eeschema/tools/ee_actions.cpp:600
+#: eeschema/tools/ee_actions.cpp:612
 msgid "Enter Sheet"
 msgstr "进入分页"
 
-#: eeschema/tools/ee_actions.cpp:600
+#: eeschema/tools/ee_actions.cpp:612
 msgid "Display the selected sheet's contents in the Eeschema window"
 msgstr "在 Eeschema 窗口中显示所选图框的内容"
 
-#: eeschema/tools/ee_actions.cpp:606
+#: eeschema/tools/ee_actions.cpp:618
 msgid "Leave Sheet"
 msgstr "离开分页"
 
-#: eeschema/tools/ee_actions.cpp:606
+#: eeschema/tools/ee_actions.cpp:618
 msgid "Display the parent sheet in the Eeschema window"
 msgstr "在 Eeschema 窗口中显示父级图框"
 
-#: eeschema/tools/ee_actions.cpp:611
+#: eeschema/tools/ee_actions.cpp:623
 msgid "Show Hierarchy Navigator"
 msgstr "显示层次结构导航器"
 
-#: eeschema/tools/ee_actions.cpp:616
+#: eeschema/tools/ee_actions.cpp:628
 msgid "Highlight on PCB"
 msgstr "高亮 PCB"
 
-#: eeschema/tools/ee_actions.cpp:616
+#: eeschema/tools/ee_actions.cpp:628
 msgid "Highlight corresponding items in PCBNew"
 msgstr "高亮显示 PCBNew 中的相应项目"
 
-#: eeschema/tools/ee_actions.cpp:621
+#: eeschema/tools/ee_actions.cpp:633
 msgid "Show Hidden Pins"
 msgstr "显示隐藏引脚"
 
-#: eeschema/tools/ee_actions.cpp:626
+#: eeschema/tools/ee_actions.cpp:638
 msgid "Show Hidden Fields"
 msgstr "显示隐藏字段"
 
-#: eeschema/tools/ee_actions.cpp:631
+#: eeschema/tools/ee_actions.cpp:643
 msgid "Force H/V Wires and Buses"
 msgstr "强制水平或垂直绘制连线和总线"
 
-#: eeschema/tools/ee_actions.cpp:639
+#: eeschema/tools/ee_actions.cpp:651
 msgid "Add Junctions to Selection where needed"
 msgstr "根据需要将连接点添加到选择"
 
-#: eeschema/tools/ee_actions.cpp:644
+#: eeschema/tools/ee_actions.cpp:656
 msgid "Add Wire"
 msgstr "添加连线"
 
-#: eeschema/tools/ee_actions.cpp:644
+#: eeschema/tools/ee_actions.cpp:656
 msgid "Add a wire"
 msgstr "添加连线"
 
-#: eeschema/tools/ee_actions.cpp:650
+#: eeschema/tools/ee_actions.cpp:662
 msgid "Add Bus"
 msgstr "添加总线"
 
-#: eeschema/tools/ee_actions.cpp:650
+#: eeschema/tools/ee_actions.cpp:662
 msgid "Add a bus"
 msgstr "添加总线"
 
-#: eeschema/tools/ee_actions.cpp:656
-#: eeschema/tools/sch_line_wire_bus_tool.cpp:92
-#: eeschema/tools/sch_line_wire_bus_tool.cpp:148
+#: eeschema/tools/ee_actions.cpp:668
+#: eeschema/tools/sch_line_wire_bus_tool.cpp:79
+#: eeschema/tools/sch_line_wire_bus_tool.cpp:135
 msgid "Unfold from Bus"
 msgstr "从总线上展开"
 
-#: eeschema/tools/ee_actions.cpp:656
+#: eeschema/tools/ee_actions.cpp:668
 msgid "Break a wire out of a bus"
 msgstr "断开总线上的连线"
 
-#: eeschema/tools/ee_actions.cpp:668
+#: eeschema/tools/ee_actions.cpp:680
 msgid "Finish Wire or Bus"
 msgstr "结束电线或总线"
 
-#: eeschema/tools/ee_actions.cpp:668
+#: eeschema/tools/ee_actions.cpp:680
 msgid "Complete drawing at current segment"
 msgstr "在当前线段处结束绘制"
 
-#: eeschema/tools/ee_actions.cpp:673
+#: eeschema/tools/ee_actions.cpp:685
 msgid "Finish Wire"
 msgstr "结束连线"
 
-#: eeschema/tools/ee_actions.cpp:673
+#: eeschema/tools/ee_actions.cpp:685
 msgid "Complete wire with current segment"
 msgstr "结束连线并保留当前连线线段"
 
-#: eeschema/tools/ee_actions.cpp:678
+#: eeschema/tools/ee_actions.cpp:690
 msgid "Finish Bus"
 msgstr "结束总线"
 
-#: eeschema/tools/ee_actions.cpp:678
+#: eeschema/tools/ee_actions.cpp:690
 msgid "Complete bus with current segment"
 msgstr "结束总线并保留当前总线线段"
 
-#: eeschema/tools/ee_actions.cpp:683
+#: eeschema/tools/ee_actions.cpp:695
 msgid "Finish Lines"
 msgstr "完成线"
 
-#: eeschema/tools/ee_actions.cpp:683
+#: eeschema/tools/ee_actions.cpp:695
 msgid "Complete connected lines with current segment"
 msgstr "完成与当前段的连接线"
 
-#: eeschema/tools/ee_actions.cpp:692 pagelayout_editor/tools/pl_actions.cpp:67
+#: eeschema/tools/ee_actions.cpp:704 pagelayout_editor/tools/pl_actions.cpp:67
 #: pcbnew/dialogs/panel_edit_options_base.cpp:176
-#: pcbnew/tools/pcb_actions.cpp:226
+#: pcbnew/tools/pcb_actions.cpp:241
 msgid "Move"
 msgstr "移动"
 
-#: eeschema/tools/ee_actions.cpp:692 pagelayout_editor/tools/pl_actions.cpp:67
-#: pcbnew/tools/pcb_actions.cpp:226
+#: eeschema/tools/ee_actions.cpp:704 pagelayout_editor/tools/pl_actions.cpp:67
+#: pcbnew/tools/pcb_actions.cpp:241
 msgid "Moves the selected item(s)"
 msgstr "移动选择项"
 
-#: eeschema/tools/ee_actions.cpp:697 pcbnew/tools/edit_tool.cpp:647
+#: eeschema/tools/ee_actions.cpp:709 pcbnew/tools/edit_tool.cpp:646
 msgid "Drag"
 msgstr "拖动"
 
-#: eeschema/tools/ee_actions.cpp:697
+#: eeschema/tools/ee_actions.cpp:709
 msgid "Drags the selected item(s)"
 msgstr "拖动所选项目"
 
-#: eeschema/tools/ee_actions.cpp:701
+#: eeschema/tools/ee_actions.cpp:713
 msgid "Move Activate"
 msgstr "移动激活"
 
-#: eeschema/tools/ee_actions.cpp:705
+#: eeschema/tools/ee_actions.cpp:717
 msgid "Symbol Move Activate"
 msgstr "符号移动激活"
 
+#: eeschema/tools/ee_actions.cpp:721
+msgid "Align Elements to Grid"
+msgstr "将元素与网格对齐"
+
 #: eeschema/tools/ee_inspection_tool.cpp:128
 msgid "No pins!"
 msgstr "没有引脚！"
@@ -14444,14 +14788,14 @@ msgstr "  标准"
 msgid "No off grid or duplicate pins were found."
 msgstr "没有发现网格外或重复的引脚。"
 
-#: eeschema/tools/ee_selection_tool.cpp:1159
-#: pagelayout_editor/tools/pl_selection_tool.cpp:558
-#: pcbnew/tools/selection_tool.cpp:1613
+#: eeschema/tools/ee_selection_tool.cpp:1199
+#: pagelayout_editor/tools/pl_selection_tool.cpp:564
+#: pcbnew/tools/selection_tool.cpp:1642
 msgid "Select &All\tA"
 msgstr "全选 (&A)\tA"
 
-#: eeschema/tools/ee_selection_tool.cpp:1162
-#: pcbnew/tools/selection_tool.cpp:1616
+#: eeschema/tools/ee_selection_tool.cpp:1202
+#: pcbnew/tools/selection_tool.cpp:1645
 msgid "&Expand Selection\tE"
 msgstr "展开选定内容 (&E)\tE"
 
@@ -14472,7 +14816,7 @@ msgstr "无法保存文件 \"%s\"。"
 msgid "Filename:"
 msgstr "文件名："
 
-#: eeschema/tools/lib_control.cpp:436
+#: eeschema/tools/lib_control.cpp:436 eeschema/tools/lib_control.cpp:474
 msgid "No schematic currently open."
 msgstr "当前没有打开原理图。"
 
@@ -14480,7 +14824,7 @@ msgstr "当前没有打开原理图。"
 msgid "Edit Component Name"
 msgstr "编辑元件名称"
 
-#: eeschema/tools/lib_edit_tool.cpp:497 eeschema/tools/sch_edit_tool.cpp:1144
+#: eeschema/tools/lib_edit_tool.cpp:497 eeschema/tools/sch_edit_tool.cpp:1146
 #, c-format
 msgid "Edit %s Field"
 msgstr "编辑 %s 字段"
@@ -14509,77 +14853,87 @@ msgstr ""
 "未执行批注！\n"
 
 #: eeschema/tools/sch_drawing_tools.cpp:371
-#: pagelayout_editor/pl_editor_frame.cpp:844
-#: pagelayout_editor/pl_editor_frame.cpp:852
+#: pagelayout_editor/pl_editor_frame.cpp:840
+#: pagelayout_editor/pl_editor_frame.cpp:848
 #, c-format
 msgid "Couldn't load image from \"%s\""
 msgstr "无法从 \"%s\" 加载图片"
 
-#: eeschema/tools/sch_drawing_tools.cpp:813
+#: eeschema/tools/sch_drawing_tools.cpp:812
 msgid "Click over a sheet."
 msgstr "单击图框。"
 
-#: eeschema/tools/sch_drawing_tools.cpp:826
+#: eeschema/tools/sch_drawing_tools.cpp:825
 msgid "No new hierarchical labels found."
 msgstr "没有找到新的层次标签。"
 
-#: eeschema/tools/sch_edit_tool.cpp:73
+#: eeschema/tools/sch_edit_tool.cpp:74
 msgid "Symbol Unit"
 msgstr "符号单元"
 
-#: eeschema/tools/sch_edit_tool.cpp:93
+#: eeschema/tools/sch_edit_tool.cpp:94
 msgid "no symbol selected"
 msgstr "没有选择符号"
 
-#: eeschema/tools/sch_edit_tool.cpp:102
+#: eeschema/tools/sch_edit_tool.cpp:103
 msgid "symbol is not multi-unit"
 msgstr "符号不是多单元"
 
-#: eeschema/tools/sch_edit_tool.cpp:1085 pcbnew/tools/pcbnew_control.cpp:469
+#: eeschema/tools/sch_edit_tool.cpp:1087 pcbnew/tools/pcbnew_control.cpp:469
 msgid "Item locked."
 msgstr "项目已锁定。"
 
-#: eeschema/tools/sch_edit_tool.cpp:1718
+#: eeschema/tools/sch_edit_tool.cpp:1340
+#, c-format
+msgid "'%s' is not a valid library indentifier."
+msgstr "'%s' 不是有效的库标识符。"
+
+#: eeschema/tools/sch_edit_tool.cpp:1350
+#, c-format
+msgid "Symbol '%s' not found in symbol library '%s'."
+msgstr "符号 \"%s\" 在符号库中 \"%s\" 没有找到。"
+
+#: eeschema/tools/sch_edit_tool.cpp:1753
 msgid "There are no unreferenced pins in this sheet to remove."
 msgstr "此图框中没有要删除的未引用引脚。"
 
-#: eeschema/tools/sch_edit_tool.cpp:1722
+#: eeschema/tools/sch_edit_tool.cpp:1757
 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:459
 msgid "Reached end of schematic."
 msgstr "到达原理图的末尾。"
 
-#: eeschema/tools/sch_editor_control.cpp:455
+#: eeschema/tools/sch_editor_control.cpp:460
 msgid "Reached end of sheet."
 msgstr "到达图框的末尾。"
 
-#: eeschema/tools/sch_editor_control.cpp:458
+#: eeschema/tools/sch_editor_control.cpp:463
 msgid " Find again to wrap around to the start."
 msgstr " 再次查找到开始。"
 
-#: eeschema/tools/sch_editor_control.cpp:831
+#: eeschema/tools/sch_editor_control.cpp:839
 msgid "Error: duplicate sub-sheet names found in current sheet."
 msgstr "错误：在当前图框中找到重复的子图框名称。"
 
-#: eeschema/tools/sch_editor_control.cpp:919
+#: eeschema/tools/sch_editor_control.cpp:927
 msgid "Net must be labelled to assign a netclass."
 msgstr "网络必须加上标签才能分配网络类。"
 
-#: eeschema/tools/sch_editor_control.cpp:930
+#: eeschema/tools/sch_editor_control.cpp:938
 msgid "Netclasses"
 msgstr "网络类"
 
-#: eeschema/tools/sch_editor_control.cpp:943
+#: eeschema/tools/sch_editor_control.cpp:951
 msgid "Assign Netclass"
 msgstr "分配网络类"
 
-#: eeschema/tools/sch_editor_control.cpp:944
+#: eeschema/tools/sch_editor_control.cpp:952
 msgid "Select netclass:"
 msgstr "选择网络类："
 
-#: eeschema/tools/sch_editor_control.cpp:1362
+#: eeschema/tools/sch_editor_control.cpp:1429
 #, c-format
 msgid ""
 "The pasted sheet \"%s\"\n"
@@ -14589,11 +14943,11 @@ msgstr ""
 "粘贴的图框 \"%s\"\n"
 "已删除, 因为目标已具有图框或其子图框之一作为父级窗体。"
 
-#: eeschema/tools/sch_line_wire_bus_tool.cpp:130
+#: eeschema/tools/sch_line_wire_bus_tool.cpp:117
 msgid "No bus selected"
 msgstr "未选择总线"
 
-#: eeschema/tools/sch_line_wire_bus_tool.cpp:139
+#: eeschema/tools/sch_line_wire_bus_tool.cpp:126
 msgid "Bus has no members"
 msgstr "总线没有成员"
 
@@ -14659,15 +15013,6 @@ msgstr "存储选项"
 msgid "Get Stored Choice"
 msgstr "获取存储选项"
 
-#: gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp:109
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:35
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:49
-#: pcbnew/dialogs/dialog_move_exact_base.cpp:63
-#: pcbnew/dialogs/dialog_position_relative_base.cpp:81
-#: pcbnew/dialogs/dialog_position_relative_base.cpp:98
-msgid "Reset"
-msgstr "重置"
-
 #: gerbview/dialogs/dialog_layers_select_to_pcb_base.h:81
 msgid "Layer Selection"
 msgstr "层选择"
@@ -14713,13 +15058,14 @@ msgid "Do not export"
 msgstr "不导出"
 
 #: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:170
-#: pcbnew/board_connected_item.cpp:211 pcbnew/board_connected_item.cpp:212
+#: pcbnew/board_connected_item.cpp:146 pcbnew/board_connected_item.cpp:147
 #: pcbnew/board_stackup_manager/panel_board_stackup_base.cpp:62
-#: pcbnew/class_board_item.cpp:189 pcbnew/class_drawsegment.cpp:551
-#: pcbnew/class_module.cpp:1710 pcbnew/class_module.cpp:1713
-#: pcbnew/class_pad.cpp:811 pcbnew/class_pcb_text.cpp:118
-#: pcbnew/class_text_mod.cpp:305 pcbnew/class_track.cpp:1142
-#: pcbnew/class_zone.cpp:662 pcbnew/dialogs/dialog_copper_zones_base.cpp:22
+#: pcbnew/class_board_item.cpp:186 pcbnew/class_drawsegment.cpp:551
+#: pcbnew/class_module.cpp:1730 pcbnew/class_module.cpp:1733
+#: pcbnew/class_pad.cpp:820 pcbnew/class_pcb_text.cpp:117
+#: pcbnew/class_text_mod.cpp:305 pcbnew/class_track.cpp:624
+#: pcbnew/class_track.cpp:689 pcbnew/class_track.cpp:1092
+#: pcbnew/class_zone.cpp:608 pcbnew/dialogs/dialog_copper_zones_base.cpp:22
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:59
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:59
 #: pcbnew/dialogs/panel_modedit_defaults.cpp:52
@@ -14769,11 +15115,11 @@ msgid "Coordinates"
 msgstr "坐标轴"
 
 #: gerbview/dialogs/panel_gerbview_settings_base.cpp:28
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:120
 #: pcbnew/dialogs/dialog_export_idf_base.cpp:102
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:56
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:108
-#: pcbnew/dialogs/dialog_plot_base.cpp:331
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:92
+#: pcbnew/dialogs/dialog_plot_base.cpp:353
 #: pcbnew/dialogs/panel_edit_options_base.cpp:31
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:87
 msgid "Millimeters"
@@ -14836,12 +15182,12 @@ msgstr "可见"
 
 #: gerbview/excellon_read_drill_file.cpp:264
 #, c-format
-msgid "File %s not found"
-msgstr "文件 %s 没有找到"
+msgid "File %s not found."
+msgstr "找不到文件 %s。"
 
 #: gerbview/excellon_read_drill_file.cpp:274
-msgid "No room to load file"
-msgstr "没有空间加载文件"
+msgid "No empty layers to load file into."
+msgstr "没有要将文件加载到的空图层。"
 
 #: gerbview/excellon_read_drill_file.cpp:281
 msgid "Error reading EXCELLON drill file"
@@ -15047,9 +15393,9 @@ msgstr "黑"
 msgid "Polarity"
 msgstr "极性"
 
-#: gerbview/gerber_draw_item.cpp:711 pcbnew/class_pcb_text.cpp:121
-#: pcbnew/class_pcb_text.cpp:123 pcbnew/class_text_mod.cpp:312
-#: pcbnew/tools/edit_tool.cpp:949 pcbnew/tools/pcb_actions.cpp:273
+#: gerbview/gerber_draw_item.cpp:711 pcbnew/class_pcb_text.cpp:120
+#: pcbnew/class_pcb_text.cpp:122 pcbnew/class_text_mod.cpp:312
+#: pcbnew/tools/edit_tool.cpp:948 pcbnew/tools/pcb_actions.cpp:288
 msgid "Mirror"
 msgstr "镜像"
 
@@ -15123,12 +15469,12 @@ msgstr "清除最近的钻孔文件"
 msgid "Clear Recent Job Files"
 msgstr "清除最近的作业文件"
 
-#: gerbview/gerbview_frame.cpp:143 pcbnew/footprint_edit_frame.cpp:221
-#: pcbnew/footprint_edit_frame.cpp:675
+#: gerbview/gerbview_frame.cpp:143 pcbnew/footprint_edit_frame.cpp:222
+#: pcbnew/footprint_edit_frame.cpp:676
 msgid "Layers Manager"
 msgstr "层管理器"
 
-#: gerbview/gerbview_frame.cpp:161 pcbnew/pcb_edit_frame.cpp:319
+#: gerbview/gerbview_frame.cpp:161 pcbnew/pcb_edit_frame.cpp:320
 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 "
@@ -15144,15 +15490,15 @@ msgstr ""
 "是否要尝试启用图形加速？\n"
 "如果您想稍后选择，请在首选项菜单中选择硬件加速图形。"
 
-#: gerbview/gerbview_frame.cpp:168 pcbnew/pcb_edit_frame.cpp:326
+#: gerbview/gerbview_frame.cpp:168 pcbnew/pcb_edit_frame.cpp:327
 msgid "Enable Graphics Acceleration"
 msgstr "启用显卡加速"
 
-#: gerbview/gerbview_frame.cpp:170 pcbnew/pcb_edit_frame.cpp:328
+#: gerbview/gerbview_frame.cpp:170 pcbnew/pcb_edit_frame.cpp:329
 msgid "&Enable Acceleration"
 msgstr "启用加速 (&E)"
 
-#: gerbview/gerbview_frame.cpp:170 pcbnew/pcb_edit_frame.cpp:328
+#: gerbview/gerbview_frame.cpp:170 pcbnew/pcb_edit_frame.cpp:329
 msgid "&No Thanks"
 msgstr "不，谢谢 (&N)"
 
@@ -15165,28 +15511,28 @@ msgstr "D 码"
 msgid "Drawing layer %d not in use"
 msgstr "绘图层 %d 没有使用"
 
-#: gerbview/gerbview_frame.cpp:717 gerbview/menubar.cpp:158
+#: gerbview/gerbview_frame.cpp:719 gerbview/menubar.cpp:158
 msgid "GerbView"
 msgstr "GerbView"
 
-#: gerbview/gerbview_frame.cpp:719
+#: gerbview/gerbview_frame.cpp:721
 msgid " (with X2 attributes)"
 msgstr " (X2 属性)"
 
-#: gerbview/gerbview_frame.cpp:727
+#: gerbview/gerbview_frame.cpp:729
 #, c-format
 msgid "Image name: \"%s\"  Layer name: \"%s\""
 msgstr "图片名称：\"%s\" 图层名称 \"%s\""
 
-#: gerbview/gerbview_frame.cpp:743
+#: gerbview/gerbview_frame.cpp:745
 msgid "X2 attr"
 msgstr "X2 属性"
 
-#: gerbview/gerbview_frame.cpp:1141
+#: gerbview/gerbview_frame.cpp:1143
 msgid "Gerbview"
 msgstr "GerbView"
 
-#: gerbview/gerbview_layer_widget.cpp:81 pcbnew/class_track.cpp:746
+#: gerbview/gerbview_layer_widget.cpp:81
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:46 pcbnew/layer_widget.cpp:525
 #: pcbnew/pcb_layer_widget.cpp:327
 msgid "Layers"
@@ -15214,12 +15560,12 @@ msgid "Show negative objects in this color"
 msgstr "以此颜色显示负片"
 
 #: gerbview/gerbview_layer_widget.cpp:105 pcbnew/pcb_layer_widget.cpp:79
-#: pcbnew/widgets/appearance_controls.cpp:306
+#: pcbnew/widgets/appearance_controls.cpp:351
 msgid "Show the (x,y) grid dots"
 msgstr "(X,Y) 显示格点"
 
 #: gerbview/gerbview_layer_widget.cpp:106 pcbnew/pcb_layer_widget.cpp:76
-#: pcbnew/widgets/appearance_controls.cpp:305
+#: pcbnew/widgets/appearance_controls.cpp:350
 msgid "Show worksheet"
 msgstr "显示图框"
 
@@ -15228,12 +15574,12 @@ msgid "PCB Background"
 msgstr "PCB 背景"
 
 #: gerbview/gerbview_layer_widget.cpp:126 pcbnew/pcb_layer_widget.cpp:177
-#: pcbnew/widgets/appearance_controls.cpp:1193
+#: pcbnew/widgets/appearance_controls.cpp:1406
 msgid "Show All Layers"
 msgstr "显示所有层"
 
 #: gerbview/gerbview_layer_widget.cpp:130
-#: pcbnew/widgets/appearance_controls.cpp:1180
+#: pcbnew/widgets/appearance_controls.cpp:1393
 msgid "Hide All Layers But Active"
 msgstr "隐藏除当前工作层的所有层"
 
@@ -15242,7 +15588,7 @@ msgid "Always Hide All Layers But Active"
 msgstr "总是隐藏除当前工作层的所有层"
 
 #: gerbview/gerbview_layer_widget.cpp:137 pcbnew/pcb_layer_widget.cpp:179
-#: pcbnew/widgets/appearance_controls.cpp:1196
+#: pcbnew/widgets/appearance_controls.cpp:1409
 msgid "Hide All Layers"
 msgstr "隐藏所有层"
 
@@ -15369,11 +15715,11 @@ msgstr "RS274X：无效的 GERBER 格式命令 \"%c\" 在行 %d：\"%s\""
 msgid "GERBER file \"%s\" may not display as intended."
 msgstr "GERBER 文件 \"%s\" 不能按预期显示。"
 
-#: gerbview/rs274x.cpp:515
+#: gerbview/rs274x.cpp:539
 msgid "RS274X: Command \"IR\" rotation value not allowed"
 msgstr "RS274X: 命令 \"IR\" 旋转值不允许"
 
-#: gerbview/rs274x.cpp:606
+#: gerbview/rs274x.cpp:647
 msgid "RS274X: Command KNOCKOUT ignored by GerbView"
 msgstr "RS274X: GerbView 命令 KNOCKOUT 被忽略"
 
@@ -15566,7 +15912,7 @@ msgstr "高亮网络 \"%s\""
 msgid "Highlight Aperture Type \"%s\""
 msgstr "高亮光圈类型 \"%s\""
 
-#: gerbview/tools/gerbview_selection_tool.cpp:423
+#: gerbview/tools/gerbview_selection_tool.cpp:429
 msgid "Clarify selection"
 msgstr "明确选择"
 
@@ -15598,6 +15944,10 @@ msgstr "插件类型"
 msgid "Active"
 msgstr "活动的"
 
+#: include/libeval_compiler/libeval_compiler.h:286
+msgid "Malformed expression"
+msgstr "格式错误的表达式"
+
 #: include/netclass.h:161
 #, c-format
 msgid "'%s' netclass"
@@ -15695,11 +16045,15 @@ msgstr ""
 "\n"
 "您要创建一个与工程同名的新目录吗?"
 
-#: kicad/kicad_manager_frame.cpp:540
+#: kicad/kicad_manager_frame.cpp:538
 msgid "Load File to Edit"
 msgstr "打开文件编辑"
 
-#: kicad/kicad_manager_frame.cpp:656
+#: kicad/kicad_manager_frame.cpp:604 pcbnew/pcb_edit_frame.cpp:1175
+msgid " [Read Only]"
+msgstr " [只读]"
+
+#: kicad/kicad_manager_frame.cpp:654
 #, c-format
 msgid ""
 "Project name:\n"
@@ -15708,11 +16062,11 @@ msgstr ""
 "工程文件:\n"
 "%s\n"
 
-#: kicad/kicad_manager_frame.cpp:692
+#: kicad/kicad_manager_frame.cpp:690
 msgid "Restoring session"
 msgstr "正在恢复会话"
 
-#: kicad/kicad_manager_frame.cpp:702
+#: kicad/kicad_manager_frame.cpp:700
 #, c-format
 msgid "Restoring \"%s\""
 msgstr "正在恢复 \"%s\""
@@ -15971,17 +16325,22 @@ msgstr "将工程保存到"
 msgid "Application failed to load:\n"
 msgstr "应用程序加载失败：\n"
 
-#: kicad/tools/kicad_manager_control.cpp:601 pcbnew/pcb_edit_frame.cpp:1387
-#: pcbnew/pcb_edit_frame.cpp:1417
+#: kicad/tools/kicad_manager_control.cpp:601
+#: kicad/tools/kicad_manager_control.cpp:608 pcbnew/pcb_edit_frame.cpp:1416
+#: pcbnew/pcb_edit_frame.cpp:1446
 msgid "KiCad Error"
 msgstr "KiCad 错误"
 
-#: kicad/tools/kicad_manager_control.cpp:667
+#: kicad/tools/kicad_manager_control.cpp:608
+msgid "Application failed to load."
+msgstr "应用程序加载失败。"
+
+#: kicad/tools/kicad_manager_control.cpp:674
 #, c-format
 msgid "%s closed [pid=%d]\n"
 msgstr "%s 关闭 [PID = %d]\n"
 
-#: kicad/tools/kicad_manager_control.cpp:727
+#: kicad/tools/kicad_manager_control.cpp:734
 #, c-format
 msgid "%s %s opened [pid=%ld]\n"
 msgstr "%s %s 打开 [PID = %ld]\n"
@@ -16027,7 +16386,7 @@ msgstr "在查找器窗口中显示目录"
 msgid "Open Directory in File Explorer"
 msgstr "在文件资源管理器中打开目录"
 
-#: kicad/tree_project_frame.cpp:728 pcbnew/menubar_pcb_editor.cpp:416
+#: kicad/tree_project_frame.cpp:728 pcbnew/menubar_pcb_editor.cpp:420
 msgid "Opens the directory in the default system file manager"
 msgstr "在默认系统文件管理器中打开目录"
 
@@ -16289,7 +16648,7 @@ msgid "Set to 0 for default"
 msgstr "默认设置为 0"
 
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:364
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1278
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1352
 msgid "Rotation:"
 msgstr "旋转："
 
@@ -16327,9 +16686,10 @@ msgid "Default Values:"
 msgstr "默认值："
 
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:542
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:351
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:134
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:156
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:234
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:209
 msgid "Line thickness:"
 msgstr "线宽："
 
@@ -16416,48 +16776,48 @@ msgstr "文件 \"%s\" 写入"
 msgid "Save As"
 msgstr "另存为"
 
-#: pagelayout_editor/files.cpp:202 pcbnew/exporters/export_gencad.cpp:261
+#: pagelayout_editor/files.cpp:202 pcbnew/exporters/export_gencad.cpp:245
 #: pcbnew/exporters/gen_footprints_placefile.cpp:530
 #, c-format
 msgid "Unable to create \"%s\""
 msgstr "\"%s\" 无法建立"
 
-#: pagelayout_editor/pl_editor_frame.cpp:146
+#: pagelayout_editor/pl_editor_frame.cpp:142
 msgid "coord origin: Right Bottom page corner"
 msgstr "原点位置：图框左下角"
 
-#: pagelayout_editor/pl_editor_frame.cpp:171
+#: pagelayout_editor/pl_editor_frame.cpp:167
 msgid "Properties"
 msgstr "属性"
 
-#: pagelayout_editor/pl_editor_frame.cpp:304
+#: pagelayout_editor/pl_editor_frame.cpp:300
 #, c-format
 msgid "Error when loading file \"%s\""
 msgstr "<%s> 文件加载错误"
 
-#: pagelayout_editor/pl_editor_frame.cpp:410
+#: pagelayout_editor/pl_editor_frame.cpp:406
 msgid "Error Init Printer info"
 msgstr "初始化打印机信息出现错误"
 
-#: pagelayout_editor/pl_editor_frame.cpp:539
+#: pagelayout_editor/pl_editor_frame.cpp:535
 msgid "no file selected"
 msgstr "没有选中的文件"
 
-#: pagelayout_editor/pl_editor_frame.cpp:711
+#: pagelayout_editor/pl_editor_frame.cpp:707
 #, c-format
 msgid "Page size: width %.4g height %.4g"
 msgstr "图框尺寸: 宽 %.4g 高 %.4g"
 
-#: pagelayout_editor/pl_editor_frame.cpp:750
+#: pagelayout_editor/pl_editor_frame.cpp:746
 #, c-format
 msgid "coord origin: %s"
 msgstr "坐标原点: %s"
 
-#: pagelayout_editor/pl_editor_frame.cpp:890
+#: pagelayout_editor/pl_editor_frame.cpp:886
 msgid "New page layout file is unsaved"
 msgstr "新图框文件未保存"
 
-#: pagelayout_editor/pl_editor_frame.cpp:894
+#: pagelayout_editor/pl_editor_frame.cpp:890
 msgid "Page layout changes are unsaved"
 msgstr "图框更改未保存"
 
@@ -16565,11 +16925,11 @@ msgstr ""
 "在编辑模式下显示标题块：\n"
 "文本占位符显示为 ${keyword} 标记。"
 
-#: pagelayout_editor/tools/pl_edit_tool.cpp:463
+#: pagelayout_editor/tools/pl_edit_tool.cpp:460
 msgid "Error writing objects to clipboard"
 msgstr "将对象写入剪贴板时出错"
 
-#: pagelayout_editor/tools/pl_selection_tool.cpp:233
+#: pagelayout_editor/tools/pl_selection_tool.cpp:239
 msgid "Clarify Selection"
 msgstr "明确选择"
 
@@ -16618,16 +16978,19 @@ msgid "Degree"
 msgstr "度"
 
 #: pcb_calculator/UnitSelector.cpp:154
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:404
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:493
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:730
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:840
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1301
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1411
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1583
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1672
 msgid "Ohm"
 msgstr "Ω"
 
 #: pcb_calculator/UnitSelector.cpp:155
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:97
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:111
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:465
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:476
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:487
 msgid "KOhm"
 msgstr "KΩ"
 
@@ -16738,9 +17101,9 @@ msgid "Vref:"
 msgstr "Vref："
 
 #: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:44
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:416
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:505
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:742
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1313
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1595
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1684
 msgid "Volt"
 msgstr "Volt"
 
@@ -16824,7 +17187,8 @@ msgid "3 Terminal Type"
 msgstr "三端"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:188
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1470
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:335
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:572
 msgid "Calculate"
 msgstr "计算"
 
@@ -16869,285 +17233,536 @@ msgstr "删除当前列表中可用的稳压器的项"
 msgid "Regulators"
 msgstr "稳压器"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:270
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:543
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1420
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:269
+msgid "PI"
+msgstr "PI（π）"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:269
+msgid "Tee"
+msgstr "T 型"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:269
+msgid "Bridged Tee"
+msgstr "桥 T 型"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:269
+msgid "Resistive Splitter"
+msgstr "电阻分压型"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:271
+msgid "Attenuators:"
+msgstr "衰减器："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:285
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1114
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1449
 msgid "Parameters:"
 msgstr "参数："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:278
-msgid "Current:"
-msgstr "电流："
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:293
+msgid "Attenuation"
+msgstr "衰减"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:291
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:668
-msgid "Temperature rise:"
-msgstr "温升："
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:300
+msgid "dB"
+msgstr "dB"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:298
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:677
-msgid "deg C"
-msgstr "摄氏度"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:302
-msgid "Conductor length:"
-msgstr "导线长度："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:314
-msgid "Resistivity:"
-msgstr "电阻率："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:321
-msgid "Ohm-meter"
-msgstr "欧姆 - 米"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:341
-msgid "External layer traces:"
-msgstr "外层布线："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:349
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:447
-msgid "Trace width:"
-msgstr "布线宽度："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:363
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:461
-msgid "Trace thickness:"
-msgstr "布线厚度："
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:304
+msgid "Zin"
+msgstr "Zin"
 
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:311
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:322
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:362
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:373
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:384
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:473
-msgid "Cross-section area:"
-msgstr "截面积："
+msgid "Ohms"
+msgstr "Ω"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:315
+msgid "Zout"
+msgstr "Zout"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:355
+msgid "R1"
+msgstr "R1"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:366
+msgid "R2"
+msgstr "R2"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:377
+msgid "R3"
+msgstr "R3"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:405
+msgid "Formula"
+msgstr "计算公式"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:417
+msgid "RF Attenuators"
+msgstr "RF 衰减器"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:431
+msgid "E-Series Resistor Calculator"
+msgstr "E 系列电阻器计算器"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:450
+msgid "Inputs"
+msgstr "输入"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:458
+msgid "Required Resistance:"
+msgstr "所需电阻："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:469
+msgid "Exclude Value 1:"
+msgstr "排除值 1："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:480
+msgid "Exclude Value 2:"
+msgstr "排除值 2："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:491
+msgid "E1"
+msgstr "E1"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:491
+msgid "E3"
+msgstr "E3"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:491
+msgid "E6"
+msgstr "E6"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:491
+msgid "E12"
+msgstr "E12"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:493
+msgid "Available Values:"
+msgstr "可选值："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:504
+msgid "Solutions"
+msgstr "解决方案"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:512
+msgid "Simple Solution:"
+msgstr "简单解决方案："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:521
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:541
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:561
+msgid "Error:"
+msgstr "错误："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:532
+msgid "3R Solution:"
+msgstr "3R 解决方案："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:552
+msgid "4R Solution:"
+msgstr "4R 解决方案："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:609
+msgid "E-Series"
+msgstr "电子系列"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:614
+msgid "10% / 5%"
+msgstr "10% / 5%"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:614
+msgid "<= 2%"
+msgstr "<= 2%"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:616
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:645
+msgid "Tolerance"
+msgstr "误差"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:625
+msgid "1st Band"
+msgstr "第一环"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:629
+msgid "2nd Band"
+msgstr "第二环"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:633
+msgid "3rd Band"
+msgstr "第三环"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:637
+msgid "4th Band"
+msgstr "第四环"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:641
+msgid "Multiplier"
+msgstr "乘数"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:674
+msgid "Color Code"
+msgstr "颜色代码"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Microstrip Line"
+msgstr "微带线"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Coplanar wave guide"
+msgstr "共面波导"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Coplanar wave guide with ground plane"
+msgstr "共面波导与接地层"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Rectangular Waveguide"
+msgstr "矩形波导"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Coaxial Line"
+msgstr "同轴线"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Coupled Microstrip Line"
+msgstr "耦合微带线"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Stripline"
+msgstr "带状线"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:682
+msgid "Twisted Pair"
+msgstr "双绞线"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:684
+msgid "Transmission Line Type:"
+msgstr "线路类型："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:701
+msgid "Substrate Parameters"
+msgstr "基板参数"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:709
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1227
+msgid "Er:"
+msgstr "Er："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:719
+msgid "TanD:"
+msgstr "介损："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:729
+msgid "Rho:"
+msgstr "Rho："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:731
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1217
+msgid "Specific resistance in ohms * meters"
+msgstr "电阻率 欧姆*米"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:741
+msgid "H:"
+msgstr "H："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:753
+msgid "H_t:"
+msgstr "H_t："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:765
+msgid "T:"
+msgstr "T："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:777
+msgid "Rough:"
+msgstr "表面粗糙度："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:789
+msgid "mu Rel:"
+msgstr "mu Rel："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:801
+msgid "mu Rel C:"
+msgstr "mu Rel C："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:388
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:400
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:412
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:424
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:477
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:489
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:501
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:513
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:726
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:738
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:750
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:764
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:778
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:790
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:806
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:820
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:836
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1324
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1328
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1332
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1336
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1340
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1344
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1348
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1352
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1356
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1360
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1364
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1368
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1372
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1376
+msgid "Component Parameters:"
+msgstr "元件参数："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:858
+msgid "Zdiff = Zodd * 2"
+msgstr "Zdiff = Zodd * 2"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:864
+msgid "Zcommon = Zeven / 2"
+msgstr "Zcommon = Zeven / 2"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:883
+msgid "Physical Parameters:"
+msgstr "物理参数："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:894
+msgid "Prm1"
+msgstr "Prm1"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:909
+msgid "prm2"
+msgstr "prm2"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:924
+msgid "prm3"
+msgstr "prm3"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:959
+msgid "Analyze"
+msgstr "分析"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:962
+msgid "Synthesize"
+msgstr "合成"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:977
+msgid "Electrical Parameters:"
+msgstr "电气参数："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:985
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:997
+msgid "Z"
+msgstr "Z"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1009
+#: pcbnew/class_drawsegment.cpp:477 pcbnew/class_drawsegment.cpp:518
+#: pcbnew/class_drawsegment.cpp:1270 pcbnew/class_pcb_text.cpp:125
+#: pcbnew/class_text_mod.cpp:315
+msgid "Angle"
+msgstr "角度"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1028
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1285
+msgid "Results:"
+msgstr "结果："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1036
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1040
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1044
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1048
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1052
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1056
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1060
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1064
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1068
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1072
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1076
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1080
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1084
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1088
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1297
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1309
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1321
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1335
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1349
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1361
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1377
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1391
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1407
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1567
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1579
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1591
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1603
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1656
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1668
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1680
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1692
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:170
 msgid "dummy"
 msgstr "假"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:392
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:481
-msgid "mm ^ 2"
-msgstr "mm ^ 2"
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1108
+msgid "TransLine"
+msgstr "传输线路"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:396
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:485
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:722
-msgid "Resistance:"
-msgstr "阻抗："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:408
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:497
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:734
-msgid "Voltage drop:"
-msgstr "压降："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:420
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:509
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:746
-msgid "Power loss:"
-msgstr "电源损耗："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:428
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:517
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:754
-msgid "Watt"
-msgstr "W"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:439
-msgid "Internal layer traces:"
-msgstr "内层布线："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:551
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1122
 msgid "Finished hole diameter (D):"
 msgstr "成品孔直径 (D)："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:565
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1136
 msgid "Plating thickness (T):"
 msgstr "镀层厚度 (T)："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:577
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1148
 msgid "Via length:"
 msgstr "过孔长度："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:579
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1150
 msgid "Via length is the board thickness for through hole vias"
 msgstr "通孔长度是通孔过孔的板厚"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:591
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1162
 msgid "Via pad diameter:"
 msgstr "过孔焊盘外径："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:593
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1164
 msgid "Diameter of pad surrounding via (annular ring)"
 msgstr "通过（环形环）的焊盘直径"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:605
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1176
 msgid "Clearance hole diameter:"
 msgstr "间隙孔直径："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:607
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1178
 msgid "Diameter of clearance hole in ground plane(s)"
 msgstr "地平面过孔直径"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:619
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1190
 msgid "Z0:"
 msgstr "Z0："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:621
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1192
 msgid "Characteristic impedance of conductor"
 msgstr "导体的特性阻抗"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:633
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1204
 msgid "Applied current:"
 msgstr "应用电流："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:644
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1215
 msgid "Plating resistivity (Ohm.m):"
 msgstr "电镀电阻率（Ohm.m）："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:646
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1019
-msgid "Specific resistance in ohms * meters"
-msgstr "电阻率 欧姆*米"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:656
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:997
-msgid "Er:"
-msgstr "Er："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:658
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1229
 msgid "Relative dielectric constant (epsilon r)"
 msgstr "相对介电常数 (epsilon r)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:670
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1239
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1470
+msgid "Temperature rise:"
+msgstr "温升："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1241
 msgid "Maximum acceptable rise in temperature"
 msgstr "最大温升"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:681
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1248
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1477
+msgid "deg C"
+msgstr "摄氏度"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1252
 msgid "Pulse rise time:"
 msgstr "脉冲上升时间:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:683
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1254
 msgid "Pulse rise time to calculate reactance"
 msgstr "计算电抗的脉冲上升时间"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:690
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1261
 msgid "ns"
 msgstr "ns"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:692
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1263
 msgid "nanoseconds"
 msgstr "ns"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:703
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1274
 msgid "Top view of via"
 msgstr "过孔的顶视图"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:714
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1316
-msgid "Results:"
-msgstr "结果："
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1293
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1575
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1664
+msgid "Resistance:"
+msgstr "阻抗："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:758
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1305
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1587
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1676
+msgid "Voltage drop:"
+msgstr "压降："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1317
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1599
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1688
+msgid "Power loss:"
+msgstr "电源损耗："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1325
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1607
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1696
+msgid "Watt"
+msgstr "W"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1329
 msgid "Thermal resistance:"
 msgstr "热阻："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:760
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1331
 msgid "Using thermal conductivity value 401 Watts/(meter-Kelvin)"
 msgstr "使用导热系数 401 瓦特/(米-开尔文)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:768
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1339
 msgid "deg C/Watt"
 msgstr "摄氏度/瓦特"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:772
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1343
 msgid "Estimated ampacity:"
 msgstr "估计的载流量："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:774
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1345
 msgid "Based on temperature rise"
 msgstr "温升"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:786
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1357
 msgid "Capacitance:"
 msgstr "电容："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:794
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1365
 msgid "pF"
 msgstr "pF"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:796
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1367
 msgid "pico-Farad"
 msgstr "pF"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:800
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1371
 msgid "Rise time degradation:"
 msgstr "上升时间下降:"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:802
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1373
 msgid "Rise time degradation for given Z0 and calculated capacitance"
 msgstr "给定 Z0 的上升时间衰减和计算电容"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:810
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1381
 msgid "ps"
 msgstr "ps"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:812
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1383
 msgid "picoseconds"
 msgstr "ps"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:816
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1387
 msgid "Inductance:"
 msgstr "电感："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:824
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1395
 msgid "nH"
 msgstr "nH"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:826
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1397
 msgid "nano-Henry"
 msgstr "nH"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:830
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1401
 msgid "Reactance:"
 msgstr "电抗："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:832
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1403
 msgid "Inductive reactance for given rise time and calculated inductance"
 msgstr "给定上升时间和计算电感的感抗"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:850
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1421
 msgid ""
 "Warning:\n"
 "Via pad diameter >= Clearance hole diameter.\n"
@@ -17159,83 +17774,127 @@ msgstr ""
 "无法为过孔计算某些参数\n"
 "在铜区内。"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:885
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1457
+msgid "Current:"
+msgstr "电流："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1481
+msgid "Conductor length:"
+msgstr "导线长度："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1496
+msgid "Resistivity:"
+msgstr "电阻率："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1500
+msgid "Ohm-meter"
+msgstr "欧姆 - 米"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1520
+msgid "External layer traces:"
+msgstr "外层布线："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1528
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1626
+msgid "Trace width:"
+msgstr "布线宽度："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1542
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1640
+msgid "Trace thickness:"
+msgstr "布线厚度："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1563
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1652
+msgid "Cross-section area:"
+msgstr "截面积："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1571
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1660
+msgid "mm ^ 2"
+msgstr "mm ^ 2"
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1618
+msgid "Internal layer traces:"
+msgstr "内层布线："
+
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1732
 msgid "Voltage > 500V:"
 msgstr "电压 > 500V："
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:892
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1739
 msgid "Update Values"
 msgstr "更新电压值"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:901
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1748
 msgid "Note: Values are minimal values (from IPC 2221)"
 msgstr "注意：表内数值最小值 (来自《IPC-2221 印制板通用设计标准》)"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:920
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1767
 msgid "B1"
 msgstr "B1"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:921
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1768
 msgid "B2"
 msgstr "B2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:922
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1769
 msgid "B3"
 msgstr "B3"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:923
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1770
 msgid "B4"
 msgstr "B4"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:925
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1772
 msgid "A6"
 msgstr "A6"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:926
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1773
 msgid "A7"
 msgstr "A7"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:933
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1780
 msgid "0 ... 15V"
 msgstr "0 ... 15V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:934
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1781
 msgid "16 ... 30V"
 msgstr "16 ... 30V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:935
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1782
 msgid "31 ... 50V"
 msgstr "31 ... 50V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:936
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1783
 msgid "51 ... 100V"
 msgstr "51 ... 100V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:937
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1784
 msgid "101 ... 150V"
 msgstr "101 ... 150V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:938
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1785
 msgid "151 ... 170V"
 msgstr "151 ... 170V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:939
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1786
 msgid "171 ... 250V"
 msgstr "171 ... 250V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:940
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1787
 msgid "251 ... 300V"
 msgstr "251 ... 300V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:941
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1788
 msgid "301 ... 500V"
 msgstr "301 ... 500V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:942
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1789
 msgid " > 500V"
 msgstr " > 500V"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:951
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1798
 msgid ""
 "*  B1 - Internal Conductors\n"
 "*  B2 - External Conductors, uncoated, sea level to 3050 m\n"
@@ -17255,296 +17914,138 @@ msgstr ""
 "*  A6 - 外部元件引线/端接，无涂层\n"
 "*  A7 - 外部元件引线端接，带保形涂层（任何高度）"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:962
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1809
 msgid "Electrical Spacing"
 msgstr "电气间距"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Microstrip Line"
-msgstr "微带线"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Coplanar wave guide"
-msgstr "共面波导"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Coplanar wave guide with ground plane"
-msgstr "共面波导与接地层"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Rectangular Waveguide"
-msgstr "矩形波导"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Coaxial Line"
-msgstr "同轴线"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Coupled Microstrip Line"
-msgstr "耦合微带线"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Stripline"
-msgstr "带状线"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:970
-msgid "Twisted Pair"
-msgstr "双绞线"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:972
-msgid "Transmission Line Type:"
-msgstr "线路类型："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:989
-msgid "Substrate Parameters"
-msgstr "基板参数"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1007
-msgid "TanD:"
-msgstr "介损："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1017
-msgid "Rho:"
-msgstr "Rho："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1029
-msgid "H:"
-msgstr "H："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1041
-msgid "H_t:"
-msgstr "H_t："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1053
-msgid "T:"
-msgstr "T："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1065
-msgid "Rough:"
-msgstr "表面粗糙度："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1077
-msgid "mu Rel:"
-msgstr "mu Rel："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1089
-msgid "mu Rel C:"
-msgstr "mu Rel C："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1108
-msgid "Component Parameters:"
-msgstr "元件参数："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1146
-msgid "Zdiff = Zodd * 2"
-msgstr "Zdiff = Zodd * 2"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1152
-msgid "Zcommon = Zeven / 2"
-msgstr "Zcommon = Zeven / 2"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1171
-msgid "Physical Parameters:"
-msgstr "物理参数："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1182
-msgid "Prm1"
-msgstr "Prm1"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1197
-msgid "prm2"
-msgstr "prm2"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1212
-msgid "prm3"
-msgstr "prm3"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1247
-msgid "Analyze"
-msgstr "分析"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1250
-msgid "Synthesize"
-msgstr "合成"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1265
-msgid "Electrical Parameters:"
-msgstr "电气参数："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1273
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1285
-msgid "Z"
-msgstr "Z"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1297
-#: pcbnew/class_drawsegment.cpp:477 pcbnew/class_drawsegment.cpp:518
-#: pcbnew/class_drawsegment.cpp:1271 pcbnew/class_pcb_text.cpp:126
-#: pcbnew/class_text_mod.cpp:315
-msgid "Angle"
-msgstr "角度"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1396
-msgid "TransLine"
-msgstr "传输线路"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1404
-msgid "PI"
-msgstr "PI（π）"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1404
-msgid "Tee"
-msgstr "T 型"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1404
-msgid "Bridged Tee"
-msgstr "桥 T 型"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1404
-msgid "Resistive Splitter"
-msgstr "电阻分压型"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1406
-msgid "Attenuators:"
-msgstr "衰减器："
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1428
-msgid "Attenuation"
-msgstr "衰减"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1435
-msgid "dB"
-msgstr "dB"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1439
-msgid "Zin"
-msgstr "Zin"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1446
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1457
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1497
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1508
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1519
-msgid "Ohms"
-msgstr "Ω"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1450
-msgid "Zout"
-msgstr "Zout"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1490
-msgid "R1"
-msgstr "R1"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1501
-msgid "R2"
-msgstr "R2"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1512
-msgid "R3"
-msgstr "R3"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1540
-msgid "Formula"
-msgstr "计算公式"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1552
-msgid "RF Attenuators"
-msgstr "RF 衰减器"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1557
-msgid "10% / 5%"
-msgstr "10% / 5%"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1557
-msgid "<= 2%"
-msgstr "<= 2%"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1559
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1588
-msgid "Tolerance"
-msgstr "误差"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1568
-msgid "1st Band"
-msgstr "第一环"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1572
-msgid "2nd Band"
-msgstr "第二环"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1576
-msgid "3rd Band"
-msgstr "第三环"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1580
-msgid "4th Band"
-msgstr "第四环"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1584
-msgid "Multiplier"
-msgstr "乘数"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1617
-msgid "Color Code"
-msgstr "颜色代码"
-
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1630
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1822
 msgid "Note: Values are minimal values"
 msgstr "注意：该值为最小值"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1649
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1841
 msgid "Class 1"
 msgstr "类别 1"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1650
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1842
 msgid "Class 2"
 msgstr "类别 2"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1651
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1843
 msgid "Class 3"
 msgstr "类别 3"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1652
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1844
 msgid "Class 4"
 msgstr "类别 4"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1653
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1845
 msgid "Class 5"
 msgstr "类别 5"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1654
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1846
 msgid "Class 6"
 msgstr "类别 6"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1661
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1853
 msgid "Lines width"
 msgstr "线宽"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1662
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1854
 msgid "Min clearance"
 msgstr "最小间距"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1663
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1855
 msgid "Via: (diam - drill)"
 msgstr "过孔：（外径 - 内径）"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1664
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1856
 msgid "Plated Pad: (diam - drill)"
 msgstr "金属化焊盘：（外径 - 内径）"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1665
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1857
 msgid "NP Pad: (diam - drill)"
 msgstr "非金属化焊盘：（外径 - 内径）"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1684
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1876
 msgid "Board Classes"
 msgstr "电路板类别"
 
-#: pcb_calculator/dialogs/pcb_calculator_frame_base.h:386
+#: pcb_calculator/dialogs/pcb_calculator_frame_base.h:417
 msgid "PCB Calculator"
 msgstr "PCB 计算器"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:124
+#: pcb_calculator/eserie_help.h:2
+#, fuzzy, c-format
+msgid ""
+"E-series defined in IEC 60063 are a widely accepted system of preferred\n"
+"numbers for electronic components.  Available values are approximately\n"
+"equally spaced in a logarithmic scale.  Although E-series are used for\n"
+"Zener diodes, inductors and other components, this calculator is mainly\n"
+"intended for resistors.\n"
+"\n"
+"\tE12: 1,0 1,2 1,5 1,8 2,2 2,7 3,3 3,9 4,7 5,6 6,8 8,2\n"
+"\tE6:  1,0  -  1,5  -  2,2  -  3,3  -  4,7  -  6,8  -\n"
+"\tE3:  1,0  -   -   -  2,2  -   -   -  4,7  -   -   -\n"
+"\tE1:  1,0  -   -   -   -   -   -   -   -   -   -   -\n"
+"If your design requires any resistor value which is not readily available,\n"
+"this calculator will find a combination of standard E-series components to\n"
+"create it.  You can enter the required resistance from 0,0025 to 4000 "
+"KOhm. \n"
+"Solutions using 3 or 4 resistors are given if a better match can be found. \n"
+"The 4R checkbox option will take longer to process is considered for the "
+"E12\n"
+"series only.  Optionally it is possible to exclude up to two additional\n"
+"values from the solution for the reason of being not available.  If a\n"
+"E-series value is entered to the required input field, it is always "
+"excluded\n"
+"from any solution as it is assumed that this value is unavailable.\n"
+"\n"
+"Solutions are given in the following formats:\n"
+"\n"
+"\tR1 + R2 +...+ Rn\tresistors in series\n"
+"\tR1 | R2 |...| Rn\tresistors in parallel\n"
+"\tR1 + (R2|R3)...\t\tany combination of the above\n"
+"__Example:__ Voltage dividers, commonly used for 1:10 range selection\n"
+"require resistor ratio values 1:9.  Unfortunately the \"9\" is a value, "
+"what\n"
+"is not even in the E192 series available.  Deviation of 1% and more is yet\n"
+"unacceptable for 8 bit accuracy.  For a required resistor value of 9 KOhm,\n"
+"the calculator suggests the E6 values 2k2 + 6k8 in series as a possible\n"
+"exact solution.\n"
+msgstr ""
+"IEC 60063 中定义的 E 系列是一个被广泛接受的首选系统\n"
+"电子元件的编号。  可用值大约为\n"
+"在对数刻度上等间距。  虽然电子系列用于\n"
+"齐纳二极管、电感等元件，此计算器主要\n"
+"用于电阻。\n"
+"\n"
+"\tE12: 1,0 1,2 1,5 1,8 2,2 2,7 3,3 3,9 4,7 5,6 6,8 8,2\n"
+"\tE6:  1,0  -  1,5  -  2,2  -  3,3  -  4,7  -  6,8  -\n"
+"\tE3:  1,0  -   -   -  2,2  -   -   -  4,7  -   -   -\n"
+"\tE1:  1,0  -   -   -   -   -   -   -   -   -   -   -\n"
+"如果您的设计需要任何不易获得的电阻值，\n"
+"此计算器将找到标准电子系列组件的组合\n"
+"创建它。  您可以输入 0,0025 到 4000 KOhm 所需的电阻。\n"
+"如果找到更好的匹配，将给出使用 3 或 4 个电阻的解决方案。\n"
+"考虑 E12 的 4R 复选框选项需要更长的时间来处理\n"
+"仅限系列。  可选的是，由于不可用的原因\n"
+"最多可以排除另外两个，来自解决方案的值。  如果\n"
+"电子系列值输入到所需的输入字段，从任何解决方案中\n"
+"它始终被排除，因为它假定此值不可用。\n"
+"\n"
+"解决方案以以下格式提供：\n"
+"\n"
+"\tR1 + R2 +...+ Rn\t串联电阻\n"
+"\tR1 | R2 |...| Rn\t并联电阻\n"
+"\tR1 + (R2|R3)...\t\t以上任意组合\n"
+"__例如：__ 分压器，通常用于 1:10 量程选择\n"
+"需要电阻比值 1:9。  可惜 \"9\" 是一个值，\n"
+"甚至不在 E192 系列中。  偏差为 1% 或更多。\n"
+"对于 8 位精度不可接受。  对于所需的电阻值为 9 KOhm，\n"
+"计算器建议 E6 值 2k2 + 6k8 串联\n"
+"精确的解决方案。\n"
+
+#: pcb_calculator/pcb_calculator_frame.cpp:125
 msgid ""
 "Data modified, and no data filename to save modifications\n"
 "Do you want to exit and abandon your change?"
@@ -17552,11 +18053,11 @@ msgstr ""
 "更改后的数据不会被保存。\n"
 "你确定要退出并放弃更改？"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:126
+#: pcb_calculator/pcb_calculator_frame.cpp:127
 msgid "Regulator list change"
 msgstr "修改稳压器列表"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:137
+#: pcb_calculator/pcb_calculator_frame.cpp:138
 #, c-format
 msgid ""
 "Unable to write file \"%s\"\n"
@@ -17565,7 +18066,7 @@ msgstr ""
 "无法写入文件 \"%s\"\n"
 "是否退出并放弃修改？"
 
-#: pcb_calculator/pcb_calculator_frame.cpp:141
+#: pcb_calculator/pcb_calculator_frame.cpp:142
 msgid "Write Data File Error"
 msgstr "写入数据文件时发生错误"
 
@@ -17950,94 +18451,73 @@ msgstr "电缆长度"
 msgid "Electrical Resistivity in Ohm*m"
 msgstr "电阻率（以 Ohm*m 为单位）"
 
-#: pcbnew/array_creator.cpp:185
+#: pcbnew/array_creator.cpp:188
 msgid "Create an array"
 msgstr "创建阵列"
 
-#: pcbnew/autorouter/ar_autoplacer.cpp:950
+#: pcbnew/autorouter/ar_autoplacer.cpp:947
 msgid "Autoplacing components..."
 msgstr "自动放置元件..."
 
-#: pcbnew/autorouter/ar_autoplacer.cpp:967
+#: pcbnew/autorouter/ar_autoplacer.cpp:964
 #, c-format
 msgid "Autoplacing %s"
 msgstr "自动放置 %s"
 
-#: pcbnew/autorouter/autoplacer_tool.cpp:93
+#: pcbnew/autorouter/autoplace_tool.cpp:68
+#, c-format
+msgid "Board edges must be defined on the %s layer."
+msgstr "必须在 %s 图层上定义板边。"
+
+#: pcbnew/autorouter/autoplace_tool.cpp:88
 msgid "Autoplace Components"
 msgstr "自动放置元件"
 
-#: pcbnew/autorouter/autoplacer_tool.cpp:99
+#: pcbnew/autorouter/autoplace_tool.cpp:94
 msgid "Autoplace components"
 msgstr "自动放置元件"
 
-#: pcbnew/board_connected_item.cpp:126 pcbnew/class_track.cpp:166
-#: pcbnew/class_track.cpp:193 pcbnew/drc/drc_clearance_test_functions.cpp:254
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:108
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:159
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:211
-#: qa/drc_proto/drc_clearance_test_functions.cpp:353
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:95
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:138
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:181
-msgid "board minimum"
-msgstr "电路板最小值"
-
-#: pcbnew/board_connected_item.cpp:140 pcbnew/drc/drc.cpp:494
-#: pcbnew/drc/drc_clearance_test_functions.cpp:496 qa/drc_proto/drc.cpp:534
-#: qa/drc_proto/drc_clearance_test_functions.cpp:631
-msgid "board edge"
-msgstr "电路板边缘"
-
-#: pcbnew/board_connected_item.cpp:164 pcbnew/class_track.cpp:151
-#: pcbnew/class_track.cpp:186 pcbnew/class_zone.cpp:383
-#: pcbnew/drc/drc_clearance_test_functions.cpp:314
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:103
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:154
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:206
-#: qa/drc_proto/drc_clearance_test_functions.cpp:420
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:101
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:144
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:187
-#, c-format
-msgid "'%s' rule"
-msgstr "'%s' 规则"
-
-#: pcbnew/board_connected_item.cpp:217
+#: pcbnew/board_connected_item.cpp:152
 msgid "NetName"
 msgstr "网络名称"
 
-#: pcbnew/board_connected_item.cpp:219 pcbnew/class_pad.cpp:809
-#: pcbnew/class_track.cpp:800 pcbnew/class_zone.cpp:640
+#: pcbnew/board_connected_item.cpp:154 pcbnew/class_pad.cpp:818
+#: pcbnew/class_track.cpp:743 pcbnew/class_zone.cpp:586
 msgid "NetClass"
 msgstr "网络类"
 
-#: pcbnew/board_stackup_manager/class_board_stackup.cpp:303
+#: pcbnew/board_stackup_manager/class_board_stackup.cpp:305
 #, c-format
 msgid "Dielectric %d"
 msgstr "介电 %d"
 
-#: pcbnew/board_stackup_manager/class_board_stackup.cpp:523
+#: pcbnew/board_stackup_manager/class_board_stackup.cpp:525
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:291
 msgid "Top Silk Screen"
 msgstr "顶层丝印"
 
-#: pcbnew/board_stackup_manager/class_board_stackup.cpp:531
+#: pcbnew/board_stackup_manager/class_board_stackup.cpp:533
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:275
 msgid "Top Solder Paste"
 msgstr "顶部焊膏"
 
-#: pcbnew/board_stackup_manager/class_board_stackup.cpp:539
+#: pcbnew/board_stackup_manager/class_board_stackup.cpp:541
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:307
 msgid "Top Solder Mask"
 msgstr "顶层阻焊"
 
-#: pcbnew/board_stackup_manager/class_board_stackup.cpp:583
+#: pcbnew/board_stackup_manager/class_board_stackup.cpp:585
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:302
 msgid "Bottom Solder Mask"
 msgstr "底层阻焊"
 
-#: pcbnew/board_stackup_manager/class_board_stackup.cpp:591
+#: pcbnew/board_stackup_manager/class_board_stackup.cpp:593
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:270
 msgid "Bottom Solder Paste"
 msgstr "底部焊膏"
 
-#: pcbnew/board_stackup_manager/class_board_stackup.cpp:599
+#: pcbnew/board_stackup_manager/class_board_stackup.cpp:601
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:286
 msgid "Bottom Silk Screen"
 msgstr "底层丝印"
 
@@ -18103,7 +18583,7 @@ msgid "Dielectric Layers List"
 msgstr "电介质层列表"
 
 #: pcbnew/board_stackup_manager/panel_board_stackup.cpp:617
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:164
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:168
 msgid "Copper"
 msgstr "铜层"
 
@@ -18328,8 +18808,8 @@ msgid "Not specified"
 msgstr "未标明"
 
 #: pcbnew/build_BOM_from_board.cpp:80
-msgid "Cannot export BOM: there are no footprints in the PCB"
-msgstr "无法导出 BOM：因为 PCB 上没有封装"
+msgid "Cannot export BOM: there are no footprints on the PCB."
+msgstr "无法导出 BOM：PCB 上没有封装。"
 
 #: pcbnew/build_BOM_from_board.cpp:90
 msgid "Save Bill of Materials"
@@ -18366,79 +18846,79 @@ msgstr "供应商和参考"
 msgid "This is the default net class."
 msgstr "这是默认网络类。"
 
-#: pcbnew/class_board.cpp:690
+#: pcbnew/class_board.cpp:693
 msgid "PCB"
 msgstr "PCB"
 
-#: pcbnew/class_board.cpp:922
+#: pcbnew/class_board.cpp:1027
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:77
-#: pcbnew/netinfo_item.cpp:110 pcbnew/pcb_draw_panel_gal.cpp:397
-#: pcbnew/ratsnest/ratsnest.cpp:55 pcbnew/tools/pcbnew_control.cpp:1076
-#: pcbnew/widgets/appearance_controls.cpp:287
+#: pcbnew/netinfo_item.cpp:105 pcbnew/pcb_draw_panel_gal.cpp:398
+#: pcbnew/ratsnest/ratsnest.cpp:55 pcbnew/tools/pcbnew_control.cpp:1089
+#: pcbnew/widgets/appearance_controls.cpp:332
 msgid "Pads"
 msgstr "焊盘"
 
-#: pcbnew/class_board.cpp:925
+#: pcbnew/class_board.cpp:1030
 #: pcbnew/dialogs/dialog_board_statistics_base.cpp:156
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:68
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:31
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:154
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:84
-#: pcbnew/netinfo_item.cpp:130 pcbnew/pcb_draw_panel_gal.cpp:400
-#: pcbnew/widgets/appearance_controls.cpp:286
+#: pcbnew/netinfo_item.cpp:125 pcbnew/pcb_draw_panel_gal.cpp:401
+#: pcbnew/widgets/appearance_controls.cpp:331
 msgid "Vias"
 msgstr "过孔"
 
-#: pcbnew/class_board.cpp:928 pcbnew/pcb_draw_panel_gal.cpp:403
+#: pcbnew/class_board.cpp:1033 pcbnew/pcb_draw_panel_gal.cpp:404
 msgid "Track Segments"
 msgstr "布线分段数"
 
-#: pcbnew/class_board.cpp:931 pcbnew/pcb_draw_panel_gal.cpp:406
+#: pcbnew/class_board.cpp:1036 pcbnew/pcb_draw_panel_gal.cpp:407
 msgid "Nodes"
 msgstr "节点"
 
-#: pcbnew/class_board.cpp:934 pcbnew/pcb_draw_panel_gal.cpp:409
+#: pcbnew/class_board.cpp:1039 pcbnew/pcb_draw_panel_gal.cpp:410
 #: pcbnew/ratsnest/ratsnest.cpp:58
 msgid "Nets"
 msgstr "网络"
 
-#: pcbnew/class_board.cpp:937 pcbnew/pcb_draw_panel_gal.cpp:412
+#: pcbnew/class_board.cpp:1042 pcbnew/pcb_draw_panel_gal.cpp:413
 msgid "Unrouted"
 msgstr "未布线"
 
-#: pcbnew/class_board.cpp:1946
+#: pcbnew/class_board.cpp:2048
 #, c-format
 msgid "Group Uuid %s maps to 2 different BOARD_ITEMS: %p and %p"
 msgstr "组 UUID %s 映射到两个不同的 BOARD_ITEMS: %p 和 %p"
 
-#: pcbnew/class_board.cpp:1958
+#: pcbnew/class_board.cpp:2061
 #, c-format
 msgid "Two groups of identical name: %s"
 msgstr "两个同名的组：%s"
 
-#: pcbnew/class_board.cpp:1972
+#: pcbnew/class_board.cpp:2077
 #, c-format
 msgid "Group %s contains deleted item %s"
 msgstr "组 %s 包含已删除的项目 %s"
 
-#: pcbnew/class_board.cpp:1981
+#: pcbnew/class_board.cpp:2087
 #, c-format
 msgid "Uuid %s maps to 2 different BOARD_ITEMS: %s %p %s and %p %s"
 msgstr "UUID %s 映射到两个不同的 BOARD_ITEMS: %s %p %s 和 %p %s"
 
-#: pcbnew/class_board.cpp:1996
+#: pcbnew/class_board.cpp:2103
 #, c-format
 msgid ""
 "BOARD_ITEM %s appears multiple times in groups (either in the same group or "
 "in multiple groups) "
 msgstr "BOARD_ITEM %s 在组中多次出现 (在同一组中或在多个组中) "
 
-#: pcbnew/class_board.cpp:2025
+#: pcbnew/class_board.cpp:2134
 #, c-format
 msgid "Group must have at least one member: %s"
 msgstr "组必须至少有一个成员：%s"
 
-#: pcbnew/class_board_item.cpp:38 pcbnew/class_pad.cpp:1031
+#: pcbnew/class_board_item.cpp:38 pcbnew/class_pad.cpp:1040
 msgid "Rect"
 msgstr "矩形"
 
@@ -18447,39 +18927,39 @@ msgid "Bezier Curve"
 msgstr "贝塞尔曲线"
 
 #: pcbnew/class_board_item.cpp:42 pcbnew/class_drawsegment.cpp:491
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1995
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2027
 msgid "Polygon"
 msgstr "多边形"
 
-#: pcbnew/class_board_item.cpp:78 pcbnew/dialogs/dialog_pad_properties.cpp:921
-msgid "All copper layers"
+#: pcbnew/class_board_item.cpp:81
+msgid "all copper layers"
 msgstr "所有铜层"
 
-#: pcbnew/class_board_item.cpp:92
+#: pcbnew/class_board_item.cpp:95
 msgid " and others"
 msgstr " 和其它"
 
-#: pcbnew/class_board_item.cpp:106
+#: pcbnew/class_board_item.cpp:103
 msgid "no layers"
 msgstr "没有层"
 
-#: pcbnew/class_board_item.cpp:185 pcbnew/class_track.cpp:1120
+#: pcbnew/class_board_item.cpp:182 pcbnew/class_track.cpp:1070
 msgid "Position X"
 msgstr "位置 X"
 
-#: pcbnew/class_board_item.cpp:187 pcbnew/class_track.cpp:1123
+#: pcbnew/class_board_item.cpp:184 pcbnew/class_track.cpp:1073
 msgid "Position Y"
 msgstr "位置 Y"
 
-#: pcbnew/class_board_item.cpp:191
+#: pcbnew/class_board_item.cpp:188
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:35
 msgid "Locked"
 msgstr "锁定"
 
-#: pcbnew/class_dimension.cpp:461
+#: pcbnew/class_dimension.cpp:405
 #, c-format
-msgid "Dimension \"%s\" on %s"
-msgstr "尺寸 \"%s\" 在 %s"
+msgid "Dimension '%s' on %s"
+msgstr "标注 '%s' 在 %s"
 
 #: pcbnew/class_drawsegment.cpp:459
 msgid "Drawing"
@@ -18495,8 +18975,8 @@ msgstr "点"
 
 #: pcbnew/class_drawsegment.cpp:509
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:84
-#: pcbnew/dialogs/dialog_pad_properties.cpp:719
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1994
+#: pcbnew/dialogs/dialog_pad_properties.cpp:707
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2026
 msgid "Segment"
 msgstr "线段"
 
@@ -18504,24 +18984,19 @@ msgstr "线段"
 msgid "Unrecognized"
 msgstr "无法识别"
 
-#: pcbnew/class_drawsegment.cpp:921
+#: pcbnew/class_drawsegment.cpp:918 pcbnew/class_edge_mod.cpp:134
 #, c-format
-msgid "Pcb Graphic %s on %s"
-msgstr "Pcb 图形 %s（位于 %s 上）"
+msgid "%s on %s"
+msgstr "时间：%s  日期：%s"
 
-#: pcbnew/class_drawsegment.cpp:1275 pcbnew/class_track.cpp:1126
+#: pcbnew/class_drawsegment.cpp:1274 pcbnew/class_track.cpp:1076
 msgid "End X"
 msgstr "结束点 X"
 
-#: pcbnew/class_drawsegment.cpp:1277 pcbnew/class_track.cpp:1128
+#: pcbnew/class_drawsegment.cpp:1276 pcbnew/class_track.cpp:1078
 msgid "End Y"
 msgstr "结束点 Y"
 
-#: pcbnew/class_edge_mod.cpp:134
-#, c-format
-msgid "Graphic %s of %s on %s"
-msgstr "图形 %s %s 在 %s"
-
 #: pcbnew/class_marker_pcb.cpp:93
 msgid "Marker"
 msgstr "标记"
@@ -18535,282 +19010,325 @@ msgstr "违规"
 msgid "Marker (%s)"
 msgstr "标记 （%s）"
 
-#: pcbnew/class_module.cpp:668 pcbnew/tools/pcbnew_control.cpp:1073
+#: pcbnew/class_module.cpp:679 pcbnew/tools/pcbnew_control.cpp:1086
 msgid "Last Change"
 msgstr "最后修改"
 
-#: pcbnew/class_module.cpp:672
+#: pcbnew/class_module.cpp:683
 msgid "Board Side"
 msgstr "PCB 板面"
 
-#: pcbnew/class_module.cpp:672
+#: pcbnew/class_module.cpp:683
 msgid "Back (Flipped)"
 msgstr "背面(翻转)"
 
-#: pcbnew/class_module.cpp:673
+#: pcbnew/class_module.cpp:684
 #: pcbnew/dialogs/dialog_board_reannotate_base.cpp:174
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:140
 msgid "Front"
 msgstr "正面"
 
-#: pcbnew/class_module.cpp:688
+#: pcbnew/class_module.cpp:699
 msgid "locked"
 msgstr "锁定"
 
-#: pcbnew/class_module.cpp:691
+#: pcbnew/class_module.cpp:702
 msgid "autoplaced"
 msgstr "自动放置"
 
-#: pcbnew/class_module.cpp:694
+#: pcbnew/class_module.cpp:705
 msgid "not in schematic"
 msgstr "不在原理图中"
 
-#: pcbnew/class_module.cpp:697
+#: pcbnew/class_module.cpp:708
 msgid "exclude from pos files"
 msgstr "从 pos 文件中排除"
 
-#: pcbnew/class_module.cpp:700
+#: pcbnew/class_module.cpp:711
 msgid "exclude from BOM"
 msgstr "从 BOM 中排除"
 
-#: pcbnew/class_module.cpp:702
+#: pcbnew/class_module.cpp:713
 msgid "Status: "
 msgstr "状态： "
 
-#: pcbnew/class_module.cpp:702
+#: pcbnew/class_module.cpp:713
 msgid "Attributes: "
 msgstr "属性： "
 
-#: pcbnew/class_module.cpp:709
+#: pcbnew/class_module.cpp:720
 #, c-format
 msgid "3D-Shape: %s"
 msgstr "3D 形状： %s"
 
-#: pcbnew/class_module.cpp:710
+#: pcbnew/class_module.cpp:721
 msgid "none"
 msgstr "无"
 
-#: pcbnew/class_module.cpp:713 pcbnew/tools/pcbnew_control.cpp:1079
+#: pcbnew/class_module.cpp:724 pcbnew/tools/pcbnew_control.cpp:1092
 #, c-format
 msgid "Doc: %s"
 msgstr "文档：%s"
 
-#: pcbnew/class_module.cpp:714
+#: pcbnew/class_module.cpp:725
 #, c-format
 msgid "Keywords: %s"
 msgstr "关键字：%s"
 
-#: pcbnew/class_module.cpp:967
+#: pcbnew/class_module.cpp:978
 msgid "<no reference designator>"
 msgstr "< 无位号 >"
 
-#: pcbnew/class_module.cpp:969
+#: pcbnew/class_module.cpp:980
 #, c-format
-msgid "Footprint %s on %s"
-msgstr "封装 %s 在 %s 层"
+msgid "Footprint %s"
+msgstr "封装 %s"
 
-#: pcbnew/class_module.cpp:1626
+#: pcbnew/class_module.cpp:1646
 #, c-format
 msgid "Processing courtyard of \"%s\": %s"
 msgstr "处理外框 \"%s\"：%s"
 
-#: pcbnew/class_module.cpp:1721
+#: pcbnew/class_module.cpp:1742 pcbnew/class_pad.cpp:1397
 msgid "Local Clearance"
 msgstr "局部间隙"
 
-#: pcbnew/class_module.cpp:1723 pcbnew/class_pad.cpp:1351
+#: pcbnew/class_module.cpp:1745 pcbnew/class_pad.cpp:1374
 msgid "Local Solderpaste Margin"
 msgstr "锡膏间隙"
 
-#: pcbnew/class_module.cpp:1725 pcbnew/class_pad.cpp:1353
+#: pcbnew/class_module.cpp:1748 pcbnew/class_pad.cpp:1377
 msgid "Local Solderpaste Margin Ratio"
 msgstr "局部焊锡边率"
 
-#: pcbnew/class_module.cpp:1727 pcbnew/class_pad.cpp:1355
+#: pcbnew/class_module.cpp:1750
 msgid "Thermal Width"
 msgstr "热宽度"
 
-#: pcbnew/class_module.cpp:1729 pcbnew/class_pad.cpp:1357
+#: pcbnew/class_module.cpp:1753
 msgid "Thermal Gap"
 msgstr "热间距"
 
-#: pcbnew/class_module.h:241
+#: pcbnew/class_module.h:249
 #, c-format
 msgid "footprint %s"
 msgstr "封装 %s"
 
-#: pcbnew/class_pad.cpp:646
+#: pcbnew/class_pad.cpp:629
 #, c-format
 msgid "pad %s"
 msgstr "焊盘 %s"
 
-#: pcbnew/class_pad.cpp:798
+#: pcbnew/class_pad.cpp:741 pcbnew/class_pad.cpp:762 pcbnew/class_pad.cpp:781
+msgid "parent footprint"
+msgstr "父级封装"
+
+#: pcbnew/class_pad.cpp:748 pcbnew/class_pad.cpp:768 pcbnew/class_pad.cpp:787
+msgid "pad"
+msgstr "焊盘"
+
+#: pcbnew/class_pad.cpp:807
 msgid "Pin Name"
 msgstr "引脚名称"
 
-#: pcbnew/class_pad.cpp:822
+#: pcbnew/class_pad.cpp:831
 msgid "BGA"
 msgstr "BGA"
 
-#: pcbnew/class_pad.cpp:823
+#: pcbnew/class_pad.cpp:832
 msgid "Fiducial global"
 msgstr "基准全局"
 
-#: pcbnew/class_pad.cpp:824
+#: pcbnew/class_pad.cpp:833
 msgid "Fiducial local"
 msgstr "基准本地"
 
-#: pcbnew/class_pad.cpp:825
+#: pcbnew/class_pad.cpp:834
 msgid "Test point"
 msgstr "测试点"
 
-#: pcbnew/class_pad.cpp:826
+#: pcbnew/class_pad.cpp:835
 msgid "Heat sink"
 msgstr "散热片"
 
-#: pcbnew/class_pad.cpp:827
+#: pcbnew/class_pad.cpp:836
 msgid "Castellated"
 msgstr "邮票孔"
 
-#: pcbnew/class_pad.cpp:836 pcbnew/class_track.cpp:752
-#: pcbnew/class_track.cpp:1138
+#: pcbnew/class_pad.cpp:845 pcbnew/class_track.cpp:695
+#: pcbnew/class_track.cpp:1088
 msgid "Diameter"
 msgstr "直径"
 
-#: pcbnew/class_pad.cpp:861
+#: pcbnew/class_pad.cpp:870
 msgid "Length in Package"
 msgstr "封装长度"
 
-#: pcbnew/class_pad.cpp:868 pcbnew/class_track.cpp:757
-#: pcbnew/class_track.cpp:1140
+#: pcbnew/class_pad.cpp:877 pcbnew/class_track.cpp:700
+#: pcbnew/class_track.cpp:1090
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:102
 msgid "Drill"
 msgstr "钻孔"
 
-#: pcbnew/class_pad.cpp:875
+#: pcbnew/class_pad.cpp:884
 msgid "Drill X / Y"
 msgstr "钻孔 X / Y"
 
-#: pcbnew/class_pad.cpp:881 pcbnew/class_track.cpp:688
-#: pcbnew/class_track.cpp:761 pcbnew/class_zone.cpp:682
+#: pcbnew/class_pad.cpp:890 pcbnew/class_track.cpp:655
+#: pcbnew/class_track.cpp:704 pcbnew/class_zone.cpp:628
 #, c-format
 msgid "Min Clearance: %s"
 msgstr "最小间距：%s"
 
-#: pcbnew/class_pad.cpp:882 pcbnew/class_track.cpp:689
-#: pcbnew/class_track.cpp:696 pcbnew/class_track.cpp:762
-#: pcbnew/class_track.cpp:768 pcbnew/class_zone.cpp:683
+#: pcbnew/class_pad.cpp:891 pcbnew/class_track.cpp:656
+#: pcbnew/class_track.cpp:663 pcbnew/class_track.cpp:705
+#: pcbnew/class_track.cpp:711 pcbnew/class_zone.cpp:629
 #, c-format
 msgid "(from %s)"
 msgstr "(从 %s)"
 
-#: pcbnew/class_pad.cpp:1030 pcbnew/class_pad.cpp:1331
+#: pcbnew/class_pad.cpp:1039 pcbnew/class_pad.cpp:1340
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:104
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:364
 msgid "Oval"
 msgstr "椭圆"
 
-#: pcbnew/class_pad.cpp:1032
+#: pcbnew/class_pad.cpp:1041
 msgid "Trap"
 msgstr "凹槽"
 
-#: pcbnew/class_pad.cpp:1033
+#: pcbnew/class_pad.cpp:1042
 msgid "Roundrect"
 msgstr "圆角矩形"
 
-#: pcbnew/class_pad.cpp:1034
+#: pcbnew/class_pad.cpp:1043
 msgid "Chamferedrect"
 msgstr "倒角"
 
-#: pcbnew/class_pad.cpp:1035
+#: pcbnew/class_pad.cpp:1044
 msgid "CustomShape"
 msgstr "自定义形状"
 
-#: pcbnew/class_pad.cpp:1045
+#: pcbnew/class_pad.cpp:1054
 msgid "Std"
 msgstr "标准"
 
-#: pcbnew/class_pad.cpp:1046
+#: pcbnew/class_pad.cpp:1055
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:280
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:187
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:40
 msgid "SMD"
 msgstr "贴片"
 
-#: pcbnew/class_pad.cpp:1047
+#: pcbnew/class_pad.cpp:1056
 msgid "Conn"
 msgstr "连接器"
 
-#: pcbnew/class_pad.cpp:1048
+#: pcbnew/class_pad.cpp:1057
 msgid "Not Plated"
 msgstr "非金属化"
 
-#: pcbnew/class_pad.cpp:1058
+#: pcbnew/class_pad.cpp:1067
 #, c-format
 msgid "Pad of %s on %s"
 msgstr "焊盘 %s - %s"
 
-#: pcbnew/class_pad.cpp:1064
+#: pcbnew/class_pad.cpp:1073
 #, c-format
 msgid "Pad %s of %s on %s"
 msgstr "焊盘　%s (%s) - %s"
 
-#: pcbnew/class_pad.cpp:1332
+#: pcbnew/class_pad.cpp:1341
 msgid "Trapezoid"
 msgstr "梯形"
 
-#: pcbnew/class_pad.cpp:1333
-msgid "Rounded Rectangle"
+#: pcbnew/class_pad.cpp:1342 pcbnew/dialogs/dialog_pad_properties_base.cpp:104
+msgid "Rounded rectangle"
 msgstr "圆角矩形"
 
-#: pcbnew/class_pad.cpp:1334
-msgid "Chamfered Rectangle"
+#: pcbnew/class_pad.cpp:1343 pcbnew/dialogs/dialog_pad_properties_base.cpp:104
+msgid "Chamfered rectangle"
 msgstr "倒角矩形"
 
+#: pcbnew/class_pad.cpp:1348 pcbnew/dialogs/dialog_pad_properties_base.cpp:558
+msgid "BGA pad"
+msgstr "BGA 焊盘"
+
+#: pcbnew/class_pad.cpp:1349 pcbnew/dialogs/dialog_pad_properties_base.cpp:558
+msgid "Fiducial, global to board"
+msgstr "基准，全局到板"
+
+#: pcbnew/class_pad.cpp:1350 pcbnew/dialogs/dialog_pad_properties_base.cpp:558
+msgid "Fiducial, local to footprint"
+msgstr "基准，局部到封装"
+
+#: pcbnew/class_pad.cpp:1351 pcbnew/dialogs/dialog_pad_properties_base.cpp:558
+msgid "Test point pad"
+msgstr "测试点焊盘"
+
+#: pcbnew/class_pad.cpp:1352 pcbnew/dialogs/dialog_pad_properties_base.cpp:558
+msgid "Heatsink pad"
+msgstr "散热片焊盘"
+
+#: pcbnew/class_pad.cpp:1353
+msgid "Castellated pad"
+msgstr "邮票孔"
+
 # Die 裸芯片
-#: pcbnew/class_pad.cpp:1347 pcbnew/class_track.cpp:679
+#: pcbnew/class_pad.cpp:1368 pcbnew/class_track.cpp:646
 msgid "Pad To Die Length"
 msgstr "焊盘到裸芯片长度"
 
-#: pcbnew/class_pad.cpp:1349
+#: pcbnew/class_pad.cpp:1371
 msgid "Local Soldermask Margin"
 msgstr "阻焊间隙"
 
-#: pcbnew/class_pad.cpp:1360
+#: pcbnew/class_pad.cpp:1379
+msgid "Thermal Relief Spoke Width"
+msgstr "防散热导线宽度"
+
+#: pcbnew/class_pad.cpp:1382
+msgid "Thermal Relief"
+msgstr "防散热 (花焊盘)"
+
+#: pcbnew/class_pad.cpp:1385
+msgid "Fabrication Property"
+msgstr "制造属性"
+
+#: pcbnew/class_pad.cpp:1388
 msgid "Round Radius Ratio"
 msgstr "圆半径比"
 
-#: pcbnew/class_pcb_group.cpp:267
+#: pcbnew/class_pcb_group.cpp:275
 #, c-format
-msgid "Anonymous group %s with %ld members"
-msgstr "匿名组 %s 有 %ld 个成员"
+msgid "Anonymous Group, %zu members"
+msgstr "匿名组 %zu 成员"
 
-#: pcbnew/class_pcb_group.cpp:270
+#: pcbnew/class_pcb_group.cpp:279
 #, c-format
-msgid "Group \"%s\" with %ld members"
-msgstr "组 \"%s\" 有 %ld 个成员"
+msgid "Group \"%s\", %zu members"
+msgstr "组 \"%s\", %zu 成员"
 
-#: pcbnew/class_pcb_group.cpp:282
+#: pcbnew/class_pcb_group.cpp:293
 msgid "Anonymous"
 msgstr "匿名"
 
-#: pcbnew/class_pcb_group.cpp:284
+#: pcbnew/class_pcb_group.cpp:295
 msgid "Members"
 msgstr "成员"
 
-#: pcbnew/class_pcb_target.cpp:122
-#, c-format
-msgid "Target size %s"
-msgstr "目标尺寸 %s"
+#: pcbnew/class_pcb_text.cpp:113
+msgid "Dimension"
+msgstr "标注"
 
-#: pcbnew/class_pcb_text.cpp:116
+#: pcbnew/class_pcb_text.cpp:115
 msgid "PCB Text"
 msgstr "PCB 文本"
 
-#: pcbnew/class_pcb_text.cpp:220
+#: pcbnew/class_pcb_text.cpp:219
 #, c-format
-msgid "Pcb Text \"%s\" on %s"
-msgstr "电路板上的文字 \"%s\" (%s)"
+msgid "PCB Text '%s' on %s"
+msgstr "电路板上的文本 \"%s\" (%s)"
 
 # 此处需要查证。
 #: pcbnew/class_text_mod.cpp:285
@@ -18823,195 +19341,220 @@ msgstr "显示"
 
 #: pcbnew/class_text_mod.cpp:333
 #, c-format
-msgid "Reference %s"
-msgstr "参考编号 %s"
+msgid "Reference '%s'"
+msgstr "位号 '%s'"
 
 #: pcbnew/class_text_mod.cpp:337
 #, c-format
-msgid "Value %s of %s"
-msgstr "值 %s (%s)"
+msgid "Value '%s' of %s"
+msgstr "值 '%s' (%s)"
 
 #: pcbnew/class_text_mod.cpp:342
 #, c-format
-msgid "Text \"%s\" of %s on %s"
-msgstr "文本 \"%s\" (%s) - %s"
+msgid "Footprint Text '%s' of %s"
+msgstr "封装文本 '%s' (%s)"
+
+#: pcbnew/class_track.cpp:85
+#, c-format
+msgid "Blind/Buried Via %s on %s"
+msgstr "盲孔/埋孔 %s (%s)"
 
 #: pcbnew/class_track.cpp:86
 #, c-format
-msgid "Blind/Buried Via %s %s on %s - %s"
-msgstr "盲孔/埋孔 %s %s 在 %s - %s上"
+msgid "Micro Via %s on %s"
+msgstr "微孔 %s (%s)"
 
-#: pcbnew/class_track.cpp:89
+#: pcbnew/class_track.cpp:87
 #, c-format
-msgid "Micro Via %s %s on %s - %s"
-msgstr "微孔 %s %s 在 %s - %s上"
+msgid "Via %s on %s"
+msgstr "过孔 %s (%s)"
 
-#: pcbnew/class_track.cpp:93
-#, c-format
-msgid "Via %s %s on %s - %s"
-msgstr "过孔 %s %s 在 %s - %s上"
-
-#: pcbnew/class_track.cpp:175
-msgid "removed annulus"
+#: pcbnew/class_track.cpp:143
+msgid "removed annular ring"
 msgstr "移除通孔环"
 
-#: pcbnew/class_track.cpp:682
+#: pcbnew/class_track.cpp:649
 msgid "Full Length"
 msgstr "全长"
 
-#: pcbnew/class_track.cpp:695
+#: pcbnew/class_track.cpp:662
 #, c-format
 msgid "Min Width: %s"
 msgstr "最小宽度：%s"
 
-#: pcbnew/class_track.cpp:719
+#: pcbnew/class_track.cpp:679
 msgid "Blind/Buried Via"
 msgstr "盲孔/埋孔"
 
-#: pcbnew/class_track.cpp:767
+#: pcbnew/class_track.cpp:710
 #, c-format
-msgid "Min Annulus: %s"
-msgstr "最小环面：%s"
+msgid "Min Annular Width: %s"
+msgstr "最小环形宽度：%s"
 
-#: pcbnew/class_track.cpp:808
+#: pcbnew/class_track.cpp:751
 msgid "NetCode"
 msgstr "网络代码"
 
-#: pcbnew/class_track.cpp:933
+#: pcbnew/class_track.cpp:884
 #, c-format
-msgid "Track %s %s on %s, length: %s"
-msgstr "布线 %s %s 在 %s 上， 长度：%s"
+msgid "Track %s on %s, length %s"
+msgstr "布线 %s (%s), 长度：%s"
 
-#: pcbnew/class_track.cpp:1098
+#: pcbnew/class_track.cpp:1048
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
 msgid "Through"
 msgstr "通孔"
 
-#: pcbnew/class_track.cpp:1099
-msgid "Blind/Buried"
-msgstr "盲孔/埋孔"
+#: pcbnew/class_track.cpp:1049
+msgid "Buried_via"
+msgstr "埋孔"
 
-#: pcbnew/class_track.cpp:1100
-msgid "Microvia"
+#: pcbnew/class_track.cpp:1050
+msgid "Micro_via"
 msgstr "微孔"
 
-#: pcbnew/class_track.cpp:1121
+#: pcbnew/class_track.cpp:1071
 msgid "Origin X"
 msgstr "原点 X"
 
-#: pcbnew/class_track.cpp:1124
+#: pcbnew/class_track.cpp:1074
 msgid "Origin Y"
 msgstr "原点 Y"
 
-#: pcbnew/class_track.cpp:1143
+#: pcbnew/class_track.cpp:1093
 msgid "Layer Top"
 msgstr "图层顶部"
 
-#: pcbnew/class_track.cpp:1145
+#: pcbnew/class_track.cpp:1095
 msgid "Layer Bottom"
 msgstr "图层底部"
 
-#: pcbnew/class_track.cpp:1147
+#: pcbnew/class_track.cpp:1097
 msgid "Via Type"
 msgstr "过孔类型"
 
-#: pcbnew/class_zone.cpp:359
-msgid "zone properties"
-msgstr "区域属性"
-
-#: pcbnew/class_zone.cpp:529
+#: pcbnew/class_zone.cpp:332 pcbnew/class_zone.cpp:347
+#: pcbnew/class_zone.cpp:474 pcbnew/class_zone.cpp:769
+#: pcbnew/tools/pcb_inspection_tool.cpp:117
+#: pcbnew/tools/pcb_inspection_tool.cpp:151
+#: pcbnew/tools/pcb_inspection_tool.cpp:169
 msgid "zone"
 msgstr "区域"
 
-#: pcbnew/class_zone.cpp:582
-msgid "Keepout Area"
-msgstr "禁布区"
+#: pcbnew/class_zone.cpp:527
+msgid "Rule Area"
+msgstr "规则区域"
 
-#: pcbnew/class_zone.cpp:584
+#: pcbnew/class_zone.cpp:529
 msgid "Copper Zone"
 msgstr "铜区"
 
-#: pcbnew/class_zone.cpp:586
+#: pcbnew/class_zone.cpp:531
 msgid "Non-copper Zone"
 msgstr "非铜区"
 
-#: pcbnew/class_zone.cpp:591
+#: pcbnew/class_zone.cpp:536
 msgid "Cutout"
 msgstr "挖空"
 
-#: pcbnew/class_zone.cpp:600
+#: pcbnew/class_zone.cpp:545
 msgid "No vias"
 msgstr "无过孔"
 
-#: pcbnew/class_zone.cpp:603
+#: pcbnew/class_zone.cpp:548
 msgid "No tracks"
 msgstr "无布线"
 
-#: pcbnew/class_zone.cpp:606
+#: pcbnew/class_zone.cpp:551
 msgid "No pads"
 msgstr "无焊盘"
 
-#: pcbnew/class_zone.cpp:609
+#: pcbnew/class_zone.cpp:554
 msgid "No copper zones"
 msgstr "无铜区"
 
-#: pcbnew/class_zone.cpp:612
+#: pcbnew/class_zone.cpp:557
 msgid "No footprints"
 msgstr "没有封装"
 
-#: pcbnew/class_zone.cpp:614
-msgid "Keepout"
-msgstr "禁止布线"
+#: pcbnew/class_zone.cpp:560
+msgid "Restrictions"
+msgstr "限制"
 
-#: pcbnew/class_zone.cpp:645 pcbnew/class_zone.cpp:1375
+#: pcbnew/class_zone.cpp:591 pcbnew/class_zone.cpp:1362
 msgid "Priority"
 msgstr "优先"
 
-#: pcbnew/class_zone.cpp:660 pcbnew/class_zone.cpp:914
+#: pcbnew/class_zone.cpp:606 pcbnew/class_zone.cpp:871
 #, c-format
 msgid "%s and %d more"
 msgstr "%s 和 %d 更多"
 
-#: pcbnew/class_zone.cpp:670 pcbnew/dialogs/dialog_copper_zones_base.cpp:144
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
+#: pcbnew/class_zone.cpp:616 pcbnew/dialogs/dialog_copper_zones_base.cpp:144
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:58
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:76
 msgid "Hatched"
 msgstr "阴影线"
 
-#: pcbnew/class_zone.cpp:674
+#: pcbnew/class_zone.cpp:620
 msgid "Fill Mode"
 msgstr "填充模式"
 
-#: pcbnew/class_zone.cpp:677
+#: pcbnew/class_zone.cpp:623
 msgid "Filled Area"
 msgstr "填充区域"
 
-#: pcbnew/class_zone.cpp:689
+#: pcbnew/class_zone.cpp:635
 msgid "HatchBorder Lines"
 msgstr "图案填充边框线"
 
-#: pcbnew/class_zone.cpp:704
+#: pcbnew/class_zone.cpp:654
 msgid "Corner Count"
 msgstr "拐角数"
 
-#: pcbnew/class_zone.cpp:895
+#: pcbnew/class_zone.cpp:852
 msgid "(Cutout)"
 msgstr "(挖空)"
 
-#: pcbnew/class_zone.cpp:898
-msgid "(Keepout)"
-msgstr "(禁布区)"
+#: pcbnew/class_zone.cpp:855
+msgid "(Rule Area)"
+msgstr "（规则区域）"
 
-#: pcbnew/class_zone.cpp:916
+#: pcbnew/class_zone.cpp:873
 #, c-format
 msgid "Zone Outline %s on %s"
 msgstr "在 %s 区域边线 %s 上"
 
-#: pcbnew/class_zone.cpp:1379
-msgid "Min Thickness"
-msgstr "最小线宽"
+#: pcbnew/class_zone.cpp:1353
+msgid "Inherited"
+msgstr "继承"
 
-#: pcbnew/cleanup_item.cpp:47 pcbnew/zone_filler.cpp:119
+#: pcbnew/class_zone.cpp:1355 pcbnew/dialogs/dialog_copper_zones_base.cpp:233
+msgid "Thermal reliefs"
+msgstr "防散热 (花焊盘)"
+
+#: pcbnew/class_zone.cpp:1357 pcbnew/dialogs/dialog_copper_zones_base.cpp:233
+msgid "Reliefs for PTH"
+msgstr "金属化孔 (PTH) 防散热"
+
+#: pcbnew/class_zone.cpp:1371
+msgid "Min Width"
+msgstr "最小宽度"
+
+#: pcbnew/class_zone.cpp:1374
+msgid "Pad Connections"
+msgstr "焊盘连接"
+
+#: pcbnew/class_zone.cpp:1376
+msgid "Thermal Clearance"
+msgstr "花焊盘到覆铜区间隙"
+
+#: pcbnew/class_zone.cpp:1379
+msgid "Thermal Spoke Width"
+msgstr "防散热导线宽度"
+
+#: pcbnew/cleanup_item.cpp:47 pcbnew/tools/drc_tool.cpp:174
+#: pcbnew/zone_filler.cpp:101
 msgid "Checking zone fills..."
 msgstr "检查填充区域..."
 
@@ -19067,13 +19610,13 @@ msgstr "将直线转换为矩形"
 msgid "Unknown cleanup action"
 msgstr "未知的清除操作"
 
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:491
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:697
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:490
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:695
 #, c-format
 msgid "Unable to find edge with an endpoint of (%s, %s)."
 msgstr "无法找到端点为 (%s, %s) 的边。"
 
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:788
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:786
 msgid "No edges found on Edge.Cuts layer."
 msgstr "在电路板边框轮廓层上找不到边框。"
 
@@ -19471,7 +20014,7 @@ msgstr "重新批注："
 
 #: pcbnew/dialogs/dialog_board_reannotate_base.cpp:177
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:140
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:584
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:579
 msgid "Back"
 msgstr "背面"
 
@@ -19573,57 +20116,58 @@ msgstr ""
 msgid "Geographical Reannotation"
 msgstr "位置重新批注"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:45
+#: pcbnew/dialogs/dialog_board_setup.cpp:44
 msgid "Board Setup"
 msgstr "电路板设置"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:45
+#: pcbnew/dialogs/dialog_board_setup.cpp:44
 msgid "Import Settings from Another Board..."
 msgstr "从另一个电路板导入设置..."
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:71
+#: pcbnew/dialogs/dialog_board_setup.cpp:70
 msgid "Board Stackup"
 msgstr "电路板堆叠"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:72
+#: pcbnew/dialogs/dialog_board_setup.cpp:71
 msgid "Board Editor Layers"
 msgstr "电路板板编辑器图层"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:73
+#: pcbnew/dialogs/dialog_board_setup.cpp:72
 msgid "Physical Stackup"
 msgstr "物理堆叠"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:77
+#: pcbnew/dialogs/dialog_board_setup.cpp:76
 msgid "Defaults"
 msgstr "默认"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:78
+#: pcbnew/dialogs/dialog_board_setup.cpp:77
 msgid "Text & Graphics"
 msgstr "文本与图形"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:79 pcbnew/edit_track_width.cpp:207
-#: pcbnew/edit_track_width.cpp:225
+#: pcbnew/dialogs/dialog_board_setup.cpp:78 pcbnew/edit_track_width.cpp:201
+#: pcbnew/edit_track_width.cpp:219
 msgid "Tracks & Vias"
 msgstr "导线和过孔"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:80
+#: pcbnew/dialogs/dialog_board_setup.cpp:79 pcbnew/dialogs/dialog_plot.cpp:946
 msgid "Solder Mask/Paste"
 msgstr "阻焊/锡膏"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:82
+#: pcbnew/dialogs/dialog_board_setup.cpp:81
 msgid "Design Rules"
 msgstr "设计规则"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:83
+#: pcbnew/dialogs/dialog_board_setup.cpp:82
 msgid "Constraints"
 msgstr "约束"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:84 pcbnew/drc/drc.cpp:204
-#: qa/drc_proto/drc.cpp:206
+#: pcbnew/dialogs/dialog_board_setup.cpp:83 pcbnew/tools/drc_tool.cpp:158
+#: pcbnew/tools/pcb_inspection_tool.cpp:198
+#: pcbnew/tools/pcb_inspection_tool.cpp:344
 msgid "Rules"
 msgstr "规则"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:150
+#: pcbnew/dialogs/dialog_board_setup.cpp:149
 #, c-format
 msgid ""
 "Error importing settings from board:\n"
@@ -19632,7 +20176,7 @@ msgstr ""
 "从电路板导入设置错误：\n"
 "无法加载关联项目文件 %s"
 
-#: pcbnew/dialogs/dialog_board_setup.cpp:185 pcbnew/files.cpp:575
+#: pcbnew/dialogs/dialog_board_setup.cpp:188 pcbnew/files.cpp:623
 #, c-format
 msgid ""
 "Error loading board file:\n"
@@ -19876,17 +20420,17 @@ msgstr "电路板统计"
 msgid "No footprint selected"
 msgstr "没有选择封装"
 
-#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:43
+#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:44
 msgid "Update Footprint"
 msgstr "更新封装"
 
-#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:43
-#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:56
-#: pcbnew/dialogs/dialog_netlist.cpp:91 pcbnew/dialogs/dialog_update_pcb.cpp:73
+#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:44
+#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:55
+#: pcbnew/dialogs/dialog_netlist.cpp:88 pcbnew/dialogs/dialog_update_pcb.cpp:73
 msgid "Update PCB"
 msgstr "更新 PCB"
 
-#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:113
+#: pcbnew/dialogs/dialog_cleanup_graphics.cpp:114
 msgid "Graphics cleanup"
 msgstr "图形清理"
 
@@ -19914,7 +20458,7 @@ msgstr "应用变更："
 msgid "Cleanup Graphics"
 msgstr "清理图形"
 
-#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:149
+#: pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp:148
 msgid "Board cleanup"
 msgstr "清理电路板"
 
@@ -19962,6 +20506,10 @@ msgstr "删除在焊盘内同时具有起始位置和结束位置的布线"
 msgid "Cleanup Tracks and Vias"
 msgstr "清除布线和过孔"
 
+#: pcbnew/dialogs/dialog_constraints_reporter_base.h:41
+msgid "Constraints Resolution Report"
+msgstr "约束解析报告"
+
 #: pcbnew/dialogs/dialog_copper_zones.cpp:282
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:163
 #: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:106
@@ -20012,7 +20560,7 @@ msgstr ""
 "仅显示与此模式匹配的网络名称。"
 
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:66
-#: pcbnew/widgets/appearance_controls.cpp:633
+#: pcbnew/widgets/appearance_controls.cpp:826
 msgid "Show all nets"
 msgstr "显示所有网络"
 
@@ -20035,7 +20583,6 @@ msgid "Zone name:"
 msgstr "区域名称："
 
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:107
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:86
 msgid "A unique name for this zone to identify it for DRC"
 msgstr "此区域的唯一名称，用于在 DRC 中对其进行标识"
 
@@ -20062,13 +20609,13 @@ msgstr ""
 "* 如果其优先级相等，则设置 DRC 错误。"
 
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:140
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:68
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:72
 msgid "Outline display:"
 msgstr "轮廓显示："
 
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:144
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:72
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:58
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:76
 msgid "Fully hatched"
 msgstr "完全填充"
 
@@ -20115,14 +20662,6 @@ msgstr ""
 "默认焊盘与覆铜区连接类型。\n"
 "该设置可以通过本地焊盘设置覆盖"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
-msgid "Thermal reliefs"
-msgstr "防散热 (花焊盘)"
-
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:233
-msgid "Reliefs for PTH"
-msgstr "金属化孔 (PTH) 防散热"
-
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:239
 msgid "Thermal clearance:"
 msgstr "花焊盘到覆铜区间隙："
@@ -20141,7 +20680,7 @@ msgstr "防散热 (花焊盘) 连接线的宽度。"
 
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:274
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:105
-#: pcbnew/tools/pcb_actions.cpp:1164
+#: pcbnew/tools/pcb_actions.cpp:1203
 msgid "Fill"
 msgstr "填充"
 
@@ -20212,20 +20751,6 @@ msgstr "删除孤铜："
 msgid "Choose what to do with unconnected copper islands"
 msgstr "选择如何处理未连接的孤铜"
 
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
-#: pcbnew/dialogs/panel_edit_options_base.cpp:100
-#: pcbnew/dialogs/panel_edit_options_base.cpp:114
-#: pcbnew/dialogs/panel_edit_options_base.cpp:128
-msgid "Always"
-msgstr "总是"
-
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
-#: pcbnew/dialogs/panel_edit_options_base.cpp:100
-#: pcbnew/dialogs/panel_edit_options_base.cpp:114
-#: pcbnew/dialogs/panel_edit_options_base.cpp:128
-msgid "Never"
-msgstr "从不"
-
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:349
 msgid "Below area limit"
 msgstr "低于区域限制"
@@ -20418,18 +20943,10 @@ msgid "Vertical center:"
 msgstr "垂直居中："
 
 #: pcbnew/dialogs/dialog_create_array_base.cpp:229
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1165
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1239
 msgid "Radius:"
 msgstr "半径："
 
-#: pcbnew/dialogs/dialog_create_array_base.cpp:241
-#: pcbnew/dialogs/dialog_move_exact.cpp:203
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:120
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:331
-#: pcbnew/dialogs/dialog_position_relative.cpp:161
-msgid "Angle:"
-msgstr "角度："
-
 #: pcbnew/dialogs/dialog_create_array_base.cpp:246
 msgid ""
 "Positive angles represent an anti-clockwise rotation. An angle of 0 will "
@@ -20471,60 +20988,346 @@ msgstr "圆形阵列"
 msgid "Create Array"
 msgstr "创建阵列"
 
-#: pcbnew/dialogs/dialog_drc.cpp:76
+#: pcbnew/dialogs/dialog_dimension_properties.cpp:198
+msgid ""
+"This item was on a non-existing or forbidden layer.\n"
+"It has been moved to the first allowed layer."
+msgstr ""
+"此项目在一个不存在或禁止的层上\n"
+"它以被移动到第一个允许的层。"
+
+#: pcbnew/dialogs/dialog_dimension_properties.cpp:279
+msgid "Change dimension properties"
+msgstr "更改标注属性"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:20
+msgid "Leader Format"
+msgstr "引线格式"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:37
+msgid "Text frame:"
+msgstr "文本框架："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:39
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:47
+msgid "Draw a shape around the leader text"
+msgstr "在引线文本周围绘制形状"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:51
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:74
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:183
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:117
+#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:167
+#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:25
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:83
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:138
+msgid "Layer:"
+msgstr "层："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:67
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:87
+msgid "Dimension Format"
+msgstr "标注格式"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:96
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:102
+msgid "Measured value of this dimension"
+msgstr "该标注的测量值"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:106
+msgid "Override value"
+msgstr "覆盖值"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:107
+msgid ""
+"When checked, the actual measurement is ignored and any value can be entered"
+msgstr "选中后，实际测量值将被忽略，并且可以输入任何值"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:114
+#: pcbnew/dialogs/dialog_export_idf_base.cpp:44
+#: pcbnew/dialogs/dialog_export_step_base.cpp:75
+#: pcbnew/dialogs/dialog_export_vrml_base.cpp:59
+#: pcbnew/dialogs/dialog_plot_base.cpp:369
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:83
+#: pcbnew/import_gfx/dialog_import_gfx_base.cpp:97
+msgid "Units:"
+msgstr "单位："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:116
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:124
+msgid ""
+"Units of this dimension (\"automatic\" to follow the units selected in the "
+"editor)"
+msgstr "此标注的单位(“自动”以遵循编辑器中选择的单位)"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:120
+#: pcbnew/dialogs/dialog_export_idf_base.cpp:102
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:87
+msgid "Mils"
+msgstr "Mils"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:128
+msgid "Prefix:"
+msgstr "前缀："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:130
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:135
+msgid "Text to print before the dimension value"
+msgstr "要在标注值之前打印的文本"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:139
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:110
+msgid "Units format:"
+msgstr "单位格式："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:141
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:149
+msgid "Choose how to display the units"
+msgstr "选择单位的显示方式"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:145
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:114
+msgid "1234"
+msgstr "1234"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:145
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:114
+msgid "1234 mm"
+msgstr "1234 mm"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:145
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:114
+msgid "1234 (mm)"
+msgstr "1234 (mm)"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:153
+msgid "Suffix:"
+msgstr "后缀："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:155
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:160
+msgid "Text to print after the dimension value"
+msgstr "要在标注值之后打印的文本"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:164
+#: pcbnew/dialogs/dialog_gendrill_base.cpp:128
+#: pcbnew/dialogs/dialog_plot_base.cpp:384
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:125
+msgid "Precision:"
+msgstr "精度："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:166
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:174
+msgid "Choose how many digits of precision to display"
+msgstr "选择要显示的精度位数"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:170
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:292
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:163
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:161
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:129
+msgid "0.0"
+msgstr "0.0"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:170
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:129
+msgid "0.00"
+msgstr "0.00"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:170
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:129
+msgid "0.000"
+msgstr "0.000"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:170
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:129
+msgid "0.0000"
+msgstr "0.0000"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:170
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:129
+msgid "0.00000"
+msgstr "0.00000"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:178
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:148
+msgid "Suppress trailing zeroes"
+msgstr "隐藏尾随零"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:179
+msgid ""
+"When checked, \"0.100\" will be shown as \"0.1\" even if the precision "
+"setting is higher"
+msgstr "选中后，即使精度设置更高，\"0.100\" 也会显示为 \"0.1\""
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:210
+msgid "Dimension Text"
+msgstr "标注文本"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:219
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:101
+msgid "Text width"
+msgstr "文本宽度"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:235
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:169
+msgid "Text pos X"
+msgstr "文本位置 X"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:248
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:120
+msgid "Text height"
+msgstr "文本高度"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:261
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:190
+msgid "Text pos Y"
+msgstr "文本位置 Y"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:272
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1262
+#: pcbnew/dialogs/dialog_target_properties_base.cpp:39
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:141
+msgid "Thickness:"
+msgstr "线宽："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:274
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:143
+msgid "Text thickness"
+msgstr "文本线宽"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:287
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:156
+msgid "Text orientation"
+msgstr "文本方向"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:293
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:166
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:162
+msgid "90.0"
+msgstr "90.0"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:294
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:169
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:163
+msgid "-90.0"
+msgstr "-90.0"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:295
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:172
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:164
+msgid "180.0"
+msgstr "180.0"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:301
+msgid "Keep aligned with dimension"
+msgstr "与标注保持对齐"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:302
+msgid "Automatically set the text orientation to match the dimension lines"
+msgstr "自动设置文本方向以匹配标注线"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:307
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:181
+msgid "Mirror text"
+msgstr "镜像文本"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:311
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:131
+msgid "Justification:"
+msgstr "对齐："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:321
+msgid "Position mode:"
+msgstr "位置模式："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:325
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:102
+msgid "Outside"
+msgstr "外部"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:325
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:102
+msgid "Inline"
+msgstr "内联"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:325
+#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:58
+msgid "Manual"
+msgstr "手动"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:329
+msgid "Choose how to position the text relative to the dimension line"
+msgstr "选择文本相对于标注线的定位方式"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:344
+msgid "Dimension Line"
+msgstr "标注线"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:353
+msgid "Thickness of the dimension lines"
+msgstr "标注线的粗细"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:367
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:137
+msgid "Arrow length:"
+msgstr "箭头长度："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:378
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:153
+msgid "Extension line offset:"
+msgstr "尺寸界线偏移："
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:380
+#: pcbnew/dialogs/dialog_dimension_properties_base.cpp:385
+msgid "Gap between the measured points and the start of the extension lines"
+msgstr "测量点与尺寸界线起点之间的间隙"
+
+#: pcbnew/dialogs/dialog_dimension_properties_base.h:120
+msgid "Dimension Properties"
+msgstr "标注属性"
+
+#: pcbnew/dialogs/dialog_drc.cpp:79
 msgid "Run DRC"
 msgstr "运行 DRC"
 
-#: pcbnew/dialogs/dialog_drc.cpp:356
+#: pcbnew/dialogs/dialog_drc.cpp:234
+msgid ""
+"-------- DRC cancelled by user.\n"
+"\n"
+msgstr ""
+"-------- 用户取消的 DRC。\n"
+"\n"
+
+#: pcbnew/dialogs/dialog_drc.cpp:236
+msgid ""
+"Done.\n"
+"\n"
+msgstr ""
+"完成。\n"
+"\n"
+
+#: pcbnew/dialogs/dialog_drc.cpp:405
 msgid "Open the Board Setup... dialog"
 msgstr "打开“电路板设置...”对话框"
 
-#: pcbnew/dialogs/dialog_drc.cpp:660
+#: pcbnew/dialogs/dialog_drc.cpp:748
 msgid "Do you wish to delete excluded markers as well?"
 msgstr "是否也要删除排除的标记？"
 
-#: pcbnew/dialogs/dialog_drc.cpp:663
+#: pcbnew/dialogs/dialog_drc.cpp:751
 msgid "Delete exclusions"
 msgstr "删除排除项"
 
-#: pcbnew/dialogs/dialog_drc.cpp:700
+#: pcbnew/dialogs/dialog_drc.cpp:789
 msgid "not run"
 msgstr "不运行"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:33
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:194
-msgid "Minimum track width:"
-msgstr "最小布线宽度："
+#: pcbnew/dialogs/dialog_drc_base.cpp:25
+msgid "Report all errors for each track"
+msgstr "报告布线的所有错误"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:35 pcbnew/dialogs/dialog_drc_base.cpp:44
-msgid "Enter the minimum acceptable value for a track width"
-msgstr "输入允许的最小布线宽度值"
-
-#: pcbnew/dialogs/dialog_drc_base.cpp:48
-msgid "Minimum via size:"
-msgstr "最小过孔尺寸："
-
-#: pcbnew/dialogs/dialog_drc_base.cpp:50 pcbnew/dialogs/dialog_drc_base.cpp:59
-msgid "Enter the minimum acceptable diameter for a standard via"
-msgstr "输入允许的最小标准过孔直径"
-
-#: pcbnew/dialogs/dialog_drc_base.cpp:63
-msgid "Minimum uVia size:"
-msgstr "最小微孔尺寸："
-
-#: pcbnew/dialogs/dialog_drc_base.cpp:65 pcbnew/dialogs/dialog_drc_base.cpp:74
-msgid "Enter the minimum acceptable diameter for a micro via"
-msgstr "输入允许的最小微孔外径"
-
-#: pcbnew/dialogs/dialog_drc_base.cpp:84
-msgid "Refill all zones before performing DRC"
-msgstr "在执行 DRC 之前重新填充所有覆铜"
-
-#: pcbnew/dialogs/dialog_drc_base.cpp:87
-msgid "Report all errors for tracks (slower)"
-msgstr "报告所有布线错误(较慢)"
-
-#: pcbnew/dialogs/dialog_drc_base.cpp:88
+#: pcbnew/dialogs/dialog_drc_base.cpp:26
 msgid ""
 "If selected, all DRC violations for tracks will be reported.  This can be "
 "slow for complicated designs.\n"
@@ -20537,11 +21340,11 @@ msgstr ""
 "\n"
 "如果未选中，则只会为每个布线连接报告第一个 DRC 违规。"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:92
-msgid "Test tracks against filled copper areas (very slow)"
-msgstr "测试填充铜区域的布线 (非常慢)"
+#: pcbnew/dialogs/dialog_drc_base.cpp:30
+msgid "Test tracks against zone fills (slow)"
+msgstr "针对区域填充的测试布线（慢速）"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:93
+#: pcbnew/dialogs/dialog_drc_base.cpp:31
 msgid ""
 "If selected, tracks will be tested against copper zones. \n"
 "If copper zones are up to date, this test should be not needed.\n"
@@ -20553,67 +21356,75 @@ msgstr ""
 "\n"
 "对于复杂的设计，此测试可能非常慢*。"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:97
-msgid "Test footprints against schematic"
-msgstr "根据原理图测试封装"
+#: pcbnew/dialogs/dialog_drc_base.cpp:41
+msgid "Refill all zones before performing DRC"
+msgstr "在执行 DRC 之前重新填充所有覆铜"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:133
+#: pcbnew/dialogs/dialog_drc_base.cpp:44
+msgid "Test for parity between PCB and schematic"
+msgstr "PCB 和原理图之间的奇偶校验测试"
+
+#: pcbnew/dialogs/dialog_drc_base.cpp:80
+msgid "Tests Running..."
+msgstr "测试正在运行..."
+
+#: pcbnew/dialogs/dialog_drc_base.cpp:108
 #, c-format
-msgid "Violations / Markers (%d)"
-msgstr "违规 / 标记 (%d)"
+msgid "Violations (%d)"
+msgstr "违规 (%d)"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:145
+#: pcbnew/dialogs/dialog_drc_base.cpp:120
 #, c-format
 msgid "Unconnected Items (%d)"
 msgstr "未连接的项目 (%d)"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:157
+#: pcbnew/dialogs/dialog_drc_base.cpp:132
 #, c-format
-msgid "Footprint Warnings (%d)"
-msgstr "封装警告 (%d)"
+msgid "Schematic Parity (%d)"
+msgstr "原理图奇偶校验 (%d)"
 
-#: pcbnew/dialogs/dialog_drc_base.cpp:216
+#: pcbnew/dialogs/dialog_drc_base.cpp:199
 msgid "Delete Marker"
 msgstr "删除标记"
 
-#: pcbnew/dialogs/dialog_drc_base.h:101
+#: pcbnew/dialogs/dialog_drc_base.h:100
 msgid "DRC Control"
 msgstr "DRC 控制"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:292
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:308
 msgid ""
 "Component can be freely moved and auto placed. User can arbitrarily select "
 "and edit component's pads."
 msgstr "元件可以自由移动和自动放置。用户可以任意选择和编辑元件的焊盘。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:294
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:310
 msgid ""
 "Component can be freely moved and auto placed, but its pads cannot be "
 "selected or edited."
 msgstr "元件可以自由移动和自动放置，但其焊盘不能被选择或编辑。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:296
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:312
 msgid "Component is locked: it cannot be freely moved or auto placed."
 msgstr "元件被锁定：它不能被自由移动和自动放置。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:435
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:371
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:451
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:384
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "无效的文件名：%s"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:593
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:562
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:609
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:575
 msgid "Text items must have some content."
 msgstr "文本项必须包含一些内容。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:741
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:696
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:757
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:709
 msgid "Modify module properties"
 msgstr "修改模块属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:793
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:767
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:809
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:780
 msgid "Reference and value are mandatory."
 msgstr "参考和值是强制的。"
 
@@ -20659,26 +21470,6 @@ msgstr "坐标"
 msgid "Side:"
 msgstr "侧面："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:163
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:186
-msgid "0.0"
-msgstr "0.0"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:166
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:187
-msgid "90.0"
-msgstr "90.0"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:169
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:188
-msgid "-90.0"
-msgstr "-90.0"
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:172
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:189
-msgid "180.0"
-msgstr "180.0"
-
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:195
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:135
 msgid "Free"
@@ -20718,7 +21509,7 @@ msgid "Update Footprint from Library..."
 msgstr "从库中更新封装..."
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:252
-#: pcbnew/tools/pcb_actions.cpp:387
+#: pcbnew/tools/pcb_actions.cpp:402
 msgid "Change Footprint..."
 msgstr "修改封装..."
 
@@ -20919,34 +21710,24 @@ msgstr "3D 模型"
 msgid "3D Settings"
 msgstr "3D 设置"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:521
-msgid "Library link:"
-msgstr "库链接："
-
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:529
-msgid ""
-"The library ID and footprint ID currently assigned.  Use “Change Footprint…” "
-"to assign a different footprint."
-msgstr "当前分配的库 ID 和封装 ID。使用“更改封装…”来分配不同的封装。"
-
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h:149
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h:124
 msgid "Footprint Properties"
 msgstr "封装属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:222
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:235
 msgid "Enable hotkey move commands and Auto Placement"
 msgstr "允许快捷键移动和自动布局"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:223
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:236
 msgid "Disable hotkey move commands and Auto Placement"
 msgstr "不允许快捷键移动和自动布局"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:516
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:529
 msgid "Footprint must have a name."
 msgstr "封装必须要有一个名称。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:521
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:534
 #, c-format
 msgid "Footprint name may not contain \"%s\"."
 msgstr "封装名称可能不包含\"%s\"。"
@@ -21044,12 +21825,12 @@ msgstr "从库中更新封装"
 msgid "Change Footprints"
 msgstr "修改封装"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:361
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:374
 #, c-format
 msgid "%s footprint \"%s\" (from \"%s\") to \"%s\""
 msgstr "%s 封装 \"%s\" (从 \"%s\")更改为 \"%s\""
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:371
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:384
 msgid "*** footprint not found ***"
 msgstr "***封装没有找到***"
 
@@ -21082,41 +21863,37 @@ msgstr "库 ID 为 %s 封装："
 msgid "New footprint library id:"
 msgstr "新的封装库 ID："
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:94
-msgid "Update Options"
-msgstr "更新选项"
-
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:96
 msgid "Remove text items which are not in library footprint"
 msgstr "删除不在库封装中的文本项目"
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:97
-msgid "Removes fields that do not occur in the original library symbols"
-msgstr "删除原始库符号中不存在的字段"
-
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:101
-msgid "Reset text layers and visibilities"
-msgstr "重置文本层和可见性"
+#, c-format
+msgid "%s text layers and visibilities"
+msgstr "%s 文本层和可见性"
 
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:104
-msgid "Reset text sizes, styles and positions"
-msgstr "重置文本尺寸，样式和位置"
+#, c-format
+msgid "%s text sizes, styles and positions"
+msgstr "%s 文本尺寸，样式和位置"
 
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:107
-msgid "Reset fabrication attributes"
-msgstr "重置制造属性"
+#, c-format
+msgid "%s fabrication attributes"
+msgstr "%s 制造属性"
 
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:110
-msgid "Reset 3D models"
-msgstr "重置 3D 模型"
+#, c-format
+msgid "%s 3D models"
+msgstr "%s 3D 模型设计"
 
-#: pcbnew/dialogs/dialog_export_idf.cpp:164
+#: pcbnew/dialogs/dialog_export_idf.cpp:161
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:119
 #, c-format
 msgid "File %s already exists."
 msgstr "文件 \"%s\" 已经存在。"
 
-#: pcbnew/dialogs/dialog_export_idf.cpp:226
+#: pcbnew/dialogs/dialog_export_idf.cpp:223
 msgid "Unable to create "
 msgstr "无法创建 "
 
@@ -21139,16 +21916,6 @@ msgstr "网格参考点："
 msgid "Adjust automatically"
 msgstr "自动调整"
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:44
-#: pcbnew/dialogs/dialog_export_step_base.cpp:75
-#: pcbnew/dialogs/dialog_export_vrml_base.cpp:59
-#: pcbnew/dialogs/dialog_plot_base.cpp:347
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:88
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:83
-#: pcbnew/import_gfx/dialog_import_gfx_base.cpp:97
-msgid "Units:"
-msgstr "单位："
-
 #: pcbnew/dialogs/dialog_export_idf_base.cpp:60
 #: pcbnew/dialogs/dialog_export_step_base.cpp:88
 msgid "X position:"
@@ -21159,12 +21926,6 @@ msgstr "X 坐标："
 msgid "Y position:"
 msgstr "Y 坐标："
 
-#: pcbnew/dialogs/dialog_export_idf_base.cpp:102
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:92
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:87
-msgid "Mils"
-msgstr "Mils"
-
 #: pcbnew/dialogs/dialog_export_idf_base.cpp:104
 #: pcbnew/dialogs/dialog_export_vrml_base.cpp:113
 msgid "Output Units:"
@@ -21269,23 +22030,23 @@ msgstr "容差设置被认为连接的两个点之间的距离。  标准是 0.0
 msgid "Export STEP"
 msgstr "导出 STEP"
 
-#: pcbnew/dialogs/dialog_export_svg.cpp:204
+#: pcbnew/dialogs/dialog_export_svg.cpp:203
 #: pcbnew/exporters/gen_footprints_placefile.cpp:192
 msgid "Use a relative path?"
 msgstr "是否使用相对路径？"
 
-#: pcbnew/dialogs/dialog_export_svg.cpp:214
+#: pcbnew/dialogs/dialog_export_svg.cpp:213
 #: pcbnew/exporters/gen_footprints_placefile.cpp:201
 msgid ""
 "Cannot make path relative (target volume different from board file volume)!"
 msgstr "无法使用相对路径（目标卷不同于电路板文件卷）"
 
-#: pcbnew/dialogs/dialog_export_svg.cpp:265
+#: pcbnew/dialogs/dialog_export_svg.cpp:264
 #, c-format
 msgid "Exported \"%s\"."
 msgstr "输出 \"%s\"。"
 
-#: pcbnew/dialogs/dialog_export_svg.cpp:269 pcbnew/dialogs/dialog_plot.cpp:882
+#: pcbnew/dialogs/dialog_export_svg.cpp:268 pcbnew/dialogs/dialog_plot.cpp:901
 #: pcbnew/exporters/gen_footprints_placefile.cpp:293
 #: pcbnew/exporters/gen_footprints_placefile.cpp:429
 #, c-format
@@ -21314,7 +22075,7 @@ msgid "Technical layers:"
 msgstr "工艺层："
 
 #: pcbnew/dialogs/dialog_export_svg_base.cpp:85
-#: pcbnew/dialogs/dialog_plot_base.cpp:229
+#: pcbnew/dialogs/dialog_plot_base.cpp:251
 msgid "Default pen size:"
 msgstr "默认画笔尺寸："
 
@@ -21463,30 +22224,30 @@ msgstr "包含覆铜 (&Z)"
 msgid "Filter Selection"
 msgstr "选择滤波器"
 
-#: pcbnew/dialogs/dialog_find.cpp:221
+#: pcbnew/dialogs/dialog_find.cpp:219
 msgid "Searching..."
 msgstr "搜索中..."
 
-#: pcbnew/dialogs/dialog_find.cpp:302 pcbnew/dialogs/dialog_find.cpp:318
+#: pcbnew/dialogs/dialog_find.cpp:300 pcbnew/dialogs/dialog_find.cpp:316
 msgid "No more item to show"
 msgstr "没有要显示的项目"
 
-#: pcbnew/dialogs/dialog_find.cpp:333
+#: pcbnew/dialogs/dialog_find.cpp:331
 #, c-format
 msgid "\"%s\" found"
 msgstr "找到 \"%s\""
 
-#: pcbnew/dialogs/dialog_find.cpp:336
+#: pcbnew/dialogs/dialog_find.cpp:334
 #, c-format
 msgid "Hit(s): %ld / %lu"
 msgstr "匹配记录： %ld / %lu"
 
-#: pcbnew/dialogs/dialog_find.cpp:344
+#: pcbnew/dialogs/dialog_find.cpp:342
 #, c-format
 msgid "\"%s\" not found"
 msgstr "未找到 \"%s\""
 
-#: pcbnew/dialogs/dialog_find.cpp:347
+#: pcbnew/dialogs/dialog_find.cpp:345
 msgid "No hits"
 msgstr "无匹配记录"
 
@@ -21631,36 +22392,36 @@ msgstr "使用辅助轴为原点"
 msgid "Save the origin coordinates in the file"
 msgstr "设置文件中的网格原点"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:74
+#: pcbnew/dialogs/dialog_gendrill.cpp:72
 msgid "Generate Drill File"
 msgstr "生成钻孔文件"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:75
+#: pcbnew/dialogs/dialog_gendrill.cpp:73
 msgid "Generate Map File"
 msgstr "生成图文件"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:316
+#: pcbnew/dialogs/dialog_gendrill.cpp:304
 msgid "Cannot make path relative (target volume different from file volume)!"
 msgstr "不能进行相对路径（目标卷从文件卷不同）！"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:386
+#: pcbnew/dialogs/dialog_gendrill.cpp:374
 #, c-format
 msgid "Could not write drill and/or map files to folder \"%s\"."
 msgstr "无法将钻孔和/或图文件写入文件夹 \"%s\"。"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:435
+#: pcbnew/dialogs/dialog_gendrill.cpp:423
 msgid "Save Drill Report File"
 msgstr "保存钻孔报告文件"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:461
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:119
-#: pcbnew/exporters/gendrill_file_writer_base.cpp:333
-#: pcbnew/exporters/gendrill_gerber_writer.cpp:105
+#: pcbnew/dialogs/dialog_gendrill.cpp:449
+#: pcbnew/exporters/gendrill_Excellon_writer.cpp:121
+#: pcbnew/exporters/gendrill_file_writer_base.cpp:335
+#: pcbnew/exporters/gendrill_gerber_writer.cpp:107
 #, c-format
 msgid "** Unable to create %s **\n"
 msgstr "** 无法创建  %s **\n"
 
-#: pcbnew/dialogs/dialog_gendrill.cpp:466
+#: pcbnew/dialogs/dialog_gendrill.cpp:454
 #, c-format
 msgid "Report file %s created\n"
 msgstr "生成报告文件 %s\n"
@@ -21800,12 +22561,6 @@ msgstr "零的格式"
 msgid "Choose EXCELLON numbers notation"
 msgstr "选择 EXCELLON 数字符号"
 
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:128
-#: pcbnew/dialogs/dialog_plot_base.cpp:362
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:93
-msgid "Precision:"
-msgstr "精度："
-
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:132
 msgid "Precision"
 msgstr "精度"
@@ -21844,7 +22599,7 @@ msgid "Available:"
 msgstr "可用："
 
 #: pcbnew/dialogs/dialog_get_footprint_by_name_base.h:56
-#: pcbnew/tools/pcb_actions.cpp:219
+#: pcbnew/tools/pcb_actions.cpp:234
 msgid "Get and Move Footprint"
 msgstr "获取和移动封装"
 
@@ -21861,8 +22616,8 @@ msgid "Items to Delete:"
 msgstr "删除项："
 
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:25
-#: pcbnew/tools/pcb_editor_control.cpp:76
-#: pcbnew/widgets/appearance_controls.cpp:288
+#: pcbnew/tools/pcb_editor_control.cpp:77
+#: pcbnew/widgets/appearance_controls.cpp:333
 msgid "Zones"
 msgstr "覆铜"
 
@@ -21871,6 +22626,7 @@ msgid "Board outlines"
 msgstr "电路板边框"
 
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:34
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:723
 msgid "Drawings"
 msgstr "图形"
 
@@ -21911,6 +22667,7 @@ msgid "Unlocked footprints"
 msgstr "解锁封装"
 
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:82
+#: pcbnew/widgets/appearance_controls.cpp:662
 msgid "All layers"
 msgstr "所有层"
 
@@ -22030,16 +22787,8 @@ msgstr "活动"
 msgid "Set to specified values:"
 msgstr "设置为指定值："
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:117
-#: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:167
-#: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:25
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:108
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:138
-msgid "Layer:"
-msgstr "层："
-
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:199
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:226
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:201
 msgid "Keep upright"
 msgstr "禁止倒置"
 
@@ -22047,10 +22796,6 @@ msgstr "禁止倒置"
 msgid "Set to layer default values:"
 msgstr "设置为图层默认值："
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:270
-msgid "Some items failed DRC and were not modified."
-msgstr "有些项目 DRC 失败，未被修改。"
-
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:39
 msgid "Filter Items"
 msgstr "项目筛选"
@@ -22202,70 +22947,26 @@ msgstr "图形项属性"
 msgid "Deselect All"
 msgstr "取消所有"
 
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:48
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:51
 msgid "Layers setup"
 msgstr "层设置"
 
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:51
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:54
 msgid "Text and graphics default properties"
 msgstr "文本与图形默认属性"
 
-#: pcbnew/dialogs/dialog_import_settings_base.cpp:54
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:57
 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:60
+msgid "Predefined track and via dimensions"
+msgstr "预定义的布线和通孔标注"
+
+#: pcbnew/dialogs/dialog_import_settings_base.cpp:63
 msgid "Solder mask/paste defaults"
 msgstr "阻焊/锡膏默认值"
 
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:157
-msgid "Tracks, vias, and pads are allowed. The keepout will have no effect."
-msgstr "允许导线，过孔和焊盘，该禁布区无效。"
-
-#: pcbnew/dialogs/dialog_keepout_area_properties.cpp:163
-msgid "No layers selected."
-msgstr "没有选择层。"
-
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:25
-msgid "Layers:"
-msgstr "层："
-
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:38
-msgid "Keep out tracks"
-msgstr "禁止布线"
-
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:41
-msgid "Keep out vias"
-msgstr "禁止过孔"
-
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:44
-msgid "Keep out pads"
-msgstr "保留焊盘"
-
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:47
-msgid "Keep out copper pours"
-msgstr "禁止覆铜"
-
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:53
-msgid "Keep out footprints"
-msgstr "保留封装"
-
-#: pcbnew/dialogs/dialog_keepout_area_properties_base.cpp:59
-msgid "Constrain outline to H, V and 45 deg"
-msgstr "限制轮廓线方向水平，垂直或 45 度"
-
-#: 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 "禁布区属性"
-
 #: pcbnew/dialogs/dialog_layer_selection_base.cpp:120
 msgid "Top/Front layer:"
 msgstr "顶层："
@@ -22275,6 +22976,7 @@ msgid "Bottom/Back layer:"
 msgstr "底层："
 
 #: pcbnew/dialogs/dialog_layer_selection_base.h:50
+#: pcbnew/dialogs/panel_setup_layers.cpp:866
 msgid "Select Layer"
 msgstr "选择层"
 
@@ -22334,50 +23036,42 @@ msgstr "使用极坐标"
 msgid "Move Item"
 msgstr "移动项目"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:92
+#: pcbnew/dialogs/dialog_netlist.cpp:89
 msgid "Rebuild Ratsnest"
 msgstr "重建飞线"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:138
+#: pcbnew/dialogs/dialog_netlist.cpp:135
 msgid "Select Netlist"
 msgstr "选择网表"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:155
+#: pcbnew/dialogs/dialog_netlist.cpp:152
 msgid "Please, choose a valid netlist file."
 msgstr "请选择一个有效的网表文件。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:161 pcbnew/dialogs/dialog_netlist.cpp:228
+#: pcbnew/dialogs/dialog_netlist.cpp:158 pcbnew/dialogs/dialog_netlist.cpp:198
 msgid "The netlist file does not exist."
 msgstr "网表文件不存在。"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:166
+#: pcbnew/dialogs/dialog_netlist.cpp:163
 msgid ""
 "The changes made cannot be undone.  Are you sure you want to update the PCB?"
 msgstr "所做的更改不能撤销。你确定要更新 PCB 吗？"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:169
+#: pcbnew/dialogs/dialog_netlist.cpp:166
 #: pcbnew/dialogs/dialog_update_pcb.cpp:145
 msgid "Changes Applied To PCB"
 msgstr "更改应用于 PCB"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:181
-msgid "No footprints."
-msgstr "没有封装。"
-
-#: pcbnew/dialogs/dialog_netlist.cpp:192
-msgid "Check footprints"
-msgstr "检查封装"
-
-#: pcbnew/dialogs/dialog_netlist.cpp:277
+#: pcbnew/dialogs/dialog_netlist.cpp:241
 #, c-format
 msgid "Reading netlist file \"%s\".\n"
 msgstr "读取网表文件 \"%s\"\n"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:281
+#: pcbnew/dialogs/dialog_netlist.cpp:245
 msgid "Using reference designators to match components and footprints.\n"
 msgstr "使用位号来匹配元件和封装。\n"
 
-#: pcbnew/dialogs/dialog_netlist.cpp:283
+#: pcbnew/dialogs/dialog_netlist.cpp:247
 msgid "Using tstamps (unique IDs) to match components and footprints.\n"
 msgstr "使用时间戳（唯一ID） 来匹配元件和封装。\n"
 
@@ -22436,15 +23130,7 @@ msgstr ""
 "如果封装外形中的焊盘未出现在网表中，则显示警告。\n"
 "只测试铜层上有名称的焊盘。"
 
-#: pcbnew/dialogs/dialog_netlist_base.cpp:89
-msgid "Test Footprints"
-msgstr "封装测试"
-
-#: pcbnew/dialogs/dialog_netlist_base.cpp:90
-msgid "Read the current netlist file and list missing and extra footprints"
-msgstr "读取当前的网表文件并列出丢失和额外的封装"
-
-#: pcbnew/dialogs/dialog_netlist_base.h:79
+#: pcbnew/dialogs/dialog_netlist_base.h:72
 msgid "Import Netlist"
 msgstr "导入网表"
 
@@ -22504,121 +23190,126 @@ msgstr "选择一个角落后添加新的拐角。"
 msgid "Select a corner to delete."
 msgstr "选择要删除的拐角。"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:479
+#: pcbnew/dialogs/dialog_pad_properties.cpp:468
+#: pcbnew/dialogs/dialog_text_properties.cpp:261
 #, c-format
-msgid "Footprint %s (%s),"
-msgstr "封装 %s(%s),"
+msgid "Footprint %s (%s), %s, rotated %.1f deg"
+msgstr "封装 %s (%s), %s, 旋转 %.1f°"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:482
-#, c-format
-msgid "%s, rotated %.1f deg"
-msgstr "%s，旋转 %.1f 度"
-
-#: pcbnew/dialogs/dialog_pad_properties.cpp:483
-#: pcbnew/dialogs/dialog_text_properties.cpp:445
+#: pcbnew/dialogs/dialog_pad_properties.cpp:471
+#: pcbnew/dialogs/dialog_text_properties.cpp:264
 msgid "back side (mirrored)"
 msgstr "背面(镜像)"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:484
-#: pcbnew/dialogs/dialog_text_properties.cpp:445
+#: pcbnew/dialogs/dialog_pad_properties.cpp:472
+#: pcbnew/dialogs/dialog_text_properties.cpp:264
 msgid "front side"
 msgstr "正面"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:714
+#: pcbnew/dialogs/dialog_pad_properties.cpp:702
 msgid "width "
 msgstr "宽度 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:720
-#: pcbnew/dialogs/dialog_pad_properties.cpp:726
+#: pcbnew/dialogs/dialog_pad_properties.cpp:708
+#: pcbnew/dialogs/dialog_pad_properties.cpp:714
 msgid "from "
 msgstr "来自 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:721
-#: pcbnew/dialogs/dialog_pad_properties.cpp:727
+#: pcbnew/dialogs/dialog_pad_properties.cpp:709
+#: pcbnew/dialogs/dialog_pad_properties.cpp:715
 msgid "to "
 msgstr "到 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:732
+#: pcbnew/dialogs/dialog_pad_properties.cpp:720
 msgid "center "
 msgstr "中心 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:733
+#: pcbnew/dialogs/dialog_pad_properties.cpp:721
 msgid "start "
 msgstr "开始 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:734
+#: pcbnew/dialogs/dialog_pad_properties.cpp:722
 msgid "angle "
 msgstr "角度 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:739
+#: pcbnew/dialogs/dialog_pad_properties.cpp:727
 msgid "ring"
 msgstr "环"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:741
+#: pcbnew/dialogs/dialog_pad_properties.cpp:729
 msgid "circle"
 msgstr "圆圈"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:744
+#: pcbnew/dialogs/dialog_pad_properties.cpp:732
 msgid "radius "
 msgstr "半径 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:749
+#: pcbnew/dialogs/dialog_pad_properties.cpp:737
 #, c-format
 msgid "corners count %d"
 msgstr "拐角计数 %d"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:922
+#: pcbnew/dialogs/dialog_pad_properties.cpp:906
+msgid "All copper layers"
+msgstr "所有铜层"
+
+#: pcbnew/dialogs/dialog_pad_properties.cpp:907
 #, c-format
 msgid "%s, %s and connected layers"
 msgstr "%s, %s 和连接的图层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:925
+#: pcbnew/dialogs/dialog_pad_properties.cpp:910
 msgid "Connected layers only"
 msgstr "仅连接层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1149
+#: pcbnew/dialogs/dialog_pad_properties.cpp:915
+#, c-format
+msgid "%s and %s"
+msgstr "%s 和 %s"
+
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1170
 msgid "Pad size must be greater than zero"
 msgstr "焊盘尺寸必须大于 0"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1155
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1176
 msgid "Incorrect value for pad drill: pad drill bigger than pad size"
 msgstr "钻孔值不正确: 钻孔尺寸超过了焊盘尺寸"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1162
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1183
 msgid "Pad local clearance must be zero or greater than zero"
 msgstr "焊盘局部间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1173
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1194
 msgid "Pad local solder mask clearance must be zero or greater than zero"
 msgstr "焊盘局部阻焊间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1181
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1202
 #, c-format
 msgid "Pad local solder mask clearance must be greater than %s"
 msgstr "焊盘局部阻焊间隙必须大于 %s"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1196
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1217
 msgid "Error: pad has no layer"
 msgstr "错误：焊盘没有层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1204
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1225
 msgid ""
 "Error: plated through holes must have a copper pad on at least one layer"
 msgstr "错误：电镀通孔必须至少有一层铜焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1220
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1241
 msgid "Incorrect value for pad offset"
 msgstr "焊盘偏移数值不正确"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1225
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1246
 msgid "Too large value for pad delta size"
 msgstr "焊盘增量尺寸值太大"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1233
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1254
 msgid "Error: Through hole pad: drill diameter set to 0"
 msgstr "错误：通孔焊盘：钻孔直径设置为 0"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1238
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1259
 msgid ""
 "Error: Connector pads are not on the solder paste layer\n"
 "Use SMD pads instead"
@@ -22626,61 +23317,61 @@ msgstr ""
 "错误：焊盘连接不是在锡膏层\n"
 "使用贴片焊盘替代"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1248
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1269
 msgid "Error: only one external copper layer allowed for SMD or Connector pads"
 msgstr "错误：允许贴片或连接焊盘只有一个外部铜层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1255
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1276
 msgid "Property cannot be set for NPTH"
 msgstr "无法为非金属化孔设置属性"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1259
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1280
 msgid "Castellated property can be set only for PTH"
 msgstr "只能为金属化孔设置邮票孔属性"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1263
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1284
 msgid "BGA property can be set only for SMD pads"
 msgstr "BGA 属性只能为贴片焊盘设置"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1273
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1294
 msgid "Incorrect corner size value"
 msgstr "不正确的拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1277
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1298
 msgid "Incorrect (negative) corner size value"
 msgstr "不正确的（负）拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1279
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1300
 msgid "Corner size value must be smaller than 50%"
 msgstr "转角值必须小于 50%"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1290
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1311
 msgid "Incorrect pad shape: the shape must be equivalent to only one polygon"
 msgstr "错误的焊盘形状：该形状必须相当于只有一个多边形"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1296
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1317
 msgid "Pad setup errors list"
 msgstr "焊盘设置错误列表"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1526
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1547
 msgid "Modify pad"
 msgstr "修改焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1905
-#: pcbnew/dialogs/dialog_pad_properties.cpp:2043
-#: pcbnew/dialogs/dialog_pad_properties.cpp:2077
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1937
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2075
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2109
 msgid "No shape selected"
 msgstr "未选择形状"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1995
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2027
 msgid "Ring/Circle"
 msgstr "圆"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1997
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2029
 msgid "Shape type:"
 msgstr "形状类型："
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1997
+#: pcbnew/dialogs/dialog_pad_properties.cpp:2029
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:810
 msgid "Add Primitive"
 msgstr "添加图元"
@@ -22710,8 +23401,8 @@ msgid "Pad number:"
 msgstr "焊盘编号："
 
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:53
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:841
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:895
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:842
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:896
 msgid "Net name:"
 msgstr "网络名称："
 
@@ -22732,14 +23423,6 @@ msgstr "矩形"
 msgid "Trapezoidal"
 msgstr "梯形"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:104
-msgid "Rounded rectangle"
-msgstr "圆角矩形"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:104
-msgid "Chamfered rectangle"
-msgstr "倒角矩形"
-
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:104
 msgid "Chamfered with other corners rounded"
 msgstr "倒角，其他角为圆角"
@@ -22845,10 +23528,6 @@ msgstr "焊盘尺寸 X："
 msgid "90"
 msgstr "90"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:339
-msgid "180"
-msgstr "180"
-
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:360
 msgid "Hole shape:"
 msgstr "钻孔形状："
@@ -22940,26 +23619,6 @@ msgstr ""
 "蜂窝状指定板边缘上蜂窝状的过孔焊盘\n"
 "此属性在 Gerber X2 文件中指定。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
-msgid "BGA pad"
-msgstr "BGA 焊盘"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
-msgid "Fiducial, local to footprint"
-msgstr "基准，局部到封装"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
-msgid "Fiducial, global to board"
-msgstr "基准，全局到板"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
-msgid "Test Point Pad"
-msgstr "测试点焊盘"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
-msgid "Heatsink pad"
-msgstr "散热片焊盘"
-
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:558
 msgid "Castellated pad (through hole only)"
 msgstr "邮票孔（仅限通孔）"
@@ -23068,85 +23727,67 @@ msgstr "删除图元"
 msgid "Custom Shape Primitives"
 msgstr "自定义形状"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:852
-msgid "Footprint name"
-msgstr "封装名称"
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:968
+msgid "Footprint R1 (300K), back side (mirrored), rotated 180.0º"
+msgstr "封装 R1 (300K)，背面 (镜像)，旋转 180.0º"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:858
-msgid "side and rotation"
-msgstr "侧面和旋转"
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:977
+msgid "Preview pad in sketch mode"
+msgstr "在草图模式下预览焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:878
-msgid "Board View"
-msgstr "电路板视图"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:896
-msgid "Stackup View"
-msgstr "堆叠视图"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:900
-msgid "Show pad in outline mode"
-msgstr "在轮廓模式下显示焊盘"
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1061
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1135
 msgid "Start point"
 msgstr "起始点"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1087
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1161
 msgid "Control point 1"
 msgstr "控制点 1"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1113
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1187
 msgid "Control point 2"
 msgstr "控制点 2"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1139
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1213
 msgid "End point"
 msgstr "结束点"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1188
-#: pcbnew/dialogs/dialog_target_properties_base.cpp:39
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:166
-msgid "Thickness:"
-msgstr "线宽："
-
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1208
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1282
 msgid "Set thickness to 0 for a filled circle."
 msgstr "设置线宽为 0 时，填充圆。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1252
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1326
 msgid "Move vector"
 msgstr "移动矢量"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1301
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1375
 msgid "Scaling factor:"
 msgstr "比例因子："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1323
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1397
 msgid "Duplicate:"
 msgstr "重复："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1432
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1506
 msgid "Outline thickness:"
 msgstr "轮廓线宽："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1494
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1568
 msgid "Coordinates are relative to anchor pad, rotated 0.0 deg."
 msgstr "坐标相对于锚焊盘，旋转 0.0 度。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1500
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1574
 msgid "Set thickness to 0 for a filled polygon."
 msgstr "设置线宽为 0 时，填充多边形。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:254
+#: pcbnew/dialogs/dialog_pad_properties_base.h:264
 msgid "Pad Properties"
 msgstr "焊盘属性"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:343
+#: pcbnew/dialogs/dialog_pad_properties_base.h:353
 msgid "Pad Custom Shape Geometry Transform"
 msgstr "焊盘自定义形状几何变换"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:383
+#: pcbnew/dialogs/dialog_pad_properties_base.h:393
 msgid "Basic Shape Polygon"
 msgstr "基本形状多边形"
 
@@ -23154,38 +23795,38 @@ msgstr "基本形状多边形"
 msgid "Generate Drill Files..."
 msgstr "生成钻孔文件..."
 
-#: pcbnew/dialogs/dialog_plot.cpp:646
+#: pcbnew/dialogs/dialog_plot.cpp:665
 msgid "HPGL pen size constrained."
 msgstr "HPGL 画笔尺寸限制。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:662
+#: pcbnew/dialogs/dialog_plot.cpp:681
 msgid "X scale constrained."
 msgstr "X 比例限制。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:674
+#: pcbnew/dialogs/dialog_plot.cpp:693
 msgid "Y scale constrained."
 msgstr "Y 比例限制。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:690
+#: pcbnew/dialogs/dialog_plot.cpp:709
 #, c-format
 msgid ""
 "Width correction constrained. The reasonable width correction value must be "
 "in a range of  [%s; %s] (%s) for current design rules."
 msgstr "宽度校正限制。目前的设计规则合理的宽度修正值必须在范围 [%s; %s] (%s)。"
 
-#: pcbnew/dialogs/dialog_plot.cpp:770
+#: pcbnew/dialogs/dialog_plot.cpp:789
 msgid "No layer selected, Nothing to plot"
 msgstr "没有图层选择，没有绘制"
 
-#: pcbnew/dialogs/dialog_plot.cpp:826
+#: pcbnew/dialogs/dialog_plot.cpp:845
 msgid "Warning: Scale option set to a very small value"
 msgstr "警告：缩放选项设置为一个很小的值"
 
-#: pcbnew/dialogs/dialog_plot.cpp:829
+#: pcbnew/dialogs/dialog_plot.cpp:848
 msgid "Warning: Scale option set to a very large value"
 msgstr "警告：缩放选项设置为一个非常大的值"
 
-#: pcbnew/dialogs/dialog_plot.cpp:877
+#: pcbnew/dialogs/dialog_plot.cpp:896
 #, c-format
 msgid "Plot file \"%s\" created."
 msgstr "创建绘制文件 \"%s\"。"
@@ -23295,28 +23936,30 @@ msgstr "负片绘制"
 msgid "Check zone fills before plotting"
 msgstr "在绘制之前检查填充区域"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:168
+#: pcbnew/dialogs/dialog_plot_base.cpp:171
 msgid ""
-"Global solder mask min width and/or margin are not set to 0\n"
-"Most of board houses expect a 0 value and use their constraints, especially "
-"for solder mask min width.\n"
-"Please ensure the  solder mask min width (and margin value) are valid\n"
-"Use non 0 values only when required."
-msgstr ""
-"全局阻焊层的最小宽度和/或边距未设置为 0\n"
-"大多数电路板厂期望值为 0 并使用其约束，特别是对于最小宽度的阻焊层。\n"
-"请确保阻焊层的最小宽度和边距值有效\n"
-"并仅在需要时使用非 0 值。"
+"Global solder mask min width and/or margin are not set to 0.  Most board "
+"houses"
+msgstr "全局阻焊层的最小宽度和/或边距未设置为 0。  大多数电路板厂"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:175
+#: pcbnew/dialogs/dialog_plot_base.cpp:178
+msgid ""
+"expect 0 and use their constraints, especially for solder mask min width."
+msgstr "预期为 0，并使用它们的约束，特别是对于阻焊层最小宽度。"
+
+#: pcbnew/dialogs/dialog_plot_base.cpp:185
+msgid "Board setup"
+msgstr "电路板设置"
+
+#: pcbnew/dialogs/dialog_plot_base.cpp:197
 msgid "Gerber Options"
 msgstr "Gerber 选项"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:182
+#: pcbnew/dialogs/dialog_plot_base.cpp:204
 msgid "Use Protel filename extensions"
 msgstr "使用 Protel 文件扩展名"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:183
+#: pcbnew/dialogs/dialog_plot_base.cpp:205
 msgid ""
 "Use Protel Gerber extensions (.GBL, .GTL, etc...)\n"
 "No longer recommended. The official extension is .gbr"
@@ -23324,11 +23967,11 @@ msgstr ""
 "使用 Protel Gerber 扩展 (.GBL，.GTL等...）\n"
 "不再推荐, 官方扩展名是 .gbr"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:188
+#: pcbnew/dialogs/dialog_plot_base.cpp:210
 msgid "Generate Gerber job file"
 msgstr "生成 Gerber 工作文件"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:190
+#: pcbnew/dialogs/dialog_plot_base.cpp:212
 msgid ""
 "Generate a Gerber job file that contains info about the board,\n"
 "and the list of generated Gerber plot files"
@@ -23336,27 +23979,27 @@ msgstr ""
 "生成一个 Gerber 工作文件，其中包含有关该板的信息，\n"
 "和生成的 Gerber 绘制文件列表"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:195
+#: pcbnew/dialogs/dialog_plot_base.cpp:217
 msgid "Remove silkscreen from areas without soldermask"
 msgstr "在没有阻焊的区域移除丝印"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:199
+#: pcbnew/dialogs/dialog_plot_base.cpp:221
 msgid "Coordinate format:"
 msgstr "坐标格式："
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:203
+#: pcbnew/dialogs/dialog_plot_base.cpp:225
 msgid "4.5, unit mm"
 msgstr "4.5，单位 mm"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:203
+#: pcbnew/dialogs/dialog_plot_base.cpp:225
 msgid "4.6, unit mm"
 msgstr "4.6，单位 mm"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:209
+#: pcbnew/dialogs/dialog_plot_base.cpp:231
 msgid "Use extended X2 format"
 msgstr "使用扩展的X2格式"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:210
+#: pcbnew/dialogs/dialog_plot_base.cpp:232
 msgid ""
 "Use X2 Gerber file format.\n"
 "Include  mainly X2 attributes in Gerber headers.\n"
@@ -23368,11 +24011,11 @@ msgstr ""
 "如果未选中，请使用 X1 格式。\n"
 "在 X1 格式中，这些属性作为注释包含在文件中。"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:214
+#: pcbnew/dialogs/dialog_plot_base.cpp:236
 msgid "Include netlist attributes"
 msgstr "包括网络属性"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:215
+#: pcbnew/dialogs/dialog_plot_base.cpp:237
 msgid ""
 "Include netlist metadata and aperture attributes in Gerber files.\n"
 "In X1 format, they are comments.\n"
@@ -23382,31 +24025,31 @@ msgstr ""
 "在 X1 格式中，它们是注释。\n"
 "用于检查 CAM 工具和 Gerber 查看器中的连接。"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:246
+#: pcbnew/dialogs/dialog_plot_base.cpp:268
 msgid "Postscript Options"
 msgstr "Postscript 选项"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:256
+#: pcbnew/dialogs/dialog_plot_base.cpp:278
 msgid "X scale factor:"
 msgstr "X 比例因子："
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:261
+#: pcbnew/dialogs/dialog_plot_base.cpp:283
 msgid "Set global X scale adjust for exact scale postscript output."
 msgstr "设置精确比例 postscript 输出的全局 X 比例调整."
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:268
+#: pcbnew/dialogs/dialog_plot_base.cpp:290
 msgid "Y scale factor:"
 msgstr "Y 比例因子："
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:273
+#: pcbnew/dialogs/dialog_plot_base.cpp:295
 msgid "Set global Y scale adjust for exact scale postscript output."
 msgstr "设置精确比例 postscript 输出的全局 Y 比例调整."
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:280
+#: pcbnew/dialogs/dialog_plot_base.cpp:302
 msgid "Track width correction:"
 msgstr "布线宽度修正："
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:285
+#: pcbnew/dialogs/dialog_plot_base.cpp:307
 msgid ""
 "Set global width correction for exact width postscript output.\n"
 "These width correction is intended to compensate tracks width and also pads "
@@ -23419,27 +24062,27 @@ msgstr ""
 "合理的宽度修正值必须在以下范围内[ - （最小布线宽度-1）+（最小间隙-1）]（0.1 "
 "mil 单位）。"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:296
+#: pcbnew/dialogs/dialog_plot_base.cpp:318
 msgid "Force A4 output"
 msgstr "强制 A4 输出"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:302
+#: pcbnew/dialogs/dialog_plot_base.cpp:324
 msgid "DXF Options"
 msgstr "DXF 选项"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:307
+#: pcbnew/dialogs/dialog_plot_base.cpp:329
 msgid "Plot graphic items using their contours"
 msgstr "使用轮廓绘制图形项目"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:309
+#: pcbnew/dialogs/dialog_plot_base.cpp:331
 msgid "Uncheck to plot graphic items using their center lines"
 msgstr "取消选中以使用图形项目的中心线绘制图形项"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:313
+#: pcbnew/dialogs/dialog_plot_base.cpp:335
 msgid "Use Pcbnew font to plot texts"
 msgstr "使用 Pcbnew 字体绘制文本"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:314
+#: pcbnew/dialogs/dialog_plot_base.cpp:336
 msgid ""
 "Check to use Pcbnew stroke font\n"
 "Uncheck to plot oneline ASCII texts as editable text (using DXF font)"
@@ -23447,23 +24090,23 @@ msgstr ""
 "检查并使用 Pcbnew 笔画字体\n"
 "取消选中将单列 ASCII 文本绘制为可编辑文本(使用 DXF 字体)"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:327
+#: pcbnew/dialogs/dialog_plot_base.cpp:349
 msgid "Export units:"
 msgstr "导出单位："
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:335
+#: pcbnew/dialogs/dialog_plot_base.cpp:357
 msgid "The units to use for the exported DXF file"
 msgstr "用于导出的 DXF 文件的单位"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:345
+#: pcbnew/dialogs/dialog_plot_base.cpp:367
 msgid "SVG Options"
 msgstr "SVG 选项"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:351
+#: pcbnew/dialogs/dialog_plot_base.cpp:373
 msgid "Millimeter"
 msgstr "毫米"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:355
+#: pcbnew/dialogs/dialog_plot_base.cpp:377
 msgid ""
 "The units that are used for a SVG user units.\n"
 "Choose Millimeter when you are not sure."
@@ -23471,7 +24114,7 @@ msgstr ""
 "用于 SVG 用户单位的单位。\n"
 "不确定时选择毫米。"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:367
+#: pcbnew/dialogs/dialog_plot_base.cpp:389
 msgid ""
 "How big a SVG user unit is.\n"
 "The number defines how many digits are exported that are below 1 mm or 1 "
@@ -23484,32 +24127,32 @@ msgstr ""
 "用户单位为 10^-<N> 毫米或 10^-<N> 英寸。\n"
 "如果您不确定，请选择 6。"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:393
+#: pcbnew/dialogs/dialog_plot_base.cpp:415
 msgid "Run DRC..."
 msgstr "运行 DRC..."
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:396
+#: pcbnew/dialogs/dialog_plot_base.cpp:418
 #, c-format
 msgid "(%d known DRC violations; %d exclusions)"
 msgstr "（%d 个已知的 DRC 违规；%d 个排除）"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:419
+#: pcbnew/dialogs/dialog_plot_base.cpp:441
 msgid "Select Fab Layers"
 msgstr "选择制造层"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:423
+#: pcbnew/dialogs/dialog_plot_base.cpp:445
 msgid "Select all Copper Layers"
 msgstr "全选所有铜层"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:427
+#: pcbnew/dialogs/dialog_plot_base.cpp:449
 msgid "Deselect all Copper Layers"
 msgstr "取消选择铜层"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:431
+#: pcbnew/dialogs/dialog_plot_base.cpp:453
 msgid "Select all Layers"
 msgstr "全选所有层"
 
-#: pcbnew/dialogs/dialog_plot_base.cpp:435
+#: pcbnew/dialogs/dialog_plot_base.cpp:457
 msgid "Deselect all Layers"
 msgstr "取消全选所有层"
 
@@ -23531,7 +24174,7 @@ msgstr "过孔间距与线路间距相同"
 
 #: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h:60
 msgid "Differential Pair Dimensions"
-msgstr "差分对尺寸"
+msgstr "差分对标注"
 
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp:79
 msgid "Single Track Length Tuning"
@@ -23569,10 +24212,6 @@ msgstr "约束："
 msgid "From Design Rules"
 msgstr "来自设计规则"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:58
-msgid "Manual"
-msgstr "手动"
-
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:69
 msgid "Target length:"
 msgstr "目标长度："
@@ -23825,8 +24464,8 @@ msgid "Position Relative To Reference Item"
 msgstr "相対于参考项目的位置"
 
 #: pcbnew/dialogs/dialog_print_pcbnew.cpp:201
-msgid "Print according to Items tab of Layers Manager"
-msgstr "根据“图层管理器”的“项目”选项卡进行打印"
+msgid "Print according to objects tab of appearance manager"
+msgstr "根据“外观管理器”的“对象”选项卡进行打印"
 
 #: pcbnew/dialogs/dialog_print_pcbnew.cpp:227
 msgid "No drill mark"
@@ -23884,6 +24523,55 @@ msgstr "不要修改具有不同类型的焊盘"
 msgid "Push Pad Properties"
 msgstr "推挤焊盘属性"
 
+#: pcbnew/dialogs/dialog_rule_area_properties.cpp:152
+msgid "No layers selected."
+msgstr "没有选择层。"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:25
+msgid "Layers:"
+msgstr "层："
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:38
+msgid "Basic Rules"
+msgstr "基本规则"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:42
+msgid "Keep out tracks"
+msgstr "禁止布线"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:45
+msgid "Keep out vias"
+msgstr "禁止过孔"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:48
+msgid "Keep out pads"
+msgstr "保留焊盘"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:51
+msgid "Keep out copper pours"
+msgstr "禁止覆铜"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:57
+msgid "Keep out footprints"
+msgstr "保留封装"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:63
+msgid "Constrain outline to H, V and 45 deg"
+msgstr "限制轮廓线方向水平，垂直或 45 度"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:88
+msgid "Area name:"
+msgstr "区域名称："
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:90
+#: pcbnew/dialogs/dialog_rule_area_properties_base.cpp:95
+msgid "A unique name for this rule area for use in DRC rules"
+msgstr "此规则区域的唯一名称，用于 DRC 规则"
+
+#: pcbnew/dialogs/dialog_rule_area_properties_base.h:66
+msgid "Rule Area Properties"
+msgstr "规则区域属性"
+
 #: pcbnew/dialogs/dialog_scripting_base.cpp:24
 msgid "&Run"
 msgstr "运行 (&R)"
@@ -23909,55 +24597,55 @@ msgstr "电路板长度"
 msgid "Die Length"
 msgstr "裸芯片长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:841
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:842
 msgid "New Net"
 msgstr "新建网络"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:853
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:918
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:854
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:919
 #, c-format
 msgid "Net name '%s' is already in use."
 msgstr "网络名称 '%s' 已经在使用中。"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:895
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:896
 msgid "Rename Net"
 msgstr "重命名网络"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:908
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:909
 msgid "Net name cannot be empty."
 msgstr "网络名称变量名不能为空。"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:947
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:954
 msgid "Net is in use.  Delete anyway?"
 msgstr "网络正在使用中。仍要删除吗？"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:961
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:962
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:968
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:969
 msgid "Report file"
 msgstr "报告文件"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:977
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:984
 msgid "Net Id"
 msgstr "网络 ID"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:978
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:985
 msgid "Pad count"
 msgstr "焊盘计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:978
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:985
 msgid "Via count"
 msgstr "过孔计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:979
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:986
 msgid "Board length"
 msgstr "电路板长度"
 
 # Die 裸芯片
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:979
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:986
 msgid "Die length"
 msgstr "裸芯片长度"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:979
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:986
 msgid "Net length"
 msgstr "网络长度"
 
@@ -23970,7 +24658,7 @@ msgid "Create Report..."
 msgstr "创建报告..."
 
 #: pcbnew/dialogs/dialog_select_net_from_list_base.h:68
-#: pcbnew/tools/pcb_actions.cpp:720
+#: pcbnew/tools/pcb_actions.cpp:740
 msgid "Net Inspector"
 msgstr "网络检查"
 
@@ -24006,32 +24694,23 @@ msgstr "X"
 msgid "Target Properties"
 msgstr "目标属性"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:77
-msgid "Dimension Properties"
-msgstr "尺寸属性"
-
-#: pcbnew/dialogs/dialog_text_properties.cpp:102
+#: pcbnew/dialogs/dialog_text_properties.cpp:73
 msgid "Footprint Text Properties"
 msgstr "封装文本属性"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:109
+#: pcbnew/dialogs/dialog_text_properties.cpp:80
 msgid "Reference:"
 msgstr "参考编号："
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:442
-#, c-format
-msgid "Footprint %s (%s), %s, rotated %.1f deg"
-msgstr "封装 %s (%s), %s, 旋转 %.1f°"
-
-#: pcbnew/dialogs/dialog_text_properties.cpp:458
+#: pcbnew/dialogs/dialog_text_properties.cpp:277
 msgid ""
-"This item was on a non-existing or forbidden layer.\n"
-"It has been moved to the first allowed layer."
+"This item was on a non-existing layer.\n"
+"It has been moved to the first layer."
 msgstr ""
-"此项目在一个不存在或禁止的层上\n"
-"它以被移动到第一个允许的层。"
+"此项目在不存在的图层上。\n"
+"已移动到第一层。"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:567
+#: pcbnew/dialogs/dialog_text_properties.cpp:362
 msgid ""
 "The text thickness is too large for the text size.\n"
 "It will be clamped."
@@ -24039,7 +24718,7 @@ msgstr ""
 "文本宽度与高度比例不对。\n"
 "它将会变形，被挤在一起。"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:591
+#: pcbnew/dialogs/dialog_text_properties.cpp:386
 msgid "Change text properties"
 msgstr "更改文本属性"
 
@@ -24047,47 +24726,11 @@ msgstr "更改文本属性"
 msgid "Enter the text placed on selected layer."
 msgstr "输入文字放在所选层."
 
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:81
-msgid "Dimension text:"
-msgstr "尺寸文字："
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:126
-msgid "Text width"
-msgstr "文本宽度"
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:145
-msgid "Text height"
-msgstr "文本高度"
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:156
-msgid "Justification:"
-msgstr "对齐："
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:168
-msgid "Text thickness"
-msgstr "文本线宽"
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:181
-msgid "Text orientation"
-msgstr "文本方向"
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:194
-msgid "Text pos X"
-msgstr "文本位置 X"
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:206
-msgid "Mirror text"
-msgstr "镜像文本"
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:215
-msgid "Text pos Y"
-msgstr "文本位置 Y"
-
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:227
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:202
 msgid "Keep text upright"
 msgstr "保持文本直立"
 
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:254
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:229
 msgid "Parent footprint description"
 msgstr "父级封装描述"
 
@@ -24307,7 +24950,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:782
+#: pcbnew/tools/pcb_actions.cpp:802
 msgid "Show pad numbers"
 msgstr "显示焊盘编号"
 
@@ -24364,7 +25007,7 @@ msgstr ""
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:35
 msgid "Set units used to display dimensions and positions."
-msgstr "设置用于显示尺寸和位置的单位。"
+msgstr "设置用于显示标注和位置的单位。"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:42
 msgid "Magnetic pads"
@@ -24437,7 +25080,7 @@ msgid "Always show selected ratsnest"
 msgstr "始终显示选定的飞线"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:151
-#: pcbnew/tools/pcb_actions.cpp:751
+#: pcbnew/tools/pcb_actions.cpp:771
 msgid "Show ratsnest with curved lines"
 msgstr "用曲线显示飞线"
 
@@ -24459,49 +25102,49 @@ msgid "Moves the track segment without moving connected tracks"
 msgstr "移动布线段而不移动连接的布线"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:184
-#: pcbnew/tools/pcb_actions.cpp:1285
+#: pcbnew/tools/pcb_actions.cpp:1324
 msgid "Drag (45 degree mode)"
 msgstr "拖动 (45 度模式)"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:185
-#: pcbnew/tools/pcb_actions.cpp:1286
+#: pcbnew/tools/pcb_actions.cpp:1325
 msgid "Drags the track segment while keeping connected tracks at 45 degrees."
 msgstr "在保持连接布线 45 度的情况下拖动布线段。"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:192
-#: pcbnew/tools/pcb_actions.cpp:1292
+#: pcbnew/tools/pcb_actions.cpp:1331
 msgid "Drag (free angle)"
 msgstr "拖动(自由角度)"
 
 #: pcbnew/dialogs/panel_edit_options_base.cpp:193
-#: pcbnew/tools/pcb_actions.cpp:1293
+#: pcbnew/tools/pcb_actions.cpp:1332
 msgid ""
 "Drags the nearest joint in the track without restricting the track angle."
 msgstr "在不限制布线角度的情况下，拖拽布线中最近的连接点。"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:294
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:295
 msgid "Options Editor..."
 msgstr "编辑器选项..."
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:294
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:295
 msgid "Edit options"
 msgstr "编辑选项"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:577
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:582
 #, c-format
 msgid "Duplicate Nicknames \"%s\"."
 msgstr "重复的昵称 \"%s\"。"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:780
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:784
 #, c-format
 msgid "Select %s Library"
 msgstr "选择 %s 库"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:820
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:824
 msgid "The following directories could not be opened: \n"
 msgstr "无法打开以下目录：\n"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:825
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:829
 msgid "Failed to open directories to look for libraries"
 msgstr "无法打开目录以查找库"
 
@@ -24509,12 +25152,12 @@ msgstr "无法打开目录以查找库"
 msgid "Add Existing"
 msgstr "添加现有"
 
-#: pcbnew/dialogs/panel_modedit_color_settings.cpp:139
+#: pcbnew/dialogs/panel_modedit_color_settings.cpp:130
 msgid "Internal Layers"
 msgstr "内层"
 
 #: pcbnew/dialogs/panel_modedit_defaults.cpp:321
-#: pcbnew/dialogs/panel_setup_text_and_graphics.cpp:161
+#: pcbnew/dialogs/panel_setup_text_and_graphics.cpp:179
 msgid ""
 "Text will not be readable with a thickness greater than\n"
 "1/4 its width or height."
@@ -24628,79 +25271,97 @@ msgstr ""
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:90
 #, c-format
 msgid ""
-"Value < %s  can be time consumming\n"
-"when filling zones."
+"Value < %s  can be time consuming when \n"
+"filling zones."
 msgstr ""
-"值 < %s  可以是填充区域时\n"
-"耗费的时间。"
+"填充区域时，值 < %s \n"
+"可能会很耗时。"
 
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:107
 msgid "Zone fill strategy"
 msgstr "区域填充策略"
 
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:122
-msgid "Stroked outlines (legacy)"
-msgstr "描边轮廓 (旧版)"
+msgid "Mimic legacy behavior"
+msgstr "模仿旧行为"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:125
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:123
+msgid ""
+"Produces a slightly smoother outline at the expense of performance, some "
+"export fidelity issues, and overly agressive higher-priority zone knockouts."
+msgstr ""
+"以牺牲性能、一些导出保真度问题和过于激进的高优先级区域挖空为代价，生成稍微平"
+"滑的轮廓。"
+
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:127
 msgid "Smoothed polygons (best performance)"
 msgstr "平滑多边形 (最佳性能)"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:141
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:129
+msgid ""
+"Better performance, exact export fidelity, and more complete filling near "
+"higher-priority zones."
+msgstr "更好的性能、精确的导出保真度，以及在较高优先级区域附近更完整的填充。"
+
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:145
 msgid "Allow fillets outside zone outline"
 msgstr "允许圆角超出区域轮廓"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:180
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:184
 msgid "Minimum clearance:"
 msgstr "最小间隙："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:210
-msgid "Minimum via annulus:"
-msgstr "最小过孔环："
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:198
+msgid "Minimum track width:"
+msgstr "最小布线宽度："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:224
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:214
+msgid "Minimum annular width:"
+msgstr "最小环形宽度："
+
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:228
 msgid "Minimum via diameter:"
 msgstr "最小过孔外径："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:238
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:242
 msgid "Copper edge clearance:"
 msgstr "铜边缘间隙:"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:261
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:265
 msgid "Holes"
 msgstr "过孔"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:277
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:281
 msgid "Minimum through hole:"
 msgstr "最小通孔："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:291
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:295
 msgid "Hole to hole clearance:"
 msgstr "孔对孔间隙："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:314
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:318
 msgid "uVias"
 msgstr "微孔"
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:330
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:334
 msgid "Minimum uVia diameter:"
 msgstr "最小微孔外径："
 
-#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:344
+#: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:348
 msgid "Minimum uVia drill:"
 msgstr "最小微孔内径："
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:426
+#: pcbnew/dialogs/panel_setup_layers.cpp:477
 #, c-format
 msgid "Use the \"%s\" control to change the number of copper layers."
 msgstr "使用 \"%s\" 控制更改铜层数。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:441
+#: pcbnew/dialogs/panel_setup_layers.cpp:492
 #, c-format
 msgid "The %s layer is mandatory."
 msgstr "%s 层是必须的。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:499
+#: pcbnew/dialogs/panel_setup_layers.cpp:550
 #, c-format
 msgid ""
 "Footprints have some items on removed layers:\n"
@@ -24713,7 +25374,7 @@ msgstr ""
 "这些项目将不再可访问\n"
 "是否继续？"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:507
+#: pcbnew/dialogs/panel_setup_layers.cpp:558
 msgid ""
 "Items have been found on removed layers. This operation will delete all "
 "items from removed layers and cannot be undone. Do you wish to continue?"
@@ -24721,25 +25382,25 @@ msgstr ""
 "在移除的图层上找到了项目。 该操作将删除已移除图层中的所有项目，并且不能撤"
 "消。 你想继续吗？"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:647
+#: pcbnew/dialogs/panel_setup_layers.cpp:709
 msgid "Layer must have a name."
 msgstr "层必须要有一个名称。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:653
+#: pcbnew/dialogs/panel_setup_layers.cpp:715
 #, c-format
 msgid "\"%s\" are forbidden in layer names."
 msgstr "\"%s\" 在层名称中是禁止的。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:660
+#: pcbnew/dialogs/panel_setup_layers.cpp:722
 msgid "Layer name \"signal\" is reserved."
 msgstr "“信号” 是保留层名称。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:668
+#: pcbnew/dialogs/panel_setup_layers.cpp:730
 #, c-format
 msgid "Layer name \"%s\" is already in use."
 msgstr "图层名称 \"%s\" 已经在使用中。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:766
+#: pcbnew/dialogs/panel_setup_layers.cpp:830
 #, c-format
 msgid ""
 "Imported settings have fewer copper layers than the current board (%i "
@@ -24751,10 +25412,14 @@ msgstr ""
 "\n"
 "是否继续并从当前电路板中删除额外的内部铜层？"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:773
+#: pcbnew/dialogs/panel_setup_layers.cpp:837
 msgid "Inner Layers To Be Deleted"
 msgstr "要删除的内部铜层"
 
+#: pcbnew/dialogs/panel_setup_layers.cpp:865
+msgid "Select user defined layer to add to board layer set"
+msgstr "选择要添加到电路板层集合的用户定义层"
+
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:23
 msgid "Custom layer set"
 msgstr "自定义图层设置"
@@ -24831,16 +25496,20 @@ msgstr "30"
 msgid "32"
 msgstr "32"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:60
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:45
+msgid "Add User Defined Layer"
+msgstr "添加用户定义的图层"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:63
 msgid "If you want a courtyard layer for the front side of the board"
 msgstr "开启/关闭 顶层封装丝印外框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:64
-msgid "CrtYd_Front_layer"
-msgstr "顶层封装外框"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:67
+msgid "CrtYd_Front"
+msgstr "顶层封装层"
 
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:70
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:671
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:660
 msgid "Off-board, testing"
 msgstr "电路板外, 测试"
 
@@ -24849,241 +25518,241 @@ msgid "If you want a fabrication layer for the front side of the board"
 msgstr "开启/关闭 顶层制造层"
 
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:81
-msgid "Fab_Front_layer"
-msgstr "制造顶层"
+msgid "Fab_Front"
+msgstr "顶层制造层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:85
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:658
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:84
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:648
 msgid "Off-board, manufacturing"
 msgstr "电路板外, 生产"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:90
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:89
 msgid "If you want an adhesive template for the front side of the board"
 msgstr "开启/关闭 顶层粘胶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:94
-msgid "Adhes_Front_layer"
-msgstr "顶层粘胶"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:93
+msgid "Adhes_Front"
+msgstr "顶层粘胶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:98
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:111
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:124
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:137
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:606
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:619
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:632
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:645
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:96
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:108
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:120
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:132
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:600
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:612
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:624
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:636
 msgid "On-board, non-copper"
 msgstr "电路板上, 非铜层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:103
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:101
 msgid "If you want a solder paster layer for front side of the board"
 msgstr "开启/关闭 顶层锡膏层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:107
-msgid "SoldP_Front_layer"
-msgstr "顶层锡膏"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:105
+msgid "SoldP_Front"
+msgstr "顶层锡膏层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:116
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:113
 msgid "If you want a silk screen layer for the front side of the board"
 msgstr "开启/关闭 顶层丝印层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:120
-msgid "SilkS_Front_layer"
-msgstr "顶层丝印"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:117
+msgid "SilkS_Front"
+msgstr "顶层丝印层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:129
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:125
 msgid "If you want a solder mask layer for the front of the board"
 msgstr "开启/关闭 顶层阻焊层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:133
-msgid "Mask_Front_layer"
-msgstr "顶层阻焊"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:129
+msgid "Mask_Front"
+msgstr "顶层阻焊层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:142
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:137
 msgid "If you want a front copper layer"
 msgstr "开启/关闭 顶层铜层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:146
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:141
 msgid "Front_layer"
 msgstr "顶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:147
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:142
 msgid "Layer name of front (top) copper layer"
 msgstr "顶层铜层的名称"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:151
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:165
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:193
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:207
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:221
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:235
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:249
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:263
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:277
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:291
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:305
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:319
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:347
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:361
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:375
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:389
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:403
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:417
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:431
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:445
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:459
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:473
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:501
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:515
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:529
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:543
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:557
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:571
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:589
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:146
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:160
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:174
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:188
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:202
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:216
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:230
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:244
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:258
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:272
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:286
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:300
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:314
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:328
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:342
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:356
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:370
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:384
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:398
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:412
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:426
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:440
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:454
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:468
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:482
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:496
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:510
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:524
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:538
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:552
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:566
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:584
 msgid "signal"
 msgstr "信号"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:151
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:165
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:193
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:207
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:221
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:235
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:249
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:263
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:277
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:291
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:305
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:319
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:347
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:361
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:375
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:389
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:403
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:417
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:431
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:445
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:459
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:473
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:501
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:515
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:529
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:543
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:557
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:571
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:589
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:146
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:160
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:174
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:188
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:202
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:216
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:230
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:244
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:258
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:272
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:286
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:300
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:314
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:328
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:342
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:356
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:370
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:384
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:398
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:412
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:426
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:440
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:454
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:468
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:482
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:496
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:510
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:524
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:538
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:552
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:566
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:584
 msgid "power plane"
 msgstr "电源层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:151
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:165
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:193
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:207
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:221
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:235
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:249
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:263
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:277
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:291
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:305
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:319
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:347
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:361
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:375
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:389
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:403
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:417
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:431
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:445
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:459
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:473
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:501
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:515
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:529
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:543
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:557
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:571
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:589
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:146
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:160
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:174
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:188
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:202
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:216
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:230
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:244
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:258
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:272
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:286
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:300
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:314
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:328
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:342
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:356
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:370
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:384
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:398
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:412
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:426
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:440
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:454
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:468
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:482
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:496
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:510
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:524
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:538
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:552
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:566
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:584
 msgid "mixed"
 msgstr "混合"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:151
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:165
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:193
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:207
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:221
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:235
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:249
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:263
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:277
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:291
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:305
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:319
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:347
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:361
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:375
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:389
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:403
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:417
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:431
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:445
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:459
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:473
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:501
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:515
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:529
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:543
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:557
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:571
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:589
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:146
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:160
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:174
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:188
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:202
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:216
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:230
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:244
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:258
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:272
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:286
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:300
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:314
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:328
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:342
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:356
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:370
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:384
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:398
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:412
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:426
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:440
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:454
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:468
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:482
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:496
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:510
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:524
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:538
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:552
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:566
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:584
 msgid "jumper"
 msgstr "跳线"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:155
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:169
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:183
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:197
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:211
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:225
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:239
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:253
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:267
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:281
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:295
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:309
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:323
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:337
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:351
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:365
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:379
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:393
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:407
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:421
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:435
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:449
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:463
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:477
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:491
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:505
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:519
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:533
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:547
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:561
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:575
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:593
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:150
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:164
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:178
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:192
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:206
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:220
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:234
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:248
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:262
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:276
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:290
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:304
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:318
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:332
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:346
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:360
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:374
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:388
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:402
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:416
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:430
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:444
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:458
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:472
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:486
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:500
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:514
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:528
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:542
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:556
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:570
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:588
 msgid ""
 "Copper layer type for Freerouter and other external routers.\n"
 "Power plane layers are removed from Freerouter's layer menus."
@@ -25091,232 +25760,272 @@ msgstr ""
 "对于 Freerouter 和其他外部布线器的铜层类型。\n"
 "从 Freerouter 的图层菜单中删除电源平面层。"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:162
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:157
 msgid "In1"
 msgstr "内层 1"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:176
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:171
 msgid "In2"
 msgstr "内层 2"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:190
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:185
 msgid "In3"
 msgstr "内层 3"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:204
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:199
 msgid "In4"
 msgstr "内层 4"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:218
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:213
 msgid "In5"
 msgstr "内层 5"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:232
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:227
 msgid "In6"
 msgstr "内层 6"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:246
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:241
 msgid "In7"
 msgstr "内层 7"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:260
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:255
 msgid "In8"
 msgstr "内层 8"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:274
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:269
 msgid "In9"
 msgstr "内层 9"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:288
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:283
 msgid "In10"
 msgstr "内层 10"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:302
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:297
 msgid "In11"
 msgstr "内层 11"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:316
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:311
 msgid "In12"
 msgstr "内层 12"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:330
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:325
 msgid "In13"
 msgstr "内层 13"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:344
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:339
 msgid "In14"
 msgstr "内层 14"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:358
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:353
 msgid "In15"
 msgstr "内层 15"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:372
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:367
 msgid "In16"
 msgstr "内层 16"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:386
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:381
 msgid "In17"
 msgstr "内层 17"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:400
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:395
 msgid "In18"
 msgstr "内层 18"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:414
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:409
 msgid "In19"
 msgstr "内层 19"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:428
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:423
 msgid "In20"
 msgstr "内层 20"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:442
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:437
 msgid "In21"
 msgstr "内层 21"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:456
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:451
 msgid "In22"
 msgstr "内层 22"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:470
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:465
 msgid "In23"
 msgstr "内层 23"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:484
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:479
 msgid "In24"
 msgstr "内层 24"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:498
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:493
 msgid "In25"
 msgstr "内层 25"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:512
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:507
 msgid "In26"
 msgstr "内层 26"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:526
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:521
 msgid "In27"
 msgstr "内层 27"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:540
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:535
 msgid "In28"
 msgstr "内层 28"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:554
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:549
 msgid "In29"
 msgstr "内层 29"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:568
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:563
 msgid "In30"
 msgstr "内层 30"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:580
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:575
 msgid "If you want a back copper layer"
 msgstr "开启/关闭 底层铜层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:585
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:580
 msgid "Layer name of back (bottom) copper layer"
 msgstr "底层铜层的名称"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:598
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:593
 msgid "If you want a solder mask layer for the back side of the board"
 msgstr "开启/关闭 底层阻焊层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:602
-msgid "Mask_Back_layer"
-msgstr "底层阻焊"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:597
+msgid "SoldM_Back"
+msgstr "底层阻焊层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:611
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:605
 msgid "If you want a silk screen layer for the back side of the board"
 msgstr "开启/关闭 底层丝印层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:615
-msgid "SilkS_Back_layer"
-msgstr "底层丝印"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:609
+msgid "SilkS_Back"
+msgstr "底层丝印层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:624
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:617
 msgid "If you want a solder paste layer for the back side of the board"
 msgstr "开启/关闭 底层锡膏层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:628
-msgid "SoldP_Back_layer"
-msgstr "底层锡膏"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:621
+msgid "SoldP_Back"
+msgstr "底层锡膏层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:637
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:629
 msgid "If you want an adhesive layer for the back side of the board"
 msgstr "开启/关闭 底层粘胶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:641
-msgid "Adhes_Back_layer"
-msgstr "底层粘胶"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:633
+msgid "Adhes_Back"
+msgstr "底层粘胶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:650
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:641
 msgid "If you want a fabrication layer for the back side of the board"
 msgstr "开启/关闭 底层制造层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:654
-msgid "Fab_Back_layer"
-msgstr "底层制造"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:645
+msgid "Fab_Back"
+msgstr "底层制造层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:663
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:653
 msgid "If you want a courtyard layer for the back side of the board"
 msgstr "开启/关闭 底层封装外框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:667
-msgid "CrtYd_Back_layer"
-msgstr "底层封装外框"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:657
+msgid "CrtYd_Back"
+msgstr "底层封装层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:676
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:665
 msgid "If you want a board perimeter layer"
 msgstr "打开/关闭 电路板边框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:680
-msgid "PCB_Edges_layer"
-msgstr "PCB 板边框层"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:669
+msgid "Pcb_Edges"
+msgstr "电路板边框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:684
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:672
 msgid "Board contour"
 msgstr "电路板边框"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:691
-msgid "Margin_layer"
-msgstr "电气边界层"
-
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:695
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:682
 msgid "Edge_Cuts setback"
 msgstr "电气边界"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:702
-msgid "Eco1_layer"
-msgstr "Eco1_层"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:689
+msgid "Eco1"
+msgstr "用户自定义 1 层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:706
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:717
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:730
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:743
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:692
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:702
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:714
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:726
 msgid "Auxiliary"
 msgstr "辅助"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:713
-msgid "Eco2_layer"
-msgstr "Eco2_层"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:699
+msgid "Eco2"
+msgstr "用户自定义 2 层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:722
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:707
 msgid "If you want a separate layer for comments or notes"
 msgstr "开启/关闭 描述性注释层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:726
-msgid "Comments_layer"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:711
+msgid "Comments"
 msgstr "注释层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:735
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:719
 msgid "If you want a layer for documentation drawings"
 msgstr "开启/关闭 文档图形层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:739
-msgid "Drawings_layer"
-msgstr "图形层"
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:733
+msgid "User1"
+msgstr "用户 1"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:736
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:746
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:756
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:766
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:776
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:786
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:796
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:806
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:816
+msgid "User defined layer"
+msgstr "用户定义的图层"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:743
+msgid "User2"
+msgstr "用户 2"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:753
+msgid "User3"
+msgstr "用户 3"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:763
+msgid "User4"
+msgstr "用户 4"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:773
+msgid "User5"
+msgstr "用户 5"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:783
+msgid "User6"
+msgstr "用户 6"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:793
+msgid "User7"
+msgstr "用户 7"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:803
+msgid "User8"
+msgstr "用户 8"
+
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:813
+msgid "User9"
+msgstr "用户 9"
 
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:29
 msgid ""
@@ -25380,31 +26089,11 @@ msgid ""
 "the final clearance."
 msgstr "注意：添加锡膏间隙（绝对和相对）以确定最终间隙。"
 
-#: pcbnew/dialogs/panel_setup_rules.cpp:268
-#: pcbnew/dialogs/panel_setup_rules.cpp:337
+#: pcbnew/dialogs/panel_setup_rules.cpp:297
+#: pcbnew/dialogs/panel_setup_rules.cpp:366
 msgid "DRC rules"
 msgstr "DRC 规则"
 
-#: pcbnew/dialogs/panel_setup_rules.cpp:362
-msgid "Top-level Clauses"
-msgstr "顶级条款"
-
-#: pcbnew/dialogs/panel_setup_rules.cpp:367
-msgid "Rule Clauses"
-msgstr "规则条款"
-
-#: pcbnew/dialogs/panel_setup_rules.cpp:374
-msgid "Constraint Types"
-msgstr "约束类型"
-
-#: pcbnew/dialogs/panel_setup_rules.cpp:380
-msgid "Item Types"
-msgstr "物料类型"
-
-#: pcbnew/dialogs/panel_setup_rules.cpp:388
-msgid "Examples"
-msgstr "例如"
-
 #: pcbnew/dialogs/panel_setup_rules_base.cpp:26
 msgid "DRC rules:"
 msgstr "DRC 规则："
@@ -25415,19 +26104,38 @@ msgstr "检查规则语法"
 
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:74
 msgid "Default properties for new dimension objects:"
-msgstr "新维度对象的默认属性："
+msgstr "新标注对象的默认属性："
 
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:97
-msgid "0.01 mm / 1 mil"
-msgstr "0.01 mm / 1 mil"
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:91
+msgid ""
+"Default units for dimensions (\"automatic\" to follow the chosen UI units)"
+msgstr "标注的默认单位(“自动”跟随选定的 UI 单位)"
 
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:97
-msgid "0.001 mm / 0.1 mil"
-msgstr "0.001 mm / 0.1 mil"
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:98
+msgid "Text position:"
+msgstr "文字位置 ："
 
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:97
-msgid "0.0001mm / 0.01 mil"
-msgstr "0.0001mm / 0.01 mil"
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:106
+msgid "Where to position the dimension text relative to the dimension line"
+msgstr "标注文字相对于标注线的位置"
+
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:120
+msgid "Keep text aligned"
+msgstr "保持文本对齐"
+
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:121
+msgid "When checked, dimension text will be kept aligned with dimension lines"
+msgstr "选中后，标注文本将与标注线保持对齐"
+
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:133
+msgid "How many digits of precision to show"
+msgstr "要显示多少位精度"
+
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:149
+msgid ""
+"When checked, \"1.2300\" will be rendered as \"1.23\" even if precision is "
+"set to show more digits"
+msgstr "选中后，即使精度设置为显示更多位数，\"1.2300\" 也会呈现为 \"1.23\""
 
 #: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:240
 #, c-format
@@ -25478,7 +26186,7 @@ msgstr "差分对过孔间隙小于最小间隙(%s)。"
 
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:19
 msgid "Pre-defined track and via dimensions:"
-msgstr "预定义布线和过孔直径："
+msgstr "预定义布线和过孔标注："
 
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:143
 msgid "Differential Pairs"
@@ -25564,412 +26272,508 @@ msgstr "下载 3D 模型库："
 msgid "Add 3D Shape Libraries Wizard"
 msgstr "3D 模型库添加向导"
 
-#: pcbnew/drc/drc.cpp:239 qa/drc_proto/drc.cpp:244
-msgid "Board Outline...\n"
-msgstr "电路板边框...\n"
+#: pcbnew/drc/drc_engine.cpp:96 pcbnew/drc/drc_engine.cpp:153
+msgid "board setup constraints"
+msgstr "电路板设置约束"
 
-#: pcbnew/drc/drc.cpp:251 qa/drc_proto/drc.cpp:286
-msgid "Pad clearances...\n"
-msgstr "焊盘间距...\n"
+#: pcbnew/drc/drc_engine.cpp:132
+msgid "board setup micro-via constraints"
+msgstr "电路板设置微孔约束"
 
-#: pcbnew/drc/drc.cpp:265 qa/drc_proto/drc.cpp:301
-msgid "Drill sizes and clearances...\n"
-msgstr "钻头尺寸和间隙...\n"
-
-#: pcbnew/drc/drc.cpp:283 qa/drc_proto/drc.cpp:319
-msgid "Refilling all zones...\n"
-msgstr "重新填充所有覆铜区域...\n"
-
-#: pcbnew/drc/drc.cpp:290 qa/drc_proto/drc.cpp:326
-msgid "Checking zone fills...\n"
-msgstr "检查填充区域...\n"
-
-#: pcbnew/drc/drc.cpp:298 qa/drc_proto/drc.cpp:334
-msgid "Track clearances...\n"
-msgstr "布线间距...\n"
-
-#: pcbnew/drc/drc.cpp:307 qa/drc_proto/drc.cpp:343
-msgid "Zone to zone clearances...\n"
-msgstr "覆铜区域与覆铜区域间隙...\n"
-
-#: pcbnew/drc/drc.cpp:319 qa/drc_proto/drc.cpp:355
-msgid "Unconnected pads...\n"
-msgstr "未连接焊盘...\n"
-
-#: pcbnew/drc/drc.cpp:331 qa/drc_proto/drc.cpp:367
-msgid "Keepout areas ...\n"
-msgstr "禁布区...\n"
-
-#: pcbnew/drc/drc.cpp:348 qa/drc_proto/drc.cpp:385
-msgid "Text and graphic clearances...\n"
-msgstr "文本和图形间隙...\n"
-
-#: pcbnew/drc/drc.cpp:364 qa/drc_proto/drc.cpp:401
-msgid "Courtyard areas...\n"
-msgstr "封装外框...\n"
-
-#: pcbnew/drc/drc.cpp:383 qa/drc_proto/drc.cpp:423
-msgid "Checking footprints against schematic...\n"
-msgstr "检查封装和原理图...\n"
-
-#: pcbnew/drc/drc.cpp:402 qa/drc_proto/drc.cpp:442
-msgid "Items on disabled layers...\n"
-msgstr "禁用层上的项目...\n"
-
-#: pcbnew/drc/drc.cpp:413 qa/drc_proto/drc.cpp:453
-msgid "Unresolved text variables...\n"
-msgstr "未解析的文本变量...\n"
-
-#: pcbnew/drc/drc.cpp:511 pcbnew/drc/drc.cpp:817 pcbnew/drc/drc.cpp:938
-#: pcbnew/drc/drc.cpp:983 pcbnew/drc/drc.cpp:1142 pcbnew/drc/drc.cpp:1166
-#: pcbnew/drc/drc.cpp:1227 pcbnew/drc/drc_clearance_test_functions.cpp:327
-#: pcbnew/drc/drc_clearance_test_functions.cpp:355
-#: pcbnew/drc/drc_clearance_test_functions.cpp:427
-#: pcbnew/drc/drc_clearance_test_functions.cpp:476
-#: pcbnew/drc/drc_clearance_test_functions.cpp:540 qa/drc_proto/drc.cpp:550
-#: qa/drc_proto/drc.cpp:862 qa/drc_proto/drc.cpp:1051 qa/drc_proto/drc.cpp:1109
-#: qa/drc_proto/drc.cpp:1283 qa/drc_proto/drc.cpp:1312
-#: qa/drc_proto/drc.cpp:1361 qa/drc_proto/drc_clearance_test_functions.cpp:450
-#: qa/drc_proto/drc_clearance_test_functions.cpp:476
-#: qa/drc_proto/drc_clearance_test_functions.cpp:562
-#: qa/drc_proto/drc_clearance_test_functions.cpp:611
-#: qa/drc_proto/drc_clearance_test_functions.cpp:677
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:221
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:266
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:369
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:456
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:513
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:644
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:810
-#: qa/drc_proto/drc_test_provider_edge_clearance.cpp:147
-#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:290
-#: qa/drc_proto/drc_test_provider_hole_clearance.cpp:321
+#: pcbnew/drc/drc_engine.cpp:179
 #, c-format
-msgid " (%s clearance %s; actual %s)"
-msgstr " (%s 间隙 %s; 实际 %s)"
+msgid "netclass '%s'"
+msgstr "网络类 '%s'"
 
-#: pcbnew/drc/drc.cpp:549 qa/drc_proto/drc.cpp:588
-msgid "Track clearances"
-msgstr "布线间距"
-
-#: pcbnew/drc/drc.cpp:1016 pcbnew/drc/drc_courtyard_tester.cpp:76
-#: qa/drc_proto/drc.cpp:1139 qa/drc_proto/drc_courtyard_tester.cpp:76
-msgid " (not a closed shape)"
-msgstr " (不是闭合形状)"
-
-#: pcbnew/drc/drc.cpp:1040 pcbnew/drc/drc.cpp:1060 pcbnew/drc/drc.cpp:1078
-#: qa/drc_proto/drc.cpp:1163 qa/drc_proto/drc.cpp:1183
-#: qa/drc_proto/drc.cpp:1201
+#: pcbnew/drc/drc_engine.cpp:457 pcbnew/drc/drc_engine.cpp:467
 #, c-format
-msgid "layer %s"
-msgstr "层 %s"
+msgid "Local override on %s; clearance: %s."
+msgstr "%s 上的本地替代；间隙：%s。"
 
-#: pcbnew/drc/drc.cpp:1197
-#: qa/drc_proto/drc_test_provider_copper_clearance.cpp:611
+#: pcbnew/drc/drc_engine.cpp:495
 #, c-format
-msgid " (nets %s and %s)"
-msgstr " (网络 %s 和 %s)"
+msgid "Checking %s; clearance: %s."
+msgstr "检查 %s；间隙：%s。"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:49
-#: pcbnew/drc/drc_clearance_test_functions.cpp:66
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:293
-#: qa/drc_proto/drc_clearance_test_functions.cpp:150
-#: qa/drc_proto/drc_clearance_test_functions.cpp:167
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:269
+#: pcbnew/drc/drc_engine.cpp:496
 #, c-format
-msgid " (board minimum %s; actual %s)"
-msgstr " (电路板最小值 %s; 实际 %s)"
+msgid "Checking rule %s; clearance: %s."
+msgstr "检查规则 %s；间隙：%s。"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:85
-#: qa/drc_proto/drc_clearance_test_functions.cpp:186
+#: pcbnew/drc/drc_engine.cpp:502
 #, c-format
-msgid " (diameter %s; drill %s)"
-msgstr " （直径 %s; 钻孔 %s）"
+msgid "Checking %s."
+msgstr "检查 %s。"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:101
-#: qa/drc_proto/drc_clearance_test_functions.cpp:202
-msgid "Microvia not allowed (board design rule constraints)"
-msgstr "不允许微孔 (电路板设计规则约束)"
-
-#: pcbnew/drc/drc_clearance_test_functions.cpp:114
-#: qa/drc_proto/drc_clearance_test_functions.cpp:215
-msgid "Blind/buried via not allowed (board design rule constraints)"
-msgstr "不允许盲孔/埋孔 (电路板设计规则约束)"
-
-#: pcbnew/drc/drc_clearance_test_functions.cpp:146
-#: qa/drc_proto/drc_clearance_test_functions.cpp:245
+#: pcbnew/drc/drc_engine.cpp:503
 #, c-format
-msgid "Microvia through too many layers (%s and %s not adjacent)"
-msgstr "通过太多层的微孔(%s 和 %s 不相邻)"
+msgid "Checking rule %s."
+msgstr "检查规则 %s。"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:189
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:115
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:166
-#: pcbnew/drc/drc_drilled_hole_tester.cpp:218
-#: qa/drc_proto/drc_clearance_test_functions.cpp:288
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:108
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:151
-#: qa/drc_proto/drc_drilled_hole_tester.cpp:194
+#: pcbnew/drc/drc_engine.cpp:511
 #, c-format
-msgid " (%s %s; actual %s)"
-msgstr " (%s %s; 实际 %s)"
+msgid "Rule layer \"%s\" not matched."
+msgstr "规则层 \"%s\" 不匹配。"
 
-#: pcbnew/drc/drc_clearance_test_functions.cpp:237
-#: pcbnew/drc/drc_clearance_test_functions.cpp:261
-#: qa/drc_proto/drc_clearance_test_functions.cpp:336
-#: qa/drc_proto/drc_clearance_test_functions.cpp:360
+#: pcbnew/drc/drc_engine.cpp:521
+msgid "Unconditional constraint applied."
+msgstr "已应用无条件约束。"
+
+#: pcbnew/drc/drc_engine.cpp:522
+msgid "Unconditional rule applied."
+msgstr "应用无条件规则。"
+
+#: pcbnew/drc/drc_engine.cpp:532
 #, c-format
-msgid "Via annulus too small (%s %s; actual %s)"
-msgstr "过孔环隙太小 (%s %s; 实际 %s)"
+msgid "Checking rule condition \"%s\"."
+msgstr "检查规则条件 \"%s\"。"
 
-#: pcbnew/drc/drc_item.cpp:43 qa/drc_proto/drc_item.cpp:40
+#: pcbnew/drc/drc_engine.cpp:538
+msgid "Constraint applicable."
+msgstr "适用的约束条件。"
+
+#: pcbnew/drc/drc_engine.cpp:539
+msgid "Rule applied.  (No further rules will be checked.)"
+msgstr "已应用规则。  (将不检查其他规则。)"
+
+#: pcbnew/drc/drc_engine.cpp:546
+msgid "Membership not satisfied; constraint not applicable."
+msgstr "未满足成员资格；约束不适用。"
+
+#: pcbnew/drc/drc_engine.cpp:547
+msgid "Condition not satisfied; rule not applied."
+msgstr "条件不满足；未应用规则。"
+
+#: pcbnew/drc/drc_engine.cpp:566 pcbnew/drc/drc_engine.cpp:577
+#, c-format
+msgid "Local clearance on %s; clearance: %s."
+msgstr "本地间隙 %s；间隙：%s。"
+
+#: pcbnew/drc/drc_item.cpp:42
 msgid "Unconnected items"
 msgstr "未连接的项目"
 
-#: pcbnew/drc/drc_item.cpp:47 qa/drc_proto/drc_item.cpp:44
+#: pcbnew/drc/drc_item.cpp:46
 msgid "Items shorting two nets"
 msgstr "短路两个网络的项目"
 
-#: pcbnew/drc/drc_item.cpp:51 qa/drc_proto/drc_item.cpp:48
+#: pcbnew/drc/drc_item.cpp:50
 msgid "Items not allowed"
 msgstr "不允许的项目"
 
-#: pcbnew/drc/drc_item.cpp:55 qa/drc_proto/drc_item.cpp:52
+#: pcbnew/drc/drc_item.cpp:54
 msgid "Clearance violation"
 msgstr "间隙违规"
 
-#: pcbnew/drc/drc_item.cpp:59 qa/drc_proto/drc_item.cpp:56
+#: pcbnew/drc/drc_item.cpp:58
 msgid "Tracks crossing"
 msgstr "布线有交叉"
 
-#: pcbnew/drc/drc_item.cpp:63 qa/drc_proto/drc_item.cpp:60
+#: pcbnew/drc/drc_item.cpp:62
 msgid "Board edge clearance violation"
 msgstr "电路板边缘间隙违规"
 
-#: pcbnew/drc/drc_item.cpp:67 qa/drc_proto/drc_item.cpp:64
+#: pcbnew/drc/drc_item.cpp:66
 msgid "Copper areas intersect"
 msgstr "覆铜区交叉"
 
-#: pcbnew/drc/drc_item.cpp:71 qa/drc_proto/drc_item.cpp:68
+#: pcbnew/drc/drc_item.cpp:70
 msgid "Copper zone net has no pads"
 msgstr "铜区没有焊盘连接"
 
-#: pcbnew/drc/drc_item.cpp:75 qa/drc_proto/drc_item.cpp:72
+#: pcbnew/drc/drc_item.cpp:74
 msgid "Via is not connected"
 msgstr "过孔未连接"
 
-#: pcbnew/drc/drc_item.cpp:79 qa/drc_proto/drc_item.cpp:76
+#: pcbnew/drc/drc_item.cpp:78
 msgid "Track has unconnected end"
 msgstr "布线有未连接端"
 
-#: pcbnew/drc/drc_item.cpp:83
+#: pcbnew/drc/drc_item.cpp:82
+msgid "Hole clearance"
+msgstr "过孔间隙"
+
+#: pcbnew/drc/drc_item.cpp:86
 msgid "Drilled holes too close together"
 msgstr "钻孔太靠近了"
 
-#: pcbnew/drc/drc_item.cpp:87 qa/drc_proto/drc_item.cpp:84
-msgid "Track width outside allowed limits"
-msgstr "布线宽度超出允许的限制"
+#: pcbnew/drc/drc_item.cpp:90
+msgid "Track width"
+msgstr "布线宽度"
 
-#: pcbnew/drc/drc_item.cpp:91 qa/drc_proto/drc_item.cpp:88
-msgid "Via size too small"
-msgstr "过孔外径太小"
+#: pcbnew/drc/drc_item.cpp:94
+msgid "Annular width"
+msgstr "环形宽度"
 
-#: pcbnew/drc/drc_item.cpp:95 qa/drc_proto/drc_item.cpp:92
-msgid "Via annulus"
-msgstr "通孔环"
-
-#: pcbnew/drc/drc_item.cpp:99 qa/drc_proto/drc_item.cpp:96
+#: pcbnew/drc/drc_item.cpp:98
 msgid "Drill too small"
 msgstr "钻孔内径太小"
 
-#: pcbnew/drc/drc_item.cpp:103 qa/drc_proto/drc_item.cpp:100
+#: pcbnew/drc/drc_item.cpp:102
 msgid "Via hole larger than diameter"
 msgstr "过孔内径大于过孔外径"
 
+#: pcbnew/drc/drc_item.cpp:106
+msgid "Via diameter"
+msgstr "过孔外径"
+
 # Padstack 焊盘槽/孔
-#: pcbnew/drc/drc_item.cpp:107 qa/drc_proto/drc_item.cpp:104
+#: pcbnew/drc/drc_item.cpp:110
 msgid "Padstack is not valid"
 msgstr "焊盘槽/孔无效"
 
-#: pcbnew/drc/drc_item.cpp:111 qa/drc_proto/drc_item.cpp:108
-msgid "Micro via size too small"
-msgstr "微孔外径太小"
-
-#: pcbnew/drc/drc_item.cpp:115 qa/drc_proto/drc_item.cpp:112
+#: pcbnew/drc/drc_item.cpp:114
 msgid "Micro via drill too small"
 msgstr "微孔内径太小"
 
-#: pcbnew/drc/drc_item.cpp:119 qa/drc_proto/drc_item.cpp:116
+#: pcbnew/drc/drc_item.cpp:118
 msgid "Keepout violation"
 msgstr "禁止违规"
 
-#: pcbnew/drc/drc_item.cpp:123 qa/drc_proto/drc_item.cpp:120
+#: pcbnew/drc/drc_item.cpp:122
 msgid "Courtyards overlap"
 msgstr "外框重叠"
 
-#: pcbnew/drc/drc_item.cpp:127 qa/drc_proto/drc_item.cpp:124
+#: pcbnew/drc/drc_item.cpp:126
 msgid "Footprint has no courtyard defined"
 msgstr "封装没有定义外框"
 
-#: pcbnew/drc/drc_item.cpp:131 qa/drc_proto/drc_item.cpp:128
+#: pcbnew/drc/drc_item.cpp:130
 msgid "Footprint has malformed courtyard"
 msgstr "封装的外框有误"
 
-#: pcbnew/drc/drc_item.cpp:135 qa/drc_proto/drc_item.cpp:132
+#: pcbnew/drc/drc_item.cpp:134
 msgid "PTH inside courtyard"
 msgstr "PTH 在外框内"
 
-#: pcbnew/drc/drc_item.cpp:139 qa/drc_proto/drc_item.cpp:136
+#: pcbnew/drc/drc_item.cpp:138
 msgid "NPTH inside courtyard"
 msgstr "NPTH 在外框内"
 
-#: pcbnew/drc/drc_item.cpp:143 qa/drc_proto/drc_item.cpp:140
+#: pcbnew/drc/drc_item.cpp:142
 msgid "Item on a disabled layer"
 msgstr "禁用层上的项目"
 
-#: pcbnew/drc/drc_item.cpp:147 qa/drc_proto/drc_item.cpp:144
+#: pcbnew/drc/drc_item.cpp:146
 msgid "Board has malformed outline"
 msgstr "电路板的格式有误"
 
-#: pcbnew/drc/drc_item.cpp:151 qa/drc_proto/drc_item.cpp:148
+#: pcbnew/drc/drc_item.cpp:150
 msgid "Duplicate footprints"
 msgstr "重复的封装"
 
-#: pcbnew/drc/drc_item.cpp:155 qa/drc_proto/drc_item.cpp:152
+#: pcbnew/drc/drc_item.cpp:154
 msgid "Missing footprint"
 msgstr "错误的封装"
 
-#: pcbnew/drc/drc_item.cpp:159 qa/drc_proto/drc_item.cpp:156
+#: pcbnew/drc/drc_item.cpp:158
 msgid "Extra footprint"
 msgstr "多余的封装"
 
-#: pcbnew/drc/drc_keepout_tester.cpp:100 pcbnew/drc/drc_keepout_tester.cpp:142
-#: pcbnew/drc/drc_keepout_tester.cpp:195 pcbnew/drc/drc_keepout_tester.cpp:245
-#: pcbnew/drc/drc_keepout_tester.cpp:263 pcbnew/drc/drc_keepout_tester.cpp:314
-#: qa/drc_proto/drc_keepout_tester.cpp:101
-#: qa/drc_proto/drc_keepout_tester.cpp:153
-#: qa/drc_proto/drc_keepout_tester.cpp:203
-#: 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_item.cpp:162
+msgid "Pad net doesn't match schematic"
+msgstr "焊盘网络与原理图不匹配"
 
-#: pcbnew/drc/drc_rule.cpp:126 pcbnew/drc/drc_rule_parser.cpp:60
-#: pcbnew/drc/drc_rule_parser.cpp:407 qa/drc_proto/drc_rule_parser.cpp:63
+#: pcbnew/drc/drc_rule.h:145
+#, c-format
+msgid "rule %s"
+msgstr "规则 %s"
+
+#: pcbnew/drc/drc_rule_condition.cpp:53
+msgid "ERROR in expression."
+msgstr "表达式中的错误。"
+
+#: pcbnew/drc/drc_rule_condition.cpp:63
+msgid "ERROR: "
+msgstr "错误：  "
+
+#: pcbnew/drc/drc_rule_condition.cpp:98 pcbnew/drc/drc_rule_parser.cpp:61
+#: pcbnew/drc/drc_rule_parser.cpp:435
 #, c-format
 msgid "ERROR: <a href='%d:%d'>%s</a>%s"
 msgstr "错误：<a href='%d:%d'>%s</a>%s"
 
-#: pcbnew/drc/drc_rule_parser.cpp:98 pcbnew/drc/drc_rule_parser.cpp:178
-#: pcbnew/drc/drc_rule_parser.cpp:318 qa/drc_proto/drc_rule_parser.cpp:101
-#: qa/drc_proto/drc_rule_parser.cpp:177 qa/drc_proto/drc_rule_parser.cpp:308
+#: pcbnew/drc/drc_rule_parser.cpp:71 pcbnew/drc/drc_rule_parser.cpp:445
+#, c-format
+msgid "ERROR: %s%s"
+msgstr "错误：%s%s"
+
+#: pcbnew/drc/drc_rule_parser.cpp:108 pcbnew/drc/drc_rule_parser.cpp:191
+#: pcbnew/drc/drc_rule_parser.cpp:337
 msgid "Missing '('."
 msgstr "缺少 '('。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:104 qa/drc_proto/drc_rule_parser.cpp:107
+#: pcbnew/drc/drc_rule_parser.cpp:114
 msgid "Missing version statement."
 msgstr "缺少版本说明。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:116 qa/drc_proto/drc_rule_parser.cpp:119
+#: pcbnew/drc/drc_rule_parser.cpp:126
 msgid "Missing version number."
 msgstr "缺少版本号。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:128 qa/drc_proto/drc_rule_parser.cpp:131
+#: pcbnew/drc/drc_rule_parser.cpp:138
 #, c-format
 msgid "Unrecognized item '%s'.| Expected version number"
 msgstr "无法识别的项目 '%s'。 | 应为版本号"
 
-#: pcbnew/drc/drc_rule_parser.cpp:134 pcbnew/drc/drc_rule_parser.cpp:211
-#: pcbnew/drc/drc_rule_parser.cpp:338 pcbnew/drc/drc_rule_parser.cpp:358
-#: pcbnew/drc/drc_rule_parser.cpp:378 pcbnew/drc/drc_rule_parser.cpp:455
-#: qa/drc_proto/drc_rule_parser.cpp:137 qa/drc_proto/drc_rule_parser.cpp:212
-#: qa/drc_proto/drc_rule_parser.cpp:328 qa/drc_proto/drc_rule_parser.cpp:348
-#: qa/drc_proto/drc_rule_parser.cpp:368 qa/drc_proto/drc_rule_parser.cpp:461
+#: pcbnew/drc/drc_rule_parser.cpp:145 pcbnew/drc/drc_rule_parser.cpp:224
+#: pcbnew/drc/drc_rule_parser.cpp:357 pcbnew/drc/drc_rule_parser.cpp:378
+#: pcbnew/drc/drc_rule_parser.cpp:399 pcbnew/drc/drc_rule_parser.cpp:501
 #, c-format
 msgid "Unrecognized item '%s'."
 msgstr "无法识别的项目 '%s'。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:146 pcbnew/drc/drc_rule_parser.cpp:222
-#: pcbnew/drc/drc_rule_parser.cpp:385
+#: pcbnew/drc/drc_rule_parser.cpp:158 pcbnew/drc/drc_rule_parser.cpp:237
+#: pcbnew/drc/drc_rule_parser.cpp:407
 msgid "Incomplete statement."
 msgstr "声明不完整。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:150 pcbnew/drc/drc_rule_parser.cpp:226
-#: pcbnew/drc/drc_rule_parser.cpp:267 pcbnew/drc/drc_rule_parser.cpp:299
-#: pcbnew/drc/drc_rule_parser.cpp:389 qa/drc_proto/drc_rule_parser.cpp:149
-#: qa/drc_proto/drc_rule_parser.cpp:223 qa/drc_proto/drc_rule_parser.cpp:265
-#: qa/drc_proto/drc_rule_parser.cpp:292 qa/drc_proto/drc_rule_parser.cpp:398
+#: pcbnew/drc/drc_rule_parser.cpp:162 pcbnew/drc/drc_rule_parser.cpp:241
+#: pcbnew/drc/drc_rule_parser.cpp:286 pcbnew/drc/drc_rule_parser.cpp:318
+#: pcbnew/drc/drc_rule_parser.cpp:411
 #, c-format
 msgid "Unrecognized item '%s'.| Expected %s."
 msgstr "无法识别的项目 '%s'。 | 应为 %s。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:158 qa/drc_proto/drc_rule_parser.cpp:157
+#: pcbnew/drc/drc_rule_parser.cpp:171
 msgid "No errors found."
 msgstr "未发现错误。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:171 qa/drc_proto/drc_rule_parser.cpp:170
+#: pcbnew/drc/drc_rule_parser.cpp:184
 msgid "Missing rule name."
 msgstr "缺少规则名称。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:193 qa/drc_proto/drc_rule_parser.cpp:192
+#: pcbnew/drc/drc_rule_parser.cpp:206
 msgid "Missing condition expression."
 msgstr "缺少条件表达式。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:204 qa/drc_proto/drc_rule_parser.cpp:205
+#: pcbnew/drc/drc_rule_parser.cpp:217
 #, c-format
 msgid "Unrecognized item '%s'.| Expected quoted expression."
 msgstr "无法识别的项目 '%s'。|应为带引号的表达式。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:235 pcbnew/drc/drc_rule_parser.cpp:295
-#: pcbnew/drc/drc_rule_parser.cpp:310 pcbnew/drc/drc_rule_parser.cpp:397
+#: pcbnew/drc/drc_rule_parser.cpp:250 pcbnew/drc/drc_rule_parser.cpp:314
+#: pcbnew/drc/drc_rule_parser.cpp:329 pcbnew/drc/drc_rule_parser.cpp:420
 msgid "Missing ')'."
 msgstr "缺少 ')'。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:253 qa/drc_proto/drc_rule_parser.cpp:246
+#: pcbnew/drc/drc_rule_parser.cpp:267
 #, c-format
 msgid "Missing constraint type.|  Expected %s."
 msgstr "缺少约束类型。|  应为 %s。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:329 qa/drc_proto/drc_rule_parser.cpp:319
+#: pcbnew/drc/drc_rule_parser.cpp:348
 msgid "Missing min value."
 msgstr "缺少最小值。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:349 qa/drc_proto/drc_rule_parser.cpp:339
+#: pcbnew/drc/drc_rule_parser.cpp:369
 msgid "Missing max value."
 msgstr "缺少最大值。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:369 qa/drc_proto/drc_rule_parser.cpp:359
+#: pcbnew/drc/drc_rule_parser.cpp:390
 msgid "Missing opt value."
 msgstr "缺少选择值。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:431 qa/drc_proto/drc_rule_parser.cpp:437
+#: pcbnew/drc/drc_rule_parser.cpp:468
 msgid "Missing layer name or type."
 msgstr "缺少图层名称或类型。"
 
-#: pcbnew/drc/drc_rule_parser.cpp:448 pcbnew/pcb_expr_evaluator.cpp:52
-#: qa/drc_proto/drc_rule_parser.cpp:454
+#: pcbnew/drc/drc_rule_parser.cpp:494
 #, c-format
-msgid "Unrecognized layer '%s' "
-msgstr "无法识别的图层 '%s' "
+msgid "Unrecognized layer '%s'."
+msgstr "无法识别的图层 '%s'。"
 
-#: pcbnew/drc/footprint_tester.cpp:65 qa/drc_proto/footprint_tester.cpp:64
+#: pcbnew/drc/drc_test_provider_annulus.cpp:79
+msgid "Checking via annular rings..."
+msgstr "检查过孔环形孔..."
+
+#: pcbnew/drc/drc_test_provider_annulus.cpp:121
+#, c-format
+msgid " (%s min annular width %s; actual %s)"
+msgstr " (%s 最小环形宽度 %s；实际 %s)"
+
+#: pcbnew/drc/drc_test_provider_annulus.cpp:127
+#, c-format
+msgid " (%s max annular width %s; actual %s)"
+msgstr " (%s 最大环形宽度 %s；实际 %s)"
+
+#: pcbnew/drc/drc_test_provider_connectivity.cpp:74
+msgid "Checking pad, via and zone connections..."
+msgstr "正在检查焊盘、过孔和区域连接..."
+
+#: pcbnew/drc/drc_test_provider_connectivity.cpp:145
+msgid "Checking net connections..."
+msgstr "正在检查网络连接..."
+
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:126
+msgid "Checking pad clearances..."
+msgstr "正在检查焊盘间隙..."
+
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:131
+msgid "Checking track & via clearances..."
+msgstr "正在检查布线和过孔间隙..."
+
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:136
+msgid "Checking copper graphic & text clearances..."
+msgstr "正在检查铜图形和文本间隙..."
+
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:141
+msgid "Checking copper zone clearances..."
+msgstr "正在检查铜区间隙..."
+
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:238
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:281
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:374
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:450
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:506
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:651
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:831
+#: pcbnew/drc/drc_test_provider_edge_clearance.cpp:151
+#: pcbnew/drc/drc_test_provider_hole_clearance.cpp:289
+#: pcbnew/drc/drc_test_provider_hole_clearance.cpp:322
+#: pcbnew/drc/drc_test_provider_hole_clearance.cpp:412
+#: qa/drc_proto/drc_test_provider_silk_to_pad.cpp:143
+#, c-format
+msgid " (%s clearance %s; actual %s)"
+msgstr " (%s 间隙 %s; 实际 %s)"
+
+#: pcbnew/drc/drc_test_provider_copper_clearance.cpp:610
+#, c-format
+msgid " (nets %s and %s)"
+msgstr " (网络 %s 和 %s)"
+
+#: pcbnew/drc/drc_test_provider_courtyard_clearance.cpp:81
+msgid "Checking footprint courtyard definitions..."
+msgstr "正在检查封装外框定义..."
+
+#: pcbnew/drc/drc_test_provider_courtyard_clearance.cpp:116
+#: pcbnew/drc/drc_test_provider_misc.cpp:93
+msgid " (not a closed shape)"
+msgstr " (不是闭合形状)"
+
+#: pcbnew/drc/drc_test_provider_courtyard_clearance.cpp:130
+msgid "Checking footprint courtyard overlap..."
+msgstr "正在检查封装外框重叠..."
+
+#: pcbnew/drc/drc_test_provider_disallow.cpp:73
+msgid "Checking keepouts & disallow constraints..."
+msgstr "正在检查禁布区和不允许约束..."
+
+#: pcbnew/drc/drc_test_provider_disallow.cpp:87
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: pcbnew/drc/drc_test_provider_edge_clearance.cpp:92
+msgid "Checking board edge clearances..."
+msgstr "正在检查板边缘间隙..."
+
+#: pcbnew/drc/drc_test_provider_hole_clearance.cpp:127
+msgid "Checking hole to pad clearances..."
+msgstr "正在检查通孔到焊盘间隙..."
+
+#: pcbnew/drc/drc_test_provider_hole_clearance.cpp:132
+msgid "Checking hole to hole clearances..."
+msgstr "正在检查通孔到通孔间隙..."
+
+#: pcbnew/drc/drc_test_provider_hole_size.cpp:79
+msgid "Checking pad holes..."
+msgstr "正在检查焊盘通孔..."
+
+#: pcbnew/drc/drc_test_provider_hole_size.cpp:98
+msgid "Checking via holes..."
+msgstr "正在检查微孔通孔..."
+
+#: pcbnew/drc/drc_test_provider_hole_size.cpp:143
+#: pcbnew/drc/drc_test_provider_hole_size.cpp:185
+#, c-format
+msgid " (%s %s; actual %s)"
+msgstr " (%s %s; 实际 %s)"
+
+#: pcbnew/drc/drc_test_provider_lvs.cpp:118
 #, c-format
 msgid "Missing footprint %s (%s)"
 msgstr "缺失的封装 %s (%s)"
 
-#: pcbnew/eagle_plugin.cpp:956
+#: pcbnew/drc/drc_test_provider_lvs.cpp:139
+msgid "No corresponding pin found in schematic."
+msgstr "在原理图中找不到相应的引脚。"
+
+#: pcbnew/drc/drc_test_provider_lvs.cpp:148
+#, c-format
+msgid "Pad missing net given by schematic (%s)."
+msgstr "原理图 (%s) 给出的焊盘缺失网络。"
+
+#: pcbnew/drc/drc_test_provider_lvs.cpp:158
+#, c-format
+msgid "Pad net (%s) doesn't match net given by schematic (%s)."
+msgstr "焊盘网络 (%s) 与原理图 (%s) 提供的网络不匹配。"
+
+#: pcbnew/drc/drc_test_provider_lvs.cpp:178
+#, c-format
+msgid "No pad found for pin %s in schematic."
+msgstr "在原理图中未找到引脚 %s 的焊盘。"
+
+#: pcbnew/drc/drc_test_provider_lvs.cpp:211
+msgid "Checking PCB to schematic parity..."
+msgstr "正在检查 PCB 到原理图奇偶校验..."
+
+#: pcbnew/drc/drc_test_provider_misc.cpp:118
+#, c-format
+msgid " (layer %s)"
+msgstr "  （层 %s）"
+
+#: pcbnew/drc/drc_test_provider_misc.cpp:194
+msgid "Checking board outline..."
+msgstr "正在检查电路板边框..."
+
+#: pcbnew/drc/drc_test_provider_misc.cpp:199
+msgid "Checking disabled layers..."
+msgstr "正在检查禁用的图层..."
+
+#: pcbnew/drc/drc_test_provider_misc.cpp:204
+msgid "Checking text variables..."
+msgstr "正在检查文本变量..."
+
+#: pcbnew/drc/drc_test_provider_track_width.cpp:77
+msgid "Checking track widths..."
+msgstr "正在检查布线宽度..."
+
+#: pcbnew/drc/drc_test_provider_track_width.cpp:126
+#, c-format
+msgid " (%s %s width %s; actual %s)"
+msgstr "  （%s %s 宽度 %s;实际 %s）"
+
+#: pcbnew/drc/drc_test_provider_track_width.cpp:128
+#: pcbnew/drc/drc_test_provider_via_diameter.cpp:115
+msgid "min"
+msgstr "分钟"
+
+#: pcbnew/drc/drc_test_provider_track_width.cpp:128
+#: pcbnew/drc/drc_test_provider_via_diameter.cpp:115
+msgid "max"
+msgstr "最大"
+
+#: pcbnew/drc/drc_test_provider_via_diameter.cpp:75
+msgid "Checking via diameters..."
+msgstr "正在检查过孔直径..."
+
+#: pcbnew/drc/drc_test_provider_via_diameter.cpp:113
+#, c-format
+msgid " (%s %s diameter %s; actual %s)"
+msgstr "  （%s %s 直径 %s;实际 %s）"
+
+#: pcbnew/eagle_plugin.cpp:953
 #, c-format
 msgid "<package> name: \"%s\" duplicated in eagle <library>: \"%s\""
 msgstr "<包> 名称: \"%s\" 在 eagle <库>: \"%s\" 有重复"
 
-#: pcbnew/eagle_plugin.cpp:1033
+#: pcbnew/eagle_plugin.cpp:1030
 #, c-format
 msgid "No \"%s\" package in library \"%s\""
 msgstr "没有 \"%s\" 封装在库 \"%s\" 里"
 
-#: pcbnew/eagle_plugin.cpp:2530
+#: pcbnew/eagle_plugin.cpp:2515
 #, c-format
 msgid "Unsupported Eagle layer '%s' (%d), converted to Dwgs.User layer"
 msgstr "不支持的边框层 \"%s\"(%d)，转换为用户图纸层"
@@ -25998,11 +26802,11 @@ msgstr ""
 "它们已作为椭圆形焊盘导出器。"
 
 #: pcbnew/exporters/export_idf.cpp:627 pcbnew/exporters/export_idf.cpp:636
-#: pcbnew/exporters/export_idf.cpp:644 pcbnew/exporters/export_vrml.cpp:1701
+#: pcbnew/exporters/export_idf.cpp:644 pcbnew/exporters/export_vrml.cpp:1685
 msgid "IDF Export Failed:\n"
 msgstr "IDF 导出失败：\n"
 
-#: pcbnew/exporters/export_vrml.cpp:858
+#: pcbnew/exporters/export_vrml.cpp:838
 msgid ""
 "Unable to calculate the board outlines; fall back to using the board "
 "boundary box."
@@ -26010,7 +26814,7 @@ msgstr ""
 "无法计算板边\n"
 "退回到使用电路板边界框。"
 
-#: pcbnew/exporters/export_vrml.cpp:889
+#: pcbnew/exporters/export_vrml.cpp:869
 msgid "VRML Export Failed: Could not add holes to contours."
 msgstr "VRML 导出失败：轮廓上不能添加孔。"
 
@@ -26078,9 +26882,9 @@ msgstr ""
 msgid "Footprint Report"
 msgstr "封装报告"
 
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:128
-#: pcbnew/exporters/gendrill_file_writer_base.cpp:343
-#: pcbnew/exporters/gendrill_gerber_writer.cpp:114
+#: pcbnew/exporters/gendrill_Excellon_writer.cpp:130
+#: pcbnew/exporters/gendrill_file_writer_base.cpp:345
+#: pcbnew/exporters/gendrill_gerber_writer.cpp:116
 #, c-format
 msgid "Create file %s\n"
 msgstr "创建文件 %s\n"
@@ -26103,46 +26907,56 @@ msgstr ""
 "板堆叠设置不是最新的\n"
 "请修复堆叠"
 
-#: pcbnew/files.cpp:134
+#: pcbnew/files.cpp:135
 msgid "Open Board File"
 msgstr "打开电路板文件"
 
-#: pcbnew/files.cpp:134
+#: pcbnew/files.cpp:135
 msgid "Import Non KiCad Board File"
 msgstr "导入非 KiCad 电路板文件"
 
-#: pcbnew/files.cpp:170
+#: pcbnew/files.cpp:161
+msgid "Create a new project for this board"
+msgstr "为此板创建新工程"
+
+#: pcbnew/files.cpp:163
+msgid ""
+"Creating a project will enable features such as design rules, net classes, "
+"and layer presets"
+msgstr "创建工程将启用设计规则、网络类和图层预设等功能"
+
+#: pcbnew/files.cpp:205
 msgid "Save Board File As"
 msgstr "另存文件"
 
-#: pcbnew/files.cpp:193
+#: pcbnew/files.cpp:235
 msgid "Printed circuit board"
 msgstr "印刷电路板"
 
-#: pcbnew/files.cpp:257
+#: pcbnew/files.cpp:299
 #, c-format
 msgid "Recovery file \"%s\" not found."
 msgstr "没有找到备份文件 \"%s\"。"
 
-#: pcbnew/files.cpp:262
+#: pcbnew/files.cpp:304
 #, c-format
 msgid "OK to load recovery file \"%s\""
 msgstr "确定加载恢复文件 \"%s\""
 
-#: pcbnew/files.cpp:285
+#: pcbnew/files.cpp:327
 #, c-format
 msgid "Current board will be closed, save changes to \"%s\" before continuing?"
 msgstr "当前电路板将关闭，是否在继续之前保存对 \"%s\" 的更改？"
 
-#: pcbnew/files.cpp:293
+#: pcbnew/files.cpp:335
 msgid "Current Board will be closed. Continue?"
 msgstr "当前电路板将关闭。是否继续？"
 
-#: pcbnew/files.cpp:334
+#: pcbnew/files.cpp:376
 msgid "noname"
 msgstr "无名称"
 
-#: pcbnew/files.cpp:431
+#: pcbnew/files.cpp:479
 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"
@@ -26154,25 +26968,25 @@ msgstr ""
 "导致与之前使用的 KiCad 版本不同的填充\n"
 "板框图层上板边界的线宽。"
 
-#: pcbnew/files.cpp:435
+#: pcbnew/files.cpp:483
 msgid "Edge Clearance Warning"
 msgstr "边缘间隙警告"
 
-#: pcbnew/files.cpp:466
+#: pcbnew/files.cpp:514
 #, c-format
 msgid "PCB file \"%s\" is already open."
 msgstr "PCB 文件 \"%s\" 已经打开。"
 
-#: pcbnew/files.cpp:473
+#: pcbnew/files.cpp:521
 msgid "The current PCB has been modified.  Save changes?"
 msgstr "当前 PCB 已被修改。是否保存更改？"
 
-#: pcbnew/files.cpp:492
+#: pcbnew/files.cpp:540
 #, c-format
 msgid "PCB \"%s\" does not exist.  Do you wish to create it?"
 msgstr "PCB \"%s\" 不存在，你想创建它吗？"
 
-#: pcbnew/files.cpp:617
+#: pcbnew/files.cpp:665
 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."
@@ -26180,12 +26994,12 @@ msgstr ""
 "这个文件是由 Pcbnew 旧版本创建\n"
 "当您保存此文件，它会以新的文件格式存储。"
 
-#: pcbnew/files.cpp:696 pcbnew/files.cpp:838
+#: pcbnew/files.cpp:744 pcbnew/files.cpp:886
 #, c-format
 msgid "No access rights to write to file \"%s\""
 msgstr "没有权限写入文件 \"%s\""
 
-#: pcbnew/files.cpp:764 pcbnew/files.cpp:862
+#: pcbnew/files.cpp:812 pcbnew/files.cpp:910
 #, c-format
 msgid ""
 "Error saving board file \"%s\".\n"
@@ -26194,7 +27008,7 @@ msgstr ""
 "保存电路板文件 \"%s\" 错误。\n"
 "%s"
 
-#: pcbnew/files.cpp:783
+#: pcbnew/files.cpp:831
 #, c-format
 msgid ""
 "Error saving board file \"%s\".\n"
@@ -26203,12 +27017,12 @@ msgstr ""
 "保存电路板文件 \"%s\" 时出错。\n"
 "重命名临时文件 \"%s\" 失败"
 
-#: pcbnew/files.cpp:818
+#: pcbnew/files.cpp:866
 #, c-format
 msgid "Wrote board file: \"%s\""
 msgstr "写板文件：\"%s\""
 
-#: pcbnew/files.cpp:870
+#: pcbnew/files.cpp:948
 #, c-format
 msgid ""
 "Board copied to:\n"
@@ -26217,7 +27031,7 @@ msgstr ""
 "PCB 复制到：\n"
 "\"%s\""
 
-#: pcbnew/files.cpp:987
+#: pcbnew/files.cpp:1065
 #, c-format
 msgid ""
 "Error occurred saving project specific footprint library table:\n"
@@ -26228,44 +27042,45 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/footprint_edit_frame.cpp:167 pcbnew/zone_settings.cpp:218
+#: pcbnew/footprint_edit_frame.cpp:193 pcbnew/zone_settings.cpp:218
 msgid "Inner layers"
 msgstr "内部图层"
 
-#: pcbnew/footprint_edit_frame.cpp:226 pcbnew/pcb_edit_frame.cpp:265
+#: pcbnew/footprint_edit_frame.cpp:227 pcbnew/pcb_edit_frame.cpp:266
 msgid "Selection Filter"
 msgstr "选择筛选器"
 
-#: pcbnew/footprint_edit_frame.cpp:249
+#: pcbnew/footprint_edit_frame.cpp:250
 msgid "Footprint changes are unsaved"
 msgstr "封装更改未保存"
 
-#: pcbnew/footprint_edit_frame.cpp:411
+#: pcbnew/footprint_edit_frame.cpp:412
 #, c-format
 msgid "Editing %s from board.  Saving will update the board only."
 msgstr "正在从电路板编辑 %s。保存只会更新电路板。"
 
-#: pcbnew/footprint_edit_frame.cpp:722
-msgid "[Read Only]"
-msgstr "[只读]"
+#: pcbnew/footprint_edit_frame.cpp:705
+#, c-format
+msgid "%s [from %s.%s]"
+msgstr "%s [从 %s.%s]"
 
-#: pcbnew/footprint_edit_frame.cpp:729
+#: pcbnew/footprint_edit_frame.cpp:730
 msgid "[Unsaved]"
 msgstr "[未保存]"
 
-#: pcbnew/footprint_edit_frame.cpp:794
+#: pcbnew/footprint_edit_frame.cpp:797
 msgid "Updating Footprint Libraries"
 msgstr "更新封装库"
 
-#: pcbnew/footprint_edit_frame.cpp:874
+#: pcbnew/footprint_edit_frame.cpp:877
 msgid "Default Values"
 msgstr "默认值"
 
-#: pcbnew/footprint_edit_frame.cpp:1055
+#: pcbnew/footprint_edit_frame.cpp:1063
 msgid "No footprint selected."
 msgstr "没有选择封装。"
 
-#: pcbnew/footprint_edit_frame.cpp:1064
+#: pcbnew/footprint_edit_frame.cpp:1072
 msgid "Footprint Image File Name"
 msgstr "封装图像文件名称"
 
@@ -26367,45 +27182,45 @@ msgstr "无法创建或写入文件 \"%s\""
 msgid "Footprint exported to file \"%s\""
 msgstr "导出封装到文件 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:438
+#: pcbnew/footprint_libraries_utils.cpp:438 pcbnew/kicad_plugin.cpp:2322
 #, c-format
-msgid "Library \"%s\" is read only, not writable"
-msgstr "\"%s\" 库为只读，不可写"
+msgid "Library \"%s\" is read only."
+msgstr "\"%s\" 库为只读。"
 
-#: pcbnew/footprint_libraries_utils.cpp:445
+#: pcbnew/footprint_libraries_utils.cpp:444
 #, c-format
 msgid "Library %s already exists."
 msgstr "库 \"%s\" 已经存在。"
 
-#: pcbnew/footprint_libraries_utils.cpp:506
+#: pcbnew/footprint_libraries_utils.cpp:505
 msgid "Select Library Table"
 msgstr "选择库表"
 
-#: pcbnew/footprint_libraries_utils.cpp:589
+#: pcbnew/footprint_libraries_utils.cpp:581
 #, c-format
-msgid "Library '%s' is read only"
-msgstr "库 '%s' 为只读"
+msgid "Library '%s' is read only."
+msgstr "\"%s\" 库为只读。"
 
-#: pcbnew/footprint_libraries_utils.cpp:595
+#: pcbnew/footprint_libraries_utils.cpp:587
 #, c-format
 msgid "Delete footprint '%s' from library '%s'?"
 msgstr "删除封装 '%s' 来自库 '%s'？"
 
-#: pcbnew/footprint_libraries_utils.cpp:612
+#: pcbnew/footprint_libraries_utils.cpp:604
 #, c-format
 msgid "Footprint '%s' deleted from library '%s'"
 msgstr "封装 \"%s\" 删除来自库 '%s'"
 
-#: pcbnew/footprint_libraries_utils.cpp:627
+#: pcbnew/footprint_libraries_utils.cpp:619
 msgid "No footprints to archive!"
 msgstr "没有要压缩的封装！"
 
-#: pcbnew/footprint_libraries_utils.cpp:782
+#: pcbnew/footprint_libraries_utils.cpp:774
 #: pcbnew/footprint_viewer_frame.cpp:723
 msgid "No board currently open."
 msgstr "当前没有打开的板。"
 
-#: pcbnew/footprint_libraries_utils.cpp:808
+#: pcbnew/footprint_libraries_utils.cpp:800
 msgid ""
 "Unable to find the footprint on the main board.\n"
 "Cannot save."
@@ -26413,46 +27228,42 @@ msgstr ""
 "无法在主电路板板上找到封装。\n"
 "无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:814
-msgid "Footprint already exists on board."
-msgstr "封装已经存在于电路板上。"
-
-#: pcbnew/footprint_libraries_utils.cpp:888
+#: pcbnew/footprint_libraries_utils.cpp:874
 msgid "Save Footprint"
 msgstr "保存封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:925
+#: pcbnew/footprint_libraries_utils.cpp:911
 msgid "No library specified.  Footprint could not be saved."
 msgstr "没有指定库，封装无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:935
+#: pcbnew/footprint_libraries_utils.cpp:921
 msgid "No footprint name specified.  Footprint could not be saved."
 msgstr "没有指定封装名称, 封装无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:959
+#: pcbnew/footprint_libraries_utils.cpp:945
 #, c-format
 msgid "Footprint %s already exists in %s."
 msgstr "封装 \"%s\" 已经存在于 \"%s\" 中。"
 
-#: pcbnew/footprint_libraries_utils.cpp:975
+#: pcbnew/footprint_libraries_utils.cpp:961
 #, c-format
 msgid "Component \"%s\" replaced in \"%s\""
 msgstr "元件 \"%s\" 替换为 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:976
+#: pcbnew/footprint_libraries_utils.cpp:962
 #, c-format
 msgid "Component \"%s\" added in  \"%s\""
 msgstr "元件 \"%s\" 添加到 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:1024
+#: pcbnew/footprint_libraries_utils.cpp:1010
 msgid "Enter footprint name:"
 msgstr "输入封装名称:"
 
-#: pcbnew/footprint_libraries_utils.cpp:1024
+#: pcbnew/footprint_libraries_utils.cpp:1010
 msgid "New Footprint"
 msgstr "新建封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:1037
+#: pcbnew/footprint_libraries_utils.cpp:1023
 msgid "No footprint name defined."
 msgstr "没有定义封装名称."
 
@@ -26497,36 +27308,36 @@ msgstr "封装库没有找到。"
 msgid "Footprint Wizard"
 msgstr "封装向导"
 
-#: pcbnew/footprint_wizard_frame.cpp:202
+#: pcbnew/footprint_wizard_frame.cpp:199
 msgid "Parameters"
 msgstr "参数"
 
-#: pcbnew/footprint_wizard_frame.cpp:334
+#: pcbnew/footprint_wizard_frame.cpp:328
 msgid "Parameter"
 msgstr "参数"
 
-#: pcbnew/footprint_wizard_frame.cpp:583
+#: pcbnew/footprint_wizard_frame.cpp:577
 #, c-format
 msgid "ModView: 3D Viewer [%s]"
 msgstr "模型浏览：3D 查看器 [%s]"
 
-#: pcbnew/footprint_wizard_frame.cpp:599
+#: pcbnew/footprint_wizard_frame.cpp:593
 msgid "Select wizard script to run"
 msgstr "选择向导脚本运行"
 
-#: pcbnew/footprint_wizard_frame.cpp:604
+#: pcbnew/footprint_wizard_frame.cpp:598
 msgid "Reset wizard parameters to default"
 msgstr "重置向导参数为默认值"
 
-#: pcbnew/footprint_wizard_frame.cpp:609
+#: pcbnew/footprint_wizard_frame.cpp:603
 msgid "Select previous parameters page"
 msgstr "选择上一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:612
+#: pcbnew/footprint_wizard_frame.cpp:606
 msgid "Select next parameters page"
 msgstr "选择下一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:627
+#: pcbnew/footprint_wizard_frame.cpp:621
 msgid "Export footprint to editor"
 msgstr "导出封装到编辑器"
 
@@ -26651,7 +27462,7 @@ msgstr "\"%s\" 无法转换为整数"
 msgid "footprint library path \"%s\" does not exist"
 msgstr "封装库路径 \"%s\" 不存在"
 
-#: pcbnew/gpcb_plugin.cpp:287 pcbnew/kicad_plugin.cpp:296
+#: pcbnew/gpcb_plugin.cpp:287 pcbnew/kicad_plugin.cpp:291
 #, c-format
 msgid "library \"%s\" has no footprint \"%s\" to delete"
 msgstr "库 \"%s\" 中没有封装 \"%s\" 可删除"
@@ -26666,7 +27477,7 @@ msgstr "未知标记 \"%s\""
 msgid "Element token contains %d parameters."
 msgstr "元素标记包含 %d 个参数。"
 
-#: pcbnew/gpcb_plugin.cpp:961 pcbnew/kicad_plugin.cpp:2195
+#: pcbnew/gpcb_plugin.cpp:961 pcbnew/kicad_plugin.cpp:2236
 #, c-format
 msgid "Library \"%s\" is read only"
 msgstr "\"%s\" 库为只读"
@@ -26778,7 +27589,7 @@ msgid ""
 "Current Board will be lost and this operation cannot be undone. Continue?"
 msgstr "当前电路板将丢失，此操作无法撤消。继续吗？"
 
-#: pcbnew/io_mgr.cpp:92
+#: pcbnew/io_mgr.cpp:93
 #, c-format
 msgid "UNKNOWN (%d)"
 msgstr "未知(%d)"
@@ -26787,27 +27598,27 @@ msgstr "未知(%d)"
 msgid "Clipboard content is not KiCad compatible"
 msgstr "剪贴板内容不兼容 KiCad"
 
-#: pcbnew/kicad_plugin.cpp:167
+#: pcbnew/kicad_plugin.cpp:162
 #, c-format
 msgid "Cannot create footprint library path \"%s\""
 msgstr "不能创建封装库路径 \"%s\""
 
-#: pcbnew/kicad_plugin.cpp:173
+#: pcbnew/kicad_plugin.cpp:168
 #, c-format
 msgid "Footprint library path \"%s\" is read only"
 msgstr "封装库路径 \"%s\" 只读"
 
-#: pcbnew/kicad_plugin.cpp:212
+#: pcbnew/kicad_plugin.cpp:207
 #, c-format
 msgid "Cannot rename temporary file \"%s\" to footprint library file \"%s\""
 msgstr "无法重命名临时文件 \"%s\" 到封装库文件 \"%s\""
 
-#: pcbnew/kicad_plugin.cpp:239
+#: pcbnew/kicad_plugin.cpp:234
 #, c-format
 msgid "Footprint library path '%s' does not exist (or is not a directory)."
 msgstr "封装库路径 \"%s\" 不存在（或不是目录）。"
 
-#: pcbnew/kicad_plugin.cpp:340
+#: pcbnew/kicad_plugin.cpp:335
 #, c-format
 msgid ""
 "Please report this bug.  Error validating group structure: %s\n"
@@ -26818,34 +27629,34 @@ msgstr ""
 "\n"
 "还是要保存吗？"
 
-#: pcbnew/kicad_plugin.cpp:342
+#: pcbnew/kicad_plugin.cpp:337
 msgid "Internal group data structure corrupt"
 msgstr "内部组数据结构损坏"
 
-#: pcbnew/kicad_plugin.cpp:344
+#: pcbnew/kicad_plugin.cpp:339
 msgid "Save Anyway"
 msgstr "仍要保存"
 
-#: pcbnew/kicad_plugin.cpp:1209 pcbnew/legacy_plugin.cpp:98
+#: pcbnew/kicad_plugin.cpp:1245 pcbnew/legacy_plugin.cpp:98
 #, c-format
 msgid "unknown pad type: %d"
 msgstr "未知焊盘类型：%d"
 
-#: pcbnew/kicad_plugin.cpp:1626
+#: pcbnew/kicad_plugin.cpp:1666
 #, c-format
 msgid "unknown via type %d"
 msgstr "未知过孔类型 %d"
 
-#: pcbnew/kicad_plugin.cpp:1794
+#: pcbnew/kicad_plugin.cpp:1835
 #, c-format
 msgid "unknown zone corner smoothing type %d"
 msgstr "未知铜区角平滑类型  %d"
 
-#: pcbnew/kicad_plugin.cpp:2046
+#: pcbnew/kicad_plugin.cpp:2087
 msgid "this file does not contain a PCB"
 msgstr "此文件不包含 PCB"
 
-#: pcbnew/kicad_plugin.cpp:2183
+#: pcbnew/kicad_plugin.cpp:2224
 #, c-format
 msgid ""
 "Library \"%s\" does not exist.\n"
@@ -26854,46 +27665,41 @@ msgstr ""
 "库 \"%s\" 不存在。\n"
 "是否要创建它？"
 
-#: pcbnew/kicad_plugin.cpp:2187
+#: pcbnew/kicad_plugin.cpp:2228
 msgid "Library Not Found"
 msgstr "未找到库"
 
-#: pcbnew/kicad_plugin.cpp:2226
+#: pcbnew/kicad_plugin.cpp:2267
 #, c-format
 msgid "Footprint file name \"%s\" is not valid."
 msgstr "无效的封装文件名称 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2232
+#: pcbnew/kicad_plugin.cpp:2273
 #, c-format
 msgid "No write permissions to delete file \"%s\""
 msgstr "没有写入权限来删除文件 \"%s\""
 
-#: pcbnew/kicad_plugin.cpp:2281
-#, c-format
-msgid "Library \"%s\" is read only."
-msgstr "\"%s\" 库为只读。"
-
-#: pcbnew/kicad_plugin.cpp:2300
+#: pcbnew/kicad_plugin.cpp:2341
 #, c-format
 msgid "Cannot overwrite library path \"%s\"."
 msgstr "不能覆盖库路径 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2325
+#: pcbnew/kicad_plugin.cpp:2366
 #, c-format
 msgid "User does not have permission to delete directory \"%s\"."
 msgstr "用户没有权限删除目录 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2333
+#: pcbnew/kicad_plugin.cpp:2374
 #, c-format
 msgid "Library directory \"%s\" has unexpected sub-directories."
 msgstr "库目录 \"%s\" 有额外的子目录。"
 
-#: pcbnew/kicad_plugin.cpp:2352
+#: pcbnew/kicad_plugin.cpp:2393
 #, c-format
 msgid "Unexpected file \"%s\" was found in library path \"%s\"."
 msgstr "在库路径 \"%s\" 中找到了额外的文件 \"%s\"。"
 
-#: pcbnew/kicad_plugin.cpp:2368
+#: pcbnew/kicad_plugin.cpp:2409
 #, c-format
 msgid "Footprint library \"%s\" cannot be deleted."
 msgstr "封装库 \"%s\" 不能被删除。"
@@ -26906,10 +27712,9 @@ msgstr "更改层的颜色 "
 msgid "Change Render Color for "
 msgstr "更改渲染颜色 "
 
-#: pcbnew/layer_widget.cpp:337 pcbnew/widgets/appearance_controls.cpp:675
-#: pcbnew/widgets/appearance_controls.cpp:1007
-#: pcbnew/widgets/appearance_controls.cpp:1488
-#: pcbnew/widgets/appearance_controls.cpp:1687
+#: pcbnew/layer_widget.cpp:337 pcbnew/widgets/appearance_controls.cpp:868
+#: pcbnew/widgets/appearance_controls.cpp:1701
+#: pcbnew/widgets/appearance_controls.cpp:1900
 msgid ""
 "Left double click or middle click for color change, right click for menu"
 msgstr "双击鼠标左键或点击中键修改颜色，单击右键弹出菜单"
@@ -26978,7 +27783,7 @@ msgstr "CZONE_CONTAINER \"%s\"的错误 ZAux"
 msgid "Bad ZSmoothing for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\"是坏的 ZSmoothing"
 
-#: pcbnew/legacy_plugin.cpp:2591 pcbnew/pcb_parser.cpp:4153
+#: pcbnew/legacy_plugin.cpp:2591 pcbnew/pcb_parser.cpp:4417
 msgid ""
 "The legacy segment fill mode is no longer supported.\n"
 "Convert zones to polygon fills?"
@@ -26986,7 +27791,7 @@ msgstr ""
 "不再支持旧段填充模式。\n"
 "是否将区域转换为多边形填充？"
 
-#: pcbnew/legacy_plugin.cpp:2593 pcbnew/pcb_parser.cpp:4155
+#: pcbnew/legacy_plugin.cpp:2593 pcbnew/pcb_parser.cpp:4419
 msgid "Legacy Zone Warning"
 msgstr "旧区警告"
 
@@ -26995,7 +27800,7 @@ msgstr "旧区警告"
 msgid "Bad ZClearance padoption for CZONE_CONTAINER \"%s\""
 msgstr "CZONE_CONTAINER \"%s\" 的 ZClearance 选项不正确"
 
-#: pcbnew/legacy_plugin.cpp:2950 pcbnew/legacy_plugin.cpp:2987
+#: pcbnew/legacy_plugin.cpp:2945 pcbnew/legacy_plugin.cpp:2982
 #, c-format
 msgid ""
 "invalid float number in file: \"%s\"\n"
@@ -27004,7 +27809,7 @@ msgstr ""
 "文件中的浮点数字无效：\"%s\"\n"
 "行：%d, 偏移量：%d"
 
-#: pcbnew/legacy_plugin.cpp:2959 pcbnew/legacy_plugin.cpp:2995
+#: pcbnew/legacy_plugin.cpp:2954 pcbnew/legacy_plugin.cpp:2990
 #, c-format
 msgid ""
 "missing float number in file: \"%s\"\n"
@@ -27013,12 +27818,12 @@ msgstr ""
 "文件中缺少浮点数：\"%s\"\n"
 "行：%d，偏移量：%d"
 
-#: pcbnew/legacy_plugin.cpp:3195
+#: pcbnew/legacy_plugin.cpp:3190
 #, c-format
 msgid "File '%s' is empty."
 msgstr "文件 \"%s\" 为空。"
 
-#: pcbnew/legacy_plugin.cpp:3198
+#: pcbnew/legacy_plugin.cpp:3193
 #, c-format
 msgid "File '%s' is not a legacy library."
 msgstr "文件 \"%s\" 不是一个旧库。"
@@ -27059,11 +27864,11 @@ msgstr "导出视图为 PNG... (&P)"
 msgid "Create a PNG file from the current view"
 msgstr "从当前视图创建一个 PNG 文件"
 
-#: pcbnew/menubar_footprint_editor.cpp:160 pcbnew/menubar_pcb_editor.cpp:274
+#: pcbnew/menubar_footprint_editor.cpp:160 pcbnew/menubar_pcb_editor.cpp:273
 msgid "&Drawing Mode"
 msgstr "绘制模式 (&D)"
 
-#: pcbnew/menubar_footprint_editor.cpp:170 pcbnew/menubar_pcb_editor.cpp:294
+#: pcbnew/menubar_footprint_editor.cpp:170 pcbnew/menubar_pcb_editor.cpp:293
 msgid "&Contrast Mode"
 msgstr "对比度模式 (&C)"
 
@@ -27083,105 +27888,105 @@ msgstr "在 PCB 上插入封装 (&I)"
 msgid "Insert footprint onto current board"
 msgstr "将封装插入到当前电路板"
 
-#: pcbnew/menubar_pcb_editor.cpp:104
+#: pcbnew/menubar_pcb_editor.cpp:103
 msgid "Resc&ue"
 msgstr "恢复 (&U)"
 
-#: pcbnew/menubar_pcb_editor.cpp:105
+#: pcbnew/menubar_pcb_editor.cpp:104
 msgid "Clear board and get last rescue file automatically saved by Pcbnew"
 msgstr "清除电路板以便恢复最后的自动备份 Pcbnew 文件"
 
-#: pcbnew/menubar_pcb_editor.cpp:117
+#: pcbnew/menubar_pcb_editor.cpp:116
 msgid "Graphics..."
 msgstr "图形..."
 
-#: pcbnew/menubar_pcb_editor.cpp:117
+#: pcbnew/menubar_pcb_editor.cpp:116
 msgid "Import 2D drawing file"
 msgstr "导入2D 绘制文件"
 
-#: pcbnew/menubar_pcb_editor.cpp:122
+#: pcbnew/menubar_pcb_editor.cpp:121
 msgid "Non-KiCad Board File..."
 msgstr "非 KiCad 电路板文件..."
 
-#: pcbnew/menubar_pcb_editor.cpp:123
+#: pcbnew/menubar_pcb_editor.cpp:122
 msgid "Import board file from other applications"
 msgstr "从其它应用程序中导入板文件"
 
-#: pcbnew/menubar_pcb_editor.cpp:137
+#: pcbnew/menubar_pcb_editor.cpp:136
 msgid "GenCAD..."
 msgstr "GenCAD..."
 
-#: pcbnew/menubar_pcb_editor.cpp:137
+#: pcbnew/menubar_pcb_editor.cpp:136
 msgid "Export GenCAD board representation"
 msgstr "导出 GenCAD 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:139
+#: pcbnew/menubar_pcb_editor.cpp:138
 msgid "VRML..."
 msgstr "VRML..."
 
-#: pcbnew/menubar_pcb_editor.cpp:139
+#: pcbnew/menubar_pcb_editor.cpp:138
 msgid "Export VRML 3D board representation"
 msgstr "导出 VRML 3D 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:141
+#: pcbnew/menubar_pcb_editor.cpp:140
 msgid "IDFv3..."
 msgstr "IDFv3..."
 
-#: pcbnew/menubar_pcb_editor.cpp:141
+#: pcbnew/menubar_pcb_editor.cpp:140
 msgid "Export IDF 3D board representation"
 msgstr "导出 IDF 3D 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:143
+#: pcbnew/menubar_pcb_editor.cpp:142
 msgid "STEP..."
 msgstr "STEP..."
 
-#: pcbnew/menubar_pcb_editor.cpp:143
+#: pcbnew/menubar_pcb_editor.cpp:142
 msgid "Export STEP 3D board representation"
 msgstr "导出 STEP 3D 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:145
+#: pcbnew/menubar_pcb_editor.cpp:144
 msgid "SVG..."
 msgstr "SVG..."
 
-#: pcbnew/menubar_pcb_editor.cpp:145
+#: pcbnew/menubar_pcb_editor.cpp:144
 msgid "Export SVG board representation"
 msgstr "导出 SVG 电路板表示"
 
-#: pcbnew/menubar_pcb_editor.cpp:147
+#: pcbnew/menubar_pcb_editor.cpp:146
 msgid "Footprint Association (.cmp) File..."
 msgstr "封装关联 (.cmp) 文件..."
 
-#: pcbnew/menubar_pcb_editor.cpp:148
+#: pcbnew/menubar_pcb_editor.cpp:147
 msgid "Export footprint association file (*.cmp) for schematic back annotation"
 msgstr "导出封装关联文件 (*.cmp) 用于原理图中反向批注"
 
-#: pcbnew/menubar_pcb_editor.cpp:150
+#: pcbnew/menubar_pcb_editor.cpp:149
 msgid "Hyperlynx..."
 msgstr "Hyperlynx..."
 
-#: pcbnew/menubar_pcb_editor.cpp:158
+#: pcbnew/menubar_pcb_editor.cpp:157
 msgid "Fabrication Outputs"
 msgstr "制造输出"
 
-#: pcbnew/menubar_pcb_editor.cpp:180
+#: pcbnew/menubar_pcb_editor.cpp:179
 msgid "Archive Footprints"
 msgstr "压缩封装"
 
-#: pcbnew/menubar_pcb_editor.cpp:183
+#: pcbnew/menubar_pcb_editor.cpp:182
 msgid "&Archive Footprints in Existing Library..."
 msgstr "压缩封装到现有库中... (&A)"
 
-#: pcbnew/menubar_pcb_editor.cpp:184
+#: pcbnew/menubar_pcb_editor.cpp:183
 msgid ""
 "Archive all footprints to existing library in footprint Lib table(does not "
 "remove other footprints in this library)"
 msgstr "将所有封装压缩到现有库的封装库表中 (不会删除此库中的其他封装)"
 
-#: pcbnew/menubar_pcb_editor.cpp:188
+#: pcbnew/menubar_pcb_editor.cpp:187
 msgid "&Create New Library and Archive Footprints..."
 msgstr "创建新库并压缩封装... (&C)"
 
-#: pcbnew/menubar_pcb_editor.cpp:189
+#: pcbnew/menubar_pcb_editor.cpp:188
 msgid ""
 "Archive all footprints to a new library\n"
 "(if the library already exists it will be replaced)"
@@ -27189,43 +27994,43 @@ msgstr ""
 "压缩所有的封装到新库\n"
 "(如果这个库已经存在，将会被替换)"
 
-#: pcbnew/menubar_pcb_editor.cpp:336
+#: pcbnew/menubar_pcb_editor.cpp:338
 msgid "Auto-Place Footprints"
 msgstr "自动放置封装"
 
-#: pcbnew/menubar_pcb_editor.cpp:402
+#: pcbnew/menubar_pcb_editor.cpp:406
 msgid "External Plugins"
 msgstr "外部插件"
 
-#: pcbnew/menubar_pcb_editor.cpp:405
+#: pcbnew/menubar_pcb_editor.cpp:409
 msgid "Refresh Plugins"
 msgstr "刷新插件"
 
-#: pcbnew/menubar_pcb_editor.cpp:406
+#: pcbnew/menubar_pcb_editor.cpp:410
 msgid "Reload all python plugins and refresh plugin menus"
 msgstr "重新加载所有的 Python 插件并刷新插件菜单"
 
-#: pcbnew/menubar_pcb_editor.cpp:410
+#: pcbnew/menubar_pcb_editor.cpp:414
 msgid "Reveal Plugin Folder in Finder"
 msgstr "在查找器中显示插件文件夹"
 
-#: pcbnew/menubar_pcb_editor.cpp:411
+#: pcbnew/menubar_pcb_editor.cpp:415
 msgid "Reveals the plugins folder in a Finder window"
 msgstr "在查找器窗口中显示插件文件夹"
 
-#: pcbnew/menubar_pcb_editor.cpp:415
+#: pcbnew/menubar_pcb_editor.cpp:419
 msgid "Open Plugin Directory"
 msgstr "打开插件目录"
 
-#: pcbnew/menubar_pcb_editor.cpp:435
+#: pcbnew/menubar_pcb_editor.cpp:442
 msgid "Add &3D Shapes Libraries Wizard..."
 msgstr "3D 模型库添加向导... (&3)"
 
-#: pcbnew/menubar_pcb_editor.cpp:436
+#: pcbnew/menubar_pcb_editor.cpp:443
 msgid "Download 3D shape libraries from GitHub"
 msgstr "从 GitHub 下载 3D 模型封装库"
 
-#: pcbnew/menubar_pcb_editor.cpp:459
+#: pcbnew/menubar_pcb_editor.cpp:468
 msgid "Ro&ute"
 msgstr "布线 (&U)"
 
@@ -27318,19 +28123,19 @@ msgstr "形状不包含任何点!"
 msgid "Place microwave feature"
 msgstr "放置微波特征"
 
-#: pcbnew/netinfo_item.cpp:84
+#: pcbnew/netinfo_item.cpp:78
 msgid "Net Name"
 msgstr "网络名称"
 
-#: pcbnew/netinfo_item.cpp:134
+#: pcbnew/netinfo_item.cpp:129
 msgid "Net Length"
 msgstr "网络长度"
 
-#: pcbnew/netinfo_item.cpp:138
+#: pcbnew/netinfo_item.cpp:133
 msgid "On Board"
 msgstr "板载"
 
-#: pcbnew/netinfo_item.cpp:142
+#: pcbnew/netinfo_item.cpp:137
 msgid "In Package"
 msgstr "在包中"
 
@@ -27349,136 +28154,136 @@ msgstr "无法添加 %s (封装 \"%s\" 未找到)。"
 msgid "Add %s (footprint \"%s\")."
 msgstr "添加 %s (封装 \"%s\")。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:201
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:202
 #, c-format
 msgid "Cannot update %s (no footprint assigned)."
 msgstr "无法更新 %s (没有分配封装)。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:213
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:214
 #, c-format
 msgid "Cannot update %s (footprint \"%s\" not found)."
 msgstr "无法更新 %s (封装 \"%s\" 未找到)."
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:253
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:254
 #, c-format
 msgid "Change %s reference designator to %s."
 msgstr "更改 %s 的位号为 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:268
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:269
 #, c-format
 msgid "Change %s value from %s to %s."
 msgstr "\"%s\" 的值从 \"%s\" 更改为 \"%s\"。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:284
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:285
 #, c-format
 msgid "Update %s symbol association from %s to %s."
 msgstr "更新 %s 符号关联从 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:299
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:300
 #, c-format
 msgid "Update %s properties."
 msgstr "更新 %s 属性。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:318
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:319
 #, c-format
 msgid "Setting %s 'exclude from BOM' fabrication attribute."
 msgstr "设置 %s “从 BOM 中排除”制造属性。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:324
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:325
 #, c-format
 msgid "Removing %s 'exclude from BOM' fabrication attribute."
 msgstr "正在删除 %s “从 BOM 中排除”制造属性。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:381
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:382
 #, c-format
 msgid "Disconnect %s pin %s."
 msgstr "断开 %s 引脚 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:389
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:390
 #, c-format
 msgid "No net for component %s pin %s."
 msgstr "元件 %s 引脚 %s 没有网络。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:439
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:440
 #, c-format
 msgid "Add net %s."
 msgstr "添加网络 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:447
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:448
 #, c-format
 msgid "Reconnect %s pin %s from %s to %s."
 msgstr "重新连接 %s 的引脚 %s 从 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:455
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:456
 #, c-format
 msgid "Connect %s pin %s to %s."
 msgstr "连接 %s 的引脚 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:527
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:528
 #, c-format
 msgid "Reconnect via from %s to %s."
 msgstr "重新连接过孔从 %s 到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:548
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:549
 #, c-format
 msgid "Via connected to unknown net (%s)."
 msgstr "过孔连接到未知网络 (%s)。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:587
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:588
 #, c-format
 msgid "Reconnect copper zone from %s to %s."
 msgstr "将铜区 %s 重新连接到 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:608
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:609
 #, c-format
 msgid "Copper zone (%s) has no pads connected."
 msgstr "铜区 (%s)没有焊盘连接。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:639
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:640
 #, c-format
 msgid "Cannot remove unused footprint %s (locked)."
 msgstr "无法删除未使用的封装 %s (已锁定)。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:644
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:645
 #, c-format
 msgid "Remove unused footprint %s."
 msgstr "删除未使用封装 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:704
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:705
 #, c-format
 msgid "Remove single pad net %s."
 msgstr "删除单一焊盘网络 %s。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:767
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:768
 #, c-format
 msgid "%s pad %s not found in %s."
 msgstr "%s 的焊盘 %s 在 %s 中未找到。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:809
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:810
 #, c-format
 msgid "Processing component \"%s:%s\"."
 msgstr "处理元件 \"%s:%s\"。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:861
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:862
 #, c-format
 msgid "Multiple footprints found for \"%s\"."
 msgstr "找到 \"%s\" 的多个封装。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:885
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:886
 #, c-format
 msgid "Remove unused net \"%s\"."
 msgstr "删除未使用的网络 \"%s\"。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:892
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:893
 msgid "Update netlist"
 msgstr "更新网表"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:912
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:913
 #, c-format
 msgid "Total warnings: %d, errors: %d."
 msgstr "总计警告：%d，错误：%d。"
 
-#: pcbnew/netlist_reader/board_netlist_updater.cpp:917
+#: pcbnew/netlist_reader/board_netlist_updater.cpp:918
 msgid ""
 "Errors occurred during the netlist update. Unless you fix them your board "
 "will not be consistent with the schematics."
@@ -27490,7 +28295,7 @@ msgid "Cannot find component with reference designator \"%s\" in netlist."
 msgstr "未能在网表中找到元件位号 \"%s\"。"
 
 #: pcbnew/netlist_reader/kicad_netlist_reader.cpp:425
-#: pcbnew/pcb_parser.cpp:2547
+#: pcbnew/pcb_parser.cpp:2811
 #, c-format
 msgid ""
 "Invalid footprint ID in\n"
@@ -27603,28 +28408,28 @@ msgstr "KiCad 仅支持 32 个信号层"
 msgid "Error loading project footprint libraries"
 msgstr "加载工程封装库时出错"
 
-#: pcbnew/pcb_edit_frame.cpp:363
+#: pcbnew/pcb_edit_frame.cpp:364
 msgid "New PCB file is unsaved"
 msgstr "新的 PCB 文件未保存"
 
-#: pcbnew/pcb_edit_frame.cpp:859
+#: pcbnew/pcb_edit_frame.cpp:884
 #, c-format
 msgid "The auto save file \"%s\" could not be removed!"
 msgstr "自动保存文件 \"%s\" 不能被删除！"
 
-#: pcbnew/pcb_edit_frame.cpp:1048
+#: pcbnew/pcb_edit_frame.cpp:1071
 msgid "PCB file changes are unsaved"
 msgstr "PCB 文件更改未保存"
 
-#: pcbnew/pcb_edit_frame.cpp:1154
+#: pcbnew/pcb_edit_frame.cpp:1177
 msgid " [Unsaved]"
 msgstr " [未保存]"
 
-#: pcbnew/pcb_edit_frame.cpp:1301
+#: pcbnew/pcb_edit_frame.cpp:1330
 msgid "The schematic for this board cannot be found."
 msgstr "找不到该电路板的原理图。"
 
-#: pcbnew/pcb_edit_frame.cpp:1334
+#: pcbnew/pcb_edit_frame.cpp:1363
 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 "
@@ -27633,42 +28438,47 @@ msgstr ""
 "无法更新 PCB, 因为 Pcbnew 是在独立模式下打开的。为了从原理图创建或更新 PCB, "
 "您必须启动 KiCad 工程管理器并创建一个工程。"
 
-#: pcbnew/pcb_edit_frame.cpp:1352
+#: pcbnew/pcb_edit_frame.cpp:1381
 msgid "Eeschema netlist"
 msgstr "Eeschema 网表"
 
-#: pcbnew/pcb_edit_frame.cpp:1386
+#: pcbnew/pcb_edit_frame.cpp:1415
 #, c-format
 msgid "Schematic file \"%s\" not found."
 msgstr "没有找到原理图文件 \"%s\"。"
 
-#: pcbnew/pcb_edit_frame.cpp:1416
+#: pcbnew/pcb_edit_frame.cpp:1445
 msgid "Eeschema failed to load:\n"
 msgstr "Eeschema 无法加载:\n"
 
-#: pcbnew/pcb_edit_frame.cpp:1626
+#: pcbnew/pcb_edit_frame.cpp:1656
 msgid "Export Hyperlynx Layout"
 msgstr "导出 Hyperlynx 布局"
 
-#: pcbnew/pcb_expr_evaluator.cpp:42 pcbnew/pcb_expr_evaluator.cpp:91
-#: pcbnew/pcb_expr_evaluator.cpp:154
+#: pcbnew/pcb_expr_evaluator.cpp:49 pcbnew/pcb_expr_evaluator.cpp:106
+#: pcbnew/pcb_expr_evaluator.cpp:169
 #, c-format
 msgid "Missing argument to '%s'"
 msgstr "缺少 '%s' 的参数"
 
+#: pcbnew/pcb_expr_evaluator.cpp:75
+#, c-format
+msgid "Unrecognized layer '%s'"
+msgstr "无法识别的图层 '%s'。"
+
 #: pcbnew/pcb_layer_box_selector.cpp:106
 msgid "(not activated)"
 msgstr "(未激活)"
 
-#: pcbnew/pcb_layer_widget.cpp:53 pcbnew/widgets/appearance_controls.cpp:290
+#: pcbnew/pcb_layer_widget.cpp:53 pcbnew/widgets/appearance_controls.cpp:335
 msgid "Show footprints that are on board's front"
 msgstr "在电路板的顶层显示封装"
 
-#: pcbnew/pcb_layer_widget.cpp:54 pcbnew/widgets/appearance_controls.cpp:291
+#: pcbnew/pcb_layer_widget.cpp:54 pcbnew/widgets/appearance_controls.cpp:336
 msgid "Show footprints that are on board's back"
 msgstr "在电路板的底层显示封装"
 
-#: pcbnew/pcb_layer_widget.cpp:55 pcbnew/widgets/appearance_controls.cpp:293
+#: pcbnew/pcb_layer_widget.cpp:55 pcbnew/widgets/appearance_controls.cpp:338
 msgid "Show footprint values"
 msgstr "显示封装值"
 
@@ -27684,7 +28494,7 @@ msgstr "电路板顶层显示封装文本"
 msgid "Show footprint text on board's back"
 msgstr "电路板底层显示封装文本"
 
-#: pcbnew/pcb_layer_widget.cpp:59 pcbnew/widgets/appearance_controls.cpp:296
+#: pcbnew/pcb_layer_widget.cpp:59 pcbnew/widgets/appearance_controls.cpp:341
 msgid "Show footprint text marked as invisible"
 msgstr "显示隐藏的封装文本标记"
 
@@ -27700,7 +28510,7 @@ msgstr "电路板底层显示封装焊盘"
 msgid "Show through hole pads in specific color"
 msgstr "在特定颜色下显示通孔焊盘"
 
-#: pcbnew/pcb_layer_widget.cpp:64 pcbnew/widgets/appearance_controls.cpp:285
+#: pcbnew/pcb_layer_widget.cpp:64 pcbnew/widgets/appearance_controls.cpp:330
 msgid "Show tracks"
 msgstr "显示布线"
 
@@ -27720,27 +28530,27 @@ msgstr "显示微孔"
 msgid "Show non plated holes in specific color"
 msgstr "在特定颜色下显示非金属化孔"
 
-#: pcbnew/pcb_layer_widget.cpp:70 pcbnew/widgets/appearance_controls.cpp:299
+#: pcbnew/pcb_layer_widget.cpp:70 pcbnew/widgets/appearance_controls.cpp:344
 msgid "Show unconnected nets as a ratsnest"
 msgstr "显示未连接的网络飞线"
 
-#: pcbnew/pcb_layer_widget.cpp:71 pcbnew/widgets/appearance_controls.cpp:300
+#: pcbnew/pcb_layer_widget.cpp:71 pcbnew/widgets/appearance_controls.cpp:345
 msgid "Show a marker on pads which have no net connected"
 msgstr "在没有网络连接的焊盘上显示一个标记"
 
-#: pcbnew/pcb_layer_widget.cpp:72 pcbnew/widgets/appearance_controls.cpp:301
+#: pcbnew/pcb_layer_widget.cpp:72 pcbnew/widgets/appearance_controls.cpp:346
 msgid "DRC violations with a Warning severity"
 msgstr "具有警告严重性的 DRC 违规"
 
-#: pcbnew/pcb_layer_widget.cpp:73 pcbnew/widgets/appearance_controls.cpp:302
+#: pcbnew/pcb_layer_widget.cpp:73 pcbnew/widgets/appearance_controls.cpp:347
 msgid "DRC violations with an Error severity"
 msgstr "具有错误严重性的 DRC 违规"
 
-#: pcbnew/pcb_layer_widget.cpp:74 pcbnew/widgets/appearance_controls.cpp:303
+#: pcbnew/pcb_layer_widget.cpp:74 pcbnew/widgets/appearance_controls.cpp:348
 msgid "DRC violations which have been individually excluded"
 msgstr "违反 DRC 的行为已被单独排除"
 
-#: pcbnew/pcb_layer_widget.cpp:75 pcbnew/widgets/appearance_controls.cpp:304
+#: pcbnew/pcb_layer_widget.cpp:75 pcbnew/widgets/appearance_controls.cpp:349
 msgid "Show footprint and text origins as a cross"
 msgstr "在封装和文字中央显示一个小十字"
 
@@ -27756,11 +28566,11 @@ msgstr "辅助项目"
 msgid "Auxiliary items (rulers, assistants, axes, etc.)"
 msgstr "辅助项目(标尺、辅助、坐标轴等)"
 
-#: pcbnew/pcb_layer_widget.cpp:151 pcbnew/widgets/appearance_controls.cpp:1171
+#: pcbnew/pcb_layer_widget.cpp:151 pcbnew/widgets/appearance_controls.cpp:1384
 msgid "Show All Copper Layers"
 msgstr "显示所有铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:154 pcbnew/widgets/appearance_controls.cpp:1174
+#: pcbnew/pcb_layer_widget.cpp:154 pcbnew/widgets/appearance_controls.cpp:1387
 msgid "Hide All Copper Layers"
 msgstr "隐藏所有铜层"
 
@@ -27772,113 +28582,113 @@ msgstr "隐藏当前工作层外的所有铜层"
 msgid "Always Hide All Copper Layers But Active"
 msgstr "总是隐藏当前工作层外的所有铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:169 pcbnew/widgets/appearance_controls.cpp:1185
+#: pcbnew/pcb_layer_widget.cpp:169 pcbnew/widgets/appearance_controls.cpp:1398
 msgid "Show All Non Copper Layers"
 msgstr "显示所有非铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:172 pcbnew/widgets/appearance_controls.cpp:1188
+#: pcbnew/pcb_layer_widget.cpp:172 pcbnew/widgets/appearance_controls.cpp:1401
 msgid "Hide All Non Copper Layers"
 msgstr "隐藏所有非铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:184 pcbnew/widgets/appearance_controls.cpp:1202
+#: pcbnew/pcb_layer_widget.cpp:184 pcbnew/widgets/appearance_controls.cpp:1415
 msgid "Show Only Front Assembly Layers"
 msgstr "仅显示顶装配层"
 
-#: pcbnew/pcb_layer_widget.cpp:187 pcbnew/widgets/appearance_controls.cpp:1204
+#: pcbnew/pcb_layer_widget.cpp:187 pcbnew/widgets/appearance_controls.cpp:1417
 msgid "Show Only Front Layers"
 msgstr "仅显示顶层"
 
-#: pcbnew/pcb_layer_widget.cpp:193 pcbnew/widgets/appearance_controls.cpp:1210
+#: pcbnew/pcb_layer_widget.cpp:193 pcbnew/widgets/appearance_controls.cpp:1423
 msgid "Show Only Inner Layers"
 msgstr "仅显示内层"
 
-#: pcbnew/pcb_layer_widget.cpp:197 pcbnew/widgets/appearance_controls.cpp:1214
+#: pcbnew/pcb_layer_widget.cpp:197 pcbnew/widgets/appearance_controls.cpp:1427
 msgid "Show Only Back Layers"
 msgstr "仅显示底层"
 
-#: pcbnew/pcb_layer_widget.cpp:200 pcbnew/widgets/appearance_controls.cpp:1217
+#: pcbnew/pcb_layer_widget.cpp:200 pcbnew/widgets/appearance_controls.cpp:1430
 msgid "Show Only Back Assembly Layers"
 msgstr "仅显示底装配层"
 
-#: pcbnew/pcb_layer_widget.cpp:489 pcbnew/widgets/appearance_controls.cpp:1083
+#: pcbnew/pcb_layer_widget.cpp:489 pcbnew/widgets/appearance_controls.cpp:1295
 msgid "Front copper layer"
 msgstr "顶层铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:493 pcbnew/widgets/appearance_controls.cpp:1084
+#: pcbnew/pcb_layer_widget.cpp:493 pcbnew/widgets/appearance_controls.cpp:1296
 msgid "Back copper layer"
 msgstr "底层铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:497 pcbnew/widgets/appearance_controls.cpp:1085
+#: pcbnew/pcb_layer_widget.cpp:497 pcbnew/widgets/appearance_controls.cpp:1297
 msgid "Inner copper layer"
 msgstr "内部铜层"
 
-#: pcbnew/pcb_layer_widget.cpp:522 pcbnew/widgets/appearance_controls.cpp:1114
+#: pcbnew/pcb_layer_widget.cpp:522 pcbnew/widgets/appearance_controls.cpp:1326
 msgid "Adhesive on board's front"
 msgstr "顶层粘胶"
 
-#: pcbnew/pcb_layer_widget.cpp:523 pcbnew/widgets/appearance_controls.cpp:1115
+#: pcbnew/pcb_layer_widget.cpp:523 pcbnew/widgets/appearance_controls.cpp:1327
 msgid "Adhesive on board's back"
 msgstr "底层粘胶"
 
-#: pcbnew/pcb_layer_widget.cpp:524 pcbnew/widgets/appearance_controls.cpp:1116
+#: pcbnew/pcb_layer_widget.cpp:524 pcbnew/widgets/appearance_controls.cpp:1328
 msgid "Solder paste on board's front"
 msgstr "顶层锡膏"
 
-#: pcbnew/pcb_layer_widget.cpp:525 pcbnew/widgets/appearance_controls.cpp:1117
+#: pcbnew/pcb_layer_widget.cpp:525 pcbnew/widgets/appearance_controls.cpp:1329
 msgid "Solder paste on board's back"
 msgstr "底层锡膏"
 
-#: pcbnew/pcb_layer_widget.cpp:526 pcbnew/widgets/appearance_controls.cpp:1118
+#: pcbnew/pcb_layer_widget.cpp:526 pcbnew/widgets/appearance_controls.cpp:1330
 msgid "Silkscreen on board's front"
 msgstr "顶层丝印"
 
-#: pcbnew/pcb_layer_widget.cpp:527 pcbnew/widgets/appearance_controls.cpp:1119
+#: pcbnew/pcb_layer_widget.cpp:527 pcbnew/widgets/appearance_controls.cpp:1331
 msgid "Silkscreen on board's back"
 msgstr "底层丝印"
 
-#: pcbnew/pcb_layer_widget.cpp:528 pcbnew/widgets/appearance_controls.cpp:1120
+#: pcbnew/pcb_layer_widget.cpp:528 pcbnew/widgets/appearance_controls.cpp:1332
 msgid "Solder mask on board's front"
 msgstr "顶层阻焊"
 
-#: pcbnew/pcb_layer_widget.cpp:529 pcbnew/widgets/appearance_controls.cpp:1121
+#: pcbnew/pcb_layer_widget.cpp:529 pcbnew/widgets/appearance_controls.cpp:1333
 msgid "Solder mask on board's back"
 msgstr "底层阻焊"
 
-#: pcbnew/pcb_layer_widget.cpp:530 pcbnew/widgets/appearance_controls.cpp:1122
+#: pcbnew/pcb_layer_widget.cpp:530 pcbnew/widgets/appearance_controls.cpp:1334
 msgid "Explanatory drawings"
 msgstr "图形说明"
 
-#: pcbnew/pcb_layer_widget.cpp:531 pcbnew/widgets/appearance_controls.cpp:1123
+#: pcbnew/pcb_layer_widget.cpp:531 pcbnew/widgets/appearance_controls.cpp:1335
 msgid "Explanatory comments"
 msgstr "描述性注释"
 
 #: pcbnew/pcb_layer_widget.cpp:532 pcbnew/pcb_layer_widget.cpp:533
-#: pcbnew/widgets/appearance_controls.cpp:1124
-#: pcbnew/widgets/appearance_controls.cpp:1125
+#: pcbnew/widgets/appearance_controls.cpp:1336
+#: pcbnew/widgets/appearance_controls.cpp:1337
 msgid "User defined meaning"
 msgstr "用户自定义"
 
-#: pcbnew/pcb_layer_widget.cpp:534 pcbnew/widgets/appearance_controls.cpp:1126
+#: pcbnew/pcb_layer_widget.cpp:534 pcbnew/widgets/appearance_controls.cpp:1338
 msgid "Board's perimeter definition"
 msgstr "定义电路板的边框轮廓"
 
-#: pcbnew/pcb_layer_widget.cpp:535 pcbnew/widgets/appearance_controls.cpp:1127
+#: pcbnew/pcb_layer_widget.cpp:535 pcbnew/widgets/appearance_controls.cpp:1339
 msgid "Board's edge setback outline"
 msgstr "电路板电气边界层"
 
-#: pcbnew/pcb_layer_widget.cpp:536 pcbnew/widgets/appearance_controls.cpp:1128
+#: pcbnew/pcb_layer_widget.cpp:536 pcbnew/widgets/appearance_controls.cpp:1340
 msgid "Footprint courtyards on board's front"
 msgstr "顶层上的封装外框"
 
-#: pcbnew/pcb_layer_widget.cpp:537 pcbnew/widgets/appearance_controls.cpp:1129
+#: pcbnew/pcb_layer_widget.cpp:537 pcbnew/widgets/appearance_controls.cpp:1341
 msgid "Footprint courtyards on board's back"
 msgstr "底层上的封装外框"
 
-#: pcbnew/pcb_layer_widget.cpp:538 pcbnew/widgets/appearance_controls.cpp:1130
+#: pcbnew/pcb_layer_widget.cpp:538 pcbnew/widgets/appearance_controls.cpp:1342
 msgid "Footprint assembly on board's front"
 msgstr "顶层封装装配"
 
-#: pcbnew/pcb_layer_widget.cpp:539 pcbnew/widgets/appearance_controls.cpp:1131
+#: pcbnew/pcb_layer_widget.cpp:539 pcbnew/widgets/appearance_controls.cpp:1343
 msgid "Footprint assembly on board's back"
 msgstr "底层封装装配"
 
@@ -27904,18 +28714,18 @@ msgstr ""
 msgid "Undefined layers:"
 msgstr "未定义的层："
 
-#: pcbnew/pcb_parser.cpp:747
+#: pcbnew/pcb_parser.cpp:748
 #, c-format
 msgid "Group %s not found in board"
 msgstr "电路板中未找到组 %s"
 
 # padstack 焊盘槽/孔
-#: pcbnew/pcb_parser.cpp:762 pcbnew/pcb_parser.cpp:774
+#: pcbnew/pcb_parser.cpp:765 pcbnew/pcb_parser.cpp:781
 #, c-format
 msgid "Group %s references missing item %s"
 msgstr "组 %s 位号缺少的项目 %s"
 
-#: pcbnew/pcb_parser.cpp:789
+#: pcbnew/pcb_parser.cpp:798
 #, c-format
 msgid ""
 "Error in group structure in file: %s\n"
@@ -27926,39 +28736,39 @@ msgstr ""
 "\n"
 "是否尝试修复？"
 
-#: pcbnew/pcb_parser.cpp:790
+#: pcbnew/pcb_parser.cpp:799
 msgid "File data error"
 msgstr "数据错误文件"
 
-#: pcbnew/pcb_parser.cpp:791
+#: pcbnew/pcb_parser.cpp:800
 msgid "Attempt repair"
 msgstr "尝试修复"
 
-#: pcbnew/pcb_parser.cpp:794
-msgid "File read cancelled"
+#: pcbnew/pcb_parser.cpp:803
+msgid "File read canceled"
 msgstr "文件读取已取消"
 
-#: pcbnew/pcb_parser.cpp:1405
+#: pcbnew/pcb_parser.cpp:1430
 #, 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:1444
+#: pcbnew/pcb_parser.cpp:1469
 #, c-format
 msgid "%d is not a valid layer count"
 msgstr "%d 不是一个有效的层数"
 
-#: pcbnew/pcb_parser.cpp:2063
+#: pcbnew/pcb_parser.cpp:2089
 #, c-format
 msgid "Duplicate NETCLASS name \"%s\" in file \"%s\" at line %d, offset %d"
 msgstr "重复网络类名称 \"%s\" 在文件 \"%s\" 的 %d,行 位移 %d"
 
-#: pcbnew/pcb_parser.cpp:2861
+#: pcbnew/pcb_parser.cpp:3125
 #, c-format
 msgid "Cannot handle footprint text type %s"
 msgstr "无法处理封装文本类型 %s"
 
-#: pcbnew/pcb_parser.cpp:3336
+#: pcbnew/pcb_parser.cpp:3600
 #, c-format
 msgid ""
 "Invalid net ID in\n"
@@ -27971,7 +28781,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:3352
+#: pcbnew/pcb_parser.cpp:3616
 #, c-format
 msgid ""
 "Net name doesn't match net ID in\n"
@@ -27984,8 +28794,8 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:3788 pcbnew/pcb_parser.cpp:3859
-#: pcbnew/pcb_parser.cpp:3947 pcbnew/pcb_parser.cpp:4036
+#: pcbnew/pcb_parser.cpp:4052 pcbnew/pcb_parser.cpp:4123
+#: pcbnew/pcb_parser.cpp:4211 pcbnew/pcb_parser.cpp:4300
 #, c-format
 msgid ""
 "Invalid net ID in\n"
@@ -27998,15 +28808,7 @@ msgstr ""
 "行：%d\n"
 "偏移：%d"
 
-#: pcbnew/pcb_parser.cpp:4537
-#, c-format
-msgid ""
-"There is a zone that belongs to a not existing net\n"
-"\"%s\"\n"
-"you should verify and edit it (run DRC test)."
-msgstr "有一个区域属于不存在的网 \"%s\", 您应该验证和编辑它 (运行 DRC 测试)。"
-
-#: pcbnew/pcbnew.cpp:359
+#: pcbnew/pcbnew.cpp:367
 msgid ""
 "An error occurred attempting to load the global footprint library table.\n"
 "Please edit this global footprint library table in Preferences menu."
@@ -28044,35 +28846,34 @@ msgstr "PLUGIN::Footprint*() 输入已定义的 Python 函数模块。"
 msgid "File not found: '%s'"
 msgstr "文件没有找到：'%s'"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:907
-#: pcbnew/plugins/altium/altium_pcb.cpp:982
-#: pcbnew/plugins/altium/altium_pcb.cpp:1060
-#: pcbnew/plugins/altium/altium_pcb.cpp:1083
+#: pcbnew/plugins/altium/altium_pcb.cpp:908
+#: pcbnew/plugins/altium/altium_pcb.cpp:985
+#: pcbnew/plugins/altium/altium_pcb.cpp:1063
+#: pcbnew/plugins/altium/altium_pcb.cpp:1086
 #, c-format
 msgid ""
 "Dimension on Altium layer %d has no KiCad equivalent. Put it on Eco1_User "
 "instead"
-msgstr ""
-"Altium 层 %d 上的 Dimension 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
+msgstr "Altium 层 %d 上的标注没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1179
+#: pcbnew/plugins/altium/altium_pcb.cpp:1182
 #, c-format
 msgid "Cannot create directory \"%s\" -> no 3D-models will be imported."
 msgstr "无法创建目录 \"%s\" -> 无法导入 3D 模型。"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1258
+#: pcbnew/plugins/altium/altium_pcb.cpp:1261
 #, c-format
 msgid "Polygon on Altium layer %d has no KiCad equivalent. Ignore it instead"
 msgstr "Altium 层 %d 上的 Polygon 没有任何 KiCad 等效项。 忽略它"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1443
+#: pcbnew/plugins/altium/altium_pcb.cpp:1446
 #, c-format
 msgid ""
 "Zone on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
 msgstr ""
 "Altium 层 %d 上的 Zone 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1468
+#: pcbnew/plugins/altium/altium_pcb.cpp:1471
 #, c-format
 msgid ""
 "Polygon on Altium layer %d has no KiCad equivalent. Put it on Eco1_User "
@@ -28080,33 +28881,33 @@ msgid ""
 msgstr ""
 "Altium 层 %d 上的 Polygon 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1583
+#: pcbnew/plugins/altium/altium_pcb.cpp:1586
 #, c-format
 msgid ""
 "Arc on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
 msgstr "Altium 层 %d 上的 Arc 没有 KiCad 等效项。改为将其放在 Eco1_User 上"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1756
+#: pcbnew/plugins/altium/altium_pcb.cpp:1759
 #, c-format
 msgid ""
 "Pad '%s' of Footprint %s has a square hole. KiCad does not support this yet"
 msgstr "焊盘 \"%s\"（封装 %s）有一个方孔。KiCad 目前还不支持此功能"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1777
+#: pcbnew/plugins/altium/altium_pcb.cpp:1780
 #, c-format
 msgid ""
 "Pad '%s' of Footprint %s has a hole-rotation of %f degree. KiCad only "
 "supports 90 degree angles"
 msgstr "焊盘 \"%s\"（封装 %s）有 %f 度的孔旋转。KiCad 仅支持 90 度角"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1806
+#: pcbnew/plugins/altium/altium_pcb.cpp:1809
 #, c-format
 msgid ""
 "Pad '%s' of Footprint %s uses a complex pad stack (kind %d), which is not "
 "supported yet"
 msgstr "焊盘 \"%s\"（封装 %s）使用复杂的焊盘堆叠（类型为 %d），尚不支持"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1896
+#: pcbnew/plugins/altium/altium_pcb.cpp:1899
 #, c-format
 msgid ""
 "Non-Copper Pad on Altium layer %d has no KiCad equivalent. Put it on "
@@ -28114,40 +28915,349 @@ msgid ""
 msgstr ""
 "Altium 层 %d 上的非铜焊盘没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:1916
+#: pcbnew/plugins/altium/altium_pcb.cpp:1919
 #, c-format
 msgid ""
 "Non-Copper Pad '%s' uses a complex pad stack (kind %d). This should not "
 "happen"
 msgstr "非铜焊盘 \"%s\" 使用复杂的焊盘堆叠（类型为 %d）。这不应该发生"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:2152
+#: pcbnew/plugins/altium/altium_pcb.cpp:2155
 #, c-format
 msgid ""
 "Track on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
 msgstr ""
 "Altium 层 %d 上的 Track 没有任何 KiCad 等效项。 改为将其放在 Eco1_User 上"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:2226
+#: pcbnew/plugins/altium/altium_pcb.cpp:2229
 #, c-format
 msgid ""
 "Ignore Barcode on Altium layer %d because it is not supported right now."
 msgstr "忽略 Altium 层 %d 上的条形码，因为目前不支持该条形码。"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:2309
+#: pcbnew/plugins/altium/altium_pcb.cpp:2312
 #, c-format
 msgid ""
 "Text on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
 msgstr ""
 "Altium 层 %d 上的 Text 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
 
-#: pcbnew/plugins/altium/altium_pcb.cpp:2407
+#: pcbnew/plugins/altium/altium_pcb.cpp:2410
 #, c-format
 msgid ""
 "Fill on Altium layer %d has no KiCad equivalent. Put it on Eco1_User instead"
 msgstr ""
 "Altium 层 %d 上的 Fill 没有任何 KiCad 等效项。改为将其放在 Eco1_User 上"
 
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:59
+#, c-format
+msgid ""
+"The design is too large and cannot be imported into KiCad. \n"
+"Please reduce the maximum design size in CADSTAR by navigating to: \n"
+"Design Tab -> Properties -> Design Options -> Maximum Design Size. \n"
+"Current Design size: %.2f, %.2f millimeters. \n"
+"Maximum permitted design size: %.2f, %.2f millimeters.\n"
+msgstr ""
+"设计太大，无法导入到 KiCad 中。请导航到以下位置以减小 CADSTAR 中的最大设计尺"
+"寸：\n"
+"设计选项卡 -> 属性 -> 设计选项 -> 最大设计尺寸。\n"
+"当前设计大小：%.2f, %.2f 毫米。\n"
+"允许的最大设计大小：%.2f, %.2f 毫米。\n"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:75
+msgid ""
+"The selected file indicates that nets might be out of synchronisation with "
+"the schematic. It is recommended that you carry out an 'Align Nets' "
+"procedure in CADSTAR and re-import, to avoid inconsistencies between the PCB "
+"and the schematic. "
+msgstr ""
+"选中的文件指示网络可能与原理图不同步。建议您在 CADSTAR 中执行对齐网络程序并重"
+"新导入，以避免 PCB 和原理图之间的不一致。  "
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:97
+msgid ""
+"The CADSTAR design contains variants which has no KiCad equivalent. All "
+"components have been loaded on top of each other. "
+msgstr "CADSTAR 设计包含没有 KiCad 等效项的变体。所有元件都相互加载。  "
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:101
+msgid ""
+"The CADSTAR design has been imported successfully.\n"
+"Please review the import errors and warnings (if any)."
+msgstr ""
+"已成功导入 CADSTAR 设计。\n"
+"请查看导入错误和警告（如果有）。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:110
+#, c-format
+msgid ""
+"The CADSTAR layer '%s' has no KiCad equivalent. All elements on this layer "
+"have been mapped to KiCad layer '%s' instead."
+msgstr ""
+"CADSTAR 图层 \"%s\" 没有等效项。此图层上的所有元素都映射到 KiCad 图层 \"%s"
+"\"。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:167
+#, c-format
+msgid "Unexpected layer '%s' in layer stack."
+msgstr "图层堆栈中意外的图层 \"%s\"。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:246
+#, c-format
+msgid ""
+"The CADSTAR layer '%s' has been assumed to be an adhesive layer. All "
+"elements on this layer have been mapped to KiCad layer '%s'."
+msgstr ""
+"CADSTAR 层 '%s' 已被假定为粘合层。此图层上的所有元素都已映射到 KiCad 图层 "
+"'%s' 。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:412
+#, c-format
+msgid "Design rule %s was not found. This was ignored."
+msgstr "未找到设计规则 %s。这被忽略。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:438
+msgid ""
+"KiCad design rules are different from CADSTAR ones. Only the compatible "
+"design rules were imported. It is recommended that you review the design "
+"rules that have been applied."
+msgstr ""
+"KiCad 设计规则与 CADSTAR 设计规则不同。仅导入兼容的设计规则。建议您查看已应用"
+"的设计规则。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:535
+#, c-format
+msgid ""
+"The CADSTAR area '%s' in library component '%s' does not have a KiCad "
+"equivalent. The area is neither a via orroute keepout area. The area was not "
+"imported. "
+msgstr ""
+"库元件 \"%s\" 中的 CADSTAR 区域 \"%s\" 没有 KiCad 等效项。该区域既不是过孔"
+"区，也不是布线禁区。未导入该区域。  "
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:722
+#, c-format
+msgid ""
+"The file appears to be corrupt. Unable to find group ID %s in the group "
+"definitions."
+msgstr "该文件似乎已损坏。无法在组定义中查找组 ID %s。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:729
+#, c-format
+msgid ""
+"The file appears to be corrupt. Unable to find sub group %s in the group map "
+"(parent group ID=%s, Name=%s)."
+msgstr "该文件似乎已损坏。无法在组映射中查找子组 %s（父组 ID=%s，名称=%s）。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:838
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:848
+#, c-format
+msgid "Dimension ID %s has no KiCad equivalent. This was not imported"
+msgstr "标注 ID %s 没有 KiCad 等效项。这不是导入的"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:887
+#, c-format
+msgid ""
+"The CADSTAR area '%s' is defined as a placement and/or routing area in "
+"CADSTAR, in addition to Keepout. Placement or Routing areas are not "
+"supported in KiCad. Only the supported elements were imported."
+msgstr ""
+"CADSTAR 区域 '%s' 被定义为 CADSTAR 中的放置和/或布线区域，此外还有禁布区。"
+"KiCad 中不支持放置或布线区域。仅导入了受支持的元素。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:895
+#, c-format
+msgid ""
+"The CADSTAR area '%s' does not have a KiCad equivalent. Pure Placement or "
+"Routing areas are not supported."
+msgstr "CADSTAR 区域 '%s' 没有 KiCad 等效项。不支持纯放置或布线区域。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:919
+#, c-format
+msgid "Unable to find component '%s' in the library(Symdef ID: '%s')"
+msgstr "无法在库中查找元件 \"%s\" (符号定义 ID：\"%s\")"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:967
+#, c-format
+msgid "Unable to find documentation symbol in the library (Symdef ID: '%s')"
+msgstr "无法在库中查找文档符号 (符号定义 ID：'%s')"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1033
+#, c-format
+msgid ""
+"The CADSTAR template '%s' has the setting 'Allow in No Routing Areas' "
+"enabled. This setting has no KiCad equivalent, so it has been ignored."
+msgstr ""
+"CADSTAR 模板 '%s' 启用了设置“允许再无布线区”。此设置没有 KiCad 等效项，因此已"
+"被忽略。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1039
+#, c-format
+msgid ""
+"The CADSTAR template '%s' has the setting 'Box Isolated Pins'enabled. This "
+"setting has no KiCad equivalent, so it has been ignored."
+msgstr ""
+"CADSTAR 模板 '%s' 启用了设置“盒式隔离引脚”。此设置没有 KiCad 等效项，因此已被"
+"忽略。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1045
+#, c-format
+msgid ""
+"The CADSTAR template '%s' has the setting 'Automatic Repour'enabled. This "
+"setting has no KiCad equivalent, so it has been ignored."
+msgstr ""
+"CADSTAR 模板 '%s' 启用了“自动刷新”设置。此设置没有 KiCad 等效项，因此已被忽"
+"略。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1054
+#, c-format
+msgid ""
+"The CADSTAR template '%s' has a non-zero value defined for the 'Sliver "
+"Width' setting. There is no KiCad equivalent for this, so this setting was "
+"ignored."
+msgstr ""
+"CADSTAR 模板 '%s' 具有为“条子宽度（两焊盘之间的间隙）”设置定义的非零值。对此"
+"没有 KiCad 等效项，因此忽略此设置。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1062
+#, c-format
+msgid ""
+"The CADSTAR template '%s' has different settings for 'Retain Poured Copper - "
+"Disjoint' and 'Retain Poured Copper - Isolated'. KiCad does not distinguish "
+"between these two settings. The setting for disjoint copper has been applied "
+"as the minimum island area of the KiCad Zone."
+msgstr ""
+"CADSTAR 模板 '%s' 具有不同的设置，用于\"保留敷铜 - 不相交\"和\"保留敷铜 - 隔"
+"离\"。KiCad 不区分这两个设置。不相交敷铜的设置已作为 KiCad 区域的最小敷铜面积"
+"应用。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1093
+#, c-format
+msgid ""
+"The CADSTAR template '%s' has different settings for thermal relief in pads "
+"and vias. KiCad only supports one single setting for both. The setting for "
+"pads has been applied."
+msgstr ""
+"CADSTAR 模板 '%s' 在焊盘和过孔中具有不同的防散热设置。KiCad 仅支持这两种设置"
+"的单一设置。已应用焊盘的设置。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1132
+#, c-format
+msgid ""
+"The CADSTAR layer '%s' is defined as a power plane layer. However no net "
+"with such name exists. The layer has been loaded but no copper zone was "
+"created."
+msgstr ""
+"CADSTAR 层 '%s' 被定义为电源层。然而，不存在具有该名称的网络。已加载层，但未"
+"创建铜区。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1181
+msgid ""
+"The CADSTAR design contains COPPER elements, which have no direct KiCad "
+"equivalent. These have been imported as a KiCad Zone if solid or hatch "
+"filled, or as a KiCad Track if the shape was an unfilled outline (open or "
+"closed)."
+msgstr ""
+"CADSTAR 设计包含没有直接 KiCad 等价物的铜元素。如果填充的是实体或图案填充，则"
+"它们已导入为 KiCad 区域；如果形状是未填充的轮廓(开放或闭合)，则它们将导入为 "
+"KiCad 布线。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1284
+#, c-format
+msgid ""
+"The net '%s' references component ID '%s' which does not exist. This has "
+"been ignored,"
+msgstr "网络 '%s' 引用了不存在的元件 ID '%s'。这一点已经被忽略了,"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1291
+#, c-format
+msgid ""
+"The net '%s' references non-existent pad index '%d' in component '%s'. This "
+"has been ignored."
+msgstr "网络 '%s' 引用了不存在的焊盘索引 '%d' 在元件 '%s' 中 。这被忽略了。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1386
+#, c-format
+msgid ""
+"The CADSTAR via code '%s' has different shape from a circle defined. KiCad "
+"only supports circular vias so this via type has been changed to be a via "
+"with circular shape of %.2f mm diameter."
+msgstr ""
+"通过代码 '%s' 的 CADSTAR 具有与定义的圆不同的形状。KiCad 仅支持圆形过孔，因此"
+"此过孔类型已更改为直径为 %.2f mm 的圆形过孔。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:1581
+#, c-format
+msgid ""
+"The shape for '%s' is Hatch filled in CADSTAR, which has no KiCad "
+"equivalent. Using solid fill instead."
+msgstr ""
+"'%s' 的形状是在 CADSTAR 中填充的图案填充，该 CADSTAR 没有 KiCad 等效项。改用"
+"实体填充。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:2266
+#, c-format
+msgid ""
+"The CADSTAR Hatching code '%s' has %d hatches defined. KiCad only supports 2 "
+"hatches (crosshatching) 90 degrees apart. The imported hatching is "
+"crosshatched."
+msgstr ""
+"CADSTAR 图案填充代码 '%s' 定义了 %d 个图案填充。KiCad 仅支持相距 90 度的两个"
+"图案填充(剖面线)。导入的剖面线为交叉线。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:2276
+#, c-format
+msgid ""
+"The CADSTAR Hatching code '%s' has different line widths for each hatch. "
+"KiCad only supports one width for the haching. The imported hatching uses "
+"the width defined in the first hatch definition, i.e. %.2f mm."
+msgstr ""
+"CADSTAR 图案填充代码 '%s' 的每个图案填充具有不同的线宽。KiCad 只支持一种宽度"
+"的缓存。导入的图案填充使用第一个图案填充定义中定义的宽度，即 %.2f mm。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:2287
+#, c-format
+msgid ""
+"The CADSTAR Hatching code '%s' has different step sizes for each hatch. "
+"KiCad only supports one step size for the haching. The imported hatching "
+"uses the step size defined in the first hatching definition, i.e. %.2f mm."
+msgstr ""
+"CADSTAR 图案填充代码 '%s' 对于每个图案填充具有不同的步长。KiCad 只支持一个步"
+"骤大小的缓存。导入的图案填充使用第一个图案填充定义中定义的步长，即 %.2f mm。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:2300
+#, c-format
+msgid ""
+"The hatches in CADSTAR Hatching code '%s' have an angle  difference of %.1f "
+"degrees. KiCad only supports hatching 90 degrees apart.  The imported "
+"hatching has two hatches 90 degrees apart, oriented %.1f degrees from "
+"horizontal."
+msgstr ""
+"CADSTAR 图案填充代码 '%s' 中的图案填充具有 %.1f 度的角度差。KiCad 仅支持相隔 "
+"90 度的图案填充。导入的图案填充有两个相距 90 度的图案填充，方向与水平方向成 "
+"%.1f 度。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:2384
+msgid ""
+"The CADSTAR design contains nets with a 'Net Class' assigned. KiCad does not "
+"have an equivalent to CADSTAR's Net Class so these elements were not "
+"imported. Note: KiCad's version of 'Net Class' is closer to CADSTAR's 'Net "
+"Route Code' (which has been imported for all nets)."
+msgstr ""
+"CADSTAR设计包含分配了“网络类”的网络。KiCad 没有与 CADSTAR 的网络类等效的元"
+"素，因此没有导入这些元素。注：KiCad 的“网络类”版本更接近 CADSTAR 的“网络路线"
+"编码”(已为所有网络导入)。"
+
+#: pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp:2395
+msgid ""
+"The CADSTAR design contains nets with a 'Spacing Class' assigned. KiCad does "
+"not have an equivalent to CADSTAR's Spacing Class so these elements were not "
+"imported. Please review the design rules as copper pours will affected by "
+"this."
+msgstr ""
+"CADSTAR 设计包含分配了“间隔类”的网络。KiCad 没有与 CADSTAR 的间隔类等效的元"
+"素，因此未导入这些元素。请检查设计规则，因为敷铜将受此影响。"
+
 #: pcbnew/router/length_tuner_tool.cpp:57
 msgid "New Track"
 msgstr "新布线"
@@ -28433,10 +29543,11 @@ msgid "Use track and via sizes from the net class"
 msgstr "使用布线和过孔的网络类值"
 
 #: pcbnew/router/router_tool.cpp:204 pcbnew/router/router_tool.cpp:325
+#: pcbnew/tools/drawing_tool.cpp:91
 msgid "Use Custom Values..."
 msgstr "使用自定义值..."
 
-#: pcbnew/router/router_tool.cpp:205
+#: pcbnew/router/router_tool.cpp:205 pcbnew/tools/drawing_tool.cpp:92
 msgid "Specify custom track and via sizes"
 msgstr "指定自定义布线和过孔尺寸"
 
@@ -28453,27 +29564,27 @@ msgstr "布线 %s"
 msgid "Via netclass values"
 msgstr "过孔网络类值"
 
-#: pcbnew/router/router_tool.cpp:236
+#: pcbnew/router/router_tool.cpp:236 pcbnew/tools/drawing_tool.cpp:102
 #, c-format
 msgid "Via %s, drill %s"
 msgstr "过孔 %s，钻孔 %s"
 
-#: pcbnew/router/router_tool.cpp:240
+#: pcbnew/router/router_tool.cpp:240 pcbnew/tools/drawing_tool.cpp:106
 #, c-format
 msgid "Via %s"
 msgstr "过孔 %s"
 
 #: pcbnew/router/router_tool.cpp:304
 msgid "Select Differential Pair Dimensions"
-msgstr "选择差分对尺寸"
+msgstr "选择差分对标注"
 
 #: pcbnew/router/router_tool.cpp:321
 msgid "Use differential pair dimensions from the net class"
-msgstr "使用网络类中的差分对尺寸"
+msgstr "使用网络类中的差分对标注"
 
 #: pcbnew/router/router_tool.cpp:326
 msgid "Specify custom differential pair dimensions"
-msgstr "指定自定义差分对尺寸"
+msgstr "指定自定义差分对标注"
 
 #: pcbnew/router/router_tool.cpp:339
 msgid "Width "
@@ -28487,13 +29598,13 @@ msgstr "，间隙 "
 msgid ", via gap "
 msgstr "，过孔间隙 "
 
-#: pcbnew/router/router_tool.cpp:732
+#: pcbnew/router/router_tool.cpp:731
 msgid ""
 "Blind/buried vias have to be enabled in Board Setup > Design Rules > "
 "Constraints."
 msgstr "必须在“电路板设置”>“设计规则”>“约束”中启用盲孔/埋孔。"
 
-#: pcbnew/router/router_tool.cpp:739
+#: pcbnew/router/router_tool.cpp:738
 msgid ""
 "Microvias have to be enabled in Board Setup > Design Rules > Constraints."
 msgstr "必须在“电路板设置”>“设计规则”>“约束”中启用微孔。"
@@ -28504,25 +29615,25 @@ msgstr "2 层板上只允许通孔。"
 
 #: pcbnew/router/router_tool.cpp:754
 msgid ""
-"Microvias can be placed only between the outer layers (F.Cu/B.Cu) and the "
+"Microvias can only be placed between the outer layers (F.Cu/B.Cu) and the "
 "ones directly adjacent to them."
-msgstr "微孔只能放在外层 (顶层铜层/底层铜层) 和与它们直接相邻的层之间。"
+msgstr "微孔只能放置在外层 (顶层铜层/底层铜层) 和与其直接相邻的层之间。"
 
 #: pcbnew/router/router_tool.cpp:863
 msgid "Tracks on Copper layers only"
 msgstr "布线只能出现在铜层"
 
-#: pcbnew/router/router_tool.cpp:1216 pcbnew/router/router_tool.cpp:1397
-#: pcbnew/router/router_tool.cpp:1553
+#: pcbnew/router/router_tool.cpp:1213 pcbnew/router/router_tool.cpp:1394
+#: pcbnew/router/router_tool.cpp:1550
 msgid "The selected item is locked."
 msgstr "选择的项目被锁定。"
 
-#: pcbnew/router/router_tool.cpp:1218 pcbnew/router/router_tool.cpp:1399
+#: pcbnew/router/router_tool.cpp:1215 pcbnew/router/router_tool.cpp:1396
 msgid "Drag Anyway"
 msgstr "仍然拖动"
 
-#: pcbnew/router/router_tool.cpp:1555 pcbnew/tools/pcb_actions.cpp:1272
-#: pcbnew/tools/pcb_actions.cpp:1278
+#: pcbnew/router/router_tool.cpp:1552 pcbnew/tools/pcb_actions.cpp:1311
+#: pcbnew/tools/pcb_actions.cpp:1317
 msgid "Break Track"
 msgstr "分割布线"
 
@@ -28632,7 +29743,7 @@ msgstr "插入封装放置到当前电路板"
 msgid "Check footprint"
 msgstr "检查封装"
 
-#: pcbnew/toolbars_footprint_editor.cpp:202 pcbnew/toolbars_pcb_editor.cpp:613
+#: pcbnew/toolbars_footprint_editor.cpp:202 pcbnew/toolbars_pcb_editor.cpp:617
 msgid "+/- to switch"
 msgstr "+/- 切换"
 
@@ -28656,7 +29767,7 @@ msgstr ""
 "显示工作中的层\n"
 "选择布线和过孔的连接层"
 
-#: pcbnew/toolbars_pcb_editor.cpp:484
+#: pcbnew/toolbars_pcb_editor.cpp:488
 msgid ""
 "Auto track width: when starting on an existing track use its width\n"
 "otherwise, use current width setting"
@@ -28664,110 +29775,126 @@ msgstr ""
 "自动布线宽度：在开始现有的布线时使用它的宽度，\n"
 "否则，使用当前的宽度设置"
 
-#: pcbnew/toolbars_pcb_editor.cpp:532
+#: pcbnew/toolbars_pcb_editor.cpp:536
 #, c-format
 msgid "Track: %.3f mm (%.2f mils)"
 msgstr "布线：%.3f mm (%.2f mils)"
 
-#: pcbnew/toolbars_pcb_editor.cpp:534
+#: pcbnew/toolbars_pcb_editor.cpp:538
 #, c-format
 msgid "Track: %.2f mils (%.3f mm)"
 msgstr "布线: %.2f mils (%.3f mm)"
 
-#: pcbnew/toolbars_pcb_editor.cpp:546 pcbnew/toolbars_pcb_editor.cpp:598
+#: pcbnew/toolbars_pcb_editor.cpp:550 pcbnew/toolbars_pcb_editor.cpp:602
 msgid "Edit Pre-defined Sizes..."
 msgstr "编辑预定义尺寸..."
 
-#: pcbnew/toolbars_pcb_editor.cpp:574
+#: pcbnew/toolbars_pcb_editor.cpp:578
 #, c-format
 msgid "%.2f / %.2f mm"
 msgstr "%.2f / %.2f mm"
 
-#: pcbnew/toolbars_pcb_editor.cpp:576
+#: pcbnew/toolbars_pcb_editor.cpp:580
 #, c-format
 msgid "%.2f mm"
 msgstr "%.2f mm"
 
-#: pcbnew/toolbars_pcb_editor.cpp:582
+#: pcbnew/toolbars_pcb_editor.cpp:586
 #, c-format
 msgid "%.1f / %.1f mils"
 msgstr "%.1f / %.1f mils"
 
-#: pcbnew/toolbars_pcb_editor.cpp:584
+#: pcbnew/toolbars_pcb_editor.cpp:588
 #, c-format
 msgid "%.1f mils"
 msgstr "%.1f mils"
 
-#: pcbnew/toolbars_pcb_editor.cpp:586
+#: pcbnew/toolbars_pcb_editor.cpp:590
 #, c-format
 msgid "Via: %s (%s)"
 msgstr "过孔：%s (%s)"
 
-#: pcbnew/tools/convert_tool.cpp:76
+#: pcbnew/tools/convert_tool.cpp:68
 msgid "Convert..."
 msgstr "转换..."
 
-#: pcbnew/tools/convert_tool.cpp:186
+#: pcbnew/tools/convert_tool.cpp:178
 msgid "Convert shapes to polygon"
 msgstr "将形状转换为多边形"
 
-#: pcbnew/tools/convert_tool.cpp:217
+#: pcbnew/tools/convert_tool.cpp:209
 msgid "Convert shapes to zone"
 msgstr "将形状转换为区域"
 
-#: pcbnew/tools/convert_tool.cpp:472
+#: pcbnew/tools/convert_tool.cpp:491
 msgid "Convert polygons to lines"
 msgstr "将多边形转换为线"
 
-#: pcbnew/tools/convert_tool.cpp:555
+#: pcbnew/tools/convert_tool.cpp:577
 msgid "Create arc from line segment"
 msgstr "从线段创建圆弧"
 
-#: pcbnew/tools/drawing_tool.cpp:166 pcbnew/tools/drawing_tool.cpp:1176
+#: pcbnew/tools/drawing_tool.cpp:71
+msgid "Select Via Size"
+msgstr "选择过孔尺寸"
+
+#: pcbnew/tools/drawing_tool.cpp:261 pcbnew/tools/drawing_tool.cpp:1349
 msgid "Draw a line segment"
 msgstr "绘制线段"
 
-#: pcbnew/tools/drawing_tool.cpp:210 pcbnew/tools/pcb_actions.cpp:98
+#: pcbnew/tools/drawing_tool.cpp:305 pcbnew/tools/pcb_actions.cpp:98
 msgid "Draw a rectangle"
 msgstr "绘制矩形"
 
-#: pcbnew/tools/drawing_tool.cpp:252 pcbnew/tools/pcb_actions.cpp:104
+#: pcbnew/tools/drawing_tool.cpp:347 pcbnew/tools/pcb_actions.cpp:104
 msgid "Draw a circle"
 msgstr "绘制圆"
 
-#: pcbnew/tools/drawing_tool.cpp:291 pcbnew/tools/pcb_actions.cpp:110
+#: pcbnew/tools/drawing_tool.cpp:386 pcbnew/tools/pcb_actions.cpp:110
 msgid "Draw an arc"
 msgstr "绘制圆弧"
 
-#: pcbnew/tools/drawing_tool.cpp:466
+#: pcbnew/tools/drawing_tool.cpp:556
 msgid "Place a text"
 msgstr "放置文本"
 
-#: pcbnew/tools/drawing_tool.cpp:685
-msgid "Draw a dimension"
-msgstr "绘制尺寸"
+#: pcbnew/tools/drawing_tool.cpp:822
+msgid "Draw a leader"
+msgstr "绘制引线"
 
-#: pcbnew/tools/drawing_tool.cpp:762
+#: pcbnew/tools/drawing_tool.cpp:835
+msgid "Draw a dimension"
+msgstr "绘制标注"
+
+#: pcbnew/tools/drawing_tool.cpp:958
 msgid "No graphic items found in file to import"
 msgstr "在要导入的文件中找不到图形项目"
 
-#: pcbnew/tools/drawing_tool.cpp:804 pcbnew/tools/drawing_tool.cpp:889
+#: pcbnew/tools/drawing_tool.cpp:1000 pcbnew/tools/drawing_tool.cpp:1084
 msgid "Place a DXF_SVG drawing"
 msgstr "放置 DXF_SVG 图形"
 
-#: pcbnew/tools/drawing_tool.cpp:943
+#: pcbnew/tools/drawing_tool.cpp:1136
 msgid "Move the footprint reference anchor"
 msgstr "移动封装位号锚点"
 
-#: pcbnew/tools/drawing_tool.cpp:1537
+#: pcbnew/tools/drawing_tool.cpp:1717
 msgid "Self-intersecting polygons are not allowed"
 msgstr "不允许自相交多边形"
 
-#: pcbnew/tools/drawing_tool.cpp:1998
+#: pcbnew/tools/drawing_tool.cpp:2186
 msgid "Place via"
 msgstr "放置过孔"
 
-#: pcbnew/tools/edit_tool.cpp:141
+#: pcbnew/tools/drc_tool.cpp:168
+msgid "Refilling all zones..."
+msgstr "重新填充所有覆铜区域..."
+
+#: pcbnew/tools/drc_tool.cpp:228
+msgid "DRC"
+msgstr "DRC"
+
+#: pcbnew/tools/edit_tool.cpp:143
 msgid "Special Tools..."
 msgstr "特殊工具..."
 
@@ -28775,27 +29902,27 @@ msgstr "特殊工具..."
 msgid "Select reference point for move..."
 msgstr "选择要移动的参考点..."
 
-#: pcbnew/tools/edit_tool.cpp:702
+#: pcbnew/tools/edit_tool.cpp:701
 msgid "Edit track width/via size"
 msgstr "编辑布线宽度/过孔尺寸"
 
-#: pcbnew/tools/edit_tool.cpp:1014 pcbnew/tools/pcb_actions.cpp:268
+#: pcbnew/tools/edit_tool.cpp:1013 pcbnew/tools/pcb_actions.cpp:283
 msgid "Flip"
 msgstr "翻转"
 
-#: pcbnew/tools/edit_tool.cpp:1161 pcbnew/tools/zone_filler_tool.cpp:143
+#: pcbnew/tools/edit_tool.cpp:1160 pcbnew/tools/zone_filler_tool.cpp:149
 msgid "Fill Zone"
 msgstr "填充覆铜"
 
-#: pcbnew/tools/edit_tool.cpp:1229
+#: pcbnew/tools/edit_tool.cpp:1228
 msgid "Remove of items in entered group resulted in inconsistent state: "
 msgstr "删除输入组中的项目导致状态不一致： "
 
-#: pcbnew/tools/edit_tool.cpp:1239
+#: pcbnew/tools/edit_tool.cpp:1236
 msgid "Delete again to remove locked items"
 msgstr "再次删除锁定的项目"
 
-#: pcbnew/tools/edit_tool.cpp:1342
+#: pcbnew/tools/edit_tool.cpp:1339
 msgid "Move exact"
 msgstr "精确移动"
 
@@ -28804,17 +29931,9 @@ msgstr "精确移动"
 msgid "Duplicated %d item(s)"
 msgstr "复制 %d 项"
 
-#: pcbnew/tools/edit_tool.cpp:1650
-msgid "Select reference point for the copy..."
-msgstr "为副本选择参考点..."
-
-#: pcbnew/tools/edit_tool.cpp:1651
-msgid "Selection copied."
-msgstr "选择项已复制。"
-
-#: pcbnew/tools/edit_tool.cpp:1652
-msgid "Copy cancelled."
-msgstr "复制取消。"
+#: pcbnew/tools/edit_tool.cpp:1649
+msgid "Selection copied"
+msgstr "选择已复制"
 
 #: pcbnew/tools/footprint_editor_tools.cpp:183
 msgid "_copy"
@@ -28880,12 +29999,12 @@ msgid "Creates a copper zone from the selection"
 msgstr "从所选内容创建铜区"
 
 #: pcbnew/tools/pcb_actions.cpp:66
-msgid "Convert to Keepout"
-msgstr "转换为禁布区"
+msgid "Convert to Rule Area"
+msgstr "转换为规则区域"
 
 #: pcbnew/tools/pcb_actions.cpp:67
-msgid "Creates a keepout zone from the selection"
-msgstr "从所选内容创建禁止区域"
+msgid "Creates a rule area from the selection"
+msgstr "从所选内容创建规则区域"
 
 #: pcbnew/tools/pcb_actions.cpp:70
 msgid "Convert to Lines"
@@ -28940,693 +30059,737 @@ msgid "Draw Arc"
 msgstr "绘制圆弧"
 
 #: pcbnew/tools/pcb_actions.cpp:122
-msgid "Add Dimension"
-msgstr "添加尺寸"
+msgid "Add Aligned Dimension"
+msgstr "添加对齐标注"
 
 #: pcbnew/tools/pcb_actions.cpp:122
-msgid "Add a dimension"
-msgstr "添加尺寸"
+msgid "Add an aligned linear dimension"
+msgstr "添加对齐的线性标注"
 
-#: pcbnew/tools/pcb_actions.cpp:133
+#: pcbnew/tools/pcb_actions.cpp:127
+msgid "Add Center Dimension"
+msgstr "添加中心标注"
+
+#: pcbnew/tools/pcb_actions.cpp:127
+msgid "Add a center dimension"
+msgstr "添加中心标注"
+
+#: pcbnew/tools/pcb_actions.cpp:132
+msgid "Add Orthogonal Dimension"
+msgstr "添加正交标注"
+
+#: pcbnew/tools/pcb_actions.cpp:132
+msgid "Add an orthogonal dimension"
+msgstr "添加正交标注"
+
+#: pcbnew/tools/pcb_actions.cpp:137
+msgid "Add Leader"
+msgstr "添加引线"
+
+#: pcbnew/tools/pcb_actions.cpp:137
+msgid "Add a leader dimension"
+msgstr "添加引线标注"
+
+#: pcbnew/tools/pcb_actions.cpp:148
 msgid "Add Filled Zone"
 msgstr "添加覆铜区域"
 
-#: pcbnew/tools/pcb_actions.cpp:133
+#: pcbnew/tools/pcb_actions.cpp:148
 msgid "Add a filled zone"
 msgstr "添加填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:139
+#: pcbnew/tools/pcb_actions.cpp:154
 msgid "Add Vias"
 msgstr "添加过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:139
+#: pcbnew/tools/pcb_actions.cpp:154
 msgid "Add free-standing vias"
 msgstr "添加独立的过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:145
-msgid "Add Keepout Area"
-msgstr "添加禁布区"
+#: pcbnew/tools/pcb_actions.cpp:160
+msgid "Add Rule Area"
+msgstr "添加规则区域"
 
-#: pcbnew/tools/pcb_actions.cpp:145
-msgid "Add a keepout area"
-msgstr "添加禁布区"
+#: pcbnew/tools/pcb_actions.cpp:160
+msgid "Add a rule area (keepout)"
+msgstr "添加规则区域（禁布区）"
 
-#: pcbnew/tools/pcb_actions.cpp:151
+#: pcbnew/tools/pcb_actions.cpp:166
 msgid "Add a Zone Cutout"
 msgstr "添加挖空区域"
 
-#: pcbnew/tools/pcb_actions.cpp:151
+#: pcbnew/tools/pcb_actions.cpp:166
 msgid "Add a cutout area of an existing zone"
 msgstr "添加挖空区域"
 
-#: pcbnew/tools/pcb_actions.cpp:157
+#: pcbnew/tools/pcb_actions.cpp:172
 msgid "Add a Similar Zone"
 msgstr "添加相似覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:157
+#: pcbnew/tools/pcb_actions.cpp:172
 msgid "Add a zone with the same settings as an existing zone"
 msgstr "添加与现有区域具有相同设置的区域"
 
-#: pcbnew/tools/pcb_actions.cpp:163
+#: pcbnew/tools/pcb_actions.cpp:178
 msgid "Place Imported Graphics"
 msgstr "放置导入的图形"
 
-#: pcbnew/tools/pcb_actions.cpp:169
+#: pcbnew/tools/pcb_actions.cpp:184
 msgid "Place the Footprint Anchor"
 msgstr "放置封装锚点"
 
-#: pcbnew/tools/pcb_actions.cpp:175
+#: pcbnew/tools/pcb_actions.cpp:190
 msgid "Increase Line Width"
 msgstr "增大线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:175
+#: pcbnew/tools/pcb_actions.cpp:190
 msgid "Increase the line width"
 msgstr "增加线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:180
+#: pcbnew/tools/pcb_actions.cpp:195
 msgid "Decrease Line Width"
 msgstr "减小线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:180
+#: pcbnew/tools/pcb_actions.cpp:195
 msgid "Decrease the line width"
 msgstr "减少线宽"
 
-#: pcbnew/tools/pcb_actions.cpp:185
+#: pcbnew/tools/pcb_actions.cpp:200
 msgid "Switch Arc Posture"
 msgstr "切换弧形态"
 
-#: pcbnew/tools/pcb_actions.cpp:185
+#: pcbnew/tools/pcb_actions.cpp:200
 msgid "Switch the arc posture"
 msgstr "交换圆弧位置"
 
-#: pcbnew/tools/pcb_actions.cpp:190
+#: pcbnew/tools/pcb_actions.cpp:205
 msgid "Delete Last Point"
 msgstr "删除最后的点"
 
-#: pcbnew/tools/pcb_actions.cpp:190
+#: pcbnew/tools/pcb_actions.cpp:205
 msgid "Delete the last point added to the current item"
 msgstr "删除当前项目中添加的最后一个点"
 
-#: pcbnew/tools/pcb_actions.cpp:195
+#: pcbnew/tools/pcb_actions.cpp:210
 msgid "Close Outline"
 msgstr "闭合轮廓"
 
-#: pcbnew/tools/pcb_actions.cpp:195
+#: pcbnew/tools/pcb_actions.cpp:210
 msgid "Close the in progress outline"
 msgstr "闭合进行中的边界"
 
-#: pcbnew/tools/pcb_actions.cpp:203
+#: pcbnew/tools/pcb_actions.cpp:218
 msgid "Design Rules Checker"
 msgstr "设计规则检查"
 
-#: pcbnew/tools/pcb_actions.cpp:203
+#: pcbnew/tools/pcb_actions.cpp:218
 msgid "Show the design rules checker window"
 msgstr "显示设计规则检查器窗口"
 
-#: pcbnew/tools/pcb_actions.cpp:212
+#: pcbnew/tools/pcb_actions.cpp:227
 msgid "Open in Footprint Editor"
 msgstr "在封装编辑器中打开"
 
-#: pcbnew/tools/pcb_actions.cpp:213
+#: pcbnew/tools/pcb_actions.cpp:228
 msgid "Opens the selected footprint in the Footprint Editor"
 msgstr "在封装编辑器中打开选择的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:220
+#: pcbnew/tools/pcb_actions.cpp:235
 msgid ""
 "Selects a footprint by reference designator and places it under the cursor "
 "for moving"
 msgstr "按位号选择封装，并将其放置在光标下以进行移动"
 
-#: pcbnew/tools/pcb_actions.cpp:230
+#: pcbnew/tools/pcb_actions.cpp:245
 msgid "Move with Reference"
 msgstr "随位号移动"
 
-#: pcbnew/tools/pcb_actions.cpp:231
+#: pcbnew/tools/pcb_actions.cpp:246
 msgid "Moves the selected item(s) with a specified starting point"
 msgstr "移动具有指定精确的选定项目"
 
-#: pcbnew/tools/pcb_actions.cpp:237
+#: pcbnew/tools/pcb_actions.cpp:252
 msgid "Duplicate and Increment"
 msgstr "重复和递增"
 
-#: pcbnew/tools/pcb_actions.cpp:237
+#: pcbnew/tools/pcb_actions.cpp:252
 msgid "Duplicates the selected item(s), incrementing pad numbers"
 msgstr "复制选择项目, 增量焊盘编号"
 
-#: pcbnew/tools/pcb_actions.cpp:243
+#: pcbnew/tools/pcb_actions.cpp:258
 msgid "Move Exactly..."
 msgstr "精确移动..."
 
-#: pcbnew/tools/pcb_actions.cpp:243
+#: pcbnew/tools/pcb_actions.cpp:258
 msgid "Moves the selected item(s) by an exact amount"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:249
+#: pcbnew/tools/pcb_actions.cpp:264
 msgid "Create Array..."
 msgstr "创建阵列..."
 
-#: pcbnew/tools/pcb_actions.cpp:249
+#: pcbnew/tools/pcb_actions.cpp:264
 msgid "Create array"
 msgstr "创建阵列"
 
-#: pcbnew/tools/pcb_actions.cpp:262
+#: pcbnew/tools/pcb_actions.cpp:277
 msgid "Rotate Counterclockwise"
 msgstr "逆时针旋转"
 
-#: pcbnew/tools/pcb_actions.cpp:262
+#: pcbnew/tools/pcb_actions.cpp:277
 msgid "Rotates selected item(s) counterclockwise"
 msgstr "将选中的项目逆时针旋转"
 
-#: pcbnew/tools/pcb_actions.cpp:268
+#: pcbnew/tools/pcb_actions.cpp:283
 msgid "Flips selected item(s) to opposite side of board"
 msgstr "将所选项目翻转到板的另一侧"
 
-#: pcbnew/tools/pcb_actions.cpp:273
+#: pcbnew/tools/pcb_actions.cpp:288
 msgid "Mirrors selected item"
 msgstr "镜像选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:278
+#: pcbnew/tools/pcb_actions.cpp:293
 msgid "Change Track Width"
 msgstr "调整布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:278
+#: pcbnew/tools/pcb_actions.cpp:293
 msgid "Updates selected track & via sizes"
 msgstr "更新选定的布线和过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:283
+#: pcbnew/tools/pcb_actions.cpp:298
 msgid "Delete Full Track"
 msgstr "删除整条布线"
 
-#: pcbnew/tools/pcb_actions.cpp:283
+#: pcbnew/tools/pcb_actions.cpp:298
 msgid "Deletes selected item(s) and copper connections"
 msgstr "删除所选项目和铜连接"
 
-#: pcbnew/tools/pcb_actions.cpp:300
+#: pcbnew/tools/pcb_actions.cpp:315
 msgid "Show Footprint Tree"
 msgstr "显示封装树"
 
-#: pcbnew/tools/pcb_actions.cpp:300
+#: pcbnew/tools/pcb_actions.cpp:315
 msgid "Toggles the footprint tree visibility"
 msgstr "切换封装树可见性"
 
-#: pcbnew/tools/pcb_actions.cpp:306
+#: pcbnew/tools/pcb_actions.cpp:321
 msgid "New Footprint..."
 msgstr "新建封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:306
+#: pcbnew/tools/pcb_actions.cpp:321
 msgid "Create a new, empty footprint"
 msgstr "创建一个新的空封装"
 
-#: pcbnew/tools/pcb_actions.cpp:311
+#: pcbnew/tools/pcb_actions.cpp:326
 msgid "Create Footprint..."
 msgstr "创建封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:311
+#: pcbnew/tools/pcb_actions.cpp:326
 msgid "Create a new footprint using the Footprint Wizard"
 msgstr "使用封装向导创建一个新的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:316
+#: pcbnew/tools/pcb_actions.cpp:331
 msgid "Save to Board"
 msgstr "保存电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:316
+#: pcbnew/tools/pcb_actions.cpp:331
 msgid "Update footprint on board"
 msgstr "更新在板上的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:321
+#: pcbnew/tools/pcb_actions.cpp:336
 msgid "Save to Library"
 msgstr "保存到库"
 
-#: pcbnew/tools/pcb_actions.cpp:321
+#: pcbnew/tools/pcb_actions.cpp:336
 msgid "Save changes to library"
 msgstr "保存更改到库"
 
-#: pcbnew/tools/pcb_actions.cpp:326
+#: pcbnew/tools/pcb_actions.cpp:341
 msgid "Edit Footprint"
 msgstr "编辑封装"
 
-#: pcbnew/tools/pcb_actions.cpp:326
+#: pcbnew/tools/pcb_actions.cpp:341
 msgid "Show selected footprint on editor canvas"
 msgstr "在编辑器画布上显示选定的轮廓线"
 
-#: pcbnew/tools/pcb_actions.cpp:331
+#: pcbnew/tools/pcb_actions.cpp:346
 msgid "Delete Footprint from Library"
 msgstr "从库中删除封装"
 
-#: pcbnew/tools/pcb_actions.cpp:336
+#: pcbnew/tools/pcb_actions.cpp:351
 msgid "Cut Footprint"
 msgstr "剪切封装"
 
-#: pcbnew/tools/pcb_actions.cpp:341
+#: pcbnew/tools/pcb_actions.cpp:356
 msgid "Copy Footprint"
 msgstr "复制封装"
 
-#: pcbnew/tools/pcb_actions.cpp:346
+#: pcbnew/tools/pcb_actions.cpp:361
 msgid "Paste Footprint"
 msgstr "粘贴封装"
 
-#: pcbnew/tools/pcb_actions.cpp:351
+#: pcbnew/tools/pcb_actions.cpp:366
 msgid "Import Footprint..."
 msgstr "导入封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:356
+#: pcbnew/tools/pcb_actions.cpp:371
 msgid "Export Footprint..."
 msgstr "导出封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:361
+#: pcbnew/tools/pcb_actions.cpp:376
 msgid "Footprint Properties..."
 msgstr "封装属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:369
+#: pcbnew/tools/pcb_actions.cpp:384
 msgid "Update Footprint..."
 msgstr "更新封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:370
+#: pcbnew/tools/pcb_actions.cpp:385
 msgid "Update footprint to include any changes from the library"
 msgstr "更新封装以包含来自库的任何更改"
 
-#: pcbnew/tools/pcb_actions.cpp:375
+#: pcbnew/tools/pcb_actions.cpp:390
 msgid "Update Footprints from Library..."
 msgstr "从库中更新封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:376
+#: pcbnew/tools/pcb_actions.cpp:391
 msgid "Update footprints to include any changes from the library"
 msgstr "更新封装以包含来自库的任何更改"
 
-#: pcbnew/tools/pcb_actions.cpp:381
+#: pcbnew/tools/pcb_actions.cpp:396
 msgid "Remove Unused Pads..."
 msgstr "删除未使用的焊盘..."
 
-#: pcbnew/tools/pcb_actions.cpp:382
+#: pcbnew/tools/pcb_actions.cpp:397
 msgid ""
 "Remove or reset the unconnected inner layers on through hole pads and vias"
 msgstr "移除或重置通孔焊盘和通孔上未连接的内层"
 
-#: pcbnew/tools/pcb_actions.cpp:387
+#: pcbnew/tools/pcb_actions.cpp:402
 msgid "Assign a different footprint from the library"
 msgstr "从库中分配不同的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:392
+#: pcbnew/tools/pcb_actions.cpp:407
 msgid "Change Footprints..."
 msgstr "保存封装..."
 
-#: pcbnew/tools/pcb_actions.cpp:392
+#: pcbnew/tools/pcb_actions.cpp:407
 msgid "Assign different footprints from the library"
 msgstr "从库中分配不同的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:397
+#: pcbnew/tools/pcb_actions.cpp:412
 msgid "Swap Layers..."
 msgstr "交换层..."
 
-#: pcbnew/tools/pcb_actions.cpp:397
+#: pcbnew/tools/pcb_actions.cpp:412
 msgid "Move tracks or drawings from one layer to another"
 msgstr "将布线或绘制从一层移到另一层"
 
-#: pcbnew/tools/pcb_actions.cpp:402
+#: pcbnew/tools/pcb_actions.cpp:417
 msgid "Edit Track & Via Properties..."
 msgstr "编辑布线与过孔属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:408
+#: pcbnew/tools/pcb_actions.cpp:423
 msgid "Edit Text and graphics properties globally across board"
 msgstr "全局编辑文本和图形属性"
 
-#: pcbnew/tools/pcb_actions.cpp:413
+#: pcbnew/tools/pcb_actions.cpp:428
 msgid "Global Deletions..."
 msgstr "全局删除..."
 
-#: pcbnew/tools/pcb_actions.cpp:414
+#: pcbnew/tools/pcb_actions.cpp:429
 msgid "Delete tracks, footprints and graphic items from board"
 msgstr "在板上删除布线, 封装和图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:419
+#: pcbnew/tools/pcb_actions.cpp:434
 msgid "Cleanup Tracks & Vias..."
 msgstr "清除布线和过孔..."
 
-#: pcbnew/tools/pcb_actions.cpp:420
+#: pcbnew/tools/pcb_actions.cpp:435
 msgid "Cleanup redundant items, shorting items, etc."
 msgstr "清理冗余项，短路项等。"
 
-#: pcbnew/tools/pcb_actions.cpp:425
+#: pcbnew/tools/pcb_actions.cpp:440
 msgid "Cleanup Graphics..."
 msgstr "清理图形..."
 
-#: pcbnew/tools/pcb_actions.cpp:426
+#: pcbnew/tools/pcb_actions.cpp:441
 msgid "Cleanup redundant items, etc."
 msgstr "清理冗余项等。"
 
-#: pcbnew/tools/pcb_actions.cpp:433
+#: pcbnew/tools/pcb_actions.cpp:448
 msgid "Add Microwave Gap"
 msgstr "添加微波间隙"
 
-#: pcbnew/tools/pcb_actions.cpp:433
+#: pcbnew/tools/pcb_actions.cpp:448
 msgid "Create gap of specified length for microwave applications"
 msgstr "创建指定长度的高频设计缺口"
 
-#: pcbnew/tools/pcb_actions.cpp:438
+#: pcbnew/tools/pcb_actions.cpp:453
 msgid "Add Microwave Stub"
 msgstr "添加微波存根"
 
-#: pcbnew/tools/pcb_actions.cpp:438
+#: pcbnew/tools/pcb_actions.cpp:453
 msgid "Create stub of specified length for microwave applications"
 msgstr "创建指定长度的高频设计短截线"
 
-#: pcbnew/tools/pcb_actions.cpp:443
+#: pcbnew/tools/pcb_actions.cpp:458
 msgid "Add Microwave Arc Stub"
 msgstr "添加微波弧形存根"
 
-#: pcbnew/tools/pcb_actions.cpp:443
+#: pcbnew/tools/pcb_actions.cpp:458
 msgid "Create stub (arc) of specified size for microwave applications"
 msgstr "为微波应用创建指定大小的存根(弧形)"
 
-#: pcbnew/tools/pcb_actions.cpp:448
+#: pcbnew/tools/pcb_actions.cpp:463
 msgid "Add Microwave Polygonal Shape"
 msgstr "添加微波多边形"
 
-#: pcbnew/tools/pcb_actions.cpp:448
+#: pcbnew/tools/pcb_actions.cpp:463
 msgid "Create a microwave polygonal shape from a list of vertices"
 msgstr "从顶点列表创建微波多边形形状"
 
-#: pcbnew/tools/pcb_actions.cpp:453
+#: pcbnew/tools/pcb_actions.cpp:468
 msgid "Add Microwave Line"
 msgstr "添加微波线"
 
-#: pcbnew/tools/pcb_actions.cpp:453
+#: pcbnew/tools/pcb_actions.cpp:468
 msgid "Create line of specified length for microwave applications"
 msgstr "创建指定长度的高频设计线"
 
-#: pcbnew/tools/pcb_actions.cpp:461
+#: pcbnew/tools/pcb_actions.cpp:476
 msgid "Copy Pad Properties to Default"
 msgstr "将焊盘属性复制到默认值"
 
-#: pcbnew/tools/pcb_actions.cpp:461
+#: pcbnew/tools/pcb_actions.cpp:476
 msgid "Copy current pad's properties"
 msgstr "复制当前焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:466
+#: pcbnew/tools/pcb_actions.cpp:481
 msgid "Paste Default Pad Properties to Selected"
 msgstr "将默认焊盘属性粘贴到选定项"
 
-#: pcbnew/tools/pcb_actions.cpp:467
+#: pcbnew/tools/pcb_actions.cpp:482
 msgid "Replace the current pad's properties with those copied earlier"
 msgstr "将先前复制的属性替换为当前焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:472
+#: pcbnew/tools/pcb_actions.cpp:487
 msgid "Push Pad Properties to Other Pads..."
 msgstr "将焊盘属性推送到其他焊盘."
 
-#: pcbnew/tools/pcb_actions.cpp:473
+#: pcbnew/tools/pcb_actions.cpp:488
 msgid "Copy the current pad's properties to other pads"
 msgstr "复制当前焊盘属性到其他焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:478
+#: pcbnew/tools/pcb_actions.cpp:493
 msgid "Renumber Pads..."
 msgstr "焊盘重新编号..."
 
-#: pcbnew/tools/pcb_actions.cpp:479
+#: pcbnew/tools/pcb_actions.cpp:494
 msgid "Renumber pads by clicking on them in the desired order"
 msgstr "按所需顺序单击它们重新编号"
 
-#: pcbnew/tools/pcb_actions.cpp:484
+#: pcbnew/tools/pcb_actions.cpp:499
 msgid "Add Pad"
 msgstr "添加焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:484
+#: pcbnew/tools/pcb_actions.cpp:499
 msgid "Add a pad"
 msgstr "添加焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:490
+#: pcbnew/tools/pcb_actions.cpp:505
 msgid "Edit Pad as Graphic Shapes"
 msgstr "将焊盘编辑为图形形状"
 
-#: pcbnew/tools/pcb_actions.cpp:491
+#: pcbnew/tools/pcb_actions.cpp:506
 msgid "Ungroups a custom-shaped pad for editing as individual graphic shapes"
 msgstr "取消自定义形状焊盘的分组，以便作为单个图形形状进行编辑"
 
-#: pcbnew/tools/pcb_actions.cpp:497
+#: pcbnew/tools/pcb_actions.cpp:512
 msgid "Finish Pad Edit"
 msgstr "完成焊盘编辑"
 
-#: pcbnew/tools/pcb_actions.cpp:498
+#: pcbnew/tools/pcb_actions.cpp:513
 msgid "Regroups all touching graphic shapes into the edited pad"
 msgstr "将所有接触图形形状重新组合到已编辑的焊盘中"
 
-#: pcbnew/tools/pcb_actions.cpp:503
+#: pcbnew/tools/pcb_actions.cpp:518
 msgid "Default Pad Properties..."
 msgstr "默认焊盘属性..."
 
-#: pcbnew/tools/pcb_actions.cpp:503
+#: pcbnew/tools/pcb_actions.cpp:518
 msgid "Edit the pad properties used when creating new pads"
 msgstr "编辑创建新焊盘时使用的焊盘属性"
 
-#: pcbnew/tools/pcb_actions.cpp:511
+#: pcbnew/tools/pcb_actions.cpp:526
 msgid "Board Setup..."
 msgstr "电路板设置..."
 
-#: pcbnew/tools/pcb_actions.cpp:512
+#: pcbnew/tools/pcb_actions.cpp:527
 msgid "Edit board setup including layers, design rules and various defaults"
 msgstr "编辑电路板设置，包括层、设计规则和各个默认值"
 
-#: pcbnew/tools/pcb_actions.cpp:517
+#: pcbnew/tools/pcb_actions.cpp:532
 msgid "Netlist..."
 msgstr "网表..."
 
-#: pcbnew/tools/pcb_actions.cpp:517
+#: pcbnew/tools/pcb_actions.cpp:532
 msgid "Read netlist and update board connectivity"
 msgstr "读取网络列表并更新电路板连接"
 
-#: pcbnew/tools/pcb_actions.cpp:522
+#: pcbnew/tools/pcb_actions.cpp:537
 msgid "Specctra Session..."
 msgstr "自动布线会话..."
 
-#: pcbnew/tools/pcb_actions.cpp:522
+#: pcbnew/tools/pcb_actions.cpp:537
 msgid "Import routed Specctra session (*.ses) file"
 msgstr "导入布线器会话(*.ses)文件"
 
-#: pcbnew/tools/pcb_actions.cpp:527
+#: pcbnew/tools/pcb_actions.cpp:542
 msgid "Specctra DSN..."
 msgstr "光绘 DSN..."
 
-#: pcbnew/tools/pcb_actions.cpp:527
+#: pcbnew/tools/pcb_actions.cpp:542
 msgid "Export Specctra DSN routing info"
 msgstr "导出光绘 DSN 路线信息"
 
-#: pcbnew/tools/pcb_actions.cpp:532
+#: pcbnew/tools/pcb_actions.cpp:547
 msgid "Gerbers (.gbr)..."
 msgstr "Gerbers (.gbr)..."
 
-#: pcbnew/tools/pcb_actions.cpp:532
+#: pcbnew/tools/pcb_actions.cpp:547
 msgid "Generate Gerbers for fabrication"
 msgstr "生成用于制造的 Gerbers"
 
-#: pcbnew/tools/pcb_actions.cpp:537
+#: pcbnew/tools/pcb_actions.cpp:552
 msgid "Drill Files (.drl)..."
 msgstr "钻孔文件 (.drl)..."
 
-#: pcbnew/tools/pcb_actions.cpp:537
+#: pcbnew/tools/pcb_actions.cpp:552
 msgid "Generate Excellon drill file(s)"
 msgstr "生成出色的钻取文件"
 
-#: pcbnew/tools/pcb_actions.cpp:542
+#: pcbnew/tools/pcb_actions.cpp:557
 msgid "Footprint Positions (.pos)..."
 msgstr "封装位置 (.pos)..."
 
-#: pcbnew/tools/pcb_actions.cpp:543
+#: pcbnew/tools/pcb_actions.cpp:558
 msgid "Generate footprint position file for pick and place"
 msgstr "生成封装拾取和放置位置的文件"
 
-#: pcbnew/tools/pcb_actions.cpp:548
+#: pcbnew/tools/pcb_actions.cpp:563
 msgid "Footprint Report (.rpt)..."
 msgstr "封装报告 (.rpt)..."
 
-#: pcbnew/tools/pcb_actions.cpp:549
+#: pcbnew/tools/pcb_actions.cpp:564
 msgid "Create report of all footprints from current board"
 msgstr "创建当前电路板所有封装报告"
 
-#: pcbnew/tools/pcb_actions.cpp:554
+#: pcbnew/tools/pcb_actions.cpp:569
 msgid "IPC-D-356 Netlist File..."
 msgstr "IPC-D-356 网络列表文件..."
 
-#: pcbnew/tools/pcb_actions.cpp:554
+#: pcbnew/tools/pcb_actions.cpp:569
 msgid "Generate IPC-D-356 netlist file"
 msgstr "创建 IPC-D-356 网络文件"
 
-#: pcbnew/tools/pcb_actions.cpp:559
+#: pcbnew/tools/pcb_actions.cpp:574
 msgid "BOM..."
 msgstr "BOM..."
 
-#: pcbnew/tools/pcb_actions.cpp:559
+#: pcbnew/tools/pcb_actions.cpp:574
 msgid "Create bill of materials from board"
 msgstr "从电路板板创建 BOM"
 
-#: pcbnew/tools/pcb_actions.cpp:566
+#: pcbnew/tools/pcb_actions.cpp:581
 msgid "Switch Track Width to Next"
 msgstr "切换下一个布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:571
+#: pcbnew/tools/pcb_actions.cpp:586
 msgid "Switch Track Width to Previous"
 msgstr "切换上一个布线宽度"
 
-#: pcbnew/tools/pcb_actions.cpp:576
+#: pcbnew/tools/pcb_actions.cpp:591
 msgid "Increase Via Size"
 msgstr "增大过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:581
+#: pcbnew/tools/pcb_actions.cpp:596
 msgid "Decrease Via Size"
 msgstr "减小过孔尺寸"
 
-#: pcbnew/tools/pcb_actions.cpp:590
+#: pcbnew/tools/pcb_actions.cpp:605
 msgid "Merge Zones"
 msgstr "合并区域"
 
-#: pcbnew/tools/pcb_actions.cpp:590
+#: pcbnew/tools/pcb_actions.cpp:605
 msgid "Merge zones"
 msgstr "合并覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:594
+#: pcbnew/tools/pcb_actions.cpp:609
 msgid "Duplicate Zone onto Layer..."
 msgstr "重复覆铜区域到层..."
 
-#: pcbnew/tools/pcb_actions.cpp:594
+#: pcbnew/tools/pcb_actions.cpp:609
 msgid "Duplicate zone outline onto a different layer"
 msgstr "复制覆铜轮廓到不同的层上"
 
-#: pcbnew/tools/pcb_actions.cpp:599
+#: pcbnew/tools/pcb_actions.cpp:614
 msgid "Add Layer Alignment Target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_actions.cpp:599
+#: pcbnew/tools/pcb_actions.cpp:614
 msgid "Add a layer alignment target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_actions.cpp:605
+#: pcbnew/tools/pcb_actions.cpp:620
 msgid "Add Footprint"
 msgstr "添加封装"
 
-#: pcbnew/tools/pcb_actions.cpp:605
+#: pcbnew/tools/pcb_actions.cpp:620
 msgid "Add a footprint"
 msgstr "添加封装"
 
-#: pcbnew/tools/pcb_actions.cpp:610
+#: pcbnew/tools/pcb_actions.cpp:625
 msgid "Drill/Place File Origin"
 msgstr "钻孔/放置文件原点"
 
-#: pcbnew/tools/pcb_actions.cpp:611
+#: pcbnew/tools/pcb_actions.cpp:626
 msgid "Place origin point for drill files and footprint position files"
 msgstr "放置钻孔文件和封装位置文件的原点"
 
-#: pcbnew/tools/pcb_actions.cpp:617
+#: pcbnew/tools/pcb_actions.cpp:632
 msgid "Toggle Lock"
 msgstr "切换锁定"
 
-#: pcbnew/tools/pcb_actions.cpp:622 pcbnew/tools/pcb_editor_control.cpp:995
+#: pcbnew/tools/pcb_actions.cpp:637 pcbnew/tools/pcb_editor_control.cpp:996
 msgid "Lock"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_actions.cpp:627 pcbnew/tools/pcb_editor_control.cpp:996
+#: pcbnew/tools/pcb_actions.cpp:642 pcbnew/tools/pcb_editor_control.cpp:997
 msgid "Unlock"
 msgstr "解锁"
 
-#: pcbnew/tools/pcb_actions.cpp:637
+#: pcbnew/tools/pcb_actions.cpp:647
+msgid "Add the selected items to a new group"
+msgstr "将所选项目添加到新组"
+
+#: pcbnew/tools/pcb_actions.cpp:652
 msgid "Merge"
 msgstr "合并"
 
-#: pcbnew/tools/pcb_actions.cpp:642
+#: pcbnew/tools/pcb_actions.cpp:657
 msgid "Ungroup"
 msgstr "解组"
 
-#: pcbnew/tools/pcb_actions.cpp:647
+#: pcbnew/tools/pcb_actions.cpp:662
 msgid "Remove Items"
 msgstr "删除项目"
 
-#: pcbnew/tools/pcb_actions.cpp:652
-msgid "Flatten"
-msgstr "扁平化"
-
-#: pcbnew/tools/pcb_actions.cpp:657
-msgid "Enter"
-msgstr "开始"
-
 #: pcbnew/tools/pcb_actions.cpp:662
+msgid "Remove items from group"
+msgstr "从组中删除项目"
+
+#: pcbnew/tools/pcb_actions.cpp:667
+msgid "Flatten Group"
+msgstr "展开组"
+
+#: pcbnew/tools/pcb_actions.cpp:672
+msgid "Enter Group"
+msgstr "编辑组合"
+
+#: pcbnew/tools/pcb_actions.cpp:672
+msgid "Enter the group to edit items"
+msgstr "输入要编辑项目的组"
+
+#: pcbnew/tools/pcb_actions.cpp:677
+msgid "Leave Group"
+msgstr "离开组"
+
+#: pcbnew/tools/pcb_actions.cpp:677
+msgid "Leave the current group"
+msgstr "离开当前组"
+
+#: pcbnew/tools/pcb_actions.cpp:682
 msgid "Append Board..."
 msgstr "添加电路板..."
 
-#: pcbnew/tools/pcb_actions.cpp:666
+#: pcbnew/tools/pcb_actions.cpp:686
 msgid "Highlight the selected net"
 msgstr "高亮所选的网络"
 
-#: pcbnew/tools/pcb_actions.cpp:671
+#: pcbnew/tools/pcb_actions.cpp:691
 msgid "Toggle Last Net Highlight"
 msgstr "切换最后一个网络高亮"
 
-#: pcbnew/tools/pcb_actions.cpp:671
+#: pcbnew/tools/pcb_actions.cpp:691
 msgid "Toggle between last two highlighted nets"
 msgstr "在最后两个突出显示的网之间切换"
 
-#: pcbnew/tools/pcb_actions.cpp:675
+#: pcbnew/tools/pcb_actions.cpp:695
 msgid "Clear Net Highlighting"
 msgstr "清除网络高亮"
 
-#: pcbnew/tools/pcb_actions.cpp:679 pcbnew/tools/pcb_actions.cpp:686
+#: pcbnew/tools/pcb_actions.cpp:699 pcbnew/tools/pcb_actions.cpp:706
 msgid "Highlight all copper items of a net"
 msgstr "高亮网络中的所有铜项目"
 
-#: pcbnew/tools/pcb_actions.cpp:693
+#: pcbnew/tools/pcb_actions.cpp:713
 msgid "Hide Net"
 msgstr "隐藏网络"
 
-#: pcbnew/tools/pcb_actions.cpp:693
+#: pcbnew/tools/pcb_actions.cpp:713
 msgid "Hide the ratsnest for the selected net"
 msgstr "显示所选网络的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:696
+#: pcbnew/tools/pcb_actions.cpp:716
 msgid "Show Net"
 msgstr "显示网络"
 
-#: pcbnew/tools/pcb_actions.cpp:696
+#: pcbnew/tools/pcb_actions.cpp:716
 msgid "Show the ratsnest for the selected net"
 msgstr "显示所选网络的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:700
+#: pcbnew/tools/pcb_actions.cpp:720
 msgid "Switch to Schematic Editor"
 msgstr "切换到原理图编辑器"
 
-#: pcbnew/tools/pcb_actions.cpp:700
+#: pcbnew/tools/pcb_actions.cpp:720
 msgid "Open schematic in Eeschema"
 msgstr "在 Eeschema 中打开原理图"
 
-#: pcbnew/tools/pcb_actions.cpp:709
+#: pcbnew/tools/pcb_actions.cpp:729
 msgid "Highlight Ratsnest"
 msgstr "高亮飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:709
+#: pcbnew/tools/pcb_actions.cpp:729
 msgid "Show ratsnest of selected item(s)"
 msgstr "显示所选项目的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:720
+#: pcbnew/tools/pcb_actions.cpp:740
 msgid "Show the net inspector"
 msgstr "显示网络检查"
 
-#: pcbnew/tools/pcb_actions.cpp:725
+#: pcbnew/tools/pcb_actions.cpp:745
 msgid "Scripting Console"
 msgstr "脚本控制台"
 
-#: pcbnew/tools/pcb_actions.cpp:725
+#: pcbnew/tools/pcb_actions.cpp:745
 msgid "Show the Python scripting console"
 msgstr "显示 Python 脚本控制台"
 
-#: pcbnew/tools/pcb_actions.cpp:730
-msgid "Show Layers Manager"
-msgstr "显示层管理"
+#: pcbnew/tools/pcb_actions.cpp:750
+msgid "Show Appearance Manager"
+msgstr "显示外观管理器"
 
-#: pcbnew/tools/pcb_actions.cpp:730
-msgid "Show/hide the layers manager"
-msgstr "显示或隐藏层管理器"
+#: pcbnew/tools/pcb_actions.cpp:750
+msgid "Show/hide the appearance manager"
+msgstr "显示/隐藏外观管理器"
 
-#: pcbnew/tools/pcb_actions.cpp:735
+#: pcbnew/tools/pcb_actions.cpp:755
 msgid "Show Microwave Toolbar"
 msgstr "显示微波工具栏"
 
-#: pcbnew/tools/pcb_actions.cpp:735
+#: pcbnew/tools/pcb_actions.cpp:755
 msgid ""
 "Show/hide microwave toolbar\n"
 "(Experimental feature)"
@@ -29634,552 +30797,581 @@ msgstr ""
 "显示或隐藏微波设计工具栏 \n"
 "(试验功能)"
 
-#: pcbnew/tools/pcb_actions.cpp:740
+#: pcbnew/tools/pcb_actions.cpp:760
 msgid "Flip Board View"
 msgstr "翻转电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:740
+#: pcbnew/tools/pcb_actions.cpp:760
 msgid "Flip (mirror) the board view"
 msgstr "翻转 (镜像) 板视图"
 
-#: pcbnew/tools/pcb_actions.cpp:746
+#: pcbnew/tools/pcb_actions.cpp:766
 msgid "Show Ratsnest"
 msgstr "显示飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:746
+#: pcbnew/tools/pcb_actions.cpp:766
 msgid "Show board ratsnest"
 msgstr "显示线路板飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:751
+#: pcbnew/tools/pcb_actions.cpp:771
 msgid "Curved Ratsnest Lines"
 msgstr "弯曲的飞线"
 
-#: pcbnew/tools/pcb_actions.cpp:757
+#: pcbnew/tools/pcb_actions.cpp:777
 msgid "Sketch Tracks"
 msgstr "布线草图"
 
-#: pcbnew/tools/pcb_actions.cpp:757
+#: pcbnew/tools/pcb_actions.cpp:777
 msgid "Show tracks in outline mode"
 msgstr "在轮廓模式下显示布线"
 
-#: pcbnew/tools/pcb_actions.cpp:762
+#: pcbnew/tools/pcb_actions.cpp:782
 msgid "Sketch Pads"
 msgstr "焊盘草图"
 
-#: pcbnew/tools/pcb_actions.cpp:762
+#: pcbnew/tools/pcb_actions.cpp:782
 msgid "Show pads in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: pcbnew/tools/pcb_actions.cpp:767
+#: pcbnew/tools/pcb_actions.cpp:787
 msgid "Sketch Vias"
 msgstr "过孔草图"
 
-#: pcbnew/tools/pcb_actions.cpp:767
+#: pcbnew/tools/pcb_actions.cpp:787
 msgid "Show vias in outline mode"
 msgstr "在轮廓模式下显示过孔"
 
-#: pcbnew/tools/pcb_actions.cpp:772
+#: pcbnew/tools/pcb_actions.cpp:792
 msgid "Sketch Graphic Items"
 msgstr "草图图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:772
+#: pcbnew/tools/pcb_actions.cpp:792
 msgid "Show graphic items in outline mode"
 msgstr "在轮廓模式下显示图形项目"
 
-#: pcbnew/tools/pcb_actions.cpp:777
+#: pcbnew/tools/pcb_actions.cpp:797
 msgid "Sketch Text Items"
 msgstr "草图文本项"
 
-#: pcbnew/tools/pcb_actions.cpp:777
+#: pcbnew/tools/pcb_actions.cpp:797
 msgid "Show footprint texts in line mode"
 msgstr "在行模式下显示封装文本"
 
-#: pcbnew/tools/pcb_actions.cpp:787
+#: pcbnew/tools/pcb_actions.cpp:807
 msgid "Automatically zoom to fit"
 msgstr "自动缩放以适合"
 
-#: pcbnew/tools/pcb_actions.cpp:787
+#: pcbnew/tools/pcb_actions.cpp:807
 msgid "Zoom to fit when changing footprint"
 msgstr "更改封装时缩放至适合大小"
 
-#: pcbnew/tools/pcb_actions.cpp:792
+#: pcbnew/tools/pcb_actions.cpp:812
 msgid "Fill Zones"
 msgstr "填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:792
+#: pcbnew/tools/pcb_actions.cpp:812
 msgid "Show filled areas of zones"
 msgstr "显示覆铜填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:797
+#: pcbnew/tools/pcb_actions.cpp:817
 msgid "Wireframe Zones"
 msgstr "线框区域"
 
-#: pcbnew/tools/pcb_actions.cpp:797
+#: pcbnew/tools/pcb_actions.cpp:817
 msgid "Show only zone boundaries"
 msgstr "仅显示区域边界"
 
-#: pcbnew/tools/pcb_actions.cpp:802
+#: pcbnew/tools/pcb_actions.cpp:822
 msgid "Sketch Zones"
 msgstr "草图区域"
 
-#: pcbnew/tools/pcb_actions.cpp:802
+#: pcbnew/tools/pcb_actions.cpp:822
 msgid "Show solid areas of zones in outline mode"
 msgstr "在轮廓模式下显示区域的实心区域"
 
-#: pcbnew/tools/pcb_actions.cpp:808
+#: pcbnew/tools/pcb_actions.cpp:828
 msgid "Toggle Zone Display"
 msgstr "切换区域显示"
 
-#: pcbnew/tools/pcb_actions.cpp:809
+#: pcbnew/tools/pcb_actions.cpp:829
 msgid "Cycle between showing filled zones, wireframed zones and sketched zones"
 msgstr "在显示填充区域、线框区域和草图区域之间循环"
 
-#: pcbnew/tools/pcb_actions.cpp:817
+#: pcbnew/tools/pcb_actions.cpp:837
 msgid "Switch to Component (F.Cu) layer"
 msgstr "切换到元件层（顶层铜层）"
 
-#: pcbnew/tools/pcb_actions.cpp:823
+#: pcbnew/tools/pcb_actions.cpp:843
 msgid "Switch to Inner layer 1"
 msgstr "切换到内层 1"
 
-#: pcbnew/tools/pcb_actions.cpp:829
+#: pcbnew/tools/pcb_actions.cpp:849
 msgid "Switch to Inner layer 2"
 msgstr "切换到内层 2"
 
-#: pcbnew/tools/pcb_actions.cpp:835
+#: pcbnew/tools/pcb_actions.cpp:855
 msgid "Switch to Inner layer 3"
 msgstr "切换到内层 3"
 
-#: pcbnew/tools/pcb_actions.cpp:841
+#: pcbnew/tools/pcb_actions.cpp:861
 msgid "Switch to Inner layer 4"
 msgstr "切换到内层 4"
 
-#: pcbnew/tools/pcb_actions.cpp:847
+#: pcbnew/tools/pcb_actions.cpp:867
 msgid "Switch to Inner layer 5"
 msgstr "切换到内层 5"
 
-#: pcbnew/tools/pcb_actions.cpp:853
+#: pcbnew/tools/pcb_actions.cpp:873
 msgid "Switch to Inner layer 6"
 msgstr "切换到内层 6"
 
-#: pcbnew/tools/pcb_actions.cpp:858
+#: pcbnew/tools/pcb_actions.cpp:878
 msgid "Switch to Inner layer 7"
 msgstr "切换到内层 7"
 
-#: pcbnew/tools/pcb_actions.cpp:863
+#: pcbnew/tools/pcb_actions.cpp:883
 msgid "Switch to Inner layer 8"
 msgstr "切换到内层 8"
 
-#: pcbnew/tools/pcb_actions.cpp:868
+#: pcbnew/tools/pcb_actions.cpp:888
 msgid "Switch to Inner layer 9"
 msgstr "切换到内层 9"
 
-#: pcbnew/tools/pcb_actions.cpp:873
+#: pcbnew/tools/pcb_actions.cpp:893
 msgid "Switch to Inner layer 10"
 msgstr "切换到内层 10"
 
-#: pcbnew/tools/pcb_actions.cpp:878
+#: pcbnew/tools/pcb_actions.cpp:898
 msgid "Switch to Inner layer 11"
 msgstr "切换到内层 11"
 
-#: pcbnew/tools/pcb_actions.cpp:883
+#: pcbnew/tools/pcb_actions.cpp:903
 msgid "Switch to Inner layer 12"
 msgstr "切换到内层 12"
 
-#: pcbnew/tools/pcb_actions.cpp:888
+#: pcbnew/tools/pcb_actions.cpp:908
 msgid "Switch to Inner layer 13"
 msgstr "切换到内层 13"
 
-#: pcbnew/tools/pcb_actions.cpp:893
+#: pcbnew/tools/pcb_actions.cpp:913
 msgid "Switch to Inner layer 14"
 msgstr "切换到内层 14"
 
-#: pcbnew/tools/pcb_actions.cpp:898
+#: pcbnew/tools/pcb_actions.cpp:918
 msgid "Switch to Inner layer 15"
 msgstr "切换到内层 15"
 
-#: pcbnew/tools/pcb_actions.cpp:903
+#: pcbnew/tools/pcb_actions.cpp:923
 msgid "Switch to Inner layer 16"
 msgstr "切换到内层 16"
 
-#: pcbnew/tools/pcb_actions.cpp:908
+#: pcbnew/tools/pcb_actions.cpp:928
 msgid "Switch to Inner layer 17"
 msgstr "切换到内层 17"
 
-#: pcbnew/tools/pcb_actions.cpp:913
+#: pcbnew/tools/pcb_actions.cpp:933
 msgid "Switch to Inner layer 18"
 msgstr "切换到内层 18"
 
-#: pcbnew/tools/pcb_actions.cpp:918
+#: pcbnew/tools/pcb_actions.cpp:938
 msgid "Switch to Inner layer 19"
 msgstr "切换到内层 19"
 
-#: pcbnew/tools/pcb_actions.cpp:923
+#: pcbnew/tools/pcb_actions.cpp:943
 msgid "Switch to Inner layer 20"
 msgstr "切换到内层 20"
 
-#: pcbnew/tools/pcb_actions.cpp:928
+#: pcbnew/tools/pcb_actions.cpp:948
 msgid "Switch to Inner layer 21"
 msgstr "切换到内层 21"
 
-#: pcbnew/tools/pcb_actions.cpp:933
+#: pcbnew/tools/pcb_actions.cpp:953
 msgid "Switch to Inner layer 22"
 msgstr "切换到内层 22"
 
-#: pcbnew/tools/pcb_actions.cpp:938
+#: pcbnew/tools/pcb_actions.cpp:958
 msgid "Switch to Inner layer 23"
 msgstr "切换到内层 23"
 
-#: pcbnew/tools/pcb_actions.cpp:943
+#: pcbnew/tools/pcb_actions.cpp:963
 msgid "Switch to Inner layer 24"
 msgstr "切换到内层 24"
 
-#: pcbnew/tools/pcb_actions.cpp:948
+#: pcbnew/tools/pcb_actions.cpp:968
 msgid "Switch to Inner layer 25"
 msgstr "切换到内层 25"
 
-#: pcbnew/tools/pcb_actions.cpp:953
+#: pcbnew/tools/pcb_actions.cpp:973
 msgid "Switch to Inner layer 26"
 msgstr "切换到内层 26"
 
-#: pcbnew/tools/pcb_actions.cpp:958
+#: pcbnew/tools/pcb_actions.cpp:978
 msgid "Switch to Inner layer 27"
 msgstr "切换到内层 27"
 
-#: pcbnew/tools/pcb_actions.cpp:963
+#: pcbnew/tools/pcb_actions.cpp:983
 msgid "Switch to Inner layer 28"
 msgstr "切换到内层 28"
 
-#: pcbnew/tools/pcb_actions.cpp:968
+#: pcbnew/tools/pcb_actions.cpp:988
 msgid "Switch to Inner layer 29"
 msgstr "切换到内层 29"
 
-#: pcbnew/tools/pcb_actions.cpp:973
+#: pcbnew/tools/pcb_actions.cpp:993
 msgid "Switch to Inner layer 30"
 msgstr "切换到内层 30"
 
-#: pcbnew/tools/pcb_actions.cpp:979
+#: pcbnew/tools/pcb_actions.cpp:999
 msgid "Switch to Copper (B.Cu) layer"
 msgstr "切换到底层铜层"
 
-#: pcbnew/tools/pcb_actions.cpp:985
+#: pcbnew/tools/pcb_actions.cpp:1005
 msgid "Switch to Next Layer"
 msgstr "切换到下一层"
 
-#: pcbnew/tools/pcb_actions.cpp:990
+#: pcbnew/tools/pcb_actions.cpp:1010
 msgid "Switch to Previous Layer"
 msgstr "切换到上一层"
 
-#: pcbnew/tools/pcb_actions.cpp:995
-msgid "Add Through Via"
-msgstr "添加通孔"
+#: pcbnew/tools/pcb_actions.cpp:1015
+msgid "Toggle Layer"
+msgstr "切换图层"
 
-#: pcbnew/tools/pcb_actions.cpp:1001
+#: pcbnew/tools/pcb_actions.cpp:1015
+msgid "Switch between layers in active layer pair"
+msgstr "在活动图层对中的图层之间切换"
+
+#: pcbnew/tools/pcb_actions.cpp:1022
 msgid "Increase Layer Opacity"
 msgstr "增大图层不透明度"
 
-#: pcbnew/tools/pcb_actions.cpp:1001 pcbnew/tools/pcb_actions.cpp:1008
+#: pcbnew/tools/pcb_actions.cpp:1022 pcbnew/tools/pcb_actions.cpp:1029
 msgid "Make the current layer more transparent"
 msgstr "使当前层更加透明"
 
-#: pcbnew/tools/pcb_actions.cpp:1008
+#: pcbnew/tools/pcb_actions.cpp:1029
 msgid "Decrease Layer Opacity"
 msgstr "减小图层不透明度"
 
-#: pcbnew/tools/pcb_actions.cpp:1019
+#: pcbnew/tools/pcb_actions.cpp:1040
 msgid "Show Board Statistics"
 msgstr "显示板统计信息"
 
-#: pcbnew/tools/pcb_actions.cpp:1019
+#: pcbnew/tools/pcb_actions.cpp:1040
 msgid "Shows board statistics"
 msgstr "显示板统计信息"
 
-#: pcbnew/tools/pcb_actions.cpp:1025
+#: pcbnew/tools/pcb_actions.cpp:1045
+msgid "Clearance Resolution..."
+msgstr "间隙分辨率..."
+
+#: pcbnew/tools/pcb_actions.cpp:1046
+msgid ""
+"Show clearance resolution for the active layer between two selected objects"
+msgstr "显示两个选定对象之间活动层的间隙分辨率"
+
+#: pcbnew/tools/pcb_actions.cpp:1051
+msgid "Constraints Resolution..."
+msgstr "约束解析..."
+
+#: pcbnew/tools/pcb_actions.cpp:1052
+msgid "Show constraints resolution for the selected object"
+msgstr "显示所选对象的约束解析"
+
+#: pcbnew/tools/pcb_actions.cpp:1058
 msgid "Geographical Reannotate..."
 msgstr "位置重新批注..."
 
-#: pcbnew/tools/pcb_actions.cpp:1025
+#: pcbnew/tools/pcb_actions.cpp:1058
 msgid "Reannotate PCB in geographical order"
 msgstr "按位置顺序重新批注 PCB"
 
-#: pcbnew/tools/pcb_actions.cpp:1030
+#: pcbnew/tools/pcb_actions.cpp:1063
 msgid "Repair Board"
 msgstr "修复电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:1031
+#: pcbnew/tools/pcb_actions.cpp:1064
 msgid "Run various diagnostics and attempt to repair board"
 msgstr "运行各种诊断程序并尝试修复电路板"
 
-#: pcbnew/tools/pcb_actions.cpp:1039
+#: pcbnew/tools/pcb_actions.cpp:1072
 msgid "Align to Top"
 msgstr "顶部对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:1040
+#: pcbnew/tools/pcb_actions.cpp:1073
 msgid "Aligns selected items to the top edge"
 msgstr "对齐选择的项到顶边"
 
-#: pcbnew/tools/pcb_actions.cpp:1044
+#: pcbnew/tools/pcb_actions.cpp:1077
 msgid "Align to Bottom"
 msgstr "底部对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:1045
+#: pcbnew/tools/pcb_actions.cpp:1078
 msgid "Aligns selected items to the bottom edge"
 msgstr "对齐选择的项到底边"
 
-#: pcbnew/tools/pcb_actions.cpp:1049
+#: pcbnew/tools/pcb_actions.cpp:1082
 msgid "Align to Left"
 msgstr "左对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:1050
+#: pcbnew/tools/pcb_actions.cpp:1083
 msgid "Aligns selected items to the left edge"
 msgstr "对齐选择的项到左边"
 
-#: pcbnew/tools/pcb_actions.cpp:1054
+#: pcbnew/tools/pcb_actions.cpp:1087
 msgid "Align to Right"
 msgstr "右对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:1055
+#: pcbnew/tools/pcb_actions.cpp:1088
 msgid "Aligns selected items to the right edge"
 msgstr "对齐选择的项到右边"
 
-#: pcbnew/tools/pcb_actions.cpp:1059
+#: pcbnew/tools/pcb_actions.cpp:1092
 msgid "Align to Vertical Center"
 msgstr "与垂直中心对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:1060
+#: pcbnew/tools/pcb_actions.cpp:1093
 msgid "Aligns selected items to the vertical center"
 msgstr "将选定的项目垂直居中"
 
-#: pcbnew/tools/pcb_actions.cpp:1064
+#: pcbnew/tools/pcb_actions.cpp:1097
 msgid "Align to Horizontal Center"
 msgstr "与水平中心对齐"
 
-#: pcbnew/tools/pcb_actions.cpp:1065
+#: pcbnew/tools/pcb_actions.cpp:1098
 msgid "Aligns selected items to the horizontal center"
 msgstr "将选定的项目水平居中"
 
-#: pcbnew/tools/pcb_actions.cpp:1069
+#: pcbnew/tools/pcb_actions.cpp:1102
 msgid "Distribute Horizontally"
 msgstr "水平分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1070
+#: pcbnew/tools/pcb_actions.cpp:1103
 msgid "Distributes selected items along the horizontal axis"
 msgstr "所选项沿水平轴分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1074
+#: pcbnew/tools/pcb_actions.cpp:1107
 msgid "Distribute Vertically"
 msgstr "垂直分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1075
+#: pcbnew/tools/pcb_actions.cpp:1108
 msgid "Distributes selected items along the vertical axis"
 msgstr "所选项沿垂直轴分布"
 
-#: pcbnew/tools/pcb_actions.cpp:1095
+#: pcbnew/tools/pcb_actions.cpp:1128
 msgid "Position Relative To..."
 msgstr "相対位置..."
 
-#: pcbnew/tools/pcb_actions.cpp:1096
+#: pcbnew/tools/pcb_actions.cpp:1129
 msgid "Positions the selected item(s) by an exact amount relative to another"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/pcb_actions.cpp:1132
+#: pcbnew/tools/pcb_actions.cpp:1165
 msgid "Select/Expand Connection"
 msgstr "选择/扩展连接"
 
-#: pcbnew/tools/pcb_actions.cpp:1133
+#: pcbnew/tools/pcb_actions.cpp:1166
 msgid ""
 "Selects a connection or expands an existing selection to junctions, pads, or "
 "entire connections"
 msgstr "选择连接或将现有选择扩展到连接点、焊盘或整个连接"
 
-#: pcbnew/tools/pcb_actions.cpp:1138
+#: pcbnew/tools/pcb_actions.cpp:1171
 msgid "Select All Tracks in Net"
 msgstr "选择网中的所有布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1139
+#: pcbnew/tools/pcb_actions.cpp:1172
 msgid "Selects all tracks & vias belonging to the same net."
 msgstr "选择所有属于同一网络的布线与过孔。"
 
-#: pcbnew/tools/pcb_actions.cpp:1145
+#: pcbnew/tools/pcb_actions.cpp:1177
+msgid "Deselect All Tracks in Net"
+msgstr "取消选择网络中的所有布线"
+
+#: pcbnew/tools/pcb_actions.cpp:1178
+msgid "Deselects all tracks & vias belonging to the same net."
+msgstr "取消选择属于同一网的所有布线和过孔。"
+
+#: pcbnew/tools/pcb_actions.cpp:1184
 msgid "Selects all modules and tracks in the schematic sheet"
 msgstr "选择原理图框中的所有模块和布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1150
+#: pcbnew/tools/pcb_actions.cpp:1189
 msgid "Items in Same Hierarchical Sheet"
 msgstr "同一层次图框中的项目"
 
-#: pcbnew/tools/pcb_actions.cpp:1151
+#: pcbnew/tools/pcb_actions.cpp:1190
 msgid "Selects all modules and tracks in the same schematic sheet"
 msgstr "选择同一原理图框中的所有模块和布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1156
+#: pcbnew/tools/pcb_actions.cpp:1195
 msgid "Filter Selection..."
 msgstr "筛选器选择..."
 
-#: pcbnew/tools/pcb_actions.cpp:1156
+#: pcbnew/tools/pcb_actions.cpp:1195
 msgid "Filter the types of items in the selection"
 msgstr "筛选选中的项目类型"
 
-#: pcbnew/tools/pcb_actions.cpp:1164
+#: pcbnew/tools/pcb_actions.cpp:1203
 msgid "Fill zone(s)"
 msgstr "填充覆铜"
 
-#: pcbnew/tools/pcb_actions.cpp:1170
+#: pcbnew/tools/pcb_actions.cpp:1209
 msgid "Fill All"
 msgstr "填充所有"
 
-#: pcbnew/tools/pcb_actions.cpp:1170
+#: pcbnew/tools/pcb_actions.cpp:1209
 msgid "Fill all zones"
 msgstr "填充所有区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1175
+#: pcbnew/tools/pcb_actions.cpp:1214
 msgid "Unfill"
 msgstr "取消填充"
 
-#: pcbnew/tools/pcb_actions.cpp:1175
+#: pcbnew/tools/pcb_actions.cpp:1214
 msgid "Unfill zone(s)"
 msgstr "取消填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1181
+#: pcbnew/tools/pcb_actions.cpp:1220
 msgid "Unfill All"
 msgstr "取消所有填充"
 
-#: pcbnew/tools/pcb_actions.cpp:1181
+#: pcbnew/tools/pcb_actions.cpp:1220
 msgid "Unfill all zones"
 msgstr "取消所有填充区域"
 
-#: pcbnew/tools/pcb_actions.cpp:1189
+#: pcbnew/tools/pcb_actions.cpp:1228
 msgid "Place Selected Footprints"
 msgstr "放置选定的封装"
 
-#: pcbnew/tools/pcb_actions.cpp:1190
+#: pcbnew/tools/pcb_actions.cpp:1229
 msgid "Performs automatic placement of selected components"
 msgstr "执行选定元件的自动放置"
 
-#: pcbnew/tools/pcb_actions.cpp:1195
+#: pcbnew/tools/pcb_actions.cpp:1234
 msgid "Place Off-Board Footprints"
 msgstr "放置板外封装"
 
-#: pcbnew/tools/pcb_actions.cpp:1196
+#: pcbnew/tools/pcb_actions.cpp:1235
 msgid "Performs automatic placement of components outside board area"
 msgstr "在板区域外执行元件的自动放置"
 
-#: pcbnew/tools/pcb_actions.cpp:1205
+#: pcbnew/tools/pcb_actions.cpp:1244
 msgid "Route Single Track"
 msgstr "单轨交互式布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1205
+#: pcbnew/tools/pcb_actions.cpp:1244
 msgid "Run push & shove router (single tracks)"
 msgstr "运行推挤布线(单轨布线)"
 
-#: pcbnew/tools/pcb_actions.cpp:1212
+#: pcbnew/tools/pcb_actions.cpp:1251
 msgid "Route Differential Pair"
 msgstr "差分对交互布线"
 
-#: pcbnew/tools/pcb_actions.cpp:1212
+#: pcbnew/tools/pcb_actions.cpp:1251
 msgid "Run push & shove router (differential pairs)"
 msgstr "运行推挤布线(差分对布线)"
 
-#: pcbnew/tools/pcb_actions.cpp:1218
+#: pcbnew/tools/pcb_actions.cpp:1257
 msgid "Interactive Router Settings..."
 msgstr "交互式布线设置..."
 
-#: pcbnew/tools/pcb_actions.cpp:1218
+#: pcbnew/tools/pcb_actions.cpp:1257
 msgid "Open Interactive Router settings"
 msgstr "打开交互布线设置"
 
-#: pcbnew/tools/pcb_actions.cpp:1223
+#: pcbnew/tools/pcb_actions.cpp:1262
 msgid "Differential Pair Dimensions..."
-msgstr "差分对尺寸..."
+msgstr "差分对标注..."
 
-#: pcbnew/tools/pcb_actions.cpp:1223
+#: pcbnew/tools/pcb_actions.cpp:1262
 msgid "Open Differential Pair Dimension settings"
-msgstr "打开差分对尺寸设置"
+msgstr "打开差分对标注设置"
 
-#: pcbnew/tools/pcb_actions.cpp:1228
+#: pcbnew/tools/pcb_actions.cpp:1267
 msgid "Router Highlight Mode"
 msgstr "布线高亮模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1228
+#: pcbnew/tools/pcb_actions.cpp:1267
 msgid "Switch router to highlight mode"
 msgstr "将布线切换到高亮模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1233
+#: pcbnew/tools/pcb_actions.cpp:1272
 msgid "Router Shove Mode"
 msgstr "布线推挤模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1233
+#: pcbnew/tools/pcb_actions.cpp:1272
 msgid "Switch router to shove mode"
 msgstr "将布线切换到推挤模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1238
+#: pcbnew/tools/pcb_actions.cpp:1277
 msgid "Router Walkaround Mode"
 msgstr "布线绕走模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1238
+#: pcbnew/tools/pcb_actions.cpp:1277
 msgid "Switch router to walkaround mode"
 msgstr "将布线切换到绕走模式"
 
-#: pcbnew/tools/pcb_actions.cpp:1243
+#: pcbnew/tools/pcb_actions.cpp:1282
 msgid "Set Layer Pair..."
 msgstr "设置层对..."
 
-#: pcbnew/tools/pcb_actions.cpp:1243
+#: pcbnew/tools/pcb_actions.cpp:1282
 msgid "Change active layer pair for routing"
 msgstr "更改布线的活动层对"
 
-#: pcbnew/tools/pcb_actions.cpp:1250
+#: pcbnew/tools/pcb_actions.cpp:1289
 msgid "Tune length of a single track"
 msgstr "调整单轨布线长度"
 
-#: pcbnew/tools/pcb_actions.cpp:1257
+#: pcbnew/tools/pcb_actions.cpp:1296
 msgid "Tune length of a differential pair"
 msgstr "调整差分对布线长度"
 
-#: pcbnew/tools/pcb_actions.cpp:1264
+#: pcbnew/tools/pcb_actions.cpp:1303
 msgid "Tune skew of a differential pair"
 msgstr "调整差分对布线歪斜"
 
-#: pcbnew/tools/pcb_actions.cpp:1273 pcbnew/tools/pcb_actions.cpp:1279
+#: pcbnew/tools/pcb_actions.cpp:1312 pcbnew/tools/pcb_actions.cpp:1318
 msgid ""
 "Splits the track segment into two segments connected at the cursor position."
 msgstr "将布线拆分为在光标位置连接的两个段。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:107
+#: pcbnew/tools/pcb_editor_control.cpp:108
 msgid "Locking"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_editor_control.cpp:127
+#: pcbnew/tools/pcb_editor_control.cpp:128
 msgid "Grouping"
 msgstr "分组"
 
-#: pcbnew/tools/pcb_editor_control.cpp:151
+#: pcbnew/tools/pcb_editor_control.cpp:152
 msgid "Group is in inconsistent state: "
 msgstr "组处于不一致状态： "
 
-#: pcbnew/tools/pcb_editor_control.cpp:362
+#: pcbnew/tools/pcb_editor_control.cpp:364
 msgid "Merge Specctra Session file:"
 msgstr "合并布线器会话文件:"
 
-#: pcbnew/tools/pcb_editor_control.cpp:385
+#: pcbnew/tools/pcb_editor_control.cpp:387
 msgid "Specctra DSN File"
 msgstr "Specctra DSN 文件"
 
-#: pcbnew/tools/pcb_editor_control.cpp:485
+#: pcbnew/tools/pcb_editor_control.cpp:487
 #, c-format
 msgid "%d duplicate IDs replaced.\n"
 msgstr "已替换 %d 个重复 ID。\n"
 
-#: pcbnew/tools/pcb_editor_control.cpp:500
+#: pcbnew/tools/pcb_editor_control.cpp:502
 #, c-format
 msgid "%d potential problems repaired."
 msgstr "已修复 %d 个潜在问题。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:505
+#: pcbnew/tools/pcb_editor_control.cpp:507
 msgid "No board problems found."
 msgstr "未发现电路板问题。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:530
+#: pcbnew/tools/pcb_editor_control.cpp:532
 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 "
@@ -30188,66 +31380,173 @@ msgstr ""
 "无法更新原理图，因为 Pcbnew 在独立模式下打开。为了从原理图创建或更新 PCB，您"
 "必须启动 KiCad 项目管理器并创建项目。"
 
-#: pcbnew/tools/pcb_editor_control.cpp:908
+#: pcbnew/tools/pcb_editor_control.cpp:909
 msgid "Place a module"
 msgstr "放置模块"
 
-#: pcbnew/tools/pcb_editor_control.cpp:997
+#: pcbnew/tools/pcb_editor_control.cpp:998
 msgid "Toggle Locking"
 msgstr "切换锁定"
 
 #: pcbnew/tools/pcb_editor_control.cpp:1027
-#, c-format
-msgid "Item %s appears in selection multiple times"
-msgstr "项目 %s 多次出现在所选内容中"
-
-#: pcbnew/tools/pcb_editor_control.cpp:1033
 msgid "GroupCreate"
 msgstr "组创建"
 
-#: pcbnew/tools/pcb_editor_control.cpp:1035
-msgid "Group create resulted in inconsistent state: "
-msgstr "组创建导致状态不一致： "
-
-#: pcbnew/tools/pcb_editor_control.cpp:1073
-msgid "Group not found in selection though selection was checked"
-msgstr "虽然选中了选择，但在所选内容中找不到组"
-
-#: pcbnew/tools/pcb_editor_control.cpp:1085
-#, c-format
-msgid "Item %s is already in group for merge"
-msgstr "项目 %s 已在要合并的组中"
-
-#: pcbnew/tools/pcb_editor_control.cpp:1092
-#: pcbnew/tools/pcb_editor_control.cpp:1135
-msgid "Group merge resulted in inconsistent state: "
-msgstr "组合并导致状态不一致： "
-
-#: pcbnew/tools/pcb_editor_control.cpp:1123
-msgid "Selection for ungroup should only have groups in it - was checked."
-msgstr "解组的选择应仅包含组 - 已选中。"
-
-#: pcbnew/tools/pcb_editor_control.cpp:1170
-msgid "Group removeItems resulted in inconsistent state: "
-msgstr "组删除项导致状态不一致： "
-
-#: pcbnew/tools/pcb_editor_control.cpp:1240
-msgid "Group flatten resulted in inconsistent state: "
-msgstr "组扁平化导致状态不一致： "
-
-#: pcbnew/tools/pcb_editor_control.cpp:1518
+#: pcbnew/tools/pcb_editor_control.cpp:1509
 msgid "Duplicate zone"
 msgstr "复制区域"
 
-#: pcbnew/tools/pcb_inspection_tool.cpp:52
+#: pcbnew/tools/pcb_inspection_tool.cpp:56
 msgid "Net Tools"
 msgstr "网络工具"
 
-#: pcbnew/tools/pcbnew_control.cpp:718
+#: pcbnew/tools/pcb_inspection_tool.cpp:114
+#, c-format
+msgid "Zone connection type: %s."
+msgstr "区域连接类型：%s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:119
+#, c-format
+msgid "Overridden by %s; connection type: %s."
+msgstr "被 %s 覆盖；连接类型：%s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:134
+#, c-format
+msgid "Pad is not a PTH pad; connection will be: %s."
+msgstr "焊盘不是金属化孔焊盘；连接将是：%s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:146
+#, c-format
+msgid "Zone thermal relief: %s."
+msgstr "区域防散热 (花焊盘)：%s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:153
+#, c-format
+msgid "Overridden by %s; thermal relief: %s."
+msgstr "被 %s 覆盖；防散热：%s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:162
+#, c-format
+msgid "Zone clearance: %s."
+msgstr "区域间隙：%s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:171
+#, c-format
+msgid "Overridden by larger thermal relief from %s;clearance: %s."
+msgstr "被来自 %s 的较大防散热覆盖；间隙：%s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:180
+msgid "Clearance is 0."
+msgstr "间隙为 0。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:211
+#, c-format
+msgid "Clearance: %s."
+msgstr "间隙： %s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:224
+msgid "Select two items for a clearance resolution report."
+msgstr "为间隙解决报告选择两个项目。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:231
+msgid "Clearance Report"
+msgstr "间隙报告"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:252
+#, c-format
+msgid "Active layer (%s) is not a copper layer.  No clearance defined."
+msgstr "活动层 (%s) 不是铜层。  未定义间隙。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:258
+#: pcbnew/tools/pcb_inspection_tool.cpp:264
+#, c-format
+msgid "%s not present on layer %s.  No clearance defined."
+msgstr "%s 不在层 %s 上。    未定义间隙。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:270
+msgid "Items have no electrical connections.  No clearance defined."
+msgstr "项目没有电气连接。    未定义间隙。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:274
+msgid "<h7>Clearance resolution for:</h7>"
+msgstr "<h7>间隙分辨率:</h7>"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:276
+#, c-format
+msgid "<ul><li>Layer %s</li><li>%s</li><li>%s</li></ul>"
+msgstr "<ul><li>层 %s</li><li>%s</li><li>%s</li></ul>"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:295
+msgid "Items belong to the same net. Clearance is 0."
+msgstr "项目属于同一网络。间隙为 0。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:319
+msgid "Select an item for a constraints resolution report."
+msgstr "选择约束解析报告的项。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:326
+msgid "Constraints Report"
+msgstr "约束报告"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:353
+msgid "<h7>Track width resolution for:</h7>"
+msgstr "<h7>布线宽度解析用于：</h7>"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:354
+#: pcbnew/tools/pcb_inspection_tool.cpp:382
+#: pcbnew/tools/pcb_inspection_tool.cpp:408
+#: pcbnew/tools/pcb_inspection_tool.cpp:437
+#, c-format
+msgid "<ul><li>%s</li></ul>"
+msgstr "<ul><li>%s</li></ul>"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:361
+#: pcbnew/tools/pcb_inspection_tool.cpp:362
+#: pcbnew/tools/pcb_inspection_tool.cpp:389
+#: pcbnew/tools/pcb_inspection_tool.cpp:390
+#: pcbnew/tools/pcb_inspection_tool.cpp:415
+#: pcbnew/tools/pcb_inspection_tool.cpp:416
+#: pcbnew/tools/pcb_inspection_tool.cpp:444
+msgid "undefined"
+msgstr "未定义"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:371
+#, c-format
+msgid "Width constraints: min %s max %s."
+msgstr "宽度约束：最小 %s 最大 %s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:381
+msgid "<h7>Via diameter resolution for:</h7>"
+msgstr "<h7>过孔直径解析用于：</h7>"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:399
+#, c-format
+msgid "Diameter constraints: min %s max %s."
+msgstr "直径约束：最小 %s 最大 %s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:407
+msgid "<h7>Via annular width resolution for:</h7>"
+msgstr "<h7>过孔环形宽度解析用于：</h7>"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:425
+#, c-format
+msgid "Annular width constraints: min %s max %s."
+msgstr "环形宽度约束：最小 %s 最大 %s。"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:436
+msgid "<h7>Hole diameter resolution for:</h7>"
+msgstr "<h7>通孔环形宽度解析用于：</h7>"
+
+#: pcbnew/tools/pcb_inspection_tool.cpp:450
+#, c-format
+msgid "Hole constraint: min %s."
+msgstr "通孔约束：最小 %s。"
+
+#: pcbnew/tools/pcbnew_control.cpp:721
 msgid "Invalid clipboard contents"
 msgstr "无效的剪贴板内容"
 
-#: pcbnew/tools/pcbnew_control.cpp:969 qa/qa_utils/pcb_test_frame.cpp:149
+#: pcbnew/tools/pcbnew_control.cpp:982 qa/qa_utils/pcb_test_frame.cpp:104
 #, c-format
 msgid ""
 "Error loading board.\n"
@@ -30256,15 +31555,15 @@ msgstr ""
 "电路板载入错误。\n"
 "%s"
 
-#: pcbnew/tools/pcbnew_control.cpp:1046
+#: pcbnew/tools/pcbnew_control.cpp:1059
 msgid "Selected Items"
 msgstr "选中项"
 
-#: pcbnew/tools/pcbnew_control.cpp:1063
+#: pcbnew/tools/pcbnew_control.cpp:1076
 msgid "Footprint Name"
 msgstr "封装名称"
 
-#: pcbnew/tools/pcbnew_control.cpp:1080
+#: pcbnew/tools/pcbnew_control.cpp:1093
 #, c-format
 msgid "Key Words: %s"
 msgstr "关键字：%s"
@@ -30305,27 +31604,27 @@ msgstr "水平分布"
 msgid "Distribute vertically"
 msgstr "垂直分布"
 
-#: pcbnew/tools/point_editor.cpp:296
+#: pcbnew/tools/point_editor.cpp:331
 msgid "Self-intersecting polygons are not allowed."
 msgstr "不允许自相交多边形。"
 
-#: pcbnew/tools/point_editor.cpp:305
+#: pcbnew/tools/point_editor.cpp:340
 msgid "pcbnew.InteractiveSelection tool is not available"
 msgstr "pcbnew 交互式选择工具不可用"
 
-#: pcbnew/tools/point_editor.cpp:439
+#: pcbnew/tools/point_editor.cpp:503
 msgid "Drag a corner"
 msgstr "拖动拐角"
 
-#: pcbnew/tools/point_editor.cpp:1814
+#: pcbnew/tools/point_editor.cpp:2007
 msgid "Add a zone corner"
 msgstr "添加覆铜区域拐角"
 
-#: pcbnew/tools/point_editor.cpp:1852
+#: pcbnew/tools/point_editor.cpp:2045
 msgid "Split segment"
 msgstr "分割线段"
 
-#: pcbnew/tools/point_editor.cpp:1923
+#: pcbnew/tools/point_editor.cpp:2116
 msgid "Remove a zone/polygon corner"
 msgstr "删除区域或多边形的拐角"
 
@@ -30341,11 +31640,7 @@ msgstr "选择位号项目..."
 msgid "Select"
 msgstr "选择"
 
-#: pcbnew/tools/selection_tool.cpp:331
-msgid "EnterGroup called when selection is not a single group"
-msgstr "当选择不是单个组时输入被叫组"
-
-#: pcbnew/tools/selection_tool.cpp:736
+#: pcbnew/tools/selection_tool.cpp:757
 msgid "Selection contains locked items. Do you want to continue?"
 msgstr "选择包含锁定项, 你要继续吗?"
 
@@ -30353,32 +31648,32 @@ msgstr "选择包含锁定项, 你要继续吗?"
 msgid "Add a zone cutout"
 msgstr "添加挖空区域"
 
-#: pcbnew/tools/zone_create_helper.cpp:214
+#: pcbnew/tools/zone_create_helper.cpp:215
 msgid "Add a zone"
 msgstr "添加覆铜"
 
-#: pcbnew/tools/zone_create_helper.cpp:253
+#: pcbnew/tools/zone_create_helper.cpp:254
 msgid "Add a graphical polygon"
 msgstr "添加多边形图形"
 
-#: pcbnew/tools/zone_filler_tool.cpp:69
+#: pcbnew/tools/zone_filler_tool.cpp:71
 msgid "Checking Zones"
 msgstr "检查区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:73 pcbnew/tools/zone_filler_tool.cpp:106
-#: pcbnew/tools/zone_filler_tool.cpp:146
+#: pcbnew/tools/zone_filler_tool.cpp:75 pcbnew/tools/zone_filler_tool.cpp:112
+#: pcbnew/tools/zone_filler_tool.cpp:152
 msgid "Fill Zone(s)"
 msgstr "填充区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:102
+#: pcbnew/tools/zone_filler_tool.cpp:108
 msgid "Fill All Zones"
 msgstr "填充所有区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:178
+#: pcbnew/tools/zone_filler_tool.cpp:184
 msgid "Unfill Zone"
 msgstr "取消填充区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:197
+#: pcbnew/tools/zone_filler_tool.cpp:203
 msgid "Unfill All Zones"
 msgstr "取消填充所有区域"
 
@@ -30386,164 +31681,250 @@ msgstr "取消填充所有区域"
 msgid "Incomplete undo/redo operation: some items not found"
 msgstr "不完整的撤消/重做操作：找不到某些项目"
 
-#: pcbnew/widgets/appearance_controls.cpp:286
+#: pcbnew/widgets/appearance_controls.cpp:331
 msgid "Show all vias"
 msgstr "显示所有过孔"
 
-#: pcbnew/widgets/appearance_controls.cpp:287
+#: pcbnew/widgets/appearance_controls.cpp:332
 msgid "Show all pads"
 msgstr "显示所有焊盘"
 
-#: pcbnew/widgets/appearance_controls.cpp:288
+#: pcbnew/widgets/appearance_controls.cpp:333
 msgid "Show copper zones"
 msgstr "显示铜区"
 
-#: pcbnew/widgets/appearance_controls.cpp:292
+#: pcbnew/widgets/appearance_controls.cpp:337
 msgid "Through-hole Pads"
 msgstr "通孔焊盘"
 
-#: pcbnew/widgets/appearance_controls.cpp:292
+#: pcbnew/widgets/appearance_controls.cpp:337
 msgid "Show through-hole pads"
 msgstr "显示通孔焊盘"
 
-#: pcbnew/widgets/appearance_controls.cpp:294
+#: pcbnew/widgets/appearance_controls.cpp:339
 msgid "References"
 msgstr "位号"
 
-#: pcbnew/widgets/appearance_controls.cpp:294
+#: pcbnew/widgets/appearance_controls.cpp:339
 msgid "Show footprint references"
 msgstr "显示封装位号"
 
-#: pcbnew/widgets/appearance_controls.cpp:295
+#: pcbnew/widgets/appearance_controls.cpp:340
 msgid "Show footprint text"
 msgstr "显示封装文本"
 
-#: pcbnew/widgets/appearance_controls.cpp:311
+#: pcbnew/widgets/appearance_controls.cpp:356
 msgid "No Layers"
 msgstr "没有图层"
 
-#: pcbnew/widgets/appearance_controls.cpp:313
+#: pcbnew/widgets/appearance_controls.cpp:358
 msgid "All Layers"
 msgstr "所有图层"
 
-#: pcbnew/widgets/appearance_controls.cpp:315
+#: pcbnew/widgets/appearance_controls.cpp:360
 msgid "All Copper Layers"
 msgstr "所有铜层"
 
-#: pcbnew/widgets/appearance_controls.cpp:318
+#: pcbnew/widgets/appearance_controls.cpp:363
 msgid "Inner Copper Layers"
 msgstr "内部铜层"
 
-#: pcbnew/widgets/appearance_controls.cpp:321
+#: pcbnew/widgets/appearance_controls.cpp:366
 msgid "Front Layers"
 msgstr "顶层"
 
-#: pcbnew/widgets/appearance_controls.cpp:324
+#: pcbnew/widgets/appearance_controls.cpp:369
 msgid "Front Assembly View"
 msgstr "顶层装配视图"
 
-#: pcbnew/widgets/appearance_controls.cpp:327
+#: pcbnew/widgets/appearance_controls.cpp:372
 msgid "Back Layers"
 msgstr "底层"
 
-#: pcbnew/widgets/appearance_controls.cpp:330
+#: pcbnew/widgets/appearance_controls.cpp:375
 msgid "Back Assembly View"
 msgstr "底层装配视图"
 
-#: pcbnew/widgets/appearance_controls.cpp:362
+#: pcbnew/widgets/appearance_controls.cpp:414
 msgid "Filter nets"
 msgstr "筛选网络"
 
-#: pcbnew/widgets/appearance_controls.cpp:622
+#: pcbnew/widgets/appearance_controls.cpp:546
+msgid "Layer Display Options"
+msgstr "图层显示选项"
+
+#: pcbnew/widgets/appearance_controls.cpp:556
+msgid "Non-active layers:"
+msgstr "非活动图层："
+
+#: pcbnew/widgets/appearance_controls.cpp:568
+msgid "Non-active layers will be shown in full color"
+msgstr "非活动图层将显示全彩色"
+
+#: pcbnew/widgets/appearance_controls.cpp:572
+msgid "Dim"
+msgstr "尺寸"
+
+#: pcbnew/widgets/appearance_controls.cpp:574
+msgid "Non-active layers will be dimmed"
+msgstr "非活动图层将变暗"
+
+#: pcbnew/widgets/appearance_controls.cpp:578
+msgid "Hide"
+msgstr "隐藏"
+
+#: pcbnew/widgets/appearance_controls.cpp:580
+msgid "Non-active layers will be hidden"
+msgstr "非活动图层将被隐藏"
+
+#: pcbnew/widgets/appearance_controls.cpp:590
+msgid "Flip board view"
+msgstr "翻转电路板视图"
+
+#: pcbnew/widgets/appearance_controls.cpp:612
+msgid "Net Display Options"
+msgstr "网络显示选项"
+
+#: pcbnew/widgets/appearance_controls.cpp:621
+msgid "Net colors:"
+msgstr "网络颜色："
+
+#: pcbnew/widgets/appearance_controls.cpp:624
+msgid "Choose when to show net and netclass colors"
+msgstr "选择何时显示网络和网络类颜色"
+
+#: pcbnew/widgets/appearance_controls.cpp:632
+msgid "Net and netclass colors are shown on all copper items"
+msgstr "网络和网络类颜色显示在所有铜项目上"
+
+#: pcbnew/widgets/appearance_controls.cpp:639
+msgid "Net and netclass colors are shown on the ratsnest only"
+msgstr "网络和网络类颜色仅在飞线上显示"
+
+#: pcbnew/widgets/appearance_controls.cpp:645
+msgid "Net and netclass colors are not shown"
+msgstr "不显示网络和网络类颜色"
+
+#: pcbnew/widgets/appearance_controls.cpp:653
+msgid "Ratsnest display:"
+msgstr "飞线显示："
+
+#: pcbnew/widgets/appearance_controls.cpp:656
+msgid "Choose what ratsnest lines to display"
+msgstr "选择要显示的飞线"
+
+#: pcbnew/widgets/appearance_controls.cpp:664
+msgid "Ratsnest lines are shown to items on all layers"
+msgstr "飞线显示为所有图层上的项目"
+
+#: pcbnew/widgets/appearance_controls.cpp:669
+msgid "Visible layers"
+msgstr "可见层"
+
+#: pcbnew/widgets/appearance_controls.cpp:671
+msgid "Ratsnest lines are shown to items on visible layers"
+msgstr "飞线线显示为可见图层上的项目"
+
+#: pcbnew/widgets/appearance_controls.cpp:812
 msgid "Set net color"
 msgstr "设置网络颜色"
 
-#: pcbnew/widgets/appearance_controls.cpp:624
+#: pcbnew/widgets/appearance_controls.cpp:814
 #, c-format
 msgid "Highlight %s"
 msgstr "高亮 %s"
 
-#: pcbnew/widgets/appearance_controls.cpp:627
-#: pcbnew/widgets/appearance_controls.cpp:1741
+#: pcbnew/widgets/appearance_controls.cpp:817
+#: pcbnew/widgets/appearance_controls.cpp:1954
 #, c-format
 msgid "Select tracks and vias in %s"
 msgstr "选择 %s 中的布线和过孔"
 
-#: pcbnew/widgets/appearance_controls.cpp:635
+#: pcbnew/widgets/appearance_controls.cpp:820
+#: pcbnew/widgets/appearance_controls.cpp:1958
+#, c-format
+msgid "Deselect tracks and vias in %s"
+msgstr "在 %s 中取消选择布线和过孔"
+
+#: pcbnew/widgets/appearance_controls.cpp:828
 msgid "Hide all other nets"
 msgstr "隐藏所有其他网络"
 
-#: pcbnew/widgets/appearance_controls.cpp:668
+#: pcbnew/widgets/appearance_controls.cpp:861
 #, c-format
 msgid "Click to hide ratsnest for %s"
 msgstr "单击以隐藏 %s 的飞线"
 
-#: pcbnew/widgets/appearance_controls.cpp:669
+#: pcbnew/widgets/appearance_controls.cpp:862
 #, c-format
 msgid "Click to show ratsnest for %s"
 msgstr "单击以显示 %s 的飞线"
 
-#: pcbnew/widgets/appearance_controls.cpp:1013
+#: pcbnew/widgets/appearance_controls.cpp:1218
+msgid "Double click or middle click for color change, right click for menu"
+msgstr "双击或中键更改颜色，右键单击菜单"
+
+#: pcbnew/widgets/appearance_controls.cpp:1225
 msgid "Show or hide this layer"
 msgstr "显示或隐藏此层"
 
-#: pcbnew/widgets/appearance_controls.cpp:1508
+#: pcbnew/widgets/appearance_controls.cpp:1721
 #, c-format
 msgid "Show or hide %s"
 msgstr "显示或隐藏 %s"
 
-#: pcbnew/widgets/appearance_controls.cpp:1549
+#: pcbnew/widgets/appearance_controls.cpp:1762
 #, c-format
 msgid "Set opacity of %s"
 msgstr "设置 %s 的不透明度"
 
-#: pcbnew/widgets/appearance_controls.cpp:1702
+#: pcbnew/widgets/appearance_controls.cpp:1915
 #, c-format
 msgid "Show or hide ratsnest for nets in %s"
 msgstr "显示或隐藏 %s 中的网络飞线"
 
-#: pcbnew/widgets/appearance_controls.cpp:1733
+#: pcbnew/widgets/appearance_controls.cpp:1946
 msgid "Set netclass color"
 msgstr "设置网络类颜色"
 
-#: pcbnew/widgets/appearance_controls.cpp:1738
+#: pcbnew/widgets/appearance_controls.cpp:1951
 #, c-format
 msgid "Highlight nets in %s"
 msgstr "高亮 %s 中的网络"
 
-#: pcbnew/widgets/appearance_controls.cpp:1748
+#: pcbnew/widgets/appearance_controls.cpp:1965
 msgid "Show all netclasses"
 msgstr "显示所有网络类"
 
-#: pcbnew/widgets/appearance_controls.cpp:1751
+#: pcbnew/widgets/appearance_controls.cpp:1968
 msgid "Hide all other netclasses"
 msgstr "隐藏所有其他网络类"
 
-#: pcbnew/widgets/appearance_controls.cpp:1806
+#: pcbnew/widgets/appearance_controls.cpp:2022
 msgid "Save preset..."
 msgstr "保存预设..."
 
-#: pcbnew/widgets/appearance_controls.cpp:1807
+#: pcbnew/widgets/appearance_controls.cpp:2023
 msgid "Delete preset..."
 msgstr "删除预设..."
 
-#: pcbnew/widgets/appearance_controls.cpp:1888
+#: pcbnew/widgets/appearance_controls.cpp:2104
 msgid "Layer preset name:"
 msgstr "层预设名称："
 
-#: pcbnew/widgets/appearance_controls.cpp:1888
+#: pcbnew/widgets/appearance_controls.cpp:2104
 msgid "Save Layer Preset"
 msgstr "保存层预设"
 
-#: pcbnew/widgets/appearance_controls.cpp:1923
+#: pcbnew/widgets/appearance_controls.cpp:2139
 msgid "Presets"
 msgstr "预设"
 
-#: pcbnew/widgets/appearance_controls.cpp:1935
+#: pcbnew/widgets/appearance_controls.cpp:2151
 msgid "Delete Preset"
 msgstr "删除预设"
 
-#: pcbnew/widgets/appearance_controls.cpp:1936
+#: pcbnew/widgets/appearance_controls.cpp:2152
 msgid "Select preset:"
 msgstr "选择预设："
 
@@ -30552,39 +31933,35 @@ msgstr "选择预设："
 msgid "Only %s"
 msgstr "仅 %s"
 
-#: pcbnew/zone_filler.cpp:120
+#: pcbnew/zone_filler.cpp:102
 msgid "Building zone fills..."
 msgstr "构造填充区域..."
 
-#: pcbnew/zone_filler.cpp:231
+#: pcbnew/zone_filler.cpp:302
 msgid "Removing insulated copper islands..."
 msgstr "移除死铜..."
 
-#: pcbnew/zone_filler.cpp:313
+#: pcbnew/zone_filler.cpp:413
 msgid "Zone fills are out-of-date. Refill?"
 msgstr "覆铜区域已失效，重新覆铜？"
 
-#: pcbnew/zone_filler.cpp:315
+#: pcbnew/zone_filler.cpp:415
 msgid "Refill"
 msgstr "重新覆铜"
 
-#: pcbnew/zone_filler.cpp:315
+#: pcbnew/zone_filler.cpp:415
 msgid "Continue without Refill"
 msgstr "取消覆铜"
 
-#: pcbnew/zone_filler.cpp:325
+#: pcbnew/zone_filler.cpp:426
 msgid "Performing polygon fills..."
 msgstr "执行多边形填充..."
 
-#: pcbnew/zone_filler.cpp:385
-msgid "Committing changes..."
-msgstr "提交更改..."
-
-#: pcbnew/zones_by_polygon.cpp:93 pcbnew/zones_by_polygon.cpp:149
+#: pcbnew/zones_by_polygon.cpp:92 pcbnew/zones_by_polygon.cpp:148
 msgid "Modify zone properties"
 msgstr "修改区域属性"
 
-#: pcbnew/zones_by_polygon.cpp:139
+#: pcbnew/zones_by_polygon.cpp:138
 #, c-format
 msgid "Refill %d Zones"
 msgstr "重新填充 %d 覆铜"
@@ -30595,7 +31972,6 @@ msgstr " * [信息] 载入失败：输入行太长\n"
 
 #: qa/common_tools/tools/coroutines/coroutines.cpp:85
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:77
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:214
 #: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:89
 msgid "displays help on the command line parameters"
 msgstr "在命令行参数上显示帮助"
@@ -30609,13 +31985,11 @@ msgid "Test a simple coroutine that yields a given number of times"
 msgstr "测试生成给定次数的简单协同程序"
 
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:85
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:222
 #: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:91
 msgid "print parsing information"
 msgstr "打印解析信息"
 
 #: qa/common_tools/tools/sexpr_parser/sexpr_parse.cpp:91
-#: qa/pcbnew_tools/tools/drc_tool/drc_tool.cpp:258
 #: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:92
 msgid "input file"
 msgstr "输入文件"
@@ -30624,82 +31998,19 @@ msgstr "输入文件"
 msgid "Tests parsing of S-Expression files"
 msgstr "测试解析表达式文件"
 
-#: qa/drc_proto/drc.cpp:253
-msgid "Netclasses...\n"
-msgstr "网类...\n"
+#: qa/drc_proto/drc_test_provider_silk_to_pad.cpp:85
+msgid "Checking pad to silkscreen clearances..."
+msgstr "正在检查焊盘到丝印间隙..."
 
-#: qa/drc_proto/drc.cpp:269
-msgid "NETCLASS VIOLATIONS: Aborting DRC\n"
-msgstr "网络类违规：中止 DRC\n"
-
-#: qa/drc_proto/drc_item.cpp:80
-msgid "Drilled hole clearance violation"
-msgstr "钻孔间隙违规"
-
-#: 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/drc_proto/drc_test_provider_hole_clearance.cpp:402
-#, c-format
-msgid " (clearance %s; actual %s)"
-msgstr " (间隙 %s; 实际 %s)"
-
-#: qa/drc_proto/drc_test_provider_hole_size.cpp:146
-#: qa/drc_proto/drc_test_provider_hole_size.cpp:178
-#: qa/drc_proto/drc_test_provider_track_width.cpp:145
-#: qa/drc_proto/drc_test_provider_track_width.cpp:177
-#, c-format
-msgid " (%s; actual %s)"
-msgstr " (%s; 实际 %s)"
-
-#: qa/pcbnew/group_saveload.cpp:79
-#, c-format
-msgid "group-%d"
-msgstr "组-%d"
-
-#: qa/pcbnew/group_saveload.cpp:90
+#: qa/pcbnew/group_saveload.cpp:84
 #, c-format
 msgid "some text-%d"
 msgstr "某些文本-%d"
 
-#: 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:234
-msgid "print DRC marker information"
-msgstr "打印 DRC 标记信息"
-
-#: 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:246
-msgid "perform courtyard-overlap (and malformation) checking"
-msgstr "执行外框重叠 (和畸形) 检查"
-
-#: 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:284
-msgid ""
-"This program runs DRC tools on given PCB files. This can be used for "
-"debugging, fuzz testing or development, etc."
-msgstr ""
-"该程序在给定的 PCB 文件上运行 DRC 工具。 这可以用于调试，模糊测试或开发等。"
+#: qa/pcbnew/group_saveload.cpp:100
+#, c-format
+msgid "group-%d"
+msgstr "组-%d"
 
 #: qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp:114
 msgid ""
@@ -30765,6 +32076,518 @@ msgstr ""
 "3D 搜索路径列表为空;\n"
 "继续写空文件？"
 
+#~ msgid "B.SilkS"
+#~ msgstr "底层丝印层"
+
+#~ msgid "F.SilkS"
+#~ msgstr "顶层丝印层"
+
+#~ msgid "Dwgs.User"
+#~ msgstr "用户图纸层"
+
+#~ msgid "Cmts.User"
+#~ msgstr "用户注释层"
+
+#~ msgid "F.CrtYd"
+#~ msgstr "顶层封装外框层"
+
+#~ msgid "B.CrtYd"
+#~ msgstr "底层封装外框层"
+
+#, c-format
+#~ msgid "Min Annulus: %s"
+#~ msgstr "最小环面：%s"
+
+#~ msgid "Blind/Buried"
+#~ msgstr "盲孔/埋孔"
+
+#~ msgid "Keepout Area"
+#~ msgstr "禁布区"
+
+#~ msgid "Keepout"
+#~ msgstr "禁止布线"
+
+#~ msgid "(Keepout)"
+#~ msgstr "(禁布区)"
+
+#~ msgid "No items are disallowed. The keepout will have no effect."
+#~ msgstr "不允许任何项目。保留将不起作用。"
+
+#~ msgid "Keepout name:"
+#~ msgstr "禁止名称："
+
+#~ msgid "Minimum via annulus:"
+#~ msgstr "最小过孔环："
+
+#~ msgid "Mask_Back_layer"
+#~ msgstr "底层阻焊"
+
+#~ msgid "PCB_Edges_layer"
+#~ msgstr "PCB 板边框层"
+
+#~ msgid "Margin_layer"
+#~ msgstr "电气边界层"
+
+#~ msgid "Eco1_layer"
+#~ msgstr "Eco1_层"
+
+#~ msgid "Eco2_layer"
+#~ msgstr "Eco2_层"
+
+#~ msgid "Comments_layer"
+#~ msgstr "注释层"
+
+#~ msgid "Drawings_layer"
+#~ msgstr "图形层"
+
+#~ msgid "Rule applied."
+#~ msgstr "应用规则。"
+
+#~ msgid "Track width outside allowed limits"
+#~ msgstr "布线宽度超出允许的限制"
+
+#~ msgid "Annulus"
+#~ msgstr "通孔环"
+
+#, fuzzy
+#~| msgid "Track width outside allowed limits"
+#~ msgid "Via diameter outside allowed limits"
+#~ msgstr "布线宽度超出允许的限制"
+
+#, c-format
+#~ msgid " (%s %s annulus %s; actual %s)"
+#~ msgstr "  （%s %s 环形 %s;实际 %s）"
+
+#, fuzzy
+#~| msgid "Checking pins...\n"
+#~ msgid "Checking dangling pads & vias..."
+#~ msgstr "测试悬空的焊盘/过孔"
+
+#, fuzzy
+#~| msgid "Checking sheet names...\n"
+#~ msgid "Checking starved zones..."
+#~ msgstr "测试 starved 区域"
+
+#~ msgid "Select reference point for the copy..."
+#~ msgstr "为副本选择参考点..."
+
+#~ msgid "Copy cancelled."
+#~ msgstr "复制取消。"
+
+#~ msgid "Convert to Keepout"
+#~ msgstr "转换为禁布区"
+
+#~ msgid "Creates a keepout zone from the selection"
+#~ msgstr "从所选内容创建禁止区域"
+
+#~ msgid "Add Keepout Area"
+#~ msgstr "添加禁布区"
+
+#~ msgid "Add a keepout area"
+#~ msgstr "添加禁布区"
+
+#, c-format
+#~ msgid "Text %s at (%s, %s)"
+#~ msgstr "文本 %s 在 (%s, %s)"
+
+#, c-format
+#~ msgid "Imported shape at (%s, %s)"
+#~ msgstr "导入的形状在 (%s, %s)"
+
+#, c-format
+#~ msgid "Rectangle from (%s, %s) to (%s, %s)"
+#~ msgstr "矩形坐标从 (%s, %s) 到  (%s, %s)"
+
+#, c-format
+#~ msgid "Line from (%s, %s) to (%s, %s)"
+#~ msgstr "连线从 (%s,%s) 到 (%s,%s)"
+
+#, c-format
+#~ msgid "Image at (%s, %s)"
+#~ msgstr "图像在 ( %s, %s)"
+
+#~ msgid "Library reference is not valid."
+#~ msgstr "库位号无效。"
+
+#, c-format
+#~ msgid "Symbol \"%s\" not found in library \"%s\"."
+#~ msgstr "符号 \"%s\" 在库中 \"%s\" 没有找到。"
+
+#~ msgid "Sets fields to the original library values"
+#~ msgstr "将符号字段设置为原始库值"
+
+#~ msgid "Library Reference:"
+#~ msgstr "库位号："
+
+#~ msgid "Name of the symbol in the library to which this symbol is linked"
+#~ msgstr "该符号链接到的库中的符号名称"
+
+#~ msgid "Browse library"
+#~ msgstr "浏览库"
+
+#~ msgid "+180"
+#~ msgstr "+180"
+
+#~ msgid "Select if the symbol is to be rotated when drawn"
+#~ msgstr "选择是否在绘制时旋转符号"
+
+#~ msgid "Aspect"
+#~ msgstr "方向"
+
+#~ msgid ""
+#~ "Pick the graphical transformation to be used when displaying the symbol"
+#~ msgstr "指定元件显示图形变换时使用"
+
+#, c-format
+#~ msgid "Arc center (%s, %s), radius %s"
+#~ msgstr "圆弧中心 (%s, %s), 半径 %s"
+
+#, c-format
+#~ msgid "Field %s (%s)"
+#~ msgstr "字段 %s (%s)"
+
+#, c-format
+#~ msgid "Symbol Library Browser -- %s"
+#~ msgstr "符号库浏览器 -- %s"
+
+#~ msgid "No symbol name specified.  Symbol could not be saved."
+#~ msgstr "没有指定符号名称, 符号无法保存。"
+
+#, c-format
+#~ msgid "%s Graphic Line from (%s, %s) to (%s, %s)"
+#~ msgstr "%s 图形线从 (%s,%s) 到 (%s,%s)"
+
+#, c-format
+#~ msgid "%s Wire from (%s, %s) to (%s, %s)"
+#~ msgstr "%s 连线从 (%s,%s) 到 (%s,%s)"
+
+#, c-format
+#~ msgid "%s Bus from (%s, %s) to (%s, %s)"
+#~ msgstr "%s 总线从 (%s,%s) 到 (%s,%s)"
+
+#, c-format
+#~ msgid "%s Line on Unknown Layer from (%s, %s) to (%s, %s)"
+#~ msgstr "%s 线在未知层从 (%s,%s) 到 (%s,%s)"
+
+#, c-format
+#~ msgid ""
+#~ "\"%s\" and \"%s\" use the same schematic symbol.\n"
+#~ "They cannot have different footprints or values."
+#~ msgstr ""
+#~ "\"%s\" 和 \"%s\" 使用相同的原理图符号。\n"
+#~ "它们不能有不同的封装或值。"
+
+#, c-format
+#~ msgid ""
+#~ "Unable to change \"%s\" footprint or value because associated symbol is "
+#~ "reused in the another project"
+#~ msgstr "无法更改 \"%s\" 封装或值，因为关联的符号在另一个项目中重复使用"
+
+#~ msgid "Change library symbols in schematic"
+#~ msgstr "更改原理图中的库符号"
+
+#~ msgid "Update Library Symbols..."
+#~ msgstr "更新库符号..."
+
+#~ msgid "Change Library Symbol..."
+#~ msgstr "更改库符号..."
+
+#~ msgid "Change library symbol for selected symbol"
+#~ msgstr "更改选定符号的库符号"
+
+#~ msgid "Update library symbol for selected symbol"
+#~ msgstr "更新所选符号的库符号"
+
+#~ msgid "Remap Symbols..."
+#~ msgstr "重新映射符号..."
+
+#~ msgid "board minimum"
+#~ msgstr "电路板最小值"
+
+#~ msgid "board edge"
+#~ msgstr "电路板边缘"
+
+#, c-format
+#~ msgid "'%s' rule"
+#~ msgstr "'%s' 规则"
+
+#, c-format
+#~ msgid "Pcb Graphic %s on %s"
+#~ msgstr "Pcb 图形 %s（位于 %s 上）"
+
+#, c-format
+#~ msgid "Graphic %s of %s on %s"
+#~ msgstr "图形 %s %s 在 %s"
+
+#~ msgid "Rounded Rectangle"
+#~ msgstr "圆角矩形"
+
+#~ msgid "Chamfered Rectangle"
+#~ msgstr "倒角矩形"
+
+#, c-format
+#~ msgid "Target size %s"
+#~ msgstr "目标尺寸 %s"
+
+#, c-format
+#~ msgid "Text \"%s\" of %s on %s"
+#~ msgstr "文本 \"%s\" (%s) - %s"
+
+#, c-format
+#~ msgid "Via %s %s on %s - %s"
+#~ msgstr "过孔 %s %s 在 %s - %s上"
+
+#~ msgid "zone properties"
+#~ msgstr "区域属性"
+
+#~ msgid "Min Thickness"
+#~ msgstr "最小线宽"
+
+#~ msgid "Enter the minimum acceptable value for a track width"
+#~ msgstr "输入允许的最小布线宽度值"
+
+#~ msgid "Minimum via size:"
+#~ msgstr "最小过孔尺寸："
+
+#~ msgid "Enter the minimum acceptable diameter for a standard via"
+#~ msgstr "输入允许的最小标准过孔直径"
+
+#~ msgid "Minimum uVia size:"
+#~ msgstr "最小微孔尺寸："
+
+#~ msgid "Enter the minimum acceptable diameter for a micro via"
+#~ msgstr "输入允许的最小微孔外径"
+
+#, c-format
+#~ msgid "Violations / Markers (%d)"
+#~ msgstr "违规 / 标记 (%d)"
+
+#, c-format
+#~ msgid "Footprint Warnings (%d)"
+#~ msgstr "封装警告 (%d)"
+
+#~ msgid "Some items failed DRC and were not modified."
+#~ msgstr "有些项目 DRC 失败，未被修改。"
+
+#~ msgid "No footprints."
+#~ msgstr "没有封装。"
+
+#~ msgid "Check footprints"
+#~ msgstr "检查封装"
+
+#~ msgid "Test Footprints"
+#~ msgstr "封装测试"
+
+#~ msgid "Read the current netlist file and list missing and extra footprints"
+#~ msgstr "读取当前的网表文件并列出丢失和额外的封装"
+
+#, c-format
+#~ msgid "Footprint %s (%s),"
+#~ msgstr "封装 %s(%s),"
+
+#, c-format
+#~ msgid "%s, rotated %.1f deg"
+#~ msgstr "%s，旋转 %.1f 度"
+
+#~ msgid "Footprint name"
+#~ msgstr "封装名称"
+
+#~ msgid "side and rotation"
+#~ msgstr "侧面和旋转"
+
+#~ msgid "Board View"
+#~ msgstr "电路板视图"
+
+#~ msgid "Stackup View"
+#~ msgstr "堆叠视图"
+
+#~ msgid "Show pad in outline mode"
+#~ msgstr "在轮廓模式下显示焊盘"
+
+#~ msgid ""
+#~ "Global solder mask min width and/or margin are not set to 0\n"
+#~ "Most of board houses expect a 0 value and use their constraints, "
+#~ "especially for solder mask min width.\n"
+#~ "Please ensure the  solder mask min width (and margin value) are valid\n"
+#~ "Use non 0 values only when required."
+#~ msgstr ""
+#~ "全局阻焊层的最小宽度和/或边距未设置为 0\n"
+#~ "大多数电路板厂期望值为 0 并使用其约束，特别是对于最小宽度的阻焊层。\n"
+#~ "请确保阻焊层的最小宽度和边距值有效\n"
+#~ "并仅在需要时使用非 0 值。"
+
+#~ msgid "Stroked outlines (legacy)"
+#~ msgstr "描边轮廓 (旧版)"
+
+#~ msgid "Top-level Clauses"
+#~ msgstr "顶级条款"
+
+#~ msgid "Rule Clauses"
+#~ msgstr "规则条款"
+
+#~ msgid "Item Types"
+#~ msgstr "物料类型"
+
+#~ msgid "Examples"
+#~ msgstr "例如"
+
+#~ msgid "0.01 mm / 1 mil"
+#~ msgstr "0.01 mm / 1 mil"
+
+#~ msgid "0.001 mm / 0.1 mil"
+#~ msgstr "0.001 mm / 0.1 mil"
+
+#~ msgid "0.0001mm / 0.01 mil"
+#~ msgstr "0.0001mm / 0.01 mil"
+
+#~ msgid "Board Outline...\n"
+#~ msgstr "电路板边框...\n"
+
+#~ msgid "Drill sizes and clearances...\n"
+#~ msgstr "钻头尺寸和间隙...\n"
+
+#~ msgid "Checking zone fills...\n"
+#~ msgstr "检查填充区域...\n"
+
+#~ msgid "Unconnected pads...\n"
+#~ msgstr "未连接焊盘...\n"
+
+#~ msgid "Keepout areas ...\n"
+#~ msgstr "禁布区...\n"
+
+#~ msgid "Courtyard areas...\n"
+#~ msgstr "封装外框...\n"
+
+#~ msgid "Unresolved text variables...\n"
+#~ msgstr "未解析的文本变量...\n"
+
+#~ msgid "Track clearances"
+#~ msgstr "布线间距"
+
+#, c-format
+#~ msgid " (board minimum %s; actual %s)"
+#~ msgstr " (电路板最小值 %s; 实际 %s)"
+
+#, c-format
+#~ msgid " (diameter %s; drill %s)"
+#~ msgstr " （直径 %s; 钻孔 %s）"
+
+#~ msgid "Microvia not allowed (board design rule constraints)"
+#~ msgstr "不允许微孔 (电路板设计规则约束)"
+
+#~ msgid "Blind/buried via not allowed (board design rule constraints)"
+#~ msgstr "不允许盲孔/埋孔 (电路板设计规则约束)"
+
+#, c-format
+#~ msgid "Microvia through too many layers (%s and %s not adjacent)"
+#~ msgstr "通过太多层的微孔(%s 和 %s 不相邻)"
+
+#, c-format
+#~ msgid "Via annulus too small (%s %s; actual %s)"
+#~ msgstr "过孔环隙太小 (%s %s; 实际 %s)"
+
+#~ msgid "Via size too small"
+#~ msgstr "过孔外径太小"
+
+#~ msgid "Micro via size too small"
+#~ msgstr "微孔外径太小"
+
+#, c-format
+#~ msgid "Library \"%s\" is read only, not writable"
+#~ msgstr "\"%s\" 库为只读，不可写"
+
+#~ msgid "Footprint already exists on board."
+#~ msgstr "封装已经存在于电路板上。"
+
+#, c-format
+#~ msgid ""
+#~ "There is a zone that belongs to a not existing net\n"
+#~ "\"%s\"\n"
+#~ "you should verify and edit it (run DRC test)."
+#~ msgstr ""
+#~ "有一个区域属于不存在的网 \"%s\", 您应该验证和编辑它 (运行 DRC 测试)。"
+
+#~ msgid "Enter"
+#~ msgstr "开始"
+
+#~ msgid "Add Through Via"
+#~ msgstr "添加通孔"
+
+#, c-format
+#~ msgid "Item %s appears in selection multiple times"
+#~ msgstr "项目 %s 多次出现在所选内容中"
+
+#~ msgid "Group create resulted in inconsistent state: "
+#~ msgstr "组创建导致状态不一致： "
+
+#~ msgid "Group not found in selection though selection was checked"
+#~ msgstr "虽然选中了选择，但在所选内容中找不到组"
+
+#, c-format
+#~ msgid "Item %s is already in group for merge"
+#~ msgstr "项目 %s 已在要合并的组中"
+
+#~ msgid "Group merge resulted in inconsistent state: "
+#~ msgstr "组合并导致状态不一致： "
+
+#~ msgid "Selection for ungroup should only have groups in it - was checked."
+#~ msgstr "解组的选择应仅包含组 - 已选中。"
+
+#~ msgid "Group removeItems resulted in inconsistent state: "
+#~ msgstr "组删除项导致状态不一致： "
+
+#~ msgid "Group flatten resulted in inconsistent state: "
+#~ msgstr "组扁平化导致状态不一致： "
+
+#~ msgid "EnterGroup called when selection is not a single group"
+#~ msgstr "当选择不是单个组时输入被叫组"
+
+#~ msgid "Committing changes..."
+#~ msgstr "提交更改..."
+
+#~ msgid "Netclasses...\n"
+#~ msgstr "网类...\n"
+
+#~ msgid "NETCLASS VIOLATIONS: Aborting DRC\n"
+#~ msgstr "网络类违规：中止 DRC\n"
+
+#~ msgid "Drilled hole clearance violation"
+#~ msgstr "钻孔间隙违规"
+
+#, c-format
+#~ msgid " (board minimum %s; %s netclass %s)"
+#~ msgstr " (电路板最小值 %s; %s 网络类 %s)"
+
+#, c-format
+#~ msgid " (board min through hole %s; %s netclass %s)"
+#~ msgstr " (电路板最小通孔 %s; %s 网络类 %s)"
+
+#, c-format
+#~ msgid " (%s; actual %s)"
+#~ msgstr " (%s; 实际 %s)"
+
+#~ msgid "print DRC timings"
+#~ msgstr "打印 DRC 计时"
+
+#~ msgid "print DRC marker information"
+#~ msgstr "打印 DRC 标记信息"
+
+#~ msgid "perform all available DRC checks"
+#~ msgstr "执行所有可用的 DRC 检查"
+
+#~ msgid "perform courtyard-overlap (and malformation) checking"
+#~ msgstr "执行外框重叠 (和畸形) 检查"
+
+#~ msgid "perform courtyard-missing checking"
+#~ msgstr "执行外框缺失检查"
+
+#~ msgid ""
+#~ "This program runs DRC tools on given PCB files. This can be used for "
+#~ "debugging, fuzz testing or development, etc."
+#~ msgstr ""
+#~ "该程序在给定的 PCB 文件上运行 DRC 工具。 这可以用于调试，模糊测试或开发"
+#~ "等。"
+
 #~ msgid "<unassigned>"
 #~ msgstr "<未分配>"
 
@@ -30831,9 +32654,6 @@ msgstr ""
 #~ msgid "Lithuanian"
 #~ msgstr "立陶宛语"
 
-#~ msgid "Checking connections...\n"
-#~ msgstr "检查连接...\n"
-
 #~ msgid "Remove Colors"
 #~ msgstr "删除颜色"
 
@@ -30848,9 +32668,6 @@ msgstr ""
 #~ msgid "Unique ID that identifies the symbol"
 #~ msgstr "标识符号的唯一 ID"
 
-#~ msgid "No Objects"
-#~ msgstr "没有对象"
-
 #, c-format
 #~ msgid "Net count = %d"
 #~ msgstr "网络计数 = %d"
@@ -31019,9 +32836,6 @@ msgstr ""
 #~ msgid "Place a layer alignment target"
 #~ msgstr "放置层对齐标记"
 
-#~ msgid " (board design rule constraints)"
-#~ msgstr " (电路板设计规则约束)"
-
 #, c-format
 #~ msgid " (%s and %s not adjacent)"
 #~ msgstr " (%s 和 %s 不相邻)"
@@ -31048,9 +32862,6 @@ msgstr ""
 #~ msgid "Update net names"
 #~ msgstr "更新网络名称"
 
-#~ msgid "Edit Symbol"
-#~ msgstr "编辑符号"
-
 #~ msgid "Duplicate Symbol"
 #~ msgstr "复制符号"
 
@@ -31074,10 +32885,6 @@ msgstr ""
 #~ "the parent sheet(s) and the symbol."
 #~ msgstr "指向相关原理图符号的链接，包括父级图纸和符号的唯一 ID。"
 
-#, c-format
-#~ msgid "Rule \"%s\" not found."
-#~ msgstr "规则 \"%s\" 没有找到。"
-
 #, c-format
 #~ msgid "Layer \"%s\" not found."
 #~ msgstr "层 \"%s\" 未找到。"
@@ -31372,9 +33179,6 @@ msgstr ""
 #~ msgid " OK\n"
 #~ msgstr " 确定\n"
 
-#~ msgid " *ERROR*\n"
-#~ msgstr " *错误*\n"
-
 #, c-format
 #~ msgid "(%lu bytes, compressed %d bytes)\n"
 #~ msgstr "(%lu 字节, 压缩 %d 字节)\n"
@@ -31730,9 +33534,6 @@ msgstr ""
 #~ msgid "Texts sketch mode"
 #~ msgstr "文本草图模式"
 
-#~ msgid "Pad sketch mode"
-#~ msgstr "焊盘草图模式"
-
 #~ msgid "Show texts in line mode"
 #~ msgstr "在线条模式下显示文本"
 
@@ -31793,9 +33594,6 @@ msgstr ""
 #~ msgid "(NetClass)"
 #~ msgstr "(网络类)"
 
-#~ msgid "zone clearance"
-#~ msgstr "区域间隙"
-
 #~ msgid "Zone Outline"
 #~ msgstr "覆铜轮廓"
 
@@ -31933,9 +33731,6 @@ msgstr ""
 #~ msgid "&New"
 #~ msgstr "新建 (&N)"
 
-#~ msgid "Create a new color theme based on the current one"
-#~ msgstr "根据当前主题创建一个新的颜色主题"
-
 #~ msgid "The \"User\" theme cannot be renamed"
 #~ msgstr "无法重命名“用户”主题"
 
@@ -32119,9 +33914,6 @@ msgstr ""
 #~ msgid "Incorrect number of reference points for linear dimension object"
 #~ msgstr "线性尺寸对象的参考点数量不正确"
 
-#~ msgid "No text position present for leader dimension object"
-#~ msgstr "没有引线尺寸对象的文本位置"
-
 #, c-format
 #~ msgid "Ignore dimension object of kind %d"
 #~ msgstr "忽略类型为 %d 的 Dimension 对象"
@@ -32654,9 +34446,6 @@ msgstr ""
 #~ msgid "Enable writing report to this file"
 #~ msgstr "将报告写入该文件"
 
-#~ msgid "Enter the report filename"
-#~ msgstr "输入报告文件名称"
-
 #~ msgid "Board side:"
 #~ msgstr "PCB 板面："
 
@@ -32781,9 +34570,6 @@ msgstr ""
 #~ msgid "sym-lib-table files contain no library with nickname \"%s\""
 #~ msgstr "符号库表文件不包含 \"%s\" 别名"
 
-#~ msgid "Include &items on invisible layers"
-#~ msgstr "包括隐藏层上的项 (&I)"
-
 #~ msgid "Draw &selected items while moving"
 #~ msgstr "在移动时绘制选定项目 (&S)"
 
@@ -32837,9 +34623,6 @@ msgstr ""
 #~ msgid "Alias field substitutions:"
 #~ msgstr "别名字段替换："
 
-#~ msgid "Alias name:"
-#~ msgstr "别名："
-
 #~ msgid "Alias description:"
 #~ msgstr "别名描述："
 
@@ -33071,9 +34854,6 @@ msgstr ""
 #~ msgid "Encoding UTF8"
 #~ msgstr "UTF8 编码"
 
-#~ msgid "value %s"
-#~ msgstr "值 %s"
-
 #~ msgid "field %s"
 #~ msgstr "字段 %s"
 
@@ -33246,9 +35026,6 @@ msgstr ""
 #~ msgid "Add dimension"
 #~ msgstr "添加尺寸标注"
 
-#~ msgid "Add keepout"
-#~ msgstr "添加禁布区"
-
 #~ msgid "Add zone cutout"
 #~ msgstr "添加挖空区域"
 
@@ -33309,9 +35086,6 @@ msgstr ""
 #~ msgid "Refill Zones"
 #~ msgstr "补充区域"
 
-#~ msgid "Resolution:"
-#~ msgstr "分辨率："
-
 #~ msgid "Mirror Y"
 #~ msgstr "Y 轴镜像"
 
@@ -33950,9 +35724,6 @@ msgstr ""
 #~ msgid "Toggles the search tree"
 #~ msgstr "切换搜索树"
 
-#~ msgid "Board setup"
-#~ msgstr "电路板设置"
-
 #~ msgid "Open footprint editor"
 #~ msgstr "打开封装编辑"
 
@@ -35145,9 +36916,6 @@ msgstr ""
 #~ msgid "End Edge"
 #~ msgstr "结束边框"
 
-#~ msgid "Place Edge"
-#~ msgstr "放置边框轮廓线"
-
 #~ msgid "Global Changes"
 #~ msgstr "全局修改"
 
@@ -35493,9 +37261,6 @@ msgstr ""
 #~ msgid "Add Similar Zone"
 #~ msgstr "添加相似敷铜"
 
-#~ msgid "Add Cutout Area"
-#~ msgstr "添加挖空区域"
-
 #~ msgid "Remove Filled Areas in Zone"
 #~ msgstr "删除区域中的填充区域"