diff --git a/zh_CN/kicad.po b/zh_CN/kicad.po
index 64efc7f098..cc2104ff86 100755
--- a/zh_CN/kicad.po
+++ b/zh_CN/kicad.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KICAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-28 09:01+0800\n"
-"PO-Revision-Date: 2018-08-28 22:26+0800\n"
+"POT-Creation-Date: 2018-10-26 14:21+0800\n"
+"PO-Revision-Date: 2018-10-30 15:13+0800\n"
 "Last-Translator: Liu Guang <l.g110@163.com>\n"
 "Language-Team: <Liu Guang>l.g110@163.com\n"
 "Language: zh_CN\n"
@@ -29,7 +29,7 @@ msgid "Paths:"
 msgstr "路径:"
 
 #: 3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp:137
-#: common/dialogs/dialog_configure_paths_base.h:71
+#: common/dialogs/dialog_configure_paths_base.h:73
 msgid "Configure Paths"
 msgstr "配置路径"
 
@@ -42,11 +42,11 @@ msgstr "配置路径"
 msgid "OK"
 msgstr "确定"
 
-#: 3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp:143 common/confirm.cpp:187
-#: common/selcolor.cpp:180 common/tool/actions.cpp:10
+#: 3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp:143 common/confirm.cpp:186
+#: common/confirm.cpp:204 common/selcolor.cpp:181 common/tool/actions.cpp:10
 #: eeschema/dialogs/dialog_netlist_base.cpp:131
-#: eeschema/libedit_onrightclick.cpp:71 eeschema/onrightclick.cpp:153
-#: eeschema/onrightclick.cpp:186
+#: eeschema/libedit/libedit_onrightclick.cpp:71 eeschema/onrightclick.cpp:158
+#: eeschema/onrightclick.cpp:191
 #: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:182
 #: gerbview/onrightclick.cpp:60 gerbview/onrightclick.cpp:82
 #: pagelayout_editor/onrightclick.cpp:134
@@ -64,9 +64,9 @@ msgstr "比例"
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:72
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:116
 #: pcbnew/dialogs/dialog_export_vrml_base.cpp:69
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:823
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:849
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:962
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:825
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:851
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:964
 #: pcbnew/dialogs/dialog_set_grid_base.cpp:31
 #: pcbnew/import_dxf/dialog_dxf_import_base.cpp:67
 msgid "X:"
@@ -76,9 +76,9 @@ msgstr "X:"
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:82
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:126
 #: pcbnew/dialogs/dialog_export_vrml_base.cpp:84
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:834
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:860
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:973
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:836
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:862
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:975
 #: pcbnew/dialogs/dialog_set_grid_base.cpp:42
 #: pcbnew/import_dxf/dialog_dxf_import_base.cpp:87
 msgid "Y:"
@@ -91,7 +91,7 @@ msgid "Z:"
 msgstr "Z："
 
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:65
-#: gerbview/gerber_draw_item.cpp:714 pcbnew/class_module.cpp:607
+#: gerbview/gerber_draw_item.cpp:714 pcbnew/class_module.cpp:613
 msgid "Rotation"
 msgstr "旋转"
 
@@ -101,10 +101,10 @@ msgstr "偏移"
 
 #: 3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp:159
 #: eeschema/dialogs/dialog_print_using_printer.cpp:155
-#: eeschema/dialogs/dialog_print_using_printer.cpp:244
+#: eeschema/dialogs/dialog_print_using_printer.cpp:236
 #: gerbview/dialogs/dialog_print_using_printer_base.cpp:100
 #: pagelayout_editor/dialogs/dialogs_for_printing.cpp:237
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:424
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:430
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:332
 #: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:51
 msgid "Preview"
@@ -126,45 +126,40 @@ msgstr "没有此类文件"
 msgid "failed to open file"
 msgstr "无法打开文件"
 
-#: 3d-viewer/3d_canvas/cinfo3d_visu.cpp:425
+#: 3d-viewer/3d_canvas/cinfo3d_visu.cpp:426
 msgid "Build board body"
 msgstr "创建电路板"
 
-#: 3d-viewer/3d_canvas/cinfo3d_visu.cpp:435
+#: 3d-viewer/3d_canvas/cinfo3d_visu.cpp:436
 msgid "Create layers"
 msgstr "创建图层"
 
-#: 3d-viewer/3d_canvas/cinfo3d_visu.cpp:461
-#: pcbnew/dialogs/dialog_export_step.cpp:233
+#: 3d-viewer/3d_canvas/cinfo3d_visu.cpp:462
+#: pcbnew/dialogs/dialog_export_step.cpp:234
 msgid "Cannot determine the board outline."
 msgstr "无法确定电路板的轮廓。"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:248
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:251
 msgid "Create tracks and vias"
 msgstr "创建导线和过孔"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:787
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:790
 msgid "Create zones"
 msgstr "创建覆铜"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:796
-#, c-format
-msgid "Create zones of layer %s"
-msgstr "创建 %s 层覆铜"
-
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:863
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:862
 msgid "Simplifying copper layers polygons"
 msgstr "简化铜层多边形"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:894
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:906
 msgid "Simplify holes contours"
 msgstr "简化孔轮廓"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:940
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:952
 msgid "Build Tech layers"
 msgstr "建立工艺层"
 
-#: 3d-viewer/3d_canvas/create_layer_items.cpp:1170
+#: 3d-viewer/3d_canvas/create_layer_items.cpp:1182
 msgid "Build BVH for holes and vias"
 msgstr "为孔和过孔构造BVH"
 
@@ -173,51 +168,51 @@ msgstr "为孔和过孔构造BVH"
 msgid "Render time %.0f ms ( %.1f fps)"
 msgstr "渲染时间 %.0f ms ( %.1f fps)"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:612
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:618
 msgid "Zoom +"
 msgstr "放大"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:618
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:624
 msgid "Zoom -"
 msgstr "缩小"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:625
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:631
 msgid "Top View"
 msgstr "顶视图"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:630
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:636
 msgid "Bottom View"
 msgstr "底视图"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:637
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:643
 msgid "Right View"
 msgstr "右视图"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:642
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:648
 msgid "Left View"
 msgstr "左视图"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:649
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:655
 msgid "Front View"
 msgstr "前视图"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:654
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:660
 msgid "Back View"
 msgstr "后视图"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:661
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:667
 msgid "Move Left <-"
 msgstr "左移 ←"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:666
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:672
 msgid "Move Right ->"
 msgstr "右移 →"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:671
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:677
 msgid "Move Up ^"
 msgstr "上移 ↑"
 
-#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:676
+#: 3d-viewer/3d_canvas/eda_3d_canvas.cpp:682
 #: cvpcb/dialogs/dialog_config_equfiles_base.cpp:45
 msgid "Move Down"
 msgstr "下移 ↓"
@@ -226,54 +221,54 @@ msgstr "下移 ↓"
 msgid "Load OpenGL: board"
 msgstr "载入 OpenGL: 电路板"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:437
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:438
 msgid "Load OpenGL: holes and vias"
 msgstr "载入 OpenGL: 开孔和过孔"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:536
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:537
 msgid "Load OpenGL: layers"
 msgstr "载入 OpenGL: 层"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:643
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:644
 msgid "Loading 3D models"
 msgstr "载入3D模型"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:667
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:668
 #: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp:963
 #, c-format
 msgid "Reload time %.3f s"
 msgstr "重新载入时间 %.3f s"
 
-#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:954
+#: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp:955
 #, c-format
 msgid "Loading %s"
-msgstr "加载 \"%s\""
+msgstr "加载 %s"
 
 #: 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp:479
-#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:177
+#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:176
 #: common/widgets/footprint_preview_widget.cpp:100
 msgid "Loading..."
 msgstr "载入中......"
 
-#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:357
+#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:356
 #, c-format
 msgid "Rendering time %.3f s"
 msgstr "渲染时间 %.3f s"
 
-#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:415
+#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:411
 #, c-format
 msgid "Rendering: %.0f %%"
 msgstr "渲染: %.0f %%"
 
-#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:926
+#: 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp:922
 msgid "Rendering: Post processing shader"
 msgstr "渲染：后期处理着色器"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:52 cvpcb/menubar.cpp:105
-#: eeschema/menubar.cpp:114 eeschema/menubar_libedit.cpp:344
-#: eeschema/tool_viewlib.cpp:199 gerbview/menubar.cpp:362 kicad/menubar.cpp:429
+#: eeschema/libedit/menubar_libedit.cpp:356 eeschema/menubar.cpp:114
+#: eeschema/tool_viewlib.cpp:197 gerbview/menubar.cpp:369 kicad/menubar.cpp:428
 #: pagelayout_editor/menubar.cpp:211 pcbnew/menubar_footprint_editor.cpp:473
-#: pcbnew/menubar_pcb_editor.cpp:131 pcbnew/tool_footprint_viewer.cpp:177
+#: pcbnew/menubar_pcb_editor.cpp:131 pcbnew/tool_footprint_viewer.cpp:198
 msgid "&File"
 msgstr "文件(&F)"
 
@@ -285,15 +280,16 @@ msgstr "导出当前视图为PNG..."
 msgid "Export Current View as JPEG..."
 msgstr "导出当前视图为JPEG..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:64 eeschema/menubar.cpp:468
-#: kicad/menubar.cpp:288 pcbnew/menubar_footprint_editor.cpp:121
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:64 eeschema/menubar.cpp:446
+#: kicad/menubar.cpp:288 pcbnew/menubar_footprint_editor.cpp:126
 #: pcbnew/menubar_pcb_editor.cpp:932
 msgid "&Exit"
 msgstr "退出(&E)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:67 eeschema/menubar.cpp:115
-#: eeschema/menubar_libedit.cpp:345 pagelayout_editor/menubar.cpp:212
-#: pcbnew/menubar_footprint_editor.cpp:474 pcbnew/menubar_pcb_editor.cpp:132
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:67
+#: eeschema/libedit/menubar_libedit.cpp:357 eeschema/menubar.cpp:115
+#: pagelayout_editor/menubar.cpp:212 pcbnew/menubar_footprint_editor.cpp:474
+#: pcbnew/menubar_pcb_editor.cpp:132
 msgid "&Edit"
 msgstr "编辑(&E)"
 
@@ -301,37 +297,40 @@ msgstr "编辑(&E)"
 msgid "Copy 3D Image"
 msgstr "复制三维图像"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:73 eeschema/menubar.cpp:116
-#: eeschema/menubar_libedit.cpp:346 eeschema/tool_viewlib.cpp:201
-#: gerbview/menubar.cpp:363 kicad/menubar.cpp:430
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:73
+#: eeschema/libedit/menubar_libedit.cpp:358 eeschema/menubar.cpp:116
+#: eeschema/tool_viewlib.cpp:199 gerbview/menubar.cpp:370 kicad/menubar.cpp:429
 #: pagelayout_editor/menubar.cpp:213 pcbnew/menubar_footprint_editor.cpp:475
-#: pcbnew/menubar_pcb_editor.cpp:133 pcbnew/tool_footprint_viewer.cpp:179
+#: pcbnew/menubar_pcb_editor.cpp:133 pcbnew/tool_footprint_viewer.cpp:200
 msgid "&View"
 msgstr "视图(&V)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:76 eeschema/menubar.cpp:166
-#: eeschema/menubar_libedit.cpp:191 eeschema/tool_viewlib.cpp:152
-#: gerbview/menubar.cpp:195 pcbnew/menubar_footprint_editor.cpp:202
-#: pcbnew/menubar_pcb_editor.cpp:569 pcbnew/tool_footprint_viewer.cpp:132
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:76
+#: eeschema/libedit/menubar_libedit.cpp:191 eeschema/menubar.cpp:166
+#: eeschema/tool_viewlib.cpp:150 gerbview/menubar.cpp:202
+#: pcbnew/menubar_footprint_editor.cpp:207 pcbnew/menubar_pcb_editor.cpp:569
+#: pcbnew/tool_footprint_viewer.cpp:153
 msgid "Zoom &In"
 msgstr "放大(&I)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:80 eeschema/menubar.cpp:170
-#: eeschema/menubar_libedit.cpp:195 eeschema/tool_viewlib.cpp:156
-#: gerbview/menubar.cpp:199 pcbnew/menubar_footprint_editor.cpp:206
-#: pcbnew/menubar_pcb_editor.cpp:573 pcbnew/tool_footprint_viewer.cpp:136
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:80
+#: eeschema/libedit/menubar_libedit.cpp:195 eeschema/menubar.cpp:170
+#: eeschema/tool_viewlib.cpp:154 gerbview/menubar.cpp:206
+#: pcbnew/menubar_footprint_editor.cpp:211 pcbnew/menubar_pcb_editor.cpp:573
+#: pcbnew/tool_footprint_viewer.cpp:157
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:84 gerbview/menubar.cpp:203
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:84 gerbview/menubar.cpp:210
 #: pcbnew/menubar_pcb_editor.cpp:577
 msgid "Zoom to &Fit"
 msgstr "缩放至适合大小(&F)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:88 eeschema/menubar.cpp:183
-#: eeschema/menubar_libedit.cpp:208 eeschema/tool_viewlib.cpp:164
-#: gerbview/menubar.cpp:210 pcbnew/menubar_footprint_editor.cpp:219
-#: pcbnew/menubar_pcb_editor.cpp:586 pcbnew/tool_footprint_viewer.cpp:144
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:88
+#: eeschema/libedit/menubar_libedit.cpp:208 eeschema/menubar.cpp:183
+#: eeschema/tool_viewlib.cpp:162 gerbview/menubar.cpp:217
+#: pcbnew/menubar_footprint_editor.cpp:224 pcbnew/menubar_pcb_editor.cpp:586
+#: pcbnew/tool_footprint_viewer.cpp:165
 msgid "&Redraw"
 msgstr "刷新显示(&R)"
 
@@ -384,277 +383,275 @@ msgid "Move down"
 msgstr "下移"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:139 cvpcb/menubar.cpp:106
-#: gerbview/menubar.cpp:365 kicad/menubar.cpp:433
+#: gerbview/menubar.cpp:372 kicad/menubar.cpp:432
 msgid "&Preferences"
 msgstr "首选项(&P)"
 
 #: 3d-viewer/3d_viewer/3d_menubar.cpp:142
-msgid "Use Touchpad to Pan"
-msgstr "使用触摸板平移"
-
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:148
-#: cvpcb/dialogs/dialog_display_options_base.h:58
-#: eeschema/eeschema_config.cpp:205 gerbview/gerbview_config.cpp:69
-#: pcbnew/footprint_edit_frame.cpp:933 pcbnew/pcbnew_config.cpp:100
+#: cvpcb/dialogs/dialog_display_options_base.h:56
+#: eeschema/eeschema_config.cpp:209 eeschema/eeschema_config.cpp:589
+#: gerbview/gerbview_config.cpp:69
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.h:56
+#: pcbnew/footprint_edit_frame.cpp:947 pcbnew/pcbnew_config.cpp:100
 msgid "Display Options"
 msgstr "显示选项"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:153
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:147
 msgid "Render Engine"
 msgstr "渲染引擎"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:156
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:150
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:160
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:154
 msgid "Raytracing"
 msgstr "光线追踪"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:171
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:165
 msgid "Render Options"
 msgstr "渲染设置"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:175
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:169
 msgid "Material Properties"
 msgstr "材料属性"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:178
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:172
 msgid "Use All Properties"
 msgstr "使用所有属性"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:179
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:173
 msgid "Use all material properties from each 3D model file"
 msgstr "每个3D模型文件中使用的所有材料属性"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:182
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:176
 msgid "Use Diffuse Only"
 msgstr "只使用漫射"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:183
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:177
 msgid "Use only the diffuse color property from model 3D model file "
-msgstr "在模型的3D模型文件只使用漫反射颜色属性"
+msgstr "在模型的3D模型文件只使用漫反射颜色属性 "
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:186
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:180
 msgid "CAD Color Style"
 msgstr "CAD颜色风格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:187
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:181
 msgid "Use a CAD color style based on the diffuse color of the material"
-msgstr "使用基于漫反射颜色材料的CAD的色彩风格。"
+msgstr "使用基于漫反射颜色材料的CAD的色彩风格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:194
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:188
 msgid "OpenGL Options"
 msgstr "OpenGL选项"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:197
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:191
 msgid "Show Copper Thickness"
 msgstr "显示铜厚"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:198
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:192
 msgid "Shows the copper thickness on copper layers (slower loading)"
 msgstr "显示了铜层的铜的厚度（加载速度较慢）"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:202
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:196
 msgid "Show Model Bounding Boxes"
 msgstr "模型边框显示"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:210
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:204
 msgid "Raytracing Options"
 msgstr "光线追踪选项"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:213
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:207
 msgid "Render Shadows"
 msgstr "阴影"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:217
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:211
 msgid "Procedural Textures"
 msgstr "过程纹理"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:218
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:212
 msgid "Apply procedural textures to materials (slow)"
 msgstr "将过程纹理应用于材质（较慢）"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:222
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:216
 msgid "Add Floor"
 msgstr "添加层"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:223
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:217
 msgid "Adds a floor plane below the board (slow)"
 msgstr "在线路板下面添加一块反光板 (慢)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:227
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:221
 msgid "Refractions"
 msgstr "折射"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:228
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:222
 msgid "Render materials with refractions properties on final render (slow)"
 msgstr "渲染折射性能（慢）"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:232
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:226
 msgid "Reflections"
 msgstr "反射"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:233
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:227
 msgid "Render materials with reflections properties on final render (slow)"
 msgstr "渲染材质的反射特性（慢）"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:237
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:231
 msgid "Anti-aliasing"
 msgstr "抗锯齿"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:238
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:232
 msgid "Render with improved quality on final render (slow)"
 msgstr "提高最终渲染质量（慢）"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:242
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:236
 msgid "Post-processing"
 msgstr "后期处理"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:243
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:237
 msgid ""
 "Apply Screen Space Ambient Occlusion and Global Illumination reflections on "
 "final render (slow)"
 msgstr "最终渲染应用屏幕空间环境光遮蔽和全局光照反射（慢）"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:255
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:249
 msgid "Choose Colors"
 msgstr "选择颜色"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:259
-#: eeschema/widgets/widget_eeschema_color_config.cpp:210
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:253
 msgid "Background Color"
 msgstr "背景颜色"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:262
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:256
 msgid "Background Top Color..."
 msgstr "背景上部颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:265
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:259
 msgid "Background Bottom Color..."
 msgstr "背景下部颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:268
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:262
 msgid "Silkscreen Color..."
 msgstr "丝印颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:271
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:265
 msgid "Solder Mask Color..."
 msgstr "阻焊颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:274
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:268
 msgid "Solder Paste Color..."
 msgstr "锡膏颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:277
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:271
 msgid "Copper/Surface Finish Color..."
 msgstr "铜/表面处理颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:280
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:274
 msgid "Board Body Color..."
 msgstr "电路板颜色..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:283
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:277
 msgid "Show 3D &Axis"
 msgstr "显示3D轴线(&A)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:291
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:285
 msgid "3D Grid"
 msgstr "3D网格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:292
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:286
 msgid "No 3D Grid"
 msgstr "不显示网格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:293
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:287
 msgid "3D Grid 10 mm"
 msgstr "10mm网格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:294
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:288
 msgid "3D Grid 5 mm"
 msgstr "5mm网格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:295
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:289
 msgid "3D Grid 2.5 mm"
 msgstr "2.5mm网格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:296
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:290
 msgid "3D Grid 1 mm"
 msgstr "1mm网格"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:314
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:308
 msgid "Reset to Default Settings"
 msgstr "重置为默认值"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:319 cvpcb/menubar.cpp:107
-#: eeschema/menubar.cpp:121 eeschema/menubar_libedit.cpp:350
-#: eeschema/tool_viewlib.cpp:202 gerbview/menubar.cpp:366 kicad/menubar.cpp:434
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:313 cvpcb/menubar.cpp:107
+#: eeschema/libedit/menubar_libedit.cpp:362 eeschema/menubar.cpp:121
+#: eeschema/tool_viewlib.cpp:200 gerbview/menubar.cpp:373 kicad/menubar.cpp:433
 #: pagelayout_editor/menubar.cpp:216 pcbnew/menubar_footprint_editor.cpp:480
-#: pcbnew/menubar_pcb_editor.cpp:139 pcbnew/tool_footprint_viewer.cpp:180
+#: pcbnew/menubar_pcb_editor.cpp:139 pcbnew/tool_footprint_viewer.cpp:201
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:322
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:316
 #: pcbnew/menubar_footprint_editor.cpp:446 pcbnew/menubar_pcb_editor.cpp:418
-#: pcbnew/tool_footprint_viewer.cpp:160
+#: pcbnew/tool_footprint_viewer.cpp:181
 msgid "Pcbnew &Manual"
 msgstr "Pcbnew手册(&M)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:323 pcbnew/menubar_pcb_editor.cpp:419
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:317 pcbnew/menubar_pcb_editor.cpp:419
 msgid "Open Pcbnew Manual"
 msgstr "打开Pcbnew手册"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:327 cvpcb/menubar.cpp:97
-#: eeschema/menubar.cpp:620 eeschema/menubar_libedit.cpp:321
-#: eeschema/tool_viewlib.cpp:182 kicad/menubar.cpp:404
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:321 cvpcb/menubar.cpp:97
+#: eeschema/libedit/menubar_libedit.cpp:333 eeschema/menubar.cpp:599
+#: eeschema/tool_viewlib.cpp:180 kicad/menubar.cpp:403
 #: pagelayout_editor/menubar.cpp:190 pcbnew/menubar_footprint_editor.cpp:451
-#: pcbnew/menubar_pcb_editor.cpp:423 pcbnew/tool_footprint_viewer.cpp:165
+#: pcbnew/menubar_pcb_editor.cpp:423 pcbnew/tool_footprint_viewer.cpp:186
 msgid "&Getting Started in KiCad"
 msgstr "KiCad入门(&G)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:328 cvpcb/menubar.cpp:98
-#: eeschema/menubar.cpp:621 kicad/menubar.cpp:405
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:322 cvpcb/menubar.cpp:98
+#: eeschema/menubar.cpp:600 kicad/menubar.cpp:404
 #: pagelayout_editor/menubar.cpp:191 pcbnew/menubar_pcb_editor.cpp:424
 msgid "Open \"Getting Started in KiCad\" guide for beginners"
 msgstr "打开“KiCad入门”初学者指南"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:331 eeschema/menubar.cpp:624
-#: eeschema/menubar_libedit.cpp:325 gerbview/menubar.cpp:343
-#: pcbnew/menubar_footprint_editor.cpp:455 pcbnew/menubar_pcb_editor.cpp:427
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:325
+#: eeschema/libedit/menubar_libedit.cpp:337 eeschema/menubar.cpp:603
+#: gerbview/menubar.cpp:350 pcbnew/menubar_footprint_editor.cpp:455
+#: pcbnew/menubar_pcb_editor.cpp:427
 msgid "&List Hotkeys..."
 msgstr "快捷键列表(&L)..."
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:334 eeschema/menubar_libedit.cpp:329
-#: gerbview/menubar.cpp:345 kicad/menubar.cpp:411
-#: pagelayout_editor/menubar.cpp:196
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:328
+#: eeschema/libedit/menubar_libedit.cpp:341 gerbview/menubar.cpp:352
+#: kicad/menubar.cpp:410 pagelayout_editor/menubar.cpp:196
 msgid "Displays the current hotkeys list and corresponding commands"
 msgstr "显示当前快捷键列表和相应命令"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:340 eeschema/menubar.cpp:630
-#: eeschema/menubar_libedit.cpp:334 eeschema/tool_viewlib.cpp:188
-#: gerbview/menubar.cpp:352 kicad/menubar.cpp:419
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:334
+#: eeschema/libedit/menubar_libedit.cpp:346 eeschema/menubar.cpp:609
+#: eeschema/tool_viewlib.cpp:186 gerbview/menubar.cpp:359 kicad/menubar.cpp:418
 #: pagelayout_editor/menubar.cpp:200 pcbnew/menubar_footprint_editor.cpp:464
 #: pcbnew/menubar_pcb_editor.cpp:436
 msgid "Get &Involved"
 msgstr "加入KiCad"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:341 eeschema/menubar.cpp:631
-#: eeschema/menubar_libedit.cpp:335 eeschema/tool_viewlib.cpp:189
-#: gerbview/menubar.cpp:353 kicad/menubar.cpp:420
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:335
+#: eeschema/libedit/menubar_libedit.cpp:347 eeschema/menubar.cpp:610
+#: eeschema/tool_viewlib.cpp:187 gerbview/menubar.cpp:360 kicad/menubar.cpp:419
 #: pagelayout_editor/menubar.cpp:201 pcbnew/menubar_footprint_editor.cpp:465
 #: pcbnew/menubar_pcb_editor.cpp:437
 msgid "Contribute to KiCad (opens a web browser)"
 msgstr "帮助KICAD（打开网页浏览器）"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:347 cvpcb/menubar.cpp:102
-#: eeschema/menubar.cpp:635 eeschema/menubar_libedit.cpp:341
-#: gerbview/menubar.cpp:359 kicad/menubar.cpp:426
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:341 cvpcb/menubar.cpp:102
+#: eeschema/libedit/menubar_libedit.cpp:353 eeschema/menubar.cpp:614
+#: gerbview/menubar.cpp:366 kicad/menubar.cpp:425
 #: pagelayout_editor/menubar.cpp:208 pcbnew/menubar_footprint_editor.cpp:470
 #: pcbnew/menubar_pcb_editor.cpp:442
 msgid "&About KiCad"
 msgstr "关于KiCad(&A)"
 
-#: 3d-viewer/3d_viewer/3d_menubar.cpp:348
+#: 3d-viewer/3d_viewer/3d_menubar.cpp:342
 msgid "Display KiCad About dialog"
 msgstr "显示关于KiCad对话框"
 
@@ -675,26 +672,26 @@ msgid "Render current view using Raytracing"
 msgstr "使用光线追踪渲染当前视图"
 
 #: 3d-viewer/3d_viewer/3d_toolbar.cpp:77 eeschema/help_common_strings.h:43
-#: eeschema/tool_viewlib.cpp:65 gerbview/menubar.cpp:197
-#: gerbview/toolbars_gerber.cpp:74 pagelayout_editor/toolbars_pl_editor.cpp:86
-#: pcbnew/footprint_wizard_frame.cpp:761 pcbnew/help_common_strings.h:19
-#: pcbnew/tool_footprint_editor.cpp:78 pcbnew/tool_footprint_viewer.cpp:73
+#: eeschema/tool_viewlib.cpp:65 gerbview/menubar.cpp:204
+#: gerbview/toolbars_gerber.cpp:78 pagelayout_editor/toolbars_pl_editor.cpp:86
+#: pcbnew/footprint_wizard_frame.cpp:765 pcbnew/help_common_strings.h:19
+#: pcbnew/tool_footprint_editor.cpp:78 pcbnew/tool_footprint_viewer.cpp:77
 msgid "Zoom in"
 msgstr "放大"
 
 #: 3d-viewer/3d_viewer/3d_toolbar.cpp:80 3d-viewer/3d_viewer/hotkeys.cpp:52
 #: eeschema/help_common_strings.h:44 eeschema/tool_viewlib.cpp:70
-#: gerbview/menubar.cpp:201 gerbview/toolbars_gerber.cpp:77
+#: gerbview/menubar.cpp:208 gerbview/toolbars_gerber.cpp:81
 #: pagelayout_editor/toolbars_pl_editor.cpp:89
-#: pcbnew/footprint_wizard_frame.cpp:766 pcbnew/help_common_strings.h:20
-#: pcbnew/tool_footprint_editor.cpp:81 pcbnew/tool_footprint_viewer.cpp:77
+#: pcbnew/footprint_wizard_frame.cpp:770 pcbnew/help_common_strings.h:20
+#: pcbnew/tool_footprint_editor.cpp:81 pcbnew/tool_footprint_viewer.cpp:81
 msgid "Zoom out"
 msgstr "缩小"
 
 #: 3d-viewer/3d_viewer/3d_toolbar.cpp:84 eeschema/tool_viewlib.cpp:75
-#: gerbview/toolbars_gerber.cpp:71 pagelayout_editor/toolbars_pl_editor.cpp:82
-#: pcbnew/footprint_wizard_frame.cpp:771 pcbnew/tool_footprint_editor.cpp:75
-#: pcbnew/tool_footprint_viewer.cpp:81
+#: gerbview/toolbars_gerber.cpp:75 pagelayout_editor/toolbars_pl_editor.cpp:82
+#: pcbnew/footprint_wizard_frame.cpp:775 pcbnew/tool_footprint_editor.cpp:75
+#: pcbnew/tool_footprint_viewer.cpp:73
 msgid "Redraw view"
 msgstr "刷新显示"
 
@@ -783,43 +780,40 @@ msgstr "显示ECO层"
 msgid "3D Display Options"
 msgstr "3D显示选项"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:338
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:343
 msgid "Background Color, Bottom"
 msgstr "背景下部颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:348
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:353
 msgid "Background Color, Top"
 msgstr "背景上部颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:934
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:930
 msgid "3D Image File Name:"
 msgstr "3D图像文件名称:"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:970
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:966
 msgid "Failed to copy image to clipboard"
 msgstr "复制图像到剪贴板失败"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:981
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:977
 msgid "Can't save file"
 msgstr "无法保存文件"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1047
-msgid "Silk Screen Color"
-msgstr "丝印颜色"
-
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1083
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1028
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1057
 msgid "Solder Mask Color"
 msgstr "阻焊颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1109
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1076
 msgid "Copper Color"
 msgstr "铜箔颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1139
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1099
 msgid "Board Body Color"
 msgstr "电路板颜色"
 
-#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1164
+#: 3d-viewer/3d_viewer/eda_3d_viewer.cpp:1117
 msgid "Solder Paste Color"
 msgstr "锡膏颜色"
 
@@ -905,12 +899,12 @@ msgstr "切换3D虚拟模型"
 msgid "Viewer 3D"
 msgstr "3D查看器"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:270 eeschema/edit_bitmap.cpp:103
+#: bitmap2component/bitmap2cmp_gui.cpp:270 eeschema/edit_bitmap.cpp:41
 #: pagelayout_editor/pl_editor_frame.cpp:555
 msgid "Choose Image"
 msgstr "选择图片"
 
-#: bitmap2component/bitmap2cmp_gui.cpp:271 eeschema/edit_bitmap.cpp:104
+#: bitmap2component/bitmap2cmp_gui.cpp:271 eeschema/edit_bitmap.cpp:42
 #: pagelayout_editor/pl_editor_frame.cpp:556
 msgid "Image Files "
 msgstr "图片文件 "
@@ -979,7 +973,9 @@ msgid "pixels"
 msgstr "像素"
 
 #: bitmap2component/bitmap2cmp_gui_base.cpp:78 common/base_units.cpp:443
-#: common/draw_frame.cpp:590 common/preview_items/preview_utils.cpp:44
+#: common/legacy_gal/eda_draw_frame.cpp:596
+#: common/legacy_wx/eda_draw_frame.cpp:609
+#: common/preview_items/preview_utils.cpp:44
 #: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:32
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:93
 #: eeschema/dialogs/dialog_plot_schematic_base.cpp:129
@@ -991,20 +987,20 @@ msgstr "像素"
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:145
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:179
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:186
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:235
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:249
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:295
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:309
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:457
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:464
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:512
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:519
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:540
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:547
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:597
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:604
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:625
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:632
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:236
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:250
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:296
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:310
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:447
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:454
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:502
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:509
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:530
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:537
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:587
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:594
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:615
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:622
 #: pagelayout_editor/pl_editor_frame.cpp:386 pcb_calculator/UnitSelector.cpp:38
 #: pcb_calculator/UnitSelector.cpp:70
 #: pcbnew/dialogs/dialog_create_array_base.cpp:52
@@ -1037,7 +1033,7 @@ msgstr "像素"
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:110
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:121
 #: pcbnew/dialogs/panel_setup_feature_constraints_base.cpp:141
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:61
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:53
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:53
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:66
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:88
@@ -1072,7 +1068,9 @@ msgid "Load Bitmap"
 msgstr "读取位图"
 
 #: bitmap2component/bitmap2cmp_gui_base.cpp:124
-#: eeschema/lib_edit_frame.cpp:1127 pcbnew/dialogs/dialog_export_svg.cpp:108
+#: eeschema/libedit/lib_edit_frame.cpp:1139
+#: pcbnew/dialogs/dialog_export_step.cpp:123
+#: pcbnew/dialogs/dialog_export_svg.cpp:108
 msgid "Export"
 msgstr "导出"
 
@@ -1117,7 +1115,7 @@ msgid ""
 msgstr "阀值将灰度图像调整为高对比度单色图像."
 
 #: bitmap2component/bitmap2cmp_gui_base.cpp:147
-#: gerbview/gerber_file_image.cpp:353
+#: gerbview/gerber_file_image.cpp:357
 msgid "Negative"
 msgstr "负片"
 
@@ -1158,46 +1156,45 @@ msgstr ""
 msgid "Bitmap to Component Converter"
 msgstr "将位图转换成元件"
 
-#: common/base_screen.cpp:188
+#: common/base_screen.cpp:197
 msgid "Custom User Grid"
 msgstr "用户自定义网络"
 
-#: common/base_screen.cpp:194
+#: common/base_screen.cpp:203
 #, c-format
 msgid "Grid: %.4f mm (%.2f mils)"
 msgstr "网格: %.4f mm (%.2f mils)"
 
-#: common/base_screen.cpp:197
+#: common/base_screen.cpp:206
 #, c-format
 msgid "Grid: %.2f mils (%.4f mm)"
 msgstr "网格: %.2f mils (%.4f mm)"
 
-#: common/base_screen.cpp:248
+#: common/base_screen.cpp:257
 #, c-format
 msgid ""
 "Grid size( %f, %f ) not in grid list, falling back to grid size( %f, %f )."
 msgstr "网格尺寸(%f, %f)不在网格列表中，回退到网格尺寸(%f, %f)。"
 
-#: common/base_screen.cpp:271
+#: common/base_screen.cpp:280
 #, c-format
 msgid "Grid ID %d not in grid list, falling back to grid size( %g, %g )."
 msgstr "网格 ID %d不在网格列表中，回退到网格尺寸(%g, %g)。"
 
-#: common/base_units.cpp:438
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:35
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:55
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:66
+#: common/base_units.cpp:438 eeschema/dialogs/dialog_set_grid_base.cpp:34
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:41
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:52
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:63
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:52
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:63
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:74
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:37
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:35
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:55
 #: eeschema/dialogs/panel_libedit_settings_base.cpp:66
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:86
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:97
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:108
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:137
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:148
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:162
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:77
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:106
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:117
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:131
 #: pcbnew/import_dxf/dialog_dxf_import_base.cpp:157
 msgid "mils"
 msgstr "mils"
@@ -1210,62 +1207,11 @@ msgstr "in"
 #: pcbnew/dialogs/dialog_create_array_base.cpp:233
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:136
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:59
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:141
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:994
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:142
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:996
 msgid "deg"
 msgstr "度"
 
-#: common/block_commande.cpp:69
-msgid "Block Move"
-msgstr "移动块"
-
-#: common/block_commande.cpp:73
-msgid "Block Drag"
-msgstr "拖动块"
-
-#: common/block_commande.cpp:77
-msgid "Drag item"
-msgstr "拖动项目"
-
-#: common/block_commande.cpp:81
-msgid "Block Duplicate"
-msgstr "块副本"
-
-#: common/block_commande.cpp:85
-msgid "Block Delete"
-msgstr "删除块"
-
-#: common/block_commande.cpp:89
-msgid "Block Copy"
-msgstr "复制 块"
-
-#: common/block_commande.cpp:93
-msgid "Block Paste"
-msgstr "粘贴块"
-
-#: common/block_commande.cpp:97 common/tool/zoom_tool.cpp:58
-#: cvpcb/display_footprints_frame.cpp:290 eeschema/lib_edit_frame.cpp:1074
-#: eeschema/schedit.cpp:517 eeschema/tool_lib.cpp:148 eeschema/tool_sch.cpp:127
-#: gerbview/events_called_functions.cpp:230 gerbview/toolbars_gerber.cpp:85
-#: pagelayout_editor/events_functions.cpp:138
-#: pagelayout_editor/toolbars_pl_editor.cpp:98 pcbnew/edit.cpp:1438
-#: pcbnew/footprint_editor_utils.cpp:964 pcbnew/tool_footprint_editor.cpp:88
-#: pcbnew/tool_pcb_editor.cpp:286
-msgid "Zoom to selection"
-msgstr "放大选取"
-
-#: common/block_commande.cpp:101
-msgid "Block Rotate"
-msgstr "旋转 块"
-
-#: common/block_commande.cpp:105
-msgid "Block Flip"
-msgstr "翻转 块"
-
-#: common/block_commande.cpp:110
-msgid "Block Mirror"
-msgstr "镜像 块"
-
 #: common/colors.cpp:39
 msgid "Black"
 msgstr "黑色"
@@ -1386,81 +1332,96 @@ msgstr "品红4"
 msgid "Yellow 4"
 msgstr "黄色4"
 
-#: common/common.cpp:352
+#: common/common.cpp:380
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
 msgstr ""
 
-#: common/common.cpp:429
+#: common/common.cpp:457
 #, c-format
 msgid "Cannot make path \"%s\" absolute with respect to \"%s\"."
 msgstr "不能设置 '%s' 为绝对路径 '%s'。"
 
-#: common/common.cpp:447
+#: common/common.cpp:475
 #, c-format
 msgid "Output directory \"%s\" created.\n"
 msgstr "输出目录 \"%s\" 已创建。\n"
 
-#: common/common.cpp:456
+#: common/common.cpp:484
 #, c-format
 msgid "Cannot create output directory \"%s\".\n"
 msgstr "无法创建输出目录 '%s'.\n"
 
-#: common/confirm.cpp:129
+#: common/confirm.cpp:62
+msgid "Do not show again"
+msgstr "不显示"
+
+#: common/confirm.cpp:128
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:234
 msgid "Message"
 msgstr "信息"
 
-#: common/confirm.cpp:130
+#: common/confirm.cpp:129
 msgid "Question"
 msgstr "问题"
 
-#: common/confirm.cpp:131 common/confirm.cpp:239 eeschema/symbedit.cpp:105
-#: eeschema/widgets/widget_eeschema_color_config.cpp:296
+#: common/confirm.cpp:130 common/confirm.cpp:251
+#: eeschema/libedit/symbedit.cpp:105
+#: eeschema/widgets/widget_eeschema_color_config.cpp:255
 #: pcbnew/dialogs/dialog_export_vrml.cpp:178
 msgid "Warning"
 msgstr "警告"
 
-#: common/confirm.cpp:132 common/confirm.cpp:251 kicad/prjconfig.cpp:303
+#: common/confirm.cpp:131 common/confirm.cpp:263 kicad/prjconfig.cpp:303
 #: pcbnew/router/length_tuner_tool.cpp:156
 msgid "Error"
 msgstr "错误"
 
-#: common/confirm.cpp:186 common/dialogs/dialog_exit_base.cpp:34
+#: common/confirm.cpp:185 common/dialogs/dialog_exit_base.cpp:34
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "如果不保存关闭，文件的所有修改将不可恢复。"
 
-#: common/confirm.cpp:187 eeschema/hotkeys.cpp:221 eeschema/libedit.cpp:404
-#: eeschema/widgets/tuner_slider_base.cpp:66 pagelayout_editor/hotkeys.cpp:98
-#: pcbnew/footprint_libraries_utils.cpp:741 pcbnew/hotkeys.cpp:291
+#: common/confirm.cpp:186 eeschema/hotkeys.cpp:226
+#: eeschema/libedit/libedit.cpp:409 eeschema/widgets/tuner_slider_base.cpp:66
+#: pagelayout_editor/hotkeys.cpp:98 pcbnew/footprint_libraries_utils.cpp:884
+#: pcbnew/hotkeys.cpp:291
 msgid "Save"
 msgstr "保存"
 
-#: common/confirm.cpp:268
+#: common/confirm.cpp:203
+msgid "Your current changes will be permanently lost."
+msgstr "你当前的更改将不可恢复。"
+
+#: common/confirm.cpp:204 eeschema/widgets/symbol_tree_pane.cpp:60
+#: eeschema/widgets/symbol_tree_pane.cpp:84 pcbnew/footprint_tree_pane.cpp:85
+msgid "Revert"
+msgstr "恢复"
+
+#: common/confirm.cpp:281
 msgid "Info"
 msgstr "信息"
 
-#: common/confirm.cpp:283 eeschema/dialogs/dialog_annotate.cpp:216
-#: eeschema/dialogs/dialog_annotate.cpp:262 eeschema/lib_export.cpp:156
-#: eeschema/pinedit.cpp:211 kicad/import_project.cpp:101
+#: common/confirm.cpp:297 eeschema/dialogs/dialog_annotate.cpp:216
+#: eeschema/dialogs/dialog_annotate.cpp:262 eeschema/libedit/lib_export.cpp:153
+#: eeschema/libedit/pinedit.cpp:218 kicad/import_project.cpp:101
 #: kicad/prjconfig.cpp:365 pcbnew/dialogs/dialog_export_idf.cpp:171
 #: pcbnew/dialogs/dialog_gencad_export_options.cpp:126
 #: pcbnew/dialogs/dialog_track_via_properties.cpp:329
-#: pcbnew/footprint_libraries_utils.cpp:490 pcbnew/router/router_tool.cpp:1008
-#: pcbnew/router/router_tool.cpp:1162 pcbnew/tools/placement_tool.cpp:242
-#: pcbnew/zone_filler.cpp:197
+#: pcbnew/footprint_libraries_utils.cpp:480
+#: pcbnew/footprint_libraries_utils.cpp:956 pcbnew/router/router_tool.cpp:1008
+#: pcbnew/router/router_tool.cpp:1156 pcbnew/zone_filler.cpp:209
 msgid "Confirmation"
 msgstr "确认"
 
 #: common/dialog_about/AboutDialog_main.cpp:114
-#: common/dialogs/dialog_configure_paths_base.cpp:96
-#: common/lib_tree_model_adapter.cpp:181 eeschema/libedit.cpp:391
-#: eeschema/libedit.cpp:775 eeschema/sch_component.cpp:1441
-#: eeschema/viewlibs.cpp:243 include/lib_table_grid.h:196
+#: common/dialogs/dialog_configure_paths_base.cpp:98
+#: common/lib_tree_model_adapter.cpp:181 eeschema/libedit/libedit.cpp:396
+#: eeschema/libedit/libedit.cpp:809 eeschema/sch_component.cpp:1474
+#: eeschema/viewlib_frame.cpp:279 include/lib_table_grid.h:196
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:44
-#: pcbnew/footprint_libraries_utils.cpp:728
-#: pcbnew/footprint_libraries_utils.cpp:921
+#: pcbnew/footprint_libraries_utils.cpp:871
+#: pcbnew/footprint_libraries_utils.cpp:1098
 msgid "Description"
 msgstr "描述"
 
@@ -1511,26 +1472,26 @@ msgid "The complete KiCad EDA Suite is released under the"
 msgstr "完整的EDA的KiCad套件发布是根据"
 
 #: common/dialog_about/AboutDialog_main.cpp:187
-msgid "GNU General Public License (GPL) version 3 or any later version"
-msgstr "GNU通用公共许可证（GPL）第3版或更高版本"
+msgid "GNU Affero General Public License (AGPL) version 3 or any later version"
+msgstr "GNU Affero 通用公共许可证（AGPL）第3版或更高版本"
 
-#: common/dialog_about/AboutDialog_main.cpp:374
+#: common/dialog_about/AboutDialog_main.cpp:379
 msgid "Others"
 msgstr "其它"
 
-#: common/dialog_about/AboutDialog_main.cpp:393
+#: common/dialog_about/AboutDialog_main.cpp:398
 msgid "Icons by"
 msgstr "图标设计"
 
-#: common/dialog_about/AboutDialog_main.cpp:411
+#: common/dialog_about/AboutDialog_main.cpp:416
 msgid "3D models by"
 msgstr "3D模型设计"
 
-#: common/dialog_about/AboutDialog_main.cpp:428
+#: common/dialog_about/AboutDialog_main.cpp:433
 msgid "Symbols by"
 msgstr "符号设计"
 
-#: common/dialog_about/AboutDialog_main.cpp:435
+#: common/dialog_about/AboutDialog_main.cpp:440
 msgid "Footprints by"
 msgstr "封装设计"
 
@@ -1562,19 +1523,19 @@ msgstr "打包"
 msgid "License"
 msgstr "许可"
 
-#: common/dialog_about/dialog_about.cpp:592
+#: common/dialog_about/dialog_about.cpp:599
 msgid "Version Info"
 msgstr "版本信息"
 
-#: common/dialog_about/dialog_about.cpp:604
+#: common/dialog_about/dialog_about.cpp:611
 msgid "Could not open clipboard to write version information."
 msgstr "无法打开剪贴板写入版本信息。"
 
-#: common/dialog_about/dialog_about.cpp:605
+#: common/dialog_about/dialog_about.cpp:612
 msgid "Clipboard Error"
 msgstr "剪贴板错误"
 
-#: common/dialog_about/dialog_about.cpp:614
+#: common/dialog_about/dialog_about.cpp:621
 msgid "Copied..."
 msgstr "复制..."
 
@@ -1610,33 +1571,85 @@ msgstr "复制KiCad版本信息到剪贴板"
 msgid "About"
 msgstr "关于"
 
-#: common/dialogs/dialog_configure_paths.cpp:208
-#: common/dialogs/dialog_configure_paths.cpp:278
+#: common/dialogs/dialog_color_picker_base.cpp:31
+msgid "RGB"
+msgstr "RGB"
+
+#: common/dialogs/dialog_color_picker_base.cpp:46
+msgid "Red:"
+msgstr "红色："
+
+#: common/dialogs/dialog_color_picker_base.cpp:50
+msgid "Green:"
+msgstr "绿色："
+
+#: common/dialogs/dialog_color_picker_base.cpp:54
+msgid "Blue:"
+msgstr "蓝色："
+
+#: common/dialogs/dialog_color_picker_base.cpp:80
+msgid "HSV"
+msgstr "HSV"
+
+#: common/dialogs/dialog_color_picker_base.cpp:97
+msgid "Hue:"
+msgstr "色相："
+
+#: common/dialogs/dialog_color_picker_base.cpp:101
+msgid "Saturation:"
+msgstr "饱和度："
+
+#: common/dialogs/dialog_color_picker_base.cpp:124
+#: eeschema/dialogs/dialog_spice_model_base.cpp:45
+#: eeschema/dialogs/dialog_spice_model_base.cpp:596
+#: pcbnew/dialogs/dialog_text_properties.cpp:91
+msgid "Value:"
+msgstr "明度："
+
+#: common/dialogs/dialog_color_picker_base.cpp:144
+#: common/dialogs/dialog_color_picker_base.h:92
+msgid "Color Picker"
+msgstr "颜色选择器"
+
+#: common/dialogs/dialog_color_picker_base.cpp:164
+msgid "Defined Colors"
+msgstr "自定义颜色"
+
+#: common/dialogs/dialog_color_picker_base.cpp:173
+msgid "Opacity:"
+msgstr "不透明度："
+
+#: common/dialogs/dialog_color_picker_base.cpp:195
+msgid "Preview (old / new):"
+msgstr "预览 (旧/新)："
+
+#: common/dialogs/dialog_configure_paths.cpp:231
+#: common/dialogs/dialog_configure_paths.cpp:301
 msgid "Environment variable name cannot be empty."
 msgstr "环境变量名称不能为空."
 
-#: common/dialogs/dialog_configure_paths.cpp:216
-#: common/dialogs/dialog_configure_paths.cpp:280
+#: common/dialogs/dialog_configure_paths.cpp:239
+#: common/dialogs/dialog_configure_paths.cpp:303
 msgid "Environment variable path cannot be empty."
 msgstr "环境变量路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:243
-#: common/dialogs/dialog_configure_paths.cpp:285
+#: common/dialogs/dialog_configure_paths.cpp:266
+#: common/dialogs/dialog_configure_paths.cpp:308
 msgid "3D search path alias cannot be empty."
 msgstr "3D搜索路径别名不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:251
-#: common/dialogs/dialog_configure_paths.cpp:287
+#: common/dialogs/dialog_configure_paths.cpp:274
+#: common/dialogs/dialog_configure_paths.cpp:310
 msgid "3D search path cannot be empty."
 msgstr "3D搜索路径不能为空。"
 
-#: common/dialogs/dialog_configure_paths.cpp:300
+#: common/dialogs/dialog_configure_paths.cpp:323
 msgid ""
 "This path was defined  externally to the running process and\n"
 "will only be temporarily overwritten."
 msgstr ""
 
-#: common/dialogs/dialog_configure_paths.cpp:302
+#: common/dialogs/dialog_configure_paths.cpp:325
 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"
@@ -1649,15 +1662,16 @@ msgstr ""
 "配置对话框将被忽略。如果你不想这样, 请重命名任何冲突\n"
 "的条目或删除系统中的外部环境变量。"
 
-#: common/dialogs/dialog_configure_paths.cpp:437
+#: common/dialogs/dialog_configure_paths.cpp:465
 msgid "File Browser..."
 msgstr "文件浏览器..."
 
-#: common/dialogs/dialog_configure_paths.cpp:440
+#: common/dialogs/dialog_configure_paths.cpp:468
+#: common/widgets/grid_text_button_helpers.cpp:316
 msgid "Select Path"
 msgstr "选择路径"
 
-#: common/dialogs/dialog_configure_paths.cpp:520
+#: common/dialogs/dialog_configure_paths.cpp:548
 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.  "
@@ -1668,7 +1682,7 @@ msgstr ""
 "为每个环境变量输入名称和路径。灰色条目为已经定义的外部系统或用户级别名称。在"
 "系统或用户级别定义的环境变量优先于该表中定义。这意味着该表中的值将被忽略。"
 
-#: common/dialogs/dialog_configure_paths.cpp:526
+#: common/dialogs/dialog_configure_paths.cpp:554
 msgid ""
 "To ensure environment variable names are valid on all platforms, the name "
 "field will only accept upper case letters, digits, and the underscore "
@@ -1677,61 +1691,15 @@ msgstr ""
 "为了确保环境变量名是在所有平台上有效的，名称字段将只接受大写字母，数字和下划"
 "线字符。"
 
-#: common/dialogs/dialog_configure_paths.cpp:529
-msgid ""
-"<b>KICAD_SYMBOL_DIR</b> is the base path of the locally installed symbol "
-"libraries."
-msgstr "<b>KICAD_SYMBOL_DIR</b> 是本地安装的符号库的基本路径。"
-
-#: common/dialogs/dialog_configure_paths.cpp:531
-msgid ""
-"<b>KIGITHUB</b> is used by KiCad to define the URL of the repository of the "
-"official KiCad footprint libraries."
-msgstr ""
-"<b><i>KIGITHUB</b></i>由 KiCad 用于定义官方 KiCad 封装库的存储库的 URL。"
-
-#: common/dialogs/dialog_configure_paths.cpp:534
-msgid ""
-"<b>KISYS3DMOD</b> is the base path of system footprint 3D shapes (.3Dshapes "
-"folders)."
-msgstr "<b>KISYS3DMOD</b>是KiCad封装3D模型的基本路径 (.3Dshapes 文件夹)."
-
-#: common/dialogs/dialog_configure_paths.cpp:537
-msgid ""
-"<b>KISYSMOD</b> is the base path of locally installed system footprint "
-"libraries (.pretty folders)."
-msgstr "<b>KISYSMOD</b> 是本地安装的封装库的基本路径 (.pretty 文件夹)."
-
-#: common/dialogs/dialog_configure_paths.cpp:540
-msgid ""
-"<b>KIPRJMOD</b> is internally defined by KiCad (cannot be edited) and is set "
-"to the absolute path of the currently loaded project file.  This environment "
-"variable can be used to define files and paths relative to the currently "
-"loaded project.  For instance, ${KIPRJMOD}/libs/footprints.pretty can be "
-"defined as a folder containing a project specific footprint library named "
-"footprints.pretty."
-msgstr ""
-"<b>KIPRJMOD</b>由KiCad的内部定义（不能被编辑），并设置为当前加载的项目文件的"
-"绝对路径。这个环境变量可以用于定义相对于当前加载的项目文件和路径。例如，$ "
-"{KIPRJMOD} /libs/footprints.pretty可以被定义为包含名为footprints.pretty特定项"
-"目封装库的文件夹。"
-
-#: common/dialogs/dialog_configure_paths.cpp:546
-msgid ""
-"<b>KICAD_PTEMPLATES</b> is optional and can be defined if you want to create "
-"your own project templates folder."
-msgstr ""
-"<b>KICAD_PTEMPLATES</b>可选定义项，可以定义你所创建的自己的项目模板文件夹。"
-
-#: common/dialogs/dialog_configure_paths.cpp:549
+#: common/dialogs/dialog_configure_paths.cpp:569
 msgid "Environment Variable Help"
 msgstr "环境变量帮助"
 
-#: common/dialogs/dialog_configure_paths_base.cpp:20
+#: common/dialogs/dialog_configure_paths_base.cpp:22
 msgid "Environment Variables"
 msgstr "环境变量"
 
-#: common/dialogs/dialog_configure_paths_base.cpp:37
+#: common/dialogs/dialog_configure_paths_base.cpp:39
 #: cvpcb/dialogs/dialog_config_equfiles_base.cpp:80
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:56
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:319
@@ -1739,26 +1707,26 @@ msgstr "环境变量"
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:74
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:45
 #: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:38
-#: eeschema/fields_grid_table.cpp:127 eeschema/lib_pin.cpp:1707
-#: eeschema/libedit.cpp:755 eeschema/sch_component.cpp:1418
-#: eeschema/sch_component.cpp:1454 eeschema/viewlibs.cpp:241
+#: eeschema/fields_grid_table.cpp:134 eeschema/lib_pin.cpp:1713
+#: eeschema/libedit/libedit.cpp:789 eeschema/sch_component.cpp:1451
+#: eeschema/sch_component.cpp:1487 eeschema/viewlib_frame.cpp:278
 #: eeschema/widgets/tuner_slider_base.cpp:20
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:43
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:97
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:69
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:48
 msgid "Name"
 msgstr "名称"
 
-#: common/dialogs/dialog_configure_paths_base.cpp:38
-#: common/dialogs/dialog_configure_paths_base.cpp:95
+#: common/dialogs/dialog_configure_paths_base.cpp:40
+#: common/dialogs/dialog_configure_paths_base.cpp:97
 msgid "Path"
 msgstr "路径"
 
-#: common/dialogs/dialog_configure_paths_base.cpp:76
+#: common/dialogs/dialog_configure_paths_base.cpp:78
 msgid "3D Search Paths"
 msgstr "3D搜索路径"
 
-#: common/dialogs/dialog_configure_paths_base.cpp:94 eeschema/viewlibs.cpp:242
+#: common/dialogs/dialog_configure_paths_base.cpp:96
 msgid "Alias"
 msgstr "别名"
 
@@ -1774,6 +1742,10 @@ msgstr "应用于全部"
 msgid "Discard Changes"
 msgstr "放弃更改"
 
+#: common/dialogs/dialog_hotkey_list.cpp:34
+msgid "Hotkey List"
+msgstr "快捷键列表"
+
 #: common/dialogs/dialog_image_editor.cpp:137
 msgid "Incorrect scale number"
 msgstr "错误的比例数值"
@@ -1797,8 +1769,8 @@ msgstr "X轴镜像"
 msgid "Mirror Y"
 msgstr "Y轴镜像"
 
-#: common/dialogs/dialog_image_editor_base.cpp:39 pcbnew/onrightclick.cpp:942
-#: pcbnew/tools/edit_tool.cpp:693
+#: common/dialogs/dialog_image_editor_base.cpp:39 pcbnew/onrightclick.cpp:940
+#: pcbnew/tools/edit_tool.cpp:680
 msgid "Rotate"
 msgstr "旋转"
 
@@ -1888,31 +1860,31 @@ msgstr "USLedger 11x17in"
 msgid "User (Custom)"
 msgstr "用户设置（自定义）"
 
-#: common/dialogs/dialog_page_settings.cpp:272
-#: common/dialogs/dialog_page_settings.cpp:690
+#: common/dialogs/dialog_page_settings.cpp:274
+#: common/dialogs/dialog_page_settings.cpp:692
 #: common/dialogs/dialog_page_settings_base.cpp:46
 msgid "Portrait"
 msgstr "纵向"
 
-#: common/dialogs/dialog_page_settings.cpp:432
+#: common/dialogs/dialog_page_settings.cpp:434
 #, c-format
 msgid "Page layout description file \"%s\" not found."
 msgstr "未找到页面布局描述文件 \"%s\" 。"
 
-#: common/dialogs/dialog_page_settings.cpp:506
+#: common/dialogs/dialog_page_settings.cpp:508
 msgid "the translation for paper size must preserve original spellings"
 msgstr "纸张尺寸的翻译必须保留原始拼写"
 
-#: common/dialogs/dialog_page_settings.cpp:692
+#: common/dialogs/dialog_page_settings.cpp:694
 #: common/dialogs/dialog_page_settings_base.cpp:46
 msgid "Landscape"
 msgstr "横向"
 
-#: common/dialogs/dialog_page_settings.cpp:772
+#: common/dialogs/dialog_page_settings.cpp:774
 msgid "Select Page Layout Description File"
 msgstr "选择页面布局描述文件"
 
-#: common/dialogs/dialog_page_settings.cpp:789
+#: common/dialogs/dialog_page_settings.cpp:791
 #, c-format
 msgid ""
 "The page layout description file name has changed.\n"
@@ -1937,7 +1909,7 @@ msgstr "虚拟文本"
 
 #: common/dialogs/dialog_page_settings_base.cpp:42
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:86
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:130
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:131
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:146
 msgid "Orientation:"
 msgstr "方向："
@@ -1965,9 +1937,9 @@ msgstr "自定义图纸高度."
 #: pcbnew/dialogs/dialog_drc_base.cpp:86
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:126
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:137
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:326
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:339
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:352
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:332
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:345
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:358
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:234
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:247
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:260
@@ -1976,15 +1948,15 @@ msgstr "自定义图纸高度."
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:182
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:200
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:229
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:830
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:841
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:856
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:867
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:881
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:904
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:969
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:980
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1145
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:832
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:843
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:858
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:869
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:883
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:906
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:971
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:982
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1147
 #: 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
@@ -2091,16 +2063,16 @@ msgid "Page Settings"
 msgstr "页面设置"
 
 #: common/dialogs/dialog_text_entry_base.cpp:22
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:500
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1172
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:506
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1174
 msgid "MyLabel"
 msgstr "标签"
 
-#: common/dialogs/panel_common_settings.cpp:162
+#: common/dialogs/panel_common_settings.cpp:169
 msgid "Executable files ("
 msgstr "可执行文件（"
 
-#: common/dialogs/panel_common_settings.cpp:167
+#: common/dialogs/panel_common_settings.cpp:174
 msgid "Select Preferred PDF Browser"
 msgstr "选择默认PDF浏览器"
 
@@ -2117,97 +2089,141 @@ msgid "File history size:"
 msgstr "文件历史大小："
 
 #: common/dialogs/panel_common_settings_base.cpp:52
+msgid "Graphics acceleration:"
+msgstr "图形加速："
+
+#: common/dialogs/panel_common_settings_base.cpp:56
+msgid "No Antialiasing"
+msgstr "无抗锯齿"
+
+#: common/dialogs/panel_common_settings_base.cpp:56
+msgid "Subpixel Antialiasing (High Quality)"
+msgstr "亚像素抗锯齿（高质量）"
+
+#: common/dialogs/panel_common_settings_base.cpp:56
+msgid "Subpixel Antialiasing (Ultra Quality)"
+msgstr "亚像素抗锯齿（超质量）"
+
+#: common/dialogs/panel_common_settings_base.cpp:56
+msgid "Supersampling (2x)"
+msgstr "超级采样(2X)"
+
+#: common/dialogs/panel_common_settings_base.cpp:56
+msgid "Supersampling (4x)"
+msgstr "超级采样(4x)"
+
+#: common/dialogs/panel_common_settings_base.cpp:71
+msgid "Helper Applications"
+msgstr "应用程序助手"
+
+#: common/dialogs/panel_common_settings_base.cpp:80
 msgid "Text editor:"
 msgstr "文本编辑器："
 
-#: common/dialogs/panel_common_settings_base.cpp:67
+#: common/dialogs/panel_common_settings_base.cpp:95
 msgid "System default PDF viewer"
 msgstr "系统默认PDF浏览器"
 
-#: common/dialogs/panel_common_settings_base.cpp:70
+#: common/dialogs/panel_common_settings_base.cpp:98
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:167
 msgid "Other:"
 msgstr "其它:"
 
-#: common/dialogs/panel_common_settings_base.cpp:90
+#: common/dialogs/panel_common_settings_base.cpp:121
 msgid "User Interface"
 msgstr "用户界面"
 
-#: common/dialogs/panel_common_settings_base.cpp:98
+#: common/dialogs/panel_common_settings_base.cpp:129
 msgid "Icon scale:"
 msgstr "图标比例:"
 
-#: common/dialogs/panel_common_settings_base.cpp:105
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:365
+#: common/dialogs/panel_common_settings_base.cpp:141
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:371
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:273
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:213
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:214
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:453
 #: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp:151
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:101
 msgid "%"
 msgstr "%"
 
-#: common/dialogs/panel_common_settings_base.cpp:112
-#: pcbnew/dialogs/dialog_plot_base.cpp:129
-msgid "Auto"
+#: common/dialogs/panel_common_settings_base.cpp:148
+msgid "Automatic"
 msgstr "自动"
 
-#: common/dialogs/panel_common_settings_base.cpp:124
+#: common/dialogs/panel_common_settings_base.cpp:157
 msgid "Show icons in menus"
 msgstr "在菜单中显示图标"
 
-#: common/dialogs/panel_common_settings_base.cpp:131
+#: common/dialogs/panel_common_settings_base.cpp:164
 msgid "Pan and Zoom"
 msgstr "平移和缩放"
 
-#: common/dialogs/panel_common_settings_base.cpp:133
+#: common/dialogs/panel_common_settings_base.cpp:166
 msgid "Ce&nter and warp cursor on zoom"
 msgstr "缩放时光标居中 (&N)"
 
-#: common/dialogs/panel_common_settings_base.cpp:134
-#: cvpcb/dialogs/dialog_display_options_base.cpp:44
+#: common/dialogs/panel_common_settings_base.cpp:167
 msgid "Center the cursor on screen when zooming."
 msgstr "缩放时将光标居中在屏幕上。"
 
-#: common/dialogs/panel_common_settings_base.cpp:138
-#: cvpcb/dialogs/dialog_display_options_base.cpp:48
+#: common/dialogs/panel_common_settings_base.cpp:171
 msgid "Use touchpad to pan"
 msgstr "使用触摸板平移"
 
-#: common/dialogs/panel_common_settings_base.cpp:139
-#: cvpcb/dialogs/dialog_display_options_base.cpp:49
+#: common/dialogs/panel_common_settings_base.cpp:172
 msgid ""
 "Enable touchpad-friendly controls (pan with scroll action, zoom with Ctrl"
 "+scroll)."
 msgstr "启用触摸板友好控制(平移滚动动作，使用Ctrl +滚动缩放)"
 
-#: common/dialogs/panel_common_settings_base.cpp:143
+#: common/dialogs/panel_common_settings_base.cpp:176
 msgid "&Pan while moving object"
 msgstr "平移同时移动物体（&P）"
 
-#: common/dialogs/panel_common_settings_base.cpp:144
-#: cvpcb/dialogs/dialog_display_options_base.cpp:54
+#: common/dialogs/panel_common_settings_base.cpp:177
 msgid ""
 "When drawing a track or moving an item, pan when approaching the edge of the "
 "display."
 msgstr "当绘制布线或移动项目时， 在接近显示器边缘时平移。"
 
-#: common/dialogs/panel_hotkeys_editor_base.cpp:27
+#: common/dialogs/panel_hotkeys_editor.cpp:81
+msgid "Type filter text"
+msgstr "过滤器文本框"
+
+#: common/dialogs/panel_hotkeys_editor.cpp:106
 msgid "Reset Hotkeys"
 msgstr "重置快捷键"
 
-#: common/dialogs/panel_hotkeys_editor_base.cpp:30
+#: common/dialogs/panel_hotkeys_editor.cpp:107
+msgid "Undo all changes made so far in this dialog"
+msgstr "在此对话框中撤消到目前为止所做的所有更改"
+
+#: common/dialogs/panel_hotkeys_editor.cpp:114
 msgid "Set to Defaults"
 msgstr "设置为默认值"
 
-#: common/dialogs/panel_hotkeys_editor_base.cpp:36
+#: common/dialogs/panel_hotkeys_editor.cpp:115
+msgid "Set all hotkeys to the built-in KiCad defaults"
+msgstr "将所有快捷键设置为内置的KiCad默认值"
+
+#: common/dialogs/panel_hotkeys_editor.cpp:125
 msgid "Import..."
 msgstr "导入..."
 
-#: common/dialogs/panel_hotkeys_editor_base.cpp:39
+#: common/dialogs/panel_hotkeys_editor.cpp:126
+msgid ""
+"Import hotkey definitions from an external file, replacing the current values"
+msgstr "从外部文件导入快捷键定义，来替换当前值。"
+
+#: common/dialogs/panel_hotkeys_editor.cpp:133
 msgid "Export..."
 msgstr "导出..."
 
+#: common/dialogs/panel_hotkeys_editor.cpp:134
+msgid "Export these hotkey definitions to an external file"
+msgstr "将这些快捷键定义导出到外部文件"
+
 #: common/dialogs/wx_html_report_panel.cpp:245
 #: common/dialogs/wx_html_report_panel.cpp:272
 msgid "Error: "
@@ -2245,12 +2261,12 @@ msgid "Show:"
 msgstr "显示："
 
 #: common/dialogs/wx_html_report_panel_base.cpp:35
-#: eeschema/lib_draw_item.cpp:66 eeschema/lib_draw_item.cpp:73
+#: eeschema/lib_draw_item.cpp:65 eeschema/lib_draw_item.cpp:72
 msgid "All"
 msgstr "所有"
 
-#: common/dialogs/wx_html_report_panel_base.cpp:42 gerbview/files.cpp:306
-#: gerbview/files.cpp:423 gerbview/readgerb.cpp:69
+#: common/dialogs/wx_html_report_panel_base.cpp:42 gerbview/files.cpp:332
+#: gerbview/files.cpp:449 gerbview/readgerb.cpp:69
 msgid "Errors"
 msgstr "错误"
 
@@ -2271,49 +2287,9 @@ msgid "Save..."
 msgstr "保存..."
 
 #: common/displlst.cpp:58 common/widgets/lib_tree.cpp:123
-#: common/widgets/net_selector.cpp:60
 msgid "Filter"
 msgstr "过滤"
 
-#: common/draw_frame.cpp:200 common/draw_frame.cpp:586
-#: gerbview/dialogs/panel_gerbview_settings_base.cpp:28
-#: pagelayout_editor/pl_editor_frame.cpp:120
-#: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:58
-#: pcbnew/dialogs/dialog_gendrill_base.cpp:100
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:65
-#: pcbnew/dialogs/panel_modedit_settings_base.cpp:31
-#: pcbnew/dialogs/panel_pcbnew_settings_base.cpp:31
-msgid "Inches"
-msgstr "英寸"
-
-#: common/draw_frame.cpp:433 cvpcb/display_footprints_frame.cpp:222
-#: pcbnew/tool_footprint_editor.cpp:189 pcbnew/tool_pcb_editor.cpp:351
-msgid "Hide grid"
-msgstr "隐藏网格"
-
-#: common/draw_frame.cpp:433
-msgid "Show grid"
-msgstr "显示网格"
-
-#: common/draw_frame.cpp:594
-#: gerbview/dialogs/panel_gerbview_settings_base.cpp:30
-#: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:60
-#: pcbnew/dialogs/panel_modedit_settings_base.cpp:33
-#: pcbnew/dialogs/panel_pcbnew_settings_base.cpp:33
-#: pcbnew/footprint_wizard_frame.cpp:389
-msgid "Units"
-msgstr "单位"
-
-#: common/draw_frame.cpp:1419 eeschema/dialogs/panel_sym_lib_table.cpp:340
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:585
-#: pcbnew/footprint_libraries_utils.cpp:74
-msgid "Select Library"
-msgstr "选择库"
-
-#: common/draw_frame.cpp:1419
-msgid "New Library"
-msgstr "新建库"
-
 #: common/dsnlexer.cpp:39
 msgid "clipboard"
 msgstr "剪贴板"
@@ -2386,33 +2362,33 @@ msgstr "参与KiCad"
 msgid "Preferences"
 msgstr "首选项"
 
-#: common/eda_base_frame.cpp:519 eeschema/hotkeys.cpp:343
+#: common/eda_base_frame.cpp:519 eeschema/hotkeys.cpp:364
 #: pagelayout_editor/hotkeys.cpp:126
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:20
-#: pcbnew/hotkeys.cpp:503
+#: pcbnew/hotkeys.cpp:509
 msgid "Common"
 msgstr "常规"
 
-#: common/eda_base_frame.cpp:520
+#: common/eda_base_frame.cpp:521
 msgid "Hotkeys"
 msgstr "快捷键"
 
-#: common/eda_base_frame.cpp:560
+#: common/eda_base_frame.cpp:561
 #, c-format
 msgid "You do not have write permissions to folder \"%s\"."
 msgstr "你没有文件夹写入权限<%s>。"
 
-#: common/eda_base_frame.cpp:565
+#: common/eda_base_frame.cpp:566
 #, c-format
 msgid "You do not have write permissions to save file \"%s\" to folder \"%s\"."
 msgstr "你没有写入权限保存文件 <%s> 到文件夹 <%s>."
 
-#: common/eda_base_frame.cpp:570
+#: common/eda_base_frame.cpp:571
 #, c-format
 msgid "You do not have write permissions to save file \"%s\"."
 msgstr "你没有写入权限来保存文件 \"%s\"。"
 
-#: common/eda_base_frame.cpp:602
+#: common/eda_base_frame.cpp:603
 #, c-format
 msgid ""
 "Well this is potentially embarrassing!\n"
@@ -2426,12 +2402,12 @@ msgstr ""
 "\"%s\"\n"
 "它没有正确保存, 你是否希望恢复上次保存的修改内容？"
 
-#: common/eda_base_frame.cpp:630
+#: common/eda_base_frame.cpp:631
 #, c-format
 msgid "Could not create backup file \"%s\""
 msgstr "不能创建备份文件 \"%s\""
 
-#: common/eda_base_frame.cpp:638
+#: common/eda_base_frame.cpp:639
 msgid "The auto save file could not be renamed to the board file name."
 msgstr "自动保存文件不能重命名为电路板文件名称."
 
@@ -2457,25 +2433,25 @@ msgstr " X:"
 msgid " Y:"
 msgstr " Y:"
 
-#: common/eda_text.cpp:391 eeschema/dialogs/dialog_edit_label_base.cpp:87
-#: eeschema/libedit.cpp:765 eeschema/sch_text.cpp:662
-#: gerbview/gerber_file_image.cpp:353 gerbview/gerber_file_image.cpp:357
-#: gerbview/gerber_file_image.cpp:360 pcbnew/class_module.cpp:613
+#: common/eda_text.cpp:392 eeschema/dialogs/dialog_edit_label_base.cpp:87
+#: eeschema/libedit/libedit.cpp:799 eeschema/sch_text.cpp:595
+#: gerbview/gerber_file_image.cpp:357 gerbview/gerber_file_image.cpp:361
+#: gerbview/gerber_file_image.cpp:364 pcbnew/class_module.cpp:619
 #: pcbnew/microwave.cpp:466
 msgid "Normal"
 msgstr "标准"
 
-#: common/eda_text.cpp:392
+#: common/eda_text.cpp:393
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:61
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:324
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:53
 #: eeschema/dialogs/dialog_edit_label_base.cpp:87
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:80
-#: eeschema/fields_grid_table.cpp:132 eeschema/sch_text.cpp:662
+#: eeschema/fields_grid_table.cpp:139 eeschema/sch_text.cpp:595
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:105
 #: 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:187
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:190
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:172
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:108
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:119
@@ -2484,21 +2460,87 @@ msgstr "标准"
 msgid "Italic"
 msgstr "斜体"
 
-#: common/eda_text.cpp:393
+#: common/eda_text.cpp:394
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:62
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:325
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:54
 #: eeschema/dialogs/dialog_edit_label_base.cpp:87
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:110
-#: eeschema/fields_grid_table.cpp:133 eeschema/sch_text.cpp:662
+#: eeschema/fields_grid_table.cpp:140 eeschema/sch_text.cpp:595
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:92
 msgid "Bold"
 msgstr "加粗"
 
-#: common/eda_text.cpp:394
+#: common/eda_text.cpp:395
 msgid "Bold+Italic"
 msgstr "粗体+斜体"
 
+#: common/env_vars.cpp:70
+msgid ""
+"The base path of locally installed system footprint libraries (.pretty "
+"folders)."
+msgstr "本地安装的封装库的基本路径 (.pretty 文件夹)."
+
+#: common/env_vars.cpp:73
+msgid "The base path of system footprint 3D shapes (.3Dshapes folders)."
+msgstr "KiCad封装3D模型的基本路径 (.3Dshapes 文件夹)."
+
+#: common/env_vars.cpp:75
+msgid "The base path of the locally installed symbol libraries."
+msgstr "本地安装的符号库的基本路径。"
+
+#: common/env_vars.cpp:77
+msgid ""
+"Used by KiCad to define the URL of the repository of the official KiCad "
+"footprint libraries."
+msgstr "由 KiCad 用于定义官方 KiCad 封装库的存储库的 URL。"
+
+#: common/env_vars.cpp:80
+#, fuzzy
+#| msgid ""
+#| "<b>KICAD_TEMPLATE_DIR</b> is required and is the path containing the "
+#| "project templates installed with KiCad."
+msgid "A directory containing project templates installed with KiCad."
+msgstr ""
+"<b>KICAD_TEMPLATE_DIR</b>是必需的，并且是包含与KiCad一起安装的项目模板的路"
+"径。"
+
+#: common/env_vars.cpp:82
+#, fuzzy
+#| msgid ""
+#| "<b>KICAD_PTEMPLATES</b> is optional and can be defined if you want to "
+#| "create your own project templates folder."
+msgid ""
+"Optional. Can be defined if you want to create your own project templates "
+"folder."
+msgstr ""
+"<b>KICAD_PTEMPLATES</b>可选定义项，可以定义你所创建的自己的项目模板文件夹。"
+
+#: common/env_vars.cpp:85
+#, fuzzy
+#| msgid ""
+#| "<b>KIPRJMOD</b> is internally defined by KiCad (cannot be edited) and is "
+#| "set to the absolute path of the currently loaded project file.  This "
+#| "environment variable can be used to define files and paths relative to "
+#| "the currently loaded project.  For instance, ${KIPRJMOD}/libs/footprints."
+#| "pretty can be defined as a folder containing a project specific footprint "
+#| "library named footprints.pretty."
+msgid ""
+"Internally defined by KiCad (cannot be edited) and is set to the absolute "
+"path of the currently loaded project file.  This environment variable can be "
+"used to define files and paths relative to the currently loaded project.  "
+"For instance, ${KIPRJMOD}/libs/footprints.pretty can be defined as a folder "
+"containing a project specific footprint library named footprints.pretty."
+msgstr ""
+"<b>KIPRJMOD</b>由KiCad的内部定义（不能被编辑），并设置为当前加载的项目文件的"
+"绝对路径。这个环境变量可以用于定义相对于当前加载的项目文件和路径。例如，$ "
+"{KIPRJMOD} /libs/footprints.pretty可以被定义为包含名为footprints.pretty特定项"
+"目封装库的文件夹。"
+
+#: common/env_vars.cpp:93
+msgid "Deprecated version of KICAD_TEMPLATE_DIR."
+msgstr ""
+
 #: common/exceptions.cpp:29
 #, c-format
 msgid "from %s : %s() line:%d"
@@ -2581,7 +2623,7 @@ msgstr "无法打开配置文件"
 msgid "Problems writing configuration file"
 msgstr "问题写入配置文件"
 
-#: common/footprint_info.cpp:91 cvpcb/cvpcb_mainframe.cpp:755
+#: common/footprint_info.cpp:91 cvpcb/cvpcb_mainframe.cpp:758
 msgid "Load Error"
 msgstr "载入错误"
 
@@ -2601,7 +2643,7 @@ msgstr "找到重复的库别名 \"%s\" 在封装库表文件行 %d 中"
 msgid "fp-lib-table files contain no library with nickname \"%s\""
 msgstr "fp-lib-table 文件不包含 '%s' 别名"
 
-#: common/fp_lib_table.cpp:458
+#: common/fp_lib_table.cpp:472
 #: eeschema/dialogs/dialog_global_sym_lib_table_config.cpp:138
 #: eeschema/symbol_lib_table.cpp:486
 #, c-format
@@ -2627,47 +2669,43 @@ msgstr ""
 msgid "Unable to find a PDF viewer for \"%s\""
 msgstr "没有找到PDF浏览器 <%s>"
 
-#: common/grid_tricks.cpp:186
+#: common/grid_tricks.cpp:239
 msgid "Cut\tCTRL+X"
 msgstr "剪切\tCTRL+X"
 
-#: common/grid_tricks.cpp:186
+#: common/grid_tricks.cpp:239
 msgid "Clear selected cells placing original contents on clipboard"
 msgstr "清除选中的单元格，原始内容保存到剪贴板"
 
-#: common/grid_tricks.cpp:187
+#: common/grid_tricks.cpp:240
 msgid "Copy\tCTRL+C"
 msgstr "复制\tCTRL+C"
 
-#: common/grid_tricks.cpp:187
+#: common/grid_tricks.cpp:240
 msgid "Copy selected cells to clipboard"
 msgstr "复制选择单元到剪贴板"
 
-#: common/grid_tricks.cpp:188
+#: common/grid_tricks.cpp:241
 msgid "Paste\tCTRL+V"
 msgstr "粘贴\tCTRL+V"
 
-#: common/grid_tricks.cpp:188
+#: common/grid_tricks.cpp:241
 msgid "Paste clipboard cells to matrix at current cell"
 msgstr "在当前单元格粘贴剪贴板中的内容"
 
-#: common/grid_tricks.cpp:189
+#: common/grid_tricks.cpp:242
 msgid "Select All\tCTRL+A"
 msgstr "全选\tCTRL+A"
 
-#: common/grid_tricks.cpp:189
+#: common/grid_tricks.cpp:242
 msgid "Select all cells"
 msgstr "选择所有单元"
 
-#: common/hotkeys_basic.cpp:456 common/hotkeys_basic.cpp:486
-msgid "Hotkeys List"
-msgstr "快捷键列表"
-
-#: common/hotkeys_basic.cpp:760
+#: common/hotkeys_basic.cpp:720
 msgid "Read Hotkey Configuration File:"
 msgstr "导入快捷键配置："
 
-#: common/hotkeys_basic.cpp:792
+#: common/hotkeys_basic.cpp:752
 msgid "Write Hotkey Configuration File:"
 msgstr "导出快捷键配置："
 
@@ -2709,6 +2747,185 @@ msgstr ""
 "从命令行: argv[0]:\n"
 "'"
 
+#: common/legacy_gal/block.cpp:71 common/legacy_wx/block.cpp:69
+msgid "Block Move"
+msgstr "移动块"
+
+#: common/legacy_gal/block.cpp:75 common/legacy_wx/block.cpp:73
+msgid "Block Drag"
+msgstr "拖动块"
+
+#: common/legacy_gal/block.cpp:79 common/legacy_wx/block.cpp:77
+msgid "Drag item"
+msgstr "拖动项目"
+
+#: common/legacy_gal/block.cpp:83 common/legacy_wx/block.cpp:81
+msgid "Block Duplicate"
+msgstr "块副本"
+
+#: common/legacy_gal/block.cpp:87 common/legacy_wx/block.cpp:85
+msgid "Block Delete"
+msgstr "删除块"
+
+#: common/legacy_gal/block.cpp:91 common/legacy_wx/block.cpp:89
+msgid "Block Copy"
+msgstr "复制 块"
+
+#: common/legacy_gal/block.cpp:95 common/legacy_wx/block.cpp:93
+msgid "Block Paste"
+msgstr "粘贴块"
+
+#: common/legacy_gal/block.cpp:99 common/legacy_wx/block.cpp:97
+#: common/tool/zoom_tool.cpp:58 cvpcb/display_footprints_frame.cpp:299
+#: eeschema/libedit/lib_edit_frame.cpp:1086 eeschema/libedit/tool_lib.cpp:148
+#: eeschema/schedit.cpp:507 eeschema/tool_sch.cpp:128
+#: gerbview/events_called_functions.cpp:231 gerbview/toolbars_gerber.cpp:89
+#: pagelayout_editor/events_functions.cpp:138
+#: pagelayout_editor/toolbars_pl_editor.cpp:98 pcbnew/edit.cpp:1437
+#: pcbnew/footprint_editor_utils.cpp:930 pcbnew/tool_footprint_editor.cpp:88
+#: pcbnew/tool_pcb_editor.cpp:286
+msgid "Zoom to selection"
+msgstr "放大选取"
+
+#: common/legacy_gal/block.cpp:103 common/legacy_wx/block.cpp:101
+msgid "Block Flip"
+msgstr "翻转 块"
+
+#: common/legacy_gal/eda_draw_frame.cpp:210
+#: common/legacy_gal/eda_draw_frame.cpp:595
+#: common/legacy_wx/eda_draw_frame.cpp:212
+#: common/legacy_wx/eda_draw_frame.cpp:605
+#: gerbview/dialogs/panel_gerbview_settings_base.cpp:28
+#: pagelayout_editor/pl_editor_frame.cpp:120
+#: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:58
+#: pcbnew/dialogs/dialog_gendrill_base.cpp:100
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:65
+#: pcbnew/dialogs/panel_modedit_settings_base.cpp:31
+#: pcbnew/dialogs/panel_pcbnew_settings_base.cpp:31
+msgid "Inches"
+msgstr "英寸"
+
+#: common/legacy_gal/eda_draw_frame.cpp:448
+#: common/legacy_wx/eda_draw_frame.cpp:452
+#: cvpcb/display_footprints_frame.cpp:231 pcbnew/tool_footprint_editor.cpp:201
+#: pcbnew/tool_pcb_editor.cpp:351
+msgid "Hide grid"
+msgstr "隐藏网格"
+
+#: common/legacy_gal/eda_draw_frame.cpp:448
+#: common/legacy_wx/eda_draw_frame.cpp:452
+msgid "Show grid"
+msgstr "显示网格"
+
+#: common/legacy_gal/eda_draw_frame.cpp:597
+#: common/legacy_wx/eda_draw_frame.cpp:613
+#: gerbview/dialogs/panel_gerbview_settings_base.cpp:30
+#: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:60
+#: pcbnew/dialogs/panel_modedit_settings_base.cpp:33
+#: pcbnew/dialogs/panel_pcbnew_settings_base.cpp:33
+#: pcbnew/footprint_wizard_frame.cpp:393
+msgid "Units"
+msgstr "单位"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1501
+#: common/legacy_wx/eda_draw_frame.cpp:1801 common/tool/actions.cpp:32
+#: common/widgets/mathplot.cpp:1792
+#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:120
+#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:150
+#: eeschema/fields_grid_table.cpp:90 eeschema/fields_grid_table.cpp:98
+#: eeschema/fields_grid_table.cpp:299 eeschema/fields_grid_table.cpp:312
+#: eeschema/fields_grid_table.cpp:385 eeschema/fields_grid_table.cpp:396
+#: gerbview/gerber_file_image.cpp:361 gerbview/gerber_file_image.cpp:364
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:86
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:99
+#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:90
+#: pcbnew/dialogs/dialog_text_properties_base.cpp:129
+msgid "Center"
+msgstr "居中"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1503
+#: common/legacy_wx/eda_draw_frame.cpp:1803 common/tool/actions.cpp:16
+#: common/widgets/mathplot.cpp:1794 eeschema/hotkeys.cpp:106
+#: eeschema/hotkeys.cpp:108 eeschema/sim/sim_plot_frame_base.cpp:77
+#: gerbview/hotkeys.cpp:65 pagelayout_editor/hotkeys.cpp:80
+#: pagelayout_editor/menubar.cpp:122 pcbnew/hotkeys.cpp:214
+#: pcbnew/hotkeys.cpp:216
+msgid "Zoom In"
+msgstr "放大"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1505
+#: common/legacy_wx/eda_draw_frame.cpp:1805 common/tool/actions.cpp:20
+#: common/widgets/mathplot.cpp:1795 eeschema/hotkeys.cpp:113
+#: eeschema/hotkeys.cpp:115 eeschema/sim/sim_plot_frame_base.cpp:81
+#: gerbview/hotkeys.cpp:64 pagelayout_editor/hotkeys.cpp:79
+#: pagelayout_editor/menubar.cpp:125 pcbnew/hotkeys.cpp:221
+#: pcbnew/hotkeys.cpp:223
+msgid "Zoom Out"
+msgstr "缩小"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1507
+#: common/legacy_wx/eda_draw_frame.cpp:1807 pagelayout_editor/menubar.cpp:146
+msgid "Redraw View"
+msgstr "刷新视图"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1509
+#: common/legacy_wx/eda_draw_frame.cpp:1809 pagelayout_editor/menubar.cpp:128
+msgid "Zoom to Fit"
+msgstr "缩放至适合大小"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1515
+#: common/legacy_wx/eda_draw_frame.cpp:1815 common/tool/zoom_menu.cpp:39
+msgid "Zoom"
+msgstr "缩放"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1528
+#: common/legacy_wx/eda_draw_frame.cpp:1828
+msgid "Zoom: "
+msgstr "放大： "
+
+#: common/legacy_gal/eda_draw_frame.cpp:1539
+#: common/legacy_wx/eda_draw_frame.cpp:1839 common/tool/grid_menu.cpp:40
+#: eeschema/widgets/widget_eeschema_color_config.cpp:97
+#: gerbview/gerbview_layer_widget.cpp:119 pcbnew/pcb_layer_widget.cpp:91
+msgid "Grid"
+msgstr "网格"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1555
+#: common/legacy_wx/eda_draw_frame.cpp:1855
+#: eeschema/dialogs/dialog_annotate.cpp:116 eeschema/dialogs/dialog_bom.cpp:238
+#: eeschema/dialogs/dialog_erc.cpp:93
+#: eeschema/dialogs/dialog_netlist_base.cpp:49
+#: eeschema/dialogs/dialog_plot_schematic.cpp:81
+#: eeschema/dialogs/dialog_print_using_printer.cpp:156
+#: eeschema/dialogs/dialog_schematic_find_base.cpp:134
+#: eeschema/dialogs/dialog_symbol_remap_base.cpp:33
+#: gerbview/dialogs/dialog_print_using_printer_base.cpp:107
+#: pcbnew/dialogs/dialog_drc.cpp:108
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:140
+#: pcbnew/dialogs/dialog_export_step.cpp:122
+#: pcbnew/dialogs/dialog_export_svg.cpp:109
+#: pcbnew/dialogs/dialog_find_base.cpp:46 pcbnew/dialogs/dialog_gendrill.cpp:88
+#: pcbnew/dialogs/dialog_netlist.cpp:102 pcbnew/dialogs/dialog_plot.cpp:55
+#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:57
+#: pcbnew/dialogs/dialog_print_using_printer.cpp:149
+#: pcbnew/dialogs/dialog_update_pcb.cpp:77
+#: pcbnew/exporters/gen_footprints_placefile.cpp:109
+msgid "Close"
+msgstr "关闭"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1766
+#: common/legacy_wx/eda_draw_frame.cpp:1438
+#: eeschema/dialogs/panel_sym_lib_table.cpp:344
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:608
+#: pcbnew/footprint_libraries_utils.cpp:77
+msgid "Select Library"
+msgstr "选择库"
+
+#: common/legacy_gal/eda_draw_frame.cpp:1766
+#: common/legacy_wx/eda_draw_frame.cpp:1438
+msgid "New Library"
+msgstr "新建库"
+
 #: common/lib_id.cpp:284
 msgid "Illegal character found in logical library name"
 msgstr "在逻辑库名称找到无效字符"
@@ -2717,8 +2934,8 @@ msgstr "在逻辑库名称找到无效字符"
 msgid "Illegal character found in revision"
 msgstr "在修订版本找到无效字符"
 
-#: common/lib_tree_model.cpp:136 eeschema/lib_draw_item.cpp:70
-#: eeschema/libedit.cpp:760 eeschema/onrightclick.cpp:491
+#: common/lib_tree_model.cpp:136 eeschema/lib_draw_item.cpp:69
+#: eeschema/libedit/libedit.cpp:794 eeschema/onrightclick.cpp:504
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:36
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:47
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:58
@@ -2728,17 +2945,17 @@ msgstr "在修订版本找到无效字符"
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:102
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:113
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:147
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:59
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:70
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:81
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:92
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:105
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:116
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:172
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:183
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:196
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:207
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:218
+#: 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
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:89
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:102
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:113
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:169
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:180
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:193
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:204
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:215
 msgid "Unit"
 msgstr "单位"
 
@@ -2746,7 +2963,7 @@ msgstr "单位"
 msgid "Item"
 msgstr "项目"
 
-#: common/marker_base.cpp:212
+#: common/marker_base.cpp:189
 msgid "Marker Info"
 msgstr "标记信息"
 
@@ -2755,123 +2972,123 @@ msgstr "标记信息"
 msgid "The file \"%s\" was not fully read"
 msgstr "文件\"%s\"没有被完全读取"
 
-#: common/pgm_base.cpp:122 common/widgets/footprint_select_widget.cpp:231
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:176
+#: common/pgm_base.cpp:125 common/widgets/footprint_select_widget.cpp:231
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:179
 #: eeschema/dialogs/dialog_edit_line_style.cpp:40
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:62
 msgid "Default"
 msgstr "默认"
 
-#: common/pgm_base.cpp:124
+#: common/pgm_base.cpp:127
 msgid "French"
 msgstr "法语"
 
-#: common/pgm_base.cpp:125
+#: common/pgm_base.cpp:128
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: common/pgm_base.cpp:126
+#: common/pgm_base.cpp:129
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: common/pgm_base.cpp:127
+#: common/pgm_base.cpp:130
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: common/pgm_base.cpp:128
+#: common/pgm_base.cpp:131
 msgid "Italian"
 msgstr "意大利语"
 
-#: common/pgm_base.cpp:129
+#: common/pgm_base.cpp:132
 msgid "German"
 msgstr "德语"
 
-#: common/pgm_base.cpp:130
+#: common/pgm_base.cpp:133
 msgid "Greek"
 msgstr "希腊语"
 
-#: common/pgm_base.cpp:131
+#: common/pgm_base.cpp:134
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: common/pgm_base.cpp:132
+#: common/pgm_base.cpp:135
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: common/pgm_base.cpp:133
+#: common/pgm_base.cpp:136
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: common/pgm_base.cpp:134
+#: common/pgm_base.cpp:137
 msgid "Polish"
 msgstr "波兰语"
 
-#: common/pgm_base.cpp:135
+#: common/pgm_base.cpp:138
 msgid "Czech"
 msgstr "捷克语"
 
-#: common/pgm_base.cpp:136
+#: common/pgm_base.cpp:139
 msgid "Russian"
 msgstr "俄语"
 
-#: common/pgm_base.cpp:137
+#: common/pgm_base.cpp:140
 msgid "Korean"
 msgstr "韩语"
 
-#: common/pgm_base.cpp:139
+#: common/pgm_base.cpp:142
 msgid "Chinese simplified"
 msgstr "简体中文"
 
-#: common/pgm_base.cpp:141
+#: common/pgm_base.cpp:144
 msgid "Chinese traditional"
 msgstr "繁体中文"
 
-#: common/pgm_base.cpp:142
+#: common/pgm_base.cpp:145
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: common/pgm_base.cpp:143
+#: common/pgm_base.cpp:146
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: common/pgm_base.cpp:144
+#: common/pgm_base.cpp:147
 msgid "Japanese"
 msgstr "日语"
 
-#: common/pgm_base.cpp:145
+#: common/pgm_base.cpp:148
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: common/pgm_base.cpp:146
+#: common/pgm_base.cpp:149
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: common/pgm_base.cpp:221
+#: common/pgm_base.cpp:224
 msgid "No default editor found, you must choose it"
 msgstr "未找到默认编辑器 请先设置首选文本编辑器"
 
-#: common/pgm_base.cpp:241
+#: common/pgm_base.cpp:244
 msgid "Executable file (*.exe)|*.exe"
 msgstr "可执行文件 (*.exe)|*.exe"
 
-#: common/pgm_base.cpp:243
+#: common/pgm_base.cpp:246
 msgid "Executable file (*)|*"
 msgstr "可执行文件 (*)|*"
 
-#: common/pgm_base.cpp:253
+#: common/pgm_base.cpp:256
 msgid "Select Preferred Editor"
 msgstr "选择首选编辑器"
 
-#: common/pgm_base.cpp:274
+#: common/pgm_base.cpp:277
 #, c-format
 msgid "%s is already running. Continue?"
 msgstr "%s 正在运行, 是否打开新窗口运行?"
 
-#: common/pgm_base.cpp:805
+#: common/pgm_base.cpp:826
 msgid "Set Language"
 msgstr "设置语言"
 
-#: common/pgm_base.cpp:806
+#: common/pgm_base.cpp:827
 msgid "Select application language (only for testing)"
 msgstr "选择应用程序的语言（仅适用于测试）"
 
@@ -2897,7 +3114,7 @@ msgstr "无法创建工程文件 '%s' (目录不可写)"
 msgid "Error loading project footprint library table"
 msgstr "加载项目占用空间库表时出错"
 
-#: common/richio.cpp:167 tools/io_benchmark/stdstream_line_reader.cpp:76
+#: common/richio.cpp:167 qa/qa_utils/stdstream_line_reader.cpp:76
 #, c-format
 msgid "Unable to open filename \"%s\" for reading"
 msgstr "无法打开文件名 '%s' 阅读"
@@ -2914,7 +3131,7 @@ msgstr "超出线路长度"
 msgid "OUTPUTSTREAM_OUTPUTFORMATTER write error"
 msgstr "OUTPUTSTREAM_OUTPUTFORMATTER写入错误"
 
-#: common/selcolor.cpp:85 eeschema/eeschema_config.cpp:206
+#: common/selcolor.cpp:86 eeschema/eeschema_config.cpp:210
 msgid "Colors"
 msgstr "颜色"
 
@@ -2922,69 +3139,30 @@ msgstr "颜色"
 msgid "Cancel current tool"
 msgstr "取消当前工具"
 
-#: common/tool/actions.cpp:16 common/widgets/mathplot.cpp:1767
-#: common/zoom.cpp:282 eeschema/hotkeys.cpp:106 eeschema/hotkeys.cpp:108
-#: eeschema/sim/sim_plot_frame_base.cpp:77 gerbview/hotkeys.cpp:65
-#: pagelayout_editor/hotkeys.cpp:80 pagelayout_editor/menubar.cpp:122
-#: pcbnew/hotkeys.cpp:214 pcbnew/hotkeys.cpp:216
-msgid "Zoom In"
-msgstr "放大"
-
-#: common/tool/actions.cpp:20 common/widgets/mathplot.cpp:1768
-#: common/zoom.cpp:284 eeschema/hotkeys.cpp:113 eeschema/hotkeys.cpp:115
-#: eeschema/sim/sim_plot_frame_base.cpp:81 gerbview/hotkeys.cpp:64
-#: pagelayout_editor/hotkeys.cpp:79 pagelayout_editor/menubar.cpp:125
-#: pcbnew/hotkeys.cpp:221 pcbnew/hotkeys.cpp:223
-msgid "Zoom Out"
-msgstr "缩小"
-
-#: common/tool/actions.cpp:32 common/widgets/mathplot.cpp:1765
-#: common/zoom.cpp:280 eeschema/dialogs/dialog_lib_edit_text_base.cpp:120
-#: eeschema/dialogs/dialog_lib_edit_text_base.cpp:150
-#: eeschema/fields_grid_table.cpp:84 eeschema/fields_grid_table.cpp:92
-#: eeschema/fields_grid_table.cpp:294 eeschema/fields_grid_table.cpp:302
-#: eeschema/fields_grid_table.cpp:366 eeschema/fields_grid_table.cpp:377
-#: gerbview/gerber_file_image.cpp:357 gerbview/gerber_file_image.cpp:360
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:86
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:99
-#: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:90
-#: pcbnew/dialogs/dialog_text_properties_base.cpp:129
-msgid "Center"
-msgstr "居中"
-
 #: common/tool/actions.cpp:36 eeschema/hotkeys.cpp:89
 #: gerbview/gerbview_frame.cpp:1272 gerbview/hotkeys.cpp:61
 #: pagelayout_editor/hotkeys.cpp:75 pcbnew/hotkeys.cpp:198
-#: pcbnew/hotkeys.cpp:200 pcbnew/pcb_base_frame.cpp:1081
+#: pcbnew/hotkeys.cpp:200 pcbnew/pcb_base_frame.cpp:1132
 msgid "Zoom Auto"
 msgstr "自动缩放"
 
-#: common/tool/actions.cpp:40 eeschema/hotkeys.cpp:199 eeschema/menubar.cpp:179
-#: eeschema/menubar_libedit.cpp:203 gerbview/hotkeys.cpp:66
-#: gerbview/menubar.cpp:207 pagelayout_editor/hotkeys.cpp:81
-#: pagelayout_editor/menubar.cpp:131 pcbnew/hotkeys.cpp:226
-#: pcbnew/menubar_footprint_editor.cpp:215 pcbnew/menubar_pcb_editor.cpp:582
+#: common/tool/actions.cpp:40 eeschema/hotkeys.cpp:202
+#: eeschema/libedit/menubar_libedit.cpp:203 eeschema/menubar.cpp:179
+#: gerbview/hotkeys.cpp:66 gerbview/menubar.cpp:214
+#: pagelayout_editor/hotkeys.cpp:81 pagelayout_editor/menubar.cpp:131
+#: pcbnew/hotkeys.cpp:226 pcbnew/menubar_footprint_editor.cpp:220
+#: pcbnew/menubar_pcb_editor.cpp:582
 msgid "Zoom to Selection"
 msgstr "放大选取"
 
-#: common/tool/common_tools.cpp:39
+#: common/tool/common_tools.cpp:40
 msgid "Toggle Always Show Cursor"
 msgstr "始终切换显示游标"
 
-#: common/tool/common_tools.cpp:40
+#: common/tool/common_tools.cpp:41
 msgid "Toggle display of the cursor, even when not in an interactive tool"
 msgstr "切换光标显示，即使不在交互式工具中"
 
-#: common/tool/grid_menu.cpp:40 common/zoom.cpp:318
-#: eeschema/widgets/widget_eeschema_color_config.cpp:93
-#: gerbview/gerbview_layer_widget.cpp:119 pcbnew/pcb_layer_widget.cpp:91
-msgid "Grid"
-msgstr "网格"
-
-#: common/tool/zoom_menu.cpp:39 common/zoom.cpp:294
-msgid "Zoom"
-msgstr "缩放"
-
 #: common/tool/zoom_menu.cpp:49
 #, c-format
 msgid "Zoom: %.2f"
@@ -2998,8 +3176,8 @@ msgstr "Y轴的镜像尚不支持"
 msgid "Footprint not found"
 msgstr "封装没有找到"
 
-#: common/widgets/footprint_select_widget.cpp:78 cvpcb/cvpcb_mainframe.cpp:704
-#: pcbnew/footprint_edit_frame.cpp:812 pcbnew/load_select_footprint.cpp:197
+#: common/widgets/footprint_select_widget.cpp:78 cvpcb/cvpcb_mainframe.cpp:707
+#: pcbnew/footprint_edit_frame.cpp:826 pcbnew/load_select_footprint.cpp:203
 msgid "Loading Footprint Libraries"
 msgstr "载入封装库"
 
@@ -3012,192 +3190,179 @@ msgstr "没有默认的封装"
 msgid "Other..."
 msgstr "其它..."
 
-#: common/widgets/gal_options_panel.cpp:75
+#: common/widgets/gal_options_panel.cpp:65
 msgid " (not supported in Legacy Toolset)"
 msgstr " （不支持传统工具箱）"
 
-#: common/widgets/gal_options_panel.cpp:83
-msgid "Accelerated Graphics"
-msgstr "图形加速"
-
-#: common/widgets/gal_options_panel.cpp:86
-msgid "No Antialiasing"
-msgstr "无抗锯齿"
-
-#: common/widgets/gal_options_panel.cpp:87
-msgid "Subpixel Antialiasing (High Quality)"
-msgstr "亚像素抗锯齿（高质量）"
-
-#: common/widgets/gal_options_panel.cpp:88
-msgid "Subpixel Antialiasing (Ultra Quality)"
-msgstr "亚像素抗锯齿（超质量）"
-
-#: common/widgets/gal_options_panel.cpp:89
-msgid "Supersampling (2x)"
-msgstr "超级采样(2X)"
-
-#: common/widgets/gal_options_panel.cpp:90
-msgid "Supersampling (4x)"
-msgstr "超级采样(4x)"
-
-#: common/widgets/gal_options_panel.cpp:107
+#: common/widgets/gal_options_panel.cpp:73
 msgid "Grid Options"
 msgstr "网格选项"
 
-#: common/widgets/gal_options_panel.cpp:110
+#: common/widgets/gal_options_panel.cpp:76
 msgid "Dots"
 msgstr "点"
 
-#: common/widgets/gal_options_panel.cpp:111
+#: common/widgets/gal_options_panel.cpp:77
 msgid "Lines"
 msgstr "线"
 
-#: common/widgets/gal_options_panel.cpp:112
+#: common/widgets/gal_options_panel.cpp:78
 msgid "Small crosses"
 msgstr "小十字"
 
-#: common/widgets/gal_options_panel.cpp:116
+#: common/widgets/gal_options_panel.cpp:82
 msgid "Grid Style"
 msgstr "网格风格"
 
-#: common/widgets/gal_options_panel.cpp:128
+#: common/widgets/gal_options_panel.cpp:94
 msgid "Grid thickness:"
 msgstr "网格大小："
 
-#: common/widgets/gal_options_panel.cpp:140
-#: common/widgets/gal_options_panel.cpp:157
+#: common/widgets/gal_options_panel.cpp:106
+#: common/widgets/gal_options_panel.cpp:123
 msgid "px"
 msgstr "像素"
 
-#: common/widgets/gal_options_panel.cpp:145
+#: common/widgets/gal_options_panel.cpp:111
 msgid "Min grid spacing:"
 msgstr "最小网格间距："
 
-#: common/widgets/gal_options_panel.cpp:182
+#: common/widgets/gal_options_panel.cpp:151
 msgid "Cursor Options"
 msgstr "光标选项"
 
-#: common/widgets/gal_options_panel.cpp:196
+#: common/widgets/gal_options_panel.cpp:165
 msgid "Small crosshair"
 msgstr "小十字"
 
-#: common/widgets/gal_options_panel.cpp:197
+#: common/widgets/gal_options_panel.cpp:166
 msgid "Full window crosshair"
 msgstr "十字光标全屏"
 
-#: common/widgets/gal_options_panel.cpp:202
+#: common/widgets/gal_options_panel.cpp:171
 msgid "Cursor shape:"
 msgstr "光标形状："
 
-#: common/widgets/gal_options_panel.cpp:207
+#: common/widgets/gal_options_panel.cpp:176
 msgid "Cursor shape for drawing, placement and movement tools"
 msgstr "用于绘图，放置和移动工具的光标形状"
 
-#: common/widgets/gal_options_panel.cpp:213
+#: common/widgets/gal_options_panel.cpp:182
 msgid "Always show crosshairs"
 msgstr "始终显示十字光标"
 
-#: common/widgets/gal_options_panel.cpp:218
+#: common/widgets/gal_options_panel.cpp:187
 msgid "Always show crosshairs (not in Legacy)"
 msgstr "始终显示十字光标（not in Legacy）"
 
-#: common/widgets/mathplot.cpp:1765
+#: common/widgets/mathplot.cpp:1792
 msgid "Center plot view to this position"
 msgstr "居中绘制视图"
 
-#: common/widgets/mathplot.cpp:1766 eeschema/hotkeys.cpp:87
+#: common/widgets/mathplot.cpp:1793 eeschema/hotkeys.cpp:87
 #: eeschema/sim/sim_plot_frame_base.cpp:85
 msgid "Fit on Screen"
 msgstr "适应窗口"
 
-#: common/widgets/mathplot.cpp:1766
+#: common/widgets/mathplot.cpp:1793
 msgid "Set plot view to show all items"
 msgstr "设置绘图视图以显示所有项目"
 
-#: common/widgets/mathplot.cpp:1767
+#: common/widgets/mathplot.cpp:1794
 msgid "Zoom in plot view."
 msgstr "放大"
 
-#: common/widgets/mathplot.cpp:1768
+#: common/widgets/mathplot.cpp:1795
 msgid "Zoom out plot view."
 msgstr "缩小"
 
-#: common/widgets/net_selector.cpp:37
+#: common/widgets/net_selector.cpp:48
 msgid "<no net>"
 msgstr "<无网络>"
 
-#: common/widgets/unit_binder.cpp:165
-#, c-format
-msgid "%s must be larger than %s."
-msgstr "%s必须大于%s 。"
+#: common/widgets/net_selector.cpp:69
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:688
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:726
+msgid "Filter:"
+msgstr "过滤："
 
-#: common/widgets/unit_binder.cpp:186
+#: common/widgets/unit_binder.cpp:138
+#, c-format
+msgid "%s must be larger than %s or equal."
+msgstr "%s必须大于或等于%s 。"
+
+#: common/widgets/unit_binder.cpp:159
 #, c-format
 msgid "%s must be smaller than %s."
 msgstr "%s必须小于%s 。"
 
-#: common/widgets/widget_hotkey_list.cpp:104
+#: common/widgets/widget_hotkey_list.cpp:102
 msgid "Press a new hotkey, or press Esc to cancel..."
 msgstr "按下新的快捷键，或按ESC取消..."
 
-#: common/widgets/widget_hotkey_list.cpp:111
+#: common/widgets/widget_hotkey_list.cpp:109
 msgid "Command:"
 msgstr "命令:"
 
-#: common/widgets/widget_hotkey_list.cpp:119
+#: common/widgets/widget_hotkey_list.cpp:117
 msgid "Current key:"
 msgstr "当前快捷键："
 
-#: common/widgets/widget_hotkey_list.cpp:213
+#: common/widgets/widget_hotkey_list.cpp:211
 msgid "Set Hotkey"
 msgstr "设置快捷键"
 
-#: common/widgets/widget_hotkey_list.cpp:379
-#: eeschema/libedit_onrightclick.cpp:202 eeschema/libedit_onrightclick.cpp:266
-#: eeschema/libedit_onrightclick.cpp:295 eeschema/onrightclick.cpp:280
-#: eeschema/onrightclick.cpp:527 eeschema/onrightclick.cpp:563
-#: eeschema/onrightclick.cpp:599 eeschema/onrightclick.cpp:633
-#: eeschema/onrightclick.cpp:818 eeschema/onrightclick.cpp:849
+#: common/widgets/widget_hotkey_list.cpp:429
+#: eeschema/libedit/libedit_onrightclick.cpp:202
+#: eeschema/libedit/libedit_onrightclick.cpp:266
+#: eeschema/libedit/libedit_onrightclick.cpp:295 eeschema/onrightclick.cpp:285
+#: eeschema/onrightclick.cpp:540 eeschema/onrightclick.cpp:576
+#: eeschema/onrightclick.cpp:610 eeschema/onrightclick.cpp:642
+#: eeschema/onrightclick.cpp:825 eeschema/onrightclick.cpp:855
 #: pcbnew/footprint_editor_onclick.cpp:384
 #: pcbnew/footprint_editor_onclick.cpp:425 pcbnew/onrightclick.cpp:184
 #: pcbnew/onrightclick.cpp:236 pcbnew/onrightclick.cpp:281
-#: pcbnew/onrightclick.cpp:840 pcbnew/onrightclick.cpp:946
+#: pcbnew/onrightclick.cpp:838 pcbnew/onrightclick.cpp:944
 msgid "Edit..."
 msgstr "编辑..."
 
-#: common/widgets/widget_hotkey_list.cpp:380
+#: common/widgets/widget_hotkey_list.cpp:430
 #: eeschema/dialogs/dialog_edit_components_libid_base.cpp:64
 msgid "Undo Changes"
 msgstr "撤销更改"
 
-#: common/widgets/widget_hotkey_list.cpp:381
+#: common/widgets/widget_hotkey_list.cpp:431
 msgid "Restore Default"
 msgstr "重置为默认值"
 
-#: common/widgets/widget_hotkey_list.cpp:383
+#: common/widgets/widget_hotkey_list.cpp:435
 msgid "Undo All Changes"
 msgstr "撤销所有更改"
 
-#: common/widgets/widget_hotkey_list.cpp:384
+#: common/widgets/widget_hotkey_list.cpp:436
 msgid "Restore All to Default"
 msgstr "重置所有为默认值"
 
-#: common/widgets/widget_hotkey_list.cpp:484
+#: common/widgets/widget_hotkey_list.cpp:483
 #, 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:489
+#: common/widgets/widget_hotkey_list.cpp:488
 msgid "Confirm change"
 msgstr "确认修改"
 
-#: common/widgets/widget_hotkey_list.cpp:513
-msgid "Command (double-click to edit)"
-msgstr "指令(双击鼠标编辑)"
+#: common/widgets/widget_hotkey_list.cpp:515
+msgid "Command"
+msgstr "命令"
 
-#: common/widgets/widget_hotkey_list.cpp:514
+#: common/widgets/widget_hotkey_list.cpp:518
+msgid "(double-click to edit)"
+msgstr "(双击编辑)"
+
+#: common/widgets/widget_hotkey_list.cpp:521
 msgid "Hotkey"
 msgstr "快捷键"
 
@@ -3381,41 +3546,6 @@ msgstr "工作簿文件 (*.wbk)|*."
 msgid "PNG file (*.png)|*."
 msgstr "PNG文件 (*.zip)|*."
 
-#: common/zoom.cpp:286 pagelayout_editor/menubar.cpp:146
-msgid "Redraw View"
-msgstr "刷新视图"
-
-#: common/zoom.cpp:288 pagelayout_editor/menubar.cpp:128
-msgid "Zoom to Fit"
-msgstr "缩放至适合大小"
-
-#: common/zoom.cpp:307
-msgid "Zoom: "
-msgstr "放大： "
-
-#: common/zoom.cpp:334 eeschema/dialogs/dialog_annotate.cpp:116
-#: eeschema/dialogs/dialog_bom.cpp:235 eeschema/dialogs/dialog_erc.cpp:93
-#: eeschema/dialogs/dialog_netlist_base.cpp:49
-#: eeschema/dialogs/dialog_plot_schematic.cpp:81
-#: eeschema/dialogs/dialog_print_using_printer.cpp:156
-#: eeschema/dialogs/dialog_schematic_find_base.cpp:134
-#: eeschema/dialogs/dialog_symbol_remap_base.cpp:33
-#: gerbview/dialogs/dialog_print_using_printer_base.cpp:107
-#: pcbnew/dialogs/dialog_drc.cpp:108
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:151
-#: pcbnew/dialogs/dialog_export_step.cpp:122
-#: pcbnew/dialogs/dialog_export_svg.cpp:109
-#: pcbnew/dialogs/dialog_find_base.cpp:46
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:71
-#: pcbnew/dialogs/dialog_gendrill.cpp:88 pcbnew/dialogs/dialog_netlist.cpp:102
-#: pcbnew/dialogs/dialog_plot.cpp:55
-#: pcbnew/dialogs/dialog_print_for_modedit_base.cpp:57
-#: pcbnew/dialogs/dialog_print_using_printer.cpp:149
-#: pcbnew/dialogs/dialog_update_pcb.cpp:77
-#: pcbnew/exporters/gen_footprints_placefile.cpp:109
-msgid "Close"
-msgstr "关闭"
-
 #: cvpcb/auto_associate.cpp:107
 #, c-format
 msgid "Equivalence file \"%s\" could not be found in the default search paths."
@@ -3479,7 +3609,7 @@ msgstr "尝试加载全局封装库表发生错误"
 msgid "Assign Footprints"
 msgstr "分配封装"
 
-#: cvpcb/cvpcb_mainframe.cpp:154 pcbnew/dialogs/panel_fp_lib_table.cpp:785
+#: cvpcb/cvpcb_mainframe.cpp:154 pcbnew/dialogs/panel_fp_lib_table.cpp:808
 msgid "Footprint Libraries"
 msgstr "封装库"
 
@@ -3492,7 +3622,7 @@ msgid "Filtered Footprints"
 msgstr "过滤的封装"
 
 #: cvpcb/cvpcb_mainframe.cpp:193
-#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:103
+#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:105
 msgid "Apply, Save Schematic && Continue"
 msgstr "应用，保存原理图并继续"
 
@@ -3520,46 +3650,46 @@ msgstr "在封装浏览器中显示分配的封装"
 msgid "Show the current footprint in the footprint viewer"
 msgstr "在封装浏览器中显示当前封装"
 
-#: cvpcb/cvpcb_mainframe.cpp:632
+#: cvpcb/cvpcb_mainframe.cpp:635
 msgid "key words"
 msgstr "关键字"
 
-#: cvpcb/cvpcb_mainframe.cpp:645
+#: cvpcb/cvpcb_mainframe.cpp:648
 msgid "pin count"
 msgstr "引脚数"
 
-#: cvpcb/cvpcb_mainframe.cpp:655
+#: cvpcb/cvpcb_mainframe.cpp:658
 msgid "library"
 msgstr "库"
 
-#: cvpcb/cvpcb_mainframe.cpp:663
+#: cvpcb/cvpcb_mainframe.cpp:666
 msgid "search text"
 msgstr "搜索文本"
 
-#: cvpcb/cvpcb_mainframe.cpp:667
+#: cvpcb/cvpcb_mainframe.cpp:670
 msgid "No filtering"
 msgstr "不过滤"
 
-#: cvpcb/cvpcb_mainframe.cpp:669
+#: cvpcb/cvpcb_mainframe.cpp:672
 #, c-format
 msgid "Filtered by %s"
 msgstr "过滤 %s"
 
-#: cvpcb/cvpcb_mainframe.cpp:683
+#: cvpcb/cvpcb_mainframe.cpp:686
 #, c-format
 msgid "Description: %s;  Key words: %s"
 msgstr "描述：%s；关键字: %s"
 
-#: cvpcb/cvpcb_mainframe.cpp:699
+#: cvpcb/cvpcb_mainframe.cpp:702
 msgid ""
 "No PCB footprint libraries are listed in the current footprint library table."
 msgstr "在当前封装库列表中没有PCB封装库被列出。"
 
-#: cvpcb/cvpcb_mainframe.cpp:700
+#: cvpcb/cvpcb_mainframe.cpp:703
 msgid "Configuration Error"
 msgstr "配置错误"
 
-#: cvpcb/cvpcb_mainframe.cpp:754
+#: cvpcb/cvpcb_mainframe.cpp:757
 #, c-format
 msgid ""
 "Error loading schematic.\n"
@@ -3591,12 +3721,13 @@ msgid "Symbol Footprint Association Files (.equ)"
 msgstr "符号封装关联文件（.equ）"
 
 #: cvpcb/dialogs/dialog_config_equfiles_base.cpp:36
-#: eeschema/dialogs/dialog_spice_model_base.cpp:614
+#: eeschema/dialogs/dialog_spice_model_base.cpp:610
+#: eeschema/libedit/lib_edit_frame.cpp:1647
 msgid "Add"
 msgstr "添加"
 
 #: cvpcb/dialogs/dialog_config_equfiles_base.cpp:39
-#: eeschema/dialogs/dialog_spice_model_base.cpp:622
+#: eeschema/dialogs/dialog_spice_model_base.cpp:618
 msgid "Remove"
 msgstr "移除"
 
@@ -3616,17 +3747,17 @@ msgstr "可选的相对路径环境变量："
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:57
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:320
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:49
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:779
-#: eeschema/dialogs/dialog_rescue_each.cpp:116
-#: eeschema/fields_grid_table.cpp:128 eeschema/lib_field.cpp:447
-#: eeschema/lib_field.cpp:627 eeschema/sch_component.cpp:1413
-#: eeschema/sch_component.cpp:1452 eeschema/template_fieldnames.cpp:48
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:833
+#: eeschema/dialogs/dialog_rescue_each.cpp:126
+#: eeschema/fields_grid_table.cpp:135 eeschema/lib_field.cpp:448
+#: eeschema/lib_field.cpp:626 eeschema/sch_component.cpp:1446
+#: eeschema/sch_component.cpp:1485 eeschema/template_fieldnames.cpp:48
 #: eeschema/widgets/widget_eeschema_color_config.cpp:76
 #: pcbnew/class_edge_mod.cpp:286 pcbnew/class_text_mod.cpp:374
 #: 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:42
-#: pcbnew/footprint_wizard_frame.cpp:388 pcbnew/text_mod_grid_table.cpp:106
+#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:44
+#: pcbnew/footprint_wizard_frame.cpp:392 pcbnew/text_mod_grid_table.cpp:106
 msgid "Value"
 msgstr "值"
 
@@ -3644,36 +3775,41 @@ msgid "Path Type:"
 msgstr "路径类型:"
 
 #: cvpcb/dialogs/dialog_display_options_base.cpp:23
-msgid "Draw Options:"
-msgstr "绘制选项:"
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.cpp:23
+msgid "Drawing Options"
+msgstr "绘制选项"
 
 #: cvpcb/dialogs/dialog_display_options_base.cpp:25
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.cpp:25
 msgid "Graphic items sketch mode"
 msgstr "在草图模式下显示图形项目"
 
 #: cvpcb/dialogs/dialog_display_options_base.cpp:28
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.cpp:28
 msgid "Texts sketch mode"
 msgstr "在草图模式下显示文本"
 
 #: cvpcb/dialogs/dialog_display_options_base.cpp:31
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.cpp:31
 msgid "Pad sketch mode"
 msgstr "在草图模式下显示焊盘"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:34
-msgid "Show pad &number"
+#: cvpcb/dialogs/dialog_display_options_base.cpp:37
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.cpp:37
+msgid "Show pad &numbers"
 msgstr "显示焊盘编号 (&N)"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:41
-msgid "Pan and Zoom:"
-msgstr "平移和缩放："
+#: cvpcb/dialogs/dialog_display_options_base.cpp:44
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.cpp:44
+msgid "Auto-zoom"
+msgstr "自动缩放"
 
-#: cvpcb/dialogs/dialog_display_options_base.cpp:43
-msgid "Center and warp cursor on zoom"
-msgstr ""
-
-#: cvpcb/dialogs/dialog_display_options_base.cpp:53
-msgid "Pan while moving object"
-msgstr ""
+#: cvpcb/dialogs/dialog_display_options_base.cpp:46
+#: pcbnew/dialogs/dialog_fp_browser_display_options_base.cpp:46
+#, fuzzy
+#| msgid "Zoom to fit footprint"
+msgid "Zoom to fit when changing footprint"
+msgstr "缩放封装至适合大小"
 
 #: cvpcb/dialogs/fp_conflict_assignment_selector.cpp:37
 msgid "Ref"
@@ -3702,100 +3838,99 @@ msgstr ""
 msgid "Footprint Assignment Conflicts"
 msgstr "封装分配冲突"
 
-#: cvpcb/display_footprints_frame.cpp:87
+#: cvpcb/display_footprints_frame.cpp:89
 msgid "Footprint Viewer"
 msgstr "封装浏览"
 
-#: cvpcb/display_footprints_frame.cpp:216 gerbview/toolbars_gerber.cpp:241
+#: cvpcb/display_footprints_frame.cpp:225 gerbview/toolbars_gerber.cpp:245
 msgid "Measure distance between two points"
 msgstr "测量两点之间的距离"
 
-#: cvpcb/display_footprints_frame.cpp:226 pcbnew/pcb_base_frame.cpp:666
+#: cvpcb/display_footprints_frame.cpp:235 pcbnew/pcb_base_frame.cpp:696
 #: pcbnew/tool_pcb_editor.cpp:354
 msgid "Display polar coordinates"
 msgstr "显示极坐标"
 
-#: cvpcb/display_footprints_frame.cpp:230 eeschema/tool_lib.cpp:214
-#: gerbview/toolbars_gerber.cpp:257 pcbnew/tool_footprint_editor.cpp:197
+#: cvpcb/display_footprints_frame.cpp:239 eeschema/libedit/tool_lib.cpp:214
+#: gerbview/toolbars_gerber.cpp:261 pcbnew/tool_footprint_editor.cpp:209
 #: pcbnew/tool_pcb_editor.cpp:357
 msgid "Set units to inches"
 msgstr "将单位设置为英寸"
 
-#: cvpcb/display_footprints_frame.cpp:234 eeschema/tool_lib.cpp:219
-#: gerbview/toolbars_gerber.cpp:261 pcbnew/tool_footprint_editor.cpp:201
+#: cvpcb/display_footprints_frame.cpp:243 eeschema/libedit/tool_lib.cpp:219
+#: gerbview/toolbars_gerber.cpp:265 pcbnew/tool_footprint_editor.cpp:213
 #: pcbnew/tool_pcb_editor.cpp:360
 msgid "Set units to millimeters"
 msgstr "将单位设置为毫米"
 
-#: cvpcb/display_footprints_frame.cpp:239 eeschema/menubar.cpp:213
-#: eeschema/tool_lib.cpp:224 eeschema/tool_sch.cpp:301
-#: gerbview/toolbars_gerber.cpp:266 pcbnew/menubar_footprint_editor.cpp:255
-#: pcbnew/menubar_pcb_editor.cpp:623 pcbnew/tool_footprint_editor.cpp:206
+#: cvpcb/display_footprints_frame.cpp:248 eeschema/libedit/tool_lib.cpp:224
+#: eeschema/menubar.cpp:215 eeschema/tool_sch.cpp:301
+#: gerbview/toolbars_gerber.cpp:270 pcbnew/menubar_footprint_editor.cpp:260
+#: pcbnew/menubar_pcb_editor.cpp:623 pcbnew/tool_footprint_editor.cpp:217
 #: pcbnew/tool_pcb_editor.cpp:365
 msgid "Change cursor shape"
 msgstr "改变光标形状"
 
-#: cvpcb/display_footprints_frame.cpp:243 eeschema/tool_lib.cpp:228
-#: eeschema/tool_sch.cpp:305 gerbview/toolbars_gerber.cpp:270
-#: pcbnew/menubar_footprint_editor.cpp:260 pcbnew/menubar_pcb_editor.cpp:628
-#: pcbnew/tool_footprint_editor.cpp:210 pcbnew/tool_pcb_editor.cpp:369
+#: cvpcb/display_footprints_frame.cpp:252 eeschema/libedit/tool_lib.cpp:228
+#: gerbview/toolbars_gerber.cpp:274 pcbnew/menubar_footprint_editor.cpp:265
+#: pcbnew/menubar_pcb_editor.cpp:628 pcbnew/tool_pcb_editor.cpp:369
 msgid "Change cursor shape (not supported in Legacy Toolset)"
 msgstr "更改光标形状(不支持传统工具箱)"
 
-#: cvpcb/display_footprints_frame.cpp:250
-#: pcbnew/menubar_footprint_editor.cpp:270 pcbnew/menubar_pcb_editor.cpp:659
-#: pcbnew/pcb_base_frame.cpp:677 pcbnew/tool_pcb_editor.cpp:391
+#: cvpcb/display_footprints_frame.cpp:259
+#: pcbnew/menubar_footprint_editor.cpp:275 pcbnew/menubar_pcb_editor.cpp:659
+#: pcbnew/pcb_base_frame.cpp:707 pcbnew/tool_pcb_editor.cpp:391
 msgid "Show pads in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: cvpcb/display_footprints_frame.cpp:254
+#: cvpcb/display_footprints_frame.cpp:263
 msgid "Show texts in line mode"
 msgstr "在线条模式下显示文本"
 
-#: cvpcb/display_footprints_frame.cpp:258
+#: cvpcb/display_footprints_frame.cpp:267
 msgid "Show outlines in line mode"
 msgstr "在线条模式下显示轮廓"
 
-#: cvpcb/display_footprints_frame.cpp:273
+#: cvpcb/display_footprints_frame.cpp:282 pcbnew/tool_footprint_viewer.cpp:59
 msgid "Display options"
 msgstr "显示选项"
 
-#: cvpcb/display_footprints_frame.cpp:278
+#: cvpcb/display_footprints_frame.cpp:287
 msgid "Zoom in (F1)"
 msgstr "放大(F1)"
 
-#: cvpcb/display_footprints_frame.cpp:281
+#: cvpcb/display_footprints_frame.cpp:290
 msgid "Zoom out (F2)"
 msgstr "缩小(F2)"
 
-#: cvpcb/display_footprints_frame.cpp:284
+#: cvpcb/display_footprints_frame.cpp:293
 msgid "Redraw view (F3)"
 msgstr "重绘视图 (F3)"
 
-#: cvpcb/display_footprints_frame.cpp:287
+#: cvpcb/display_footprints_frame.cpp:296
 msgid "Zoom to fit footprint (Home)"
 msgstr "缩放封装至适合大小(Home)"
 
-#: cvpcb/display_footprints_frame.cpp:294
+#: cvpcb/display_footprints_frame.cpp:303
 msgid "3D Display (Alt+3)"
 msgstr "3D显示 (Alt+3)"
 
-#: cvpcb/display_footprints_frame.cpp:449
+#: cvpcb/display_footprints_frame.cpp:488
 #, c-format
 msgid "Footprint ID \"%s\" is not valid."
 msgstr "封装ID \"%s\" 无效。"
 
-#: cvpcb/display_footprints_frame.cpp:476
+#: cvpcb/display_footprints_frame.cpp:515
 #, c-format
 msgid "Footprint \"%s\" not found"
 msgstr "封装 '%s' 没有找到"
 
-#: cvpcb/display_footprints_frame.cpp:503
+#: cvpcb/display_footprints_frame.cpp:542
 #, c-format
 msgid "Footprint: %s"
 msgstr "封装: %s"
 
-#: cvpcb/display_footprints_frame.cpp:514
+#: cvpcb/display_footprints_frame.cpp:553
 #, c-format
 msgid "Lib: %s"
 msgstr "库: %s"
@@ -3804,13 +3939,14 @@ msgstr "库: %s"
 msgid "&Save Schematic\tCtrl+S"
 msgstr "保存原理图(&S) \tCtrl+S"
 
-#: cvpcb/menubar.cpp:67 eeschema/menubar_libedit.cpp:286 kicad/menubar.cpp:328
-#: pcbnew/menubar_footprint_editor.cpp:406 pcbnew/menubar_pcb_editor.cpp:261
+#: cvpcb/menubar.cpp:67 eeschema/libedit/menubar_libedit.cpp:298
+#: kicad/menubar.cpp:328 pcbnew/menubar_footprint_editor.cpp:406
+#: pcbnew/menubar_pcb_editor.cpp:261
 msgid "&Configure Paths..."
 msgstr "配置路径(&C)..."
 
-#: cvpcb/menubar.cpp:68 eeschema/menubar.cpp:643
-#: eeschema/menubar_libedit.cpp:287 kicad/menubar.cpp:329
+#: cvpcb/menubar.cpp:68 eeschema/libedit/menubar_libedit.cpp:299
+#: eeschema/menubar.cpp:622 kicad/menubar.cpp:329
 #: pcbnew/menubar_footprint_editor.cpp:407 pcbnew/menubar_pcb_editor.cpp:262
 msgid "Edit path configuration environment variables"
 msgstr "编辑环境变量路径配置"
@@ -3942,81 +4078,81 @@ msgid "Measure Tool"
 msgstr "测量工具"
 
 #: cvpcb/tools/cvpcb_selection_tool.cpp:46 gerbview/tools/selection_tool.cpp:74
-#: pcbnew/tools/edit_tool.cpp:159
+#: pcbnew/tools/edit_tool.cpp:155
 msgid "Interactively measure distance between points"
 msgstr "交互测量点之间的距离"
 
 #: cvpcb/tools/cvpcb_selection_tool.cpp:171
 #: gerbview/tools/selection_tool.cpp:807
-#: pcbnew/menubar_footprint_editor.cpp:378 pcbnew/menubar_pcb_editor.cpp:244
-#: pcbnew/tool_footprint_editor.cpp:172 pcbnew/tool_pcb_editor.cpp:508
-#: pcbnew/tools/edit_tool.cpp:1187
+#: pcbnew/menubar_footprint_editor.cpp:383 pcbnew/menubar_pcb_editor.cpp:244
+#: pcbnew/tool_footprint_editor.cpp:184 pcbnew/tool_pcb_editor.cpp:508
+#: pcbnew/tools/edit_tool.cpp:1201
 msgid "Measure distance"
 msgstr "测量距离"
 
-#: eeschema/annotate.cpp:112
+#: eeschema/annotate.cpp:114
 #, c-format
 msgid "%d duplicate time stamps were found and replaced."
 msgstr "共找到 %d 处重复的时间标记和更换。"
 
-#: eeschema/annotate.cpp:202
+#: eeschema/annotate.cpp:204
 #, c-format
 msgid "Updated %s (unit %s) from %s to %s"
 msgstr "更新%s(单位%s)从%s到%s"
 
-#: eeschema/annotate.cpp:208
+#: eeschema/annotate.cpp:210
 #, c-format
 msgid "Updated %s from %s to %s"
 msgstr "更新%s从%s到%s"
 
-#: eeschema/annotate.cpp:216
+#: eeschema/annotate.cpp:218
 #, c-format
 msgid "Annotated %s (unit %s) as %s"
 msgstr "标注 %s(单位 %s)为%s"
 
-#: eeschema/annotate.cpp:221
+#: eeschema/annotate.cpp:223
 #, c-format
 msgid "Annotated %s as %s"
 msgstr "批注%s为%s"
 
-#: eeschema/annotate.cpp:231
+#: eeschema/annotate.cpp:233
 msgid "Annotation complete."
 msgstr "批注完成。"
 
-#: eeschema/backanno.cpp:221
+#: eeschema/backanno.cpp:225
 msgid "Load Symbol Footprint Link File"
 msgstr "载入符号封装关联文件"
 
-#: eeschema/backanno.cpp:232
+#: eeschema/backanno.cpp:236
 msgid "Keep existing footprint field visibility"
 msgstr "保持当前的封装字段可见性"
 
-#: eeschema/backanno.cpp:233
+#: eeschema/backanno.cpp:237
 msgid "Show all footprint fields"
 msgstr "显示封装所有字段"
 
-#: eeschema/backanno.cpp:234
+#: eeschema/backanno.cpp:238
 msgid "Hide all footprint fields"
 msgstr "隐藏封装所有字段"
 
-#: eeschema/backanno.cpp:236
+#: eeschema/backanno.cpp:240
 msgid "Select the footprint field visibility setting."
 msgstr "选择封装字段可见性设置。"
 
-#: eeschema/backanno.cpp:237
+#: eeschema/backanno.cpp:241
 msgid "Change Visibility"
 msgstr "修改可见性"
 
-#: eeschema/backanno.cpp:248
+#: eeschema/backanno.cpp:252
 #, c-format
 msgid "Failed to open component-footprint link file \"%s\""
 msgstr "无法打开元件封装链接文件\"%s\""
 
-#: eeschema/block.cpp:471
+#: eeschema/block.cpp:397
 msgid "No item to paste."
 msgstr "没有粘贴项。"
 
-#: eeschema/block.cpp:501 eeschema/files-io.cpp:468 eeschema/sheet.cpp:274
+#: eeschema/block.cpp:432 eeschema/files-io.cpp:472 eeschema/sheet.cpp:276
 #, c-format
 msgid ""
 "The sheet changes cannot be made because the destination sheet already has "
@@ -4026,7 +4162,7 @@ msgstr ""
 "该图页无法作出更改，因为目标图页已经有图页<%s>或它的子图页作为上层某处原理图"
 "层次。"
 
-#: eeschema/class_libentry.cpp:570
+#: eeschema/class_libentry.cpp:587
 #, c-format
 msgid ""
 "An attempt was made to remove the %s field from component %s in library %s."
@@ -4047,7 +4183,7 @@ msgstr ""
 msgid "Unable to load project's \"%s\" file"
 msgstr "无法读取工程文件%s"
 
-#: eeschema/class_library.cpp:577 eeschema/lib_edit_frame.cpp:1526
+#: eeschema/class_library.cpp:577 eeschema/libedit/lib_edit_frame.cpp:1593
 #: eeschema/symbol_tree_model_adapter.cpp:61
 msgid "Loading Symbol Libraries"
 msgstr "加载符号库"
@@ -4106,22 +4242,22 @@ 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/component_references_lister.cpp:704
+#: eeschema/component_references_lister.cpp:702
 #, c-format
 msgid "Duplicate time stamp (%s) for %s%d and %s%d"
 msgstr "重复时间戳 (%s) 在 %s%d 和 %s%d"
 
-#: eeschema/controle.cpp:185 eeschema/lib_edit_frame.cpp:1271
-#: pcbnew/controle.cpp:228 pcbnew/footprint_editor_utils.cpp:135
-#: pcbnew/tools/selection_tool.cpp:527
+#: eeschema/controle.cpp:203 eeschema/libedit/lib_edit_frame.cpp:1341
+#: pcbnew/controle.cpp:228 pcbnew/footprint_editor_utils.cpp:136
+#: pcbnew/tools/selection_tool.cpp:556
 msgid "Clarify Selection"
 msgstr "明确选择"
 
-#: eeschema/cross-probing.cpp:82
+#: eeschema/cross-probing.cpp:83
 msgid "Selected net: "
 msgstr "选择网络: "
 
-#: eeschema/cross-probing.cpp:280
+#: eeschema/cross-probing.cpp:284
 msgid "Schematic saved"
 msgstr "原理图已保存"
 
@@ -4145,13 +4281,11 @@ msgstr "清除并批注当前图页所有符号?"
 msgid ""
 "\n"
 "\n"
-"This operation will change the current annotation and cannot \n"
-"be undone."
+"This operation will change the current annotation and cannot be undone."
 msgstr ""
 "\n"
 "\n"
-"该操作将改变已有的批注\n"
-"并且不可撤销。"
+"该操作将改变当前批注并且不可撤销。"
 
 #: eeschema/dialogs/dialog_annotate.cpp:217
 msgid "Clear and Annotate"
@@ -4245,41 +4379,41 @@ msgstr "参考编号X1000"
 msgid "Annotate Schematic"
 msgstr "批注序号"
 
-#: eeschema/dialogs/dialog_bom.cpp:234
+#: eeschema/dialogs/dialog_bom.cpp:237
 msgid "Generate"
 msgstr "生成"
 
-#: eeschema/dialogs/dialog_bom.cpp:353
+#: eeschema/dialogs/dialog_bom.cpp:358
 #, c-format
 msgid "Failed to open file \"%s\"."
 msgstr "无法打开文件 \"%s\"。"
 
-#: eeschema/dialogs/dialog_bom.cpp:464 eeschema/dialogs/dialog_bom_base.cpp:43
+#: eeschema/dialogs/dialog_bom.cpp:468 eeschema/dialogs/dialog_bom_base.cpp:43
 msgid "Plugin nickname:"
 msgstr "插件昵称："
 
-#: eeschema/dialogs/dialog_bom.cpp:464
+#: eeschema/dialogs/dialog_bom.cpp:468
 msgid "Add Plugin"
 msgstr "添加插件"
 
-#: eeschema/dialogs/dialog_bom.cpp:474
+#: eeschema/dialogs/dialog_bom.cpp:479
 #, c-format
 msgid "Nickname \"%s\" already in use."
 msgstr "昵称 \"%s\"已经被占用了。"
 
-#: eeschema/dialogs/dialog_bom.cpp:502 eeschema/dialogs/dialog_netlist.cpp:845
+#: eeschema/dialogs/dialog_bom.cpp:510 eeschema/dialogs/dialog_netlist.cpp:845
 msgid "Plugin files:"
 msgstr "插件文件:"
 
-#: eeschema/dialogs/dialog_bom.cpp:619
+#: eeschema/dialogs/dialog_bom.cpp:630
 msgid "Plugin file name not found."
 msgstr "没有找到插件文件名。"
 
-#: eeschema/dialogs/dialog_bom.cpp:629
+#: eeschema/dialogs/dialog_bom.cpp:640
 msgid "No text editor selected in KiCad.  Please choose one."
 msgstr "KiCad中未选择任何文本编辑器，请选择一个。"
 
-#: eeschema/dialogs/dialog_bom.cpp:635
+#: eeschema/dialogs/dialog_bom.cpp:646
 msgid "Bom Generation Help"
 msgstr "Bom 生成帮助"
 
@@ -4320,14 +4454,32 @@ msgstr ""
 msgid "Bill of Material"
 msgstr "BOM 材料清单"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:128
+#: eeschema/dialogs/dialog_choose_component.cpp:129
 #: pcbnew/dialogs/dialog_choose_footprint.cpp:104
 msgid "Select with Browser"
 msgstr "在符号库浏览器中选择"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:305
-#: eeschema/dialogs/dialog_choose_component.cpp:366
-#: eeschema/dialogs/dialog_choose_component.cpp:416
+#: eeschema/dialogs/dialog_choose_component.cpp:308
+#: eeschema/widgets/symbol_preview_widget.cpp:143
+#, c-format
+msgid ""
+"Error loading symbol %s from library %s.\n"
+"\n"
+"%s"
+msgstr ""
+"从库中%s加载符号发生错误%s。\n"
+"\n"
+"%s"
+
+#: eeschema/dialogs/dialog_choose_component.cpp:331
+msgid "No footprint specified"
+msgstr "没有指定封装"
+
+#: eeschema/dialogs/dialog_choose_component.cpp:345
+msgid "Invalid footprint specified"
+msgstr "指定的封装无效"
+
+#: eeschema/dialogs/dialog_choose_component.cpp:368
 #: eeschema/generate_alias_info.cpp:81
 #, c-format
 msgid ""
@@ -4339,75 +4491,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/dialog_choose_component.cpp:329
-msgid "No footprint specified"
-msgstr "没有指定封装"
-
-#: eeschema/dialogs/dialog_choose_component.cpp:343
-msgid "Invalid footprint specified"
-msgstr "指定的封装无效"
-
-#: eeschema/dialogs/dialog_choose_component.cpp:531
+#: eeschema/dialogs/dialog_choose_component.cpp:429
 msgid "No symbol selected"
 msgstr "没有选择符号"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:219
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:226
 #: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:359
 msgid "References must start with a letter."
 msgstr "参考编号必须以字母开头。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:238
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:246
 #: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:411
 msgid "Fields must have a name."
 msgstr "字段必须要有名称。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:249
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:258
 msgid "Delete extra units from symbol?"
 msgstr "是否删除符号多余单元?"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:255
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:264
 msgid "Add new pins for alternate body style (DeMorgan) to symbol?"
 msgstr "添加一个新的引脚到符号的备用主体 ( 德摩根 )？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:260
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:269
 msgid "Delete alternate body style (DeMorgan) draw items from symbol?"
 msgstr "确定从符号中删除备用主体样式（德摩根）的图形项？"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:387
-#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:592
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:415
+#: eeschema/dialogs/dialog_edit_component_in_schematic.cpp:593
 #, c-format
 msgid "The first %d fields are mandatory."
 msgstr "首字段%d是必填字段。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:586
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:605
 #, c-format
 msgid "Alias \"%s\" already exists."
 msgstr "别名\"%s\" 已经存在."
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:601
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:620
 #, c-format
 msgid "Symbol name \"%s\" already exists in library \"%s\"."
 msgstr "符号名称 \"%s\" 已经在库 \"%s\" 中存在。"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:617
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:636
 msgid "untitled"
 msgstr "无标题"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:621
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:640
 #, c-format
 msgid "untitled%i"
 msgstr "无标题%i"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:669
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:707
-msgid "Filter:"
-msgstr "过滤："
-
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:669
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:688
 msgid "Add Footprint Filter"
 msgstr "添加封装过滤"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:707
+#: eeschema/dialogs/dialog_edit_component_in_lib.cpp:726
 msgid "Edit Footprint Filter"
 msgstr "编辑封装过滤"
 
@@ -4420,8 +4559,8 @@ msgstr "字段"
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:58
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:321
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:50
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:617
-#: eeschema/fields_grid_table.cpp:129
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:655
+#: eeschema/fields_grid_table.cpp:136
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:54
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:54
 #: pcbnew/text_mod_grid_table.cpp:86
@@ -4431,34 +4570,34 @@ msgstr "显示"
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:59
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:322
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:51
-#: eeschema/fields_grid_table.cpp:130
+#: eeschema/fields_grid_table.cpp:137
 msgid "H Align"
 msgstr "水平排列"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:60
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:323
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:52
-#: eeschema/fields_grid_table.cpp:131
+#: eeschema/fields_grid_table.cpp:138
 msgid "V Align"
 msgstr "垂直排列"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:63
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:326
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:55
-#: eeschema/fields_grid_table.cpp:134
+#: eeschema/fields_grid_table.cpp:141
 msgid "Text Size"
 msgstr "文本大小"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:64
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:327
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:56
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:170
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:173
 #: eeschema/dialogs/dialog_edit_label_base.cpp:83
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:77
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:48
-#: eeschema/fields_grid_table.cpp:135 eeschema/lib_pin.cpp:1729
-#: eeschema/onrightclick.cpp:398 eeschema/onrightclick.cpp:809
-#: eeschema/sch_text.cpp:660
+#: eeschema/fields_grid_table.cpp:142 eeschema/lib_pin.cpp:1735
+#: eeschema/onrightclick.cpp:406 eeschema/onrightclick.cpp:816
+#: eeschema/sch_text.cpp:593
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:60
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:148
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:60
@@ -4471,7 +4610,7 @@ msgstr "方向"
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:57
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:81
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:52
-#: eeschema/fields_grid_table.cpp:136
+#: eeschema/fields_grid_table.cpp:143
 msgid "X Position"
 msgstr "X 坐标"
 
@@ -4480,7 +4619,7 @@ msgstr "X 坐标"
 #: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:58
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:82
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:53
-#: eeschema/fields_grid_table.cpp:137
+#: eeschema/fields_grid_table.cpp:144
 msgid "Y Position"
 msgstr "Y 坐标"
 
@@ -4500,8 +4639,8 @@ msgid "Keywords:"
 msgstr "关键字："
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:159
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:115
-#: eeschema/libedit.cpp:772
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:118
+#: eeschema/libedit/libedit.cpp:806
 msgid "Symbol"
 msgstr "符号"
 
@@ -4540,6 +4679,7 @@ msgid ""
 msgstr "创建多单元符号时，勾选这个选项，所有单元都不能互换"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:201
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:74
 #: gerbview/dialogs/panel_gerbview_display_options_base.cpp:28
 #: pcbnew/dialogs/panel_pcbnew_display_options_base.cpp:29
 msgid "Annotations"
@@ -4607,8 +4747,8 @@ msgid "units"
 msgstr "单位"
 
 #: eeschema/dialogs/dialog_edit_component_in_lib_base.cpp:259
-#: eeschema/widgets/widget_eeschema_color_config.cpp:100
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:285
+#: eeschema/widgets/widget_eeschema_color_config.cpp:104
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:291
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:193
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:369
 msgid "General"
@@ -4655,7 +4795,7 @@ msgstr ""
 msgid "Footprint Filters"
 msgstr "封装过滤器"
 
-#: eeschema/dialogs/dialog_edit_component_in_lib_base.h:113
+#: eeschema/dialogs/dialog_edit_component_in_lib_base.h:115
 msgid "Library Symbol Properties"
 msgstr "符号库属性"
 
@@ -4668,31 +4808,31 @@ msgstr "库参考无效。"
 msgid "Symbol \"%s\" not found in library \"%s\"."
 msgstr "符号\"%s\"在库中\"%s\"没有找到。"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:100
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:103
 msgid "   Update Fields from Library...   "
 msgstr "  从库中更新字段...   "
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:101
+#: 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_base.cpp:123
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:126
 msgid "Library Reference:"
 msgstr "库参考："
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:131
+#: 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:143
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:146
 msgid "Unit:"
 msgstr "单位:"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:157
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:160
 msgid "Alternate symbol (DeMorgan)"
 msgstr "备用符号 (德摩根)"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:158
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:161
 msgid ""
 "Use the alternate shape of this symbol.\n"
 "For gates, this is the \"De Morgan\" conversion"
@@ -4700,7 +4840,7 @@ msgstr ""
 "使用此符号的备用形状。\n"
 "对于门而言，这是“德摩根”转换"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:168
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:171
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:103
 #: pcbnew/dialogs/dialog_create_array_base.cpp:71
 #: pcbnew/dialogs/dialog_create_array_base.cpp:82
@@ -4722,53 +4862,55 @@ msgstr ""
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:28
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:42
 #: pcbnew/dialogs/dialog_move_exact_base.cpp:56
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1142
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:136
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1144
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:53
 #: pcbnew/dialogs/dialog_position_relative_base.cpp:70
 msgid "0"
 msgstr "0"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:168
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:171
 msgid "+90"
 msgstr "+90"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:168
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:171
 msgid "+180"
 msgstr "+180"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:168
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:171
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:138
 msgid "-90"
 msgstr "-90"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:172
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:175
 msgid "Select if the symbol is to be rotated when drawn"
 msgstr "选择是否在绘制时旋转符号"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:176
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:179
 msgid "Mirror around X axis "
 msgstr "X轴镜像 "
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:176
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:179
 msgid "Mirror around Y axis "
 msgstr "Y轴镜像 "
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:178
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:181
 msgid "Aspect"
 msgstr "方向"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:180
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:183
 msgid "Pick the graphical transformation to be used when displaying the symbol"
 msgstr "指定元件显示图形变换时使用"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:197
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:200
 msgid "Unique ID:"
 msgstr "唯一ID："
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:202
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:205
 msgid "Unique ID that identifies the symbol"
 msgstr "标识符号的唯一ID"
 
-#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:212
+#: eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp:215
 msgid "   Edit Spice Model...   "
 msgstr "  编辑Spice模型...  "
 
@@ -4777,32 +4919,32 @@ msgstr "  编辑Spice模型...  "
 msgid "Symbol Properties"
 msgstr "符号属性"
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:568
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:579
 #, c-format
 msgid "Symbol library identifier \"%s\" is not valid."
 msgstr "符号库标识符 \"%s\" 无效."
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:686
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:697
 #, c-format
 msgid "Available Candidates for %s "
 msgstr "\"%s\"的可用候选"
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:690
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:701
 #, c-format
 msgid "Candidates count %d "
 msgstr "Candidates计数: %d "
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:700
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:711
 #, c-format
 msgid "%u link(s) mapped, %d not found"
 msgstr "已映射 %u 链接，未找到 %d"
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:704
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:715
 #, c-format
 msgid "All %u link(s) resolved"
 msgstr "所有 %u 链接已解决"
 
-#: eeschema/dialogs/dialog_edit_components_libid.cpp:727
+#: eeschema/dialogs/dialog_edit_components_libid.cpp:738
 msgid "Invalid symbol library identifier"
 msgstr "无效的符号库标识符"
 
@@ -4836,7 +4978,7 @@ msgstr ""
 "如果某些元件是孤立的（无法找到链接的符号），\n"
 "尝试在加载的符号库之一中找到具有相同名称的候选者"
 
-#: eeschema/dialogs/dialog_edit_components_libid_base.h:65
+#: eeschema/dialogs/dialog_edit_components_libid_base.h:62
 msgid "Symbol Library References"
 msgstr "库符号库参考"
 
@@ -4889,8 +5031,8 @@ msgstr "文本大小："
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:81
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:120
-#: eeschema/fields_grid_table.cpp:93 eeschema/fields_grid_table.cpp:295
-#: eeschema/fields_grid_table.cpp:368 eeschema/lib_pin.cpp:116
+#: eeschema/fields_grid_table.cpp:99 eeschema/fields_grid_table.cpp:301
+#: eeschema/fields_grid_table.cpp:387 eeschema/lib_pin.cpp:116
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:86
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:129
 msgid "Right"
@@ -4902,8 +5044,8 @@ msgstr "向上"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:81
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:120
-#: eeschema/fields_grid_table.cpp:91 eeschema/fields_grid_table.cpp:293
-#: eeschema/fields_grid_table.cpp:364 eeschema/lib_pin.cpp:117
+#: eeschema/fields_grid_table.cpp:97 eeschema/fields_grid_table.cpp:297
+#: eeschema/fields_grid_table.cpp:383 eeschema/lib_pin.cpp:117
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:86
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:129
 msgid "Left"
@@ -4917,29 +5059,29 @@ msgstr "向下"
 msgid "Bold and italic"
 msgstr "加粗斜体"
 
-#: eeschema/dialogs/dialog_edit_label_base.cpp:89 eeschema/lib_field.cpp:615
-#: eeschema/lib_pin.cpp:1715 eeschema/sch_text.cpp:671
+#: eeschema/dialogs/dialog_edit_label_base.cpp:89 eeschema/lib_field.cpp:614
+#: eeschema/lib_pin.cpp:1721 eeschema/sch_text.cpp:604
 msgid "Style"
 msgstr "样式"
 
 # 中文显示乱码，未来版本支持中文的话，再来翻译
 #: eeschema/dialogs/dialog_edit_label_base.cpp:93
 #: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:31 eeschema/pin_type.cpp:38
-#: eeschema/sch_text.cpp:681
+#: eeschema/sch_text.cpp:614
 msgid "Input"
 msgstr "Input"
 
 # 中文显示乱码，未来版本支持中文的话，再来翻译
 #: eeschema/dialogs/dialog_edit_label_base.cpp:93
 #: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:32 eeschema/pin_type.cpp:41
-#: eeschema/sch_text.cpp:682
+#: eeschema/sch_text.cpp:615
 msgid "Output"
 msgstr "Output"
 
 # 中文显示乱码，未来版本支持中文的话，再来翻译
 #: eeschema/dialogs/dialog_edit_label_base.cpp:93
 #: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:33 eeschema/pin_type.cpp:44
-#: eeschema/sch_text.cpp:683
+#: eeschema/sch_text.cpp:616
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
@@ -4953,12 +5095,12 @@ msgstr "Tri-state"
 #: eeschema/dialogs/dialog_edit_label_base.cpp:93
 #: eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp:35
 #: eeschema/dialogs/dialog_spice_model_base.cpp:199 eeschema/pin_type.cpp:50
-#: eeschema/sch_text.cpp:685
+#: eeschema/sch_text.cpp:618
 msgid "Passive"
 msgstr "Passive"
 
 #: eeschema/dialogs/dialog_edit_label_base.cpp:95
-#: pcbnew/class_drawsegment.cpp:446
+#: pcbnew/class_drawsegment.cpp:445
 msgid "Shape"
 msgstr "形状"
 
@@ -4976,7 +5118,7 @@ msgstr "颜色："
 
 #: eeschema/dialogs/dialog_edit_line_style_base.cpp:62
 #: pcbnew/dialogs/dialog_copper_zones_base.cpp:203
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:388
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:394
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:296
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:517
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
@@ -5003,10 +5145,14 @@ msgstr "线型："
 msgid "Line Style"
 msgstr "线型"
 
-#: eeschema/dialogs/dialog_edit_one_field.cpp:217
+#: eeschema/dialogs/dialog_edit_one_field.cpp:190
 msgid "Illegal reference field value!"
 msgstr "非法参考编号值！"
 
+#: eeschema/dialogs/dialog_edit_one_field.cpp:198
+msgid "Value may not be empty."
+msgstr "值不能为空。"
+
 #: eeschema/dialogs/dialog_erc.cpp:92
 msgid "Run"
 msgstr "运行"
@@ -5036,11 +5182,11 @@ msgstr "需要注释！"
 msgid "Pin %s on %s is connected to both %s and %s"
 msgstr "%s上引脚%s既连接到%s有连接到%s"
 
-#: eeschema/dialogs/dialog_erc.cpp:636 pcbnew/drc.cpp:529
+#: eeschema/dialogs/dialog_erc.cpp:644 pcbnew/drc.cpp:532
 msgid "Finished"
 msgstr "完成"
 
-#: eeschema/dialogs/dialog_erc.cpp:643
+#: eeschema/dialogs/dialog_erc.cpp:651
 msgid "ERC File"
 msgstr "ERC文件"
 
@@ -5124,43 +5270,45 @@ msgstr "选项"
 msgid "Electrical Rules Checker"
 msgstr "电气规则检查 (ERC)"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:67
-#: eeschema/fields_grid_table.cpp:450
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:68
+#: eeschema/fields_grid_table.cpp:469
 msgid "Select Footprint..."
 msgstr "选择封装..."
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:67
-#: eeschema/fields_grid_table.cpp:450
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:68
+#: eeschema/fields_grid_table.cpp:469
 msgid "Browse for footprint"
 msgstr "浏览封装"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:72
-#: eeschema/fields_grid_table.cpp:455 eeschema/menubar_libedit.cpp:270
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:73
+#: eeschema/fields_grid_table.cpp:474 eeschema/hotkeys.cpp:209
+#: eeschema/libedit/menubar_libedit.cpp:279 eeschema/onrightclick.cpp:360
+#: eeschema/onrightclick.cpp:472
 msgid "Show Datasheet"
 msgstr "显示数据手册"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:72
-#: eeschema/fields_grid_table.cpp:455
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:73
+#: eeschema/fields_grid_table.cpp:474
 msgid "Show datasheet in browser"
 msgstr "在浏览器中显示数据书册"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:212
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:213
 msgid "Qty"
 msgstr "数量"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:616
-#: eeschema/lib_field.cpp:624 eeschema/lib_field.h:105
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:654
+#: eeschema/lib_field.cpp:623 eeschema/lib_field.h:105
 #: eeschema/template_fieldnames.cpp:51
 msgid "Field"
 msgstr "字段"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:618
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:656
 msgid "Group By"
 msgstr "分组依据"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:778
-#: eeschema/dialogs/dialog_rescue_each.cpp:112 eeschema/lib_field.cpp:440
-#: eeschema/sch_component.cpp:1409 eeschema/sch_component.cpp:1449
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:832
+#: eeschema/dialogs/dialog_rescue_each.cpp:122 eeschema/lib_field.cpp:441
+#: eeschema/sch_component.cpp:1442 eeschema/sch_component.cpp:1482
 #: eeschema/template_fieldnames.cpp:47
 #: eeschema/widgets/widget_eeschema_color_config.cpp:75
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:69
@@ -5169,50 +5317,50 @@ msgstr "分组依据"
 msgid "Reference"
 msgstr "参考"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:780
-#: eeschema/lib_field.cpp:454 eeschema/sch_component.cpp:1438
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:834
+#: eeschema/lib_field.cpp:455 eeschema/sch_component.cpp:1471
 #: eeschema/template_fieldnames.cpp:49 pcbnew/class_edge_mod.cpp:285
-#: pcbnew/class_module.cpp:630 pcbnew/class_pad.cpp:721
-#: pcbnew/class_text_mod.cpp:378 pcbnew/load_select_footprint.cpp:366
+#: pcbnew/class_module.cpp:636 pcbnew/class_pad.cpp:730
+#: pcbnew/class_text_mod.cpp:378 pcbnew/load_select_footprint.cpp:337
 msgid "Footprint"
 msgstr "封装"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:781
-#: eeschema/lib_field.cpp:461 eeschema/libedit.cpp:777
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:835
+#: eeschema/lib_field.cpp:462 eeschema/libedit/libedit.cpp:811
 #: eeschema/template_fieldnames.cpp:50
 msgid "Datasheet"
 msgstr "数据手册"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:800
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:854
 msgid "New field name:"
 msgstr "新字段名称："
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:800
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:854
 msgid "Add Field"
 msgstr "添加字段"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:809
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:863
 msgid "Field must have a name."
 msgstr "字段必须要有一个名称。"
 
-#: eeschema/dialogs/dialog_fields_editor_global.cpp:817
+#: eeschema/dialogs/dialog_fields_editor_global.cpp:871
 #, c-format
 msgid "Field name \"%s\" already in use."
 msgstr "字段名称 \"%s\" 已经在使用。"
 
-#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:29
+#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:31
 msgid "Group symbols"
 msgstr "分组符号"
 
-#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:31
+#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:33
 msgid "Group components together based on common properties"
 msgstr "根据公共属性将元件组合在一起"
 
-#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:51
+#: eeschema/dialogs/dialog_fields_editor_global_base.cpp:53
 msgid "Add Field..."
 msgstr "添加字段..."
 
-#: eeschema/dialogs/dialog_fields_editor_global_base.h:74
+#: eeschema/dialogs/dialog_fields_editor_global_base.h:76
 msgid "Symbol Fields"
 msgstr "符号字段"
 
@@ -5331,39 +5479,39 @@ msgid "Configure Global Symbol Library Table"
 msgstr "配置全局符号库表"
 
 #: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:25
-msgid "Line Width:"
+msgid "Line width:"
 msgstr "线宽："
 
 #: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:39
+msgid "Do not fill"
+msgstr "不填充"
+
+#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:39
+msgid "Fill with body outline color"
+msgstr "填充主体轮廓颜色"
+
+#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:39
+msgid "Fill with body background color"
+msgstr "填充主体背景颜色"
+
+#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:41
+msgid "Fill Style"
+msgstr "填充样式"
+
+#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:45
 msgid "Common to all &units in component"
 msgstr "元件中所有单元共用(&U)"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:42
+#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:48
 #: eeschema/dialogs/dialog_lib_edit_pin_base.cpp:147
 msgid "Common to all body &styles (DeMorgan)"
 msgstr "所有主体风格(德摩根)共用 (&S)"
 
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:48
-msgid "Do not fill"
-msgstr "不填充"
-
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:48
-msgid "Fill foreground"
-msgstr "前景填充"
-
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:48
-msgid "Fill background"
-msgstr "背景填充"
-
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp:50
-msgid "Fill Style"
-msgstr "填充样式"
-
-#: eeschema/dialogs/dialog_lib_edit_draw_item_base.h:50
+#: eeschema/dialogs/dialog_lib_edit_draw_item_base.h:52
 msgid "Drawing Properties"
 msgstr "图形特性"
 
-#: eeschema/dialogs/dialog_lib_edit_pin.cpp:115
+#: eeschema/dialogs/dialog_lib_edit_pin.cpp:116
 #, c-format
 msgid ""
 "This pin is not on a %d mils grid which will make it\n"
@@ -5440,7 +5588,7 @@ msgstr "引脚属性"
 
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:73
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:44
-#: eeschema/lib_pin.cpp:1709
+#: eeschema/lib_pin.cpp:1715
 msgid "Number"
 msgstr "编号"
 
@@ -5466,7 +5614,7 @@ msgstr "名称文本尺寸"
 
 #: eeschema/dialogs/dialog_lib_edit_pin_table.cpp:80
 #: eeschema/dialogs/dialog_lib_edit_pin_table_base.cpp:51
-#: eeschema/lib_pin.cpp:1726 pcbnew/class_drawsegment.cpp:475
+#: eeschema/lib_pin.cpp:1732 pcbnew/class_drawsegment.cpp:474
 #: pcbnew/class_track.cpp:1068
 msgid "Length"
 msgstr "长度"
@@ -5495,7 +5643,7 @@ msgstr "选择"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:55
 #: eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp:39
-#: eeschema/lib_pin.cpp:1722
+#: eeschema/lib_pin.cpp:1728
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:120
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:91
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:47
@@ -5505,31 +5653,31 @@ msgstr "可见"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:66
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:119
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:86
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:87
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:157
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:165
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:162
 msgid "Position X:"
 msgstr "位置 X:"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:90
-#: eeschema/fields_grid_table.cpp:99 eeschema/fields_grid_table.cpp:312
-#: eeschema/fields_grid_table.cpp:391 eeschema/sch_text.cpp:640
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:195
+#: eeschema/fields_grid_table.cpp:105 eeschema/fields_grid_table.cpp:326
+#: eeschema/fields_grid_table.cpp:410 eeschema/sch_text.cpp:586
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:196
 msgid "Horizontal"
 msgstr "水平"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:90
-#: eeschema/fields_grid_table.cpp:100 eeschema/fields_grid_table.cpp:313
-#: eeschema/fields_grid_table.cpp:393
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:195
+#: eeschema/fields_grid_table.cpp:106 eeschema/fields_grid_table.cpp:328
+#: eeschema/fields_grid_table.cpp:412
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:196
 msgid "Vertical"
 msgstr "垂直"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:96
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:130
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:97
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:98
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:174
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:176
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:173
 msgid "Position Y:"
 msgstr "位置 Y:"
 
@@ -5548,15 +5696,15 @@ msgid "V Align:"
 msgstr "垂直对齐："
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:150
-#: eeschema/fields_grid_table.cpp:83 eeschema/fields_grid_table.cpp:301
-#: eeschema/fields_grid_table.cpp:375
+#: eeschema/fields_grid_table.cpp:89 eeschema/fields_grid_table.cpp:310
+#: eeschema/fields_grid_table.cpp:394
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:99
 msgid "Top"
 msgstr "上对齐"
 
 #: eeschema/dialogs/dialog_lib_edit_text_base.cpp:150
-#: eeschema/fields_grid_table.cpp:85 eeschema/fields_grid_table.cpp:303
-#: eeschema/fields_grid_table.cpp:379
+#: eeschema/fields_grid_table.cpp:91 eeschema/fields_grid_table.cpp:314
+#: eeschema/fields_grid_table.cpp:398
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:99
 msgid "Bottom"
 msgstr "下对齐"
@@ -5709,9 +5857,9 @@ msgstr "默认网表文件名:"
 
 #: eeschema/dialogs/dialog_netlist_base.cpp:114
 #: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:28
-#: eeschema/libedit.cpp:408
+#: eeschema/libedit/libedit.cpp:413
 #: pcb_calculator/dialogs/dialog_regulator_data_base.cpp:26
-#: pcbnew/footprint_libraries_utils.cpp:745
+#: pcbnew/footprint_libraries_utils.cpp:888
 msgid "Name:"
 msgstr "名称："
 
@@ -5785,10 +5933,12 @@ msgid "A3"
 msgstr "A3"
 
 #: eeschema/dialogs/dialog_plot_schematic.cpp:222
+#: qa/common/test_hotkey_store.cpp:33
 msgid "A2"
 msgstr "A2"
 
 #: eeschema/dialogs/dialog_plot_schematic.cpp:223
+#: qa/common/test_hotkey_store.cpp:32
 msgid "A1"
 msgstr "A1"
 
@@ -5941,8 +6091,8 @@ msgid "Plot Schematic Options"
 msgstr "绘制原理图选项"
 
 #: eeschema/dialogs/dialog_print_using_printer.cpp:154
-#: eeschema/dialogs/dialog_print_using_printer_base.h:56
-#: eeschema/hotkeys.cpp:224 gerbview/dialogs/dialog_print_using_printer.cpp:405
+#: eeschema/dialogs/dialog_print_using_printer_base.h:53
+#: eeschema/hotkeys.cpp:229 gerbview/dialogs/dialog_print_using_printer.cpp:405
 #: gerbview/dialogs/dialog_print_using_printer_base.cpp:103
 #: gerbview/dialogs/dialog_print_using_printer_base.h:71
 #: pagelayout_editor/hotkeys.cpp:101
@@ -5954,20 +6104,20 @@ msgstr "绘制原理图选项"
 msgid "Print"
 msgstr "打印"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:290
+#: eeschema/dialogs/dialog_print_using_printer.cpp:282
 msgid "Print Schematic"
 msgstr "打印原理图"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:299
+#: eeschema/dialogs/dialog_print_using_printer.cpp:291
 msgid "An error occurred attempting to print the schematic."
 msgstr "打印原理图时出现错误。"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:300
+#: eeschema/dialogs/dialog_print_using_printer.cpp:292
 #: pagelayout_editor/dialogs/dialogs_for_printing.cpp:225
 msgid "Printing"
 msgstr "打印"
 
-#: eeschema/dialogs/dialog_print_using_printer.cpp:322
+#: eeschema/dialogs/dialog_print_using_printer.cpp:314
 #, c-format
 msgid "Print page %d"
 msgstr "打印页面 %d"
@@ -5989,7 +6139,7 @@ msgstr "仅黑白双色打印 (&B)"
 msgid "Page Setup..."
 msgstr "页面设置..."
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:83
+#: eeschema/dialogs/dialog_rescue_each.cpp:93
 msgid ""
 "This schematic was made using older symbol libraries which may break the "
 "schematic.  Some symbols may need to be linked to a different symbol name.  "
@@ -6003,26 +6153,26 @@ msgstr ""
 "\n"
 "建议进行以下更改以更新工程。"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:90
+#: eeschema/dialogs/dialog_rescue_each.cpp:100
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:199
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:642
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:632
 msgid "Accept"
 msgstr "确定"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:104
+#: eeschema/dialogs/dialog_rescue_each.cpp:114
 msgid "Symbol Name"
 msgstr "符号名称"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:108
+#: eeschema/dialogs/dialog_rescue_each.cpp:118
 msgid "Action Taken"
 msgstr "采取措施"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:210
+#: eeschema/dialogs/dialog_rescue_each.cpp:221
 #, c-format
 msgid "Instances of this symbol (%d items):"
 msgstr "此符号的实例（%d项）："
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:319
+#: eeschema/dialogs/dialog_rescue_each.cpp:278
 msgid ""
 "Stop showing this tool?\n"
 "No changes will be made.\n"
@@ -6036,27 +6186,27 @@ msgstr ""
 "该设置可以从 “符号库” 对话框进行更改，\n"
 "并且可以从 “工具” 菜单手动激活该工具。"
 
-#: eeschema/dialogs/dialog_rescue_each.cpp:323
+#: eeschema/dialogs/dialog_rescue_each.cpp:282
 msgid "Rescue Symbols"
 msgstr "恢复符号"
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:22
+#: eeschema/dialogs/dialog_rescue_each_base.cpp:25
 msgid "Symbols to update:"
 msgstr "更新元件符号："
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:31
+#: eeschema/dialogs/dialog_rescue_each_base.cpp:34
 msgid "Instances of this symbol:"
 msgstr "符号属性："
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:46
+#: eeschema/dialogs/dialog_rescue_each_base.cpp:49
 msgid "Cached Symbol:"
 msgstr "缓存符号："
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:63
+#: eeschema/dialogs/dialog_rescue_each_base.cpp:70
 msgid "Library Symbol:"
 msgstr "库符号："
 
-#: eeschema/dialogs/dialog_rescue_each_base.cpp:83
+#: eeschema/dialogs/dialog_rescue_each_base.cpp:94
 msgid "Never Show Again"
 msgstr "不再显示"
 
@@ -6067,14 +6217,14 @@ msgstr "工程恢复助手"
 
 #: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:42
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:128
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:502
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:492
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:175
 msgid "Text height:"
 msgstr "文本高度:"
 
 #: eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp:53
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:121
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:495
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:485
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:156
 msgid "Text width:"
 msgstr "文本宽度:"
@@ -6118,7 +6268,7 @@ msgstr "原理图页属性"
 msgid "Find"
 msgstr "查找"
 
-#: eeschema/dialogs/dialog_schematic_find.cpp:48 eeschema/hotkeys.cpp:195
+#: eeschema/dialogs/dialog_schematic_find.cpp:48 eeschema/hotkeys.cpp:198
 msgid "Find and Replace"
 msgstr "查找和替换"
 
@@ -6200,6 +6350,15 @@ msgstr "替换所有 (&A)"
 msgid "Status..."
 msgstr "状态..."
 
+#: eeschema/dialogs/dialog_set_grid_base.cpp:25
+msgid "&Grid size:"
+msgstr "网格尺寸(&G):"
+
+#: eeschema/dialogs/dialog_set_grid_base.h:54
+#: pcbnew/dialogs/dialog_set_grid_base.h:71
+msgid "Grid Settings"
+msgstr "网格设置"
+
 #: eeschema/dialogs/dialog_sim_settings.cpp:99
 msgid "You need to enable at least one source"
 msgstr "你需要启用至少一个源"
@@ -6362,16 +6521,16 @@ msgstr "时间步长："
 #: eeschema/dialogs/dialog_sim_settings_base.cpp:371
 #: eeschema/dialogs/dialog_sim_settings_base.cpp:385
 #: eeschema/dialogs/dialog_sim_settings_base.cpp:399
-#: eeschema/dialogs/dialog_spice_model_base.cpp:369
-#: eeschema/dialogs/dialog_spice_model_base.cpp:380
-#: eeschema/dialogs/dialog_spice_model_base.cpp:391
-#: eeschema/dialogs/dialog_spice_model_base.cpp:402
-#: eeschema/dialogs/dialog_spice_model_base.cpp:413
-#: eeschema/dialogs/dialog_spice_model_base.cpp:471
-#: eeschema/dialogs/dialog_spice_model_base.cpp:529
-#: eeschema/dialogs/dialog_spice_model_base.cpp:540
-#: eeschema/dialogs/dialog_spice_model_base.cpp:551
-#: eeschema/dialogs/dialog_spice_model_base.cpp:562
+#: eeschema/dialogs/dialog_spice_model_base.cpp:365
+#: eeschema/dialogs/dialog_spice_model_base.cpp:376
+#: eeschema/dialogs/dialog_spice_model_base.cpp:387
+#: eeschema/dialogs/dialog_spice_model_base.cpp:398
+#: eeschema/dialogs/dialog_spice_model_base.cpp:409
+#: eeschema/dialogs/dialog_spice_model_base.cpp:467
+#: eeschema/dialogs/dialog_spice_model_base.cpp:525
+#: eeschema/dialogs/dialog_spice_model_base.cpp:536
+#: eeschema/dialogs/dialog_spice_model_base.cpp:547
+#: eeschema/dialogs/dialog_spice_model_base.cpp:558
 msgid "seconds"
 msgstr "秒"
 
@@ -6416,7 +6575,27 @@ msgstr "为.include库指令添加完整路径"
 msgid "Simulation settings"
 msgstr "仿真设置"
 
-#: eeschema/dialogs/dialog_spice_model.cpp:738
+#: eeschema/dialogs/dialog_spice_model.cpp:72
+msgid "Diode"
+msgstr "二极管"
+
+#: eeschema/dialogs/dialog_spice_model.cpp:73
+msgid "BJT"
+msgstr "双极型晶体管"
+
+#: eeschema/dialogs/dialog_spice_model.cpp:74
+msgid "MOSFET"
+msgstr "MOSFET"
+
+#: eeschema/dialogs/dialog_spice_model.cpp:75
+msgid "JFET"
+msgstr "JFET"
+
+#: eeschema/dialogs/dialog_spice_model.cpp:76
+msgid "Subcircuit"
+msgstr "支路"
+
+#: eeschema/dialogs/dialog_spice_model.cpp:768
 msgid "Select library"
 msgstr "选择库"
 
@@ -6445,12 +6624,6 @@ msgstr "电感"
 msgid "Passive type"
 msgstr "无源类型"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:45
-#: eeschema/dialogs/dialog_spice_model_base.cpp:600
-#: pcbnew/dialogs/dialog_text_properties.cpp:91
-msgid "Value:"
-msgstr "值："
-
 #: eeschema/dialogs/dialog_spice_model_base.cpp:54
 msgid "Spice value in simulation"
 msgstr "仿真中的SPICE值"
@@ -6590,214 +6763,198 @@ msgstr "选择文件..."
 msgid "Model:"
 msgstr "模型："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:238
-msgid "Subcircuit"
-msgstr "支路"
-
-#: eeschema/dialogs/dialog_spice_model_base.cpp:239
-msgid "BJT"
-msgstr "双极型晶体管"
-
-#: eeschema/dialogs/dialog_spice_model_base.cpp:240
-msgid "MOSFET"
-msgstr "MOSFET"
-
-#: eeschema/dialogs/dialog_spice_model_base.cpp:241
-msgid "Diode"
-msgstr "二极管"
-
-#: eeschema/dialogs/dialog_spice_model_base.cpp:256
+#: eeschema/dialogs/dialog_spice_model_base.cpp:252
 msgid "Model"
 msgstr "模型"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:264
+#: eeschema/dialogs/dialog_spice_model_base.cpp:260
 msgid "DC/AC analysis:"
 msgstr "DC/AC分析："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:273
+#: eeschema/dialogs/dialog_spice_model_base.cpp:269
 msgid "DC:"
 msgstr "DC:"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:282
-#: eeschema/dialogs/dialog_spice_model_base.cpp:304
-#: eeschema/dialogs/dialog_spice_model_base.cpp:347
-#: eeschema/dialogs/dialog_spice_model_base.cpp:358
-#: eeschema/dialogs/dialog_spice_model_base.cpp:438
-#: eeschema/dialogs/dialog_spice_model_base.cpp:449
-#: eeschema/dialogs/dialog_spice_model_base.cpp:507
-#: eeschema/dialogs/dialog_spice_model_base.cpp:518
-#: eeschema/dialogs/dialog_spice_model_base.cpp:607
+#: eeschema/dialogs/dialog_spice_model_base.cpp:278
+#: eeschema/dialogs/dialog_spice_model_base.cpp:300
+#: eeschema/dialogs/dialog_spice_model_base.cpp:343
+#: eeschema/dialogs/dialog_spice_model_base.cpp:354
+#: eeschema/dialogs/dialog_spice_model_base.cpp:434
+#: eeschema/dialogs/dialog_spice_model_base.cpp:445
+#: eeschema/dialogs/dialog_spice_model_base.cpp:503
+#: eeschema/dialogs/dialog_spice_model_base.cpp:514
+#: eeschema/dialogs/dialog_spice_model_base.cpp:603
 msgid "Volts/Amps"
 msgstr "电压/电流"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:295
+#: eeschema/dialogs/dialog_spice_model_base.cpp:291
 msgid "AC magnitude:"
 msgstr "交流幅度："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:308
+#: eeschema/dialogs/dialog_spice_model_base.cpp:304
 msgid "AC phase:"
 msgstr "交流相位："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:317
+#: eeschema/dialogs/dialog_spice_model_base.cpp:313
 msgid "radians"
 msgstr "弧度"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:328
+#: eeschema/dialogs/dialog_spice_model_base.cpp:324
 msgid "Transient analysis:"
 msgstr "瞬态分析："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:338
-#: eeschema/dialogs/dialog_spice_model_base.cpp:498
+#: eeschema/dialogs/dialog_spice_model_base.cpp:334
+#: eeschema/dialogs/dialog_spice_model_base.cpp:494
 msgid "Initial value:"
 msgstr "初始值："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:351
-#: eeschema/dialogs/dialog_spice_model_base.cpp:511
+#: eeschema/dialogs/dialog_spice_model_base.cpp:347
+#: eeschema/dialogs/dialog_spice_model_base.cpp:507
 msgid "Pulsed value:"
 msgstr "脉冲值："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:362
+#: eeschema/dialogs/dialog_spice_model_base.cpp:358
 msgid "Delay time:"
 msgstr "延迟时间："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:373
+#: eeschema/dialogs/dialog_spice_model_base.cpp:369
 msgid "Rise time:"
 msgstr "上升时间："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:384
+#: eeschema/dialogs/dialog_spice_model_base.cpp:380
 msgid "Fall time:"
 msgstr "下降时间："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:395
+#: eeschema/dialogs/dialog_spice_model_base.cpp:391
 msgid "Pulse width:"
 msgstr "脉冲宽度："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:406
+#: eeschema/dialogs/dialog_spice_model_base.cpp:402
 msgid "Period:"
 msgstr "周期："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:421
+#: eeschema/dialogs/dialog_spice_model_base.cpp:417
 msgid "Pulse"
 msgstr "脉冲"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:429
+#: eeschema/dialogs/dialog_spice_model_base.cpp:425
 msgid "DC offset:"
 msgstr "直流偏移："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:442
+#: eeschema/dialogs/dialog_spice_model_base.cpp:438
 msgid "Amplitude:"
 msgstr "幅度："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:453
+#: eeschema/dialogs/dialog_spice_model_base.cpp:449
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:768
 #: pcb_calculator/transline_ident.cpp:156
 msgid "Frequency:"
 msgstr "频率："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:460
+#: eeschema/dialogs/dialog_spice_model_base.cpp:456
 #: pcb_calculator/UnitSelector.cpp:107
 msgid "Hz"
 msgstr "Hz"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:464
+#: eeschema/dialogs/dialog_spice_model_base.cpp:460
 msgid "Delay:"
 msgstr "延时："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:475
+#: eeschema/dialogs/dialog_spice_model_base.cpp:471
 msgid "Damping factor:"
 msgstr "阻尼因数："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:482
+#: eeschema/dialogs/dialog_spice_model_base.cpp:478
 msgid "1/seconds"
 msgstr "1/s"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:490
+#: eeschema/dialogs/dialog_spice_model_base.cpp:486
 msgid "Sinusoidal"
 msgstr "正弦"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:522
+#: eeschema/dialogs/dialog_spice_model_base.cpp:518
 msgid "Rise delay time:"
 msgstr "上升延迟时间："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:533
+#: eeschema/dialogs/dialog_spice_model_base.cpp:529
 msgid "Rise time constant:"
 msgstr "上升时间常数："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:544
+#: eeschema/dialogs/dialog_spice_model_base.cpp:540
 msgid "Fall delay time:"
 msgstr "下降延迟时间："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:555
+#: eeschema/dialogs/dialog_spice_model_base.cpp:551
 msgid "Fall time constant:"
 msgstr "下降延迟时间："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:570
+#: eeschema/dialogs/dialog_spice_model_base.cpp:566
 msgid "Exponential"
 msgstr "指数"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:572
+#: eeschema/dialogs/dialog_spice_model_base.cpp:568
 msgid "Piece-wise linear"
 msgstr "分段线性"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:587
+#: eeschema/dialogs/dialog_spice_model_base.cpp:583
 msgid "Time:"
 msgstr "时间："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:596
+#: eeschema/dialogs/dialog_spice_model_base.cpp:592
 msgid "second"
 msgstr "s"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:629
+#: eeschema/dialogs/dialog_spice_model_base.cpp:625
 msgid "Piece-wise Linear"
 msgstr "分段线性"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:633
+#: eeschema/dialogs/dialog_spice_model_base.cpp:629
 msgid "FM"
 msgstr "调频"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:637
+#: eeschema/dialogs/dialog_spice_model_base.cpp:633
 msgid "AM"
 msgstr "调幅"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:641
+#: eeschema/dialogs/dialog_spice_model_base.cpp:637
 msgid "Transient noise"
 msgstr "瞬态噪声"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:645
+#: eeschema/dialogs/dialog_spice_model_base.cpp:641
 msgid "Random"
 msgstr "随机"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:649
+#: eeschema/dialogs/dialog_spice_model_base.cpp:645
 msgid "External data"
 msgstr "外部数据"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:656
+#: eeschema/dialogs/dialog_spice_model_base.cpp:652
 #: eeschema/sim/sim_plot_panel.cpp:399
 msgid "Voltage"
 msgstr "V"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:656
+#: eeschema/dialogs/dialog_spice_model_base.cpp:652
 #: eeschema/sim/sim_plot_panel.cpp:389 eeschema/sim/sim_plot_panel.cpp:400
 msgid "Current"
 msgstr "电流"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:658
+#: eeschema/dialogs/dialog_spice_model_base.cpp:654
 msgid "Source type:"
 msgstr "源类型："
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:666
+#: eeschema/dialogs/dialog_spice_model_base.cpp:662
 msgid "Source"
 msgstr "源"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:673
+#: eeschema/dialogs/dialog_spice_model_base.cpp:669
 msgid "Disable symbol for simulation"
 msgstr "禁用符号仿真"
 
-#: eeschema/dialogs/dialog_spice_model_base.cpp:679
+#: eeschema/dialogs/dialog_spice_model_base.cpp:675
 msgid "Alternate node sequence:"
 msgstr "替代节点序列："
 
-#: eeschema/dialogs/dialog_spice_model_base.h:198
+#: eeschema/dialogs/dialog_spice_model_base.h:200
 msgid "Spice Model Editor"
 msgstr "Spice模型编辑器"
 
@@ -6934,7 +7091,7 @@ msgid "Remove fields not in library"
 msgstr "删除在库中不存在的字段"
 
 #: eeschema/dialogs/dialog_update_fields_base.cpp:50
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:102
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:101
 msgid "Removes fields that do not occur in the original library symbols"
 msgstr "删除原始库符号中不存在的字段"
 
@@ -6963,21 +7120,24 @@ msgid "Update Symbol Fields"
 msgstr "更新符号字段"
 
 #: eeschema/dialogs/panel_eeschema_display_options_base.cpp:26
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:28
-msgid "&Grid size:"
-msgstr "网格尺寸(&G):"
+msgid "Dimensions"
+msgstr "尺寸"
 
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:48
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:34
 msgid "&Bus thickness:"
 msgstr "总线宽度(&B):"
 
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:59
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:45
 msgid "&Line thickness:"
 msgstr "线宽 (&L):"
 
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:56
+msgid "Junction size:"
+msgstr "连接点大小："
+
 #: eeschema/dialogs/panel_eeschema_display_options_base.cpp:79
-msgid "&Part ID notation:"
-msgstr "部件ID符号(&P):"
+msgid "Symbol unit notation:"
+msgstr "符号单元代号："
 
 #: eeschema/dialogs/panel_eeschema_display_options_base.cpp:83
 msgid ".A"
@@ -7003,23 +7163,14 @@ msgstr "-1"
 msgid "_1"
 msgstr "_1"
 
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:98
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:41
-msgid "&Show grid"
-msgstr "显示网格(&S)"
-
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:101
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:95
 msgid "S&how hidden pins"
 msgstr "显示隐藏引脚(&H)"
 
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:104
+#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:98
 msgid "Show page limi&ts"
 msgstr "显示页面范围(&T)"
 
-#: eeschema/dialogs/panel_eeschema_display_options_base.cpp:111
-msgid "Show footprint previews in symbol chooser (experimental)"
-msgstr "在符号选择器中显示封装预览(实验)"
-
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:32
 msgid "&Measurement units:"
 msgstr "测量单位(&M):"
@@ -7039,17 +7190,17 @@ msgid "Def&ault text size:"
 msgstr "默认文本尺寸(&A)："
 
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:56
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:130
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:99
 msgid "&Horizontal pitch of repeated items:"
 msgstr "重复项目的水平间距(&H)："
 
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:67
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:141
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:110
 msgid "&Vertical pitch of repeated items:"
 msgstr "重复项目的垂直间距(&V)："
 
 #: eeschema/dialogs/panel_eeschema_settings_base.cpp:78
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:166
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:135
 msgid "&Increment of repeated labels:"
 msgstr "连续重复标签增量(&I):"
 
@@ -7057,15 +7208,23 @@ msgstr "连续重复标签增量(&I):"
 msgid "&Restrict buses and wires to H and V orientation"
 msgstr "限制总线和连线垂直或水平绘制(&R)"
 
-#: eeschema/dialogs/panel_eeschema_settings_base.cpp:100
+#: eeschema/dialogs/panel_eeschema_settings_base.cpp:97
+msgid "Show footprint previews in symbol chooser"
+msgstr "在符号选择器中显示封装预览"
+
+#: eeschema/dialogs/panel_eeschema_settings_base.cpp:104
+msgid "Symbol Field Automatic Placement"
+msgstr "自动放置符号字段"
+
+#: eeschema/dialogs/panel_eeschema_settings_base.cpp:106
 msgid "A&utomatically place symbol fields"
 msgstr "自动放置符号字段(&U)"
 
-#: eeschema/dialogs/panel_eeschema_settings_base.cpp:103
+#: eeschema/dialogs/panel_eeschema_settings_base.cpp:109
 msgid "A&llow field autoplace to change justification"
 msgstr "允许字段自动对齐放置(&L)"
 
-#: eeschema/dialogs/panel_eeschema_settings_base.cpp:106
+#: eeschema/dialogs/panel_eeschema_settings_base.cpp:112
 msgid "Al&ways align autoplaced fields to the 50 mil grid"
 msgstr "自动放置字段对齐到50mil网格(&W)"
 
@@ -7073,87 +7232,88 @@ msgstr "自动放置字段对齐到50mil网格(&W)"
 msgid "URL"
 msgstr "URL"
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:59
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:28
 msgid "&Default line width:"
 msgstr "默认线宽(&D):"
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:79
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:48
 msgid "D&efault pin length:"
 msgstr "默认引脚长度(&E):"
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:90
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:59
 msgid "De&fault pin number size:"
 msgstr "当前引脚编号尺寸(&F)："
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:101
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:70
 msgid "Def&ault pin name size:"
 msgstr "默认引脚名称尺寸(&A)："
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:112
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:81
 msgid "Show pin &electrical type"
 msgstr "显示引脚电气类型(&S)"
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:145
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:156
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:114
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:125
 msgid "100"
 msgstr "100"
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:152
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:121
 msgid "&Pitch of repeated pins:"
 msgstr "重复的引脚间距(&P):"
 
-#: eeschema/dialogs/panel_libedit_settings_base.cpp:156
+#: eeschema/dialogs/panel_libedit_settings_base.cpp:125
 msgid "50"
 msgstr "50"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:265
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:391
+#: eeschema/dialogs/panel_sym_lib_table.cpp:271
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:395
 #, c-format
 msgid "Illegal character '%c' in Nickname: \"%s\""
 msgstr "非法字符 '%c' 在昵称: \"%s\""
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:276
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:402
+#: eeschema/dialogs/panel_sym_lib_table.cpp:282
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:406
 msgid "No Colon in Nicknames"
 msgstr "别名没有冒号"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:305
+#: eeschema/dialogs/panel_sym_lib_table.cpp:309
 #, c-format
 msgid "Duplicate Nickname: \"%s\"."
 msgstr "重复的昵称：\"%s\"。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:315
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:441
+#: eeschema/dialogs/panel_sym_lib_table.cpp:319
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:443
 msgid "Please Delete or Modify One"
 msgstr "请删除或修改一个"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:354
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:602
+#: eeschema/dialogs/panel_sym_lib_table.cpp:358
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:625
 msgid "Warning: Duplicate Nickname"
 msgstr "警告：重复的别名"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:355
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:603
+#: eeschema/dialogs/panel_sym_lib_table.cpp:359
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:626
 #, c-format
 msgid "A library nicknamed \"%s\" already exists."
 msgstr "库别名 \"%s\"已经存在。"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:371
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:618
+#: eeschema/dialogs/panel_sym_lib_table.cpp:375
+#: eeschema/libedit/lib_edit_frame.cpp:1646
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:641
 msgid "Skip"
 msgstr "跳过"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:371
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:618
+#: eeschema/dialogs/panel_sym_lib_table.cpp:375
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:641
 msgid "Add Anyway"
 msgstr "仍然添加"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:681
+#: eeschema/dialogs/panel_sym_lib_table.cpp:703
 msgid "Symbol Libraries"
 msgstr "符号库"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:698
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:803
+#: eeschema/dialogs/panel_sym_lib_table.cpp:720
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:826
 #, c-format
 msgid ""
 "Error saving global library table:\n"
@@ -7164,15 +7324,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:699
-#: eeschema/dialogs/panel_sym_lib_table.cpp:713 eeschema/sch_base_frame.cpp:311
-#: eeschema/sch_base_frame.cpp:327 pcbnew/dialogs/panel_fp_lib_table.cpp:804
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:817 pcbnew/files.cpp:896
+#: eeschema/dialogs/panel_sym_lib_table.cpp:721
+#: eeschema/dialogs/panel_sym_lib_table.cpp:735 eeschema/sch_base_frame.cpp:338
+#: eeschema/sch_base_frame.cpp:354 pcbnew/dialogs/panel_fp_lib_table.cpp:827
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:840 pcbnew/files.cpp:901
 msgid "File Save Error"
 msgstr "文件存储错误"
 
-#: eeschema/dialogs/panel_sym_lib_table.cpp:712
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:816
+#: eeschema/dialogs/panel_sym_lib_table.cpp:734
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:839
 #, c-format
 msgid ""
 "Error saving project-specific library table:\n"
@@ -7183,43 +7343,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:18
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:18
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:20
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:20
 msgid "Libraries by Scope"
 msgstr "库的范围"
 
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:32
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:85
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:32
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:84
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:34
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:87
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:34
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:86
 #: pcbnew/import_dxf/dialog_dxf_import_base.cpp:24
 msgid "File:"
 msgstr "文件:"
 
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:36
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:89
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:36
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:88
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:38
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:91
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:38
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:90
 msgid "Table Name"
 msgstr "列表名称"
 
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:75
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:74
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:77
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:76
 msgid "Global Libraries"
 msgstr "全局库"
 
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:127
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:126
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:129
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:128
 msgid "Project Specific Libraries"
 msgstr "工程专用库"
 
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:159
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:158
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:161
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:160
 msgid "Path Substitutions:"
 msgstr "替换路径:"
 
-#: eeschema/dialogs/panel_sym_lib_table_base.cpp:188
-#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:187
+#: eeschema/dialogs/panel_sym_lib_table_base.cpp:190
+#: pcbnew/dialogs/panel_fp_lib_table_base.cpp:189
 msgid "This is a read-only table which shows pertinent environment variables."
 msgstr "这是只读列表,其显示了相关的环境变量。"
 
@@ -7276,19 +7436,19 @@ msgid ""
 "Different net assigned to a shared pin in another unit of the same component"
 msgstr "在同一元件的另一个单元中分配给共用引脚的不同网络"
 
-#: eeschema/edit_bitmap.cpp:115 eeschema/edit_bitmap.cpp:125
+#: eeschema/edit_bitmap.cpp:52 eeschema/edit_bitmap.cpp:62
 #: pagelayout_editor/pl_editor_frame.cpp:566
 #: pagelayout_editor/pl_editor_frame.cpp:574
 #, c-format
 msgid "Couldn't load image from \"%s\""
 msgstr "无法从\"%s\"加载图片"
 
-#: eeschema/edit_component_in_schematic.cpp:65 eeschema/libfield.cpp:58
+#: eeschema/edit_component_in_schematic.cpp:66 eeschema/libedit/libfield.cpp:58
 #, c-format
 msgid "Edit %s Field"
 msgstr "编辑 %s 字段"
 
-#: eeschema/eeschema.cpp:285
+#: eeschema/eeschema.cpp:289
 msgid ""
 "An error occurred attempting to load the global symbol library table.\n"
 "Please edit this global symbol library table in Preferences menu."
@@ -7296,28 +7456,29 @@ msgstr ""
 "试图加载全局符号库表时出错。\n"
 "请在首选项菜单中编辑这个全局符号库表。"
 
-#: eeschema/eeschema_config.cpp:156
+#: eeschema/eeschema_config.cpp:160
 msgid "Load Project File"
 msgstr "载入工程文件"
 
-#: eeschema/eeschema_config.cpp:204 eeschema/sch_edit_frame.cpp:1441
-#: eeschema/sch_edit_frame.cpp:1448
+#: eeschema/eeschema_config.cpp:208 eeschema/sch_edit_frame.cpp:1480
+#: eeschema/sch_edit_frame.cpp:1487
 msgid "Eeschema"
 msgstr "Eeschema"
 
-#: eeschema/eeschema_config.cpp:207
+#: eeschema/eeschema_config.cpp:211
 msgid "Field Name Templates"
 msgstr "字段名称模板"
 
-#: eeschema/eeschema_config.cpp:296 pcbnew/pcbnew_config.cpp:134
+#: eeschema/eeschema_config.cpp:300 pcbnew/pcbnew_config.cpp:134
 msgid "Save Project File"
 msgstr "保存工程文件"
 
-#: eeschema/eeschema_config.cpp:633
+#: eeschema/eeschema_config.cpp:588 eeschema/libedit/libedit.cpp:61
+#: kicad/commandframe.cpp:76
 msgid "Symbol Editor"
 msgstr "符号编辑器"
 
-#: eeschema/eeschema_config.cpp:670 eeschema/files-io.cpp:516
+#: eeschema/eeschema_config.cpp:626 eeschema/files-io.cpp:520
 #, c-format
 msgid "An error occurred loading the symbol library table \"%s\"."
 msgstr "加载符号库表 \"%s\" 时发生错误。"
@@ -7483,26 +7644,26 @@ msgstr ""
 msgid "Failed to save \"%s\""
 msgstr "无法保存 '%s'"
 
-#: eeschema/files-io.cpp:156
+#: eeschema/files-io.cpp:159
 #, c-format
 msgid "File %s saved"
 msgstr "保存文件 %s"
 
-#: eeschema/files-io.cpp:161
+#: eeschema/files-io.cpp:164
 msgid "File write operation failed."
 msgstr "文件存储失败。"
 
-#: eeschema/files-io.cpp:209 eeschema/files-io.cpp:769
+#: eeschema/files-io.cpp:212 eeschema/files-io.cpp:777
 #, c-format
 msgid "Schematic file \"%s\" is already open."
 msgstr "电路图文件 \"%s\" 已经打开。"
 
-#: eeschema/files-io.cpp:227
+#: eeschema/files-io.cpp:230
 #, c-format
 msgid "Schematic \"%s\" does not exist.  Do you wish to create it?"
 msgstr "原理图\"%s\"不存在。你想创建它吗？"
 
-#: eeschema/files-io.cpp:296
+#: eeschema/files-io.cpp:299
 msgid ""
 "The entire schematic could not be loaded.  Errors occurred attempting to "
 "load \n"
@@ -7511,7 +7672,7 @@ msgstr ""
 "整个原理图不能被加载。 尝试加载时发生错误\n"
 "层次原理图。"
 
-#: eeschema/files-io.cpp:310
+#: eeschema/files-io.cpp:313
 #, c-format
 msgid ""
 "Error loading schematic file \"%s\".\n"
@@ -7520,12 +7681,12 @@ msgstr ""
 "加载原理图文件 \"%s\" 时出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:314 eeschema/files-io.cpp:875
+#: eeschema/files-io.cpp:317 eeschema/files-io.cpp:883
 #, c-format
 msgid "Failed to load \"%s\""
 msgstr "无法加载 '%s'"
 
-#: eeschema/files-io.cpp:329
+#: eeschema/files-io.cpp:332
 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 "
@@ -7534,27 +7695,34 @@ msgstr ""
 "加载已自动修复的原理图时发现错误。 请保存原理图以修复损坏的文件，否则可能无法"
 "与其他版本的KiCad一起使用。"
 
-#: eeschema/files-io.cpp:392
+#: eeschema/files-io.cpp:396
 msgid "Append Schematic"
 msgstr "添加原理图"
 
-#: eeschema/files-io.cpp:440
+#: eeschema/files-io.cpp:444
+#, fuzzy
+#| msgid ""
+#| "The entire schematic could not be loaded.  Errors occurred attempting to "
+#| "load \n"
+#| "hierarchical sheet schematics."
 msgid ""
-"The entire schematic could not be load.  Errors occurred attempting to load "
-"hierarchical sheet schematics."
-msgstr "整个原理图不能加载。 尝试加载层次原理图时发生错误。"
+"The entire schematic could not be loaded.  Errors occurred attempting to "
+"load hierarchical sheet schematics."
+msgstr ""
+"整个原理图不能被加载。 尝试加载时发生错误\n"
+"层次原理图。"
 
-#: eeschema/files-io.cpp:448 eeschema/sheet.cpp:245
+#: eeschema/files-io.cpp:452 eeschema/sheet.cpp:247
 #, c-format
 msgid "Error occurred loading schematic file \"%s\"."
 msgstr "载入原理图文件 '%s' 发生错误."
 
-#: eeschema/files-io.cpp:451 eeschema/sheet.cpp:248
+#: eeschema/files-io.cpp:455 eeschema/sheet.cpp:250
 #, c-format
 msgid "Failed to load schematic \"%s\""
 msgstr "无法加载原理图 \"%s\""
 
-#: eeschema/files-io.cpp:638
+#: eeschema/files-io.cpp:645
 msgid ""
 "This operation cannot be undone.\n"
 "\n"
@@ -7564,16 +7732,16 @@ msgstr ""
 "\n"
 "是否在执行该操作前保存当前原理图?"
 
-#: eeschema/files-io.cpp:658
+#: eeschema/files-io.cpp:665
 msgid "Import Schematic"
 msgstr "导入原理图"
 
-#: eeschema/files-io.cpp:693
+#: eeschema/files-io.cpp:701
 #, c-format
 msgid "Directory \"%s\" is not writable."
 msgstr "目录 \"%s\"不可写入。"
 
-#: eeschema/files-io.cpp:872
+#: eeschema/files-io.cpp:880
 #, c-format
 msgid ""
 "Error loading schematic \"%s\".\n"
@@ -7582,64 +7750,64 @@ msgstr ""
 "加载原理图 \"%s\" 出错。\n"
 "%s"
 
-#: eeschema/files-io.cpp:898
+#: eeschema/files-io.cpp:906
 msgid "The current schematic has been modified.  Save changes?"
 msgstr "当前原理图已被修改。是否保存更改？"
 
-#: eeschema/find.cpp:95
+#: eeschema/find.cpp:96
 #, c-format
 msgid "Design rule check marker found in sheet %s at %s, %s"
 msgstr "在图页%s的%s，%s中找到设计规则标记"
 
-#: eeschema/find.cpp:103
+#: eeschema/find.cpp:104
 msgid "No more markers were found."
 msgstr "没有找到更多标记。"
 
-#: eeschema/find.cpp:242
+#: eeschema/find.cpp:213
 msgid "component"
 msgstr "元件"
 
-#: eeschema/find.cpp:246
+#: eeschema/find.cpp:214
 #, c-format
 msgid "pin %s"
 msgstr "引脚 %s"
 
-#: eeschema/find.cpp:250
+#: eeschema/find.cpp:215
 #, c-format
 msgid "reference %s"
 msgstr "参考 %s"
 
-#: eeschema/find.cpp:254
+#: eeschema/find.cpp:216
 #, c-format
 msgid "value %s"
 msgstr "值 %s"
 
-#: eeschema/find.cpp:258
+#: eeschema/find.cpp:217
 #, c-format
 msgid "field %s"
 msgstr "字段 %s"
 
-#: eeschema/find.cpp:266
+#: eeschema/find.cpp:223
 #, c-format
 msgid "%s %s found"
 msgstr "%s %s 找到"
 
-#: eeschema/find.cpp:271
+#: eeschema/find.cpp:225
 #, c-format
 msgid "%s found but %s not found"
 msgstr "找到 %s 但 %s 未找到"
 
-#: eeschema/find.cpp:277
+#: eeschema/find.cpp:228
 #, c-format
 msgid "Component %s not found"
 msgstr "元件[%s]没有找到"
 
-#: eeschema/find.cpp:489
+#: eeschema/find.cpp:438
 #, c-format
 msgid "No item found matching %s."
 msgstr "未找到匹配 %s 的项目。"
 
-#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1422
+#: eeschema/generate_alias_info.cpp:37 eeschema/sch_component.cpp:1455
 msgid "Alias of"
 msgstr "别名"
 
@@ -7647,11 +7815,11 @@ msgstr "别名"
 msgid "Key words:"
 msgstr "关键字:"
 
-#: eeschema/generate_alias_info.cpp:122 pcbnew/class_module.cpp:573
+#: eeschema/generate_alias_info.cpp:122 pcbnew/class_module.cpp:579
 msgid "Unknown"
 msgstr "未知"
 
-#: eeschema/getpart.cpp:152 pcbnew/load_select_footprint.cpp:212
+#: eeschema/getpart.cpp:152 pcbnew/load_select_footprint.cpp:218
 msgid "Recently Used"
 msgstr "最近使用"
 
@@ -7660,12 +7828,12 @@ msgstr "最近使用"
 msgid "Choose Power Symbol (%d items loaded)"
 msgstr "选择电源符号(%d项加载完毕)"
 
-#: eeschema/getpart.cpp:168 eeschema/viewlibs.cpp:62
+#: eeschema/getpart.cpp:168 eeschema/viewlibs.cpp:63
 #, c-format
 msgid "Choose Symbol (%d items loaded)"
 msgstr "选择符号(共%d项)"
 
-#: eeschema/getpart.cpp:408
+#: eeschema/getpart.cpp:385
 #, c-format
 msgid "No alternate body style found for symbol \"%s\" in library \"%s\"."
 msgstr "在库 \"%s\" 中找不到符号 \"%s\"的替代正文样式。"
@@ -7686,10 +7854,10 @@ msgstr "缩放原理图至适合页面"
 msgid "Redraw schematic view"
 msgstr "刷新显示"
 
-#: eeschema/help_common_strings.h:48 eeschema/lib_edit_frame.cpp:1139
-#: eeschema/schedit.cpp:609 pcbnew/edit.cpp:1508
-#: pcbnew/footprint_editor_utils.cpp:1007 pcbnew/tool_footprint_editor.cpp:163
-#: pcbnew/tools/pcbnew_control.cpp:820
+#: eeschema/help_common_strings.h:48 eeschema/libedit/lib_edit_frame.cpp:1151
+#: eeschema/schedit.cpp:599 pcbnew/edit.cpp:1507
+#: pcbnew/footprint_editor_utils.cpp:973 pcbnew/tool_footprint_editor.cpp:175
+#: pcbnew/tools/pcbnew_control.cpp:684
 msgid "Delete item"
 msgstr "删除项目"
 
@@ -7819,19 +7987,19 @@ msgstr "添加圆弧到符号体"
 msgid "Add lines and polygons to symbol body"
 msgstr "添加线和多边形到符号体"
 
-#: eeschema/help_common_strings.h:90 eeschema/tool_sch.cpp:266
+#: eeschema/help_common_strings.h:90 eeschema/tool_sch.cpp:267
 msgid "Add bitmap image"
 msgstr "添加图片"
 
-#: eeschema/hierarch.cpp:149
+#: eeschema/hierarch.cpp:150
 msgid "Navigator"
 msgstr "导航"
 
-#: eeschema/hierarch.cpp:161
+#: eeschema/hierarch.cpp:162
 msgid "Root"
 msgstr "根"
 
-#: eeschema/highlight_connection.cpp:51
+#: eeschema/highlight_connection.cpp:52
 msgid "Error: duplicate sub-sheet names found in current sheet. Fix it"
 msgstr "错误：当前工作表中找到的重复的子工作表名称。 修复它"
 
@@ -7851,7 +8019,7 @@ msgstr "刷新显示"
 msgid "Reset Local Coordinates"
 msgstr "重置局部坐标"
 
-#: eeschema/hotkeys.cpp:120 eeschema/onrightclick.cpp:205
+#: eeschema/hotkeys.cpp:120 eeschema/onrightclick.cpp:210
 msgid "Leave Sheet"
 msgstr "离开分页"
 
@@ -7865,11 +8033,11 @@ msgstr "单击鼠标左键"
 msgid "Mouse Left Double Click"
 msgstr "双击鼠标左键"
 
-#: eeschema/hotkeys.cpp:128 eeschema/onrightclick.cpp:691
+#: eeschema/hotkeys.cpp:128 eeschema/onrightclick.cpp:700
 msgid "Begin Wire"
 msgstr "开始连线"
 
-#: eeschema/hotkeys.cpp:129 eeschema/onrightclick.cpp:741
+#: eeschema/hotkeys.cpp:129 eeschema/onrightclick.cpp:749
 msgid "Begin Bus"
 msgstr "总线开始"
 
@@ -7889,8 +8057,8 @@ msgstr "添加层次标签"
 msgid "Add Global Label"
 msgstr "添加全局标签"
 
-#: eeschema/hotkeys.cpp:138 eeschema/onrightclick.cpp:722
-#: eeschema/onrightclick.cpp:760
+#: eeschema/hotkeys.cpp:138 eeschema/onrightclick.cpp:730
+#: eeschema/onrightclick.cpp:767
 msgid "Add Junction"
 msgstr "添加连接点"
 
@@ -7951,134 +8119,149 @@ msgid "Edit Symbol Footprint"
 msgstr "编辑符号封装"
 
 #: eeschema/hotkeys.cpp:172
+msgid "Show Symbol Datasheet"
+msgstr "显示符号数据手册"
+
+#: eeschema/hotkeys.cpp:175
 msgid "Edit with Symbol Editor"
 msgstr "用符号编辑器来编辑"
 
-#: eeschema/hotkeys.cpp:176
+#: eeschema/hotkeys.cpp:179
 msgid "Move Schematic Item"
 msgstr "移动原理图项目"
 
-#: eeschema/hotkeys.cpp:180
+#: eeschema/hotkeys.cpp:183
 msgid "Duplicate Symbol or Label"
 msgstr "重复的符号或标签"
 
-#: eeschema/hotkeys.cpp:184 pcbnew/hotkeys.cpp:145
+#: eeschema/hotkeys.cpp:187 pcbnew/hotkeys.cpp:145
 msgid "Drag Item"
 msgstr "拖动项目"
 
-#: eeschema/hotkeys.cpp:185
+#: eeschema/hotkeys.cpp:188
 msgid "Move Block -> Drag Block"
 msgstr "移动块-> 拖动块"
 
-#: eeschema/hotkeys.cpp:187
+#: eeschema/hotkeys.cpp:190
 msgid "Repeat Last Item"
 msgstr "重复最后项"
 
-#: eeschema/hotkeys.cpp:188 pagelayout_editor/hotkeys.cpp:90
+#: eeschema/hotkeys.cpp:191 pagelayout_editor/hotkeys.cpp:90
 msgid "Delete Item"
 msgstr "删除项目"
 
-#: eeschema/hotkeys.cpp:189 eeschema/onrightclick.cpp:675
-#: eeschema/onrightclick.cpp:709
+#: eeschema/hotkeys.cpp:192 eeschema/onrightclick.cpp:684
+#: eeschema/onrightclick.cpp:717
 msgid "Delete Node"
 msgstr "删除节点"
 
-#: eeschema/hotkeys.cpp:192 pcbnew/dialogs/dialog_find_base.cpp:39
+#: eeschema/hotkeys.cpp:195 pcbnew/dialogs/dialog_find_base.cpp:39
 #: pcbnew/hotkeys.cpp:97
 msgid "Find Item"
 msgstr "查找项目"
 
-#: eeschema/hotkeys.cpp:193
+#: eeschema/hotkeys.cpp:196
 msgid "Find Next Item"
 msgstr "查找下一项"
 
-#: eeschema/hotkeys.cpp:197
+#: eeschema/hotkeys.cpp:200
 msgid "Find Next DRC Marker"
 msgstr "查找下一个DRC标记"
 
-#: eeschema/hotkeys.cpp:203
+#: eeschema/hotkeys.cpp:206
 msgid "Create Pin"
 msgstr "新建引脚"
 
-#: eeschema/hotkeys.cpp:204
+#: eeschema/hotkeys.cpp:207
 msgid "Repeat Pin"
 msgstr "重复引脚"
 
-#: eeschema/hotkeys.cpp:205
+#: eeschema/hotkeys.cpp:208
 msgid "Move Library Item"
 msgstr "移动库项目"
 
-#: eeschema/hotkeys.cpp:208 eeschema/onrightclick.cpp:411
+#: eeschema/hotkeys.cpp:213 eeschema/onrightclick.cpp:419
 msgid "Autoplace Fields"
 msgstr "自动放置字段"
 
-#: eeschema/hotkeys.cpp:211 pcbnew/dialogs/dialog_update_pcb_base.h:57
+#: eeschema/hotkeys.cpp:216 pcbnew/dialogs/dialog_update_pcb_base.h:57
 msgid "Update PCB from Schematic"
 msgstr "从原理图更新PCB"
 
-#: eeschema/hotkeys.cpp:215
+#: eeschema/hotkeys.cpp:220
 msgid "Highlight Connection"
 msgstr "高亮连接"
 
-#: eeschema/hotkeys.cpp:219 pagelayout_editor/hotkeys.cpp:96
+#: eeschema/hotkeys.cpp:224 pagelayout_editor/hotkeys.cpp:96
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:212 pcbnew/hotkeys.cpp:289
 msgid "New"
 msgstr "新建"
 
-#: eeschema/hotkeys.cpp:220 pagelayout_editor/files.cpp:142
+#: eeschema/hotkeys.cpp:225 pagelayout_editor/files.cpp:146
 #: pagelayout_editor/hotkeys.cpp:97 pcbnew/hotkeys.cpp:290
 msgid "Open"
 msgstr "打开"
 
-#: eeschema/hotkeys.cpp:222 pagelayout_editor/files.cpp:179
+#: eeschema/hotkeys.cpp:227 pagelayout_editor/files.cpp:183
 #: pagelayout_editor/hotkeys.cpp:99 pcbnew/hotkeys.cpp:292
 msgid "Save As"
 msgstr "另存为"
 
-#: eeschema/hotkeys.cpp:226 pagelayout_editor/hotkeys.cpp:94
+#: eeschema/hotkeys.cpp:231 pagelayout_editor/hotkeys.cpp:94
 #: pagelayout_editor/menubar.cpp:108
 #: pagelayout_editor/toolbars_pl_editor.cpp:75 pcbnew/hotkeys.cpp:295
 msgid "Undo"
 msgstr "撤消"
 
-#: eeschema/hotkeys.cpp:229 eeschema/hotkeys.cpp:231
+#: eeschema/hotkeys.cpp:234 eeschema/hotkeys.cpp:236
 #: pagelayout_editor/hotkeys.cpp:95 pagelayout_editor/menubar.cpp:111
 #: pagelayout_editor/toolbars_pl_editor.cpp:78 pcbnew/hotkeys.cpp:298
 #: pcbnew/hotkeys.cpp:300
 msgid "Redo"
 msgstr "重做"
 
-#: eeschema/hotkeys.cpp:236 pcbnew/hotkeys.cpp:305
-#: pcbnew/tools/edit_tool.cpp:169
+#: eeschema/hotkeys.cpp:241 eeschema/widgets/symbol_tree_pane.cpp:88
+#: pcbnew/footprint_tree_pane.cpp:89 pcbnew/hotkeys.cpp:305
+#: pcbnew/tools/edit_tool.cpp:165
 msgid "Cut"
 msgstr "剪切"
 
-#: eeschema/hotkeys.cpp:237 eeschema/onrightclick.cpp:556
-#: pcbnew/hotkeys.cpp:306 pcbnew/onrightclick.cpp:937
-#: pcbnew/tools/edit_tool.cpp:164
+#: eeschema/hotkeys.cpp:242 eeschema/onrightclick.cpp:569
+#: eeschema/widgets/symbol_tree_pane.cpp:90 pcbnew/footprint_tree_pane.cpp:91
+#: pcbnew/hotkeys.cpp:306 pcbnew/onrightclick.cpp:935
+#: pcbnew/tools/edit_tool.cpp:160
 msgid "Copy"
 msgstr "复制"
 
-#: eeschema/hotkeys.cpp:238 eeschema/tool_sch.cpp:88 pcbnew/hotkeys.cpp:307
-#: pcbnew/tools/pcbnew_control.cpp:243
+#: eeschema/hotkeys.cpp:243 eeschema/tool_sch.cpp:89 pcbnew/hotkeys.cpp:307
+#: pcbnew/tools/pcbnew_control.cpp:208
 msgid "Paste"
 msgstr "粘贴"
 
-#: eeschema/hotkeys.cpp:344
+#: eeschema/hotkeys.cpp:245 gerbview/hotkeys.cpp:95 pcbnew/hotkeys.cpp:179
+msgid ""
+"Switch to Modern Toolset with hardware-accelerated graphics (recommended)"
+msgstr "切换到具有硬件图形加速的现代工具箱(推荐)"
+
+#: eeschema/hotkeys.cpp:251 gerbview/hotkeys.cpp:101 pcbnew/hotkeys.cpp:185
+msgid "Switch to Modern Toolset with software graphics (fall-back)"
+msgstr "切换到具有软件图形加速的现代工具箱 (回退)"
+
+#: eeschema/hotkeys.cpp:365
 msgid "Schematic Editor"
 msgstr "原理图编辑"
 
-#: eeschema/hotkeys.cpp:345 eeschema/lib_edit_frame.cpp:190
+#: eeschema/hotkeys.cpp:366 eeschema/libedit/lib_edit_frame.cpp:197
 msgid "Library Editor"
 msgstr "库编辑器"
 
-#: eeschema/hotkeys.cpp:785
+#: eeschema/hotkeys.cpp:803
 msgid "Add Pin"
 msgstr "添加引脚"
 
-#: eeschema/lib_arc.cpp:490 eeschema/lib_bezier.cpp:331
-#: eeschema/lib_circle.cpp:241 eeschema/lib_polyline.cpp:324
-#: eeschema/lib_rectangle.cpp:220 eeschema/lib_text.cpp:301
+#: eeschema/lib_arc.cpp:496 eeschema/lib_bezier.cpp:339
+#: eeschema/lib_circle.cpp:247 eeschema/lib_polyline.cpp:330
+#: eeschema/lib_rectangle.cpp:226 eeschema/lib_text.cpp:308
 #: pcb_calculator/transline_ident.cpp:186
 #: pcb_calculator/transline_ident.cpp:216
 #: pcb_calculator/transline_ident.cpp:248
@@ -8087,21 +8270,21 @@ msgstr "添加引脚"
 msgid "Line Width"
 msgstr "线宽"
 
-#: eeschema/lib_arc.cpp:495 eeschema/lib_bezier.cpp:336
-#: eeschema/lib_circle.cpp:249 eeschema/lib_polyline.cpp:329
+#: eeschema/lib_arc.cpp:501 eeschema/lib_bezier.cpp:344
+#: eeschema/lib_circle.cpp:255 eeschema/lib_polyline.cpp:335
 msgid "Bounding Box"
 msgstr "边界框"
 
-#: eeschema/lib_arc.cpp:501
+#: eeschema/lib_arc.cpp:507
 #, c-format
 msgid "Arc center (%s, %s), radius %s"
 msgstr "圆弧中心 (%s, %s), 半径 %s"
 
 #: eeschema/lib_arc.h:96 gerbview/gerber_draw_item.cpp:237
-#: pcbnew/class_board_item.cpp:45 pcbnew/class_drawsegment.cpp:458
+#: pcbnew/class_board_item.cpp:45 pcbnew/class_drawsegment.cpp:457
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:89
-#: pcbnew/dialogs/dialog_pad_properties.cpp:769
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1873
+#: pcbnew/dialogs/dialog_pad_properties.cpp:798
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1903
 msgid "Arc"
 msgstr "弧"
 
@@ -8109,218 +8292,67 @@ msgstr "弧"
 msgid "Bezier"
 msgstr "贝塞尔曲线"
 
-#: eeschema/lib_circle.cpp:244 pcbnew/class_drawsegment.cpp:454
-#: pcbnew/class_drawsegment.cpp:463
+#: eeschema/lib_circle.cpp:250 pcbnew/class_drawsegment.cpp:453
+#: pcbnew/class_drawsegment.cpp:462
 msgid "Radius"
 msgstr "半径"
 
-#: eeschema/lib_circle.cpp:255
+#: eeschema/lib_circle.cpp:261
 #, c-format
 msgid "Circle center (%s, %s), radius %s"
 msgstr "圆中心 (%s, %s), 半径 %s"
 
 #: eeschema/lib_circle.h:61 gerbview/gerber_draw_item.cpp:240
-#: pcbnew/class_board_item.cpp:46 pcbnew/class_drawsegment.cpp:451
-#: pcbnew/class_pad.cpp:1166
+#: pcbnew/class_board_item.cpp:46 pcbnew/class_drawsegment.cpp:450
+#: pcbnew/class_pad.cpp:1175
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:104
 msgid "Circle"
 msgstr "圆"
 
-#: eeschema/lib_draw_item.cpp:63 eeschema/lib_pin.cpp:1711
-#: eeschema/libedit.cpp:774 eeschema/sch_text.cpp:689
-#: gerbview/gerber_draw_item.cpp:692 pcbnew/class_drawsegment.cpp:444
+#: eeschema/lib_draw_item.cpp:62 eeschema/lib_pin.cpp:1717
+#: eeschema/libedit/libedit.cpp:808 eeschema/sch_text.cpp:622
+#: gerbview/gerber_draw_item.cpp:692 pcbnew/class_drawsegment.cpp:443
 #: pcbnew/class_marker_pcb.cpp:100 pcbnew/class_text_mod.cpp:384
 #: pcbnew/class_track.cpp:1165 pcbnew/class_track.cpp:1192
-#: pcbnew/class_track.cpp:1241 pcbnew/class_zone.cpp:825
+#: pcbnew/class_track.cpp:1241 pcbnew/class_zone.cpp:824
 msgid "Type"
 msgstr "类型"
 
-#: eeschema/lib_draw_item.cpp:75
+#: eeschema/lib_draw_item.cpp:74
 msgid "no"
 msgstr "否"
 
-#: eeschema/lib_draw_item.cpp:77
+#: eeschema/lib_draw_item.cpp:76
 msgid "yes"
 msgstr "是"
 
-#: eeschema/lib_draw_item.cpp:81
+#: eeschema/lib_draw_item.cpp:80
 msgid "Converted"
 msgstr "转换"
 
-#: eeschema/lib_edit_frame.cpp:263
-#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:194
-#: pcbnew/footprint_edit_frame.cpp:301 pcbnew/footprint_edit_frame.cpp:678
-msgid "Libraries"
-msgstr "库"
-
-#: eeschema/lib_edit_frame.cpp:354 eeschema/onrightclick.cpp:477
-#, c-format
-msgid "Unit %s"
-msgstr "单元 %s"
-
-#: eeschema/lib_edit_frame.cpp:1082
-msgid "Add pin"
-msgstr "添加引脚"
-
-#: eeschema/lib_edit_frame.cpp:1086
-msgid "Set pin options"
-msgstr "设置引脚选项"
-
-#: eeschema/lib_edit_frame.cpp:1097 eeschema/schedit.cpp:564
-#: pcbnew/edit.cpp:1496 pcbnew/footprint_editor_utils.cpp:982
-#: pcbnew/tools/drawing_tool.cpp:342
-msgid "Add text"
-msgstr "文本"
-
-#: eeschema/lib_edit_frame.cpp:1101
-msgid "Add rectangle"
-msgstr "添加矩形"
-
-#: eeschema/lib_edit_frame.cpp:1105 pcbnew/footprint_editor_utils.cpp:978
-msgid "Add circle"
-msgstr "添加圆"
-
-#: eeschema/lib_edit_frame.cpp:1109 pcbnew/footprint_editor_utils.cpp:974
-msgid "Add arc"
-msgstr "添加圆弧"
-
-#: eeschema/lib_edit_frame.cpp:1113 pcbnew/footprint_editor_utils.cpp:970
-msgid "Add line"
-msgstr "添加线"
-
-#: eeschema/lib_edit_frame.cpp:1117
-msgid "Set anchor position"
-msgstr "设置锚点坐标"
-
-#: eeschema/lib_edit_frame.cpp:1121
-msgid "Import"
-msgstr "导入"
-
-#: eeschema/lib_edit_frame.cpp:1447
-#, c-format
-msgid "Library \"%s\" already exists"
-msgstr "库 \"%s\" 已经存在"
-
-#: eeschema/lib_edit_frame.cpp:1461
-msgid "Could not create the library file. Check write permission."
-msgstr "无法创建库文件，请检查写入权限。"
-
-#: eeschema/lib_edit_frame.cpp:1469
-msgid "Could not open the library file."
-msgstr "无法打开库文件。"
-
-#: eeschema/lib_edit_frame.cpp:1530 eeschema/symbol_tree_model_adapter.cpp:71
-#, c-format
-msgid "Loading library \"%s\""
-msgstr "加载库 \"%s\""
-
-#: eeschema/lib_edit_frame.cpp:1570 eeschema/libedit_onrightclick.cpp:310
-#: pcbnew/footprint_libraries_utils.cpp:434
-msgid "Global"
-msgstr "全局"
-
-#: eeschema/lib_edit_frame.cpp:1571 pcbnew/footprint_libraries_utils.cpp:435
-msgid "Project"
-msgstr "工程"
-
-#: eeschema/lib_edit_frame.cpp:1573 pcbnew/footprint_libraries_utils.cpp:437
-msgid "Select Library Table"
-msgstr "选择库表"
-
-#: eeschema/lib_edit_frame.cpp:1574 pcbnew/footprint_libraries_utils.cpp:438
-msgid "Choose the Library Table to add the library to:"
-msgstr "选择库表添加到以下库："
-
-#: eeschema/lib_edit_frame.cpp:1596
-msgid "Failed to save backup document to file "
-msgstr "无法将备份文档保存到文件 "
-
-#: eeschema/lib_export.cpp:60 eeschema/symbedit.cpp:64
-msgid "Import Symbol"
-msgstr "导入符号"
-
-#: eeschema/lib_export.cpp:80 eeschema/symbedit.cpp:90
-#, c-format
-msgid "Cannot import symbol library \"%s\"."
-msgstr "无法导入符号库 '%s'."
-
-#: eeschema/lib_export.cpp:87 eeschema/symbedit.cpp:97
-#, c-format
-msgid "Symbol library file \"%s\" is empty."
-msgstr "符号库 <%s> 为空."
-
-#: eeschema/lib_export.cpp:97
-#, c-format
-msgid "Symbol \"%s\" already exists in library \"%s\"."
-msgstr "符号 <%s> 已经在库<%s>中存在。"
-
-#: eeschema/lib_export.cpp:114
-msgid "There is no symbol selected to save."
-msgstr "没有选择元件保存。"
-
-#: eeschema/lib_export.cpp:123 eeschema/symbedit.cpp:171
-msgid "Export Symbol"
-msgstr "导出符号"
-
-#: eeschema/lib_export.cpp:147
-#, c-format
-msgid "Error occurred attempting to load symbol library file \"%s\""
-msgstr "试图加载符号库文件 \"%s\" 时出错"
-
-#: eeschema/lib_export.cpp:155
-#, c-format
-msgid "Symbol \"%s\" already exists."
-msgstr "符号\"%s\"已经存在。"
-
-#: eeschema/lib_export.cpp:157 kicad/prjconfig.cpp:367
-#: pcbnew/dialogs/dialog_export_idf.cpp:172
-#: pcbnew/dialogs/dialog_gencad_export_options.cpp:127
-#: pcbnew/footprint_libraries_utils.cpp:491
-msgid "Overwrite"
-msgstr "覆盖"
-
-#: eeschema/lib_export.cpp:167
-#, c-format
-msgid "Write permissions are required to save library \"%s\"."
-msgstr "需要写入权限才能保存库 \"%s\"。"
-
-#: eeschema/lib_export.cpp:181
-msgid "Failed to create symbol library file "
-msgstr "无法创建符号库文件"
-
-#: eeschema/lib_export.cpp:183
-#, c-format
-msgid "Error creating symbol library \"%s\""
-msgstr "创建符号库 \"%s\"错误"
-
-#: eeschema/lib_export.cpp:192
-#, c-format
-msgid "Symbol \"%s\" saved in library \"%s\""
-msgstr "符号 \"%s\" 保存到库中 \"%s\""
-
-#: eeschema/lib_field.cpp:470
+#: eeschema/lib_field.cpp:471
 #, c-format
 msgid "Field%d"
 msgstr "字段 %d"
 
-#: eeschema/lib_field.cpp:537
+#: eeschema/lib_field.cpp:538
 #, c-format
 msgid "Field %s \"%s\""
 msgstr "字段 %s \"%s\""
 
-#: eeschema/lib_field.cpp:618 pcbnew/class_drawsegment.cpp:496
-#: pcbnew/class_pad.cpp:735 pcbnew/class_pcb_text.cpp:142
+#: eeschema/lib_field.cpp:617 pcbnew/class_drawsegment.cpp:495
+#: pcbnew/class_pad.cpp:744 pcbnew/class_pcb_text.cpp:142
 #: pcbnew/class_text_mod.cpp:410 pcbnew/class_track.cpp:1180
 #: pcbnew/class_track.cpp:1207
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:55
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:55
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:43
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:131
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:169
 #: pcbnew/text_mod_grid_table.cpp:87
 msgid "Width"
 msgstr "宽度"
 
-#: eeschema/lib_field.cpp:621 pcbnew/class_pad.cpp:738
+#: eeschema/lib_field.cpp:620 pcbnew/class_pad.cpp:747
 #: pcbnew/class_pcb_text.cpp:145 pcbnew/class_text_mod.cpp:413
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:56
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:56
@@ -8328,54 +8360,29 @@ msgstr "宽度"
 msgid "Height"
 msgstr "高度"
 
-#: eeschema/lib_manager.cpp:104
-#, c-format
-msgid "Cannot find library \"%s\" in the Symbol Library Table"
-msgstr "无法在符号库表中找到库 \"%s\""
-
-#: eeschema/lib_manager.cpp:143
-#, c-format
-msgid "Cannot flush library changes (\"%s\")"
-msgstr "无法刷新库更改(\"%s\")"
-
-#: eeschema/lib_manager.cpp:299 eeschema/lib_manager.cpp:670
-#, c-format
-msgid "Cannot enumerate library \"%s\""
-msgstr "无法枚举库%s"
-
-#: eeschema/lib_manager.cpp:337
-#, c-format
-msgid "Cannot load aliases from library \"%s\""
-msgstr "无法从库\"%s\"添加别名"
-
-#: eeschema/lib_manager.cpp:368 eeschema/lib_manager.cpp:533
-#, c-format
-msgid "Cannot load symbol \"%s\" from library \"%s\""
-msgstr "不能从库\"%s\"中加载符号\"%s\""
-
-#: eeschema/lib_pin.cpp:1718 gerbview/gerber_draw_item.cpp:722
+#: eeschema/lib_pin.cpp:1724 gerbview/gerber_draw_item.cpp:722
 #: gerbview/gerber_draw_item.cpp:723 pcbnew/class_pcb_text.cpp:133
 #: pcbnew/class_text_mod.cpp:389 pcbnew/class_text_mod.cpp:397
 msgid "Yes"
 msgstr "是"
 
-#: eeschema/lib_pin.cpp:1720 gerbview/gerber_draw_item.cpp:722
+#: eeschema/lib_pin.cpp:1726 gerbview/gerber_draw_item.cpp:722
 #: gerbview/gerber_draw_item.cpp:723 pcbnew/class_pcb_text.cpp:131
 #: pcbnew/class_text_mod.cpp:387 pcbnew/class_text_mod.cpp:399
 msgid "No"
 msgstr "否"
 
-#: eeschema/lib_pin.cpp:1742 eeschema/lib_pin.cpp:1761
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1097
+#: eeschema/lib_pin.cpp:1748 eeschema/lib_pin.cpp:1767
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1099
 msgid "Pos X"
 msgstr "X位置"
 
-#: eeschema/lib_pin.cpp:1745 eeschema/lib_pin.cpp:1764
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1098
+#: eeschema/lib_pin.cpp:1751 eeschema/lib_pin.cpp:1770
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1100
 msgid "Pos Y"
 msgstr "Y位置"
 
-#: eeschema/lib_pin.cpp:1960
+#: eeschema/lib_pin.cpp:1966
 #, c-format
 msgid "Pin %s, %s, %s"
 msgstr "引脚 %s, %s, %s"
@@ -8384,7 +8391,7 @@ msgstr "引脚 %s, %s, %s"
 msgid "Pin"
 msgstr "引脚"
 
-#: eeschema/lib_polyline.cpp:335
+#: eeschema/lib_polyline.cpp:341
 #, c-format
 msgid "Polyline at (%s, %s) with %d points"
 msgstr "多线段在 (%s, %s) 与 %d 点"
@@ -8393,7 +8400,7 @@ msgstr "多线段在 (%s, %s) 与 %d 点"
 msgid "PolyLine"
 msgstr "多段线"
 
-#: eeschema/lib_rectangle.cpp:296
+#: eeschema/lib_rectangle.cpp:302
 #, c-format
 msgid "Rectangle from (%s, %s) to (%s, %s)"
 msgstr "矩形坐标从 (%s, %s) 到  (%s, %s)"
@@ -8402,7 +8409,7 @@ msgstr "矩形坐标从 (%s, %s) 到  (%s, %s)"
 msgid "Rectangle"
 msgstr "矩形"
 
-#: eeschema/lib_text.cpp:362 eeschema/sch_text.cpp:499
+#: eeschema/lib_text.cpp:369 eeschema/sch_text.cpp:462
 #, c-format
 msgid "Graphic Text \"%s\""
 msgstr "图形文本 \"%s\""
@@ -8438,345 +8445,941 @@ msgstr "创建符号库%s时发生错误。"
 msgid "Failed to save symbol library file \"%s\""
 msgstr "无法创建元件库文件 '%s'"
 
-#: eeschema/libedit.cpp:61
-msgid "Symbol Library Editor"
-msgstr "符号库编辑器"
+#: eeschema/libedit/lib_edit_frame.cpp:263
+#: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:194
+#: pcbnew/footprint_edit_frame.cpp:302 pcbnew/footprint_edit_frame.cpp:684
+msgid "Libraries"
+msgstr "库"
 
-#: eeschema/libedit.cpp:107
+#: eeschema/libedit/lib_edit_frame.cpp:360 eeschema/onrightclick.cpp:490
+#, c-format
+msgid "Unit %s"
+msgstr "单元 %s"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1094
+msgid "Add pin"
+msgstr "添加引脚"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1098
+msgid "Set pin options"
+msgstr "设置引脚选项"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1109 eeschema/schedit.cpp:554
+#: pcbnew/edit.cpp:1495 pcbnew/footprint_editor_utils.cpp:948
+#: pcbnew/tools/drawing_tool.cpp:339
+msgid "Add text"
+msgstr "文本"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1113
+msgid "Add rectangle"
+msgstr "添加矩形"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1117
+#: pcbnew/footprint_editor_utils.cpp:944
+msgid "Add circle"
+msgstr "添加圆"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1121
+#: pcbnew/footprint_editor_utils.cpp:940
+msgid "Add arc"
+msgstr "添加圆弧"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1125
+#: pcbnew/footprint_editor_utils.cpp:936
+msgid "Add line"
+msgstr "添加线"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1129
+msgid "Set anchor position"
+msgstr "设置锚点坐标"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1133
+msgid "Import"
+msgstr "导入"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1514
+#, c-format
+msgid "Library \"%s\" already exists"
+msgstr "库 \"%s\" 已经存在"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1528
+msgid "Could not create the library file. Check write permission."
+msgstr "无法创建库文件，请检查写入权限。"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1536 eeschema/libedit/lib_export.cpp:199
+msgid "Could not open the library file."
+msgstr "无法打开库文件。"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1598
+#: eeschema/symbol_tree_model_adapter.cpp:71
+#, c-format
+msgid "Loading library \"%s\""
+msgstr "加载库 \"%s\""
+
+#: eeschema/libedit/lib_edit_frame.cpp:1638
+#: eeschema/libedit/libedit_onrightclick.cpp:310
+#: pcbnew/footprint_libraries_utils.cpp:526
+msgid "Global"
+msgstr "全局"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1639
+#: pcbnew/footprint_libraries_utils.cpp:527
+msgid "Project"
+msgstr "工程"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1641
+#: pcbnew/footprint_libraries_utils.cpp:530
+msgid "Choose the Library Table to add the library to:"
+msgstr "选择库表添加到以下库："
+
+#: eeschema/libedit/lib_edit_frame.cpp:1642
+msgid "Add To Library Table"
+msgstr "添加到库表"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1674
+msgid "Failed to save backup document to file "
+msgstr "无法将备份文档保存到文件 "
+
+#: eeschema/libedit/lib_edit_frame.cpp:1799
+#, c-format
+msgid ""
+"The current configuration does not include the symbol library\n"
+"\"%s\".\n"
+"Use Manage Symbol Libraries to edit the configuration."
+msgstr ""
+"当前配置不包含符号库\n"
+"\"%s\"。\n"
+"使用符号库编辑器来编辑配置。"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1802
+msgid "Library not found in symbol library table."
+msgstr "在符号库表中未找到库"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1810
+#, c-format
+msgid ""
+"The library with the nickname \"%s\" is not enabled\n"
+"in the current configuration.  Use Manage Symbol Libraries to\n"
+"edit the configuration."
+msgstr ""
+"昵称为\"%s\"的库未启用\n"
+"在当前配置中，使用符号库管理\n"
+"来编辑配置。"
+
+#: eeschema/libedit/lib_edit_frame.cpp:1813
+msgid "Symbol library not enabled."
+msgstr "符号库未启用。"
+
+#: eeschema/libedit/lib_export.cpp:53 eeschema/libedit/symbedit.cpp:64
+msgid "Import Symbol"
+msgstr "导入符号"
+
+#: eeschema/libedit/lib_export.cpp:73 eeschema/libedit/symbedit.cpp:90
+#, c-format
+msgid "Cannot import symbol library \"%s\"."
+msgstr "无法导入符号库 '%s'."
+
+#: eeschema/libedit/lib_export.cpp:80 eeschema/libedit/symbedit.cpp:97
+#, c-format
+msgid "Symbol library file \"%s\" is empty."
+msgstr "符号库 <%s> 为空."
+
+#: eeschema/libedit/lib_export.cpp:90
+#, c-format
+msgid "Symbol \"%s\" already exists in library \"%s\"."
+msgstr "符号 <%s> 已经在库<%s>中存在。"
+
+#: eeschema/libedit/lib_export.cpp:108
+msgid "There is no symbol selected to save."
+msgstr "没有选择元件保存。"
+
+#: eeschema/libedit/lib_export.cpp:117 eeschema/libedit/symbedit.cpp:170
+msgid "Export Symbol"
+msgstr "导出符号"
+
+#: eeschema/libedit/lib_export.cpp:141
+#, c-format
+msgid "Error occurred attempting to load symbol library file \"%s\""
+msgstr "试图加载符号库文件 \"%s\" 时出错"
+
+#: eeschema/libedit/lib_export.cpp:149
+#, c-format
+msgid "Symbol \"%s\" already exists in \"%s\"."
+msgstr "符号 \"%s\" 已经在\"%s\"中存在。"
+
+#: eeschema/libedit/lib_export.cpp:154 kicad/prjconfig.cpp:367
+#: pcbnew/dialogs/dialog_export_idf.cpp:172
+#: pcbnew/dialogs/dialog_gencad_export_options.cpp:127
+#: pcbnew/footprint_libraries_utils.cpp:481
+#: pcbnew/footprint_libraries_utils.cpp:957
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: eeschema/libedit/lib_export.cpp:164
+#, c-format
+msgid "Write permissions are required to save library \"%s\"."
+msgstr "需要写入权限才能保存库 \"%s\"。"
+
+#: eeschema/libedit/lib_export.cpp:178
+msgid "Failed to create symbol library file "
+msgstr "无法创建符号库文件"
+
+#: eeschema/libedit/lib_export.cpp:180
+#, c-format
+msgid "Error creating symbol library \"%s\""
+msgstr "创建符号库 \"%s\"错误"
+
+#: eeschema/libedit/lib_export.cpp:189
+#, c-format
+msgid "Symbol \"%s\" saved in library \"%s\""
+msgstr "符号 \"%s\" 保存到库中 \"%s\""
+
+#: eeschema/libedit/lib_manager.cpp:105
+#, c-format
+msgid "Cannot find library \"%s\" in the Symbol Library Table"
+msgstr "无法在符号库表中找到库 \"%s\""
+
+#: eeschema/libedit/lib_manager.cpp:144
+#, c-format
+msgid "Cannot flush library changes (\"%s\")"
+msgstr "无法刷新库更改(\"%s\")"
+
+#: eeschema/libedit/lib_manager.cpp:300 eeschema/libedit/lib_manager.cpp:677
+#, c-format
+msgid "Cannot enumerate library \"%s\""
+msgstr "无法枚举库%s"
+
+#: eeschema/libedit/lib_manager.cpp:338
+#, c-format
+msgid "Cannot load aliases from library \"%s\""
+msgstr "无法从库\"%s\"添加别名"
+
+#: eeschema/libedit/lib_manager.cpp:369 eeschema/libedit/lib_manager.cpp:534
+#, c-format
+msgid "Cannot load symbol \"%s\" from library \"%s\""
+msgstr "不能从库\"%s\"中加载符号\"%s\""
+
+#: eeschema/libedit/libedit.cpp:107
 msgid "The current symbol has been modified.  Save changes?"
 msgstr "当前符号已被修改。是否保存更改？"
 
-#: eeschema/libedit.cpp:132 eeschema/sch_edit_frame.cpp:1210
+#: eeschema/libedit/libedit.cpp:132 eeschema/sch_edit_frame.cpp:1230
 #: eeschema/selpart.cpp:63
 #, c-format
 msgid "Error occurred loading symbol \"%s\" from library \"%s\"."
 msgstr "从库中%s加载符号%s发生错误。"
 
-#: eeschema/libedit.cpp:276
+#: eeschema/libedit/libedit.cpp:278
 msgid "This new symbol has no name and cannot be created."
 msgstr "此新符号没有名称, 无法创建。"
 
-#: eeschema/libedit.cpp:287 eeschema/libedit.cpp:453
+#: eeschema/libedit/libedit.cpp:289 eeschema/libedit/libedit.cpp:458
 #, c-format
 msgid "Symbol \"%s\" already exists in library \"%s\""
 msgstr "符号 \"%s\" 已经在库 \"%s\" 中存在"
 
-#: eeschema/libedit.cpp:390 include/lib_table_grid.h:190
-#: pcbnew/footprint_libraries_utils.cpp:727
-#: pcbnew/footprint_libraries_utils.cpp:920
+#: eeschema/libedit/libedit.cpp:395 include/lib_table_grid.h:190
+#: pcbnew/footprint_libraries_utils.cpp:870
+#: pcbnew/footprint_libraries_utils.cpp:1097
 msgid "Nickname"
 msgstr "昵称"
 
-#: eeschema/libedit.cpp:401
+#: eeschema/libedit/libedit.cpp:406
 msgid "Save Copy of Symbol"
 msgstr "保存符号副本"
 
-#: eeschema/libedit.cpp:403 pcbnew/footprint_libraries_utils.cpp:740
+#: eeschema/libedit/libedit.cpp:408 pcbnew/footprint_libraries_utils.cpp:883
 msgid "Save in library:"
 msgstr "保存在库："
 
-#: eeschema/libedit.cpp:435
+#: eeschema/libedit/libedit.cpp:440
 msgid "No library specified.  Symbol could not be saved."
 msgstr "没有指定库，符号无法保存。"
 
-#: eeschema/libedit.cpp:446
+#: eeschema/libedit/libedit.cpp:451
 msgid "No symbol name specified.  Symbol could not be saved."
 msgstr "没有指定符号名称, 符号无法保存。"
 
-#: eeschema/libedit.cpp:545
-msgid ""
-"The revert operation cannot be undone!\n"
-"\n"
-"Revert changes?"
+#: eeschema/libedit/libedit.cpp:577 pcbnew/footprint_libraries_utils.cpp:988
+#, c-format
+msgid "Revert \"%s\" to last version saved?"
 msgstr ""
-"恢复操作不能撤消！\n"
-"\n"
-"还原更改？"
 
-#: eeschema/libedit.cpp:595
+#: eeschema/libedit/libedit.cpp:630
 #, c-format
 msgid "Symbol name \"%s\" not found in library \"%s\""
 msgstr "在库 \"%s\" 中找不到符号 \"%s\" ！"
 
-#: eeschema/libedit.cpp:624
+#: eeschema/libedit/libedit.cpp:659
 msgid "No library specified."
 msgstr "没有指定库。"
 
-#: eeschema/libedit.cpp:641
+#: eeschema/libedit/libedit.cpp:676
 #, c-format
 msgid "Save Library \"%s\" As..."
 msgstr "另存为库 \"%s\"..."
 
-#: eeschema/libedit.cpp:679
+#: eeschema/libedit/libedit.cpp:714
 #, c-format
 msgid "Failed to save changes to symbol library file \"%s\""
 msgstr "无法将更改保存到符号库文件%s"
 
-#: eeschema/libedit.cpp:681
+#: eeschema/libedit/libedit.cpp:716
 msgid "Error saving library"
 msgstr "保存库时出错"
 
-#: eeschema/libedit.cpp:688
+#: eeschema/libedit/libedit.cpp:723
 #, c-format
 msgid "Symbol library file \"%s\" saved"
 msgstr "符号库文件 \"%s\" 已保存"
 
-#: eeschema/libedit.cpp:690
+#: eeschema/libedit/libedit.cpp:725
 #, c-format
 msgid "Symbol library documentation file \"%s\" saved"
 msgstr "保存库说明文件 <%s> 时发生错误"
 
-#: eeschema/libedit.cpp:717
+#: eeschema/libedit/libedit.cpp:751
 #, c-format
 msgid "Save changes to \"%s\" before closing?"
 msgstr "是否在\"%s\"关闭之前保存更改？"
 
-#: eeschema/libedit.cpp:763 eeschema/onrightclick.cpp:466
+#: eeschema/libedit/libedit.cpp:797 eeschema/onrightclick.cpp:479
 msgid "Convert"
 msgstr "转换"
 
-#: eeschema/libedit.cpp:767
-#: eeschema/widgets/widget_eeschema_color_config.cpp:70
+#: eeschema/libedit/libedit.cpp:801
 msgid "Body"
 msgstr "主体"
 
-#: eeschema/libedit.cpp:770
+#: eeschema/libedit/libedit.cpp:804
 msgid "Power Symbol"
 msgstr "电源符号"
 
-#: eeschema/libedit.cpp:776 eeschema/sch_component.cpp:1443
-#: eeschema/viewlibs.cpp:244
+#: eeschema/libedit/libedit.cpp:810 eeschema/sch_component.cpp:1476
+#: eeschema/viewlib_frame.cpp:280
 msgid "Key words"
 msgstr "关键字"
 
-#: eeschema/libedit_onrightclick.cpp:89 eeschema/onrightclick.cpp:158
+#: eeschema/libedit/libedit_onrightclick.cpp:89 eeschema/onrightclick.cpp:163
 #: gerbview/onrightclick.cpp:63 pagelayout_editor/onrightclick.cpp:80
 #: pcbnew/footprint_editor_onclick.cpp:237 pcbnew/onrightclick.cpp:88
 msgid "End Tool"
 msgstr "结束工具操作"
 
-#: eeschema/libedit_onrightclick.cpp:105 eeschema/menubar.cpp:499
-#: eeschema/onrightclick.cpp:196 pcbnew/menubar_footprint_editor.cpp:151
+#: eeschema/libedit/libedit_onrightclick.cpp:105 eeschema/menubar.cpp:478
+#: eeschema/onrightclick.cpp:201 pcbnew/menubar_footprint_editor.cpp:156
 #: pcbnew/menubar_pcb_editor.cpp:471
 msgid "&Paste"
 msgstr "粘贴(&P)"
 
-#: eeschema/libedit_onrightclick.cpp:107 eeschema/menubar.cpp:501
-#: eeschema/onrightclick.cpp:198 pcbnew/menubar_footprint_editor.cpp:153
+#: eeschema/libedit/libedit_onrightclick.cpp:107 eeschema/menubar.cpp:480
+#: eeschema/onrightclick.cpp:203 pcbnew/menubar_footprint_editor.cpp:158
 #: pcbnew/menubar_pcb_editor.cpp:473
 msgid "Pastes item(s) from the Clipboard"
 msgstr "从剪贴板粘贴项目"
 
-#: eeschema/libedit_onrightclick.cpp:126 eeschema/libedit_onrightclick.cpp:147
-#: eeschema/libedit_onrightclick.cpp:196 eeschema/libedit_onrightclick.cpp:218
-#: eeschema/libedit_onrightclick.cpp:258 eeschema/libedit_onrightclick.cpp:290
-#: eeschema/onrightclick.cpp:514 eeschema/onrightclick.cpp:551
-#: eeschema/onrightclick.cpp:587 eeschema/onrightclick.cpp:623
-#: eeschema/onrightclick.cpp:781 eeschema/onrightclick.cpp:844
-#: eeschema/onrightclick.cpp:921 pcbnew/footprint_editor_onclick.cpp:348
+#: eeschema/libedit/libedit_onrightclick.cpp:126
+#: eeschema/libedit/libedit_onrightclick.cpp:147
+#: eeschema/libedit/libedit_onrightclick.cpp:196
+#: eeschema/libedit/libedit_onrightclick.cpp:218
+#: eeschema/libedit/libedit_onrightclick.cpp:258
+#: eeschema/libedit/libedit_onrightclick.cpp:290 eeschema/onrightclick.cpp:527
+#: eeschema/onrightclick.cpp:564 eeschema/onrightclick.cpp:600
+#: eeschema/onrightclick.cpp:634 eeschema/onrightclick.cpp:788
+#: eeschema/onrightclick.cpp:851 eeschema/onrightclick.cpp:926
+#: pcbnew/footprint_editor_onclick.cpp:348
 #: pcbnew/footprint_editor_onclick.cpp:406 pcbnew/onrightclick.cpp:164
 #: pcbnew/onrightclick.cpp:240 pcbnew/onrightclick.cpp:266
-#: pcbnew/onrightclick.cpp:465 pcbnew/onrightclick.cpp:659
-#: pcbnew/onrightclick.cpp:736 pcbnew/onrightclick.cpp:824
-#: pcbnew/onrightclick.cpp:934 pcbnew/tools/edit_tool.cpp:92
+#: pcbnew/onrightclick.cpp:463 pcbnew/onrightclick.cpp:657
+#: pcbnew/onrightclick.cpp:734 pcbnew/onrightclick.cpp:822
+#: pcbnew/onrightclick.cpp:932 pcbnew/tools/edit_tool.cpp:88
 msgid "Move"
 msgstr "移动"
 
-#: eeschema/libedit_onrightclick.cpp:130
+#: eeschema/libedit/libedit_onrightclick.cpp:130
 msgid "Drag Arc Edge"
 msgstr "拖动圆弧"
 
-#: eeschema/libedit_onrightclick.cpp:134
+#: eeschema/libedit/libedit_onrightclick.cpp:134
 msgid "Edit Arc Options"
 msgstr "圆弧选项"
 
-#: eeschema/libedit_onrightclick.cpp:139 eeschema/libedit_onrightclick.cpp:162
-#: eeschema/libedit_onrightclick.cpp:186 eeschema/libedit_onrightclick.cpp:210
-#: eeschema/libedit_onrightclick.cpp:238 eeschema/libedit_onrightclick.cpp:247
-#: eeschema/libedit_onrightclick.cpp:303 eeschema/onrightclick.cpp:407
-#: eeschema/onrightclick.cpp:529 eeschema/onrightclick.cpp:565
-#: eeschema/onrightclick.cpp:601 eeschema/onrightclick.cpp:635
-#: eeschema/onrightclick.cpp:832 eeschema/onrightclick.cpp:852
-#: eeschema/onrightclick.cpp:940 eeschema/widgets/symbol_tree_pane.cpp:80
+#: eeschema/libedit/libedit_onrightclick.cpp:139
+#: eeschema/libedit/libedit_onrightclick.cpp:162
+#: eeschema/libedit/libedit_onrightclick.cpp:186
+#: eeschema/libedit/libedit_onrightclick.cpp:210
+#: eeschema/libedit/libedit_onrightclick.cpp:238
+#: eeschema/libedit/libedit_onrightclick.cpp:247
+#: eeschema/libedit/libedit_onrightclick.cpp:303 eeschema/onrightclick.cpp:415
+#: eeschema/onrightclick.cpp:542 eeschema/onrightclick.cpp:578
+#: eeschema/onrightclick.cpp:612 eeschema/onrightclick.cpp:644
+#: eeschema/onrightclick.cpp:839 eeschema/onrightclick.cpp:858
+#: eeschema/onrightclick.cpp:945 eeschema/widgets/symbol_tree_pane.cpp:82
 #: pagelayout_editor/events_functions.cpp:601 pagelayout_editor/menubar.cpp:116
 #: pagelayout_editor/onrightclick.cpp:122
 #: pcbnew/footprint_editor_onclick.cpp:390
-#: pcbnew/footprint_editor_onclick.cpp:429 pcbnew/footprint_tree_pane.cpp:86
-#: pcbnew/onrightclick.cpp:190 pcbnew/onrightclick.cpp:255
-#: pcbnew/onrightclick.cpp:285 pcbnew/onrightclick.cpp:431
-#: pcbnew/onrightclick.cpp:579 pcbnew/onrightclick.cpp:661
-#: pcbnew/onrightclick.cpp:768 pcbnew/onrightclick.cpp:851
-#: pcbnew/onrightclick.cpp:908 pcbnew/onrightclick.cpp:954
-#: pcbnew/tools/edit_tool.cpp:131 pcbnew/tools/edit_tool.cpp:897
+#: pcbnew/footprint_editor_onclick.cpp:429 pcbnew/onrightclick.cpp:190
+#: pcbnew/onrightclick.cpp:255 pcbnew/onrightclick.cpp:285
+#: pcbnew/onrightclick.cpp:429 pcbnew/onrightclick.cpp:577
+#: pcbnew/onrightclick.cpp:659 pcbnew/onrightclick.cpp:766
+#: pcbnew/onrightclick.cpp:849 pcbnew/onrightclick.cpp:906
+#: pcbnew/onrightclick.cpp:952 pcbnew/tools/edit_tool.cpp:127
+#: pcbnew/tools/edit_tool.cpp:908
 msgid "Delete"
 msgstr "删除"
 
-#: eeschema/libedit_onrightclick.cpp:151
+#: eeschema/libedit/libedit_onrightclick.cpp:151
 msgid "Drag Circle Outline"
 msgstr "拖动圆轮廓"
 
-#: eeschema/libedit_onrightclick.cpp:156
+#: eeschema/libedit/libedit_onrightclick.cpp:156
 msgid "Edit Circle Options..."
 msgstr "编辑圆选项..."
 
-#: eeschema/libedit_onrightclick.cpp:171
+#: eeschema/libedit/libedit_onrightclick.cpp:171
 msgid "Move Rectangle"
 msgstr "移动矩形"
 
-#: eeschema/libedit_onrightclick.cpp:177
+#: eeschema/libedit/libedit_onrightclick.cpp:177
 msgid "Edit Rectangle Options..."
 msgstr "编辑矩形选项..."
 
-#: eeschema/libedit_onrightclick.cpp:183
+#: eeschema/libedit/libedit_onrightclick.cpp:183
 msgid "Drag Rectangle Edge"
 msgstr "拖动矩形边界"
 
-#: eeschema/libedit_onrightclick.cpp:205 eeschema/libedit_onrightclick.cpp:264
-#: eeschema/libedit_onrightclick.cpp:298 eeschema/onrightclick.cpp:384
-#: eeschema/onrightclick.cpp:525 eeschema/onrightclick.cpp:561
-#: eeschema/onrightclick.cpp:795 pcbnew/footprint_editor_onclick.cpp:354
-#: pcbnew/onrightclick.cpp:749 pcbnew/onrightclick.cpp:834
-#: pcbnew/tools/edit_tool.cpp:113 qa/common/mocks.cpp:317
+#: eeschema/libedit/libedit_onrightclick.cpp:205
+#: eeschema/libedit/libedit_onrightclick.cpp:264
+#: eeschema/libedit/libedit_onrightclick.cpp:298 eeschema/onrightclick.cpp:392
+#: eeschema/onrightclick.cpp:538 eeschema/onrightclick.cpp:574
+#: eeschema/onrightclick.cpp:802 pcbnew/footprint_editor_onclick.cpp:354
+#: pcbnew/onrightclick.cpp:747 pcbnew/onrightclick.cpp:832
+#: pcbnew/tools/edit_tool.cpp:109 qa/qa_utils/mocks.cpp:321
 msgid "Rotate Clockwise"
 msgstr "顺时针旋转"
 
-#: eeschema/libedit_onrightclick.cpp:222
+#: eeschema/libedit/libedit_onrightclick.cpp:222
 msgid "Drag Edge Point"
 msgstr "拖动边界点"
 
-#: eeschema/libedit_onrightclick.cpp:228
+#: eeschema/libedit/libedit_onrightclick.cpp:228
 msgid "Line End"
 msgstr "结束线"
 
-#: eeschema/libedit_onrightclick.cpp:232
+#: eeschema/libedit/libedit_onrightclick.cpp:232
 msgid "Edit Line Options..."
 msgstr "线条选项..."
 
-#: eeschema/libedit_onrightclick.cpp:313
+#: eeschema/libedit/libedit_onrightclick.cpp:313
 msgid "Push Pin Size to Selected Pin"
 msgstr "将引脚尺寸应用到所选引脚"
 
-#: eeschema/libedit_onrightclick.cpp:314
+#: eeschema/libedit/libedit_onrightclick.cpp:314
 msgid "Push Pin Size to Others"
 msgstr "将引脚尺寸应用到其他引脚"
 
-#: eeschema/libedit_onrightclick.cpp:317
+#: eeschema/libedit/libedit_onrightclick.cpp:317
 msgid "Push Pin Name Size to Selected Pin"
 msgstr "将引脚名称尺寸应用到选定的引脚"
 
-#: eeschema/libedit_onrightclick.cpp:318
+#: eeschema/libedit/libedit_onrightclick.cpp:318
 msgid "Push Pin Name Size to Others"
 msgstr "将引脚名称尺寸应用到其他引脚"
 
-#: eeschema/libedit_onrightclick.cpp:321
+#: eeschema/libedit/libedit_onrightclick.cpp:321
 msgid "Push Pin Num Size to Selected Pin"
 msgstr "引脚编号大小 应用到选中引脚"
 
-#: eeschema/libedit_onrightclick.cpp:322
+#: eeschema/libedit/libedit_onrightclick.cpp:322
 msgid "Push Pin Num Size to Others"
 msgstr "引脚编号大小应用到其他引脚"
 
-#: eeschema/libedit_onrightclick.cpp:331 eeschema/onrightclick.cpp:861
+#: eeschema/libedit/libedit_onrightclick.cpp:331 eeschema/onrightclick.cpp:866
 #: gerbview/onrightclick.cpp:74 pagelayout_editor/onrightclick.cpp:71
-#: pcbnew/footprint_editor_onclick.cpp:249 pcbnew/onrightclick.cpp:423
+#: pcbnew/footprint_editor_onclick.cpp:249 pcbnew/onrightclick.cpp:421
 msgid "Cancel Block"
 msgstr "取消块"
 
-#: eeschema/libedit_onrightclick.cpp:336
-#: pcbnew/footprint_editor_onclick.cpp:251 pcbnew/onrightclick.cpp:425
+#: eeschema/libedit/libedit_onrightclick.cpp:336
+#: pcbnew/footprint_editor_onclick.cpp:251 pcbnew/onrightclick.cpp:423
 msgid "Zoom Block"
 msgstr "块区域放大显示 "
 
-#: eeschema/libedit_onrightclick.cpp:341 eeschema/onrightclick.cpp:869
+#: eeschema/libedit/libedit_onrightclick.cpp:341 eeschema/onrightclick.cpp:874
 #: gerbview/onrightclick.cpp:77 pcbnew/footprint_editor_onclick.cpp:255
-#: pcbnew/onrightclick.cpp:427
+#: pcbnew/onrightclick.cpp:425
 msgid "Place Block"
 msgstr "放置块"
 
-#: eeschema/libedit_onrightclick.cpp:345
+#: eeschema/libedit/libedit_onrightclick.cpp:345
 msgid "Select Items"
 msgstr "选中项"
 
-#: eeschema/libedit_onrightclick.cpp:347 eeschema/onrightclick.cpp:875
+#: eeschema/libedit/libedit_onrightclick.cpp:348 eeschema/onrightclick.cpp:880
 msgid "Cut Block"
 msgstr "剪切块"
 
-#: eeschema/libedit_onrightclick.cpp:350 eeschema/onrightclick.cpp:878
+#: eeschema/libedit/libedit_onrightclick.cpp:351 eeschema/onrightclick.cpp:883
 msgid "Copy Block"
 msgstr "复制块"
 
-#: eeschema/libedit_onrightclick.cpp:353 eeschema/onrightclick.cpp:881
+#: eeschema/libedit/libedit_onrightclick.cpp:355 eeschema/onrightclick.cpp:886
 msgid "Duplicate Block"
 msgstr "重复块"
 
-#: eeschema/libedit_onrightclick.cpp:355 eeschema/onrightclick.cpp:891
+#: eeschema/libedit/libedit_onrightclick.cpp:358 eeschema/onrightclick.cpp:896
 msgid "Mirror Block Around Horizontal(X) Axis"
 msgstr "沿水平(X)轴镜像块"
 
-#: eeschema/libedit_onrightclick.cpp:359 eeschema/onrightclick.cpp:888
+#: eeschema/libedit/libedit_onrightclick.cpp:362 eeschema/onrightclick.cpp:893
 msgid "Mirror Block Around Vertical(Y) Axis"
 msgstr "沿垂直(Y)轴镜像块"
 
-#: eeschema/libedit_onrightclick.cpp:363 eeschema/onrightclick.cpp:386
-#: eeschema/onrightclick.cpp:597 eeschema/onrightclick.cpp:631
-#: eeschema/onrightclick.cpp:798 eeschema/onrightclick.cpp:926
-#: pcbnew/footprint_editor_onclick.cpp:295 pcbnew/onrightclick.cpp:430
-#: pcbnew/onrightclick.cpp:745 pcbnew/tools/edit_tool.cpp:118
-#: qa/common/mocks.cpp:322
+#: eeschema/libedit/libedit_onrightclick.cpp:366 eeschema/onrightclick.cpp:394
+#: eeschema/onrightclick.cpp:608 eeschema/onrightclick.cpp:640
+#: eeschema/onrightclick.cpp:805 eeschema/onrightclick.cpp:931
+#: pcbnew/footprint_editor_onclick.cpp:295 pcbnew/onrightclick.cpp:428
+#: pcbnew/onrightclick.cpp:743 pcbnew/tools/edit_tool.cpp:114
+#: qa/qa_utils/mocks.cpp:326
 msgid "Rotate Counterclockwise"
 msgstr "逆时针旋转"
 
-#: eeschema/libedit_onrightclick.cpp:366 eeschema/onrightclick.cpp:886
+#: eeschema/libedit/libedit_onrightclick.cpp:370 eeschema/onrightclick.cpp:891
 msgid "Delete Block"
 msgstr "删除 块"
 
-#: eeschema/libedit_plot_component.cpp:55
+#: eeschema/libedit/libedit_plot_component.cpp:55
 msgid "No component"
 msgstr "没有元件"
 
-#: eeschema/libedit_plot_component.cpp:72
-#: eeschema/libedit_plot_component.cpp:95
+#: eeschema/libedit/libedit_plot_component.cpp:72
+#: eeschema/libedit/libedit_plot_component.cpp:95
 msgid "Filename:"
 msgstr "文件名:"
 
-#: eeschema/libedit_plot_component.cpp:137
+#: eeschema/libedit/libedit_plot_component.cpp:140
 #, c-format
 msgid "Can't save file \"%s\""
 msgstr "无法保存文件 \"%s\""
 
-#: eeschema/libfield.cpp:56
+#: eeschema/libedit/libfield.cpp:56
 msgid "Edit Component Name"
 msgstr "编辑元件名称"
 
-#: eeschema/libfield.cpp:80
+#: eeschema/libedit/libfield.cpp:80
 #, c-format
 msgid ""
 "The name \"%s\" conflicts with an existing entry in the symbol library \"%s"
 "\"."
 msgstr "名称 \"%s\" 与符号库 \"%s\" 中的现有条目有冲突。"
 
-#: eeschema/menubar.cpp:117 eeschema/menubar_libedit.cpp:347
+#: eeschema/libedit/menubar_libedit.cpp:56
+#: pcbnew/menubar_footprint_editor.cpp:58
+msgid "New Library..."
+msgstr "新建库..."
+
+#: eeschema/libedit/menubar_libedit.cpp:57
+#: pcbnew/menubar_footprint_editor.cpp:59
+msgid "Creates an empty library"
+msgstr "创建一个新库"
+
+#: eeschema/libedit/menubar_libedit.cpp:62
+#: pcbnew/menubar_footprint_editor.cpp:64
+msgid "Add Library..."
+msgstr "添加库..."
+
+#: eeschema/libedit/menubar_libedit.cpp:63
+#: pcbnew/menubar_footprint_editor.cpp:65
+msgid "Adds a previously created library"
+msgstr "添加以前创建的库"
+
+#: eeschema/libedit/menubar_libedit.cpp:66
+msgid "&New Symbol..."
+msgstr "新建符号(&N)..."
+
+#: eeschema/libedit/menubar_libedit.cpp:70
+msgid "Create a new symbol"
+msgstr "创建一个新符号"
+
+#: eeschema/libedit/menubar_libedit.cpp:75 eeschema/menubar.cpp:378
+#: eeschema/widgets/symbol_tree_pane.cpp:56
+#: eeschema/widgets/symbol_tree_pane.cpp:76 kicad/menubar.cpp:245
+#: pagelayout_editor/menubar.cpp:81 pcbnew/footprint_tree_pane.cpp:57
+#: pcbnew/footprint_tree_pane.cpp:79 pcbnew/menubar_footprint_editor.cpp:82
+#: pcbnew/menubar_pcb_editor.cpp:771
+msgid "&Save"
+msgstr "保存(&S)"
+
+#: eeschema/libedit/menubar_libedit.cpp:79 eeschema/menubar.cpp:380
+#: pcbnew/menubar_footprint_editor.cpp:84 pcbnew/tool_footprint_editor.cpp:61
+msgid "Save changes"
+msgstr "保存更改"
+
+#: eeschema/libedit/menubar_libedit.cpp:82 pagelayout_editor/menubar.cpp:86
+#: pcbnew/footprint_tree_pane.cpp:81 pcbnew/menubar_footprint_editor.cpp:88
+msgid "Save &As..."
+msgstr "另存为(&A)..."
+
+#: eeschema/libedit/menubar_libedit.cpp:86
+#: pcbnew/menubar_footprint_editor.cpp:89
+msgid "Save a copy to a new name and/or location"
+msgstr "将副本保存到新名称和或位置"
+
+#: eeschema/libedit/menubar_libedit.cpp:91
+msgid "Save All"
+msgstr "保存所有"
+
+#: eeschema/libedit/menubar_libedit.cpp:92
+msgid "Save all library and symbol changes"
+msgstr "保存所有库和符号更改"
+
+#: eeschema/libedit/menubar_libedit.cpp:97
+#: pcbnew/menubar_footprint_editor.cpp:93
+msgid "&Revert"
+msgstr "恢复(&R)"
+
+#: eeschema/libedit/menubar_libedit.cpp:98
+#: pcbnew/menubar_footprint_editor.cpp:94
+msgid "Throw away changes"
+msgstr "放弃更改"
+
+#: eeschema/libedit/menubar_libedit.cpp:105
+#: eeschema/widgets/symbol_tree_pane.cpp:66
+msgid "&Import Symbol..."
+msgstr "导入符号(&I)..."
+
+#: eeschema/libedit/menubar_libedit.cpp:106
+msgid "Import a symbol to the current library"
+msgstr "导入符号到当前库"
+
+#: eeschema/libedit/menubar_libedit.cpp:111
+msgid "&Export Symbol..."
+msgstr "导出符号(&E)..."
+
+#: eeschema/libedit/menubar_libedit.cpp:112
+msgid "Export the current symbol"
+msgstr "导出当前符号"
+
+#: eeschema/libedit/menubar_libedit.cpp:117
+msgid "Export PNG..."
+msgstr "导出PNG..."
+
+#: eeschema/libedit/menubar_libedit.cpp:118
+msgid "Create a PNG file from the current view"
+msgstr "从当前视图创建一个PNG文件"
+
+#: eeschema/libedit/menubar_libedit.cpp:123
+msgid "Export SVG..."
+msgstr "导出SVG..."
+
+#: eeschema/libedit/menubar_libedit.cpp:124
+msgid "Create a SVG file from the current symbol"
+msgstr "从当前符号创建一个SVG文件"
+
+#: eeschema/libedit/menubar_libedit.cpp:131
+msgid "&Quit"
+msgstr "退出(&Q)"
+
+#: eeschema/libedit/menubar_libedit.cpp:132
+msgid "Quit Library Editor"
+msgstr "退出库编辑器"
+
+#: eeschema/libedit/menubar_libedit.cpp:138 eeschema/menubar.cpp:457
+#: pcbnew/menubar_footprint_editor.cpp:134 pcbnew/menubar_pcb_editor.cpp:451
+msgid "&Undo"
+msgstr "撤消(&U)"
+
+#: eeschema/libedit/menubar_libedit.cpp:142 pcbnew/help_common_strings.h:15
+#: pcbnew/tool_footprint_editor.cpp:70
+msgid "Undo last edit"
+msgstr "撤消上次编辑"
+
+#: eeschema/libedit/menubar_libedit.cpp:145 eeschema/menubar.cpp:462
+#: pcbnew/menubar_footprint_editor.cpp:140 pcbnew/menubar_pcb_editor.cpp:454
+msgid "&Redo"
+msgstr "重做(&R)"
+
+#: eeschema/libedit/menubar_libedit.cpp:149 pcbnew/help_common_strings.h:16
+msgid "Redo the last undo command"
+msgstr "重做撤消"
+
+#: eeschema/libedit/menubar_libedit.cpp:156
+msgid "&Properties..."
+msgstr "属性(&P)..."
+
+#: eeschema/libedit/menubar_libedit.cpp:157 eeschema/libedit/tool_lib.cpp:154
+msgid "Edit symbol properties"
+msgstr "编辑符号属性"
+
+#: eeschema/libedit/menubar_libedit.cpp:162
+msgid "Pin &Table..."
+msgstr "引脚列表(&T)..."
+
+#: eeschema/libedit/menubar_libedit.cpp:163 eeschema/libedit/tool_lib.cpp:158
+msgid "Show pin table"
+msgstr "显示引脚列表"
+
+#: eeschema/libedit/menubar_libedit.cpp:171 eeschema/viewlib_frame.cpp:105
+#: pcbnew/footprint_viewer_frame.cpp:728
+msgid "Library Browser"
+msgstr "库浏览"
+
+#: eeschema/libedit/menubar_libedit.cpp:172
+msgid "Open the symbol viewer"
+msgstr "打开符号查看器"
+
+#: eeschema/libedit/menubar_libedit.cpp:199 eeschema/menubar.cpp:174
+#: eeschema/tool_viewlib.cpp:158 pcbnew/menubar_footprint_editor.cpp:215
+msgid "&Zoom to Fit"
+msgstr "缩放至适合大小(&Z)"
+
+#: eeschema/libedit/menubar_libedit.cpp:200 eeschema/libedit/tool_lib.cpp:142
+#: eeschema/tool_viewlib.cpp:80 eeschema/tool_viewlib.cpp:159
+msgid "Zoom to fit symbol"
+msgstr "缩放符号至适合大小"
+
+#: eeschema/libedit/menubar_libedit.cpp:214 eeschema/menubar.cpp:191
+#: gerbview/menubar.cpp:224 pagelayout_editor/menubar.cpp:141
+#: pagelayout_editor/pl_editor_config.cpp:64
+#: pcbnew/menubar_footprint_editor.cpp:231 pcbnew/menubar_pcb_editor.cpp:593
+msgid "Show &Grid"
+msgstr "显示网格(&G)"
+
+#: eeschema/libedit/menubar_libedit.cpp:218 eeschema/menubar.cpp:195
+msgid "Grid Settings..."
+msgstr "网格设置..."
+
+#: eeschema/libedit/menubar_libedit.cpp:226
+msgid "&Search Tree"
+msgstr "搜索树(&S)"
+
+#: eeschema/libedit/menubar_libedit.cpp:227
+msgid "Toggles the search tree visibility"
+msgstr "切换搜索树可见性"
+
+#: eeschema/libedit/menubar_libedit.cpp:236
+msgid "&Pin"
+msgstr "引脚(&P)"
+
+#: eeschema/libedit/menubar_libedit.cpp:243
+msgid "Graphic &Text"
+msgstr "图形文本(&T)"
+
+#: eeschema/libedit/menubar_libedit.cpp:250
+msgid "&Rectangle"
+msgstr "矩形(&R)"
+
+#: eeschema/libedit/menubar_libedit.cpp:257
+#: pcbnew/menubar_footprint_editor.cpp:346 pcbnew/menubar_pcb_editor.cpp:308
+msgid "&Circle"
+msgstr "圆(&C)"
+
+#: eeschema/libedit/menubar_libedit.cpp:264
+#: pcbnew/menubar_footprint_editor.cpp:340 pcbnew/menubar_pcb_editor.cpp:304
+msgid "&Arc"
+msgstr "圆弧(&A)"
+
+#: eeschema/libedit/menubar_libedit.cpp:271
+msgid "&Line or Polygon"
+msgstr "线或多边形(&L)"
+
+#: eeschema/libedit/menubar_libedit.cpp:283
+msgid "Open associated datasheet in web browser"
+msgstr "在网页浏览器中打开相关的数据表"
+
+#: eeschema/libedit/menubar_libedit.cpp:288 eeschema/menubar.cpp:513
+msgid "Electrical Rules &Checker"
+msgstr "电气规则检查(&C)"
+
+#: eeschema/libedit/menubar_libedit.cpp:289 eeschema/libedit/tool_lib.cpp:167
+msgid "Check duplicate and off grid pins"
+msgstr "检查重复和关闭网格引脚"
+
+#: eeschema/libedit/menubar_libedit.cpp:305 kicad/menubar.cpp:334
+msgid "Manage &Symbol Libraries..."
+msgstr "管理符号库(&S)…"
+
+#: eeschema/libedit/menubar_libedit.cpp:306
+msgid "Edit the global and project symbol library tables."
+msgstr "编辑全局和工程封装库表。"
+
+#: eeschema/libedit/menubar_libedit.cpp:314 gerbview/menubar.cpp:296
+#: kicad/menubar.cpp:346 pagelayout_editor/menubar.cpp:175
+#: pcbnew/menubar_footprint_editor.cpp:416 pcbnew/menubar_pcb_editor.cpp:158
+msgid "&Preferences..."
+msgstr "首选项(&P)..."
+
+#: eeschema/libedit/menubar_libedit.cpp:315 eeschema/menubar.cpp:632
+#: kicad/menubar.cpp:347 pagelayout_editor/menubar.cpp:176
+#: pcbnew/menubar_footprint_editor.cpp:416 pcbnew/menubar_pcb_editor.cpp:158
+msgid "Show preferences for all open tools"
+msgstr "显示所有打开工具的首选项"
+
+#: eeschema/libedit/menubar_libedit.cpp:327 eeschema/menubar.cpp:595
+#: eeschema/tool_viewlib.cpp:175
+msgid "Eeschema &Manual"
+msgstr "Eeschema手册 (&M)"
+
+#: eeschema/libedit/menubar_libedit.cpp:328
+msgid "Open the Eeschema Manual"
+msgstr "打开 Eeschema 手册"
+
+#: eeschema/libedit/menubar_libedit.cpp:334 eeschema/tool_viewlib.cpp:181
+#: pcbnew/menubar_footprint_editor.cpp:452 pcbnew/tool_footprint_viewer.cpp:187
+msgid "Open the \"Getting Started in KiCad\" guide for beginners"
+msgstr "打开 \"KiCad入门\" 初学者指南"
+
+#: eeschema/libedit/menubar_libedit.cpp:359 eeschema/menubar.cpp:117
 #: pagelayout_editor/menubar.cpp:214 pcbnew/menubar_footprint_editor.cpp:476
 #: pcbnew/menubar_pcb_editor.cpp:134
 msgid "&Place"
 msgstr "放置(&P)"
 
-#: eeschema/menubar.cpp:118 eeschema/menubar_libedit.cpp:348
+#: eeschema/libedit/menubar_libedit.cpp:360 eeschema/menubar.cpp:118
 #: pcbnew/menubar_footprint_editor.cpp:477 pcbnew/menubar_pcb_editor.cpp:136
 msgid "&Inspect"
 msgstr "检查(&I)"
 
-#: eeschema/menubar.cpp:119 gerbview/menubar.cpp:364 kicad/menubar.cpp:431
-#: pcbnew/menubar_footprint_editor.cpp:478 pcbnew/menubar_pcb_editor.cpp:137
-msgid "&Tools"
-msgstr "工具(&T)"
-
-#: eeschema/menubar.cpp:120 eeschema/menubar_libedit.cpp:349
+#: eeschema/libedit/menubar_libedit.cpp:361 eeschema/menubar.cpp:120
 #: pagelayout_editor/menubar.cpp:215 pcbnew/menubar_footprint_editor.cpp:479
 #: pcbnew/menubar_pcb_editor.cpp:138
 msgid "P&references"
 msgstr "首选项(&R)"
 
+#: eeschema/libedit/pinedit.cpp:215
+#, c-format
+msgid "This position is already occupied by another pin, in unit %d."
+msgstr "这个位置已经被另一个引脚占用, 在单元%d"
+
+#: eeschema/libedit/pinedit.cpp:219
+msgid "Create Pin Anyway"
+msgstr "新建引脚阵列"
+
+#: eeschema/libedit/pinedit.cpp:605
+msgid "No pins!"
+msgstr "没有引脚！"
+
+#: eeschema/libedit/pinedit.cpp:615
+msgid "Marker Information"
+msgstr "标记信息"
+
+#: eeschema/libedit/pinedit.cpp:636
+#, c-format
+msgid ""
+"<b>Duplicate pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b> conflicts "
+"with pin %s \"%s\" at location <b>(%.3f, %.3f)</b>"
+msgstr ""
+"<b>重复引脚 %s</b> \"%s\" 在位置 <b>(%.3f, %.3f)</b>与冲突引脚 %s \"%s\" 在位"
+"置 <b>(%.3f, %.3f)</b>"
+
+#: eeschema/libedit/pinedit.cpp:650
+#, c-format
+msgid " in units %c and %c"
+msgstr "单位 %c 和 %c"
+
+#: eeschema/libedit/pinedit.cpp:658 eeschema/libedit/pinedit.cpp:698
+msgid "  of converted"
+msgstr " 转换"
+
+#: eeschema/libedit/pinedit.cpp:660 eeschema/libedit/pinedit.cpp:700
+msgid "  of normal"
+msgstr "标准"
+
+#: eeschema/libedit/pinedit.cpp:683
+#, c-format
+msgid "<b>Off grid pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b>"
+msgstr "<b>网格外引脚 %s</b> \"%s\" 在位置 <b>(%.3f, %.3f)</b>"
+
+#: eeschema/libedit/pinedit.cpp:692
+#, c-format
+msgid " in symbol %c"
+msgstr " 在符号 %c内"
+
+#: eeschema/libedit/pinedit.cpp:709
+msgid "No off grid or duplicate pins were found."
+msgstr "没有发现网格外或重复的引脚。"
+
+#: eeschema/libedit/symbedit.cpp:104
+#, c-format
+msgid "More than one symbol found in symbol file \"%s\"."
+msgstr "符号文件 '%s' 内不止一个符号"
+
+#: eeschema/libedit/symbedit.cpp:190
+#, c-format
+msgid "Saving symbol in \"%s\""
+msgstr "保存符号到 \"%s\""
+
+#: eeschema/libedit/symbedit.cpp:206
+#, fuzzy, c-format
+#| msgid "An error occurred attempting to save symbol file \"%s\""
+msgid "An error occurred saving symbol file \"%s\""
+msgstr "保存符号文件 '%s' 发生错误。"
+
+#: eeschema/libedit/tool_lib.cpp:58
+msgid "Deselect current tool"
+msgstr "不选择当前工具"
+
+#: eeschema/libedit/tool_lib.cpp:85
+msgid "Move symbol anchor"
+msgstr "移动符号锚点"
+
+#: eeschema/libedit/tool_lib.cpp:89
+msgid "Import existing drawings"
+msgstr "导入现有的图形"
+
+#: eeschema/libedit/tool_lib.cpp:93
+msgid "Export current drawing"
+msgstr "导出当前图形"
+
+#: eeschema/libedit/tool_lib.cpp:116
+msgid "Create new symbol"
+msgstr "创建新符号"
+
+#: eeschema/libedit/tool_lib.cpp:120
+msgid "Save all changes"
+msgstr "保存所有更改"
+
+#: eeschema/libedit/tool_lib.cpp:164
+msgid "Show associated datasheet or document"
+msgstr "显示关联的数据手册或文档"
+
+#: eeschema/libedit/tool_lib.cpp:173 eeschema/tool_viewlib.cpp:88
+msgid "Show as \"De Morgan\" normal symbol"
+msgstr "显示为\"德摩根\" 标准符号"
+
+#: eeschema/libedit/tool_lib.cpp:176 eeschema/tool_viewlib.cpp:93
+msgid "Show as \"De Morgan\" convert symbol"
+msgstr "显示\"德摩根\" 转换符号"
+
+#: eeschema/libedit/tool_lib.cpp:190
+msgid ""
+"Synchronized pin edit mode\n"
+"Synchronized pin edit mode propagates to other units all pin changes except "
+"pin number modification.\n"
+"Enabled by default for multiunit parts with interchangeable units."
+msgstr ""
+"同步引脚编辑模式\n"
+"同步引脚编辑模式传播到其他单元的所有引脚变化，除了引脚编号修改。\n"
+"默认情况下为可更换单元的多单元部件启用。"
+
+#: eeschema/libedit/tool_lib.cpp:211 eeschema/tool_sch.cpp:289
+#: gerbview/toolbars_gerber.cpp:253
+msgid "Turn grid off"
+msgstr "关闭网格"
+
+#: eeschema/libedit/tool_lib.cpp:234
+msgid "Show pins electrical type"
+msgstr "显示引脚电气类型"
+
+#: eeschema/libedit/tool_lib.cpp:238
+msgid "Toggles the search tree"
+msgstr "切换搜索树"
+
+#: eeschema/menubar.cpp:119 gerbview/menubar.cpp:371 kicad/menubar.cpp:430
+#: pcbnew/menubar_footprint_editor.cpp:478 pcbnew/menubar_pcb_editor.cpp:137
+msgid "&Tools"
+msgstr "工具(&T)"
+
 #: eeschema/menubar.cpp:134
 msgid "Library &Browser"
 msgstr "库浏览(&B)"
@@ -8785,7 +9388,7 @@ msgstr "库浏览(&B)"
 msgid "Show &Hierarchical Navigator"
 msgstr "原理图层次结构(&H)"
 
-#: eeschema/menubar.cpp:140 eeschema/tool_sch.cpp:133
+#: eeschema/menubar.cpp:140 eeschema/tool_sch.cpp:134
 msgid "Navigate schematic hierarchy"
 msgstr "原理图层次结构"
 
@@ -8797,640 +9400,416 @@ msgstr "离开分页(&L)"
 msgid "Return to parent schematic sheet"
 msgstr "回到根原理图页"
 
-#: eeschema/menubar.cpp:174 eeschema/menubar_libedit.cpp:199
-#: eeschema/tool_viewlib.cpp:160 pcbnew/menubar_footprint_editor.cpp:210
-msgid "&Zoom to Fit"
-msgstr "缩放至适合大小(&Z)"
-
-#: eeschema/menubar.cpp:191 gerbview/menubar.cpp:217
-#: pagelayout_editor/menubar.cpp:141 pagelayout_editor/pl_editor_config.cpp:64
-#: pcbnew/menubar_footprint_editor.cpp:226 pcbnew/menubar_pcb_editor.cpp:593
-msgid "Show &Grid"
-msgstr "显示网格(&G)"
-
-#: eeschema/menubar.cpp:197 gerbview/menubar.cpp:227
-#: pcbnew/menubar_footprint_editor.cpp:240 pcbnew/menubar_pcb_editor.cpp:607
+#: eeschema/menubar.cpp:201 gerbview/menubar.cpp:234
+#: pcbnew/menubar_footprint_editor.cpp:245 pcbnew/menubar_pcb_editor.cpp:607
 msgid "&Imperial"
 msgstr "英制(&I)"
 
-#: eeschema/menubar.cpp:197 gerbview/menubar.cpp:227
-#: pcbnew/menubar_footprint_editor.cpp:240 pcbnew/menubar_pcb_editor.cpp:607
+#: eeschema/menubar.cpp:201 gerbview/menubar.cpp:234
+#: pcbnew/menubar_footprint_editor.cpp:245 pcbnew/menubar_pcb_editor.cpp:607
 msgid "Use imperial units"
 msgstr "使用英制单位"
 
-#: eeschema/menubar.cpp:201 gerbview/menubar.cpp:231
-#: pcbnew/menubar_footprint_editor.cpp:244 pcbnew/menubar_pcb_editor.cpp:611
+#: eeschema/menubar.cpp:205 gerbview/menubar.cpp:238
+#: pcbnew/menubar_footprint_editor.cpp:249 pcbnew/menubar_pcb_editor.cpp:611
 msgid "&Metric"
 msgstr "公制(&M)"
 
-#: eeschema/menubar.cpp:201 gerbview/menubar.cpp:231
-#: pcbnew/menubar_footprint_editor.cpp:244 pcbnew/menubar_pcb_editor.cpp:611
+#: eeschema/menubar.cpp:205 gerbview/menubar.cpp:238
+#: pcbnew/menubar_footprint_editor.cpp:249 pcbnew/menubar_pcb_editor.cpp:611
 msgid "Use metric units"
 msgstr "使用公制单位"
 
-#: eeschema/menubar.cpp:205 gerbview/menubar.cpp:235
-#: pcbnew/menubar_footprint_editor.cpp:248 pcbnew/menubar_pcb_editor.cpp:615
+#: eeschema/menubar.cpp:209 gerbview/menubar.cpp:242
+#: pcbnew/menubar_footprint_editor.cpp:253 pcbnew/menubar_pcb_editor.cpp:615
 msgid "&Units"
 msgstr "单位(&U)"
 
-#: eeschema/menubar.cpp:206 gerbview/menubar.cpp:236
-#: pcbnew/menubar_footprint_editor.cpp:249 pcbnew/menubar_pcb_editor.cpp:616
+#: eeschema/menubar.cpp:210 gerbview/menubar.cpp:243
+#: pcbnew/menubar_footprint_editor.cpp:254 pcbnew/menubar_pcb_editor.cpp:616
 msgid "Select which units are displayed"
 msgstr "选择要显示的单元"
 
-#: eeschema/menubar.cpp:212 eeschema/menubar.cpp:217
+#: eeschema/menubar.cpp:214
 msgid "Full &Window Crosshair"
 msgstr "十字光标全屏(&W)"
 
-#: eeschema/menubar.cpp:218
-msgid "Change cursor shape (not supported in Legacy graphics)"
-msgstr "更改光标形状(不支持传统图形)"
-
-#: eeschema/menubar.cpp:225
+#: eeschema/menubar.cpp:221
 msgid "Show Hidden &Pins"
 msgstr "显示隐藏引脚(&P)"
 
-#: eeschema/menubar.cpp:239
+#: eeschema/menubar.cpp:235
 msgid "&Symbol"
 msgstr "符号(&S)"
 
-#: eeschema/menubar.cpp:245
+#: eeschema/menubar.cpp:241
 msgid "&Power Port"
 msgstr "电源端口(&P)"
 
-#: eeschema/menubar.cpp:251
+#: eeschema/menubar.cpp:247
 msgid "&Wire"
 msgstr "连线(&W)"
 
-#: eeschema/menubar.cpp:257
+#: eeschema/menubar.cpp:253
 msgid "&Bus"
 msgstr "总线(&B)"
 
-#: eeschema/menubar.cpp:263
+#: eeschema/menubar.cpp:259
 msgid "Wire to Bus &Entry"
 msgstr "连线到总线入口(&E)"
 
-#: eeschema/menubar.cpp:269
+#: eeschema/menubar.cpp:265
 msgid "Bus &to Bus Entry"
 msgstr "总线到总线入口(&T)"
 
-#: eeschema/menubar.cpp:275
+#: eeschema/menubar.cpp:271
 msgid "&No Connect Flag"
 msgstr "不连接标记(&N)"
 
-#: eeschema/menubar.cpp:279
+#: eeschema/menubar.cpp:275
 msgid "&Junction"
 msgstr "连接点(&J)"
 
-#: eeschema/menubar.cpp:285
+#: eeschema/menubar.cpp:281
 msgid "&Label"
 msgstr "标签(&L)"
 
-#: eeschema/menubar.cpp:291
+#: eeschema/menubar.cpp:287
 msgid "Gl&obal Label"
 msgstr "全局标签(&O)"
 
-#: eeschema/menubar.cpp:299
+#: eeschema/menubar.cpp:295
 msgid "&Hierarchical Label"
 msgstr "层次标签(&H)"
 
-#: eeschema/menubar.cpp:306
+#: eeschema/menubar.cpp:302
 msgid "Hierar&chical Sheet"
 msgstr "层次图页(&C)"
 
-#: eeschema/menubar.cpp:314
+#: eeschema/menubar.cpp:310
 msgid "I&mport Hierarchical Label"
 msgstr "导入层次标签(&M)"
 
-#: eeschema/menubar.cpp:320
+#: eeschema/menubar.cpp:316
 msgid "Hierarchical Pi&n to Sheet"
 msgstr "原理图页引脚(&N)"
 
-#: eeschema/menubar.cpp:326
+#: eeschema/menubar.cpp:322
 msgid "Graphic Pol&yline"
 msgstr "多段线图形(&Y)"
 
-#: eeschema/menubar.cpp:332
+#: eeschema/menubar.cpp:328
 msgid "&Graphic Text"
 msgstr "图形文本(&G)"
 
-#: eeschema/menubar.cpp:339
+#: eeschema/menubar.cpp:335
 msgid "&Image"
 msgstr "图片(&I)"
 
-#: eeschema/menubar.cpp:365
+#: eeschema/menubar.cpp:361
 msgid "&New..."
 msgstr "新建(&N)..."
 
-#: eeschema/menubar.cpp:367
-msgid "Clear current schematic hierarchy and start new schematic root sheet"
-msgstr "清除当前层次原理图并启动新的原理图图页"
+#: eeschema/menubar.cpp:363
+msgid "Start new schematic root sheet"
+msgstr ""
 
-#: eeschema/menubar.cpp:370 pagelayout_editor/menubar.cpp:67
+#: eeschema/menubar.cpp:366 pagelayout_editor/menubar.cpp:67
 #: pcbnew/menubar_pcb_editor.cpp:758
 msgid "&Open..."
 msgstr "打开(&O)..."
 
-#: eeschema/menubar.cpp:372
+#: eeschema/menubar.cpp:368
 msgid "Open existing schematic"
 msgstr "打开当前原理图"
 
-#: eeschema/menubar.cpp:376 kicad/menubar.cpp:237
+#: eeschema/menubar.cpp:371 kicad/menubar.cpp:237
 #: pagelayout_editor/menubar.cpp:75 pcbnew/menubar_pcb_editor.cpp:764
 msgid "Open &Recent"
 msgstr "最近打开(&R)"
 
-#: eeschema/menubar.cpp:377
+#: eeschema/menubar.cpp:372
 msgid "Open recently opened schematic"
 msgstr "打开最近的原理图"
 
-#: eeschema/menubar.cpp:383 eeschema/menubar_libedit.cpp:75
-#: eeschema/widgets/symbol_tree_pane.cpp:56
-#: eeschema/widgets/symbol_tree_pane.cpp:74 kicad/menubar.cpp:245
-#: pagelayout_editor/menubar.cpp:81 pcbnew/footprint_tree_pane.cpp:57
-#: pcbnew/footprint_tree_pane.cpp:82 pcbnew/menubar_footprint_editor.cpp:82
-#: pcbnew/menubar_pcb_editor.cpp:771
-msgid "&Save"
-msgstr "保存(&S)"
-
-#: eeschema/menubar.cpp:386
-msgid "Save all sheets in schematic"
-msgstr "保存原理图中所有图页"
-
-#: eeschema/menubar.cpp:391
+#: eeschema/menubar.cpp:383
 msgid "Save &Current Sheet"
 msgstr "保存当前图页(&C)"
 
-#: eeschema/menubar.cpp:392
-msgid "Save only current schematic sheet"
-msgstr "仅保存当前原理图页"
+#: eeschema/menubar.cpp:384
+msgid "Save only the current sheet"
+msgstr "仅保存当前图页"
 
-#: eeschema/menubar.cpp:397
+#: eeschema/menubar.cpp:387
 msgid "Save C&urrent Sheet As..."
 msgstr "另存当前图页(&U)"
 
-#: eeschema/menubar.cpp:401
-msgid "Save current schematic sheet with new name"
-msgstr "用新名称保存当前原理图页"
+#: eeschema/menubar.cpp:389
+msgid "Save a copy of the current sheet"
+msgstr "保存当前图页的副本"
 
-#: eeschema/menubar.cpp:408
+#: eeschema/menubar.cpp:394
 msgid "App&end Schematic Sheet Content..."
 msgstr "添加原理图内容(&E)..."
 
-#: eeschema/menubar.cpp:409
-msgid "Import schematic sheet content from another project to current sheet"
-msgstr "从其它项目中导入原理图到当前图页"
+#: eeschema/menubar.cpp:395
+msgid ""
+"Append schematic sheet content from another project to the current sheet"
+msgstr "将另一个工程中的原理图页内容添加到当前图页"
 
-#: eeschema/menubar.cpp:413
-msgid "&Import Non KiCad Schematic File..."
-msgstr "导入非KiCad原理图文件(&I)..."
+#: eeschema/menubar.cpp:398
+msgid "&Import Non KiCad Schematic..."
+msgstr "导入非KiCad原理图(&I)..."
 
-#: eeschema/menubar.cpp:414
-msgid "Import schematic file from other applications"
+#: eeschema/menubar.cpp:399
+#, fuzzy
+#| msgid "Import schematic file from other applications"
+msgid ""
+"Replace current schematic sheet with one imported from another application"
 msgstr "从其它应用程序中导入原理图文件"
 
-#: eeschema/menubar.cpp:423
+#: eeschema/menubar.cpp:407
 msgid "&Footprint Association File..."
 msgstr "封装关联文件(&F)..."
 
-#: eeschema/menubar.cpp:429 pcbnew/menubar_pcb_editor.cpp:839
+#: eeschema/menubar.cpp:411 pcbnew/menubar_pcb_editor.cpp:839
 msgid "&Import"
 msgstr "导入(&I)"
 
-#: eeschema/menubar.cpp:430 pcbnew/menubar_pcb_editor.cpp:840
+#: eeschema/menubar.cpp:412 pcbnew/menubar_pcb_editor.cpp:840
 msgid "Import files"
 msgstr "导入文件"
 
-#: eeschema/menubar.cpp:438
+#: eeschema/menubar.cpp:419
 msgid "Drawing to C&lipboard"
 msgstr "图形到剪贴板"
 
-#: eeschema/menubar.cpp:439
+#: eeschema/menubar.cpp:420
 msgid "Export drawings to clipboard"
 msgstr "将图形输出到剪贴板"
 
-#: eeschema/menubar.cpp:444 pcbnew/menubar_pcb_editor.cpp:848
+#: eeschema/menubar.cpp:423 pcbnew/menubar_pcb_editor.cpp:848
 msgid "E&xport"
 msgstr "导出(&X)"
 
-#: eeschema/menubar.cpp:445
+#: eeschema/menubar.cpp:424
 msgid "Export files"
 msgstr "导出文件"
 
-#: eeschema/menubar.cpp:452 pcbnew/menubar_pcb_editor.cpp:894
+#: eeschema/menubar.cpp:430 pcbnew/menubar_pcb_editor.cpp:894
 msgid "Page S&ettings..."
 msgstr "页面设置(&S)..."
 
-#: eeschema/menubar.cpp:453 pcbnew/menubar_pcb_editor.cpp:895
+#: eeschema/menubar.cpp:431 pcbnew/menubar_pcb_editor.cpp:895
 msgid "Settings for sheet size and frame references"
 msgstr "设置图页和图框"
 
-#: eeschema/menubar.cpp:456 gerbview/menubar.cpp:163
-#: pagelayout_editor/menubar.cpp:93 pcbnew/menubar_footprint_editor.cpp:112
+#: eeschema/menubar.cpp:434 gerbview/menubar.cpp:170
+#: pagelayout_editor/menubar.cpp:93 pcbnew/menubar_footprint_editor.cpp:117
 #: pcbnew/menubar_pcb_editor.cpp:898
 msgid "&Print..."
 msgstr "打印(&P)..."
 
-#: eeschema/menubar.cpp:458
+#: eeschema/menubar.cpp:436
 msgid "Print schematic sheet"
 msgstr "打印原理图页"
 
-#: eeschema/menubar.cpp:461 pcbnew/menubar_pcb_editor.cpp:904
+#: eeschema/menubar.cpp:439 pcbnew/menubar_pcb_editor.cpp:904
 msgid "P&lot..."
 msgstr "绘制(&L)..."
 
-#: eeschema/menubar.cpp:462
+#: eeschema/menubar.cpp:440
 msgid "Plot schematic sheet in PostScript, PDF, SVG, DXF or HPGL format"
 msgstr "在 PostScript 中绘制原理图页 , PDF, SVG, DXF 或 HPGL 格式"
 
-#: eeschema/menubar.cpp:468
+#: eeschema/menubar.cpp:447
 msgid "Close Eeschema"
 msgstr "关闭 Eeschema"
 
-#: eeschema/menubar.cpp:478 eeschema/menubar_libedit.cpp:138
-#: pcbnew/menubar_footprint_editor.cpp:129 pcbnew/menubar_pcb_editor.cpp:451
-msgid "&Undo"
-msgstr "撤消(&U)"
-
-#: eeschema/menubar.cpp:483 eeschema/menubar_libedit.cpp:145
-#: pcbnew/menubar_footprint_editor.cpp:135 pcbnew/menubar_pcb_editor.cpp:454
-msgid "&Redo"
-msgstr "重做(&R)"
-
-#: eeschema/menubar.cpp:489 pcbnew/menubar_pcb_editor.cpp:461
+#: eeschema/menubar.cpp:468 pcbnew/menubar_pcb_editor.cpp:461
 msgid "&Cut"
 msgstr "剪切(&C)"
 
-#: eeschema/menubar.cpp:491 pcbnew/menubar_footprint_editor.cpp:147
+#: eeschema/menubar.cpp:470 pcbnew/menubar_footprint_editor.cpp:152
 #: pcbnew/menubar_pcb_editor.cpp:463
 msgid "Cuts the selected item(s) to the Clipboard"
 msgstr "将选定的项目剪切到剪贴板"
 
-#: eeschema/menubar.cpp:494 pcbnew/menubar_footprint_editor.cpp:148
+#: eeschema/menubar.cpp:473 pcbnew/menubar_footprint_editor.cpp:153
 #: pcbnew/menubar_pcb_editor.cpp:466
 msgid "&Copy"
 msgstr "复制(&C)"
 
-#: eeschema/menubar.cpp:496 pcbnew/menubar_footprint_editor.cpp:150
+#: eeschema/menubar.cpp:475 pcbnew/menubar_footprint_editor.cpp:155
 #: pcbnew/menubar_pcb_editor.cpp:468
 msgid "Copies the selected item(s) to the Clipboard"
 msgstr "将所选项目复制到剪贴板"
 
-#: eeschema/menubar.cpp:507 pcbnew/menubar_pcb_editor.cpp:478
+#: eeschema/menubar.cpp:486 pcbnew/footprint_tree_pane.cpp:83
+#: pcbnew/menubar_pcb_editor.cpp:478
 msgid "&Delete"
 msgstr "删除(&D)"
 
-#: eeschema/menubar.cpp:512 pcbnew/menubar_pcb_editor.cpp:483
+#: eeschema/menubar.cpp:491 pcbnew/menubar_pcb_editor.cpp:483
 msgid "&Find..."
 msgstr "查找(&F)..."
 
-#: eeschema/menubar.cpp:516
+#: eeschema/menubar.cpp:495
 msgid "Find and Re&place..."
 msgstr "查找和替换(&P)..."
 
-#: eeschema/menubar.cpp:525
+#: eeschema/menubar.cpp:504
 msgid "Update Fields from Library..."
 msgstr "从库中更新字段..."
 
-#: eeschema/menubar.cpp:526
+#: eeschema/menubar.cpp:505
 msgid "Sets symbol fields to original library values"
 msgstr "将符号字段设置为原始库值"
 
-#: eeschema/menubar.cpp:534 eeschema/menubar_libedit.cpp:276
-msgid "Electrical Rules &Checker"
-msgstr "电气规则检查(&C)"
-
-#: eeschema/menubar.cpp:535 eeschema/tool_sch.cpp:159
+#: eeschema/menubar.cpp:514 eeschema/tool_sch.cpp:160
 msgid "Perform electrical rules check"
 msgstr "执行电气规则检查"
 
-#: eeschema/menubar.cpp:544 pcbnew/menubar_pcb_editor.cpp:369
+#: eeschema/menubar.cpp:523 pcbnew/menubar_pcb_editor.cpp:369
 msgid "Update PCB from Schematic..."
 msgstr "从原理图更新PCB..."
 
-#: eeschema/menubar.cpp:549
+#: eeschema/menubar.cpp:528
 msgid "Updates PCB design with current schematic (forward annotation)."
 msgstr "由当前原理图更新PCB设计（正向批注）"
 
-#: eeschema/menubar.cpp:553
+#: eeschema/menubar.cpp:532
 msgid "&Open PCB Editor"
 msgstr "打开PCB编辑器(&O)"
 
-#: eeschema/menubar.cpp:554 kicad/menubar.cpp:139
+#: eeschema/menubar.cpp:533 kicad/menubar.cpp:139
 msgid "Run Pcbnew"
 msgstr "运行Pcbnew"
 
-#: eeschema/menubar.cpp:559
+#: eeschema/menubar.cpp:538
 msgid "Symbol Library &Editor"
 msgstr "符号库编辑器(&E)"
 
-#: eeschema/menubar.cpp:563
+#: eeschema/menubar.cpp:542
 msgid "&Rescue Symbols..."
 msgstr "恢复符号(&R)..."
 
-#: eeschema/menubar.cpp:564
+#: eeschema/menubar.cpp:543
 msgid "Find old symbols in project and rename/rescue them"
 msgstr "在工程中找到旧的符号重命名或恢复它们"
 
-#: eeschema/menubar.cpp:567
+#: eeschema/menubar.cpp:546
 msgid "Remap Symbols..."
 msgstr "重新映射符号..."
 
-#: eeschema/menubar.cpp:568
+#: eeschema/menubar.cpp:547
 msgid "Remap legacy library symbols to symbol library table"
 msgstr "将传统库符号重新映射到符号库表"
 
-#: eeschema/menubar.cpp:573
+#: eeschema/menubar.cpp:552
 msgid "Edit Symbol Field&s..."
 msgstr "编辑符号字段(&S)..."
 
-#: eeschema/menubar.cpp:577
+#: eeschema/menubar.cpp:556
 msgid "Edit Symbol Library References..."
 msgstr "编辑符号库参考..."
 
-#: eeschema/menubar.cpp:578
+#: eeschema/menubar.cpp:557
 msgid "Edit links between schematic symbols and library symbols"
 msgstr "编辑原理图符号和库符号之间的链接"
 
-#: eeschema/menubar.cpp:583
+#: eeschema/menubar.cpp:562
 msgid "&Annotate Schematic..."
 msgstr "批注原理图(&A)..."
 
-#: eeschema/menubar.cpp:587
+#: eeschema/menubar.cpp:566
 msgid "Generate &Netlist File..."
 msgstr "生成网表文件(&N)..."
 
-#: eeschema/menubar.cpp:588
+#: eeschema/menubar.cpp:567
 msgid "Generate netlist file"
 msgstr "生成网表文件"
 
-#: eeschema/menubar.cpp:591
+#: eeschema/menubar.cpp:570
 msgid "Generate Bill of &Materials..."
 msgstr "生成材料清单(&M)..."
 
-#: eeschema/menubar.cpp:598
+#: eeschema/menubar.cpp:577
 msgid "A&ssign Footprints..."
 msgstr "分配封装(&S)..."
 
-#: eeschema/menubar.cpp:599 eeschema/tool_sch.cpp:162
+#: eeschema/menubar.cpp:578 eeschema/tool_sch.cpp:163
 msgid "Assign PCB footprints to schematic symbols"
 msgstr "分配PCB封装到原理图符号"
 
-#: eeschema/menubar.cpp:606
+#: eeschema/menubar.cpp:585
 msgid "Simula&tor"
 msgstr "仿真器(&T)"
 
-#: eeschema/menubar.cpp:607
+#: eeschema/menubar.cpp:586
 msgid "Simulate circuit"
 msgstr "模拟电路"
 
-#: eeschema/menubar.cpp:616 eeschema/menubar_libedit.cpp:315
-#: eeschema/tool_viewlib.cpp:177
-msgid "Eeschema &Manual"
-msgstr "Eeschema手册 (&M)"
-
-#: eeschema/menubar.cpp:617
+#: eeschema/menubar.cpp:596
 msgid "Open Eeschema Manual"
 msgstr "打开 Eeschema 手册"
 
-#: eeschema/menubar.cpp:626 pcbnew/menubar_footprint_editor.cpp:458
+#: eeschema/menubar.cpp:605 pcbnew/menubar_footprint_editor.cpp:458
 msgid "Displays current hotkeys table and corresponding commands"
 msgstr "显示当前快捷键表和相应命令"
 
-#: eeschema/menubar.cpp:642
+#: eeschema/menubar.cpp:621
 msgid "Configure Pa&ths..."
 msgstr "配置路径(&T)..."
 
-#: eeschema/menubar.cpp:647
+#: eeschema/menubar.cpp:626
 msgid "Manage Symbol Libraries..."
 msgstr "管理符号库…"
 
-#: eeschema/menubar.cpp:648
+#: eeschema/menubar.cpp:627
 msgid "Edit the global and project symbol library lists"
 msgstr "编辑全局和工程符号库表"
 
-#: eeschema/menubar.cpp:652
+#: eeschema/menubar.cpp:631
 msgid "Preferences..."
 msgstr "首选项..."
 
-#: eeschema/menubar.cpp:653 eeschema/menubar_libedit.cpp:303
-#: kicad/menubar.cpp:347 pagelayout_editor/menubar.cpp:176
-#: pcbnew/menubar_footprint_editor.cpp:416 pcbnew/menubar_pcb_editor.cpp:158
-msgid "Show preferences for all open tools"
-msgstr "显示所有打开工具的首选项"
+#: eeschema/menubar.cpp:642 gerbview/menubar.cpp:308
+#: pcbnew/menubar_footprint_editor.cpp:426 pcbnew/menubar_pcb_editor.cpp:167
+msgid "Modern Toolset (&Accelerated)"
+msgstr "现代工具箱 (加速&A)"
 
-#: eeschema/menubar.cpp:664
+#: eeschema/menubar.cpp:645 gerbview/menubar.cpp:310
+#: pcbnew/menubar_footprint_editor.cpp:428 pcbnew/menubar_pcb_editor.cpp:170
+msgid "Use Modern Toolset with hardware-accelerated graphics (recommended)"
+msgstr "使用带有硬件图形加速的现代工具箱(推荐）"
+
+#: eeschema/menubar.cpp:648 gerbview/menubar.cpp:313
+#: pcbnew/menubar_pcb_editor.cpp:173
+msgid "Modern Toolset (Fallba&ck)"
+msgstr "现代工具箱 (回退&C)"
+
+#: eeschema/menubar.cpp:651 gerbview/menubar.cpp:315
+#: pcbnew/menubar_footprint_editor.cpp:433 pcbnew/menubar_pcb_editor.cpp:176
+msgid "Use Modern Toolset with software graphics (fall-back)"
+msgstr "使用带有软件图形加速的现代工具箱(回退）"
+
+#: eeschema/menubar.cpp:657
 msgid "&Save Project File..."
 msgstr "保存工程文件(&S)..."
 
-#: eeschema/menubar.cpp:665
+#: eeschema/menubar.cpp:658
 msgid "Save project preferences into a project file"
 msgstr "保存工程首选项参数到工程文件"
 
-#: eeschema/menubar.cpp:668
+#: eeschema/menubar.cpp:661
 msgid "Load P&roject File..."
 msgstr "载入工程文件(&P)..."
 
-#: eeschema/menubar.cpp:669
+#: eeschema/menubar.cpp:662
 msgid "Load project preferences from a project file"
 msgstr "从工程文件载入工程首选项参数"
 
-#: eeschema/menubar_libedit.cpp:56 pcbnew/menubar_footprint_editor.cpp:58
-msgid "New Library..."
-msgstr "新建库..."
-
-#: eeschema/menubar_libedit.cpp:57 pcbnew/menubar_footprint_editor.cpp:59
-msgid "Creates an empty library"
-msgstr "创建一个新库"
-
-#: eeschema/menubar_libedit.cpp:62
-msgid "Add Library..."
-msgstr "添加库..."
-
-#: eeschema/menubar_libedit.cpp:63
-msgid "Adds a previously created library"
-msgstr "添加以前创建的库"
-
-#: eeschema/menubar_libedit.cpp:66
-msgid "&New Symbol..."
-msgstr "新建符号(&N)..."
-
-#: eeschema/menubar_libedit.cpp:70
-msgid "Create a new symbol"
-msgstr "创建一个新符号"
-
-#: eeschema/menubar_libedit.cpp:79 pcbnew/menubar_footprint_editor.cpp:84
-msgid "Save changes"
-msgstr "保存更改"
-
-#: eeschema/menubar_libedit.cpp:82 pagelayout_editor/menubar.cpp:86
-msgid "Save &As..."
-msgstr "另存为(&A)..."
-
-#: eeschema/menubar_libedit.cpp:86
-msgid "Save to a new name and/or location"
-msgstr "保存到一个新的名称或位置"
-
-#: eeschema/menubar_libedit.cpp:91
-msgid "Save All"
-msgstr "保存所有"
-
-#: eeschema/menubar_libedit.cpp:92
-msgid "Save all library and symbol changes"
-msgstr "保存所有库和符号更改"
-
-#: eeschema/menubar_libedit.cpp:97
-msgid "&Revert"
-msgstr "恢复(&R)"
-
-#: eeschema/menubar_libedit.cpp:98
-msgid "Throw away changes"
-msgstr "放弃更改"
-
-#: eeschema/menubar_libedit.cpp:105 eeschema/widgets/symbol_tree_pane.cpp:66
-msgid "&Import Symbol..."
-msgstr "导入符号(&I)..."
-
-#: eeschema/menubar_libedit.cpp:106
-msgid "Import a symbol to the current library"
-msgstr "导入符号到当前库"
-
-#: eeschema/menubar_libedit.cpp:111
-msgid "&Export Symbol..."
-msgstr "导出符号(&E)..."
-
-#: eeschema/menubar_libedit.cpp:112
-msgid "Export the current symbol"
-msgstr "导出当前符号"
-
-#: eeschema/menubar_libedit.cpp:117
-msgid "Export PNG..."
-msgstr "导出PNG..."
-
-#: eeschema/menubar_libedit.cpp:118
-msgid "Create a PNG file from the current view"
-msgstr "从当前视图创建一个PNG文件"
-
-#: eeschema/menubar_libedit.cpp:123
-msgid "Export SVG..."
-msgstr "导出SVG..."
-
-#: eeschema/menubar_libedit.cpp:124
-msgid "Create a SVG file from the current symbol"
-msgstr "从当前符号创建一个SVG文件"
-
-#: eeschema/menubar_libedit.cpp:131
-msgid "&Quit"
-msgstr "退出(&Q)"
-
-#: eeschema/menubar_libedit.cpp:132
-msgid "Quit Library Editor"
-msgstr "退出库编辑器"
-
-#: eeschema/menubar_libedit.cpp:142 pcbnew/help_common_strings.h:15
-#: pcbnew/tool_footprint_editor.cpp:70
-msgid "Undo last edit"
-msgstr "撤消上次编辑"
-
-#: eeschema/menubar_libedit.cpp:149 pcbnew/help_common_strings.h:16
-msgid "Redo the last undo command"
-msgstr "重做撤消"
-
-#: eeschema/menubar_libedit.cpp:156
-msgid "&Properties..."
-msgstr "属性(&P)..."
-
-#: eeschema/menubar_libedit.cpp:157 eeschema/tool_lib.cpp:154
-msgid "Edit symbol properties"
-msgstr "编辑符号属性"
-
-#: eeschema/menubar_libedit.cpp:162
-msgid "Pin &Table..."
-msgstr "引脚列表(&T)..."
-
-#: eeschema/menubar_libedit.cpp:163 eeschema/tool_lib.cpp:158
-msgid "Show pin table"
-msgstr "显示引脚列表"
-
-#: eeschema/menubar_libedit.cpp:171 eeschema/viewlib_frame.cpp:117
-#: pcbnew/footprint_viewer_frame.cpp:714
-msgid "Library Browser"
-msgstr "库浏览"
-
-#: eeschema/menubar_libedit.cpp:172
-msgid "Open the symbol viewer"
-msgstr "打开符号查看器"
-
-#: eeschema/menubar_libedit.cpp:200 eeschema/tool_lib.cpp:142
-#: eeschema/tool_viewlib.cpp:80 eeschema/tool_viewlib.cpp:161
-msgid "Zoom to fit symbol"
-msgstr "缩放符号至适合大小"
-
-#: eeschema/menubar_libedit.cpp:216
-msgid "&Search Tree"
-msgstr "搜索树(&S)"
-
-#: eeschema/menubar_libedit.cpp:217
-msgid "Toggles the search tree visibility"
-msgstr "切换搜索树可见性"
-
-#: eeschema/menubar_libedit.cpp:226
-msgid "&Pin"
-msgstr "引脚(&P)"
-
-#: eeschema/menubar_libedit.cpp:233
-msgid "Graphic &Text"
-msgstr "图形文本(&T)"
-
-#: eeschema/menubar_libedit.cpp:240
-msgid "&Rectangle"
-msgstr "矩形(&R)"
-
-#: eeschema/menubar_libedit.cpp:247 pcbnew/menubar_footprint_editor.cpp:341
-#: pcbnew/menubar_pcb_editor.cpp:308
-msgid "&Circle"
-msgstr "圆(&C)"
-
-#: eeschema/menubar_libedit.cpp:254 pcbnew/menubar_footprint_editor.cpp:335
-#: pcbnew/menubar_pcb_editor.cpp:304
-msgid "&Arc"
-msgstr "圆弧(&A)"
-
-#: eeschema/menubar_libedit.cpp:261
-msgid "&Line or Polygon"
-msgstr "线或多边形(&L)"
-
-#: eeschema/menubar_libedit.cpp:271
-msgid "Open associated datasheet in web browser"
-msgstr "在网页浏览器中打开相关的数据表"
-
-#: eeschema/menubar_libedit.cpp:277 eeschema/tool_lib.cpp:167
-msgid "Check duplicate and off grid pins"
-msgstr "检查重复和关闭网格引脚"
-
-#: eeschema/menubar_libedit.cpp:293 kicad/menubar.cpp:334
-msgid "Manage &Symbol Libraries..."
-msgstr "管理符号库(&S)…"
-
-#: eeschema/menubar_libedit.cpp:294
-msgid "Edit the global and project symbol library tables."
-msgstr "编辑全局和工程封装库表。"
-
-#: eeschema/menubar_libedit.cpp:302 gerbview/menubar.cpp:289
-#: kicad/menubar.cpp:346 pagelayout_editor/menubar.cpp:175
-#: pcbnew/menubar_footprint_editor.cpp:416 pcbnew/menubar_pcb_editor.cpp:158
-msgid "&Preferences..."
-msgstr "首选项(&P)..."
-
-#: eeschema/menubar_libedit.cpp:316
-msgid "Open the Eeschema Manual"
-msgstr "打开 Eeschema 手册"
-
-#: eeschema/menubar_libedit.cpp:322 eeschema/tool_viewlib.cpp:183
-#: pcbnew/menubar_footprint_editor.cpp:452 pcbnew/tool_footprint_viewer.cpp:166
-msgid "Open the \"Getting Started in KiCad\" guide for beginners"
-msgstr "打开 \"KiCad入门\" 初学者指南"
-
 #: eeschema/netlist_exporters/netlist_exporter_cadstar.cpp:47
 #: eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp:53
 #, c-format
@@ -9480,280 +9859,281 @@ msgstr "没有对象"
 msgid "Net count = %d"
 msgstr "网络计数 = %d"
 
-#: eeschema/onrightclick.cpp:99
+#: eeschema/onrightclick.cpp:101
 msgid "Edit Text..."
 msgstr "编辑文本..."
 
-#: eeschema/onrightclick.cpp:105
+#: eeschema/onrightclick.cpp:107
 msgid "Edit Label..."
 msgstr "编辑标签..."
 
-#: eeschema/onrightclick.cpp:111
+#: eeschema/onrightclick.cpp:113
 msgid "Edit Global Label..."
 msgstr "编辑全局标签..."
 
-#: eeschema/onrightclick.cpp:118
+#: eeschema/onrightclick.cpp:120
 msgid "Edit Hierarchical Label..."
 msgstr "编辑层次标签..."
 
-#: eeschema/onrightclick.cpp:125 eeschema/onrightclick.cpp:934
+#: eeschema/onrightclick.cpp:127 eeschema/onrightclick.cpp:939
 msgid "Edit Image..."
 msgstr "编辑图片..."
 
-#: eeschema/onrightclick.cpp:219
+#: eeschema/onrightclick.cpp:224
 msgid "Delete No Connect"
 msgstr "删除未连接"
 
-#: eeschema/onrightclick.cpp:277 pcbnew/onrightclick.cpp:159
+#: eeschema/onrightclick.cpp:282 pcbnew/onrightclick.cpp:159
 msgid "End Drawing"
 msgstr "结束 图形"
 
-#: eeschema/onrightclick.cpp:282
+#: eeschema/onrightclick.cpp:287
 msgid "Delete Drawing"
 msgstr "删除图形"
 
-#: eeschema/onrightclick.cpp:315
+#: eeschema/onrightclick.cpp:320
 msgid "Move Reference"
 msgstr "移动 参考编号"
 
-#: eeschema/onrightclick.cpp:316
+#: eeschema/onrightclick.cpp:321
 msgid "Move Value"
 msgstr "移动 值"
 
-#: eeschema/onrightclick.cpp:317
+#: eeschema/onrightclick.cpp:322
 msgid "Move Footprint Field"
 msgstr "移动 封装字段"
 
-#: eeschema/onrightclick.cpp:318
+#: eeschema/onrightclick.cpp:323
 msgid "Move Field"
 msgstr "移动 字段"
 
-#: eeschema/onrightclick.cpp:328
+#: eeschema/onrightclick.cpp:333
 msgid "Rotate Reference"
 msgstr "旋转 参考编号"
 
-#: eeschema/onrightclick.cpp:329
+#: eeschema/onrightclick.cpp:334
 msgid "Rotate Value"
 msgstr "旋转 值"
 
-#: eeschema/onrightclick.cpp:330
+#: eeschema/onrightclick.cpp:335
 msgid "Rotate Footprint Field"
 msgstr "旋转 封装字段"
 
-#: eeschema/onrightclick.cpp:331
+#: eeschema/onrightclick.cpp:336
 msgid "Rotate Field"
 msgstr "旋转 字段"
 
-#: eeschema/onrightclick.cpp:343 eeschema/onrightclick.cpp:454
+#: eeschema/onrightclick.cpp:348 eeschema/onrightclick.cpp:462
 msgid "Edit Reference..."
 msgstr "编辑参考编号..."
 
-#: eeschema/onrightclick.cpp:347 eeschema/onrightclick.cpp:449
+#: eeschema/onrightclick.cpp:352 eeschema/onrightclick.cpp:457
 msgid "Edit Value..."
 msgstr "编辑值..."
 
-#: eeschema/onrightclick.cpp:351
+#: eeschema/onrightclick.cpp:356
 msgid "Edit Footprint Field..."
 msgstr "编辑封装字段..."
 
-#: eeschema/onrightclick.cpp:355
+#: eeschema/onrightclick.cpp:364
 msgid "Edit Field..."
 msgstr "编辑字段..."
 
-#: eeschema/onrightclick.cpp:375
+#: eeschema/onrightclick.cpp:384
 #, c-format
 msgid "Move %s"
 msgstr "移动 %s"
 
-#: eeschema/onrightclick.cpp:379 eeschema/onrightclick.cpp:517
-#: eeschema/onrightclick.cpp:554 eeschema/onrightclick.cpp:590
-#: eeschema/onrightclick.cpp:785 pcbnew/onrightclick.cpp:740
-#: pcbnew/tools/edit_tool.cpp:572
+#: eeschema/onrightclick.cpp:387 eeschema/onrightclick.cpp:530
+#: eeschema/onrightclick.cpp:567 eeschema/onrightclick.cpp:602
+#: eeschema/onrightclick.cpp:792 pcbnew/onrightclick.cpp:738
+#: pcbnew/tools/edit_tool.cpp:563
 msgid "Drag"
 msgstr "拖动"
 
-#: eeschema/onrightclick.cpp:388 eeschema/onrightclick.cpp:801
-#: eeschema/onrightclick.cpp:928
+#: eeschema/onrightclick.cpp:396 eeschema/onrightclick.cpp:808
+#: eeschema/onrightclick.cpp:933
 msgid "Mirror Around Horizontal(X) Axis"
 msgstr "水平(X)轴镜像"
 
-#: eeschema/onrightclick.cpp:391 eeschema/onrightclick.cpp:804
-#: eeschema/onrightclick.cpp:931
+#: eeschema/onrightclick.cpp:399 eeschema/onrightclick.cpp:811
+#: eeschema/onrightclick.cpp:936
 msgid "Mirror Around Vertical(Y) Axis"
 msgstr "垂直(Y)轴镜像"
 
-#: eeschema/onrightclick.cpp:394
+#: eeschema/onrightclick.cpp:402
 msgid "Reset to Default"
 msgstr "重置为默认值"
 
-#: eeschema/onrightclick.cpp:404 eeschema/onrightclick.cpp:520
-#: eeschema/onrightclick.cpp:592 eeschema/onrightclick.cpp:626
-#: eeschema/widgets/symbol_tree_pane.cpp:78
+#: eeschema/onrightclick.cpp:412 eeschema/onrightclick.cpp:533
+#: eeschema/onrightclick.cpp:604 eeschema/onrightclick.cpp:636
+#: eeschema/widgets/symbol_tree_pane.cpp:80
 #: pcbnew/footprint_editor_onclick.cpp:367
 #: pcbnew/footprint_editor_onclick.cpp:409 pcbnew/onrightclick.cpp:169
 #: pcbnew/onrightclick.cpp:245 pcbnew/onrightclick.cpp:276
-#: pcbnew/onrightclick.cpp:428 pcbnew/onrightclick.cpp:481
-#: pcbnew/onrightclick.cpp:780 pcbnew/tools/edit_tool.cpp:96
-#: pcbnew/tools/edit_tool.cpp:100
+#: pcbnew/onrightclick.cpp:426 pcbnew/onrightclick.cpp:479
+#: pcbnew/onrightclick.cpp:778 pcbnew/tools/edit_tool.cpp:92
+#: pcbnew/tools/edit_tool.cpp:96
 msgid "Duplicate"
 msgstr "重复"
 
-#: eeschema/onrightclick.cpp:415
+#: eeschema/onrightclick.cpp:423
 msgid "Open Documentation"
 msgstr "打开文档"
 
-#: eeschema/onrightclick.cpp:444
+#: eeschema/onrightclick.cpp:452
 msgid "Edit Properties..."
 msgstr "编辑属性..."
 
-#: eeschema/onrightclick.cpp:459
+#: eeschema/onrightclick.cpp:467
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:260
 msgid "Edit Footprint..."
 msgstr "编辑封装..."
 
-#: eeschema/onrightclick.cpp:496
+#: eeschema/onrightclick.cpp:509
 msgid "Edit with Library Editor"
 msgstr "在库编辑器中编辑元件"
 
-#: eeschema/onrightclick.cpp:503 pagelayout_editor/pl_editor_frame.cpp:138
+#: eeschema/onrightclick.cpp:516 pagelayout_editor/pl_editor_frame.cpp:138
 msgid "Properties"
 msgstr "属性"
 
-#: eeschema/onrightclick.cpp:534 eeschema/onrightclick.cpp:606
-#: eeschema/onrightclick.cpp:646
+#: eeschema/onrightclick.cpp:547 eeschema/onrightclick.cpp:617
+#: eeschema/onrightclick.cpp:655
 msgid "Change to Hierarchical Label"
 msgstr "修改为层次标签"
 
-#: eeschema/onrightclick.cpp:536 eeschema/onrightclick.cpp:570
-#: eeschema/onrightclick.cpp:644
+#: eeschema/onrightclick.cpp:549 eeschema/onrightclick.cpp:583
+#: eeschema/onrightclick.cpp:653
 msgid "Change to Label"
 msgstr "修改为标签"
 
-#: eeschema/onrightclick.cpp:538 eeschema/onrightclick.cpp:572
-#: eeschema/onrightclick.cpp:608
+#: eeschema/onrightclick.cpp:551 eeschema/onrightclick.cpp:585
+#: eeschema/onrightclick.cpp:619
 msgid "Change to Text"
 msgstr "改为注释文字"
 
-#: eeschema/onrightclick.cpp:540 eeschema/onrightclick.cpp:576
-#: eeschema/onrightclick.cpp:612 eeschema/onrightclick.cpp:650
+#: eeschema/onrightclick.cpp:553 eeschema/onrightclick.cpp:589
+#: eeschema/onrightclick.cpp:623 eeschema/onrightclick.cpp:659
 msgid "Change Type"
 msgstr "改变类型"
 
-#: eeschema/onrightclick.cpp:574 eeschema/onrightclick.cpp:610
-#: eeschema/onrightclick.cpp:648
+#: eeschema/onrightclick.cpp:587 eeschema/onrightclick.cpp:621
+#: eeschema/onrightclick.cpp:657
 msgid "Change to Global Label"
 msgstr "修改为全局标签"
 
-#: eeschema/onrightclick.cpp:660
+#: eeschema/onrightclick.cpp:669
 msgid "Delete Junction"
 msgstr "删除连接点"
 
-#: eeschema/onrightclick.cpp:666
+#: eeschema/onrightclick.cpp:675
 msgid "Drag Junction"
 msgstr "拖动连接点"
 
-#: eeschema/onrightclick.cpp:669 eeschema/onrightclick.cpp:717
+#: eeschema/onrightclick.cpp:678 eeschema/onrightclick.cpp:725
 msgid "Break Wire"
 msgstr "分割 连线"
 
 # コネクション→一連のネットの意であればそのまま用語として残す
-#: eeschema/onrightclick.cpp:677 eeschema/onrightclick.cpp:711
+#: eeschema/onrightclick.cpp:686 eeschema/onrightclick.cpp:719
 msgid "Delete Connection"
 msgstr "删除 连接"
 
-#: eeschema/onrightclick.cpp:699
+#: eeschema/onrightclick.cpp:707
 msgid "Wire End"
 msgstr "结束连线"
 
-#: eeschema/onrightclick.cpp:704
+#: eeschema/onrightclick.cpp:712
 msgid "Drag Wire"
 msgstr "拖动 连线"
 
-#: eeschema/onrightclick.cpp:707
+#: eeschema/onrightclick.cpp:715
 msgid "Delete Wire"
 msgstr "删除 连线"
 
-#: eeschema/onrightclick.cpp:724 eeschema/onrightclick.cpp:762
+#: eeschema/onrightclick.cpp:732 eeschema/onrightclick.cpp:769
 msgid "Add Label..."
 msgstr "添加标签..."
 
-#: eeschema/onrightclick.cpp:729 eeschema/onrightclick.cpp:767
+#: eeschema/onrightclick.cpp:737 eeschema/onrightclick.cpp:774
 msgid "Add Global Label..."
 msgstr "添加全局标签..."
 
-#: eeschema/onrightclick.cpp:749
+#: eeschema/onrightclick.cpp:756
 msgid "Bus End"
 msgstr "总线 结束"
 
-#: eeschema/onrightclick.cpp:754
+#: eeschema/onrightclick.cpp:761
 msgid "Delete Bus"
 msgstr "删除 总线"
 
-#: eeschema/onrightclick.cpp:757
+#: eeschema/onrightclick.cpp:764
 msgid "Break Bus"
 msgstr "分割 总线"
 
-#: eeschema/onrightclick.cpp:778
+#: eeschema/onrightclick.cpp:785
 msgid "Enter Sheet"
 msgstr "进入 分页"
 
-#: eeschema/onrightclick.cpp:789
+#: eeschema/onrightclick.cpp:796
 msgid "Select Items On PCB"
 msgstr "选择PCB上的项目"
 
-#: eeschema/onrightclick.cpp:814
+#: eeschema/onrightclick.cpp:821
 msgid "Place"
 msgstr "放置"
 
-#: eeschema/onrightclick.cpp:821
+#: eeschema/onrightclick.cpp:828
 msgid "Resize"
 msgstr "调整大小"
 
-#: eeschema/onrightclick.cpp:824
+#: eeschema/onrightclick.cpp:831
 msgid "Import Sheet Pins"
 msgstr "导入图页连接"
 
-#: eeschema/onrightclick.cpp:828
+#: eeschema/onrightclick.cpp:835
 msgid "Cleanup Sheet Pins"
 msgstr "清除图页连接"
 
-#: eeschema/onrightclick.cpp:867
+#: eeschema/onrightclick.cpp:872
 msgid "Window Zoom"
 msgstr "窗口缩放"
 
-#: eeschema/onrightclick.cpp:883
+#: eeschema/onrightclick.cpp:888
 msgid "Drag Block"
 msgstr "拖动 块"
 
-#: eeschema/onrightclick.cpp:894
+#: eeschema/onrightclick.cpp:899
 msgid "Rotate Block CCW"
 msgstr "逆时针旋转块"
 
-#: eeschema/onrightclick.cpp:900
+#: eeschema/onrightclick.cpp:905
 msgid "Copy to Clipboard"
 msgstr "复制到剪贴板"
 
-#: eeschema/onrightclick.cpp:909 pcbnew/dialogs/dialog_drc_base.cpp:195
-#: pcbnew/onrightclick.cpp:962
+#: eeschema/onrightclick.cpp:914 pcbnew/dialogs/dialog_drc_base.cpp:195
+#: pcbnew/onrightclick.cpp:960
 msgid "Delete Marker"
 msgstr "删除标记"
 
-#: eeschema/onrightclick.cpp:910 pcbnew/onrightclick.cpp:964
+#: eeschema/onrightclick.cpp:915 pcbnew/onrightclick.cpp:962
 msgid "Marker Error Info"
 msgstr "标记错误信息"
 
-#: eeschema/onrightclick.cpp:952
+#: eeschema/onrightclick.cpp:957
 msgid "Move Bus Entry"
 msgstr "移动 总线入口"
 
-#: eeschema/onrightclick.cpp:959
+#: eeschema/onrightclick.cpp:964
 msgid "Set Bus Entry Shape /"
 msgstr "设置总线入口方向 /"
 
-#: eeschema/onrightclick.cpp:962
+#: eeschema/onrightclick.cpp:967
 msgid "Set Bus Entry Shape \\"
 msgstr "设置总线入口方向 \\"
 
-#: eeschema/onrightclick.cpp:964
+#: eeschema/onrightclick.cpp:969
 msgid "Delete Bus Entry"
 msgstr "删除总线入口"
 
@@ -9822,59 +10202,6 @@ msgstr "Open emitter"
 msgid "Not connected"
 msgstr "Not connected"
 
-#: eeschema/pinedit.cpp:208
-#, c-format
-msgid "This position is already occupied by another pin, in unit %d."
-msgstr "这个位置已经被另一个引脚占用, 在单元%d"
-
-#: eeschema/pinedit.cpp:212
-msgid "Create Pin Anyway"
-msgstr "新建引脚阵列"
-
-#: eeschema/pinedit.cpp:637
-msgid "No pins!"
-msgstr "没有引脚！"
-
-#: eeschema/pinedit.cpp:647
-msgid "Marker Information"
-msgstr "标记信息"
-
-#: eeschema/pinedit.cpp:668
-#, c-format
-msgid ""
-"<b>Duplicate pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b> conflicts "
-"with pin %s \"%s\" at location <b>(%.3f, %.3f)</b>"
-msgstr ""
-"<b>重复引脚 %s</b> \"%s\" 在位置 <b>(%.3f, %.3f)</b>与冲突引脚 %s \"%s\" 在位"
-"置 <b>(%.3f, %.3f)</b>"
-
-#: eeschema/pinedit.cpp:682
-#, c-format
-msgid " in units %c and %c"
-msgstr "单位 %c 和 %c"
-
-#: eeschema/pinedit.cpp:690 eeschema/pinedit.cpp:730
-msgid "  of converted"
-msgstr " 转换"
-
-#: eeschema/pinedit.cpp:692 eeschema/pinedit.cpp:732
-msgid "  of normal"
-msgstr "标准"
-
-#: eeschema/pinedit.cpp:715
-#, c-format
-msgid "<b>Off grid pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b>"
-msgstr "<b>网格外引脚 %s</b> \"%s\" 在位置 <b>(%.3f, %.3f)</b>"
-
-#: eeschema/pinedit.cpp:724
-#, c-format
-msgid " in symbol %c"
-msgstr " 在符号 %c内"
-
-#: eeschema/pinedit.cpp:741
-msgid "No off grid or duplicate pins were found."
-msgstr "没有发现网格外或重复的引脚。"
-
 #: eeschema/plot_schematic_DXF.cpp:79 eeschema/plot_schematic_HPGL.cpp:151
 #: eeschema/plot_schematic_PDF.cpp:125 eeschema/plot_schematic_PS.cpp:106
 #: eeschema/plot_schematic_SVG.cpp:82
@@ -9922,26 +10249,26 @@ msgstr "这个工程不需要恢复."
 msgid "No symbols were rescued."
 msgstr "未恢复元件符号。"
 
-#: eeschema/project_rescue.cpp:670
+#: eeschema/project_rescue.cpp:671
 #, c-format
 msgid "Failed to create symbol library file \"%s\""
 msgstr "无法创建元件库文件 '%s'"
 
-#: eeschema/project_rescue.cpp:794
+#: eeschema/project_rescue.cpp:795
 #, c-format
 msgid "Failed to save rescue library %s."
 msgstr "无法保存恢复库 '%s'."
 
-#: eeschema/project_rescue.cpp:818
+#: eeschema/project_rescue.cpp:819
 msgid "Error occurred saving project specific symbol library table."
 msgstr "保存项目特定的符号库表时出错。"
 
-#: eeschema/sch_base_frame.cpp:62
+#: eeschema/sch_base_frame.cpp:66
 #, c-format
 msgid "Could not load symbol \"%s\" from library \"%s\"."
 msgstr "不能从库%s中载入符号%s"
 
-#: eeschema/sch_base_frame.cpp:310
+#: eeschema/sch_base_frame.cpp:337
 #, c-format
 msgid ""
 "Error saving global symbol library table:\n"
@@ -9952,7 +10279,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/sch_base_frame.cpp:326
+#: eeschema/sch_base_frame.cpp:353
 #, c-format
 msgid ""
 "Error saving project-specific symbol library table:\n"
@@ -9963,66 +10290,70 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/sch_bitmap.h:131
+#: eeschema/sch_base_frame.cpp:547
+msgid "Nothing to paste"
+msgstr "没有粘贴"
+
+#: eeschema/sch_bitmap.h:152
 msgid "Image"
 msgstr "图片"
 
-#: eeschema/sch_bus_entry.cpp:337
+#: eeschema/sch_bus_entry.cpp:345
 msgid "Bus to Wire Entry"
 msgstr "总线到连线入口"
 
-#: eeschema/sch_bus_entry.cpp:343
+#: eeschema/sch_bus_entry.cpp:351
 msgid "Bus to Bus Entry"
 msgstr "总线到总线入口"
 
-#: eeschema/sch_collectors.cpp:350 pcbnew/class_board.cpp:77
+#: eeschema/sch_collectors.cpp:355 pcbnew/class_board.cpp:77
 msgid "(Deleted Item)"
 msgstr "(删除项)"
 
-#: eeschema/sch_collectors.cpp:501
+#: eeschema/sch_collectors.cpp:506
 #, c-format
 msgid "Match %i of %i: %s of %s in sheet %s"
 msgstr "匹配第%i个/共%i个：%s of %s in sheet %s"
 
-#: eeschema/sch_collectors.cpp:510
+#: eeschema/sch_collectors.cpp:515
 #, c-format
 msgid "Match %i of %i: %s in sheet %s"
 msgstr "匹配第%i个/共%i个 ：%s在图页%s中"
 
-#: eeschema/sch_component.cpp:1413
+#: eeschema/sch_component.cpp:1446
 msgid "Power symbol"
 msgstr "电源符号"
 
-#: eeschema/sch_component.cpp:1425 eeschema/sch_component.cpp:1427
-#: eeschema/sch_component.cpp:1430 eeschema/sch_component.cpp:1460
-#: eeschema/sch_component.cpp:1466 eeschema/selpart.cpp:88
+#: eeschema/sch_component.cpp:1458 eeschema/sch_component.cpp:1460
+#: eeschema/sch_component.cpp:1463 eeschema/sch_component.cpp:1493
+#: eeschema/sch_component.cpp:1499 eeschema/selpart.cpp:88
 msgid "Library"
 msgstr "库"
 
-#: eeschema/sch_component.cpp:1430
+#: eeschema/sch_component.cpp:1463
 msgid "Undefined!!!"
 msgstr "未定义!!!"
 
-#: eeschema/sch_component.cpp:1436
+#: eeschema/sch_component.cpp:1469
 msgid "<Unknown>"
 msgstr "< 未知 >"
 
-#: eeschema/sch_component.cpp:1461
+#: eeschema/sch_component.cpp:1494
 msgid "No library defined!!!"
 msgstr "没有定义库！！！"
 
-#: eeschema/sch_component.cpp:1465
+#: eeschema/sch_component.cpp:1498
 #, c-format
 msgid "Symbol not found in %s!!!"
 msgstr "在%s中没有找到封装！！！"
 
-#: eeschema/sch_component.cpp:1700
+#: eeschema/sch_component.cpp:1722
 #, c-format
 msgid "Symbol %s, %s"
 msgstr "符号 %s, %s"
 
 #: eeschema/sch_eagle_plugin.cpp:385 pcbnew/eagle_plugin.cpp:236
-#: pcbnew/eagle_plugin.cpp:2337
+#: pcbnew/eagle_plugin.cpp:2276
 #, c-format
 msgid "Unable to read file \"%s\""
 msgstr "无法读取文件\" %s\""
@@ -10032,15 +10363,15 @@ msgstr "无法读取文件\" %s\""
 msgid "Could not find %s in the imported library"
 msgstr "在导入的库中找不到 %s"
 
-#: eeschema/sch_edit_frame.cpp:178 pcbnew/board_connected_item.h:142
+#: eeschema/sch_edit_frame.cpp:185 pcbnew/board_connected_item.h:142
 msgid "Not Found"
 msgstr "未找到"
 
-#: eeschema/sch_edit_frame.cpp:180
+#: eeschema/sch_edit_frame.cpp:187
 msgid "The following libraries were not found:"
 msgstr "未找到以下库:"
 
-#: eeschema/sch_edit_frame.cpp:633 pcbnew/pcb_edit_frame.cpp:585
+#: eeschema/sch_edit_frame.cpp:663 pcbnew/pcb_edit_frame.cpp:585
 #, c-format
 msgid ""
 "Save changes to\n"
@@ -10051,23 +10382,23 @@ msgstr ""
 "\"%s\"\n"
 "关闭之前保存更改？"
 
-#: eeschema/sch_edit_frame.cpp:752
+#: eeschema/sch_edit_frame.cpp:780
 msgid "Draw wires and buses in any direction"
 msgstr "任意方向绘制连线或总线"
 
-#: eeschema/sch_edit_frame.cpp:753
+#: eeschema/sch_edit_frame.cpp:781
 msgid "Draw horizontal and vertical wires and buses only"
 msgstr "仅允许水平或垂直绘连线和总线"
 
-#: eeschema/sch_edit_frame.cpp:762
+#: eeschema/sch_edit_frame.cpp:790
 msgid "Do not show hidden pins"
 msgstr "不显示隐藏引脚"
 
-#: eeschema/sch_edit_frame.cpp:763 eeschema/tool_sch.cpp:312
+#: eeschema/sch_edit_frame.cpp:791 eeschema/tool_sch.cpp:306
 msgid "Show hidden pins"
 msgstr "显示隐藏引脚"
 
-#: eeschema/sch_edit_frame.cpp:827
+#: eeschema/sch_edit_frame.cpp:865
 msgid ""
 "Cannot update the PCB, because the Schematic Editor is opened in stand-alone "
 "mode. In order to create/update PCBs from schematics, you need to launch "
@@ -10076,37 +10407,37 @@ msgstr ""
 "无法更新PCB，因为原理图编辑器在单机模式下打开。如果要创建可以从原理图更新的"
 "PCB，您需要启动KiCad管理器，并创建一个PCB项目。"
 
-#: eeschema/sch_edit_frame.cpp:971
+#: eeschema/sch_edit_frame.cpp:994
 msgid "Schematic"
 msgstr "原理图"
 
-#: eeschema/sch_edit_frame.cpp:1004
+#: eeschema/sch_edit_frame.cpp:1027
 msgid "New Schematic"
 msgstr "新建原理图"
 
-#: eeschema/sch_edit_frame.cpp:1017
+#: eeschema/sch_edit_frame.cpp:1040
 #, c-format
-msgid "Schematic file \"%s\" already exists, use Open instead"
-msgstr "原理图文件 \"%s\" 已存在，使用开放式替代"
+msgid "Schematic file \"%s\" already exists."
+msgstr "原理图文件 \"%s\" 已经存在。"
 
-#: eeschema/sch_edit_frame.cpp:1038
+#: eeschema/sch_edit_frame.cpp:1058
 msgid "Open Schematic"
 msgstr "打开原理图"
 
-#: eeschema/sch_edit_frame.cpp:1137
+#: eeschema/sch_edit_frame.cpp:1157
 msgid "Could not open CvPcb"
 msgstr "不能打开CvPcb"
 
-#: eeschema/sch_edit_frame.cpp:1174
+#: eeschema/sch_edit_frame.cpp:1194
 msgid "Error: not a symbol or no symbol."
 msgstr "错误: 没有符号。"
 
-#: eeschema/sch_edit_frame.cpp:1456 kicad/prjconfig.cpp:87
-#: pcbnew/pcb_edit_frame.cpp:1014
+#: eeschema/sch_edit_frame.cpp:1495 kicad/prjconfig.cpp:87
+#: pcbnew/pcb_edit_frame.cpp:1012
 msgid " [Read Only]"
 msgstr " [只读]"
 
-#: eeschema/sch_edit_frame.cpp:1459
+#: eeschema/sch_edit_frame.cpp:1498
 msgid " [no file]"
 msgstr " [没有文件]"
 
@@ -10131,111 +10462,123 @@ msgstr "'%s' 类型插件没有找到。"
 msgid "Unknown SCH_FILE_T value: %d"
 msgstr "未知 SCH_FILE_T 值: %d"
 
-#: eeschema/sch_junction.h:90
+#: eeschema/sch_junction.h:96
 #: eeschema/widgets/widget_eeschema_color_config.cpp:60
 msgid "Junction"
 msgstr "连接点"
 
-#: eeschema/sch_legacy_plugin.cpp:147 eeschema/sch_legacy_plugin.cpp:190
-#: eeschema/sch_legacy_plugin.cpp:236 eeschema/sch_legacy_plugin.cpp:280
-#: eeschema/sch_legacy_plugin.cpp:322 eeschema/sch_legacy_plugin.cpp:335
-#: eeschema/sch_legacy_plugin.cpp:384 eeschema/sch_legacy_plugin.cpp:397
-#: eeschema/sch_legacy_plugin.cpp:416 eeschema/sch_legacy_plugin.cpp:982
-#: eeschema/sch_legacy_plugin.cpp:2791
+#: eeschema/sch_legacy_plugin.cpp:148 eeschema/sch_legacy_plugin.cpp:191
+#: eeschema/sch_legacy_plugin.cpp:237 eeschema/sch_legacy_plugin.cpp:281
+#: eeschema/sch_legacy_plugin.cpp:323 eeschema/sch_legacy_plugin.cpp:336
+#: eeschema/sch_legacy_plugin.cpp:385 eeschema/sch_legacy_plugin.cpp:398
+#: eeschema/sch_legacy_plugin.cpp:417 eeschema/sch_legacy_plugin.cpp:983
+#: eeschema/sch_legacy_plugin.cpp:2808
 msgid "unexpected end of line"
 msgstr "行意外结束"
 
-#: eeschema/sch_legacy_plugin.cpp:346
+#: eeschema/sch_legacy_plugin.cpp:347
 msgid "expected unquoted string"
 msgstr "需要不带括号的字符"
 
-#: eeschema/sch_legacy_plugin.cpp:782
+#: eeschema/sch_legacy_plugin.cpp:783
 #, c-format
 msgid "\"%s\" does not appear to be an Eeschema file"
 msgstr "'%s' 似乎不是一个eeschema文件"
 
-#: eeschema/sch_legacy_plugin.cpp:810
+#: eeschema/sch_legacy_plugin.cpp:811
 msgid "Missing 'EELAYER END'"
 msgstr "缺少 'EELAYER END'"
 
-#: eeschema/sch_legacy_plugin.cpp:858 eeschema/sch_legacy_plugin.cpp:1120
-#: eeschema/sch_legacy_plugin.cpp:1128 eeschema/sch_legacy_plugin.cpp:2343
+#: eeschema/sch_legacy_plugin.cpp:859 eeschema/sch_legacy_plugin.cpp:1121
+#: eeschema/sch_legacy_plugin.cpp:1129 eeschema/sch_legacy_plugin.cpp:2360
 msgid "unexpected end of file"
 msgstr "文件意外结束"
 
-#: eeschema/sch_legacy_plugin.cpp:1087
+#: eeschema/sch_legacy_plugin.cpp:1088
 msgid "Unexpected end of file"
 msgstr "文件意外结束"
 
-#: eeschema/sch_legacy_plugin.cpp:1375
+#: eeschema/sch_legacy_plugin.cpp:1379
 msgid "expected 'Italics' or '~'"
 msgstr "需要 '斜体' 或 '~'符号"
 
-#: eeschema/sch_legacy_plugin.cpp:1598
+#: eeschema/sch_legacy_plugin.cpp:1603
 msgid "component field text attributes must be 3 characters wide"
 msgstr "元件字段文本的属性必须是3个字符宽度"
 
-#: eeschema/sch_legacy_plugin.cpp:2426
+#: eeschema/sch_legacy_plugin.cpp:2340
+#, c-format
+msgid ""
+"Library file \"%s\" not found.\n"
+"\n"
+"Use the Manage Symbol Libraries dialog to fix the path (or remove the "
+"library)."
+msgstr ""
+"没有找到库文件\"%s\"。\n"
+"\n"
+"使用\"管理符号库\"对话框来修复路径（或删除库）。"
+
+#: eeschema/sch_legacy_plugin.cpp:2443
 #, c-format
 msgid "user does not have permission to read library document file \"%s\""
 msgstr "用户没有权限读取库文档 \"%s\""
 
-#: eeschema/sch_legacy_plugin.cpp:2434
+#: eeschema/sch_legacy_plugin.cpp:2451
 msgid "symbol document library file is empty"
 msgstr "符号文档库文件为空"
 
-#: eeschema/sch_legacy_plugin.cpp:3904 eeschema/sch_legacy_plugin.cpp:3939
+#: eeschema/sch_legacy_plugin.cpp:3921 eeschema/sch_legacy_plugin.cpp:3956
 #, c-format
 msgid "library %s does not contain an alias %s"
 msgstr "库 \"%s\" 不包含别名 %s"
 
-#: eeschema/sch_legacy_plugin.cpp:4122
+#: eeschema/sch_legacy_plugin.cpp:4139
 #, c-format
 msgid "symbol library \"%s\" already exists, cannot create a new library"
 msgstr "符号库 '%s' 已经存在, 无法创建新的库"
 
-#: eeschema/sch_legacy_plugin.cpp:4150 pcbnew/legacy_plugin.cpp:3463
+#: eeschema/sch_legacy_plugin.cpp:4167 pcbnew/legacy_plugin.cpp:3463
 #, c-format
 msgid "library \"%s\" cannot be deleted"
 msgstr "不能删除库 \"%s\""
 
-#: eeschema/sch_line.cpp:615
+#: eeschema/sch_line.cpp:616
 msgid "Vertical "
 msgstr "垂直 "
 
-#: eeschema/sch_line.cpp:617
+#: eeschema/sch_line.cpp:618
 msgid "Horizontal "
 msgstr "水平 "
 
-#: eeschema/sch_line.cpp:622
+#: eeschema/sch_line.cpp:623
 #, c-format
 msgid "%sGraphic Line from (%s, %s) to (%s, %s)"
 msgstr "%s 图形线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:626
+#: eeschema/sch_line.cpp:627
 #, c-format
 msgid "%sWire from (%s, %s) to (%s, %s)"
 msgstr "%s 连线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:630
+#: eeschema/sch_line.cpp:631
 #, c-format
 msgid "%sBus from (%s, %s) to (%s, %s)"
 msgstr "%s 总线从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_line.cpp:634
+#: eeschema/sch_line.cpp:635
 #, c-format
 msgid "%sLine on Unknown Layer from (%s, %s) to (%s, %s)"
 msgstr "%s 线在未知层从 (%s,%s) 到 (%s,%s)"
 
-#: eeschema/sch_marker.cpp:117
+#: eeschema/sch_marker.cpp:126
 msgid "Electronics Rule Check Error"
 msgstr "ERC错误"
 
-#: eeschema/sch_marker.h:99
+#: eeschema/sch_marker.h:101
 msgid "ERC Marker"
 msgstr "ERC标记"
 
-#: eeschema/sch_no_connect.h:92
+#: eeschema/sch_no_connect.h:97
 msgid "No Connect"
 msgstr "没有连接"
 
@@ -10266,19 +10609,19 @@ msgid ""
 "Enter the python symbol which implements the SCH_PLUGIN::Symbol*() functions."
 msgstr "输入实现SCH_PLUGIN::Symbol*()函数的python符号。"
 
-#: eeschema/sch_sheet.cpp:661
+#: eeschema/sch_sheet.cpp:669
 msgid "Sheet Name"
 msgstr "图页名称"
 
-#: eeschema/sch_sheet.cpp:662
+#: eeschema/sch_sheet.cpp:670
 msgid "File Name"
 msgstr "文件名称"
 
-#: eeschema/sch_sheet.cpp:667
+#: eeschema/sch_sheet.cpp:675
 msgid "Time Stamp"
 msgstr "时间标识"
 
-#: eeschema/sch_sheet.cpp:878
+#: eeschema/sch_sheet.cpp:871
 #, c-format
 msgid "Hierarchical Sheet %s"
 msgstr "层次分页 %s"
@@ -10293,64 +10636,64 @@ msgstr "%8.8lX/"
 msgid "Hierarchical Sheet Pin %s"
 msgstr "层次图页引脚 %s"
 
-#: eeschema/sch_text.cpp:612
+#: eeschema/sch_text.cpp:574
 msgid "Graphic Text"
 msgstr "图形文本"
 
-#: eeschema/sch_text.cpp:616
+#: eeschema/sch_text.cpp:575
 #: eeschema/widgets/widget_eeschema_color_config.cpp:61
 msgid "Label"
 msgstr "标签"
 
-#: eeschema/sch_text.cpp:620
+#: eeschema/sch_text.cpp:576
 msgid "Global Label"
 msgstr "全局标签"
 
-#: eeschema/sch_text.cpp:624
+#: eeschema/sch_text.cpp:577
 msgid "Hierarchical Label"
 msgstr "层次标签"
 
-#: eeschema/sch_text.cpp:628
+#: eeschema/sch_text.cpp:578
 msgid "Hierarchical Sheet Pin"
 msgstr "层次图页引脚"
 
-#: eeschema/sch_text.cpp:644
+#: eeschema/sch_text.cpp:587
 msgid "Vertical up"
 msgstr "垂直向上"
 
-#: eeschema/sch_text.cpp:648
+#: eeschema/sch_text.cpp:588
 msgid "Horizontal invert"
 msgstr "水平翻转"
 
-#: eeschema/sch_text.cpp:652
+#: eeschema/sch_text.cpp:589
 msgid "Vertical down"
 msgstr "垂直向下"
 
-#: eeschema/sch_text.cpp:662
+#: eeschema/sch_text.cpp:595
 msgid "Bold Italic"
 msgstr "加粗斜体"
 
-#: eeschema/sch_text.cpp:684
+#: eeschema/sch_text.cpp:617
 msgid "Tri-State"
 msgstr "三态"
 
-#: eeschema/sch_text.cpp:694
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:86
+#: eeschema/sch_text.cpp:627
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:105
 #: pcbnew/microwave.cpp:475
 msgid "Size"
 msgstr "尺寸"
 
-#: eeschema/sch_text.cpp:810
+#: eeschema/sch_text.cpp:691
 #, c-format
 msgid "Label %s"
 msgstr "标签 %s"
 
-#: eeschema/sch_text.cpp:1177
+#: eeschema/sch_text.cpp:991
 #, c-format
 msgid "Global Label %s"
 msgstr "全局标签 %s"
 
-#: eeschema/sch_text.cpp:1438
+#: eeschema/sch_text.cpp:1192
 #, c-format
 msgid "Hierarchical Label %s"
 msgstr "层次标签 %s"
@@ -10432,79 +10775,79 @@ msgstr "这个图页中没有未定义的标签清理."
 msgid "Do you wish to cleanup this sheet?"
 msgstr "你想清除这个图页吗?"
 
-#: eeschema/schedit.cpp:510
+#: eeschema/schedit.cpp:500
 msgid "Highlight specific net"
 msgstr "高亮网络"
 
-#: eeschema/schedit.cpp:524
+#: eeschema/schedit.cpp:514
 msgid "Add no connect"
 msgstr "添加 不连接标记"
 
-#: eeschema/schedit.cpp:529
+#: eeschema/schedit.cpp:519
 msgid "Add wire"
 msgstr "添加 连线"
 
-#: eeschema/schedit.cpp:534
+#: eeschema/schedit.cpp:524
 msgid "Add bus"
 msgstr "添加 总线"
 
-#: eeschema/schedit.cpp:539
+#: eeschema/schedit.cpp:529
 msgid "Add lines"
 msgstr "添加 线"
 
-#: eeschema/schedit.cpp:544
+#: eeschema/schedit.cpp:534
 msgid "Add junction"
 msgstr "添加 连接点"
 
-#: eeschema/schedit.cpp:549
+#: eeschema/schedit.cpp:539
 msgid "Add label"
 msgstr "添加 标签"
 
-#: eeschema/schedit.cpp:554
+#: eeschema/schedit.cpp:544
 msgid "Add global label"
 msgstr "添加 全局标签"
 
-#: eeschema/schedit.cpp:559
+#: eeschema/schedit.cpp:549
 msgid "Add hierarchical label"
 msgstr "添加 层次标签"
 
-#: eeschema/schedit.cpp:569
+#: eeschema/schedit.cpp:559
 msgid "Add image"
 msgstr "添加 图片"
 
-#: eeschema/schedit.cpp:574
+#: eeschema/schedit.cpp:564
 msgid "Add wire to bus entry"
 msgstr "添加 连线到总线入口"
 
-#: eeschema/schedit.cpp:579
+#: eeschema/schedit.cpp:569
 msgid "Add bus to bus entry"
 msgstr "添加 总线到总线入口"
 
-#: eeschema/schedit.cpp:584
+#: eeschema/schedit.cpp:574
 msgid "Add sheet"
 msgstr "添加 图页"
 
-#: eeschema/schedit.cpp:589
+#: eeschema/schedit.cpp:579
 msgid "Add sheet pins"
 msgstr "添加 图页引脚"
 
-#: eeschema/schedit.cpp:594
+#: eeschema/schedit.cpp:584
 msgid "Import sheet pins"
 msgstr "导入 图页引脚"
 
-#: eeschema/schedit.cpp:599
+#: eeschema/schedit.cpp:589
 msgid "Add component"
 msgstr "添加 元件"
 
-#: eeschema/schedit.cpp:604
+#: eeschema/schedit.cpp:594
 msgid "Add power"
 msgstr "添加 电源端口"
 
-#: eeschema/schedit.cpp:614
+#: eeschema/schedit.cpp:604
 msgid "Add a simulator probe"
 msgstr "添加仿真器探针"
 
-#: eeschema/schedit.cpp:619
+#: eeschema/schedit.cpp:609
 msgid "Select a value to be tuned"
 msgstr "选择要调整的值"
 
@@ -10533,41 +10876,41 @@ msgstr "库:符号"
 msgid "Select Symbol"
 msgstr "选择符号"
 
-#: eeschema/sheet.cpp:104
+#: eeschema/sheet.cpp:106
 #, c-format
 msgid "\"%s\" already exists."
 msgstr "\"%s\" 已经存在。"
 
-#: eeschema/sheet.cpp:105
+#: eeschema/sheet.cpp:107
 #, c-format
 msgid "Link \"%s\" to this file?"
 msgstr "链接 \"%s\"到这个文件？"
 
-#: eeschema/sheet.cpp:131
+#: eeschema/sheet.cpp:133
 #, c-format
 msgid "Change \"%s\" link from \"%s\" to \"%s\"?"
 msgstr "将“%s”链接从“%s”改为“%s”?"
 
-#: eeschema/sheet.cpp:133
+#: eeschema/sheet.cpp:135
 #, c-format
 msgid "Create new file \"%s\" with contents of \"%s\"?"
 msgstr "创建包含\"%s\"内容的新文件\"%s\"？"
 
-#: eeschema/sheet.cpp:135
+#: eeschema/sheet.cpp:137
 msgid "This action cannot be undone."
 msgstr "此操作无法撤销。"
 
-#: eeschema/sheet.cpp:201
+#: eeschema/sheet.cpp:203
 #, c-format
 msgid "Error occurred saving schematic file \"%s\"."
 msgstr "保存原理图文件 \"%s\" 发生错误。"
 
-#: eeschema/sheet.cpp:204
+#: eeschema/sheet.cpp:206
 #, c-format
 msgid "Failed to save schematic \"%s\""
 msgstr "无法保存原理图 \"%s\""
 
-#: eeschema/sheet.cpp:238
+#: eeschema/sheet.cpp:240
 msgid ""
 "The entire schematic could not be loaded.\n"
 "Errors occurred loading hierarchical sheets."
@@ -10575,15 +10918,17 @@ msgstr ""
 "整个原理图不能被加载。\n"
 "加载层次图页时出错。"
 
-#: eeschema/sheet.cpp:287
+#: eeschema/sheet.cpp:289
 #, c-format
 msgid ""
-"The schematic \"%s\" has not been remapped to the symbol library table. Most "
-"if not all of the symbol library links will be broken.  Do you want to "
-"continue?"
+"The schematic \"%s\" has not been remapped to the symbol\n"
+"library table.  The project this schematic belongs to must first be "
+"remapped\n"
+"before it can be imported into the current project."
 msgstr ""
-"原理图 \"%s\" 尚未重新映射到符号库表。 大多数（如果不是全部）符号库链接将被破"
-"坏。 你想继续吗？"
+"原理图 \"%s\" 尚未重新映射到符号库表。\n"
+"在它被导入当前工程之前\n"
+"这个原理图所属的工程必须先重新映射。"
 
 #: eeschema/sheetlab.cpp:133
 msgid "No new hierarchical labels found."
@@ -10830,21 +11175,6 @@ msgstr "请填写必填字段"
 msgid "\"%s\" is not a valid Spice value"
 msgstr "\"%s\"不是有效的Spice 值"
 
-#: eeschema/symbedit.cpp:104
-#, c-format
-msgid "More than one symbol found in symbol file \"%s\"."
-msgstr "符号文件 '%s' 内不止一个符号"
-
-#: eeschema/symbedit.cpp:194
-#, c-format
-msgid "Saving symbol in \"%s\""
-msgstr "保存符号到 \"%s\""
-
-#: eeschema/symbedit.cpp:211
-#, c-format
-msgid "An error occurred attempting to save symbol file \"%s\""
-msgstr "保存符号文件 '%s' 发生错误。"
-
 #: eeschema/symbol_lib_table.cpp:210
 #, c-format
 msgid ""
@@ -10867,128 +11197,68 @@ msgstr ""
 "\n"
 "%s"
 
-#: eeschema/tool_lib.cpp:58
-msgid "Deselect current tool"
-msgstr "不选择当前工具"
-
-#: eeschema/tool_lib.cpp:85
-msgid "Move symbol anchor"
-msgstr "移动符号锚点"
-
-#: eeschema/tool_lib.cpp:89
-msgid "Import existing drawings"
-msgstr "导入现有的图形"
-
-#: eeschema/tool_lib.cpp:93
-msgid "Export current drawing"
-msgstr "导出当前图形"
-
-#: eeschema/tool_lib.cpp:116
-msgid "Create new symbol"
-msgstr "创建新符号"
-
-#: eeschema/tool_lib.cpp:120
-msgid "Save all changes"
-msgstr "保存所有更改"
-
-#: eeschema/tool_lib.cpp:164
-msgid "Show associated datasheet or document"
-msgstr "显示关联的数据手册或文档"
-
-#: eeschema/tool_lib.cpp:173 eeschema/tool_viewlib.cpp:88
-msgid "Show as \"De Morgan\" normal symbol"
-msgstr "显示为\"德摩根\" 标准符号"
-
-#: eeschema/tool_lib.cpp:176 eeschema/tool_viewlib.cpp:93
-msgid "Show as \"De Morgan\" convert symbol"
-msgstr "显示\"德摩根\" 转换符号"
-
-#: eeschema/tool_lib.cpp:190
-msgid ""
-"Synchronized pin edit mode\n"
-"Synchronized pin edit mode propagates to other units all pin changes except "
-"pin number modification.\n"
-"Enabled by default for multiunit parts with interchangeable units."
-msgstr ""
-"同步引脚编辑模式\n"
-"同步引脚编辑模式传播到其他单元的所有引脚变化，除了引脚编号修改。\n"
-"默认情况下为可更换单元的多单元部件启用。"
-
-#: eeschema/tool_lib.cpp:211 eeschema/tool_sch.cpp:288
-#: gerbview/toolbars_gerber.cpp:249
-msgid "Turn grid off"
-msgstr "关闭网格"
-
-#: eeschema/tool_lib.cpp:234
-msgid "Show pins electrical type"
-msgstr "显示引脚电气类型"
-
-#: eeschema/tool_lib.cpp:238
-msgid "Toggles the search tree"
-msgstr "切换搜索树"
-
-#: eeschema/tool_sch.cpp:61
+#: eeschema/tool_sch.cpp:62
 msgid "New schematic"
 msgstr "新建原理图"
 
-#: eeschema/tool_sch.cpp:65
+#: eeschema/tool_sch.cpp:66
 msgid "Open schematic"
 msgstr "打开原理图"
 
-#: eeschema/tool_sch.cpp:70
+#: eeschema/tool_sch.cpp:71
 msgid "Save (all sheets)"
 msgstr "保存 (所有图页)"
 
-#: eeschema/tool_sch.cpp:75
+#: eeschema/tool_sch.cpp:76
 msgid "Edit Page settings"
 msgstr "编辑页面设置"
 
-#: eeschema/tool_sch.cpp:80
+#: eeschema/tool_sch.cpp:81
 msgid "Print schematic"
 msgstr "打印原理图"
 
-#: eeschema/tool_sch.cpp:83
+#: eeschema/tool_sch.cpp:84
 msgid "Plot schematic"
 msgstr "绘制原理图"
 
-#: eeschema/tool_sch.cpp:106
+#: eeschema/tool_sch.cpp:107
 msgid "Find and replace text"
 msgstr "查找和替换文字"
 
-#: eeschema/tool_sch.cpp:137
+#: eeschema/tool_sch.cpp:138
 msgid "Leave sheet"
 msgstr "离开 图页"
 
-#: eeschema/tool_sch.cpp:151
+#: eeschema/tool_sch.cpp:152
 msgid "Footprint Editor - Create/edit footprints"
 msgstr "封装编辑 - 创建/编辑封装"
 
-#: eeschema/tool_sch.cpp:165
+#: eeschema/tool_sch.cpp:166
 msgid "Generate netlist"
 msgstr "生成网表"
 
-#: eeschema/tool_sch.cpp:168
+#: eeschema/tool_sch.cpp:169
 msgid "Edit symbol fields"
 msgstr "编辑符号字段"
 
-#: eeschema/tool_sch.cpp:177
+#: eeschema/tool_sch.cpp:178
 msgid "Run Pcbnew to layout printed circuit board"
 msgstr "运行Pcbnew设计印刷电路板(PCB)"
 
-#: eeschema/tool_sch.cpp:204 pcbnew/edit.cpp:1512
-#: pcbnew/tool_pcb_editor.cpp:443 pcbnew/tools/pcb_editor_control.cpp:1044
+#: eeschema/tool_sch.cpp:205 pcbnew/edit.cpp:1511
+#: pcbnew/tool_pcb_editor.cpp:443 pcbnew/tools/pcb_editor_control.cpp:1066
 msgid "Highlight net"
 msgstr "高亮网络"
 
-#: eeschema/tool_sch.cpp:292
+#: eeschema/tool_sch.cpp:293
 msgid "Set unit to inch"
 msgstr "设置单位为英寸"
 
-#: eeschema/tool_sch.cpp:296
+#: eeschema/tool_sch.cpp:297
 msgid "Set unit to mm"
 msgstr "设置单位为毫米"
 
-#: eeschema/tool_sch.cpp:317
+#: eeschema/tool_sch.cpp:311
 msgid "HV orientation for wires and bus"
 msgstr "连线和总线仅水平和垂直方向"
 
@@ -11004,39 +11274,39 @@ msgstr "显示上一个符号"
 msgid "Display next symbol"
 msgstr "显示下一个符号"
 
-#: eeschema/tool_viewlib.cpp:106
+#: eeschema/tool_viewlib.cpp:105
 msgid "View symbol documents"
 msgstr "查看元件说明文档"
 
-#: eeschema/tool_viewlib.cpp:114
+#: eeschema/tool_viewlib.cpp:112
 msgid "Insert symbol in schematic"
 msgstr "在原理图中插入符号"
 
-#: eeschema/tool_viewlib.cpp:145 pcbnew/tool_footprint_viewer.cpp:125
+#: eeschema/tool_viewlib.cpp:143 pcbnew/tool_footprint_viewer.cpp:146
 msgid "Cl&ose"
 msgstr "关闭(&O)"
 
-#: eeschema/tool_viewlib.cpp:146
+#: eeschema/tool_viewlib.cpp:144
 msgid "Close schematic symbol viewer"
 msgstr "关闭原理图符号视图"
 
-#: eeschema/tool_viewlib.cpp:169
+#: eeschema/tool_viewlib.cpp:167
 msgid "&Show Pin Electrical Type"
 msgstr "显示引脚电气类型(&S)"
 
-#: eeschema/tool_viewlib.cpp:178
+#: eeschema/tool_viewlib.cpp:176
 msgid "Open Eeschema manual"
 msgstr "打开 Eeschema 手册"
 
-#: eeschema/tool_viewlib.cpp:194
+#: eeschema/tool_viewlib.cpp:192
 msgid "&About Eeschema"
 msgstr "关于 Eeschema (&A)"
 
-#: eeschema/tool_viewlib.cpp:195
+#: eeschema/tool_viewlib.cpp:193
 msgid "About Eeschema schematic designer"
 msgstr "关于Eeschema原理图设计"
 
-#: eeschema/viewlib_frame.cpp:356
+#: eeschema/viewlib_frame.cpp:383
 #, c-format
 msgid "Unit %c"
 msgstr "单元 %c"
@@ -11046,52 +11316,43 @@ msgstr "单元 %c"
 msgid "Symbol Library Browser -- %s"
 msgstr "符号库浏览器 -- %s"
 
-#: eeschema/viewlibs.cpp:183 pcbnew/footprint_viewer_frame.cpp:717
+#: eeschema/viewlibs.cpp:183 pcbnew/footprint_viewer_frame.cpp:731
 msgid "no library selected"
 msgstr "没有选择库"
 
-#: eeschema/viewlibs.cpp:228
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:50
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:124
-#: pcbnew/dialogs/dialog_copper_zones_base.cpp:203
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:388
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:296
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:311
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:517
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
-#: pcbnew/dialogs/dialog_plot_base.cpp:119
-msgid "None"
-msgstr "无"
-
 #: eeschema/widgets/symbol_tree_pane.cpp:52
-#: eeschema/widgets/symbol_tree_pane.cpp:91 pcbnew/footprint_tree_pane.cpp:99
+#: eeschema/widgets/symbol_tree_pane.cpp:99 pcbnew/footprint_tree_pane.cpp:51
+#: pcbnew/footprint_tree_pane.cpp:100
 msgid "&New Library..."
 msgstr "新建库 (&N)..."
 
 #: eeschema/widgets/symbol_tree_pane.cpp:54
-#: eeschema/widgets/symbol_tree_pane.cpp:93
+#: eeschema/widgets/symbol_tree_pane.cpp:101 pcbnew/footprint_tree_pane.cpp:54
+#: pcbnew/footprint_tree_pane.cpp:103
 msgid "&Add Library..."
 msgstr "添加库(&A)..."
 
 #: eeschema/widgets/symbol_tree_pane.cpp:58
-#: eeschema/widgets/symbol_tree_pane.cpp:76
 msgid "Save As..."
 msgstr "另存为..."
 
-#: eeschema/widgets/symbol_tree_pane.cpp:60
-#: eeschema/widgets/symbol_tree_pane.cpp:82
-msgid "Revert"
-msgstr "恢复"
-
 #: eeschema/widgets/symbol_tree_pane.cpp:64
 msgid "New Sy&mbol..."
 msgstr "新建符号 (&M)..."
 
-#: eeschema/widgets/symbol_tree_pane.cpp:70
+#: eeschema/widgets/symbol_tree_pane.cpp:68
+msgid "Paste Symbol"
+msgstr "粘贴符号"
+
+#: eeschema/widgets/symbol_tree_pane.cpp:72
 msgid "&Edit Symbol"
 msgstr "编辑符号(&E)"
 
-#: eeschema/widgets/symbol_tree_pane.cpp:86
+#: eeschema/widgets/symbol_tree_pane.cpp:78
+msgid "Save a Copy As..."
+msgstr "另存为..."
+
+#: eeschema/widgets/symbol_tree_pane.cpp:94
 msgid "E&xport Symbol..."
 msgstr "导出符号(&E)..."
 
@@ -11123,6 +11384,10 @@ msgstr "注解"
 msgid "No connect symbol"
 msgstr "不连接符号"
 
+#: eeschema/widgets/widget_eeschema_color_config.cpp:70
+msgid "Body outline"
+msgstr "主体轮廓"
+
 #: eeschema/widgets/widget_eeschema_color_config.cpp:71
 msgid "Body background"
 msgstr "主体背景"
@@ -11136,7 +11401,7 @@ msgid "Pin name"
 msgstr "引脚名称"
 
 #: eeschema/widgets/widget_eeschema_color_config.cpp:82
-#: eeschema/widgets/widget_eeschema_color_config.cpp:102
+#: eeschema/widgets/widget_eeschema_color_config.cpp:106
 #: pcbnew/tools/selection_tool.cpp:118
 msgid "Sheet"
 msgstr "图页"
@@ -11165,19 +11430,38 @@ msgstr "ERC警告"
 msgid "ERC error"
 msgstr "ERC错误"
 
-#: eeschema/widgets/widget_eeschema_color_config.cpp:94
+#: eeschema/widgets/widget_eeschema_color_config.cpp:93
 msgid "Brightened"
 msgstr "高亮"
 
-#: eeschema/widgets/widget_eeschema_color_config.cpp:101
+#: eeschema/widgets/widget_eeschema_color_config.cpp:94
+msgid "Hidden items"
+msgstr "隐藏项目"
+
+#: eeschema/widgets/widget_eeschema_color_config.cpp:95
+#: gerbview/gerbview_layer_widget.cpp:120 pcbnew/pcb_layer_widget.cpp:88
+msgid "Worksheet"
+msgstr "工作表"
+
+#: eeschema/widgets/widget_eeschema_color_config.cpp:96
+#: pcbnew/pcb_layer_widget.cpp:89
+msgid "Cursor"
+msgstr "光标"
+
+#: eeschema/widgets/widget_eeschema_color_config.cpp:98
+#: gerbview/gerbview_layer_widget.cpp:121 pcbnew/pcb_layer_widget.cpp:92
+msgid "Background"
+msgstr "背景"
+
+#: eeschema/widgets/widget_eeschema_color_config.cpp:105
 msgid "Component"
 msgstr "元件"
 
-#: eeschema/widgets/widget_eeschema_color_config.cpp:103
+#: eeschema/widgets/widget_eeschema_color_config.cpp:107
 msgid "Miscellaneous"
 msgstr "其他"
 
-#: eeschema/widgets/widget_eeschema_color_config.cpp:293
+#: eeschema/widgets/widget_eeschema_color_config.cpp:251
 msgid ""
 "Some items have the same color as the background\n"
 "and they will not be seen on the screen.  Are you\n"
@@ -11266,10 +11550,10 @@ msgstr "初始化打印机信息出现错误"
 
 #: gerbview/dialogs/dialog_print_using_printer.cpp:165
 #: gerbview/dialogs/dialog_select_one_pcb_layer.cpp:163
-#: pcbnew/class_drawsegment.cpp:493 pcbnew/class_pad.cpp:729
+#: pcbnew/class_drawsegment.cpp:492 pcbnew/class_pad.cpp:738
 #: pcbnew/class_pcb_text.cpp:128 pcbnew/class_text_mod.cpp:394
 #: pcbnew/class_track.cpp:1175 pcbnew/class_track.cpp:1202
-#: pcbnew/class_zone.cpp:871 pcbnew/dialogs/dialog_copper_zones_base.cpp:35
+#: pcbnew/class_zone.cpp:870 pcbnew/dialogs/dialog_copper_zones_base.cpp:35
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:59
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:59
 #: pcbnew/text_mod_grid_table.cpp:91
@@ -11391,8 +11675,8 @@ msgstr "设置 Y 方向调整比例使输出更精确"
 #: gerbview/dialogs/dialog_print_using_printer_base.cpp:77
 #: gerbview/gerber_draw_item.cpp:724 pcbnew/class_pcb_text.cpp:131
 #: pcbnew/class_pcb_text.cpp:133 pcbnew/class_text_mod.cpp:401
-#: pcbnew/footprint_editor_onclick.cpp:297 pcbnew/tools/edit_tool.cpp:127
-#: pcbnew/tools/edit_tool.cpp:811
+#: pcbnew/footprint_editor_onclick.cpp:297 pcbnew/tools/edit_tool.cpp:123
+#: pcbnew/tools/edit_tool.cpp:797
 msgid "Mirror"
 msgstr "镜像"
 
@@ -11514,65 +11798,80 @@ msgstr "页面尺寸"
 msgid "Show page limits"
 msgstr "显示页面限制"
 
-#: gerbview/events_called_functions.cpp:236
-#: gerbview/events_called_functions.cpp:483 pcbnew/edit.cpp:1525
+#: gerbview/events_called_functions.cpp:237
+#: gerbview/events_called_functions.cpp:484 pcbnew/edit.cpp:1524
 msgid "Unsupported tool in this canvas"
 msgstr "此画布中不支持的工具"
 
-#: gerbview/events_called_functions.cpp:378
+#: gerbview/events_called_functions.cpp:379
 #, c-format
 msgid "Source file \"%s\" is not available"
 msgstr "源文件 \"%s\" 不可用"
 
-#: gerbview/events_called_functions.cpp:386
+#: gerbview/events_called_functions.cpp:387
 msgid "No editor defined. Please select one"
 msgstr "没有定义编辑器, 请选择一个"
 
-#: gerbview/events_called_functions.cpp:391
+#: gerbview/events_called_functions.cpp:392
 #, c-format
 msgid "No file loaded on the active layer %d"
 msgstr "没有文件加载到当前工作层 %d"
 
-#: gerbview/events_called_functions.cpp:435 pcbnew/pcb_edit_frame.cpp:945
+#: gerbview/events_called_functions.cpp:436 pcbnew/pcb_edit_frame.cpp:943
 msgid "Visibles"
 msgstr "可见"
 
-#: gerbview/excellon_read_drill_file.cpp:183
+#: gerbview/excellon_read_drill_file.cpp:266
 msgid "No room to load file"
 msgstr "没有空间加载文件"
 
-#: gerbview/excellon_read_drill_file.cpp:192
+#: gerbview/excellon_read_drill_file.cpp:275
 #, c-format
 msgid "File %s not found"
 msgstr "文件 %s 没有找到"
 
-#: gerbview/excellon_read_drill_file.cpp:200
+#: gerbview/excellon_read_drill_file.cpp:283
 msgid "Error reading EXCELLON drill file"
 msgstr "错误读取 EXCELLON 钻孔文件"
 
+#: gerbview/excellon_read_drill_file.cpp:388
+#, c-format
+msgid "Unexpected symbol &lt;%c&gt;"
+msgstr "异常符号 &lt;%c&gt;"
+
 #: gerbview/excellon_read_drill_file.cpp:434
+#, c-format
+msgid "Unknown Excellon command &lt;%s&gt;"
+msgstr "未知 Excellon命令： &lt;%s&gt;"
+
+#: gerbview/excellon_read_drill_file.cpp:517
 msgid "ICI command has no parameter"
 msgstr "ICI命令没有参数"
 
-#: gerbview/excellon_read_drill_file.cpp:444
+#: gerbview/excellon_read_drill_file.cpp:527
 msgid "ICI command has incorrect parameter"
 msgstr "ICI命令参数错误"
 
-#: gerbview/excellon_read_drill_file.cpp:498
+#: gerbview/excellon_read_drill_file.cpp:565
+#, c-format
+msgid "Got unknown tool code %d"
+msgstr "有未知工具代码%d"
+
+#: gerbview/excellon_read_drill_file.cpp:636
 msgid "Tool definition shape not found"
 msgstr "工具定义形状未找到"
 
-#: gerbview/excellon_read_drill_file.cpp:501
+#: gerbview/excellon_read_drill_file.cpp:639
 #, c-format
 msgid "Tool definition '%c' not supported"
 msgstr "工具定义 '%c' 不支持"
 
-#: gerbview/excellon_read_drill_file.cpp:558
+#: gerbview/excellon_read_drill_file.cpp:720
 #, c-format
 msgid "Tool %d not defined"
 msgstr "没有定义工具 %d"
 
-#: gerbview/excellon_read_drill_file.cpp:705
+#: gerbview/excellon_read_drill_file.cpp:893
 #, c-format
 msgid "Unknown Excellon G Code: &lt;%s&gt;"
 msgstr "未知 Excellon G 代码: &lt;%s&gt;"
@@ -11619,95 +11918,95 @@ msgstr "Zip文件"
 msgid "Job files"
 msgstr "工作文件:"
 
-#: gerbview/files.cpp:164
+#: gerbview/files.cpp:190
 msgid "Gerber files (.g* .lgr .pho)"
 msgstr "Gerber 文件 (.g* .lgr .pho)"
 
-#: gerbview/files.cpp:170
+#: gerbview/files.cpp:196
 msgid "Top layer (*.GTL)|*.GTL;*.gtl|"
 msgstr "顶层 (*.GTL)|*.GTL;*.gtl|"
 
-#: gerbview/files.cpp:171
+#: gerbview/files.cpp:197
 msgid "Bottom layer (*.GBL)|*.GBL;*.gbl|"
 msgstr "底层 (*.GBL)|*.GBL;*.gbl|"
 
-#: gerbview/files.cpp:172
+#: gerbview/files.cpp:198
 msgid "Bottom solder resist (*.GBS)|*.GBS;*.gbs|"
 msgstr "底层阻焊 (*.GBS)|*.GBS;*.gbs|"
 
-#: gerbview/files.cpp:173
+#: gerbview/files.cpp:199
 msgid "Top solder resist (*.GTS)|*.GTS;*.gts|"
 msgstr "顶层阻焊 (*.GTS)|*.GTS;*.gts|"
 
-#: gerbview/files.cpp:174
+#: gerbview/files.cpp:200
 msgid "Bottom overlay (*.GBO)|*.GBO;*.gbo|"
 msgstr "底层丝印层 (*.GBO)|*.GBO;*.gbo|"
 
-#: gerbview/files.cpp:175
+#: gerbview/files.cpp:201
 msgid "Top overlay (*.GTO)|*.GTO;*.gto|"
 msgstr "顶层丝印层 (*.GTO)|*.GTO;*.gto|"
 
-#: gerbview/files.cpp:176
+#: gerbview/files.cpp:202
 msgid "Bottom paste (*.GBP)|*.GBP;*.gbp|"
 msgstr "底层锡膏 (*.GBP)|*.GBP;*.gbp|"
 
-#: gerbview/files.cpp:177
+#: gerbview/files.cpp:203
 msgid "Top paste (*.GTP)|*.GTP;*.gtp|"
 msgstr "顶层锡膏 (*.GTP)|*.GTP;*.gtp|"
 
-#: gerbview/files.cpp:178
+#: gerbview/files.cpp:204
 msgid "Keep-out layer (*.GKO)|*.GKO;*.gko|"
 msgstr "禁止布线层 (*.GKO)|*.GKO;*.gko|"
 
-#: gerbview/files.cpp:179
+#: gerbview/files.cpp:205
 msgid "Mechanical layers (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|"
 msgstr "机械层 (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|"
 
-#: gerbview/files.cpp:180
+#: gerbview/files.cpp:206
 msgid "Top Pad Master (*.GPT)|*.GPT;*.gpt|"
 msgstr "顶层主焊盘 (*.GPT)|*.GPT;*.gpt|"
 
-#: gerbview/files.cpp:181
+#: gerbview/files.cpp:207
 msgid "Bottom Pad Master (*.GPB)|*.GPB;*.gpb|"
 msgstr "底层主焊盘 (*.GPB)|*.GPB;*.gpb|"
 
-#: gerbview/files.cpp:199
+#: gerbview/files.cpp:225
 msgid "Open Gerber File(s)"
 msgstr "打开 Gerber 文件"
 
-#: gerbview/files.cpp:251 gerbview/files.cpp:253
+#: gerbview/files.cpp:277 gerbview/files.cpp:279
 msgid "Loading Gerber files..."
 msgstr "载入Gerber文件..."
 
-#: gerbview/files.cpp:355
+#: gerbview/files.cpp:381
 msgid "Open Excellon Drill File(s)"
 msgstr "打开最近的钻孔文件"
 
-#: gerbview/files.cpp:454
+#: gerbview/files.cpp:480
 #, c-format
 msgid "Zip file \"%s\" cannot be opened"
 msgstr "无法打开Zip文件\"%s\""
 
-#: gerbview/files.cpp:496
+#: gerbview/files.cpp:522
 #, c-format
 msgid "Info: skip file <i>\"%s\"</i> (unknown type)\n"
 msgstr "信息: 跳过文件 <i>“%s”</i> (未知类型)\n"
 
-#: gerbview/files.cpp:538
+#: gerbview/files.cpp:564
 #, c-format
 msgid "<b>Unable to create temporary file \"%s\"</b>\n"
 msgstr "<b>无法创建临时文件 '%s'<b>\n"
 
-#: gerbview/files.cpp:568
+#: gerbview/files.cpp:594
 #, c-format
 msgid "<b>unzipped file %s read error</b>\n"
 msgstr "<b>解压缩文件%s读取错误</b>\n"
 
-#: gerbview/files.cpp:605
+#: gerbview/files.cpp:631
 msgid "Open Zip File"
 msgstr "打开Zip文件"
 
-#: gerbview/files.cpp:642 gerbview/job_file_reader.cpp:220
+#: gerbview/files.cpp:668 gerbview/job_file_reader.cpp:220
 #: pcbnew/dialogs/dialog_drc_base.cpp:115
 #: pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp:91
 #: pcbnew/dialogs/dialog_gendrill_base.cpp:198
@@ -11735,7 +12034,7 @@ msgstr "清除"
 msgid "Dark"
 msgstr "黑"
 
-#: gerbview/gerber_draw_item.cpp:718 gerbview/gerber_file_image.cpp:354
+#: gerbview/gerber_draw_item.cpp:718 gerbview/gerber_file_image.cpp:358
 msgid "Polarity"
 msgstr "极性"
 
@@ -11743,7 +12042,7 @@ msgstr "极性"
 msgid "AB axis"
 msgstr "AB轴"
 
-#: gerbview/gerber_draw_item.cpp:740 gerbview/toolbars_gerber.cpp:133
+#: gerbview/gerber_draw_item.cpp:740 gerbview/toolbars_gerber.cpp:137
 #: pcbnew/dialogs/dialog_track_via_properties_base.cpp:25
 msgid "Net:"
 msgstr "网络:"
@@ -11762,27 +12061,27 @@ msgstr "Cmp:"
 msgid "%s (D%d) on layer %d: %s"
 msgstr "%s (D%d) 在层 %d: %s上"
 
-#: gerbview/gerber_file_image.cpp:341
+#: gerbview/gerber_file_image.cpp:345
 msgid "Image name"
 msgstr "图片名称"
 
-#: gerbview/gerber_file_image.cpp:346
+#: gerbview/gerber_file_image.cpp:350
 msgid "Graphic layer"
 msgstr "图形层"
 
-#: gerbview/gerber_file_image.cpp:350
+#: gerbview/gerber_file_image.cpp:354
 msgid "Img Rot."
 msgstr "Img Rot."
 
-#: gerbview/gerber_file_image.cpp:358
+#: gerbview/gerber_file_image.cpp:362
 msgid "X Justify"
 msgstr "X 对齐"
 
-#: gerbview/gerber_file_image.cpp:361
+#: gerbview/gerber_file_image.cpp:365
 msgid "Y Justify"
 msgstr "Y 对齐"
 
-#: gerbview/gerber_file_image.cpp:370
+#: gerbview/gerber_file_image.cpp:374
 msgid "Image Justify Offset"
 msgstr "图像偏移对齐"
 
@@ -11795,8 +12094,8 @@ msgstr "图形层 %d"
 msgid "Gerbview"
 msgstr "GerbView"
 
-#: gerbview/gerbview_frame.cpp:158 pcbnew/footprint_edit_frame.cpp:305
-#: pcbnew/footprint_edit_frame.cpp:682 pcbnew/pcb_edit_frame.cpp:373
+#: gerbview/gerbview_frame.cpp:158 pcbnew/footprint_edit_frame.cpp:306
+#: pcbnew/footprint_edit_frame.cpp:688 pcbnew/pcb_edit_frame.cpp:373
 msgid "Layers Manager"
 msgstr "层管理器"
 
@@ -11857,7 +12156,7 @@ msgstr "图片名称：\"%s\" 图层名称 \"%s\""
 msgid "X2 attr"
 msgstr "X2 属性"
 
-#: gerbview/gerbview_frame.cpp:1277 pcbnew/pcb_base_frame.cpp:1086
+#: gerbview/gerbview_frame.cpp:1277 pcbnew/pcb_base_frame.cpp:1137
 msgid "Zoom "
 msgstr "缩放 "
 
@@ -11893,18 +12192,10 @@ msgstr "以此颜色显示负片"
 msgid "Show the (x,y) grid dots"
 msgstr "(X,Y)显示格点"
 
-#: gerbview/gerbview_layer_widget.cpp:120 pcbnew/pcb_layer_widget.cpp:88
-msgid "Worksheet"
-msgstr "工作表"
-
 #: gerbview/gerbview_layer_widget.cpp:120 pcbnew/pcb_layer_widget.cpp:88
 msgid "Show worksheet"
 msgstr "显示工作表"
 
-#: gerbview/gerbview_layer_widget.cpp:121 pcbnew/pcb_layer_widget.cpp:92
-msgid "Background"
-msgstr "背景"
-
 #: gerbview/gerbview_layer_widget.cpp:121 pcbnew/pcb_layer_widget.cpp:92
 msgid "PCB Background"
 msgstr "PCB背景"
@@ -11965,15 +12256,6 @@ msgstr "上一层"
 msgid "Switch to Legacy Toolset"
 msgstr "切换到传统工具箱"
 
-#: gerbview/hotkeys.cpp:95 pcbnew/hotkeys.cpp:179
-msgid ""
-"Switch to Modern Toolset with hardware-accelerated graphics (recommended)"
-msgstr "切换到具有硬件图形加速的现代工具箱(推荐)"
-
-#: gerbview/hotkeys.cpp:101 pcbnew/hotkeys.cpp:185
-msgid "Switch to Modern Toolset with software graphics (fall-back)"
-msgstr "切换到具有软件图形加速的现代工具箱 (回退)"
-
 #: gerbview/hotkeys.cpp:108 pcbnew/hotkeys.cpp:311
 msgid "Measure Distance (Modern Toolset only)"
 msgstr "测量距离(仅适用于现代工具箱)"
@@ -11994,7 +12276,7 @@ msgstr "打开Gerber工作文件"
 msgid "Open &Gerber File(s)..."
 msgstr "打开Gerber文件(&G)..."
 
-#: gerbview/menubar.cpp:57 gerbview/toolbars_gerber.cpp:60
+#: gerbview/menubar.cpp:57 gerbview/toolbars_gerber.cpp:64
 msgid "Open Gerber file(s) on the current layer. Previous data will be deleted"
 msgstr "打开当前图层上的Gerber文件。 以前的数据将被删除"
 
@@ -12002,7 +12284,7 @@ msgstr "打开当前图层上的Gerber文件。 以前的数据将被删除"
 msgid "Open &Excellon Drill File(s)..."
 msgstr "打开Excellon 钻孔文件..."
 
-#: gerbview/menubar.cpp:63 gerbview/toolbars_gerber.cpp:64
+#: gerbview/menubar.cpp:63 gerbview/toolbars_gerber.cpp:68
 msgid ""
 "Open Excellon drill file(s) on the current layer. Previous data will be "
 "deleted"
@@ -12065,189 +12347,178 @@ msgstr "清除所有层(&A)"
 msgid "Clear all layers. All data will be deleted"
 msgstr "清除所有层，所有数据将被删除"
 
-#: gerbview/menubar.cpp:154
+#: gerbview/menubar.cpp:151
+msgid "Reload All Layers"
+msgstr "重新载入所有层"
+
+#: gerbview/menubar.cpp:152
+msgid "Reload all layers. All data will be reloaded"
+msgstr "重新载入所有层。所有数据将被重新加载"
+
+#: gerbview/menubar.cpp:161
 msgid "E&xport to Pcbnew..."
 msgstr "导出到 pcbnew (&X)..."
 
-#: gerbview/menubar.cpp:155
+#: gerbview/menubar.cpp:162
 msgid "Export data in Pcbnew format"
 msgstr "将数据导出为 pcbnew 格式"
 
-#: gerbview/menubar.cpp:163 gerbview/toolbars_gerber.cpp:68
+#: gerbview/menubar.cpp:170 gerbview/toolbars_gerber.cpp:72
 msgid "Print layers"
 msgstr "打印"
 
-#: gerbview/menubar.cpp:171 pagelayout_editor/menubar.cpp:100
+#: gerbview/menubar.cpp:178 pagelayout_editor/menubar.cpp:100
 msgid "&Close"
 msgstr "关闭(&C)"
 
-#: gerbview/menubar.cpp:171
+#: gerbview/menubar.cpp:178
 msgid "Close GerbView"
 msgstr "关闭 GerbView"
 
-#: gerbview/menubar.cpp:179
+#: gerbview/menubar.cpp:186
 msgid "Show &Layers Manager"
 msgstr "显示层管理 (&L)"
 
-#: gerbview/menubar.cpp:179
+#: gerbview/menubar.cpp:186
 msgid "Show or hide the layer manager"
 msgstr "显示/隐藏层管理器"
 
-#: gerbview/menubar.cpp:204 gerbview/toolbars_gerber.cpp:80
+#: gerbview/menubar.cpp:211 gerbview/toolbars_gerber.cpp:84
 #: pcbnew/tool_footprint_viewer.cpp:85
 msgid "Zoom to fit"
 msgstr "缩放至适合大小"
 
-#: gerbview/menubar.cpp:212
+#: gerbview/menubar.cpp:219
 msgid "Refresh screen"
 msgstr "刷新屏幕"
 
-#: gerbview/menubar.cpp:221 pcbnew/menubar_footprint_editor.cpp:234
+#: gerbview/menubar.cpp:228 pcbnew/menubar_footprint_editor.cpp:239
 #: pcbnew/menubar_pcb_editor.cpp:601
 msgid "Display &Polar Coordinates"
 msgstr "显示极坐标(&P)"
 
-#: gerbview/menubar.cpp:242
+#: gerbview/menubar.cpp:249
 msgid "Sketch F&lashed Items"
 msgstr "项目快速草图"
 
-#: gerbview/menubar.cpp:242 gerbview/toolbars_gerber.cpp:277
-#: gerbview/toolbars_gerber.cpp:558
+#: gerbview/menubar.cpp:249 gerbview/toolbars_gerber.cpp:281
+#: gerbview/toolbars_gerber.cpp:562
 msgid "Show flashed items in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: gerbview/menubar.cpp:246
+#: gerbview/menubar.cpp:253
 msgid "Sketch &Lines"
 msgstr "线条草图(&L)"
 
-#: gerbview/menubar.cpp:246 gerbview/toolbars_gerber.cpp:281
-#: gerbview/toolbars_gerber.cpp:570
+#: gerbview/menubar.cpp:253 gerbview/toolbars_gerber.cpp:285
+#: gerbview/toolbars_gerber.cpp:574
 msgid "Show lines in outline mode"
 msgstr "在轮廓模式下显示线"
 
-#: gerbview/menubar.cpp:250
+#: gerbview/menubar.cpp:257
 msgid "Sketch Pol&ygons"
 msgstr "多边形草图(&Y)"
 
-#: gerbview/menubar.cpp:250 gerbview/toolbars_gerber.cpp:285
-#: gerbview/toolbars_gerber.cpp:582
+#: gerbview/menubar.cpp:257 gerbview/toolbars_gerber.cpp:289
+#: gerbview/toolbars_gerber.cpp:586
 msgid "Show polygons in outline mode"
 msgstr "在轮廓模式下显示多边形"
 
-#: gerbview/menubar.cpp:254
+#: gerbview/menubar.cpp:261
 msgid "Show &DCodes"
 msgstr "显示D码(&D)"
 
-#: gerbview/menubar.cpp:254
+#: gerbview/menubar.cpp:261
 msgid "Show or hide DCodes"
 msgstr "显示或隐藏D码"
 
-#: gerbview/menubar.cpp:258
+#: gerbview/menubar.cpp:265
 msgid "Show &Negative Objects"
 msgstr "显示负片对象(&N)"
 
-#: gerbview/menubar.cpp:258 gerbview/toolbars_gerber.cpp:606
+#: gerbview/menubar.cpp:265 gerbview/toolbars_gerber.cpp:610
 msgid "Show negative objects in ghost color"
 msgstr "以鬼影颜色显示负片对象"
 
-#: gerbview/menubar.cpp:264
+#: gerbview/menubar.cpp:271
 msgid "Show in Differential Mode"
 msgstr "以差异模式显示"
 
-#: gerbview/menubar.cpp:264 gerbview/toolbars_gerber.cpp:618
+#: gerbview/menubar.cpp:271 gerbview/toolbars_gerber.cpp:622
 msgid "Show layers in differential mode"
 msgstr "以差异模式显示图层"
 
-#: gerbview/menubar.cpp:268
+#: gerbview/menubar.cpp:275
 msgid "Show in High Contrast"
 msgstr "以高对比度显示"
 
-#: gerbview/menubar.cpp:268
+#: gerbview/menubar.cpp:275
 msgid "Show in high contrast mode"
 msgstr "以高对比度模式显示"
 
-#: gerbview/menubar.cpp:274
+#: gerbview/menubar.cpp:281
 msgid "Show Normal Mode"
 msgstr "显示正常模式"
 
-#: gerbview/menubar.cpp:274 gerbview/toolbars_gerber.cpp:617
+#: gerbview/menubar.cpp:281 gerbview/toolbars_gerber.cpp:621
 msgid "Show layers in normal mode"
 msgstr "以正常模式显示图层"
 
-#: gerbview/menubar.cpp:277
+#: gerbview/menubar.cpp:284
 msgid "Show Stacked Mode"
 msgstr "显示堆叠模式"
 
-#: gerbview/menubar.cpp:277
+#: gerbview/menubar.cpp:284
 msgid "Show layers in stacked mode"
 msgstr "在堆叠模式中显示图层"
 
-#: gerbview/menubar.cpp:280
+#: gerbview/menubar.cpp:287
 msgid "Show Transparency Mode"
 msgstr "显示透明模式"
 
-#: gerbview/menubar.cpp:280
+#: gerbview/menubar.cpp:287
 msgid "Show layers in transparency mode"
 msgstr "在透明模式下显示图层"
 
-#: gerbview/menubar.cpp:296 pcbnew/menubar_footprint_editor.cpp:421
+#: gerbview/menubar.cpp:303 pcbnew/menubar_footprint_editor.cpp:421
 #: pcbnew/menubar_pcb_editor.cpp:161
 msgid "Legacy Tool&set"
 msgstr "传统工具箱(&S)"
 
-#: gerbview/menubar.cpp:298 pcbnew/menubar_footprint_editor.cpp:423
+#: gerbview/menubar.cpp:305 pcbnew/menubar_footprint_editor.cpp:423
 #: pcbnew/menubar_pcb_editor.cpp:164
 msgid "Use Legacy Toolset (not all features will be available)"
 msgstr "使用传统工具箱(并不是所有工具都可用)"
 
-#: gerbview/menubar.cpp:301 pcbnew/menubar_footprint_editor.cpp:426
-#: pcbnew/menubar_pcb_editor.cpp:167
-msgid "Modern Toolset (&Accelerated)"
-msgstr "现代工具箱 (加速&A)"
-
-#: gerbview/menubar.cpp:303 pcbnew/menubar_footprint_editor.cpp:428
-#: pcbnew/menubar_pcb_editor.cpp:170
-msgid "Use Modern Toolset with hardware-accelerated graphics (recommended)"
-msgstr "使用带有硬件图形加速的现代工具箱(推荐）"
-
-#: gerbview/menubar.cpp:306 pcbnew/menubar_pcb_editor.cpp:173
-msgid "Modern Toolset (Fallba&ck)"
-msgstr "现代工具箱 (回退&C)"
-
-#: gerbview/menubar.cpp:308 pcbnew/menubar_footprint_editor.cpp:433
-#: pcbnew/menubar_pcb_editor.cpp:176
-msgid "Use Modern Toolset with software graphics (fall-back)"
-msgstr "使用带有软件图形加速的现代工具箱(回退）"
-
-#: gerbview/menubar.cpp:320
+#: gerbview/menubar.cpp:327
 msgid "&List DCodes..."
 msgstr "D码列表(&L)..."
 
-#: gerbview/menubar.cpp:321
+#: gerbview/menubar.cpp:328
 msgid "List D-codes defined in Gerber files"
 msgstr "列出在Gerber文件中定义的D码"
 
-#: gerbview/menubar.cpp:325
+#: gerbview/menubar.cpp:332
 msgid "&Show Source..."
 msgstr "显示源码(&S)..."
 
-#: gerbview/menubar.cpp:326
+#: gerbview/menubar.cpp:333
 msgid "Show source file for the current layer"
 msgstr "当前层显示源码"
 
-#: gerbview/menubar.cpp:332
+#: gerbview/menubar.cpp:339
 msgid "&Clear Current Layer..."
 msgstr "清除当前层(&C)..."
 
-#: gerbview/menubar.cpp:333
+#: gerbview/menubar.cpp:340
 msgid "Clear the graphic layer currently selected"
 msgstr "清除当前选择的图形层"
 
-#: gerbview/menubar.cpp:339
+#: gerbview/menubar.cpp:346
 msgid "Gerbview &Manual"
 msgstr "Gerbview 手册(&M)"
 
-#: gerbview/menubar.cpp:340
+#: gerbview/menubar.cpp:347
 msgid "Open the GerbView Manual"
 msgstr "打开 GerbView 手册"
 
@@ -12270,7 +12541,7 @@ msgstr "高亮光圈类型 \"%s\""
 msgid "Clear Highlight"
 msgstr "清除高亮"
 
-#: gerbview/readgerb.cpp:61 pcbnew/footprint_libraries_utils.cpp:61
+#: gerbview/readgerb.cpp:61 pcbnew/footprint_libraries_utils.cpp:64
 #, c-format
 msgid "File \"%s\" not found"
 msgstr "文件 %s 没有找到"
@@ -12285,21 +12556,21 @@ msgstr ""
 "这可能是旧版的 RS274D 文件\n"
 "所以大小项未定义"
 
-#: gerbview/rs274x.cpp:272
+#: gerbview/rs274x.cpp:271
 #, c-format
 msgid "RS274X: Invalid GERBER format command '%c' at line %d: \"%s\""
 msgstr "RS274X：无效的GEBER格式命令 \"%c\" 在行 %d ：\"%s\""
 
-#: gerbview/rs274x.cpp:275
+#: gerbview/rs274x.cpp:274
 #, c-format
 msgid "GERBER file \"%s\" may not display as intended."
 msgstr "GERBER文件 \"%s\" 不能按预期显示。"
 
-#: gerbview/rs274x.cpp:550
+#: gerbview/rs274x.cpp:549
 msgid "RS274X: Command \"IR\" rotation value not allowed"
 msgstr "RS274X: 命令 \"IR\" 旋转值不允许"
 
-#: gerbview/rs274x.cpp:641
+#: gerbview/rs274x.cpp:640
 msgid "RS274X: Command KNOCKOUT ignored by GerbView"
 msgstr "RS274X: GerbView 命令 KNOCKOUT 被忽略"
 
@@ -12318,44 +12589,48 @@ msgstr "导出的电路板没有足够的铜层处理选择的内层"
 msgid "Clear all layers"
 msgstr "清除所有层"
 
-#: gerbview/toolbars_gerber.cpp:120
+#: gerbview/toolbars_gerber.cpp:61
+msgid "Reload all layers"
+msgstr "重新载入所有层"
+
+#: gerbview/toolbars_gerber.cpp:124
 msgid "Highlight items belonging to this component"
 msgstr "高亮显示属于此元件的项目"
 
-#: gerbview/toolbars_gerber.cpp:121
+#: gerbview/toolbars_gerber.cpp:125
 msgid "Cmp: "
 msgstr "Cmp： "
 
-#: gerbview/toolbars_gerber.cpp:132
+#: gerbview/toolbars_gerber.cpp:136
 msgid "Highlight items belonging to this net"
 msgstr "高亮显示属于此网络的项目"
 
-#: gerbview/toolbars_gerber.cpp:144
+#: gerbview/toolbars_gerber.cpp:148
 msgid "Highlight items with this aperture attribute"
 msgstr "高亮显示此光圈属性"
 
-#: gerbview/toolbars_gerber.cpp:145
+#: gerbview/toolbars_gerber.cpp:149
 msgid "Attr:"
 msgstr "属性："
 
-#: gerbview/toolbars_gerber.cpp:156
+#: gerbview/toolbars_gerber.cpp:160
 msgid "DCode:"
 msgstr "D码："
 
-#: gerbview/toolbars_gerber.cpp:253
+#: gerbview/toolbars_gerber.cpp:257
 msgid "Turn polar coordinates on"
 msgstr "打开极坐标"
 
-#: gerbview/toolbars_gerber.cpp:290
+#: gerbview/toolbars_gerber.cpp:294
 msgid "Show negatives objects in ghost color"
 msgstr "显示负片对象"
 
-#: gerbview/toolbars_gerber.cpp:295
+#: gerbview/toolbars_gerber.cpp:299
 msgid "Show dcode number"
 msgstr "显示D码编号"
 
 # pls translate more better.
-#: gerbview/toolbars_gerber.cpp:303
+#: gerbview/toolbars_gerber.cpp:307
 msgid ""
 "Show layers in raw mode\n"
 "(could have problems with negative items when more than one gerber file is "
@@ -12364,7 +12639,7 @@ msgstr ""
 "在原始模式中显示图层 \n"
 "(当显示多个gerber文件时, 可能会出现负片项目的问题)"
 
-#: gerbview/toolbars_gerber.cpp:308
+#: gerbview/toolbars_gerber.cpp:312
 msgid ""
 "Show layers in stacked mode\n"
 "(show negative items without artifacts)"
@@ -12373,7 +12648,7 @@ msgstr ""
 "(show negative items without artifacts)"
 
 # pls translate more better.
-#: gerbview/toolbars_gerber.cpp:313
+#: gerbview/toolbars_gerber.cpp:317
 msgid ""
 "Show layers in transparency mode\n"
 "(show negative items without artifacts)"
@@ -12381,69 +12656,69 @@ msgstr ""
 "透明模式显示层\n"
 "（显示负项没有任何瑕疵）"
 
-#: gerbview/toolbars_gerber.cpp:321
+#: gerbview/toolbars_gerber.cpp:325
 msgid "Show layers in diff (compare) mode"
 msgstr "在比较模式下显示图层"
 
-#: gerbview/toolbars_gerber.cpp:326 pcbnew/tool_footprint_editor.cpp:229
+#: gerbview/toolbars_gerber.cpp:330 pcbnew/tool_footprint_editor.cpp:234
 #: pcbnew/tool_pcb_editor.cpp:404
 msgid "Enable high contrast display mode"
 msgstr "启用高对比度显示模式"
 
-#: gerbview/toolbars_gerber.cpp:336 pcbnew/help_common_strings.h:24
+#: gerbview/toolbars_gerber.cpp:340 pcbnew/help_common_strings.h:24
 msgid "Show/hide the layers manager toolbar"
 msgstr "显示/隐藏层管理工具栏"
 
-#: gerbview/toolbars_gerber.cpp:344
+#: gerbview/toolbars_gerber.cpp:348
 msgid "<No selection>"
 msgstr "<没有选择>"
 
-#: gerbview/toolbars_gerber.cpp:546
+#: gerbview/toolbars_gerber.cpp:550
 msgid "Turn on rectangular coordinates"
 msgstr "打开直角坐标"
 
-#: gerbview/toolbars_gerber.cpp:547
+#: gerbview/toolbars_gerber.cpp:551
 msgid "Turn on polar coordinates"
 msgstr "打开极坐标"
 
-#: gerbview/toolbars_gerber.cpp:559
+#: gerbview/toolbars_gerber.cpp:563
 #, fuzzy
 msgid "Show flashed items in fill mode"
 msgstr "在填充模式显示闪烁的项目"
 
-#: gerbview/toolbars_gerber.cpp:571
+#: gerbview/toolbars_gerber.cpp:575
 msgid "Show lines in fill mode"
 msgstr "在填充模式下显示线"
 
-#: gerbview/toolbars_gerber.cpp:583
+#: gerbview/toolbars_gerber.cpp:587
 msgid "Show polygons in fill mode"
 msgstr "在填充模式下显示多边形"
 
-#: gerbview/toolbars_gerber.cpp:594
+#: gerbview/toolbars_gerber.cpp:598
 msgid "Hide DCodes"
 msgstr "隐藏D码"
 
-#: gerbview/toolbars_gerber.cpp:594
+#: gerbview/toolbars_gerber.cpp:598
 msgid "Show DCodes"
 msgstr "显示D码"
 
-#: gerbview/toolbars_gerber.cpp:605
+#: gerbview/toolbars_gerber.cpp:609
 msgid "Show negative objects in normal color"
 msgstr "以标准颜色显示负片对象"
 
-#: gerbview/toolbars_gerber.cpp:629
+#: gerbview/toolbars_gerber.cpp:633
 msgid "Disable high contrast mode"
 msgstr "禁用高对比度模式"
 
-#: gerbview/toolbars_gerber.cpp:630
+#: gerbview/toolbars_gerber.cpp:634
 msgid "Enable high contrast mode"
 msgstr "启用高对比度显示模式"
 
-#: gerbview/toolbars_gerber.cpp:641
+#: gerbview/toolbars_gerber.cpp:645
 msgid "Hide layers manager"
 msgstr "隐藏层管理"
 
-#: gerbview/toolbars_gerber.cpp:643
+#: gerbview/toolbars_gerber.cpp:647
 msgid "Show layers manager"
 msgstr "显示层管理"
 
@@ -12467,10 +12742,6 @@ msgstr "高亮"
 msgid "Clarify selection"
 msgstr "明确选择"
 
-#: include/confirm.h:56
-msgid "Do not show again"
-msgstr "不显示"
-
 #: include/kiway_player.h:276
 msgid "This file is already open."
 msgstr "文件已经被打开。"
@@ -12488,40 +12759,45 @@ msgid "Active"
 msgstr "活动的"
 
 #: kicad/commandframe.cpp:72
-msgid "Schematic layout editor"
+msgid "Schematic Layout Editor"
 msgstr "原理图编辑器"
 
-#: kicad/commandframe.cpp:76
-msgid "Symbol library editor"
-msgstr "符号库编辑器"
-
 #: kicad/commandframe.cpp:83
-msgid "PCB layout editor"
-msgstr "PCB板编辑器"
+msgid "PCB Layout Editor"
+msgstr "PCB编辑器"
 
-#: kicad/commandframe.cpp:87
-msgid "Footprint library editor"
-msgstr "封装库编辑器"
+#: kicad/commandframe.cpp:87 pcbnew/footprint_edit_frame.cpp:753
+#: pcbnew/footprint_edit_frame.cpp:946 pcbnew/hotkeys.cpp:511
+msgid "Footprint Editor"
+msgstr "封装编辑器"
 
 #: kicad/commandframe.cpp:94
-msgid "Gerber viewer"
+msgid "Gerber Viewer"
 msgstr "Gerber浏览器"
 
 #: kicad/commandframe.cpp:98
 msgid ""
-"Import bitmap\n"
-"Convert bitmap images to schematic or PCB elements"
+"Bitmap to Component Converter\n"
+"Convert bitmap images to schematic or PCB components"
 msgstr ""
-"位图导入\n"
-"把位图转换为原理图或PCB可使用的元件"
+"位图 - 元件转换器\n"
+"转换位图为原理图或PCB元件"
 
 #: kicad/commandframe.cpp:103
-msgid "Calculator tools"
-msgstr "计算器工具"
+msgid ""
+"PCB Calculator\n"
+"Run component calculations, track width calculations, etc."
+msgstr ""
+"PCB计算器\n"
+"运行元件计算，布线宽度计算等。"
 
-#: kicad/commandframe.cpp:107
-msgid "Worksheet layout editor"
-msgstr "工作表布局编辑器"
+#: kicad/commandframe.cpp:108
+msgid ""
+"Page Layout Editor\n"
+"Edit worksheet graphics and text"
+msgstr ""
+"页面布局编辑器\n"
+"编辑工作表图形和文本"
 
 #: kicad/dialogs/dialog_template_selector.cpp:123
 msgid "<html><h1>Template Selector</h1></html>"
@@ -12645,19 +12921,19 @@ msgstr ""
 "\n"
 "您要创建一个与工程同名的新目录吗?"
 
-#: kicad/import_project.cpp:138 kicad/mainframe.cpp:304
-#: pcbnew/pcb_edit_frame.cpp:1196
+#: kicad/import_project.cpp:138 kicad/mainframe.cpp:294
+#: pcbnew/pcb_edit_frame.cpp:1194
 msgid "Eeschema failed to load:\n"
 msgstr "Eeschema 无法加载:\n"
 
 #: kicad/import_project.cpp:139 kicad/import_project.cpp:173
-#: kicad/mainframe.cpp:305 kicad/mainframe.cpp:352 kicad/mainframe.cpp:377
-#: kicad/mainframe.cpp:424 pcbnew/pcb_edit_frame.cpp:1167
-#: pcbnew/pcb_edit_frame.cpp:1197
+#: kicad/mainframe.cpp:295 kicad/mainframe.cpp:338 kicad/mainframe.cpp:363
+#: kicad/mainframe.cpp:405 pcbnew/pcb_edit_frame.cpp:1165
+#: pcbnew/pcb_edit_frame.cpp:1195
 msgid "KiCad Error"
 msgstr "KiCad 错误"
 
-#: kicad/import_project.cpp:173 kicad/mainframe.cpp:377
+#: kicad/import_project.cpp:173 kicad/mainframe.cpp:363
 msgid "Pcbnew failed to load:\n"
 msgstr "Pcbnew 无法加载：\n"
 
@@ -12671,19 +12947,19 @@ msgstr "%s 关闭 [pid=%d]\n"
 msgid "%s %s opened [pid=%ld]\n"
 msgstr "%s %s 打开 [pid=%ld]\n"
 
-#: kicad/mainframe.cpp:351
+#: kicad/mainframe.cpp:337
 msgid "Component library editor failed to load:\n"
 msgstr "元件编辑器无法加载:\n"
 
-#: kicad/mainframe.cpp:423
+#: kicad/mainframe.cpp:404
 msgid "Footprint library editor failed to load:\n"
 msgstr "封装库编辑器无法加载:\n"
 
-#: kicad/mainframe.cpp:483
+#: kicad/mainframe.cpp:464
 msgid "Load File to Edit"
 msgstr "打开文件编辑"
 
-#: kicad/mainframe.cpp:540
+#: kicad/mainframe.cpp:521
 #, c-format
 msgid ""
 "Project name:\n"
@@ -12756,7 +13032,7 @@ msgstr "新建空工程"
 msgid "Project from &Template..."
 msgstr "从模板新建工程(&T)..."
 
-#: kicad/menubar.cpp:217 kicad/menubar.cpp:468
+#: kicad/menubar.cpp:217 kicad/menubar.cpp:467
 msgid "Create new project from template"
 msgstr "从模板新建工程"
 
@@ -12765,7 +13041,7 @@ msgstr "从模板新建工程"
 msgid "&New"
 msgstr "新建(&N)"
 
-#: kicad/menubar.cpp:222 kicad/menubar.cpp:464
+#: kicad/menubar.cpp:222 kicad/menubar.cpp:463
 msgid "Create new project"
 msgstr "新建工程"
 
@@ -12781,7 +13057,7 @@ msgstr "打开一个现有工程"
 msgid "Open a recent project"
 msgstr "打开最近工程"
 
-#: kicad/menubar.cpp:247 kicad/menubar.cpp:481
+#: kicad/menubar.cpp:247 kicad/menubar.cpp:480
 msgid "Save current project"
 msgstr "保存当前工程"
 
@@ -12813,7 +13089,7 @@ msgstr "把当前工程打包成ZIP文件"
 msgid "&Unarchive Project..."
 msgstr "解压工程(&U)..."
 
-#: kicad/menubar.cpp:279 kicad/menubar.cpp:494
+#: kicad/menubar.cpp:279 kicad/menubar.cpp:493
 msgid "Unarchive project files from zip archive"
 msgstr "选择一个ZIP工程文件，并解压缩"
 
@@ -12825,7 +13101,7 @@ msgstr "关闭KiCad"
 msgid "&Refresh"
 msgstr "刷新(&R)"
 
-#: kicad/menubar.cpp:298 kicad/menubar.cpp:501
+#: kicad/menubar.cpp:298 kicad/menubar.cpp:500
 msgid "Refresh project tree"
 msgstr "刷新工程目录"
 
@@ -12862,7 +13138,7 @@ msgid "Edit Schematic Symbols"
 msgstr "编辑原理图符号"
 
 #: kicad/menubar.cpp:365
-msgid "Edit PCB Layout"
+msgid "Edit PCB"
 msgstr "编辑PCB"
 
 #: kicad/menubar.cpp:369
@@ -12878,48 +13154,46 @@ msgid "Convert Image"
 msgstr "图片转换"
 
 #: kicad/menubar.cpp:380
-msgid ""
-"Bitmap2Component - Convert bitmap images to schematic\n"
-"or PCB elements"
-msgstr "Bitmap2Component - 转换位图到原理图或PCB元素"
+msgid "Convert bitmap images to schematic or PCB components"
+msgstr "转换位图为原理图或PCB元件"
 
-#: kicad/menubar.cpp:384
-msgid "Run PCB Calculator"
-msgstr "运行PCB计算器"
+#: kicad/menubar.cpp:383
+msgid "Calculator Tools"
+msgstr "计算器工具"
 
-#: kicad/menubar.cpp:386
-msgid "Pcb calculator - Calculator for components, track width, etc."
-msgstr "计量工具 - 计算布线宽度等"
+#: kicad/menubar.cpp:385
+msgid "Run component calculations, track width calculations, etc."
+msgstr "元件计算，布线宽度计算等等。"
 
-#: kicad/menubar.cpp:389
-msgid "Edit Page Layout"
-msgstr "编辑页面布局"
+#: kicad/menubar.cpp:388
+msgid "Edit Worksheet"
+msgstr "编辑工作表"
 
-#: kicad/menubar.cpp:391
-msgid "Pl editor - Worksheet layout editor"
-msgstr "Pl 编辑器 - 工作表布局编辑器"
+#: kicad/menubar.cpp:390
+msgid "Edit worksheet graphics and text"
+msgstr "编辑工作表图形和文本"
 
-#: kicad/menubar.cpp:399
+#: kicad/menubar.cpp:398
 msgid "KiCad &Manual"
 msgstr "kiCad手册(&M)"
 
-#: kicad/menubar.cpp:400
+#: kicad/menubar.cpp:399
 msgid "Open KiCad user manual"
 msgstr "打开KiCad用户手册"
 
-#: kicad/menubar.cpp:410 pagelayout_editor/menubar.cpp:194
+#: kicad/menubar.cpp:409 pagelayout_editor/menubar.cpp:194
 msgid "&List Hotkeys"
 msgstr "快捷键列表(&L)"
 
-#: kicad/menubar.cpp:432
+#: kicad/menubar.cpp:431
 msgid "&Browse"
 msgstr "查看(&B)"
 
-#: kicad/menubar.cpp:473
+#: kicad/menubar.cpp:472
 msgid "Open existing project"
 msgstr "打开工程"
 
-#: kicad/menubar.cpp:489
+#: kicad/menubar.cpp:488
 msgid "Archive all project files"
 msgstr "归档全部工程文件"
 
@@ -13024,7 +13298,7 @@ msgstr "无法创建文件夹 \"%s\""
 msgid "Cannot copy file \"%s\"."
 msgstr "无法复制文件 %s"
 
-#: kicad/tree_project_frame.cpp:234
+#: kicad/tree_project_frame.cpp:235
 #, c-format
 msgid ""
 "Current project directory:\n"
@@ -13033,60 +13307,60 @@ msgstr ""
 "当前工程目录:\n"
 "%s"
 
-#: kicad/tree_project_frame.cpp:235
+#: kicad/tree_project_frame.cpp:236
 msgid "Create New Directory"
 msgstr "创建新目录"
 
-#: kicad/tree_project_frame.cpp:700
+#: kicad/tree_project_frame.cpp:702
 msgid "&Switch to this Project"
 msgstr "切换到此工程(&S)"
 
-#: kicad/tree_project_frame.cpp:701
+#: kicad/tree_project_frame.cpp:703
 msgid "Close all editors, and switch to the selected project"
 msgstr "关闭所有编辑器，然后切换到所选工程"
 
-#: kicad/tree_project_frame.cpp:706 kicad/tree_project_frame.cpp:713
+#: kicad/tree_project_frame.cpp:709 kicad/tree_project_frame.cpp:716
 msgid "New D&irectory..."
 msgstr "新建目录(&N)..."
 
-#: kicad/tree_project_frame.cpp:707 kicad/tree_project_frame.cpp:714
+#: kicad/tree_project_frame.cpp:710 kicad/tree_project_frame.cpp:717
 msgid "Create a New Directory"
 msgstr "创建一个新目录"
 
-#: kicad/tree_project_frame.cpp:717
+#: kicad/tree_project_frame.cpp:720
 msgid "&Delete Directory"
 msgstr "删除目录(&D)"
 
-#: kicad/tree_project_frame.cpp:718 kicad/tree_project_frame.cpp:733
+#: kicad/tree_project_frame.cpp:721 kicad/tree_project_frame.cpp:736
 msgid "Delete the Directory and its content"
 msgstr "删除目录及其内容"
 
-#: kicad/tree_project_frame.cpp:724
+#: kicad/tree_project_frame.cpp:727
 msgid "&Edit in a Text Editor"
 msgstr "在文本编辑器中编辑(&E)"
 
-#: kicad/tree_project_frame.cpp:725
+#: kicad/tree_project_frame.cpp:728
 msgid "Open the file in a Text Editor"
 msgstr "在文本编辑器打开文件"
 
-#: kicad/tree_project_frame.cpp:728
+#: kicad/tree_project_frame.cpp:731
 msgid "&Rename File..."
 msgstr "重命名文件(&R)..."
 
-#: kicad/tree_project_frame.cpp:729
+#: kicad/tree_project_frame.cpp:732
 msgid "Rename file"
 msgstr "重命名"
 
-#: kicad/tree_project_frame.cpp:732
+#: kicad/tree_project_frame.cpp:735
 msgid "&Delete File"
 msgstr "删除文件(&D)"
 
-#: kicad/tree_project_frame.cpp:782
+#: kicad/tree_project_frame.cpp:785
 #, c-format
 msgid "Change filename: \"%s\""
 msgstr "修改文件名称: \"%s\""
 
-#: kicad/tree_project_frame.cpp:785
+#: kicad/tree_project_frame.cpp:788
 msgid "Change filename"
 msgstr "修改文件名称"
 
@@ -13214,31 +13488,31 @@ msgstr "原点"
 
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:68
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:128
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:264
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:324
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:265
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:325
 msgid "Upper Right"
 msgstr "右上"
 
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:68
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:128
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:265
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:325
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:266
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:326
 msgid "Upper Left"
 msgstr "左上"
 
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:68
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:128
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:263
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:266
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:326
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:264
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:267
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:327
 msgid "Lower Right"
 msgstr "右下"
 
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:68
 #: pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp:128
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:267
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:323
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:327
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:268
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:324
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:328
 msgid "Lower Left"
 msgstr "左下"
 
@@ -13266,6 +13540,18 @@ msgstr "试图打印页面边框时发生错误。"
 msgid "Page 1 option:"
 msgstr "第 1 页选项："
 
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:50
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:124
+#: pcbnew/dialogs/dialog_copper_zones_base.cpp:203
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:394
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:296
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:311
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:517
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:566
+#: pcbnew/dialogs/dialog_plot_base.cpp:119
+msgid "None"
+msgstr "无"
+
 #: pagelayout_editor/dialogs/properties_frame_base.cpp:50
 msgid "Page 1 only"
 msgstr "仅第 1 页"
@@ -13294,115 +13580,115 @@ msgstr "最大宽度："
 msgid "Maximum height:"
 msgstr "最大高度："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:206
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:207
 msgid "Comment:"
 msgstr "注释："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:225
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:226
 msgid "Start X:"
 msgstr "起点 X："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:239
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:240
 msgid "Start Y:"
 msgstr "起点 Y："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:259
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:319
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:260
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:320
 msgid "Origin:"
 msgstr "原点："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:285
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:286
 msgid "End X:"
 msgstr "结束点 X："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:299
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:300
 msgid "End Y:"
 msgstr "结束点 Y："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:342
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:894
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:343
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:896
 #: pcbnew/dialogs/dialog_target_properties_base.cpp:39
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:135
 msgid "Thickness:"
 msgstr "线宽:"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:352
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:353
 msgid "Set to 0 to use default"
 msgstr "设置默认为0"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:369
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:984
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:370
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:986
 msgid "Rotation:"
 msgstr "旋转:"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:376
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:377
 msgid "Bitmap PPI:"
 msgstr "位图 PPI"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:403
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:393
 msgid "Repeat parameters:"
 msgstr "重复参数："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:414
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:404
 msgid "Repeat count:"
 msgstr "重复计数："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:421
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:411
 msgid "Text Increment:"
 msgstr "文本增量:"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:440
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:430
 msgid "Step X:"
 msgstr "步距 X："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:447
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:437
 msgid "Step Y:"
 msgstr "步距 Y："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:475
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:465
 msgid "Item Properties"
 msgstr "项目属性"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:484
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:474
 msgid "Default Values:"
 msgstr "默认值："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:523
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:513
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:124
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:140
 msgid "Line thickness:"
 msgstr "线宽："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:530
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:520
 #: pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp:193
 msgid "Text thickness:"
 msgstr "文本线宽："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:560
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:550
 msgid "Set to Default"
 msgstr "设置为默认"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:569
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:559
 msgid "Page Margins:"
 msgstr "页面边距："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:580
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:570
 msgid "Left:"
 msgstr "左："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:587
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:577
 msgid "Right:"
 msgstr "右:"
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:608
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:598
 msgid "Top:"
 msgstr "上："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:615
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:605
 msgid "Bottom:"
 msgstr "下："
 
-#: pagelayout_editor/dialogs/properties_frame_base.cpp:650
+#: pagelayout_editor/dialogs/properties_frame_base.cpp:641
 #: pcbnew/dialogs/dialog_plot_base.cpp:70
 msgid "General Options"
 msgstr "常规选项"
@@ -13411,41 +13697,40 @@ msgstr "常规选项"
 msgid "Page Layout Description File"
 msgstr "页面图框文件"
 
-#: pagelayout_editor/files.cpp:63 pagelayout_editor/files.cpp:97
-#: pagelayout_editor/pl_editor_frame.cpp:188
-msgid "The current page layout has been modified.  Save changes?"
+#: pagelayout_editor/files.cpp:66 pagelayout_editor/files.cpp:101
+msgid "The current page layout has been modified. Save changes?"
 msgstr "当前页面布局文件已被修改。是否保存更改？"
 
-#: pagelayout_editor/files.cpp:75 pagelayout_editor/files.cpp:158
+#: pagelayout_editor/files.cpp:79 pagelayout_editor/files.cpp:162
 #, c-format
 msgid "File \"%s\" loaded"
 msgstr "文件\"%s\"已加载"
 
-#: pagelayout_editor/files.cpp:115
+#: pagelayout_editor/files.cpp:119
 msgid "Append Existing Page Layout File"
 msgstr "添加现有的页面布局文件"
 
-#: pagelayout_editor/files.cpp:126 pagelayout_editor/files.cpp:152
+#: pagelayout_editor/files.cpp:130 pagelayout_editor/files.cpp:156
 #, c-format
 msgid "Unable to load %s file"
 msgstr "无法载入文件 %s"
 
-#: pagelayout_editor/files.cpp:134
+#: pagelayout_editor/files.cpp:138
 #, c-format
 msgid "File \"%s\" inserted"
 msgstr "插入文件\"%s\""
 
-#: pagelayout_editor/files.cpp:167
+#: pagelayout_editor/files.cpp:171
 #, c-format
 msgid "Unable to write \"%s\""
 msgstr "无法写入\"%s\""
 
-#: pagelayout_editor/files.cpp:172 pagelayout_editor/files.cpp:203
+#: pagelayout_editor/files.cpp:176 pagelayout_editor/files.cpp:207
 #, c-format
 msgid "File \"%s\" written"
 msgstr "文件\"%s\" 写入"
 
-#: pagelayout_editor/files.cpp:197 pcbnew/exporters/export_gencad.cpp:287
+#: pagelayout_editor/files.cpp:201 pcbnew/exporters/export_gencad.cpp:287
 #: pcbnew/exporters/gen_footprints_placefile.cpp:650
 #, c-format
 msgid "Unable to create \"%s\""
@@ -13588,6 +13873,10 @@ msgstr "原点位置：纸张左下角"
 msgid "Design"
 msgstr "设计"
 
+#: pagelayout_editor/pl_editor_frame.cpp:188
+msgid "The current page layout has been modified.  Save changes?"
+msgstr "当前页面布局文件已被修改。是否保存更改？"
+
 #: pagelayout_editor/pl_editor_frame.cpp:265
 msgid "no file selected"
 msgstr "没有选中的文件"
@@ -13971,7 +14260,6 @@ msgstr "截面积："
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1020
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1024
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:1028
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:223
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:170
 msgid "dummy"
 msgstr "假"
@@ -14006,7 +14294,7 @@ msgid "Internal layer traces:"
 msgstr "内层布线："
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:521
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:164
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:188
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:50
 msgid "Track Width"
 msgstr "布线宽度"
@@ -14024,10 +14312,12 @@ msgid "Note: Values are minimal values (from IPC 2221)"
 msgstr "注：表内数值最小值(来自《IPC-2221印制板通用设计标准》)"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:572
+#: qa/common/test_hotkey_store.cpp:38
 msgid "B1"
 msgstr "B1"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:573
+#: qa/common/test_hotkey_store.cpp:39
 msgid "B2"
 msgstr "B2"
 
@@ -14273,8 +14563,8 @@ msgid "Z"
 msgstr "Z"
 
 #: pcb_calculator/dialogs/pcb_calculator_frame_base.cpp:949
-#: pcbnew/class_drawsegment.cpp:460 pcbnew/class_drawsegment.cpp:481
-#: pcbnew/class_pad.cpp:763 pcbnew/class_pcb_text.cpp:136
+#: pcbnew/class_drawsegment.cpp:459 pcbnew/class_drawsegment.cpp:480
+#: pcbnew/class_pad.cpp:772 pcbnew/class_pcb_text.cpp:136
 #: pcbnew/class_text_mod.cpp:404
 msgid "Angle"
 msgstr "角度"
@@ -14908,7 +15198,7 @@ msgstr "电路板文件载入错误"
 msgid "Create an array"
 msgstr "创建阵列"
 
-#: pcbnew/autorouter/ar_autoplacer.cpp:943
+#: pcbnew/autorouter/ar_autoplacer.cpp:942
 msgid "Autoplacing components..."
 msgstr "自动放置元件..."
 
@@ -14968,7 +15258,7 @@ msgstr "没有找到封装!"
 msgid "Abort routing?"
 msgstr "退出布线 ?"
 
-#: pcbnew/autorouter/spread_footprints.cpp:190
+#: pcbnew/autorouter/spread_footprints.cpp:193
 msgid "Could not automatically place footprints. No board outlines detected."
 msgstr "由于没有检测到电路板轮廓，无法自动放置封装。"
 
@@ -15026,72 +15316,78 @@ msgstr "更改符号路径 \"%s:%s\" 到 \"%s\"。"
 msgid "Disconnect %s pin %s."
 msgstr "断开 %s 引脚 %s。"
 
-#: pcbnew/board_netlist_updater.cpp:332
+#: pcbnew/board_netlist_updater.cpp:336
 #, c-format
 msgid "Add net %s."
 msgstr "添加网络%s。"
 
-#: pcbnew/board_netlist_updater.cpp:338
+#: pcbnew/board_netlist_updater.cpp:342
 #, c-format
 msgid "Reconnect %s pin %s from %s to %s."
 msgstr "重新连接 %s的引脚 %s 从 %s 到 %s。"
 
-#: pcbnew/board_netlist_updater.cpp:346
+#: pcbnew/board_netlist_updater.cpp:350
 #, c-format
 msgid "Connect %s pin %s to %s."
 msgstr "连接%s的引脚%s到 %s。"
 
-#: pcbnew/board_netlist_updater.cpp:428
+#: pcbnew/board_netlist_updater.cpp:432
 #, c-format
 msgid "Reconnect copper zone from %s to %s."
 msgstr "将铜区\"%s\" 重新连接到\"%s\"。"
 
-#: pcbnew/board_netlist_updater.cpp:449
+#: pcbnew/board_netlist_updater.cpp:453
 #, c-format
 msgid "Copper zone (%s) has no pads connected."
 msgstr "铜区 (%s)没有焊盘连接。"
 
-#: pcbnew/board_netlist_updater.cpp:479
+#: pcbnew/board_netlist_updater.cpp:483
 #, c-format
 msgid "Cannot remove unused %s (locked)."
 msgstr "无法删除未使用的%s(锁定)。"
 
-#: pcbnew/board_netlist_updater.cpp:484
+#: pcbnew/board_netlist_updater.cpp:488
 #, c-format
 msgid "Remove unused %s."
 msgstr "删除未使用的%s。"
 
-#: pcbnew/board_netlist_updater.cpp:542 pcbnew/class_board.cpp:2818
+#: pcbnew/board_netlist_updater.cpp:546 pcbnew/class_board.cpp:2819
 #, c-format
 msgid "Remove single pad net %s."
 msgstr "删除单一焊盘网络 %s。"
 
-#: pcbnew/board_netlist_updater.cpp:604
+#: pcbnew/board_netlist_updater.cpp:608
 #, c-format
 msgid "%s pad %s not found in %s."
 msgstr "%s的焊盘%s 在%s中未找到。"
 
-#: pcbnew/board_netlist_updater.cpp:635
+#: pcbnew/board_netlist_updater.cpp:646
 #, c-format
 msgid "Processing component \"%s:%s:%s\"."
 msgstr "处理元件 \"%s:%s:%s\"。"
 
-#: pcbnew/board_netlist_updater.cpp:673
+#: pcbnew/board_netlist_updater.cpp:699 pcbnew/class_board.cpp:2733
+#, fuzzy, c-format
+#| msgid "No footprint defined for symbol \"%s\".\n"
+msgid "Multiple footprints found for \"%s\"."
+msgstr "没有为符号 \"%s\" 定义封装。\n"
+
+#: pcbnew/board_netlist_updater.cpp:715
 msgid "Update netlist"
 msgstr "更新网表"
 
-#: pcbnew/board_netlist_updater.cpp:682
+#: pcbnew/board_netlist_updater.cpp:724
 #, c-format
 msgid "Total warnings: %d, errors: %d."
 msgstr "总计警告: %d, 错误: %d."
 
-#: pcbnew/board_netlist_updater.cpp:687
+#: pcbnew/board_netlist_updater.cpp:729
 msgid ""
 "Errors occurred during the netlist update. Unless you fix them your board "
 "will not be consistent with the schematics."
 msgstr "网表更新发生错误。如果不能解决这些问题，电路板将无法与原理图保持一致。"
 
-#: pcbnew/board_netlist_updater.cpp:695
+#: pcbnew/board_netlist_updater.cpp:735
 msgid "Netlist update successful!"
 msgstr "网表更新成功！"
 
@@ -15137,112 +15433,112 @@ msgstr "供应商和REF"
 msgid "This is the default net class."
 msgstr "这是默认网络类。"
 
-#: pcbnew/class_board.cpp:1206 pcbnew/class_module.cpp:594
-#: pcbnew/netinfo_item.cpp:120 pcbnew/pcb_draw_panel_gal.cpp:334
+#: pcbnew/class_board.cpp:1203 pcbnew/class_module.cpp:600
+#: pcbnew/netinfo_item.cpp:123 pcbnew/pcb_draw_panel_gal.cpp:356
 #: pcbnew/tools/pad_tool.cpp:75
 msgid "Pads"
 msgstr "焊盘"
 
-#: pcbnew/class_board.cpp:1209
+#: pcbnew/class_board.cpp:1206
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:68
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:35
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:157
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:69
-#: pcbnew/netinfo_item.cpp:140 pcbnew/pcb_draw_panel_gal.cpp:337
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:154
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:88
+#: pcbnew/netinfo_item.cpp:143 pcbnew/pcb_draw_panel_gal.cpp:359
 msgid "Vias"
 msgstr "过孔"
 
-#: pcbnew/class_board.cpp:1212 pcbnew/pcb_draw_panel_gal.cpp:340
+#: pcbnew/class_board.cpp:1209 pcbnew/pcb_draw_panel_gal.cpp:362
 msgid "Track Segments"
 msgstr "布线分段数"
 
-#: pcbnew/class_board.cpp:1215 pcbnew/pcb_draw_panel_gal.cpp:343
+#: pcbnew/class_board.cpp:1212 pcbnew/pcb_draw_panel_gal.cpp:365
 msgid "Nodes"
 msgstr "节点"
 
-#: pcbnew/class_board.cpp:1218
+#: pcbnew/class_board.cpp:1215
 #: pcbnew/dialogs/dialog_select_net_from_list_base.h:55
-#: pcbnew/pcb_draw_panel_gal.cpp:346
+#: pcbnew/pcb_draw_panel_gal.cpp:368
 msgid "Nets"
 msgstr "网络"
 
-#: pcbnew/class_board.cpp:1221 pcbnew/pcb_draw_panel_gal.cpp:349
+#: pcbnew/class_board.cpp:1218 pcbnew/pcb_draw_panel_gal.cpp:371
 msgid "Unrouted"
 msgstr "未布线"
 
-#: pcbnew/class_board.cpp:2516
-#, c-format
-msgid "Checking netlist symbol footprint \"%s:%s:%s\"."
-msgstr "检查网表符号封装 \"%s:%s:%s\"。"
-
-#: pcbnew/class_board.cpp:2534
-#, c-format
-msgid "Adding new symbol %s footprint %s."
-msgstr "添加新符号 \"%s\" 封装: \"%s\"。"
-
-#: pcbnew/class_board.cpp:2541
-#, c-format
-msgid "Cannot add new symbol %s due to missing footprint %s."
-msgstr "无法添加新的符号 %s ，因为缺少封装 %s。"
-
-#: pcbnew/class_board.cpp:2571
-#, c-format
-msgid "Changing symbol %s footprint from %s to %s."
-msgstr "将符号\"%s\" 的封装从 \"%s\" 更改为 \"%s\"。"
-
-#: pcbnew/class_board.cpp:2579
-#, c-format
-msgid "Cannot change symbol %s footprint due to missing footprint %s."
-msgstr "无法更改符号 %s 封装，因为缺少封装 %s。"
-
-#: pcbnew/class_board.cpp:2630
-#, c-format
-msgid "Changing footprint %s reference to %s."
-msgstr "更改封装%s的参考为%s。"
-
-#: pcbnew/class_board.cpp:2645
-#, c-format
-msgid "Changing footprint %s value from %s to %s."
-msgstr "更改封装 \"%s\" 的值从 \"%s\" 到 \"%s\"。"
-
-#: pcbnew/class_board.cpp:2661
-#, c-format
-msgid "Changing component path \"%s:%s\" to \"%s\"."
-msgstr "更改元件路径 \"%s:%s\" 到 \"%s\"。"
-
-#: pcbnew/class_board.cpp:2685
+#: pcbnew/class_board.cpp:2473
 #, c-format
 msgid "Clearing component %s pin %s net."
 msgstr "清除元件 \"%s\" 的引脚 \"%s\" 的网络。"
 
-#: pcbnew/class_board.cpp:2703
+#: pcbnew/class_board.cpp:2495
 #, c-format
 msgid "Changing footprint %s pad %s net from %s to %s."
 msgstr "更改封装 \"%s\"的焊盘 \"%s\"网络名，从 \"%s\" 到 \"%s\"."
 
-#: pcbnew/class_board.cpp:2753
+#: pcbnew/class_board.cpp:2574
+#, c-format
+msgid "Checking netlist symbol footprint \"%s:%s:%s\"."
+msgstr "检查网表符号封装 \"%s:%s:%s\"。"
+
+#: pcbnew/class_board.cpp:2598
+#, c-format
+msgid "Changing symbol %s footprint from %s to %s."
+msgstr "将符号\"%s\" 的封装从 \"%s\" 更改为 \"%s\"。"
+
+#: pcbnew/class_board.cpp:2606
+#, c-format
+msgid "Cannot change symbol %s footprint due to missing footprint %s."
+msgstr "无法更改符号 %s 封装，因为缺少封装 %s。"
+
+#: pcbnew/class_board.cpp:2653
+#, c-format
+msgid "Changing footprint %s reference to %s."
+msgstr "更改封装%s的参考为%s。"
+
+#: pcbnew/class_board.cpp:2665
+#, c-format
+msgid "Changing footprint %s value from %s to %s."
+msgstr "更改封装 \"%s\" 的值从 \"%s\" 到 \"%s\"。"
+
+#: pcbnew/class_board.cpp:2678
+#, c-format
+msgid "Changing component path \"%s:%s\" to \"%s\"."
+msgstr "更改元件路径 \"%s:%s\" 到 \"%s\"。"
+
+#: pcbnew/class_board.cpp:2704
+#, c-format
+msgid "Adding new symbol %s footprint %s."
+msgstr "添加新符号 \"%s\" 封装: \"%s\"。"
+
+#: pcbnew/class_board.cpp:2711
+#, c-format
+msgid "Cannot add new symbol %s due to missing footprint %s."
+msgstr "无法添加新的符号 %s ，因为缺少封装 %s。"
+
+#: pcbnew/class_board.cpp:2758
 #, c-format
 msgid "Removing unused footprint %s."
 msgstr "删除未使用封装\"%s\"。"
 
-#: pcbnew/class_board.cpp:2855
+#: pcbnew/class_board.cpp:2852
 #, c-format
 msgid "Symbol %s pad %s not found in footprint %s.\n"
 msgstr ""
 "符号%s的焊盘%s在封装%s中未找到。\n"
 "\n"
 
-#: pcbnew/class_board.cpp:2892
+#: pcbnew/class_board.cpp:2886
 #, c-format
 msgid "Updating copper zone from net %s to %s."
 msgstr "将铜区的网络从\"%s\"更新为\"%s\"。"
 
-#: pcbnew/class_board.cpp:2898
+#: pcbnew/class_board.cpp:2893
 #, c-format
 msgid "Copper zone (net %s) has no pads connected."
 msgstr "铜区(网络%s)没有焊盘连接。"
 
-#: pcbnew/class_board_item.cpp:44 pcbnew/class_pad.cpp:1172
+#: pcbnew/class_board_item.cpp:44 pcbnew/class_pad.cpp:1181
 msgid "Rect"
 msgstr "矩形"
 
@@ -15250,7 +15546,7 @@ msgstr "矩形"
 msgid "Bezier Curve"
 msgstr "贝塞尔曲线"
 
-#: pcbnew/class_board_item.cpp:48 pcbnew/dialogs/dialog_pad_properties.cpp:1873
+#: pcbnew/class_board_item.cpp:48 pcbnew/dialogs/dialog_pad_properties.cpp:1903
 msgid "Polygon"
 msgstr "多边形"
 
@@ -15259,22 +15555,22 @@ msgstr "多边形"
 msgid "Dimension \"%s\" on %s"
 msgstr "尺寸 \"%s\" 在 %s"
 
-#: pcbnew/class_drawsegment.cpp:442
+#: pcbnew/class_drawsegment.cpp:441
 msgid "Drawing"
 msgstr "图形"
 
-#: pcbnew/class_drawsegment.cpp:467
+#: pcbnew/class_drawsegment.cpp:466
 msgid "Curve"
 msgstr "曲线"
 
-#: pcbnew/class_drawsegment.cpp:472
+#: pcbnew/class_drawsegment.cpp:471
 #: pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp:80
-#: pcbnew/dialogs/dialog_pad_properties.cpp:763
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1873
+#: pcbnew/dialogs/dialog_pad_properties.cpp:792
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1903
 msgid "Segment"
 msgstr "线段"
 
-#: pcbnew/class_drawsegment.cpp:807
+#: pcbnew/class_drawsegment.cpp:801
 #, c-format
 msgid "Pcb Graphic %s, length %s on %s"
 msgstr "Pcb图形 %s, 长度 %s 在%s"
@@ -15306,149 +15602,155 @@ msgstr "错误类型 (%d)- %s:"
 msgid "Marker @(%s, %s)"
 msgstr "标记 @(%s,%s)"
 
-#: pcbnew/class_module.cpp:575
+#: pcbnew/class_module.cpp:581
 msgid "Last Change"
 msgstr "最后修改"
 
-#: pcbnew/class_module.cpp:578
+#: pcbnew/class_module.cpp:584
 msgid "Netlist Path"
 msgstr "网表路径"
 
-#: pcbnew/class_module.cpp:581
+#: pcbnew/class_module.cpp:587
 msgid "Board Side"
 msgstr "PCB板面"
 
-#: pcbnew/class_module.cpp:582
+#: pcbnew/class_module.cpp:588
 msgid "Back (Flipped)"
 msgstr "背面(翻转)"
 
-#: pcbnew/class_module.cpp:582
+#: pcbnew/class_module.cpp:588
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:188
 msgid "Front"
 msgstr "正面"
 
-#: pcbnew/class_module.cpp:604 pcbnew/class_track.cpp:1157
+#: pcbnew/class_module.cpp:610 pcbnew/class_track.cpp:1157
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp:193
 msgid "Status"
 msgstr "状态"
 
 # 快捷键，不要翻译
-#: pcbnew/class_module.cpp:617
+#: pcbnew/class_module.cpp:623
 msgid "Insert"
 msgstr "Insert"
 
-#: pcbnew/class_module.cpp:621
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:269
+#: pcbnew/class_module.cpp:627
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:275
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:180
 msgid "Virtual"
 msgstr "虚拟"
 
-#: pcbnew/class_module.cpp:629
+#: pcbnew/class_module.cpp:635
 msgid "Attributes"
 msgstr "属性"
 
-#: pcbnew/class_module.cpp:633
+#: pcbnew/class_module.cpp:639
 msgid "No 3D shape"
 msgstr "没有3D模型"
 
-#: pcbnew/class_module.cpp:639
+#: pcbnew/class_module.cpp:645
 msgid "3D-Shape"
 msgstr "3D-样式"
 
-#: pcbnew/class_module.cpp:642
+#: pcbnew/class_module.cpp:648
 #, c-format
 msgid "Doc: %s"
 msgstr "文档: %s"
 
-#: pcbnew/class_module.cpp:643
+#: pcbnew/class_module.cpp:649
 #, c-format
 msgid "Key Words: %s"
 msgstr "关键字: %s"
 
-#: pcbnew/class_module.cpp:885
+#: pcbnew/class_module.cpp:891
 msgid "<no reference>"
 msgstr "<无参考>"
 
-#: pcbnew/class_module.cpp:887
+#: pcbnew/class_module.cpp:893
 #, c-format
 msgid "Footprint %s on %s"
 msgstr "封装 %s 在 %s 层"
 
-#: pcbnew/class_pad.cpp:722
+#: pcbnew/class_module.cpp:1488
+#, fuzzy, c-format
+#| msgid "Processing component \"%s:%s:%s\"."
+msgid "Processing courtyard of \"%s\": %s"
+msgstr "处理元件 \"%s:%s:%s\"。"
+
+#: pcbnew/class_pad.cpp:731
 msgid "Pad"
 msgstr "焊盘"
 
-#: pcbnew/class_pad.cpp:725 pcbnew/dialogs/dialog_copper_zones_base.cpp:46
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:96
+#: pcbnew/class_pad.cpp:734 pcbnew/dialogs/dialog_copper_zones_base.cpp:46
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:68
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:211
 msgid "Net"
 msgstr "网络"
 
-#: pcbnew/class_pad.cpp:744 pcbnew/class_track.cpp:1268
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:87
+#: pcbnew/class_pad.cpp:753 pcbnew/class_track.cpp:1268
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:106
 msgid "Drill"
 msgstr "钻孔"
 
-#: pcbnew/class_pad.cpp:751
+#: pcbnew/class_pad.cpp:760
 msgid "Drill X / Y"
 msgstr "钻孔 X / Y"
 
-#: pcbnew/class_pad.cpp:768
+#: pcbnew/class_pad.cpp:777
 msgid "Position"
 msgstr "坐标"
 
-#: pcbnew/class_pad.cpp:773
+#: pcbnew/class_pad.cpp:782
 msgid "Length in package"
 msgstr "封装长度"
 
-#: pcbnew/class_pad.cpp:1169 pcbnew/dialogs/dialog_pad_properties_base.cpp:77
+#: pcbnew/class_pad.cpp:1178 pcbnew/dialogs/dialog_pad_properties_base.cpp:78
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:252
 msgid "Oval"
 msgstr "椭圆"
 
-#: pcbnew/class_pad.cpp:1175
+#: pcbnew/class_pad.cpp:1184
 msgid "Trap"
 msgstr "陷阱"
 
-#: pcbnew/class_pad.cpp:1178
+#: pcbnew/class_pad.cpp:1187
 msgid "Roundrect"
 msgstr "圆角矩形"
 
-#: pcbnew/class_pad.cpp:1181
+#: pcbnew/class_pad.cpp:1190
 msgid "CustomShape"
 msgstr "自定义形状"
 
-#: pcbnew/class_pad.cpp:1194
+#: pcbnew/class_pad.cpp:1203
 msgid "Std"
 msgstr "标准"
 
-#: pcbnew/class_pad.cpp:1197 pcbnew/dialogs/dialog_pad_properties_base.cpp:64
+#: pcbnew/class_pad.cpp:1206 pcbnew/dialogs/dialog_pad_properties_base.cpp:65
 msgid "SMD"
 msgstr "SMD"
 
-#: pcbnew/class_pad.cpp:1200
+#: pcbnew/class_pad.cpp:1209
 msgid "Conn"
 msgstr "连接器"
 
-#: pcbnew/class_pad.cpp:1203
+#: pcbnew/class_pad.cpp:1212
 msgid "Not Plated"
 msgstr "非金属化"
 
-#: pcbnew/class_pad.cpp:1215
+#: pcbnew/class_pad.cpp:1224
 #, c-format
 msgid "Pad of %s on %s"
 msgstr "焊盘 %s - %s"
 
-#: pcbnew/class_pad.cpp:1221
+#: pcbnew/class_pad.cpp:1230
 #, c-format
 msgid "Pad %s of %s on %s"
 msgstr "焊盘　%s (%s) - %s"
 
-#: pcbnew/class_pad.cpp:1380
+#: pcbnew/class_pad.cpp:1389
 msgid " & others"
 msgstr " 其它(&O)"
 
-#: pcbnew/class_pad.cpp:1386
+#: pcbnew/class_pad.cpp:1395
 msgid "no layers"
 msgstr "没有层"
 
@@ -15548,11 +15850,11 @@ msgstr "网络类过孔外径"
 msgid "NC Via Drill"
 msgstr "网络类过孔内径"
 
-#: pcbnew/class_track.cpp:1114 pcbnew/class_zone.cpp:856
+#: pcbnew/class_track.cpp:1114 pcbnew/class_zone.cpp:855
 msgid "NetName"
 msgstr "网络名称"
 
-#: pcbnew/class_track.cpp:1118 pcbnew/class_zone.cpp:860
+#: pcbnew/class_track.cpp:1118 pcbnew/class_zone.cpp:859
 msgid "NetCode"
 msgstr "网络代码"
 
@@ -15597,98 +15899,87 @@ msgstr "(网络类)"
 msgid "Track %s %s on %s, length: %s"
 msgstr "布线 %s %s 在 %s 上， 长度: %s"
 
-#: pcbnew/class_zone.cpp:817
+#: pcbnew/class_zone.cpp:816
 msgid "Zone Outline"
 msgstr "覆铜轮廓"
 
-#: pcbnew/class_zone.cpp:823 pcbnew/class_zone.cpp:1053
+#: pcbnew/class_zone.cpp:822 pcbnew/class_zone.cpp:1052
 msgid "(Cutout)"
 msgstr "(挖空)"
 
-#: pcbnew/class_zone.cpp:832
+#: pcbnew/class_zone.cpp:831
 msgid "No via"
 msgstr "没有过孔"
 
-#: pcbnew/class_zone.cpp:835
+#: pcbnew/class_zone.cpp:834
 msgid "No track"
 msgstr "没有布线"
 
-#: pcbnew/class_zone.cpp:838
+#: pcbnew/class_zone.cpp:837
 msgid "No copper pour"
 msgstr "没有覆铜"
 
-#: pcbnew/class_zone.cpp:840
+#: pcbnew/class_zone.cpp:839
 msgid "Keepout"
 msgstr "禁止布线"
 
-#: pcbnew/class_zone.cpp:851
+#: pcbnew/class_zone.cpp:850
 msgid "<unknown>"
 msgstr "<未知>"
 
-#: pcbnew/class_zone.cpp:864
+#: pcbnew/class_zone.cpp:863
 msgid "Priority"
 msgstr "优先"
 
-#: pcbnew/class_zone.cpp:868
+#: pcbnew/class_zone.cpp:867
 msgid "Non Copper Zone"
 msgstr "非铜区"
 
-#: pcbnew/class_zone.cpp:874
+#: pcbnew/class_zone.cpp:873
 msgid "Corners"
 msgstr "拐角"
 
-#: pcbnew/class_zone.cpp:877
+#: pcbnew/class_zone.cpp:876
 msgid "Segments"
 msgstr "线段"
 
-#: pcbnew/class_zone.cpp:879
+#: pcbnew/class_zone.cpp:878
 msgid "Polygons"
 msgstr "多边形"
 
-#: pcbnew/class_zone.cpp:881
+#: pcbnew/class_zone.cpp:880
 msgid "Fill Mode"
 msgstr "填充模式"
 
-#: pcbnew/class_zone.cpp:885
+#: pcbnew/class_zone.cpp:884
 msgid "Hatch Lines"
 msgstr "线宽"
 
-#: pcbnew/class_zone.cpp:890
+#: pcbnew/class_zone.cpp:889
 msgid "Corner Count"
 msgstr "拐角数"
 
-#: pcbnew/class_zone.cpp:1056
+#: pcbnew/class_zone.cpp:1055
 msgid "(Keepout)"
 msgstr "(禁布区)"
 
-#: pcbnew/class_zone.cpp:1060
+#: pcbnew/class_zone.cpp:1059
 #, c-format
 msgid "Zone Outline %s on %s"
 msgstr "在 %s 区域边线 %s上"
 
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:414
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:598
-#, c-format
-msgid "Unsupported DRAWSEGMENT type %s"
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:412
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:591
+#, fuzzy, c-format
+#| msgid "Unsupported DRAWSEGMENT type %s"
+msgid "Unsupported DRAWSEGMENT type %s."
 msgstr "DRAWSEGMENT类型%s不支持"
 
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:442
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:439
+#: pcbnew/convert_drawsegment_list_to_polygon.cpp:618
 #, c-format
-msgid ""
-"Unable to find the next boundary segment with an endpoint of (%s mm, %s mm). "
-"graphic outline must form a contiguous, closed polygon."
-msgstr ""
-"无法找到边框线段端点(%s mm, %s mm)的另一个线段连接端点\n"
-"编辑线路板边框图形,使它成为边线连续的图形。"
-
-#: pcbnew/convert_drawsegment_list_to_polygon.cpp:626
-#, c-format
-msgid ""
-"Unable to find the next graphic segment with an endpoint of (%s mm, %s mm).\n"
-"Edit graphics, making them contiguous polygons each."
-msgstr ""
-"无法找到禁布线段边框端点(%s mm, %s mm)的另一个线段连接端点\n"
-"编辑禁布边框图形,使它成为边线连续的图形。"
+msgid "Unable to find segment with an endpoint of (%s, %s)."
+msgstr "无法找到端点为（%s, %s）的线段。"
 
 #: pcbnew/cross-probing.cpp:158
 #, c-format
@@ -15855,7 +16146,11 @@ msgstr "不建议使用旧的线段填充模式。是否将区域转换为多边
 msgid "Legacy Warning"
 msgstr "传统警告"
 
-#: pcbnew/dialogs/dialog_copper_zones.cpp:310
+#: pcbnew/dialogs/dialog_copper_zones.cpp:284
+msgid "Thermal relief spoke must be greater than the minimum width."
+msgstr "热风焊盘辐射线必须大于最小宽度.."
+
+#: pcbnew/dialogs/dialog_copper_zones.cpp:317
 #: pcbnew/dialogs/dialog_non_copper_zones_properties.cpp:153
 #: pcbnew/dialogs/dialog_print_using_printer.cpp:428
 msgid "No layer selected."
@@ -16094,8 +16389,8 @@ msgstr "水平(X)方向计数："
 #: pcbnew/dialogs/dialog_create_array_base.cpp:49
 #: pcbnew/dialogs/dialog_create_array_base.cpp:60
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:53
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:97
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:143
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:116
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:181
 msgid "5"
 msgstr "5"
 
@@ -16127,10 +16422,10 @@ msgstr "交错："
 #: pcbnew/dialogs/dialog_create_array_base.cpp:160
 #: pcbnew/dialogs/dialog_create_array_base.cpp:165
 #: pcbnew/dialogs/dialog_create_array_base.cpp:277
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1014
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1016
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:49
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:93
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:139
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:112
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:177
 msgid "1"
 msgstr "1"
 
@@ -16214,8 +16509,8 @@ msgid "Vertical center:"
 msgstr "垂直居中："
 
 #: pcbnew/dialogs/dialog_create_array_base.cpp:212
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:168
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:871
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:159
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:873
 msgid "Radius:"
 msgstr "半径："
 
@@ -16239,8 +16534,8 @@ msgstr "计数:"
 #: pcbnew/dialogs/dialog_create_array_base.cpp:241
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:38
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:52
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:96
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:142
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:115
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:180
 msgid "4"
 msgstr "4"
 
@@ -16391,24 +16686,24 @@ msgstr "删除所有标记"
 msgid "DRC Control"
 msgstr "DRC控制"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:283
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:289
 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:285
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:291
 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:287
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:293
 msgid "Component is locked: it cannot be freely moved or auto placed."
 msgstr "元件被锁定: 它不能被自由移动和自动放置。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:293
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:220
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:299
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:230
 msgid ""
 "Use this attribute for most non SMD footprints\n"
 "Footprints with this option are not put in the footprint position list file"
@@ -16416,8 +16711,8 @@ msgstr ""
 "对于大多数非SMD封装使用此属性\n"
 "使有此选项的封装不会放置在封装位置列表文件中"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:295
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:222
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:301
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:232
 msgid ""
 "Use this attribute for SMD footprints.\n"
 "Only footprints with this option are put in the footprint position list file"
@@ -16425,8 +16720,8 @@ msgstr ""
 "SMD元件使用该属性\n"
 "只有使用此选项的元件放在封装位置列表文件"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:297
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:224
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:303
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:234
 msgid ""
 "Use this attribute for \"virtual\" footprints drawn on board\n"
 "such as an edge connector (old ISA PC bus for instance)"
@@ -16434,24 +16729,24 @@ msgstr ""
 "该属性适用于绘制电路板上的 \"虚拟\" 封装\n"
 " 例如电路板插头<金手指>(如老式的ISA PC总线)"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:414
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:329
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:420
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:339
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "无效的文件名：%s"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:564
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:490
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:570
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:522
 msgid "Text items must have some content."
 msgstr "文本项必须包含一些内容。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:705
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:595
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:712
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:627
 msgid "Modify module properties"
 msgstr "修改模块属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:763
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:641
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp:770
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:730
 msgid "Reference and value are mandatory."
 msgstr "参考和值是强制的"
 
@@ -16481,25 +16776,21 @@ msgid "Y Offset"
 msgstr "Y 偏移"
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:155
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:135
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:151
 msgid "0.0"
 msgstr "0.0"
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:158
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:136
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:152
 msgid "90.0"
 msgstr "90.0"
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:161
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:137
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:153
 msgid "-90.0"
 msgstr "-90.0"
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:164
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:138
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:154
 msgid "180.0"
 msgstr "180.0"
@@ -16509,7 +16800,7 @@ msgid "Board side:"
 msgstr "PCB板面："
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:188
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:852
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:596
 msgid "Back"
 msgstr "背面"
 
@@ -16552,40 +16843,40 @@ msgid "Update Footprint from Library..."
 msgstr "从库中更新封装..."
 
 #: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:257
-#: pcbnew/onrightclick.cpp:794 pcbnew/tools/edit_tool.cpp:146
+#: pcbnew/onrightclick.cpp:792 pcbnew/tools/edit_tool.cpp:142
 msgid "Change Footprint..."
 msgstr "修改封装..."
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:260
-msgid "Footprint Editor..."
-msgstr "封装编辑器..."
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:266
+msgid "Edit Library Footprint..."
+msgstr "编辑库封装..."
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:269
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:275
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:180
 msgid "Through hole"
 msgstr "通孔"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:269
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:275
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:180
 msgid "Surface mount"
 msgstr "表面贴装"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:271
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:277
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:182
 msgid "Fabrication Attributes"
 msgstr "制造属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:291
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:297
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:199
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:378
 msgid "Clearances"
 msgstr "间隙"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:293
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:299
 msgid "Set values to 0 to use Board Setup values."
 msgstr "设置值为0，使用电路板设置值。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:299
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:305
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:207
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:387
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:23
@@ -16593,7 +16884,7 @@ msgid ""
 "Positive clearance means area bigger than the pad (usual for mask clearance)."
 msgstr "正间隙指的是比焊盘大的区域（通常为阻焊间隙）"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:305
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:311
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:213
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:393
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:29
@@ -16602,13 +16893,13 @@ msgid ""
 "clearance)."
 msgstr "负间隙指的是比焊盘小的区域（通常为锡膏间隙）"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:317
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:323
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:225
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:405
 msgid "Pad clearance:"
 msgstr "焊盘间隙:"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:319
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:325
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:227
 msgid ""
 "This is the local net clearance for all pad of this footprint\n"
@@ -16619,14 +16910,14 @@ msgstr ""
 "如果为 0, 即使用网络类值\n"
 "这个值可以被局部值所取代。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:330
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:336
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:238
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:418
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:44
 msgid "Solder mask clearance:"
 msgstr "阻焊间隙:"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:332
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:338
 msgid ""
 "This is the local clearance between pads and the solder mask for this "
 "footprint.\n"
@@ -16637,14 +16928,14 @@ msgstr ""
 "这个值可以被焊盘局部值所取代。\n"
 "如果为0时，使用全局设置值"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:343
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:349
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:251
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:431
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:79
 msgid "Solder paste clearance:"
 msgstr "锡膏间隙:"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:345
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:351
 msgid ""
 "This is the local clearance between pads and the solder paste for this "
 "footprint.\n"
@@ -16658,14 +16949,14 @@ msgstr ""
 "最终间隙值是此值与间隙值比率的总和\n"
 "负值表示比焊盘尺寸更小的阻焊尺寸"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:356
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:362
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:264
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:444
 #: pcbnew/dialogs/panel_setup_mask_and_paste_base.cpp:92
 msgid "Solder paste ratio clearance:"
 msgstr "锡膏间隙比例:"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:358
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:364
 msgid ""
 "This is the local clearance ratio in percent between pads and the solder "
 "paste for this footprint.\n"
@@ -16680,7 +16971,7 @@ msgstr ""
 "最终间隙值是该值与间隙值的总和。\n"
 "负值意味着比焊盘尺寸更小的阻焊尺寸。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:372
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:378
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:280
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:466
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:488
@@ -16689,72 +16980,72 @@ msgid ""
 "Note: solder mask and paste values are used only for pads on copper layers."
 msgstr "注意：阻焊和锡膏值仅适用于铜层上的焊盘。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:382
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:388
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:290
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:505
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:554
 msgid "Connection to Copper Zones"
 msgstr "连接到铜区"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:384
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:390
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:292
 msgid "Pad connection to zones:"
 msgstr "焊盘连接到铜区:"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:388
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:394
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:296
 msgid "Use zone setting"
 msgstr "使用区域设置"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:388
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:394
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:296
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:517
 msgid "Thermal relief"
 msgstr "防散热<花焊盘>"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:401
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:407
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:309
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:595
 msgid "Local Clearance and Settings"
 msgstr "局部间隙和设置"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:423
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:429
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:331
 msgid "3D Model(s)"
 msgstr "3D模型"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:464
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:470
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:364
 msgid "Configure Paths..."
 msgstr "配置路径..."
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:482
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:488
 #: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp:382
 msgid "3D Settings"
 msgstr "3D设置"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:494
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp:500
 msgid "Library reference:"
 msgstr "库参考："
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h:144
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h:118
+#: pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h:147
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h:120
 msgid "Footprint Properties"
 msgstr "封装属性"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:214
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:224
 msgid "Enable hotkey move commands and Auto Placement"
 msgstr "允许快捷键移动和自动布局"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:215
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:225
 msgid "Disable hotkey move commands and Auto Placement"
 msgstr "不允许快捷键移动和自动布局"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:468
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:478
 msgid "Footprint must have a name."
 msgstr "封装必须要有一个名称。"
 
-#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:470
+#: pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp:480
 #, c-format
 msgid "Footprint name may not contain \"%s\"."
 msgstr "封装名称可能不包含\"%s\"。"
@@ -16829,31 +17120,31 @@ msgstr "第一个焊盘编号:"
 msgid "Pad Enumeration Settings"
 msgstr "焊盘枚举设置"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:61
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:64
 msgid "Update Footprints from Library"
 msgstr "从库中更新封装"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:61
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:64
 msgid "Change Footprints"
 msgstr "修改封装"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:62
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:395
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:65
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:344
 #: pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp:212
 msgid "Update"
 msgstr "更新"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:62
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:395
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:65
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:344
 msgid "Change"
 msgstr "修改"
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:394
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:343
 #, c-format
 msgid "%s footprint \"%s\" (from \"%s\") to \"%s\""
 msgstr "%s 封装 \"%s\"(从\"%s\")更改为 \"%s\""
 
-#: pcbnew/dialogs/dialog_exchange_footprints.cpp:404
+#: pcbnew/dialogs/dialog_exchange_footprints.cpp:353
 msgid "*** footprint not found ***"
 msgstr "***封装没有找到***"
 
@@ -16864,46 +17155,41 @@ msgstr "%s在板上的所有封装"
 
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:27
 #, c-format
-msgid "%s current footprint (%s)"
-msgstr "%s当前封装（%s）"
+msgid "%s selected footprint"
+msgstr "%s选择封装"
 
 #: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:30
 #, c-format
-msgid "%s footprint with reference:"
-msgstr "%s封装参考编号："
+msgid "%s footprints matching reference:"
+msgstr "%s封装匹配参考编号："
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:36
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:38
 #, c-format
-msgid "%s footprints with matching value (%s)"
-msgstr "具有匹配值的 %s 封装（%s）"
+msgid "%s footprints matching value:"
+msgstr "%s封装匹配值："
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:39
-#, c-format
-msgid "%s footprints with value:"
-msgstr "%s封装值："
-
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:45
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:44
 #, c-format
 msgid "%s footprints with identifier:"
 msgstr "%s封装标识符："
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:76
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:75
 msgid "New footprint identifier:"
 msgstr "新封装标识符："
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:99
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:98
 msgid "Update Options"
 msgstr "更新选项"
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:101
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:100
 msgid "Remove text items which are not in library footprint"
 msgstr "删除不在库封装中的文本项目"
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:106
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:105
 msgid "Reset text layers and visibilities"
 msgstr "重置文本层和可见性"
 
-#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:109
+#: pcbnew/dialogs/dialog_exchange_footprints_base.cpp:108
 msgid "Reset text sizes, styles and positions"
 msgstr "重置文本尺寸，样式和位置"
 
@@ -16964,35 +17250,35 @@ msgstr "输出单位："
 msgid "Export IDFv3"
 msgstr "导出 IDFv3"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:192
+#: pcbnew/dialogs/dialog_export_step.cpp:193
 msgid "STEP export failed!  Please save the PCB and try again"
 msgstr "STEP导出失败！ 请保存PCB并再次尝试"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:241
+#: pcbnew/dialogs/dialog_export_step.cpp:242
 #, c-format
 msgid "File '%s' already exists. Do you want overwrite this file?"
 msgstr "文件 '%s' 已经存在，你想覆盖它吗？"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:244
+#: pcbnew/dialogs/dialog_export_step.cpp:245
 msgid "STEP Export"
 msgstr "导出STEP"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:326
+#: pcbnew/dialogs/dialog_export_step.cpp:327
 #, c-format
 msgid "Executing '%s'"
 msgstr "需要 '%s'"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:351
+#: pcbnew/dialogs/dialog_export_step.cpp:352
 msgid ""
 "Unable to create STEP file.  Check that the board has a valid outline and "
 "models."
 msgstr "无法创建STEP文件。 检查电路板是否具有有效的轮廓和模型。"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:356
+#: pcbnew/dialogs/dialog_export_step.cpp:357
 msgid "STEP file has been created, but there are warnings."
 msgstr "STEP文件已创建，但有警告。"
 
-#: pcbnew/dialogs/dialog_export_step.cpp:362
+#: pcbnew/dialogs/dialog_export_step.cpp:363
 msgid "STEP file has been created successfully."
 msgstr "STEP文件已经成功创建。"
 
@@ -17175,14 +17461,14 @@ msgid "0.1 Inch"
 msgstr "0.1 Inch"
 
 #: pcbnew/dialogs/dialog_export_vrml_base.cpp:111
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:93
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:104
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:115
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:126
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:152
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:163
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:176
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:187
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:94
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:105
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:116
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:127
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:153
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:164
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:177
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:188
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:269
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:280
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:414
@@ -17213,21 +17499,21 @@ msgstr "简洁 PCB (没有铜箔或丝印)"
 msgid "VRML Export Options"
 msgstr "VRML导出选项"
 
-#: pcbnew/dialogs/dialog_find.cpp:132
+#: pcbnew/dialogs/dialog_find.cpp:136
 #, c-format
 msgid "\"%s\" found"
 msgstr "找到 \"%s\""
 
-#: pcbnew/dialogs/dialog_find.cpp:138
+#: pcbnew/dialogs/dialog_find.cpp:142
 #, c-format
 msgid "\"%s\" not found"
 msgstr "未找到 \"%s\""
 
-#: pcbnew/dialogs/dialog_find.cpp:169
+#: pcbnew/dialogs/dialog_find.cpp:173
 msgid "Marker found"
 msgstr "找到标记"
 
-#: pcbnew/dialogs/dialog_find.cpp:175
+#: pcbnew/dialogs/dialog_find.cpp:179
 msgid "No marker found"
 msgstr "未找到标记"
 
@@ -17275,85 +17561,37 @@ msgstr "封装生成"
 msgid "Traceback of Python Script Errors"
 msgstr "追溯Python脚本错误"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options.cpp:36
+#: pcbnew/dialogs/dialog_fp_plugin_options.cpp:37
 msgid ""
 "Select an <b>Option Choice</b> in the listbox above, and then click the "
 "<b>Append Selected Option</b> button."
 msgstr "在列表框设置一个 <b>设置选项</b> , 并点击 <b>添加选择设置</b> 按钮。"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options.cpp:61
+#: pcbnew/dialogs/dialog_fp_plugin_options.cpp:62
 #, c-format
 msgid "Options for Library \"%s\""
 msgstr "库 \"%s\" 的选项"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:23
+#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:25
 msgid "Plugin Options"
 msgstr "插件选项"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:41
+#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:43
 msgid "Option"
 msgstr "设置"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:75
+#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:77
 msgid "Option Choices"
 msgstr "选项选择："
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:78
+#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:80
 msgid "Options supported by current plugin"
 msgstr "当前插件支持的选项"
 
-#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:82
+#: pcbnew/dialogs/dialog_fp_plugin_options_base.cpp:84
 msgid "<<    Append Selected Option"
 msgstr "<<   添加选定的选项"
 
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:101
-msgid "Freeroute Help"
-msgstr "FreeRoute 帮助"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:160
-msgid ""
-"It appears that the Java run time environment is not installed on this "
-"computer.  Java is required to use FreeRoute."
-msgstr "似乎Java运行环境没有在此计算机上安装。 安装Java才能使用FreeRoute。"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:163
-msgid "Pcbnew Error"
-msgstr "Pcbnew 错误"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange.cpp:199
-#: pcbnew/specctra_import_export/specctra_export.cpp:95
-msgid "Specctra DSN File"
-msgstr "Specctra DSN 文件"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:25
-msgid "Export/Import to/from FreeRoute:"
-msgstr "从 FreeRoute 导出/导入 :"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:40
-msgid "Export a Specctra Design (*.dsn) File"
-msgstr "导出SPECCTRA设计 (*.dsn) 文件"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:41
-msgid "Export a Specctra DSN file (to FreeRouter)"
-msgstr "导出 Specctra DSN 文件到FreeRouter"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:45
-msgid "Export a Specctra Design and Launch FreeRoute"
-msgstr "导出 Specctra设计并启动FreeRoute"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:46
-msgid ""
-"FreeRouter can be run only if freeroute.jar is found in Kicad binaries folder"
-msgstr "FreeRouter 运行 freeroute.jar 只能存在于 Kicad 二进制目录"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:50
-msgid "Back Import the Specctra Session (*.ses) File"
-msgstr "反向导入布线器会话文件 (*.ses)"
-
-#: pcbnew/dialogs/dialog_freeroute_exchange_base.cpp:51
-msgid "Merge a session file created by FreeRouter with the current board."
-msgstr "FreeRouter从目前电路板创建一个会话文件."
-
 #: pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp:31
 #: pcbnew/dialogs/dialog_import_settings_base.cpp:27
 #: pcbnew/dialogs/dialog_plot_base.cpp:41
@@ -17449,7 +17687,7 @@ msgid "Save Drill Report File"
 msgstr "保存钻孔报告文件"
 
 #: pcbnew/dialogs/dialog_gendrill.cpp:463
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:110
+#: pcbnew/exporters/gendrill_Excellon_writer.cpp:115
 #: pcbnew/exporters/gendrill_file_writer_base.cpp:328
 #: pcbnew/exporters/gendrill_gerber_writer.cpp:104
 #, c-format
@@ -17641,7 +17879,7 @@ msgid "Items to Delete:"
 msgstr "删除项："
 
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:25
-#: pcbnew/onrightclick.cpp:653 pcbnew/tools/pcb_editor_control.cpp:158
+#: pcbnew/onrightclick.cpp:651 pcbnew/tools/pcb_editor_control.cpp:157
 msgid "Zones"
 msgstr "覆铜"
 
@@ -17659,7 +17897,7 @@ msgstr "封装"
 
 #: pcbnew/dialogs/dialog_global_deletion_base.cpp:40
 #: pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp:31
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:44
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:41
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:27
 #: pcbnew/pcb_layer_widget.cpp:79
 msgid "Tracks"
@@ -17717,55 +17955,61 @@ msgstr "当前层:"
 msgid "Delete Items"
 msgstr "删除项"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:161
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:162
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:125
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:55
 msgid "Silk Layers"
 msgstr "丝印层"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:162
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:163
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:126
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:56
 msgid "Copper Layers"
 msgstr "铜层"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:163
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:164
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:127
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:57
-msgid "Edges & Courtyards"
-msgstr "边框与外框"
+msgid "Edge Cuts"
+msgstr "板框"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:164
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:165
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:128
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:58
+msgid "Courtyards"
+msgstr "外框"
+
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:166
+#: pcbnew/dialogs/panel_modedit_defaults_base.cpp:129
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:59
 msgid "Other Layers"
 msgstr "其他层"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:166
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:168
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:115
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:44
 msgid "Line Thickness"
 msgstr "线宽"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:172
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:175
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:116
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:45
 msgid "Text Width"
 msgstr "文本宽度"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:177
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:180
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:117
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:46
 msgid "Text Height"
 msgstr "文本高度"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:182
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:185
 #: pcbnew/dialogs/panel_modedit_defaults_base.cpp:118
 #: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:47
 msgid "Text Thickness"
 msgstr "文本线宽"
 
-#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:192
+#: pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp:195
 msgid "Upright"
 msgstr "垂直"
 
@@ -17826,7 +18070,7 @@ msgstr "设置为指定值："
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:151
 #: pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp:25
 #: pcbnew/dialogs/dialog_text_properties_base.cpp:81
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:141
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:138
 msgid "Layer:"
 msgstr "层:"
 
@@ -17842,22 +18086,22 @@ msgstr "设置为图层默认值："
 msgid "Edit Text and Graphic Properties"
 msgstr "编辑文本和图形属性属性"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:165
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:189
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:51
 msgid "Via Size"
 msgstr "过孔外径"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:166
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:190
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:52
 msgid "Via Drill"
 msgstr "过孔内径"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:167
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:191
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:53
 msgid "uVia Size"
 msgstr "微孔外径"
 
-#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:168
+#: pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp:192
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:54
 msgid "uVia Drill"
 msgstr "微孔内径"
@@ -17878,41 +18122,41 @@ msgstr "设置为网络类值："
 msgid "Set Track and Via Properties"
 msgstr "设置布线和过孔属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:165
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:156
 msgid "Circle Properties"
 msgstr "圆属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:166
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:174
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:157
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:165
 msgid "Center X:"
 msgstr "X轴中心："
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:167
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:175
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:158
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:166
 msgid "Center Y:"
 msgstr "Y轴中心："
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:173
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:164
 msgid "Arc Properties"
 msgstr "圆弧属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:176
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:167
 msgid "Start Point X:"
 msgstr "起点 X："
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:177
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:168
 msgid "Start Point Y:"
 msgstr "起点 Y："
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:183
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:174
 msgid "Polygon Properties"
 msgstr "多边形属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:188
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:179
 msgid "Line Segment Properties"
 msgstr "线段属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:218
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:209
 msgid ""
 "This item was on a forbidden or non-existing layer.\n"
 "It has been moved to the first allowed layer."
@@ -17920,51 +18164,51 @@ msgstr ""
 "此项目在一个禁止层或不存在的层\n"
 "已经将它移动到第一个允许的层。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:286
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:270
 msgid "Modify drawing properties"
 msgstr "修改图形属性"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:310
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:291
 msgid "The arc angle cannot be zero."
 msgstr "圆弧角度不能为零。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:316
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:297
 msgid "The radius must be greater than zero."
 msgstr "半径必须大于0."
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:325
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:306
 msgid "The start and end points cannot be the same."
 msgstr "开始和结束点不能相同。"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:337
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:318
 msgid "The polygon outline thickness must be >= 0."
 msgstr "多边形轮廓厚度必须 >= 0"
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:342
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:323
 msgid "The item thickness must be greater than zero."
 msgstr "此连线的宽度必须大于0."
 
-#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:347
+#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:328
 msgid "Error List"
 msgstr "错误列表"
 
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:29
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:52
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:49
 msgid "Start point X:"
 msgstr "起点 X："
 
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:40
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:63
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:60
 msgid "Start point Y:"
 msgstr "起点 Y："
 
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:51
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:74
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:71
 msgid "End point X:"
 msgstr "结束点 X："
 
 #: pcbnew/dialogs/dialog_graphic_item_properties_base.cpp:62
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:85
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:82
 msgid "End point Y:"
 msgstr "结束点 Y："
 
@@ -18149,7 +18393,7 @@ msgid ""
 msgstr "所做的更改不能撤销。你确定要更新PCB吗？"
 
 #: pcbnew/dialogs/dialog_netlist.cpp:165
-#: pcbnew/dialogs/dialog_update_pcb.cpp:190
+#: pcbnew/dialogs/dialog_update_pcb.cpp:184
 msgid "Changes Applied To PCB"
 msgstr "更改应用于PCB"
 
@@ -18320,119 +18564,119 @@ msgstr "选择一个角落后添加新的拐角。"
 msgid "Select a corner to delete."
 msgstr "选择要删除的拐角。"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:539
-#: pcbnew/dialogs/dialog_text_properties.cpp:268
+#: pcbnew/dialogs/dialog_pad_properties.cpp:568
+#: pcbnew/dialogs/dialog_text_properties.cpp:272
 msgid "back side (mirrored)"
 msgstr "背面(镜像)"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:539
-#: pcbnew/dialogs/dialog_text_properties.cpp:268
+#: pcbnew/dialogs/dialog_pad_properties.cpp:568
+#: pcbnew/dialogs/dialog_text_properties.cpp:272
 msgid "front side"
 msgstr "正面"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:540
+#: pcbnew/dialogs/dialog_pad_properties.cpp:569
 #, c-format
 msgid "Footprint %s (%s),"
 msgstr "封装 %s(%s),"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:541
+#: pcbnew/dialogs/dialog_pad_properties.cpp:570
 #, c-format
 msgid "%s, rotated %.1f deg"
 msgstr "%s，旋转 %.1f 度"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:757
+#: pcbnew/dialogs/dialog_pad_properties.cpp:786
 #, c-format
 msgid "width %s"
 msgstr "宽度 %s"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:764
+#: pcbnew/dialogs/dialog_pad_properties.cpp:793
 msgid "from "
 msgstr "来自 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:765
+#: pcbnew/dialogs/dialog_pad_properties.cpp:794
 msgid "to "
 msgstr "到 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:770
+#: pcbnew/dialogs/dialog_pad_properties.cpp:799
 msgid "center "
 msgstr "中心 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:771
+#: pcbnew/dialogs/dialog_pad_properties.cpp:800
 msgid "start "
 msgstr "开始 "
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:772
+#: pcbnew/dialogs/dialog_pad_properties.cpp:801
 #, c-format
 msgid "angle %s"
 msgstr "角度 %s"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:777
+#: pcbnew/dialogs/dialog_pad_properties.cpp:806
 msgid "ring"
 msgstr "环"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:779
+#: pcbnew/dialogs/dialog_pad_properties.cpp:808
 msgid "circle"
 msgstr "圆"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:782
+#: pcbnew/dialogs/dialog_pad_properties.cpp:811
 #, c-format
 msgid "radius %s"
 msgstr "半径 %s"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:788
+#: pcbnew/dialogs/dialog_pad_properties.cpp:817
 #, c-format
 msgid "corners count %d"
 msgstr "拐角计数 %d"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1085
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1114
 msgid "Pad size must be greater than zero"
 msgstr "焊盘尺寸必须大于0."
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1091
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1120
 msgid "Incorrect value for pad drill: pad drill bigger than pad size"
 msgstr "钻孔值不正确: 钻孔尺寸超过了焊盘尺寸"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1098
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1127
 msgid "Pad local clearance must be zero or greater than zero"
 msgstr "焊盘局部间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1109
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1138
 msgid "Pad local solder mask clearance must be zero or greater than zero"
 msgstr "焊盘局部阻焊间隙必须为零或大于零"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1117
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1146
 #, c-format
 msgid "Pad local solder mask clearance must be greater than %s"
 msgstr "焊盘局部阻焊间隙必须大于 %s"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1132
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1161
 msgid "Error: pad has no layer"
 msgstr "错误：焊盘没有层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1139
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1168
 msgid "Error: the pad is not on a copper layer and has a hole"
 msgstr "错误：焊盘没有在铜层并且有一个孔"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1144
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1173
 msgid ""
 "For NPTH pad, set pad size value to pad drill value, if you do not want this "
 "pad plotted in gerber files"
 msgstr ""
 "对于非金属化焊盘，设置焊盘尺寸值到焊盘钻孔的值，如果你不想要这个焊盘光绘文件"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1163
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1192
 msgid "Incorrect value for pad offset"
 msgstr "焊盘偏移数值不正确"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1168
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1197
 msgid "Too large value for pad delta size"
 msgstr "焊盘增量尺寸值太大"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1176
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1205
 msgid "Error: Through hole pad: drill diameter set to 0"
 msgstr "错误: 通孔焊盘: 钻孔直径设置为 0"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1181
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1210
 msgid ""
 "Error: Connector pads are not on the solder paste layer\n"
 "Use SMD pads instead"
@@ -18440,151 +18684,159 @@ msgstr ""
 "错误: 焊盘连接不是在锡膏层\n"
 "使用 SMD 焊盘替代"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1190
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1219
 msgid "Error: only one external copper layer allowed for SMD or Connector pads"
 msgstr "错误：允许SMD或连接焊盘只有一个外部铜层"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1202
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1231
 msgid "Incorrect corner size value"
 msgstr "不正确的拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1206
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1235
 msgid "Incorrect (negative) corner size value"
 msgstr "不正确的（负）拐角值"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1208
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1237
 msgid "Corner size value must be smaller than 50%"
 msgstr "转角值必须小于50%"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1215
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1244
 msgid "Incorrect pad shape: the shape must be equivalent to only one polygon"
 msgstr "错误的焊盘形状：该形状必须相当于只有一个多边形"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1221
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1250
 msgid "Pad setup errors list"
 msgstr "焊盘设置错误列表"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1497
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1527
 msgid "Modify pad"
 msgstr "修改焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1784
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1915
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1950
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1814
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1945
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1980
 msgid "No shape selected"
 msgstr "未选择形状"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1873
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1903
 msgid "Ring/Circle"
 msgstr "圆"
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1875
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1905
 msgid "Shape type:"
 msgstr "形状类型："
 
-#: pcbnew/dialogs/dialog_pad_properties.cpp:1875
+#: pcbnew/dialogs/dialog_pad_properties.cpp:1905
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:626
 msgid "Add Primitive"
 msgstr "添加图元"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:40
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:41
 msgid "Pad number:"
 msgstr "焊盘编号:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:50
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:51
 msgid "Net name:"
 msgstr "网络名称:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:60
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:61
 msgid "Pad type:"
 msgstr "焊盘类型:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:64
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:65
 msgid "Through-hole"
 msgstr "通孔"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:64
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:65
 msgid "Connector"
 msgstr "连接器"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:64
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:65
 msgid "NPTH, Mechanical"
 msgstr "非金属化孔，机械的"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:64
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:65
 msgid "Aperture"
 msgstr "孔"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:73
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:74
 #: pcbnew/dialogs/dialog_target_properties_base.cpp:50
 msgid "Shape:"
 msgstr "焊盘形状："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:77
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:78
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:252
 msgid "Circular"
 msgstr "圆形"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:77
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:78
 msgid "Rectangular"
 msgstr "矩形"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:77
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:78
 msgid "Trapezoidal"
 msgstr "梯形"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:77
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:78
 msgid "Rounded Rectangle"
 msgstr "圆角矩形"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:77
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:78
 msgid "Custom (Circ. Anchor)"
 msgstr "自定义(Circ. Anchor)"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:77
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:78
 msgid "Custom (Rect. Anchor)"
 msgstr "自定义(Rect. Anchor)"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:108
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:109
 #: pcbnew/dialogs/dialog_set_grid_base.cpp:68
 msgid "Size X:"
 msgstr "X 尺寸:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:119
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:120
 #: pcbnew/dialogs/dialog_set_grid_base.cpp:79
 msgid "Size Y:"
 msgstr "Y 尺寸:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:145
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:137
+msgid "90"
+msgstr "90"
+
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:139
+msgid "180"
+msgstr "180"
+
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:146
 msgid "Shape offset X:"
 msgstr "形状偏移X:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:156
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:157
 msgid "Shape offset Y:"
 msgstr "形状偏移Y:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:167
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:168
 msgid "Pad to die length:"
 msgstr "焊盘到裸片(die)的长度:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:169
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:170
 msgid ""
 "Wire length from pad to die on chip ( used to calculate actual track length)"
 msgstr "从焊盘到芯片上裸片(die)的导线长度(用于计算实际导线长度)"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:180
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:181
 msgid "Trapezoid delta:"
 msgstr "梯形增量:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:191
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:192
 msgid "Trapezoid axis:"
 msgstr "梯形轴线："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:204
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:205
 msgid "Corner size:"
 msgstr "圆角尺寸："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:206
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:207
 msgid ""
 "Corner radius in percent  of the pad width.\n"
 "The width is the smaller value between size X and size Y.\n"
@@ -18594,11 +18846,11 @@ msgstr ""
 "宽度为尺寸X和尺寸Y之间的较小值\n"
 "最大值为50%"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:217
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:218
 msgid "Corner radius:"
 msgstr "圆角半径："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:219
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:220
 msgid ""
 "Corner radius.\n"
 "Can be no more than half pad width.\n"
@@ -18769,7 +19021,7 @@ msgstr "使用焊盘形状"
 
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:576
 msgid "Use pad convex hull"
-msgstr ""
+msgstr "使用焊盘凸包"
 
 #: pcbnew/dialogs/dialog_pad_properties_base.cpp:599
 msgid "Primitives list"
@@ -18811,51 +19063,51 @@ msgstr ""
 msgid "Show pad in outline mode"
 msgstr "在轮廓模式下显示焊盘"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:819
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:821
 msgid "Start point"
 msgstr "起始点"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:845
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:847
 msgid "End point"
 msgstr "结束点"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:914
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:916
 msgid "Set thickness to 0 for a filled circle."
 msgstr "设置线宽为0时，填充圆。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:958
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:960
 msgid "Move vector"
 msgstr "移动矢量"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1007
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1009
 msgid "Scaling factor:"
 msgstr "比例因子："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1029
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1031
 msgid "Duplicate:"
 msgstr "重复:"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1138
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1140
 msgid "Outline thickness:"
 msgstr "轮廓线宽："
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1200
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1202
 msgid "Coordinates are relative to anchor pad, rotated 0.0 deg."
 msgstr "坐标相对于锚焊盘，旋转0.0度。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1206
+#: pcbnew/dialogs/dialog_pad_properties_base.cpp:1208
 msgid "Set thickness to 0 for a filled polygon."
 msgstr "设置线宽为0时，填充多边形。"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:213
+#: pcbnew/dialogs/dialog_pad_properties_base.h:215
 msgid "Pad Properties"
 msgstr "焊盘属性"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:288
+#: pcbnew/dialogs/dialog_pad_properties_base.h:290
 msgid "Pad Custom Shape Geometry Transform"
 msgstr "焊盘自定义形状几何变换"
 
-#: pcbnew/dialogs/dialog_pad_properties_base.h:328
+#: pcbnew/dialogs/dialog_pad_properties_base.h:330
 msgid "Basic Shape Polygon"
 msgstr "基本形状多边形"
 
@@ -18973,6 +19225,10 @@ msgstr "实际尺寸"
 msgid "Scaling:"
 msgstr "缩放比例:"
 
+#: pcbnew/dialogs/dialog_plot_base.cpp:129
+msgid "Auto"
+msgstr "自动"
+
 #: pcbnew/dialogs/dialog_plot_base.cpp:129
 msgid "1:1"
 msgstr "1:1"
@@ -19195,6 +19451,10 @@ msgstr "全选所有层"
 msgid "Deselect all Layers"
 msgstr "取消全选所有层"
 
+#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp:55
+msgid "Trace gap must be greater than 0."
+msgstr "布线间距必须大于0."
+
 #: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp:38
 msgid "Trace gap:"
 msgstr "线路间距:"
@@ -19207,7 +19467,7 @@ msgstr "过孔间距:"
 msgid "Via gap same as trace gap"
 msgstr "过孔间距与线路间距相同"
 
-#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h:63
+#: pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h:62
 #: pcbnew/hotkeys.cpp:279
 msgid "Differential Pair Dimensions"
 msgstr "差分对尺寸"
@@ -19288,7 +19548,7 @@ msgstr "圆弧"
 msgid "Miter radius (r):"
 msgstr "斜切半径 (r):"
 
-#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h:76
+#: pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h:75
 msgid "Trace Length Tuning"
 msgstr "布线长度调整"
 
@@ -19565,20 +19825,10 @@ msgstr "不修改不同方向的焊盘"
 msgid "Push Pad Properties"
 msgstr "推挤焊盘属性"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:98
+#: pcbnew/dialogs/dialog_select_net_from_list.cpp:70
 msgid "Pad Count"
 msgstr "焊盘计数"
 
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:143
-#, c-format
-msgid "%.3d"
-msgstr "%.3d"
-
-#: pcbnew/dialogs/dialog_select_net_from_list.cpp:147
-#, c-format
-msgid "%u"
-msgstr "%u"
-
 #: pcbnew/dialogs/dialog_select_net_from_list_base.cpp:22
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:124
 msgid "Net name filter:"
@@ -19605,20 +19855,33 @@ msgid "Grid 1:"
 msgstr "网格 1:"
 
 #: pcbnew/dialogs/dialog_set_grid_base.cpp:117
+#: pcbnew/dialogs/dialog_set_grid_base.cpp:130
+msgid "(hotkey)"
+msgstr "(快捷键)"
+
+#: pcbnew/dialogs/dialog_set_grid_base.cpp:121
 msgid "Grid 2:"
 msgstr "网格 2:"
 
-#: pcbnew/dialogs/dialog_set_grid_base.cpp:135 pcbnew/hotkeys.cpp:171
+#: pcbnew/dialogs/dialog_set_grid_base.cpp:143 pcbnew/hotkeys.cpp:171
 msgid "Reset Grid Origin"
 msgstr "复位网格原点"
 
-#: pcbnew/dialogs/dialog_set_grid_base.h:69
-msgid "Grid Settings"
-msgstr "网格设置"
+#: pcbnew/dialogs/dialog_swap_layers.cpp:54
+#, fuzzy
+#| msgid "Move item"
+msgid "Move items on:"
+msgstr "移动项目"
 
-#: pcbnew/dialogs/dialog_swap_layers.cpp:52
-msgid "Move To:"
-msgstr "移动到："
+#: pcbnew/dialogs/dialog_swap_layers.cpp:55
+#, fuzzy
+#| msgid "no layers"
+msgid "To layer:"
+msgstr "没有层"
+
+#: pcbnew/dialogs/dialog_swap_layers_base.h:48
+msgid "Swap Layers"
+msgstr "交换层"
 
 #: pcbnew/dialogs/dialog_target_properties_base.cpp:54
 msgid "+"
@@ -19640,16 +19903,16 @@ msgstr "尺寸文本属性"
 msgid "Footprint Text Properties"
 msgstr "封装文本属性"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:265
+#: pcbnew/dialogs/dialog_text_properties.cpp:269
 #, c-format
 msgid "Footprint %s (%s), %s, rotated %.1f deg"
 msgstr "封装 %s (%s), %s, 旋转 %.1f°"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:310
+#: pcbnew/dialogs/dialog_text_properties.cpp:314
 msgid "No layer selected, Please select the text layer"
 msgstr "没有层被选择, 请选择文字层"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:383
+#: pcbnew/dialogs/dialog_text_properties.cpp:388
 msgid ""
 "The text thickness is too large for the text size.\n"
 "It will be clamped."
@@ -19657,7 +19920,7 @@ msgstr ""
 "文本宽度与高度比例不对。\n"
 "它将会变形，被挤在一起。"
 
-#: pcbnew/dialogs/dialog_text_properties.cpp:415
+#: pcbnew/dialogs/dialog_text_properties.cpp:420
 msgid "Change text properties"
 msgstr "更改文本属性"
 
@@ -19703,78 +19966,77 @@ msgid ""
 msgstr ""
 
 #: pcbnew/dialogs/dialog_track_via_properties.cpp:330
-#: pcbnew/tools/placement_tool.cpp:243
 msgid "Continue"
 msgstr "继续"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:366
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:377
 msgid "Via drill size must be smaller than via diameter"
 msgstr "过孔内径尺寸必须小于过孔外径"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:375
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:386
 msgid "Via start layer and end layer cannot be the same"
 msgstr "过孔起始层和结束层不能相同"
 
-#: pcbnew/dialogs/dialog_track_via_properties.cpp:522
+#: pcbnew/dialogs/dialog_track_via_properties.cpp:533
 msgid "Edit track/via properties"
 msgstr "编辑布线/过孔属性"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:38
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:35
 msgid "Locked"
 msgstr "锁定"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:96
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:93
 msgid "Pre-defined widths:"
 msgstr "预定义宽度："
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:109
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:106
 #: pcbnew/dialogs/dialog_track_via_size_base.cpp:27
 msgid "Track width:"
 msgstr "布线宽度:"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:123
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:120
 msgid "Use net class widths"
 msgstr "使用网络类宽度"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:187
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:184
 msgid "Pre-defined sizes:"
 msgstr "预定义尺寸："
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:200
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:197
 #: pcbnew/dialogs/dialog_track_via_size_base.cpp:38
 msgid "Via diameter:"
 msgstr "过孔外径："
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:211
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:208
 #: pcbnew/dialogs/dialog_track_via_size_base.cpp:49
 msgid "Via drill:"
 msgstr "过孔内径："
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:225
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:222
 msgid "Use net class sizes"
 msgstr "使用网络类尺寸"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:243
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:240
 msgid "Via type:"
 msgstr "过孔类型:"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:247
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
 msgid "Through"
 msgstr "通孔"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:247
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
 msgid "Micro"
 msgstr "微孔"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:247
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:244
 msgid "Blind/buried"
 msgstr "盲孔/埋孔"
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:255
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:252
 msgid "Start layer:"
 msgstr "开始层："
 
-#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:262
+#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:259
 msgid "End layer:"
 msgstr "结束层："
 
@@ -19800,25 +20062,25 @@ msgstr ""
 "通过参考编号(U1, R3...) (标准设置)\n"
 "或者时间戳记 (如果电路图的参考编号重新批注已经改变, 可以使用此项)"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:81
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:83
 msgid "All supported library formats|"
 msgstr "所有支持的库格式|"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:200
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:202
 msgid "Options Editor..."
 msgstr "编辑器选项..."
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:200
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:202
 msgid "Edit options"
 msgstr "编辑选项"
 
-#: pcbnew/dialogs/panel_fp_lib_table.cpp:431
+#: pcbnew/dialogs/panel_fp_lib_table.cpp:433
 #, c-format
 msgid "Duplicate Nicknames \"%s\"."
 msgstr "重复的昵称\"%s\"。"
 
-#: pcbnew/dialogs/panel_modedit_defaults.cpp:151
-#: pcbnew/dialogs/panel_setup_text_and_graphics.cpp:150
+#: pcbnew/dialogs/panel_modedit_defaults.cpp:152
+#: pcbnew/dialogs/panel_setup_text_and_graphics.cpp:151
 msgid ""
 "Text will not be readable with a thickness greater than\n"
 "1/4 its width or height."
@@ -19878,9 +20140,9 @@ msgstr "保留参考和/或值留空以使用封装名称。"
 msgid "Default properties for new graphic items:"
 msgstr "新建图形项目的默认属性："
 
-#: pcbnew/dialogs/panel_modedit_defaults_base.cpp:135
+#: pcbnew/dialogs/panel_modedit_defaults_base.cpp:136
 #: pcbnew/dialogs/panel_setup_netclasses_base.cpp:69
-#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:65
+#: pcbnew/dialogs/panel_setup_text_and_graphics_base.cpp:66
 msgid "Net Class parameters"
 msgstr "网络类参数"
 
@@ -19939,16 +20201,16 @@ msgid "Do not show"
 msgstr "不显示"
 
 #: pcbnew/dialogs/panel_pcbnew_display_options_base.cpp:31
-msgid "On pads"
-msgstr "焊盘上"
+msgid "Show on pads"
+msgstr "在焊盘上显示"
 
 #: pcbnew/dialogs/panel_pcbnew_display_options_base.cpp:31
-msgid "On tracks"
-msgstr "布线上"
+msgid "Show on tracks"
+msgstr "在布线上显示"
 
 #: pcbnew/dialogs/panel_pcbnew_display_options_base.cpp:31
-msgid "On pads and tracks"
-msgstr "焊盘和布线上"
+msgid "Show on pads and tracks"
+msgstr "在焊盘和布线上显示"
 
 #: pcbnew/dialogs/panel_pcbnew_display_options_base.cpp:33
 msgid "Net Names"
@@ -19963,8 +20225,8 @@ msgid "Show pad numbers"
 msgstr "显示焊盘编号"
 
 #: pcbnew/dialogs/panel_pcbnew_display_options_base.cpp:43
-msgid "Show pad no net connection indicator"
-msgstr "显示焊盘无网络连接指示"
+msgid "Show pad <no net> indicator"
+msgstr "显示焊盘<no net>指示"
 
 #: pcbnew/dialogs/panel_pcbnew_display_options_base.cpp:51
 msgid "Clearance Outlines"
@@ -20129,17 +20391,17 @@ msgstr "最小微孔内径："
 msgid "Minimum hole to hole:"
 msgstr "最小孔到孔间距："
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:443
+#: pcbnew/dialogs/panel_setup_layers.cpp:433
 #, c-format
 msgid "Use the \"%s\" control to change the number of copper layers."
 msgstr "使用\"%s\"控制更改铜层数。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:458
+#: pcbnew/dialogs/panel_setup_layers.cpp:448
 #, c-format
 msgid "The %s layer is mandatory."
 msgstr "%s层是必须的。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:521
+#: pcbnew/dialogs/panel_setup_layers.cpp:511
 #, c-format
 msgid ""
 "Footprints have some items on removed layers:\n"
@@ -20152,7 +20414,7 @@ msgstr ""
 "这些项目将不再可访问\n"
 "是否继续？"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:529
+#: pcbnew/dialogs/panel_setup_layers.cpp:519
 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?"
@@ -20160,20 +20422,20 @@ msgstr ""
 "在移除的图层上找到了项目。 该操作将删除已移除图层中的所有项目，并且不能撤"
 "消。 你想继续吗？"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:664
+#: pcbnew/dialogs/panel_setup_layers.cpp:653
 msgid "Layer must have a name."
 msgstr "层必须要有一个名称。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:670
+#: pcbnew/dialogs/panel_setup_layers.cpp:659
 #, c-format
 msgid "\"%s\" are forbidden in layer names."
 msgstr "\"%s\"在层名称中是禁止的。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:677
+#: pcbnew/dialogs/panel_setup_layers.cpp:666
 msgid "Layer name \"signal\" is reserved."
 msgstr "”信号(signal)“ 是保留层名称。"
 
-#: pcbnew/dialogs/panel_setup_layers.cpp:685
+#: pcbnew/dialogs/panel_setup_layers.cpp:674
 #, c-format
 msgid "Layer name \"%s\" is already in use."
 msgstr "图层名称 \"%s\" 已经在使用中。"
@@ -20208,22 +20470,22 @@ msgstr "开启所有层"
 
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:38
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:50
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:94
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:140
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:113
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:178
 msgid "2"
 msgstr "2"
 
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:38
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:54
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:98
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:144
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:117
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:182
 msgid "6"
 msgstr "6"
 
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:38
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:56
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:100
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:146
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:119
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:184
 msgid "8"
 msgstr "8"
 
@@ -20279,488 +20541,488 @@ msgstr "32"
 msgid "PCB thickness:"
 msgstr "PCB厚度："
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:80
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:72
 msgid "If you want a courtyard layer for the front side of the board"
 msgstr "开启/关闭 顶层封装丝印外框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:84
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:76
 msgid "CrtYd_Front_layer"
 msgstr "CrtYd_Front_layer"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:90
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:947
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:82
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:683
 msgid "Off-board, testing"
 msgstr "Off-board, 测试"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:97
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:89
 msgid "If you want a fabrication layer for the front side of the board"
 msgstr "开启/关闭 顶层制造层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:101
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:93
 msgid "Fab_Front_layer"
 msgstr "制造顶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:105
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:934
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:97
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:670
 msgid "Off-board, manufacturing"
 msgstr "Off-board, 生产"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:110
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:102
 msgid "If you want an adhesive template for the front side of the board"
 msgstr "开启/关闭 顶层粘胶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:114
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:106
 msgid "Adhes_Front_layer"
 msgstr "顶层粘胶"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:118
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:131
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:144
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:157
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:882
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:895
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:908
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:921
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:110
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:123
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:136
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:149
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:618
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:631
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:644
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:657
 msgid "On-board, non-copper"
 msgstr "电路板上, 非铜层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:123
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:115
 msgid "If you want a solder paster layer for front side of the board"
 msgstr "开启/关闭 顶层锡膏层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:127
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:119
 msgid "SoldP_Front_layer"
 msgstr "顶层锡膏"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:136
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:128
 msgid "If you want a silk screen layer for the front side of the board"
 msgstr "开启/关闭 顶层丝印层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:140
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:132
 msgid "SilkS_Front_layer"
 msgstr "顶层丝印"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:149
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:141
 msgid "If you want a solder mask layer for the front of the board"
 msgstr "开启/关闭 顶层阻焊层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:153
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:145
 msgid "Mask_Front_layer"
 msgstr "顶层阻焊"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:162
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:154
 msgid "If you want a front copper layer"
 msgstr "开启/关闭 顶层铜层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:166
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:158
 msgid "Front_layer"
 msgstr "顶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:175
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:159
 msgid "Layer name of front (top) copper layer"
 msgstr "顶层铜层的名称"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:201
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:223
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:245
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:267
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:163
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:177
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:191
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:205
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:219
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:233
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:247
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:261
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:275
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:289
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:311
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:355
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:377
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:399
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:421
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:303
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:317
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:331
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:345
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:359
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:373
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:387
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:401
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:415
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:429
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:443
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:465
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:509
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:531
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:553
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:575
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:597
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:619
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:641
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:663
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:685
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:707
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:729
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:751
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:773
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:795
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:817
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:839
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:865
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:457
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:471
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:485
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:499
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:513
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:527
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:541
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:555
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:569
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:583
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:601
 msgid "signal"
 msgstr "信号"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:201
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:223
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:245
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:267
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:163
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:177
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:191
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:205
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:219
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:233
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:247
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:261
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:275
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:289
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:311
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:355
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:377
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:399
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:421
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:303
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:317
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:331
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:345
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:359
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:373
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:387
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:401
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:415
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:429
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:443
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:465
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:509
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:531
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:553
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:575
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:597
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:619
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:641
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:663
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:685
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:707
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:729
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:751
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:773
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:795
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:817
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:839
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:865
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:457
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:471
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:485
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:499
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:513
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:527
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:541
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:555
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:569
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:583
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:601
 msgid "power"
 msgstr "电源"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:201
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:223
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:245
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:267
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:163
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:177
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:191
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:205
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:219
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:233
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:247
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:261
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:275
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:289
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:311
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:355
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:377
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:399
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:421
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:303
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:317
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:331
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:345
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:359
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:373
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:387
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:401
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:415
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:429
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:443
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:465
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:509
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:531
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:553
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:575
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:597
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:619
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:641
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:663
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:685
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:707
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:729
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:751
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:773
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:795
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:817
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:839
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:865
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:457
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:471
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:485
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:499
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:513
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:527
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:541
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:555
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:569
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:583
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:601
 msgid "mixed"
 msgstr "混合"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:179
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:201
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:223
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:245
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:267
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:163
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:177
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:191
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:205
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:219
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:233
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:247
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:261
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:275
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:289
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:311
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:333
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:355
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:377
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:399
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:421
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:303
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:317
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:331
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:345
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:359
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:373
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:387
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:401
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:415
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:429
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:443
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:465
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:487
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:509
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:531
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:553
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:575
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:597
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:619
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:641
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:663
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:685
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:707
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:729
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:751
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:773
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:795
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:817
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:839
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:865
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:457
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:471
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:485
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:499
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:513
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:527
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:541
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:555
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:569
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:583
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:601
 msgid "jumper"
 msgstr "跳线"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:183
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:205
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:227
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:249
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:271
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:167
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:181
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:195
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:209
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:223
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:237
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:251
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:265
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:279
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:293
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:315
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:337
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:359
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:381
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:403
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:425
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:307
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:321
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:335
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:349
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:363
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:377
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:391
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:405
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:419
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:433
 #: pcbnew/dialogs/panel_setup_layers_base.cpp:447
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:469
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:491
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:513
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:535
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:557
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:579
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:601
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:623
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:645
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:667
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:689
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:711
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:733
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:755
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:777
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:799
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:821
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:843
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:869
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:461
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:475
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:489
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:503
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:517
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:531
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:545
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:559
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:573
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:587
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:605
 msgid ""
 "Copper layer type for Freerouter.  Power layers are removed from "
 "Freerouter's layer menus."
 msgstr "对于Freerouter的铜层类型。电源层将从Freerouter的图层菜单中删除。"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:190
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:174
 msgid "In1"
 msgstr "In1"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:212
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:188
 msgid "In2"
 msgstr "In2"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:234
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:202
 msgid "In3"
 msgstr "In3"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:256
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:216
 msgid "In4"
 msgstr "In4"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:278
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:230
 msgid "In5"
 msgstr "In5"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:300
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:244
 msgid "In6"
 msgstr "In6"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:322
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:258
 msgid "In7"
 msgstr "In7"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:344
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:272
 msgid "In8"
 msgstr "In8"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:366
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:286
 msgid "In9"
 msgstr "In9"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:388
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:300
 msgid "In10"
 msgstr "In10"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:410
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:314
 msgid "In11"
 msgstr "In11"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:432
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:328
 msgid "In12"
 msgstr "In12"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:454
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:342
 msgid "In13"
 msgstr "In13"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:476
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:356
 msgid "In14"
 msgstr "In14"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:498
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:370
 msgid "In15"
 msgstr "In15"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:520
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:384
 msgid "In16"
 msgstr "In16"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:542
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:398
 msgid "In17"
 msgstr "In17"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:564
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:412
 msgid "In18"
 msgstr "In18"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:586
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:426
 msgid "In19"
 msgstr "In19"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:608
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:440
 msgid "In20"
 msgstr "In20"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:630
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:454
 msgid "In21"
 msgstr "In21"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:652
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:468
 msgid "In22"
 msgstr "In22"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:674
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:482
 msgid "In23"
 msgstr "In23"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:696
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:496
 msgid "In24"
 msgstr "In24"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:718
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:510
 msgid "In25"
 msgstr "In25"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:740
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:524
 msgid "In26"
 msgstr "In26"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:762
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:538
 msgid "In27"
 msgstr "In27"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:784
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:552
 msgid "In28"
 msgstr "In28"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:806
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:566
 msgid "In29"
 msgstr "In29"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:828
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:580
 msgid "In30"
 msgstr "In30"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:848
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:592
 msgid "If you want a back copper layer"
 msgstr "开启/关闭 底层铜层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:861
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:597
 msgid "Layer name of back (bottom) copper layer"
 msgstr "底层铜层的名称"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:874
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:610
 msgid "If you want a solder mask layer for the back side of the board"
 msgstr "开启/关闭 底层阻焊层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:878
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:614
 msgid "Mask_Back_layer"
 msgstr "底层阻焊"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:887
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:623
 msgid "If you want a silk screen layer for the back side of the board"
 msgstr "开启/关闭 底层丝印层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:891
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:627
 msgid "SilkS_Back_layer"
 msgstr "底层丝印"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:900
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:636
 msgid "If you want a solder paste layer for the back side of the board"
 msgstr "开启/关闭 底层锡膏层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:904
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:640
 msgid "SoldP_Back_layer"
 msgstr "底层锡膏"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:913
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:649
 msgid "If you want an adhesive layer for the back side of the board"
 msgstr "开启/关闭 底层粘胶层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:917
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:653
 msgid "Adhes_Back_layer"
 msgstr "底层粘胶"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:926
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:662
 msgid "If you want a fabrication layer for the back side of the board"
 msgstr "开启/关闭 底层制造层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:930
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:666
 msgid "Fab_Back_layer"
 msgstr "底层制造"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:939
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:675
 msgid "If you want a courtyard layer for the back side of the board"
 msgstr "开启/关闭 底层封装外框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:943
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:679
 msgid "CrtYd_Back_layer"
 msgstr "底层封装外框"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:952
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:688
 msgid "If you want a board perimeter layer"
 msgstr "打开/关闭 电路板边框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:956
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:692
 msgid "PCB_Edges_layer"
 msgstr "PCB板边框层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:960
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:696
 msgid "Board contour"
 msgstr "电路板边框"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:967
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:703
 msgid "Margin_layer"
 msgstr "电气边界层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:971
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:707
 msgid "Edge_Cuts setback"
 msgstr "电气边界"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:978
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:714
 msgid "Eco1_layer"
 msgstr "Eco1_层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:982
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:993
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:1006
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:1019
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:718
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:729
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:742
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:755
 msgid "Auxiliary"
 msgstr "辅助"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:989
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:725
 msgid "Eco2_layer"
 msgstr "Eco2_层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:998
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:734
 msgid "If you want a separate layer for comments or notes"
 msgstr "开启/关闭 描述性注释层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:1002
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:738
 msgid "Comments_layer"
 msgstr "注释层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:1011
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:747
 msgid "If you want a layer for documentation drawings"
 msgstr "开启/关闭 文档图形层"
 
-#: pcbnew/dialogs/panel_setup_layers_base.cpp:1015
+#: pcbnew/dialogs/panel_setup_layers_base.cpp:751
 msgid "Drawings_layer"
 msgstr "图形层"
 
@@ -20810,56 +21072,56 @@ msgstr ""
 "此值可以通过封装或焊盘局部值所取代。\n"
 "最终的间隙值是该值与间隙值的总和。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:270
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:264
 msgid "Netclass must have a name."
 msgstr "网络类必须要有一个名称。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:279
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:273
 msgid "Netclass name already in use."
 msgstr "网络类名称已经在使用。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:333
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:328
 msgid "The default net class is required."
 msgstr "默认的网络类是必需的。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:494
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:191
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:487
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:238
 #, c-format
 msgid "Track width less than minimum track width (%s)."
 msgstr "布线宽度小于最小线宽(%s)。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:502
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:495
 #, c-format
 msgid "Differential pair width less than minimum track width (%s)."
 msgstr "差分对宽度小于最小布线宽度(%s)。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:511
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:208
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:504
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:255
 #, c-format
 msgid "Via diameter less than minimum via diameter (%s)."
 msgstr "过孔外径小于最小过孔外径(%s)。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:519
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:234
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:512
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:281
 msgid "Via drill larger than via diameter."
 msgstr "过孔内径大于过孔外径。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:526
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:225
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:519
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:272
 #, c-format
 msgid "Via drill less than minimum via drill (%s)."
 msgstr "过孔内径小于最小孔内径(%s)。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:535
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:528
 #, c-format
 msgid "Microvia diameter less than minimum microvia diameter (%s)."
 msgstr "微孔外径小于最小微孔外径(%s)。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:543
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:536
 msgid "Microvia drill larger than microvia diameter."
 msgstr "微孔内径大于微孔外径。"
 
-#: pcbnew/dialogs/panel_setup_netclasses.cpp:550
+#: pcbnew/dialogs/panel_setup_netclasses.cpp:543
 #, c-format
 msgid "Microvia drill less than minimum microvia drill (%s)."
 msgstr "微孔内径小于最小内径(%s)。"
@@ -20912,35 +21174,52 @@ msgstr "分配给选择的网络"
 msgid "Net Class"
 msgstr "网络类"
 
-#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:218
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:265
 msgid "No via drill defined."
 msgstr "没有钻孔定义。"
 
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:297
+#, c-format
+msgid "Differential pair track width less than minimum track width (%s)."
+msgstr "差分对布线宽度小于最小布线宽度(%s)。"
+
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:307
+msgid "No differential pair gap defined."
+msgstr "没有定义差分对间距。"
+
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:314
+msgid "Differential pair gap cannot be negative."
+msgstr "差分对间距不能为负数。"
+
+#: pcbnew/dialogs/panel_setup_tracks_and_vias.cpp:326
+msgid "Differential pair via gap cannot be negative."
+msgstr "差分对过孔间距不能为负数。"
+
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:19
 msgid "Pre-defined track and via dimensions:"
 msgstr "预定义布线和过孔直径："
 
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:51
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:95
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:141
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:114
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:179
 msgid "3"
 msgstr "3"
 
 #: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:55
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:99
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:145
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:118
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:183
 msgid "7"
 msgstr "7"
 
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:113
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:151
 msgid "Differential Pairs"
 msgstr "差分对布线"
 
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:132
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:170
 msgid "Gap"
 msgstr "间距"
 
-#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:133
+#: pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp:171
 msgid "Via Gap"
 msgstr "过孔间距"
 
@@ -21016,85 +21295,85 @@ msgstr "下载3D模型库："
 msgid "Add 3D Shape Libraries Wizard"
 msgstr "3D模型库添加向导"
 
-#: pcbnew/drc.cpp:402
+#: pcbnew/drc.cpp:405
 msgid "Aborting\n"
 msgstr "终止\n"
 
-#: pcbnew/drc.cpp:415
+#: pcbnew/drc.cpp:418
 msgid "Pad clearances...\n"
 msgstr "焊盘间距...\n"
 
-#: pcbnew/drc.cpp:425
+#: pcbnew/drc.cpp:428
 msgid "Drill clearances...\n"
 msgstr "钻孔间隙...\n"
 
-#: pcbnew/drc.cpp:437
+#: pcbnew/drc.cpp:440
 msgid "Refilling all zones...\n"
 msgstr "重新填充所有覆铜区域...\n"
 
-#: pcbnew/drc.cpp:444
+#: pcbnew/drc.cpp:447
 msgid "Checking zone fills...\n"
 msgstr "检查填充区域...\n"
 
-#: pcbnew/drc.cpp:452
+#: pcbnew/drc.cpp:455
 msgid "Track clearances...\n"
 msgstr "布线间距...\n"
 
-#: pcbnew/drc.cpp:461
+#: pcbnew/drc.cpp:464
 msgid "Zone to zone clearances...\n"
 msgstr "覆铜区域与覆铜区域间隙...\n"
 
-#: pcbnew/drc.cpp:472
+#: pcbnew/drc.cpp:475
 msgid "Unconnected pads...\n"
 msgstr "未连接焊盘...\n"
 
-#: pcbnew/drc.cpp:484
+#: pcbnew/drc.cpp:487
 msgid "Keepout areas ...\n"
 msgstr "禁布区...\n"
 
-#: pcbnew/drc.cpp:494
+#: pcbnew/drc.cpp:497
 msgid "Test texts...\n"
 msgstr "测试文本...\n"
 
-#: pcbnew/drc.cpp:506
+#: pcbnew/drc.cpp:509
 msgid "Courtyard areas...\n"
 msgstr "封装外框...\n"
 
-#: pcbnew/drc.cpp:518
+#: pcbnew/drc.cpp:521
 msgid "Items on disabled layers...\n"
 msgstr "禁用层上的项目...\n"
 
-#: pcbnew/drc.cpp:571
+#: pcbnew/drc.cpp:574
 #, c-format
 msgid "NETCLASS: \"%s\" has Clearance:%s which is less than global:%s"
 msgstr "网络类：\"%s\" 设置的间距：%s 其小于全局设置：%s"
 
-#: pcbnew/drc.cpp:585
+#: pcbnew/drc.cpp:588
 #, c-format
 msgid "NETCLASS: \"%s\" has TrackWidth:%s which is less than global:%s"
 msgstr "网络类：\"%s\" 设置的布线宽度：%s 其小于全局设置：%s"
 
-#: pcbnew/drc.cpp:597
+#: pcbnew/drc.cpp:600
 #, c-format
 msgid "NETCLASS: \"%s\" has Via Dia:%s which is less than global:%s"
 msgstr "网络类：\"%s\" 设置的过孔外径：\"%s\" 其小于全局设置：%s"
 
-#: pcbnew/drc.cpp:609
+#: pcbnew/drc.cpp:612
 #, c-format
 msgid "NETCLASS: \"%s\" has Via Drill:%s which is less than global:%s"
 msgstr "网络类：\"%s\" 设置的过孔内径：%s 其小于全局设置：%s"
 
-#: pcbnew/drc.cpp:621
+#: pcbnew/drc.cpp:624
 #, c-format
 msgid "NETCLASS: \"%s\" has uVia Dia:%s which is less than global:%s"
 msgstr "网络类：\"%s\" 设置的微孔外径：%s 其小于全局设置：%s"
 
-#: pcbnew/drc.cpp:632
+#: pcbnew/drc.cpp:635
 #, c-format
 msgid "NETCLASS: \"%s\" has uVia Drill:%s which is less than global:%s"
 msgstr "网络类：\"%s\" 设置的微孔内径：%s 其小于全局设置：%s"
 
-#: pcbnew/drc.cpp:801
+#: pcbnew/drc.cpp:804
 msgid "Track clearances"
 msgstr "布线间距"
 
@@ -21271,62 +21550,17 @@ msgstr "封装有错误的外框(不是闭合的形状)"
 msgid "Unknown DRC error code %d"
 msgstr "未知的DRC错误码%d"
 
-#: pcbnew/eagle_plugin.cpp:835
+#: pcbnew/eagle_plugin.cpp:808
 #, c-format
 msgid "<package> name: \"%s\" duplicated in eagle <library>: \"%s\""
 msgstr "<封装> 名称: '%s' 在eagle <库>: '%s' 有重复"
 
-#: pcbnew/eagle_plugin.cpp:913
+#: pcbnew/eagle_plugin.cpp:886
 #, c-format
 msgid "No \"%s\" package in library \"%s\""
 msgstr "没有 \"%s\" 封装在库 \"%s\" 里"
 
-#: pcbnew/eagle_plugin.cpp:1422
-#, c-format
-msgid ""
-"Line on copper layer in package %s (%f mm, %f mm) (%f mm, %f mm).\n"
-"Moving to Dwgs.User layer"
-msgstr ""
-"封装%s上铜层线 (%f mm, %f mm) (%f mm, %f mm).\n"
-"移动到 Dwgs.User 层"
-
-#: pcbnew/eagle_plugin.cpp:1543
-#, c-format
-msgid ""
-"Unsupported text on copper layer in package %s.\n"
-"Moving to Dwgs.User layer."
-msgstr ""
-"封装%s上铜层不支持的文本\n"
-"移动到 Dwgs.User 层。"
-
-#: pcbnew/eagle_plugin.cpp:1657
-#, c-format
-msgid ""
-"Unsupported rectangle on copper layer in package %s.\n"
-"Moving to Dwgs.User layer."
-msgstr ""
-"封装%s上铜层不支持的矩形\n"
-"移动到 Dwgs.User 层。"
-
-#: pcbnew/eagle_plugin.cpp:1700
-#, c-format
-msgid ""
-"Unsupported polygon on copper layer in package %s.\n"
-"Moving to Dwgs.User layer."
-msgstr ""
-"封装%s上铜层不支持的多边形\n"
-"移动到 Dwgs.User 层。"
-
-#: pcbnew/eagle_plugin.cpp:1785
-#, c-format
-msgid ""
-"Unsupported circle on copper layer in package %s.\n"
-"Moving to Dwgs.User layer."
-msgstr ""
-"封装%s上铜层不支持的圆\n"
-"移动到 Dwgs.User 层。"
-
-#: pcbnew/eagle_plugin.cpp:2242
+#: pcbnew/eagle_plugin.cpp:2181
 #, c-format
 msgid "Unsupported Eagle layer '%s' (%d), converted to Dwgs.User layer"
 msgstr "不支持的边框层 \"%s\"(%d)，转换为Dwgs.User 层"
@@ -21337,83 +21571,83 @@ msgid ""
 "This is very dangerous. Are you sure?"
 msgstr "该图形项将会在铜层。这是非常危险的。你肯定吗？"
 
-#: pcbnew/edit.cpp:693 pcbnew/edit.cpp:715 pcbnew/edit.cpp:741
-#: pcbnew/edit.cpp:769 pcbnew/edit.cpp:797 pcbnew/edit.cpp:825
+#: pcbnew/edit.cpp:692 pcbnew/edit.cpp:714 pcbnew/edit.cpp:740
+#: pcbnew/edit.cpp:768 pcbnew/edit.cpp:796 pcbnew/edit.cpp:824
 #, c-format
 msgid "Footprint %s found, but it is locked"
 msgstr "%s 封装被锁定"
 
-#: pcbnew/edit.cpp:903 pcbnew/edit.cpp:922
+#: pcbnew/edit.cpp:902 pcbnew/edit.cpp:921
 #, c-format
 msgid "The parent (%s) of the pad is locked"
 msgstr "父级焊盘 (%s) 被锁定"
 
-#: pcbnew/edit.cpp:1445 pcbnew/edit.cpp:1447
+#: pcbnew/edit.cpp:1444 pcbnew/edit.cpp:1446
 msgid "Add tracks"
 msgstr "添加 布线"
 
-#: pcbnew/edit.cpp:1453 pcbnew/edit.cpp:1500 pcbnew/menubar_pcb_editor.cpp:285
-#: pcbnew/tools/pcb_editor_control.cpp:429
+#: pcbnew/edit.cpp:1452 pcbnew/edit.cpp:1499 pcbnew/menubar_pcb_editor.cpp:285
+#: pcbnew/tools/pcb_editor_control.cpp:431
 msgid "Add footprint"
 msgstr "添加 封装"
 
-#: pcbnew/edit.cpp:1457 pcbnew/tools/drawing_tool.cpp:682
+#: pcbnew/edit.cpp:1456 pcbnew/tools/drawing_tool.cpp:682
 msgid "Add zones"
 msgstr "添加覆铜区域"
 
-#: pcbnew/edit.cpp:1460
+#: pcbnew/edit.cpp:1459
 msgid "Warning: zone display is OFF!!!"
 msgstr "警告：覆铜显示已关闭！！！"
 
-#: pcbnew/edit.cpp:1468 pcbnew/tools/drawing_tool.cpp:692
+#: pcbnew/edit.cpp:1467 pcbnew/tools/drawing_tool.cpp:692
 msgid "Add keepout"
 msgstr "添加禁布区"
 
-#: pcbnew/edit.cpp:1472 pcbnew/menubar_pcb_editor.cpp:327
-#: pcbnew/tool_pcb_editor.cpp:488 pcbnew/tools/pcb_editor_control.cpp:602
+#: pcbnew/edit.cpp:1471 pcbnew/menubar_pcb_editor.cpp:327
+#: pcbnew/tool_pcb_editor.cpp:488 pcbnew/tools/pcb_editor_control.cpp:605
 msgid "Add layer alignment target"
 msgstr "添加 层对齐标记"
 
-#: pcbnew/edit.cpp:1476 pcbnew/tools/pcb_editor_control.cpp:888
+#: pcbnew/edit.cpp:1475 pcbnew/tools/pcb_editor_control.cpp:891
 msgid "Adjust zero"
 msgstr "调整为0"
 
-#: pcbnew/edit.cpp:1480 pcbnew/tools/pcbnew_control.cpp:733
+#: pcbnew/edit.cpp:1479 pcbnew/tools/pcbnew_control.cpp:595
 msgid "Adjust grid origin"
 msgstr "调整网格原点"
 
-#: pcbnew/edit.cpp:1484 pcbnew/menubar_footprint_editor.cpp:349
-#: pcbnew/menubar_pcb_editor.cpp:313 pcbnew/tool_footprint_editor.cpp:142
+#: pcbnew/edit.cpp:1483 pcbnew/menubar_footprint_editor.cpp:354
+#: pcbnew/menubar_pcb_editor.cpp:313 pcbnew/tool_footprint_editor.cpp:154
 #: pcbnew/tools/drawing_tool.cpp:233
 msgid "Add graphic line"
 msgstr "添加图形线"
 
-#: pcbnew/edit.cpp:1488 pcbnew/menubar_footprint_editor.cpp:337
-#: pcbnew/menubar_pcb_editor.cpp:305 pcbnew/tool_footprint_editor.cpp:148
-#: pcbnew/tool_pcb_editor.cpp:475 pcbnew/tools/drawing_tool.cpp:302
+#: pcbnew/edit.cpp:1487 pcbnew/menubar_footprint_editor.cpp:342
+#: pcbnew/menubar_pcb_editor.cpp:305 pcbnew/tool_footprint_editor.cpp:160
+#: pcbnew/tool_pcb_editor.cpp:475 pcbnew/tools/drawing_tool.cpp:300
 msgid "Add graphic arc"
 msgstr "添加圆弧"
 
-#: pcbnew/edit.cpp:1492 pcbnew/menubar_footprint_editor.cpp:343
-#: pcbnew/menubar_pcb_editor.cpp:309 pcbnew/tool_footprint_editor.cpp:145
-#: pcbnew/tool_pcb_editor.cpp:472 pcbnew/tools/drawing_tool.cpp:270
+#: pcbnew/edit.cpp:1491 pcbnew/menubar_footprint_editor.cpp:348
+#: pcbnew/menubar_pcb_editor.cpp:309 pcbnew/tool_footprint_editor.cpp:157
+#: pcbnew/tool_pcb_editor.cpp:472 pcbnew/tools/drawing_tool.cpp:269
 msgid "Add graphic circle"
 msgstr "添加圆"
 
-#: pcbnew/edit.cpp:1504 pcbnew/menubar_pcb_editor.cpp:323
-#: pcbnew/tool_pcb_editor.cpp:485 pcbnew/tools/drawing_tool.cpp:509
+#: pcbnew/edit.cpp:1503 pcbnew/menubar_pcb_editor.cpp:323
+#: pcbnew/tool_pcb_editor.cpp:485 pcbnew/tools/drawing_tool.cpp:507
 msgid "Add dimension"
 msgstr "添加尺寸标注"
 
-#: pcbnew/edit.cpp:1516
+#: pcbnew/edit.cpp:1515
 msgid "Select rats nest"
 msgstr "选择飞线"
 
-#: pcbnew/editedge.cpp:151
+#: pcbnew/editedge.cpp:146
 msgid "Copper layer global delete not allowed!"
 msgstr "铜层不允许全局删除!"
 
-#: pcbnew/editedge.cpp:156
+#: pcbnew/editedge.cpp:151
 #, c-format
 msgid "Delete everything on layer %s?"
 msgstr "删除 %s 层上的所有物件吗?"
@@ -21509,7 +21743,7 @@ msgstr ""
 msgid "Footprint Report"
 msgstr "封装报告"
 
-#: pcbnew/exporters/gendrill_Excellon_writer.cpp:119
+#: pcbnew/exporters/gendrill_Excellon_writer.cpp:124
 #: pcbnew/exporters/gendrill_file_writer_base.cpp:338
 #: pcbnew/exporters/gendrill_gerber_writer.cpp:113
 #, c-format
@@ -21526,51 +21760,51 @@ msgstr "无法创建工作文件 \"%s\"。"
 msgid "Create Gerber job file \"%s\""
 msgstr "创建Gerber工作文件 %s"
 
-#: pcbnew/files.cpp:143
+#: pcbnew/files.cpp:144
 msgid "Open Board File"
 msgstr "打开电路板文件"
 
-#: pcbnew/files.cpp:143
+#: pcbnew/files.cpp:144
 msgid "Import Non KiCad Board File"
 msgstr "导入非KiCad电路板文件"
 
-#: pcbnew/files.cpp:179
+#: pcbnew/files.cpp:180
 msgid "Save Board File As"
 msgstr "另存文件"
 
-#: pcbnew/files.cpp:202
+#: pcbnew/files.cpp:203
 msgid "Printed circuit board"
 msgstr "印刷电路板"
 
-#: pcbnew/files.cpp:278
+#: pcbnew/files.cpp:279
 #, c-format
 msgid "Recovery file \"%s\" not found."
 msgstr "没有找到备份文件 \"%s\"。"
 
-#: pcbnew/files.cpp:283
+#: pcbnew/files.cpp:284
 #, c-format
 msgid "OK to load recovery or backup file \"%s\""
 msgstr "确认加载恢复文件或备份文件 '%s'"
 
-#: pcbnew/files.cpp:345
+#: pcbnew/files.cpp:346
 msgid "noname"
 msgstr "无名称"
 
-#: pcbnew/files.cpp:417
+#: pcbnew/files.cpp:420
 #, c-format
 msgid "PCB file \"%s\" is already open."
 msgstr "PCB文件 '%s' 已经打开"
 
-#: pcbnew/files.cpp:424
+#: pcbnew/files.cpp:429
 msgid "The current PCB has been modified.  Save changes?"
 msgstr "当前PCB已被修改。是否保存更改？"
 
-#: pcbnew/files.cpp:440
+#: pcbnew/files.cpp:445
 #, c-format
 msgid "PCB \"%s\" does not exist.  Do you wish to create it?"
 msgstr "PCB <\"%s\"> 不存在，你想创建它吗？"
 
-#: pcbnew/files.cpp:504
+#: pcbnew/files.cpp:509
 #, c-format
 msgid ""
 "Error loading board file:\n"
@@ -21579,7 +21813,7 @@ msgstr ""
 "电路板文件载入错误：\n"
 "%s"
 
-#: pcbnew/files.cpp:542
+#: pcbnew/files.cpp:547
 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."
@@ -21587,17 +21821,17 @@ msgstr ""
 "这个文件是由PCBnew旧版本创建\n"
 "当您保存此文件，它会以新的文件格式存储。"
 
-#: pcbnew/files.cpp:629
+#: pcbnew/files.cpp:634
 #, c-format
 msgid "Warning: unable to create backup file \"%s\""
 msgstr "警告: 未能创建备份文件 '%s'"
 
-#: pcbnew/files.cpp:656 pcbnew/files.cpp:749
+#: pcbnew/files.cpp:661 pcbnew/files.cpp:754
 #, c-format
 msgid "No access rights to write to file \"%s\""
 msgstr "没有权限写入文件 \"%s\""
 
-#: pcbnew/files.cpp:695 pcbnew/files.cpp:774
+#: pcbnew/files.cpp:700 pcbnew/files.cpp:779
 #, c-format
 msgid ""
 "Error saving board file \"%s\".\n"
@@ -21606,22 +21840,22 @@ msgstr ""
 "保存电路板文件 '%s' 错误.\n"
 "%s"
 
-#: pcbnew/files.cpp:701
+#: pcbnew/files.cpp:706
 #, c-format
 msgid "Failed to create \"%s\""
 msgstr "无法创建 '%s'"
 
-#: pcbnew/files.cpp:727
+#: pcbnew/files.cpp:732
 #, c-format
 msgid "Backup file: \"%s\""
 msgstr "备份文件: %s"
 
-#: pcbnew/files.cpp:729
+#: pcbnew/files.cpp:734
 #, c-format
 msgid "Wrote board file: \"%s\""
 msgstr "写板文件：\"%s\""
 
-#: pcbnew/files.cpp:783
+#: pcbnew/files.cpp:788
 #, c-format
 msgid ""
 "Board copied to:\n"
@@ -21630,7 +21864,7 @@ msgstr ""
 "PCB复制到:\n"
 "'%s'"
 
-#: pcbnew/files.cpp:893
+#: pcbnew/files.cpp:898
 #, c-format
 msgid ""
 "Error occurred saving project specific footprint library table:\n"
@@ -21641,31 +21875,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: pcbnew/footprint_edit_frame.cpp:497
+#: pcbnew/footprint_edit_frame.cpp:519
 msgid "Save changes to footprint before closing?"
 msgstr "在关闭之前将更改保存到封装？"
 
-#: pcbnew/footprint_edit_frame.cpp:747
-msgid "Footprint Library Editor"
-msgstr "封装库编辑器"
-
-#: pcbnew/footprint_edit_frame.cpp:764
+#: pcbnew/footprint_edit_frame.cpp:777
 msgid "[Read Only]"
 msgstr "[只读]"
 
-#: pcbnew/footprint_edit_frame.cpp:770
+#: pcbnew/footprint_edit_frame.cpp:784
 msgid "[Unsaved]"
 msgstr "[未保存]"
 
-#: pcbnew/footprint_edit_frame.cpp:836
+#: pcbnew/footprint_edit_frame.cpp:850
 msgid "Updating Footprint Libraries"
 msgstr "更新封装库"
 
-#: pcbnew/footprint_edit_frame.cpp:932 pcbnew/hotkeys.cpp:505
-msgid "Footprint Editor"
-msgstr "封装编辑器"
-
-#: pcbnew/footprint_edit_frame.cpp:934
+#: pcbnew/footprint_edit_frame.cpp:948
 msgid "Default Values"
 msgstr "默认值"
 
@@ -21693,8 +21919,8 @@ msgstr "精确移动块..."
 #: pcbnew/footprint_editor_onclick.cpp:379
 #: pcbnew/footprint_editor_onclick.cpp:412 pcbnew/onrightclick.cpp:174
 #: pcbnew/onrightclick.cpp:250 pcbnew/onrightclick.cpp:271
-#: pcbnew/onrightclick.cpp:486 pcbnew/onrightclick.cpp:775
-#: pcbnew/onrightclick.cpp:828 pcbnew/tools/edit_tool.cpp:104
+#: pcbnew/onrightclick.cpp:484 pcbnew/onrightclick.cpp:773
+#: pcbnew/onrightclick.cpp:826 pcbnew/tools/edit_tool.cpp:100
 msgid "Move Exactly..."
 msgstr "精确移动..."
 
@@ -21706,20 +21932,20 @@ msgstr "编辑封装"
 msgid "Transform Footprint"
 msgstr "转换封装"
 
-#: pcbnew/footprint_editor_onclick.cpp:313 pcbnew/onrightclick.cpp:885
+#: pcbnew/footprint_editor_onclick.cpp:313 pcbnew/onrightclick.cpp:883
 msgid "Move Pad"
 msgstr "移动焊盘"
 
-#: pcbnew/footprint_editor_onclick.cpp:317 pcbnew/onrightclick.cpp:890
+#: pcbnew/footprint_editor_onclick.cpp:317 pcbnew/onrightclick.cpp:888
 msgid "Edit Pad..."
 msgstr "编辑焊盘..."
 
-#: pcbnew/footprint_editor_onclick.cpp:320 pcbnew/onrightclick.cpp:895
+#: pcbnew/footprint_editor_onclick.cpp:320 pcbnew/onrightclick.cpp:893
 #: pcbnew/tools/pad_tool.cpp:48
 msgid "Copy Pad Properties"
 msgstr "复制焊盘属性"
 
-#: pcbnew/footprint_editor_onclick.cpp:322 pcbnew/onrightclick.cpp:899
+#: pcbnew/footprint_editor_onclick.cpp:322 pcbnew/onrightclick.cpp:897
 #: pcbnew/tools/pad_tool.cpp:54 pcbnew/tools/pad_tool.cpp:224
 #: pcbnew/tools/pad_tool.cpp:336
 msgid "Paste Pad Properties"
@@ -21741,14 +21967,14 @@ msgstr "精确移动焊盘..."
 msgid "Create Pad Array..."
 msgstr "创建焊盘阵列..."
 
-#: pcbnew/footprint_editor_onclick.cpp:340 pcbnew/onrightclick.cpp:903
+#: pcbnew/footprint_editor_onclick.cpp:340 pcbnew/onrightclick.cpp:901
 #: pcbnew/tools/pad_tool.cpp:60
 msgid "Push Pad Properties..."
 msgstr "推挤焊盘属性..."
 
 #: pcbnew/footprint_editor_onclick.cpp:372
 #: pcbnew/footprint_editor_onclick.cpp:415 pcbnew/onrightclick.cpp:179
-#: pcbnew/onrightclick.cpp:785 pcbnew/tools/edit_tool.cpp:109
+#: pcbnew/onrightclick.cpp:783 pcbnew/tools/edit_tool.cpp:105
 msgid "Create Array..."
 msgstr "创建阵列..."
 
@@ -21772,63 +21998,70 @@ msgstr "修改主体项宽度(所有)"
 msgid "Change Body Items Layer..."
 msgstr "修改主体项层..."
 
-#: pcbnew/footprint_editor_utils.cpp:337 pcbnew/initpcb.cpp:103
+#: pcbnew/footprint_editor_utils.cpp:382 pcbnew/initpcb.cpp:103
 msgid "The current footprint has been modified.  Save changes?"
 msgstr "当前封装已被修改。是否保存更改？"
 
-#: pcbnew/footprint_editor_utils.cpp:454
-msgid "No board currently open."
-msgstr "当前没有打开的板"
+#: pcbnew/footprint_editor_utils.cpp:520
+msgid "_copy"
+msgstr "复制"
 
-#: pcbnew/footprint_editor_utils.cpp:479
-msgid "Unable to find the footprint source on the main board"
-msgstr "在主电路板上找不到该封装的源"
-
-#: pcbnew/footprint_editor_utils.cpp:480
-msgid ""
-"\n"
-"Cannot update the footprint"
-msgstr ""
-"\n"
-"无法更新封装"
-
-#: pcbnew/footprint_editor_utils.cpp:489
-msgid "A footprint source was found on the main board"
-msgstr "在主电路板上找到一个封装的源"
-
-#: pcbnew/footprint_editor_utils.cpp:490
-msgid ""
-"\n"
-"Cannot insert this footprint"
-msgstr ""
-"\n"
-"无法插入该封装"
-
-#: pcbnew/footprint_editor_utils.cpp:986
+#: pcbnew/footprint_editor_utils.cpp:952
 msgid "Place anchor"
 msgstr "放置 锚点"
 
-#: pcbnew/footprint_editor_utils.cpp:990 pcbnew/tool_footprint_editor.cpp:167
+#: pcbnew/footprint_editor_utils.cpp:956 pcbnew/tool_footprint_editor.cpp:179
 msgid "Set grid origin"
 msgstr "设置网格原点"
 
-#: pcbnew/footprint_editor_utils.cpp:996
-#: pcbnew/menubar_footprint_editor.cpp:323 pcbnew/tool_footprint_editor.cpp:138
+#: pcbnew/footprint_editor_utils.cpp:962
+#: pcbnew/menubar_footprint_editor.cpp:328 pcbnew/tool_footprint_editor.cpp:150
 msgid "Add pad"
 msgstr "添加焊盘"
 
-#: pcbnew/footprint_editor_utils.cpp:1000
+#: pcbnew/footprint_editor_utils.cpp:966
 msgid "Pad properties"
 msgstr "焊盘属性"
 
-#: pcbnew/footprint_editor_utils.cpp:1040
+#: pcbnew/footprint_editor_utils.cpp:1006
 msgid "Cannot delete REFERENCE!"
 msgstr "不能删除参考编号!"
 
-#: pcbnew/footprint_editor_utils.cpp:1044
+#: pcbnew/footprint_editor_utils.cpp:1010
 msgid "Cannot delete VALUE!"
 msgstr "不能删除值!"
 
+#: pcbnew/footprint_editor_utils.cpp:1094
+#, c-format
+msgid ""
+"The current configuration does not include the footprint library\n"
+"\"%s\".\n"
+"Use Manage Footprint Libraries to edit the configuration."
+msgstr ""
+"当前配置不包含封装库\n"
+"\"%s\"。\n"
+"使用\"管理封装库\"来编辑配置。\n"
+"来编辑配置。"
+
+#: pcbnew/footprint_editor_utils.cpp:1097
+msgid "Library not found in footprint library table."
+msgstr "在封装库表中未找到库。"
+
+#: pcbnew/footprint_editor_utils.cpp:1105 pcbnew/footprint_viewer_frame.cpp:603
+#, c-format
+msgid ""
+"The library with the nickname \"%s\" is not enabled\n"
+"in the current configuration.  Use Manage Footprint Libraries to\n"
+"edit the configuration."
+msgstr ""
+"昵称为\"%s\"的库未启用\n"
+"在当前配置中，使用封装库管理\n"
+"来编辑封装。"
+
+#: pcbnew/footprint_editor_utils.cpp:1108 pcbnew/footprint_viewer_frame.cpp:606
+msgid "Footprint library not enabled."
+msgstr "封装库未启用。"
+
 #: pcbnew/footprint_info_impl.cpp:138
 msgid "Fetching Footprint Libraries"
 msgstr "获取封装库"
@@ -21837,60 +22070,60 @@ msgstr "获取封装库"
 msgid "Loading Footprints"
 msgstr "载入封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:59
+#: pcbnew/footprint_libraries_utils.cpp:62
 #, c-format
 msgid "OK to delete footprint \"%s\" in library \"%s\""
 msgstr "确定删除库 \"%s\" 中封装 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:60
+#: pcbnew/footprint_libraries_utils.cpp:63
 msgid "Import Footprint"
 msgstr "导入封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:62
+#: pcbnew/footprint_libraries_utils.cpp:65
 msgid "Not a footprint file"
 msgstr "不是封装文件"
 
-#: pcbnew/footprint_libraries_utils.cpp:63
+#: pcbnew/footprint_libraries_utils.cpp:66
 #, c-format
 msgid "Unable to find or load footprint \"%s\" from lib path \"%s\""
 msgstr "无法从库路径 \"%s\" 中找到或载入封装 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:64
+#: pcbnew/footprint_libraries_utils.cpp:67
 #, c-format
 msgid "Library \"%s\" is read only, not writable"
 msgstr "\"%s\" 库为只读，不可写。"
 
-#: pcbnew/footprint_libraries_utils.cpp:66
+#: pcbnew/footprint_libraries_utils.cpp:69
 msgid "Export Footprint"
 msgstr "导出封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:67
+#: pcbnew/footprint_libraries_utils.cpp:70
 msgid "Save Footprint"
 msgstr "保存封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:68
+#: pcbnew/footprint_libraries_utils.cpp:71
 msgid "Enter footprint name:"
 msgstr "输入封装名称:"
 
-#: pcbnew/footprint_libraries_utils.cpp:69
+#: pcbnew/footprint_libraries_utils.cpp:72
 #, c-format
 msgid "Footprint exported to file \"%s\""
 msgstr "导出封装到文件 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:70
+#: pcbnew/footprint_libraries_utils.cpp:73
 #, c-format
 msgid "Footprint \"%s\" deleted from library \"%s\""
 msgstr "从库中 \"%s\" 删除封装 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:71
+#: pcbnew/footprint_libraries_utils.cpp:74
 msgid "New Footprint"
 msgstr "新建封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:73
+#: pcbnew/footprint_libraries_utils.cpp:76
 msgid "No footprint name defined."
 msgstr "没有定义封装名称."
 
-#: pcbnew/footprint_libraries_utils.cpp:77
+#: pcbnew/footprint_libraries_utils.cpp:80
 msgid ""
 "Writing/modifying legacy libraries (.mod files) is not allowed\n"
 "Please save the current library to the new .pretty format\n"
@@ -21902,7 +22135,7 @@ msgstr ""
 "并更新你的封装库列表\n"
 " .pretty库文件夹恢复你的封装( .kicad_mod 文件) "
 
-#: pcbnew/footprint_libraries_utils.cpp:83
+#: pcbnew/footprint_libraries_utils.cpp:86
 msgid ""
 "Modifying legacy libraries (.mod files) is not allowed\n"
 "Please save the current library under the new .pretty format\n"
@@ -21914,77 +22147,105 @@ msgstr ""
 "并更新你的封装库列表\n"
 "然后删除之前的封装"
 
-#: pcbnew/footprint_libraries_utils.cpp:397
+#: pcbnew/footprint_libraries_utils.cpp:398
 #, c-format
 msgid "Unable to create or write file \"%s\""
 msgstr "无法创建或写入文件 '%s'"
 
-#: pcbnew/footprint_libraries_utils.cpp:489
+#: pcbnew/footprint_libraries_utils.cpp:479
 #, c-format
 msgid "Library %s already exists."
 msgstr "库 \"%s\" 已经存在。"
 
-#: pcbnew/footprint_libraries_utils.cpp:551 pcbnew/gpcb_plugin.cpp:958
+#: pcbnew/footprint_libraries_utils.cpp:529
+msgid "Select Library Table"
+msgstr "选择库表"
+
+#: pcbnew/footprint_libraries_utils.cpp:601 pcbnew/gpcb_plugin.cpp:958
 #: pcbnew/kicad_plugin.cpp:2056 pcbnew/kicad_plugin.cpp:2137
 #, c-format
 msgid "Library \"%s\" is read only"
 msgstr "'%s' 库为只读"
 
-#: pcbnew/footprint_libraries_utils.cpp:585
+#: pcbnew/footprint_libraries_utils.cpp:635
 msgid "No footprints to archive!"
 msgstr "没有封装归档"
 
-#: pcbnew/footprint_libraries_utils.cpp:776
+#: pcbnew/footprint_libraries_utils.cpp:779
+msgid "No board currently open."
+msgstr "当前没有打开的板"
+
+#: pcbnew/footprint_libraries_utils.cpp:802
+#, fuzzy
+#| msgid "Unable to find the footprint source on the main board"
+msgid ""
+"Unable to find the footprint on the main board.\n"
+"Cannot save."
+msgstr "在主电路板上找不到该封装的源"
+
+#: pcbnew/footprint_libraries_utils.cpp:808
+#, fuzzy
+#| msgid "Footprint \"%s\" already exists in library \"%s\""
+msgid "Footprint already exists on board."
+msgstr "封装 \"%s\" 已经存在于库 \"%s\" 中"
+
+#: pcbnew/footprint_libraries_utils.cpp:919
 msgid "No library specified.  Footprint could not be saved."
 msgstr "没有指定库，封装无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:786
+#: pcbnew/footprint_libraries_utils.cpp:929
 msgid "No footprint name specified.  Footprint could not be saved."
 msgstr "没有指定封装名称, 封装无法保存。"
 
-#: pcbnew/footprint_libraries_utils.cpp:827
+#: pcbnew/footprint_libraries_utils.cpp:953
+#, fuzzy, c-format
+#| msgid "Footprint \"%s\" already exists in library \"%s\""
+msgid "Footprint %s already exists in %s."
+msgstr "封装 \"%s\" 已经存在于库 \"%s\" 中"
+
+#: pcbnew/footprint_libraries_utils.cpp:971
 #, c-format
 msgid "Component \"%s\" replaced in \"%s\""
 msgstr "元件 \"%s\" 替换为 \"%s\""
 
-#: pcbnew/footprint_libraries_utils.cpp:828
+#: pcbnew/footprint_libraries_utils.cpp:972
 #, c-format
 msgid "Component \"%s\" added in  \"%s\""
 msgstr "元件 \"%s\" 添加到 \"%s\""
 
-#: pcbnew/footprint_tree_pane.cpp:51
-msgid "New &Library..."
-msgstr "新建库(&L)..."
+#: pcbnew/footprint_tree_pane.cpp:59
+msgid "Save a Copy &As..."
+msgstr "另存为(&A)..."
 
-#: pcbnew/footprint_tree_pane.cpp:59 pcbnew/footprint_tree_pane.cpp:84
-msgid "Save a Copy As..."
-msgstr "另存为..."
+#: pcbnew/footprint_tree_pane.cpp:63 pcbnew/menubar_footprint_editor.cpp:68
+msgid "&New Footprint..."
+msgstr "新建封装 (&N)..."
 
-#: pcbnew/footprint_tree_pane.cpp:67
-msgid "New &Footprint..."
-msgstr "新建封装(&F)..."
-
-#: pcbnew/footprint_tree_pane.cpp:71
+#: pcbnew/footprint_tree_pane.cpp:66
 msgid "&Create Footprint from Wizard..."
 msgstr "从向导创建封装(&C)..."
 
-#: pcbnew/footprint_tree_pane.cpp:74
+#: pcbnew/footprint_tree_pane.cpp:69
 msgid "&Import Footprint..."
 msgstr "导入封装(&I)..."
 
-#: pcbnew/footprint_tree_pane.cpp:78
+#: pcbnew/footprint_tree_pane.cpp:71
+msgid "Paste Footprint"
+msgstr "粘贴封装"
+
+#: pcbnew/footprint_tree_pane.cpp:75
 msgid "&Edit Footprint"
 msgstr "编辑封装(&E)"
 
-#: pcbnew/footprint_tree_pane.cpp:94
+#: pcbnew/footprint_tree_pane.cpp:95
 msgid "E&xport Footprint..."
 msgstr "导出封装(&E)..."
 
-#: pcbnew/footprint_viewer_frame.cpp:127
+#: pcbnew/footprint_viewer_frame.cpp:131
 msgid "Footprint Library Browser"
 msgstr "封装库浏览"
 
-#: pcbnew/footprint_viewer_frame.cpp:431
+#: pcbnew/footprint_viewer_frame.cpp:440
 #, c-format
 msgid ""
 "Could not load footprint \"%s\" from library \"%s\".\n"
@@ -21995,7 +22256,7 @@ msgstr ""
 "\n"
 "错误 %s."
 
-#: pcbnew/footprint_viewer_frame.cpp:582
+#: pcbnew/footprint_viewer_frame.cpp:596
 #, c-format
 msgid ""
 "The current configuration does not include a library with the\n"
@@ -22006,28 +22267,13 @@ msgstr ""
 "昵称\"%s\"。使用封装库管理\n"
 "来编辑配置。"
 
-#: pcbnew/footprint_viewer_frame.cpp:585
+#: pcbnew/footprint_viewer_frame.cpp:599
 msgid "Footprint library not found."
 msgstr "封装库没有找到。"
 
-#: pcbnew/footprint_viewer_frame.cpp:589
-#, c-format
-msgid ""
-"The library with the nickname \"%s\" is not enabled\n"
-"in the current configuration.  Use Manage Footprint Libraries to\n"
-"edit the configuration."
-msgstr ""
-"昵称为\"%s\"的库未启用\n"
-"在当前配置中，使用封装库管理\n"
-"来编辑封装。"
-
-#: pcbnew/footprint_viewer_frame.cpp:592
-msgid "Footprint library not enabled."
-msgstr "封装库未启用。"
-
-#: pcbnew/footprint_viewer_frame.cpp:650 pcbnew/footprint_viewer_frame.cpp:666
-#: pcbnew/footprint_wizard_frame.cpp:687 pcbnew/hotkeys.cpp:229
-#: pcbnew/pcb_base_frame.cpp:486
+#: pcbnew/footprint_viewer_frame.cpp:664 pcbnew/footprint_viewer_frame.cpp:680
+#: pcbnew/footprint_wizard_frame.cpp:691 pcbnew/hotkeys.cpp:229
+#: pcbnew/pcb_base_frame.cpp:516
 msgid "3D Viewer"
 msgstr "查看3D效果"
 
@@ -22036,46 +22282,46 @@ msgstr "查看3D效果"
 msgid "Footprint Wizard"
 msgstr "封装向导"
 
-#: pcbnew/footprint_wizard_frame.cpp:224
+#: pcbnew/footprint_wizard_frame.cpp:228
 msgid "Parameters"
 msgstr "参数"
 
-#: pcbnew/footprint_wizard_frame.cpp:387
+#: pcbnew/footprint_wizard_frame.cpp:391
 msgid "Parameter"
 msgstr "参数"
 
-#: pcbnew/footprint_wizard_frame.cpp:714
+#: pcbnew/footprint_wizard_frame.cpp:718
 #, c-format
 msgid "ModView: 3D Viewer [%s]"
 msgstr "模型浏览: 3D查看器 [%s]"
 
-#: pcbnew/footprint_wizard_frame.cpp:737
+#: pcbnew/footprint_wizard_frame.cpp:741
 msgid "Select wizard script to run"
 msgstr "选择向导脚本运行"
 
-#: pcbnew/footprint_wizard_frame.cpp:743
+#: pcbnew/footprint_wizard_frame.cpp:747
 msgid "Reset wizard parameters to default"
 msgstr "重置向导参数为默认值"
 
-#: pcbnew/footprint_wizard_frame.cpp:749
+#: pcbnew/footprint_wizard_frame.cpp:753
 msgid "Select previous parameters page"
 msgstr "选择上一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:753
+#: pcbnew/footprint_wizard_frame.cpp:757
 msgid "Select next parameters page"
 msgstr "选择下一个参数页"
 
-#: pcbnew/footprint_wizard_frame.cpp:758
-#: pcbnew/menubar_footprint_editor.cpp:186 pcbnew/tool_footprint_viewer.cpp:69
-#: pcbnew/tool_footprint_viewer.cpp:152
+#: pcbnew/footprint_wizard_frame.cpp:762
+#: pcbnew/menubar_footprint_editor.cpp:191 pcbnew/tool_footprint_viewer.cpp:93
+#: pcbnew/tool_footprint_viewer.cpp:173
 msgid "Show footprint in 3D viewer"
 msgstr "查看封装3D外形"
 
-#: pcbnew/footprint_wizard_frame.cpp:776 pcbnew/tool_footprint_editor.cpp:84
+#: pcbnew/footprint_wizard_frame.cpp:780 pcbnew/tool_footprint_editor.cpp:84
 msgid "Zoom auto"
 msgstr "自动缩放"
 
-#: pcbnew/footprint_wizard_frame.cpp:785
+#: pcbnew/footprint_wizard_frame.cpp:789
 msgid "Export footprint to editor"
 msgstr "导出封装到编辑器"
 
@@ -22352,7 +22598,7 @@ msgstr "添加 盲/埋孔"
 msgid "Select Layer and Add Blind/Buried Via"
 msgstr "选择层并添加盲/埋孔"
 
-#: pcbnew/hotkeys.cpp:128 pcbnew/onrightclick.cpp:538
+#: pcbnew/hotkeys.cpp:128 pcbnew/onrightclick.cpp:536
 #: pcbnew/router/router_tool.cpp:191
 msgid "Switch Track Posture"
 msgstr "切换布线状态"
@@ -22361,7 +22607,7 @@ msgstr "切换布线状态"
 msgid "Drag Track Keep Slope"
 msgstr "保持角度拖动布线"
 
-#: pcbnew/hotkeys.cpp:132 pcbnew/onrightclick.cpp:761
+#: pcbnew/hotkeys.cpp:132 pcbnew/onrightclick.cpp:759
 msgid "Edit with Footprint Editor"
 msgstr "在封装编辑器编辑"
 
@@ -22421,7 +22667,7 @@ msgstr "绘制圆"
 msgid "Draw Arc"
 msgstr "绘制圆弧"
 
-#: pcbnew/hotkeys.cpp:156 pcbnew/tool_footprint_editor.cpp:154
+#: pcbnew/hotkeys.cpp:156 pcbnew/tool_footprint_editor.cpp:166
 #: pcbnew/tools/drawing_tool.cpp:87
 msgid "Add Text"
 msgstr "添加 文本"
@@ -22510,7 +22756,7 @@ msgstr "切换网格到上一个"
 msgid "Track Display Mode"
 msgstr "布线显示模式"
 
-#: pcbnew/hotkeys.cpp:257 pcbnew/tools/pcb_editor_control.cpp:110
+#: pcbnew/hotkeys.cpp:257 pcbnew/tools/pcb_editor_control.cpp:105
 msgid "Add Footprint"
 msgstr "添加 封装"
 
@@ -22567,7 +22813,7 @@ msgstr "切换光标显示(仅限现代工具箱)"
 msgid "Insert Corner (Modern Toolset only)"
 msgstr "插入拐角(仅适用于现代工具箱）"
 
-#: pcbnew/hotkeys.cpp:504
+#: pcbnew/hotkeys.cpp:510
 msgid "Board Editor"
 msgstr "电路板编辑"
 
@@ -22872,30 +23118,26 @@ msgstr ""
 msgid "File \"%s\" is empty or is not a legacy library"
 msgstr "文件 \"%s\"为空或不是一个旧版库"
 
-#: pcbnew/load_select_footprint.cpp:220
+#: pcbnew/load_select_footprint.cpp:226
 #, c-format
 msgid "Choose Footprint (%d items loaded)"
 msgstr "选择封装(共%d项)"
 
-#: pcbnew/load_select_footprint.cpp:362
+#: pcbnew/load_select_footprint.cpp:333
 #, c-format
 msgid "Footprints [%u items]"
 msgstr "封装 [%u 项]"
 
-#: pcbnew/load_select_footprint.cpp:428
+#: pcbnew/load_select_footprint.cpp:399
 #, c-format
 msgid "Footprint \"%s\" saved"
 msgstr "封装 '%s' 保存"
 
-#: pcbnew/load_select_footprint.cpp:439
+#: pcbnew/load_select_footprint.cpp:410
 #, c-format
 msgid "Footprint library \"%s\" saved as \"%s\"."
 msgstr "封装库 \"%s\" 另存为 \"%s\"。"
 
-#: pcbnew/menubar_footprint_editor.cpp:68
-msgid "&New Footprint..."
-msgstr "新建封装 (&N)..."
-
 #: pcbnew/menubar_footprint_editor.cpp:70
 msgid "Create a new footprint"
 msgstr "创建一个新的封装"
@@ -22908,232 +23150,216 @@ msgstr "创建封装..."
 msgid "Create a new footprint using the footprint wizard"
 msgstr "使用封装向导创建一个新的封装"
 
-#: pcbnew/menubar_footprint_editor.cpp:88
-msgid "Save a Copy &As..."
-msgstr "另存为(&A)..."
-
-#: pcbnew/menubar_footprint_editor.cpp:89
-msgid "Save a copy to a new name and/or location"
-msgstr "将副本保存到新名称和或位置"
-
-#: pcbnew/menubar_footprint_editor.cpp:95
+#: pcbnew/menubar_footprint_editor.cpp:100
 msgid "Import Footprint from &KiCad File..."
 msgstr "从KiCad文件导入封装(&K)..."
 
-#: pcbnew/menubar_footprint_editor.cpp:96
+#: pcbnew/menubar_footprint_editor.cpp:101
 msgid "Import a footprint from an existing footprint file"
 msgstr "从现有封装文件导入封装"
 
-#: pcbnew/menubar_footprint_editor.cpp:100
+#: pcbnew/menubar_footprint_editor.cpp:105
 msgid "Import Outlines from &DXF File..."
 msgstr "从DXF文件导入轮廓(&D)..."
 
-#: pcbnew/menubar_footprint_editor.cpp:101
+#: pcbnew/menubar_footprint_editor.cpp:106
 msgid "Import 2D Drawing DXF file to Footprint Editor on Drawings layer"
 msgstr "导入2D绘图DXF文件到绘图层的封装编辑器"
 
-#: pcbnew/menubar_footprint_editor.cpp:105
+#: pcbnew/menubar_footprint_editor.cpp:110
 msgid "&Export Footprint..."
 msgstr "导出封装(&E)..."
 
-#: pcbnew/menubar_footprint_editor.cpp:106
+#: pcbnew/menubar_footprint_editor.cpp:111
 msgid "Export current footprint to a file"
 msgstr "导出当前封装到文件"
 
-#: pcbnew/menubar_footprint_editor.cpp:114
+#: pcbnew/menubar_footprint_editor.cpp:119
 msgid "Print current footprint"
 msgstr "打印当前封装"
 
-#: pcbnew/menubar_footprint_editor.cpp:122
+#: pcbnew/menubar_footprint_editor.cpp:127
 msgid "Close footprint editor"
 msgstr "关闭封装编辑器"
 
-#: pcbnew/menubar_footprint_editor.cpp:131
+#: pcbnew/menubar_footprint_editor.cpp:136
 msgid "Undo last action"
 msgstr "撤消上次操作"
 
-#: pcbnew/menubar_footprint_editor.cpp:137
+#: pcbnew/menubar_footprint_editor.cpp:142
 msgid "Redo last action"
 msgstr "重做最后撤消操作"
 
-#: pcbnew/menubar_footprint_editor.cpp:145
+#: pcbnew/menubar_footprint_editor.cpp:150
 msgid "Cu&t"
 msgstr "剪切(&T)"
 
-#: pcbnew/menubar_footprint_editor.cpp:160
+#: pcbnew/menubar_footprint_editor.cpp:165
 msgid "&Footprint Properties..."
 msgstr "封装属性(&F)..."
 
-#: pcbnew/menubar_footprint_editor.cpp:161
+#: pcbnew/menubar_footprint_editor.cpp:166
 msgid "Edit footprint properties"
 msgstr "编辑封装属性"
 
-#: pcbnew/menubar_footprint_editor.cpp:165
+#: pcbnew/menubar_footprint_editor.cpp:170
 msgid "Default Pad Properties..."
 msgstr "默认焊盘属性..."
 
-#: pcbnew/menubar_footprint_editor.cpp:166
+#: pcbnew/menubar_footprint_editor.cpp:171
 msgid "Edit default pad properties"
 msgstr "编辑默认焊盘属性"
 
-#: pcbnew/menubar_footprint_editor.cpp:172
+#: pcbnew/menubar_footprint_editor.cpp:177
 msgid "&Delete Footprint from Library"
 msgstr "从库中删除封装(&D)"
 
-#: pcbnew/menubar_footprint_editor.cpp:173
+#: pcbnew/menubar_footprint_editor.cpp:178
 msgid "Delete the current footprint"
 msgstr "删除当前封装"
 
-#: pcbnew/menubar_footprint_editor.cpp:180 pcbnew/menubar_pcb_editor.cpp:547
+#: pcbnew/menubar_footprint_editor.cpp:185 pcbnew/menubar_pcb_editor.cpp:547
 msgid "&Library Browser"
 msgstr "库浏览器(&L)"
 
-#: pcbnew/menubar_footprint_editor.cpp:181 pcbnew/menubar_pcb_editor.cpp:548
+#: pcbnew/menubar_footprint_editor.cpp:186 pcbnew/menubar_pcb_editor.cpp:548
 msgid "Open the Library Browser"
 msgstr "打开库浏览器"
 
-#: pcbnew/menubar_footprint_editor.cpp:184 pcbnew/menubar_pcb_editor.cpp:551
+#: pcbnew/menubar_footprint_editor.cpp:189 pcbnew/menubar_pcb_editor.cpp:551
 msgid "&3D Viewer"
 msgstr "3D查看器(&3)"
 
-#: pcbnew/menubar_footprint_editor.cpp:212 pcbnew/tool_footprint_viewer.cpp:141
+#: pcbnew/menubar_footprint_editor.cpp:217 pcbnew/tool_footprint_viewer.cpp:162
 msgid "Zoom to fit footprint"
 msgstr "缩放封装至适合大小"
 
-#: pcbnew/menubar_footprint_editor.cpp:230 pcbnew/menubar_pcb_editor.cpp:597
+#: pcbnew/menubar_footprint_editor.cpp:235 pcbnew/menubar_pcb_editor.cpp:597
 msgid "Grid &Settings..."
 msgstr "网格设置(&S)..."
 
-#: pcbnew/menubar_footprint_editor.cpp:230 pcbnew/menubar_pcb_editor.cpp:597
+#: pcbnew/menubar_footprint_editor.cpp:235 pcbnew/menubar_pcb_editor.cpp:597
 msgid "Adjust custom user-defined grid dimensions"
 msgstr "调整自定义网格尺寸"
 
-#: pcbnew/menubar_footprint_editor.cpp:254
-#: pcbnew/menubar_footprint_editor.cpp:259 pcbnew/menubar_pcb_editor.cpp:622
+#: pcbnew/menubar_footprint_editor.cpp:259
+#: pcbnew/menubar_footprint_editor.cpp:264 pcbnew/menubar_pcb_editor.cpp:622
 #: pcbnew/menubar_pcb_editor.cpp:627
 msgid "Full Window Crosshair"
 msgstr "十字光标全屏"
 
-#: pcbnew/menubar_footprint_editor.cpp:270 pcbnew/menubar_pcb_editor.cpp:659
+#: pcbnew/menubar_footprint_editor.cpp:275 pcbnew/menubar_pcb_editor.cpp:659
 msgid "Sketch &Pads"
 msgstr "焊盘草图(&P)"
 
-#: pcbnew/menubar_footprint_editor.cpp:274 pcbnew/menubar_pcb_editor.cpp:677
+#: pcbnew/menubar_footprint_editor.cpp:279 pcbnew/menubar_pcb_editor.cpp:677
 msgid "Sketch Footprint &Edges"
 msgstr "封装边框草图(&R)"
 
-#: pcbnew/menubar_footprint_editor.cpp:274 pcbnew/menubar_pcb_editor.cpp:677
+#: pcbnew/menubar_footprint_editor.cpp:279 pcbnew/menubar_pcb_editor.cpp:677
 msgid "Show footprint edges in outline mode"
 msgstr "在大纲模式下显示封装边框"
 
-#: pcbnew/menubar_footprint_editor.cpp:277 pcbnew/menubar_pcb_editor.cpp:681
+#: pcbnew/menubar_footprint_editor.cpp:282 pcbnew/menubar_pcb_editor.cpp:681
 msgid "Sketch Footprint Te&xt"
 msgstr "封装文本草图(&X)"
 
-#: pcbnew/menubar_footprint_editor.cpp:277 pcbnew/menubar_pcb_editor.cpp:681
+#: pcbnew/menubar_footprint_editor.cpp:282 pcbnew/menubar_pcb_editor.cpp:681
 msgid "Show footprint text in outline mode"
 msgstr "在大纲模式显示封装文本"
 
-#: pcbnew/menubar_footprint_editor.cpp:281 pcbnew/menubar_pcb_editor.cpp:685
+#: pcbnew/menubar_footprint_editor.cpp:286 pcbnew/menubar_pcb_editor.cpp:685
 msgid "&Drawing Mode"
 msgstr "绘图模式 (&D)"
 
-#: pcbnew/menubar_footprint_editor.cpp:282
-#: pcbnew/menubar_footprint_editor.cpp:310 pcbnew/menubar_pcb_editor.cpp:686
+#: pcbnew/menubar_footprint_editor.cpp:287
+#: pcbnew/menubar_footprint_editor.cpp:315 pcbnew/menubar_pcb_editor.cpp:686
 #: pcbnew/menubar_pcb_editor.cpp:714
 msgid "Select how items are displayed"
 msgstr "选择项目的显示方式"
 
-#: pcbnew/menubar_footprint_editor.cpp:288 pcbnew/menubar_pcb_editor.cpp:692
+#: pcbnew/menubar_footprint_editor.cpp:293 pcbnew/menubar_pcb_editor.cpp:692
 msgid "&High Contrast Mode"
 msgstr "高对比度模式(&H)"
 
-#: pcbnew/menubar_footprint_editor.cpp:291 pcbnew/menubar_pcb_editor.cpp:695
+#: pcbnew/menubar_footprint_editor.cpp:296 pcbnew/menubar_pcb_editor.cpp:695
 msgid "Use high contrast display mode"
 msgstr "使用高对比度显示模式"
 
-#: pcbnew/menubar_footprint_editor.cpp:296 pcbnew/menubar_pcb_editor.cpp:700
+#: pcbnew/menubar_footprint_editor.cpp:301 pcbnew/menubar_pcb_editor.cpp:700
 msgid "&Decrease Layer Opacity"
 msgstr "减小图层不透明度(&D)"
 
-#: pcbnew/menubar_footprint_editor.cpp:299 pcbnew/menubar_pcb_editor.cpp:703
+#: pcbnew/menubar_footprint_editor.cpp:304 pcbnew/menubar_pcb_editor.cpp:703
 msgid "Make the current layer more transparent"
 msgstr "使当前层更加透明"
 
-#: pcbnew/menubar_footprint_editor.cpp:302 pcbnew/menubar_pcb_editor.cpp:706
+#: pcbnew/menubar_footprint_editor.cpp:307 pcbnew/menubar_pcb_editor.cpp:706
 msgid "&Increase Layer Opacity"
 msgstr "增大图层不透明度(&I)"
 
-#: pcbnew/menubar_footprint_editor.cpp:305 pcbnew/menubar_pcb_editor.cpp:709
+#: pcbnew/menubar_footprint_editor.cpp:310 pcbnew/menubar_pcb_editor.cpp:709
 msgid "Make the current layer less transparent"
 msgstr "使当前层不透明"
 
-#: pcbnew/menubar_footprint_editor.cpp:309 pcbnew/menubar_pcb_editor.cpp:713
+#: pcbnew/menubar_footprint_editor.cpp:314 pcbnew/menubar_pcb_editor.cpp:713
 msgid "&Contrast Mode"
 msgstr "对比度模式(&C)"
 
-#: pcbnew/menubar_footprint_editor.cpp:323
+#: pcbnew/menubar_footprint_editor.cpp:328
 msgid "&Pad"
 msgstr "焊盘(&P)"
 
-#: pcbnew/menubar_footprint_editor.cpp:329
+#: pcbnew/menubar_footprint_editor.cpp:334
 msgid "&Text"
 msgstr "文本 (&T)"
 
-#: pcbnew/menubar_footprint_editor.cpp:331
+#: pcbnew/menubar_footprint_editor.cpp:336
 msgid "Add graphic text"
 msgstr "添加 图形文本"
 
-#: pcbnew/menubar_footprint_editor.cpp:347 pcbnew/menubar_pcb_editor.cpp:312
+#: pcbnew/menubar_footprint_editor.cpp:352 pcbnew/menubar_pcb_editor.cpp:312
 msgid "&Line"
 msgstr "线 (&L)"
 
-#: pcbnew/menubar_footprint_editor.cpp:353 pcbnew/menubar_pcb_editor.cpp:316
+#: pcbnew/menubar_footprint_editor.cpp:358 pcbnew/menubar_pcb_editor.cpp:316
 msgid "&Polygon"
 msgstr "多边形(&P)"
 
-#: pcbnew/menubar_footprint_editor.cpp:355 pcbnew/menubar_pcb_editor.cpp:317
-#: pcbnew/tool_footprint_editor.cpp:151 pcbnew/tool_pcb_editor.cpp:478
+#: pcbnew/menubar_footprint_editor.cpp:360 pcbnew/menubar_pcb_editor.cpp:317
+#: pcbnew/tool_footprint_editor.cpp:163 pcbnew/tool_pcb_editor.cpp:478
 #: pcbnew/tools/drawing_tool.cpp:716
 msgid "Add graphic polygon"
 msgstr "添加多边形"
 
-#: pcbnew/menubar_footprint_editor.cpp:361
+#: pcbnew/menubar_footprint_editor.cpp:366
 msgid "A&nchor"
 msgstr "锚点(&N)"
 
-#: pcbnew/menubar_footprint_editor.cpp:363 pcbnew/tool_footprint_editor.cpp:158
+#: pcbnew/menubar_footprint_editor.cpp:368 pcbnew/tool_footprint_editor.cpp:170
 msgid "Place footprint reference anchor"
 msgstr "放置封装参考编号标记"
 
-#: pcbnew/menubar_footprint_editor.cpp:368 pcbnew/menubar_pcb_editor.cpp:337
+#: pcbnew/menubar_footprint_editor.cpp:373 pcbnew/menubar_pcb_editor.cpp:337
 msgid "&Grid Origin"
 msgstr "网格原点(&G)"
 
-#: pcbnew/menubar_footprint_editor.cpp:369 pcbnew/menubar_pcb_editor.cpp:338
+#: pcbnew/menubar_footprint_editor.cpp:374 pcbnew/menubar_pcb_editor.cpp:338
 msgid "Set grid origin point"
 msgstr "设置网格原点"
 
-#: pcbnew/menubar_footprint_editor.cpp:376 pcbnew/menubar_pcb_editor.cpp:242
+#: pcbnew/menubar_footprint_editor.cpp:381 pcbnew/menubar_pcb_editor.cpp:242
 msgid "&Measure"
 msgstr "测量(&M)"
 
-#: pcbnew/menubar_footprint_editor.cpp:385
+#: pcbnew/menubar_footprint_editor.cpp:390
 msgid "&Load Footprint from PCB..."
 msgstr "从PCB载入封装(&L)..."
 
-#: pcbnew/menubar_footprint_editor.cpp:386
+#: pcbnew/menubar_footprint_editor.cpp:391
 msgid "Load a footprint from the current board into the editor"
 msgstr "将当前电路板的封装载入到编辑器中"
 
-#: pcbnew/menubar_footprint_editor.cpp:390
-msgid "&Update Footprint on PCB"
-msgstr "更新封装到PCB"
-
-#: pcbnew/menubar_footprint_editor.cpp:391
-msgid "Push updated footprint through to current board"
-msgstr "更新当前电路板封装"
-
 #: pcbnew/menubar_footprint_editor.cpp:395
 msgid "&Insert Footprint on PCB"
 msgstr "在电路板上插入封装(&I)"
@@ -23642,8 +23868,12 @@ msgid "&Archive Footprints in Existing Library..."
 msgstr "归档封装到现有库中(&A)..."
 
 #: pcbnew/menubar_pcb_editor.cpp:915
+#, fuzzy
+#| msgid ""
+#| "Archive all footprints in existing library in footprint Lib table(does "
+#| "not remove other footprints in this library)"
 msgid ""
-"Archive all footprints in existing library in footprint Lib table(does not "
+"Archive all footprints to existing library in footprint Lib table(does not "
 "remove other footprints in this library)"
 msgstr "在封装库表中存储现有库中的所有封装(不要删除此库中其他的封装）"
 
@@ -23652,9 +23882,13 @@ msgid "&Create New Library and Archive Footprints..."
 msgstr "创建库并归档封装(&C)..."
 
 #: pcbnew/menubar_pcb_editor.cpp:921
+#, fuzzy
+#| msgid ""
+#| "Archive all footprints in new library\n"
+#| "(if the library already exists it will be deleted)"
 msgid ""
-"Archive all footprints in new library\n"
-"(if the library already exists it will be deleted)"
+"Archive all footprints to a new library\n"
+"(if the library already exists it will be replaced)"
 msgstr ""
 "归档所有的封装到新库\n"
 "（如果这个库已经存在，将会被删除）"
@@ -23846,23 +24080,23 @@ msgstr "添加圆弧短线"
 msgid "Add Polynomial Shape"
 msgstr "添加 多边形图形"
 
-#: pcbnew/netinfo_item.cpp:94
+#: pcbnew/netinfo_item.cpp:97
 msgid "Net Name"
 msgstr "网络名称"
 
-#: pcbnew/netinfo_item.cpp:97
+#: pcbnew/netinfo_item.cpp:100
 msgid "Net Code"
 msgstr "网络代码"
 
-#: pcbnew/netinfo_item.cpp:144
+#: pcbnew/netinfo_item.cpp:147
 msgid "Net Length"
 msgstr "网络长度"
 
-#: pcbnew/netinfo_item.cpp:148
+#: pcbnew/netinfo_item.cpp:151
 msgid "On Board"
 msgstr "板载"
 
-#: pcbnew/netinfo_item.cpp:152
+#: pcbnew/netinfo_item.cpp:155
 msgid "In Package"
 msgstr "封装"
 
@@ -23883,23 +24117,23 @@ msgstr "没有封装"
 msgid "Components"
 msgstr "元件"
 
-#: pcbnew/netlist.cpp:254
+#: pcbnew/netlist.cpp:252
 #, c-format
 msgid "No footprint defined for symbol \"%s\".\n"
 msgstr "没有为符号 \"%s\" 定义封装。\n"
 
-#: pcbnew/netlist.cpp:276
+#: pcbnew/netlist.cpp:270
 #, c-format
 msgid ""
 "Footprint of %s changed: board footprint \"%s\", netlist footprint \"%s\"."
 msgstr "\"%s\"的封装发生了变化：电路板封装 \"%s\"，网表封装 \"%s\"。"
 
-#: pcbnew/netlist.cpp:306
+#: pcbnew/netlist.cpp:297
 #, c-format
 msgid "%s footprint ID \"%s\" is not valid."
 msgstr "%s的封装ID \"%s\" 无效。"
 
-#: pcbnew/netlist.cpp:326
+#: pcbnew/netlist.cpp:314
 #, c-format
 msgid ""
 "%s footprint \"%s\" not found in any libraries in the footprint library "
@@ -23917,27 +24151,23 @@ msgstr ""
 "文件: <%s>\n"
 "行: %d"
 
-#: pcbnew/onleftclick.cpp:262
-msgid "Graphic not allowed on Copper layers"
-msgstr "图形不允许出现在铜层"
-
-#: pcbnew/onleftclick.cpp:286 pcbnew/router/router_tool.cpp:726
+#: pcbnew/onleftclick.cpp:280 pcbnew/router/router_tool.cpp:726
 msgid "Tracks on Copper layers only"
 msgstr "布线只能出现在铜层"
 
-#: pcbnew/onleftclick.cpp:345
+#: pcbnew/onleftclick.cpp:339
 msgid "Texts not allowed on Edge Cut layer"
 msgstr "文本不允许出现在边界层"
 
-#: pcbnew/onleftclick.cpp:397
+#: pcbnew/onleftclick.cpp:396
 msgid "Dimension not allowed on Copper or Edge Cut layers"
 msgstr "尺寸不允许出现在铜层或边界层"
 
-#: pcbnew/onleftclick.cpp:450
+#: pcbnew/onleftclick.cpp:449
 msgid "Via Tool not available in Legacy Toolset"
 msgstr "在传统工具箱中过孔工具不可用"
 
-#: pcbnew/onleftclick.cpp:455
+#: pcbnew/onleftclick.cpp:454
 msgid "Measurement Tool not available in Legacy Toolset"
 msgstr "测量工具在传统工具箱中不可用"
 
@@ -23945,7 +24175,8 @@ msgstr "测量工具在传统工具箱中不可用"
 msgid "Delete All Drawings on Layer"
 msgstr "删除层上所有图形"
 
-#: pcbnew/onrightclick.cpp:201
+#: pcbnew/onrightclick.cpp:201 pcbnew/tools/zone_filler_tool.cpp:63
+#: pcbnew/tools/zone_filler_tool.cpp:181
 msgid "Delete Zone Filling"
 msgstr "删除 覆铜填充"
 
@@ -23963,17 +24194,17 @@ msgstr "获取并移动封装..."
 
 #: pcbnew/onrightclick.cpp:344 pcbnew/onrightclick.cpp:350
 #: pcbnew/onrightclick.cpp:368 pcbnew/onrightclick.cpp:381
-#: pcbnew/onrightclick.cpp:408 pcbnew/onrightclick.cpp:502
+#: pcbnew/onrightclick.cpp:406 pcbnew/onrightclick.cpp:500
 msgid "Select Working Layer..."
 msgstr "选择工作层..."
 
-#: pcbnew/onrightclick.cpp:358 pcbnew/onrightclick.cpp:400
-#: pcbnew/onrightclick.cpp:449
+#: pcbnew/onrightclick.cpp:358 pcbnew/onrightclick.cpp:398
+#: pcbnew/onrightclick.cpp:447
 msgid "Begin Track"
 msgstr "开始布线"
 
-#: pcbnew/onrightclick.cpp:364 pcbnew/onrightclick.cpp:404
-#: pcbnew/onrightclick.cpp:574
+#: pcbnew/onrightclick.cpp:364 pcbnew/onrightclick.cpp:402
+#: pcbnew/onrightclick.cpp:572
 msgid "Select Track Width"
 msgstr "选择布线宽度"
 
@@ -23985,240 +24216,240 @@ msgstr "为过孔选择图层对："
 msgid "Footprint Documentation"
 msgstr "封装文档文件"
 
-#: pcbnew/onrightclick.cpp:429 pcbnew/onrightclick.cpp:750
-#: pcbnew/onrightclick.cpp:944 pcbnew/tools/edit_tool.cpp:123
-#: pcbnew/tools/edit_tool.cpp:850 qa/common/mocks.cpp:273
+#: pcbnew/onrightclick.cpp:427 pcbnew/onrightclick.cpp:748
+#: pcbnew/onrightclick.cpp:942 pcbnew/tools/edit_tool.cpp:119
+#: pcbnew/tools/edit_tool.cpp:835 qa/qa_utils/mocks.cpp:273
 msgid "Flip"
 msgstr "翻转"
 
-#: pcbnew/onrightclick.cpp:456
+#: pcbnew/onrightclick.cpp:454
 msgid "Drag Via"
 msgstr "拖动过孔"
 
-#: pcbnew/onrightclick.cpp:471
+#: pcbnew/onrightclick.cpp:469
 msgid "Drag Segments, Keep Slope"
 msgstr "拖拉 线段（保持角度）"
 
-#: pcbnew/onrightclick.cpp:476
+#: pcbnew/onrightclick.cpp:474
 msgid "Drag Segment"
 msgstr "拖拉 线段"
 
-#: pcbnew/onrightclick.cpp:491
+#: pcbnew/onrightclick.cpp:489
 msgid "Create Track Array..."
 msgstr "创建布线阵列..."
 
-#: pcbnew/onrightclick.cpp:497 pcbnew/router/router_tool.cpp:121
+#: pcbnew/onrightclick.cpp:495 pcbnew/router/router_tool.cpp:121
 msgid "Break Track"
 msgstr "分割 布线"
 
-#: pcbnew/onrightclick.cpp:507
+#: pcbnew/onrightclick.cpp:505
 msgid "Place Node"
 msgstr "放置 节点"
 
-#: pcbnew/onrightclick.cpp:514 pcbnew/router/length_tuner_tool.cpp:55
+#: pcbnew/onrightclick.cpp:512 pcbnew/router/length_tuner_tool.cpp:55
 #: pcbnew/router/router_tool.cpp:142
 msgid "End Track"
 msgstr "结束 布线"
 
-#: pcbnew/onrightclick.cpp:518 pcbnew/router/router_tool.cpp:149
+#: pcbnew/onrightclick.cpp:516 pcbnew/router/router_tool.cpp:149
 msgid "Place Through Via"
 msgstr "放置通孔"
 
-#: pcbnew/onrightclick.cpp:521 pcbnew/router/router_tool.cpp:170
+#: pcbnew/onrightclick.cpp:519 pcbnew/router/router_tool.cpp:170
 msgid "Select Layer and Place Through Via..."
 msgstr "选择层并添加通孔..."
 
-#: pcbnew/onrightclick.cpp:528 pcbnew/router/router_tool.cpp:156
+#: pcbnew/onrightclick.cpp:526 pcbnew/router/router_tool.cpp:156
 msgid "Place Blind/Buried Via"
 msgstr "放置盲孔或埋孔"
 
-#: pcbnew/onrightclick.cpp:532 pcbnew/router/router_tool.cpp:178
+#: pcbnew/onrightclick.cpp:530 pcbnew/router/router_tool.cpp:178
 msgid "Select Layer and Place Blind/Buried Via..."
 msgstr "选择层并放置盲/埋孔..."
 
-#: pcbnew/onrightclick.cpp:546
+#: pcbnew/onrightclick.cpp:544
 msgid "Place Micro Via"
 msgstr "放置微孔"
 
-#: pcbnew/onrightclick.cpp:557
+#: pcbnew/onrightclick.cpp:555
 msgid "Change Via Size and Drill"
 msgstr "修改过孔外径和内径"
 
-#: pcbnew/onrightclick.cpp:563
+#: pcbnew/onrightclick.cpp:561
 msgid "Change Segment Width"
 msgstr "更改段宽度"
 
-#: pcbnew/onrightclick.cpp:567
+#: pcbnew/onrightclick.cpp:565
 msgid "Change Track Width"
 msgstr "调整布线宽度"
 
-#: pcbnew/onrightclick.cpp:583
+#: pcbnew/onrightclick.cpp:581
 msgid "Delete Via"
 msgstr "删除过孔"
 
-#: pcbnew/onrightclick.cpp:583
+#: pcbnew/onrightclick.cpp:581
 msgid "Delete Segment"
 msgstr "删除线段"
 
-#: pcbnew/onrightclick.cpp:590
+#: pcbnew/onrightclick.cpp:588
 msgid "Delete Track"
 msgstr "删除布线"
 
-#: pcbnew/onrightclick.cpp:592
+#: pcbnew/onrightclick.cpp:590
 msgid "Delete Net"
 msgstr "删除网络"
 
-#: pcbnew/onrightclick.cpp:601
+#: pcbnew/onrightclick.cpp:599
 msgid "Set Track and Via Sizes..."
 msgstr "设置布线和过孔尺寸..."
 
-#: pcbnew/onrightclick.cpp:607
+#: pcbnew/onrightclick.cpp:605
 msgid "Set Flags"
 msgstr "设置标志"
 
-#: pcbnew/onrightclick.cpp:609
+#: pcbnew/onrightclick.cpp:607
 msgid "Locked: Yes"
 msgstr "锁定: 是"
 
-#: pcbnew/onrightclick.cpp:610
+#: pcbnew/onrightclick.cpp:608
 msgid "Locked: No"
 msgstr "锁定: 否"
 
-#: pcbnew/onrightclick.cpp:619
+#: pcbnew/onrightclick.cpp:617
 msgid "Track Locked: Yes"
 msgstr "布线锁定: 是"
 
-#: pcbnew/onrightclick.cpp:620
+#: pcbnew/onrightclick.cpp:618
 msgid "Track Locked: No"
 msgstr "布线锁定: 否"
 
-#: pcbnew/onrightclick.cpp:622
+#: pcbnew/onrightclick.cpp:620
 msgid "Net Locked: Yes"
 msgstr "网络锁定: 是"
 
-#: pcbnew/onrightclick.cpp:623
+#: pcbnew/onrightclick.cpp:621
 msgid "Net Locked: No"
 msgstr "网络锁定: 否"
 
-#: pcbnew/onrightclick.cpp:637
+#: pcbnew/onrightclick.cpp:635
 msgid "Place Edge Outline"
 msgstr "放置 边框轮廓线"
 
-#: pcbnew/onrightclick.cpp:643
+#: pcbnew/onrightclick.cpp:641
 msgid "Place Corner"
 msgstr "放置 拐角"
 
-#: pcbnew/onrightclick.cpp:646
+#: pcbnew/onrightclick.cpp:644
 msgid "Place Zone"
 msgstr "放置 覆铜"
 
-#: pcbnew/onrightclick.cpp:653
+#: pcbnew/onrightclick.cpp:651
 msgid "Keepout Area"
 msgstr "禁布区"
 
-#: pcbnew/onrightclick.cpp:666 pcbnew/tools/point_editor.cpp:54
+#: pcbnew/onrightclick.cpp:664 pcbnew/tools/point_editor.cpp:55
 msgid "Create Corner"
 msgstr "创建拐角"
 
-#: pcbnew/onrightclick.cpp:667
+#: pcbnew/onrightclick.cpp:665
 msgid "Drag Outline Segment"
 msgstr "拖动 轮廓线段"
 
-#: pcbnew/onrightclick.cpp:675
+#: pcbnew/onrightclick.cpp:673
 msgid "Add Similar Zone"
 msgstr "添加 相似覆铜"
 
-#: pcbnew/onrightclick.cpp:678
+#: pcbnew/onrightclick.cpp:676
 msgid "Add Cutout Area"
 msgstr "添加 挖空区域"
 
-#: pcbnew/onrightclick.cpp:681 pcbnew/tools/pcb_editor_control.cpp:100
+#: pcbnew/onrightclick.cpp:679 pcbnew/tools/pcb_editor_control.cpp:96
 msgid "Duplicate Zone onto Layer..."
 msgstr "重复覆铜区域到层..."
 
-#: pcbnew/onrightclick.cpp:686 pcbnew/tools/zone_filler_tool.cpp:93
+#: pcbnew/onrightclick.cpp:684 pcbnew/tools/zone_filler_tool.cpp:97
 msgid "Fill Zone"
 msgstr "填充 覆铜"
 
-#: pcbnew/onrightclick.cpp:692
+#: pcbnew/onrightclick.cpp:690
 msgid "Remove Filled Areas in Zone"
 msgstr "删除区域中的填充区域"
 
-#: pcbnew/onrightclick.cpp:695
+#: pcbnew/onrightclick.cpp:693
 msgid "Move Zone"
 msgstr "移动 覆铜"
 
-#: pcbnew/onrightclick.cpp:698
+#: pcbnew/onrightclick.cpp:696
 msgid "Move Zone Exactly..."
 msgstr "精确移动区域..."
 
-#: pcbnew/onrightclick.cpp:703
+#: pcbnew/onrightclick.cpp:701
 msgid "Edit Zone Properties..."
 msgstr "编辑区域属性..."
 
-#: pcbnew/onrightclick.cpp:713
+#: pcbnew/onrightclick.cpp:711
 msgid "Delete Cutout"
 msgstr "删除 挖空区域"
 
-#: pcbnew/onrightclick.cpp:716
+#: pcbnew/onrightclick.cpp:714
 msgid "Delete Zone Outline"
 msgstr "删除 覆铜边界"
 
-#: pcbnew/onrightclick.cpp:756
+#: pcbnew/onrightclick.cpp:754
 msgid "Edit Parameters..."
 msgstr "编辑参数..."
 
-#: pcbnew/onrightclick.cpp:791 pcbnew/tools/edit_tool.cpp:141
+#: pcbnew/onrightclick.cpp:789 pcbnew/tools/edit_tool.cpp:137
 msgid "Update Footprint..."
 msgstr "更新封装..."
 
-#: pcbnew/onrightclick.cpp:844 pcbnew/onrightclick.cpp:951
+#: pcbnew/onrightclick.cpp:842 pcbnew/onrightclick.cpp:949
 msgid "Reset Size"
 msgstr "重置尺寸"
 
-#: pcbnew/onrightclick.cpp:887
+#: pcbnew/onrightclick.cpp:885
 msgid "Drag Pad"
 msgstr "拖动焊盘"
 
-#: pcbnew/onrightclick.cpp:904
+#: pcbnew/onrightclick.cpp:902
 msgid ""
 "Copy this pad's properties to all pads in this footprint (or similar "
 "footprints)"
 msgstr "将此焊盘的属性复制到其封装（或类似封装）中的所有焊盘。"
 
-#: pcbnew/onrightclick.cpp:982
+#: pcbnew/onrightclick.cpp:980
 msgid "Auto Width"
 msgstr "自动宽度"
 
-#: pcbnew/onrightclick.cpp:983
+#: pcbnew/onrightclick.cpp:981
 msgid ""
 "Use the track width when starting on a track, otherwise the current track "
 "width"
 msgstr "在布线开始时使用的布线宽度，否则使用当前布线宽度"
 
-#: pcbnew/onrightclick.cpp:991
+#: pcbnew/onrightclick.cpp:989
 msgid "Use Netclass Values"
 msgstr "使用网络类值"
 
-#: pcbnew/onrightclick.cpp:992
+#: pcbnew/onrightclick.cpp:990
 msgid "Use track and via sizes from their Netclass values"
 msgstr "使用布线和过孔的网络类值"
 
-#: pcbnew/onrightclick.cpp:998
+#: pcbnew/onrightclick.cpp:996
 #, c-format
 msgid "Track %s"
 msgstr "布线 %s"
 
-#: pcbnew/onrightclick.cpp:1001 pcbnew/onrightclick.cpp:1023
+#: pcbnew/onrightclick.cpp:999 pcbnew/onrightclick.cpp:1021
 msgid " uses NetClass"
 msgstr "使用网络类"
 
-#: pcbnew/onrightclick.cpp:1015
+#: pcbnew/onrightclick.cpp:1013
 #, c-format
 msgid "Via %s"
 msgstr "过孔 %s"
 
-#: pcbnew/onrightclick.cpp:1019
+#: pcbnew/onrightclick.cpp:1017
 #, c-format
 msgid "Via %s, drill %s"
 msgstr "过孔 %s;钻孔 %s"
@@ -24228,31 +24459,31 @@ msgstr "过孔 %s;钻孔 %s"
 msgid "Delete pad (footprint %s %s)?"
 msgstr "删除焊盘(封装 %s %s)？"
 
-#: pcbnew/pcb_base_frame.cpp:193
+#: pcbnew/pcb_base_frame.cpp:194
 msgid "Error loading project footprint libraries"
 msgstr "加载工程封装库时出错"
 
-#: pcbnew/pcb_base_frame.cpp:665
+#: pcbnew/pcb_base_frame.cpp:695
 msgid "Display rectangular coordinates"
 msgstr "显示直角坐标"
 
-#: pcbnew/pcb_base_frame.cpp:678
+#: pcbnew/pcb_base_frame.cpp:708
 msgid "Show pads in fill mode"
 msgstr "在填充模式下显示焊盘"
 
-#: pcbnew/pcb_base_frame.cpp:694
+#: pcbnew/pcb_base_frame.cpp:724
 msgid "Show outlines in filled mode"
 msgstr "在填充模式下显示轮廓"
 
-#: pcbnew/pcb_base_frame.cpp:695
+#: pcbnew/pcb_base_frame.cpp:725
 msgid "Show outlines in sketch mode"
 msgstr "在草图模式下显示轮廓"
 
-#: pcbnew/pcb_base_frame.cpp:707
+#: pcbnew/pcb_base_frame.cpp:737
 msgid "Show texts in filled mode"
 msgstr "在填充模式下显示文本"
 
-#: pcbnew/pcb_base_frame.cpp:708
+#: pcbnew/pcb_base_frame.cpp:738
 msgid "Show texts in sketch mode"
 msgstr "在草图模式下显示文本"
 
@@ -24261,15 +24492,15 @@ msgstr "在草图模式下显示文本"
 msgid "The auto save file \"%s\" could not be removed!"
 msgstr "自动保存文件 '%s' 不能被删除！"
 
-#: pcbnew/pcb_edit_frame.cpp:1016
+#: pcbnew/pcb_edit_frame.cpp:1014
 msgid " [Unsaved]"
 msgstr " [未保存]"
 
-#: pcbnew/pcb_edit_frame.cpp:1018 pcbnew/pcbnew_config.cpp:99
+#: pcbnew/pcb_edit_frame.cpp:1016 pcbnew/pcbnew_config.cpp:99
 msgid "Pcbnew"
 msgstr "Pcbnew"
 
-#: pcbnew/pcb_edit_frame.cpp:1128
+#: pcbnew/pcb_edit_frame.cpp:1126
 msgid ""
 "Cannot update the PCB, because Pcbnew is opened in stand-alone mode. In "
 "order to create or update PCBs from schematics, you need to launch the KiCad "
@@ -24278,7 +24509,7 @@ msgstr ""
 "无法更新PCB，因为Pcbnew在独立模式下打开。为了从原理图中创建或更新PCB，您需要"
 "启动KiCad工程管理器并创建一个PCB工程。"
 
-#: pcbnew/pcb_edit_frame.cpp:1166
+#: pcbnew/pcb_edit_frame.cpp:1164
 #, c-format
 msgid "Schematic file \"%s\" not found."
 msgstr "没有找到原理图文件 \"%s\"。"
@@ -24415,10 +24646,6 @@ msgstr "锚点"
 msgid "Show footprint and text origins as a cross"
 msgstr "在封装和文字中央显示一个小十字"
 
-#: pcbnew/pcb_layer_widget.cpp:89
-msgid "Cursor"
-msgstr "光标"
-
 #: pcbnew/pcb_layer_widget.cpp:89
 msgid "PCB Cursor"
 msgstr "PCB光标"
@@ -24612,7 +24839,7 @@ msgstr ""
 msgid "Duplicate NETCLASS name \"%s\" in file \"%s\" at line %d, offset %d"
 msgstr "重复网络类名称 \"%s\" 在文件 <%s> 的 %d,行 位移 %d"
 
-#: pcbnew/pcb_parser.cpp:1814
+#: pcbnew/pcb_parser.cpp:1822
 #, c-format
 msgid ""
 "Invalid footprint ID in\n"
@@ -24625,14 +24852,14 @@ msgstr ""
 "行: %d\n"
 "偏移: %d"
 
-#: pcbnew/pcb_parser.cpp:2065
+#: pcbnew/pcb_parser.cpp:2073
 #, c-format
 msgid "Cannot handle footprint text type %s"
 msgstr "无法处理封装文本类型 %s"
 
-#: pcbnew/pcb_parser.cpp:2490 pcbnew/pcb_parser.cpp:2496
-#: pcbnew/pcb_parser.cpp:2725 pcbnew/pcb_parser.cpp:2807
-#: pcbnew/pcb_parser.cpp:2871
+#: pcbnew/pcb_parser.cpp:2504 pcbnew/pcb_parser.cpp:2510
+#: pcbnew/pcb_parser.cpp:2740 pcbnew/pcb_parser.cpp:2822
+#: pcbnew/pcb_parser.cpp:2886
 #, c-format
 msgid ""
 "Invalid net ID in\n"
@@ -24645,7 +24872,7 @@ msgstr ""
 "行: %d\n"
 "位移: %d"
 
-#: pcbnew/pcb_parser.cpp:3197
+#: pcbnew/pcb_parser.cpp:3212
 #, c-format
 msgid ""
 "There is a zone that belongs to a not existing net\n"
@@ -24821,12 +25048,12 @@ msgstr "调整："
 msgid "?"
 msgstr "?"
 
-#: pcbnew/router/pns_kicad_iface.cpp:800
+#: pcbnew/router/pns_kicad_iface.cpp:793
 #, c-format
 msgid "Malformed keep-out zone at (%d, %d)"
 msgstr "畸形的禁布区在(%d, %d)"
 
-#: pcbnew/router/pns_kicad_iface.cpp:803
+#: pcbnew/router/pns_kicad_iface.cpp:796
 #, c-format
 msgid ""
 "%s\n"
@@ -24837,7 +25064,7 @@ msgstr ""
 "无法通过 \"跟踪布局\" 工具来处理此区域。\n"
 "请验证它不是自相交多边形。"
 
-#: pcbnew/router/pns_kicad_iface.cpp:1204
+#: pcbnew/router/pns_kicad_iface.cpp:1197
 msgid "Added a track"
 msgstr "新增了一条布线"
 
@@ -24865,7 +25092,7 @@ msgstr "太短: 歪斜"
 msgid "Tuned: skew "
 msgstr "调整: 歪斜"
 
-#: pcbnew/router/pns_router.cpp:175
+#: pcbnew/router/pns_router.cpp:178
 msgid "Cannot start routing inside a keepout area or board outline."
 msgstr "无法在禁止区或板框内开始布线。"
 
@@ -25097,11 +25324,11 @@ msgstr "布线"
 msgid "Router Differential Pair"
 msgstr "差分对布线"
 
-#: pcbnew/router/router_tool.cpp:1008 pcbnew/router/router_tool.cpp:1162
+#: pcbnew/router/router_tool.cpp:1008 pcbnew/router/router_tool.cpp:1156
 msgid "The selected item is locked."
 msgstr "选择的项目被锁定。"
 
-#: pcbnew/router/router_tool.cpp:1010 pcbnew/router/router_tool.cpp:1164
+#: pcbnew/router/router_tool.cpp:1010 pcbnew/router/router_tool.cpp:1158
 msgid "Drag Anyway"
 msgstr "仍然拖动"
 
@@ -25109,6 +25336,10 @@ msgstr "仍然拖动"
 msgid "Warning: top and bottom layers are same."
 msgstr "警告: 顶层和底层相同。"
 
+#: pcbnew/specctra_import_export/specctra_export.cpp:95
+msgid "Specctra DSN File"
+msgstr "Specctra DSN 文件"
+
 #: pcbnew/specctra_import_export/specctra_export.cpp:157
 msgid "BOARD exported OK."
 msgstr "电路板导出成功。"
@@ -25197,7 +25428,7 @@ msgstr "方法为找到 \"%s\",或不可调用"
 msgid "Unknown Method"
 msgstr "未知方法"
 
-#: pcbnew/swig/pcbnew_action_plugins.cpp:340
+#: pcbnew/swig/pcbnew_action_plugins.cpp:336
 #, c-format
 msgid ""
 "(PCB_EDIT_FRAME::OnActionPlugin) needs work: BOARD_ITEM type (%d) not handled"
@@ -25220,10 +25451,6 @@ msgstr "新建封装"
 msgid "New footprint using footprint wizard"
 msgstr "使用封装向导新建封装"
 
-#: pcbnew/tool_footprint_editor.cpp:61
-msgid "Save footprint in existing library"
-msgstr "保存封装到现有的库中"
-
 #: pcbnew/tool_footprint_editor.cpp:66
 msgid "Print footprint"
 msgstr "打印封装"
@@ -25245,30 +25472,26 @@ msgid "Load footprint from current board"
 msgstr "从当前电路板打开封装"
 
 #: pcbnew/tool_footprint_editor.cpp:106
-msgid "Update footprint into current board"
-msgstr "更新当前电路板封装"
-
-#: pcbnew/tool_footprint_editor.cpp:110
 msgid "Insert footprint into current board"
 msgstr "插入封装放置到当前电路板"
 
-#: pcbnew/tool_footprint_editor.cpp:116
+#: pcbnew/tool_footprint_editor.cpp:112
 msgid "Check footprint"
 msgstr "检查封装"
 
-#: pcbnew/tool_footprint_editor.cpp:193
+#: pcbnew/tool_footprint_editor.cpp:205
 msgid "Display Polar Coord ON"
 msgstr "显示极坐标: 开启"
 
-#: pcbnew/tool_footprint_editor.cpp:217
+#: pcbnew/tool_footprint_editor.cpp:222
 msgid "Show Pads Sketch"
 msgstr "显示焊盘草图"
 
-#: pcbnew/tool_footprint_editor.cpp:221
+#: pcbnew/tool_footprint_editor.cpp:226
 msgid "Show Texts Sketch"
 msgstr "显示文本草图"
 
-#: pcbnew/tool_footprint_editor.cpp:225
+#: pcbnew/tool_footprint_editor.cpp:230
 msgid "Show Edges Sketch"
 msgstr "显示边框草图"
 
@@ -25276,39 +25499,39 @@ msgstr "显示边框草图"
 msgid "Select footprint to browse"
 msgstr "选择封装并查看"
 
-#: pcbnew/tool_footprint_viewer.cpp:59
+#: pcbnew/tool_footprint_viewer.cpp:65
 msgid "Display previous footprint"
 msgstr "显示上一个封装"
 
-#: pcbnew/tool_footprint_viewer.cpp:63
+#: pcbnew/tool_footprint_viewer.cpp:69
 msgid "Display next footprint"
 msgstr "显示下一个封装"
 
-#: pcbnew/tool_footprint_viewer.cpp:94
+#: pcbnew/tool_footprint_viewer.cpp:99
 msgid "Insert footprint in board"
 msgstr "将封装放置到电路板"
 
-#: pcbnew/tool_footprint_viewer.cpp:126
+#: pcbnew/tool_footprint_viewer.cpp:147
 msgid "Close footprint viewer"
 msgstr "关闭封装浏览器"
 
-#: pcbnew/tool_footprint_viewer.cpp:140
+#: pcbnew/tool_footprint_viewer.cpp:161
 msgid "&Fit on Screen"
 msgstr "适应窗口(&F)"
 
-#: pcbnew/tool_footprint_viewer.cpp:151
+#: pcbnew/tool_footprint_viewer.cpp:172
 msgid "3&D Viewer"
 msgstr "3D查看器(&D)"
 
-#: pcbnew/tool_footprint_viewer.cpp:161
+#: pcbnew/tool_footprint_viewer.cpp:182
 msgid "Open the Pcbnew manual"
 msgstr "打开Pcbnew用户手册"
 
-#: pcbnew/tool_footprint_viewer.cpp:172
+#: pcbnew/tool_footprint_viewer.cpp:193
 msgid "&About Pcbnew"
 msgstr "关于 Pcbnew (&A)"
 
-#: pcbnew/tool_footprint_viewer.cpp:173
+#: pcbnew/tool_footprint_viewer.cpp:194
 msgid "About Pcbnew PCB designer"
 msgstr "关于PCBNew PCB设计"
 
@@ -25380,7 +25603,7 @@ msgstr "添加 封装"
 msgid "Route tracks"
 msgstr "布线"
 
-#: pcbnew/tool_pcb_editor.cpp:457 pcbnew/tools/drawing_tool.cpp:1697
+#: pcbnew/tool_pcb_editor.cpp:457 pcbnew/tools/drawing_tool.cpp:1735
 msgid "Add vias"
 msgstr "添加过孔"
 
@@ -25446,6 +25669,26 @@ msgstr "布线 %.3f mm (%.2f mils)"
 msgid "Track: %.2f mils (%.3f mm)"
 msgstr "布线: %.2f mils (%.3f mm)"
 
+#: pcbnew/tool_pcb_editor.cpp:689
+#, c-format
+msgid "%.2f / %.2f mm"
+msgstr "%.2f / %.2f mm"
+
+#: pcbnew/tool_pcb_editor.cpp:691
+#, c-format
+msgid "%.2f mm"
+msgstr "%.2f mm"
+
+#: pcbnew/tool_pcb_editor.cpp:697
+#, c-format
+msgid "%.1f / %.1f mils"
+msgstr "%.1f / %.1f mils"
+
+#: pcbnew/tool_pcb_editor.cpp:699
+#, c-format
+msgid "%.1f mils"
+msgstr "%.1f mils"
+
 #: pcbnew/tool_pcb_editor.cpp:701
 #, c-format
 msgid "Via: %s (%s)"
@@ -25493,7 +25736,7 @@ msgstr "正常显示模式"
 msgid "High contrast display mode"
 msgstr "高对比度的显示模式"
 
-#: pcbnew/tools/drawing_tool.cpp:71 pcbnew/tools/drawing_tool.cpp:1107
+#: pcbnew/tools/drawing_tool.cpp:71 pcbnew/tools/drawing_tool.cpp:1119
 msgid "Draw a line"
 msgstr "绘制 线"
 
@@ -25501,11 +25744,11 @@ msgstr "绘制 线"
 msgid "Draw a graphic polygon"
 msgstr "绘制多边形"
 
-#: pcbnew/tools/drawing_tool.cpp:79 pcbnew/tools/drawing_tool.cpp:278
+#: pcbnew/tools/drawing_tool.cpp:79 pcbnew/tools/drawing_tool.cpp:276
 msgid "Draw a circle"
 msgstr "绘制 圆"
 
-#: pcbnew/tools/drawing_tool.cpp:83 pcbnew/tools/drawing_tool.cpp:310
+#: pcbnew/tools/drawing_tool.cpp:83 pcbnew/tools/drawing_tool.cpp:307
 msgid "Draw an arc"
 msgstr "绘制 圆弧"
 
@@ -25569,11 +25812,11 @@ msgstr "删除当前项目中添加的最后一个点"
 msgid "Close the outline of a zone in progress"
 msgstr "闭合覆铜区域边界"
 
-#: pcbnew/tools/drawing_tool.cpp:241
+#: pcbnew/tools/drawing_tool.cpp:240
 msgid "Draw a line segment"
 msgstr "画一条线段"
 
-#: pcbnew/tools/drawing_tool.cpp:449
+#: pcbnew/tools/drawing_tool.cpp:446
 msgid "Place a text"
 msgstr "放置文本"
 
@@ -25597,120 +25840,120 @@ msgstr "放置DXF图形"
 msgid "Move the footprint reference anchor"
 msgstr "移动封装参考锚点"
 
-#: pcbnew/tools/drawing_tool.cpp:1338 pcbnew/tools/point_editor.cpp:251
+#: pcbnew/tools/drawing_tool.cpp:1406 pcbnew/tools/point_editor.cpp:252
 msgid "Self-intersecting polygons are not allowed"
 msgstr "不允许自相交多边形"
 
-#: pcbnew/tools/drawing_tool.cpp:1699
+#: pcbnew/tools/drawing_tool.cpp:1737
 msgid "Place via"
 msgstr "放置过孔"
 
-#: pcbnew/tools/edit_tool.cpp:82
+#: pcbnew/tools/edit_tool.cpp:78
 msgid "Open in Footprint Editor"
 msgstr "在封装编辑器中打开"
 
-#: pcbnew/tools/edit_tool.cpp:83
+#: pcbnew/tools/edit_tool.cpp:79
 msgid "Opens the selected footprint in the Footprint Editor"
 msgstr "在封装编辑器中打开选择的封装"
 
-#: pcbnew/tools/edit_tool.cpp:88
+#: pcbnew/tools/edit_tool.cpp:84
 msgid "Edit Activate"
 msgstr "编辑激活"
 
-#: pcbnew/tools/edit_tool.cpp:92
+#: pcbnew/tools/edit_tool.cpp:88
 msgid "Moves the selected item(s)"
 msgstr "移动选择项"
 
-#: pcbnew/tools/edit_tool.cpp:96
+#: pcbnew/tools/edit_tool.cpp:92
 msgid "Duplicates the selected item(s)"
 msgstr "复制选择项"
 
-#: pcbnew/tools/edit_tool.cpp:100
+#: pcbnew/tools/edit_tool.cpp:96
 msgid "Duplicates the selected item(s), incrementing pad numbers"
 msgstr "复制选择项目, 增量焊盘编号"
 
-#: pcbnew/tools/edit_tool.cpp:104
+#: pcbnew/tools/edit_tool.cpp:100
 msgid "Moves the selected item(s) by an exact amount"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/edit_tool.cpp:109
+#: pcbnew/tools/edit_tool.cpp:105
 msgid "Create array"
 msgstr "创建阵列"
 
-#: pcbnew/tools/edit_tool.cpp:113 qa/common/mocks.cpp:317
+#: pcbnew/tools/edit_tool.cpp:109 qa/qa_utils/mocks.cpp:321
 msgid "Rotates selected item(s) clockwise"
 msgstr "将选中的项目顺时针旋转"
 
-#: pcbnew/tools/edit_tool.cpp:118 qa/common/mocks.cpp:322
+#: pcbnew/tools/edit_tool.cpp:114 qa/qa_utils/mocks.cpp:326
 msgid "Rotates selected item(s) counterclockwise"
 msgstr "将选中的项目逆时针旋转"
 
-#: pcbnew/tools/edit_tool.cpp:123 qa/common/mocks.cpp:273
+#: pcbnew/tools/edit_tool.cpp:119 qa/qa_utils/mocks.cpp:273
 msgid "Flips selected item(s)"
 msgstr "翻转选择项"
 
-#: pcbnew/tools/edit_tool.cpp:127
+#: pcbnew/tools/edit_tool.cpp:123
 msgid "Mirrors selected item"
 msgstr "镜像选择项"
 
-#: pcbnew/tools/edit_tool.cpp:131 pcbnew/tools/edit_tool.cpp:136
+#: pcbnew/tools/edit_tool.cpp:127 pcbnew/tools/edit_tool.cpp:132
 msgid "Deletes selected item(s)"
 msgstr "删除选择项"
 
-#: pcbnew/tools/edit_tool.cpp:136
+#: pcbnew/tools/edit_tool.cpp:132
 msgid "Delete (Alternative)"
 msgstr "删除(替换)"
 
-#: pcbnew/tools/edit_tool.cpp:141
+#: pcbnew/tools/edit_tool.cpp:137
 msgid "Update the footprint from the library"
 msgstr "从库中更新封装"
 
-#: pcbnew/tools/edit_tool.cpp:146
+#: pcbnew/tools/edit_tool.cpp:142
 msgid "Assign a different footprint from the library"
 msgstr "从库中分配不同的封装"
 
-#: pcbnew/tools/edit_tool.cpp:151 qa/common/mocks.cpp:278
+#: pcbnew/tools/edit_tool.cpp:147 qa/qa_utils/mocks.cpp:278
 msgid "Properties..."
 msgstr "属性..."
 
-#: pcbnew/tools/edit_tool.cpp:151 qa/common/mocks.cpp:278
+#: pcbnew/tools/edit_tool.cpp:147 qa/qa_utils/mocks.cpp:278
 msgid "Displays item properties dialog"
 msgstr "显示项属性对话框"
 
-#: pcbnew/tools/edit_tool.cpp:159
+#: pcbnew/tools/edit_tool.cpp:155
 msgid "Measuring Tool"
 msgstr "测量工具"
 
-#: pcbnew/tools/edit_tool.cpp:164
+#: pcbnew/tools/edit_tool.cpp:160
 msgid "Copy selected content to clipboard"
 msgstr "将选定内容复制到剪贴板"
 
-#: pcbnew/tools/edit_tool.cpp:169
+#: pcbnew/tools/edit_tool.cpp:165
 msgid "Cut selected content to clipboard"
 msgstr "将选定的内容剪切到剪贴板"
 
-#: pcbnew/tools/edit_tool.cpp:611
+#: pcbnew/tools/edit_tool.cpp:602
 msgid "Edit track width/via size"
 msgstr "编辑布线宽度/过孔尺寸"
 
-#: pcbnew/tools/edit_tool.cpp:965
+#: pcbnew/tools/edit_tool.cpp:975
 msgid "Move exact"
 msgstr "精确移动"
 
-#: pcbnew/tools/edit_tool.cpp:1040
+#: pcbnew/tools/edit_tool.cpp:1052
 #, c-format
 msgid "Duplicated %d item(s)"
 msgstr "复制 %d 项"
 
-#: pcbnew/tools/edit_tool.cpp:1387
+#: pcbnew/tools/edit_tool.cpp:1380
 msgid "Select reference point for the copy..."
 msgstr "为副本选择参考点..."
 
-#: pcbnew/tools/edit_tool.cpp:1392
+#: pcbnew/tools/edit_tool.cpp:1385
 msgid "Selection copied."
 msgstr "选择复制。"
 
-#: pcbnew/tools/edit_tool.cpp:1399
+#: pcbnew/tools/edit_tool.cpp:1392
 msgid "Copy cancelled."
 msgstr "复制取消。"
 
@@ -25723,7 +25966,7 @@ msgid "Add a pad"
 msgstr "添加焊盘"
 
 #: pcbnew/tools/footprint_editor_tools.cpp:67
-#: pcbnew/tools/footprint_editor_tools.cpp:479
+#: pcbnew/tools/footprint_editor_tools.cpp:486
 msgid "Create Pad from Selected Shapes"
 msgstr "从选定的形状创建焊盘"
 
@@ -25747,27 +25990,27 @@ msgstr "焊盘重新编号..."
 msgid "Renumber pads by clicking on them in the desired order"
 msgstr "按所需顺序单击它们重新编号"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:114
+#: pcbnew/tools/footprint_editor_tools.cpp:121
 msgid "Add pads"
 msgstr "添加 焊盘"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:118
+#: pcbnew/tools/footprint_editor_tools.cpp:125
 msgid "Place pad"
 msgstr "放置焊盘"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:152
+#: pcbnew/tools/footprint_editor_tools.cpp:159
 msgid "Click on successive pads to renumber them"
 msgstr "单击连续的焊盘重新编号"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:238
+#: pcbnew/tools/footprint_editor_tools.cpp:245
 msgid "Renumber pads"
 msgstr "焊盘重新编号"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:313
+#: pcbnew/tools/footprint_editor_tools.cpp:320
 msgid "Explode pad to shapes"
 msgstr "将焊盘分解成形状"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:388
+#: pcbnew/tools/footprint_editor_tools.cpp:395
 msgid ""
 "Cannot convert items to a custom-shaped pad:\n"
 "selection contains more than one reference pad."
@@ -25775,7 +26018,7 @@ msgstr ""
 "无法将项目转换为自定义形状的焊盘：\n"
 "选择中包含多个参考焊盘。"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:396
+#: pcbnew/tools/footprint_editor_tools.cpp:403
 msgid ""
 "Cannot convert items to a custom-shaped pad:\n"
 "selection contains unsupported items.\n"
@@ -25785,7 +26028,7 @@ msgstr ""
 "选择中有包含不受支持的项目。\n"
 "只允许图形线条，圆形，弧形和多边形。"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:442
+#: pcbnew/tools/footprint_editor_tools.cpp:449
 msgid ""
 "Cannot convert items to a custom-shaped pad:\n"
 "unable to determine the anchor point position.\n"
@@ -25795,7 +26038,7 @@ msgstr ""
 "无法确定锚点位置。\n"
 "考虑在选择中添加一个小锚点，然后重试。"
 
-#: pcbnew/tools/footprint_editor_tools.cpp:465
+#: pcbnew/tools/footprint_editor_tools.cpp:472
 msgid ""
 "Cannot convert items to a custom-shaped pad:\n"
 "selected items do not form a single solid shape."
@@ -25839,70 +26082,71 @@ msgstr "将先前复制的属性替换为当前焊盘属性"
 msgid "Copy the current pad's properties to other pads"
 msgstr "复制当前焊盘属性到其他焊盘"
 
-#: pcbnew/tools/pcb_editor_control.cpp:96
+#: pcbnew/tools/pcb_editor_control.cpp:92
 msgid "Merge Zones"
 msgstr "合并区域"
 
-#: pcbnew/tools/pcb_editor_control.cpp:96
-#: pcbnew/tools/pcb_editor_control.cpp:752
+#: pcbnew/tools/pcb_editor_control.cpp:92
+#: pcbnew/tools/pcb_editor_control.cpp:755
 msgid "Merge zones"
 msgstr "合并区域"
 
-#: pcbnew/tools/pcb_editor_control.cpp:100
+#: pcbnew/tools/pcb_editor_control.cpp:96
 msgid "Duplicate zone outline onto a different layer"
 msgstr "复制覆铜区域轮廓到不同的层上"
 
-#: pcbnew/tools/pcb_editor_control.cpp:106
+#: pcbnew/tools/pcb_editor_control.cpp:101
 msgid "Add Layer Alignment Target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_editor_control.cpp:106
+#: pcbnew/tools/pcb_editor_control.cpp:101
 msgid "Add a layer alignment target"
 msgstr "添加层对齐标记"
 
-#: pcbnew/tools/pcb_editor_control.cpp:110
+#: pcbnew/tools/pcb_editor_control.cpp:105
 msgid "Add a footprint"
 msgstr "添加封装"
 
-#: pcbnew/tools/pcb_editor_control.cpp:126
+#: pcbnew/tools/pcb_editor_control.cpp:121
 msgid "Lock"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_editor_control.cpp:130
+#: pcbnew/tools/pcb_editor_control.cpp:125
 msgid "Unlock"
 msgstr "解锁"
 
-#: pcbnew/tools/pcb_editor_control.cpp:217
+#: pcbnew/tools/pcb_editor_control.cpp:216
 msgid "Locking"
 msgstr "锁定"
 
-#: pcbnew/tools/pcb_editor_control.cpp:484
+#: pcbnew/tools/pcb_editor_control.cpp:487
 msgid "Place a module"
 msgstr "放置模块"
 
-#: pcbnew/tools/pcb_editor_control.cpp:636
+#: pcbnew/tools/pcb_editor_control.cpp:639
 msgid "Place a layer alignment target"
 msgstr "放置层对齐标记"
 
-#: pcbnew/tools/pcb_editor_control.cpp:807
+#: pcbnew/tools/pcb_editor_control.cpp:810
 msgid "Duplicate zone"
 msgstr "复制区域"
 
-#: pcbnew/tools/pcb_editor_control.cpp:1102
+#: pcbnew/tools/pcb_editor_control.cpp:1124
 msgid "Pick Components for Local Ratsnest"
 msgstr "为局部牵拉线选择元件"
 
-#: pcbnew/tools/pcbnew_control.cpp:243
+#: pcbnew/tools/pcbnew_control.cpp:208
 msgid "Paste content from clipboard"
 msgstr "从剪贴板粘贴内容"
 
-#: pcbnew/tools/pcbnew_control.cpp:904
+#: pcbnew/tools/pcbnew_control.cpp:768
 msgid "Invalid clipboard contents"
 msgstr "无效的剪贴板内容"
 
-#: pcbnew/tools/pcbnew_control.cpp:1087 qa/common/pcb_test_frame.cpp:150
+#: pcbnew/tools/pcbnew_control.cpp:951
 #: qa/polygon_generator/test_polygon_generator.cpp:50
-#: qa/polygon_triangulation/test_polygon_triangulation.cpp:210
+#: qa/polygon_triangulation/test_polygon_triangulation.cpp:212
+#: qa/qa_utils/pcb_test_frame.cpp:150
 #, c-format
 msgid ""
 "Error loading board.\n"
@@ -25911,7 +26155,7 @@ msgstr ""
 "电路板载入错误.\n"
 "%s"
 
-#: pcbnew/tools/pcbnew_control.cpp:1125
+#: pcbnew/tools/pcbnew_control.cpp:989
 msgid "Not available in OpenGL/Cairo canvases."
 msgstr "OpenGL/Cairo绘图模式下无法使用."
 
@@ -25979,71 +26223,67 @@ msgstr "垂直分布"
 msgid "Distributes selected items along the vertical axis"
 msgstr "所选项沿垂直轴分布"
 
-#: pcbnew/tools/placement_tool.cpp:107
+#: pcbnew/tools/placement_tool.cpp:110
 msgid "Align/Distribute"
 msgstr "对齐/分布"
 
-#: pcbnew/tools/placement_tool.cpp:241 pcbnew/tools/selection_tool.cpp:735
-msgid "Selection contains locked items. Do you want to continue?"
-msgstr "选择包含锁定项, 你要继续吗?"
-
-#: pcbnew/tools/placement_tool.cpp:290
+#: pcbnew/tools/placement_tool.cpp:220
 msgid "Align to top"
 msgstr "顶部对齐"
 
-#: pcbnew/tools/placement_tool.cpp:330
+#: pcbnew/tools/placement_tool.cpp:257
 msgid "Align to bottom"
 msgstr "底部对齐"
 
-#: pcbnew/tools/placement_tool.cpp:385
+#: pcbnew/tools/placement_tool.cpp:309
 msgid "Align to left"
 msgstr "左对齐"
 
-#: pcbnew/tools/placement_tool.cpp:440
+#: pcbnew/tools/placement_tool.cpp:361
 msgid "Align to right"
 msgstr "右对齐:"
 
-#: pcbnew/tools/placement_tool.cpp:481
+#: pcbnew/tools/placement_tool.cpp:399
 msgid "Align to middle"
 msgstr "居中对齐"
 
-#: pcbnew/tools/placement_tool.cpp:522
+#: pcbnew/tools/placement_tool.cpp:437
 msgid "Align to center"
 msgstr "居中对齐"
 
-#: pcbnew/tools/placement_tool.cpp:572
+#: pcbnew/tools/placement_tool.cpp:485
 msgid "Distribute horizontally"
 msgstr "水平分布"
 
-#: pcbnew/tools/placement_tool.cpp:658
+#: pcbnew/tools/placement_tool.cpp:581
 msgid "Distribute vertically"
 msgstr "垂直分布"
 
-#: pcbnew/tools/point_editor.cpp:54
+#: pcbnew/tools/point_editor.cpp:55
 msgid "Create a corner"
 msgstr "建立拐角"
 
-#: pcbnew/tools/point_editor.cpp:58
+#: pcbnew/tools/point_editor.cpp:59
 msgid "Remove Corner"
 msgstr "移除拐角"
 
-#: pcbnew/tools/point_editor.cpp:58
+#: pcbnew/tools/point_editor.cpp:59
 msgid "Remove corner"
 msgstr "移除拐角"
 
-#: pcbnew/tools/point_editor.cpp:372
+#: pcbnew/tools/point_editor.cpp:391
 msgid "Drag a corner"
 msgstr "拖动拐角"
 
-#: pcbnew/tools/point_editor.cpp:999
+#: pcbnew/tools/point_editor.cpp:1041
 msgid "Add a zone corner"
 msgstr "添加覆铜区域拐角"
 
-#: pcbnew/tools/point_editor.cpp:1038
+#: pcbnew/tools/point_editor.cpp:1073
 msgid "Split segment"
 msgstr "分割线段"
 
-#: pcbnew/tools/point_editor.cpp:1111
+#: pcbnew/tools/point_editor.cpp:1145
 msgid "Remove a zone/polygon corner"
 msgstr "删除区域/多边形的拐角"
 
@@ -26055,11 +26295,11 @@ msgstr "相対位置..."
 msgid "Positions the selected item(s) by an exact amount relative to another"
 msgstr "精确移动选择项"
 
-#: pcbnew/tools/position_relative_tool.cpp:120
+#: pcbnew/tools/position_relative_tool.cpp:127
 msgid "Position Relative"
 msgstr "相対位置"
 
-#: pcbnew/tools/position_relative_tool.cpp:138
+#: pcbnew/tools/position_relative_tool.cpp:145
 msgid "Select reference item..."
 msgstr "选择参考项目..."
 
@@ -26130,7 +26370,11 @@ msgstr "过滤器选择..."
 msgid "Filter the types of items in the selection"
 msgstr "过滤选中的项目类型"
 
-#: pcbnew/tools/selection_tool.cpp:1342
+#: pcbnew/tools/selection_tool.cpp:764
+msgid "Selection contains locked items. Do you want to continue?"
+msgstr "选择包含锁定项, 你要继续吗?"
+
+#: pcbnew/tools/selection_tool.cpp:1367
 msgid "Filter selection"
 msgstr "选择过滤"
 
@@ -26178,55 +26422,55 @@ msgstr "取消所有填充"
 msgid "Unfill all zones"
 msgstr "取消所有填充区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:116
+#: pcbnew/tools/zone_filler_tool.cpp:122
 msgid "Fill All Zones"
 msgstr "填充所有区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:145
+#: pcbnew/tools/zone_filler_tool.cpp:153
 msgid "Unfill Zone"
 msgstr "取消填充区域"
 
-#: pcbnew/tools/zone_filler_tool.cpp:163
+#: pcbnew/tools/zone_filler_tool.cpp:200
 msgid "Unfill All Zones"
 msgstr "取消所有填充区域"
 
-#: pcbnew/tracks_cleaner.cpp:169 pcbnew/tracks_cleaner.cpp:741
+#: pcbnew/tracks_cleaner.cpp:169 pcbnew/tracks_cleaner.cpp:740
 msgid "Board cleanup"
 msgstr "板清理"
 
-#: pcbnew/zone_filler.cpp:114
+#: pcbnew/zone_filler.cpp:108
 msgid "Checking zone fills..."
 msgstr "检查填充区域..."
 
-#: pcbnew/zone_filler.cpp:161
+#: pcbnew/zone_filler.cpp:159
 msgid "Removing insulated copper islands..."
 msgstr "移除铜孤岛..."
 
-#: pcbnew/zone_filler.cpp:196
+#: pcbnew/zone_filler.cpp:208
 msgid "Zone fills are out-of-date. Refill?"
 msgstr "覆铜区域已失效，重新覆铜？"
 
-#: pcbnew/zone_filler.cpp:198
+#: pcbnew/zone_filler.cpp:210
 msgid "Refill"
 msgstr "重新填充"
 
-#: pcbnew/zone_filler.cpp:198
+#: pcbnew/zone_filler.cpp:210
 msgid "Continue without Refill"
 msgstr "继续重新填充"
 
-#: pcbnew/zone_filler.cpp:223
+#: pcbnew/zone_filler.cpp:232
 msgid "Performing polygon fills..."
 msgstr "执行多边形填充..."
 
-#: pcbnew/zone_filler.cpp:275
+#: pcbnew/zone_filler.cpp:284
 msgid "Performing segment fills..."
 msgstr "执行分段填充..."
 
-#: pcbnew/zone_filler.cpp:302
+#: pcbnew/zone_filler.cpp:334
 msgid "Committing changes..."
 msgstr "提交更改..."
 
-#: pcbnew/zone_filler.cpp:309
+#: pcbnew/zone_filler.cpp:342
 msgid "Fill Zone(s)"
 msgstr "填充区域"
 
@@ -26268,7 +26512,7 @@ msgstr "修改区域属性"
 msgid "Refill %d Zones"
 msgstr "重新填充 %d 覆铜区域"
 
-#: pcbnew/zones_by_polygon_fill_functions.cpp:120
+#: pcbnew/zones_by_polygon_fill_functions.cpp:119
 msgid "Checking Zones"
 msgstr "检查区域"
 
@@ -26356,6 +26600,25 @@ msgstr "不兼容的插件(缺少函数 'GetVersion')"
 msgid "missing function 'GetVersion'"
 msgstr "缺少函数 'GetVersion'"
 
+#: qa/pcb_parse_input/main.cpp:80
+msgid "displays help on the command line parameters"
+msgstr "在命令行参数上显示帮助"
+
+#: qa/pcb_parse_input/main.cpp:83
+msgid "print parsing information"
+msgstr "打印解析信息"
+
+#: qa/pcb_parse_input/main.cpp:85
+msgid "input file"
+msgstr "输入文件"
+
+#: qa/pcb_parse_input/main.cpp:108
+msgid ""
+"This program parses PCB files, either from the stdin stream or from the "
+"given filenames. This can be used either for standalone testing of the "
+"parser or for fuzz testing."
+msgstr ""
+
 #: resources/linux/appdata/kicad.appdata.xml:6
 #: resources/linux/mime/applications/kicad.desktop:10
 msgid "KiCad"
@@ -26372,9 +26635,13 @@ msgstr ""
 
 #: resources/linux/appdata/kicad.appdata.xml:11
 msgid "Suite EDA"
-msgstr ""
+msgstr "EDA套件"
 
-#: resources/linux/appdata/kicad.appdata.xml:23
+#: resources/linux/appdata/kicad.appdata.xml:12
+msgid "EDA Programpaket"
+msgstr "EDA程序包"
+
+#: resources/linux/appdata/kicad.appdata.xml:24
 msgid ""
 "A Cross Platform and Open Source Electronics Design Automation Suite. The "
 "programs handle Schematic Capture, and PCB Layout with Gerber output."
@@ -26382,7 +26649,7 @@ msgstr ""
 "跨平台和开源电子设计自动化套件。这些程序处理原理图绘制，PCB设计和Gerber文件输"
 "出。"
 
-#: resources/linux/appdata/kicad.appdata.xml:27
+#: resources/linux/appdata/kicad.appdata.xml:28
 msgid ""
 "KiCad ist eine Plattform übergreifende freie Software Lösung für "
 "Elektronische Design-Automation (EDA). KiCad enthält Programme zum "
@@ -26390,22 +26657,30 @@ msgid ""
 "als auch zum Export von Leiterplatten, z.B. per Gerber Format."
 msgstr ""
 
-#: resources/linux/appdata/kicad.appdata.xml:33
+#: resources/linux/appdata/kicad.appdata.xml:34
 msgid ""
 "KiCad è una soluzione software EDA (Electronic Design Automation) gratuita e "
 "multipiattaforma. Contiene programmi per lo sviluppo e la modifica di schemi "
 "elettrici e circuiti stampati esportabili in formato Gerber."
 msgstr ""
 
-#: resources/linux/appdata/kicad.appdata.xml:46
+#: resources/linux/appdata/kicad.appdata.xml:39
+msgid ""
+"KiCad är ett plattformslös och öppen källkods programpaket för elektronisk "
+"design automatisering. KiCad innehåller program för utveckling och "
+"redigering av kretsscheman och tryckta kretskort samt för export av "
+"kretskort, t.ex. med Gerber-format."
+msgstr ""
+
+#: resources/linux/appdata/kicad.appdata.xml:53
 msgid "Eeschema Schematic Editor"
 msgstr "Eeschema 原理图编辑器"
 
-#: resources/linux/appdata/kicad.appdata.xml:51
+#: resources/linux/appdata/kicad.appdata.xml:58
 msgid "PcbNew PCB Layout"
 msgstr "PcbNew PCB设计"
 
-#: resources/linux/appdata/kicad.appdata.xml:56
+#: resources/linux/appdata/kicad.appdata.xml:63
 msgid "PcbNew 3D Viewer"
 msgstr "PcbNew 3D查看器"
 
@@ -26477,46 +26752,46 @@ msgstr "PCB设计"
 msgid "KiCad printed circuit board layout (standalone)"
 msgstr "KiCad PCB设计(独立的)"
 
-#: utils/kicad2step/kicad2step.cpp:62
+#: utils/kicad2step/kicad2step.cpp:65
 msgid "pcb_filename"
 msgstr "pcb_filename"
 
-#: utils/kicad2step/kicad2step.cpp:64
+#: utils/kicad2step/kicad2step.cpp:67
 msgid "output filename"
 msgstr "输出文件名"
 
-#: utils/kicad2step/kicad2step.cpp:67
+#: utils/kicad2step/kicad2step.cpp:70
 msgid "IGES output (default STEP)"
 msgstr "IGES输出(默认步骤)"
 
-#: utils/kicad2step/kicad2step.cpp:70
+#: utils/kicad2step/kicad2step.cpp:73
 msgid "overwrite output file"
 msgstr "覆盖输出文件"
 
-#: utils/kicad2step/kicad2step.cpp:72
+#: utils/kicad2step/kicad2step.cpp:75
 msgid "Use Drill Origin for output origin"
 msgstr "使用网格原点输出原点"
 
-#: utils/kicad2step/kicad2step.cpp:74
+#: utils/kicad2step/kicad2step.cpp:77
 msgid "Use Grid Origin for output origin"
 msgstr "使用网格原点输出原点"
 
-#: utils/kicad2step/kicad2step.cpp:77
+#: utils/kicad2step/kicad2step.cpp:80
 msgid ""
 "User-specified output origin ex. 1x1in, 1x1inch, 25.4x25.4mm (default mm)"
 msgstr "用户指定的输出原点 ex.1x1in，1x1inch，25.4x25.4mm（默认mm）"
 
-#: utils/kicad2step/kicad2step.cpp:80
+#: utils/kicad2step/kicad2step.cpp:83
 msgid "exclude 3D models for components with 'virtual' attribute"
 msgstr "排除具有“虚拟”属性元件的3D模型"
 
-#: utils/kicad2step/kicad2step.cpp:83
+#: utils/kicad2step/kicad2step.cpp:86
 msgid ""
 "Minimum distance between points to treat them as separate ones (default 0.01 "
 "mm)"
 msgstr ""
 
-#: utils/kicad2step/kicad2step.cpp:85
+#: utils/kicad2step/kicad2step.cpp:88
 msgid "display this message"
 msgstr "显示此消息"
 
@@ -26528,6 +26803,247 @@ msgstr ""
 "3D搜索路径列表是空的;\n"
 "继续写空文件？"
 
+#~ msgid "Silk Screen Color"
+#~ msgstr "丝印颜色"
+
+#~ msgid ""
+#~ "The entire schematic could not be load.  Errors occurred attempting to "
+#~ "load hierarchical sheet schematics."
+#~ msgstr "整个原理图不能加载。 尝试加载层次原理图时发生错误。"
+
+#~ msgid "Change cursor shape (not supported in Legacy graphics)"
+#~ msgstr "更改光标形状(不支持传统图形)"
+
+#~ msgid ""
+#~ "Unable to find the next boundary segment with an endpoint of (%s mm, %s "
+#~ "mm). graphic outline must form a contiguous, closed polygon."
+#~ msgstr ""
+#~ "无法找到边框线段端点(%s mm, %s mm)的另一个线段连接端点\n"
+#~ "编辑线路板边框图形,使它成为边线连续的图形。"
+
+#~ msgid ""
+#~ "Unable to find the next graphic segment with an endpoint of (%s mm, %s "
+#~ "mm).\n"
+#~ "Edit graphics, making them contiguous polygons each."
+#~ msgstr ""
+#~ "无法找到禁布线段边框端点(%s mm, %s mm)的另一个线段连接端点\n"
+#~ "编辑禁布边框图形,使它成为边线连续的图形。"
+
+#~ msgid "Footprint Editor..."
+#~ msgstr "封装编辑器..."
+
+#~ msgid "%s current footprint (%s)"
+#~ msgstr "%s当前封装（%s）"
+
+#~ msgid "%s footprints with matching value (%s)"
+#~ msgstr "具有匹配值的 %s 封装（%s）"
+
+#~ msgid "Create zones of layer %s"
+#~ msgstr "创建 %s 层覆铜"
+
+#~ msgid "Use Touchpad to Pan"
+#~ msgstr "使用触摸板平移"
+
+#~ msgid "Block Rotate"
+#~ msgstr "旋转 块"
+
+#~ msgid "Block Mirror"
+#~ msgstr "镜像 块"
+
+#~ msgid "Accelerated Graphics"
+#~ msgstr "图形加速"
+
+#~ msgid "Pan and Zoom:"
+#~ msgstr "平移和缩放："
+
+#~ msgid "Line Width:"
+#~ msgstr "线宽："
+
+#~ msgid "Fill foreground"
+#~ msgstr "前景填充"
+
+#~ msgid "&Part ID notation:"
+#~ msgstr "部件ID符号(&P):"
+
+#~ msgid "&Show grid"
+#~ msgstr "显示网格(&S)"
+
+#~ msgid "Symbol \"%s\" already exists."
+#~ msgstr "符号\"%s\"已经存在。"
+
+#~ msgid "Symbol Library Editor"
+#~ msgstr "符号库编辑器"
+
+#~ msgid ""
+#~ "The revert operation cannot be undone!\n"
+#~ "\n"
+#~ "Revert changes?"
+#~ msgstr ""
+#~ "恢复操作不能撤消！\n"
+#~ "\n"
+#~ "还原更改？"
+
+#~ msgid "Clear current schematic hierarchy and start new schematic root sheet"
+#~ msgstr "清除当前层次原理图并启动新的原理图图页"
+
+#~ msgid "Save all sheets in schematic"
+#~ msgstr "保存原理图中所有图页"
+
+#~ msgid "Save current schematic sheet with new name"
+#~ msgstr "用新名称保存当前原理图页"
+
+#~ msgid "Save to a new name and/or location"
+#~ msgstr "保存到一个新的名称或位置"
+
+#~ msgid "Schematic file \"%s\" already exists, use Open instead"
+#~ msgstr "原理图文件 \"%s\" 已存在，使用开放式替代"
+
+#~ msgid "Symbol library editor"
+#~ msgstr "符号库编辑器"
+
+#~ msgid "Footprint library editor"
+#~ msgstr "封装库编辑器"
+
+#~ msgid "Worksheet layout editor"
+#~ msgstr "工作表布局编辑器"
+
+#~ msgid "Edit PCB Layout"
+#~ msgstr "编辑PCB"
+
+#~ msgid "Run PCB Calculator"
+#~ msgstr "运行PCB计算器"
+
+#~ msgid "Edit Page Layout"
+#~ msgstr "编辑页面布局"
+
+#~ msgid "Pl editor - Worksheet layout editor"
+#~ msgstr "Pl 编辑器 - 工作表布局编辑器"
+
+#~ msgid "Freeroute Help"
+#~ msgstr "FreeRoute 帮助"
+
+#~ msgid ""
+#~ "It appears that the Java run time environment is not installed on this "
+#~ "computer.  Java is required to use FreeRoute."
+#~ msgstr "似乎Java运行环境没有在此计算机上安装。 安装Java才能使用FreeRoute。"
+
+#~ msgid "Pcbnew Error"
+#~ msgstr "Pcbnew 错误"
+
+#~ msgid "Export/Import to/from FreeRoute:"
+#~ msgstr "从 FreeRoute 导出/导入 :"
+
+#~ msgid "Export a Specctra Design (*.dsn) File"
+#~ msgstr "导出SPECCTRA设计 (*.dsn) 文件"
+
+#~ msgid "Export a Specctra DSN file (to FreeRouter)"
+#~ msgstr "导出 Specctra DSN 文件到FreeRouter"
+
+#~ msgid "Export a Specctra Design and Launch FreeRoute"
+#~ msgstr "导出 Specctra设计并启动FreeRoute"
+
+#~ msgid ""
+#~ "FreeRouter can be run only if freeroute.jar is found in Kicad binaries "
+#~ "folder"
+#~ msgstr "FreeRouter 运行 freeroute.jar 只能存在于 Kicad 二进制目录"
+
+#~ msgid "Back Import the Specctra Session (*.ses) File"
+#~ msgstr "反向导入布线器会话文件 (*.ses)"
+
+#~ msgid "Merge a session file created by FreeRouter with the current board."
+#~ msgstr "FreeRouter从目前电路板创建一个会话文件."
+
+#~ msgid "%.3d"
+#~ msgstr "%.3d"
+
+#~ msgid "%u"
+#~ msgstr "%u"
+
+#~ msgid "Move To:"
+#~ msgstr "移动到："
+
+#~ msgid "On pads"
+#~ msgstr "焊盘上"
+
+#~ msgid "On tracks"
+#~ msgstr "布线上"
+
+#~ msgid ""
+#~ "Line on copper layer in package %s (%f mm, %f mm) (%f mm, %f mm).\n"
+#~ "Moving to Dwgs.User layer"
+#~ msgstr ""
+#~ "封装%s上铜层线 (%f mm, %f mm) (%f mm, %f mm).\n"
+#~ "移动到 Dwgs.User 层"
+
+#~ msgid ""
+#~ "Unsupported text on copper layer in package %s.\n"
+#~ "Moving to Dwgs.User layer."
+#~ msgstr ""
+#~ "封装%s上铜层不支持的文本\n"
+#~ "移动到 Dwgs.User 层。"
+
+#~ msgid ""
+#~ "Unsupported rectangle on copper layer in package %s.\n"
+#~ "Moving to Dwgs.User layer."
+#~ msgstr ""
+#~ "封装%s上铜层不支持的矩形\n"
+#~ "移动到 Dwgs.User 层。"
+
+#~ msgid ""
+#~ "Unsupported polygon on copper layer in package %s.\n"
+#~ "Moving to Dwgs.User layer."
+#~ msgstr ""
+#~ "封装%s上铜层不支持的多边形\n"
+#~ "移动到 Dwgs.User 层。"
+
+#~ msgid ""
+#~ "Unsupported circle on copper layer in package %s.\n"
+#~ "Moving to Dwgs.User layer."
+#~ msgstr ""
+#~ "封装%s上铜层不支持的圆\n"
+#~ "移动到 Dwgs.User 层。"
+
+#~ msgid "Footprint Library Editor"
+#~ msgstr "封装库编辑器"
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot update the footprint"
+#~ msgstr ""
+#~ "\n"
+#~ "无法更新封装"
+
+#~ msgid "A footprint source was found on the main board"
+#~ msgstr "在主电路板上找到一个封装的源"
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot insert this footprint"
+#~ msgstr ""
+#~ "\n"
+#~ "无法插入该封装"
+
+#~ msgid "New &Library..."
+#~ msgstr "新建库(&L)..."
+
+#~ msgid "New &Footprint..."
+#~ msgstr "新建封装(&F)..."
+
+#~ msgid "&Update Footprint on PCB"
+#~ msgstr "更新封装到PCB"
+
+#~ msgid "Push updated footprint through to current board"
+#~ msgstr "更新当前电路板封装"
+
+#~ msgid "Graphic not allowed on Copper layers"
+#~ msgstr "图形不允许出现在铜层"
+
+#~ msgid "Save footprint in existing library"
+#~ msgstr "保存封装到现有的库中"
+
+#~ msgid "Update footprint into current board"
+#~ msgstr "更新当前电路板封装"
+
 #~ msgid ""
 #~ "The graphic item will be on a copper layer.\n"
 #~ "This is very dangerous because DRC does not handle it.\n"
@@ -26754,12 +27270,6 @@ msgstr ""
 #~ msgid "Schematic sheet:"
 #~ msgstr "图纸大小"
 
-#~ msgid "90"
-#~ msgstr "90"
-
-#~ msgid "180"
-#~ msgstr "180"
-
 #~ msgid "Combo!"
 #~ msgstr "组合！"
 
@@ -26995,13 +27505,6 @@ msgstr ""
 #~ "<b>KIGITHUB</b>定义的是KiCad官方封装库的网址。只有在使用Github插件访问封装"
 #~ "库时才需要这样做。"
 
-#~ msgid ""
-#~ "<b>KICAD_TEMPLATE_DIR</b> is required and is the path containing the "
-#~ "project templates installed with KiCad."
-#~ msgstr ""
-#~ "<b>KICAD_TEMPLATE_DIR</b>是必需的，并且是包含与KiCad一起安装的项目模板的路"
-#~ "径。"
-
 #~ msgid ""
 #~ "<b>KICAD_USER_TEMPLATE_DIR</b> is required and is the path containing any "
 #~ "user specific project templates."
@@ -27125,9 +27628,6 @@ msgstr ""
 #~ msgid "E&xport Hotkeys..."
 #~ msgstr "导出快捷键(&X)..."
 
-#~ msgid "Export current hotkeys into configuration file"
-#~ msgstr "将当前快捷键导出到配置文件中"
-
 #~ msgid "&Import Hotkeys..."
 #~ msgstr "导入快捷键(&I)..."
 
@@ -27146,9 +27646,6 @@ msgstr ""
 #~ msgid "Do not show this message again."
 #~ msgstr "不再显示该信息."
 
-#~ msgid "Command"
-#~ msgstr "命令"
-
 #~ msgid ""
 #~ "Error occurred saving the global footprint library table:\n"
 #~ "\"%s\"\n"
@@ -27673,9 +28170,6 @@ msgstr ""
 #~ msgid "Revert Library"
 #~ msgstr "恢复库"
 
-#~ msgid "Paste Symbol"
-#~ msgstr "粘贴符号"
-
 #~ msgid "Remove Symbol"
 #~ msgstr "删除符号"
 
@@ -27843,9 +28337,6 @@ msgstr ""
 #~ msgid "Minimum width must be larger than %f\" / %f mm."
 #~ msgstr "最小宽度必须大于 %f\" / %f mm."
 
-#~ msgid "Thermal relief spoke must be greater than the minimum width."
-#~ msgstr "热风焊盘辐射线必须大于最小宽度.."
-
 #~ msgid "No net selected."
 #~ msgstr "没有网络被选择。"
 
@@ -28534,9 +29025,6 @@ msgstr ""
 #~ msgid "Board thickness %s is out of range."
 #~ msgstr "电路板厚度 %s 超出范围"
 
-#~ msgid "Layer name may not be empty."
-#~ msgstr "图层名称不能为空"
-
 #~ msgid "Layer name has an illegal character, one of: '"
 #~ msgstr "图层名称有非法字符,之一:'"
 
@@ -28771,9 +29259,6 @@ msgstr ""
 #~ msgid "Plot sheet reference on all layers"
 #~ msgstr "在所有层上绘制图页参考编号"
 
-#~ msgid "Line width:"
-#~ msgstr "线宽："
-
 #~ msgid "Solder Mask Options:"
 #~ msgstr "阻焊选项："
 
@@ -28957,9 +29442,6 @@ msgstr ""
 #~ "paths."
 #~ msgstr "在任何路径中均搜索不到封装库 '%s'."
 
-#~ msgid "Footprint \"%s\" already exists in library \"%s\""
-#~ msgstr "封装 \"%s\" 已经存在于库 \"%s\" 中"
-
 #~ msgid "Library Filter:"
 #~ msgstr "库过滤器:"
 
@@ -29152,12 +29634,6 @@ msgstr ""
 #~ msgid "Via: %.1f mils (%.2f mm)"
 #~ msgstr "过孔: %.1f mils (%.2f mm)"
 
-#~ msgid "%.2f mm (%.1f mils)"
-#~ msgstr "%.2f mm (%.1f mils)"
-
-#~ msgid "%.1f mils (%.2f mm)"
-#~ msgstr "%.1f mils (%.2f mm)"
-
 #~ msgid "Copy the default pad properties to the current pad"
 #~ msgstr "复制默认焊盘属性到当前焊盘"
 
@@ -29784,9 +30260,6 @@ msgstr ""
 #~ msgid "Use conventional Protel Gerber extensions - .GBL, .GTL, etc..."
 #~ msgstr "使用常规的Protel光绘扩展名 - .GBL, .GTL, etc..."
 
-#~ msgid "Automatic neckdown"
-#~ msgstr "自动减小宽度调整为颈缩（线）"
-
 #~ msgid "fit in page"
 #~ msgstr "适合页面"
 
@@ -30011,9 +30484,6 @@ msgstr ""
 #~ msgid "Fast access to the web based FreeROUTE advanced router"
 #~ msgstr "快速访问基于Web FreeROUTE的高级布线器"
 
-#~ msgid "D&imensions"
-#~ msgstr "尺寸设置(&I)"
-
 #~ msgid "Pad settings"
 #~ msgstr "焊盘设置"
 
@@ -30266,9 +30736,6 @@ msgstr ""
 #~ msgid "Updating ratsnest..."
 #~ msgstr "更新牵拉线..."
 
-#~ msgid "PCB Library Tables"
-#~ msgstr "PCB库列表"
-
 #~ msgid "Drill Files Generation"
 #~ msgstr "生成钻孔文件"
 
@@ -30281,9 +30748,6 @@ msgstr ""
 #~ msgid "Grid Properties"
 #~ msgstr "格点属性"
 
-#~ msgid " mils"
-#~ msgstr " mils"
-
 #~ msgid " in"
 #~ msgstr " in"
 
@@ -30819,9 +31283,6 @@ msgstr ""
 #~ msgid "Move Pin "
 #~ msgstr "移动 引脚"
 
-#~ msgid "Edit Pin "
-#~ msgstr "编辑 引脚"
-
 #~ msgid "Rotate Pin "
 #~ msgstr "旋转 引脚"
 
@@ -31707,9 +32168,6 @@ msgstr ""
 #~ msgid "Executable file (%s)|%s"
 #~ msgstr "可执行文件 (%s)|%s"
 
-#~ msgid "Copy &Version Information"
-#~ msgstr "版本信息"
-
 #~ msgid "Copy the version string to clipboard to send with bug reports"
 #~ msgstr "复制版本信息字符串添加到BUG报告"
 
@@ -31863,9 +32321,6 @@ msgstr ""
 #~ msgid "%s: <b>Via Diameter</b> &lt; <b>Minimun Via Diameter</b><br>"
 #~ msgstr "%s: <b>过孔直径</b> &lt; <b>最小过孔直径</b><br>"
 
-#~ msgid "Defined holes"
-#~ msgstr "定义孔"
-
 #~ msgid "Show Via Holes:"
 #~ msgstr "显示通孔:"
 
@@ -32087,9 +32542,6 @@ msgstr ""
 #~ msgid "De&fault text size:"
 #~ msgstr "默认文本尺寸(&F):"
 
-#~ msgid "&Part id notation:"
-#~ msgstr "部件ID符号(&P)："
-
 #~ msgid "Sho&w hidden pins"
 #~ msgstr "显示隐藏引脚(&W)"