diff --git a/internat/zh_CN/kicad.mo b/internat/zh_CN/kicad.mo
index 9a35e5d566..557271b8ee 100644
Binary files a/internat/zh_CN/kicad.mo and b/internat/zh_CN/kicad.mo differ
diff --git a/internat/zh_CN/kicad.po b/internat/zh_CN/kicad.po
index 64ec121b27..bb1c5bbba6 100644
--- a/internat/zh_CN/kicad.po
+++ b/internat/zh_CN/kicad.po
@@ -1,17 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-01-20 21:26+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-02 02:01+0800\n"
+"PO-Revision-Date: 2008-04-21 22:55+0800\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
-"X-Poedit-Basepath: c:\\kicad_dev\n"
 "X-Poedit-KeywordsList: _\n"
+"X-Poedit-Basepath: f:\\kicad\n"
 "X-Poedit-SearchPath-0: pcbnew\n"
 "X-Poedit-SearchPath-1: eeschema\n"
 "X-Poedit-SearchPath-2: cvpcb\n"
@@ -21,85 +22,571 @@ msgstr ""
 "X-Poedit-SearchPath-6: 3d-viewer\n"
 "X-Poedit-SearchPath-7: share\n"
 
-#: pcbnew/autoplac.cpp:106
-msgid "Footprints NOT LOCKED will be moved"
-msgstr "未锁定的封装将被移动"
+#: pcbnew/globaleditpad.cpp:76
+msgid "Pads Global Edit"
+msgstr "焊盘全局编辑"
+
+#: pcbnew/globaleditpad.cpp:94
+msgid "Pad Settings..."
+msgstr "焊盘设置 ..."
+
+#: pcbnew/globaleditpad.cpp:99
+msgid "Change Module"
+msgstr "改变模块"
+
+#: pcbnew/globaleditpad.cpp:104
+msgid "Change Id Modules"
+msgstr "改变相同的模块"
+
+#: pcbnew/globaleditpad.cpp:108
+#: pcbnew/pcbtexte.cpp:116
+#: pcbnew/block.cpp:154
+#: pcbnew/cotation.cpp:109
+#: pcbnew/set_color.cpp:357
+#: pcbnew/onrightclick.cpp:157
+#: pcbnew/onrightclick.cpp:171
+#: pcbnew/sel_layer.cpp:162
+#: pcbnew/sel_layer.cpp:320
+#: pcbnew/modedit_onclick.cpp:202
+#: pcbnew/modedit_onclick.cpp:234
+#: pcbnew/mirepcb.cpp:103
+#: pcbnew/dialog_edit_module.cpp:122
+#: pcbnew/muonde.cpp:352
+#: eeschema/sheetlab.cpp:100
+#: eeschema/eelayer.cpp:255
+#: eeschema/onrightclick.cpp:125
+#: eeschema/onrightclick.cpp:137
+#: eeschema/libedit_onrightclick.cpp:48
+#: eeschema/libedit_onrightclick.cpp:63
+#: gerbview/set_color.cpp:329
+#: gerbview/options.cpp:169
+#: gerbview/options.cpp:293
+#: gerbview/onrightclick.cpp:40
+#: gerbview/onrightclick.cpp:59
+#: gerbview/reglage.cpp:112
+#: common/selcolor.cpp:171
+#: common/get_component_dialog.cpp:121
+#: common/displlst.cpp:111
+msgid "Cancel"
+msgstr "取消"
+
+#: pcbnew/globaleditpad.cpp:114
+msgid "Pad Filter :"
+msgstr "焊盘过滤:"
+
+#: pcbnew/globaleditpad.cpp:118
+msgid "Shape Filter"
+msgstr "形状过滤"
+
+#: pcbnew/globaleditpad.cpp:122
+msgid "Layer Filter"
+msgstr "层过滤"
+
+#: pcbnew/globaleditpad.cpp:126
+msgid "Orient Filter"
+msgstr "方向过滤"
+
+#: pcbnew/globaleditpad.cpp:132
+msgid "Change Items :"
+msgstr "改变的内容:"
+
+#: pcbnew/globaleditpad.cpp:136
+msgid "Change Size"
+msgstr "改变大小"
+
+#: pcbnew/globaleditpad.cpp:140
+msgid "Change Shape"
+msgstr "改变形状"
+
+#: pcbnew/globaleditpad.cpp:144
+msgid "Change Drill"
+msgstr "改变钻孔"
+
+#: pcbnew/globaleditpad.cpp:148
+msgid "Change Orient"
+msgstr "改变方向"
+
+#: pcbnew/plot_rtn.cpp:227
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"reference\" text."
+msgstr ""
+"你的电路板中有一个错误的层号(%u), 它存在于模块\n"
+"%s 的\"索引\"文字。"
+
+#: pcbnew/plot_rtn.cpp:247
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"value\" text."
+msgstr ""
+"你的电路板中有一个错误的层号(%u), 它存在于模块\n"
+"%s 的\"数值\"文字。"
+
+#: pcbnew/plot_rtn.cpp:293
+#, c-format
+msgid ""
+"Your BOARD has a bad layer number of %u for module\n"
+" %s's \"module text\" text of %s."
+msgstr ""
+"你的电路板中有一个错误的层号(%u), 它存在于模块\n"
+"%s 的\"模块文本\"文字\"%s\"。"
+
+#: pcbnew/xchgmod.cpp:80
+msgid "Exchange Modules"
+msgstr "更换模块"
+
+#: pcbnew/xchgmod.cpp:107
+msgid "Change module"
+msgstr "更换当前的模块"
+
+#: pcbnew/xchgmod.cpp:113
+msgid "Change same modules"
+msgstr "更换所有相同的"
+
+#: pcbnew/xchgmod.cpp:119
+msgid "Ch. same module+value"
+msgstr "更换名称, 数值均相同的"
+
+#: pcbnew/xchgmod.cpp:125
+msgid "Change all"
+msgstr "更换所有"
+
+#: pcbnew/xchgmod.cpp:131
+msgid "Browse Libs modules"
+msgstr "从库中浏览模块"
+
+#: pcbnew/xchgmod.cpp:137
+#: pcbnew/pcbplot.cpp:214
+#: share/zoom.cpp:448
+msgid "Close"
+msgstr "关闭"
+
+#: pcbnew/xchgmod.cpp:142
+msgid "Current Module"
+msgstr "当前的模块"
+
+#: pcbnew/xchgmod.cpp:149
+msgid "Current Value"
+msgstr "当前的数值"
+
+#: pcbnew/xchgmod.cpp:156
+#: pcbnew/tool_modedit.cpp:70
+msgid "New Module"
+msgstr "新模块"
+
+#: pcbnew/xchgmod.cpp:226
+#, c-format
+msgid "file %s not found"
+msgstr "文件 %s 没有找到"
+
+#: pcbnew/xchgmod.cpp:240
+#, c-format
+msgid "Unable to create file %s"
+msgstr "无法建立文件 %s"
+
+#: pcbnew/xchgmod.cpp:347
+#, c-format
+msgid "Change modules <%s> -> <%s> (val = %s)?"
+msgstr "将模块 <%s> 更换为 <%s> (值 = %s) ? "
+
+#: pcbnew/xchgmod.cpp:354
+#, c-format
+msgid "Change modules <%s> -> <%s> ?"
+msgstr "将模块 <%s> 更换为 <%s> ?"
+
+#: pcbnew/xchgmod.cpp:418
+msgid "Change ALL modules ?"
+msgstr "更换所有模块 ?"
+
+#: pcbnew/xchgmod.cpp:480
+#, c-format
+msgid "Change module %s (%s)  "
+msgstr "更换模块 %s (%s)  "
+
+#: pcbnew/xchgmod.cpp:615
+#: pcbnew/automove.cpp:208
+msgid "No Modules!"
+msgstr "没有模块 !"
+
+#: pcbnew/xchgmod.cpp:627
+msgid "Cmp files:"
+msgstr "元件文件:"
+
+#: pcbnew/xchgmod.cpp:643
+#: pcbnew/gendrill.cpp:323
+#: pcbnew/gendrill.cpp:789
+#: pcbnew/plotps.cpp:51
+msgid "Unable to create file "
+msgstr "无法建立文件"
+
+#: pcbnew/dialog_drc.cpp:430
+#: eeschema/dialog_erc.cpp:238
+#: eeschema/dialog_edit_component_in_schematic.cpp:201
+#: eeschema/dialog_edit_component_in_lib.cpp:166
+#: eeschema/dialog_create_component.cpp:176
+msgid "Options"
+msgstr "选项"
+
+#: pcbnew/dialog_drc.cpp:440
+#: pcbnew/dialog_track_options.cpp:290
+msgid "Clearance"
+msgstr "间距"
+
+#: pcbnew/dialog_drc.cpp:445
+msgid "In the clearance units, enter the clearance distance"
+msgstr "请输入对间距进行检查的设定值"
+
+#: pcbnew/dialog_drc.cpp:448
+msgid "Create Report File"
+msgstr "生成报告文件"
+
+#: pcbnew/dialog_drc.cpp:455
+msgid "Enable writing report to this file"
+msgstr "将报告写入指定的文件"
+
+#: pcbnew/dialog_drc.cpp:460
+msgid "Enter the report filename"
+msgstr "请输入报告文件名"
+
+#: pcbnew/dialog_drc.cpp:463
+msgid "..."
+msgstr ""
+
+#: pcbnew/dialog_drc.cpp:465
+msgid "Pick a filename interactively"
+msgstr "以交互方式选择一个文件名"
+
+#: pcbnew/dialog_drc.cpp:468
+msgid "Include Tests For:"
+msgstr "检查包括的内容:"
+
+#: pcbnew/dialog_drc.cpp:472
+msgid "Pad to pad"
+msgstr "焊盘到焊盘"
+
+#: pcbnew/dialog_drc.cpp:475
+msgid "Include tests for clearances between pad to pads"
+msgstr "包含对焊盘与焊盘之间的间距检查"
+
+#: pcbnew/dialog_drc.cpp:478
+#: pcbnew/onrightclick.cpp:683
+msgid "Zones"
+msgstr "覆铜"
+
+#: pcbnew/dialog_drc.cpp:481
+msgid "Include zones in clearance or unconnected tests"
+msgstr "在间距检查和连接检查中包含覆铜"
+
+#: pcbnew/dialog_drc.cpp:484
+#: pcbnew/class_drc_item.cpp:39
+msgid "Unconnected pads"
+msgstr "未连接的焊盘"
+
+#: pcbnew/dialog_drc.cpp:487
+msgid "Find unconnected pads"
+msgstr "搜索未连接的焊盘"
+
+#: pcbnew/dialog_drc.cpp:493
+msgid "Start DRC"
+msgstr "开始 DRC"
+
+#: pcbnew/dialog_drc.cpp:495
+msgid "Start the Design Rule Checker"
+msgstr "开始设计规则检查"
+
+#: pcbnew/dialog_drc.cpp:499
+msgid "List Unconnected"
+msgstr "列出未连接的"
+
+#: pcbnew/dialog_drc.cpp:501
+msgid "List unconnected pads or tracks"
+msgstr "列出未连接的焊盘或导线"
+
+#: pcbnew/dialog_drc.cpp:505
+msgid "Delete All Markers"
+msgstr "删除所有标记"
+
+#: pcbnew/dialog_drc.cpp:507
+msgid "Delete every marker"
+msgstr "删除所有标记"
+
+#: pcbnew/dialog_drc.cpp:511
+msgid "Delete Current Marker"
+msgstr "删除当前标记"
+
+#: pcbnew/dialog_drc.cpp:513
+msgid "Delete the marker selected in the listBox below"
+msgstr "删除在下面列表栏中选中的标记"
+
+#: pcbnew/dialog_drc.cpp:517
+msgid "Error Messages:"
+msgstr "错误信息:"
+
+#: pcbnew/dialog_drc.cpp:527
+msgid "MARKERs, double click any to go there in PCB, right click for popup menu"
+msgstr "标记 - 双击鼠标直接转到PCB对应位置, 单击鼠标右键选择弹出菜单"
+
+#: pcbnew/dialog_drc.cpp:529
+msgid "Distance Problem Markers"
+msgstr "距离问题的标记"
+
+#: pcbnew/dialog_drc.cpp:533
+msgid "A list of unconnected pads, right click for popup menu"
+msgstr "未连接焊盘列表, 单击鼠标右键选择弹出菜单"
+
+#: pcbnew/dialog_drc.cpp:535
+msgid "Unconnected"
+msgstr "未连接的"
+
+#: pcbnew/dialog_drc.cpp:546
+#: pcbnew/dialog_initpcb.cpp:164
+#: pcbnew/dialog_zones_by_polygon.cpp:205
+#: pcbnew/set_grid.cpp:176
+#: pcbnew/dialog_track_options.cpp:328
+#: pcbnew/dialog_edit_mod_text.cpp:217
+#: pcbnew/dialog_pad_edit.cpp:221
+#: pcbnew/swap_layers.cpp:224
+#: pcbnew/dialog_graphic_items_options.cpp:267
+#: pcbnew/dialog_display_options.cpp:286
+#: pcbnew/dialog_general_options.cpp:372
+#: pcbnew/dialog_netlist.cpp:189
+#: eeschema/dialog_cmp_graphic_properties.cpp:182
+#: eeschema/pinedit-dialog.cpp:304
+#: eeschema/netlist_control.cpp:145
+#: eeschema/netlist_control.cpp:268
+#: eeschema/sheet.cpp:219
+#: eeschema/symbtext.cpp:178
+#: eeschema/dialog_edit_label.cpp:183
+#: eeschema/dialog_erc.cpp:219
+#: eeschema/dialog_options.cpp:278
+#: eeschema/plothpgl.cpp:276
+#: eeschema/dialog_build_BOM.cpp:334
+#: eeschema/dialog_edit_component_in_schematic.cpp:232
+#: eeschema/dialog_edit_component_in_lib.cpp:214
+#: eeschema/dialog_create_component.cpp:200
+#: cvpcb/dialog_display_options.cpp:191
+#: gerbview/select_layers_to_pcb.cpp:288
+#: share/setpage.cpp:446
+msgid "&Cancel"
+msgstr "取消(&C)"
+
+#: pcbnew/dialog_drc.cpp:550
+#: pcbnew/dialog_initpcb.cpp:161
+#: pcbnew/set_grid.cpp:171
+#: pcbnew/dialog_track_options.cpp:322
+#: pcbnew/dialog_edit_mod_text.cpp:213
+#: pcbnew/dialog_pad_edit.cpp:217
+#: pcbnew/swap_layers.cpp:220
+#: pcbnew/dialog_graphic_items_options.cpp:263
+#: pcbnew/dialog_display_options.cpp:282
+#: pcbnew/dialog_general_options.cpp:368
+#: eeschema/dialog_cmp_graphic_properties.cpp:178
+#: eeschema/pinedit-dialog.cpp:308
+#: eeschema/sheet.cpp:224
+#: eeschema/symbtext.cpp:174
+#: eeschema/dialog_edit_label.cpp:178
+#: eeschema/dialog_options.cpp:274
+#: eeschema/dialog_build_BOM.cpp:330
+#: eeschema/dialog_edit_component_in_schematic.cpp:240
+#: eeschema/dialog_edit_component_in_lib.cpp:218
+#: eeschema/dialog_create_component.cpp:195
+#: cvpcb/dialog_cvpcb_config.cpp:139
+#: cvpcb/dialog_display_options.cpp:186
+#: gerbview/select_layers_to_pcb.cpp:284
+#: share/setpage.cpp:442
+msgid "&OK"
+msgstr "确定(&O)"
+
+#: pcbnew/dialog_drc.cpp:659
+#: pcbnew/dialog_drc.cpp:737
+#, c-format
+msgid "Report file \"%s\" created"
+msgstr "已生成报告文件 \"%s\""
+
+#: pcbnew/dialog_drc.cpp:661
+#: pcbnew/dialog_drc.cpp:739
+msgid "Disk File Report Completed"
+msgstr "磁盘文件报告完成"
+
+#: pcbnew/dialog_drc.cpp:767
+msgid "DRC Report file"
+msgstr "DRC 报告文件"
+
+#: pcbnew/editrack-part2.cpp:32
+#, c-format
+msgid "Track Width: %s   Vias Size : %s"
+msgstr "导线宽度: %s   导孔大小: %s"
+
+#: pcbnew/editrack-part2.cpp:136
+msgid "Drc error, cancelled"
+msgstr "Drc 出错, 自动取消"
+
+#: pcbnew/initpcb.cpp:125
+msgid "Current Board will be lost ?"
+msgstr "当前电路板将丢弃 ?"
+
+#: pcbnew/initpcb.cpp:213
+msgid "Delete Zones ?"
+msgstr "删除 覆铜 ?"
+
+#: pcbnew/initpcb.cpp:240
+msgid "Delete Board edges ?"
+msgstr "删除 电路板边界 ?"
+
+#: pcbnew/initpcb.cpp:245
+msgid "Delete draw items?"
+msgstr "删除 图示内容 ?"
+
+#: pcbnew/initpcb.cpp:287
+#: gerbview/initpcb.cpp:150
+msgid "Delete Tracks?"
+msgstr "删除 导线 ?"
+
+#: pcbnew/initpcb.cpp:310
+msgid "Delete Modules?"
+msgstr "删除 模块 ?"
+
+#: pcbnew/initpcb.cpp:333
+#: gerbview/initpcb.cpp:173
+msgid "Delete Pcb Texts"
+msgstr "删除 PCB 文字"
+
+#: pcbnew/pcbtexte.cpp:88
+msgid "TextPCB properties"
+msgstr "PCB文字属性"
+
+#: pcbnew/pcbtexte.cpp:111
+#: pcbnew/block.cpp:157
+#: pcbnew/dialog_gendrill.cpp:278
+#: pcbnew/cotation.cpp:105
+#: pcbnew/dialog_zones_by_polygon.cpp:202
+#: pcbnew/set_color.cpp:353
+#: pcbnew/sel_layer.cpp:158
+#: pcbnew/sel_layer.cpp:316
+#: pcbnew/mirepcb.cpp:99
+#: pcbnew/dialog_edit_module.cpp:118
+#: pcbnew/muonde.cpp:348
+#: eeschema/sheetlab.cpp:96
+#: eeschema/eelayer.cpp:251
+#: gerbview/set_color.cpp:325
+#: gerbview/options.cpp:165
+#: gerbview/options.cpp:289
+#: gerbview/reglage.cpp:108
+#: common/get_component_dialog.cpp:112
+#: common/displlst.cpp:106
+msgid "OK"
+msgstr "确定"
 
-#: pcbnew/autoplac.cpp:111
-msgid "Footprints NOT PLACED will be moved"
-msgstr "未放置的封装将被移动"
+#: pcbnew/pcbtexte.cpp:120
+#: pcbnew/dialog_edit_mod_text.cpp:314
+#: eeschema/sheetlab.cpp:104
+#: common/confirm.cpp:145
+msgid "Text:"
+msgstr "文字:"
 
-#: pcbnew/autoplac.cpp:402
-msgid "No edge PCB, Unknown board size!"
-msgstr "PCB 未设置边界，电路板大小未知！"
+#: pcbnew/pcbtexte.cpp:126
+#: pcbnew/cotation.cpp:125
+#: pcbnew/mirepcb.cpp:108
+#: pcbnew/muonde.cpp:367
+#: eeschema/pinedit-dialog.cpp:273
+#: eeschema/pinedit-dialog.cpp:279
+#: eeschema/sheet.cpp:192
+#: eeschema/sheet.cpp:203
+#: common/wxwineda.cpp:91
+msgid "Size"
+msgstr "大小"
 
-#: pcbnew/autoplac.cpp:423
-msgid "Cols"
-msgstr "列"
+#: pcbnew/pcbtexte.cpp:130
+#: pcbnew/class_drawsegment.cpp:179
+#: pcbnew/class_text_mod.cpp:386
+#: pcbnew/class_track.cpp:859
+#: pcbnew/cotation.cpp:129
+#: pcbnew/dialog_edit_mod_text.cpp:204
+#: pcbnew/mirepcb.cpp:113
+#: pcbnew/class_edge_mod.cpp:300
+#: pcbnew/class_pcb_text.cpp:191
+#: eeschema/dialog_cmp_graphic_properties.cpp:188
+#: eeschema/affiche.cpp:190
+#: gerbview/affiche.cpp:52
+#: gerbview/affiche.cpp:114
+msgid "Width"
+msgstr "宽度"
 
-#: pcbnew/autoplac.cpp:425
-msgid "Lines"
-msgstr "行"
+#: pcbnew/pcbtexte.cpp:134
+msgid "Position"
+msgstr "位置"
 
-#: pcbnew/autoplac.cpp:427
-msgid "Cells."
-msgstr "单元."
+#: pcbnew/pcbtexte.cpp:152
+#: pcbnew/dialog_edit_mod_text.cpp:225
+msgid "Orientation"
+msgstr "方向"
 
-#: pcbnew/autoplac.cpp:488
-msgid "Loop"
-msgstr "循环"
+#: pcbnew/pcbtexte.cpp:176
+#: pcbnew/cotation.cpp:113
+#: pcbnew/dialog_edit_module.cpp:243
+#: pcbnew/dialog_edit_module.cpp:289
+#: pcbnew/muonde.cpp:360
+#: eeschema/onrightclick.cpp:313
+#: eeschema/dialog_options.cpp:229
+#: eeschema/dialog_edit_component_in_schematic.cpp:180
+msgid "Normal"
+msgstr "普通"
 
-#: pcbnew/autoplac.cpp:642
-msgid "Ok to abort ?"
-msgstr "确定退出？"
+#: pcbnew/pcbtexte.cpp:176
+#: pcbnew/class_text_mod.cpp:380
+#: pcbnew/cotation.cpp:113
+#: pcbnew/modedit_onclick.cpp:253
+#: pcbnew/class_pcb_text.cpp:181
+#: gerbview/affiche.cpp:40
+#: share/dialog_print.cpp:178
+msgid "Mirror"
+msgstr "镜像"
 
-#: pcbnew/pcbnew.cpp:42
-msgid "Pcbnew is already running, Continue?"
-msgstr "Pcbnew 已经在运行。是否继续？"
+#: pcbnew/pcbtexte.cpp:177
+#: pcbnew/class_text_mod.cpp:361
+#: pcbnew/cotation.cpp:114
+#: pcbnew/dialog_edit_mod_text.cpp:232
+#: pcbnew/dialog_general_options.cpp:264
+#: eeschema/affiche.cpp:94
+#: gerbview/options.cpp:176
+#: gerbview/tool_gerber.cpp:113
+msgid "Display"
+msgstr "显示"
 
-#: pcbnew/plothpgl.cpp:67
-#: pcbnew/librairi.cpp:255
-#: pcbnew/librairi.cpp:401
-#: pcbnew/librairi.cpp:551
-#: pcbnew/librairi.cpp:754
-#: pcbnew/files.cpp:326
-#: pcbnew/export_gencad.cpp:83
-#: pcbnew/gen_modules_placefile.cpp:87
-#: pcbnew/gen_modules_placefile.cpp:98
-#: pcbnew/gen_modules_placefile.cpp:251
-#: eeschema/plothpgl.cpp:560
-#: eeschema/plotps.cpp:389
-#: cvpcb/genequiv.cpp:42
-#: gerbview/export_to_pcbnew.cpp:75
-#: common/hotkeys_basic.cpp:385
-msgid "Unable to create "
-msgstr "无法建立 "
+#: pcbnew/automove.cpp:212
+msgid "Move Modules ?"
+msgstr "移动模块 ?"
 
-#: pcbnew/plothpgl.cpp:74
-#: pcbnew/gendrill.cpp:401
-#: pcbnew/gendrill.cpp:1027
-#: pcbnew/gendrill.cpp:1620
-#: pcbnew/plotgerb.cpp:84
-#: pcbnew/plotps.cpp:58
-msgid "File"
-msgstr "文件"
+#: pcbnew/automove.cpp:221
+msgid "Autoplace modules: No boad edges detected, unable to place modules"
+msgstr "自动放置模块: 没有检测到电路板边界, 无法放置模块"
 
-#: pcbnew/controle.cpp:172
-#: pcbnew/modedit.cpp:77
-msgid "Selection Clarification"
-msgstr "选取 - "
+#: pcbnew/automove.cpp:344
+#, c-format
+msgid "Ok to set module orientation to %d degrees ?"
+msgstr "是否将模块的方向设置为 %d 度 ?"
+
+#: pcbnew/gen_drill_report_files.cpp:388
+msgid ""
+" Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n"
+"Plot uses circle shape for some drill values"
+msgstr ""
+" 钻孔图: 直径值过多, 每个钻孔形状最多允许13个值\n"
+"某些钻孔值采用圆形绘图输出"
 
 #: pcbnew/librairi.cpp:48
 msgid "Import Module:"
-msgstr "导入模块："
+msgstr "导入模块:"
 
 #: pcbnew/librairi.cpp:64
 #: pcbnew/files.cpp:182
 #: cvpcb/rdpcad.cpp:45
-#: cvpcb/readschematicnetlist.cpp:51
+#: cvpcb/readschematicnetlist.cpp:53
 #, c-format
 msgid "File <%s> not found"
-msgstr " 文件 < %s > 未找到"
+msgstr "文件 < %s > 未找到"
 
 #: pcbnew/librairi.cpp:73
 msgid "Not a module file"
@@ -111,13 +598,13 @@ msgstr "建立库"
 
 #: pcbnew/librairi.cpp:132
 msgid "Export Module:"
-msgstr "导出模块："
+msgstr "导出模块:"
 
 #: pcbnew/librairi.cpp:147
 #: pcbnew/librairi.cpp:388
 #, c-format
 msgid "File %s exists, OK to replace ?"
-msgstr "文件 %s 已经存在，确定替换？"
+msgstr "文件 %s 已经存在, 确定替换?"
 
 #: pcbnew/librairi.cpp:156
 #: eeschema/symbedit.cpp:166
@@ -133,7 +620,7 @@ msgstr "模块成功导出到文件 < %s >"
 #: pcbnew/librairi.cpp:193
 #, c-format
 msgid "Ok to delete module %s in library %s"
-msgstr "确定删除 模块 %s （在库 %s 中）"
+msgstr "确定删除模块 %s (在库 %s 中)"
 
 #: pcbnew/librairi.cpp:203
 msgid "Library "
@@ -141,9 +628,9 @@ msgstr "库"
 
 #: pcbnew/librairi.cpp:203
 #: pcbnew/files.cpp:57
-#: eeschema/find.cpp:250
-#: eeschema/find.cpp:258
-#: eeschema/find.cpp:699
+#: eeschema/find.cpp:243
+#: eeschema/find.cpp:251
+#: eeschema/find.cpp:697
 #: gerbview/dcode.cpp:260
 #: gerbview/readgerb.cpp:145
 #: common/eda_doc.cpp:144
@@ -159,6 +646,24 @@ msgstr "不是一个库文件"
 msgid "Module [%s] not found"
 msgstr "模块 [ %s ] 未找到"
 
+#: pcbnew/librairi.cpp:255
+#: pcbnew/librairi.cpp:401
+#: pcbnew/librairi.cpp:551
+#: pcbnew/librairi.cpp:754
+#: pcbnew/gen_modules_placefile.cpp:87
+#: pcbnew/gen_modules_placefile.cpp:98
+#: pcbnew/gen_modules_placefile.cpp:251
+#: pcbnew/files.cpp:326
+#: pcbnew/export_gencad.cpp:83
+#: pcbnew/plothpgl.cpp:67
+#: eeschema/plothpgl.cpp:562
+#: eeschema/plotps.cpp:391
+#: cvpcb/genequiv.cpp:42
+#: gerbview/export_to_pcbnew.cpp:75
+#: common/hotkeys_basic.cpp:385
+msgid "Unable to create "
+msgstr "无法建立 "
+
 #: pcbnew/librairi.cpp:337
 #, c-format
 msgid "Component %s deleted in library %s"
@@ -166,7 +671,7 @@ msgstr "元件 %s 已从库 %s 中删除"
 
 #: pcbnew/librairi.cpp:363
 msgid " No modules to archive!"
-msgstr " 没有可以存档的模块！"
+msgstr " 没有可以存档的模块 !"
 
 #: pcbnew/librairi.cpp:370
 msgid "Library"
@@ -181,6544 +686,6850 @@ msgstr "库 %s 未找到"
 #: eeschema/symbtext.cpp:140
 #: common/get_component_dialog.cpp:98
 msgid "Name:"
-msgstr "名称："
+msgstr "名称:"
 
 #: pcbnew/librairi.cpp:484
 #, c-format
 msgid "Unable to open %s"
-msgstr "无法打开 \"%s\""
+msgstr "无法打开 %s"
 
 #: pcbnew/librairi.cpp:494
 #, c-format
 msgid "File %s is not a eeschema library"
 msgstr "文件 %s 不是一个 eeschema 库"
 
-#: pcbnew/librairi.cpp:523
-msgid "Module exists Line "
-msgstr "模块存在于行 "
+#: pcbnew/librairi.cpp:523
+msgid "Module exists Line "
+msgstr "模块存在于行 "
+
+#: pcbnew/librairi.cpp:642
+msgid "Component "
+msgstr "元件"
+
+#: pcbnew/librairi.cpp:643
+msgid " added in "
+msgstr " 被添加到 "
+
+#: pcbnew/librairi.cpp:643
+msgid " replaced in "
+msgstr " 被替换到 "
+
+#: pcbnew/librairi.cpp:670
+msgid "Module Reference:"
+msgstr "模块索引:"
+
+#: pcbnew/librairi.cpp:722
+msgid "Active Lib:"
+msgstr "活动的库:"
+
+#: pcbnew/librairi.cpp:733
+msgid "Module Editor (lib: "
+msgstr "模块编辑器 (库: "
+
+#: pcbnew/librairi.cpp:747
+msgid "Library exists "
+msgstr "库已经存在"
+
+#: pcbnew/librairi.cpp:762
+msgid "Create error "
+msgstr "建立文件错误"
+
+#: pcbnew/hotkeys.cpp:468
+#, c-format
+msgid "Footprint %s found, but locked"
+msgstr "找到封装 %s, 但是被锁定"
+
+#: pcbnew/hotkeys.cpp:633
+msgid "Delete module?"
+msgstr "是否删除模块 ?"
+
+#: pcbnew/moduleframe.cpp:182
+msgid "Module Editor: module modified!, Continue ?"
+msgstr "模块编辑程序: 模块已被修改!, 是否继续 ?"
+
+#: pcbnew/plotgerb.cpp:72
+msgid "unable to create file "
+msgstr "无法建立文件"
+
+#: pcbnew/plotgerb.cpp:84
+#: pcbnew/plothpgl.cpp:74
+#: pcbnew/plotps.cpp:58
+msgid "File"
+msgstr "文件"
+
+#: pcbnew/plotgerb.cpp:817
+#, c-format
+msgid "unable to reopen file <%s>"
+msgstr "无法重新打开文件 < %s >"
+
+#: pcbnew/modedit.cpp:77
+#: pcbnew/controle.cpp:172
+msgid "Selection Clarification"
+msgstr "选取 - "
+
+#: pcbnew/modedit.cpp:263
+msgid "Unable to find the footprint source on the main board"
+msgstr "在主电路板上找不到该封装的源"
+
+#: pcbnew/modedit.cpp:264
+msgid ""
+"\n"
+"Cannot update the footprint"
+msgstr ""
+"\n"
+"无法更新封装"
+
+#: pcbnew/modedit.cpp:272
+msgid "A footprint source was found on the main board"
+msgstr "在主电路板上找到一个封装的源"
+
+#: pcbnew/modedit.cpp:273
+msgid ""
+"\n"
+"Cannot insert this footprint"
+msgstr ""
+"\n"
+"无法插入该封装"
+
+#: pcbnew/modedit.cpp:393
+msgid "Add Pad"
+msgstr "添加 焊盘"
+
+#: pcbnew/modedit.cpp:396
+#: pcbnew/tool_modedit.cpp:133
+#: pcbnew/menubarpcb.cpp:237
+#: pcbnew/menubarmodedit.cpp:45
+msgid "Pad Settings"
+msgstr "焊盘设置"
+
+#: pcbnew/modedit.cpp:406
+#: eeschema/schedit.cpp:116
+msgid "Add Drawing"
+msgstr "添加 图形"
+
+#: pcbnew/modedit.cpp:410
+#: pcbnew/tool_modedit.cpp:185
+msgid "Place anchor"
+msgstr "放置 锚点"
+
+#: pcbnew/modedit.cpp:424
+#: pcbnew/edit.cpp:552
+#: eeschema/libframe.cpp:579
+#: eeschema/schedit.cpp:283
+msgid "Delete item"
+msgstr "删除内容"
+
+#: pcbnew/specctra.cpp:133
+#: pcbnew/specctra.cpp:140
+msgid "Expecting"
+msgstr ""
+
+#: pcbnew/specctra.cpp:147
+#: pcbnew/specctra.cpp:154
+msgid "Unexpected"
+msgstr ""
+
+#: pcbnew/specctra.cpp:321
+#: pcbnew/specctra.cpp:351
+#: pcbnew/specctra.cpp:3519
+#: pcbnew/specctra.cpp:3544
+#, c-format
+msgid "Unable to open file \"%s\""
+msgstr "打开文件 \"%s\" 失败"
+
+#: pcbnew/specctra.cpp:3461
+#, c-format
+msgid "System file error writing to file \"%s\""
+msgstr "当写文件 \"%s\" 时发生系统文件错误"
+
+#: pcbnew/specctra.cpp:3639
+msgid "Error writing to STRINGFORMATTER"
+msgstr "写入 STRINGFORMATTER 时发生错误"
+
+#: pcbnew/editmod.cpp:45
+#: pcbnew/edit.cpp:179
+msgid "Module Editor"
+msgstr "模块编辑器"
+
+#: pcbnew/editmod.cpp:144
+msgid "Text is REFERENCE!"
+msgstr "文本为元件索引!"
+
+#: pcbnew/editmod.cpp:149
+msgid "Text is VALUE!"
+msgstr "文本为元件数值!"
+
+#: pcbnew/deltrack.cpp:161
+msgid "Delete NET ?"
+msgstr "删除 网络?"
+
+#: pcbnew/dialog_initpcb.cpp:105
+msgid "Items to delete"
+msgstr "删除内容"
+
+#: pcbnew/dialog_initpcb.cpp:109
+msgid "Delete Zones"
+msgstr "删除 覆铜"
 
-#: pcbnew/librairi.cpp:642
-msgid "Component "
-msgstr "元件"
+#: pcbnew/dialog_initpcb.cpp:113
+msgid "Delete Texts"
+msgstr "删除 文字"
 
-#: pcbnew/librairi.cpp:643
-msgid " added in "
-msgstr " 被添加到 "
+#: pcbnew/dialog_initpcb.cpp:117
+msgid "Delete Edges"
+msgstr "删除 边界线"
 
-#: pcbnew/librairi.cpp:643
-msgid " replaced in "
-msgstr " 被替换到 "
+#: pcbnew/dialog_initpcb.cpp:121
+msgid "Delete Drawings"
+msgstr "删除 图形"
 
-#: pcbnew/librairi.cpp:670
-msgid "Module Reference:"
-msgstr "模块标签："
+#: pcbnew/dialog_initpcb.cpp:125
+msgid "Delete Modules"
+msgstr "删除 模块"
 
-#: pcbnew/librairi.cpp:722
-msgid "Active Lib:"
-msgstr "活动的库："
+#: pcbnew/dialog_initpcb.cpp:129
+msgid "Delete Tracks"
+msgstr "删除 导线"
 
-#: pcbnew/librairi.cpp:733
-msgid "Module Editor (lib: "
-msgstr "模块编辑器 （库： "
+#: pcbnew/dialog_initpcb.cpp:133
+msgid "Delete Markers"
+msgstr "删除 DRC标记"
 
-#: pcbnew/librairi.cpp:747
-msgid "Library exists "
-msgstr "库已经存在："
+#: pcbnew/dialog_initpcb.cpp:137
+msgid "Clear Board"
+msgstr "清空电路板"
 
-#: pcbnew/librairi.cpp:762
-msgid "Create error "
-msgstr "建立文件错误"
+#: pcbnew/dialog_initpcb.cpp:144
+msgid "Track Filter"
+msgstr "导线过滤"
 
-#: pcbnew/initpcb.cpp:126
-msgid "Current Board will be lost ?"
-msgstr "当前电路板将丢弃 ？"
+#: pcbnew/dialog_initpcb.cpp:148
+msgid "Include AutoRouted Tracks"
+msgstr "包括自动布的导线"
 
-#: pcbnew/initpcb.cpp:213
-msgid "Delete Zones ?"
-msgstr "删除 覆铜？"
+#: pcbnew/dialog_initpcb.cpp:152
+msgid "Include Locked Tracks"
+msgstr "包括锁定的导线"
 
-#: pcbnew/initpcb.cpp:240
-msgid "Delete Board edges ?"
-msgstr "删除 电路板边界？"
+#: pcbnew/netlist.cpp:100
+#, c-format
+msgid "Netlist file %s not found"
+msgstr "没有找到网络表文件 %s"
 
-#: pcbnew/initpcb.cpp:245
-msgid "Delete draw items?"
-msgstr "删除 图示内容？"
+#: pcbnew/netlist.cpp:152
+msgid "Read Netlist "
+msgstr "读取网络表"
 
-#: pcbnew/initpcb.cpp:287
-#: gerbview/initpcb.cpp:152
-msgid "Delete Tracks?"
-msgstr "删除 导线？"
+#: pcbnew/netlist.cpp:395
+#, c-format
+msgid "Cmp %s: Mismatch! module is [%s] and netlist said [%s]\n"
+msgstr "元件 %s: 不匹配! 模块为[%s], 网络表中为[%s]\n"
 
-#: pcbnew/initpcb.cpp:310
-msgid "Delete Modules?"
-msgstr "删除 模块？"
+#: pcbnew/netlist.cpp:433
+#, c-format
+msgid "Component [%s] not found"
+msgstr "元件[%s]没有找到"
 
-#: pcbnew/initpcb.cpp:333
-#: gerbview/initpcb.cpp:175
-msgid "Delete Pcb Texts"
-msgstr "删除 PCB 文字"
+#: pcbnew/netlist.cpp:506
+#, c-format
+msgid "Module [%s]: Pad [%s] not found"
+msgstr "模块[%s]: 焊盘[%s]没有找到"
 
-#: pcbnew/ioascii.cpp:196
-#: pcbnew/dialog_display_options.cpp:193
-msgid "Tracks:"
-msgstr "导线："
+#: pcbnew/netlist.cpp:533
+msgid "No Modules"
+msgstr "没有模块"
 
-#: pcbnew/ioascii.cpp:200
-msgid "Zones:"
-msgstr "覆铜："
+#: pcbnew/netlist.cpp:548
+msgid "Components"
+msgstr "元件"
 
-#: pcbnew/ioascii.cpp:207
-msgid "Error: Unexpected end of file !"
-msgstr "错误：文件结尾有错误！"
+#: pcbnew/netlist.cpp:596
+msgid "No modules"
+msgstr "没有模块"
 
-#: pcbnew/classpcb.cpp:229
-#: pcbnew/class_track.cpp:765
-#: pcbnew/class_text_mod.cpp:359
-#: pcbnew/class_marker.cpp:92
-#: gerbview/affiche.cpp:93
-msgid "Type"
-msgstr "类型"
+#: pcbnew/netlist.cpp:606
+msgid "No modules in NetList"
+msgstr "网络表中没有包含模块"
 
-#: pcbnew/classpcb.cpp:231
-msgid "Shape"
-msgstr "形状"
+#: pcbnew/netlist.cpp:609
+msgid "Check Modules"
+msgstr "检查模块"
 
-#: pcbnew/classpcb.cpp:234
-#: pcbnew/class_board_item.cpp:108
-#: pcbnew/dialog_pad_edit.cpp:176
-#: pcbnew/dialog_pad_edit.cpp:196
-#: pcbnew/class_track.cpp:791
-msgid "Circle"
-msgstr "圆"
+#: pcbnew/netlist.cpp:612
+msgid "Duplicates"
+msgstr "重复"
 
-#: pcbnew/classpcb.cpp:238
-msgid "  Arc  "
-msgstr "  圆弧  "
+#: pcbnew/netlist.cpp:630
+msgid "Lack:"
+msgstr "缺:"
 
-#: pcbnew/classpcb.cpp:243
-#: pcbnew/class_track.cpp:789
-msgid "Segment"
-msgstr "线段"
+#: pcbnew/netlist.cpp:652
+msgid "Not in Netlist:"
+msgstr "未在网络表中:"
 
-#: pcbnew/classpcb.cpp:245
-#: pcbnew/dialog_edit_module.cpp:235
-#: pcbnew/class_track.cpp:821
-#: pcbnew/class_pcb_text.cpp:198
-#: pcbnew/class_text_mod.cpp:369
-#: pcbnew/class_text_mod.cpp:373
-#: pcbnew/class_pad.cpp:1062
-#: pcbnew/class_module.cpp:1217
-#: pcbnew/sel_layer.cpp:145
-#: gerbview/affiche.cpp:109
-msgid "Layer"
-msgstr "层"
+#: pcbnew/netlist.cpp:800
+#, c-format
+msgid "File <%s> not found, use Netlist for lib module selection"
+msgstr "文件<%s>没有找到, 应用网络表中的模块库选项"
 
-#: pcbnew/classpcb.cpp:250
-#: pcbnew/dialog_edit_mod_text.cpp:204
-#: pcbnew/mirepcb.cpp:113
-#: pcbnew/cotation.cpp:129
-#: pcbnew/class_track.cpp:845
-#: pcbnew/pcbtexte.cpp:130
-#: pcbnew/class_pcb_text.cpp:212
-#: pcbnew/class_text_mod.cpp:386
-#: pcbnew/class_edge_mod.cpp:297
-#: eeschema/affiche.cpp:188
-#: eeschema/dialog_cmp_graphic_properties.cpp:188
-#: gerbview/affiche.cpp:52
-#: gerbview/affiche.cpp:113
-msgid "Width"
-msgstr "宽度"
+#: pcbnew/netlist.cpp:886
+msgid "Netlist Selection:"
+msgstr "选择网络表文件:"
 
-#: pcbnew/autorout.cpp:59
-msgid "Net not selected"
-msgstr "没有选择网络"
+#: pcbnew/netlist.cpp:963
+#, c-format
+msgid "Component [%s]: footprint <%s> not found"
+msgstr "元件[%s]: 封装<%s>没有找到"
 
-#: pcbnew/autorout.cpp:67
-msgid "Module not selected"
-msgstr "没有选择模块"
+#: pcbnew/find.cpp:114
+msgid "Marker found"
+msgstr "DRC标记 找到"
 
-#: pcbnew/autorout.cpp:75
-msgid "Pad not selected"
-msgstr "没有选择焊盘"
+#: pcbnew/find.cpp:116
+#, c-format
+msgid "<%s> Found"
+msgstr "<%s> 找到"
 
-#: pcbnew/autorout.cpp:143
-msgid "No memory for autorouting"
-msgstr "没有足够的内存进行自动布线"
+#: pcbnew/find.cpp:129
+msgid "Marker not found"
+msgstr "DRC标记 没有找到"
 
-#: pcbnew/autorout.cpp:148
-msgid "Place Cells"
-msgstr "放置 Cells"
+#: pcbnew/find.cpp:131
+#, c-format
+msgid "<%s> Not Found"
+msgstr "< %s > 没有找到"
 
-#: pcbnew/muwave_command.cpp:52
-#: eeschema/libframe.cpp:519
-msgid "Add Line"
-msgstr "添加 Line"
+#: pcbnew/find.cpp:238
+#: eeschema/dialog_find.cpp:107
+msgid "Item to find:"
+msgstr "查找内容: "
 
-#: pcbnew/muwave_command.cpp:56
-msgid "Add Gap"
-msgstr "添加 Gap"
+#: pcbnew/find.cpp:259
+msgid "Find Item"
+msgstr "查找内容"
 
-#: pcbnew/muwave_command.cpp:60
-msgid "Add Stub"
-msgstr "添加 Stub"
+#: pcbnew/find.cpp:265
+msgid "Find Next Item"
+msgstr "查找下一个"
 
-#: pcbnew/muwave_command.cpp:64
-msgid "Add Arc Stub"
-msgstr "添加 Arc Stub"
+#: pcbnew/find.cpp:274
+msgid "Find Marker"
+msgstr "查找DRC标记"
 
-#: pcbnew/muwave_command.cpp:68
-msgid "Add Polynomial Shape"
-msgstr "添加 Polynomial Shape"
+#: pcbnew/find.cpp:280
+msgid "Find Next Marker"
+msgstr "查找下一个DRC标记"
 
-#: pcbnew/drc.cpp:80
-msgid "Look for active routes\n"
-msgstr "寻找有问题的布线\n"
+#: pcbnew/move_or_drag_track.cpp:714
+msgid "Unable to drag this segment: too many segments connected"
+msgstr "无法拖动该线段: 连接的线段过多"
 
-#: pcbnew/drc.cpp:93
-msgid "Unconnected found:\n"
-msgstr "发现未连接的：\n"
+#: pcbnew/move_or_drag_track.cpp:768
+msgid "Unable to drag this segment: two collinear segments"
+msgstr "无法拖动该线段: 因为是两条重合的线段"
 
-#: pcbnew/drc.cpp:101
-#, c-format
-msgid "%d > Pad %s (%s) @ %.4f,%.4f and "
-msgstr "%d > 焊盘%s(%s) 在 %.4f,%.4f 和 "
+#: pcbnew/onleftclick.cpp:176
+msgid "Graphic not authorized on Copper layers"
+msgstr "不允许图形出现在铜层"
 
-#: pcbnew/drc.cpp:115
-#, c-format
-msgid "Pad %s (%s) @ %.4f,%.4f\n"
-msgstr "焊盘%s(%s) 在 %.4f,%.4f \n"
+#: pcbnew/onleftclick.cpp:199
+msgid "Tracks on Copper layers only "
+msgstr "导线只能出现在铜层"
 
-#: pcbnew/drc.cpp:125
-#, c-format
-msgid "Active routes: %d\n"
-msgstr "有问题的布线： %d处\n"
+#: pcbnew/onleftclick.cpp:281
+#, fuzzy
+msgid "Cotation not authorized on Copper layers"
+msgstr "Cotation 不允许出现在铜层"
 
-#: pcbnew/drc.cpp:127
-msgid "OK! (No active routes)\n"
-msgstr "OK！（没有找到有问题的布线）\n"
+#: pcbnew/surbrill.cpp:37
+msgid "Filter for net names:"
+msgstr "过滤网络名称:"
 
-#: pcbnew/drc.cpp:186
-#, c-format
-msgid "** End Drc: %d errors **\n"
-msgstr "** DRC结束：发现 %d处 错误 **\n"
+#: pcbnew/surbrill.cpp:41
+msgid "List Nets"
+msgstr "列出网络"
 
-#: pcbnew/drc.cpp:188
-msgid "** End Drc: No Error **\n"
-msgstr "** DRC结束：无错误 **\n"
+#: pcbnew/class_module.cpp:1070
+msgid "Last Change"
+msgstr "最后更改"
 
-#: pcbnew/drc.cpp:197
-#, c-format
-msgid "Report file <%s> created\n"
-msgstr "生成报告文件 < %s > \n"
+#: pcbnew/class_module.cpp:1076
+msgid "Netlist path"
+msgstr "网络表路径"
 
-#: pcbnew/drc.cpp:279
-msgid "Tst Pad to Pad\n"
-msgstr "焊盘到焊盘检测\n"
+#: pcbnew/class_module.cpp:1080
+#: pcbnew/class_drawsegment.cpp:175
+#: pcbnew/class_text_mod.cpp:369
+#: pcbnew/class_text_mod.cpp:373
+#: pcbnew/class_track.cpp:836
+#: pcbnew/sel_layer.cpp:145
+#: pcbnew/class_zone.cpp:555
+#: pcbnew/dialog_edit_module.cpp:235
+#: pcbnew/class_pad.cpp:971
+#: pcbnew/class_pcb_text.cpp:177
+#: gerbview/affiche.cpp:110
+msgid "Layer"
+msgstr "层"
 
-#: pcbnew/drc.cpp:325
-#: pcbnew/drc.cpp:399
-msgid "SegmNb"
-msgstr "线段编号"
+#: pcbnew/class_module.cpp:1092
+#: pcbnew/affiche.cpp:52
+#: pcbnew/class_board.cpp:434
+msgid "Pads"
+msgstr "焊盘"
 
-#: pcbnew/drc.cpp:326
-msgid "Track Err"
-msgstr "导线错误"
+#: pcbnew/class_module.cpp:1100
+#: pcbnew/class_track.cpp:820
+msgid "Stat"
+msgstr "状态"
 
-#: pcbnew/drc.cpp:330
-msgid "Tst Tracks\n"
-msgstr "导线检测\n"
+#: pcbnew/class_module.cpp:1104
+#: pcbnew/class_text_mod.cpp:383
+#: pcbnew/dialog_edit_module.cpp:246
+#: pcbnew/class_pad.cpp:1013
+#: pcbnew/class_pcb_text.cpp:188
+#: eeschema/affiche.cpp:119
+#: gerbview/affiche.cpp:49
+msgid "Orient"
+msgstr "方向"
 
-#: pcbnew/drc.cpp:361
-#: pcbnew/drc.cpp:439
-#: eeschema/eelayer.h:104
-msgid "Netname"
-msgstr "网络名"
+#: pcbnew/class_module.cpp:1107
+#: pcbnew/class_text_mod.cpp:350
+#: pcbnew/class_edge_mod.cpp:289
+#: pcbnew/class_pad.cpp:881
+#: cvpcb/setvisu.cpp:31
+msgid "Module"
+msgstr "模块"
 
-#: pcbnew/drc.cpp:400
-msgid "Zone Err"
-msgstr "覆铜错误"
+#: pcbnew/class_module.cpp:1110
+msgid "3D-Shape"
+msgstr "3D外形"
 
-#: pcbnew/drc.cpp:403
-msgid "Tst Zones\n"
-msgstr "覆铜检测\n"
+#: pcbnew/class_module.cpp:1114
+msgid "Doc:  "
+msgstr "说  明: "
 
-#: pcbnew/drc.cpp:1386
-#, c-format
-msgid "%d Drc Err %d %s (net %s) and PAD %s (%s) net %s @ %d,%d\n"
-msgstr "%d DRC错误 %d %s(网络%s) 和 焊盘%s(%s) 网络%s 在 %d,%d\n"
+#: pcbnew/class_module.cpp:1115
+msgid "KeyW: "
+msgstr "关键词: "
 
-#: pcbnew/drc.cpp:1403
-#, c-format
-msgid "%d Err type %d: %s (net %s) and VIA (net %s) @ %d,%d\n"
-msgstr "%d 错误类型 %d: %s(网络%s) 和 过孔(网络%s) 在 %d,%d\n"
+#: pcbnew/class_drawsegment.cpp:159
+#: pcbnew/class_text_mod.cpp:359
+#: pcbnew/class_track.cpp:779
+#: pcbnew/class_zone.cpp:526
+#: pcbnew/class_marker.cpp:133
+#: gerbview/affiche.cpp:94
+msgid "Type"
+msgstr "类型"
 
-#: pcbnew/drc.cpp:1419
-#, c-format
-msgid "%d Err type %d: %s (net %s) and track (net %s) @ %d,%d\n"
-msgstr "%d 错误类型 %d: %s(网络%s) 和 导线(网络%s) 在 %d,%d\n"
+#: pcbnew/class_drawsegment.cpp:161
+msgid "Shape"
+msgstr "形状"
 
-#: pcbnew/drc.cpp:1477
-#, c-format
-msgid "%d Drc Err: PAD %s (%s) net %s @ %d,%d and PAD %s (%s) net %s @ %d,%d\n"
-msgstr "%d DRC错误: 焊盘%s(%s)网络%s 在 %d,%d 和 焊盘%s(%s)网络%s 在 %d,%d\n"
+#: pcbnew/class_drawsegment.cpp:164
+#: pcbnew/class_track.cpp:806
+#: pcbnew/class_board_item.cpp:108
+#: pcbnew/dialog_pad_edit.cpp:176
+#: pcbnew/dialog_pad_edit.cpp:196
+msgid "Circle"
+msgstr "圆"
 
-#: pcbnew/find.cpp:127
-msgid "Marker found"
-msgstr "DRC标记 找到"
+#: pcbnew/class_drawsegment.cpp:168
+msgid "  Arc  "
+msgstr "  圆弧  "
 
-#: pcbnew/find.cpp:129
-#, c-format
-msgid "<%s> Found"
-msgstr "<%s> 找到"
+#: pcbnew/class_drawsegment.cpp:173
+#: pcbnew/class_track.cpp:804
+msgid "Segment"
+msgstr "线段"
 
-#: pcbnew/find.cpp:156
-msgid "Marker not found"
-msgstr "DRC标记 没有找到"
+#: pcbnew/block.cpp:122
+msgid "Include Modules"
+msgstr "包括 模块"
 
-#: pcbnew/find.cpp:158
-#, c-format
-msgid "<%s> Not Found"
-msgstr "< %s > 没有找到"
+#: pcbnew/block.cpp:126
+msgid "Include tracks"
+msgstr "包括 导线"
 
-#: pcbnew/find.cpp:265
-#: eeschema/dialog_find.cpp:107
-msgid "Item to find:"
-msgstr "查找内容："
+#: pcbnew/block.cpp:130
+msgid "Include zones"
+msgstr "包括 覆铜"
 
-#: pcbnew/find.cpp:286
-msgid "Find Item"
-msgstr "查找内容"
+#: pcbnew/block.cpp:135
+msgid "Include Text on copper layers"
+msgstr "包括 铜层的文字"
 
-#: pcbnew/find.cpp:292
-msgid "Find Next Item"
-msgstr "查找下一个"
+#: pcbnew/block.cpp:139
+msgid "Include drawings"
+msgstr "包括 图形"
 
-#: pcbnew/find.cpp:301
-msgid "Find Marker"
-msgstr "查找DRC标记"
+#: pcbnew/block.cpp:143
+msgid "Include egde layer"
+msgstr "包括 边界层"
 
-#: pcbnew/find.cpp:307
-msgid "Find Next Marker"
-msgstr "查找下一个DRC标记"
+#: pcbnew/block.cpp:450
+msgid "Delete Block"
+msgstr "删除 块"
 
-#: pcbnew/gendrill.cpp:150
-msgid "Drill tools"
-msgstr "钻孔工具"
+#: pcbnew/block.cpp:559
+msgid "Delete zones"
+msgstr "删除 覆铜"
 
-#: pcbnew/gendrill.cpp:171
-#: pcbnew/dialog_general_options.cpp:272
-#: gerbview/options.cpp:186
-msgid "millimeters"
-msgstr "mm"
+#: pcbnew/block.cpp:607
+msgid "Rotate Block"
+msgstr "旋转 块"
 
-#: pcbnew/gendrill.cpp:171
-#: eeschema/dialog_options.cpp:246
-msgid "inches"
-msgstr "inch"
+#: pcbnew/block.cpp:664
+msgid "Zone rotation"
+msgstr "覆铜 旋转"
 
-#: pcbnew/gendrill.cpp:173
-msgid "Drill Units:"
-msgstr "钻孔单位："
+#: pcbnew/block.cpp:772
+msgid "Block mirroring"
+msgstr "块 镜像"
 
-#: pcbnew/gendrill.cpp:181
-msgid "decimal format"
-msgstr "十进制格式"
+#: pcbnew/block.cpp:960
+msgid "Move Block"
+msgstr "移动 块"
 
-#: pcbnew/gendrill.cpp:182
-msgid "suppress leading zeros"
-msgstr "去掉前导的零"
+#: pcbnew/block.cpp:1115
+msgid "Copy Block"
+msgstr "复制 块"
 
-#: pcbnew/gendrill.cpp:182
-msgid "suppress trailing zeros"
-msgstr "去掉结尾的零"
+#: pcbnew/router.cpp:60
+msgid "Unable to create temporary file "
+msgstr "无法建立临时文件"
 
-#: pcbnew/gendrill.cpp:182
-msgid "keep zeros"
-msgstr "保留零"
+#: pcbnew/router.cpp:65
+msgid "Create temporary file "
+msgstr "建立临时文件"
 
-#: pcbnew/gendrill.cpp:185
-msgid "Zeros Format"
-msgstr "零的格式"
+#: pcbnew/router.cpp:566
+msgid "Unable to find data file "
+msgstr "无法找到数据文件"
 
-#: pcbnew/gendrill.cpp:192
-#: pcbnew/gendrill.cpp:443
-msgid "2:3"
-msgstr "2:3"
+#: pcbnew/router.cpp:572
+msgid "Reading autorouter data file "
+msgstr "读取自动布线程序的数据文件"
 
-#: pcbnew/gendrill.cpp:192
-#: pcbnew/gendrill.cpp:444
-msgid "2:4"
-msgstr "2:4"
+#: pcbnew/pcbplot.cpp:120
+#: pcbnew/pcbplot.cpp:210
+#: gerbview/tool_gerber.cpp:90
+msgid "Plot"
+msgstr "绘图输出(Plot)"
 
-#: pcbnew/gendrill.cpp:193
-#: pcbnew/gendrill.cpp:449
-msgid "3:2"
-msgstr "3:2"
+#: pcbnew/pcbplot.cpp:150
+msgid "Plot Format"
+msgstr "绘图格式"
 
-#: pcbnew/gendrill.cpp:193
-#: pcbnew/gendrill.cpp:450
-msgid "3:3"
-msgstr "3:3"
+#: pcbnew/pcbplot.cpp:176
+msgid "Spot min"
+msgstr "点最小值"
 
-#: pcbnew/gendrill.cpp:199
-msgid "Precision"
-msgstr "精度"
+#: pcbnew/pcbplot.cpp:180
+msgid "Pen Size"
+msgstr "笔大小"
 
-#: pcbnew/gendrill.cpp:211
-msgid "absolute"
-msgstr "绝对"
+#: pcbnew/pcbplot.cpp:184
+msgid "Pen Speed (cm/s)"
+msgstr "笔速度(cm/s)"
 
-#: pcbnew/gendrill.cpp:211
-msgid "auxiliary axis"
-msgstr "辅助轴"
+#: pcbnew/pcbplot.cpp:186
+msgid "Set pen speed in cm/s"
+msgstr "设置笔速度, 单位cm/s"
 
-#: pcbnew/gendrill.cpp:213
-msgid "Drill Origin:"
-msgstr "钻孔原点："
+#: pcbnew/pcbplot.cpp:188
+msgid "Pen Ovr"
+msgstr "笔覆盖"
 
-#: pcbnew/gendrill.cpp:222
-#: pcbnew/gendrill.cpp:230
-#: eeschema/viewlibs.cpp:120
-#: eeschema/libedit.cpp:41
-msgid "None"
-msgstr "无"
+#: pcbnew/pcbplot.cpp:190
+msgid "Set plot overlay for filling"
+msgstr "设置填充时笔的覆盖"
 
-#: pcbnew/gendrill.cpp:222
-msgid "drill sheet (HPGL)"
-msgstr "钻孔表（HPGL）"
+#: pcbnew/pcbplot.cpp:192
+msgid "Lines Width"
+msgstr "线宽"
 
-#: pcbnew/gendrill.cpp:222
-msgid "drill sheet (PostScript)"
-msgstr "钻孔表（PostScript）"
+#: pcbnew/pcbplot.cpp:194
+msgid "Set width for lines in Line plot mode"
+msgstr "设置在线绘图模式下的线宽"
 
-#: pcbnew/gendrill.cpp:224
-msgid "Drill Sheet:"
-msgstr "钻孔表："
+#: pcbnew/pcbplot.cpp:198
+msgid "Absolute"
+msgstr "绝对"
 
-#: pcbnew/gendrill.cpp:230
-msgid "Drill report"
-msgstr "钻孔报告"
+#: pcbnew/pcbplot.cpp:198
+msgid "Auxiliary axis"
+msgstr "辅助轴"
 
-#: pcbnew/gendrill.cpp:232
-msgid "Drill Report:"
-msgstr "钻孔报告："
+#: pcbnew/pcbplot.cpp:200
+msgid "Plot Origin"
+msgstr "绘图原点"
 
-#: pcbnew/gendrill.cpp:238
-msgid "Via Drill"
-msgstr "过孔钻孔"
+#: pcbnew/pcbplot.cpp:218
+msgid "Save options"
+msgstr "保存选项设置"
 
-#: pcbnew/gendrill.cpp:243
-#: eeschema/plothpgl.cpp:239
-msgid "Pen Number"
-msgstr "笔数量"
+#: pcbnew/pcbplot.cpp:222
+msgid "Create Drill File"
+msgstr "生成钻孔文件"
 
-#: pcbnew/gendrill.cpp:246
-msgid "Speed (cm/s)"
-msgstr "速度（cm/s）"
+#: pcbnew/pcbplot.cpp:234
+#: share/dialog_print.cpp:150
+msgid "X Scale Adjust"
+msgstr "X 比例调整"
 
-#: pcbnew/gendrill.cpp:249
-msgid "mirror y axis"
-msgstr "以 y 轴镜像"
+#: pcbnew/pcbplot.cpp:235
+#: share/wxprint.cpp:170
+msgid "Set X scale adjust for exact scale plotting"
+msgstr "设置 X 方向调整比例使输出更精确"
 
-#: pcbnew/gendrill.cpp:253
-msgid "minimal header"
-msgstr "最小报头"
+#: pcbnew/pcbplot.cpp:236
+#: share/dialog_print.cpp:156
+msgid "Y Scale Adjust"
+msgstr "Y 比例调整"
 
-#: pcbnew/gendrill.cpp:259
-msgid "&Execute"
-msgstr "执行(&E)"
+#: pcbnew/pcbplot.cpp:237
+#: share/wxprint.cpp:171
+msgid "Set Y scale adjust for exact scale plotting"
+msgstr "设置 Y 方向调整比例使输出更精确"
 
-#: pcbnew/gendrill.cpp:263
-#: eeschema/plotps.cpp:208
-#: share/dialog_print.cpp:225
-#: share/svg_print.cpp:222
-msgid "&Close"
-msgstr "关闭(&C)"
+#: pcbnew/pcbplot.cpp:239
+msgid "Plot Negative"
+msgstr "负片输出"
 
-#: pcbnew/gendrill.cpp:380
-msgid "Drill file"
-msgstr "钻孔文件"
+#: pcbnew/pcbplot.cpp:264
+msgid "Exclude Edges Pcb Layer"
+msgstr "排除PCB边界层"
 
-#: pcbnew/gendrill.cpp:394
-#: pcbnew/gendrill.cpp:1614
-#: pcbnew/plotps.cpp:51
-#: pcbnew/xchgmod.cpp:642
-msgid "Unable to create file "
-msgstr "无法建立文件"
+#: pcbnew/pcbplot.cpp:267
+msgid "Exclude contents of Edges Pcb layer from all other layers"
+msgstr "排除PCB边界层上面的内容"
 
-#: pcbnew/gendrill.cpp:407
-#: pcbnew/gendrill.cpp:1032
-#: pcbnew/gendrill.cpp:1625
-msgid "Tools"
-msgstr "工具"
+#: pcbnew/pcbplot.cpp:273
+#: eeschema/plotps.cpp:193
+#: share/dialog_print.cpp:174
+#: share/svg_print.cpp:201
+msgid "Print Sheet Ref"
+msgstr "打印 Sheet Ref"
 
-#: pcbnew/gendrill.cpp:411
-#: pcbnew/gendrill.cpp:1101
-#: pcbnew/gendrill.cpp:1677
-#: pcbnew/class_track.cpp:837
-#: pcbnew/class_track.cpp:842
-#: pcbnew/class_pad.cpp:1085
-msgid "Drill"
-msgstr "钻孔"
+#: pcbnew/pcbplot.cpp:282
+msgid "Print Pads on Silkscreen"
+msgstr "打印丝印层的焊盘"
 
-#: pcbnew/gendrill.cpp:962
-msgid "Drill Map file"
-msgstr "钻孔图文件"
+#: pcbnew/pcbplot.cpp:285
+msgid "Enable/disable print/plot pads on Silkscreen layers"
+msgstr "允许/禁止打印(绘图输出)丝印层的焊盘"
 
-#: pcbnew/gendrill.cpp:1021
-#, c-format
-msgid "Unable to create file <%s>"
-msgstr "无法建立文件 < %s >"
+#: pcbnew/pcbplot.cpp:289
+msgid "Always Print Pads"
+msgstr "打印所有焊盘"
 
-#: pcbnew/gendrill.cpp:1323
-msgid ""
-" Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n"
-"Plot uses circle shape for some drill values"
-msgstr ""
-" 钻孔图：直径值过多，每个钻孔形状最多允许13个值\n"
-"某些钻孔值采用圆形绘图输出"
+#: pcbnew/pcbplot.cpp:291
+msgid "Force print/plot pads on ALL layers"
+msgstr "强制打印(绘图输出)所有层的焊盘"
 
-#: pcbnew/gendrill.cpp:1599
-msgid "Drill Report file"
-msgstr "钻孔报告文件"
+#: pcbnew/pcbplot.cpp:295
+msgid "Print Module Value"
+msgstr "打印模块的数值"
 
-#: pcbnew/via_edit.cpp:51
-msgid "Incorrect value for Via drill. No via drill change"
-msgstr "过孔钻孔值错误。过孔钻孔未做更改。"
+#: pcbnew/pcbplot.cpp:298
+msgid "Enable/disable print/plot module value on Silkscreen layers"
+msgstr "允许/禁止打印(绘图输出)丝印层上的模块数值"
 
-#: pcbnew/surbrill.cpp:35
-msgid "Filter for net names:"
-msgstr "过滤网络名称："
+#: pcbnew/pcbplot.cpp:301
+msgid "Print Module Reference"
+msgstr "打印模块索引"
 
-#: pcbnew/surbrill.cpp:39
-msgid "List Nets"
-msgstr "列出网络"
+#: pcbnew/pcbplot.cpp:304
+msgid "Enable/disable print/plot module reference on Silkscreen layers"
+msgstr "允许/禁止打印(绘图输出)丝印层上的模块索引"
 
-#: pcbnew/plotgerb.cpp:72
-msgid "unable to create file "
-msgstr "无法建立文件"
+#: pcbnew/pcbplot.cpp:308
+msgid "Print other Module texts"
+msgstr "打印其他模块文本"
 
-#: pcbnew/plotgerb.cpp:817
-#, c-format
-msgid "unable to reopen file <%s>"
-msgstr "无法重新打开文件 < %s >"
+#: pcbnew/pcbplot.cpp:311
+msgid "Enable/disable print/plot module field texts on Silkscreen layers"
+msgstr "允许/禁止打印(绘图输出)在丝印层上的模块其他文本域文字"
 
-#: pcbnew/edgemod.cpp:204
-msgid "The graphic item will be on a copper layer.It is very dangerous. Are you sure"
-msgstr "图形内容将出现在铜层。这存在很大危险。你是否确信要执行操作？"
+#: pcbnew/pcbplot.cpp:315
+msgid "Force Print Invisible Texts"
+msgstr "强制打印不可见文本"
 
-#: pcbnew/edgemod.cpp:246
-msgid "New Width (1/10000\"):"
-msgstr "新宽度（1/10000\"）："
+#: pcbnew/pcbplot.cpp:318
+msgid "Force print/plot module invisible texts on Silkscreen layers"
+msgstr "强制打印(绘图输出)丝印层上的模块不可见文本"
 
-#: pcbnew/edgemod.cpp:253
-msgid "Incorrect number, no change"
-msgstr "数字不正确，未做改变"
+#: pcbnew/pcbplot.cpp:322
+msgid "No Drill mark"
+msgstr "无钻孔标记"
 
-#: pcbnew/router.cpp:60
-msgid "Unable to create temporary file "
-msgstr "无法建立临时文件"
+#: pcbnew/pcbplot.cpp:322
+msgid "Small mark"
+msgstr "小标记"
 
-#: pcbnew/router.cpp:65
-msgid "Create temporary file "
-msgstr "建立临时文件"
+#: pcbnew/pcbplot.cpp:322
+msgid "Real Drill"
+msgstr "实际钻孔"
 
-#: pcbnew/router.cpp:566
-msgid "Unable to find data file "
-msgstr "无法找到数据文件"
+#: pcbnew/pcbplot.cpp:324
+msgid "Pads Drill Opt"
+msgstr "焊盘钻孔选项"
 
-#: pcbnew/router.cpp:572
-msgid "Reading autorouter data file "
-msgstr "读取自动布线程序的数据文件"
+#: pcbnew/pcbplot.cpp:330
+msgid "Auto scale"
+msgstr "自动缩放"
 
-#: pcbnew/affiche.cpp:34
-msgid "Net Name"
-msgstr "网络名"
+#: pcbnew/pcbplot.cpp:330
+msgid "Scale 1"
+msgstr "比例 1"
 
-#: pcbnew/affiche.cpp:36
-msgid "No Net (not connected)"
-msgstr "无网络（无连接）"
+#: pcbnew/pcbplot.cpp:330
+msgid "Scale 1.5"
+msgstr "比例 1.5"
 
-#: pcbnew/affiche.cpp:39
-msgid "Net Code"
-msgstr "网络代码"
+#: pcbnew/pcbplot.cpp:330
+#: share/dialog_print.cpp:142
+msgid "Scale 2"
+msgstr "比例 2"
 
-#: pcbnew/affiche.cpp:52
-#: pcbnew/class_module.cpp:1228
-#: pcbnew/class_board.cpp:304
-msgid "Pads"
-msgstr "焊盘"
+#: pcbnew/pcbplot.cpp:330
+#: share/dialog_print.cpp:143
+msgid "Scale 3"
+msgstr "比例 3"
 
-#: pcbnew/affiche.cpp:63
-#: pcbnew/plotps.cpp:361
-#: pcbnew/class_board.cpp:314
-msgid "Vias"
-msgstr "过孔"
+#: pcbnew/pcbplot.cpp:332
+msgid "Scale Opt"
+msgstr "缩放选项"
 
-#: pcbnew/block.cpp:125
-msgid "Include Modules"
-msgstr "包括 模块"
+#: pcbnew/pcbplot.cpp:337
+#: pcbnew/dialog_zones_by_polygon.cpp:168
+#: pcbnew/class_board_item.cpp:99
+#: pcbnew/dialog_display_options.cpp:221
+#: pcbnew/dialog_display_options.cpp:229
+#: pcbnew/dialog_display_options.cpp:266
+#: gerbview/options.cpp:321
+msgid "Line"
+msgstr "线"
 
-#: pcbnew/block.cpp:129
-msgid "Include tracks"
-msgstr "包括 导线"
+#: pcbnew/pcbplot.cpp:337
+#: pcbnew/dialog_display_options.cpp:192
+#: pcbnew/dialog_display_options.cpp:222
+#: pcbnew/dialog_display_options.cpp:230
+#: pcbnew/dialog_display_options.cpp:245
+#: pcbnew/dialog_display_options.cpp:267
+#: eeschema/dialog_cmp_graphic_properties.cpp:168
+#: gerbview/options.cpp:298
+#: gerbview/options.cpp:321
+msgid "Filled"
+msgstr "填充"
 
-#: pcbnew/block.cpp:133
-#: pcbnew/dialog_drc.cpp:171
-msgid "Include zones"
-msgstr "包括 覆铜"
+#: pcbnew/pcbplot.cpp:337
+#: pcbnew/dialog_display_options.cpp:191
+#: pcbnew/dialog_display_options.cpp:223
+#: pcbnew/dialog_display_options.cpp:231
+#: pcbnew/dialog_display_options.cpp:244
+#: pcbnew/dialog_display_options.cpp:268
+#: gerbview/options.cpp:298
+#: gerbview/options.cpp:321
+msgid "Sketch"
+msgstr "轮廓"
 
-#: pcbnew/block.cpp:138
-msgid "Include Text on copper layers"
-msgstr "包括 铜层的文字"
+#: pcbnew/pcbplot.cpp:338
+msgid "Plot Mode"
+msgstr "绘图模式"
 
-#: pcbnew/block.cpp:142
-msgid "Include drawings"
-msgstr "包括 图形"
+#: pcbnew/pcbplot.cpp:345
+msgid "Plot Mirror"
+msgstr "镜像绘图"
 
-#: pcbnew/block.cpp:146
-msgid "Include egde layer"
-msgstr "包括 边界层"
+#: pcbnew/pcbplot.cpp:350
+msgid "Vias on Mask"
+msgstr "阻焊层过孔"
 
-#: pcbnew/block.cpp:157
-#: pcbnew/mirepcb.cpp:103
-#: pcbnew/cotation.cpp:109
-#: pcbnew/muonde.cpp:352
-#: pcbnew/dialog_edit_module.cpp:122
-#: pcbnew/pcbtexte.cpp:116
-#: pcbnew/modedit_onclick.cpp:203
-#: pcbnew/modedit_onclick.cpp:235
-#: pcbnew/set_color.cpp:357
-#: pcbnew/onrightclick.cpp:146
-#: pcbnew/onrightclick.cpp:160
-#: pcbnew/globaleditpad.cpp:108
-#: pcbnew/sel_layer.cpp:162
-#: pcbnew/sel_layer.cpp:320
-#: eeschema/sheetlab.cpp:97
-#: eeschema/eelayer.cpp:255
-#: eeschema/libedit_onrightclick.cpp:68
-#: eeschema/libedit_onrightclick.cpp:83
-#: eeschema/onrightclick.cpp:121
-#: eeschema/onrightclick.cpp:133
-#: gerbview/options.cpp:169
-#: gerbview/options.cpp:293
-#: gerbview/reglage.cpp:112
-#: gerbview/onrightclick.cpp:40
-#: gerbview/onrightclick.cpp:59
-#: gerbview/set_color.cpp:329
-#: common/selcolor.cpp:171
-#: common/displlst.cpp:103
-#: common/get_component_dialog.cpp:121
-msgid "Cancel"
-msgstr "取消"
+#: pcbnew/pcbplot.cpp:353
+msgid "Print/plot vias on mask layers. They are in this case not protected"
+msgstr "打印(绘图输出)阻焊层过孔。这样的过孔不受阻焊层保护"
 
-#: pcbnew/block.cpp:160
-#: pcbnew/mirepcb.cpp:99
-#: pcbnew/cotation.cpp:105
-#: pcbnew/muonde.cpp:348
-#: pcbnew/dialog_edit_module.cpp:118
-#: pcbnew/pcbtexte.cpp:111
-#: pcbnew/set_color.cpp:353
-#: pcbnew/sel_layer.cpp:158
-#: pcbnew/sel_layer.cpp:316
-#: eeschema/sheetlab.cpp:93
-#: eeschema/eelayer.cpp:251
-#: gerbview/options.cpp:165
-#: gerbview/options.cpp:289
-#: gerbview/reglage.cpp:108
-#: gerbview/set_color.cpp:325
-#: common/displlst.cpp:99
-#: common/get_component_dialog.cpp:112
-msgid "OK"
-msgstr "确定"
+#: pcbnew/pcbplot.cpp:357
+msgid "Org = Centre"
+msgstr "原点 = 中心"
 
-#: pcbnew/block.cpp:453
-msgid "Delete Block"
-msgstr "删除 块"
+#: pcbnew/pcbplot.cpp:359
+msgid "Draw origin ( 0,0 ) in sheet center"
+msgstr "将原点 ( 0,0 ) 绘制在图中心位置"
 
-#: pcbnew/block.cpp:464
-msgid "Delete Footprints"
-msgstr "删除 封装"
+#: pcbnew/clean.cpp:179
+msgid "Delete unconnected tracks:"
+msgstr "删除未连接的导线:"
 
-#: pcbnew/block.cpp:484
-msgid "Delete tracks"
-msgstr "删除 导线"
+#: pcbnew/clean.cpp:198
+msgid "ViaDef"
+msgstr "导孔编号"
 
-#: pcbnew/block.cpp:505
-msgid "Delete draw layers"
-msgstr "删除 图形层"
+#: pcbnew/clean.cpp:370
+msgid "Clean Null Segments"
+msgstr "清除空线段"
 
-#: pcbnew/block.cpp:570
-msgid "Delete zones"
-msgstr "删除 覆铜"
+#: pcbnew/clean.cpp:462
+msgid "Merging Segments:"
+msgstr "合并线段:"
 
-#: pcbnew/block.cpp:605
-msgid "Rotate Block"
-msgstr "旋转 块"
+#: pcbnew/clean.cpp:464
+msgid "Merge"
+msgstr "合并"
 
-#: pcbnew/block.cpp:620
-msgid "Footprint rotation"
-msgstr "封装 旋转"
+#: pcbnew/clean.cpp:464
+#: pcbnew/dialog_pad_edit.cpp:186
+#: eeschema/dialog_erc.cpp:193
+#: eeschema/dialog_erc.cpp:197
+#: eeschema/dialog_edit_component_in_schematic.cpp:171
+#, fuzzy
+msgid "0"
+msgstr "0"
 
-#: pcbnew/block.cpp:654
-msgid "Track rotation"
-msgstr "导线 旋转"
+#: pcbnew/clean.cpp:480
+msgid "Merge: "
+msgstr "合并: "
 
-#: pcbnew/block.cpp:675
-msgid "Zone rotation"
-msgstr "覆铜 旋转"
+#: pcbnew/clean.cpp:710
+msgid "DRC Control:"
+msgstr "DRC 控制:"
 
-#: pcbnew/block.cpp:696
-msgid "Draw layers rotation"
-msgstr "绘图层 旋转"
+#: pcbnew/clean.cpp:715
+#, fuzzy
+msgid "NetCtr"
+msgstr "NetCtr"
 
-#: pcbnew/block.cpp:815
-msgid "Block mirroring"
-msgstr "块 镜像"
+#: pcbnew/clean.cpp:1061
+msgid "Centre"
+msgstr "中心"
 
-#: pcbnew/block.cpp:830
-msgid "Footprint mirroring"
-msgstr "封装 镜像"
+#: pcbnew/clean.cpp:1061
+#, fuzzy
+msgid "0 "
+msgstr "0 "
 
-#: pcbnew/block.cpp:863
-msgid "Track mirroring"
-msgstr "导线 镜像"
+#: pcbnew/clean.cpp:1072
+msgid "Pads: "
+msgstr "焊盘: "
 
-#: pcbnew/block.cpp:889
-msgid "Zone mirroring"
-msgstr "覆铜 镜像"
+#: pcbnew/clean.cpp:1076
+#, fuzzy
+msgid "Max"
+msgstr "Max"
 
-#: pcbnew/block.cpp:911
-msgid "Draw layers mirroring"
-msgstr "绘图层 镜像"
+#: pcbnew/clean.cpp:1079
+msgid "Segm"
+msgstr "线段"
 
-#: pcbnew/block.cpp:1038
-msgid "Move Block"
-msgstr "移动 块"
+#: pcbnew/class_text_mod.cpp:345
+msgid "Ref."
+msgstr "索引"
 
-#: pcbnew/block.cpp:1050
-msgid "Move footprints"
-msgstr "移动 封装"
+#: pcbnew/class_text_mod.cpp:345
+#: pcbnew/class_board_item.cpp:79
+#: pcbnew/class_edge_mod.cpp:290
+#: eeschema/component_class.cpp:59
+#: eeschema/edit_component_in_schematic.cpp:791
+#: eeschema/eelayer.h:158
+msgid "Value"
+msgstr "数值"
 
-#: pcbnew/block.cpp:1083
-msgid "Move tracks"
-msgstr "移动 导线"
+#: pcbnew/class_text_mod.cpp:345
+#: pcbnew/class_text_mod.cpp:353
+#: pcbnew/class_board_item.cpp:84
+msgid "Text"
+msgstr "文字"
 
-#: pcbnew/block.cpp:1104
-msgid "Move zones"
-msgstr "移动 覆铜"
+#: pcbnew/class_text_mod.cpp:363
+#: pcbnew/dialog_display_options.cpp:275
+#: pcbnew/class_pcb_text.cpp:183
+#: eeschema/dialog_options.cpp:265
+#: gerbview/affiche.cpp:43
+msgid "No"
+msgstr "否"
 
-#: pcbnew/block.cpp:1125
-msgid "Move draw layers"
-msgstr "移动 绘图层"
+#: pcbnew/class_text_mod.cpp:365
+#: pcbnew/dialog_display_options.cpp:274
+#: pcbnew/class_pcb_text.cpp:185
+#: eeschema/dialog_options.cpp:264
+#: gerbview/affiche.cpp:45
+msgid "Yes"
+msgstr "是"
 
-#: pcbnew/block.cpp:1230
-msgid "Copy Block"
-msgstr "复制 块"
+#: pcbnew/class_text_mod.cpp:389
+#: pcbnew/class_pad.cpp:984
+#: pcbnew/class_pcb_text.cpp:194
+#: gerbview/affiche.cpp:55
+msgid "H Size"
+msgstr "H大小"
 
-#: pcbnew/block.cpp:1242
-msgid "Module copy"
-msgstr "模块 复制"
+#: pcbnew/class_text_mod.cpp:392
+#: pcbnew/class_pad.cpp:988
+#: pcbnew/class_pcb_text.cpp:197
+#: gerbview/affiche.cpp:58
+msgid "V Size"
+msgstr "V大小"
 
-#: pcbnew/block.cpp:1281
-msgid "Track copy"
-msgstr "导线 复制"
+#: pcbnew/gen_modules_placefile.cpp:76
+msgid "No Modules for Automated Placement"
+msgstr "没有要自动放置的模块"
 
-#: pcbnew/block.cpp:1305
-msgid "Zone copy"
-msgstr "覆铜 复制"
+#: pcbnew/gen_modules_placefile.cpp:110
+msgid "Component side place file:"
+msgstr "元件面放置文件:"
 
-#: pcbnew/block.cpp:1330
-msgid "Draw layers copy"
-msgstr "绘图层 复制"
+#: pcbnew/gen_modules_placefile.cpp:113
+msgid "Copper side place file:"
+msgstr "铜箔面放置文件:"
 
-#: pcbnew/editedge.cpp:167
-msgid "Copper layer global delete not allowed!"
-msgstr "铜层不允许全局删除！"
+#: pcbnew/gen_modules_placefile.cpp:116
+msgid "Module count"
+msgstr "模块数"
 
-#: pcbnew/editedge.cpp:173
-msgid "Segment is being edited"
-msgstr "线段将被更改"
+#: pcbnew/class_track.cpp:768
+#: pcbnew/pcbframe.cpp:455
+#: pcbnew/class_board_item.cpp:142
+msgid "Track"
+msgstr "导线"
 
-#: pcbnew/editedge.cpp:177
-msgid "Delete Layer "
-msgstr "删除 层"
+#: pcbnew/class_track.cpp:772
+#: pcbnew/class_board_item.cpp:185
+msgid "Zone"
+msgstr "覆铜"
 
-#: pcbnew/plotps.cpp:390
-msgid "Tracks"
-msgstr "导线"
+#: pcbnew/class_track.cpp:795
+#: pcbnew/class_zone.cpp:546
+#: pcbnew/zones_by_polygon.cpp:851
+msgid "NetName"
+msgstr "网络名称"
 
-#: pcbnew/dialog_edit_mod_text.cpp:156
-#, c-format
-msgid "Module %s (%s) orient %.1f"
-msgstr "模块 %s (%s) 方向 %.1f"
+#: pcbnew/class_track.cpp:800
+#: pcbnew/class_zone.cpp:551
+msgid "NetCode"
+msgstr "网络号"
 
-#: pcbnew/dialog_edit_mod_text.cpp:163
-msgid "Reference:"
-msgstr "标签："
+#: pcbnew/class_track.cpp:808
+#: pcbnew/dialog_pad_edit.cpp:205
+msgid "Standard"
+msgstr "标准"
 
-#: pcbnew/dialog_edit_mod_text.cpp:175
-msgid "Size X"
-msgstr "大小 X"
+#: pcbnew/class_track.cpp:844
+msgid "Diam"
+msgstr "直径"
 
-#: pcbnew/dialog_edit_mod_text.cpp:181
-msgid "Size Y"
-msgstr "大小 Y"
+#: pcbnew/class_track.cpp:851
+#: pcbnew/class_track.cpp:856
+#: pcbnew/class_pad.cpp:994
+msgid "Drill"
+msgstr "钻孔"
 
-#: pcbnew/dialog_edit_mod_text.cpp:189
-msgid "Offset X"
-msgstr "偏移 X"
+#: pcbnew/files.cpp:57
+msgid "Recovery file "
+msgstr "恢复文件"
 
-#: pcbnew/dialog_edit_mod_text.cpp:195
-msgid "Offset Y"
-msgstr "偏移 Y"
+#: pcbnew/files.cpp:63
+msgid "Ok to load Recovery file "
+msgstr "是否确定加载恢复文件"
 
-#: pcbnew/dialog_edit_mod_text.cpp:213
-#: pcbnew/dialog_initpcb.cpp:161
-#: pcbnew/dialog_display_options.cpp:282
-#: pcbnew/set_grid.cpp:171
-#: pcbnew/dialog_pad_edit.cpp:217
-#: pcbnew/dialog_general_options.cpp:368
-#: pcbnew/dialog_graphic_items_options.cpp:261
-#: pcbnew/dialog_drc.cpp:232
-#: pcbnew/swap_layers.cpp:220
-#: pcbnew/dialog_track_options.cpp:181
-#: eeschema/symbtext.cpp:174
-#: eeschema/sheet.cpp:221
-#: eeschema/dialog_options.cpp:274
-#: eeschema/dialog_edit_label.cpp:174
-#: eeschema/dialog_create_component.cpp:195
-#: eeschema/dialog_cmp_graphic_properties.cpp:178
-#: eeschema/dialog_build_BOM.cpp:346
-#: eeschema/dialog_edit_component_in_schematic.cpp:240
-#: eeschema/dialog_edit_component_in_lib.cpp:218
-#: eeschema/pinedit-dialog.cpp:308
-#: cvpcb/dialog_cvpcb_config.cpp:139
-#: cvpcb/dialog_display_options.cpp:186
-#: gerbview/select_layers_to_pcb.cpp:283
-#: share/setpage.cpp:442
-msgid "&OK"
-msgstr "确定(&O)"
+#: pcbnew/files.cpp:142
+msgid "Board Modified: Continue ?"
+msgstr "电路板被更改: 是否继续？"
+
+#: pcbnew/files.cpp:160
+msgid "Load board files:"
+msgstr "加载电路板文件: "
 
-#: pcbnew/dialog_edit_mod_text.cpp:217
-#: pcbnew/dialog_initpcb.cpp:164
-#: pcbnew/dialog_display_options.cpp:286
-#: pcbnew/dialog_netlist.cpp:189
-#: pcbnew/set_grid.cpp:176
-#: pcbnew/dialog_pad_edit.cpp:221
-#: pcbnew/zones.cpp:217
-#: pcbnew/dialog_general_options.cpp:372
-#: pcbnew/dialog_graphic_items_options.cpp:265
-#: pcbnew/dialog_drc.cpp:236
-#: pcbnew/swap_layers.cpp:224
-#: pcbnew/dialog_track_options.cpp:185
-#: eeschema/symbtext.cpp:178
-#: eeschema/plothpgl.cpp:274
-#: eeschema/annotate_dialog.cpp:154
-#: eeschema/sheet.cpp:216
-#: eeschema/dialog_options.cpp:278
-#: eeschema/dialog_edit_label.cpp:179
-#: eeschema/dialog_create_component.cpp:200
-#: eeschema/netlist_control.cpp:251
-#: eeschema/netlist_control.cpp:375
-#: eeschema/dialog_cmp_graphic_properties.cpp:182
-#: eeschema/dialog_build_BOM.cpp:350
-#: eeschema/dialog_erc.cpp:218
-#: eeschema/dialog_edit_component_in_schematic.cpp:232
-#: eeschema/dialog_edit_component_in_lib.cpp:214
-#: eeschema/pinedit-dialog.cpp:304
-#: cvpcb/dialog_display_options.cpp:191
-#: gerbview/select_layers_to_pcb.cpp:287
-#: share/setpage.cpp:446
-msgid "&Cancel"
-msgstr "取消(&C)"
+#: pcbnew/files.cpp:272
+msgid "Save board files:"
+msgstr "保存电路板文件: "
 
-#: pcbnew/dialog_edit_mod_text.cpp:222
-msgid "horiz"
-msgstr "水平"
+#: pcbnew/files.cpp:311
+msgid "Warning: unable to create bakfile "
+msgstr "警告: 无法建立备份文件"
 
-#: pcbnew/dialog_edit_mod_text.cpp:223
-msgid "vertical"
-msgstr "垂直"
+#: pcbnew/files.cpp:345
+msgid "Backup file: "
+msgstr "备份文件: "
 
-#: pcbnew/dialog_edit_mod_text.cpp:225
-#: pcbnew/pcbtexte.cpp:152
-msgid "Orientation"
-msgstr "方向"
+#: pcbnew/files.cpp:349
+msgid "Wrote board file: "
+msgstr "写入电路板文件: "
 
-#: pcbnew/dialog_edit_mod_text.cpp:229
-msgid "show"
-msgstr "显示"
+#: pcbnew/files.cpp:351
+msgid "Failed to create "
+msgstr "生成文件失败: "
 
-#: pcbnew/dialog_edit_mod_text.cpp:230
-msgid "no show"
-msgstr "不显示"
+#: pcbnew/dialog_gendrill.cpp:164
+msgid "Millimeters"
+msgstr "mm"
 
-#: pcbnew/dialog_edit_mod_text.cpp:232
-#: pcbnew/cotation.cpp:114
-#: pcbnew/pcbtexte.cpp:177
-#: pcbnew/dialog_general_options.cpp:264
-#: pcbnew/class_text_mod.cpp:361
-#: eeschema/affiche.cpp:92
-#: gerbview/options.cpp:176
-#: gerbview/tool_gerber.cpp:113
-msgid "Display"
-msgstr "显示"
+#: pcbnew/dialog_gendrill.cpp:165
+#: pcbnew/set_grid.cpp:147
+#: pcbnew/dialog_general_options.cpp:271
+#: gerbview/options.cpp:185
+msgid "Inches"
+msgstr "inch"
 
-#: pcbnew/dialog_edit_mod_text.cpp:313
-msgid "Value:"
-msgstr "值："
+#: pcbnew/dialog_gendrill.cpp:166
+msgid "Drill Units:"
+msgstr "钻孔单位: "
 
-#: pcbnew/dialog_edit_mod_text.cpp:314
-#: pcbnew/pcbtexte.cpp:120
-#: eeschema/sheetlab.cpp:101
-#: common/confirm.cpp:131
-msgid "Text:"
-msgstr "文字："
+#: pcbnew/dialog_gendrill.cpp:171
+msgid "decimal format"
+msgstr "十进制格式"
 
-#: pcbnew/netlist.cpp:96
-#, c-format
-msgid "Netlist file %s not found"
-msgstr "没有找到网络表文件 %s"
+#: pcbnew/dialog_gendrill.cpp:172
+msgid "suppress leading zeros"
+msgstr "去掉前导的零"
 
-#: pcbnew/netlist.cpp:147
-msgid "Read Netlist "
-msgstr "读取网络表"
+#: pcbnew/dialog_gendrill.cpp:173
+msgid "suppress trailing zeros"
+msgstr "去掉结尾的零"
 
-#: pcbnew/netlist.cpp:383
-#, c-format
-msgid "Cmp %s: Mismatch! module is [%s] and netlist said [%s]\n"
-msgstr "元件 %s：不匹配！模块为[%s]，网络表中为[%s]\n"
+#: pcbnew/dialog_gendrill.cpp:174
+msgid "keep zeros"
+msgstr "保留零"
 
-#: pcbnew/netlist.cpp:421
-#, c-format
-msgid "Component [%s] not found"
-msgstr "元件[%s]没有找到"
+#: pcbnew/dialog_gendrill.cpp:175
+msgid "Zeros Format"
+msgstr "零的格式"
 
-#: pcbnew/netlist.cpp:488
-#, c-format
-msgid "Module [%s]: Pad [%s] not found"
-msgstr "模块[%s]：焊盘[%s]没有找到"
+#: pcbnew/dialog_gendrill.cpp:180
+#: pcbnew/gendrill.cpp:378
+#, fuzzy
+msgid "2:3"
+msgstr "2:3"
 
-#: pcbnew/netlist.cpp:515
-msgid "No Modules"
-msgstr "没有模块"
+#: pcbnew/dialog_gendrill.cpp:181
+#: pcbnew/gendrill.cpp:379
+#, fuzzy
+msgid "2:4"
+msgstr "2:4"
 
-#: pcbnew/netlist.cpp:530
-msgid "Components"
-msgstr "元件"
+#: pcbnew/dialog_gendrill.cpp:182
+msgid "Precision"
+msgstr "精度"
 
-#: pcbnew/netlist.cpp:578
-msgid "No modules"
-msgstr "没有模块"
+#: pcbnew/dialog_gendrill.cpp:187
+msgid "absolute"
+msgstr "绝对"
 
-#: pcbnew/netlist.cpp:588
-msgid "No modules in NetList"
-msgstr "网络表中没有包含模块"
+#: pcbnew/dialog_gendrill.cpp:188
+msgid "auxiliary axis"
+msgstr "辅助轴"
 
-#: pcbnew/netlist.cpp:591
-msgid "Check Modules"
-msgstr "检查模块"
+#: pcbnew/dialog_gendrill.cpp:189
+msgid "Drill Origin:"
+msgstr "钻孔原点:"
 
-#: pcbnew/netlist.cpp:594
-msgid "Duplicates"
-msgstr "重复"
+#: pcbnew/dialog_gendrill.cpp:197
+#: pcbnew/dialog_gendrill.cpp:205
+#: eeschema/libedit.cpp:41
+#: eeschema/viewlibs.cpp:120
+msgid "None"
+msgstr "无"
 
-#: pcbnew/netlist.cpp:612
-msgid "Lack:"
-msgstr "缺："
+#: pcbnew/dialog_gendrill.cpp:198
+msgid "drill sheet (HPGL)"
+msgstr "钻孔表(HPGL)"
 
-#: pcbnew/netlist.cpp:634
-msgid "Not in Netlist:"
-msgstr "未在网络表中："
+#: pcbnew/dialog_gendrill.cpp:199
+msgid "drill sheet (PostScript)"
+msgstr "钻孔表(PostScript)"
 
-#: pcbnew/netlist.cpp:782
-#, c-format
-msgid "File <%s> not found, use Netlist for lib module selection"
-msgstr "文件 < %s > 没有找到，应用网络表中的模块库选项"
+#: pcbnew/dialog_gendrill.cpp:200
+msgid "Drill Sheet:"
+msgstr "钻孔表:"
 
-#: pcbnew/netlist.cpp:868
-msgid "Netlist Selection:"
-msgstr "选择网络表文件："
+#: pcbnew/dialog_gendrill.cpp:206
+msgid "Drill report"
+msgstr "钻孔报告"
 
-#: pcbnew/netlist.cpp:945
-#, c-format
-msgid "Component [%s]: footprint <%s> not found"
-msgstr "元件[%s]： 封装<%s>没有找到"
+#: pcbnew/dialog_gendrill.cpp:207
+msgid "Drill Report:"
+msgstr "钻孔报告:"
 
-#: pcbnew/editrout.cpp:116
-#: pcbnew/edit_track_width.cpp:117
-msgid "Edit All Tracks and Vias Sizes"
-msgstr "编辑所有导线和过孔的大小"
+#: pcbnew/dialog_gendrill.cpp:211
+msgid "HPGL plotter Options:"
+msgstr "HPGL 绘图机选项:"
 
-#: pcbnew/editrout.cpp:121
-#: pcbnew/edit_track_width.cpp:122
-msgid "Edit All Via Sizes"
-msgstr "编辑所有过孔的大小"
+#: pcbnew/dialog_gendrill.cpp:215
+msgid "Speed (cm/s)"
+msgstr "速度(cm/s)"
 
-#: pcbnew/editrout.cpp:126
-#: pcbnew/edit_track_width.cpp:127
-msgid "Edit All Track Sizes"
-msgstr "编辑所有导线的大小"
+#: pcbnew/dialog_gendrill.cpp:221
+#: eeschema/plothpgl.cpp:241
+msgid "Pen Number"
+msgstr "笔数量"
 
-#: pcbnew/deltrack.cpp:161
-msgid "Delete NET ?"
-msgstr "删除 网络？"
+#: pcbnew/dialog_gendrill.cpp:227
+#: pcbnew/dialog_general_options.cpp:315
+#: eeschema/dialog_cmp_graphic_properties.cpp:151
+#: eeschema/netlist_control.cpp:122
+#: eeschema/dialog_build_BOM.cpp:269
+#: share/dialog_print.cpp:167
+msgid "Options:"
+msgstr "选项: "
 
-#: pcbnew/pcbframe.cpp:262
-msgid "Board modified, Save before exit ?"
-msgstr "电路板已被更改，是否在退出之前保存？"
+#: pcbnew/dialog_gendrill.cpp:231
+msgid "mirror y axis"
+msgstr "以 y 轴镜像"
 
-#: pcbnew/pcbframe.cpp:263
-#: eeschema/schframe.cpp:183
-#: cvpcb/cvframe.cpp:169
-#: common/confirm.cpp:109
-msgid "Confirmation"
-msgstr "确认"
+#: pcbnew/dialog_gendrill.cpp:235
+#, fuzzy
+msgid "minimal header"
+msgstr "minimal header"
 
-#: pcbnew/pcbframe.cpp:363
-msgid "DRC Off (Disable !!!), Currently: DRC is active"
-msgstr "关闭DRC（当前：DRC激活）"
+#: pcbnew/dialog_gendrill.cpp:242
+msgid "Info:"
+msgstr "信息:"
 
-#: pcbnew/pcbframe.cpp:364
-msgid "DRC On (Currently: DRC is inactive !!!)"
-msgstr "开启DRC（当前：DRC没有激活）"
+#: pcbnew/dialog_gendrill.cpp:246
+msgid "Default Vias Drill:"
+msgstr "默认导孔钻孔:"
 
-#: pcbnew/pcbframe.cpp:375
-msgid "Polar Coords not show"
-msgstr "不显示极坐标"
+#: pcbnew/dialog_gendrill.cpp:250
+msgid "Via Drill Value"
+msgstr "导孔钻孔值"
 
-#: pcbnew/pcbframe.cpp:376
-msgid "Display Polar Coords"
-msgstr "显示极坐标"
+#: pcbnew/dialog_gendrill.cpp:253
+msgid "Micro Vias Drill:"
+msgstr "微导孔钻孔:"
 
-#: pcbnew/pcbframe.cpp:381
-#: eeschema/schframe.cpp:274
-msgid "Grid not show"
-msgstr "不显示网格"
+#: pcbnew/dialog_gendrill.cpp:257
+msgid "Micro Via Drill Value"
+msgstr "微导孔钻孔值"
 
-#: pcbnew/pcbframe.cpp:381
-#: eeschema/schframe.cpp:274
-msgid "Show Grid"
-msgstr "显示网格"
+#: pcbnew/dialog_gendrill.cpp:260
+msgid "Holes Count:"
+msgstr "孔数量:"
 
-#: pcbnew/pcbframe.cpp:390
-msgid "General ratsnest not show"
-msgstr "不显示常规牵拉线"
+#: pcbnew/dialog_gendrill.cpp:264
+msgid "Pads:"
+msgstr "焊盘:"
 
-#: pcbnew/pcbframe.cpp:390
-msgid "Show General ratsnest"
-msgstr "显示常规牵拉线"
+#: pcbnew/dialog_gendrill.cpp:267
+msgid "Through Vias:"
+msgstr "贯通导孔:"
 
-#: pcbnew/pcbframe.cpp:396
-msgid "Module ratsnest not show"
-msgstr "不显示模块牵拉线"
+#: pcbnew/dialog_gendrill.cpp:270
+#: pcbnew/dialog_track_options.cpp:223
+msgid "Micro Vias:"
+msgstr "微导孔:"
 
-#: pcbnew/pcbframe.cpp:397
-msgid "Show Module ratsnest"
-msgstr "显示模块牵拉线"
+#: pcbnew/dialog_gendrill.cpp:273
+msgid "Buried Vias:"
+msgstr "埋孔:"
 
-#: pcbnew/pcbframe.cpp:404
-msgid "Disable Auto Delete old Track"
-msgstr "禁止自动删除旧导线"
+#: pcbnew/dialog_gendrill.cpp:282
+#: eeschema/plotps.cpp:210
+#: share/dialog_print.cpp:225
+#: share/svg_print.cpp:223
+msgid "&Close"
+msgstr "关闭(&C)"
 
-#: pcbnew/pcbframe.cpp:405
-msgid "Enable Auto Delete old Track"
-msgstr "启用自动删除旧导线"
+#: pcbnew/move-drag_pads.cpp:268
+#, c-format
+msgid "Delete Pad (module %s %s) "
+msgstr "删除焊盘(模块 %s %s) "
 
-#: pcbnew/pcbframe.cpp:412
-msgid "Do not Show Zones"
-msgstr "不显示覆铜"
+#: pcbnew/editpads.cpp:77
+msgid "Pad Position"
+msgstr "焊盘位置"
 
-#: pcbnew/pcbframe.cpp:412
-#: pcbnew/tool_pcb.cpp:361
-#: pcbnew/set_color.h:423
-msgid "Show Zones"
-msgstr "显示覆铜"
+#: pcbnew/editpads.cpp:84
+msgid "Pad Size"
+msgstr "焊盘大小"
 
-#: pcbnew/pcbframe.cpp:418
-msgid "Show Pads Sketch mode"
-msgstr "焊盘 以轮廓方式显示"
+#: pcbnew/editpads.cpp:91
+msgid "Delta"
+msgstr "增量"
 
-#: pcbnew/pcbframe.cpp:419
-msgid "Show pads filled mode"
-msgstr "焊盘 以填充方式显示"
+#: pcbnew/editpads.cpp:98
+msgid "Offset"
+msgstr "偏移量"
 
-#: pcbnew/pcbframe.cpp:425
-msgid "Show Tracks Sketch mode"
-msgstr "导线 以轮廓方式显示"
+#: pcbnew/editpads.cpp:107
+msgid "Pad Drill"
+msgstr "焊盘钻孔"
 
-#: pcbnew/pcbframe.cpp:426
-msgid "Show Tracks filled mode"
-msgstr "导线 以填充方式显示"
+#: pcbnew/editpads.cpp:119
+msgid "Pad Orient (0.1 deg)"
+msgstr "焊盘方向(0.1度)"
 
-#: pcbnew/pcbframe.cpp:432
-msgid "Normal Contrast Mode Display"
-msgstr "普通对比度显示模式"
+#: pcbnew/editpads.cpp:390
+msgid "Incorrect value for pad drill: pad drill bigger than pad size"
+msgstr "钻孔值不正确: 钻孔大小超过了焊盘大小"
 
-#: pcbnew/pcbframe.cpp:433
-#: pcbnew/tool_pcb.cpp:374
-msgid "Hight Contrast Mode Display"
-msgstr "高对比度显示模式"
+#: pcbnew/editpads.cpp:396
+msgid "Incorrect value for pad offset"
+msgstr "焊盘偏移数值不正确"
 
-#: pcbnew/pcbframe.cpp:443
-#: pcbnew/class_board_item.cpp:140
-#: pcbnew/class_track.cpp:754
-msgid "Track"
-msgstr "导线"
+#: pcbnew/editpads.cpp:489
+msgid "Unknown netname, no change"
+msgstr "未知的网络名称, 未做改变"
 
-#: pcbnew/pcbframe.cpp:475
-#: pcbnew/class_board_item.cpp:170
-msgid "Via"
-msgstr "过孔"
+#: pcbnew/cotation.cpp:85
+msgid "Dimension properties"
+msgstr "尺寸标注属性"
 
-#: pcbnew/tool_pcb.cpp:51
-msgid ""
-"Show active layer selections\n"
-"and select layer pair for route and place via"
-msgstr ""
-"显示工作中的层\n"
-"选择过孔的连接层"
+#: pcbnew/cotation.cpp:133
+#: pcbnew/dialog_zones_by_polygon.cpp:236
+#: gerbview/affiche.cpp:37
+msgid "Layer:"
+msgstr "层: "
 
-#: pcbnew/tool_pcb.cpp:239
-msgid "New Board"
-msgstr "新建电路板"
+#: pcbnew/editedge.cpp:167
+msgid "Copper layer global delete not allowed!"
+msgstr "铜层不允许全局删除!"
 
-#: pcbnew/tool_pcb.cpp:241
-msgid "Open existing Board"
-msgstr "打开已有的电路板"
+#: pcbnew/editedge.cpp:173
+msgid "Segment is being edited"
+msgstr "线段将被更改"
+
+#: pcbnew/editedge.cpp:177
+msgid "Delete Layer "
+msgstr "删除 层"
+
+#: pcbnew/tool_modedit.cpp:53
+#: eeschema/tool_lib.cpp:123
+msgid "Select working library"
+msgstr "选择进行工作的库"
+
+#: pcbnew/tool_modedit.cpp:56
+msgid "Save Module in working library"
+msgstr "将模块保存到工作的库中"
+
+#: pcbnew/tool_modedit.cpp:60
+msgid "Create new library and save current module"
+msgstr "建立一个新的库保存当前的模块"
+
+#: pcbnew/tool_modedit.cpp:65
+msgid "Delete part in current library"
+msgstr "从当前库中删除零件"
 
-#: pcbnew/tool_pcb.cpp:242
-msgid "Save Board"
-msgstr "保存电路板"
+#: pcbnew/tool_modedit.cpp:74
+msgid "Load module from lib"
+msgstr "从库中加载模块"
 
-#: pcbnew/tool_pcb.cpp:246
-#: eeschema/tool_sch.cpp:65
-#: gerbview/tool_gerber.cpp:232
-msgid "page settings (size, texts)"
-msgstr "页面设置（大小，文字）"
+#: pcbnew/tool_modedit.cpp:79
+msgid "Load module from current board"
+msgstr "从当前电路板加载模块"
 
-#: pcbnew/tool_pcb.cpp:250
-msgid "Open Module Editor"
-msgstr "打开 模块编辑器"
+#: pcbnew/tool_modedit.cpp:83
+msgid "Update module in current board"
+msgstr "在当前电路板更新模块"
 
-#: pcbnew/tool_pcb.cpp:253
-#: eeschema/tool_sch.cpp:81
-#: gerbview/tool_gerber.cpp:243
-msgid "Cut selected item"
-msgstr "剪切选中的内容"
+#: pcbnew/tool_modedit.cpp:87
+msgid "Insert module into current board"
+msgstr "将模块插入到当前电路板"
 
-#: pcbnew/tool_pcb.cpp:257
-#: eeschema/tool_sch.cpp:84
-#: gerbview/tool_gerber.cpp:248
-msgid "Copy selected item"
-msgstr "复制选中的内容"
+#: pcbnew/tool_modedit.cpp:92
+msgid "import module"
+msgstr "导入模块"
 
-#: pcbnew/tool_pcb.cpp:259
-#: eeschema/tool_sch.cpp:87
-#: gerbview/tool_gerber.cpp:254
-msgid "Paste"
-msgstr "粘贴"
+#: pcbnew/tool_modedit.cpp:96
+msgid "export module"
+msgstr "导出模块"
 
-#: pcbnew/tool_pcb.cpp:262
-#: gerbview/tool_gerber.cpp:261
-msgid "Undelete"
-msgstr "恢复被删除的"
+#: pcbnew/tool_modedit.cpp:101
+#: eeschema/tool_lib.cpp:150
+#: eeschema/menubar.cpp:138
+#: eeschema/tool_sch.cpp:85
+msgid "Undo last edition"
+msgstr "撤销 最后的操作"
 
-#: pcbnew/tool_pcb.cpp:265
-msgid "Print Board"
-msgstr "打印电路板"
+#: pcbnew/tool_modedit.cpp:103
+#: eeschema/tool_lib.cpp:152
+#: eeschema/menubar.cpp:146
+#: eeschema/tool_sch.cpp:88
+msgid "Redo the last undo command"
+msgstr "重做 最后撤销的操作"
 
-#: pcbnew/tool_pcb.cpp:267
-msgid "Plot (HPGL, PostScript, or GERBER format)"
-msgstr "Plot绘图输出（HPGL，PostScript，或 GERBER 格式）"
+#: pcbnew/tool_modedit.cpp:108
+msgid "Module Properties"
+msgstr "模块属性"
+
+#: pcbnew/tool_modedit.cpp:112
+msgid "Print Module"
+msgstr "打印模块"
 
-#: pcbnew/tool_pcb.cpp:270
 #: pcbnew/tool_modedit.cpp:115
+#: pcbnew/tool_pcb.cpp:268
 #: eeschema/tool_lib.cpp:170
-#: eeschema/tool_sch.cpp:108
+#: eeschema/tool_sch.cpp:103
 #: gerbview/tool_gerber.cpp:271
 msgid "zoom +"
-msgstr "缩放 ＋"
+msgstr "缩放 +"
 
-#: pcbnew/tool_pcb.cpp:274
 #: pcbnew/tool_modedit.cpp:119
+#: pcbnew/tool_pcb.cpp:272
 #: eeschema/tool_lib.cpp:174
-#: eeschema/tool_sch.cpp:112
+#: eeschema/tool_sch.cpp:107
 #: gerbview/tool_gerber.cpp:278
 msgid "zoom -"
-msgstr "缩放 －"
+msgstr "缩放 -"
 
-#: pcbnew/tool_pcb.cpp:278
 #: pcbnew/tool_modedit.cpp:123
+#: pcbnew/tool_pcb.cpp:276
 #: eeschema/tool_lib.cpp:178
-#: eeschema/tool_sch.cpp:116
+#: eeschema/menubar.cpp:193
+#: eeschema/tool_sch.cpp:111
 #: gerbview/tool_gerber.cpp:285
 msgid "redraw"
 msgstr "窗口重绘"
 
-#: pcbnew/tool_pcb.cpp:283
 #: pcbnew/tool_modedit.cpp:128
+#: pcbnew/tool_pcb.cpp:281
 #: eeschema/tool_lib.cpp:184
-#: eeschema/tool_sch.cpp:121
+#: eeschema/tool_sch.cpp:116
 #: gerbview/tool_gerber.cpp:296
 #: 3d-viewer/3d_toolbar.cpp:53
 msgid "auto zoom"
 msgstr "自动缩放"
 
-#: pcbnew/tool_pcb.cpp:286
-#: eeschema/tool_sch.cpp:125
-msgid "Find components and texts"
-msgstr "搜索元件和文字"
+#: pcbnew/tool_modedit.cpp:137
+msgid "Module Check"
+msgstr "模块检查"
 
-#: pcbnew/tool_pcb.cpp:292
-msgid "Read Netlist"
-msgstr "读取网络表"
+#: pcbnew/tool_modedit.cpp:163
+msgid "Add Pads"
+msgstr "添加 焊盘"
 
-#: pcbnew/tool_pcb.cpp:294
-msgid "Pcb Design Rules Check"
-msgstr "PCB设计规则检查（DRC）"
+#: pcbnew/tool_modedit.cpp:168
+#: pcbnew/tool_pcb.cpp:434
+msgid "Add graphic line or polygon"
+msgstr "添加图示: 线/多边形"
 
-#: pcbnew/tool_pcb.cpp:305
-msgid "Mode Module: Manual and Automatic Move or Place for modules"
-msgstr "模块模式：手动或自动移动、放置模块"
+#: pcbnew/tool_modedit.cpp:172
+#: pcbnew/tool_pcb.cpp:438
+msgid "Add graphic circle"
+msgstr "添加图示: 圆"
 
-#: pcbnew/tool_pcb.cpp:308
-msgid "Mode Track and Autorouting"
-msgstr "布线模式：手动或自动布线"
+#: pcbnew/tool_modedit.cpp:176
+#: pcbnew/tool_pcb.cpp:442
+msgid "Add graphic arc"
+msgstr "添加图示: 圆弧"
 
-#: pcbnew/tool_pcb.cpp:332
-msgid "Drc OFF"
-msgstr "关闭 DRC"
+#: pcbnew/tool_modedit.cpp:180
+#: pcbnew/edit.cpp:290
+#: eeschema/libframe.cpp:503
+#: eeschema/schedit.cpp:136
+#: gerbview/tool_gerber.cpp:385
+msgid "Add Text"
+msgstr "添加 文字"
+
+#: pcbnew/tool_modedit.cpp:190
+#: pcbnew/tool_pcb.cpp:460
+#: eeschema/tool_lib.cpp:93
+#: eeschema/menubar.cpp:154
+#: eeschema/tool_sch.cpp:237
+#: gerbview/tool_gerber.cpp:393
+msgid "Delete items"
+msgstr "删除对象"
 
-#: pcbnew/tool_pcb.cpp:334
 #: pcbnew/tool_modedit.cpp:212
-#: eeschema/tool_sch.cpp:257
+#: pcbnew/tool_pcb.cpp:334
+#: eeschema/tool_sch.cpp:259
 #: gerbview/tool_gerber.cpp:417
 msgid "Display Grid OFF"
 msgstr "关闭 显示网格"
 
-#: pcbnew/tool_pcb.cpp:337
 #: pcbnew/tool_modedit.cpp:216
+#: pcbnew/tool_pcb.cpp:337
 #: gerbview/tool_gerber.cpp:423
 msgid "Display Polar Coord ON"
-msgstr "显示极坐标：开启"
+msgstr "显示极坐标: 开启"
 
-#: pcbnew/tool_pcb.cpp:339
 #: pcbnew/tool_modedit.cpp:220
-#: eeschema/tool_sch.cpp:261
+#: pcbnew/tool_pcb.cpp:339
+#: eeschema/tool_sch.cpp:263
 #: gerbview/tool_gerber.cpp:427
 msgid "Units = Inch"
-msgstr "单位：Inch"
+msgstr "单位 = Inch"
 
-#: pcbnew/tool_pcb.cpp:341
 #: pcbnew/tool_modedit.cpp:224
-#: eeschema/tool_sch.cpp:265
+#: pcbnew/tool_pcb.cpp:341
+#: eeschema/tool_sch.cpp:267
 #: gerbview/tool_gerber.cpp:431
 msgid "Units = mm"
-msgstr "单位：mm"
+msgstr "单位 = mm"
 
-#: pcbnew/tool_pcb.cpp:344
 #: pcbnew/tool_modedit.cpp:230
-#: eeschema/tool_sch.cpp:269
+#: pcbnew/tool_pcb.cpp:344
+#: eeschema/tool_sch.cpp:271
 #: gerbview/tool_gerber.cpp:437
 msgid "Change Cursor Shape"
 msgstr "改变光标形状"
 
-#: pcbnew/tool_pcb.cpp:349
-msgid "Show General Ratsnest"
-msgstr "显示所有牵拉线"
-
-#: pcbnew/tool_pcb.cpp:352
-msgid "Show Module Ratsnest when moving"
-msgstr "移动模块时显示牵拉线"
-
-#: pcbnew/tool_pcb.cpp:357
-msgid "Enable Auto Del Track"
-msgstr "允许自动删除旧导线"
-
-#: pcbnew/tool_pcb.cpp:366
 #: pcbnew/tool_modedit.cpp:238
+#: pcbnew/tool_pcb.cpp:366
 msgid "Show Pads Sketch"
 msgstr "焊盘 以轮廓方式显示"
 
-#: pcbnew/tool_pcb.cpp:370
-msgid "Show Tracks Sketch"
-msgstr "导线 以轮廓方式显示"
+#: pcbnew/tool_modedit.cpp:245
+msgid "Show Texts Sketch"
+msgstr "文字 以轮廓方式显示"
 
-#: pcbnew/tool_pcb.cpp:383
-msgid ""
-"Display auxiliary vertical toolbar (tools for micro wave applications)\n"
-" This is a very experimental feature (under development)"
-msgstr ""
-"显示辅助垂直工具条（微波电路工具）\n"
-" 此为试验特性（开发中）"
+#: pcbnew/tool_modedit.cpp:252
+msgid "Show Edges Sketch"
+msgstr "边界 以轮廓方式显示"
 
-#: pcbnew/tool_pcb.cpp:412
-msgid "Net highlight"
-msgstr "网络加亮显示"
+#: pcbnew/tool_modedit.cpp:285
+#: pcbnew/tool_pcb.cpp:580
+#: eeschema/plotps.cpp:171
+#: share/zoom.cpp:367
+msgid "Auto"
+msgstr "自动缩放"
 
-#: pcbnew/tool_pcb.cpp:416
-msgid "Display local ratsnest (pad or module)"
-msgstr "显示局部牵拉线（焊盘或模块的）"
+#: pcbnew/tool_modedit.cpp:289
+#, c-format
+msgid "Zoom %d"
+msgstr "缩放 %d"
 
-#: pcbnew/tool_pcb.cpp:421
-msgid "Add modules"
-msgstr "添加 模块"
+#: pcbnew/tool_modedit.cpp:308
+#, c-format
+msgid "Grid %.1f"
+msgstr "网格 %.1f"
 
-#: pcbnew/tool_pcb.cpp:425
-msgid "Add tracks and vias"
-msgstr "添加 导线、过孔"
+#: pcbnew/tool_modedit.cpp:310
+#, c-format
+msgid "Grid %.3f"
+msgstr "网格 %.3f"
 
-#: pcbnew/tool_pcb.cpp:429
-msgid "Add zones"
-msgstr "添加 覆铜"
+#: pcbnew/tool_modedit.cpp:314
+#: pcbnew/tool_pcb.cpp:614
+msgid "User Grid"
+msgstr "自定义网格"
 
-#: pcbnew/tool_pcb.cpp:434
-#: pcbnew/tool_modedit.cpp:168
-#: eeschema/tool_sch.cpp:226
-msgid "Add graphic line or polygon"
-msgstr "添加图示：线、多边形"
+#: pcbnew/affiche.cpp:34
+msgid "Net Name"
+msgstr "网络名"
 
-#: pcbnew/tool_pcb.cpp:438
-#: pcbnew/tool_modedit.cpp:172
-msgid "Add graphic circle"
-msgstr "添加图示：圆"
+#: pcbnew/affiche.cpp:36
+msgid "No Net (not connected)"
+msgstr "无网络(无连接)"
 
-#: pcbnew/tool_pcb.cpp:442
-#: pcbnew/tool_modedit.cpp:176
-msgid "Add graphic arc"
-msgstr "添加图示：圆弧"
+#: pcbnew/affiche.cpp:39
+msgid "Net Code"
+msgstr "网络代码"
 
-#: pcbnew/tool_pcb.cpp:446
-msgid "Add text"
-msgstr "添加 文字"
+#: pcbnew/affiche.cpp:63
+#: pcbnew/class_board.cpp:444
+#: pcbnew/plotps.cpp:361
+msgid "Vias"
+msgstr "导孔"
+
+#: pcbnew/dsn.cpp:502
+msgid "Line length exceeded"
+msgstr "行长度值超出限制"
+
+#: pcbnew/dsn.cpp:616
+msgid "in file"
+msgstr "在文件"
+
+#: pcbnew/dsn.cpp:617
+msgid "on line"
+msgstr "在行"
+
+#: pcbnew/dsn.cpp:618
+msgid "at offset"
+msgstr "在偏移"
+
+#: pcbnew/dsn.cpp:666
+msgid "String delimiter must be a single character of ', \", or $"
+msgstr "字符串分割符号必需为 ', \", $ 之一的单字符"
+
+#: pcbnew/dsn.cpp:756
+msgid "Un-terminated delimited string"
+msgstr "无结尾的分隔字符串"
+
+#: pcbnew/via_edit.cpp:54
+msgid "Incorrect value for Via drill. No via drill change"
+msgstr "导孔钻孔值错误。导孔钻孔未做更改。"
+
+#: pcbnew/edgemod.cpp:204
+msgid "The graphic item will be on a copper layer.It is very dangerous. Are you sure"
+msgstr "图形内容将出现在铜层。这存在很大危险。你是否确信要执行操作？"
+
+#: pcbnew/edgemod.cpp:246
+msgid "New Width (1/10000\"):"
+msgstr "新宽度(1/10000\"):"
+
+#: pcbnew/edgemod.cpp:253
+msgid "Incorrect number, no change"
+msgstr "数值不正确, 未做改变"
+
+#: pcbnew/pcbframe.cpp:272
+msgid "Board modified, Save before exit ?"
+msgstr "电路板已被更改, 是否在退出之前保存 ?"
+
+#: pcbnew/pcbframe.cpp:273
+#: eeschema/schframe.cpp:274
+#: cvpcb/cvframe.cpp:178
+#: common/confirm.cpp:119
+msgid "Confirmation"
+msgstr "确认"
+
+#: pcbnew/pcbframe.cpp:373
+msgid "DRC Off (Disable !!!), Currently: DRC is active"
+msgstr "关闭DRC(当前: DRC激活)"
+
+#: pcbnew/pcbframe.cpp:374
+msgid "DRC On (Currently: DRC is inactive !!!)"
+msgstr "开启DRC(当前: DRC没有激活)"
+
+#: pcbnew/pcbframe.cpp:385
+msgid "Polar Coords not show"
+msgstr "不显示极坐标"
+
+#: pcbnew/pcbframe.cpp:386
+msgid "Display Polar Coords"
+msgstr "显示极坐标"
+
+#: pcbnew/pcbframe.cpp:391
+#: eeschema/schframe.cpp:374
+msgid "Grid not show"
+msgstr "不显示 网格"
+
+#: pcbnew/pcbframe.cpp:391
+#: eeschema/schframe.cpp:374
+msgid "Show Grid"
+msgstr "显示 网格"
+
+#: pcbnew/pcbframe.cpp:400
+msgid "General ratsnest not show"
+msgstr "不显示 常规牵拉线"
+
+#: pcbnew/pcbframe.cpp:400
+msgid "Show General ratsnest"
+msgstr "显示 常规牵拉线"
+
+#: pcbnew/pcbframe.cpp:406
+msgid "Module ratsnest not show"
+msgstr "不显示 模块牵拉线"
+
+#: pcbnew/pcbframe.cpp:407
+msgid "Show Module ratsnest"
+msgstr "显示 模块牵拉线"
+
+#: pcbnew/pcbframe.cpp:414
+msgid "Disable Auto Delete old Track"
+msgstr "禁止自动删除旧导线"
+
+#: pcbnew/pcbframe.cpp:415
+msgid "Enable Auto Delete old Track"
+msgstr "启用自动删除旧导线"
+
+#: pcbnew/pcbframe.cpp:422
+msgid "Do not Show Zones"
+msgstr "不显示 覆铜"
+
+#: pcbnew/pcbframe.cpp:422
+#: pcbnew/tool_pcb.cpp:361
+#: pcbnew/set_color.h:423
+msgid "Show Zones"
+msgstr "显示 覆铜"
+
+#: pcbnew/pcbframe.cpp:428
+msgid "Show Pads Sketch mode"
+msgstr "焊盘 以轮廓方式显示"
+
+#: pcbnew/pcbframe.cpp:429
+msgid "Show pads filled mode"
+msgstr "焊盘 以填充方式显示"
 
-#: pcbnew/tool_pcb.cpp:451
-msgid "Add dimension"
-msgstr "添加 尺寸标注"
+#: pcbnew/pcbframe.cpp:435
+msgid "Show Tracks Sketch mode"
+msgstr "导线 以轮廓方式显示"
 
-#: pcbnew/tool_pcb.cpp:455
-#: gerbview/tool_gerber.cpp:378
-msgid "Add layer alignment target"
-msgstr "添加 层对齐目标"
+#: pcbnew/pcbframe.cpp:436
+msgid "Show Tracks filled mode"
+msgstr "导线 以填充方式显示"
 
-#: pcbnew/tool_pcb.cpp:460
-#: pcbnew/tool_modedit.cpp:190
-#: eeschema/tool_lib.cpp:93
-#: eeschema/tool_sch.cpp:235
-#: gerbview/tool_gerber.cpp:393
-msgid "Delete items"
-msgstr "删除对象"
+#: pcbnew/pcbframe.cpp:442
+msgid "Normal Contrast Mode Display"
+msgstr "普通对比度显示模式"
 
-#: pcbnew/tool_pcb.cpp:465
-msgid "Offset adjust for drill and place files"
-msgstr "钻孔和放置文件的偏移量调整"
+#: pcbnew/pcbframe.cpp:443
+#: pcbnew/tool_pcb.cpp:374
+msgid "Hight Contrast Mode Display"
+msgstr "高对比度显示模式"
 
-#: pcbnew/tool_pcb.cpp:490
-msgid "Create line of specified length for microwave applications"
-msgstr "Create line of specified length for microwave applications"
+#: pcbnew/pcbframe.cpp:487
+#: pcbnew/class_board_item.cpp:203
+msgid "Via"
+msgstr "导孔"
 
-#: pcbnew/tool_pcb.cpp:496
-msgid "Create gap of specified length for microwave applications"
-msgstr "Create gap of specified length for microwave applications"
+#: pcbnew/dialog_zones_by_polygon.cpp:153
+#: pcbnew/dialog_zones_by_polygon.cpp:154
+#: pcbnew/dialog_zones_by_polygon.cpp:155
+#: pcbnew/dialog_zones_by_polygon.cpp:156
+#, fuzzy
+msgid "0.00000"
+msgstr "0.00000"
 
-#: pcbnew/tool_pcb.cpp:504
-msgid "Create stub of specified length for microwave applications"
-msgstr "Create stub of specified length for microwave applications"
+#: pcbnew/dialog_zones_by_polygon.cpp:157
+msgid "Grid Size for Filling:"
+msgstr "设置填充时笔的覆盖"
 
-#: pcbnew/tool_pcb.cpp:510
-msgid "Create stub (arc) of specified length for microwave applications"
-msgstr "Create stub (arc) of specified length for microwave applications"
+#: pcbnew/dialog_zones_by_polygon.cpp:161
+msgid "Zone clearance value (mm):"
+msgstr "覆铜间隔(mm):"
 
-#: pcbnew/tool_pcb.cpp:517
-msgid "Create a polynomial shape for microwave applications"
-msgstr "Create a polynomial shape for microwave applications"
+#: pcbnew/dialog_zones_by_polygon.cpp:169
+msgid "Hatched Outline"
+msgstr "阴影线"
 
-#: pcbnew/tool_pcb.cpp:567
-#: pcbnew/tool_modedit.cpp:285
-#: eeschema/plotps.cpp:169
-#: share/zoom.cpp:364
-msgid "Auto"
-msgstr "自动缩放"
+#: pcbnew/dialog_zones_by_polygon.cpp:170
+msgid "Full Hatched"
+msgstr "完全阴影"
 
-#: pcbnew/tool_pcb.cpp:571
-msgid "Zoom "
-msgstr "缩放"
+#: pcbnew/dialog_zones_by_polygon.cpp:171
+msgid "Outlines Appearance"
+msgstr "轮廓样式"
 
-#: pcbnew/tool_pcb.cpp:585
-#: eeschema/eelayer.cpp:223
-#: pcbnew/set_color.h:414
-#: eeschema/eelayer.h:210
-#: gerbview/set_color.h:324
-msgid "Grid"
-msgstr "网格"
+#: pcbnew/dialog_zones_by_polygon.cpp:181
+msgid "Include Pads"
+msgstr "包围焊盘"
 
-#: pcbnew/tool_pcb.cpp:601
-#: pcbnew/tool_modedit.cpp:314
-msgid "User Grid"
-msgstr "自定义网格"
+#: pcbnew/dialog_zones_by_polygon.cpp:182
+msgid "Thermal"
+msgstr "热(花)焊盘"
 
-#: pcbnew/tool_pcb.cpp:676
-msgid "+/- to switch"
-msgstr "用 ＋/－ 切换"
+#: pcbnew/dialog_zones_by_polygon.cpp:183
+msgid "Exclude Pads"
+msgstr "空出焊盘"
 
-#: pcbnew/mirepcb.cpp:78
-msgid "Target Properties"
-msgstr "目标属性"
+#: pcbnew/dialog_zones_by_polygon.cpp:184
+msgid "Pad options:"
+msgstr "焊盘选项:"
 
-#: pcbnew/mirepcb.cpp:108
-#: pcbnew/cotation.cpp:125
-#: pcbnew/muonde.cpp:367
-#: pcbnew/pcbtexte.cpp:126
-#: eeschema/sheet.cpp:189
-#: eeschema/sheet.cpp:200
-#: eeschema/pinedit-dialog.cpp:273
-#: eeschema/pinedit-dialog.cpp:279
-#: common/wxwineda.cpp:91
-msgid "Size"
-msgstr "大小"
+#: pcbnew/dialog_zones_by_polygon.cpp:191
+#: eeschema/dialog_options.cpp:257
+msgid "Any"
+msgstr "任意"
 
-#: pcbnew/mirepcb.cpp:118
-msgid "shape +"
-msgstr "十字形"
+#: pcbnew/dialog_zones_by_polygon.cpp:192
+msgid "H , V and 45 deg"
+msgstr "水平, 垂直, 以及45度"
 
-#: pcbnew/mirepcb.cpp:118
-msgid "shape X"
-msgstr "X 形"
+#: pcbnew/dialog_zones_by_polygon.cpp:193
+msgid "Zone edges orient:"
+msgstr "覆铜边界方向:"
 
-#: pcbnew/mirepcb.cpp:120
-msgid "Target Shape:"
-msgstr "目标形状："
+#: pcbnew/dialog_zones_by_polygon.cpp:212
+msgid "Alphabetic"
+msgstr "按字母顺序"
 
-#: pcbnew/dialog_initpcb.cpp:105
-msgid "Items to delete"
-msgstr "删除内容"
+#: pcbnew/dialog_zones_by_polygon.cpp:213
+msgid "Advanced"
+msgstr "高级"
 
-#: pcbnew/dialog_initpcb.cpp:109
-msgid "Delete Zones"
-msgstr "删除 覆铜"
+#: pcbnew/dialog_zones_by_polygon.cpp:214
+msgid "Net sorting:"
+msgstr "网络排序:"
 
-#: pcbnew/dialog_initpcb.cpp:113
-msgid "Delete Texts"
-msgstr "删除 文字"
+#: pcbnew/dialog_zones_by_polygon.cpp:218
+msgid "Filter"
+msgstr "过滤"
 
-#: pcbnew/dialog_initpcb.cpp:117
-msgid "Delete Edges"
-msgstr "删除 边界线"
+#: pcbnew/dialog_zones_by_polygon.cpp:223
+msgid "Do not list net names which match with this text, in advanced mode"
+msgstr "在高级模式下, 不列出与此相符的网络名"
 
-#: pcbnew/dialog_initpcb.cpp:121
-msgid "Delete Drawings"
-msgstr "删除 图形"
+#: pcbnew/dialog_zones_by_polygon.cpp:229
+#: pcbnew/class_board_item.cpp:149
+#: pcbnew/class_board_item.cpp:217
+msgid "Net:"
+msgstr "网络:"
 
-#: pcbnew/dialog_initpcb.cpp:125
-msgid "Delete Modules"
-msgstr "删除 模块"
+#: pcbnew/dialog_zones_by_polygon.cpp:248
+msgid "Zone clearance value:"
+msgstr "覆铜间隔:"
 
-#: pcbnew/dialog_initpcb.cpp:129
-msgid "Delete Tracks"
-msgstr "删除 导线"
+#: pcbnew/dialog_zones_by_polygon.cpp:251
+msgid "Grid :"
+msgstr "网格 :"
 
-#: pcbnew/dialog_initpcb.cpp:133
-msgid "Delete Markers"
-msgstr "删除 DRC标记"
+#: pcbnew/dialog_zones_by_polygon.cpp:506
+msgid "Error : you must choose a layer"
+msgstr "错误: 你必须选择一个层"
 
-#: pcbnew/dialog_initpcb.cpp:137
-msgid "Clear Board"
-msgstr "清空电路板"
+#: pcbnew/dialog_zones_by_polygon.cpp:515
+msgid "Error : you must choose a net name"
+msgstr "错误: 你必需选择一个网络名"
 
-#: pcbnew/dialog_initpcb.cpp:144
-msgid "Track Filter"
-msgstr "导线过滤"
+#: pcbnew/autoplac.cpp:106
+msgid "Footprints NOT LOCKED will be moved"
+msgstr "未锁定的封装将被移动"
 
-#: pcbnew/dialog_initpcb.cpp:148
-msgid "Include AutoRouted Tracks"
-msgstr "包括自动布的导线"
+#: pcbnew/autoplac.cpp:111
+msgid "Footprints NOT PLACED will be moved"
+msgstr "未放置的封装将被移动"
 
-#: pcbnew/dialog_initpcb.cpp:152
-msgid "Include Locked Tracks"
-msgstr "包括锁定的导线"
+#: pcbnew/autoplac.cpp:402
+msgid "No edge PCB, Unknown board size!"
+msgstr "PCB 未设置边界, 电路板大小未知 !"
 
-#: pcbnew/class_board_item.cpp:36
-#: pcbnew/class_pad.cpp:979
-msgid "Net"
-msgstr "网络"
+#: pcbnew/autoplac.cpp:423
+msgid "Cols"
+msgstr "列"
 
-#: pcbnew/class_board_item.cpp:41
-#: eeschema/dialog_build_BOM.cpp:300
-#: eeschema/component_class.cpp:56
-msgid "Footprint"
-msgstr "封装 "
+#: pcbnew/autoplac.cpp:425
+msgid "Lines"
+msgstr "行"
 
-#: pcbnew/class_board_item.cpp:47
-msgid "Pad"
-msgstr "焊盘 "
+#: pcbnew/autoplac.cpp:427
+msgid "Cells."
+msgstr "单元."
 
-#: pcbnew/class_board_item.cpp:50
-msgid "all copper layers"
-msgstr "所有铜层"
+#: pcbnew/autoplac.cpp:488
+msgid "Loop"
+msgstr "循环"
 
-#: pcbnew/class_board_item.cpp:52
-msgid "copper layer"
-msgstr "铜层"
+#: pcbnew/autoplac.cpp:642
+msgid "Ok to abort ?"
+msgstr "确定退出 ?"
 
-#: pcbnew/class_board_item.cpp:54
-msgid "cmp layer"
-msgstr "元件层"
+#: pcbnew/solve.cpp:229
+msgid "Abort routing?"
+msgstr "退出布线 ?"
 
-#: pcbnew/class_board_item.cpp:55
-msgid "???"
-msgstr "???"
+#: pcbnew/edit_track_width.cpp:96
+msgid "Change track width (entire NET) ?"
+msgstr "改变 导线 宽度(整个网络)?"
 
-#: pcbnew/class_board_item.cpp:56
-msgid ") of "
-msgstr ") of "
+#: pcbnew/edit_track_width.cpp:130
+msgid "Edit All Tracks and Vias Sizes"
+msgstr "编辑所有导线和导孔的大小"
 
-#: pcbnew/class_board_item.cpp:60
-msgid "Pcb Graphic"
-msgstr "PCB 图形"
+#: pcbnew/edit_track_width.cpp:135
+msgid "Edit All Via Sizes"
+msgstr "编辑所有导孔的大小"
 
-#: pcbnew/class_board_item.cpp:60
-#: pcbnew/class_board_item.cpp:69
-#: pcbnew/class_board_item.cpp:146
-#: pcbnew/class_board_item.cpp:164
-#: pcbnew/class_board_item.cpp:191
-#: pcbnew/class_board_item.cpp:207
-#: pcbnew/class_board_item.cpp:213
-msgid " on "
-msgstr " 在 "
+#: pcbnew/edit_track_width.cpp:140
+msgid "Edit All Track Sizes"
+msgstr "编辑所有导线的大小"
 
-#: pcbnew/class_board_item.cpp:64
-msgid "Pcb Text"
-msgstr "PCB 文字"
+#: pcbnew/export_gencad.cpp:69
+msgid "GenCAD file:"
+msgstr "GenCAD 文件:"
 
-#: pcbnew/class_board_item.cpp:76
-#: pcbnew/dialog_netlist.cpp:135
-#: eeschema/dialog_create_component.cpp:164
-#: eeschema/edit_component_in_schematic.cpp:745
-#: eeschema/onrightclick.cpp:317
-#: eeschema/eelayer.h:153
-msgid "Reference"
-msgstr "标签"
+#: pcbnew/set_color.cpp:269
+#: pcbnew/set_color.cpp:296
+#: gerbview/set_color.cpp:258
+#: gerbview/set_color.cpp:285
+msgid "Show None"
+msgstr "全不显示"
 
-#: pcbnew/class_board_item.cpp:80
-#: pcbnew/class_text_mod.cpp:345
-#: pcbnew/class_edge_mod.cpp:286
-#: eeschema/edit_component_in_schematic.cpp:784
-#: eeschema/component_class.cpp:55
-#: eeschema/onrightclick.cpp:316
-#: eeschema/eelayer.h:159
-msgid "Value"
-msgstr "数值/型号"
+#: pcbnew/set_color.cpp:278
+#: gerbview/set_color.cpp:267
+msgid "Show All"
+msgstr "显示所有"
 
-#: pcbnew/class_board_item.cpp:80
-#: pcbnew/class_board_item.cpp:86
-#: pcbnew/class_board_item.cpp:130
-msgid " of "
-msgstr " of "
+#: pcbnew/set_color.cpp:290
+msgid "Switch on all of the copper layers"
+msgstr "开启所有铜层"
 
-#: pcbnew/class_board_item.cpp:85
-#: pcbnew/class_text_mod.cpp:345
-#: pcbnew/class_text_mod.cpp:353
-msgid "Text"
-msgstr "文字"
+#: pcbnew/set_color.cpp:299
+msgid "Switch off all of the copper layers"
+msgstr "关闭所有铜层"
 
-#: pcbnew/class_board_item.cpp:93
-msgid "Graphic"
-msgstr "图形"
+#: pcbnew/set_color.cpp:361
+#: eeschema/eelayer.cpp:259
+#: gerbview/set_color.cpp:333
+msgid "Apply"
+msgstr "应用"
 
-#: pcbnew/class_board_item.cpp:99
-#: pcbnew/dialog_display_options.cpp:221
-#: pcbnew/dialog_display_options.cpp:229
-#: pcbnew/dialog_display_options.cpp:266
-#: pcbnew/pcbplot.cpp:330
-#: gerbview/options.cpp:321
-msgid "Line"
-msgstr "线"
+#: pcbnew/set_grid.cpp:148
+#: share/drawframe.cpp:395
+msgid "mm"
+msgstr "mm"
 
-#: pcbnew/class_board_item.cpp:102
-#: pcbnew/dialog_pad_edit.cpp:198
-msgid "Rect"
-msgstr "矩形"
+#: pcbnew/set_grid.cpp:150
+msgid "Grid Size Units"
+msgstr "网格大小单位"
 
-#: pcbnew/class_board_item.cpp:105
-msgid "Arc"
-msgstr "弧"
+#: pcbnew/set_grid.cpp:156
+msgid "User Grid Size X"
+msgstr "自定义网格大小 X"
 
-#: pcbnew/class_board_item.cpp:147
-msgid "Net:"
-msgstr "网络："
+#: pcbnew/set_grid.cpp:162
+msgid "User Grid Size Y"
+msgstr "自定义网格大小 Y"
 
-#: pcbnew/class_board_item.cpp:148
-msgid "Length:"
-msgstr "长度："
+#: pcbnew/edit.cpp:259
+msgid "Add Tracks"
+msgstr "添加 导线"
 
-#: pcbnew/class_board_item.cpp:153
-#: pcbnew/class_track.cpp:758
-msgid "Zone"
-msgstr "覆铜"
+#: pcbnew/edit.cpp:268
+msgid "Add Zones"
+msgstr "添加 覆铜"
 
-#: pcbnew/class_board_item.cpp:174
-msgid "Blind"
-msgstr "盲孔"
+#: pcbnew/edit.cpp:270
+msgid "Warning: Display Zone is OFF!!!"
+msgstr "警告: 覆铜显示关闭!"
 
-#: pcbnew/class_board_item.cpp:176
-msgid "Buried"
-msgstr "埋孔"
+#: pcbnew/edit.cpp:276
+msgid "Add Layer Alignment Target"
+msgstr "添加层对齐目标"
 
-#: pcbnew/class_board_item.cpp:198
-#: pcbnew/class_marker.cpp:92
-msgid "Marker"
-msgstr "DRC标记"
+#: pcbnew/edit.cpp:280
+msgid "Adjust Zero"
+msgstr "调整零"
 
-#: pcbnew/class_board_item.cpp:202
-msgid "Dimension"
-msgstr "尺寸标注"
+#: pcbnew/edit.cpp:286
+msgid "Add Graphic"
+msgstr "添加 图形"
 
-#: pcbnew/class_board_item.cpp:207
-msgid "Target"
-msgstr "目标"
+#: pcbnew/edit.cpp:294
+msgid "Add Modules"
+msgstr "添加 模块"
 
-#: pcbnew/class_board_item.cpp:208
-msgid "size"
-msgstr "大小"
+#: pcbnew/edit.cpp:298
+msgid "Add Dimension"
+msgstr "添加 尺寸标注"
 
-#: pcbnew/class_board_item.cpp:213
-msgid "Edge Zone"
-msgstr "覆铜边界"
+#: pcbnew/edit.cpp:306
+msgid "Net Highlight"
+msgstr "网络 加亮显示"
 
-#: pcbnew/dialog_display_options.cpp:186
-msgid "Tracks and vias"
-msgstr "导线和过孔"
+#: pcbnew/edit.cpp:310
+msgid "Local Ratsnest"
+msgstr "局部牵拉线"
 
-#: pcbnew/dialog_display_options.cpp:191
-#: pcbnew/dialog_display_options.cpp:223
-#: pcbnew/dialog_display_options.cpp:231
-#: pcbnew/dialog_display_options.cpp:244
-#: pcbnew/dialog_display_options.cpp:268
-#: pcbnew/pcbplot.cpp:330
-#: gerbview/options.cpp:298
-#: gerbview/options.cpp:321
-msgid "Sketch"
-msgstr "轮廓"
+#: pcbnew/dialog_track_options.cpp:151
+msgid "Vias:"
+msgstr "导孔:"
 
-#: pcbnew/dialog_display_options.cpp:192
-#: pcbnew/dialog_display_options.cpp:222
-#: pcbnew/dialog_display_options.cpp:230
-#: pcbnew/dialog_display_options.cpp:245
-#: pcbnew/dialog_display_options.cpp:267
-#: pcbnew/pcbplot.cpp:330
-#: eeschema/dialog_cmp_graphic_properties.cpp:168
-#: gerbview/options.cpp:298
-#: gerbview/options.cpp:321
-msgid "Filled"
-msgstr "填充"
+#: pcbnew/dialog_track_options.cpp:160
+msgid "Via Size"
+msgstr "导孔大小"
 
-#: pcbnew/dialog_display_options.cpp:198
-#: pcbnew/dialog_display_options.cpp:208
-#: pcbnew/dialog_general_options.cpp:357
-msgid "Always"
-msgstr "总是"
+#: pcbnew/dialog_track_options.cpp:176
+msgid "Default Via Drill"
+msgstr "默认导孔钻孔"
 
-#: pcbnew/dialog_display_options.cpp:199
-msgid "New track"
-msgstr "新的导线"
+#: pcbnew/dialog_track_options.cpp:192
+msgid "Alternate Via Drill"
+msgstr "备用导孔钻孔"
 
-#: pcbnew/dialog_display_options.cpp:200
-#: pcbnew/dialog_display_options.cpp:206
-#: pcbnew/dialog_general_options.cpp:355
-msgid "Never"
-msgstr "从不"
+#: pcbnew/dialog_track_options.cpp:208
+#: pcbnew/pcbnew.h:291
+msgid "Through Via"
+msgstr "贯通导孔"
 
-#: pcbnew/dialog_display_options.cpp:201
-msgid "Show Track Clearance"
-msgstr "显示导线间距"
+#: pcbnew/dialog_track_options.cpp:209
+msgid "Blind or Buried Via "
+msgstr "盲导孔或埋导孔"
 
-#: pcbnew/dialog_display_options.cpp:207
-msgid "defined holes"
-msgstr "定义的孔"
+#: pcbnew/dialog_track_options.cpp:212
+msgid "Default Via Type"
+msgstr "默认导孔类型"
 
-#: pcbnew/dialog_display_options.cpp:209
-msgid "Show Via Holes"
-msgstr "显示过孔的孔"
+#: pcbnew/dialog_track_options.cpp:232
+msgid "Micro Via Size"
+msgstr "微导孔大小"
 
-#: pcbnew/dialog_display_options.cpp:213
-msgid "Modules"
-msgstr "模块"
+#: pcbnew/dialog_track_options.cpp:245
+msgid "Micro Via Drill"
+msgstr "微导孔钻孔"
 
-#: pcbnew/dialog_display_options.cpp:224
-msgid "Module Texts"
-msgstr "模块文字"
+#: pcbnew/dialog_track_options.cpp:260
+msgid "Allows Micro Vias"
+msgstr "允许微导孔(Micro Via)"
 
-#: pcbnew/dialog_display_options.cpp:232
-msgid "Module Edges:"
-msgstr "模块边界："
+#: pcbnew/dialog_track_options.cpp:265
+#: pcbnew/dialog_track_options.cpp:268
+msgid ""
+"Allows use of micro vias\n"
+"They are very small vias only from an external copper layer to its near neightbour\n"
+msgstr ""
+"允许使用微导孔(micro via)\n"
+"微导孔是一种很小的导孔, 仅用于外层铜箔到相邻层的连接\n"
 
-#: pcbnew/dialog_display_options.cpp:239
-msgid "Pad Options:"
-msgstr "焊盘选项："
+#: pcbnew/dialog_track_options.cpp:276
+msgid "Track Width"
+msgstr "导线宽度"
 
-#: pcbnew/dialog_display_options.cpp:246
-msgid "Pad Shapes:"
-msgstr "焊盘外形："
+#: pcbnew/dialog_track_options.cpp:304
+msgid "Mask clearance"
+msgstr "阻焊间隔"
 
-#: pcbnew/dialog_display_options.cpp:250
-msgid "Show Pad Clearance"
-msgstr "显示焊盘间隔"
+#: pcbnew/class_drc_item.cpp:41
+msgid "Track near thru-hole"
+msgstr "导线靠近通孔"
 
-#: pcbnew/dialog_display_options.cpp:254
-msgid "Show Pad Number"
-msgstr "显示焊盘编号"
+#: pcbnew/class_drc_item.cpp:43
+msgid "Track near pad"
+msgstr "导线靠近焊盘"
 
-#: pcbnew/dialog_display_options.cpp:258
-msgid "Show Pad NoConnect"
-msgstr "显示焊盘未连接"
+#: pcbnew/class_drc_item.cpp:45
+msgid "Track near via"
+msgstr "显示导孔的孔"
 
-#: pcbnew/dialog_display_options.cpp:269
-#: gerbview/options.cpp:322
-msgid "Display other items:"
-msgstr "其他内容的显示："
+#: pcbnew/class_drc_item.cpp:47
+msgid "Via near via"
+msgstr "导孔靠近导孔"
 
-#: pcbnew/dialog_display_options.cpp:274
-#: pcbnew/class_pcb_text.cpp:206
-#: pcbnew/class_text_mod.cpp:365
-#: eeschema/dialog_options.cpp:264
-#: gerbview/affiche.cpp:45
-msgid "Yes"
-msgstr "是"
+#: pcbnew/class_drc_item.cpp:49
+msgid "Via near track"
+msgstr "导孔靠近导线"
 
-#: pcbnew/dialog_display_options.cpp:275
-#: pcbnew/class_pcb_text.cpp:204
-#: pcbnew/class_text_mod.cpp:363
-#: eeschema/dialog_options.cpp:265
-#: gerbview/affiche.cpp:43
-msgid "No"
-msgstr "否"
+#: pcbnew/class_drc_item.cpp:59
+msgid "Two track ends"
+msgstr "导线有两个端点"
 
-#: pcbnew/dialog_display_options.cpp:276
-#: eeschema/dialog_options.cpp:267
-msgid "Show page limits"
-msgstr "显示页面限制"
+#: pcbnew/class_drc_item.cpp:61
+msgid "This looks bad"
+msgstr "这似乎存在问题"
 
-#: pcbnew/cotation.cpp:85
-msgid "Dimension properties"
-msgstr "尺寸标注属性"
+#: pcbnew/class_drc_item.cpp:63
+msgid "Tracks crossing"
+msgstr "导线交叉"
 
-#: pcbnew/cotation.cpp:113
-#: pcbnew/muonde.cpp:360
-#: pcbnew/dialog_edit_module.cpp:243
-#: pcbnew/dialog_edit_module.cpp:289
-#: pcbnew/pcbtexte.cpp:176
-#: eeschema/dialog_options.cpp:229
-#: eeschema/dialog_edit_component_in_schematic.cpp:180
-#: eeschema/onrightclick.cpp:305
-msgid "Normal"
-msgstr "普通"
+#: pcbnew/class_drc_item.cpp:65
+msgid "Pad near pad"
+msgstr "焊盘靠近焊盘"
 
-#: pcbnew/cotation.cpp:113
-#: pcbnew/pcbtexte.cpp:176
-#: pcbnew/class_pcb_text.cpp:202
-#: pcbnew/modedit_onclick.cpp:254
-#: pcbnew/class_text_mod.cpp:380
-#: gerbview/affiche.cpp:40
-#: share/dialog_print.cpp:178
-msgid "Mirror"
-msgstr "镜像"
+#: pcbnew/class_drc_item.cpp:67
+msgid "Via hole > diameter"
+msgstr "将导孔孔径设置为默认值"
 
-#: pcbnew/cotation.cpp:133
-#: gerbview/affiche.cpp:37
-msgid "Layer:"
-msgstr "层："
+#: pcbnew/class_drc_item.cpp:69
+msgid "Micro Via: incorrect layer pairs (not adjacent)"
+msgstr "微导孔: 不正确的工作层(不相邻)"
 
-#: pcbnew/xchgmod.cpp:80
-msgid "Exchange Modules"
-msgstr "更换模块"
+#: pcbnew/class_drc_item.cpp:71
+msgid "Copper area inside copper area"
+msgstr "铜箔区域位于另一铜箔区域之内"
 
-#: pcbnew/xchgmod.cpp:107
-msgid "Change module"
-msgstr "更换当前的模块"
+#: pcbnew/class_drc_item.cpp:73
+msgid "Copper areas intersect or are too close"
+msgstr "铜箔交叉或距离过近"
 
-#: pcbnew/xchgmod.cpp:113
-msgid "Change same modules"
-msgstr "更换所有相同的"
+#: pcbnew/class_drc_item.cpp:75
+msgid "Copper area has a non existent net name"
+msgstr "铜箔的网络名不存在(于网络表中)"
 
-#: pcbnew/xchgmod.cpp:119
-msgid "Ch. same module+value"
-msgstr "更换名称,数值均相同的"
+#: pcbnew/specctra_export.cpp:64
+msgid "Specctra DSN file:"
+msgstr "Specctra DSN 文件:"
 
-#: pcbnew/xchgmod.cpp:125
-msgid "Change all"
-msgstr "更换所有"
+#: pcbnew/specctra_export.cpp:118
+msgid "BOARD exported OK."
+msgstr "电路板导出成功。"
 
-#: pcbnew/xchgmod.cpp:131
-msgid "Browse Libs modules"
-msgstr "从库中浏览模块"
+#: pcbnew/specctra_export.cpp:123
+msgid "Unable to export, please fix and try again."
+msgstr "无法导出，请修正错误后再试。"
 
-#: pcbnew/xchgmod.cpp:137
-#: pcbnew/pcbplot.cpp:209
-#: share/zoom.cpp:445
-msgid "Close"
-msgstr "关闭"
+#: pcbnew/specctra_export.cpp:783
+#, c-format
+msgid "Component with value of \"%s\" has empty reference id."
+msgstr "数值为 \"%s\" 的元件索引编号为空。"
 
-#: pcbnew/xchgmod.cpp:142
-msgid "Current Module"
-msgstr "当前的模块"
+#: pcbnew/specctra_export.cpp:791
+#, c-format
+msgid "Multiple components have identical reference IDs of \"%s\"."
+msgstr "多个元件使用了相同的索引编号 \"%s\"。"
 
-#: pcbnew/xchgmod.cpp:149
-msgid "Current Value"
-msgstr "当前值"
+#: pcbnew/onrightclick.cpp:76
+#, fuzzy
+msgid "Auto Width"
+msgstr "线宽"
 
-#: pcbnew/xchgmod.cpp:156
-#: pcbnew/tool_modedit.cpp:70
-msgid "New Module"
-msgstr "新模块"
+#: pcbnew/onrightclick.cpp:78
+msgid "Use the track width when starting on a track, otherwise the current track width"
+msgstr ""
 
-#: pcbnew/xchgmod.cpp:226
+#: pcbnew/onrightclick.cpp:92
 #, c-format
-msgid "file %s not found"
-msgstr "文件 %s 没有找到"
+msgid "Track %.1f"
+msgstr "导线 %.1f"
 
-#: pcbnew/xchgmod.cpp:240
+#: pcbnew/onrightclick.cpp:94
 #, c-format
-msgid "Unable to create file %s"
-msgstr "无法建立文件 %s"
+msgid "Track %.3f"
+msgstr "导线 %.3f"
 
-#: pcbnew/xchgmod.cpp:347
+#: pcbnew/onrightclick.cpp:112
 #, c-format
-msgid "Change modules <%s> -> <%s> (val = %s)?"
-msgstr "将模块 <%s> 更换为 <%s> (值 = %s)? "
+msgid "Via %.1f"
+msgstr "导孔 %.1f"
 
-#: pcbnew/xchgmod.cpp:354
+#: pcbnew/onrightclick.cpp:114
 #, c-format
-msgid "Change modules <%s> -> <%s> ?"
-msgstr "将模块 <%s> 更换为 <%s> ?"
+msgid "Via %.3f"
+msgstr "导孔 %.3f"
 
-#: pcbnew/xchgmod.cpp:418
-msgid "Change ALL modules ?"
-msgstr "更换所有模块？"
+#: pcbnew/onrightclick.cpp:162
+#: pcbnew/modedit_onclick.cpp:206
+#: eeschema/onrightclick.cpp:129
+#: eeschema/libedit_onrightclick.cpp:53
+#: gerbview/onrightclick.cpp:42
+msgid "End Tool"
+msgstr "结束工具操作"
 
-#: pcbnew/xchgmod.cpp:480
-#, c-format
-msgid "Change module %s (%s)  "
-msgstr "更换模块 %s (%s)  "
+#: pcbnew/onrightclick.cpp:230
+msgid "Lock Module"
+msgstr "锁定模块"
 
-#: pcbnew/xchgmod.cpp:614
-#: pcbnew/automove.cpp:208
-msgid "No Modules!"
-msgstr "没有模块！"
+#: pcbnew/onrightclick.cpp:238
+msgid "Unlock Module"
+msgstr "解除模块锁定"
 
-#: pcbnew/xchgmod.cpp:626
-msgid "Cmp files:"
-msgstr "元件文件："
+#: pcbnew/onrightclick.cpp:246
+msgid "Auto place Module"
+msgstr "自动放置模块"
 
-#: pcbnew/muonde.cpp:149
-msgid "Gap"
-msgstr "Gap"
+#: pcbnew/onrightclick.cpp:252
+msgid "Autoroute"
+msgstr "自动布线"
 
-#: pcbnew/muonde.cpp:154
-msgid "Stub"
-msgstr "Stub"
+#: pcbnew/onrightclick.cpp:268
+msgid "Move Drawing"
+msgstr "移动 图形"
 
-#: pcbnew/muonde.cpp:160
-msgid "Arc Stub"
-msgstr "Arc Stub"
+#: pcbnew/onrightclick.cpp:273
+msgid "End Drawing"
+msgstr "结束 图形"
 
-#: pcbnew/muonde.cpp:175
-#: common/common.cpp:52
-msgid " (mm):"
-msgstr "（mm）："
+#: pcbnew/onrightclick.cpp:275
+msgid "Edit Drawing"
+msgstr "编辑 图形"
 
-#: pcbnew/muonde.cpp:182
-msgid " (inch):"
-msgstr "（inch）："
+#: pcbnew/onrightclick.cpp:276
+msgid "Delete Drawing"
+msgstr "删除 图形"
 
-#: pcbnew/muonde.cpp:189
-#: pcbnew/muonde.cpp:202
-#: pcbnew/gen_self.h:231
-msgid "Incorrect number, abort"
-msgstr "数值错误，退出"
+#: pcbnew/onrightclick.cpp:281
+msgid "Delete Zone Filling"
+msgstr "删除 覆铜填充"
 
-#: pcbnew/muonde.cpp:198
-msgid "Angle (0.1deg):"
-msgstr "角度（0.1度）："
+#: pcbnew/onrightclick.cpp:288
+msgid "Close Zone Outline"
+msgstr "闭合 覆铜边界"
 
-#: pcbnew/muonde.cpp:330
-msgid "Complex shape"
-msgstr "复合形状"
+#: pcbnew/onrightclick.cpp:290
+msgid "Delete Last Corner"
+msgstr "删除 最后的拐角"
+
+#: pcbnew/onrightclick.cpp:308
+msgid "Delete Marker"
+msgstr "删除 DRC标记"
+
+#: pcbnew/onrightclick.cpp:315
+msgid "Edit Dimension"
+msgstr "编辑 尺寸标注"
+
+#: pcbnew/onrightclick.cpp:318
+msgid "Delete Dimension"
+msgstr "删除 尺寸标注"
+
+#: pcbnew/onrightclick.cpp:325
+msgid "Move Target"
+msgstr "移动 目标"
 
-#: pcbnew/muonde.cpp:356
-msgid "Read Shape Descr File..."
-msgstr "读取形状描述文件 ..."
+#: pcbnew/onrightclick.cpp:328
+msgid "Edit Target"
+msgstr "编辑 目标"
 
-#: pcbnew/muonde.cpp:360
-msgid "Symmetrical"
-msgstr "对称的"
+#: pcbnew/onrightclick.cpp:330
+msgid "Delete Target"
+msgstr "删除 目标"
 
-#: pcbnew/muonde.cpp:360
-msgid "Mirrored"
-msgstr "镜像的"
+#: pcbnew/onrightclick.cpp:362
+msgid "Get and Move Footprint"
+msgstr "挑选和移动封装"
 
-#: pcbnew/muonde.cpp:362
-msgid "Shape Option"
-msgstr "形状选项"
+#: pcbnew/onrightclick.cpp:376
+msgid "Fill or Refill All Zones"
+msgstr "填充或重新填充所有覆铜"
 
-#: pcbnew/muonde.cpp:428
-msgid "Read descr shape file"
-msgstr "读取形状描述文件"
+#: pcbnew/onrightclick.cpp:381
+#: pcbnew/onrightclick.cpp:392
+#: pcbnew/onrightclick.cpp:405
+#: pcbnew/onrightclick.cpp:466
+msgid "Select Working Layer"
+msgstr "选择工作层"
 
-#: pcbnew/muonde.cpp:444
-msgid "File not found"
-msgstr "文件没有找到"
+#: pcbnew/onrightclick.cpp:390
+#: pcbnew/onrightclick.cpp:463
+msgid "Select Track Width"
+msgstr "选择导线宽度"
 
-#: pcbnew/muonde.cpp:548
-msgid "Shape has a null size!"
-msgstr "形状大小为空！"
+#: pcbnew/onrightclick.cpp:394
+msgid "Select layer pair for vias"
+msgstr "选择导孔的工作层"
 
-#: pcbnew/muonde.cpp:553
-msgid "Shape has no points!"
-msgstr "形状不包含任何点！"
+#: pcbnew/onrightclick.cpp:411
+msgid "Footprint documentation"
+msgstr "封装的文档"
 
-#: pcbnew/muonde.cpp:679
-msgid "No pad for this module"
-msgstr "该模块没有焊盘"
+#: pcbnew/onrightclick.cpp:421
+msgid "Glob Move and Place"
+msgstr "全局移动和放置"
 
-#: pcbnew/muonde.cpp:684
-msgid "Only one pad for this module"
-msgstr "该模块仅有一个焊盘"
+#: pcbnew/onrightclick.cpp:423
+msgid "Unlock All Modules"
+msgstr "解除所有模块锁定"
 
-#: pcbnew/muonde.cpp:698
-msgid "Gap (mm):"
-msgstr "Gap (mm):"
+#: pcbnew/onrightclick.cpp:425
+msgid "Lock All Modules"
+msgstr "锁定所有模块"
 
-#: pcbnew/muonde.cpp:704
-msgid "Gap (inch):"
-msgstr "Gap (inch):"
+#: pcbnew/onrightclick.cpp:428
+msgid "Move All Modules"
+msgstr "移动所有模块"
 
-#: pcbnew/solve.cpp:229
-msgid "Abort routing?"
-msgstr "退出布线？"
+#: pcbnew/onrightclick.cpp:429
+msgid "Move New Modules"
+msgstr "移动新模块"
 
-#: pcbnew/dialog_netlist.cpp:136
-msgid "Timestamp"
-msgstr "时间印记"
+#: pcbnew/onrightclick.cpp:431
+msgid "Autoplace All Modules"
+msgstr "自动放置所有模块"
 
-#: pcbnew/dialog_netlist.cpp:137
-msgid "Module Selection:"
-msgstr "模块选择依据："
+#: pcbnew/onrightclick.cpp:432
+msgid "Autoplace New Modules"
+msgstr "自动放置新模块"
 
-#: pcbnew/dialog_netlist.cpp:142
-#: pcbnew/dialog_netlist.cpp:149
-msgid "Keep"
-msgstr "保留"
+#: pcbnew/onrightclick.cpp:433
+msgid "Autoplace Next Module"
+msgstr "自动放置下一个模块"
 
-#: pcbnew/dialog_netlist.cpp:143
-#: pcbnew/onrightclick.cpp:598
-#: pcbnew/onrightclick.cpp:708
-#: pcbnew/onrightclick.cpp:805
-#: eeschema/edit_component_in_lib.cpp:239
-#: eeschema/edit_component_in_lib.cpp:320
-msgid "Delete"
-msgstr "删除"
+#: pcbnew/onrightclick.cpp:436
+msgid "Orient All Modules"
+msgstr "改变所有模块的方向"
 
-#: pcbnew/dialog_netlist.cpp:144
-msgid "Bad Tracks Deletion:"
-msgstr "错误连线删除："
+#: pcbnew/onrightclick.cpp:443
+msgid "Global Autoroute"
+msgstr "全局自动布线"
 
-#: pcbnew/dialog_netlist.cpp:150
-msgid "Change"
-msgstr "更换"
+#: pcbnew/onrightclick.cpp:445
+msgid "Select layer pair"
+msgstr "选择工作层"
 
-#: pcbnew/dialog_netlist.cpp:151
-msgid "Exchange Module:"
-msgstr "更换模块："
+#: pcbnew/onrightclick.cpp:447
+msgid "Autoroute All Modules"
+msgstr "对所有模块自动布线"
 
-#: pcbnew/dialog_netlist.cpp:155
-msgid "Display Warnings"
-msgstr "显示警告"
+#: pcbnew/onrightclick.cpp:449
+msgid "Reset Unrouted"
+msgstr "复位未布线路"
 
-#: pcbnew/dialog_netlist.cpp:164
-msgid "Select"
-msgstr "选择"
+#: pcbnew/onrightclick.cpp:454
+msgid "Global AutoRouter"
+msgstr "全局自动布线程序(AutoRouter)"
 
-#: pcbnew/dialog_netlist.cpp:168
-msgid "Read"
-msgstr "读取"
+#: pcbnew/onrightclick.cpp:456
+msgid "Read Global AutoRouter Data"
+msgstr "读取全局自动布线程序数据"
 
-#: pcbnew/dialog_netlist.cpp:172
-msgid "Module Test"
-msgstr "模块测试"
+#: pcbnew/onrightclick.cpp:484
+#: pcbnew/modedit_onclick.cpp:216
+#: eeschema/onrightclick.cpp:624
+#: eeschema/libedit_onrightclick.cpp:237
+#: gerbview/onrightclick.cpp:51
+msgid "Cancel Block"
+msgstr "取消块定义"
 
-#: pcbnew/dialog_netlist.cpp:176
-msgid "Compile"
-msgstr "编译"
+#: pcbnew/onrightclick.cpp:486
+#: pcbnew/modedit_onclick.cpp:218
+#: gerbview/onrightclick.cpp:52
+msgid "Zoom Block (Midd butt drag)"
+msgstr "块区域放大显示 (鼠标中键拖拉)"
 
-#: pcbnew/set_grid.cpp:147
-#: pcbnew/dialog_general_options.cpp:271
-#: gerbview/options.cpp:185
-msgid "Inches"
-msgstr "inch"
+#: pcbnew/onrightclick.cpp:489
+#: pcbnew/modedit_onclick.cpp:221
+#: eeschema/onrightclick.cpp:632
+#: eeschema/libedit_onrightclick.cpp:245
+#: gerbview/onrightclick.cpp:54
+msgid "Place Block"
+msgstr "放置 块"
 
-#: pcbnew/set_grid.cpp:148
-#: share/drawframe.cpp:395
-msgid "mm"
-msgstr "mm"
+#: pcbnew/onrightclick.cpp:491
+#: pcbnew/modedit_onclick.cpp:223
+#: eeschema/onrightclick.cpp:641
+#: eeschema/libedit_onrightclick.cpp:251
+msgid "Copy Block (shift + drag mouse)"
+msgstr "复制 块 (shift + 鼠标拖拉)"
 
-#: pcbnew/set_grid.cpp:150
-msgid "Grid Size Units"
-msgstr "网格大小单位"
+#: pcbnew/onrightclick.cpp:493
+msgid "Flip Block (alt + drag mouse)"
+msgstr "翻转 块 (alt + 鼠标拖拉)"
 
-#: pcbnew/set_grid.cpp:156
-msgid "User Grid Size X"
-msgstr "自定义网格大小 X"
+#: pcbnew/onrightclick.cpp:495
+#: pcbnew/modedit_onclick.cpp:227
+msgid "Rotate Block (ctrl + drag mouse)"
+msgstr "旋转 块 (ctrl + 鼠标拖拉)"
 
-#: pcbnew/set_grid.cpp:162
-msgid "User Grid Size Y"
-msgstr "自定义网格大小 Y"
+#: pcbnew/onrightclick.cpp:497
+#: pcbnew/modedit_onclick.cpp:229
+msgid "Delete Block (shift+ctrl + drag mouse)"
+msgstr "删除 块 (shift + ctrl + 鼠标拖拉)"
 
-#: pcbnew/hotkeys.cpp:440
-#, c-format
-msgid "Footprint %s found, but locked"
-msgstr "找到封装 %s，但是被锁定"
+#: pcbnew/onrightclick.cpp:516
+msgid "Drag Via"
+msgstr "拖动导孔"
 
-#: pcbnew/hotkeys.cpp:605
-msgid "Delete module?"
-msgstr "是否删除模块？"
+#: pcbnew/onrightclick.cpp:520
+#: pcbnew/onrightclick.cpp:601
+msgid "Edit Via"
+msgstr "编辑导孔"
 
-#: pcbnew/modedit.cpp:263
-msgid "Unable to find the footprint source on the main board"
-msgstr "在主电路板上找不到该封装的源"
+#: pcbnew/onrightclick.cpp:522
+msgid "Set via hole to Default"
+msgstr "将导孔孔径设置为默认值"
 
-#: pcbnew/modedit.cpp:264
-msgid ""
-"\n"
-"Cannot update the footprint"
+#: pcbnew/onrightclick.cpp:523
+msgid "Set via hole to a specific value. This specfic value is currently"
 msgstr ""
-"\n"
-"无法更新封装"
 
-#: pcbnew/modedit.cpp:272
-msgid "A footprint source was found on the main board"
-msgstr "在主电路板上找到一个封装的源"
+#: pcbnew/onrightclick.cpp:526
+msgid "Set via hole to alt value"
+msgstr "将导孔孔径设置为备用值"
 
-#: pcbnew/modedit.cpp:273
-msgid ""
-"\n"
-"Cannot insert this footprint"
+#: pcbnew/onrightclick.cpp:528
+msgid "Set alt via hole value. This value is currently"
 msgstr ""
-"\n"
-"无法插入该封装"
 
-#: pcbnew/modedit.cpp:395
-msgid "Add Pad"
-msgstr "添加 焊盘"
+#: pcbnew/onrightclick.cpp:531
+msgid "Set the via hole alt value"
+msgstr "设置导孔孔径的备用值"
 
-#: pcbnew/modedit.cpp:398
-#: pcbnew/tool_modedit.cpp:133
-#: pcbnew/menubarmodedit.cpp:45
-#: pcbnew/menubarpcb.cpp:209
-msgid "Pad Settings"
-msgstr "焊盘设置"
+#: pcbnew/onrightclick.cpp:533
+msgid "Export Via hole to alt value"
+msgstr "将当前导孔孔径导出为备用值"
 
-#: pcbnew/modedit.cpp:408
-#: eeschema/schedit.cpp:298
-msgid "Add Drawing"
-msgstr "添加 图形"
+#: pcbnew/onrightclick.cpp:535
+msgid "Export via hole to others id vias"
+msgstr "将过孔孔径设置应用到指定过孔"
 
-#: pcbnew/modedit.cpp:412
-#: pcbnew/tool_modedit.cpp:185
-msgid "Place anchor"
-msgstr "放置 锚点"
+#: pcbnew/onrightclick.cpp:537
+msgid "Set ALL via holes to default"
+msgstr "将所有导孔孔径设置为默认值"
 
-#: pcbnew/modedit.cpp:426
-#: pcbnew/edit.cpp:461
-#: eeschema/schedit.cpp:454
-#: eeschema/libframe.cpp:579
-msgid "Delete item"
-msgstr "删除对象"
+#: pcbnew/onrightclick.cpp:550
+#, fuzzy
+msgid "Move Node"
+msgstr "移动 Node"
 
-#: pcbnew/editpads.cpp:77
-msgid "Pad Position"
-msgstr "焊盘位置"
+#: pcbnew/onrightclick.cpp:555
+msgid "Drag Segments, keep slope"
+msgstr "拖拉 线段, 保持斜率"
 
-#: pcbnew/editpads.cpp:84
-msgid "Pad Size"
-msgstr "焊盘大小"
+#: pcbnew/onrightclick.cpp:557
+msgid "Drag Segment"
+msgstr "拖拉 线段"
 
-#: pcbnew/editpads.cpp:91
-msgid "Delta"
-msgstr "增量"
+#: pcbnew/onrightclick.cpp:560
+msgid "Move Segment"
+msgstr "移动 线段"
 
-#: pcbnew/editpads.cpp:98
-msgid "Offset"
-msgstr "偏移量"
+#: pcbnew/onrightclick.cpp:563
+msgid "Break Track"
+msgstr "分割 导线"
 
-#: pcbnew/editpads.cpp:107
-msgid "Pad Drill"
-msgstr "焊盘钻孔"
+#: pcbnew/onrightclick.cpp:570
+#, fuzzy
+msgid "Place Node"
+msgstr "放置 Node"
 
-#: pcbnew/editpads.cpp:119
-msgid "Pad Orient (0.1 deg)"
-msgstr "焊盘方向（0.1度）"
+#: pcbnew/onrightclick.cpp:577
+msgid "End Track"
+msgstr "结束 导线"
 
-#: pcbnew/editpads.cpp:389
-msgid "Incorrect value for pad drill: pad drill bigger than pad size"
-msgstr "钻孔值不正确：钻孔大小超过了焊盘大小"
+#: pcbnew/onrightclick.cpp:580
+msgid "Place Via"
+msgstr "放置 导孔"
 
-#: pcbnew/editpads.cpp:395
-msgid "Incorrect value for pad offset"
-msgstr "焊盘偏移数值不正确"
+#: pcbnew/onrightclick.cpp:587
+msgid "Place Micro Via"
+msgstr "放置 微导孔"
 
-#: pcbnew/dialog_pad_edit.cpp:157
-msgid "Pad Num :"
-msgstr "焊盘编号："
+#: pcbnew/onrightclick.cpp:599
+msgid "Change Width"
+msgstr "改变 宽度"
 
-#: pcbnew/dialog_pad_edit.cpp:163
-msgid "Pad Net Name :"
-msgstr "焊盘网络名称："
+#: pcbnew/onrightclick.cpp:601
+msgid "Edit Segment"
+msgstr "编辑 线段"
 
-#: pcbnew/dialog_pad_edit.cpp:177
-#: pcbnew/dialog_pad_edit.cpp:197
-msgid "Oval"
-msgstr "椭圆"
+#: pcbnew/onrightclick.cpp:604
+msgid "Edit Track"
+msgstr "编辑 导线"
+
+#: pcbnew/onrightclick.cpp:606
+msgid "Edit Net"
+msgstr "编辑 相同网络"
 
-#: pcbnew/dialog_pad_edit.cpp:178
-msgid "Drill Shape:"
-msgstr "钻孔形状："
+#: pcbnew/onrightclick.cpp:608
+msgid "Edit ALL Tracks and Vias"
+msgstr "编辑 所有导线和导孔"
 
-#: pcbnew/dialog_pad_edit.cpp:186
-#: pcbnew/clean.cpp:462
-#: eeschema/dialog_erc.cpp:192
-#: eeschema/dialog_erc.cpp:196
-#: eeschema/dialog_edit_component_in_schematic.cpp:171
-msgid "0"
-msgstr "0"
+#: pcbnew/onrightclick.cpp:610
+msgid "Edit ALL Vias (no track)"
+msgstr "编辑 所有导孔(不包括导线)"
 
-#: pcbnew/dialog_pad_edit.cpp:187
-msgid "90"
-msgstr "90"
+#: pcbnew/onrightclick.cpp:612
+msgid "Edit ALL Tracks (no via)"
+msgstr "编辑 所有导线(不包括导孔)"
 
-#: pcbnew/dialog_pad_edit.cpp:188
-#: eeschema/dialog_edit_component_in_schematic.cpp:174
-msgid "-90"
-msgstr "-90"
+#: pcbnew/onrightclick.cpp:618
+#: pcbnew/onrightclick.cpp:799
+#: pcbnew/onrightclick.cpp:896
+#: pcbnew/dialog_netlist.cpp:143
+#: eeschema/menubar.cpp:154
+#: eeschema/edit_component_in_lib.cpp:239
+#: eeschema/edit_component_in_lib.cpp:320
+msgid "Delete"
+msgstr "删除"
 
-#: pcbnew/dialog_pad_edit.cpp:189
-#: eeschema/dialog_edit_component_in_schematic.cpp:173
-msgid "180"
-msgstr "180"
+#: pcbnew/onrightclick.cpp:620
+msgid "Delete Via"
+msgstr "删除 导孔"
 
-#: pcbnew/dialog_pad_edit.cpp:190
-#: pcbnew/dialog_edit_module.cpp:243
-msgid "User"
-msgstr "自定义"
+#: pcbnew/onrightclick.cpp:620
+msgid "Delete Segment"
+msgstr "删除 线段"
 
-#: pcbnew/dialog_pad_edit.cpp:191
-msgid "Pad Orient:"
-msgstr "焊盘方向："
+#: pcbnew/onrightclick.cpp:627
+msgid "Delete Track"
+msgstr "删除 导线"
 
-#: pcbnew/dialog_pad_edit.cpp:199
-msgid "Trapezoidal"
-msgstr "梯形"
+#: pcbnew/onrightclick.cpp:631
+msgid "Delete Net"
+msgstr "删除 相同网络"
 
-#: pcbnew/dialog_pad_edit.cpp:200
-msgid "Pad Shape:"
-msgstr "焊盘形状："
+#: pcbnew/onrightclick.cpp:636
+msgid "Set Flags"
+msgstr "设置标志"
 
-#: pcbnew/dialog_pad_edit.cpp:205
-#: pcbnew/class_track.cpp:793
-msgid "Standard"
-msgstr "标准"
+#: pcbnew/onrightclick.cpp:637
+msgid "Locked: Yes"
+msgstr "锁定: 是"
 
-#: pcbnew/dialog_pad_edit.cpp:206
-msgid "SMD"
-msgstr "表面贴装"
+#: pcbnew/onrightclick.cpp:638
+msgid "Locked: No"
+msgstr "锁定: 否"
 
-#: pcbnew/dialog_pad_edit.cpp:207
-#: eeschema/netlist.cpp:210
-msgid "Conn"
-msgstr "连接器"
+#: pcbnew/onrightclick.cpp:648
+msgid "Track Locked: Yes"
+msgstr "导线锁定: 是"
 
-#: pcbnew/dialog_pad_edit.cpp:208
-msgid "Hole"
-msgstr "孔"
+#: pcbnew/onrightclick.cpp:649
+msgid "Track Locked: No"
+msgstr "导线锁定: 否"
 
-#: pcbnew/dialog_pad_edit.cpp:209
-msgid "Mechanical"
-msgstr "机械"
+#: pcbnew/onrightclick.cpp:651
+msgid "Net Locked: Yes"
+msgstr "网络锁定: 是"
 
-#: pcbnew/dialog_pad_edit.cpp:210
-msgid "Pad Type:"
-msgstr "焊盘类型："
+#: pcbnew/onrightclick.cpp:652
+msgid "Net Locked: No"
+msgstr "网络锁定: 否"
 
-#: pcbnew/dialog_pad_edit.cpp:225
-msgid "Layers:"
-msgstr "层："
+#: pcbnew/onrightclick.cpp:668
+msgid "Place Edge Outline"
+msgstr "放置 边框轮廓线"
 
-#: pcbnew/dialog_pad_edit.cpp:229
-msgid "Copper layer"
-msgstr "铜层"
+#: pcbnew/onrightclick.cpp:674
+msgid "Place Corner"
+msgstr "放置 拐角"
 
-#: pcbnew/dialog_pad_edit.cpp:233
-msgid "Comp layer"
-msgstr "元件层"
+#: pcbnew/onrightclick.cpp:677
+msgid "Place Zone"
+msgstr "放置 覆铜"
 
-#: pcbnew/dialog_pad_edit.cpp:239
-msgid "Adhesive Cmp"
-msgstr "粘胶层（元件面）"
+#: pcbnew/onrightclick.cpp:688
+msgid "Move Corner"
+msgstr "移动 拐角"
 
-#: pcbnew/dialog_pad_edit.cpp:243
-msgid "Adhesive Copper"
-msgstr "粘胶层（铜箔面）"
+#: pcbnew/onrightclick.cpp:690
+msgid "Delete Corner"
+msgstr "删除 拐角"
 
-#: pcbnew/dialog_pad_edit.cpp:247
-msgid "Solder paste Cmp"
-msgstr "贴焊层（元件面）"
+#: pcbnew/onrightclick.cpp:695
+msgid "Create Corner"
+msgstr "建立 拐角"
 
-#: pcbnew/dialog_pad_edit.cpp:251
-msgid "Solder paste Copper"
-msgstr "贴焊层（铜箔面）"
+#: pcbnew/onrightclick.cpp:697
+msgid "Drag Outline Segment"
+msgstr "拖动 轮廓线段"
 
-#: pcbnew/dialog_pad_edit.cpp:255
-msgid "Silkscreen Cmp"
-msgstr "丝印（元件面）"
+#: pcbnew/onrightclick.cpp:702
+msgid "Add Similar Zone"
+msgstr "添加 相似覆铜"
 
-#: pcbnew/dialog_pad_edit.cpp:259
-msgid "Silkscreen Copper"
-msgstr "丝印（铜箔面）"
+#: pcbnew/onrightclick.cpp:705
+msgid "Add Cutout Area"
+msgstr "添加 挖空区域"
 
-#: pcbnew/dialog_pad_edit.cpp:263
-msgid "Solder mask Cmp"
-msgstr "阻焊层（元件面）"
+#: pcbnew/onrightclick.cpp:709
+msgid "Fill Zone"
+msgstr "填充 覆铜"
 
-#: pcbnew/dialog_pad_edit.cpp:267
-msgid "Solder mask Copper"
-msgstr "阻焊层（铜箔面）"
+#: pcbnew/onrightclick.cpp:712
+msgid "Move Zone"
+msgstr "移动 覆铜"
 
-#: pcbnew/dialog_pad_edit.cpp:271
-msgid "E.C.O.1 layer"
-msgstr "E.C.O.1 layer"
+#: pcbnew/onrightclick.cpp:715
+msgid "Edit Zone Params"
+msgstr "编辑覆铜参数"
 
-#: pcbnew/dialog_pad_edit.cpp:275
-msgid "E.C.O.2 layer"
-msgstr "E.C.O.2 layer"
+#: pcbnew/onrightclick.cpp:720
+msgid "Delete Cutout"
+msgstr "删除 挖空区域"
 
-#: pcbnew/dialog_pad_edit.cpp:279
-msgid "Draft layer"
-msgstr "Draft layer"
+#: pcbnew/onrightclick.cpp:723
+msgid "Delete Zone Outline"
+msgstr "删除 覆铜边界"
 
-#: pcbnew/modules.cpp:81
-msgid "Footprint name:"
-msgstr "封装名称："
+#: pcbnew/onrightclick.cpp:745
+#: pcbnew/onrightclick.cpp:790
+#: pcbnew/onrightclick.cpp:828
+#: pcbnew/onrightclick.cpp:887
+msgid "Move"
+msgstr "移动"
 
-#: pcbnew/modules.cpp:281
-#: pcbnew/onrightclick.cpp:676
-msgid "Delete Module"
-msgstr "删除模块"
+#: pcbnew/onrightclick.cpp:748
+#: pcbnew/onrightclick.cpp:830
+msgid "Drag"
+msgstr "拖拉"
 
-#: pcbnew/modules.cpp:282
-#: eeschema/find.cpp:229
-msgid "Value "
-msgstr "值 "
+#: pcbnew/onrightclick.cpp:752
+msgid "Rotate  +"
+msgstr "旋转  +"
 
-#: pcbnew/zones.cpp:153
-#: pcbnew/zones.cpp:154
-#: pcbnew/zones.cpp:155
-#: pcbnew/zones.cpp:156
-msgid "0.00000"
-msgstr "0.00000"
+#: pcbnew/onrightclick.cpp:756
+#: eeschema/onrightclick.cpp:308
+msgid "Rotate -"
+msgstr "旋转  -"
 
-#: pcbnew/zones.cpp:160
-msgid "Grid size:"
-msgstr "网格大小："
+#: pcbnew/onrightclick.cpp:757
+msgid "Flip"
+msgstr "翻转"
 
-#: pcbnew/zones.cpp:165
-msgid "Zone clearance value (mm):"
-msgstr "覆铜间隔（mm）："
+#: pcbnew/onrightclick.cpp:761
+#: pcbnew/onrightclick.cpp:795
+#: pcbnew/onrightclick.cpp:892
+#: pcbnew/modedit_onclick.cpp:316
+#: eeschema/onrightclick.cpp:320
+msgid "Edit"
+msgstr "编辑"
 
-#: pcbnew/zones.cpp:182
-msgid "Include Pads"
-msgstr "包围焊盘"
+#: pcbnew/onrightclick.cpp:767
+#: pcbnew/modules.cpp:281
+msgid "Delete Module"
+msgstr "删除模块"
 
-#: pcbnew/zones.cpp:183
-msgid "Thermal"
-msgstr "热（花）焊盘"
+#: pcbnew/onrightclick.cpp:793
+#: pcbnew/onrightclick.cpp:890
+#: pcbnew/modedit_onclick.cpp:251
+msgid "Rotate"
+msgstr "旋转"
 
-#: pcbnew/zones.cpp:184
-msgid "Exclude Pads"
-msgstr "空出焊盘"
+#: pcbnew/onrightclick.cpp:832
+#: pcbnew/modedit_onclick.cpp:273
+msgid "Edit Pad"
+msgstr "编辑 焊盘"
 
-#: pcbnew/zones.cpp:188
-msgid "Pad options:"
-msgstr "焊盘选项："
+#: pcbnew/onrightclick.cpp:836
+#: pcbnew/modedit_onclick.cpp:275
+msgid "New Pad Settings"
+msgstr "应用新焊盘参数设置"
 
-#: pcbnew/zones.cpp:193
-#: eeschema/dialog_options.cpp:257
-msgid "Any"
-msgstr "任意方向"
+#: pcbnew/onrightclick.cpp:838
+#: pcbnew/modedit_onclick.cpp:277
+msgid "Export Pad Settings"
+msgstr "导出新焊盘参数设置"
 
-#: pcbnew/zones.cpp:194
-msgid "H , V and 45 deg"
-msgstr "水平，垂直，以及45度"
+#: pcbnew/onrightclick.cpp:843
+#: pcbnew/modedit_onclick.cpp:284
+msgid "Global Pad Settings"
+msgstr "全局应用新焊盘参数设置"
 
-#: pcbnew/zones.cpp:198
-msgid "Zone edges orient:"
-msgstr "覆铜边界方向："
+#: pcbnew/onrightclick.cpp:847
+msgid "delete"
+msgstr "删除"
 
-#: pcbnew/zones.cpp:210
-msgid "Fill"
-msgstr "填充"
+#: pcbnew/onrightclick.cpp:854
+msgid "Autoroute Pad"
+msgstr "自动布线 针对焊盘"
 
-#: pcbnew/zones.cpp:224
-msgid "Update Options"
-msgstr "更新选项"
+#: pcbnew/onrightclick.cpp:855
+msgid "Autoroute Net"
+msgstr "自动布线 针对网络"
 
-#: pcbnew/zones.cpp:233
-msgid "Zone clearance value:"
-msgstr "覆铜间隔"
+#: pcbnew/sel_layer.cpp:92
+msgid "Select Layer:"
+msgstr "选择层:"
 
-#: pcbnew/zones.cpp:236
-msgid "Grid :"
-msgstr "网格"
+#: pcbnew/sel_layer.cpp:137
+msgid "(Deselect)"
+msgstr "(不选择)"
 
-#: pcbnew/zones.cpp:399
-msgid "New zone segment width: "
-msgstr "新 覆铜线段宽度 设置："
+#: pcbnew/sel_layer.cpp:238
+msgid "Less than two copper layers are being used."
+msgstr "使用的铜层少于两层。"
 
-#: pcbnew/zones.cpp:597
-msgid "Zone: No net selected"
-msgstr "覆铜：未选择任何网络"
+#: pcbnew/sel_layer.cpp:239
+msgid "Hence Layer Pairs cannot be specified."
+msgstr "所以无法设置过孔对应层。"
 
-#: pcbnew/zones.cpp:639
-msgid "Delete Current Zone Edges"
-msgstr "删除 当前的覆铜边界"
+#: pcbnew/sel_layer.cpp:263
+msgid "Select Layer Pair:"
+msgstr "选择工作层: "
 
-#: pcbnew/zones.cpp:926
-msgid "No Net"
-msgstr "无网络"
+#: pcbnew/sel_layer.cpp:294
+msgid "Top Layer"
+msgstr "顶层"
 
-#: pcbnew/zones.cpp:928
-#: pcbnew/class_track.cpp:780
-msgid "NetName"
-msgstr "网络名称"
+#: pcbnew/sel_layer.cpp:299
+msgid "Bottom Layer"
+msgstr "底层"
 
-#: pcbnew/zones.cpp:998
-msgid "Ok"
-msgstr "Ok"
+#: pcbnew/sel_layer.cpp:358
+msgid "The Top Layer and Bottom Layer must differ"
+msgstr "顶层和底层必须不同"
 
-#: pcbnew/pcbcfg.cpp:68
-#: eeschema/eeconfig.cpp:58
+#: pcbnew/pcbcfg.cpp:71
+#: eeschema/eeconfig.cpp:61
 #: cvpcb/menucfg.cpp:170
 msgid "Read config file"
 msgstr "读取设置文件"
 
-#: pcbnew/pcbcfg.cpp:81
+#: pcbnew/pcbcfg.cpp:85
 #: cvpcb/menucfg.cpp:182
 #, c-format
 msgid "File %s not found"
 msgstr "文件 %s 未找到"
 
-#: pcbnew/pcbcfg.cpp:196
-#: eeschema/eeconfig.cpp:192
+#: pcbnew/pcbcfg.cpp:204
+#: eeschema/eeconfig.cpp:200
 #: cvpcb/cfg.cpp:71
 msgid "Save preferences"
 msgstr "保存参数设置"
 
-#: pcbnew/loadcmp.cpp:103
-msgid "Module name:"
-msgstr "模块名称："
-
-#: pcbnew/loadcmp.cpp:215
-#: eeschema/eelibs_read_libraryfiles.cpp:59
-#, c-format
-msgid "Library <%s> not found"
-msgstr "库 < %s > 没有找到"
-
-#: pcbnew/loadcmp.cpp:220
-#, c-format
-msgid "Scan Lib: %s"
-msgstr "扫描库：%s"
-
-#: pcbnew/loadcmp.cpp:229
-msgid "File is Not a library"
-msgstr "文件不是一个库文件"
-
-#: pcbnew/loadcmp.cpp:298
-#, c-format
-msgid "Module <%s> not found"
-msgstr "模块 < %s > 没有找到"
-
-#: pcbnew/loadcmp.cpp:368
-msgid "Library: "
-msgstr "库："
-
-#: pcbnew/loadcmp.cpp:433
-#: pcbnew/loadcmp.cpp:584
-#, c-format
-msgid "Modules (%d items)"
-msgstr "模块（%d 项）"
-
-#: pcbnew/dialog_edit_module.cpp:40
-msgid "Module properties"
-msgstr "模块属性"
-
-#: pcbnew/dialog_edit_module.cpp:95
-msgid "Properties"
-msgstr "属性"
-
-#: pcbnew/dialog_edit_module.cpp:99
-#: pcbnew/dialog_edit_module.cpp:108
-#: pcbnew/dialog_edit_module.cpp:137
-msgid "3D settings"
-msgstr "3D设置"
+#: pcbnew/class_zone.cpp:519
+#: pcbnew/class_board_item.cpp:155
+msgid "Zone Outline"
+msgstr "覆铜边界"
 
-#: pcbnew/dialog_edit_module.cpp:182
-msgid "Change module(s)"
-msgstr "更换模块"
+#: pcbnew/class_zone.cpp:523
+#: pcbnew/class_board_item.cpp:160
+msgid "(Cutout)"
+msgstr ""
 
-#: pcbnew/dialog_edit_module.cpp:186
-#: pcbnew/modedit_onclick.cpp:261
-msgid "Edit Module"
-msgstr "编辑模块"
+#: pcbnew/class_zone.cpp:543
+#: pcbnew/class_board_item.cpp:179
+msgid "Not Found"
+msgstr "未找到"
 
-#: pcbnew/dialog_edit_module.cpp:193
-#: eeschema/dialog_edit_component_in_lib.cpp:203
-#: eeschema/onrightclick.cpp:348
-msgid "Doc"
-msgstr "说明"
+#: pcbnew/class_zone.cpp:559
+msgid "Corners"
+msgstr "拐角"
 
-#: pcbnew/dialog_edit_module.cpp:200
-msgid "Keywords"
-msgstr "关键词"
+#: pcbnew/class_zone.cpp:563
+#, fuzzy
+msgid "Hatch lines"
+msgstr "线宽"
 
-#: pcbnew/dialog_edit_module.cpp:207
-msgid "Fields:"
-msgstr "域："
+#: pcbnew/dialog_edit_mod_text.cpp:156
+#, c-format
+msgid "Module %s (%s) orient %.1f"
+msgstr "模块 %s (%s) 方向 %.1f"
 
-#: pcbnew/dialog_edit_module.cpp:217
-msgid "Add Field"
-msgstr "添加 域"
+#: pcbnew/dialog_edit_mod_text.cpp:163
+msgid "Reference:"
+msgstr "索引:"
 
-#: pcbnew/dialog_edit_module.cpp:222
-#: eeschema/onrightclick.cpp:268
-msgid "Edit Field"
-msgstr "编辑 域"
+#: pcbnew/dialog_edit_mod_text.cpp:175
+msgid "Size X"
+msgstr "大小 X"
 
-#: pcbnew/dialog_edit_module.cpp:227
-msgid "Delete Field"
-msgstr "删除 域"
+#: pcbnew/dialog_edit_mod_text.cpp:181
+msgid "Size Y"
+msgstr "大小 Y"
 
-#: pcbnew/dialog_edit_module.cpp:234
-#: common/common.cpp:280
-msgid "Component"
-msgstr "元件层"
+#: pcbnew/dialog_edit_mod_text.cpp:189
+msgid "Offset X"
+msgstr "偏移 X"
 
-#: pcbnew/dialog_edit_module.cpp:234
-msgid "Copper"
-msgstr "铜层"
+#: pcbnew/dialog_edit_mod_text.cpp:195
+msgid "Offset Y"
+msgstr "偏移 Y"
 
-#: pcbnew/dialog_edit_module.cpp:246
-#: pcbnew/class_pcb_text.cpp:209
-#: pcbnew/class_text_mod.cpp:383
-#: pcbnew/class_pad.cpp:1104
-#: pcbnew/class_module.cpp:1240
-#: eeschema/affiche.cpp:117
-#: gerbview/affiche.cpp:49
-msgid "Orient"
-msgstr "方向"
+#: pcbnew/dialog_edit_mod_text.cpp:222
+msgid "horiz"
+msgstr "水平"
 
-#: pcbnew/dialog_edit_module.cpp:279
-msgid "Orient (0.1 deg)"
-msgstr "方向（0.1度）"
+#: pcbnew/dialog_edit_mod_text.cpp:223
+msgid "vertical"
+msgstr "垂直"
 
-#: pcbnew/dialog_edit_module.cpp:289
-msgid "Normal+Insert"
-msgstr "普通 + Insert"
+#: pcbnew/dialog_edit_mod_text.cpp:229
+msgid "show"
+msgstr "显示"
 
-#: pcbnew/dialog_edit_module.cpp:289
-msgid "Virtual"
-msgstr "虚拟"
+#: pcbnew/dialog_edit_mod_text.cpp:230
+msgid "no show"
+msgstr "不显示"
 
-#: pcbnew/dialog_edit_module.cpp:290
-msgid "Attributes"
-msgstr "属性"
+#: pcbnew/dialog_edit_mod_text.cpp:313
+msgid "Value:"
+msgstr "值:"
 
-#: pcbnew/dialog_edit_module.cpp:293
-msgid "Use this attribute for most non smd components"
-msgstr "该属性适于大部分 非表面贴装 元件"
+#: pcbnew/modedit_onclick.cpp:225
+msgid "Mirror Block (alt + drag mouse)"
+msgstr "镜像 块 (alt + 鼠标拖拉)"
 
-#: pcbnew/dialog_edit_module.cpp:295
-msgid ""
-"Use this attribute for smd components.\n"
-"Only components with this option are put in the footprint position list file"
-msgstr ""
-"该属性适于 表面贴装 元件。\n"
-"只有该属性的元件才会被放入封装定位列表文件"
+#: pcbnew/modedit_onclick.cpp:255
+msgid "Scale"
+msgstr "比例"
 
-#: pcbnew/dialog_edit_module.cpp:297
-msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)"
-msgstr ""
-"该属性适于绘制于电路板上的 \"虚拟\" 元件\n"
-" (如老式的 ISA PC 总线连接器)"
+#: pcbnew/modedit_onclick.cpp:256
+msgid "Scale X"
+msgstr "比例 X"
 
-#: pcbnew/dialog_edit_module.cpp:321
-msgid "Free"
-msgstr "自由"
+#: pcbnew/modedit_onclick.cpp:257
+msgid "Scale Y"
+msgstr "比例 Y"
 
-#: pcbnew/dialog_edit_module.cpp:321
-msgid "Locked"
-msgstr "锁定"
+#: pcbnew/modedit_onclick.cpp:260
+#: pcbnew/dialog_edit_module.cpp:186
+msgid "Edit Module"
+msgstr "编辑模块"
 
-#: pcbnew/dialog_edit_module.cpp:323
-msgid "Move and Auto Place"
-msgstr "移动和自动放置"
+#: pcbnew/modedit_onclick.cpp:263
+msgid "Transform Module"
+msgstr "转换模块"
 
-#: pcbnew/dialog_edit_module.cpp:328
-msgid "Enable hotkey move commands and Auto Placement"
-msgstr "允许热键移动和自动放置"
+#: pcbnew/modedit_onclick.cpp:271
+msgid "Move Pad"
+msgstr "移动 焊盘"
 
-#: pcbnew/dialog_edit_module.cpp:329
-msgid "Disable hotkey move commands and Auto Placement"
-msgstr "不允许热键移动和自动放置"
+#: pcbnew/modedit_onclick.cpp:279
+msgid "delete Pad"
+msgstr "删除 焊盘"
 
-#: pcbnew/dialog_edit_module.cpp:333
-msgid "Rot 90"
-msgstr "旋转 90"
+#: pcbnew/modedit_onclick.cpp:292
+msgid "Move Text Mod."
+msgstr "移动 模块文本"
 
-#: pcbnew/dialog_edit_module.cpp:341
-msgid "Rot 180"
-msgstr "旋转 180"
+#: pcbnew/modedit_onclick.cpp:295
+msgid "Rotate Text Mod."
+msgstr "旋转 模块文本"
 
-#: pcbnew/dialog_edit_module.cpp:378
-msgid "3D Shape Name"
-msgstr "3D外形文件"
+#: pcbnew/modedit_onclick.cpp:297
+msgid "Edit Text Mod."
+msgstr "编辑 模块文本"
 
-#: pcbnew/dialog_edit_module.cpp:395
-#: pcbnew/dialog_drc.cpp:213
-#: eeschema/dialog_eeschema_config.cpp:231
-msgid "Browse"
-msgstr "浏览"
+#: pcbnew/modedit_onclick.cpp:300
+msgid "Delete Text Mod."
+msgstr "删除 模块文本"
 
-#: pcbnew/dialog_edit_module.cpp:399
-msgid "Add 3D Shape"
-msgstr "添加3D外形"
+#: pcbnew/modedit_onclick.cpp:307
+msgid "End edge"
+msgstr "结束 画边界"
 
-#: pcbnew/dialog_edit_module.cpp:405
-msgid "Remove 3D Shape"
-msgstr "移除3D外形"
+#: pcbnew/modedit_onclick.cpp:310
+msgid "Move edge"
+msgstr "移动 边界"
 
-#: pcbnew/dialog_edit_module.cpp:411
-msgid "Shape Scale:"
-msgstr "外形比例："
+#: pcbnew/modedit_onclick.cpp:313
+msgid "Place edge"
+msgstr "放置 边界"
 
-#: pcbnew/dialog_edit_module.cpp:418
-msgid "Shape Offset:"
-msgstr "位置偏移量："
+#: pcbnew/modedit_onclick.cpp:318
+msgid "Edit Width (Current)"
+msgstr "应用宽度设置(当前段)"
 
-#: pcbnew/dialog_edit_module.cpp:427
-msgid "Shape Rotation:"
-msgstr "旋转角度："
+#: pcbnew/modedit_onclick.cpp:320
+msgid "Edit Width (All)"
+msgstr "应用宽度设置(全部)"
 
-#: pcbnew/dialog_edit_module.cpp:467
-msgid "3D Shape:"
-msgstr "3D外形："
+#: pcbnew/modedit_onclick.cpp:322
+msgid "Edit Layer (Current)"
+msgstr "改变所在层(当前段)"
 
-#: pcbnew/dialog_edit_module.cpp:772
-msgid "Reference or Value cannot be deleted"
-msgstr "不能删除标签或值"
+#: pcbnew/modedit_onclick.cpp:324
+msgid "Edit Layer (All)"
+msgstr "改变所在层(全部)"
 
-#: pcbnew/dialog_edit_module.cpp:776
-#, c-format
-msgid "Delete [%s]"
-msgstr "删除 [%s]"
+#: pcbnew/modedit_onclick.cpp:326
+msgid "Delete edge"
+msgstr "删除 边界"
 
-#: pcbnew/edit.cpp:171
-#: pcbnew/editmod.cpp:45
-msgid "Module Editor"
-msgstr "模块 编辑器"
+#: pcbnew/modedit_onclick.cpp:367
+msgid "Set Width"
+msgstr "设置宽度"
 
-#: pcbnew/edit.cpp:251
-msgid "Add Tracks"
-msgstr "添加 导线"
+#: pcbnew/mirepcb.cpp:78
+msgid "Target Properties"
+msgstr "目标属性"
 
-#: pcbnew/edit.cpp:260
-msgid "Add Zones"
-msgstr "添加 覆铜"
+#: pcbnew/mirepcb.cpp:118
+msgid "shape +"
+msgstr "十字形"
 
-#: pcbnew/edit.cpp:262
-msgid "Warning: Display Zone is OFF!!!"
-msgstr "警告：覆铜显示关闭！"
+#: pcbnew/mirepcb.cpp:118
+msgid "shape X"
+msgstr "X 形"
 
-#: pcbnew/edit.cpp:269
-msgid "Add Layer Alignment Target"
-msgstr "添加层对齐目标"
+#: pcbnew/mirepcb.cpp:120
+msgid "Target Shape:"
+msgstr "目标形状:"
 
-#: pcbnew/edit.cpp:273
-msgid "Adjust Zero"
-msgstr "调整零"
+#: pcbnew/class_board_item.cpp:35
+#: pcbnew/class_pad.cpp:887
+msgid "Net"
+msgstr "网络"
 
-#: pcbnew/edit.cpp:279
-msgid "Add Graphic"
-msgstr "添加 图形"
+#: pcbnew/class_board_item.cpp:40
+#: eeschema/component_class.cpp:60
+#: eeschema/edit_component_in_schematic.cpp:833
+#: eeschema/dialog_build_BOM.cpp:284
+msgid "Footprint"
+msgstr "封装 "
 
-#: pcbnew/edit.cpp:283
-#: pcbnew/tool_modedit.cpp:180
-#: eeschema/schedit.cpp:314
-#: eeschema/libframe.cpp:503
-#: gerbview/tool_gerber.cpp:385
-msgid "Add Text"
-msgstr "添加 文字"
+#: pcbnew/class_board_item.cpp:46
+msgid "Pad"
+msgstr "焊盘 "
 
-#: pcbnew/edit.cpp:287
-msgid "Add Modules"
-msgstr "添加 模块"
+#: pcbnew/class_board_item.cpp:49
+msgid "all copper layers"
+msgstr "所有铜层"
 
-#: pcbnew/edit.cpp:291
-msgid "Add Dimension"
-msgstr "添加 尺寸标注"
+#: pcbnew/class_board_item.cpp:54
+#, fuzzy
+msgid "???"
+msgstr "???"
 
-#: pcbnew/edit.cpp:299
-msgid "Net Highlight"
-msgstr "网络 加亮显示"
+#: pcbnew/class_board_item.cpp:55
+#, fuzzy
+msgid ") of "
+msgstr ") of "
 
-#: pcbnew/edit.cpp:303
-msgid "Local Ratsnest"
-msgstr "局部牵拉线"
+#: pcbnew/class_board_item.cpp:59
+msgid "Pcb Graphic"
+msgstr "PCB 图形"
 
-#: pcbnew/cleaningoptions_dialog.cpp:146
-msgid "Static"
-msgstr "Static"
+#: pcbnew/class_board_item.cpp:59
+#: pcbnew/class_board_item.cpp:68
+#: pcbnew/class_board_item.cpp:148
+#: pcbnew/class_board_item.cpp:181
+#: pcbnew/class_board_item.cpp:197
+#: pcbnew/class_board_item.cpp:225
+#: pcbnew/class_board_item.cpp:242
+msgid " on "
+msgstr " 在 "
 
-#: pcbnew/cleaningoptions_dialog.cpp:150
-msgid "Delete redundant vias"
-msgstr "删除多余的过孔"
+#: pcbnew/class_board_item.cpp:63
+msgid "Pcb Text"
+msgstr "PCB文字"
 
-#: pcbnew/cleaningoptions_dialog.cpp:153
-msgid "remove vias on pads with a through hole"
-msgstr "移除落在有孔焊盘上面的过孔"
+#: pcbnew/class_board_item.cpp:75
+#: pcbnew/dialog_netlist.cpp:135
+#: eeschema/edit_component_in_schematic.cpp:751
+#: eeschema/onrightclick.cpp:327
+#: eeschema/dialog_create_component.cpp:164
+#: eeschema/eelayer.h:152
+msgid "Reference"
+msgstr "索引"
 
-#: pcbnew/cleaningoptions_dialog.cpp:156
-msgid "Merge segments"
-msgstr "线段合并"
+#: pcbnew/class_board_item.cpp:79
+#: pcbnew/class_board_item.cpp:85
+#: pcbnew/class_board_item.cpp:132
+#, fuzzy
+msgid " of "
+msgstr " of "
 
-#: pcbnew/cleaningoptions_dialog.cpp:159
-msgid "merge aligned track segments, and remove null segments"
-msgstr "合并连成直线导线段，移除空的线段"
+#: pcbnew/class_board_item.cpp:93
+msgid "Graphic"
+msgstr "图形"
 
-#: pcbnew/cleaningoptions_dialog.cpp:162
-msgid "Delete unconnected tracks"
-msgstr "删除未连接的导线"
+#: pcbnew/class_board_item.cpp:102
+#: pcbnew/dialog_pad_edit.cpp:198
+msgid "Rect"
+msgstr "矩形"
+
+#: pcbnew/class_board_item.cpp:105
+msgid "Arc"
+msgstr "弧"
 
-#: pcbnew/cleaningoptions_dialog.cpp:165
-msgid "delete track segment having a dangling end"
-msgstr "删除一头悬空的导线段"
+#: pcbnew/class_board_item.cpp:150
+msgid "Length:"
+msgstr "长度:"
 
-#: pcbnew/cleaningoptions_dialog.cpp:168
-msgid "Connect to Pads"
-msgstr "连接到焊盘"
+#: pcbnew/class_board_item.cpp:207
+msgid "Blind/Buried"
+msgstr "盲孔/埋孔"
 
-#: pcbnew/cleaningoptions_dialog.cpp:171
-msgid "Extend dangling tracks which partially cover a pad or via, all the way to pad or via center"
-msgstr "将未与焊盘或过孔连接到位的导线连接到位（连接到中心点）"
+#: pcbnew/class_board_item.cpp:209
+#: pcbnew/pcbnew.h:289
+msgid "Micro Via"
+msgstr "微导孔(Micro Via)"
 
-#: pcbnew/cleaningoptions_dialog.cpp:177
-msgid "Clean pcb"
-msgstr "清理 PCB"
+#: pcbnew/class_board_item.cpp:232
+#: pcbnew/class_marker.cpp:133
+msgid "Marker"
+msgstr "DRC标记"
 
-#: pcbnew/files.cpp:57
-msgid "Recovery file "
-msgstr "恢复文件"
+#: pcbnew/class_board_item.cpp:237
+msgid "Dimension"
+msgstr "尺寸标注"
 
-#: pcbnew/files.cpp:63
-msgid "Ok to load Recovery file "
-msgstr "是否确定加载恢复文件"
+#: pcbnew/class_board_item.cpp:242
+msgid "Target"
+msgstr "目标"
 
-#: pcbnew/files.cpp:142
-msgid "Board Modified: Continue ?"
-msgstr "电路板被更改：是否继续？"
+#: pcbnew/class_board_item.cpp:243
+msgid "size"
+msgstr "大小"
 
-#: pcbnew/files.cpp:160
-msgid "Load board files:"
-msgstr "加载电路板文件："
+#: pcbnew/cross-probing.cpp:54
+#, c-format
+msgid "%s found"
+msgstr "<%s> 找到"
 
-#: pcbnew/files.cpp:272
-msgid "Save board files:"
-msgstr "保存电路板文件："
+#: pcbnew/cross-probing.cpp:56
+#: pcbnew/cross-probing.cpp:110
+#, c-format
+msgid "%s not found"
+msgstr "<%s> 没有找到"
 
-#: pcbnew/files.cpp:311
-msgid "Warning: unable to create bakfile "
-msgstr "警告：无法建立备份文件"
+#: pcbnew/cross-probing.cpp:113
+#, c-format
+msgid "%s pin %s not found"
+msgstr "%s 引脚 %s 未找到"
 
-#: pcbnew/files.cpp:345
-msgid "Backup file: "
-msgstr "备份文件："
+#: pcbnew/cross-probing.cpp:118
+#, c-format
+msgid "%s pin %s found"
+msgstr "%s 引脚 %s 被找到"
 
-#: pcbnew/files.cpp:349
-msgid "Wrote board file: "
-msgstr "写入电路板文件："
+#: pcbnew/dialog_pad_edit.cpp:157
+msgid "Pad Num :"
+msgstr "焊盘编号:"
 
-#: pcbnew/files.cpp:351
-msgid "Failed to create "
-msgstr "生成文件失败： "
+#: pcbnew/dialog_pad_edit.cpp:163
+msgid "Pad Net Name :"
+msgstr "焊盘网络名称:"
 
-#: pcbnew/pcbplot.cpp:115
-#: pcbnew/pcbplot.cpp:205
-#: gerbview/tool_gerber.cpp:90
-msgid "Plot"
-msgstr "绘图输出（Plot）"
+#: pcbnew/dialog_pad_edit.cpp:177
+#: pcbnew/dialog_pad_edit.cpp:197
+msgid "Oval"
+msgstr "椭圆"
 
-#: pcbnew/pcbplot.cpp:145
-msgid "Plot Format"
-msgstr "绘图格式"
+#: pcbnew/dialog_pad_edit.cpp:178
+msgid "Drill Shape:"
+msgstr "钻孔形状:"
 
-#: pcbnew/pcbplot.cpp:171
-msgid "Spot min"
-msgstr "点最小值"
+#: pcbnew/dialog_pad_edit.cpp:187
+#, fuzzy
+msgid "90"
+msgstr "90"
 
-#: pcbnew/pcbplot.cpp:175
-msgid "Pen Size"
-msgstr "笔大小"
+#: pcbnew/dialog_pad_edit.cpp:188
+#: eeschema/dialog_edit_component_in_schematic.cpp:174
+#, fuzzy
+msgid "-90"
+msgstr "-90"
 
-#: pcbnew/pcbplot.cpp:179
-msgid "Pen Speed (cm/s)"
-msgstr "笔速度（cm/s）"
+#: pcbnew/dialog_pad_edit.cpp:189
+#: eeschema/dialog_edit_component_in_schematic.cpp:173
+#, fuzzy
+msgid "180"
+msgstr "180"
 
-#: pcbnew/pcbplot.cpp:181
-msgid "Set pen speed in cm/s"
-msgstr "设置笔速度，单位cm/s"
+#: pcbnew/dialog_pad_edit.cpp:190
+#: pcbnew/dialog_edit_module.cpp:243
+msgid "User"
+msgstr "自定义"
 
-#: pcbnew/pcbplot.cpp:183
-msgid "Pen Ovr"
-msgstr "笔覆盖"
+#: pcbnew/dialog_pad_edit.cpp:191
+msgid "Pad Orient:"
+msgstr "焊盘方向:"
 
-#: pcbnew/pcbplot.cpp:185
-msgid "Set plot overlay for filling"
-msgstr "设置填充时笔的覆盖"
+#: pcbnew/dialog_pad_edit.cpp:199
+msgid "Trapezoidal"
+msgstr "梯形"
 
-#: pcbnew/pcbplot.cpp:187
-msgid "Lines Width"
-msgstr "线宽"
+#: pcbnew/dialog_pad_edit.cpp:200
+msgid "Pad Shape:"
+msgstr "焊盘形状:"
 
-#: pcbnew/pcbplot.cpp:189
-msgid "Set width for lines in Line plot mode"
-msgstr "设置在线绘图模式下的线宽"
+#: pcbnew/dialog_pad_edit.cpp:206
+msgid "SMD"
+msgstr "表面贴装"
 
-#: pcbnew/pcbplot.cpp:193
-msgid "Absolute"
-msgstr "绝对"
+#: pcbnew/dialog_pad_edit.cpp:207
+#: eeschema/netlist.cpp:216
+msgid "Conn"
+msgstr "连接器"
 
-#: pcbnew/pcbplot.cpp:193
-msgid "Auxiliary axis"
-msgstr "辅助轴"
+#: pcbnew/dialog_pad_edit.cpp:208
+msgid "Hole"
+msgstr "孔"
 
-#: pcbnew/pcbplot.cpp:195
-msgid "Plot Origin"
-msgstr "绘图原点"
+#: pcbnew/dialog_pad_edit.cpp:209
+msgid "Mechanical"
+msgstr "机械"
 
-#: pcbnew/pcbplot.cpp:213
-msgid "Save options"
-msgstr "保存选项设置"
+#: pcbnew/dialog_pad_edit.cpp:210
+msgid "Pad Type:"
+msgstr "焊盘类型:"
 
-#: pcbnew/pcbplot.cpp:217
-msgid "Create Drill File"
-msgstr "生成钻孔文件"
+#: pcbnew/dialog_pad_edit.cpp:225
+msgid "Layers:"
+msgstr "层:"
 
-#: pcbnew/pcbplot.cpp:228
-#: share/dialog_print.cpp:150
-msgid "X Scale Adjust"
-msgstr "X 比例调整"
+#: pcbnew/dialog_pad_edit.cpp:229
+msgid "Copper layer"
+msgstr "铜层"
 
-#: pcbnew/pcbplot.cpp:229
-#: share/wxprint.cpp:170
-msgid "Set X scale adjust for exact scale plotting"
-msgstr "设置 X 方向调整比例使输出更精确"
+#: pcbnew/dialog_pad_edit.cpp:233
+msgid "Comp layer"
+msgstr "元件层"
 
-#: pcbnew/pcbplot.cpp:230
-#: share/dialog_print.cpp:156
-msgid "Y Scale Adjust"
-msgstr "Y 比例调整"
+#: pcbnew/dialog_pad_edit.cpp:239
+msgid "Adhesive Cmp"
+msgstr "粘胶层(元件面)"
 
-#: pcbnew/pcbplot.cpp:231
-#: share/wxprint.cpp:171
-msgid "Set Y scale adjust for exact scale plotting"
-msgstr "设置 Y 方向调整比例使输出更精确"
+#: pcbnew/dialog_pad_edit.cpp:243
+msgid "Adhesive Copper"
+msgstr "粘胶层(铜箔面)"
 
-#: pcbnew/pcbplot.cpp:233
-msgid "Plot Negative"
-msgstr "负片输出"
+#: pcbnew/dialog_pad_edit.cpp:247
+msgid "Solder paste Cmp"
+msgstr "贴焊层(元件面)"
 
-#: pcbnew/pcbplot.cpp:257
-msgid "Exclude Edges Pcb layer"
-msgstr "排除PCB边界层"
+#: pcbnew/dialog_pad_edit.cpp:251
+msgid "Solder paste Copper"
+msgstr "贴焊层(铜箔面)"
 
-#: pcbnew/pcbplot.cpp:260
-msgid "Exclude contents of Edges Pcb layer from all other layers"
-msgstr "排除PCB边界层上面的内容"
+#: pcbnew/dialog_pad_edit.cpp:255
+msgid "Silkscreen Cmp"
+msgstr "丝印层(元件面)"
 
-#: pcbnew/pcbplot.cpp:266
-#: eeschema/plotps.cpp:191
-#: share/dialog_print.cpp:174
-#: share/svg_print.cpp:200
-msgid "Print Sheet Ref"
-msgstr "打印图标签"
+#: pcbnew/dialog_pad_edit.cpp:259
+msgid "Silkscreen Copper"
+msgstr "丝印层(铜箔面)"
 
-#: pcbnew/pcbplot.cpp:275
-msgid "Print Pads on Silkscreen"
-msgstr "打印丝印层的焊盘"
+#: pcbnew/dialog_pad_edit.cpp:263
+msgid "Solder mask Cmp"
+msgstr "阻焊层(元件面)"
 
-#: pcbnew/pcbplot.cpp:278
-msgid "Enable/disable print/plot pads on Silkscreen layers"
-msgstr "允许/禁止打印（绘图输出）丝印层的焊盘"
+#: pcbnew/dialog_pad_edit.cpp:267
+msgid "Solder mask Copper"
+msgstr "阻焊层(铜箔面)"
 
-#: pcbnew/pcbplot.cpp:282
-msgid "Always Print Pads"
-msgstr "打印所有焊盘"
+#: pcbnew/dialog_pad_edit.cpp:271
+#, fuzzy
+msgid "E.C.O.1 layer"
+msgstr "E.C.O.1 layer"
 
-#: pcbnew/pcbplot.cpp:284
-msgid "Force print/plot pads on ALL layers"
-msgstr "强制打印（绘图输出）所有层的焊盘"
+#: pcbnew/dialog_pad_edit.cpp:275
+#, fuzzy
+msgid "E.C.O.2 layer"
+msgstr "E.C.O.2 layer"
 
-#: pcbnew/pcbplot.cpp:288
-msgid "Print Module Value"
-msgstr "打印模块的数值"
+#: pcbnew/dialog_pad_edit.cpp:279
+#, fuzzy
+msgid "Draft layer"
+msgstr "Draft layer"
 
-#: pcbnew/pcbplot.cpp:291
-msgid "Enable/disable print/plot module value on Silkscreen layers"
-msgstr "允许/禁止打印（绘图输出）丝印层上的模块数值"
+#: pcbnew/loadcmp.cpp:103
+msgid "Module name:"
+msgstr "模块名称:"
 
-#: pcbnew/pcbplot.cpp:294
-msgid "Print Module Reference"
-msgstr "打印模块标签"
+#: pcbnew/loadcmp.cpp:215
+#: eeschema/eelibs_read_libraryfiles.cpp:64
+#, c-format
+msgid "Library <%s> not found"
+msgstr "库 < %s > 没有找到"
 
-#: pcbnew/pcbplot.cpp:297
-msgid "Enable/disable print/plot module reference on Silkscreen layers"
-msgstr "允许/禁止打印（绘图输出）丝印层上的模块标签"
+#: pcbnew/loadcmp.cpp:220
+#, c-format
+msgid "Scan Lib: %s"
+msgstr "扫描库: %s"
 
-#: pcbnew/pcbplot.cpp:301
-msgid "Print other Module texts"
-msgstr "打印其他模块文本"
+#: pcbnew/loadcmp.cpp:229
+msgid "File is Not a library"
+msgstr "文件不是一个库文件"
 
-#: pcbnew/pcbplot.cpp:304
-msgid "Enable/disable print/plot module field texts on Silkscreen layers"
-msgstr "允许/禁止打印（绘图输出）在丝印层上的模块其他文本域文字"
+#: pcbnew/loadcmp.cpp:298
+#, c-format
+msgid "Module <%s> not found"
+msgstr "模块 < %s > 没有找到"
 
-#: pcbnew/pcbplot.cpp:308
-msgid "Force Print Invisible Texts"
-msgstr "强制打印不可见文本"
+#: pcbnew/loadcmp.cpp:368
+msgid "Library: "
+msgstr "库: "
 
-#: pcbnew/pcbplot.cpp:311
-msgid "Force print/plot module invisible texts on Silkscreen layers"
-msgstr "强制打印（绘图输出）丝印层上的模块不可见文本"
+#: pcbnew/loadcmp.cpp:433
+#: pcbnew/loadcmp.cpp:584
+#, c-format
+msgid "Modules (%d items)"
+msgstr "模块(%d 项)"
 
-#: pcbnew/pcbplot.cpp:315
-msgid "No Drill mark"
-msgstr "无钻孔标记"
+#: pcbnew/tool_pcb.cpp:49
+msgid ""
+"Show active layer selections\n"
+"and select layer pair for route and place via"
+msgstr ""
+"显示工作中的层\n"
+"选择布线和导孔的连接层"
 
-#: pcbnew/pcbplot.cpp:315
-msgid "Small mark"
-msgstr "小标记"
+#: pcbnew/tool_pcb.cpp:237
+msgid "New Board"
+msgstr "新建电路板"
 
-#: pcbnew/pcbplot.cpp:315
-msgid "Real Drill"
-msgstr "实际钻孔"
+#: pcbnew/tool_pcb.cpp:239
+msgid "Open existing Board"
+msgstr "打开已有的电路板"
 
-#: pcbnew/pcbplot.cpp:317
-msgid "Pads Drill Opt"
-msgstr "焊盘钻孔选项"
+#: pcbnew/tool_pcb.cpp:240
+msgid "Save Board"
+msgstr "保存电路板"
 
-#: pcbnew/pcbplot.cpp:323
-msgid "Auto scale"
-msgstr "自动缩放"
+#: pcbnew/tool_pcb.cpp:244
+#: eeschema/tool_sch.cpp:60
+#: gerbview/tool_gerber.cpp:232
+msgid "page settings (size, texts)"
+msgstr "页面设置(大小, 文字)"
 
-#: pcbnew/pcbplot.cpp:323
-msgid "Scale 1"
-msgstr "比例 1"
+#: pcbnew/tool_pcb.cpp:248
+msgid "Open Module Editor"
+msgstr "打开 模块编辑器"
 
-#: pcbnew/pcbplot.cpp:323
-msgid "Scale 1.5"
-msgstr "比例 1.5"
+#: pcbnew/tool_pcb.cpp:251
+#: eeschema/tool_sch.cpp:76
+#: gerbview/tool_gerber.cpp:243
+msgid "Cut selected item"
+msgstr "剪切选中的内容"
 
-#: pcbnew/pcbplot.cpp:323
-#: share/dialog_print.cpp:142
-msgid "Scale 2"
-msgstr "比例 2"
+#: pcbnew/tool_pcb.cpp:255
+#: eeschema/tool_sch.cpp:79
+#: gerbview/tool_gerber.cpp:248
+msgid "Copy selected item"
+msgstr "复制选中的内容"
 
-#: pcbnew/pcbplot.cpp:323
-#: share/dialog_print.cpp:143
-msgid "Scale 3"
-msgstr "比例 3"
+#: pcbnew/tool_pcb.cpp:257
+#: eeschema/tool_sch.cpp:82
+#: gerbview/tool_gerber.cpp:254
+msgid "Paste"
+msgstr "粘贴"
 
-#: pcbnew/pcbplot.cpp:325
-msgid "Scale Opt"
-msgstr "缩放选项"
+#: pcbnew/tool_pcb.cpp:260
+#: gerbview/tool_gerber.cpp:261
+msgid "Undelete"
+msgstr "恢复被删除的"
 
-#: pcbnew/pcbplot.cpp:331
-msgid "Plot Mode"
-msgstr "绘图模式"
+#: pcbnew/tool_pcb.cpp:263
+msgid "Print Board"
+msgstr "打印电路板"
 
-#: pcbnew/pcbplot.cpp:338
-msgid "Plot Mirror"
-msgstr "镜像绘图"
+#: pcbnew/tool_pcb.cpp:265
+msgid "Plot (HPGL, PostScript, or GERBER format)"
+msgstr "Plot绘图输出(HPGL, PostScript, 或 GERBER 格式)"
 
-#: pcbnew/pcbplot.cpp:343
-msgid "Vias on Mask"
-msgstr "阻焊层过孔"
+#: pcbnew/tool_pcb.cpp:285
+#: eeschema/menubar.cpp:162
+#: eeschema/tool_sch.cpp:120
+msgid "Find components and texts"
+msgstr "搜索元件和文字"
 
-#: pcbnew/pcbplot.cpp:346
-msgid "Print/plot vias on mask layers. They are in this case not protected"
-msgstr "打印（绘图输出）阻焊层过孔。这样的过孔不受阻焊层保护"
+#: pcbnew/tool_pcb.cpp:292
+msgid "Read Netlist"
+msgstr "读取网络表"
 
-#: pcbnew/pcbplot.cpp:350
-msgid "Org = Centre"
-msgstr "原点 = 中心"
+#: pcbnew/tool_pcb.cpp:294
+msgid "Pcb Design Rules Check"
+msgstr "PCB设计规则检查(DRC)"
 
-#: pcbnew/pcbplot.cpp:352
-msgid "Draw origin ( 0,0 ) in sheet center"
-msgstr "将原点 ( 0,0 ) 绘制在图中心位置"
+#: pcbnew/tool_pcb.cpp:305
+msgid "Mode Module: Manual and Automatic Move or Place for modules"
+msgstr "模块模式: 手动和自动移动、放置模块"
 
-#: pcbnew/class_track.cpp:785
-msgid "NetCode"
-msgstr "网络号"
+#: pcbnew/tool_pcb.cpp:308
+msgid "Mode Track and Autorouting"
+msgstr "布线模式: 手动或自动布线"
 
-#: pcbnew/class_track.cpp:805
-#: pcbnew/class_module.cpp:1236
-msgid "Stat"
-msgstr "状态"
+#: pcbnew/tool_pcb.cpp:332
+msgid "Drc OFF"
+msgstr "关闭 DRC"
 
-#: pcbnew/class_track.cpp:829
-msgid "Diam"
-msgstr "直径"
+#: pcbnew/tool_pcb.cpp:349
+msgid "Show General Ratsnest"
+msgstr "显示所有牵拉线"
 
-#: pcbnew/clean.cpp:177
-msgid "Delete unconnected tracks:"
-msgstr "删除未连接的导线："
+#: pcbnew/tool_pcb.cpp:352
+msgid "Show Module Ratsnest when moving"
+msgstr "移动模块时显示牵拉线"
 
-#: pcbnew/clean.cpp:196
-msgid "ViaDef"
-msgstr "过孔编号"
+#: pcbnew/tool_pcb.cpp:357
+msgid "Enable Auto Del Track"
+msgstr "允许自动删除旧导线"
 
-#: pcbnew/clean.cpp:368
-msgid "Clean Null Segments"
-msgstr "清除空线段"
+#: pcbnew/tool_pcb.cpp:370
+msgid "Show Tracks Sketch"
+msgstr "导线 以轮廓方式显示"
 
-#: pcbnew/clean.cpp:460
-msgid "Merging Segments:"
-msgstr "合并线段："
+#: pcbnew/tool_pcb.cpp:383
+msgid ""
+"Display auxiliary vertical toolbar (tools for micro wave applications)\n"
+" This is a very experimental feature (under development)"
+msgstr ""
+"显示辅助垂直工具条(微波电路工具)\n"
+" 此为试验特性(开发中)"
 
-#: pcbnew/clean.cpp:462
-msgid "Merge"
-msgstr "合并"
+#: pcbnew/tool_pcb.cpp:412
+msgid "Net highlight"
+msgstr "网络加亮显示"
 
-#: pcbnew/clean.cpp:478
-msgid "Merge: "
-msgstr "合并："
+#: pcbnew/tool_pcb.cpp:416
+msgid "Display local ratsnest (pad or module)"
+msgstr "显示局部牵拉线(焊盘或模块的)"
 
-#: pcbnew/clean.cpp:708
-msgid "DRC Control:"
-msgstr "DRC 控制："
+#: pcbnew/tool_pcb.cpp:421
+msgid "Add modules"
+msgstr "添加 模块"
 
-#: pcbnew/clean.cpp:713
-msgid "NetCtr"
-msgstr "NetCtr"
+#: pcbnew/tool_pcb.cpp:425
+msgid "Add tracks and vias"
+msgstr "添加 导线/导孔"
 
-#: pcbnew/clean.cpp:1055
-msgid "Centre"
-msgstr "中心"
+#: pcbnew/tool_pcb.cpp:429
+msgid "Add zones"
+msgstr "添加 覆铜"
 
-#: pcbnew/clean.cpp:1055
-msgid "0 "
-msgstr "0 "
+#: pcbnew/tool_pcb.cpp:446
+msgid "Add text"
+msgstr "添加 文字"
 
-#: pcbnew/clean.cpp:1066
-msgid "Pads: "
-msgstr "焊盘："
+#: pcbnew/tool_pcb.cpp:451
+msgid "Add dimension"
+msgstr "添加 尺寸标注"
 
-#: pcbnew/clean.cpp:1070
-msgid "Max"
-msgstr "Max"
+#: pcbnew/tool_pcb.cpp:455
+#: gerbview/tool_gerber.cpp:378
+msgid "Add layer alignment target"
+msgstr "添加 层对齐目标"
 
-#: pcbnew/clean.cpp:1073
-msgid "Segm"
-msgstr "线段"
+#: pcbnew/tool_pcb.cpp:465
+msgid "Offset adjust for drill and place files"
+msgstr "钻孔和放置文件的偏移量调整"
 
-#: pcbnew/pcbtexte.cpp:88
-msgid "TextPCB properties"
-msgstr "PCB文本属性"
+#: pcbnew/tool_pcb.cpp:490
+#, fuzzy
+msgid "Create line of specified length for microwave applications"
+msgstr "Create line of specified length for microwave applications"
 
-#: pcbnew/pcbtexte.cpp:134
-msgid "Position"
-msgstr "位置"
+#: pcbnew/tool_pcb.cpp:496
+#, fuzzy
+msgid "Create gap of specified length for microwave applications"
+msgstr "Create gap of specified length for microwave applications"
 
-#: pcbnew/dialog_general_options.cpp:263
-#: gerbview/options.cpp:175
-msgid "No Display"
-msgstr "不显示"
+#: pcbnew/tool_pcb.cpp:504
+#, fuzzy
+msgid "Create stub of specified length for microwave applications"
+msgstr "Create stub of specified length for microwave applications"
 
-#: pcbnew/dialog_general_options.cpp:267
-#: gerbview/options.cpp:177
-msgid "Display Polar Coord"
-msgstr "显示极坐标"
+#: pcbnew/tool_pcb.cpp:510
+#, fuzzy
+msgid "Create stub (arc) of specified length for microwave applications"
+msgstr "Create stub (arc) of specified length for microwave applications"
 
-#: pcbnew/dialog_general_options.cpp:275
-#: eeschema/dialog_options.cpp:248
-#: gerbview/options.cpp:187
-msgid "Units"
-msgstr "单位"
+#: pcbnew/tool_pcb.cpp:517
+#, fuzzy
+msgid "Create a polynomial shape for microwave applications"
+msgstr "Create a polynomial shape for microwave applications"
 
-#: pcbnew/dialog_general_options.cpp:280
-#: gerbview/options.cpp:193
-msgid "Small"
-msgstr "小"
+#: pcbnew/tool_pcb.cpp:558
+msgid ""
+"Auto track width: when starting on an existing track use its width\n"
+"otherwise, use current width setting"
+msgstr ""
+"自动布线线宽: 当开始于已有的导线时使用原有线宽\n"
+"否则使用当前的线宽设置"
 
-#: pcbnew/dialog_general_options.cpp:281
-#: gerbview/options.cpp:193
-msgid "Big"
-msgstr "大"
+#: pcbnew/tool_pcb.cpp:584
+msgid "Zoom "
+msgstr "缩放"
 
-#: pcbnew/dialog_general_options.cpp:284
-#: gerbview/options.cpp:194
-msgid "Cursor"
-msgstr "光标"
+#: pcbnew/tool_pcb.cpp:598
+#: eeschema/eelayer.cpp:223
+#: pcbnew/set_color.h:414
+#: eeschema/eelayer.h:214
+#: gerbview/set_color.h:324
+msgid "Grid"
+msgstr "网格"
 
-#: pcbnew/dialog_general_options.cpp:291
-msgid "Number of Layers:"
-msgstr "层数："
+#: pcbnew/tool_pcb.cpp:707
+msgid "+/- to switch"
+msgstr "用 +/- 切换"
 
-#: pcbnew/dialog_general_options.cpp:298
-msgid "Max Links:"
-msgstr "Max Links:"
+#: pcbnew/dialog_edit_module.cpp:40
+msgid "Module properties"
+msgstr "模块属性"
 
-#: pcbnew/dialog_general_options.cpp:305
-msgid "Auto Save (minuts):"
-msgstr "自动保存（分钟）："
+#: pcbnew/dialog_edit_module.cpp:95
+msgid "Properties"
+msgstr "属性"
 
-#: pcbnew/dialog_general_options.cpp:315
-#: eeschema/netlist_control.cpp:228
-#: eeschema/dialog_cmp_graphic_properties.cpp:151
-#: eeschema/dialog_build_BOM.cpp:285
-#: share/dialog_print.cpp:167
-msgid "Options:"
-msgstr "选项："
+#: pcbnew/dialog_edit_module.cpp:99
+#: pcbnew/dialog_edit_module.cpp:108
+#: pcbnew/dialog_edit_module.cpp:137
+msgid "3D settings"
+msgstr "3D设置"
 
-#: pcbnew/dialog_general_options.cpp:319
-msgid "Drc ON"
-msgstr "DRC 开启"
+#: pcbnew/dialog_edit_module.cpp:182
+msgid "Change module(s)"
+msgstr "更换模块"
 
-#: pcbnew/dialog_general_options.cpp:324
-msgid "Show Ratsnest"
-msgstr "显示牵拉线"
+#: pcbnew/dialog_edit_module.cpp:193
+#: eeschema/onrightclick.cpp:361
+#: eeschema/dialog_edit_component_in_lib.cpp:203
+msgid "Doc"
+msgstr "说明"
 
-#: pcbnew/dialog_general_options.cpp:328
-msgid "Show Mod Ratsnest"
-msgstr "显示模块牵拉线"
+#: pcbnew/dialog_edit_module.cpp:200
+msgid "Keywords"
+msgstr "关键词"
 
-#: pcbnew/dialog_general_options.cpp:332
-msgid "Tracks Auto Del"
-msgstr "自动删除旧导线"
+#: pcbnew/dialog_edit_module.cpp:207
+msgid "Fields:"
+msgstr "域: "
 
-#: pcbnew/dialog_general_options.cpp:336
-msgid "Track 45 Only"
-msgstr "导线仅允许45度倾斜"
+#: pcbnew/dialog_edit_module.cpp:217
+msgid "Add Field"
+msgstr "添加 域"
 
-#: pcbnew/dialog_general_options.cpp:340
-msgid "Segments 45 Only"
-msgstr "线段仅允许45度倾斜"
+#: pcbnew/dialog_edit_module.cpp:222
+#: eeschema/onrightclick.cpp:276
+msgid "Edit Field"
+msgstr "编辑 域"
 
-#: pcbnew/dialog_general_options.cpp:344
-#: eeschema/dialog_options.cpp:239
-msgid "Auto PAN"
-msgstr "自动摇景"
+#: pcbnew/dialog_edit_module.cpp:227
+msgid "Delete Field"
+msgstr "删除 域"
 
-#: pcbnew/dialog_general_options.cpp:349
-msgid "Double Segm Track"
-msgstr "Double Segm Track"
+#: pcbnew/dialog_edit_module.cpp:234
+#: common/common.cpp:298
+#: common/common.cpp:309
+#: common/common.cpp:342
+msgid "Component"
+msgstr "元件层"
 
-#: pcbnew/dialog_general_options.cpp:356
-msgid "When creating tracks"
-msgstr "当创建新导线时"
+#: pcbnew/dialog_edit_module.cpp:234
+msgid "Copper"
+msgstr "铜层"
 
-#: pcbnew/dialog_general_options.cpp:360
-msgid "Magnetic Pads"
-msgstr "磁性焊盘"
+#: pcbnew/dialog_edit_module.cpp:279
+msgid "Orient (0.1 deg)"
+msgstr "方向(0.1度)"
 
-#: pcbnew/dialog_general_options.cpp:362
-msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area"
-msgstr "鼠标光标移动到焊盘区域时，对光标的捕捉特性"
+#: pcbnew/dialog_edit_module.cpp:289
+msgid "Normal+Insert"
+msgstr "普通 + Insert"
 
-#: pcbnew/editmod.cpp:144
-msgid "Text is REFERENCE!"
-msgstr "文本为元件编号！"
+#: pcbnew/dialog_edit_module.cpp:289
+msgid "Virtual"
+msgstr "虚拟"
 
-#: pcbnew/editmod.cpp:149
-msgid "Text is VALUE!"
-msgstr "文本为元件数值！"
+#: pcbnew/dialog_edit_module.cpp:290
+msgid "Attributes"
+msgstr "属性"
 
-#: pcbnew/editrack-part2.cpp:32
-#, c-format
-msgid "Track Width: %s   Vias Size : %s"
-msgstr "导线宽度：%s   过孔大小：%s"
+#: pcbnew/dialog_edit_module.cpp:293
+msgid "Use this attribute for most non smd components"
+msgstr "该属性适于大部分 非表面贴装 元件"
 
-#: pcbnew/editrack-part2.cpp:135
-msgid "Drc error, cancelled"
-msgstr "DRC错误，取消"
+#: pcbnew/dialog_edit_module.cpp:295
+msgid ""
+"Use this attribute for smd components.\n"
+"Only components with this option are put in the footprint position list file"
+msgstr ""
+"该属性适于 表面贴装 元件。\n"
+"Only components with this option are put in the footprint position list file"
 
-#: pcbnew/automove.cpp:212
-msgid "Move Modules ?"
-msgstr "移动模块？"
+#: pcbnew/dialog_edit_module.cpp:297
+msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)"
+msgstr ""
+"该属性适于绘制于电路板上的 \"虚拟\" 元件\n"
+" (如老式的 ISA PC 总线连接器)"
 
-#: pcbnew/automove.cpp:221
-msgid "Autoplace modules: No boad edges detected, unable to place modules"
-msgstr "自动放置模块：没有检测到电路板边界，无法放置模块"
+#: pcbnew/dialog_edit_module.cpp:321
+msgid "Free"
+msgstr "自由"
 
-#: pcbnew/automove.cpp:344
-#, c-format
-msgid "Ok to set module orientation to %d degrees ?"
-msgstr "是否将所有模块的方向设置为 %d 度？"
+#: pcbnew/dialog_edit_module.cpp:321
+msgid "Locked"
+msgstr "锁定"
 
-#: pcbnew/class_pcb_text.cpp:194
-#: gerbview/affiche.cpp:29
-msgid "COTATION"
-msgstr "警告"
+#: pcbnew/dialog_edit_module.cpp:323
+msgid "Move and Auto Place"
+msgstr "移动和自动放置"
 
-#: pcbnew/class_pcb_text.cpp:196
-#: gerbview/affiche.cpp:32
-msgid "PCB Text"
-msgstr "PCB文本"
+#: pcbnew/dialog_edit_module.cpp:328
+msgid "Enable hotkey move commands and Auto Placement"
+msgstr "允许热键移动和自动放置"
 
-#: pcbnew/class_pcb_text.cpp:215
-#: pcbnew/class_text_mod.cpp:389
-#: pcbnew/class_pad.cpp:1075
-#: gerbview/affiche.cpp:55
-msgid "H Size"
-msgstr "H大小"
+#: pcbnew/dialog_edit_module.cpp:329
+msgid "Disable hotkey move commands and Auto Placement"
+msgstr "不允许热键移动和自动放置"
 
-#: pcbnew/class_pcb_text.cpp:218
-#: pcbnew/class_text_mod.cpp:392
-#: pcbnew/class_pad.cpp:1079
-#: gerbview/affiche.cpp:58
-msgid "V Size"
-msgstr "V大小"
+#: pcbnew/dialog_edit_module.cpp:333
+msgid "Rot 90"
+msgstr "旋转 90"
 
-#: pcbnew/basepcbframe.cpp:131
-msgid "3D Frame already opened"
-msgstr "3D查看器已经打开"
+#: pcbnew/dialog_edit_module.cpp:341
+msgid "Rot 180"
+msgstr "旋转 180"
 
-#: pcbnew/basepcbframe.cpp:136
-#: pcbnew/basepcbframe.cpp:139
-msgid "3D Viewer"
-msgstr "3D查看器"
+#: pcbnew/dialog_edit_module.cpp:378
+msgid "3D Shape Name"
+msgstr "3D外形文件"
 
-#: pcbnew/modedit_onclick.cpp:207
-#: pcbnew/onrightclick.cpp:151
-#: eeschema/libedit_onrightclick.cpp:73
-#: eeschema/onrightclick.cpp:125
-#: gerbview/onrightclick.cpp:42
-msgid "End Tool"
-msgstr "结束工具操作"
+#: pcbnew/dialog_edit_module.cpp:395
+#: eeschema/dialog_eeschema_config.cpp:233
+msgid "Browse"
+msgstr "浏览"
 
-#: pcbnew/modedit_onclick.cpp:217
-#: pcbnew/onrightclick.cpp:479
-#: eeschema/libedit_onrightclick.cpp:252
-#: eeschema/onrightclick.cpp:581
-#: gerbview/onrightclick.cpp:51
-msgid "Cancel Block"
-msgstr "取消块定义"
+#: pcbnew/dialog_edit_module.cpp:399
+msgid "Add 3D Shape"
+msgstr "添加3D外形"
 
-#: pcbnew/modedit_onclick.cpp:219
-#: pcbnew/onrightclick.cpp:481
-#: gerbview/onrightclick.cpp:52
-msgid "Zoom Block (Midd butt drag)"
-msgstr "块区域放大显示 （鼠标中键拖拉）"
+#: pcbnew/dialog_edit_module.cpp:405
+msgid "Remove 3D Shape"
+msgstr "移除3D外形"
 
-#: pcbnew/modedit_onclick.cpp:222
-#: pcbnew/onrightclick.cpp:484
-#: eeschema/libedit_onrightclick.cpp:260
-#: eeschema/onrightclick.cpp:589
-#: gerbview/onrightclick.cpp:54
-msgid "Place Block"
-msgstr "放置 块"
+#: pcbnew/dialog_edit_module.cpp:411
+msgid "Shape Scale:"
+msgstr "外形比例:"
 
-#: pcbnew/modedit_onclick.cpp:224
-#: pcbnew/onrightclick.cpp:486
-#: eeschema/libedit_onrightclick.cpp:266
-#: eeschema/onrightclick.cpp:598
-msgid "Copy Block (shift + drag mouse)"
-msgstr "复制 块 （shift + 鼠标拖拉）"
+#: pcbnew/dialog_edit_module.cpp:418
+msgid "Shape Offset:"
+msgstr "位置偏移量:"
 
-#: pcbnew/modedit_onclick.cpp:226
-msgid "Mirror Block (alt + drag mouse)"
-msgstr "镜像 块 （alt + 鼠标拖拉）"
+#: pcbnew/dialog_edit_module.cpp:427
+msgid "Shape Rotation:"
+msgstr "旋转角度:"
 
-#: pcbnew/modedit_onclick.cpp:228
-#: pcbnew/onrightclick.cpp:490
-msgid "Rotate Block (ctrl + drag mouse)"
-msgstr "旋转 块 （ctrl + 鼠标拖拉）"
+#: pcbnew/dialog_edit_module.cpp:467
+msgid "3D Shape:"
+msgstr "3D外形:"
 
-#: pcbnew/modedit_onclick.cpp:230
-#: pcbnew/onrightclick.cpp:492
-msgid "Delete Block (shift+ctrl + drag mouse)"
-msgstr "删除 块 （shift + ctrl + 鼠标拖拉）"
+#: pcbnew/dialog_edit_module.cpp:772
+msgid "Reference or Value cannot be deleted"
+msgstr "不能删除 索引 或 数值"
 
-#: pcbnew/modedit_onclick.cpp:252
-#: pcbnew/onrightclick.cpp:702
-#: pcbnew/onrightclick.cpp:799
-msgid "Rotate"
-msgstr "旋转"
+#: pcbnew/dialog_edit_module.cpp:776
+#, c-format
+msgid "Delete [%s]"
+msgstr "删除 [%s]"
 
-#: pcbnew/modedit_onclick.cpp:256
-msgid "Scale"
-msgstr "比例"
+#: pcbnew/gendrill.cpp:308
+msgid "Drill file"
+msgstr "钻孔文件"
 
-#: pcbnew/modedit_onclick.cpp:257
-msgid "Scale X"
-msgstr "比例 X"
+#: pcbnew/gendrill.cpp:384
+msgid "3:2"
+msgstr "3:2"
 
-#: pcbnew/modedit_onclick.cpp:258
-msgid "Scale Y"
-msgstr "比例 Y"
+#: pcbnew/gendrill.cpp:385
+msgid "3:3"
+msgstr "3:3"
 
-#: pcbnew/modedit_onclick.cpp:264
-msgid "Transform Module"
-msgstr "转换模块"
+#: pcbnew/gendrill.cpp:728
+msgid "Drill Map file"
+msgstr "钻孔图文件"
 
-#: pcbnew/modedit_onclick.cpp:272
-msgid "Move Pad"
-msgstr "移动 焊盘"
+#: pcbnew/gendrill.cpp:743
+msgid "Unable to create file"
+msgstr "无法建立文件"
 
-#: pcbnew/modedit_onclick.cpp:274
-#: pcbnew/onrightclick.cpp:741
-msgid "Edit Pad"
-msgstr "编辑 焊盘"
+#: pcbnew/gendrill.cpp:774
+msgid "Drill Report file"
+msgstr "钻孔报告文件"
 
-#: pcbnew/modedit_onclick.cpp:276
-#: pcbnew/onrightclick.cpp:745
-msgid "New Pad Settings"
-msgstr "应用新焊盘参数设置"
+#: pcbnew/swap_layers.cpp:70
+msgid "Swap Layers:"
+msgstr "层交换:"
 
-#: pcbnew/modedit_onclick.cpp:278
-#: pcbnew/onrightclick.cpp:747
-msgid "Export Pad Settings"
-msgstr "导出新焊盘参数设置"
+#: pcbnew/swap_layers.cpp:188
+#: pcbnew/swap_layers.cpp:193
+#: pcbnew/swap_layers.cpp:276
+msgid "No Change"
+msgstr "无变化"
 
-#: pcbnew/modedit_onclick.cpp:280
-msgid "delete Pad"
-msgstr "删除 焊盘"
+#: pcbnew/swap_layers.cpp:266
+msgid "Deselect this layer to select the No Change state"
+msgstr "将该层恢复为未更改状态"
 
-#: pcbnew/modedit_onclick.cpp:285
-#: pcbnew/onrightclick.cpp:752
-msgid "Global Pad Settings"
-msgstr "全局应用新焊盘参数设置"
+#: pcbnew/autorout.cpp:59
+msgid "Net not selected"
+msgstr "没有选择网络"
 
-#: pcbnew/modedit_onclick.cpp:293
-msgid "Move Text Mod."
-msgstr "移动 模块文本"
+#: pcbnew/autorout.cpp:67
+msgid "Module not selected"
+msgstr "没有选择模块"
 
-#: pcbnew/modedit_onclick.cpp:296
-msgid "Rotate Text Mod."
-msgstr "旋转 模块文本"
+#: pcbnew/autorout.cpp:75
+msgid "Pad not selected"
+msgstr "没有选择焊盘"
 
-#: pcbnew/modedit_onclick.cpp:298
-msgid "Edit Text Mod."
-msgstr "编辑 模块文本"
+#: pcbnew/autorout.cpp:143
+msgid "No memory for autorouting"
+msgstr "没有足够的内存进行自动布线"
 
-#: pcbnew/modedit_onclick.cpp:301
-msgid "Delete Text Mod."
-msgstr "删除 模块文本"
+#: pcbnew/autorout.cpp:148
+#, fuzzy
+msgid "Place Cells"
+msgstr "放置 Cells"
 
-#: pcbnew/modedit_onclick.cpp:308
-msgid "End edge"
-msgstr "结束 画边界"
+#: pcbnew/dialog_graphic_items_options.cpp:194
+msgid "Graphics:"
+msgstr "图形:"
 
-#: pcbnew/modedit_onclick.cpp:311
-msgid "Move edge"
-msgstr "移动 边界"
+#: pcbnew/dialog_graphic_items_options.cpp:198
+msgid "Graphic segm Width"
+msgstr "图形线段宽度"
 
-#: pcbnew/modedit_onclick.cpp:314
-msgid "Place edge"
-msgstr "放置 边界"
+#: pcbnew/dialog_graphic_items_options.cpp:204
+msgid "Board Edges Width"
+msgstr "电路板边界线宽度"
 
-#: pcbnew/modedit_onclick.cpp:317
-#: pcbnew/onrightclick.cpp:670
-#: pcbnew/onrightclick.cpp:704
-#: pcbnew/onrightclick.cpp:801
-#: eeschema/onrightclick.cpp:312
-msgid "Edit"
-msgstr "编辑"
+#: pcbnew/dialog_graphic_items_options.cpp:210
+msgid "Copper Text Width"
+msgstr "铜层文字线宽"
 
-#: pcbnew/modedit_onclick.cpp:319
-msgid "Edit Width (Current)"
-msgstr "应用宽度设置（当前段）"
+#: pcbnew/dialog_graphic_items_options.cpp:216
+msgid "Text Size V"
+msgstr "文本垂直大小"
 
-#: pcbnew/modedit_onclick.cpp:321
-msgid "Edit Width (All)"
-msgstr "应用宽度设置（全部）"
+#: pcbnew/dialog_graphic_items_options.cpp:222
+msgid "Text Size H"
+msgstr "文本水平大小"
 
-#: pcbnew/modedit_onclick.cpp:323
-msgid "Edit Layer (Current)"
-msgstr "改变所在层（当前段）"
+#: pcbnew/dialog_graphic_items_options.cpp:230
+msgid "Modules:"
+msgstr "模块:"
 
-#: pcbnew/modedit_onclick.cpp:325
-msgid "Edit Layer (All)"
-msgstr "改变所在层（全部）"
+#: pcbnew/dialog_graphic_items_options.cpp:234
+msgid "Edges Module Width"
+msgstr "模块边界线宽度"
 
-#: pcbnew/modedit_onclick.cpp:327
-msgid "Delete edge"
-msgstr "删除 边界"
+#: pcbnew/dialog_graphic_items_options.cpp:240
+msgid "Text Module Width"
+msgstr "模块文字线宽"
 
-#: pcbnew/modedit_onclick.cpp:368
-msgid "Set Width"
-msgstr "设置宽度"
+#: pcbnew/dialog_graphic_items_options.cpp:246
+msgid "Text Module Size V"
+msgstr "模块文本垂直大小"
 
-#: pcbnew/dialog_setup_libs.cpp:97
-#: eeschema/dialog_eeschema_config.cpp:105
-#: cvpcb/dialog_cvpcb_config.cpp:76
-#: gerbview/reglage.cpp:90
-msgid "from "
-msgstr "位置 "
+#: pcbnew/dialog_graphic_items_options.cpp:252
+msgid "Text Module Size H"
+msgstr "模块文本水平大小"
 
-#: pcbnew/dialog_setup_libs.cpp:153
-#: eeschema/dialog_eeschema_config.cpp:161
-#: cvpcb/dialog_cvpcb_config.cpp:131
-#: cvpcb/dialog_display_options.cpp:177
-msgid "Save Cfg"
-msgstr "保存设置"
+#: pcbnew/dialog_display_options.cpp:186
+msgid "Tracks and vias"
+msgstr "导线和导孔"
 
-#: pcbnew/dialog_setup_libs.cpp:159
-#: eeschema/dialog_eeschema_config.cpp:178
-#: cvpcb/dialog_cvpcb_config.cpp:151
-msgid "Files ext:"
-msgstr "文件扩展名："
+#: pcbnew/dialog_display_options.cpp:193
+msgid "Tracks:"
+msgstr "导线:"
 
-#: pcbnew/dialog_setup_libs.cpp:175
-#: cvpcb/dialog_cvpcb_config.cpp:170
-#: cvpcb/dialog_cvpcb_config.cpp:202
-msgid "Del"
-msgstr "删除"
+#: pcbnew/dialog_display_options.cpp:198
+#: pcbnew/dialog_display_options.cpp:208
+#: pcbnew/dialog_general_options.cpp:357
+msgid "Always"
+msgstr "总是"
 
-#: pcbnew/dialog_setup_libs.cpp:179
-#: eeschema/dialog_eeschema_config.cpp:197
-#: eeschema/edit_component_in_lib.cpp:233
-#: eeschema/edit_component_in_lib.cpp:312
-#: cvpcb/dialog_cvpcb_config.cpp:174
-#: cvpcb/dialog_cvpcb_config.cpp:206
-msgid "Add"
-msgstr "添加"
+#: pcbnew/dialog_display_options.cpp:199
+msgid "New track"
+msgstr "新的导线"
 
-#: pcbnew/dialog_setup_libs.cpp:183
-#: eeschema/dialog_eeschema_config.cpp:203
-#: cvpcb/dialog_cvpcb_config.cpp:178
-#: cvpcb/dialog_cvpcb_config.cpp:210
-msgid "Ins"
-msgstr "插入"
+#: pcbnew/dialog_display_options.cpp:200
+#: pcbnew/dialog_display_options.cpp:206
+#: pcbnew/dialog_general_options.cpp:355
+msgid "Never"
+msgstr "从不"
 
-#: pcbnew/dialog_setup_libs.cpp:191
-#: eeschema/dialog_eeschema_config.cpp:213
-#: cvpcb/menucfg.cpp:231
-#: cvpcb/dialog_cvpcb_config.cpp:185
-msgid "Libraries"
-msgstr "库"
+#: pcbnew/dialog_display_options.cpp:201
+msgid "Show Track Clearance"
+msgstr "显示导线间距"
 
-#: pcbnew/dialog_setup_libs.cpp:199
-msgid "Lib Modules Dir:"
-msgstr "模块库目录："
+#: pcbnew/dialog_display_options.cpp:207
+msgid "defined holes"
+msgstr "定义的孔"
 
-#: pcbnew/dialog_setup_libs.cpp:206
-#: cvpcb/menucfg.cpp:91
-msgid "Module Doc File:"
-msgstr "模块说明文件："
+#: pcbnew/dialog_display_options.cpp:209
+msgid "Show Via Holes"
+msgstr "显示导孔的孔"
 
-#: pcbnew/dialog_setup_libs.cpp:216
-msgid "Board ext: "
-msgstr "电路板文件 扩展名："
+#: pcbnew/dialog_display_options.cpp:213
+msgid "Modules"
+msgstr "模块"
 
-#: pcbnew/dialog_setup_libs.cpp:220
-msgid "Cmp ext: "
-msgstr "元件文件   扩展名："
+#: pcbnew/dialog_display_options.cpp:224
+msgid "Module Texts"
+msgstr "模块文字"
 
-#: pcbnew/dialog_setup_libs.cpp:224
-msgid "Lib ext: "
-msgstr "库文件     扩展名："
+#: pcbnew/dialog_display_options.cpp:232
+msgid "Module Edges:"
+msgstr "模块边界:"
 
-#: pcbnew/dialog_setup_libs.cpp:228
-msgid "Net ext: "
-msgstr "网络表文件 扩展名："
+#: pcbnew/dialog_display_options.cpp:239
+msgid "Pad Options:"
+msgstr "焊盘选项:"
 
-#: pcbnew/dialog_setup_libs.cpp:367
-msgid "library files:"
-msgstr "库文件："
+#: pcbnew/dialog_display_options.cpp:246
+msgid "Pad Shapes:"
+msgstr "焊盘外形:"
 
-#: pcbnew/dialog_setup_libs.cpp:390
-msgid "Library exists! No Change"
-msgstr "库已经存在！未做改变"
+#: pcbnew/dialog_display_options.cpp:250
+msgid "Show Pad Clearance"
+msgstr "显示焊盘间距"
 
-#: pcbnew/class_text_mod.cpp:345
-msgid "Ref."
-msgstr "编号"
+#: pcbnew/dialog_display_options.cpp:254
+msgid "Show Pad Number"
+msgstr "显示焊盘编号"
 
-#: pcbnew/class_text_mod.cpp:350
-#: pcbnew/class_pad.cpp:973
-#: pcbnew/class_edge_mod.cpp:285
-#: pcbnew/class_module.cpp:1243
-#: cvpcb/setvisu.cpp:31
-msgid "Module"
-msgstr "模块"
+#: pcbnew/dialog_display_options.cpp:258
+msgid "Show Pad NoConnect"
+msgstr "显示无连接的焊盘"
 
-#: pcbnew/tool_modedit.cpp:53
-#: eeschema/tool_lib.cpp:123
-msgid "Select working library"
-msgstr "选择进行工作的库"
+#: pcbnew/dialog_display_options.cpp:269
+#: gerbview/options.cpp:322
+msgid "Display other items:"
+msgstr "其他内容的显示:"
 
-#: pcbnew/tool_modedit.cpp:56
-msgid "Save Module in working library"
-msgstr "将模块保存到工作的库中"
+#: pcbnew/dialog_display_options.cpp:276
+#: eeschema/dialog_options.cpp:267
+msgid "Show page limits"
+msgstr "显示页面限制"
 
-#: pcbnew/tool_modedit.cpp:60
-msgid "Create new library and save current module"
-msgstr "建立一个新的库保存当前的模块"
+#: pcbnew/class_edge_mod.cpp:287
+msgid "Seg"
+msgstr "线段"
 
-#: pcbnew/tool_modedit.cpp:65
-msgid "Delete part in current library"
-msgstr "从当前库中删除零件"
+#: pcbnew/class_edge_mod.cpp:293
+msgid "TimeStamp"
+msgstr "时间印记"
 
-#: pcbnew/tool_modedit.cpp:74
-msgid "Load module from lib"
-msgstr "从库中加载模块"
+#: pcbnew/class_edge_mod.cpp:295
+msgid "Mod Layer"
+msgstr "模块层"
 
-#: pcbnew/tool_modedit.cpp:79
-msgid "Load module from current board"
-msgstr "从当前电路板加载模块"
+#: pcbnew/class_edge_mod.cpp:297
+msgid "Seg Layer"
+msgstr "线段层"
 
-#: pcbnew/tool_modedit.cpp:83
-msgid "Update module in current board"
-msgstr "在当前电路板更新模块"
+#: pcbnew/zone_filling_algorithm.cpp:200
+msgid "No pads or starting point found to fill this zone outline"
+msgstr "没有找到填充覆铜所需的焊盘或起始点"
 
-#: pcbnew/tool_modedit.cpp:87
-msgid "Insert module into current board"
-msgstr "将模块插入到当前电路板"
+#: pcbnew/zone_filling_algorithm.cpp:246
+#, fuzzy
+msgid "Ok"
+msgstr "Ok"
 
-#: pcbnew/tool_modedit.cpp:92
-msgid "import module"
-msgstr "导入模块"
+#: pcbnew/ioascii.cpp:167
+msgid "Error: Unexpected end of file !"
+msgstr "错误: 文件结尾有错误!"
 
-#: pcbnew/tool_modedit.cpp:96
-msgid "export module"
-msgstr "导出模块"
+#: pcbnew/muonde.cpp:149
+#, fuzzy
+msgid "Gap"
+msgstr "Gap"
 
-#: pcbnew/tool_modedit.cpp:101
-#: eeschema/tool_lib.cpp:150
-#: eeschema/menubar.cpp:125
-#: eeschema/tool_sch.cpp:90
-msgid "Undo last edition"
-msgstr "撤销 最后的操作"
+#: pcbnew/muonde.cpp:154
+#, fuzzy
+msgid "Stub"
+msgstr "Stub"
 
-#: pcbnew/tool_modedit.cpp:103
-#: eeschema/tool_lib.cpp:152
-#: eeschema/menubar.cpp:132
-#: eeschema/tool_sch.cpp:93
-msgid "Redo the last undo command"
-msgstr "恢复 最后撤销的操作"
+#: pcbnew/muonde.cpp:160
+#, fuzzy
+msgid "Arc Stub"
+msgstr "Arc Stub"
 
-#: pcbnew/tool_modedit.cpp:108
-msgid "Module Properties"
-msgstr "模块属性"
+#: pcbnew/muonde.cpp:175
+#: common/common.cpp:53
+msgid " (mm):"
+msgstr " (mm):"
 
-#: pcbnew/tool_modedit.cpp:112
-msgid "Print Module"
-msgstr "打印模块"
+#: pcbnew/muonde.cpp:182
+msgid " (inch):"
+msgstr " (inch):"
 
-#: pcbnew/tool_modedit.cpp:137
-msgid "Module Check"
-msgstr "模块检查"
+#: pcbnew/muonde.cpp:189
+#: pcbnew/muonde.cpp:202
+#: pcbnew/gen_self.h:231
+msgid "Incorrect number, abort"
+msgstr "数值错误, 退出"
 
-#: pcbnew/tool_modedit.cpp:163
-msgid "Add Pads"
-msgstr "添加 焊盘"
+#: pcbnew/muonde.cpp:198
+msgid "Angle (0.1deg):"
+msgstr "角度(0.1度):"
 
-#: pcbnew/tool_modedit.cpp:245
-msgid "Show Texts Sketch"
-msgstr "文字 以轮廓方式显示"
+#: pcbnew/muonde.cpp:330
+msgid "Complex shape"
+msgstr "复合形状"
 
-#: pcbnew/tool_modedit.cpp:252
-msgid "Show Edges Sketch"
-msgstr "边界 以轮廓方式显示"
+#: pcbnew/muonde.cpp:356
+msgid "Read Shape Descr File..."
+msgstr "读取形状描述文件 ..."
 
-#: pcbnew/tool_modedit.cpp:289
-#, c-format
-msgid "Zoom %d"
-msgstr "缩放 %d"
+#: pcbnew/muonde.cpp:360
+msgid "Symmetrical"
+msgstr "对称的"
 
-#: pcbnew/tool_modedit.cpp:308
-#, c-format
-msgid "Grid %.1f"
-msgstr "网格 %.1f"
+#: pcbnew/muonde.cpp:360
+msgid "Mirrored"
+msgstr "镜像的"
 
-#: pcbnew/tool_modedit.cpp:310
-#, c-format
-msgid "Grid %.3f"
-msgstr "网格 %.3f"
+#: pcbnew/muonde.cpp:362
+msgid "Shape Option"
+msgstr "形状选项"
 
-#: pcbnew/dialog_graphic_items_options.cpp:192
-msgid "Graphics:"
-msgstr "图形："
+#: pcbnew/muonde.cpp:428
+msgid "Read descr shape file"
+msgstr "读取形状描述文件"
 
-#: pcbnew/dialog_graphic_items_options.cpp:196
-msgid "Graphic segm Width"
-msgstr "图形线段宽度"
+#: pcbnew/muonde.cpp:444
+msgid "File not found"
+msgstr "文件没有找到"
 
-#: pcbnew/dialog_graphic_items_options.cpp:202
-msgid "Board Edges Width"
-msgstr "电路板边界线宽度"
+#: pcbnew/muonde.cpp:548
+msgid "Shape has a null size!"
+msgstr "形状大小为空!"
 
-#: pcbnew/dialog_graphic_items_options.cpp:208
-msgid "Copper Text Width"
-msgstr "铜层文本宽度"
+#: pcbnew/muonde.cpp:553
+msgid "Shape has no points!"
+msgstr "形状不包含任何点!"
 
-#: pcbnew/dialog_graphic_items_options.cpp:214
-msgid "Text Size V"
-msgstr "文本垂直大小"
+#: pcbnew/muonde.cpp:679
+msgid "No pad for this module"
+msgstr "该模块没有焊盘"
 
-#: pcbnew/dialog_graphic_items_options.cpp:220
-msgid "Text Size H"
-msgstr "文本水平大小"
+#: pcbnew/muonde.cpp:684
+msgid "Only one pad for this module"
+msgstr "该模块仅有一个焊盘"
 
-#: pcbnew/dialog_graphic_items_options.cpp:228
-msgid "Modules:"
-msgstr "模块："
+#: pcbnew/muonde.cpp:698
+#, fuzzy
+msgid "Gap (mm):"
+msgstr "Gap (mm):"
 
-#: pcbnew/dialog_graphic_items_options.cpp:232
-msgid "Edges Module Width"
-msgstr "模块边界线宽度"
+#: pcbnew/muonde.cpp:704
+#, fuzzy
+msgid "Gap (inch):"
+msgstr "Gap (inch):"
 
-#: pcbnew/dialog_graphic_items_options.cpp:238
-msgid "Text Module Width"
-msgstr "模块文本宽度"
+#: pcbnew/muwave_command.cpp:52
+#: eeschema/libframe.cpp:519
+#, fuzzy
+msgid "Add Line"
+msgstr "添加 Line"
 
-#: pcbnew/dialog_graphic_items_options.cpp:244
-msgid "Text Module Size V"
-msgstr "模块文本垂直大小"
+#: pcbnew/muwave_command.cpp:56
+#, fuzzy
+msgid "Add Gap"
+msgstr "添加 Gap"
 
-#: pcbnew/dialog_graphic_items_options.cpp:250
-msgid "Text Module Size H"
-msgstr "模块文本水平大小"
+#: pcbnew/muwave_command.cpp:60
+#, fuzzy
+msgid "Add Stub"
+msgstr "添加 Stub"
 
-#: pcbnew/onleftclick.cpp:168
-msgid "Graphic not authorized on Copper layers"
-msgstr "不允许图形出现在铜层"
+#: pcbnew/muwave_command.cpp:64
+#, fuzzy
+msgid "Add Arc Stub"
+msgstr "添加 Arc Stub"
+
+#: pcbnew/muwave_command.cpp:68
+#, fuzzy
+msgid "Add Polynomial Shape"
+msgstr "添加 Polynomial Shape"
 
-#: pcbnew/onleftclick.cpp:191
-msgid "Tracks on Copper layers only "
-msgstr "导线只能出现在铜层"
+#: pcbnew/pcbnew.cpp:42
+msgid "Pcbnew is already running, Continue?"
+msgstr "pcbnew 已经在运行。是否继续？"
 
-#: pcbnew/onleftclick.cpp:267
-msgid "Cotation not authorized on Copper layers"
-msgstr "Cotation 不允许出现在铜层"
+#: pcbnew/cleaningoptions_dialog.cpp:146
+#, fuzzy
+msgid "Static"
+msgstr "Static"
 
-#: pcbnew/class_pad.cpp:801
-#: pcbnew/class_pad.cpp:887
-msgid "Unknown Pad shape"
-msgstr "未知焊盘形状"
+#: pcbnew/cleaningoptions_dialog.cpp:150
+msgid "Delete redundant vias"
+msgstr "删除多余的导孔"
 
-#: pcbnew/class_pad.cpp:976
-msgid "RefP"
-msgstr "焊盘号"
+#: pcbnew/cleaningoptions_dialog.cpp:153
+msgid "remove vias on pads with a through hole"
+msgstr "移除落在有孔焊盘上面的导孔"
 
-#: pcbnew/class_pad.cpp:1093
-msgid "Drill X / Y"
-msgstr "钻孔 X / Y"
+#: pcbnew/cleaningoptions_dialog.cpp:156
+msgid "Merge segments"
+msgstr "线段合并"
 
-#: pcbnew/class_pad.cpp:1108
-msgid "X Pos"
-msgstr "X位置"
+#: pcbnew/cleaningoptions_dialog.cpp:159
+msgid "merge aligned track segments, and remove null segments"
+msgstr "合并连成直线导线段, 移除空的线段"
 
-#: pcbnew/class_pad.cpp:1112
-msgid "Y pos"
-msgstr "Y位置"
+#: pcbnew/cleaningoptions_dialog.cpp:162
+msgid "Delete unconnected tracks"
+msgstr "删除未连接的导线"
 
-#: pcbnew/set_color.cpp:269
-#: pcbnew/set_color.cpp:296
-#: gerbview/set_color.cpp:258
-#: gerbview/set_color.cpp:285
-msgid "Show None"
-msgstr "全不显示"
+#: pcbnew/cleaningoptions_dialog.cpp:165
+msgid "delete track segment having a dangling end"
+msgstr "删除一头悬空的导线段"
 
-#: pcbnew/set_color.cpp:278
-#: gerbview/set_color.cpp:267
-msgid "Show All"
-msgstr "显示所有"
+#: pcbnew/cleaningoptions_dialog.cpp:168
+msgid "Connect to Pads"
+msgstr "连接到焊盘"
 
-#: pcbnew/set_color.cpp:290
-msgid "Switch on all of the copper layers"
-msgstr "开启所有铜层"
+#: pcbnew/cleaningoptions_dialog.cpp:171
+msgid "Extend dangling tracks which partially cover a pad or via, all the way to pad or via center"
+msgstr "将未与焊盘或导孔连接到位的导线连接到位(连接到中心点)"
 
-#: pcbnew/set_color.cpp:299
-msgid "Switch off all of the copper layers"
-msgstr "关闭所有铜层"
+#: pcbnew/cleaningoptions_dialog.cpp:177
+msgid "Clean pcb"
+msgstr "清理 PCB"
 
-#: pcbnew/set_color.cpp:361
-#: eeschema/eelayer.cpp:259
-#: gerbview/set_color.cpp:333
-msgid "Apply"
-msgstr "应用"
+#: pcbnew/specctra_import.cpp:74
+msgid "Merge Specctra Session file:"
+msgstr "合并 Specctra Session 文件:"
 
-#: pcbnew/onrightclick.cpp:83
-#, c-format
-msgid "Track %.1f"
-msgstr "导线 %.1f"
+#: pcbnew/specctra_import.cpp:101
+msgid "BOARD may be corrupted, do not save it."
+msgstr "电路板可能已经损坏，请不要保存。"
 
-#: pcbnew/onrightclick.cpp:85
-#, c-format
-msgid "Track %.3f"
-msgstr "导线 %.3f"
+#: pcbnew/specctra_import.cpp:103
+msgid "Fix problem and try again."
+msgstr "请修正错误后再试。"
 
-#: pcbnew/onrightclick.cpp:101
-#, c-format
-msgid "Via %.1f"
-msgstr "过孔 %.1f"
+#: pcbnew/specctra_import.cpp:117
+msgid "Session file imported and merged OK."
+msgstr "session文件导入与合并完成。"
 
-#: pcbnew/onrightclick.cpp:103
+#: pcbnew/specctra_import.cpp:183
+#: pcbnew/specctra_import.cpp:291
 #, c-format
-msgid "Via %.3f"
-msgstr "过孔 %.3f"
+msgid "Session file uses invalid layer id \"%s\""
+msgstr "session文件使用了错误的层标识 \"%s\""
 
-#: pcbnew/onrightclick.cpp:219
-msgid "Lock Module"
-msgstr "锁定模块"
-
-#: pcbnew/onrightclick.cpp:227
-msgid "Unlock Module"
-msgstr "解除模块锁定"
-
-#: pcbnew/onrightclick.cpp:235
-msgid "Auto place Module"
-msgstr "自动放置模块"
+#: pcbnew/specctra_import.cpp:233
+msgid "Session via padstack has no shapes"
+msgstr "session文件的导孔焊盘栈没有包含任何形状"
 
-#: pcbnew/onrightclick.cpp:241
-msgid "Autoroute"
-msgstr "自动布线"
+#: pcbnew/specctra_import.cpp:240
+#: pcbnew/specctra_import.cpp:258
+#: pcbnew/specctra_import.cpp:282
+#, c-format
+msgid "Unsupported via shape: \"%s\""
+msgstr "不支持的导孔形状: \"%s\""
 
-#: pcbnew/onrightclick.cpp:257
-msgid "Move Drawing"
-msgstr "移动 图形"
+#: pcbnew/specctra_import.cpp:339
+msgid "Session file is missing the \"session\" section"
+msgstr "Session文件丢失了 \"session\" 节"
 
-#: pcbnew/onrightclick.cpp:262
-msgid "End Drawing"
-msgstr "结束 图形"
+#: pcbnew/specctra_import.cpp:342
+msgid "Session file is missing the \"placement\" section"
+msgstr "Session文件丢失了 \"placement\" 节"
 
-#: pcbnew/onrightclick.cpp:264
-msgid "Edit Drawing"
-msgstr "编辑 图形"
+#: pcbnew/specctra_import.cpp:345
+msgid "Session file is missing the \"routes\" section"
+msgstr "Session文件丢失了 \"routes\" 节"
 
-#: pcbnew/onrightclick.cpp:265
-msgid "Delete Drawing"
-msgstr "删除 图形"
+#: pcbnew/specctra_import.cpp:348
+msgid "Session file is missing the \"library_out\" section"
+msgstr "Session文件丢失了 \"library_out\" 节"
 
-#: pcbnew/onrightclick.cpp:272
-msgid "End edge zone"
-msgstr "结束 覆铜边界"
+#: pcbnew/specctra_import.cpp:375
+#, c-format
+msgid "Session file has 'reference' to non-existent component \"%s\""
+msgstr "Session文件中发现指向不存在元件的索引编号 \"%s\""
 
-#: pcbnew/onrightclick.cpp:275
-msgid "Delete edge zone"
-msgstr "删除 覆铜边界"
+#: pcbnew/specctra_import.cpp:447
+#, c-format
+msgid "Unsupported wire shape: \"%s\" for net: \"%s\""
+msgstr "发现不支持的导线形状: \"%s\" , 网络: \"%s\""
 
-#: pcbnew/onrightclick.cpp:290
-msgid "Edit Zone"
-msgstr "编辑 覆铜"
+#: pcbnew/specctra_import.cpp:490
+#, c-format
+msgid "A wire_via references a missing padstack \"%s\""
+msgstr "发现一个导线导孔索引指向了丢失的焊盘栈 \"%s\""
 
-#: pcbnew/onrightclick.cpp:292
-msgid "Delete Zone"
-msgstr "删除 覆铜"
+#: pcbnew/class_board.cpp:447
+msgid "Nodes"
+msgstr "节点"
 
-#: pcbnew/onrightclick.cpp:297
-msgid "Delete Marker"
-msgstr "删除 DRC标记"
+#: pcbnew/class_board.cpp:450
+msgid "Links"
+msgstr "链接"
 
-#: pcbnew/onrightclick.cpp:304
-msgid "Edit Dimension"
-msgstr "编辑 尺寸标注"
+#: pcbnew/class_board.cpp:453
+msgid "Nets"
+msgstr "网络"
 
-#: pcbnew/onrightclick.cpp:307
-msgid "Delete Dimension"
-msgstr "删除 尺寸标注"
+#: pcbnew/class_board.cpp:456
+msgid "Connect"
+msgstr "连接"
 
-#: pcbnew/onrightclick.cpp:314
-msgid "Move Target"
-msgstr "移动 目标"
+#: pcbnew/class_board.cpp:459
+#: eeschema/eelayer.h:115
+msgid "NoConn"
+msgstr "无连接"
 
-#: pcbnew/onrightclick.cpp:317
-msgid "Edit Target"
-msgstr "编辑 目标"
+#: pcbnew/dialog_setup_libs.cpp:97
+#: eeschema/dialog_eeschema_config.cpp:107
+#: cvpcb/dialog_cvpcb_config.cpp:77
+#: gerbview/reglage.cpp:90
+msgid "from "
+msgstr "位置 "
 
-#: pcbnew/onrightclick.cpp:319
-msgid "Delete Target"
-msgstr "删除 目标"
+#: pcbnew/dialog_setup_libs.cpp:153
+#: eeschema/dialog_eeschema_config.cpp:163
+#: cvpcb/dialog_cvpcb_config.cpp:131
+#: cvpcb/dialog_display_options.cpp:177
+msgid "Save Cfg"
+msgstr "保存设置"
 
-#: pcbnew/onrightclick.cpp:346
-msgid "Get and Move Footprint"
-msgstr "挑选和移动封装"
+#: pcbnew/dialog_setup_libs.cpp:159
+#: eeschema/dialog_eeschema_config.cpp:180
+#: cvpcb/dialog_cvpcb_config.cpp:151
+msgid "Files ext:"
+msgstr "文件扩展名: "
 
-#: pcbnew/onrightclick.cpp:358
-msgid "Fill zone"
-msgstr "填充 覆铜"
+#: pcbnew/dialog_setup_libs.cpp:175
+#: cvpcb/dialog_cvpcb_config.cpp:170
+#: cvpcb/dialog_cvpcb_config.cpp:202
+msgid "Del"
+msgstr "删除"
 
-#: pcbnew/onrightclick.cpp:366
-msgid "Select Net"
-msgstr "选择网络"
+#: pcbnew/dialog_setup_libs.cpp:179
+#: eeschema/edit_component_in_lib.cpp:233
+#: eeschema/edit_component_in_lib.cpp:312
+#: eeschema/dialog_eeschema_config.cpp:199
+#: cvpcb/dialog_cvpcb_config.cpp:174
+#: cvpcb/dialog_cvpcb_config.cpp:206
+msgid "Add"
+msgstr "添加"
 
-#: pcbnew/onrightclick.cpp:371
-msgid "Delete Zone Limit"
-msgstr "删除 覆铜边界"
+#: pcbnew/dialog_setup_libs.cpp:183
+#: eeschema/dialog_eeschema_config.cpp:205
+#: cvpcb/dialog_cvpcb_config.cpp:178
+#: cvpcb/dialog_cvpcb_config.cpp:210
+msgid "Ins"
+msgstr "插入"
 
-#: pcbnew/onrightclick.cpp:376
-#: pcbnew/onrightclick.cpp:387
-#: pcbnew/onrightclick.cpp:400
-#: pcbnew/onrightclick.cpp:461
-msgid "Select Working Layer"
-msgstr "选择工作层"
+#: pcbnew/dialog_setup_libs.cpp:191
+#: eeschema/dialog_eeschema_config.cpp:215
+#: cvpcb/dialog_cvpcb_config.cpp:185
+msgid "Libraries"
+msgstr "库"
 
-#: pcbnew/onrightclick.cpp:385
-#: pcbnew/onrightclick.cpp:458
-msgid "Select Track Width"
-msgstr "选择导线宽度"
+#: pcbnew/dialog_setup_libs.cpp:199
+msgid "Lib Modules Dir:"
+msgstr "模块库目录:"
 
-#: pcbnew/onrightclick.cpp:389
-msgid "Select layer pair for vias"
-msgstr "选择过孔的工作层"
+#: pcbnew/dialog_setup_libs.cpp:206
+#: cvpcb/menucfg.cpp:91
+msgid "Module Doc File:"
+msgstr "模块说明文件:"
 
-#: pcbnew/onrightclick.cpp:406
-msgid "Footprint documentation"
-msgstr "封装的文档"
+#: pcbnew/dialog_setup_libs.cpp:216
+msgid "Board ext: "
+msgstr "电路板文件 扩展名: "
 
-#: pcbnew/onrightclick.cpp:416
-msgid "Glob Move and Place"
-msgstr "全局移动和放置"
+#: pcbnew/dialog_setup_libs.cpp:220
+msgid "Cmp ext: "
+msgstr "元件文件   扩展名: "
 
-#: pcbnew/onrightclick.cpp:418
-msgid "Unlock All Modules"
-msgstr "解除所有模块锁定"
+#: pcbnew/dialog_setup_libs.cpp:224
+msgid "Lib ext: "
+msgstr "库文件     扩展名: "
 
-#: pcbnew/onrightclick.cpp:420
-msgid "Lock All Modules"
-msgstr "锁定所有模块"
+#: pcbnew/dialog_setup_libs.cpp:228
+msgid "Net ext: "
+msgstr "网络表文件 扩展名: "
 
-#: pcbnew/onrightclick.cpp:423
-msgid "Move All Modules"
-msgstr "移动所有模块"
+#: pcbnew/dialog_setup_libs.cpp:367
+#: cvpcb/menucfg.cpp:232
+msgid "Library Files:"
+msgstr "库文件:"
+
+#: pcbnew/dialog_setup_libs.cpp:392
+#: eeschema/dialog_eeschema_config.cpp:396
+#: cvpcb/menucfg.cpp:257
+#: cvpcb/menucfg.cpp:325
+msgid "Library already in use"
+msgstr "库已经在使用中"
 
-#: pcbnew/onrightclick.cpp:424
-msgid "Move New Modules"
-msgstr "移动新模块"
+#: pcbnew/modules.cpp:81
+msgid "Footprint name:"
+msgstr "封装名称:"
 
-#: pcbnew/onrightclick.cpp:426
-msgid "Autoplace All Modules"
-msgstr "自动放置所有模块"
+#: pcbnew/modules.cpp:282
+#: eeschema/find.cpp:222
+#: eeschema/onrightclick.cpp:324
+msgid "Value "
+msgstr "值 "
 
-#: pcbnew/onrightclick.cpp:427
-msgid "Autoplace New Modules"
-msgstr "自动放置新模块"
+#: pcbnew/basepcbframe.cpp:159
+msgid "3D Frame already opened"
+msgstr "3D框架已经打开"
 
-#: pcbnew/onrightclick.cpp:428
-msgid "Autoplace Next Module"
-msgstr "自动放置下一个模块"
+#: pcbnew/basepcbframe.cpp:164
+#: pcbnew/basepcbframe.cpp:167
+msgid "3D Viewer"
+msgstr "3D查看器"
 
-#: pcbnew/onrightclick.cpp:431
-msgid "Orient All Modules"
-msgstr "改变所有模块的方向"
+#: pcbnew/plotps.cpp:390
+msgid "Tracks"
+msgstr "导线"
 
-#: pcbnew/onrightclick.cpp:438
-msgid "Global Autoroute"
-msgstr "全局自动布线"
+#: pcbnew/class_pad.cpp:795
+msgid "Unknown Pad shape"
+msgstr "未知焊盘形状"
 
-#: pcbnew/onrightclick.cpp:440
-msgid "Select layer pair"
-msgstr "选择工作层"
+#: pcbnew/class_pad.cpp:884
+msgid "RefP"
+msgstr "焊盘索引"
 
-#: pcbnew/onrightclick.cpp:442
-msgid "Autoroute All Modules"
-msgstr "对所有模块自动布线"
+#: pcbnew/class_pad.cpp:1002
+msgid "Drill X / Y"
+msgstr "钻孔 X / Y"
 
-#: pcbnew/onrightclick.cpp:444
-msgid "Reset Unrouted"
-msgstr "复位未布线路"
+#: pcbnew/class_pad.cpp:1017
+msgid "X Pos"
+msgstr "X位置"
 
-#: pcbnew/onrightclick.cpp:449
-msgid "Global AutoRouter"
-msgstr "全局自动布线程序（AutoRouter）"
+#: pcbnew/class_pad.cpp:1021
+msgid "Y pos"
+msgstr "Y位置"
 
-#: pcbnew/onrightclick.cpp:451
-msgid "Read Global AutoRouter Data"
-msgstr "读取全局自动布线程序数据"
+#: pcbnew/class_marker.cpp:137
+msgid "ErrType"
+msgstr "错误类型"
 
-#: pcbnew/onrightclick.cpp:488
-msgid "Flip Block (alt + drag mouse)"
-msgstr "翻转 块 （alt + 鼠标拖拉）"
+#: pcbnew/class_pcb_text.cpp:173
+#: gerbview/affiche.cpp:29
+#, fuzzy
+msgid "COTATION"
+msgstr "警告"
 
-#: pcbnew/onrightclick.cpp:511
-msgid "Drag Via"
-msgstr "拖动过孔"
+#: pcbnew/class_pcb_text.cpp:175
+#: gerbview/affiche.cpp:32
+msgid "PCB Text"
+msgstr "PCB文本"
 
-#: pcbnew/onrightclick.cpp:515
-#: pcbnew/onrightclick.cpp:579
-msgid "Edit Via"
-msgstr "编辑过孔"
+#: pcbnew/menubarpcb.cpp:42
+msgid "Load Board    Ctrl-O"
+msgstr "载入电路板    Ctrl-O"
 
-#: pcbnew/onrightclick.cpp:517
-msgid "Set via hole to Default"
-msgstr "将过孔孔径设置为默认值"
+#: pcbnew/menubarpcb.cpp:43
+msgid "Delete old Board and Load new Board"
+msgstr "放弃当前的电路板加载一个新的电路板"
 
-#: pcbnew/onrightclick.cpp:519
-msgid "Set via hole to alt value"
-msgstr "将过孔孔径设置为备用值"
+#: pcbnew/menubarpcb.cpp:48
+msgid "Append Board"
+msgstr "添加电路板"
 
-#: pcbnew/onrightclick.cpp:521
-msgid "Set the via hole alt value"
-msgstr "设置过孔孔径的备用值"
+#: pcbnew/menubarpcb.cpp:49
+msgid "Add Board to old Board"
+msgstr "向原有电路板添加电路板"
 
-#: pcbnew/onrightclick.cpp:523
-msgid "Export Via hole to alt value"
-msgstr "将当前过孔孔径导出为备用值"
+#: pcbnew/menubarpcb.cpp:54
+msgid "&New board"
+msgstr "新建电路板(&N)"
 
-#: pcbnew/onrightclick.cpp:525
-msgid "Export via hole to others id vias"
-msgstr "将过孔孔径设置应用到指定过孔"
+#: pcbnew/menubarpcb.cpp:55
+msgid "Clear old PCB and init a new one"
+msgstr "清除当前的 PCB, 建立一个新的空 PCB"
 
-#: pcbnew/onrightclick.cpp:527
-msgid "Set ALL via holes to default"
-msgstr "将所有过孔孔径设置为默认值"
+#: pcbnew/menubarpcb.cpp:60
+msgid "&Rescue"
+msgstr "挽救(&Rescue)"
 
-#: pcbnew/onrightclick.cpp:540
-msgid "Move Node"
-msgstr "移动 Node"
+#: pcbnew/menubarpcb.cpp:61
+msgid "Clear old board and get last rescue file"
+msgstr "清空电路板, 载入最后的挽救文件"
 
-#: pcbnew/onrightclick.cpp:545
-msgid "Drag Segments, keep slope"
-msgstr "拖拉 线段, 保持斜率"
+#: pcbnew/menubarpcb.cpp:66
+msgid "&Previous version"
+msgstr "前一个版本(&P)"
 
-#: pcbnew/onrightclick.cpp:547
-msgid "Drag Segment"
-msgstr "拖拉 线段"
+#: pcbnew/menubarpcb.cpp:67
+msgid "Clear old board and get old version of board"
+msgstr "清空电路板, 恢复到先前的版本"
 
-#: pcbnew/onrightclick.cpp:550
-msgid "Move Segment"
-msgstr "移动 线段"
+#: pcbnew/menubarpcb.cpp:74
+msgid "&Save board    Ctrl-S"
+msgstr "保存电路板(Ctrl+S)"
 
-#: pcbnew/onrightclick.cpp:553
-msgid "Break Track"
-msgstr "分割 导线"
+#: pcbnew/menubarpcb.cpp:75
+msgid "Save current board"
+msgstr "保存当前的电路板"
 
-#: pcbnew/onrightclick.cpp:560
-msgid "Place Node"
-msgstr "放置 Node"
+#: pcbnew/menubarpcb.cpp:80
+msgid "Save Board as.."
+msgstr "电路板另存为.."
 
-#: pcbnew/onrightclick.cpp:567
-msgid "End Track"
-msgstr "结束 导线"
+#: pcbnew/menubarpcb.cpp:81
+msgid "Save current board as.."
+msgstr "把当前的电路板另存为.."
 
-#: pcbnew/onrightclick.cpp:570
-msgid "Place Via"
-msgstr "放置 过孔"
+#: pcbnew/menubarpcb.cpp:88
+#: eeschema/menubar.cpp:82
+#: gerbview/tool_gerber.cpp:88
+msgid "P&rint"
+msgstr "打印(&R)"
 
-#: pcbnew/onrightclick.cpp:577
-msgid "Change Width"
-msgstr "改变 宽度"
+#: pcbnew/menubarpcb.cpp:88
+#: eeschema/menubar.cpp:82
+#: gerbview/tool_gerber.cpp:88
+msgid "Print on current printer"
+msgstr "用当前打印机打印"
 
-#: pcbnew/onrightclick.cpp:579
-msgid "Edit Segment"
-msgstr "编辑 线段"
+#: pcbnew/menubarpcb.cpp:93
+#: eeschema/menubar.cpp:113
+msgid "&Plot"
+msgstr "绘图输出(&Plot)"
 
-#: pcbnew/onrightclick.cpp:584
-msgid "Edit Track"
-msgstr "编辑 导线"
+#: pcbnew/menubarpcb.cpp:94
+msgid "Plot (HPGL, PostScript, or Gerber format)"
+msgstr "Plot绘图 ( HPGL, PostScript, 或 Gerber 格式 )"
 
-#: pcbnew/onrightclick.cpp:586
-msgid "Edit Net"
-msgstr "编辑 相同网络"
+#: pcbnew/menubarpcb.cpp:103
+msgid "&Specctra DSN"
+msgstr ""
 
-#: pcbnew/onrightclick.cpp:588
-msgid "Edit ALL Tracks and Vias"
-msgstr "编辑 所有导线和过孔"
+#: pcbnew/menubarpcb.cpp:103
+msgid "Export the current board to a \"Specctra DSN\" file"
+msgstr "将当前电路板导出为 \"Specctra DSN\" 文件"
 
-#: pcbnew/onrightclick.cpp:590
-msgid "Edit ALL Vias (no track)"
-msgstr "编辑 所有过孔（不包括导线）"
+#: pcbnew/menubarpcb.cpp:108
+msgid "&GenCAD"
+msgstr "&GenCAD"
 
-#: pcbnew/onrightclick.cpp:592
-msgid "Edit ALL Tracks (no via)"
-msgstr "编辑 所有导线（不包括过孔）"
+#: pcbnew/menubarpcb.cpp:108
+msgid "Export GenCAD Format"
+msgstr "导出 GenCAD 格式"
 
-#: pcbnew/onrightclick.cpp:600
-msgid "Delete Via"
-msgstr "删除 过孔"
+#: pcbnew/menubarpcb.cpp:113
+msgid "&Module report"
+msgstr "模块报告(&M)"
 
-#: pcbnew/onrightclick.cpp:600
-msgid "Delete Segment"
-msgstr "删除 线段"
+#: pcbnew/menubarpcb.cpp:113
+msgid "Create a pcb report (footprint report)"
+msgstr "生成一个PCB报告(封装报告)"
 
-#: pcbnew/onrightclick.cpp:607
-msgid "Delete Track"
-msgstr "删除 导线"
+#: pcbnew/menubarpcb.cpp:117
+msgid "E&xport"
+msgstr "导出(&X)"
 
-#: pcbnew/onrightclick.cpp:611
-msgid "Delete Net"
-msgstr "删除 相同网络"
+#: pcbnew/menubarpcb.cpp:117
+msgid "Export board"
+msgstr "导出电路板"
 
-#: pcbnew/onrightclick.cpp:616
-msgid "Set Flags"
-msgstr "设置标志"
+#: pcbnew/menubarpcb.cpp:125
+msgid "&Specctra Session"
+msgstr ""
 
-#: pcbnew/onrightclick.cpp:617
-msgid "Locked: Yes"
-msgstr "锁定：是"
+#: pcbnew/menubarpcb.cpp:125
+msgid "Import a routed \"Specctra Session\" (*.ses) file"
+msgstr "导入一个已经自动布线的 \"Specctra Session\" (*.ses) 文件"
 
-#: pcbnew/onrightclick.cpp:618
-msgid "Locked: No"
-msgstr "锁定：否"
+#: pcbnew/menubarpcb.cpp:137
+#: eeschema/libframe.cpp:527
+msgid "Import"
+msgstr "导入"
 
-#: pcbnew/onrightclick.cpp:628
-msgid "Track Locked: Yes"
-msgstr "导线锁定：是"
+#: pcbnew/menubarpcb.cpp:137
+msgid "Import files"
+msgstr "导入文件"
 
-#: pcbnew/onrightclick.cpp:629
-msgid "Track Locked: No"
-msgstr "导线锁定：否"
+#: pcbnew/menubarpcb.cpp:144
+msgid "Add new footprints"
+msgstr "添加新封装"
 
-#: pcbnew/onrightclick.cpp:631
-msgid "Net Locked: Yes"
-msgstr "网络锁定：是"
+#: pcbnew/menubarpcb.cpp:145
+msgid "Archive new footprints only in a library (keep other footprints in this lib)"
+msgstr "将新封装存档于一个库文件(库中原有封装保留)"
 
-#: pcbnew/onrightclick.cpp:632
-msgid "Net Locked: No"
-msgstr "网络锁定：否"
+#: pcbnew/menubarpcb.cpp:149
+msgid "Create footprint archive"
+msgstr "生成封装存档"
 
-#: pcbnew/onrightclick.cpp:654
-#: pcbnew/onrightclick.cpp:699
-#: pcbnew/onrightclick.cpp:737
-#: pcbnew/onrightclick.cpp:796
-msgid "Move"
-msgstr "移动"
+#: pcbnew/menubarpcb.cpp:150
+msgid "Archive all footprints  in a library(old lib will be deleted)"
+msgstr "将所有封装存档于一个库文件(旧的库将被删除)"
 
-#: pcbnew/onrightclick.cpp:657
-#: pcbnew/onrightclick.cpp:739
-msgid "Drag"
-msgstr "拖拉"
+#: pcbnew/menubarpcb.cpp:155
+msgid "Archive footprints"
+msgstr "封装存档"
 
-#: pcbnew/onrightclick.cpp:661
-msgid "Rotate  +"
-msgstr "旋转  +"
+#: pcbnew/menubarpcb.cpp:156
+msgid "Archive or Add footprints in a library file"
+msgstr "将封装存档或添加到一个库文件"
 
-#: pcbnew/onrightclick.cpp:665
-#: eeschema/onrightclick.cpp:300
-msgid "Rotate -"
-msgstr "旋转  -"
+#: pcbnew/menubarpcb.cpp:160
+#: eeschema/menubar.cpp:117
+#: cvpcb/tool_cvpcb.cpp:125
+#: kicad/buildmnu.cpp:130
+#: gerbview/tool_gerber.cpp:93
+msgid "E&xit"
+msgstr "退出(&E)"
 
-#: pcbnew/onrightclick.cpp:666
-msgid "Flip"
-msgstr "翻转"
+#: pcbnew/menubarpcb.cpp:160
+msgid "Quit pcbnew"
+msgstr "退出 pcbnew"
 
-#: pcbnew/onrightclick.cpp:756
-msgid "delete"
-msgstr "删除"
+#: pcbnew/menubarpcb.cpp:178
+#: eeschema/menubar.cpp:358
+msgid "&Libs and Dir"
+msgstr "库和目录设置(&L)"
 
-#: pcbnew/onrightclick.cpp:763
-msgid "Autoroute Pad"
-msgstr "自动布线 针对焊盘"
+#: pcbnew/menubarpcb.cpp:179
+#: eeschema/menubar.cpp:359
+#: cvpcb/tool_cvpcb.cpp:140
+msgid "Setting Libraries, Directories and others..."
+msgstr "设置库文件, 目录等 ..."
 
-#: pcbnew/onrightclick.cpp:764
-msgid "Autoroute Net"
-msgstr "自动布线 针对网络"
+#: pcbnew/menubarpcb.cpp:183
+#: eeschema/menubar.cpp:364
+#: gerbview/tool_gerber.cpp:108
+msgid "&Colors"
+msgstr "颜色(&C)"
 
-#: pcbnew/dialog_drc.cpp:147
-#: eeschema/dialog_create_component.cpp:176
-#: eeschema/dialog_erc.cpp:237
-#: eeschema/dialog_edit_component_in_schematic.cpp:201
-#: eeschema/dialog_edit_component_in_lib.cpp:166
-msgid "Options"
-msgstr "选项"
+#: pcbnew/menubarpcb.cpp:184
+msgid "Select Colors and Display for PCB items"
+msgstr "选择 PCB 的显示颜色"
 
-#: pcbnew/dialog_drc.cpp:151
-#: pcbnew/dialog_track_options.cpp:164
-msgid "Clearance"
-msgstr "间距"
+#: pcbnew/menubarpcb.cpp:188
+msgid "&General Options"
+msgstr "基本选项(&G)"
 
-#: pcbnew/dialog_drc.cpp:159
-msgid "Test Drc:"
-msgstr "DRC 测试："
+#: pcbnew/menubarpcb.cpp:189
+msgid "Select general options for pcbnew"
+msgstr "pcbnew 的基本选项设置"
 
-#: pcbnew/dialog_drc.cpp:163
-msgid "Include pad to pad test"
-msgstr "包括 焊盘到焊盘 测试"
+#: pcbnew/menubarpcb.cpp:193
+msgid "&Display Options"
+msgstr "显示选项(&D)"
 
-#: pcbnew/dialog_drc.cpp:167
-msgid "Include unconnected"
-msgstr "包括 未连接测试"
+#: pcbnew/menubarpcb.cpp:194
+msgid "Select what items are displayed"
+msgstr "选择被显示的项目"
 
-#: pcbnew/dialog_drc.cpp:175
-msgid "Create Report file"
-msgstr "生成报告文件"
+#: pcbnew/menubarpcb.cpp:204
+#: eeschema/menubar.cpp:382
+msgid "&Save preferences"
+msgstr "保存参数设置(&S)"
 
-#: pcbnew/dialog_drc.cpp:190
-msgid "Test Drc"
-msgstr "进行 DRC 测试"
+#: pcbnew/menubarpcb.cpp:205
+#: eeschema/menubar.cpp:383
+#: gerbview/tool_gerber.cpp:123
+msgid "Save application preferences"
+msgstr "保存参数设置"
 
-#: pcbnew/dialog_drc.cpp:194
-msgid "Stop Drc"
-msgstr "停止 DRC 测试"
+#: pcbnew/menubarpcb.cpp:209
+#: eeschema/menubar.cpp:386
+msgid "&Read preferences"
+msgstr "读取参数设置(&R)"
 
-#: pcbnew/dialog_drc.cpp:201
-msgid "Del Markers"
-msgstr "删除 标记"
+#: pcbnew/menubarpcb.cpp:210
+#: eeschema/menubar.cpp:387
+msgid "Read application preferences"
+msgstr "读取参数设置"
 
-#: pcbnew/dialog_drc.cpp:205
-msgid "List Unconn"
-msgstr "列出 未连接"
+#: pcbnew/menubarpcb.cpp:222
+msgid "Tracks and Vias"
+msgstr "导线和导孔"
 
-#: pcbnew/dialog_drc.cpp:209
-msgid "Report File"
-msgstr "报告文件"
+#: pcbnew/menubarpcb.cpp:223
+msgid "Adjust size and width for tracks, vias"
+msgstr "调整导线和导孔的大小及宽度"
 
-#: pcbnew/dialog_drc.cpp:220
-#: share/svg_print.cpp:232
-msgid "Messages:"
-msgstr "信息："
+#: pcbnew/menubarpcb.cpp:227
+#: pcbnew/menubarmodedit.cpp:50
+#: pcbnew/set_grid.h:39
+msgid "User Grid Size"
+msgstr "自定义网格大小"
 
-#: pcbnew/dialog_drc.cpp:342
-msgid "DRC Report file"
-msgstr "DRC 报告文件"
+#: pcbnew/menubarpcb.cpp:228
+#: pcbnew/menubarmodedit.cpp:51
+msgid "Adjust User Grid"
+msgstr "调整自定义网格"
 
-#: pcbnew/moduleframe.cpp:182
-msgid "Module Editor: module modified!, Continue ?"
-msgstr "模块编辑程序：模块已被修改！，是否继续？"
+#: pcbnew/menubarpcb.cpp:232
+#: pcbnew/dialog_graphic_items_options.h:47
+msgid "Texts and Drawings"
+msgstr "文字和图形"
 
-#: pcbnew/swap_layers.cpp:70
-msgid "Swap Layers:"
-msgstr "层交换："
+#: pcbnew/menubarpcb.cpp:233
+#: pcbnew/menubarmodedit.cpp:41
+msgid "Adjust width for texts and drawings"
+msgstr "调整文本和图形的宽度"
 
-#: pcbnew/swap_layers.cpp:188
-#: pcbnew/swap_layers.cpp:193
-#: pcbnew/swap_layers.cpp:276
-msgid "No Change"
-msgstr "无变化"
+#: pcbnew/menubarpcb.cpp:238
+#: pcbnew/menubarmodedit.cpp:46
+msgid "Adjust size,shape,layers... for Pads"
+msgstr "调整焊盘的大小、形状、层 ..."
 
-#: pcbnew/swap_layers.cpp:266
-msgid "Deselect this layer to select the No Change state"
-msgstr "将该层恢复为未更改状态"
+#: pcbnew/menubarpcb.cpp:243
+#: gerbview/tool_gerber.cpp:122
+msgid "&Save Setup"
+msgstr "保存设置(&S)"
 
-#: pcbnew/cross-probing.cpp:51
-#, c-format
-msgid "Locate module %s %s"
-msgstr "定位模块 %s %s"
+#: pcbnew/menubarpcb.cpp:244
+msgid "Save options in current directory"
+msgstr "将选项保存在当前目录"
 
-#: pcbnew/cross-probing.cpp:104
-#, c-format
-msgid "module %s not found"
-msgstr "模块 %s 没有找到"
+#: pcbnew/menubarpcb.cpp:253
+msgid "Create &Modules Pos"
+msgstr "生成模块位置文件(&M)"
 
-#: pcbnew/cross-probing.cpp:106
-#, c-format
-msgid "Pin %s (module %s) not found"
-msgstr "引脚 %s (模块 %s) 没有找到"
+#: pcbnew/menubarpcb.cpp:254
+msgid "Gen Position modules file"
+msgstr "生成模块位置信息文件"
 
-#: pcbnew/cross-probing.cpp:108
-#, c-format
-msgid "Locate Pin %s (module %s)"
-msgstr "定位引脚 %s (模块 %s)"
+#: pcbnew/menubarpcb.cpp:258
+msgid "Create &Drill file"
+msgstr "生成钻孔文件(&D)"
 
-#: pcbnew/export_gencad.cpp:69
-msgid "GenCAD file:"
-msgstr "GenCAD 文件："
+#: pcbnew/menubarpcb.cpp:259
+msgid "Gen Drill (EXCELLON] file and/or Drill sheet"
+msgstr "生成钻孔文件[EXCELLON]和(或)钻孔表格"
 
-#: pcbnew/class_edge_mod.cpp:283
-msgid "Seg"
-msgstr "线段"
+#: pcbnew/menubarpcb.cpp:263
+msgid "Create &Cmp file"
+msgstr "生成元件文件(&C)"
 
-#: pcbnew/class_edge_mod.cpp:289
-#: pcbnew/class_module.cpp:1213
-msgid "TimeStamp"
-msgstr "时间印记"
+#: pcbnew/menubarpcb.cpp:264
+msgid "Recreate .cmp file for CvPcb"
+msgstr "为 cvpcb 重新生成.cmp 文件"
 
-#: pcbnew/class_edge_mod.cpp:291
-msgid "Mod Layer"
-msgstr "模块层"
+#: pcbnew/menubarpcb.cpp:272
+msgid "Global &Deletions"
+msgstr "全局删除(&D)"
 
-#: pcbnew/class_edge_mod.cpp:293
-msgid "Seg Layer"
-msgstr "线段层"
+#: pcbnew/menubarpcb.cpp:273
+msgid "Delete Tracks, Modules, Texts... on Board"
+msgstr "删除电路板上面的导线, 模块, 文字 ..."
 
-#: pcbnew/menubarmodedit.cpp:40
-msgid "Sizes and Widths"
-msgstr "大小和宽度"
+#: pcbnew/menubarpcb.cpp:277
+msgid "&List nets"
+msgstr "列出网络(&L)"
 
-#: pcbnew/menubarmodedit.cpp:41
-#: pcbnew/menubarpcb.cpp:205
-msgid "Adjust width for texts and drawings"
-msgstr "调整文本和图形的宽度"
+#: pcbnew/menubarpcb.cpp:278
+msgid "List nets (names and id)"
+msgstr "列出网络(names and id)"
 
-#: pcbnew/menubarmodedit.cpp:46
-#: pcbnew/menubarpcb.cpp:210
-msgid "Adjust size,shape,layers... for Pads"
-msgstr "调整焊盘的大小、形状、层 ..."
+#: pcbnew/menubarpcb.cpp:282
+msgid "&Track operations"
+msgstr "导线操作(&T)"
 
-#: pcbnew/menubarmodedit.cpp:50
-#: pcbnew/menubarpcb.cpp:199
-#: pcbnew/set_grid.h:39
-msgid "User Grid Size"
-msgstr "自定义网格大小"
+#: pcbnew/menubarpcb.cpp:283
+msgid "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias"
+msgstr "清理残留, 导孔, 删除断点, 连接悬空导线"
 
-#: pcbnew/menubarmodedit.cpp:51
-#: pcbnew/menubarpcb.cpp:200
-msgid "Adjust User Grid"
-msgstr "调整自定义网格"
+#: pcbnew/menubarpcb.cpp:287
+msgid "&Swap layers"
+msgstr "层交换(&S)"
+
+#: pcbnew/menubarpcb.cpp:288
+msgid "Swap tracks on copper layers or drawings on others layers"
+msgstr "交换铜层上的导线或其他层上的图形"
 
+#: pcbnew/menubarpcb.cpp:296
 #: pcbnew/menubarmodedit.cpp:60
-#: pcbnew/menubarpcb.cpp:268
-#: eeschema/menubar.cpp:178
+#: eeschema/menubar.cpp:397
 #: cvpcb/tool_cvpcb.cpp:158
 #: kicad/buildmnu.cpp:198
 #: gerbview/tool_gerber.cpp:149
 msgid "&Contents"
 msgstr "内容(&C)"
 
+#: pcbnew/menubarpcb.cpp:296
 #: pcbnew/menubarmodedit.cpp:60
-#: pcbnew/menubarpcb.cpp:268
 msgid "Open the pcbnew manual"
-msgstr "打开 Pcbnew 手册"
+msgstr "打开 pcbnew 手册"
 
+#: pcbnew/menubarpcb.cpp:300
 #: pcbnew/menubarmodedit.cpp:64
-#: pcbnew/menubarpcb.cpp:272
-#: eeschema/menubar.cpp:183
+#: eeschema/menubar.cpp:402
 #: cvpcb/tool_cvpcb.cpp:162
 #: kicad/buildmnu.cpp:203
 #: gerbview/tool_gerber.cpp:151
 msgid "&About"
 msgstr "关于(&A)"
 
+#: pcbnew/menubarpcb.cpp:300
 #: pcbnew/menubarmodedit.cpp:64
-#: pcbnew/menubarpcb.cpp:272
-#: eeschema/menubar.cpp:183
+#: eeschema/menubar.cpp:402
 #: cvpcb/tool_cvpcb.cpp:163
 #: kicad/buildmnu.cpp:203
 #: gerbview/tool_gerber.cpp:152
 msgid "About this application"
 msgstr "关于本应用程序"
 
+#: pcbnew/menubarpcb.cpp:308
 #: pcbnew/menubarmodedit.cpp:72
-#: pcbnew/menubarpcb.cpp:280
 msgid "3D Display"
 msgstr "3D显示"
 
+#: pcbnew/menubarpcb.cpp:308
 #: pcbnew/menubarmodedit.cpp:72
-#: pcbnew/menubarpcb.cpp:280
 msgid "Show Board in 3D Mode"
 msgstr "以3D方式显示电路板"
 
+#: pcbnew/menubarpcb.cpp:312
+#: eeschema/menubar.cpp:407
+#: cvpcb/tool_cvpcb.cpp:167
+#: gerbview/tool_gerber.cpp:154
+#: 3d-viewer/3d_toolbar.cpp:111
+msgid "&File"
+msgstr "文件(&F)"
+
+#: pcbnew/menubarpcb.cpp:313
+#: eeschema/menubar.cpp:411
+#: cvpcb/tool_cvpcb.cpp:168
+#: kicad/buildmnu.cpp:210
+#: gerbview/tool_gerber.cpp:155
+#: 3d-viewer/3d_toolbar.cpp:119
+msgid "&Preferences"
+msgstr "参数设置(&P)"
+
+#: pcbnew/menubarpcb.cpp:314
 #: pcbnew/menubarmodedit.cpp:76
-#: pcbnew/menubarpcb.cpp:286
 msgid "&Dimensions"
 msgstr "尺寸(&D)"
 
+#: pcbnew/menubarpcb.cpp:315
+#: gerbview/tool_gerber.cpp:156
+msgid "&Miscellaneous"
+msgstr "其他(&M)"
+
+#: pcbnew/menubarpcb.cpp:316
+msgid "P&ostprocess"
+msgstr "后期处理(&O)"
+
+#: pcbnew/menubarpcb.cpp:317
 #: pcbnew/menubarmodedit.cpp:77
-#: pcbnew/menubarpcb.cpp:289
 msgid "&3D Display"
 msgstr "&3D显示"
 
+#: pcbnew/menubarpcb.cpp:318
 #: pcbnew/menubarmodedit.cpp:78
-#: pcbnew/menubarpcb.cpp:290
-#: eeschema/menubar.cpp:191
+#: eeschema/menubar.cpp:412
 #: cvpcb/tool_cvpcb.cpp:169
 #: kicad/buildmnu.cpp:211
 #: gerbview/tool_gerber.cpp:159
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: pcbnew/class_marker.cpp:95
-msgid "Marker Error Text"
-msgstr "标记错误文本"
-
-#: pcbnew/gen_modules_placefile.cpp:76
-msgid "No Modules for Automated Placement"
-msgstr "没有要自动放置的模块"
-
-#: pcbnew/gen_modules_placefile.cpp:110
-msgid "Component side place file:"
-msgstr "元件面放置文件："
-
-#: pcbnew/gen_modules_placefile.cpp:113
-msgid "Copper side place file:"
-msgstr "铜箔面放置文件："
-
-#: pcbnew/gen_modules_placefile.cpp:116
-msgid "Module count"
-msgstr "模块数"
-
-#: pcbnew/class_module.cpp:1207
-msgid "Last Change"
-msgstr "最后更改"
-
-#: pcbnew/class_module.cpp:1246
-msgid "3D-Shape"
-msgstr "3D外形"
+#: pcbnew/zones_by_polygon.cpp:337
+#: pcbnew/zones_by_polygon.cpp:378
+#: pcbnew/zones_by_polygon.cpp:672
+msgid "Area: DRC outline error"
+msgstr "Area: DRC outline error"
 
-#: pcbnew/class_module.cpp:1250
-msgid "Doc:  "
-msgstr "说  明："
+#: pcbnew/zones_by_polygon.cpp:561
+msgid "DRC error: this start point is inside or too close an other area"
+msgstr "DRC错误: 开始点位于另一区域之内(或过于靠近另一区域)"
 
-#: pcbnew/class_module.cpp:1251
-msgid "KeyW: "
-msgstr "关键词："
+#: pcbnew/zones_by_polygon.cpp:620
+msgid "DRC error: closing this area creates a drc error with an other area"
+msgstr "DRC错误: 关闭该区域导致与其他区域发生DRC错误"
 
-#: pcbnew/globaleditpad.cpp:76
-msgid "Pads Global Edit"
-msgstr "焊盘全局编辑"
+#: pcbnew/zones_by_polygon.cpp:849
+msgid "No Net"
+msgstr "无网络"
 
-#: pcbnew/globaleditpad.cpp:94
-msgid "Pad Settings..."
-msgstr "焊盘设置 ..."
+#: pcbnew/dialog_general_options.cpp:263
+#: gerbview/options.cpp:175
+msgid "No Display"
+msgstr "不显示"
 
-#: pcbnew/globaleditpad.cpp:99
-msgid "Change Module"
-msgstr "改变模块"
+#: pcbnew/dialog_general_options.cpp:267
+#: gerbview/options.cpp:177
+msgid "Display Polar Coord"
+msgstr "显示极坐标"
 
-#: pcbnew/globaleditpad.cpp:104
-msgid "Change Id Modules"
-msgstr "改变相同的模块"
+#: pcbnew/dialog_general_options.cpp:272
+#: gerbview/options.cpp:186
+msgid "millimeters"
+msgstr "mm"
 
-#: pcbnew/globaleditpad.cpp:114
-msgid "Pad Filter :"
-msgstr "焊盘过滤："
+#: pcbnew/dialog_general_options.cpp:275
+#: eeschema/dialog_options.cpp:248
+#: gerbview/options.cpp:187
+msgid "Units"
+msgstr "单位"
 
-#: pcbnew/globaleditpad.cpp:118
-msgid "Shape Filter"
-msgstr "形状"
+#: pcbnew/dialog_general_options.cpp:280
+#: gerbview/options.cpp:193
+msgid "Small"
+msgstr "小"
 
-#: pcbnew/globaleditpad.cpp:122
-msgid "Layer Filter"
-msgstr "层"
+#: pcbnew/dialog_general_options.cpp:281
+#: gerbview/options.cpp:193
+msgid "Big"
+msgstr "大"
 
-#: pcbnew/globaleditpad.cpp:126
-msgid "Orient Filter"
-msgstr "方向"
+#: pcbnew/dialog_general_options.cpp:284
+#: gerbview/options.cpp:194
+msgid "Cursor"
+msgstr "光标"
 
-#: pcbnew/globaleditpad.cpp:132
-msgid "Change Items :"
-msgstr "改变的内容："
+#: pcbnew/dialog_general_options.cpp:291
+msgid "Number of Layers:"
+msgstr "层数: "
 
-#: pcbnew/globaleditpad.cpp:136
-msgid "Change Size"
-msgstr "大小"
+#: pcbnew/dialog_general_options.cpp:298
+#, fuzzy
+msgid "Max Links:"
+msgstr "Max Links:"
 
-#: pcbnew/globaleditpad.cpp:140
-msgid "Change Shape"
-msgstr "形状"
+#: pcbnew/dialog_general_options.cpp:305
+msgid "Auto Save (minuts):"
+msgstr "自动保存(分钟): "
 
-#: pcbnew/globaleditpad.cpp:144
-msgid "Change Drill"
-msgstr "钻孔"
+#: pcbnew/dialog_general_options.cpp:319
+msgid "Drc ON"
+msgstr "DRC 开启"
 
-#: pcbnew/globaleditpad.cpp:148
-msgid "Change Orient"
-msgstr "方向"
+#: pcbnew/dialog_general_options.cpp:324
+msgid "Show Ratsnest"
+msgstr "显示牵拉线"
 
-#: pcbnew/sel_layer.cpp:92
-msgid "Select Layer:"
-msgstr "选择层："
+#: pcbnew/dialog_general_options.cpp:328
+msgid "Show Mod Ratsnest"
+msgstr "显示模块牵拉线"
 
-#: pcbnew/sel_layer.cpp:137
-msgid "(Deselect)"
-msgstr "(不选择)"
+#: pcbnew/dialog_general_options.cpp:332
+msgid "Tracks Auto Del"
+msgstr "自动删除旧导线"
 
-#: pcbnew/sel_layer.cpp:238
-msgid "Less than two copper layers are being used."
-msgstr "使用的铜层少于两层。"
+#: pcbnew/dialog_general_options.cpp:336
+msgid "Track 45 Only"
+msgstr "导线仅允许45度倾斜"
 
-#: pcbnew/sel_layer.cpp:239
-msgid "Hence Layer Pairs cannot be specified."
-msgstr "所以无法设置过孔对应层。"
+#: pcbnew/dialog_general_options.cpp:340
+msgid "Segments 45 Only"
+msgstr "线段仅允许45度倾斜"
 
-#: pcbnew/sel_layer.cpp:263
-msgid "Select Layer Pair:"
-msgstr "选择工作层："
+#: pcbnew/dialog_general_options.cpp:344
+#: eeschema/dialog_options.cpp:239
+msgid "Auto PAN"
+msgstr "自动摇景"
 
-#: pcbnew/sel_layer.cpp:294
-msgid "Top Layer"
-msgstr "顶层"
+#: pcbnew/dialog_general_options.cpp:349
+#, fuzzy
+msgid "Double Segm Track"
+msgstr "Double Segm Track"
 
-#: pcbnew/sel_layer.cpp:299
-msgid "Bottom Layer"
-msgstr "底层"
+#: pcbnew/dialog_general_options.cpp:356
+msgid "When creating tracks"
+msgstr "当创建新导线时"
 
-#: pcbnew/sel_layer.cpp:358
-msgid "The Top Layer and Bottom Layer must differ"
-msgstr "顶层和底层必须不同"
+#: pcbnew/dialog_general_options.cpp:360
+msgid "Magnetic Pads"
+msgstr "磁性焊盘"
 
-#: pcbnew/dialog_track_options.cpp:125
-msgid "Via Size"
-msgstr "过孔大小"
+#: pcbnew/dialog_general_options.cpp:362
+msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area"
+msgstr "鼠标光标移动到焊盘区域时, 对光标的捕捉特性"
 
-#: pcbnew/dialog_track_options.cpp:131
-msgid "Default Via Drill"
-msgstr "默认过孔钻孔"
+#: pcbnew/dialog_netlist.cpp:136
+msgid "Timestamp"
+msgstr "时间印记"
 
-#: pcbnew/dialog_track_options.cpp:137
-msgid "Alternate Via Drill"
-msgstr "备用过孔钻孔"
+#: pcbnew/dialog_netlist.cpp:137
+msgid "Module Selection:"
+msgstr "模块选择:"
 
-#: pcbnew/dialog_track_options.cpp:146
-#: pcbnew/pcbnew.h:289
-msgid "Blind Via"
-msgstr "盲孔"
+#: pcbnew/dialog_netlist.cpp:142
+#: pcbnew/dialog_netlist.cpp:149
+msgid "Keep"
+msgstr "保留"
 
-#: pcbnew/dialog_track_options.cpp:147
-#: pcbnew/pcbnew.h:290
-msgid "Buried Via"
-msgstr "埋孔"
+#: pcbnew/dialog_netlist.cpp:144
+msgid "Bad Tracks Deletion:"
+msgstr "错误连线删除:"
 
-#: pcbnew/dialog_track_options.cpp:148
-#: pcbnew/pcbnew.h:291
-msgid "Standard Via"
-msgstr "标准过孔"
+#: pcbnew/dialog_netlist.cpp:150
+msgid "Change"
+msgstr "更换"
 
-#: pcbnew/dialog_track_options.cpp:150
-msgid "Via Type"
-msgstr "过孔类型"
+#: pcbnew/dialog_netlist.cpp:151
+msgid "Exchange Module:"
+msgstr "更换模块:"
 
-#: pcbnew/dialog_track_options.cpp:158
-msgid "Track Width"
-msgstr "导线宽度"
+#: pcbnew/dialog_netlist.cpp:155
+msgid "Display Warnings"
+msgstr "显示警告"
 
-#: pcbnew/dialog_track_options.cpp:170
-msgid "Mask clearance"
-msgstr "阻焊间隔"
+#: pcbnew/dialog_netlist.cpp:164
+msgid "Select"
+msgstr "选择"
 
-#: pcbnew/dialog_track_options.cpp:257
-msgid ""
-"You have selected VIA Blind or VIA Buried\n"
-"WARNING: this feature is EXPERIMENTAL!!! Accept ?"
-msgstr ""
-"你选择了盲孔焊盘或埋孔焊盘。\n"
-"警告：该特性尚处试验阶段！是否继续？"
+#: pcbnew/dialog_netlist.cpp:168
+msgid "Read"
+msgstr "读取"
 
-#: pcbnew/menubarpcb.cpp:42
-msgid "Load Board    Ctrl-O"
-msgstr "载入电路板    Ctrl-O"
+#: pcbnew/dialog_netlist.cpp:172
+msgid "Module Test"
+msgstr "模块测试"
 
-#: pcbnew/menubarpcb.cpp:43
-msgid "Delete old Board and Load new Board"
-msgstr "放弃当前的电路板加载一个新的电路板"
+#: pcbnew/dialog_netlist.cpp:176
+msgid "Compile"
+msgstr "编译"
 
-#: pcbnew/menubarpcb.cpp:48
-msgid "Append Board"
-msgstr "添加电路板"
+#: pcbnew/menubarmodedit.cpp:40
+msgid "Sizes and Widths"
+msgstr "大小和宽度"
 
-#: pcbnew/menubarpcb.cpp:49
-msgid "Add Board to old Board"
-msgstr "向原有电路板添加电路板"
+#: eeschema/libedit.cpp:38
+msgid " Part:   "
+msgstr " 部件:   "
 
-#: pcbnew/menubarpcb.cpp:54
-msgid "&New board"
-msgstr "新建电路板 (&N)"
+#: eeschema/libedit.cpp:52
+msgid "   Convert"
+msgstr "   转换"
 
-#: pcbnew/menubarpcb.cpp:55
-msgid "Clear old PCB and init a new one"
-msgstr "清除当前的 PCB，建立一个新的空 PCB"
+#: eeschema/libedit.cpp:53
+msgid "   Normal"
+msgstr "   普通"
 
-#: pcbnew/menubarpcb.cpp:60
-msgid "&Rescue"
-msgstr "挽救(&Rescue)"
+#: eeschema/libedit.cpp:56
+msgid "  (Power Symbol)"
+msgstr "  (电源符号)"
 
-#: pcbnew/menubarpcb.cpp:61
-msgid "Clear old board and get last rescue file"
-msgstr "清空电路板，载入最后的挽救文件"
+#: eeschema/libedit.cpp:90
+msgid ""
+"Current Part not saved.\n"
+"Continue?"
+msgstr ""
+"当前部件还没有保存。\n"
+"是否继续?"
 
-#: pcbnew/menubarpcb.cpp:66
-msgid "&Previous version"
-msgstr "前一个版本(&P)"
+#: eeschema/libedit.cpp:112
+#: eeschema/libedit.cpp:389
+msgid "Component \""
+msgstr "元件 \""
 
-#: pcbnew/menubarpcb.cpp:67
-msgid "Clear old board and get old version of board"
-msgstr "清空电路板，恢复到先前的版本"
+#: eeschema/libedit.cpp:112
+msgid "\" not found."
+msgstr "\" 没有找到。"
 
-#: pcbnew/menubarpcb.cpp:74
-msgid "&Save board    Ctrl-S"
-msgstr "保存电路板 (Ctrl S)"
+#: eeschema/libedit.cpp:234
+msgid "Modify Library File \""
+msgstr "更改库文件 \""
 
-#: pcbnew/menubarpcb.cpp:75
-msgid "Save current board"
-msgstr "保存当前的电路板"
+#: eeschema/libedit.cpp:234
+msgid "\"?"
+msgstr "\"?"
 
-#: pcbnew/menubarpcb.cpp:80
-msgid "Save Board as.."
-msgstr "电路板另存为.."
+#: eeschema/libedit.cpp:243
+msgid "Error while saving Library File \""
+msgstr "保存库文件时发生错误 \""
 
-#: pcbnew/menubarpcb.cpp:81
-msgid "Save current board as.."
-msgstr "把当前的电路板另存为.."
+#: eeschema/libedit.cpp:243
+#: eeschema/libedit.cpp:390
+msgid "\"."
+msgstr "\"。"
 
-#: pcbnew/menubarpcb.cpp:88
-#: eeschema/menubar.cpp:72
-#: gerbview/tool_gerber.cpp:88
-msgid "P&rint"
-msgstr "打印(&R)"
+#: eeschema/libedit.cpp:249
+msgid "Library File \""
+msgstr "库文件 \""
 
-#: pcbnew/menubarpcb.cpp:88
-#: eeschema/menubar.cpp:72
-#: gerbview/tool_gerber.cpp:88
-msgid "Print on current printer"
-msgstr "用当前打印机打印"
+#: eeschema/libedit.cpp:251
+msgid "Document File \""
+msgstr "说明文件 \""
 
-#: pcbnew/menubarpcb.cpp:93
-#: eeschema/menubar.cpp:102
-msgid "&Plot"
-msgstr "绘图输出(&Plot)"
+#: eeschema/libedit.cpp:304
+msgid "No Active Library"
+msgstr "没有活动的库"
 
-#: pcbnew/menubarpcb.cpp:94
-msgid "Plot (HPGL, PostScript, or Gerber format)"
-msgstr "Plot绘图（HPGL，PostScript，或 Gerber 格式）"
+#: eeschema/libedit.cpp:320
+#, c-format
+msgid "Select Component (%d items)"
+msgstr "选择元件 (%d 项)"
 
-#: pcbnew/menubarpcb.cpp:102
-msgid "&GenCAD"
-msgstr "&GenCAD"
+#: eeschema/libedit.cpp:343
+msgid "Component not found"
+msgstr "元件没有找到"
 
-#: pcbnew/menubarpcb.cpp:102
-msgid "Export GenCAD Format"
-msgstr "导出 GenCAD 格式"
+#: eeschema/libedit.cpp:347
+msgid "Delete component \""
+msgstr "删除元件 \""
 
-#: pcbnew/menubarpcb.cpp:106
-msgid "&Module report"
-msgstr "模块报告(&M)"
+#: eeschema/libedit.cpp:348
+msgid "\" from library \""
+msgstr "\" 从库 \""
 
-#: pcbnew/menubarpcb.cpp:106
-msgid "Create a pcb report (footprint report)"
-msgstr "生成一个PCB报告（封装报告）"
+#: eeschema/libedit.cpp:372
+msgid "Clear old component from screen (changes will be lost)?"
+msgstr "是否清除屏幕上的元件(所有修改将被丢弃)?"
 
-#: pcbnew/menubarpcb.cpp:110
-msgid "E&xport"
-msgstr "导出(&X)"
+#: eeschema/libedit.cpp:390
+msgid "\" exists in library \""
+msgstr "\" 存在于库 \""
 
-#: pcbnew/menubarpcb.cpp:110
-msgid "Export board"
-msgstr "导出电路板"
+#: eeschema/libedit.cpp:557
+msgid "No component to Save."
+msgstr "没有需要保存的元件。"
 
-#: pcbnew/menubarpcb.cpp:116
-msgid "Add new footprints"
-msgstr "添加新封装"
+#: eeschema/libedit.cpp:564
+msgid "No Library specified."
+msgstr "没有指定库。"
 
-#: pcbnew/menubarpcb.cpp:117
-msgid "Archive new footprints only in a library (keep other footprints in this lib)"
-msgstr "将新封装存档于一个库文件（库中原有封装保留）"
+#: eeschema/libedit.cpp:575
+#, c-format
+msgid "Component \"%s\" exists. Change it?"
+msgstr "元件 \"%s\" 已经存在。是否更改它?"
 
-#: pcbnew/menubarpcb.cpp:121
-msgid "Create footprint archive"
-msgstr "生成封装存档"
+#: eeschema/libedit.cpp:614
+#, c-format
+msgid "Component %s saved in %s"
+msgstr "元件 %s 保存于 %s"
 
-#: pcbnew/menubarpcb.cpp:122
-msgid "Archive all footprints  in a library(old lib will be deleted)"
-msgstr "将所有封装存档于一个库文件（旧的库将被删除）"
+#: eeschema/class_drawsheet.cpp:178
+msgid "Ok to cleanup this sheet"
+msgstr "是否确定清理此图"
 
-#: pcbnew/menubarpcb.cpp:127
-msgid "Archive footprints"
-msgstr "封装存档"
+#: eeschema/class_drawsheet.cpp:659
+#, c-format
+msgid "%8.8lX/"
+msgstr ""
 
-#: pcbnew/menubarpcb.cpp:128
-msgid "Archive or Add footprints in a library file"
-msgstr "将封装存档或添加到一个库文件"
+#: eeschema/dialog_cmp_graphic_properties.cpp:155
+#: eeschema/pinedit-dialog.cpp:258
+#: eeschema/symbtext.cpp:159
+msgid "Common to Units"
+msgstr "各单元共用"
 
-#: pcbnew/menubarpcb.cpp:132
-#: eeschema/menubar.cpp:105
-#: cvpcb/tool_cvpcb.cpp:125
-#: kicad/buildmnu.cpp:130
-#: gerbview/tool_gerber.cpp:93
-msgid "E&xit"
-msgstr "退出(&E)"
+#: eeschema/dialog_cmp_graphic_properties.cpp:159
+#: eeschema/pinedit-dialog.cpp:262
+#: eeschema/symbtext.cpp:163
+msgid "Common to convert"
+msgstr "转换形态共用"
 
-#: pcbnew/menubarpcb.cpp:132
-msgid "Quit pcbnew"
-msgstr "退出 pcbnew"
+#: eeschema/dialog_cmp_graphic_properties.cpp:167
+msgid "Void"
+msgstr "空"
 
-#: pcbnew/menubarpcb.cpp:150
-#: eeschema/menubar.cpp:139
-msgid "&Libs and Dir"
-msgstr "库和目录设置(&L)"
+#: eeschema/dialog_cmp_graphic_properties.cpp:169
+msgid "BgFilled"
+msgstr "背景填充色"
 
-#: pcbnew/menubarpcb.cpp:151
-#: eeschema/menubar.cpp:140
-#: cvpcb/tool_cvpcb.cpp:140
-msgid "Setting Libraries, Directories and others..."
-msgstr "设置库文件，目录等 ..."
+#: eeschema/dialog_cmp_graphic_properties.cpp:171
+msgid "Fill:"
+msgstr "填充: "
 
-#: pcbnew/menubarpcb.cpp:155
-#: eeschema/menubar.cpp:145
-#: gerbview/tool_gerber.cpp:108
-msgid "&Colors"
-msgstr "颜色(&C)"
+#: eeschema/eeconfig.cpp:74
+#: kicad/files-io.cpp:131
+#: gerbview/dcode.cpp:260
+#: gerbview/readgerb.cpp:145
+msgid "File "
+msgstr "文件"
 
-#: pcbnew/menubarpcb.cpp:156
-msgid "Select Colors and Display for PCB items"
-msgstr "选择 PCB 的显示颜色"
+#: eeschema/eeconfig.cpp:74
+msgid "not found"
+msgstr "未找到"
 
-#: pcbnew/menubarpcb.cpp:160
-msgid "&General Options"
-msgstr "基本选项(&G)"
+#: eeschema/hotkeys.cpp:251
+#: eeschema/schedit.cpp:160
+msgid "Add Component"
+msgstr "添加 元件"
 
-#: pcbnew/menubarpcb.cpp:161
-msgid "Select general options for pcbnew"
-msgstr "Pcbnew 的基本选项设置"
+#: eeschema/hotkeys.cpp:273
+#: eeschema/schedit.cpp:108
+msgid "Add Wire"
+msgstr "添加 导线"
 
-#: pcbnew/menubarpcb.cpp:165
-msgid "&Display Options"
-msgstr "显示选项(&D)"
+#: eeschema/pinedit-dialog.cpp:233
+msgid "Pin Name :"
+msgstr "引脚名称:"
 
-#: pcbnew/menubarpcb.cpp:166
-msgid "Select what items are displayed"
-msgstr "选择被显示的项目"
+#: eeschema/pinedit-dialog.cpp:239
+msgid "Pin Num :"
+msgstr "引脚编号:"
 
-#: pcbnew/menubarpcb.cpp:176
-#: eeschema/menubar.cpp:163
-msgid "&Save preferences"
-msgstr "保存参数设置(&S)"
+#: eeschema/pinedit-dialog.cpp:247
+msgid " Pin Options :"
+msgstr " 引脚选项:"
 
-#: pcbnew/menubarpcb.cpp:177
-#: eeschema/menubar.cpp:164
-#: gerbview/tool_gerber.cpp:123
-msgid "Save application preferences"
-msgstr "保存参数设置"
+#: eeschema/pinedit-dialog.cpp:252
+msgid "Pin lenght :"
+msgstr "引脚长度:"
 
-#: pcbnew/menubarpcb.cpp:181
-#: eeschema/menubar.cpp:167
-msgid "&Read preferences"
-msgstr "读取参数设置(&R)"
+#: eeschema/pinedit-dialog.cpp:266
+msgid "No Draw"
+msgstr "无图形"
 
-#: pcbnew/menubarpcb.cpp:182
-#: eeschema/menubar.cpp:168
-msgid "Read application preferences"
-msgstr "读取参数设置"
+#: eeschema/pinedit-dialog.cpp:288
+#: eeschema/affiche.cpp:113
+#: eeschema/dialog_edit_label.cpp:146
+msgid "Right"
+msgstr " 向右"
 
-#: pcbnew/menubarpcb.cpp:194
-msgid "Tracks and Vias"
-msgstr "导线和过孔"
+#: eeschema/pinedit-dialog.cpp:289
+#: eeschema/affiche.cpp:110
+#: eeschema/dialog_edit_label.cpp:148
+msgid "Left"
+msgstr " 向左"
 
-#: pcbnew/menubarpcb.cpp:195
-msgid "Adjust size and width for tracks, vias"
-msgstr "调整导线和过孔的大小及宽度"
+#: eeschema/pinedit-dialog.cpp:290
+#: eeschema/affiche.cpp:104
+#: eeschema/dialog_edit_label.cpp:147
+msgid "Up"
+msgstr " 向上"
 
-#: pcbnew/menubarpcb.cpp:204
-#: pcbnew/dialog_graphic_items_options.h:38
-msgid "Texts and Drawings"
-msgstr "文字和图形"
+#: eeschema/pinedit-dialog.cpp:291
+#: eeschema/affiche.cpp:107
+#: eeschema/dialog_edit_label.cpp:149
+msgid "Down"
+msgstr " 向下"
 
-#: pcbnew/menubarpcb.cpp:215
-#: gerbview/tool_gerber.cpp:122
-msgid "&Save Setup"
-msgstr "保存设置(&S)"
+#: eeschema/pinedit-dialog.cpp:293
+msgid "Pin Orient:"
+msgstr "引脚方向:"
 
-#: pcbnew/menubarpcb.cpp:216
-msgid "Save options in current directory"
-msgstr "将选项保存在当前目录"
+#: eeschema/pinedit-dialog.cpp:317
+#: eeschema/pinedit.cpp:22
+msgid "line"
+msgstr "线"
 
-#: pcbnew/menubarpcb.cpp:225
-msgid "Create &Modules Pos"
-msgstr "生成模块位置文件(&M)"
+#: eeschema/pinedit-dialog.cpp:318
+#: eeschema/pinedit.cpp:22
+msgid "invert"
+msgstr "反相"
 
-#: pcbnew/menubarpcb.cpp:226
-msgid "Gen Position modules file"
-msgstr "生成模块位置信息文件"
+#: eeschema/pinedit-dialog.cpp:319
+#: eeschema/pinedit.cpp:22
+msgid "clock"
+msgstr "时钟"
 
-#: pcbnew/menubarpcb.cpp:230
-msgid "Create &Drill file"
-msgstr "生成钻孔文件(&D)"
+#: eeschema/pinedit-dialog.cpp:320
+#: eeschema/pinedit.cpp:22
+msgid "clock inv"
+msgstr "反相时钟"
 
-#: pcbnew/menubarpcb.cpp:231
-msgid "Gen Drill (EXCELLON] file and/or Drill sheet"
-msgstr "生成钻孔文件[EXCELLON]或钻孔表格"
+#: eeschema/pinedit-dialog.cpp:321
+#: eeschema/pinedit.cpp:23
+msgid "low in"
+msgstr "低输入"
 
-#: pcbnew/menubarpcb.cpp:235
-msgid "Create &Cmp file"
-msgstr "生成元件文件(&C)"
+#: eeschema/pinedit-dialog.cpp:322
+#: eeschema/pinedit.cpp:23
+msgid "low clock"
+msgstr "低时钟"
 
-#: pcbnew/menubarpcb.cpp:236
-msgid "Recreate .cmp file for CvPcb"
-msgstr "为 CvPcb 重新生成.cmp 文件"
+#: eeschema/pinedit-dialog.cpp:323
+#: eeschema/pinedit.cpp:23
+msgid "low out"
+msgstr "低输出"
 
-#: pcbnew/menubarpcb.cpp:244
-msgid "Global &Deletions"
-msgstr "全局删除(&D)"
+#: eeschema/pinedit-dialog.cpp:325
+msgid "Pin Shape:"
+msgstr "引脚形状:"
 
-#: pcbnew/menubarpcb.cpp:245
-msgid "Delete Tracks, Modules, Texts... on Board"
-msgstr "删除电路板上面的导线，模块，文字 ..."
+#: eeschema/pinedit-dialog.cpp:331
+#: eeschema/dialog_edit_label.cpp:157
+msgid "Input"
+msgstr "输入"
 
-#: pcbnew/menubarpcb.cpp:249
-msgid "&List nets"
-msgstr "列出网络(&L)"
+#: eeschema/pinedit-dialog.cpp:332
+#: eeschema/dialog_edit_label.cpp:158
+msgid "Output"
+msgstr "输出"
 
-#: pcbnew/menubarpcb.cpp:250
-msgid "List nets (names and id)"
-msgstr "列出网络（names and id）"
+#: eeschema/pinedit-dialog.cpp:333
+#: eeschema/dialog_edit_label.cpp:159
+msgid "Bidi"
+msgstr "双向"
 
-#: pcbnew/menubarpcb.cpp:254
-msgid "&Track operations"
-msgstr "导线操作(&T)"
+#: eeschema/pinedit-dialog.cpp:334
+msgid "3 States"
+msgstr "三态"
 
-#: pcbnew/menubarpcb.cpp:255
-msgid "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias"
-msgstr "清理残留，过孔，删除断点，连接悬空导线"
+#: eeschema/pinedit-dialog.cpp:335
+#: eeschema/dialog_edit_label.cpp:161
+msgid "Passive"
+msgstr "被动"
 
-#: pcbnew/menubarpcb.cpp:259
-msgid "&Swap layers"
-msgstr "层交换(&S)"
+#: eeschema/pinedit-dialog.cpp:336
+msgid "Unspecified"
+msgstr "未定义"
 
-#: pcbnew/menubarpcb.cpp:260
-msgid "Swap tracks on copper layers or drawings on others layers"
-msgstr "交换铜层上的导线或其他层上的图形"
+#: eeschema/pinedit-dialog.cpp:337
+msgid "Power In"
+msgstr "电源入"
 
-#: pcbnew/menubarpcb.cpp:284
-#: eeschema/menubar.cpp:188
-#: cvpcb/tool_cvpcb.cpp:167
-#: gerbview/tool_gerber.cpp:154
-#: 3d-viewer/3d_toolbar.cpp:111
-msgid "&File"
-msgstr "文件(&F)"
+#: eeschema/pinedit-dialog.cpp:338
+msgid "Power Out"
+msgstr "电源出"
 
-#: pcbnew/menubarpcb.cpp:285
-#: eeschema/menubar.cpp:190
-#: cvpcb/tool_cvpcb.cpp:168
-#: kicad/buildmnu.cpp:210
-#: gerbview/tool_gerber.cpp:155
-#: 3d-viewer/3d_toolbar.cpp:119
-msgid "&Preferences"
-msgstr "参数设置(&P)"
+#: eeschema/pinedit-dialog.cpp:339
+msgid "Open coll"
+msgstr "集电极开路"
 
-#: pcbnew/menubarpcb.cpp:287
-#: gerbview/tool_gerber.cpp:156
-msgid "&Miscellaneous"
-msgstr "其他(&M)"
+#: eeschema/pinedit-dialog.cpp:340
+msgid "Open emit"
+msgstr "发射极开路"
 
-#: pcbnew/menubarpcb.cpp:288
-msgid "P&ostprocess"
-msgstr "后期处理(&O)"
+#: eeschema/pinedit-dialog.cpp:342
+msgid "Electrical Type:"
+msgstr "电气类型:"
 
-#: pcbnew/edit_track_width.cpp:85
-msgid "Change track width (entire NET) ?"
-msgstr "改变 导线 宽度（整个网络）？"
+#: eeschema/erc.cpp:290
+msgid "Annotation Required!"
+msgstr "需要先对图进行标注!"
 
-#: pcbnew/move_or_drag_track.cpp:709
-msgid "Unable to drag this segment: too many segments connected"
-msgstr "无法拖动该线段：连接的线段过多"
+#: eeschema/erc.cpp:394
+msgid "ERC file:"
+msgstr "ERC文件: "
 
-#: pcbnew/move_or_drag_track.cpp:762
-msgid "Unable to drag this segment: two collinear segments"
-msgstr "无法拖动该线段：因为是两条重合的线段"
+#: eeschema/erc.cpp:547
+#, c-format
+msgid "Warning HLabel %s not connected to SheetLabel"
+msgstr "警告 层次标签 %s 没有连接到图标签"
 
-#: pcbnew/class_board.cpp:317
-msgid "Nodes"
-msgstr "节点"
+#: eeschema/erc.cpp:551
+#, c-format
+msgid "Warning SheetLabel %s not connected to HLabel"
+msgstr "警告 图标签 %s 没有连接到层次标签"
 
-#: pcbnew/class_board.cpp:320
-msgid "Links"
-msgstr "链接"
+#: eeschema/erc.cpp:565
+#, c-format
+msgid "Warning Pin %s Unconnected"
+msgstr "警告 %s 引脚未连接"
 
-#: pcbnew/class_board.cpp:323
-msgid "Nets"
-msgstr "网络"
+#: eeschema/erc.cpp:574
+#, c-format
+msgid "Warning Pin %s not driven (Net %d)"
+msgstr "警告 %s 引脚未被驱动(网络 %d)"
 
-#: pcbnew/class_board.cpp:326
-msgid "Connect"
-msgstr "连接"
+#: eeschema/erc.cpp:584
+msgid "Warning More than 1 Pin connected to UnConnect symbol"
+msgstr "警告 有超过1个以上的引脚连接到了不连接符号"
 
-#: pcbnew/class_board.cpp:329
-#: eeschema/eelayer.h:116
-msgid "NoConn"
-msgstr "无连接"
+#: eeschema/erc.cpp:594
+#: common/confirm.cpp:84
+msgid "Warning"
+msgstr "警告"
+
+#: eeschema/erc.cpp:597
+#: common/confirm.cpp:88
+msgid "Error"
+msgstr "错误"
 
-#: pcbnew/move-drag_pads.cpp:251
+#: eeschema/erc.cpp:603
 #, c-format
-msgid "Delete Pad (module %s %s) "
-msgstr "删除焊盘（模块 %s %s） "
+msgid "%s: Pin %s connected to Pin %s (net %d)"
+msgstr "%s: %s 引脚连接到了 %s 引脚(网络 %d)"
 
-#: eeschema/schedit.cpp:282
-msgid "Push/Pop Hierarchy"
-msgstr "压入/弹出 原理图层次"
+#: eeschema/erc.cpp:722
+msgid "ERC control"
+msgstr "ERC 控制"
 
-#: eeschema/schedit.cpp:286
-msgid "Add NoConnect Flag"
-msgstr "添加 无连接标志"
+#: eeschema/erc.cpp:731
+msgid ""
+"\n"
+"***** Sheet Root\n"
+msgstr ""
+"\n"
+"***** 根图\n"
 
-#: eeschema/schedit.cpp:290
-#: eeschema/hotkeys.cpp:262
-msgid "Add Wire"
-msgstr "添加 导线"
+#: eeschema/erc.cpp:734
+#, c-format
+msgid ""
+"\n"
+"***** Sheet %s\n"
+msgstr ""
+"\n"
+"***** 图 %s\n"
 
-#: eeschema/schedit.cpp:294
-msgid "Add Bus"
-msgstr "添加 总线"
+#: eeschema/erc.cpp:751
+#, fuzzy, c-format
+msgid "ERC: %s (X= %2.3f inches, Y= %2.3f inches\n"
+msgstr "ERC: %s (X= %2.3f inches, Y= %2.3f inches\n"
 
-#: eeschema/schedit.cpp:302
-msgid "Add Junction"
-msgstr "添加 电气连接点"
+#: eeschema/erc.cpp:760
+#, c-format
+msgid ""
+"\n"
+" >> Errors ERC: %d\n"
+msgstr ""
+"\n"
+" >> ERC错误: %d\n"
 
-#: eeschema/schedit.cpp:306
-msgid "Add Label"
-msgstr "添加 标签"
+#: eeschema/component_class.cpp:58
+#: eeschema/affiche.cpp:39
+msgid "Ref"
+msgstr "索引"
 
-#: eeschema/schedit.cpp:310
-msgid "Add Global label"
-msgstr "添加 全局标签"
+#: eeschema/component_class.cpp:61
+#: eeschema/eelayer.h:171
+msgid "Sheet"
+msgstr "图"
 
-#: eeschema/schedit.cpp:318
-msgid "Add Wire to Bus Entry"
-msgstr "添加 Wire to Bus Entry"
+#: eeschema/component_class.cpp:62
+#: eeschema/component_class.cpp:63
+#: eeschema/component_class.cpp:64
+#: eeschema/component_class.cpp:65
+#: eeschema/component_class.cpp:66
+#: eeschema/component_class.cpp:67
+#: eeschema/component_class.cpp:68
+#: eeschema/component_class.cpp:69
+#: eeschema/dialog_build_BOM.cpp:1143
+msgid "Field"
+msgstr "域"
 
-#: eeschema/schedit.cpp:322
-msgid "Add Bus to Bus entry"
-msgstr "添加 Bus to Bus entry"
+#: eeschema/component_class.cpp:232
+#: eeschema/dialog_create_component.cpp:168
+#, fuzzy
+msgid "U"
+msgstr "U"
 
-#: eeschema/schedit.cpp:326
-msgid "Add Sheet"
-msgstr "添加 Sheet"
+#: eeschema/save_schemas.cpp:72
+#: eeschema/files-io.cpp:124
+msgid "Schematic files:"
+msgstr "原理图文件: "
 
-#: eeschema/schedit.cpp:330
-msgid "Add PinSheet"
-msgstr "添加 PinSheet"
+#: eeschema/save_schemas.cpp:95
+#: eeschema/netform.cpp:57
+#: eeschema/netform.cpp:260
+msgid "Failed to create file "
+msgstr "建立文件失败"
 
-#: eeschema/schedit.cpp:334
-msgid "Import PinSheet"
-msgstr "导入 PinSheet"
+#: eeschema/save_schemas.cpp:100
+msgid "Save file "
+msgstr "保存文件"
 
-#: eeschema/schedit.cpp:338
-#: eeschema/hotkeys.cpp:240
-msgid "Add Component"
-msgstr "添加 元件"
+#: eeschema/save_schemas.cpp:116
+#: eeschema/save_schemas.cpp:310
+msgid "File write operation failed."
+msgstr "文件写入操作失败。"
 
-#: eeschema/schedit.cpp:342
-msgid "Add Power"
-msgstr "添加 电源端口"
+#: eeschema/eeschema.cpp:55
+msgid "Eeschema is already running, Continue?"
+msgstr "eeschema 已经在运行中, 是否继续?"
 
-#: eeschema/netlist.cpp:157
-#: eeschema/netlist.cpp:191
-#: eeschema/dialog_build_BOM.cpp:271
+#: eeschema/netlist.cpp:165
+#: eeschema/netlist.cpp:197
+#: eeschema/dialog_build_BOM.cpp:255
 msgid "List"
 msgstr "列表"
 
-#: eeschema/netlist.cpp:179
+#: eeschema/netlist.cpp:184
 msgid "No component"
 msgstr "无元件"
 
-#: eeschema/netlist.cpp:200
-#: eeschema/netlist.cpp:305
-#: eeschema/netlist.cpp:343
-#: eeschema/netlist.cpp:364
-#: eeschema/netlist.cpp:379
+#: eeschema/netlist.cpp:206
+#: eeschema/netlist.cpp:313
+#: eeschema/netlist.cpp:353
+#: eeschema/netlist.cpp:374
+#: eeschema/netlist.cpp:389
 msgid "Done"
 msgstr "完成"
 
-#: eeschema/netlist.cpp:203
+#: eeschema/netlist.cpp:209
+#, fuzzy
 msgid "NbItems"
 msgstr "NbItems"
 
-#: eeschema/netlist.cpp:310
+#: eeschema/netlist.cpp:318
 msgid "Labels"
 msgstr "标签"
 
-#: eeschema/netlist.cpp:346
+#: eeschema/netlist.cpp:356
 msgid "Hierar."
 msgstr "层次"
 
-#: eeschema/netlist.cpp:367
+#: eeschema/netlist.cpp:377
 msgid "Sorting"
 msgstr "排序"
 
-#: eeschema/netlist.cpp:808
+#: eeschema/netlist.cpp:811
 msgid "Bad Bus Label: "
-msgstr "不良的总线标签："
+msgstr "不良的总线标签: "
 
-#: eeschema/symbtext.cpp:130
-msgid " Text : "
-msgstr " 文本："
+#: eeschema/find.cpp:214
+msgid "Pin "
+msgstr "引脚 "
 
-#: eeschema/symbtext.cpp:149
-msgid "Size:"
-msgstr "大小："
+#: eeschema/find.cpp:218
+msgid "Ref "
+msgstr "索引 "
 
-#: eeschema/symbtext.cpp:155
-msgid " Text Options : "
-msgstr " 文本选项："
+#: eeschema/find.cpp:226
+msgid "Field "
+msgstr "域 "
 
-#: eeschema/symbtext.cpp:159
-#: eeschema/dialog_cmp_graphic_properties.cpp:155
-#: eeschema/pinedit-dialog.cpp:258
-msgid "Common to Units"
-msgstr "各单元共用"
+#: eeschema/find.cpp:236
+#: eeschema/find.cpp:240
+msgid " found"
+msgstr " 找到"
 
-#: eeschema/symbtext.cpp:163
-#: eeschema/dialog_cmp_graphic_properties.cpp:159
-#: eeschema/pinedit-dialog.cpp:262
-msgid "Common to convert"
-msgstr "转换形态共用"
+#: eeschema/find.cpp:373
+#, c-format
+msgid "Marker %d found in %s"
+msgstr "标记 %d 在 %s 中找到"
 
-#: eeschema/symbtext.cpp:167
-#: eeschema/dialog_edit_component_in_schematic.cpp:215
-#: eeschema/edit_component_in_lib.cpp:502
-msgid "Vertical"
-msgstr "垂直"
+#: eeschema/find.cpp:379
+msgid "Marker Not Found"
+msgstr "没有找到标记"
 
-#: eeschema/plothpgl.cpp:205
-msgid "Sheet Size"
-msgstr "按图定义大小"
+#: eeschema/find.cpp:611
+msgid " Found in "
+msgstr " 找到, 在 "
 
-#: eeschema/plothpgl.cpp:206
-#: eeschema/plotps.cpp:170
-msgid "Page Size A4"
-msgstr "页面大小 A4"
+#: eeschema/find.cpp:623
+msgid " Not Found"
+msgstr " 没有找到"
 
-#: eeschema/plothpgl.cpp:207
-msgid "Page Size A3"
-msgstr "页面大小 A3"
+#: eeschema/find.cpp:655
+#: eeschema/selpart.cpp:39
+msgid "No libraries are loaded"
+msgstr "没有加载任何库"
 
-#: eeschema/plothpgl.cpp:208
-msgid "Page Size A2"
-msgstr "页面大小 A2"
+#: eeschema/find.cpp:682
+#: eeschema/find.cpp:747
+#: eeschema/find.cpp:763
+msgid "Found "
+msgstr "找到 "
+
+#: eeschema/find.cpp:684
+#: eeschema/find.cpp:748
+#: eeschema/find.cpp:764
+msgid " in lib "
+msgstr " 在库 "
+
+#: eeschema/find.cpp:695
+msgid " found only in cache"
+msgstr " 仅在缓存中找到"
+
+#: eeschema/find.cpp:698
+msgid ""
+"\n"
+"Explore All Libraries?"
+msgstr ""
+"\n"
+"检索所有的库?"
+
+#: eeschema/find.cpp:704
+msgid "Nothing found"
+msgstr "没有找到任何内容"
+
+#: eeschema/selpart.cpp:45
+msgid "Select Lib"
+msgstr "选择库"
+
+#: eeschema/selpart.cpp:94
+#, c-format
+msgid "Select component (%d items)"
+msgstr "选择元件 (%d 项)"
 
-#: eeschema/plothpgl.cpp:209
-msgid "Page Size A1"
-msgstr "页面大小 A1"
+#: eeschema/edit_component_in_schematic.cpp:201
+#: eeschema/edit_component_in_lib.cpp:554
+msgid "Field to edit"
+msgstr "要编辑的域"
 
-#: eeschema/plothpgl.cpp:210
-msgid "Page Size A0"
-msgstr "页面大小 A0"
+#: eeschema/edit_component_in_schematic.cpp:207
+#: eeschema/edit_component_in_lib.cpp:508
+msgid "Field Name:"
+msgstr "域名称: "
 
-#: eeschema/plothpgl.cpp:211
-#: eeschema/plotps.cpp:171
-msgid "Page Size A"
-msgstr "页面大小 A"
+#: eeschema/edit_component_in_schematic.cpp:217
+#: eeschema/edit_component_in_lib.cpp:518
+msgid "Field Text:"
+msgstr "域文字: "
 
-#: eeschema/plothpgl.cpp:212
-msgid "Page Size B"
-msgstr "页面大小 B"
+#: eeschema/edit_component_in_schematic.cpp:225
+#: eeschema/edit_component_in_lib.cpp:524
+msgid "Pos"
+msgstr "位置"
 
-#: eeschema/plothpgl.cpp:213
-msgid "Page Size C"
-msgstr "页面大小 C"
+#: eeschema/edit_component_in_schematic.cpp:332
+msgid "No Component Name!"
+msgstr "没有元件名称!"
 
-#: eeschema/plothpgl.cpp:214
-msgid "Page Size D"
-msgstr "页面大小 D"
+#: eeschema/edit_component_in_schematic.cpp:338
+#, c-format
+msgid "Component [%s] not found!"
+msgstr "元件 [%s] 没有找到 !"
 
-#: eeschema/plothpgl.cpp:215
-msgid "Page Size E"
-msgstr "页面大小 E"
+#: eeschema/edit_component_in_schematic.cpp:455
+msgid "No Field to move"
+msgstr "没有可移动的域"
 
-#: eeschema/plothpgl.cpp:217
-#: eeschema/plotps.cpp:173
-msgid "Plot page size:"
-msgstr "绘图页面大小："
+#: eeschema/edit_component_in_schematic.cpp:518
+msgid "No Field To Edit"
+msgstr "没有可编辑的域"
 
-#: eeschema/plothpgl.cpp:223
-msgid "Pen control:"
-msgstr "绘图笔控制："
+#: eeschema/edit_component_in_schematic.cpp:532
+msgid ""
+"Part is a POWER, value cannot be modified!\n"
+"You must create a new power"
+msgstr ""
+"部件是一个电源端口, 数值不能修改 !\n"
+"你必须建立一个新的电源端口"
 
-#: eeschema/plothpgl.cpp:227
-msgid "Pen Width ( mils )"
-msgstr "笔宽（mils）"
+#: eeschema/edit_component_in_schematic.cpp:578
+msgid "Reference needed !, No change"
+msgstr "必需有元件索引! 未做更改"
 
-#: eeschema/plothpgl.cpp:233
-msgid "Pen Speed ( cm/s )"
-msgstr "笔速（cm/s）"
+#: eeschema/edit_component_in_schematic.cpp:582
+msgid "Value needed !, No change"
+msgstr "必需有元件值! 未做更改"
 
-#: eeschema/plothpgl.cpp:245
-msgid "Page offset:"
-msgstr "页偏移："
+#: eeschema/viewlib_frame.cpp:57
+msgid "Library browser"
+msgstr "库浏览器"
 
-#: eeschema/plothpgl.cpp:249
-msgid "Plot Offset X"
-msgstr "绘图偏移量 X"
+#: eeschema/eelibs_read_libraryfiles.cpp:115
+msgid "Start loading schematic libs"
+msgstr "开始加载原理图库"
 
-#: eeschema/plothpgl.cpp:255
-msgid "Plot Offset Y"
-msgstr "绘图偏移量 Y"
+#: eeschema/eelibs_read_libraryfiles.cpp:302
+#: eeschema/eelibs_read_libraryfiles.cpp:309
+msgid "File <"
+msgstr "文件 <"
 
-#: eeschema/plothpgl.cpp:266
-#: eeschema/plotps.cpp:200
-msgid "&Plot CURRENT"
-msgstr "绘图输出当前页(&P)"
+#: eeschema/eelibs_read_libraryfiles.cpp:302
+msgid "> is empty!"
+msgstr "> 是空文件!"
 
-#: eeschema/plothpgl.cpp:270
-#: eeschema/plotps.cpp:204
-msgid "Plot A&LL"
-msgstr "绘图输出所有页(&L)"
+#: eeschema/eelibs_read_libraryfiles.cpp:309
+msgid "> is NOT EESCHEMA library!"
+msgstr "> 不是 eeschema 库!"
 
-#: eeschema/plothpgl.cpp:280
-msgid "&Accept Offset"
-msgstr "接受偏移量设置(&A)"
+#: eeschema/eelibs_read_libraryfiles.cpp:328
+msgid "Library <"
+msgstr "库 <"
 
-#: eeschema/plothpgl.cpp:539
-msgid "** Plot End **\n"
-msgstr "** 绘图（Plot）结束 **\n"
+#: eeschema/eelibs_read_libraryfiles.cpp:328
+msgid "> header read error"
+msgstr "> 文件头读错误"
 
-#: eeschema/plothpgl.cpp:564
-msgid "Plot  "
-msgstr "绘图输出（Plot）"
+#: eeschema/edit_label.cpp:51
+msgid "Empty Text!"
+msgstr "文字为空!"
 
-#: eeschema/tool_lib.cpp:48
-msgid "deselect current tool"
-msgstr "不选用工具"
+#: eeschema/netlist_control.cpp:125
+#: eeschema/netlist_control.cpp:241
+#: gerbview/options.cpp:201
+msgid "Default format"
+msgstr "默认格式"
 
-#: eeschema/tool_lib.cpp:54
-msgid "Add Pins"
-msgstr "添加 引脚"
+#: eeschema/netlist_control.cpp:138
+msgid "&Browse Plugin"
+msgstr "浏览插件(&B)"
 
-#: eeschema/tool_lib.cpp:58
-msgid "Add graphic text"
-msgstr "添加 文字"
+#: eeschema/netlist_control.cpp:140
+msgid "&Netlist"
+msgstr "网络表(&N)"
 
-#: eeschema/tool_lib.cpp:62
-msgid "Add rectangles"
-msgstr "添加 矩形"
+#: eeschema/netlist_control.cpp:155
+msgid "&Ok"
+msgstr "确定(&O)"
 
-#: eeschema/tool_lib.cpp:66
-msgid "Add circles"
-msgstr "添加 圆形"
+#: eeschema/netlist_control.cpp:160
+msgid "&Delete"
+msgstr "删除(&D)"
 
-#: eeschema/tool_lib.cpp:70
-msgid "Add arcs"
-msgstr "添加 圆弧"
+#: eeschema/netlist_control.cpp:169
+#: eeschema/netlist_control.cpp:260
+msgid "Netlist"
+msgstr "网络表"
 
-#: eeschema/tool_lib.cpp:74
-msgid "Add lines and polygons"
-msgstr "添加 直线和多边形"
+#: eeschema/netlist_control.cpp:245
+msgid "Use Net Names"
+msgstr "使用网络名称"
 
-#: eeschema/tool_lib.cpp:79
-msgid "Move part anchor"
-msgstr "移动锚点"
+#: eeschema/netlist_control.cpp:245
+msgid "Use Net Numbers"
+msgstr "使用网络编号"
 
-#: eeschema/tool_lib.cpp:84
-msgid "Import existing drawings"
-msgstr "导入图形"
+#: eeschema/netlist_control.cpp:246
+msgid "Netlist Options:"
+msgstr "网络表选项: "
 
-#: eeschema/tool_lib.cpp:88
-msgid "Export current drawing"
-msgstr "导出当前图形"
+#: eeschema/netlist_control.cpp:255
+msgid "Simulator command:"
+msgstr "模拟器命令: "
 
-#: eeschema/tool_lib.cpp:120
-msgid "Save current loaded library on disk (file update)"
-msgstr "将当前加载的库保存到磁盘（更新文件）"
+#: eeschema/netlist_control.cpp:264
+msgid "&Run Simulator"
+msgstr "运行模拟器(&R)"
 
-#: eeschema/tool_lib.cpp:126
-msgid "Delete component in current library"
-msgstr "在当前库中删除元件"
+#: eeschema/netlist_control.cpp:300
+msgid "Add Plugin"
+msgstr "添加插件"
 
-#: eeschema/tool_lib.cpp:130
-msgid "New component"
-msgstr "新建元件"
+#: eeschema/netlist_control.cpp:315
+msgid "Netlist command:"
+msgstr "网络表命令: "
 
-#: eeschema/tool_lib.cpp:133
-msgid "Select component to edit"
-msgstr "选择要编辑的元件"
+#: eeschema/netlist_control.cpp:321
+#: share/setpage.cpp:352
+msgid "Title:"
+msgstr "标题: "
 
-#: eeschema/tool_lib.cpp:137
-msgid "Save current component into current loaded library (in memory)"
-msgstr "将当前元件保存到当前加载的库中（在内存中）"
+#: eeschema/netlist_control.cpp:339
+msgid "Plugin files:"
+msgstr "插件文件: "
 
-#: eeschema/tool_lib.cpp:140
-msgid "import component"
-msgstr "导入元件"
+#: eeschema/netlist_control.cpp:363
+msgid "Do not forget to choose a title for this netlist control page"
+msgstr "不要忘记为这个网络表控制页选择一个标题"
 
-#: eeschema/tool_lib.cpp:143
-msgid "export component"
-msgstr "导出元件"
+#: eeschema/netlist_control.cpp:455
+msgid "Netlist files:"
+msgstr "网络表文件: "
 
-#: eeschema/tool_lib.cpp:147
-msgid "Create a new library an save current component into"
-msgstr "建立一个新库保存当前元件"
+#: eeschema/netlist_control.cpp:472
+msgid "Must be Annotated, Continue ?"
+msgstr "必须已经标注过，是否继续？"
 
-#: eeschema/tool_lib.cpp:160
-msgid "Edit component properties"
-msgstr "编辑元件属性"
+#: eeschema/netlist_control.cpp:630
+msgid "Error. You must provide a command String"
+msgstr "错误。你必须提供一个命令字符串"
 
-#: eeschema/tool_lib.cpp:167
-msgid "Test duplicate pins"
-msgstr "测试重复引脚"
+#: eeschema/netlist_control.cpp:635
+msgid "Error. You must provide a Title"
+msgstr "错误。你必须提供一个标题"
 
-#: eeschema/tool_lib.cpp:189
-msgid "show as \"De Morgan\" normal part"
-msgstr "show as \"De Morgan\" normal part"
+#: eeschema/tool_viewlib.cpp:52
+msgid "Select library to browse"
+msgstr "选择要浏览的库"
 
-#: eeschema/tool_lib.cpp:195
-msgid "show as \"De Morgan\" convert part"
-msgstr "show as \"De Morgan\" convert part"
+#: eeschema/tool_viewlib.cpp:56
+msgid "Select part to browse"
+msgstr "选择要浏览的部件"
 
-#: eeschema/tool_lib.cpp:204
-msgid "Documents"
-msgstr "说明文件"
+#: eeschema/tool_viewlib.cpp:61
+msgid "Display previous part"
+msgstr "显示前一个部件"
 
-#: eeschema/tool_lib.cpp:221
-msgid "Edit pins part per part (Carefully use!)"
-msgstr "分别编辑不同子部件的引脚（慎用！）"
+#: eeschema/tool_viewlib.cpp:65
+msgid "Display next part"
+msgstr "显示下一个部件"
 
-#: eeschema/tool_lib.cpp:241
-#: eeschema/tool_viewlib.cpp:131
-#, c-format
-msgid "Part %c"
-msgstr "子部件 %c"
+#: eeschema/tool_viewlib.cpp:70
+#: cvpcb/displayframe.cpp:124
+#: 3d-viewer/3d_toolbar.cpp:44
+msgid "zoom + (F1)"
+msgstr "缩放 + (F1)"
 
-#: eeschema/annotate_dialog.cpp:122
-msgid "Hierarchy"
-msgstr "层次"
+#: eeschema/tool_viewlib.cpp:74
+#: cvpcb/displayframe.cpp:127
+#: 3d-viewer/3d_toolbar.cpp:47
+msgid "zoom - (F2)"
+msgstr "缩放 - (F2)"
 
-#: eeschema/annotate_dialog.cpp:123
-msgid "Current sheet"
-msgstr "当前图"
+#: eeschema/tool_viewlib.cpp:78
+#: cvpcb/displayframe.cpp:130
+#: 3d-viewer/3d_toolbar.cpp:50
+msgid "redraw (F3)"
+msgstr "窗口重绘 (F3)"
 
-#: eeschema/annotate_dialog.cpp:124
-msgid "annotate:"
-msgstr "标注："
+#: eeschema/tool_viewlib.cpp:82
+#: cvpcb/displayframe.cpp:133
+#: cvpcb/displayframe.cpp:137
+msgid "1:1 zoom"
+msgstr "缩放 1:1"
 
-#: eeschema/annotate_dialog.cpp:129
-msgid "all components"
-msgstr "所有元件"
+#: eeschema/tool_viewlib.cpp:87
+#, fuzzy
+msgid "Show as \"De Morgan\" normal part"
+msgstr "Show as \"De Morgan\" normal part"
 
-#: eeschema/annotate_dialog.cpp:130
-msgid "new components only"
-msgstr "仅新元件"
+#: eeschema/tool_viewlib.cpp:91
+#, fuzzy
+msgid "Show as \"De Morgan\" convert part"
+msgstr "Show as \"De Morgan\" convert part"
 
-#: eeschema/annotate_dialog.cpp:131
-msgid "select items:"
-msgstr "选择内容："
+#: eeschema/tool_viewlib.cpp:101
+msgid "View component documents"
+msgstr "查看元件的文档"
 
-#: eeschema/annotate_dialog.cpp:136
-msgid "by position"
-msgstr "按位置"
+#: eeschema/tool_viewlib.cpp:109
+msgid "Export to schematic"
+msgstr "输出到原理图"
 
-#: eeschema/annotate_dialog.cpp:137
-msgid "by value"
-msgstr "按数值"
+#: eeschema/tool_viewlib.cpp:131
+#: eeschema/tool_lib.cpp:241
+#, c-format
+msgid "Part %c"
+msgstr "子部件 %c"
 
-#: eeschema/annotate_dialog.cpp:138
-msgid "sorting:"
-msgstr "排序："
+#: eeschema/libframe.cpp:105
+msgid ""
+"Component was modified!\n"
+"Discard changes?"
+msgstr ""
+"元件被修改！\n"
+"是否放弃修改？"
 
-#: eeschema/annotate_dialog.cpp:145
-msgid "&Annotate"
-msgstr "标注(&A)"
+#: eeschema/libframe.cpp:118
+#, c-format
+msgid ""
+"Library \"%s\" was modified!\n"
+"Discard changes?"
+msgstr ""
+"库 \"%s\" 被修改！\n"
+"是否放弃修改？"
 
-#: eeschema/annotate_dialog.cpp:150
-msgid "&Del Annotate"
-msgstr "删除标注(&D)"
+#: eeschema/libframe.cpp:344
+msgid "Include last component changes?"
+msgstr "是否包含最后的元件更改 ?"
 
-#: eeschema/annotate.cpp:182
-msgid "Previous Annotation will be deleted. Continue ?"
-msgstr "先前的标注将被删除。是否继续？"
+#: eeschema/libframe.cpp:407
+msgid " Pins Test OK!"
+msgstr " 引脚测试 OK!"
 
-#: eeschema/annotate.cpp:689
-#, c-format
-msgid "item not annotated: %s%s"
-msgstr "未标注的内容：%s%s"
+#: eeschema/libframe.cpp:481
+msgid "Add Pin"
+msgstr "添加 引脚"
 
-#: eeschema/annotate.cpp:693
-#, c-format
-msgid "( unit %d)"
-msgstr "( 单元 %d)"
+#: eeschema/libframe.cpp:485
+msgid "Set Pin Options"
+msgstr "设置引脚选项"
 
-#: eeschema/annotate.cpp:709
-#, c-format
-msgid "Error item %s%s"
-msgstr "错误内容 %s%s"
+#: eeschema/libframe.cpp:507
+msgid "Add Rectangle"
+msgstr "添加 矩形"
 
-#: eeschema/annotate.cpp:711
-#, c-format
-msgid " unit %d and no more than %d parts"
-msgstr " 单元 %d，实际部件数量不超过 %d "
+#: eeschema/libframe.cpp:511
+msgid "Add Circle"
+msgstr "添加 圆"
 
-#: eeschema/annotate.cpp:743
-#: eeschema/annotate.cpp:766
-#, c-format
-msgid "Multiple item %s%s"
-msgstr "冲突（被复用）的内容 %s%s"
+#: eeschema/libframe.cpp:515
+msgid "Add Arc"
+msgstr "添加 圆弧"
 
-#: eeschema/annotate.cpp:748
-#: eeschema/annotate.cpp:770
-#, c-format
-msgid " (unit %d)"
-msgstr " (单元 %d)"
+#: eeschema/libframe.cpp:523
+msgid "Anchor"
+msgstr "锚点"
 
-#: eeschema/annotate.cpp:786
-#, c-format
-msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)"
-msgstr "数值不同的 %s%d%c (%s) 和 %s%d%c (%s)"
+#: eeschema/libframe.cpp:533
+msgid "Export"
+msgstr "导出"
 
-#: eeschema/dialog_eeschema_config.cpp:163
-msgid "save current configuration setting in the local .pro file"
-msgstr "将当前设置保存在本项目的 .pro 文件中"
+#: eeschema/schedit.cpp:100
+msgid "Push/Pop Hierarchy"
+msgstr "压入/弹出 原理图层次"
 
-#: eeschema/dialog_eeschema_config.cpp:169
-#: cvpcb/dialog_cvpcb_config.cpp:147
-msgid "NetList Formats:"
-msgstr "网络表格式："
+#: eeschema/schedit.cpp:104
+msgid "Add NoConnect Flag"
+msgstr "添加 \"不连接\"标记"
 
-#: eeschema/dialog_eeschema_config.cpp:191
-msgid "Remove"
-msgstr "移除"
+#: eeschema/schedit.cpp:112
+msgid "Add Bus"
+msgstr "添加 总线"
 
-#: eeschema/dialog_eeschema_config.cpp:193
-msgid "Unload the selected library"
-msgstr "卸载选中的库"
+#: eeschema/schedit.cpp:120
+msgid "Add Junction"
+msgstr "添加 电气连接点"
 
-#: eeschema/dialog_eeschema_config.cpp:199
-msgid "Add a new library after the selected library, add load it"
-msgstr "在选中库后面添加一个新库并加载它"
+#: eeschema/schedit.cpp:124
+msgid "Add Label"
+msgstr "添加 标签"
 
-#: eeschema/dialog_eeschema_config.cpp:204
-#: eeschema/dialog_eeschema_config.cpp:206
-msgid "Add a new library beforer the selected library, add load it"
-msgstr "在选中库前面添加一个新库并加载它"
+#: eeschema/schedit.cpp:128
+msgid "Add Global label"
+msgstr "添加 全局标签"
 
-#: eeschema/dialog_eeschema_config.cpp:221
-msgid "Default library file path:"
-msgstr "默认库文件目录："
+#: eeschema/schedit.cpp:132
+msgid "Add Hierarchal label"
+msgstr "添加 层次标签"
 
-#: eeschema/dialog_eeschema_config.cpp:228
-msgid ""
-"Default path to search libraries which have no absolute path in name,\n"
-"or a name which does not start by ./ or ../\n"
-"If void, the default path is kicad/library"
-msgstr ""
-"搜索库的默认路径（相对路径），\n"
-"路径名中不要包含 ./ 或 ../\n"
-"此处为空则默认路径为 kicad/library"
+#: eeschema/schedit.cpp:140
+msgid "Add Wire to Bus Entry"
+msgstr "添加 \"导线到总线\"入口"
 
-#: eeschema/dialog_eeschema_config.cpp:236
-msgid "Cmp file Ext: "
-msgstr "元件文件   扩展名："
+#: eeschema/schedit.cpp:144
+msgid "Add Bus to Bus entry"
+msgstr "添加 \"总线到总线\"入口"
 
-#: eeschema/dialog_eeschema_config.cpp:240
-msgid "Net file Ext: "
-msgstr "网络表文件 扩展名："
+#: eeschema/schedit.cpp:148
+msgid "Add Sheet"
+msgstr "添加 分图"
 
-#: eeschema/dialog_eeschema_config.cpp:244
-msgid "Library file Ext: "
-msgstr "库文件     扩展名："
+#: eeschema/schedit.cpp:152
+msgid "Add PinSheet"
+msgstr "添加 分图引脚"
 
-#: eeschema/dialog_eeschema_config.cpp:248
-msgid "Symbol file Ext: "
-msgstr "符号文件   扩展名："
+#: eeschema/schedit.cpp:156
+msgid "Import PinSheet"
+msgstr "导入 分图引脚"
 
-#: eeschema/dialog_eeschema_config.cpp:252
-msgid "Schematic file Ext: "
-msgstr "原理图文件 扩展名："
+#: eeschema/schedit.cpp:164
+msgid "Add Power"
+msgstr "添加 电源端口"
 
-#: eeschema/dialog_eeschema_config.cpp:367
-msgid "Library files:"
-msgstr "库文件："
+#: eeschema/sheetlab.cpp:75
+msgid "PinSheet Properties:"
+msgstr "图引脚属性:"
 
-#: eeschema/dialog_eeschema_config.cpp:390
-msgid "Library already in use"
-msgstr "库已经在使用中"
+#: eeschema/sheetlab.cpp:109
+msgid "PinSheet Shape:"
+msgstr "图引脚形状:"
 
-#: eeschema/dialog_eeschema_config.cpp:463
-msgid " Default Path for libraries"
-msgstr " 库的默认路径"
+#: eeschema/sheetlab.cpp:390
+msgid "No New Hierarchal Label found"
+msgstr "找不到新的层次标签"
 
-#: eeschema/sheet.cpp:162
-#: share/svg_print.cpp:226
-msgid "Filename:"
-msgstr "文件名："
+#: eeschema/lib_export.cpp:39
+msgid "Import component:"
+msgstr "导入元件:"
 
-#: eeschema/sheet.cpp:174
-msgid "Sheetname:"
-msgstr "图名："
+#: eeschema/lib_export.cpp:71
+msgid "File is empty"
+msgstr "文件是空的"
 
-#: eeschema/sheet.cpp:284
-msgid "No Filename! Aborted"
-msgstr "没有文件！退出"
+#: eeschema/lib_export.cpp:92
+msgid "No Part to Save"
+msgstr "没有需要保存的部件"
 
-#: eeschema/sheet.cpp:297
-#, c-format
-msgid "A file named %s exists, load it ?"
-msgstr "名字为 %s 的文件已经存在，是否加载它？"
+#: eeschema/lib_export.cpp:101
+msgid "New Library"
+msgstr "新库"
 
-#: eeschema/sheet.cpp:564
-msgid "Ok to cleanup this sheet"
-msgstr "是否确定清理此图"
+#: eeschema/lib_export.cpp:101
+msgid "Export component:"
+msgstr "导出元件:"
 
-#: eeschema/sheetlab.cpp:72
-msgid "PinSheet Properties:"
-msgstr "图引脚属性："
+#: eeschema/lib_export.cpp:135
+#, fuzzy
+msgid "0k"
+msgstr "0k"
 
-#: eeschema/sheetlab.cpp:106
-msgid "PinSheet Shape:"
-msgstr "图引脚形状："
+#: eeschema/lib_export.cpp:137
+msgid ""
+"Note: this new library will be available only if it is loaded by eeschema.\n"
+"Modify eeschema config if you want use it."
+msgstr ""
+"提示: 这个新的库需要被 eeschema 加载以后才能使用。\n"
+"要加载它, 请调整 eeschema 的设置。"
 
-#: eeschema/sheetlab.cpp:386
-msgid "No New Global Label found"
-msgstr "找不到新的全局标签"
+#: eeschema/lib_export.cpp:139
+msgid "Error while create "
+msgstr "建立时出错 "
 
-#: eeschema/dialog_options.cpp:140
-#: eeschema/dialog_options.cpp:288
-msgid "Delta Step X"
-msgstr "位置增量 X"
+#: eeschema/affiche.cpp:24
+#: eeschema/dialog_create_component.cpp:157
+msgid "Name"
+msgstr "名称"
 
-#: eeschema/dialog_options.cpp:145
-#: eeschema/dialog_options.cpp:294
-msgid "Delta Step Y"
-msgstr "位置增量 Y"
+#: eeschema/affiche.cpp:25
+msgid "FileName"
+msgstr "文件名"
 
-#: eeschema/dialog_options.cpp:208
-msgid "Draw Options:"
-msgstr "图形选项："
+#: eeschema/affiche.cpp:43
+msgid "Pwr Symb"
+msgstr "电源符号"
 
-#: eeschema/dialog_options.cpp:212
-msgid "Show grid"
-msgstr "显示网格"
+#: eeschema/affiche.cpp:45
+msgid "Val"
+msgstr "值"
 
-#: eeschema/dialog_options.cpp:217
-msgid "Normal (50 mils)"
-msgstr "普通（50 mils）"
+#: eeschema/affiche.cpp:48
+msgid "RefLib"
+msgstr "库索引"
 
-#: eeschema/dialog_options.cpp:218
-msgid "Small (25 mils)"
-msgstr "小（25 mils）"
+#: eeschema/affiche.cpp:51
+msgid "Lib"
+msgstr "库"
 
-#: eeschema/dialog_options.cpp:219
-msgid "Very small (10 mils)"
-msgstr "非常小（10 mils）"
+#: eeschema/affiche.cpp:74
+msgid "PinName"
+msgstr "引脚名称"
 
-#: eeschema/dialog_options.cpp:220
-msgid "Special (5 mils)"
-msgstr "特殊（5 mils）"
+#: eeschema/affiche.cpp:82
+#: eeschema/eelayer.h:140
+msgid "PinNum"
+msgstr "引脚编号"
 
-#: eeschema/dialog_options.cpp:221
-msgid "Special (2 mils)"
-msgstr "特殊（2 mils）"
+#: eeschema/affiche.cpp:86
+msgid "PinType"
+msgstr "引脚类型"
 
-#: eeschema/dialog_options.cpp:222
-msgid "Special (1 mil)"
-msgstr "特殊（1 mil）"
+#: eeschema/affiche.cpp:91
+#: eeschema/affiche.cpp:179
+msgid "no"
+msgstr "否"
 
-#: eeschema/dialog_options.cpp:224
-msgid "Grid Size"
-msgstr "网格大小"
+#: eeschema/affiche.cpp:93
+#: eeschema/affiche.cpp:181
+msgid "yes"
+msgstr "是"
 
-#: eeschema/dialog_options.cpp:230
-msgid "Show alls"
-msgstr "显示所有"
+#: eeschema/affiche.cpp:98
+msgid "Lengh"
+msgstr "长度"
 
-#: eeschema/dialog_options.cpp:232
-msgid "Show pins"
-msgstr "显示引脚"
+#: eeschema/affiche.cpp:171
+#: eeschema/affiche.cpp:177
+#: share/dialog_print.cpp:200
+#: share/svg_print.cpp:212
+msgid "All"
+msgstr "所有"
 
-#: eeschema/dialog_options.cpp:245
-msgid "millimeter"
-msgstr "mm"
+#: eeschema/affiche.cpp:174
+#: eeschema/onrightclick.cpp:346
+msgid "Unit"
+msgstr "单元"
 
-#: eeschema/dialog_options.cpp:256
-msgid "Horiz/Vertical"
-msgstr "水平/垂直"
+#: eeschema/affiche.cpp:184
+#: eeschema/onrightclick.cpp:333
+#: eeschema/dialog_edit_component_in_schematic.cpp:190
+msgid "Convert"
+msgstr "转换"
 
-#: eeschema/dialog_options.cpp:259
-msgid "Wires - Bus orient"
-msgstr "导线-总线 方向"
+#: eeschema/affiche.cpp:189
+msgid "default"
+msgstr "默认"
 
-#: eeschema/dialog_options.cpp:284
-msgid "Auto increment params"
-msgstr "自动增量参数"
+#: eeschema/sheet.cpp:164
+msgid "Filename (will be created upon save if it does not already exist):"
+msgstr "文件名(当保存时如果文件不存在将采用此名建立新文件):"
 
-#: eeschema/dialog_options.cpp:300
-msgid "Delta Label:"
-msgstr "标签编号增量："
+#: eeschema/sheet.cpp:177
+msgid "Sheetname:"
+msgstr "图名:"
 
-#: eeschema/dialog_options.cpp:308
-#: eeschema/plotps.cpp:227
-msgid "Default Line Width"
-msgstr "默认线宽"
+#: eeschema/sheet.cpp:287
+msgid "No Filename! Aborted"
+msgstr "没有文件名！退出"
 
-#: eeschema/dialog_options.cpp:311
-msgid "Default Label Size"
-msgstr "默认标签大小"
+#: eeschema/sheet.cpp:301
+#, c-format
+msgid "A file named %s exists, load it (otherwise overwrite it)?"
+msgstr "名字为 %s 的文件已经存在, 要加载已有文件吗(否则将覆盖它) ?"
 
-#: eeschema/libframe.cpp:105
-msgid ""
-"Component was modified!\n"
-"Discard changes?"
-msgstr ""
-"元件被修改！\n"
-"是否放弃修改？"
+#: eeschema/load_one_schematic_file.cpp:105
+msgid "Failed to open "
+msgstr "打开失败 "
 
-#: eeschema/libframe.cpp:118
-#, c-format
-msgid ""
-"Library \"%s\" was modified!\n"
-"Discard changes?"
-msgstr ""
-"库 \"%s\" 被修改！\n"
-"是否放弃修改？"
+#: eeschema/load_one_schematic_file.cpp:111
+msgid "Loading "
+msgstr "载入文件 "
 
-#: eeschema/libframe.cpp:344
-msgid "Include last component changes?"
-msgstr "是否包含最后的元件更改？"
+#: eeschema/load_one_schematic_file.cpp:118
+#: eeschema/load_one_schematic_file.cpp:128
+msgid " is NOT EESchema file"
+msgstr " 不是 eeschema 文件"
 
-#: eeschema/libframe.cpp:407
-msgid " Pins Test OK!"
-msgstr " 引脚测试 OK！"
+#: eeschema/load_one_schematic_file.cpp:473
+msgid "Done Loading "
+msgstr "完成加载"
 
-#: eeschema/libframe.cpp:481
-msgid "Add Pin"
-msgstr "添加 引脚"
+#: eeschema/hierarch.cpp:123
+msgid "Navigator"
+msgstr "导航"
 
-#: eeschema/libframe.cpp:485
-msgid "Set Pin Options"
-msgstr "设置引脚选项"
+#: eeschema/hierarch.cpp:134
+msgid "Root"
+msgstr "根"
 
-#: eeschema/libframe.cpp:507
-msgid "Add Rectangle"
-msgstr "添加 矩形"
+#: eeschema/symbtext.cpp:130
+msgid " Text : "
+msgstr " 文本: "
 
-#: eeschema/libframe.cpp:511
-msgid "Add Circle"
-msgstr "添加 圆"
+#: eeschema/symbtext.cpp:149
+msgid "Size:"
+msgstr "大小:"
 
-#: eeschema/libframe.cpp:515
-msgid "Add Arc"
-msgstr "添加 圆弧"
+#: eeschema/symbtext.cpp:155
+msgid " Text Options : "
+msgstr " 文本选项: "
 
-#: eeschema/libframe.cpp:523
-msgid "Anchor"
-msgstr "锚点"
+#: eeschema/symbtext.cpp:167
+#: eeschema/dialog_edit_component_in_schematic.cpp:215
+#: eeschema/edit_component_in_lib.cpp:502
+msgid "Vertical"
+msgstr "垂直"
 
-#: eeschema/libframe.cpp:527
-msgid "Import"
-msgstr "导入"
+#: eeschema/dialog_edit_label.cpp:68
+msgid "Global Label properties"
+msgstr "全局标签属性"
 
-#: eeschema/libframe.cpp:533
-msgid "Export"
-msgstr "导出"
+#: eeschema/dialog_edit_label.cpp:72
+msgid "Hierarchal Label properties"
+msgstr "层次标签属性"
 
-#: eeschema/eeschema.cpp:57
-msgid "Eeschema is already running, Continue?"
-msgstr "Eeschema 已经在运行中，是否继续？"
+#: eeschema/dialog_edit_label.cpp:76
+msgid "Label properties"
+msgstr "标签属性"
 
-#: eeschema/menubar.cpp:39
-msgid "&Load Schematic Project"
-msgstr "加载原理图工程(&L)"
+#: eeschema/dialog_edit_label.cpp:80
+msgid "Text properties"
+msgstr "文字属性"
 
-#: eeschema/menubar.cpp:40
-msgid "Load a schematic project (Schematic, libraries...)"
-msgstr "加载一个原理图工程（原理图，库 ...）"
+#: eeschema/dialog_edit_label.cpp:136
+msgid "Text "
+msgstr "文字内容(不支持汉字)"
 
-#: eeschema/menubar.cpp:45
-msgid "&Reload the current sheet"
-msgstr "重新加载当前的图 (&R)"
+#: eeschema/dialog_edit_label.cpp:150
+msgid "Text Orient:"
+msgstr "文字排列方向:"
 
-#: eeschema/menubar.cpp:46
-msgid "Load or reload a schematic file from file into the current sheet"
-msgstr "加载或重新加载原理图文件到当前的图"
+#: eeschema/dialog_edit_label.cpp:160
+msgid "TriState"
+msgstr "三态"
 
-#: eeschema/menubar.cpp:52
-msgid "&Save Schematic Project"
-msgstr "保存原理图工程(&S)"
+#: eeschema/dialog_edit_label.cpp:162
+msgid "label Shape:"
+msgstr "标签形状:"
 
-#: eeschema/menubar.cpp:53
-msgid "Save all"
-msgstr "保存全部"
+#: eeschema/dialog_edit_label.cpp:170
+msgid "Size "
+msgstr "大小"
 
-#: eeschema/menubar.cpp:59
-msgid "Save &Current sheet"
-msgstr "保存当前的图 (&C)"
+#: eeschema/libarch.cpp:79
+msgid "Failed to create archive lib file "
+msgstr "生成存档库文件失败 "
 
-#: eeschema/menubar.cpp:60
-msgid "Save current sheet only"
-msgstr "仅保存当前的图"
+#: eeschema/libarch.cpp:86
+msgid "Failed to create doc lib file "
+msgstr "生成说明库文件失败 "
 
-#: eeschema/menubar.cpp:65
-msgid "Save Current sheet &as.."
-msgstr "当前的图另存为 (&A) .."
+#: eeschema/dialog_erc.cpp:172
+#: eeschema/dialog_erc.cpp:203
+msgid "Erc File Report:"
+msgstr "ERC文件报告: "
 
-#: eeschema/menubar.cpp:66
-msgid "Save current sheet as.."
-msgstr "将当前的图另存为 .."
+#: eeschema/dialog_erc.cpp:177
+msgid "-> Total Errors:  "
+msgstr "-> 错误总数: "
 
-#: eeschema/menubar.cpp:78
-msgid "Plot PostScript"
-msgstr "绘图输出（Plot） PostScript"
+#: eeschema/dialog_erc.cpp:180
+msgid "-> Last Warnings: "
+msgstr "-> 现有警告数: "
 
-#: eeschema/menubar.cpp:78
-msgid "Plotting in PostScript format"
-msgstr "以 PostScript 格式输出"
+#: eeschema/dialog_erc.cpp:184
+msgid "-> Last Errors:   "
+msgstr "-> 现有错误数: "
 
-#: eeschema/menubar.cpp:83
-msgid "Plot HPGL"
-msgstr "绘图输出（Plot） HPGL"
+#: eeschema/dialog_erc.cpp:190
+#, fuzzy
+msgid "0000"
+msgstr "0000"
 
-#: eeschema/menubar.cpp:83
-msgid "Plotting in HPGL format"
-msgstr "以 HPGL 格式输出"
+#: eeschema/dialog_erc.cpp:206
+msgid "Write erc report"
+msgstr "写ERC报告文件"
 
-#: eeschema/menubar.cpp:88
-msgid "Plot SVG"
-msgstr "绘图输出（Plot） SVG"
+#: eeschema/dialog_erc.cpp:212
+msgid "&Test Erc"
+msgstr "ERC测试(&T)"
 
-#: eeschema/menubar.cpp:88
-msgid "Plotting in SVG format"
-msgstr "以 SVG 格式输出"
+#: eeschema/dialog_erc.cpp:216
+msgid "&Del Markers"
+msgstr "删除记号(&D)"
 
-#: eeschema/menubar.cpp:95
-msgid "Plot to Clipboard"
-msgstr "绘图输出到剪贴板"
+#: eeschema/dialog_erc.cpp:223
+msgid "erc"
+msgstr "ERC"
 
-#: eeschema/menubar.cpp:95
-msgid "Export drawings to clipboard"
-msgstr "将图形输出到剪贴板"
+#: eeschema/dialog_erc.cpp:229
+msgid "Reset"
+msgstr "复位"
 
-#: eeschema/menubar.cpp:102
-msgid "Plot HPGL, PostScript, SVG"
-msgstr "绘图输出（Plot） HPGL，PostScript，SVG"
+#: eeschema/tool_lib.cpp:48
+msgid "deselect current tool"
+msgstr "不选用工具"
 
-#: eeschema/menubar.cpp:105
-msgid "Quit Eeschema"
-msgstr "退出 Eeschema"
+#: eeschema/tool_lib.cpp:54
+msgid "Add Pins"
+msgstr "添加 引脚"
 
-#: eeschema/menubar.cpp:122
-msgid "&Undo\t"
-msgstr "撤销操作(&U)\t"
+#: eeschema/tool_lib.cpp:58
+msgid "Add graphic text"
+msgstr "添加 文字"
 
-#: eeschema/menubar.cpp:129
-msgid "&Redo\t"
-msgstr "重复操作(&R)\t"
+#: eeschema/tool_lib.cpp:62
+msgid "Add rectangles"
+msgstr "添加 矩形"
 
-#: eeschema/menubar.cpp:146
-msgid "Setting colors..."
-msgstr "设置颜色 ..."
+#: eeschema/tool_lib.cpp:66
+msgid "Add circles"
+msgstr "添加 圆形"
 
-#: eeschema/menubar.cpp:152
-#: gerbview/tool_gerber.cpp:110
-msgid "&Options"
-msgstr "选项(&O)"
+#: eeschema/tool_lib.cpp:70
+msgid "Add arcs"
+msgstr "添加 圆弧"
 
-#: eeschema/menubar.cpp:153
-msgid "Select general options..."
-msgstr "选择常规选项 ..."
+#: eeschema/tool_lib.cpp:74
+msgid "Add lines and polygons"
+msgstr "添加 直线和多边形"
 
-#: eeschema/menubar.cpp:178
-msgid "Open the eeschema manual"
-msgstr "打开 EeSchema 手册"
+#: eeschema/tool_lib.cpp:79
+msgid "Move part anchor"
+msgstr "移动锚点"
 
-#: eeschema/menubar.cpp:189
-msgid "&Edit"
-msgstr "编辑(&E)"
+#: eeschema/tool_lib.cpp:84
+msgid "Import existing drawings"
+msgstr "导入图形"
 
-#: eeschema/erc.cpp:301
-msgid "Annotation Required!"
-msgstr "需要先对图进行标注！"
+#: eeschema/tool_lib.cpp:88
+msgid "Export current drawing"
+msgstr "导出当前图形"
 
-#: eeschema/erc.cpp:403
-msgid "ERC file:"
-msgstr "ERC文件："
+#: eeschema/tool_lib.cpp:120
+msgid "Save current loaded library on disk (file update)"
+msgstr "将当前加载的库保存到磁盘(更新文件)"
 
-#: eeschema/erc.cpp:556
-#, c-format
-msgid "Warning GLabel %s not connected to SheetLabel"
-msgstr "警告 全局标签 %s 没有连接到图标签"
+#: eeschema/tool_lib.cpp:126
+msgid "Delete component in current library"
+msgstr "在当前库中删除元件"
 
-#: eeschema/erc.cpp:560
-#, c-format
-msgid "Warning SheetLabel %s not connected to GLabel"
-msgstr "警告 图标签 %s 没有连接到全局标签"
+#: eeschema/tool_lib.cpp:130
+msgid "New component"
+msgstr "新建元件"
 
-#: eeschema/erc.cpp:574
-#, c-format
-msgid "Warning Pin %s Unconnected"
-msgstr "警告 %s 引脚未连接"
+#: eeschema/tool_lib.cpp:133
+msgid "Select component to edit"
+msgstr "选择要编辑的元件"
 
-#: eeschema/erc.cpp:583
-#, c-format
-msgid "Warning Pin %s not driven (Net %d)"
-msgstr "警告 %s 引脚未被驱动 （网络 %d）"
+#: eeschema/tool_lib.cpp:137
+msgid "Save current component into current loaded library (in memory)"
+msgstr "将当前元件保存到当前加载的库中(在内存中)"
 
-#: eeschema/erc.cpp:593
-msgid "Warning More than 1 Pin connected to UnConnect symbol"
-msgstr "警告 有超过1个以上的引脚连接到了不连接符号"
+#: eeschema/tool_lib.cpp:140
+msgid "import component"
+msgstr "导入元件"
 
-#: eeschema/erc.cpp:603
-#: common/confirm.cpp:79
-msgid "Warning"
-msgstr "警告"
+#: eeschema/tool_lib.cpp:143
+msgid "export component"
+msgstr "导出元件"
 
-#: eeschema/erc.cpp:606
-#: common/confirm.cpp:82
-msgid "Error"
-msgstr "错误"
+#: eeschema/tool_lib.cpp:147
+msgid "Create a new library an save current component into"
+msgstr "建立一个新库保存当前元件"
 
-#: eeschema/erc.cpp:612
-#, c-format
-msgid "%s: Pin %s connected to Pin %s (net %d)"
-msgstr "%s：%s 引脚连接到了 %s 引脚 （网络 %d）"
+#: eeschema/tool_lib.cpp:160
+msgid "Edit component properties"
+msgstr "编辑元件属性"
 
-#: eeschema/erc.cpp:729
-msgid "ERC control"
-msgstr "ERC 控制"
+#: eeschema/tool_lib.cpp:167
+msgid "Test duplicate pins"
+msgstr "测试重复引脚"
 
-#: eeschema/erc.cpp:739
-#, c-format
-msgid ""
-"\n"
-"***** Sheet %d (%s)\n"
-msgstr ""
-"\n"
-"***** 图 %d (%s)\n"
+#: eeschema/tool_lib.cpp:189
+#, fuzzy
+msgid "show as \"De Morgan\" normal part"
+msgstr "show as \"De Morgan\" normal part"
 
-#: eeschema/erc.cpp:741
-#: eeschema/hierarch.cpp:134
-#: eeschema/dialog_build_BOM.cpp:1182
-msgid "Root"
-msgstr "Root"
+#: eeschema/tool_lib.cpp:195
+#, fuzzy
+msgid "show as \"De Morgan\" convert part"
+msgstr "show as \"De Morgan\" convert part"
 
-#: eeschema/erc.cpp:757
-#, c-format
-msgid "ERC: %s (X= %2.3f inches, Y= %2.3f inches\n"
-msgstr "ERC：%s (X= %2.3f inches, Y= %2.3f inches\n"
+#: eeschema/tool_lib.cpp:204
+msgid "Documents"
+msgstr "说明文件"
 
-#: eeschema/erc.cpp:766
-#, c-format
-msgid ""
-"\n"
-" >> Errors ERC: %d\n"
-msgstr ""
-"\n"
-" >> ERC错误：%d\n"
+#: eeschema/tool_lib.cpp:221
+msgid "Edit pins part per part (Carefully use!)"
+msgstr "分别编辑不同子部件的引脚(慎用!)"
 
-#: eeschema/find.cpp:221
-msgid "Pin "
-msgstr "引脚 "
+#: eeschema/eelayer.cpp:233
+msgid "White"
+msgstr "白"
 
-#: eeschema/find.cpp:225
-msgid "Ref "
-msgstr "标签 "
+#: eeschema/eelayer.cpp:234
+#: share/dialog_print.cpp:184
+msgid "Black"
+msgstr "黑"
 
-#: eeschema/find.cpp:233
-msgid "Field "
-msgstr "域 "
+#: eeschema/eelayer.cpp:235
+msgid "Background Color:"
+msgstr "背景颜色: "
 
-#: eeschema/find.cpp:243
-#: eeschema/find.cpp:247
-msgid " Found"
-msgstr " 找到"
+#: eeschema/annotate_dialog.cpp:156
+msgid "Scope"
+msgstr ""
 
-#: eeschema/find.cpp:378
-#, c-format
-msgid "Marker %d found in %s"
-msgstr "标记 %d 在 %s 中找到"
+#: eeschema/annotate_dialog.cpp:162
+msgid "Annotate the &entire schematic"
+msgstr "标注整个原理图(&E)"
 
-#: eeschema/find.cpp:384
-msgid "Marker Not Found"
-msgstr "没有找到标记"
+#: eeschema/annotate_dialog.cpp:166
+msgid "Annotate the current &page only"
+msgstr "仅标注保存当前的图(&P)"
 
-#: eeschema/find.cpp:613
-msgid " Found in "
-msgstr " 找到，在 "
+#: eeschema/annotate_dialog.cpp:169
+msgid "&Reset existing annotation"
+msgstr "复位已有的标注(&R)"
 
-#: eeschema/find.cpp:625
-msgid " Not Found"
-msgstr " 没有找到"
+#: eeschema/annotate_dialog.cpp:187
+msgid "Order"
+msgstr "顺序"
 
-#: eeschema/find.cpp:657
-#: eeschema/selpart.cpp:39
-msgid "No libraries are loaded"
-msgstr "没有加载任何库"
+#: eeschema/annotate_dialog.cpp:193
+msgid "Sort components by p&osition"
+msgstr "按 位置 排序元件(&O)"
 
-#: eeschema/find.cpp:684
-#: eeschema/find.cpp:749
-#: eeschema/find.cpp:765
-msgid "Found "
-msgstr "找到 "
+#: eeschema/annotate_dialog.cpp:199
+msgid "Sort components by &value"
+msgstr "按 数值 排序元件(&V)"
 
-#: eeschema/find.cpp:686
-#: eeschema/find.cpp:750
-#: eeschema/find.cpp:766
-msgid " in lib "
-msgstr " 在库 "
+#: eeschema/annotate_dialog.cpp:263
+msgid "Clear the existing annotation for "
+msgstr "清除原有的标注于: "
 
-#: eeschema/find.cpp:697
-msgid " found only in cache"
-msgstr " 仅在缓存中找到"
+#: eeschema/annotate_dialog.cpp:265
+msgid "the entire schematic?"
+msgstr "整个原理图 ?"
+
+#: eeschema/annotate_dialog.cpp:267
+msgid "the current sheet?"
+msgstr "当前图 ?"
 
-#: eeschema/find.cpp:700
+#: eeschema/annotate_dialog.cpp:269
 msgid ""
 "\n"
-"Explore All Libraries?"
+"\n"
+"This operation will clear the existing annotation and cannot be undone."
 msgstr ""
 "\n"
-"检索所有的库？"
+"\n"
+"该操作将清除已有的标注, 并且不可恢复。"
 
-#: eeschema/find.cpp:706
-msgid "Nothing found"
-msgstr "没有找到任何内容"
+#: eeschema/annotate_dialog.cpp:285
+msgid "Clear and annotate all of the components "
+msgstr "重新标注所有元件"
 
-#: eeschema/getpart.cpp:106
-#, c-format
-msgid "component selection (%d items loaded):"
-msgstr "元件选择（加载了%d项）："
+#: eeschema/annotate_dialog.cpp:287
+msgid "Annotate only the unannotated components "
+msgstr "仅标注未标注的元件"
 
-#: eeschema/getpart.cpp:171
-msgid "Failed to find part "
-msgstr "没有查找到部件 "
+#: eeschema/annotate_dialog.cpp:289
+msgid "on the entire schematic?"
+msgstr "在整个原理图 ?"
 
-#: eeschema/getpart.cpp:171
-msgid " in library"
-msgstr " （在库中）"
+#: eeschema/annotate_dialog.cpp:291
+msgid "on the current sheet?"
+msgstr "在当前图 ?"
 
-#: eeschema/dialog_edit_label.cpp:68
-msgid "Global Label properties"
-msgstr "全局标签属性"
+#: eeschema/annotate_dialog.cpp:293
+msgid ""
+"\n"
+"\n"
+"This operation will change the current annotation and cannot be undone."
+msgstr ""
+"\n"
+"\n"
+"该操作将改变已有的标注, 并且不可恢复。"
 
-#: eeschema/dialog_edit_label.cpp:72
-msgid "Label properties"
-msgstr "标签属性"
+#: eeschema/onrightclick.cpp:146
+msgid "Leave Sheet"
+msgstr "离开 分图"
 
-#: eeschema/dialog_edit_label.cpp:76
-msgid "Text properties"
-msgstr "文字属性"
+#: eeschema/onrightclick.cpp:162
+msgid "delete noconn"
+msgstr "删除 \"不连接\"标记"
 
-#: eeschema/dialog_edit_label.cpp:132
-msgid "Text "
-msgstr "文字内容（不支持汉字）"
+#: eeschema/onrightclick.cpp:172
+msgid "Move bus entry"
+msgstr "移动 总线接入符号"
 
-#: eeschema/dialog_edit_label.cpp:142
-#: eeschema/affiche.cpp:111
-#: eeschema/pinedit-dialog.cpp:288
-msgid "Right"
-msgstr " 向右"
+#: eeschema/onrightclick.cpp:174
+msgid "set bus entry /"
+msgstr "设置总线接入符号方向 /"
 
-#: eeschema/dialog_edit_label.cpp:143
-#: eeschema/affiche.cpp:102
-#: eeschema/pinedit-dialog.cpp:290
-msgid "Up"
-msgstr " 向上"
+#: eeschema/onrightclick.cpp:176
+msgid "set bus entry \\"
+msgstr "设置总线接入符号方向 \\"
 
-#: eeschema/dialog_edit_label.cpp:144
-#: eeschema/affiche.cpp:108
-#: eeschema/pinedit-dialog.cpp:289
-msgid "Left"
-msgstr " 向左"
+#: eeschema/onrightclick.cpp:178
+msgid "delete bus entry"
+msgstr "删除 总线接入符号"
 
-#: eeschema/dialog_edit_label.cpp:145
-#: eeschema/affiche.cpp:105
-#: eeschema/pinedit-dialog.cpp:291
-msgid "Down"
-msgstr " 向下"
+#: eeschema/onrightclick.cpp:182
+msgid "delete Marker"
+msgstr "删除 ERC标记"
 
-#: eeschema/dialog_edit_label.cpp:146
-msgid "Text Orient:"
-msgstr "文字排列方向："
+#: eeschema/onrightclick.cpp:236
+msgid "End drawing"
+msgstr "结束 图形"
 
-#: eeschema/dialog_edit_label.cpp:153
-#: eeschema/pinedit-dialog.cpp:331
-msgid "Input"
-msgstr "输入"
+#: eeschema/onrightclick.cpp:238
+msgid "Delete drawing"
+msgstr "删除 图形"
 
-#: eeschema/dialog_edit_label.cpp:154
-#: eeschema/pinedit-dialog.cpp:332
-msgid "Output"
-msgstr "输出"
+#: eeschema/onrightclick.cpp:274
+msgid "Move Field"
+msgstr "移动 域"
 
-#: eeschema/dialog_edit_label.cpp:155
-#: eeschema/pinedit-dialog.cpp:333
-msgid "Bidi"
-msgstr "双向"
+#: eeschema/onrightclick.cpp:275
+msgid "Rotate Field"
+msgstr "旋转 域"
 
-#: eeschema/dialog_edit_label.cpp:156
-msgid "TriState"
-msgstr "三态"
+#: eeschema/onrightclick.cpp:295
+msgid "Move Component"
+msgstr "移动 元件"
 
-#: eeschema/dialog_edit_label.cpp:157
-#: eeschema/pinedit-dialog.cpp:335
-msgid "Passive"
-msgstr "被动"
+#: eeschema/onrightclick.cpp:298
+msgid "Drag Component"
+msgstr "拖动 元件"
 
-#: eeschema/dialog_edit_label.cpp:158
-msgid "Glabel Shape:"
-msgstr "全局标签形状："
+#: eeschema/onrightclick.cpp:305
+msgid "Rotate +"
+msgstr "旋转 +"
 
-#: eeschema/dialog_edit_label.cpp:166
-msgid "Size "
-msgstr "大小"
+#: eeschema/onrightclick.cpp:309
+#: eeschema/dialog_edit_component_in_schematic.cpp:181
+msgid "Mirror --"
+msgstr "镜像 --"
 
-#: eeschema/plotps.cpp:179
-msgid "Plot Options:"
-msgstr "绘图选项："
+#: eeschema/onrightclick.cpp:311
+msgid "Mirror ||"
+msgstr "镜像 ||"
 
-#: eeschema/plotps.cpp:184
-msgid "B/W"
-msgstr "黑白"
+#: eeschema/onrightclick.cpp:317
+msgid "Orient Component"
+msgstr "元件方向"
 
-#: eeschema/plotps.cpp:185
-#: share/dialog_print.cpp:183
-#: share/svg_print.cpp:193
-msgid "Color"
-msgstr "彩色"
+#: eeschema/onrightclick.cpp:329
+msgid "Footprint "
+msgstr "封装 "
 
-#: eeschema/plotps.cpp:187
-msgid "Plot Color:"
-msgstr "绘图颜色："
+#: eeschema/onrightclick.cpp:340
+#, c-format
+msgid "Unit %d %c"
+msgstr "单元 %d %c"
 
-#: eeschema/plotps.cpp:215
-msgid "Messages :"
-msgstr "信息："
+#: eeschema/onrightclick.cpp:351
+msgid "Edit Component"
+msgstr "编辑 元件"
 
-#: eeschema/plotps.cpp:396
-#, c-format
-msgid "Plot: %s\n"
-msgstr "绘图输出（Plot）：%s\n"
+#: eeschema/onrightclick.cpp:355
+msgid "Copy Component"
+msgstr "复制 元件"
 
-#: eeschema/symbedit.cpp:52
-msgid "Import symbol drawings:"
-msgstr "导入符号图形："
+#: eeschema/onrightclick.cpp:356
+msgid "Delete Component"
+msgstr "删除 元件"
 
-#: eeschema/symbedit.cpp:74
-#, c-format
-msgid "Failed to open Symbol File <%s>"
-msgstr "打开符号文件 < %s > 失败"
+#: eeschema/onrightclick.cpp:375
+msgid "Move Glabel"
+msgstr "移动 全局标签"
 
-#: eeschema/symbedit.cpp:87
-msgid "Warning: more than 1 part in Symbol File"
-msgstr "警告：符号文件中包含多个零件"
+#: eeschema/onrightclick.cpp:376
+msgid "Rotate GLabel  (R)"
+msgstr "旋转 全局标签  (R)"
 
-#: eeschema/symbedit.cpp:92
-msgid "Symbol File is void"
-msgstr "符号文件是空的"
+#: eeschema/onrightclick.cpp:377
+msgid "Edit GLabel"
+msgstr "编辑 全局标签"
 
-#: eeschema/symbedit.cpp:151
-msgid "Export symbol drawings:"
-msgstr "导出符号图形："
+#: eeschema/onrightclick.cpp:378
+msgid "Delete Glabel"
+msgstr "删除 全局标签"
 
-#: eeschema/symbedit.cpp:171
-#, c-format
-msgid "Save Symbol in [%s]"
-msgstr "符号保存于 [%s]"
+#: eeschema/onrightclick.cpp:382
+#: eeschema/onrightclick.cpp:433
+#: eeschema/onrightclick.cpp:462
+msgid "Change to Hierarchical Label"
+msgstr "改为 层次标签"
 
-#: eeschema/hierarch.cpp:123
-msgid "Navigator"
-msgstr "层次导航"
+#: eeschema/onrightclick.cpp:384
+#: eeschema/onrightclick.cpp:406
+#: eeschema/onrightclick.cpp:460
+msgid "Change to Label"
+msgstr "改为 标签"
 
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:317
-msgid "line"
-msgstr "线"
+#: eeschema/onrightclick.cpp:386
+#: eeschema/onrightclick.cpp:408
+#: eeschema/onrightclick.cpp:435
+msgid "Change to Text"
+msgstr "改为 注释文字"
 
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:318
-msgid "invert"
-msgstr "反相"
+#: eeschema/onrightclick.cpp:388
+#: eeschema/onrightclick.cpp:412
+#: eeschema/onrightclick.cpp:439
+#: eeschema/onrightclick.cpp:466
+msgid "Change Type"
+msgstr "改变类型"
 
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:319
-msgid "clock"
-msgstr "时钟"
+#: eeschema/onrightclick.cpp:399
+msgid "Move Hlabel"
+msgstr "移动 层次标签"
 
-#: eeschema/pinedit.cpp:22
-#: eeschema/pinedit-dialog.cpp:320
-msgid "clock inv"
-msgstr "反相时钟"
+#: eeschema/onrightclick.cpp:400
+msgid "Rotate HLabel  (R)"
+msgstr "旋转 层次标签 (R)"
 
-#: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:321
-msgid "low in"
-msgstr "低输入"
+#: eeschema/onrightclick.cpp:401
+msgid "Edit HLabel"
+msgstr "编辑 层次标签"
 
-#: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:322
-msgid "low clock"
-msgstr "低时钟"
+#: eeschema/onrightclick.cpp:402
+msgid "Delete Hlabel"
+msgstr "删除 层次标签"
 
-#: eeschema/pinedit.cpp:23
-#: eeschema/pinedit-dialog.cpp:323
-msgid "low out"
-msgstr "低输出"
+#: eeschema/onrightclick.cpp:410
+#: eeschema/onrightclick.cpp:437
+msgid "Change to Global label"
+msgstr "改变为 全局标签"
 
-#: eeschema/pinedit.cpp:189
-msgid "Occupied by other pin. Continue?"
-msgstr "已被其他引脚占用。是否继续？"
+#: eeschema/onrightclick.cpp:426
+msgid "Move Label"
+msgstr "移动 标签"
 
-#: eeschema/pinedit.cpp:874
-#, c-format
-msgid "Duplicate Pin %4.4s (Pin %s loc %d, %d, and Pin %s loc %d, %d)"
-msgstr "重复的引脚 %4.4s （引脚 %s 位于 %d，%d，引脚 %s 位于 %d， %d）"
+#: eeschema/onrightclick.cpp:427
+msgid "Rotate Label  (R)"
+msgstr "旋转 标签 (R)"
 
-#: eeschema/pinedit.cpp:879
-#, c-format
-msgid "  Part %d"
-msgstr "  部件 %d"
+#: eeschema/onrightclick.cpp:428
+msgid "Edit Label"
+msgstr "编辑 标签"
 
-#: eeschema/pinedit.cpp:884
-msgid "  Convert"
-msgstr "  转换"
+#: eeschema/onrightclick.cpp:429
+msgid "Delete Label"
+msgstr "删除 标签"
 
-#: eeschema/pinedit.cpp:885
-msgid "  Normal"
-msgstr "  普通"
+#: eeschema/onrightclick.cpp:453
+msgid "Move Text"
+msgstr "移动 文字"
 
-#: eeschema/tool_viewlib.cpp:52
-msgid "Select library to browse"
-msgstr "选择要浏览的库"
+#: eeschema/onrightclick.cpp:454
+msgid "Rotate Text (R)"
+msgstr "旋转 文字 (R)"
 
-#: eeschema/tool_viewlib.cpp:56
-msgid "Select part to browse"
-msgstr "选择要浏览的部件"
+#: eeschema/onrightclick.cpp:455
+msgid "Edit Text"
+msgstr "编辑 文字"
 
-#: eeschema/tool_viewlib.cpp:61
-msgid "Display previous part"
-msgstr "显示前一个部件"
+#: eeschema/onrightclick.cpp:456
+msgid "Delete Text"
+msgstr "删除 文字"
 
-#: eeschema/tool_viewlib.cpp:65
-msgid "Display next part"
-msgstr "显示下一个部件"
+#: eeschema/onrightclick.cpp:464
+msgid "Change to Glabel"
+msgstr "改为 全局标签"
 
-#: eeschema/tool_viewlib.cpp:70
-#: cvpcb/displayframe.cpp:124
-#: 3d-viewer/3d_toolbar.cpp:44
-msgid "zoom + (F1)"
-msgstr "缩放 + (F1)"
+#: eeschema/onrightclick.cpp:484
+#: eeschema/onrightclick.cpp:524
+msgid "Break Wire"
+msgstr "分割 导线"
 
-#: eeschema/tool_viewlib.cpp:74
-#: cvpcb/displayframe.cpp:127
-#: 3d-viewer/3d_toolbar.cpp:47
-msgid "zoom - (F2)"
-msgstr "缩放 - (F2)"
+#: eeschema/onrightclick.cpp:487
+msgid "delete junction"
+msgstr "删除 电气连接点"
 
-#: eeschema/tool_viewlib.cpp:78
-#: cvpcb/displayframe.cpp:130
-#: 3d-viewer/3d_toolbar.cpp:50
-msgid "redraw (F3)"
-msgstr "窗口重绘 (F3)"
+#: eeschema/onrightclick.cpp:492
+#: eeschema/onrightclick.cpp:518
+msgid "Delete node"
+msgstr "删除 节点"
 
-#: eeschema/tool_viewlib.cpp:82
-#: cvpcb/displayframe.cpp:133
-#: cvpcb/displayframe.cpp:137
-msgid "1:1 zoom"
-msgstr "缩放 1:1"
+#: eeschema/onrightclick.cpp:494
+#: eeschema/onrightclick.cpp:520
+msgid "Delete connection"
+msgstr "删除 连接"
+
+#: eeschema/onrightclick.cpp:511
+msgid "End Wire"
+msgstr "结束 画导线"
 
-#: eeschema/tool_viewlib.cpp:87
-msgid "Show as \"De Morgan\" normal part"
-msgstr "Show as \"De Morgan\" normal part"
+#: eeschema/onrightclick.cpp:513
+msgid "Delete Wire"
+msgstr "删除 导线"
 
-#: eeschema/tool_viewlib.cpp:91
-msgid "Show as \"De Morgan\" convert part"
-msgstr "Show as \"De Morgan\" convert part"
+#: eeschema/onrightclick.cpp:528
+#: eeschema/onrightclick.cpp:560
+msgid "Add junction"
+msgstr "添加 电气连接点"
 
-#: eeschema/tool_viewlib.cpp:101
-msgid "View component documents"
-msgstr "查看元件的文档"
+#: eeschema/onrightclick.cpp:529
+#: eeschema/onrightclick.cpp:561
+msgid "Add label"
+msgstr "添加 标签"
 
-#: eeschema/tool_viewlib.cpp:109
-msgid "Export to schematic"
-msgstr "输出到原理图"
+#: eeschema/onrightclick.cpp:534
+#: eeschema/onrightclick.cpp:566
+msgid "Add global label"
+msgstr "添加 全局标签"
 
-#: eeschema/save_schemas.cpp:71
-#: eeschema/eeload.cpp:59
-#: eeschema/files-io.cpp:65
-msgid "Schematic files:"
-msgstr "原理图文件："
+#: eeschema/onrightclick.cpp:550
+msgid "End Bus"
+msgstr "结束 画总线"
 
-#: eeschema/save_schemas.cpp:94
-#: eeschema/netform.cpp:55
-#: eeschema/netform.cpp:243
-msgid "Failed to create file "
-msgstr "建立文件失败"
+#: eeschema/onrightclick.cpp:553
+msgid "Delete Bus"
+msgstr "删除 总线"
 
-#: eeschema/save_schemas.cpp:99
-msgid "Save file "
-msgstr "保存文件"
+#: eeschema/onrightclick.cpp:557
+msgid "Break Bus"
+msgstr "分割 总线"
 
-#: eeschema/save_schemas.cpp:115
-#: eeschema/save_schemas.cpp:298
-msgid "File write operation failed."
-msgstr "文件写入操作失败。"
+#: eeschema/onrightclick.cpp:579
+msgid "Enter Sheet"
+msgstr "进入 分图"
 
-#: eeschema/viewlibs.cpp:118
-msgid "Browse library: "
-msgstr "浏览库："
+#: eeschema/onrightclick.cpp:581
+msgid "Move Sheet"
+msgstr "移动 分图"
 
-#: eeschema/viewlibs.cpp:307
-#, c-format
-msgid "Current Part: <%s> (is Alias of <%s>)"
-msgstr "当前部件：<%s> （是 <%s> 的别名）"
+#: eeschema/onrightclick.cpp:586
+msgid "Place Sheet"
+msgstr "放置 分图"
 
-#: eeschema/viewlibs.cpp:313
-#, c-format
-msgid "Error: Root Part <%s> not found"
-msgstr "错误：根部件 <%s> 没有找到"
+#: eeschema/onrightclick.cpp:590
+msgid "Edit Sheet"
+msgstr "编辑 分图"
 
-#: eeschema/viewlibs.cpp:332
-#, c-format
-msgid "Current Part: <%s>"
-msgstr "当前部件：<%s>"
+#: eeschema/onrightclick.cpp:591
+msgid "Resize Sheet"
+msgstr "调整分图符号大小"
 
-#: eeschema/libedit.cpp:38
-msgid " Part:   "
-msgstr " 部件：   "
+#: eeschema/onrightclick.cpp:594
+msgid "Cleanup PinSheets"
+msgstr "清理 分图引脚"
 
-#: eeschema/libedit.cpp:52
-msgid "   Convert"
-msgstr "   转换"
+#: eeschema/onrightclick.cpp:595
+msgid "Delete Sheet"
+msgstr "删除 分图"
 
-#: eeschema/libedit.cpp:53
-msgid "   Normal"
-msgstr "   普通"
+#: eeschema/onrightclick.cpp:608
+msgid "Move PinSheet"
+msgstr "移动 分图引脚"
 
-#: eeschema/libedit.cpp:56
-msgid "  (Power Symbol)"
-msgstr "  (电源符号)"
+#: eeschema/onrightclick.cpp:610
+msgid "Edit PinSheet"
+msgstr "编辑 分图引脚"
 
-#: eeschema/libedit.cpp:90
-msgid ""
-"Current Part not saved.\n"
-"Continue?"
-msgstr ""
-"当前部件还没有保存。\n"
-"是否继续？"
+#: eeschema/onrightclick.cpp:613
+msgid "Delete PinSheet"
+msgstr "删除 分图引脚"
 
-#: eeschema/libedit.cpp:113
-#: eeschema/libedit.cpp:390
-msgid "Component \""
-msgstr "元件 \""
+#: eeschema/onrightclick.cpp:630
+#: eeschema/libedit_onrightclick.cpp:241
+msgid "Win. Zoom (Midd butt drag mouse)"
+msgstr "块区域放大显示(鼠标中键拖拉)"
 
-#: eeschema/libedit.cpp:113
-msgid "\" not found."
-msgstr "\" 没有找到。"
+#: eeschema/onrightclick.cpp:638
+msgid "Other block commands"
+msgstr "其他块操作命令"
 
-#: eeschema/libedit.cpp:235
-msgid "Modify Library File \""
-msgstr "更改库文件 \""
+#: eeschema/onrightclick.cpp:639
+msgid "Save Block"
+msgstr "保存 块"
 
-#: eeschema/libedit.cpp:235
-msgid "\"?"
-msgstr "\"？"
+#: eeschema/onrightclick.cpp:643
+msgid "Drag Block (ctrl + drag mouse)"
+msgstr "拖动 块 (ctrl + 拖拉鼠标)"
 
-#: eeschema/libedit.cpp:244
-msgid "Error while saving Library File \""
-msgstr "保存库文件时发生错误 \""
+#: eeschema/onrightclick.cpp:645
+#: eeschema/libedit_onrightclick.cpp:254
+msgid "Del. Block (shift+ctrl + drag mouse)"
+msgstr "删除 块 (shift + ctrl + 鼠标拖拉)"
 
-#: eeschema/libedit.cpp:244
-#: eeschema/libedit.cpp:391
-msgid "\"."
-msgstr "\"。"
+#: eeschema/onrightclick.cpp:647
+msgid "Mirror Block ||"
+msgstr "镜像 块 ||"
 
-#: eeschema/libedit.cpp:250
-msgid "Library File \""
-msgstr "库文件 \""
+#: eeschema/onrightclick.cpp:651
+msgid "Copy to Clipboard"
+msgstr "复制到剪贴板"
 
-#: eeschema/libedit.cpp:252
-msgid "Document File \""
-msgstr "说明文件 \""
+#: eeschema/dialog_options.cpp:140
+#: eeschema/dialog_options.cpp:288
+msgid "Delta Step X"
+msgstr "位置增量 X"
 
-#: eeschema/libedit.cpp:305
-msgid "No Active Library"
-msgstr "没有活动的库"
+#: eeschema/dialog_options.cpp:145
+#: eeschema/dialog_options.cpp:294
+msgid "Delta Step Y"
+msgstr "位置增量 Y"
 
-#: eeschema/libedit.cpp:321
-#, c-format
-msgid "Select Component (%d items)"
-msgstr "选择元件 (%d 项)"
+#: eeschema/dialog_options.cpp:208
+msgid "Draw Options:"
+msgstr "图形选项: "
 
-#: eeschema/libedit.cpp:344
-msgid "Component not found"
-msgstr "元件没有找到"
+#: eeschema/dialog_options.cpp:212
+msgid "Show grid"
+msgstr "显示网格"
 
-#: eeschema/libedit.cpp:348
-msgid "Delete component \""
-msgstr "删除元件 \""
+#: eeschema/dialog_options.cpp:217
+msgid "Normal (50 mils)"
+msgstr "普通 (50 mils)"
 
-#: eeschema/libedit.cpp:349
-msgid "\" from library \""
-msgstr "\" 从库 \""
+#: eeschema/dialog_options.cpp:218
+msgid "Small (25 mils)"
+msgstr "小 (25 mils)"
 
-#: eeschema/libedit.cpp:373
-msgid "Delete old component?"
-msgstr "删除旧元件？"
+#: eeschema/dialog_options.cpp:219
+msgid "Very small (10 mils)"
+msgstr "非常小 (10 mils)"
 
-#: eeschema/libedit.cpp:391
-msgid "\" exists in library \""
-msgstr "\" 存在于库 \""
+#: eeschema/dialog_options.cpp:220
+msgid "Special (5 mils)"
+msgstr "特殊 (5 mils)"
 
-#: eeschema/libedit.cpp:558
-msgid "No component to Save."
-msgstr "没有需要保存的元件。"
+#: eeschema/dialog_options.cpp:221
+msgid "Special (2 mils)"
+msgstr "特殊 (2 mils)"
 
-#: eeschema/libedit.cpp:565
-msgid "No Library specified."
-msgstr "没有指定库。"
+#: eeschema/dialog_options.cpp:222
+msgid "Special (1 mil)"
+msgstr "特殊 (1 mil)"
 
-#: eeschema/libedit.cpp:576
-#, c-format
-msgid "Component \"%s\" exists. Change it?"
-msgstr "元件 \"%s\" 已经存在。是否更改它？"
+#: eeschema/dialog_options.cpp:224
+msgid "Grid Size"
+msgstr "网格大小"
 
-#: eeschema/libedit.cpp:615
-#, c-format
-msgid "Component %s saved in %s"
-msgstr "元件 %s 保存于 %s"
+#: eeschema/dialog_options.cpp:230
+msgid "Show alls"
+msgstr "显示所有"
 
-#: eeschema/affiche.cpp:22
-#: eeschema/dialog_create_component.cpp:157
-msgid "Name"
-msgstr "名称"
+#: eeschema/dialog_options.cpp:232
+msgid "Show pins"
+msgstr "显示引脚"
 
-#: eeschema/affiche.cpp:23
-msgid "FileName"
-msgstr "文件名"
+#: eeschema/dialog_options.cpp:245
+msgid "millimeter"
+msgstr "mm"
 
-#: eeschema/affiche.cpp:37
-#: eeschema/component_class.cpp:54
-msgid "Ref"
-msgstr "编号标签"
+#: eeschema/dialog_options.cpp:246
+msgid "inches"
+msgstr "inch"
 
-#: eeschema/affiche.cpp:41
-msgid "Pwr Symb"
-msgstr "电源符号"
+#: eeschema/dialog_options.cpp:256
+msgid "Horiz/Vertical"
+msgstr "水平/垂直"
 
-#: eeschema/affiche.cpp:43
-msgid "Val"
-msgstr "值"
+#: eeschema/dialog_options.cpp:259
+msgid "Wires - Bus orient"
+msgstr "导线-总线 方向"
 
-#: eeschema/affiche.cpp:46
-msgid "RefLib"
-msgstr "库标签"
+#: eeschema/dialog_options.cpp:284
+msgid "Auto increment params"
+msgstr "自动增量参数"
 
-#: eeschema/affiche.cpp:49
-msgid "Lib"
-msgstr "库"
+#: eeschema/dialog_options.cpp:300
+msgid "Delta Label:"
+msgstr "标签编号增量: "
 
-#: eeschema/affiche.cpp:72
-msgid "PinName"
-msgstr "引脚名称"
+#: eeschema/dialog_options.cpp:308
+#: eeschema/plotps.cpp:229
+msgid "Default Line Width"
+msgstr "默认线宽"
 
-#: eeschema/affiche.cpp:80
-#: eeschema/eelayer.h:141
-msgid "PinNum"
-msgstr "引脚编号"
+#: eeschema/dialog_options.cpp:311
+msgid "Default Label Size"
+msgstr "默认标签大小"
 
-#: eeschema/affiche.cpp:84
-msgid "PinType"
-msgstr "引脚类型"
+#: eeschema/plothpgl.cpp:207
+msgid "Sheet Size"
+msgstr "按图定义大小"
 
-#: eeschema/affiche.cpp:89
-#: eeschema/affiche.cpp:177
-msgid "no"
-msgstr "否"
+#: eeschema/plothpgl.cpp:208
+#: eeschema/plotps.cpp:172
+msgid "Page Size A4"
+msgstr "页面大小 A4"
 
-#: eeschema/affiche.cpp:91
-#: eeschema/affiche.cpp:179
-msgid "yes"
-msgstr "是"
+#: eeschema/plothpgl.cpp:209
+msgid "Page Size A3"
+msgstr "页面大小 A3"
 
-#: eeschema/affiche.cpp:96
-msgid "Lengh"
-msgstr "长度"
+#: eeschema/plothpgl.cpp:210
+msgid "Page Size A2"
+msgstr "页面大小 A2"
 
-#: eeschema/affiche.cpp:169
-#: eeschema/affiche.cpp:175
-#: share/dialog_print.cpp:200
-#: share/svg_print.cpp:211
-msgid "All"
-msgstr "所有"
+#: eeschema/plothpgl.cpp:211
+msgid "Page Size A1"
+msgstr "页面大小 A1"
 
-#: eeschema/affiche.cpp:172
-#: eeschema/onrightclick.cpp:333
-msgid "Unit"
-msgstr "单元"
+#: eeschema/plothpgl.cpp:212
+msgid "Page Size A0"
+msgstr "页面大小 A0"
+
+#: eeschema/plothpgl.cpp:213
+#: eeschema/plotps.cpp:173
+msgid "Page Size A"
+msgstr "页面大小 A"
+
+#: eeschema/plothpgl.cpp:214
+msgid "Page Size B"
+msgstr "页面大小 B"
 
-#: eeschema/affiche.cpp:182
-#: eeschema/dialog_edit_component_in_schematic.cpp:190
-#: eeschema/onrightclick.cpp:320
-msgid "Convert"
-msgstr "转换"
+#: eeschema/plothpgl.cpp:215
+msgid "Page Size C"
+msgstr "页面大小 C"
 
-#: eeschema/affiche.cpp:187
-msgid "default"
-msgstr "默认"
+#: eeschema/plothpgl.cpp:216
+msgid "Page Size D"
+msgstr "页面大小 D"
 
-#: eeschema/eeload.cpp:46
-msgid "Clear Schematic Hierarchy (modified!)?"
-msgstr "清除原理图层次（已被更改！）？"
+#: eeschema/plothpgl.cpp:217
+msgid "Page Size E"
+msgstr "页面大小 E"
 
-#: eeschema/eeload.cpp:107
-msgid ""
-"Ready\n"
-"Working dir: \n"
-msgstr ""
-"就绪\n"
-"工作目录：\n"
+#: eeschema/plothpgl.cpp:219
+#: eeschema/plotps.cpp:175
+msgid "Plot page size:"
+msgstr "绘图页面大小:"
 
-#: eeschema/eeload.cpp:153
-#, c-format
-msgid "File %s not found (new project ?)"
-msgstr "文件 %s 没有找到（新工程？）"
+#: eeschema/plothpgl.cpp:225
+msgid "Pen control:"
+msgstr "绘图笔控制:"
 
-#: eeschema/eeload.cpp:203
-msgid "No FileName in SubSheet"
-msgstr "子图没有文件名"
+#: eeschema/plothpgl.cpp:229
+msgid "Pen Width ( mils )"
+msgstr "笔宽(mils)"
 
-#: eeschema/delsheet.cpp:42
-#, c-format
-msgid "Sheet %s (file %s) modified. Save it?"
-msgstr "图 %s （文件 %s）被更改。是否保存？"
+#: eeschema/plothpgl.cpp:235
+msgid "Pen Speed ( cm/s )"
+msgstr "笔速(cm/s)"
 
-#: eeschema/symbdraw.cpp:795
-#, c-format
-msgid "Arc %.1f deg"
-msgstr "圆弧 %.1f 度"
+#: eeschema/plothpgl.cpp:247
+msgid "Page offset:"
+msgstr "页偏移:"
 
-#: eeschema/dialog_create_component.cpp:168
-msgid "U"
-msgstr "U"
+#: eeschema/plothpgl.cpp:251
+msgid "Plot Offset X"
+msgstr "绘图偏移量 X"
 
-#: eeschema/dialog_create_component.cpp:180
-#: eeschema/edit_component_in_lib.cpp:401
-msgid "As Convert"
-msgstr "转换样式"
+#: eeschema/plothpgl.cpp:257
+msgid "Plot Offset Y"
+msgstr "绘图偏移量 Y"
 
-#: eeschema/dialog_create_component.cpp:184
-#: eeschema/dialog_edit_component_in_lib.cpp:158
-msgid "Power Symbol"
-msgstr "电源符号"
+#: eeschema/plothpgl.cpp:268
+#: eeschema/plotps.cpp:202
+msgid "&Plot CURRENT"
+msgstr "绘图输出当前页(&P)"
 
-#: eeschema/dialog_create_component.cpp:188
-#: eeschema/dialog_edit_component_in_schematic.cpp:187
-#: eeschema/dialog_edit_component_in_lib.cpp:162
-msgid "Parts are locked"
-msgstr "部件被锁定"
+#: eeschema/plothpgl.cpp:272
+#: eeschema/plotps.cpp:206
+msgid "Plot A&LL"
+msgstr "绘图输出所有页(&L)"
 
-#: eeschema/dialog_create_component.cpp:211
-msgid "&1"
-msgstr "&1"
+#: eeschema/plothpgl.cpp:282
+msgid "&Accept Offset"
+msgstr "接受偏移量设置(&A)"
 
-#: eeschema/dialog_create_component.cpp:212
-msgid "&2"
-msgstr "&2"
+#: eeschema/plothpgl.cpp:541
+msgid "** Plot End **\n"
+msgstr "** 绘图(Plot)结束 **\n"
 
-#: eeschema/dialog_create_component.cpp:213
-msgid "&3"
-msgstr "&3"
+#: eeschema/plothpgl.cpp:566
+msgid "Plot  "
+msgstr "绘图输出(Plot)"
 
-#: eeschema/dialog_create_component.cpp:214
-msgid "&4"
-msgstr "&4"
+#: eeschema/menubar.cpp:43
+#: gerbview/tool_gerber.cpp:63
+msgid "&New"
+msgstr "新建(&N)"
 
-#: eeschema/dialog_create_component.cpp:215
-msgid "&5"
-msgstr "&5"
+#: eeschema/menubar.cpp:44
+msgid "New schematic"
+msgstr "新建原理图"
 
-#: eeschema/dialog_create_component.cpp:216
-msgid "&6"
-msgstr "&6"
+#: eeschema/menubar.cpp:49
+#: cvpcb/tool_cvpcb.cpp:112
+msgid "&Open"
+msgstr "打开(&O)"
 
-#: eeschema/dialog_create_component.cpp:217
-msgid "&7"
-msgstr "&7"
+#: eeschema/menubar.cpp:50
+msgid "Open a schematic"
+msgstr "打开原理图"
 
-#: eeschema/dialog_create_component.cpp:218
-msgid "&8"
-msgstr "&8"
+#: eeschema/menubar.cpp:55
+msgid "&Reload the current sheet"
+msgstr "重新加载当前的原理图(&R)"
 
-#: eeschema/dialog_create_component.cpp:219
-msgid "&9"
-msgstr "&9"
+#: eeschema/menubar.cpp:57
+msgid "Load or reload a schematic file from file into the current sheet"
+msgstr "加载或重新加载原理图文件到当前的图"
 
-#: eeschema/dialog_create_component.cpp:220
-msgid "&10"
-msgstr "&10"
+#: eeschema/menubar.cpp:63
+msgid "&Save"
+msgstr "保存(&S)"
 
-#: eeschema/dialog_create_component.cpp:221
-msgid "&11"
-msgstr "&11"
+#: eeschema/menubar.cpp:64
+#: eeschema/tool_sch.cpp:56
+msgid "Save schematic project"
+msgstr "保存原理图工程"
 
-#: eeschema/dialog_create_component.cpp:222
-msgid "&12"
-msgstr "&12"
+#: eeschema/menubar.cpp:70
+msgid "Save &Current sheet"
+msgstr "保存当前的图 (&C)"
 
-#: eeschema/dialog_create_component.cpp:223
-msgid "&13"
-msgstr "&13"
+#: eeschema/menubar.cpp:71
+msgid "Save current sheet only"
+msgstr "仅保存当前的图"
 
-#: eeschema/dialog_create_component.cpp:224
-msgid "&14"
-msgstr "&14"
+#: eeschema/menubar.cpp:76
+msgid "Save Current sheet &as.."
+msgstr "当前的图另存为 (&A) .."
 
-#: eeschema/dialog_create_component.cpp:225
-msgid "&15"
-msgstr "&15"
+#: eeschema/menubar.cpp:77
+msgid "Save current sheet as.."
+msgstr "将当前的图另存为 .."
 
-#: eeschema/dialog_create_component.cpp:226
-msgid "&16"
-msgstr "&16"
+#: eeschema/menubar.cpp:89
+msgid "Plot PostScript"
+msgstr "绘图输出(Plot) PostScript"
 
-#: eeschema/dialog_create_component.cpp:227
-msgid "&17"
-msgstr "&17"
+#: eeschema/menubar.cpp:89
+msgid "Plotting in PostScript format"
+msgstr "以 PostScript 格式输出"
 
-#: eeschema/dialog_create_component.cpp:228
-msgid "&18"
-msgstr "&18"
+#: eeschema/menubar.cpp:94
+msgid "Plot HPGL"
+msgstr "绘图输出(Plot) HPGL"
 
-#: eeschema/dialog_create_component.cpp:229
-msgid "&19"
-msgstr "&19"
+#: eeschema/menubar.cpp:94
+msgid "Plotting in HPGL format"
+msgstr "以 HPGL 格式输出"
 
-#: eeschema/dialog_create_component.cpp:230
-msgid "&20"
-msgstr "&20"
+#: eeschema/menubar.cpp:99
+msgid "Plot SVG"
+msgstr "绘图输出(Plot) SVG"
 
-#: eeschema/dialog_create_component.cpp:231
-msgid "&21"
-msgstr "&21"
+#: eeschema/menubar.cpp:99
+msgid "Plotting in SVG format"
+msgstr "以 SVG 格式输出"
 
-#: eeschema/dialog_create_component.cpp:232
-msgid "&22"
-msgstr "&22"
+#: eeschema/menubar.cpp:106
+msgid "Plot to Clipboard"
+msgstr "绘图输出到剪贴板"
 
-#: eeschema/dialog_create_component.cpp:233
-msgid "&23"
-msgstr "&23"
+#: eeschema/menubar.cpp:106
+msgid "Export drawings to clipboard"
+msgstr "将图形输出到剪贴板"
 
-#: eeschema/dialog_create_component.cpp:234
-msgid "&24"
-msgstr "&24"
+#: eeschema/menubar.cpp:114
+msgid "Plot HPGL, PostScript, SVG"
+msgstr "绘图输出(Plot) HPGL, PostScript, SVG"
 
-#: eeschema/dialog_create_component.cpp:235
-msgid "&25"
-msgstr "&25"
+#: eeschema/menubar.cpp:117
+msgid "Quit Eeschema"
+msgstr "退出 eeschema"
 
-#: eeschema/dialog_create_component.cpp:236
-msgid "&26"
-msgstr "&26"
+#: eeschema/menubar.cpp:135
+msgid "&Undo\t"
+msgstr "撤销操作(&U)\t"
 
-#: eeschema/dialog_create_component.cpp:237
-msgid "Parts per component"
-msgstr "元件的单元部件数量"
+#: eeschema/menubar.cpp:143
+msgid "&Redo\t"
+msgstr "重复操作(&R)\t"
 
-#: eeschema/dialog_create_component.cpp:243
-msgid "Draw options"
-msgstr "图形选项"
+#: eeschema/menubar.cpp:162
+#: pcbnew/find.h:38
+msgid "Find"
+msgstr "查找"
 
-#: eeschema/dialog_create_component.cpp:247
-msgid "Show Pin Number"
-msgstr "显示引脚编号"
+#: eeschema/menubar.cpp:169
+#: eeschema/menubar.cpp:172
+#: share/zoom.cpp:360
+msgid "Zoom in"
+msgstr "放大"
+
+#: eeschema/menubar.cpp:177
+#: eeschema/menubar.cpp:180
+#: share/zoom.cpp:361
+msgid "Zoom out"
+msgstr "缩小"
+
+#: eeschema/menubar.cpp:186
+#: eeschema/menubar.cpp:196
+msgid "Zoom auto"
+msgstr "自动缩放"
 
-#: eeschema/dialog_create_component.cpp:251
-#: eeschema/edit_component_in_lib.cpp:418
-msgid "Show Pin Name"
-msgstr "显示引脚名称"
+#: eeschema/menubar.cpp:206
+msgid "&Component"
+msgstr "元件(&C)"
 
-#: eeschema/dialog_create_component.cpp:255
-#: eeschema/edit_component_in_lib.cpp:429
-msgid "Pin Name Inside"
-msgstr "引脚名称在内部"
+#: eeschema/menubar.cpp:206
+#: eeschema/tool_sch.cpp:165
+msgid "Place the component"
+msgstr "放置 元件"
 
-#: eeschema/dialog_create_component.cpp:259
-#: eeschema/dialog_edit_component_in_lib.cpp:152
-msgid "Skew:"
-msgstr "偏移值："
+#: eeschema/menubar.cpp:212
+msgid "&Power port"
+msgstr "电源端口(&P)"
 
-#: eeschema/dialog_create_component.cpp:311
-msgid "You must provide a name for this component"
-msgstr "你需要为这个元件提供一个名称"
+#: eeschema/menubar.cpp:212
+#: eeschema/tool_sch.cpp:169
+msgid "Place the power port"
+msgstr "放置 电源端口"
 
-#: eeschema/eelayer.cpp:233
-msgid "White"
-msgstr "白"
+#: eeschema/menubar.cpp:218
+msgid "&Wire"
+msgstr "导线(&W)"
 
-#: eeschema/eelayer.cpp:234
-#: share/dialog_print.cpp:184
-msgid "Black"
-msgstr "黑"
+#: eeschema/menubar.cpp:218
+#: eeschema/tool_sch.cpp:174
+msgid "Place the wire"
+msgstr "放置 导线"
 
-#: eeschema/eelayer.cpp:235
-msgid "Background Color:"
-msgstr "背景颜色："
+#: eeschema/menubar.cpp:226
+msgid "&Bus"
+msgstr "总线(&B)"
 
-#: eeschema/libarch.cpp:80
-msgid "Failed to create archive lib file "
-msgstr "生成存档库文件失败 "
+#: eeschema/menubar.cpp:227
+#: eeschema/tool_sch.cpp:178
+msgid "Place the bus"
+msgstr "放置 总线"
 
-#: eeschema/libarch.cpp:87
-msgid "Failed to create doc lib file "
-msgstr "生成说明库文件失败 "
+#: eeschema/menubar.cpp:236
+msgid "W&ire to bus entry"
+msgstr "\"导线到总线\"入口(I)"
 
-#: eeschema/database.cpp:70
-msgid "No Component found"
-msgstr "没有找到任何元件"
+#: eeschema/menubar.cpp:237
+#: eeschema/tool_sch.cpp:182
+msgid "Place the wire to bus entry"
+msgstr "放置 \"导线到总线\"入口"
 
-#: eeschema/database.cpp:96
-msgid "Selection"
-msgstr "选择"
+#: eeschema/menubar.cpp:246
+msgid "B&us to bus entry"
+msgstr "\"总线到总线\"入口(&U)"
 
-#: eeschema/libfield.cpp:221
-msgid "No new text: no change"
-msgstr "没有新文本：未做更改"
+#: eeschema/menubar.cpp:247
+#: eeschema/tool_sch.cpp:186
+msgid "Place the bus to bus entry"
+msgstr "放置 \"总线到总线\"入口"
 
-#: eeschema/selpart.cpp:45
-msgid "Select Lib"
-msgstr "选择库"
+#: eeschema/menubar.cpp:256
+msgid "No connect flag"
+msgstr "\"不连接\"标记"
 
-#: eeschema/selpart.cpp:94
-#, c-format
-msgid "Select component (%d items)"
-msgstr "选择元件 (%d 项)"
+#: eeschema/menubar.cpp:257
+#: eeschema/tool_sch.cpp:191
+msgid "Place the no connect flag"
+msgstr "放置 \"不连接\"标记"
 
-#: eeschema/netlist_control.cpp:231
-#: eeschema/netlist_control.cpp:348
-#: gerbview/options.cpp:201
-msgid "Default format"
-msgstr "默认格式"
+#: eeschema/menubar.cpp:266
+msgid "Net name"
+msgstr "网络名称"
 
-#: eeschema/netlist_control.cpp:244
-msgid "&Browse Plugin"
-msgstr "浏览插件(&B)"
+#: eeschema/menubar.cpp:267
+#: eeschema/tool_sch.cpp:195
+msgid "Place the net name"
+msgstr "放置 网络名称"
 
-#: eeschema/netlist_control.cpp:246
-msgid "&Netlist"
-msgstr "网络表(&N)"
+#: eeschema/menubar.cpp:274
+msgid "Global label"
+msgstr "全局标签"
 
-#: eeschema/netlist_control.cpp:261
-msgid "&Ok"
-msgstr "确定(&O)"
+#: eeschema/menubar.cpp:275
+msgid "Place the global label. Warning: all global labels with the same name are connected in whole hierarchy"
+msgstr "放置全局标签。警告: 所有名称相同的全局标签, 在整个层次中都是联通的。"
 
-#: eeschema/netlist_control.cpp:266
-msgid "&Delete"
-msgstr "删除(&D)"
+#: eeschema/menubar.cpp:284
+#: eeschema/eelayer.h:85
+msgid "Junction"
+msgstr "电气连接点"
 
-#: eeschema/netlist_control.cpp:275
-#: eeschema/netlist_control.cpp:367
-msgid "Netlist"
-msgstr "网络表"
+#: eeschema/menubar.cpp:285
+#: eeschema/tool_sch.cpp:204
+msgid "Place the junction"
+msgstr "放置 电气连接点"
+
+#: eeschema/menubar.cpp:296
+msgid "Hierarchical label"
+msgstr "层次标签"
+
+#: eeschema/menubar.cpp:297
+#: eeschema/tool_sch.cpp:209
+msgid "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
+msgstr "放置层次标签。该标签将在分图符号上作为引脚"
+
+#: eeschema/menubar.cpp:306
+msgid "Hierarchical sheet"
+msgstr "层次(分图)符号"
+
+#: eeschema/menubar.cpp:307
+#: eeschema/tool_sch.cpp:214
+msgid "Place the hierarchical sheet"
+msgstr "放置 层次(分图)符号"
+
+#: eeschema/menubar.cpp:316
+msgid "Imported hierarchical label"
+msgstr "导入的标签"
+
+#: eeschema/menubar.cpp:317
+#: eeschema/tool_sch.cpp:218
+msgid "Place the pin sheet (imported hierarchical label from sheet)"
+msgstr "放置分图引脚(从分图中的层次标签导出引脚)"
+
+#: eeschema/menubar.cpp:326
+msgid "Hierarchical pin to sheet"
+msgstr "层次(分图)引脚"
+
+#: eeschema/menubar.cpp:327
+msgid "Place the hierarchical pin to sheet"
+msgstr "放置 层次(分图)引脚"
+
+#: eeschema/menubar.cpp:338
+msgid "Graphic line or poligon"
+msgstr "图示: 线/多边形"
+
+#: eeschema/menubar.cpp:339
+msgid "Place the graphic line or poligon"
+msgstr "放置图示: 线/多边形"
+
+#: eeschema/menubar.cpp:348
+msgid "Graphic text (comment)"
+msgstr "注释文字"
+
+#: eeschema/menubar.cpp:349
+#: eeschema/tool_sch.cpp:232
+msgid "Place the graphic text (comment)"
+msgstr "放置 注释文字"
+
+#: eeschema/menubar.cpp:365
+msgid "Setting colors..."
+msgstr "设置颜色 ..."
+
+#: eeschema/menubar.cpp:371
+#: gerbview/tool_gerber.cpp:110
+msgid "&Options"
+msgstr "选项(&O)"
 
-#: eeschema/netlist_control.cpp:352
-msgid "Use Net Names"
-msgstr "使用网络名称"
+#: eeschema/menubar.cpp:372
+msgid "Select general options..."
+msgstr "选择常规选项 ..."
 
-#: eeschema/netlist_control.cpp:352
-msgid "Use Net Numbers"
-msgstr "使用网络编号"
+#: eeschema/menubar.cpp:397
+msgid "Open the eeschema manual"
+msgstr "打开 eeschema 手册"
 
-#: eeschema/netlist_control.cpp:353
-msgid "Netlist Options:"
-msgstr "网络表选项："
+#: eeschema/menubar.cpp:408
+msgid "&Edit"
+msgstr "编辑(&E)"
 
-#: eeschema/netlist_control.cpp:362
-msgid "Simulator command:"
-msgstr "模拟器命令："
+#: eeschema/menubar.cpp:409
+msgid "&View"
+msgstr "查看(&V)"
 
-#: eeschema/netlist_control.cpp:371
-msgid "&Run Simulator"
-msgstr "运行模拟器(&R)"
+#: eeschema/menubar.cpp:410
+msgid "&Place"
+msgstr "放置(&P)"
 
-#: eeschema/netlist_control.cpp:407
-msgid "Add Plugin"
-msgstr "添加插件"
+#: eeschema/files-io.cpp:114
+msgid "Clear Schematic Hierarchy (modified!)?"
+msgstr "清除原理图层次(已被更改!) ?"
 
-#: eeschema/netlist_control.cpp:422
-msgid "Netlist command:"
-msgstr "网络表命令："
+#: eeschema/files-io.cpp:172
+msgid ""
+"Ready\n"
+"Working dir: \n"
+msgstr ""
+"就绪\n"
+"工作目录: \n"
 
-#: eeschema/netlist_control.cpp:428
-#: share/setpage.cpp:352
-msgid "Title:"
-msgstr "标题："
+#: eeschema/files-io.cpp:218
+#, c-format
+msgid "File %s not found (new project ?)"
+msgstr "文件 %s 没有找到 (新工程 ?)"
 
-#: eeschema/netlist_control.cpp:446
-msgid "Plugin files:"
-msgstr "插件文件："
+#: eeschema/tool_sch.cpp:50
+msgid "New schematic project"
+msgstr "新建原理图工程"
 
-#: eeschema/netlist_control.cpp:470
-msgid "Do not forget to choose a title for this netlist control page"
-msgstr "不要忘记为这个网络表控制页选择一个标题"
+#: eeschema/tool_sch.cpp:53
+msgid "Open schematic project"
+msgstr "打开原理图工程"
 
-#: eeschema/netlist_control.cpp:562
-msgid "Netlist files:"
-msgstr "网络表文件："
+#: eeschema/tool_sch.cpp:64
+msgid "go to library editor"
+msgstr "打开库编辑器"
 
-#: eeschema/netlist_control.cpp:579
-msgid "Must be Annotated, Continue ?"
-msgstr "必须已经标注过，是否继续？"
+#: eeschema/tool_sch.cpp:67
+msgid "go to library browse"
+msgstr "打开库浏览器"
 
-#: eeschema/netlist_control.cpp:737
-msgid "Error. You must provide a command String"
-msgstr "错误。你必须提供一个命令字符串"
+#: eeschema/tool_sch.cpp:71
+msgid "Schematic Hierarchy Navigator"
+msgstr "原理图层次导航"
 
-#: eeschema/netlist_control.cpp:742
-msgid "Error. You must provide a Title"
-msgstr "错误。你必须提供一个标题"
+#: eeschema/tool_sch.cpp:93
+msgid "Print schematic"
+msgstr "打印原理图"
 
-#: eeschema/dialog_find.cpp:119
-msgid "Item in &Sheet"
-msgstr "当前图中内容(&S)"
+#: eeschema/tool_sch.cpp:97
+msgid "Run Cvpcb"
+msgstr "运行 cvpcb"
 
-#: eeschema/dialog_find.cpp:122
-msgid "Item in &Hierarchy"
-msgstr "层次图中内容(&H)"
+#: eeschema/tool_sch.cpp:100
+msgid "Run Pcbnew"
+msgstr "运行 pcbnew"
 
-#: eeschema/dialog_find.cpp:125
-msgid "Find &Next Item (F5)"
-msgstr "查找下一个(&N) (F5)"
+#: eeschema/tool_sch.cpp:124
+msgid "Netlist generation"
+msgstr "生成网络表"
 
-#: eeschema/dialog_find.cpp:131
-msgid "Find Markers"
-msgstr "查找ERC标记"
+#: eeschema/tool_sch.cpp:127
+msgid "Schematic Annotation"
+msgstr "原理图标注"
 
-#: eeschema/dialog_find.cpp:135
-msgid "Next Marker (F5)"
-msgstr "下一个标记 (F5)"
+#: eeschema/tool_sch.cpp:130
+msgid "Schematic Electric Rules Check"
+msgstr "原理图电气规则检查(ERC)"
 
-#: eeschema/dialog_find.cpp:139
-msgid "Find Cmp in &Lib"
-msgstr "从库中查找元件(&L)"
+#: eeschema/tool_sch.cpp:133
+msgid "Bill of material and/or Crossreferences"
+msgstr "材料清单 交叉参照表"
 
-#: eeschema/eeconfig.cpp:70
-#: kicad/files-io.cpp:131
-#: gerbview/dcode.cpp:260
-#: gerbview/readgerb.cpp:145
-msgid "File "
-msgstr "文件"
+#: eeschema/tool_sch.cpp:160
+msgid "Hierarchy Push/Pop"
+msgstr "原理图层次 压入/弹出"
 
-#: eeschema/eeconfig.cpp:70
-msgid "not found"
-msgstr "未找到"
+#: eeschema/tool_sch.cpp:199
+msgid ""
+"Place the global label.\n"
+"Warning: all global labels with the same name are connected in whole hierarchy"
+msgstr ""
+"放置全局标签。\n"
+"警告: 所有名称相同的全局标签, 在整个层次中都是联通的。"
 
-#: eeschema/schframe.cpp:182
-msgid "Schematic modified, Save before exit ?"
-msgstr "原理图被修改，是否在退出之前保存？"
+#: eeschema/tool_sch.cpp:223
+msgid "Place the hierachical pin to sheet"
+msgstr "放置 层次引脚到分图"
 
-#: eeschema/schframe.cpp:284
-msgid "No show Hidden Pins"
-msgstr "不显示隐藏引脚"
+#: eeschema/tool_sch.cpp:228
+msgid "Place the graphic line or polygon"
+msgstr "放置 图示: 线、多边形"
 
-#: eeschema/schframe.cpp:284
-#: eeschema/tool_sch.cpp:274
+#: eeschema/tool_sch.cpp:276
+#: eeschema/schframe.cpp:385
 msgid "Show Hidden Pins"
 msgstr "显示隐藏引脚"
 
-#: eeschema/schframe.cpp:287
-msgid "Draw lines at any direction"
-msgstr "可在任意方向画线"
-
-#: eeschema/schframe.cpp:288
-msgid "Draw lines H, V or 45 deg only"
-msgstr "只能水平、垂直或45度画线"
-
-#: eeschema/dialog_cmp_graphic_properties.cpp:167
-msgid "Void"
-msgstr "空"
-
-#: eeschema/dialog_cmp_graphic_properties.cpp:169
-msgid "BgFilled"
-msgstr "背景填充色"
-
-#: eeschema/dialog_cmp_graphic_properties.cpp:171
-msgid "Fill:"
-msgstr "填充："
+#: eeschema/tool_sch.cpp:281
+msgid "HV orientation for Wires and Bus"
+msgstr "导线和总线仅水平和垂直方向"
 
-#: eeschema/dialog_build_BOM.cpp:246
+#: eeschema/dialog_build_BOM.cpp:230
 msgid "List items:"
-msgstr "列表内容："
+msgstr "列表内容:"
 
-#: eeschema/dialog_build_BOM.cpp:250
+#: eeschema/dialog_build_BOM.cpp:234
 msgid "Components by Reference"
-msgstr "按编号排序元件"
+msgstr "按索引排序元件"
 
-#: eeschema/dialog_build_BOM.cpp:254
+#: eeschema/dialog_build_BOM.cpp:238
 msgid "Sub Components (i.e. U2A, U2B ...)"
-msgstr "子元件（如 U2A，U2B ...）"
+msgstr "子元件(如 U2A, U2B ...)"
 
-#: eeschema/dialog_build_BOM.cpp:258
+#: eeschema/dialog_build_BOM.cpp:242
 msgid "Components by Value"
 msgstr "按数值排序元件"
 
-#: eeschema/dialog_build_BOM.cpp:262
+#: eeschema/dialog_build_BOM.cpp:246
 msgid "Hierachy Pins by Name"
 msgstr "按名称排序层次引脚"
 
-#: eeschema/dialog_build_BOM.cpp:266
+#: eeschema/dialog_build_BOM.cpp:250
 msgid "Hierachy Pins by Sheets"
 msgstr "按分图排序层次引脚"
 
-#: eeschema/dialog_build_BOM.cpp:272
+#: eeschema/dialog_build_BOM.cpp:256
 msgid "Text for spreadsheet import"
-msgstr "文本，供电子表格导入"
+msgstr "文本, 供电子表格导入"
 
-#: eeschema/dialog_build_BOM.cpp:273
+#: eeschema/dialog_build_BOM.cpp:257
 msgid "Output format:"
-msgstr "输出格式："
+msgstr "输出格式:"
 
-#: eeschema/dialog_build_BOM.cpp:278
+#: eeschema/dialog_build_BOM.cpp:262
+#, fuzzy
 msgid "Tab"
 msgstr "Tab"
 
-#: eeschema/dialog_build_BOM.cpp:279
+#: eeschema/dialog_build_BOM.cpp:263
+#, fuzzy
 msgid ";"
 msgstr ";"
 
-#: eeschema/dialog_build_BOM.cpp:280
+#: eeschema/dialog_build_BOM.cpp:264
+#, fuzzy
 msgid ","
 msgstr ","
 
-#: eeschema/dialog_build_BOM.cpp:281
+#: eeschema/dialog_build_BOM.cpp:265
 msgid "Field separator for spreadsheet import:"
-msgstr "域分隔字符（供电子表格导入）："
+msgstr "域分隔字符(供电子表格导入):"
 
-#: eeschema/dialog_build_BOM.cpp:289
+#: eeschema/dialog_build_BOM.cpp:273
 msgid "Launch list browser"
 msgstr "启动列表浏览程序"
 
-#: eeschema/dialog_build_BOM.cpp:296
+#: eeschema/dialog_build_BOM.cpp:280
 msgid "Fields to add:"
-msgstr "要添加的域："
+msgstr "要添加的域:"
 
-#: eeschema/dialog_build_BOM.cpp:304
+#: eeschema/dialog_build_BOM.cpp:288
 msgid "Field 1"
 msgstr "域 1"
 
-#: eeschema/dialog_build_BOM.cpp:308
+#: eeschema/dialog_build_BOM.cpp:292
 msgid "Field 2"
 msgstr "域 2"
 
-#: eeschema/dialog_build_BOM.cpp:312
+#: eeschema/dialog_build_BOM.cpp:296
 msgid "Field 3"
 msgstr "域 3"
 
-#: eeschema/dialog_build_BOM.cpp:316
+#: eeschema/dialog_build_BOM.cpp:300
 msgid "Field 4"
 msgstr "域 4"
 
-#: eeschema/dialog_build_BOM.cpp:320
+#: eeschema/dialog_build_BOM.cpp:304
 msgid "Field 5"
 msgstr "域 5"
 
-#: eeschema/dialog_build_BOM.cpp:324
+#: eeschema/dialog_build_BOM.cpp:308
 msgid "Field 6"
 msgstr "域 6"
 
-#: eeschema/dialog_build_BOM.cpp:328
+#: eeschema/dialog_build_BOM.cpp:312
 msgid "Field 7"
 msgstr "域 7"
 
-#: eeschema/dialog_build_BOM.cpp:332
+#: eeschema/dialog_build_BOM.cpp:316
 msgid "Field 8"
 msgstr "域 8"
 
-#: eeschema/dialog_build_BOM.cpp:338
+#: eeschema/dialog_build_BOM.cpp:322
 msgid "Create &List"
 msgstr "生成列表(&L)"
 
-#: eeschema/dialog_build_BOM.cpp:354
+#: eeschema/dialog_build_BOM.cpp:338
 #: cvpcb/dialog_display_options.cpp:195
 msgid "&Apply"
 msgstr "应用(&A)"
 
-#: eeschema/dialog_build_BOM.cpp:560
-msgid "Bill of material:"
-msgstr "材料清单："
+#: eeschema/dialog_build_BOM.cpp:546
+msgid "Bill of materials:"
+msgstr "材料清单: "
 
-#: eeschema/dialog_build_BOM.cpp:610
-#: eeschema/dialog_build_BOM.cpp:666
+#: eeschema/dialog_build_BOM.cpp:597
+#: eeschema/dialog_build_BOM.cpp:652
 msgid "Failed to open file "
 msgstr "打开文件失败"
 
-#: eeschema/dialog_build_BOM.cpp:738
+#: eeschema/dialog_build_BOM.cpp:732
 #, c-format
 msgid ""
 "\n"
@@ -6727,7 +7538,7 @@ msgstr ""
 "\n"
 "#全局标签 ( 顺序 = 图号 ) 数量 = %d\n"
 
-#: eeschema/dialog_build_BOM.cpp:749
+#: eeschema/dialog_build_BOM.cpp:743
 #, c-format
 msgid ""
 "\n"
@@ -6738,7 +7549,7 @@ msgstr ""
 "#全局标签 ( 顺序 = 字母顺序 ) 数量 = %d\n"
 "\n"
 
-#: eeschema/dialog_build_BOM.cpp:756
+#: eeschema/dialog_build_BOM.cpp:750
 msgid ""
 "\n"
 "#End List\n"
@@ -6746,224 +7557,77 @@ msgstr ""
 "\n"
 "#列表结束\n"
 
-#: eeschema/dialog_build_BOM.cpp:1126
-#: eeschema/component_class.cpp:58
-#: eeschema/component_class.cpp:59
-#: eeschema/component_class.cpp:60
-#: eeschema/component_class.cpp:61
-#: eeschema/component_class.cpp:62
-#: eeschema/component_class.cpp:63
-#: eeschema/component_class.cpp:64
-#: eeschema/component_class.cpp:65
-msgid "Field"
-msgstr "域"
-
-#: eeschema/dialog_build_BOM.cpp:1134
+#: eeschema/dialog_build_BOM.cpp:1151
 msgid ""
 "\n"
 "#Cmp ( order = Reference )"
 msgstr ""
 "\n"
-"#元件 ( 顺序 = 标签 )"
+"#元件 ( 顺序 = 索引 )"
 
-#: eeschema/dialog_build_BOM.cpp:1137
-#: eeschema/dialog_build_BOM.cpp:1217
+#: eeschema/dialog_build_BOM.cpp:1154
+#: eeschema/dialog_build_BOM.cpp:1236
 msgid " (with SubCmp)"
 msgstr " (包括子元件)"
 
-#: eeschema/dialog_build_BOM.cpp:1197
-#: eeschema/dialog_build_BOM.cpp:1258
+#: eeschema/dialog_build_BOM.cpp:1199
+msgid "?"
+msgstr ""
+
+#: eeschema/dialog_build_BOM.cpp:1216
+#: eeschema/dialog_build_BOM.cpp:1276
 msgid "#End Cmp\n"
 msgstr "#元件列表结束\n"
 
-#: eeschema/dialog_build_BOM.cpp:1214
+#: eeschema/dialog_build_BOM.cpp:1233
 msgid ""
 "\n"
 "#Cmp ( order = Value )"
 msgstr ""
 "\n"
-"#元件 ( 顺序 = 值 )"
+"#元件 ( 顺序 = 数值 )"
 
-#: eeschema/dialog_build_BOM.cpp:1283
+#: eeschema/dialog_build_BOM.cpp:1307
 #, c-format
-msgid "> %-28.28s Global        (Sheet %.2d) pos: %3.3f, %3.3f\n"
-msgstr "> %-28.28s Global        (Sheet %.2d) pos: %3.3f, %3.3f\n"
+msgid "> %-28.28s %s        (Sheet %s) pos: %3.3f, %3.3f\n"
+msgstr "> %-28.28s %s        (图 %s) 位置: %3.3f, %3.3f\n"
 
-#: eeschema/dialog_build_BOM.cpp:1302
+#: eeschema/dialog_build_BOM.cpp:1327
 #, c-format
-msgid "> %-28.28s Sheet %-7.7s (Sheet %.2d) pos: %3.3f, %3.3f\n"
-msgstr "> %-28.28s sheet %-7.7s (sheet %.2d) pos: %3.3f, %3.3f\n"
+msgid "> %-28.28s Sheet %-7.7s (Sheet %s) pos: %3.3f, %3.3f\n"
+msgstr "> %-28.28s 图 %-7.7s (图 %s) 位置: %3.3f, %3.3f\n"
 
-#: eeschema/dialog_build_BOM.cpp:1316
+#: eeschema/dialog_build_BOM.cpp:1341
 msgid "#End labels\n"
 msgstr "#标签列表结束\n"
 
-#: eeschema/lib_export.cpp:39
-msgid "Import component:"
-msgstr "导入元件："
-
-#: eeschema/lib_export.cpp:71
-msgid "File is empty"
-msgstr "文件是空的"
-
-#: eeschema/lib_export.cpp:92
-msgid "No Part to Save"
-msgstr "没有需要保存的部件"
-
-#: eeschema/lib_export.cpp:101
-msgid "New Library"
-msgstr "新库"
-
-#: eeschema/lib_export.cpp:101
-msgid "Export component:"
-msgstr "导出元件："
-
-#: eeschema/lib_export.cpp:135
-msgid "0k"
-msgstr "0k"
-
-#: eeschema/lib_export.cpp:137
-msgid ""
-"Note: this new library will be available only if it is loaded by eeschema.\n"
-"Modify eeschema config if you want use it."
-msgstr ""
-"提示：这个新的库需要被 eeschema 加载以后才能使用。\n"
-"要加载它，请调整 eeschema 的设置。"
-
-#: eeschema/lib_export.cpp:139
-msgid "Error while create "
-msgstr "建立时出错 "
-
-#: eeschema/edit_label.cpp:49
-msgid "Empty Text!"
-msgstr "文字为空！"
-
-#: eeschema/dialog_erc.cpp:171
-#: eeschema/dialog_erc.cpp:202
-msgid "Erc File Report:"
-msgstr "ERC文件报告："
-
-#: eeschema/dialog_erc.cpp:176
-msgid "-> Total Errors:  "
-msgstr "-> 错误总数： "
-
-#: eeschema/dialog_erc.cpp:179
-msgid "-> Last Warnings: "
-msgstr "-> 现有警告数："
-
-#: eeschema/dialog_erc.cpp:183
-msgid "-> Last Errors:   "
-msgstr "-> 现有错误数： "
-
-#: eeschema/dialog_erc.cpp:189
-msgid "0000"
-msgstr "0000"
-
-#: eeschema/dialog_erc.cpp:205
-msgid "Write erc report"
-msgstr "写ERC报告文件"
-
-#: eeschema/dialog_erc.cpp:211
-msgid "&Test Erc"
-msgstr "ERC测试(&T)"
-
-#: eeschema/dialog_erc.cpp:215
-msgid "&Del Markers"
-msgstr "删除记号(&D)"
-
-#: eeschema/dialog_erc.cpp:222
-msgid "erc"
-msgstr "ERC"
-
-#: eeschema/dialog_erc.cpp:228
-msgid "Reset"
-msgstr "复位"
-
-#: eeschema/files-io.cpp:57
-msgid "Clear SubHierarchy ?"
-msgstr "清除子层次？"
-
-#: eeschema/eelibs_read_libraryfiles.cpp:108
-msgid "Start loading schematic libs"
-msgstr "开始加载原理图库"
-
-#: eeschema/eelibs_read_libraryfiles.cpp:295
-#: eeschema/eelibs_read_libraryfiles.cpp:302
-msgid "File <"
-msgstr "文件 <"
-
-#: eeschema/eelibs_read_libraryfiles.cpp:295
-msgid "> is empty!"
-msgstr "> 是空文件！"
-
-#: eeschema/eelibs_read_libraryfiles.cpp:302
-msgid "> is NOT EESCHEMA library!"
-msgstr "> 不是 EESCHEMA 库！"
-
-#: eeschema/eelibs_read_libraryfiles.cpp:321
-msgid "Library <"
-msgstr "库 <"
-
-#: eeschema/eelibs_read_libraryfiles.cpp:321
-msgid "> header read error"
-msgstr "> 文件头读错误"
-
-#: eeschema/edit_component_in_schematic.cpp:195
-#: eeschema/edit_component_in_lib.cpp:554
-msgid "Field to edit"
-msgstr "要编辑的域"
-
-#: eeschema/edit_component_in_schematic.cpp:201
-#: eeschema/edit_component_in_lib.cpp:508
-msgid "Field Name:"
-msgstr "域名称："
-
-#: eeschema/edit_component_in_schematic.cpp:211
-#: eeschema/edit_component_in_lib.cpp:518
-msgid "Field Text:"
-msgstr "域文字："
-
-#: eeschema/edit_component_in_schematic.cpp:219
-#: eeschema/edit_component_in_lib.cpp:524
-msgid "Pos"
-msgstr "位置"
-
-#: eeschema/edit_component_in_schematic.cpp:326
-msgid "No Component Name!"
-msgstr "没有元件名称！"
-
-#: eeschema/edit_component_in_schematic.cpp:332
-#, c-format
-msgid "Component [%s] not found!"
-msgstr "元件 [%s] 没有找到！"
+#: eeschema/dialog_find.cpp:119
+msgid "Item in &Sheet"
+msgstr "当前图中内容(&S)"
 
-#: eeschema/edit_component_in_schematic.cpp:449
-msgid "No Field to move"
-msgstr "没有可移动的域"
+#: eeschema/dialog_find.cpp:122
+msgid "Item in &Hierarchy"
+msgstr "层次图中内容(&H)"
 
-#: eeschema/edit_component_in_schematic.cpp:512
-msgid "No Field To Edit"
-msgstr "没有可编辑的域"
+#: eeschema/dialog_find.cpp:125
+msgid "Find &Next Item (F5)"
+msgstr "查找下一个(&N) (F5)"
 
-#: eeschema/edit_component_in_schematic.cpp:526
-msgid ""
-"Part is a POWER, value cannot be modified!\n"
-"You must create a new power"
-msgstr ""
-"部件是一个电源端口，数值不能修改！\n"
-"你必须建立一个新的电源端口"
+#: eeschema/dialog_find.cpp:131
+msgid "Find Markers"
+msgstr "查找ERC标记"
 
-#: eeschema/edit_component_in_schematic.cpp:569
-msgid "Reference needed !, No change"
-msgstr "必需有元件标签！未做更改"
+#: eeschema/dialog_find.cpp:135
+msgid "Next Marker (F5)"
+msgstr "下一个标记 (F5)"
 
-#: eeschema/edit_component_in_schematic.cpp:573
-msgid "Value needed !, No change"
-msgstr "必需有元件值！未做更改"
+#: eeschema/dialog_find.cpp:139
+msgid "Find Cmp in &Lib"
+msgstr "从库中查找元件(&L)"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:70
 msgid "Component properties (Not found in lib)"
-msgstr "元件属性（在库中没有找到）"
+msgstr "元件属性(在库中没有找到)"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:135
 msgid "Unit 1"
@@ -7072,20 +7736,16 @@ msgstr "单元 26"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:162
 msgid "Unit:"
-msgstr "单元："
+msgstr "单元: "
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:172
+#, fuzzy
 msgid "+90"
 msgstr "+90"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:175
 msgid "Orient:"
-msgstr "方向："
-
-#: eeschema/dialog_edit_component_in_schematic.cpp:181
-#: eeschema/onrightclick.cpp:301
-msgid "Mirror --"
-msgstr "镜像 --"
+msgstr "方向: "
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:182
 msgid "Mirror !"
@@ -7095,9 +7755,15 @@ msgstr "镜像 !"
 msgid "Mirror:"
 msgstr "镜像:"
 
+#: eeschema/dialog_edit_component_in_schematic.cpp:187
+#: eeschema/dialog_edit_component_in_lib.cpp:162
+#: eeschema/dialog_create_component.cpp:188
+msgid "Parts are locked"
+msgstr "部件被锁定"
+
 #: eeschema/dialog_edit_component_in_schematic.cpp:194
 msgid "Chip Name:"
-msgstr "芯片名称："
+msgstr "芯片名称:"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:211
 #: eeschema/edit_component_in_lib.cpp:497
@@ -7106,7 +7772,7 @@ msgstr "显示文字"
 
 #: eeschema/dialog_edit_component_in_schematic.cpp:225
 #: eeschema/edit_component_in_lib.cpp:484
-#: eeschema/eelayer.h:165
+#: eeschema/eelayer.h:164
 msgid "Fields"
 msgstr "域"
 
@@ -7114,854 +7780,884 @@ msgstr "域"
 msgid "Defaults"
 msgstr "默认"
 
-#: eeschema/tool_sch.cpp:55
-msgid "New schematic project"
-msgstr "新建原理图工程"
+#: eeschema/pinedit.cpp:189
+msgid "Occupied by other pin. Continue?"
+msgstr "已被其他引脚占用。是否继续 ?"
 
-#: eeschema/tool_sch.cpp:58
-msgid "Open schematic project"
-msgstr "打开原理图工程"
+#: eeschema/pinedit.cpp:874
+#, c-format
+msgid "Duplicate Pin %4.4s (Pin %s loc %d, %d, and Pin %s loc %d, %d)"
+msgstr "重复的引脚 %4.4s (引脚 %s 位于 %d, %d, 引脚 %s 位于 %d,  %d)"
 
-#: eeschema/tool_sch.cpp:61
-msgid "Save schematic project"
-msgstr "保存原理图工程"
+#: eeschema/pinedit.cpp:879
+#, c-format
+msgid "  Part %d"
+msgstr "  部件 %d"
 
-#: eeschema/tool_sch.cpp:69
-msgid "go to library editor"
-msgstr "打开库编辑器"
+#: eeschema/pinedit.cpp:884
+msgid "  Convert"
+msgstr "  转换"
 
-#: eeschema/tool_sch.cpp:72
-msgid "go to library browse"
-msgstr "打开库浏览器"
+#: eeschema/pinedit.cpp:885
+msgid "  Normal"
+msgstr "  普通"
 
-#: eeschema/tool_sch.cpp:76
-msgid "Schematic Hierarchy Navigator"
-msgstr "原理图层次导航"
+#: eeschema/getpart.cpp:108
+#, c-format
+msgid "component selection (%d items loaded):"
+msgstr "元件选择(加载了%d项):"
 
-#: eeschema/tool_sch.cpp:98
-msgid "Print schematic"
-msgstr "打印原理图"
+#: eeschema/getpart.cpp:173
+msgid "Failed to find part "
+msgstr "没有查找到部件 "
 
-#: eeschema/tool_sch.cpp:102
-msgid "Run Cvpcb"
-msgstr "运行 Cvpcb"
+#: eeschema/getpart.cpp:173
+msgid " in library"
+msgstr " (在库中)"
 
-#: eeschema/tool_sch.cpp:105
-msgid "Run Pcbnew"
-msgstr "运行 Pcbnew"
+#: eeschema/edit_component_in_lib.cpp:168
+#: eeschema/dialog_edit_component_in_lib.h:43
+msgid "Lib Component Properties"
+msgstr "库元件属性"
 
-#: eeschema/tool_sch.cpp:129
-msgid "Netlist generation"
-msgstr "生成网络表"
+#: eeschema/edit_component_in_lib.cpp:172
+msgid "Properties for "
+msgstr "属性设置: "
 
-#: eeschema/tool_sch.cpp:132
-msgid "Schematic Annotation"
-msgstr "原理图标注"
+#: eeschema/edit_component_in_lib.cpp:177
+#, fuzzy
+msgid "(alias of "
+msgstr "(alias of "
 
-#: eeschema/tool_sch.cpp:135
-msgid "Schematic Electric Rules Check"
-msgstr "原理图电气规则检查（ERC）"
+#: eeschema/edit_component_in_lib.cpp:216
+#: eeschema/dialog_edit_component_in_lib.cpp:207
+msgid "Alias"
+msgstr "别名"
 
-#: eeschema/tool_sch.cpp:138
-msgid "Bill of material and/or Crossreferences"
-msgstr "材料清单 元件对照表"
+#: eeschema/edit_component_in_lib.cpp:245
+#: eeschema/edit_component_in_lib.cpp:328
+msgid "Delete All"
+msgstr "删除所有"
 
-#: eeschema/tool_sch.cpp:165
-msgid "Hierarchy Push/Pop"
-msgstr "原理图层次 压入/弹出"
+#: eeschema/edit_component_in_lib.cpp:281
+msgid "Footprint Filter"
+msgstr "封装过滤"
 
-#: eeschema/tool_sch.cpp:170
-msgid "Add components"
-msgstr "添加 元件"
+#: eeschema/edit_component_in_lib.cpp:293
+msgid "Footprints"
+msgstr "封装"
 
-#: eeschema/tool_sch.cpp:174
-msgid "Add powers"
-msgstr "添加 电源端口"
+#: eeschema/edit_component_in_lib.cpp:401
+#: eeschema/dialog_create_component.cpp:180
+msgid "As Convert"
+msgstr "以转换样式"
 
-#: eeschema/tool_sch.cpp:179
-msgid "Add wires"
-msgstr "添加 导线"
+#: eeschema/edit_component_in_lib.cpp:407
+msgid "Show Pin Num"
+msgstr "显示引脚编号"
 
-#: eeschema/tool_sch.cpp:183
-msgid "Add bus"
-msgstr "添加 总线"
+#: eeschema/edit_component_in_lib.cpp:418
+#: eeschema/dialog_create_component.cpp:251
+msgid "Show Pin Name"
+msgstr "显示引脚名称"
 
-#: eeschema/tool_sch.cpp:187
-msgid "Add wire to bus entry"
-msgstr "添加 导线到总线 接入符号"
+#: eeschema/edit_component_in_lib.cpp:429
+#: eeschema/dialog_create_component.cpp:255
+msgid "Pin Name Inside"
+msgstr "引脚名称在内部"
 
-#: eeschema/tool_sch.cpp:191
-msgid "Add bus to bus entry"
-msgstr "添加 总线到总线 接入符号"
+#: eeschema/edit_component_in_lib.cpp:476
+msgid "Left justify"
+msgstr "左对齐"
 
-#: eeschema/tool_sch.cpp:196
-msgid "Add no connect flag"
-msgstr "添加 不连接标记"
+#: eeschema/edit_component_in_lib.cpp:476
+#: eeschema/edit_component_in_lib.cpp:478
+#: share/zoom.cpp:359
+msgid "Center"
+msgstr "居中"
 
-#: eeschema/tool_sch.cpp:200
-msgid "Add wire or bus label"
-msgstr "添加 导线或总线标签"
+#: eeschema/edit_component_in_lib.cpp:476
+msgid "Right justify"
+msgstr "右对齐"
 
-#: eeschema/tool_sch.cpp:204
-#: eeschema/onrightclick.cpp:491
-#: eeschema/onrightclick.cpp:523
-msgid "Add global label"
-msgstr "添加 全局标签"
+#: eeschema/edit_component_in_lib.cpp:478
+msgid "Bottom justify"
+msgstr "下对齐"
 
-#: eeschema/tool_sch.cpp:208
-#: eeschema/onrightclick.cpp:485
-#: eeschema/onrightclick.cpp:517
-msgid "Add junction"
-msgstr "添加 电气连接点"
+#: eeschema/edit_component_in_lib.cpp:478
+msgid "Top justify"
+msgstr "上对齐"
 
-#: eeschema/tool_sch.cpp:213
-msgid "Add hierarchical symbol (sheet)"
-msgstr "添加 层次（分图）符号"
+#: eeschema/edit_component_in_lib.cpp:529
+msgid "Hor Justify"
+msgstr "水平对齐"
 
-#: eeschema/tool_sch.cpp:217
-msgid "import glabel from sheet & create pinsheet"
-msgstr "导入分图的全局标签生成层次图引脚"
+#: eeschema/edit_component_in_lib.cpp:536
+msgid "Vert Justify"
+msgstr "垂直对齐"
 
-#: eeschema/tool_sch.cpp:221
-msgid "Add hierachical pin to sheet"
-msgstr "添加 层次（分图）引脚"
+#: eeschema/edit_component_in_lib.cpp:551
+msgid "Chip Name"
+msgstr "芯片名称"
 
-#: eeschema/tool_sch.cpp:230
-msgid "Add graphic text (comment)"
-msgstr "添加 注释文字"
+#: eeschema/edit_component_in_lib.cpp:890
+msgid "Ok to Delete Alias LIST"
+msgstr "是否确定删除别名列表"
 
-#: eeschema/tool_sch.cpp:279
-msgid "HV orientation for Wires and Bus"
-msgstr "导线和总线仅水平和垂直方向"
+#: eeschema/edit_component_in_lib.cpp:915
+msgid "New alias:"
+msgstr "新别名:"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:136
-msgid "General :"
-msgstr "基本："
+#: eeschema/edit_component_in_lib.cpp:923
+msgid "This is the Root Part"
+msgstr "这是根部件"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:144
-msgid "Number of Parts:"
-msgstr "子元件数量："
+#: eeschema/edit_component_in_lib.cpp:932
+#: eeschema/edit_component_in_lib.cpp:1200
+msgid "Already in use"
+msgstr "已经在使用中"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:172
-msgid "Doc:"
-msgstr "说明："
+#: eeschema/edit_component_in_lib.cpp:957
+msgid " is Current Selected Alias!"
+msgstr " 是当前选中的别名!"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:179
-msgid "Keywords:"
-msgstr "关键词："
+#: eeschema/edit_component_in_lib.cpp:1010
+msgid "Delete units"
+msgstr "删除单元"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:186
-msgid "DocFileName:"
-msgstr "说明文件的文件名："
+#: eeschema/edit_component_in_lib.cpp:1080
+msgid "Create pins for Convert items"
+msgstr "为转换内容生成引脚"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:195
-msgid "Copy Doc"
-msgstr "复制说明"
+#: eeschema/edit_component_in_lib.cpp:1084
+#, fuzzy
+msgid "Part as \"De Morgan\" anymore"
+msgstr "Part as \"De Morgan\" anymore"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:199
-msgid "Browse DocFiles"
-msgstr "浏览说明文件"
+#: eeschema/edit_component_in_lib.cpp:1109
+msgid "Delete Convert items"
+msgstr "删除转换的内容"
 
-#: eeschema/dialog_edit_component_in_lib.cpp:207
-#: eeschema/edit_component_in_lib.cpp:216
-msgid "Alias"
-msgstr "别名"
+#: eeschema/edit_component_in_lib.cpp:1144
+#: common/eda_doc.cpp:129
+msgid "Doc Files"
+msgstr "说明文件"
 
-#: eeschema/pinedit-dialog.cpp:233
-msgid "Pin Name :"
-msgstr "引脚名称："
+#: eeschema/edit_component_in_lib.cpp:1167
+msgid "Ok to Delete FootprintFilter LIST"
+msgstr "是否确定删除封装过滤列表"
 
-#: eeschema/pinedit-dialog.cpp:239
-msgid "Pin Num :"
-msgstr "引脚编号："
+#: eeschema/edit_component_in_lib.cpp:1189
+msgid "New FootprintFilter:"
+msgstr "新封装过滤:"
 
-#: eeschema/pinedit-dialog.cpp:247
-msgid " Pin Options :"
-msgstr " 引脚选项："
+#: eeschema/schframe.cpp:273
+msgid "Schematic modified, Save before exit ?"
+msgstr "原理图被修改，是否在退出之前保存？"
 
-#: eeschema/pinedit-dialog.cpp:252
-msgid "Pin lenght :"
-msgstr "引脚长度："
+#: eeschema/schframe.cpp:385
+msgid "No show Hidden Pins"
+msgstr "不显示隐藏引脚"
 
-#: eeschema/pinedit-dialog.cpp:266
-msgid "No Draw"
-msgstr "无图形"
+#: eeschema/schframe.cpp:389
+msgid "Draw lines at any direction"
+msgstr "可在任意方向画线"
 
-#: eeschema/pinedit-dialog.cpp:293
-msgid "Pin Orient:"
-msgstr "引脚方向："
+#: eeschema/schframe.cpp:390
+msgid "Draw lines H, V or 45 deg only"
+msgstr "只能水平、垂直或45度画线"
 
-#: eeschema/pinedit-dialog.cpp:325
-msgid "Pin Shape:"
-msgstr "引脚形状："
+#: eeschema/database.cpp:70
+msgid "No Component found"
+msgstr "没有找到任何元件"
 
-#: eeschema/pinedit-dialog.cpp:334
-msgid "3 States"
-msgstr "三态"
+#: eeschema/database.cpp:96
+msgid "Selection"
+msgstr "选择"
 
-#: eeschema/pinedit-dialog.cpp:336
-msgid "Unspecified"
-msgstr "未定义"
+#: eeschema/dialog_edit_component_in_lib.cpp:136
+msgid "General :"
+msgstr "基本: "
 
-#: eeschema/pinedit-dialog.cpp:337
-msgid "Power In"
-msgstr "电源入"
+#: eeschema/dialog_edit_component_in_lib.cpp:144
+msgid "Number of Parts:"
+msgstr "子元件数量:"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:152
+#: eeschema/dialog_create_component.cpp:259
+msgid "Skew:"
+msgstr "偏移值:"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:158
+#: eeschema/dialog_create_component.cpp:184
+msgid "Power Symbol"
+msgstr "电源符号"
+
+#: eeschema/dialog_edit_component_in_lib.cpp:172
+msgid "Doc:"
+msgstr "说明:"
 
-#: eeschema/pinedit-dialog.cpp:338
-msgid "Power Out"
-msgstr "电源出"
+#: eeschema/dialog_edit_component_in_lib.cpp:179
+msgid "Keywords:"
+msgstr "关键词:"
 
-#: eeschema/pinedit-dialog.cpp:339
-msgid "Open coll"
-msgstr "集电极开路"
+#: eeschema/dialog_edit_component_in_lib.cpp:186
+msgid "DocFileName:"
+msgstr "说明文件的文件名:"
 
-#: eeschema/pinedit-dialog.cpp:340
-msgid "Open emit"
-msgstr "发射极开路"
+#: eeschema/dialog_edit_component_in_lib.cpp:195
+msgid "Copy Doc"
+msgstr "复制说明"
 
-#: eeschema/pinedit-dialog.cpp:342
-msgid "Electrical Type:"
-msgstr "电气类型："
+#: eeschema/dialog_edit_component_in_lib.cpp:199
+msgid "Browse DocFiles"
+msgstr "浏览说明文件"
 
-#: eeschema/libedit_onrightclick.cpp:103
-msgid "Move Arc"
+#: eeschema/libedit_onrightclick.cpp:83
+msgid "Move Arc "
 msgstr "移动 圆弧"
 
-#: eeschema/libedit_onrightclick.cpp:106
+#: eeschema/libedit_onrightclick.cpp:87
 msgid "Arc Options"
 msgstr "圆弧选项"
 
-#: eeschema/libedit_onrightclick.cpp:110
-msgid "Arc Delete"
+#: eeschema/libedit_onrightclick.cpp:90
+msgid "Delete Arc "
 msgstr "删除 圆弧"
 
-#: eeschema/libedit_onrightclick.cpp:118
-msgid "Move Circle"
+#: eeschema/libedit_onrightclick.cpp:98
+msgid "Move Circle "
 msgstr "移动 圆形"
 
-#: eeschema/libedit_onrightclick.cpp:121
+#: eeschema/libedit_onrightclick.cpp:102
 msgid "Circle Options"
 msgstr "圆形选项"
 
-#: eeschema/libedit_onrightclick.cpp:125
-msgid "Circle Delete"
+#: eeschema/libedit_onrightclick.cpp:105
+msgid "Delete Circle "
 msgstr "删除 圆形"
 
-#: eeschema/libedit_onrightclick.cpp:133
-msgid "Move Rect"
+#: eeschema/libedit_onrightclick.cpp:113
+msgid "Move Rect "
 msgstr "移动 矩形"
 
-#: eeschema/libedit_onrightclick.cpp:136
+#: eeschema/libedit_onrightclick.cpp:117
 msgid "Rect Options"
 msgstr "矩形选项"
 
-#: eeschema/libedit_onrightclick.cpp:140
-msgid "Rect Delete"
+#: eeschema/libedit_onrightclick.cpp:120
+msgid "Delete Rect "
 msgstr "删除 矩形"
 
-#: eeschema/libedit_onrightclick.cpp:148
-#: eeschema/onrightclick.cpp:412
-msgid "Move Text"
+#: eeschema/libedit_onrightclick.cpp:128
+msgid "Move Text "
 msgstr "移动 文字"
 
-#: eeschema/libedit_onrightclick.cpp:151
+#: eeschema/libedit_onrightclick.cpp:132
 msgid "Text Editor"
 msgstr "编辑 文字"
 
-#: eeschema/libedit_onrightclick.cpp:153
+#: eeschema/libedit_onrightclick.cpp:134
 msgid "Rotate Text"
 msgstr "旋转 文字"
 
-#: eeschema/libedit_onrightclick.cpp:157
-msgid "Text Delete"
+#: eeschema/libedit_onrightclick.cpp:137
+msgid "Delete Text "
 msgstr "删除 文字"
 
-#: eeschema/libedit_onrightclick.cpp:165
-msgid "Move Line"
+#: eeschema/libedit_onrightclick.cpp:145
+msgid "Move Line "
 msgstr "移动 直线"
 
-#: eeschema/libedit_onrightclick.cpp:170
+#: eeschema/libedit_onrightclick.cpp:151
 msgid "Line End"
 msgstr "结束 画直线"
 
-#: eeschema/libedit_onrightclick.cpp:173
+#: eeschema/libedit_onrightclick.cpp:154
 msgid "Line Options"
 msgstr "直线选项"
 
-#: eeschema/libedit_onrightclick.cpp:177
-msgid "Line Delete"
+#: eeschema/libedit_onrightclick.cpp:157
+msgid "Delete Line "
 msgstr "删除 直线"
 
-#: eeschema/libedit_onrightclick.cpp:184
-msgid "Segment Delete"
+#: eeschema/libedit_onrightclick.cpp:164
+msgid "Delete Segment "
 msgstr "删除 线段"
 
-#: eeschema/libedit_onrightclick.cpp:192
-#: eeschema/onrightclick.cpp:266
-msgid "Move Field"
+#: eeschema/libedit_onrightclick.cpp:174
+msgid "Move Feild "
 msgstr "移动 域"
 
-#: eeschema/libedit_onrightclick.cpp:195
+#: eeschema/libedit_onrightclick.cpp:178
 msgid "Field Rotate"
 msgstr "旋转 域"
 
-#: eeschema/libedit_onrightclick.cpp:197
+#: eeschema/libedit_onrightclick.cpp:180
 msgid "Field Edit"
 msgstr "编辑 域"
 
-#: eeschema/libedit_onrightclick.cpp:222
+#: eeschema/libedit_onrightclick.cpp:205
 msgid "Move Pin"
 msgstr "移动 引脚"
 
-#: eeschema/libedit_onrightclick.cpp:224
-msgid "Pin Edit"
+#: eeschema/libedit_onrightclick.cpp:208
+msgid "Edit Pin "
 msgstr "编辑 引脚"
 
-#: eeschema/libedit_onrightclick.cpp:229
-msgid "Pin Delete"
+#: eeschema/libedit_onrightclick.cpp:213
+msgid "Delete Pin "
 msgstr "删除 引脚"
 
-#: eeschema/libedit_onrightclick.cpp:233
+#: eeschema/libedit_onrightclick.cpp:218
 msgid "Global"
 msgstr "全局"
 
-#: eeschema/libedit_onrightclick.cpp:235
+#: eeschema/libedit_onrightclick.cpp:220
 msgid "Pin Size to selected pins"
 msgstr "引脚大小 应用到选中引脚"
 
-#: eeschema/libedit_onrightclick.cpp:235
+#: eeschema/libedit_onrightclick.cpp:220
 msgid "Pin Size to others"
 msgstr "引脚大小 应用到其他引脚"
 
-#: eeschema/libedit_onrightclick.cpp:238
+#: eeschema/libedit_onrightclick.cpp:223
 msgid "Pin Name Size to selected pin"
 msgstr "引脚名称大小 应用到选中引脚"
 
-#: eeschema/libedit_onrightclick.cpp:238
+#: eeschema/libedit_onrightclick.cpp:223
 msgid "Pin Name Size to others"
 msgstr "引脚名称大小 应用到其他引脚"
 
-#: eeschema/libedit_onrightclick.cpp:241
+#: eeschema/libedit_onrightclick.cpp:226
 msgid "Pin Num Size to selected pin"
 msgstr "引脚编号大小 应用到选中引脚"
 
-#: eeschema/libedit_onrightclick.cpp:241
+#: eeschema/libedit_onrightclick.cpp:226
 msgid "Pin Num Size to others"
 msgstr "引脚编号大小 应用到其他引脚"
 
-#: eeschema/libedit_onrightclick.cpp:256
-#: eeschema/onrightclick.cpp:587
-msgid "Win. Zoom (Midd butt drag mouse)"
-msgstr "块区域放大显示（鼠标中键拖拉）"
-
-#: eeschema/libedit_onrightclick.cpp:264
+#: eeschema/libedit_onrightclick.cpp:249
 msgid "Select items"
 msgstr "选中内容"
 
-#: eeschema/libedit_onrightclick.cpp:267
+#: eeschema/libedit_onrightclick.cpp:252
 msgid "Mirror Block (ctrl + drag mouse)"
-msgstr "镜像 块 （ctrl + 鼠标拖拉）"
-
-#: eeschema/libedit_onrightclick.cpp:269
-#: eeschema/onrightclick.cpp:602
-msgid "Del. Block (shift+ctrl + drag mouse)"
-msgstr "删除 块 （shift + ctrl + 鼠标拖拉）"
-
-#: eeschema/viewlib_frame.cpp:57
-msgid "Library browser"
-msgstr "库浏览器"
-
-#: eeschema/component_class.cpp:57
-#: eeschema/eelayer.h:172
-msgid "Sheet"
-msgstr "图"
-
-#: eeschema/onrightclick.cpp:142
-msgid "Leave Sheet"
-msgstr "离开 分图"
-
-#: eeschema/onrightclick.cpp:158
-msgid "delete noconn"
-msgstr "删除 不连接标记"
-
-#: eeschema/onrightclick.cpp:168
-msgid "Move bus entry"
-msgstr "移动 总线接入符号"
-
-#: eeschema/onrightclick.cpp:170
-msgid "set bus entry /"
-msgstr "设置总线接入符号方向 /"
-
-#: eeschema/onrightclick.cpp:172
-msgid "set bus entry \\"
-msgstr "设置总线接入符号方向 \\"
-
-#: eeschema/onrightclick.cpp:174
-msgid "delete bus entry"
-msgstr "删除 总线接入符号"
-
-#: eeschema/onrightclick.cpp:178
-msgid "delete Marker"
-msgstr "删除 ERC标记"
-
-#: eeschema/onrightclick.cpp:228
-msgid "End drawing"
-msgstr "结束 图形"
-
-#: eeschema/onrightclick.cpp:230
-msgid "Delete drawing"
-msgstr "删除 图形"
-
-#: eeschema/onrightclick.cpp:267
-msgid "Rotate Field"
-msgstr "旋转 域"
-
-#: eeschema/onrightclick.cpp:287
-msgid "Move Component"
-msgstr "移动 元件"
-
-#: eeschema/onrightclick.cpp:290
-msgid "Drag Component"
-msgstr "拖动 元件"
-
-#: eeschema/onrightclick.cpp:297
-msgid "Rotate +"
-msgstr "旋转 +"
-
-#: eeschema/onrightclick.cpp:303
-msgid "Mirror ||"
-msgstr "镜像 ||"
-
-#: eeschema/onrightclick.cpp:309
-msgid "Orient Component"
-msgstr "元件方向"
+msgstr "镜像 块 (ctrl + 鼠标拖拉)"
 
-#: eeschema/onrightclick.cpp:327
+#: eeschema/annotate.cpp:659
 #, c-format
-msgid "Unit %d %c"
-msgstr "单元 %d %c"
-
-#: eeschema/onrightclick.cpp:338
-msgid "Edit Component"
-msgstr "编辑元件"
-
-#: eeschema/onrightclick.cpp:342
-msgid "Copy Component"
-msgstr "复制 元件"
-
-#: eeschema/onrightclick.cpp:343
-msgid "Delete Component"
-msgstr "删除 元件"
-
-#: eeschema/onrightclick.cpp:362
-msgid "Move Glabel"
-msgstr "移动 全局标签"
-
-#: eeschema/onrightclick.cpp:363
-msgid "Rotate GLabel  (R)"
-msgstr "旋转 全局标签  (R)"
+msgid "item not annotated: %s%s"
+msgstr "未标注的内容: %s%s"
 
-#: eeschema/onrightclick.cpp:364
-msgid "Edit GLabel"
-msgstr "编辑 全局标签"
+#: eeschema/annotate.cpp:664
+#, c-format
+msgid "( unit %d)"
+msgstr "( 单元 %d)"
 
-#: eeschema/onrightclick.cpp:365
-msgid "Delete Glabel"
-msgstr "删除 全局标签"
+#: eeschema/annotate.cpp:681
+#, c-format
+msgid "Error item %s%s"
+msgstr "错误内容 %s%s"
 
-#: eeschema/onrightclick.cpp:369
-#: eeschema/onrightclick.cpp:419
-msgid "Change to Label"
-msgstr "改为 标签"
+#: eeschema/annotate.cpp:684
+#, c-format
+msgid " unit %d and no more than %d parts"
+msgstr " 单元 %d, 实际部件数量不超过 %d "
 
-#: eeschema/onrightclick.cpp:371
-#: eeschema/onrightclick.cpp:396
-msgid "Change to Text"
-msgstr "改为 注释文字"
+#: eeschema/annotate.cpp:718
+#: eeschema/annotate.cpp:741
+#, c-format
+msgid "Multiple item %s%s"
+msgstr "冲突(被复用)的内容 %s%s"
 
-#: eeschema/onrightclick.cpp:373
-#: eeschema/onrightclick.cpp:398
-#: eeschema/onrightclick.cpp:423
-msgid "Change Type"
-msgstr "改变类型"
+#: eeschema/annotate.cpp:723
+#: eeschema/annotate.cpp:746
+#, c-format
+msgid " (unit %d)"
+msgstr " (单元 %d)"
 
-#: eeschema/onrightclick.cpp:387
-msgid "Move Label"
-msgstr "移动 标签"
+#: eeschema/annotate.cpp:763
+#, c-format
+msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)"
+msgstr "数值不同的 %s%d%c (%s) 和 %s%d%c (%s)"
 
-#: eeschema/onrightclick.cpp:388
-msgid "Rotate Label  (R)"
-msgstr "旋转 标签 (R)"
+#: eeschema/delsheet.cpp:43
+#, c-format
+msgid "Sheet %s (file %s) modified. Save it?"
+msgstr "图 %s (文件 %s) 被更改。是否保存 ?"
 
-#: eeschema/onrightclick.cpp:389
-msgid "Edit Label"
-msgstr "编辑 标签"
+#: eeschema/viewlibs.cpp:118
+msgid "Browse library: "
+msgstr "浏览库: "
 
-#: eeschema/onrightclick.cpp:390
-msgid "Delete Label"
-msgstr "删除 标签"
+#: eeschema/viewlibs.cpp:307
+#, c-format
+msgid "Current Part: <%s> (is Alias of <%s>)"
+msgstr "当前部件: <%s> (是<%s>的别名)"
 
-#: eeschema/onrightclick.cpp:394
-#: eeschema/onrightclick.cpp:421
-msgid "Change to Glabel"
-msgstr "改为 全局标签"
+#: eeschema/viewlibs.cpp:313
+#, c-format
+msgid "Error: Root Part <%s> not found"
+msgstr "错误: 根部件 <%s> 没有找到"
 
-#: eeschema/onrightclick.cpp:413
-msgid "Rotate Text (R)"
-msgstr "旋转 文字 (R)"
+#: eeschema/viewlibs.cpp:332
+#, c-format
+msgid "Current Part: <%s>"
+msgstr "当前部件: <%s>"
 
-#: eeschema/onrightclick.cpp:414
-msgid "Edit Text"
-msgstr "编辑 文字"
+#: eeschema/symbdraw.cpp:793
+#, c-format
+msgid "Arc %.1f deg"
+msgstr "圆弧 %.1f 度"
 
-#: eeschema/onrightclick.cpp:415
-msgid "Delete Text"
-msgstr "删除 文字"
+#: eeschema/dialog_create_component.cpp:211
+#, fuzzy
+msgid "&1"
+msgstr "&1"
 
-#: eeschema/onrightclick.cpp:441
-#: eeschema/onrightclick.cpp:481
-msgid "Break Wire"
-msgstr "分割 导线"
+#: eeschema/dialog_create_component.cpp:212
+#, fuzzy
+msgid "&2"
+msgstr "&2"
 
-#: eeschema/onrightclick.cpp:444
-msgid "delete junction"
-msgstr "删除 电气连接点"
+#: eeschema/dialog_create_component.cpp:213
+#, fuzzy
+msgid "&3"
+msgstr "&3"
 
-#: eeschema/onrightclick.cpp:449
-#: eeschema/onrightclick.cpp:475
-msgid "Delete node"
-msgstr "删除 节点"
+#: eeschema/dialog_create_component.cpp:214
+#, fuzzy
+msgid "&4"
+msgstr "&4"
 
-#: eeschema/onrightclick.cpp:451
-#: eeschema/onrightclick.cpp:477
-msgid "Delete connection"
-msgstr "删除 连接"
+#: eeschema/dialog_create_component.cpp:215
+#, fuzzy
+msgid "&5"
+msgstr "&5"
 
-#: eeschema/onrightclick.cpp:468
-msgid "End Wire"
-msgstr "结束 画导线"
+#: eeschema/dialog_create_component.cpp:216
+#, fuzzy
+msgid "&6"
+msgstr "&6"
 
-#: eeschema/onrightclick.cpp:470
-msgid "Delete Wire"
-msgstr "删除 导线"
+#: eeschema/dialog_create_component.cpp:217
+#, fuzzy
+msgid "&7"
+msgstr "&7"
 
-#: eeschema/onrightclick.cpp:486
-#: eeschema/onrightclick.cpp:518
-msgid "Add label"
-msgstr "添加 标签"
+#: eeschema/dialog_create_component.cpp:218
+#, fuzzy
+msgid "&8"
+msgstr "&8"
 
-#: eeschema/onrightclick.cpp:507
-msgid "End Bus"
-msgstr "结束 画总线"
+#: eeschema/dialog_create_component.cpp:219
+#, fuzzy
+msgid "&9"
+msgstr "&9"
 
-#: eeschema/onrightclick.cpp:510
-msgid "Delete Bus"
-msgstr "删除 总线"
+#: eeschema/dialog_create_component.cpp:220
+#, fuzzy
+msgid "&10"
+msgstr "&10"
 
-#: eeschema/onrightclick.cpp:514
-msgid "Break Bus"
-msgstr "分割 总线"
+#: eeschema/dialog_create_component.cpp:221
+#, fuzzy
+msgid "&11"
+msgstr "&11"
 
-#: eeschema/onrightclick.cpp:536
-msgid "Enter Sheet"
-msgstr "进入 分图"
+#: eeschema/dialog_create_component.cpp:222
+#, fuzzy
+msgid "&12"
+msgstr "&12"
 
-#: eeschema/onrightclick.cpp:538
-msgid "Move Sheet"
-msgstr "移动 分图"
+#: eeschema/dialog_create_component.cpp:223
+#, fuzzy
+msgid "&13"
+msgstr "&13"
 
-#: eeschema/onrightclick.cpp:543
-msgid "Place Sheet"
-msgstr "放置 分图"
+#: eeschema/dialog_create_component.cpp:224
+#, fuzzy
+msgid "&14"
+msgstr "&14"
 
-#: eeschema/onrightclick.cpp:547
-msgid "Edit Sheet"
-msgstr "编辑 分图"
+#: eeschema/dialog_create_component.cpp:225
+#, fuzzy
+msgid "&15"
+msgstr "&15"
 
-#: eeschema/onrightclick.cpp:548
-msgid "Resize Sheet"
-msgstr "调整分图符号大小"
+#: eeschema/dialog_create_component.cpp:226
+#, fuzzy
+msgid "&16"
+msgstr "&16"
 
-#: eeschema/onrightclick.cpp:551
-msgid "Cleanup PinSheets"
-msgstr "清理 分图引脚"
+#: eeschema/dialog_create_component.cpp:227
+#, fuzzy
+msgid "&17"
+msgstr "&17"
 
-#: eeschema/onrightclick.cpp:552
-msgid "Delete Sheet"
-msgstr "删除 分图"
+#: eeschema/dialog_create_component.cpp:228
+#, fuzzy
+msgid "&18"
+msgstr "&18"
 
-#: eeschema/onrightclick.cpp:565
-msgid "Move PinSheet"
-msgstr "移动 分图引脚"
+#: eeschema/dialog_create_component.cpp:229
+#, fuzzy
+msgid "&19"
+msgstr "&19"
 
-#: eeschema/onrightclick.cpp:567
-msgid "Edit PinSheet"
-msgstr "编辑 分图引脚"
+#: eeschema/dialog_create_component.cpp:230
+#, fuzzy
+msgid "&20"
+msgstr "&20"
 
-#: eeschema/onrightclick.cpp:570
-msgid "Delete PinSheet"
-msgstr "删除 分图引脚"
+#: eeschema/dialog_create_component.cpp:231
+#, fuzzy
+msgid "&21"
+msgstr "&21"
 
-#: eeschema/onrightclick.cpp:595
-msgid "Other block commands"
-msgstr "其他块操作命令"
+#: eeschema/dialog_create_component.cpp:232
+#, fuzzy
+msgid "&22"
+msgstr "&22"
 
-#: eeschema/onrightclick.cpp:596
-msgid "Save Block"
-msgstr "保存 块"
+#: eeschema/dialog_create_component.cpp:233
+#, fuzzy
+msgid "&23"
+msgstr "&23"
 
-#: eeschema/onrightclick.cpp:600
-msgid "Drag Block (ctrl + drag mouse)"
-msgstr "拖动 块 （ctrl + 拖拉鼠标）"
+#: eeschema/dialog_create_component.cpp:234
+#, fuzzy
+msgid "&24"
+msgstr "&24"
 
-#: eeschema/onrightclick.cpp:604
-msgid "Mirror Block ||"
-msgstr "镜像 块 ||"
+#: eeschema/dialog_create_component.cpp:235
+#, fuzzy
+msgid "&25"
+msgstr "&25"
 
-#: eeschema/onrightclick.cpp:608
-msgid "Copy to Clipboard"
-msgstr "复制到剪贴板"
+#: eeschema/dialog_create_component.cpp:236
+#, fuzzy
+msgid "&26"
+msgstr "&26"
 
-#: eeschema/edit_component_in_lib.cpp:168
-#: eeschema/dialog_edit_component_in_lib.h:43
-msgid "Lib Component Properties"
-msgstr "库元件属性"
+#: eeschema/dialog_create_component.cpp:237
+msgid "Parts per component"
+msgstr "元件的单元部件数量"
 
-#: eeschema/edit_component_in_lib.cpp:172
-msgid "Properties for "
-msgstr "属性设置： "
+#: eeschema/dialog_create_component.cpp:243
+msgid "Draw options"
+msgstr "图形选项"
 
-#: eeschema/edit_component_in_lib.cpp:177
-msgid "(alias of "
-msgstr "(别名 of "
+#: eeschema/dialog_create_component.cpp:247
+msgid "Show Pin Number"
+msgstr "显示引脚编号"
 
-#: eeschema/edit_component_in_lib.cpp:245
-#: eeschema/edit_component_in_lib.cpp:328
-msgid "Delete All"
-msgstr "删除所有"
+#: eeschema/dialog_create_component.cpp:311
+msgid "You must provide a name for this component"
+msgstr "你需要为这个元件提供一个名称"
 
-#: eeschema/edit_component_in_lib.cpp:281
-msgid "Footprint Filter"
-msgstr "封装过滤"
+#: eeschema/symbedit.cpp:52
+msgid "Import symbol drawings:"
+msgstr "导入符号图形:"
 
-#: eeschema/edit_component_in_lib.cpp:293
-msgid "Footprints"
-msgstr "封装"
+#: eeschema/symbedit.cpp:74
+#, c-format
+msgid "Failed to open Symbol File <%s>"
+msgstr "打开符号文件 < %s > 失败"
 
-#: eeschema/edit_component_in_lib.cpp:407
-msgid "Show Pin Num"
-msgstr "显示引脚编号"
+#: eeschema/symbedit.cpp:87
+msgid "Warning: more than 1 part in Symbol File"
+msgstr "警告: 符号文件中包含多个部件"
 
-#: eeschema/edit_component_in_lib.cpp:476
-msgid "Left justify"
-msgstr "左对齐"
+#: eeschema/symbedit.cpp:92
+msgid "Symbol File is void"
+msgstr "符号文件是空的"
 
-#: eeschema/edit_component_in_lib.cpp:476
-#: eeschema/edit_component_in_lib.cpp:478
-#: share/zoom.cpp:356
-msgid "Center"
-msgstr "居中"
+#: eeschema/symbedit.cpp:151
+msgid "Export symbol drawings:"
+msgstr "导出符号图形:"
 
-#: eeschema/edit_component_in_lib.cpp:476
-msgid "Right justify"
-msgstr "右对齐"
+#: eeschema/symbedit.cpp:171
+#, c-format
+msgid "Save Symbol in [%s]"
+msgstr "符号保存于 [%s]"
 
-#: eeschema/edit_component_in_lib.cpp:478
-msgid "Bottom justify"
-msgstr "下对齐"
+#: eeschema/dialog_eeschema_config.cpp:165
+msgid "save current configuration setting in the local .pro file"
+msgstr "将当前设置保存在本项目的 .pro 文件中"
 
-#: eeschema/edit_component_in_lib.cpp:478
-msgid "Top justify"
-msgstr "上对齐"
+#: eeschema/dialog_eeschema_config.cpp:171
+#: cvpcb/dialog_cvpcb_config.cpp:147
+msgid "NetList Formats:"
+msgstr "网络表格式: "
 
-#: eeschema/edit_component_in_lib.cpp:529
-msgid "Hor Justify"
-msgstr "水平对齐"
+#: eeschema/dialog_eeschema_config.cpp:193
+msgid "Remove"
+msgstr "移除"
 
-#: eeschema/edit_component_in_lib.cpp:536
-msgid "Vert Justify"
-msgstr "垂直对齐"
+#: eeschema/dialog_eeschema_config.cpp:195
+msgid "Unload the selected library"
+msgstr "卸载选中的库"
 
-#: eeschema/edit_component_in_lib.cpp:551
-msgid "Chip Name"
-msgstr "芯片名称"
+#: eeschema/dialog_eeschema_config.cpp:201
+msgid "Add a new library after the selected library, add load it"
+msgstr "在选中库后面添加一个新库并加载它"
 
-#: eeschema/edit_component_in_lib.cpp:890
-msgid "Ok to Delete Alias LIST"
-msgstr "是否确定删除别名列表"
+#: eeschema/dialog_eeschema_config.cpp:206
+#: eeschema/dialog_eeschema_config.cpp:208
+msgid "Add a new library beforer the selected library, add load it"
+msgstr "在选中库前面添加一个新库并加载它"
 
-#: eeschema/edit_component_in_lib.cpp:915
-msgid "New alias:"
-msgstr "新别名："
+#: eeschema/dialog_eeschema_config.cpp:223
+msgid "Default library file path:"
+msgstr "默认库文件目录: "
 
-#: eeschema/edit_component_in_lib.cpp:923
-msgid "This is the Root Part"
-msgstr "这是根部件"
+#: eeschema/dialog_eeschema_config.cpp:230
+msgid ""
+"Default path to search libraries which have no absolute path in name,\n"
+"or a name which does not start by ./ or ../\n"
+"If void, the default path is kicad/library"
+msgstr ""
+"搜索库的默认路径(相对路径),\n"
+"路径名中不要包含 ./ 或 ../\n"
+"此处为空则默认路径为 kicad/library"
 
-#: eeschema/edit_component_in_lib.cpp:932
-#: eeschema/edit_component_in_lib.cpp:1200
-msgid "Already in use"
-msgstr "已经在使用中"
+#: eeschema/dialog_eeschema_config.cpp:238
+msgid "Cmp file Ext: "
+msgstr "元件文件   扩展名: "
 
-#: eeschema/edit_component_in_lib.cpp:957
-msgid " is Current Selected Alias!"
-msgstr " 是当前选中的别名！"
+#: eeschema/dialog_eeschema_config.cpp:242
+msgid "Net file Ext: "
+msgstr "网络表文件 扩展名: "
 
-#: eeschema/edit_component_in_lib.cpp:1010
-msgid "Delete units"
-msgstr "删除单元"
+#: eeschema/dialog_eeschema_config.cpp:246
+msgid "Library file Ext: "
+msgstr "库文件     扩展名: "
 
-#: eeschema/edit_component_in_lib.cpp:1080
-msgid "Create pins for Convert items"
-msgstr "为转换内容生成引脚"
+#: eeschema/dialog_eeschema_config.cpp:250
+msgid "Symbol file Ext: "
+msgstr "Symbol文件 扩展名: "
 
-#: eeschema/edit_component_in_lib.cpp:1084
-msgid "Part as \"De Morgan\" anymore"
-msgstr "Part as \"De Morgan\" anymore"
+#: eeschema/dialog_eeschema_config.cpp:254
+msgid "Schematic file Ext: "
+msgstr "原理图文件 扩展名: "
 
-#: eeschema/edit_component_in_lib.cpp:1109
-msgid "Delete Convert items"
-msgstr "删除转换的内容"
+#: eeschema/dialog_eeschema_config.cpp:370
+msgid "Library files:"
+msgstr "库文件: "
 
-#: eeschema/edit_component_in_lib.cpp:1144
-#: common/eda_doc.cpp:129
-msgid "Doc Files"
-msgstr "说明文件"
+#: eeschema/dialog_eeschema_config.cpp:472
+msgid " Default Path for libraries"
+msgstr " 库的默认路径"
 
-#: eeschema/edit_component_in_lib.cpp:1167
-msgid "Ok to Delete FootprintFilter LIST"
-msgstr "是否确定删除封装过滤列表"
+#: eeschema/plotps.cpp:181
+msgid "Plot Options:"
+msgstr "绘图选项:"
 
-#: eeschema/edit_component_in_lib.cpp:1189
-msgid "New FootprintFilter:"
-msgstr "新封装过滤："
+#: eeschema/plotps.cpp:186
+msgid "B/W"
+msgstr "黑白"
 
-#: eeschema/load_one_schematic_file.cpp:103
-msgid "Failed to open "
-msgstr "打开失败 "
+#: eeschema/plotps.cpp:187
+#: share/dialog_print.cpp:183
+#: share/svg_print.cpp:194
+msgid "Color"
+msgstr "彩色"
 
-#: eeschema/load_one_schematic_file.cpp:108
-msgid "Loading "
-msgstr "载入文件 "
+#: eeschema/plotps.cpp:189
+msgid "Plot Color:"
+msgstr "绘图颜色:"
 
-#: eeschema/load_one_schematic_file.cpp:115
-#: eeschema/load_one_schematic_file.cpp:124
-msgid " is NOT EESchema file"
-msgstr " 不是 EESchema 文件"
+#: eeschema/plotps.cpp:217
+msgid "Messages :"
+msgstr "信息:"
 
-#: cvpcb/autosel.cpp:68
+#: eeschema/plotps.cpp:398
 #, c-format
-msgid "Library: <%s> not found"
-msgstr "库：< %s > 没有找到"
+msgid "Plot: %s\n"
+msgstr "绘图输出(Plot): %s\n"
 
-#: cvpcb/autosel.cpp:107
-#, c-format
-msgid "%d equivalences"
-msgstr "%d 等价"
+#: eeschema/libfield.cpp:221
+msgid "No new text: no change"
+msgstr "没有新文本: 未做更改"
 
-#: cvpcb/autosel.cpp:163
-#, c-format
-msgid "Component %s: Footprint %s not found in libraries"
-msgstr "元件%s：封装%s在库中没有找到"
+#: cvpcb/setvisu.cpp:42
+msgid "Footprint: "
+msgstr "封装: "
+
+#: cvpcb/setvisu.cpp:45
+msgid "Lib: "
+msgstr "库: "
 
 #: cvpcb/menucfg.cpp:77
 msgid "Lib Dir:"
-msgstr "库文件目录："
+msgstr "库文件目录:"
 
 #: cvpcb/menucfg.cpp:81
 msgid "Net Input Ext:"
-msgstr "输入的网络表文件扩展名："
+msgstr "输入的网络表文件扩展名:"
 
 #: cvpcb/menucfg.cpp:85
 msgid "Pkg Ext:"
-msgstr "Pkg 文件   扩展名："
+msgstr "Pkg 文件   扩展名:"
 
 #: cvpcb/menucfg.cpp:97
 msgid "Cmp ext:"
-msgstr "元件文件   扩展名："
+msgstr "元件文件   扩展名:"
 
 #: cvpcb/menucfg.cpp:101
 msgid "Lib ext:"
-msgstr "库文件     扩展名："
+msgstr "库文件     扩展名:"
 
 #: cvpcb/menucfg.cpp:105
 msgid "NetOut ext:"
-msgstr "输出网络表 扩展名："
+msgstr "输出网络表 扩展名:"
+
+#: cvpcb/menucfg.cpp:109
+msgid "Equiv ext:"
+msgstr "Equiv 文件 扩展名:"
+
+#: cvpcb/menucfg.cpp:113
+msgid "Retro ext:"
+msgstr "Retro 文件 扩展名:"
+
+#: cvpcb/menucfg.cpp:301
+msgid "Equiv Files:"
+msgstr "等价文件:"
+
+#: cvpcb/cvframe.cpp:176
+msgid "Netlist and Cmp list modified, Save before exit ?"
+msgstr "网络表和元件表已被修改, 是否在退出之前进行保存 ?"
+
+#: cvpcb/cvframe.cpp:199
+msgid "Problem when saving files, Exit anyway"
+msgstr "保存文件时发生问题, 退出"
+
+#: cvpcb/cvframe.cpp:326
+msgid "Delete selections"
+msgstr "删除选中的"
+
+#: cvpcb/cvframe.cpp:340
+#: cvpcb/init.cpp:134
+#, c-format
+msgid "Componants: %d (free: %d)"
+msgstr "元件: %d (空: %d)"
+
+#: cvpcb/cvframe.cpp:424
+#: share/drawframe.cpp:134
+msgid "font for dialog boxes"
+msgstr "对话框 字体"
+
+#: cvpcb/cvframe.cpp:426
+msgid "font for Lists"
+msgstr "列  表 字体"
+
+#: cvpcb/cvframe.cpp:428
+#: share/drawframe.cpp:138
+msgid "font for Status Line"
+msgstr "状态行 字体"
+
+#: cvpcb/cvframe.cpp:431
+#: share/drawframe.cpp:141
+msgid "&Font selection"
+msgstr "选择字体(&F)"
+
+#: cvpcb/cvframe.cpp:433
+#: share/drawframe.cpp:142
+msgid "Choose font type and size for dialogs, infos and status box"
+msgstr "选择对话框、信息提示和状态栏的字体及字体大小"
+
+#: cvpcb/dialog_cvpcb_config.cpp:135
+msgid "Read Cfg"
+msgstr "读取设置"
+
+#: cvpcb/dialog_cvpcb_config.cpp:144
+msgid "&PcbNew"
+msgstr "&PcbNew"
 
-#: cvpcb/menucfg.cpp:109
-msgid "Equiv ext:"
-msgstr "Equiv 文件 扩展名："
+#: cvpcb/dialog_cvpcb_config.cpp:145
+msgid "&ViewLogic"
+msgstr "&ViewLogic"
 
-#: cvpcb/menucfg.cpp:113
-msgid "Retro ext:"
-msgstr "Retro 文件 扩展名："
+#: cvpcb/dialog_cvpcb_config.cpp:146
+msgid "View &Net + Pkg"
+msgstr "View &Net + Pkg"
 
-#: cvpcb/menucfg.cpp:285
 #: cvpcb/dialog_cvpcb_config.cpp:217
 msgid "Equiv"
 msgstr "等价"
 
-#: cvpcb/viewlogi.cpp:55
-msgid "Netlist file "
-msgstr "网络表文件"
+#: cvpcb/listlib.cpp:69
+#, c-format
+msgid "Library file <%s> not found"
+msgstr "库文件 <%s> 没有找到"
 
-#: cvpcb/viewlogi.cpp:61
-#: cvpcb/viewlnet.cpp:66
-#: cvpcb/viewlnet.cpp:97
-#: cvpcb/viewlnet.cpp:112
-msgid "File not found "
-msgstr "文件未找到"
+#: cvpcb/listlib.cpp:79
+#, c-format
+msgid "Library file <%s> is not a module library"
+msgstr "库文件 <%s> 不是一个模块库"
+
+#: cvpcb/cvpcb.cpp:41
+msgid "Cvpcb is already running, Continue?"
+msgstr "Cvpcb 已经在运行中，是否继续？"
 
-#: cvpcb/viewlogi.cpp:72
 #: cvpcb/rdpcad.cpp:56
-#: cvpcb/readschematicnetlist.cpp:71
+#: cvpcb/readschematicnetlist.cpp:75
+#: cvpcb/viewlogi.cpp:72
 #, c-format
 msgid "Unknown file format <%s>"
 msgstr " 未知的文件格式 < %s >"
 
-#: cvpcb/cvpcb.cpp:41
-msgid "Cvpcb is already running, Continue?"
-msgstr "Cvpcb 已经在运行中，是否继续？"
+#: cvpcb/rdpcad.cpp:61
+msgid "Netlist Format: Pcad"
+msgstr "网络表格式: Pcad"
 
-#: cvpcb/loadcmp.cpp:49
-msgid "This file is NOT a library file"
-msgstr "这个文件 不是 一个库文件"
+#: cvpcb/readschematicnetlist.cpp:80
+msgid "Netlist Format: EESchema"
+msgstr "网络表格式: eeschema"
 
-#: cvpcb/loadcmp.cpp:98
+#: cvpcb/readschematicnetlist.cpp:143
 #, c-format
-msgid "Module %s not found"
-msgstr "模块 %s 没有找到"
+msgid "Netlist error: %s"
+msgstr "网络表错误: %s"
+
+#: cvpcb/autosel.cpp:68
+#, c-format
+msgid "Library: <%s> not found"
+msgstr "库: < %s > 没有找到"
+
+#: cvpcb/autosel.cpp:107
+#, c-format
+msgid "%d equivalences"
+msgstr "%d 等价"
+
+#: cvpcb/autosel.cpp:163
+#, c-format
+msgid "Component %s: Footprint %s not found in libraries"
+msgstr "元件 %s: 封装 %s 在库中没有找到"
 
 #: cvpcb/writenetlistpcbnew.cpp:168
 #: cvpcb/genorcad.cpp:134
 #, c-format
 msgid "%s %s pin %s : Different Nets"
-msgstr "%s %s 引脚 %s：网络不同"
-
-#: cvpcb/viewlnet.cpp:87
-msgid "Format Netlist: ViewLogic net&pkg"
-msgstr "网络表格式：ViewLogic net&pkg"
+msgstr "%s %s 引脚 %s: 网络不同"
 
-#: cvpcb/viewlnet.cpp:205
-#, c-format
-msgid "Component [%s] not found in .pkg file"
-msgstr "元件 [%s] 在 .pkg 文件中没有找到"
+#: cvpcb/displayframe.cpp:119
+#: pcbnew/dialog_display_options.h:54
+#: cvpcb/dialog_display_options.h:51
+msgid "Display Options"
+msgstr "显示选项"
 
 #: cvpcb/init.cpp:64
 #, c-format
 msgid "Components: %d (free: %d)"
-msgstr "元件：%d （自由：%d）"
+msgstr "元件: %d (空: %d)"
 
 #: cvpcb/init.cpp:100
 msgid "Unknown Netlist Format"
 msgstr "未知的网络表格式"
 
-#: cvpcb/init.cpp:134
-#: cvpcb/cvframe.cpp:319
-#, c-format
-msgid "Componants: %d (free: %d)"
-msgstr "元件：%d（空: %d）"
-
 #: cvpcb/init.cpp:164
 #: cvpcb/tool_cvpcb.cpp:38
 msgid "Save NetList and Components List files"
@@ -7969,7 +8665,7 @@ msgstr "保存网络表和元件表文件"
 
 #: cvpcb/init.cpp:180
 msgid "Unable to create component file (.cmp)"
-msgstr "无法建立元件文件（.cmp）"
+msgstr "无法建立元件文件(.cmp)"
 
 #: cvpcb/init.cpp:187
 msgid "Unable to create netlist file"
@@ -7979,109 +8675,84 @@ msgstr "无法建立网络表文件"
 msgid "Load Net List"
 msgstr "加载网络表"
 
-#: cvpcb/listlib.cpp:69
-#, c-format
-msgid "Library file <%s> not found"
-msgstr "库文件 <%s> 没有找到"
+#: cvpcb/loadcmp.cpp:49
+msgid "This file is NOT a library file"
+msgstr "这个文件 不是 一个库文件"
 
-#: cvpcb/listlib.cpp:79
+#: cvpcb/loadcmp.cpp:98
 #, c-format
-msgid "Library file <%s> is not a module library"
-msgstr "库文件 <%s> 不是一个模块库"
-
-#: cvpcb/setvisu.cpp:42
-msgid "Footprint: "
-msgstr "封装："
+msgid "Module %s not found"
+msgstr "模块 %s 没有找到"
 
-#: cvpcb/setvisu.cpp:45
-msgid "Lib: "
-msgstr "库："
+#: cvpcb/viewlogi.cpp:55
+msgid "Netlist file "
+msgstr "网络表文件"
 
-#: cvpcb/listboxes.cpp:328
-#, c-format
-msgid "Footprints: %d"
-msgstr "封装：%d"
+#: cvpcb/viewlogi.cpp:61
+#: cvpcb/viewlnet.cpp:66
+#: cvpcb/viewlnet.cpp:97
+#: cvpcb/viewlnet.cpp:112
+msgid "File not found "
+msgstr "文件未找到"
 
-#: cvpcb/listboxes.cpp:453
-#, c-format
-msgid "Footprints (All): %d"
-msgstr "封装（全部）：%d"
+#: cvpcb/viewlnet.cpp:87
+msgid "Format Netlist: ViewLogic net&pkg"
+msgstr "网络表格式: ViewLogic net&pkg"
 
-#: cvpcb/listboxes.cpp:455
+#: cvpcb/viewlnet.cpp:205
 #, c-format
-msgid "Footprints (filtered): %d"
-msgstr "封装（过滤的）：%d"
-
-#: cvpcb/cvframe.cpp:168
-msgid "Netlist and Cmp list modified, Save before exit ?"
-msgstr "网络表和元件表已被修改，是否在退出之前进行保存？"
-
-#: cvpcb/cvframe.cpp:186
-msgid "Problem when saving files, Exit anyway"
-msgstr "保存文件时发生问题，退出"
-
-#: cvpcb/cvframe.cpp:306
-msgid "Delete selections"
-msgstr "删除选中的"
-
-#: cvpcb/cvframe.cpp:396
-#: share/drawframe.cpp:134
-msgid "font for dialog boxes"
-msgstr "对话框 字体"
-
-#: cvpcb/cvframe.cpp:398
-msgid "font for Lists"
-msgstr "列  表 字体"
+msgid "Component [%s] not found in .pkg file"
+msgstr "元件 [%s] 在 .pkg 文件中没有找到"
 
-#: cvpcb/cvframe.cpp:400
-#: share/drawframe.cpp:138
-msgid "font for Status Line"
-msgstr "状态行 字体"
+#: cvpcb/dialog_display_options.cpp:147
+#: cvpcb/dialog_display_options.cpp:155
+msgid "&Line"
+msgstr "线条方式(&L)"
 
-#: cvpcb/cvframe.cpp:403
-#: share/drawframe.cpp:141
-msgid "&Font selection"
-msgstr "选择字体(&F)"
+#: cvpcb/dialog_display_options.cpp:148
+#: cvpcb/dialog_display_options.cpp:156
+msgid "&Filled"
+msgstr "填充方式(&F)"
 
-#: cvpcb/cvframe.cpp:404
-#: share/drawframe.cpp:142
-msgid "Choose font type and size for dialogs, infos and status box"
-msgstr "选择对话框，信息提示和状态盒的字体及字体大小"
+#: cvpcb/dialog_display_options.cpp:149
+#: cvpcb/dialog_display_options.cpp:157
+msgid "&Sketch"
+msgstr "轮廓方式(&S)"
 
-#: cvpcb/rdpcad.cpp:61
-msgid "Netlist Format: Pcad"
-msgstr "网络表格式：Pcad"
+#: cvpcb/dialog_display_options.cpp:150
+msgid "Edges:"
+msgstr "边线:"
 
-#: cvpcb/dialog_cvpcb_config.cpp:135
-msgid "Read Cfg"
-msgstr "读取设置"
+#: cvpcb/dialog_display_options.cpp:158
+msgid "Texts:"
+msgstr "文字:"
 
-#: cvpcb/dialog_cvpcb_config.cpp:144
-msgid "&PcbNew"
-msgstr "&PcbNew"
+#: cvpcb/dialog_display_options.cpp:165
+msgid "&Pad Filled"
+msgstr "焊盘填充显示(&P)"
 
-#: cvpcb/dialog_cvpcb_config.cpp:145
-msgid "&ViewLogic"
-msgstr "&ViewLogic"
+#: cvpcb/dialog_display_options.cpp:169
+msgid "Display Pad &Num"
+msgstr "显示焊盘编号(&N)"
 
-#: cvpcb/dialog_cvpcb_config.cpp:146
-msgid "View &Net + Pkg"
-msgstr "View &Net + Pkg"
+#: cvpcb/dialog_display_options.cpp:172
+msgid "Display pad number"
+msgstr "显示焊盘编号"
 
-#: cvpcb/displayframe.cpp:119
-#: pcbnew/dialog_display_options.h:54
-#: cvpcb/dialog_display_options.h:51
-msgid "Display Options"
-msgstr "显示选项"
+#: cvpcb/listboxes.cpp:335
+#, c-format
+msgid "Footprints: %d"
+msgstr "封装: %d"
 
-#: cvpcb/readschematicnetlist.cpp:76
-msgid "Netlist Format: EESchema"
-msgstr "网络表格式：EESchema"
+#: cvpcb/listboxes.cpp:460
+#, c-format
+msgid "Footprints (All): %d"
+msgstr "封装(全部): %d"
 
-#: cvpcb/readschematicnetlist.cpp:126
+#: cvpcb/listboxes.cpp:462
 #, c-format
-msgid "Netlist error: %s"
-msgstr "网络表错误：%s"
+msgid "Footprints (filtered): %d"
+msgstr "封装(过滤的): %d"
 
 #: cvpcb/tool_cvpcb.cpp:35
 #: cvpcb/tool_cvpcb.cpp:113
@@ -8114,11 +8785,11 @@ msgstr "删除所有关联"
 
 #: cvpcb/tool_cvpcb.cpp:64
 msgid "Create stuff file (component/module list)"
-msgstr "建立 stuff 文件（元件/模块 列表）"
+msgstr "建立 stuff 文件(元件/模块 列表)"
 
 #: cvpcb/tool_cvpcb.cpp:68
 msgid "Display/print component documentation (footprint.pdf)"
-msgstr "显示/打印 元件说明文件（footprint.pdf）"
+msgstr "显示/打印 元件说明文件(footprint.pdf)"
 
 #: cvpcb/tool_cvpcb.cpp:75
 msgid "Display the filtered footprint list for the current component"
@@ -8126,11 +8797,7 @@ msgstr "显示按当前元件过滤的封装列表"
 
 #: cvpcb/tool_cvpcb.cpp:79
 msgid "Display the full footprint list (without filtering)"
-msgstr "显示全部封装列表（无过滤）"
-
-#: cvpcb/tool_cvpcb.cpp:112
-msgid "&Open"
-msgstr "打开(&O)"
+msgstr "显示全部封装列表(无过滤)"
 
 #: cvpcb/tool_cvpcb.cpp:119
 msgid "&Save As..."
@@ -8156,57 +8823,147 @@ msgstr "保存设置(&S)"
 msgid "Save configuration in current dir"
 msgstr "将设置保存在当前目录"
 
-#: cvpcb/tool_cvpcb.cpp:159
-msgid "Open the cvpcb manual"
-msgstr "打开 cvpcb 手册"
+#: cvpcb/tool_cvpcb.cpp:159
+msgid "Open the cvpcb manual"
+msgstr "打开 cvpcb 手册"
+
+#: kicad/treeprj_frame.cpp:78
+msgid "&Run"
+msgstr "运行 (&R)"
+
+#: kicad/treeprj_frame.cpp:79
+msgid "Run the Python Script"
+msgstr "运行 Python 脚本"
+
+#: kicad/treeprj_frame.cpp:86
+#: kicad/treeprj_frame.cpp:140
+msgid "&Edit in a text editor"
+msgstr "在文本编辑器中编辑 (&E)"
+
+#: kicad/treeprj_frame.cpp:87
+msgid "&Open the file in a Text Editor"
+msgstr "在文本编辑器中打开文件(&O)"
+
+#: kicad/treeprj_frame.cpp:101
+msgid "New D&irectory"
+msgstr "新建目录 (&I)"
+
+#: kicad/treeprj_frame.cpp:102
+msgid "Create a New Directory"
+msgstr "建立一个新目录"
+
+#: kicad/treeprj_frame.cpp:108
+msgid "New P&ython Script"
+msgstr "新建 P&ython 脚本"
+
+#: kicad/treeprj_frame.cpp:109
+msgid "Create a New Python Script"
+msgstr "建立一个新的 Python 脚本文件"
+
+#: kicad/treeprj_frame.cpp:115
+msgid "New &Text File"
+msgstr "新建文本文件 (&T)"
+
+#: kicad/treeprj_frame.cpp:116
+msgid "Create a New Txt File"
+msgstr "建立一个新的文本文件"
+
+#: kicad/treeprj_frame.cpp:121
+msgid "New &File"
+msgstr "新建文件 (&F)"
+
+#: kicad/treeprj_frame.cpp:121
+msgid "Create a New File"
+msgstr "建立一个新文件"
+
+#: kicad/treeprj_frame.cpp:132
+msgid "&Rename File"
+msgstr "文件重命名 (&R)"
+
+#: kicad/treeprj_frame.cpp:132
+msgid "&Rename Directory"
+msgstr "目录重命名 (&R)"
+
+#: kicad/treeprj_frame.cpp:133
+msgid "Rename the File"
+msgstr "更改文件名"
+
+#: kicad/treeprj_frame.cpp:133
+msgid "&Rename the Directory"
+msgstr "目录重命名 (&R)"
+
+#: kicad/treeprj_frame.cpp:141
+msgid "Open the file in a Text Editor"
+msgstr "在文本编辑器中打开文件"
+
+#: kicad/treeprj_frame.cpp:147
+msgid "&Delete File"
+msgstr "删除文件 (&D)"
+
+#: kicad/treeprj_frame.cpp:147
+msgid "&Delete Directory"
+msgstr "删除目录 (&D)"
+
+#: kicad/treeprj_frame.cpp:148
+msgid "Delete the File"
+msgstr "删除文件"
+
+#: kicad/treeprj_frame.cpp:149
+msgid "&Delete the Directory and its content"
+msgstr "删除目录以及其中的内容 (&D)"
+
+#: kicad/treeprj_frame.cpp:414
+msgid "Create New File:"
+msgstr "建立新文件: "
 
-#: cvpcb/dialog_display_options.cpp:147
-#: cvpcb/dialog_display_options.cpp:155
-msgid "&Line"
-msgstr "线条方式(&L)"
+#: kicad/treeprj_frame.cpp:414
+msgid "Create New Directory"
+msgstr "建立新目录"
 
-#: cvpcb/dialog_display_options.cpp:148
-#: cvpcb/dialog_display_options.cpp:156
-msgid "&Filled"
-msgstr "填充方式(&F)"
+#: kicad/treeprj_frame.cpp:416
+msgid "noname"
+msgstr "noname"
 
-#: cvpcb/dialog_display_options.cpp:149
-#: cvpcb/dialog_display_options.cpp:157
-msgid "&Sketch"
-msgstr "轮廓方式(&S)"
+#: kicad/treeprj_frame.cpp:840
+msgid "Change File Name: "
+msgstr "改变文件名: "
 
-#: cvpcb/dialog_display_options.cpp:150
-msgid "Edges:"
-msgstr "边线："
+#: kicad/treeprj_datas.cpp:219
+msgid "Unable to move file ... "
+msgstr "无法移动文件 ... "
 
-#: cvpcb/dialog_display_options.cpp:158
-msgid "Texts:"
-msgstr "文字："
+#: kicad/treeprj_datas.cpp:220
+#: kicad/treeprj_datas.cpp:301
+msgid "Permission error ?"
+msgstr "没有访问权限 ?"
 
-#: cvpcb/dialog_display_options.cpp:165
-msgid "&Pad Filled"
-msgstr "焊盘填充显示(&P)"
+#: kicad/treeprj_datas.cpp:286
+msgid ""
+"Changing file extension will change file type.\n"
+" Do you want to continue ?"
+msgstr ""
+"改变文件扩展名将改变文件类型。\n"
+"是否继续？"
 
-#: cvpcb/dialog_display_options.cpp:169
-msgid "Display Pad &Num"
-msgstr "显示焊盘编号(&N)"
+#: kicad/treeprj_datas.cpp:287
+msgid "Rename File"
+msgstr "文件重命名"
 
-#: cvpcb/dialog_display_options.cpp:172
-msgid "Display pad number"
-msgstr "显示焊盘编号"
+#: kicad/treeprj_datas.cpp:300
+msgid "Unable to rename file ... "
+msgstr "无法重命名文件 ... "
 
-#: kicad/preferences.cpp:33
-msgid "Prefered Pdf Browser:"
-msgstr "选定的 PDF 查看程序:"
+#: kicad/treeprj_datas.cpp:320
+msgid "Do you really want to delete "
+msgstr "是否真的要删除 "
 
-#: kicad/preferences.cpp:74
-msgid "You must choose a PDF viewer before use this option"
-msgstr "要使用此选项，需要首先选择一个 PDF 查看程序"
+#: kicad/treeprj_datas.cpp:321
+msgid "Delete File"
+msgstr "删除文件"
 
-#: kicad/preferences.cpp:97
-#: common/gestfich.cpp:626
-msgid "Prefered Editor:"
-msgstr "选定的编辑器："
+#: kicad/treeprj_datas.cpp:394
+msgid "no kicad files found in this directory"
+msgstr "在这个目录中没有找到 kicad 文件"
 
 #: kicad/buildmnu.cpp:100
 msgid "&Open Project Descr"
@@ -8293,7 +9050,7 @@ msgstr "默认的 PDF 查看程序"
 
 #: kicad/buildmnu.cpp:168
 msgid "Use the default (system) PDF viewer used to browse datasheets"
-msgstr "使用系统默认的 PDF 查看程序阅读说明文件"
+msgstr "使用系统默认的 PDF 查看程序阅读 datasheets"
 
 #: kicad/buildmnu.cpp:175
 msgid "Favourite Pdf Viewer"
@@ -8301,7 +9058,7 @@ msgstr "自定义的 PDF 查看程序"
 
 #: kicad/buildmnu.cpp:175
 msgid "Use your favourite PDF viewer used to browse datasheets"
-msgstr "使用自定义的 PDF 浏览器阅读说明文件"
+msgstr "使用自定义的 PDF 浏览器阅读 datasheets"
 
 #: kicad/buildmnu.cpp:183
 msgid "Select Pdf Viewer"
@@ -8309,7 +9066,7 @@ msgstr "选择 PDF 查看程序"
 
 #: kicad/buildmnu.cpp:183
 msgid "Select your favourite PDF viewer used to browse datasheets"
-msgstr "选择自定义的 PDF 查看程序来阅读说明文件"
+msgstr "选择自定义的 PDF 查看程序来阅读 datasheets"
 
 #: kicad/buildmnu.cpp:187
 msgid "Pdf Browser"
@@ -8335,299 +9092,167 @@ msgstr "压缩保存全部工程文件"
 msgid "Refresh project tree"
 msgstr "刷新工程树形列表"
 
-#: kicad/prjconfig.cpp:26
-msgid "Project File <"
-msgstr "工程文件 <"
-
-#: kicad/prjconfig.cpp:26
-msgid "> not found"
-msgstr "> 没有找到"
-
-#: kicad/prjconfig.cpp:36
-msgid ""
-"\n"
-"Working dir: "
-msgstr ""
-"\n"
-"工作目录："
+#: kicad/files-io.cpp:70
+msgid "Create Project files:"
+msgstr "建立工程文件: "
 
-#: kicad/prjconfig.cpp:37
-msgid ""
-"\n"
-"Project: "
-msgstr ""
-"\n"
-"工程："
+#: kicad/files-io.cpp:71
+msgid "Load Project files:"
+msgstr "加载工程文件: "
 
-#: kicad/prjconfig.cpp:57
-msgid "Save project file"
-msgstr "保存工程文件"
+#: kicad/files-io.cpp:124
+msgid "Template file non found "
+msgstr "没有找到模板文件"
 
-#: kicad/treeprj_datas.cpp:211
-msgid "Unable to move file ... "
-msgstr "无法移动文件 ... "
+#: kicad/files-io.cpp:132
+msgid " exists! OK to continue?"
+msgstr " 已经存在! 确定继续?"
 
-#: kicad/treeprj_datas.cpp:212
-#: kicad/treeprj_datas.cpp:290
-msgid "Permission error ?"
-msgstr "没有访问权限？"
+#: kicad/files-io.cpp:163
+msgid "Unzip Project:"
+msgstr "解压缩工程文件: "
 
-#: kicad/treeprj_datas.cpp:275
+#: kicad/files-io.cpp:175
 msgid ""
-"Changing file extension will change file type.\n"
-" Do you want to continue ?"
+"\n"
+"Open "
 msgstr ""
-"改变文件扩展名将改变文件类型。\n"
-"是否继续？"
-
-#: kicad/treeprj_datas.cpp:276
-msgid "Rename File"
-msgstr "文件重命名"
-
-#: kicad/treeprj_datas.cpp:289
-msgid "Unable to rename file ... "
-msgstr "无法重命名文件 ... "
-
-#: kicad/treeprj_datas.cpp:309
-msgid "Do you really want to delete "
-msgstr "是否真的要删除 "
-
-#: kicad/treeprj_datas.cpp:310
-msgid "Delete File"
-msgstr "删除文件"
-
-#: kicad/treeprj_frame.cpp:76
-msgid "&Run"
-msgstr "运行 (&R)"
-
-#: kicad/treeprj_frame.cpp:77
-msgid "Run the Python Script"
-msgstr "运行 Python 脚本"
-
-#: kicad/treeprj_frame.cpp:84
-#: kicad/treeprj_frame.cpp:138
-msgid "&Edit in a text editor"
-msgstr "在文本编辑器中编辑 (&E)"
-
-#: kicad/treeprj_frame.cpp:85
-msgid "&Open the file in a Text Editor"
-msgstr "在文本编辑器中编辑文件"
-
-#: kicad/treeprj_frame.cpp:99
-msgid "New D&irectory"
-msgstr "新建目录 (&i)"
-
-#: kicad/treeprj_frame.cpp:100
-msgid "Create a New Directory"
-msgstr "建立一个新目录"
-
-#: kicad/treeprj_frame.cpp:106
-msgid "New P&ython Script"
-msgstr "新建 P&ython 脚本"
-
-#: kicad/treeprj_frame.cpp:107
-msgid "Create a New Python Script"
-msgstr "建立一个新的 Python 脚本文件"
-
-#: kicad/treeprj_frame.cpp:113
-msgid "New &Text File"
-msgstr "新建文本文件 (&T)"
-
-#: kicad/treeprj_frame.cpp:114
-msgid "Create a New Txt File"
-msgstr "建立一个新的文本文件"
-
-#: kicad/treeprj_frame.cpp:119
-msgid "New &File"
-msgstr "新建文件 (&F)"
-
-#: kicad/treeprj_frame.cpp:119
-msgid "Create a New File"
-msgstr "建立一个新文件"
-
-#: kicad/treeprj_frame.cpp:130
-msgid "&Rename File"
-msgstr "文件重命名 (&R)"
-
-#: kicad/treeprj_frame.cpp:130
-msgid "&Rename Directory"
-msgstr "目录重命名 (&R)"
+"\n"
+"打开"
 
-#: kicad/treeprj_frame.cpp:131
-msgid "Rename the File"
-msgstr "更改文件名"
+#: kicad/files-io.cpp:178
+msgid "Target Directory"
+msgstr "目标目录"
 
-#: kicad/treeprj_frame.cpp:131
-msgid "&Rename the Directory"
-msgstr "目录重命名 (&R)"
+#: kicad/files-io.cpp:184
+msgid "Unzip in "
+msgstr "解压缩在: "
 
-#: kicad/treeprj_frame.cpp:139
-msgid "Open the file in a Text Editor"
-msgstr "在文本编辑器中编辑文件"
+#: kicad/files-io.cpp:207
+msgid "Extract file "
+msgstr "解压缩文件"
 
-#: kicad/treeprj_frame.cpp:145
-msgid "&Delete File"
-msgstr "删除文件 (&D)"
+#: kicad/files-io.cpp:217
+#, fuzzy
+msgid " OK\n"
+msgstr " OK\n"
 
-#: kicad/treeprj_frame.cpp:145
-msgid "&Delete Directory"
-msgstr "删除目录 (&D)"
+#: kicad/files-io.cpp:220
+#, fuzzy
+msgid " *ERROR*\n"
+msgstr " *ERROR*\n"
 
-#: kicad/treeprj_frame.cpp:146
-msgid "Delete the File"
-msgstr "删除文件"
+#: kicad/files-io.cpp:246
+msgid "Archive Project files:"
+msgstr "压缩工程文件: "
 
-#: kicad/treeprj_frame.cpp:147
-msgid "&Delete the Directory and its content"
-msgstr "删除目录以及其中的内容 (&D)"
+#: kicad/files-io.cpp:286
+msgid "Compress file "
+msgstr "压缩文件"
 
-#: kicad/treeprj_frame.cpp:412
-msgid "Create New File:"
-msgstr "建立新文件："
+#: kicad/files-io.cpp:307
+msgid ""
+"\n"
+"Create Zip Archive "
+msgstr ""
+"\n"
+"建立Zip压缩文件"
 
-#: kicad/treeprj_frame.cpp:412
-msgid "Create New Directory"
-msgstr "建立新目录"
+#: kicad/preferences.cpp:33
+msgid "Prefered Pdf Browser:"
+msgstr "选择 PDF 查看程序:"
 
-#: kicad/treeprj_frame.cpp:414
-msgid "noname"
-msgstr "noname"
+#: kicad/preferences.cpp:74
+msgid "You must choose a PDF viewer before use this option"
+msgstr "要使用此选项，需要首先选择一个 PDF 查看程序"
 
-#: kicad/treeprj_frame.cpp:842
-msgid "Change File Name: "
-msgstr "改变文件名："
+#: kicad/preferences.cpp:97
+#: common/gestfich.cpp:639
+msgid "Prefered Editor:"
+msgstr "选择编辑器: "
 
-#: kicad/mainframe.cpp:102
+#: kicad/mainframe.cpp:103
 #, c-format
 msgid ""
 "Ready\n"
 "Working dir: %s\n"
 msgstr ""
 "就绪\n"
-"工作目录：%s\n"
+"工作目录: %s\n"
 
-#: kicad/mainframe.cpp:330
+#: kicad/mainframe.cpp:334
 msgid "Execute Python Script:"
-msgstr "运行 Python 脚本："
+msgstr "运行 Python 脚本: "
 
-#: kicad/mainframe.cpp:353
+#: kicad/mainframe.cpp:357
 msgid "Load file:"
-msgstr "加载文件："
-
-#: kicad/commandframe.cpp:58
-msgid "eeschema (Schematic editor)"
-msgstr "EeSchema（原理图编辑器）"
-
-#: kicad/commandframe.cpp:62
-msgid "cvpcb (Components to modules)"
-msgstr "Cvpcb（元件、模块关联）"
-
-#: kicad/commandframe.cpp:66
-msgid "pcbnew (PCB editor)"
-msgstr "Pcbnew（电路板编辑器）"
-
-#: kicad/commandframe.cpp:70
-msgid "gerbview (Gerber viewer)"
-msgstr "GerbView（Gerber 文件查看程序）"
-
-#: kicad/commandframe.cpp:78
-msgid "Run Python Script"
-msgstr "运行 Python 脚本"
-
-#: kicad/files-io.cpp:70
-msgid "Create Project files:"
-msgstr "建立工程文件："
-
-#: kicad/files-io.cpp:71
-msgid "Load Project files:"
-msgstr "加载工程文件："
-
-#: kicad/files-io.cpp:124
-msgid "Template file non found "
-msgstr "没有找到模板文件"
-
-#: kicad/files-io.cpp:132
-msgid " exists! OK to continue?"
-msgstr " 已经存在！确定继续？"
-
-#: kicad/files-io.cpp:163
-msgid "Unzip Project:"
-msgstr "解压缩工程文件："
-
-#: kicad/files-io.cpp:175
-msgid ""
-"\n"
-"Open "
-msgstr ""
-"\n"
-"打开"
+msgstr "加载文件: "
 
-#: kicad/files-io.cpp:178
-msgid "Target Directory"
-msgstr "目标目录"
+#: kicad/commandframe.cpp:58
+msgid "eeschema (Schematic editor)"
+msgstr ""
+"eeschema\n"
+"(原理图编辑器)"
 
-#: kicad/files-io.cpp:184
-msgid "Unzip in "
-msgstr "解压缩在："
+#: kicad/commandframe.cpp:62
+msgid "cvpcb (Components to modules)"
+msgstr ""
+"cvpcb\n"
+"(元件、模块关联)"
 
-#: kicad/files-io.cpp:207
-msgid "Extract file "
-msgstr "解压缩文件"
+#: kicad/commandframe.cpp:66
+msgid "pcbnew (PCB editor)"
+msgstr ""
+"pcbnew\n"
+"(电路板编辑器)"
 
-#: kicad/files-io.cpp:217
-msgid " OK\n"
-msgstr " OK\n"
+#: kicad/commandframe.cpp:70
+msgid "gerbview (Gerber viewer)"
+msgstr ""
+"gerbview\n"
+"(Gerber 文件查看程序)"
 
-#: kicad/files-io.cpp:220
-msgid " *ERROR*\n"
-msgstr " *ERROR*\n"
+#: kicad/commandframe.cpp:78
+msgid "Run Python Script"
+msgstr "运行 Python 脚本"
 
-#: kicad/files-io.cpp:246
-msgid "Archive Project files:"
-msgstr "压缩工程文件："
+#: kicad/prjconfig.cpp:26
+msgid "Project File <"
+msgstr "工程文件 <"
 
-#: kicad/files-io.cpp:286
-msgid "Compress file "
-msgstr "压缩文件"
+#: kicad/prjconfig.cpp:26
+msgid "> not found"
+msgstr "> 没有找到"
 
-#: kicad/files-io.cpp:307
+#: kicad/prjconfig.cpp:36
 msgid ""
 "\n"
-"Create Zip Archive "
+"Working dir: "
 msgstr ""
 "\n"
-"建立Zip压缩文件"
-
-#: gerbview/gerbview.cpp:39
-msgid "GerbView is already running. Continue?"
-msgstr "GerbView 已经在运行。是否继续？"
-
-#: gerbview/rs274x.cpp:317
-#, c-format
-msgid "Command <%c%c> ignored by Gerbview"
-msgstr "命令 <%c%c> 被 Gerbview 忽略"
-
-#: gerbview/rs274x.cpp:354
-msgid "Too many include files!!"
-msgstr "包含的文件过多！！"
+"工作目录: "
 
-#: gerbview/block.cpp:267
-msgid "Ok to delete block ?"
-msgstr "确定删除块？"
+#: kicad/prjconfig.cpp:37
+msgid ""
+"\n"
+"Project: "
+msgstr ""
+"\n"
+"工程: "
 
-#: gerbview/edit.cpp:246
-msgid "No layer selected"
-msgstr "没有选中的层"
+#: kicad/prjconfig.cpp:57
+msgid "Save project file"
+msgstr "保存工程文件"
 
 #: gerbview/initpcb.cpp:34
 msgid "Current Data will be lost ?"
-msgstr "丢弃当前的数据？"
+msgstr "丢弃当前的数据 ?"
 
 #: gerbview/initpcb.cpp:88
 msgid "Delete zones ?"
-msgstr "删除覆铜？"
+msgstr "删除覆铜 ?"
 
-#: gerbview/initpcb.cpp:197
+#: gerbview/initpcb.cpp:195
 #, c-format
 msgid "Delete Layer %d"
 msgstr "删除层 %d"
@@ -8636,48 +9261,102 @@ msgstr "删除层 %d"
 msgid "List D codes"
 msgstr "D codes 列表"
 
-#: gerbview/readgerb.cpp:251
+#: gerbview/gerbview_config.cpp:127
+#: gerbview/process_config.cpp:117
+msgid "Save config file"
+msgstr "保存设置文件"
+
+#: gerbview/block.cpp:267
+msgid "Ok to delete block ?"
+msgstr "确定删除块 ?"
+
+#: gerbview/export_to_pcbnew.cpp:41
+msgid "None of the Gerber layers contain any data"
+msgstr "没有 Gerber 层包含有数据"
+
+#: gerbview/export_to_pcbnew.cpp:52
+msgid "Board file name:"
+msgstr "电路板文件名:"
+
+#: gerbview/export_to_pcbnew.cpp:69
+msgid "Ok to change the existing file ?"
+msgstr "是否要更改已有的文件 ?"
+
+#: gerbview/rs274x.cpp:317
 #, c-format
-msgid "%d errors while reading Gerber file [%s]"
-msgstr "%d 错误发生在读取 Gerber 文件 [ %s ] 过程中"
+msgid "Command <%c%c> ignored by Gerbview"
+msgstr "命令 <%c%c> 被 Gerbview 忽略"
+
+#: gerbview/rs274x.cpp:354
+msgid "Too many include files!!"
+msgstr "包含的文件过多 !!"
+
+#: gerbview/files.cpp:83
+msgid "Not yet available..."
+msgstr "暂时还不可用 ..."
+
+#: gerbview/files.cpp:131
+#: gerbview/files.cpp:217
+msgid "Gerber files:"
+msgstr "Gerber 文件:"
 
-#: gerbview/readgerb.cpp:271
-#: gerbview/files.cpp:183
+#: gerbview/files.cpp:184
+#: gerbview/readgerb.cpp:273
 msgid "D codes files:"
-msgstr "D codes 文件："
+msgstr "D codes 文件:"
+
+#: gerbview/gerbview.cpp:37
+msgid "GerbView is already running. Continue?"
+msgstr "GerbView 已经在运行。是否继续？"
 
 #: gerbview/affiche.cpp:34
 #: gerbview/tool_gerber.cpp:310
 msgid "Layer "
 msgstr "层 "
 
-#: gerbview/affiche.cpp:96
+#: gerbview/affiche.cpp:97
 msgid "Tool"
 msgstr "工具"
 
-#: gerbview/affiche.cpp:101
+#: gerbview/affiche.cpp:102
+#, fuzzy
 msgid "D CODE"
 msgstr "D CODE"
 
-#: gerbview/affiche.cpp:103
+#: gerbview/affiche.cpp:104
+#, fuzzy
 msgid "D type"
 msgstr "D type"
 
-#: gerbview/affiche.cpp:104
+#: gerbview/affiche.cpp:105
+#, fuzzy
 msgid "????"
 msgstr "????"
 
+#: gerbview/readgerb.cpp:253
+#, c-format
+msgid "%d errors while reading Gerber file [%s]"
+msgstr "%d 错误发生在读取 Gerber 文件 [ %s ] 过程中"
+
+#: gerbview/set_color.cpp:279
+msgid "Switch on all of the Gerber layers"
+msgstr "打开所有 Gerber 层"
+
+#: gerbview/set_color.cpp:288
+msgid "Switch off all of the Gerber layers"
+msgstr "关闭所有 Gerber 层"
+
 #: gerbview/options.cpp:146
 msgid "Gerbview Options"
-msgstr "Gerbview 选项"
+msgstr "gerbview 选项"
 
 #: gerbview/options.cpp:200
 msgid "format: 2.3"
-msgstr "格式：2.3"
+msgstr "格式: 2.3"
 
 #: gerbview/options.cpp:200
 msgid "format 3.4"
-msgstr "格式：3.4"
+msgstr "格式: 3.4"
 
 #: gerbview/options.cpp:273
 msgid "Gerbview Draw Options"
@@ -8685,44 +9364,40 @@ msgstr "Gerbview 图形选项"
 
 #: gerbview/options.cpp:299
 msgid "Lines:"
-msgstr "线："
+msgstr "线:"
 
 #: gerbview/options.cpp:306
 msgid "Spots:"
-msgstr "点："
+msgstr "点:"
 
 #: gerbview/options.cpp:314
 msgid "Polygons:"
-msgstr "多边形："
+msgstr "多边形:"
 
 #: gerbview/options.cpp:328
 msgid "Show D codes"
 msgstr "显示 D codes"
 
-#: gerbview/reglage.cpp:102
-msgid "Save Cfg..."
-msgstr "保存设置 ..."
-
-#: gerbview/reglage.cpp:120
-msgid "Drill File Ext:"
-msgstr "钻孔文件    扩展名："
+#: gerbview/gerberframe.cpp:178
+msgid "Layer modified,  Continue ?"
+msgstr "层被更改, 是否继续 ?"
 
-#: gerbview/reglage.cpp:124
-msgid "Gerber File Ext:"
-msgstr "Gerber 文件 扩展名："
+#: gerbview/edit.cpp:246
+msgid "No layer selected"
+msgstr "没有选中的层"
 
-#: gerbview/reglage.cpp:128
-msgid "D code File Ext:"
-msgstr "D code 文件 扩展名："
+#: gerbview/select_layers_to_pcb.cpp:89
+msgid "Layer selection:"
+msgstr "层选择:"
 
-#: gerbview/files.cpp:83
-msgid "Not yet available..."
-msgstr "暂时还不可用 ..."
+#: gerbview/select_layers_to_pcb.cpp:213
+msgid "Gerber layer "
+msgstr "Gerber 层 "
 
-#: gerbview/files.cpp:131
-#: gerbview/files.cpp:216
-msgid "Gerber files:"
-msgstr "Gerber 文件："
+#: gerbview/select_layers_to_pcb.cpp:238
+#: gerbview/select_layers_to_pcb.cpp:328
+msgid "Do not export"
+msgstr "不导出"
 
 #: gerbview/onrightclick.cpp:55
 msgid "Copy Block (shift mouse)"
@@ -8736,47 +9411,21 @@ msgstr "删除 块 (ctrl + 鼠标拖动)"
 msgid "Delete Dcode items"
 msgstr "删除 Dcode 内容"
 
-#: gerbview/select_layers_to_pcb.cpp:88
-msgid "Layer selection:"
-msgstr "层选择："
-
-#: gerbview/select_layers_to_pcb.cpp:212
-msgid "Gerber layer "
-msgstr "Gerber 层 "
-
-#: gerbview/select_layers_to_pcb.cpp:237
-#: gerbview/select_layers_to_pcb.cpp:327
-msgid "Do not export"
-msgstr "不导出"
-
-#: gerbview/set_color.cpp:279
-msgid "Switch on all of the Gerber layers"
-msgstr "打开所有 Gerber 层"
-
-#: gerbview/set_color.cpp:288
-msgid "Switch off all of the Gerber layers"
-msgstr "关闭所有 Gerber 层"
-
-#: gerbview/gerberframe.cpp:177
-msgid "Layer modified,  Continue ?"
-msgstr "层被更改，是否继续？"
-
-#: gerbview/gerbview_config.cpp:127
-#: gerbview/process_config.cpp:117
-msgid "Save config file"
-msgstr "保存设置文件"
+#: gerbview/reglage.cpp:102
+msgid "Save Cfg..."
+msgstr "保存设置 ..."
 
-#: gerbview/export_to_pcbnew.cpp:41
-msgid "None of the Gerber layers contain any data"
-msgstr "没有 Gerber 层包含有数据"
+#: gerbview/reglage.cpp:120
+msgid "Drill File Ext:"
+msgstr "钻孔文件    扩展名:"
 
-#: gerbview/export_to_pcbnew.cpp:52
-msgid "Board file name:"
-msgstr "电路板文件名："
+#: gerbview/reglage.cpp:124
+msgid "Gerber File Ext:"
+msgstr "Gerber 文件 扩展名:"
 
-#: gerbview/export_to_pcbnew.cpp:69
-msgid "Ok to change the existing file ?"
-msgstr "是否要更改已有的文件？"
+#: gerbview/reglage.cpp:128
+msgid "D code File Ext:"
+msgstr "D code 文件 扩展名:"
 
 #: gerbview/tool_gerber.cpp:37
 msgid "Clear and Load Gerber file"
@@ -8800,7 +9449,7 @@ msgstr "增加一个层载入 Gerber 文件"
 
 #: gerbview/tool_gerber.cpp:48
 msgid "Increment layer number, and Load Gerber file"
-msgstr "增加层号，载入 Gerber文件"
+msgstr "增加层号, 载入 Gerber 文件"
 
 #: gerbview/tool_gerber.cpp:52
 msgid "Load DCodes"
@@ -8816,11 +9465,7 @@ msgstr "载入钻孔文件"
 
 #: gerbview/tool_gerber.cpp:58
 msgid "Load Drill File (EXCELLON Format)"
-msgstr "载入钻孔文件（EXCELLON 格式）"
-
-#: gerbview/tool_gerber.cpp:63
-msgid "&New"
-msgstr "新建(&N)"
+msgstr "载入钻孔文件(EXCELLON 格式)"
 
 #: gerbview/tool_gerber.cpp:64
 msgid "Clear all layers"
@@ -8828,7 +9473,7 @@ msgstr "清空所有层"
 
 #: gerbview/tool_gerber.cpp:69
 msgid "&Export to Pcbnew"
-msgstr "导出到 Pcbnew (&E)"
+msgstr "导出到 pcbnew (&E)"
 
 #: gerbview/tool_gerber.cpp:70
 msgid "Export data in pcbnew format"
@@ -8840,7 +9485,7 @@ msgstr "保存层(&S)"
 
 #: gerbview/tool_gerber.cpp:77
 msgid "Save current layers (GERBER format)"
-msgstr "保存当前打开的层（GERBER 格式）"
+msgstr "保存当前打开的层(GERBER 格式)"
 
 #: gerbview/tool_gerber.cpp:81
 msgid "Save layers as.."
@@ -8856,7 +9501,7 @@ msgstr "以不同格式绘图输出"
 
 #: gerbview/tool_gerber.cpp:93
 msgid "Quit Gerbview"
-msgstr "退出 Gerbview"
+msgstr "退出 gerbview"
 
 #: gerbview/tool_gerber.cpp:106
 msgid "&File ext"
@@ -8904,7 +9549,7 @@ msgstr "删除当前层"
 
 #: gerbview/tool_gerber.cpp:150
 msgid "Open the gerbview manual"
-msgstr "打开 GerbView 手册"
+msgstr "打开 gerbview 手册"
 
 #: gerbview/tool_gerber.cpp:214
 msgid "New World"
@@ -8935,6 +9580,7 @@ msgid "Tool "
 msgstr "工具"
 
 #: gerbview/tool_gerber.cpp:366
+#, fuzzy
 msgid "Add Flashes"
 msgstr "Add Flashes"
 
@@ -8942,21 +9588,113 @@ msgstr "Add Flashes"
 msgid "Add Lines"
 msgstr "添加 线"
 
-#: gerbview/tool_gerber.cpp:445
-msgid "Show Spots in Sketch Mode"
-msgstr "点 以轮廓方式显示"
+#: gerbview/tool_gerber.cpp:445
+msgid "Show Spots in Sketch Mode"
+msgstr "点 以轮廓方式显示"
+
+#: gerbview/tool_gerber.cpp:452
+msgid "Show Lines in Sketch Mode"
+msgstr "线 以轮廓方式显示"
+
+#: gerbview/tool_gerber.cpp:459
+msgid "Show Polygons in Sketch Mode"
+msgstr "多边形 以轮廓方式显示"
+
+#: gerbview/tool_gerber.cpp:466
+msgid "Show dcode number"
+msgstr "显示 dcode 编号"
+
+#: common/eda_doc.cpp:144
+msgid "Doc File "
+msgstr "说明文件"
+
+#: common/eda_doc.cpp:191
+msgid " Cannot find the PDF viewer (xpdf, gpdf or konqueror) in /usr/bin/"
+msgstr " 在 /usr/bin/ 无法找到 PDF 阅读器 (xpdf, gpdf 或 konqueror) "
+
+#: common/eda_doc.cpp:199
+#, c-format
+msgid "Unknown MIME type for Doc File [%s] (%s)"
+msgstr "说明文件 [%s] (%s) 包含未知的 MIME 类型"
+
+#: common/eda_doc.cpp:219
+#, c-format
+msgid "Cannot find Pdf viewer %s"
+msgstr "无法找到 Pdf 查看程序 %s"
+
+#: common/infospgm.cpp:34
+#, fuzzy
+msgid "Build Version:"
+msgstr "Build Version:"
+
+#: common/infospgm.cpp:49
+msgid "Author:"
+msgstr "作者: "
+
+#: common/infospgm.cpp:50
+msgid "Based on wxWidgets "
+msgstr "基于 wxWidgets"
+
+#: common/infospgm.cpp:55
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"GPL License"
+msgstr ""
+"\n"
+"\n"
+"GPL Licence"
+
+#: common/infospgm.cpp:56
+msgid ""
+"\n"
+"\n"
+"Author's sites:\n"
+msgstr ""
+"\n"
+"\n"
+"作者的网站: \n"
+
+#: common/infospgm.cpp:59
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"International wiki:\n"
+msgstr ""
+"\n"
+"\n"
+"International wiki:\n"
+
+#: common/selcolor.cpp:76
+msgid "Colors"
+msgstr "颜色"
+
+#: common/basicframe.cpp:219
+#, c-format
+msgid "Help file %s not found"
+msgstr "帮助文件 %s 没有找到"
+
+#: common/get_component_dialog.cpp:105
+msgid "History list:"
+msgstr "历史列表:"
 
-#: gerbview/tool_gerber.cpp:452
-msgid "Show Lines in Sketch Mode"
-msgstr "线 以轮廓方式显示"
+#: common/get_component_dialog.cpp:117
+msgid "Search KeyWord"
+msgstr "搜索关键字"
 
-#: gerbview/tool_gerber.cpp:459
-msgid "Show Polygons in Sketch Mode"
-msgstr "多边形 以轮廓方式显示"
+#: common/get_component_dialog.cpp:125
+msgid "List All"
+msgstr "列出所有"
 
-#: gerbview/tool_gerber.cpp:466
-msgid "Show dcode number"
-msgstr "显示 dcode 编号"
+#: common/get_component_dialog.cpp:133
+msgid "By Lib Browser"
+msgstr "从库中浏览"
+
+#: common/gestfich.cpp:633
+msgid "No default editor found, you must choose it"
+msgstr "没有找到默认编辑器程序, 请选择一个"
 
 #: common/wxwineda.cpp:169
 #: common/wxwineda.cpp:178
@@ -8964,10 +9702,12 @@ msgid "Pos "
 msgstr "位置 "
 
 #: common/wxwineda.cpp:171
+#, fuzzy
 msgid "X"
 msgstr "X"
 
 #: common/wxwineda.cpp:180
+#, fuzzy
 msgid "Y"
 msgstr "Y"
 
@@ -8976,7 +9716,7 @@ msgid ""
 "Current hotkey list:\n"
 "\n"
 msgstr ""
-"当前热键列表：\n"
+"当前热键列表:\n"
 "\n"
 
 #: common/hotkeys_basic.cpp:309
@@ -8986,274 +9726,361 @@ msgstr "键 "
 #: common/hotkeys_basic.cpp:366
 #: common/hotkeys_basic.cpp:484
 msgid "Hotkey configuration file:"
-msgstr "热键设置文件："
+msgstr "热键设置文件:"
 
 #: common/hotkeys_basic.cpp:398
 msgid "Allowed keys:\n"
-msgstr "允许的键：\n"
+msgstr "允许的键:\n"
 
 #: common/hotkeys_basic.cpp:503
 msgid "Unable to read "
 msgstr "无法读取"
 
-#: common/hotkeys_basic.cpp:611
+#: common/hotkeys_basic.cpp:616
 msgid "Show Current Hotkey List"
 msgstr "显示当前的热键列表"
 
-#: common/hotkeys_basic.cpp:612
+#: common/hotkeys_basic.cpp:617
 msgid "Show the current hotkey config"
 msgstr "显示当前的热键设置"
 
-#: common/hotkeys_basic.cpp:618
+#: common/hotkeys_basic.cpp:623
 msgid "Create Hotkey config file"
 msgstr "建立热键设置文件"
 
-#: common/hotkeys_basic.cpp:619
+#: common/hotkeys_basic.cpp:624
 msgid "Create or Recreate the hotkey config file from current hotkey list"
-msgstr "根据当前热键列表建立（或重新建立）热键设置文件"
+msgstr "根据当前热键列表建立(或重新建立)热键设置文件"
 
-#: common/hotkeys_basic.cpp:625
+#: common/hotkeys_basic.cpp:630
 msgid "Reread Hotkey config file"
 msgstr "重新读取热键设置文件"
 
-#: common/hotkeys_basic.cpp:626
+#: common/hotkeys_basic.cpp:631
 msgid "Reread the hotkey config file"
 msgstr "重新读取热键设置文件"
 
-#: common/hotkeys_basic.cpp:630
+#: common/hotkeys_basic.cpp:635
 msgid "Edit Hotkey config file"
 msgstr "编辑热键设置文件"
 
-#: common/hotkeys_basic.cpp:631
+#: common/hotkeys_basic.cpp:636
 msgid "Run the text editor and edit the hotkey config file"
 msgstr "运行文本编辑程序对热键设置文件进行编辑"
 
-#: common/hotkeys_basic.cpp:637
+#: common/hotkeys_basic.cpp:642
 msgid "home directory"
-msgstr "home 目录"
+msgstr "home directory"
 
-#: common/hotkeys_basic.cpp:638
+#: common/hotkeys_basic.cpp:643
 msgid "Use home directory to load or store Hotkey config files"
 msgstr "把热键设置文件保存在 home 目录"
 
-#: common/hotkeys_basic.cpp:643
+#: common/hotkeys_basic.cpp:648
 msgid "kicad/template directory"
 msgstr "kicad/template 目录"
 
-#: common/hotkeys_basic.cpp:644
+#: common/hotkeys_basic.cpp:649
 msgid "Use kicad/template directory to load or store Hotkey config files"
 msgstr "把热键设置文件保存在 kicad/template 目录"
 
-#: common/hotkeys_basic.cpp:650
+#: common/hotkeys_basic.cpp:655
 msgid "Hotkey config location"
 msgstr "热键设置文件的保存位置"
 
-#: common/hotkeys_basic.cpp:652
+#: common/hotkeys_basic.cpp:657
 msgid "Hotkey config file location selection (home directory or kicad tree)"
 msgstr "选择热键设置文件的保存位置 (home 或 kicad 目录)"
 
-#: common/edaappl.cpp:498
+#: common/edaappl.cpp:509
 msgid "Default"
 msgstr "默认"
 
-#: common/edaappl.cpp:508
+#: common/edaappl.cpp:519
 msgid "French"
 msgstr "法语"
 
-#: common/edaappl.cpp:513
+#: common/edaappl.cpp:524
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: common/edaappl.cpp:518
+#: common/edaappl.cpp:529
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: common/edaappl.cpp:524
+#: common/edaappl.cpp:535
 msgid "Italian"
 msgstr "意大利语"
 
-#: common/edaappl.cpp:529
+#: common/edaappl.cpp:540
 msgid "German"
 msgstr "德语"
 
-#: common/edaappl.cpp:534
+#: common/edaappl.cpp:545
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: common/edaappl.cpp:539
+#: common/edaappl.cpp:550
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: common/edaappl.cpp:544
+#: common/edaappl.cpp:555
 msgid "Polish"
 msgstr "波兰语"
 
-#: common/edaappl.cpp:549
+#: common/edaappl.cpp:560
 msgid "Russian"
 msgstr "俄语"
 
-#: common/edaappl.cpp:554
+#: common/edaappl.cpp:565
 msgid "Korean"
 msgstr "韩国语"
 
-#: common/edaappl.cpp:559
+#: common/edaappl.cpp:570
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: common/edaappl.cpp:636
+#: common/edaappl.cpp:575
+msgid "Chinese simplified"
+msgstr "中文(简体)"
+
+#: common/edaappl.cpp:657
 msgid "Language"
 msgstr "语言"
 
-#: common/eda_doc.cpp:144
-msgid "Doc File "
-msgstr "Doc 文件"
-
-#: common/eda_doc.cpp:191
-msgid " Cannot find the PDF viewer (xpdf, gpdf or konqueror) in /usr/bin/"
-msgstr " Cannot find the PDF viewer (xpdf, gpdf or konqueror) in /usr/bin/"
-
-#: common/eda_doc.cpp:199
-#, c-format
-msgid "Unknown MIME type for Doc File [%s] (%s)"
-msgstr "Unknown MIME type for Doc File [%s] (%s)"
-
-#: common/eda_doc.cpp:219
-#, c-format
-msgid "Cannot find Pdf viewer %s"
-msgstr "无法找到 Pdf 查看程序 %s"
-
-#: common/confirm.cpp:97
-msgid "Infos:"
-msgstr "信息："
-
-#: common/selcolor.cpp:76
-msgid "Colors"
-msgstr "颜色"
-
-#: common/common.cpp:48
+#: common/common.cpp:49
 msgid " (\"):"
-msgstr "（\"）："
+msgstr " (\"):"
 
-#: common/common.cpp:277
-msgid "Copper   "
-msgstr "铜层   "
+#: common/common.cpp:295
+#, fuzzy
+msgid "H2 Bottom"
+msgstr "底层"
 
-#: common/common.cpp:277
-msgid "Inner L1 "
-msgstr "内层 L1 "
+#: common/common.cpp:295
+msgid "Power"
+msgstr "电源端口"
 
-#: common/common.cpp:277
-msgid "Inner L2 "
-msgstr "内层 L2 "
+#: common/common.cpp:295
+msgid "V2 Signal"
+msgstr "V2信号"
 
-#: common/common.cpp:277
-msgid "Inner L3 "
-msgstr "内层 L3 "
+#: common/common.cpp:295
+msgid "H1 Signal"
+msgstr "H1信号"
 
-#: common/common.cpp:278
-msgid "Inner L4 "
-msgstr "内层 L4 "
+#: common/common.cpp:296
+msgid "Ground"
+msgstr "地"
 
-#: common/common.cpp:278
-msgid "Inner L5 "
+#: common/common.cpp:296
+msgid "Inner L5"
 msgstr "内层 L5 "
 
-#: common/common.cpp:278
-msgid "Inner L6 "
+#: common/common.cpp:296
+msgid "Inner L6"
 msgstr "内层 L6 "
 
-#: common/common.cpp:278
-msgid "Inner L7 "
+#: common/common.cpp:296
+msgid "Inner L7"
 msgstr "内层 L7 "
 
-#: common/common.cpp:279
-msgid "Inner L8 "
+#: common/common.cpp:297
+msgid "Inner L8"
 msgstr "内层 L8 "
 
-#: common/common.cpp:279
-msgid "Inner L9 "
+#: common/common.cpp:297
+msgid "Inner L9"
 msgstr "内层 L9 "
 
-#: common/common.cpp:279
+#: common/common.cpp:297
+#: common/common.cpp:308
+#: common/common.cpp:341
 msgid "Inner L10"
 msgstr "内层 L10"
 
-#: common/common.cpp:279
+#: common/common.cpp:297
+#: common/common.cpp:308
+#: common/common.cpp:341
 msgid "Inner L11"
 msgstr "内层 L11"
 
-#: common/common.cpp:280
+#: common/common.cpp:298
+#: common/common.cpp:309
+#: common/common.cpp:342
 msgid "Inner L12"
 msgstr "内层 L12"
 
-#: common/common.cpp:280
+#: common/common.cpp:298
+#: common/common.cpp:309
+#: common/common.cpp:342
 msgid "Inner L13"
 msgstr "内层 L13"
 
-#: common/common.cpp:280
+#: common/common.cpp:298
+#: common/common.cpp:309
+#: common/common.cpp:342
 msgid "Inner L14"
 msgstr "内层 L14"
 
-#: common/common.cpp:281
+#: common/common.cpp:299
+#: common/common.cpp:310
+#: common/common.cpp:343
 msgid "Adhes Cop"
-msgstr "铜箔面粘贴层"
+msgstr "粘胶层(铜箔面)"
 
-#: common/common.cpp:281
+#: common/common.cpp:299
+#: common/common.cpp:310
+#: common/common.cpp:343
 msgid "Adhes Cmp"
-msgstr "元件面粘贴层"
+msgstr "粘胶层(元件面)"
 
-#: common/common.cpp:281
+#: common/common.cpp:299
+#: common/common.cpp:310
+#: common/common.cpp:343
 msgid "SoldP Cop"
-msgstr "铜箔面贴焊层"
+msgstr "贴焊层(铜箔面)"
 
-#: common/common.cpp:281
+#: common/common.cpp:299
+#: common/common.cpp:310
+#: common/common.cpp:343
 msgid "SoldP Cmp"
-msgstr "元件面贴焊层"
+msgstr "贴焊层(元件面)"
 
-#: common/common.cpp:282
+#: common/common.cpp:300
+#: common/common.cpp:311
+#: common/common.cpp:344
 msgid "SilkS Cop"
-msgstr "铜箔面丝印"
+msgstr "丝印层(铜箔面)"
 
-#: common/common.cpp:282
+#: common/common.cpp:300
+#: common/common.cpp:311
+#: common/common.cpp:344
 msgid "SilkS Cmp"
-msgstr "元件面丝印"
+msgstr "丝印层(元件面)"
 
-#: common/common.cpp:282
-msgid "Mask Cop "
-msgstr "铜箔面阻焊层 "
+#: common/common.cpp:300
+msgid "Mask Cop"
+msgstr "阻焊层(铜箔面)"
 
-#: common/common.cpp:282
-msgid "Mask Cmp "
-msgstr "元件面阻焊层"
+#: common/common.cpp:300
+msgid "Mask Cmp"
+msgstr "阻焊层(元件面)"
 
-#: common/common.cpp:283
+#: common/common.cpp:301
+#: common/common.cpp:312
+#: common/common.cpp:345
 msgid "Drawings "
 msgstr "图形"
 
-#: common/common.cpp:283
-msgid "Comments "
+#: common/common.cpp:301
+msgid "Comments"
 msgstr "注释"
 
-#: common/common.cpp:283
-msgid "Eco1     "
+#: common/common.cpp:301
+#, fuzzy
+msgid "Eco1"
 msgstr "Eco1     "
 
-#: common/common.cpp:283
-msgid "Eco2     "
+#: common/common.cpp:301
+#, fuzzy
+msgid "Eco2"
 msgstr "Eco2     "
 
-#: common/common.cpp:284
+#: common/common.cpp:302
+#: common/common.cpp:313
+#: common/common.cpp:346
 msgid "Edges Pcb"
 msgstr "PCB边界层"
 
-#: common/common.cpp:284
+#: common/common.cpp:302
+#: common/common.cpp:313
+#, fuzzy
+msgid "BAD INDEX"
+msgstr "错误连线删除："
+
+#: common/common.cpp:306
+#: common/common.cpp:339
+msgid "Copper   "
+msgstr "铜层   "
+
+#: common/common.cpp:306
+#: common/common.cpp:339
+msgid "Inner L1 "
+msgstr "内层 L1 "
+
+#: common/common.cpp:306
+#: common/common.cpp:339
+msgid "Inner L2 "
+msgstr "内层 L2 "
+
+#: common/common.cpp:306
+#: common/common.cpp:339
+msgid "Inner L3 "
+msgstr "内层 L3 "
+
+#: common/common.cpp:307
+#: common/common.cpp:340
+msgid "Inner L4 "
+msgstr "内层 L4 "
+
+#: common/common.cpp:307
+#: common/common.cpp:340
+msgid "Inner L5 "
+msgstr "内层 L5 "
+
+#: common/common.cpp:307
+#: common/common.cpp:340
+msgid "Inner L6 "
+msgstr "内层 L6 "
+
+#: common/common.cpp:307
+#: common/common.cpp:340
+msgid "Inner L7 "
+msgstr "内层 L7 "
+
+#: common/common.cpp:308
+#: common/common.cpp:341
+msgid "Inner L8 "
+msgstr "内层 L8 "
+
+#: common/common.cpp:308
+#: common/common.cpp:341
+msgid "Inner L9 "
+msgstr "内层 L9 "
+
+#: common/common.cpp:311
+#: common/common.cpp:344
+msgid "Mask Cop "
+msgstr "阻焊层(铜箔面)"
+
+#: common/common.cpp:311
+#: common/common.cpp:344
+msgid "Mask Cmp "
+msgstr "阻焊层(元件面)"
+
+#: common/common.cpp:312
+#: common/common.cpp:345
+msgid "Comments "
+msgstr "注释"
+
+#: common/common.cpp:312
+#: common/common.cpp:345
+#, fuzzy
+msgid "Eco1     "
+msgstr "Eco1     "
+
+#: common/common.cpp:312
+#: common/common.cpp:345
+#, fuzzy
+msgid "Eco2     "
+msgstr "Eco2     "
+
+#: common/common.cpp:346
+#, fuzzy
 msgid "---      "
 msgstr "---      "
 
-#: common/gestfich.cpp:620
-msgid "No default editor found, you must choose it"
-msgstr "没有找到默认编辑器程序，请选择一个"
-
 #: common/block_commande.cpp:56
 msgid "Block Move"
 msgstr "块移动"
@@ -9294,34 +10121,88 @@ msgstr "块反转"
 msgid "Block Mirror"
 msgstr "块镜像"
 
-#: common/get_component_dialog.cpp:105
-msgid "History list:"
-msgstr "历史列表："
+#: common/confirm.cpp:106
+msgid "Infos:"
+msgstr "信息: "
 
-#: common/get_component_dialog.cpp:117
-msgid "Search KeyWord"
-msgstr "搜索关键字"
+#: 3d-viewer/3d_aux.cpp:193
+#, fuzzy
+msgid "Vertex "
+msgstr "Vertex "
 
-#: common/get_component_dialog.cpp:125
-msgid "List All"
-msgstr "列出所有"
+#: 3d-viewer/3d_toolbar.cpp:34
+msgid "Reload board"
+msgstr "重新载入电路板"
 
-#: common/get_component_dialog.cpp:133
-msgid "By Lib Browser"
-msgstr "从库中浏览"
+#: 3d-viewer/3d_toolbar.cpp:39
+msgid "Copy 3D Image to Clipboard"
+msgstr "复制3D图像到剪贴板"
 
-#: common/basicframe.cpp:216
-#, c-format
-msgid "Help file %s not found"
-msgstr "帮助文件 %s 没有找到"
+#: 3d-viewer/3d_toolbar.cpp:57
+msgid "Rotate X <-"
+msgstr "旋转 X <-"
+
+#: 3d-viewer/3d_toolbar.cpp:60
+msgid "Rotate X ->"
+msgstr "旋转 X ->"
+
+#: 3d-viewer/3d_toolbar.cpp:64
+msgid "Rotate Y <-"
+msgstr "旋转 Y <-"
+
+#: 3d-viewer/3d_toolbar.cpp:67
+msgid "Rotate Y ->"
+msgstr "旋转 Y ->"
+
+#: 3d-viewer/3d_toolbar.cpp:71
+msgid "Rotate Z <-"
+msgstr "旋转 Z <-"
+
+#: 3d-viewer/3d_toolbar.cpp:74
+msgid "Rotate Z ->"
+msgstr "旋转 Z ->"
+
+#: 3d-viewer/3d_toolbar.cpp:78
+#: 3d-viewer/3d_canvas.cpp:363
+msgid "Move left <-"
+msgstr "向左移动 <-"
+
+#: 3d-viewer/3d_toolbar.cpp:81
+#: 3d-viewer/3d_canvas.cpp:368
+msgid "Move right ->"
+msgstr "向右移动 ->"
+
+#: 3d-viewer/3d_toolbar.cpp:84
+#: 3d-viewer/3d_canvas.cpp:373
+msgid "Move Up ^"
+msgstr "向上移动 ^"
+
+#: 3d-viewer/3d_toolbar.cpp:87
+#: 3d-viewer/3d_canvas.cpp:378
+msgid "Move Down"
+msgstr "向下移动"
+
+#: 3d-viewer/3d_toolbar.cpp:113
+msgid "Create Image (png format)"
+msgstr "生成图片(png 格式)"
+
+#: 3d-viewer/3d_toolbar.cpp:114
+msgid "Create Image (jpeg format)"
+msgstr "生成图片(jpeg 格式)"
+
+#: 3d-viewer/3d_toolbar.cpp:116
+msgid "&Exit"
+msgstr "退出(&E)"
+
+#: 3d-viewer/3d_toolbar.cpp:122
+msgid "Choose background color"
+msgstr "选择背景颜色"
 
 #: 3d-viewer/3d_canvas.cpp:318
-#: share/zoom.cpp:357
 msgid "Zoom +"
 msgstr "缩放 +"
 
 #: 3d-viewer/3d_canvas.cpp:323
-#: share/zoom.cpp:358
 msgid "Zoom -"
 msgstr "缩放 -"
 
@@ -9349,81 +10230,30 @@ msgstr "前视"
 msgid "Back View"
 msgstr "后视"
 
-#: 3d-viewer/3d_canvas.cpp:363
-#: 3d-viewer/3d_toolbar.cpp:78
-msgid "Move left <-"
-msgstr "向左移动 <-"
-
-#: 3d-viewer/3d_canvas.cpp:368
-#: 3d-viewer/3d_toolbar.cpp:81
-msgid "Move right ->"
-msgstr "向右移动 ->"
-
-#: 3d-viewer/3d_canvas.cpp:373
-#: 3d-viewer/3d_toolbar.cpp:84
-msgid "Move Up ^"
-msgstr "向上 ^"
-
-#: 3d-viewer/3d_canvas.cpp:378
-#: 3d-viewer/3d_toolbar.cpp:87
-msgid "Move Down"
-msgstr "向下移动"
-
-#: 3d-viewer/3d_canvas.cpp:629
-msgid "3D Image filename:"
-msgstr "3D图像文件名："
-
-#: 3d-viewer/3d_toolbar.cpp:34
-msgid "Reload board"
-msgstr "重新载入电路板"
-
-#: 3d-viewer/3d_toolbar.cpp:39
-msgid "Copy 3D Image to Clipboard"
-msgstr "复制3D图像到剪贴板"
-
-#: 3d-viewer/3d_toolbar.cpp:57
-msgid "Rotate X <-"
-msgstr "旋转 X <-"
-
-#: 3d-viewer/3d_toolbar.cpp:60
-msgid "Rotate X ->"
-msgstr "旋转 X ->"
-
-#: 3d-viewer/3d_toolbar.cpp:64
-msgid "Rotate Y <-"
-msgstr "旋转 Y <-"
-
-#: 3d-viewer/3d_toolbar.cpp:67
-msgid "Rotate Y ->"
-msgstr "旋转 Y ->"
-
-#: 3d-viewer/3d_toolbar.cpp:71
-msgid "Rotate Z <-"
-msgstr "旋转 Z <-"
-
-#: 3d-viewer/3d_toolbar.cpp:74
-msgid "Rotate Z ->"
-msgstr "旋转 Z ->"
+#: 3d-viewer/3d_canvas.cpp:629
+msgid "3D Image filename:"
+msgstr "3D图像文件名: "
 
-#: 3d-viewer/3d_toolbar.cpp:113
-msgid "Create Image (png format)"
-msgstr "生成图片（png 格式）"
+#: share/wxprint.cpp:146
+msgid "Error Init Printer info"
+msgstr "初始化打印机信息出现错误"
 
-#: 3d-viewer/3d_toolbar.cpp:114
-msgid "Create Image (jpeg format)"
-msgstr "生成图片（jpeg 格式）"
+#: share/wxprint.cpp:342
+msgid "Printer Problem!"
+msgstr "打印机出现问题！"
 
-#: 3d-viewer/3d_toolbar.cpp:116
-msgid "&Exit"
-msgstr "退出(&E)"
+#: share/wxprint.cpp:373
+msgid "There was a problem previewing"
+msgstr "打印预览发生问题"
 
-#: 3d-viewer/3d_toolbar.cpp:122
-msgid "Choose background color"
-msgstr "选择背景颜色"
+#: share/wxprint.cpp:433
+msgid "There was a problem printing"
+msgstr "打印发生问题"
 
-#: 3d-viewer/3d_aux.cpp:193
-msgid "Vertex "
-msgstr "Vertex "
+#: share/wxprint.cpp:450
+#, c-format
+msgid "Print page %d"
+msgstr "打印页 %d"
 
 #: share/dialog_print.cpp:136
 msgid "fit in page"
@@ -9455,11 +10285,11 @@ msgstr "比例 4"
 
 #: share/dialog_print.cpp:146
 msgid "Approx. Scale:"
-msgstr "大致比例："
+msgstr "大致比例: "
 
 #: share/dialog_print.cpp:186
 msgid "Color Print:"
-msgstr "打印颜色："
+msgstr "打印颜色: "
 
 #: share/dialog_print.cpp:191
 msgid "1 page per layer"
@@ -9471,12 +10301,12 @@ msgstr "单一页"
 
 #: share/dialog_print.cpp:194
 #: share/dialog_print.cpp:202
-#: share/svg_print.cpp:213
+#: share/svg_print.cpp:214
 msgid "Page Print:"
-msgstr "打印页："
+msgstr "打印页: "
 
 #: share/dialog_print.cpp:199
-#: share/svg_print.cpp:210
+#: share/svg_print.cpp:211
 msgid "Current"
 msgstr "当前"
 
@@ -9493,74 +10323,61 @@ msgid "&Print"
 msgstr "打印(&P)"
 
 #: share/dialog_print.cpp:236
-#: share/svg_print.cpp:243
+#: share/svg_print.cpp:244
 msgid "Pen width mini"
-msgstr "画笔最小宽度:"
+msgstr "画笔最小宽度"
 
-#: share/zoom.cpp:322
+#: share/zoom.cpp:325
 msgid "Zoom: "
-msgstr "缩放："
+msgstr "缩放: "
 
-#: share/zoom.cpp:323
+#: share/zoom.cpp:326
 msgid "Grid: "
-msgstr "网格："
+msgstr "网格: "
 
-#: share/zoom.cpp:362
+#: share/zoom.cpp:365
 msgid "Zoom Select"
 msgstr "缩放选择"
 
-#: share/zoom.cpp:365
+#: share/zoom.cpp:368
 msgid "Redraw"
 msgstr "窗口重绘"
 
-#: share/zoom.cpp:381
+#: share/zoom.cpp:384
 msgid "Grid Select"
 msgstr "网格选择"
 
-#: share/zoom.cpp:403
+#: share/zoom.cpp:406
 msgid "grid user"
 msgstr "自定义网格"
 
-#: share/wxprint.cpp:146
-msgid "Error Init Printer info"
-msgstr "初始化打印机信息出现错误"
-
-#: share/wxprint.cpp:342
-msgid "Printer Problem!"
-msgstr "打印机出现问题！"
-
-#: share/wxprint.cpp:373
-msgid "There was a problem previewing"
-msgstr "打印预览发生问题"
-
-#: share/wxprint.cpp:433
-msgid "There was a problem printing"
-msgstr "打印发生问题"
-
-#: share/wxprint.cpp:450
-#, c-format
-msgid "Print page %d"
-msgstr "打印页 %d"
-
-#: share/svg_print.cpp:194
+#: share/svg_print.cpp:195
 msgid "Black and White"
 msgstr "黑白"
 
-#: share/svg_print.cpp:196
+#: share/svg_print.cpp:197
 msgid "Print mode"
 msgstr "打印模式"
 
-#: share/svg_print.cpp:217
+#: share/svg_print.cpp:218
 msgid "Create &File"
 msgstr "建立文件 (&F)"
 
-#: share/svg_print.cpp:363
-#: share/svg_print.cpp:377
+#: share/svg_print.cpp:227
+msgid "Filename:"
+msgstr "文件名: "
+
+#: share/svg_print.cpp:233
+msgid "Messages:"
+msgstr "信息: "
+
+#: share/svg_print.cpp:364
+#: share/svg_print.cpp:379
 msgid "Create file "
 msgstr "建立文件 "
 
-#: share/svg_print.cpp:364
-#: share/svg_print.cpp:378
+#: share/svg_print.cpp:365
+#: share/svg_print.cpp:380
 msgid " error"
 msgstr " 错误"
 
@@ -9569,94 +10386,54 @@ msgid "font for info display"
 msgstr "信息栏 字体"
 
 #: share/drawframe.cpp:391
+#, fuzzy
 msgid "Inch"
 msgstr "Inch"
 
 #: share/drawframe.cpp:399
+#, fuzzy
 msgid "??"
 msgstr "??"
 
-#: share/infospgm.cpp:47
-msgid "Build Version:"
-msgstr "Build Version:"
-
-#: share/infospgm.cpp:62
-msgid "Author:"
-msgstr "作者："
-
-#: share/infospgm.cpp:63
-msgid "Based on wxWidgets "
-msgstr "基于 wxWidgets"
-
-#: share/infospgm.cpp:68
-msgid ""
-"\n"
-"\n"
-"GPL License"
-msgstr ""
-"\n"
-"\n"
-"GPL Licence"
-
-#: share/infospgm.cpp:69
-msgid ""
-"\n"
-"\n"
-"Author's sites:\n"
-msgstr ""
-"\n"
-"\n"
-"作者的网站：\n"
-
-#: share/infospgm.cpp:72
-msgid ""
-"\n"
-"\n"
-"International wiki:\n"
-msgstr ""
-"\n"
-"\n"
-"International wiki:\n"
-
 #: share/setpage.cpp:274
 msgid "Size A4"
-msgstr "Size A4"
+msgstr "页面大小 A4"
 
 #: share/setpage.cpp:275
 msgid "Size A3"
-msgstr "Size A3"
+msgstr "页面大小 A3"
 
 #: share/setpage.cpp:276
 msgid "Size A2"
-msgstr "Size A2"
+msgstr "页面大小 A2"
 
 #: share/setpage.cpp:277
 msgid "Size A1"
-msgstr "Size A1"
+msgstr "页面大小 A1"
 
 #: share/setpage.cpp:278
 msgid "Size A0"
-msgstr "Size A0"
+msgstr "页面大小 A0"
 
 #: share/setpage.cpp:279
 msgid "Size A"
-msgstr "Size A"
+msgstr "页面大小 A"
 
 #: share/setpage.cpp:280
 msgid "Size B"
-msgstr "Size B"
+msgstr "页面大小 B"
 
 #: share/setpage.cpp:281
 msgid "Size C"
-msgstr "Size C"
+msgstr "页面大小 C"
 
 #: share/setpage.cpp:282
 msgid "Size D"
-msgstr "Size D"
+msgstr "页面大小 D"
 
 #: share/setpage.cpp:283
 msgid "Size E"
-msgstr "Size E"
+msgstr "页面大小 E"
 
 #: share/setpage.cpp:284
 msgid "User size"
@@ -9664,29 +10441,29 @@ msgstr "自定义大小"
 
 #: share/setpage.cpp:285
 msgid "Page Size:"
-msgstr "页面大小："
+msgstr "页面大小: "
 
 #: share/setpage.cpp:292
 msgid "User Page Size X: "
-msgstr "自定义大小 X："
+msgstr "自定义大小 X: "
 
 #: share/setpage.cpp:301
 msgid "User Page Size Y: "
-msgstr "自定义大小 Y："
+msgstr "自定义大小 Y: "
 
 #: share/setpage.cpp:328
 #, c-format
 msgid "Number of sheets: %d"
-msgstr "图总数：%d"
+msgstr "图总数: %d"
 
 #: share/setpage.cpp:334
 #, c-format
 msgid "Sheet number: %d"
-msgstr "图编号：%d"
+msgstr "图编号: %d"
 
 #: share/setpage.cpp:338
 msgid "Revision:"
-msgstr "修订："
+msgstr "修订: "
 
 #: share/setpage.cpp:347
 #: share/setpage.cpp:361
@@ -9700,52 +10477,56 @@ msgstr "导出到其他图"
 
 #: share/setpage.cpp:366
 msgid "Company:"
-msgstr "公司："
+msgstr "公司: "
 
 #: share/setpage.cpp:380
 msgid "Comment1:"
-msgstr "注释1："
+msgstr "注释1: "
 
 #: share/setpage.cpp:394
 msgid "Comment2:"
-msgstr "注释2："
+msgstr "注释2: "
 
 #: share/setpage.cpp:408
 msgid "Comment3:"
-msgstr "注释3："
+msgstr "注释3: "
 
 #: share/setpage.cpp:422
 msgid "Comment4:"
-msgstr "注释4："
+msgstr "注释4: "
 
-#: pcbnew/gen_self.h:217
-msgid "Length(inch):"
-msgstr "长度（inch）："
+#: pcbnew/dialog_edit_mod_text.h:43
+msgid "TextMod properties"
+msgstr "模块文字属性"
 
-#: pcbnew/gen_self.h:223
-msgid "Length(mm):"
-msgstr "长度（mm）："
+#: pcbnew/dialog_zones_by_polygon.h:53
+msgid "Fill Zones Options"
+msgstr "填充覆铜选项"
 
-#: pcbnew/gen_self.h:239
-msgid "Requested length < minimum length"
-msgstr "输入长度值 < 最小长度"
+#: pcbnew/cleaningoptions_dialog.h:48
+msgid "Cleaning options"
+msgstr "清理选项"
 
-#: pcbnew/gen_self.h:260
-msgid "Unable to create line: Requested length is too big"
-msgstr "无法生成线：输入长度值过大"
+#: pcbnew/dialog_drc.h:65
+msgid "DRC Control"
+msgstr "DRC 控制"
 
-#: pcbnew/gen_self.h:271
-#, c-format
-msgid "Segm count = %d, Lenght = "
-msgstr "Segm count = %d, Lenght = "
+#: pcbnew/dialog_gendrill.h:50
+msgid "WinEDA_DrillFrame"
+msgstr ""
 
-#: pcbnew/find.h:38
-msgid "Find"
-msgstr "查找"
+#: pcbnew/dialog_general_options.h:44
+#: eeschema/dialog_options.h:55
+msgid "General Options"
+msgstr "基本选项"
 
-#: pcbnew/dialog_drc.h:60
-msgid "DRC Control"
-msgstr "DRC 控制"
+#: pcbnew/dialog_pad_edit.h:62
+msgid "Pad properties"
+msgstr "焊盘属性"
+
+#: pcbnew/dialog_netlist.h:52
+msgid "Netlist: "
+msgstr "网络表: "
 
 #: pcbnew/dialog_setup_libs.h:43
 #: eeschema/dialog_eeschema_config.h:50
@@ -9753,34 +10534,38 @@ msgstr "DRC 控制"
 msgid "Dialog"
 msgstr "对话框"
 
-#: pcbnew/dialog_pad_edit.h:62
-msgid "Pad properties"
-msgstr "焊盘属性"
+#: pcbnew/pcbnew.h:288
+msgid "??? Via"
+msgstr "??? 导孔"
 
-#: pcbnew/dialog_general_options.h:44
-#: eeschema/dialog_options.h:55
-msgid "General Options"
-msgstr "基本选项"
+#: pcbnew/pcbnew.h:290
+msgid "Blind/Buried Via"
+msgstr "盲孔/埋孔"
 
-#: pcbnew/dialog_edit_mod_text.h:43
-msgid "TextMod properties"
-msgstr "模块文字属性"
+#: pcbnew/gen_self.h:217
+msgid "Length(inch):"
+msgstr "长度(inch):"
 
-#: pcbnew/cleaningoptions_dialog.h:48
-msgid "Cleaning options"
-msgstr "清理选项"
+#: pcbnew/gen_self.h:223
+msgid "Length(mm):"
+msgstr "长度(mm):"
 
-#: pcbnew/zones.h:54
-msgid "Fill Zones Options"
-msgstr "填充覆铜选项"
+#: pcbnew/gen_self.h:239
+msgid "Requested length < minimum length"
+msgstr "输入长度值 < 最小长度"
 
-#: pcbnew/dialog_initpcb.h:38
-msgid "Global Delete"
-msgstr "全局删除"
+#: pcbnew/gen_self.h:260
+msgid "Unable to create line: Requested length is too big"
+msgstr "无法生成线: 输入长度值过大"
+
+#: pcbnew/gen_self.h:271
+#, c-format
+msgid "Segm count = %d, Lenght = "
+msgstr "线段 数量 = %d, 长度 = "
 
 #: pcbnew/set_color.h:38
 msgid "Pcbnew Layer Colors:"
-msgstr "Pcbnew 层颜色设置："
+msgstr "pcbnew 层颜色设置："
 
 #: pcbnew/set_color.h:81
 msgid "Copper Layers"
@@ -9830,153 +10615,167 @@ msgstr "显示 元件面的模块"
 msgid "Show Modules Cu"
 msgstr "显示 铜箔面的模块"
 
-#: pcbnew/dialog_netlist.h:52
-msgid "Netlist: "
-msgstr "网络表："
-
-#: pcbnew/dialog_track_options.h:42
+#: pcbnew/dialog_track_options.h:53
 msgid "Tracks and Vias Sizes"
-msgstr "导线和过孔大小"
+msgstr "导线和导孔大小"
 
-#: eeschema/plotps.h:50
-msgid "EESchema Plot PS"
-msgstr "EESchema绘图 PostScript 输出"
+#: pcbnew/drc_stuff.h:147
+#, c-format
+msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
+msgstr "错误类型(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
 
-#: eeschema/plothpgl.h:46
-msgid "EESchema Plot HPGL"
-msgstr "EESchema绘图 HPGL 输出"
+#: pcbnew/drc_stuff.h:155
+#, c-format
+msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
+msgstr "错误类型(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
+
+#: pcbnew/dialog_initpcb.h:38
+msgid "Global Delete"
+msgstr "全局删除"
+
+#: eeschema/dialog_build_BOM.h:61
+msgid "List of Material"
+msgstr "材料列表"
 
 #: eeschema/pinedit-dialog.h:65
 msgid "Pin properties"
 msgstr "引脚属性"
 
+#: eeschema/plothpgl.h:46
+msgid "EESchema Plot HPGL"
+msgstr "eeschema绘图 HPGL 输出"
+
+#: eeschema/symbtext.h:42
+msgid "Graphic text properties"
+msgstr "图形文本属性"
+
+#: eeschema/sheet.h:43
+msgid "Sheet properties"
+msgstr "分图属性"
+
+#: eeschema/dialog_create_component.h:55
+msgid "Component Creation"
+msgstr "建立新元件"
+
+#: eeschema/annotate_dialog.h:45
+msgid "Annotate"
+msgstr "标注"
+
+#: eeschema/dialog_cmp_graphic_properties.h:43
+msgid "Graphic shape properties"
+msgstr "图形形状属性"
+
 #: eeschema/eelayer.h:35
 msgid "EESchema Colors"
-msgstr "EESchema 颜色设置"
+msgstr "eeschema 颜色设置"
 
-#: eeschema/eelayer.h:74
+#: eeschema/eelayer.h:73
 msgid "Wire"
 msgstr "导线"
 
-#: eeschema/eelayer.h:80
+#: eeschema/eelayer.h:79
 msgid "Bus"
 msgstr "总线"
 
-#: eeschema/eelayer.h:86
-msgid "Junction"
-msgstr "连接点"
-
-#: eeschema/eelayer.h:92
+#: eeschema/eelayer.h:91
 msgid "Label"
 msgstr "标签"
 
-#: eeschema/eelayer.h:98
+#: eeschema/eelayer.h:97
 msgid "GlobLabel"
 msgstr "全局标签"
 
-#: eeschema/eelayer.h:110
+#: eeschema/eelayer.h:103
+msgid "Netname"
+msgstr "网络名称"
+
+#: eeschema/eelayer.h:109
 msgid "Notes"
 msgstr "提示"
 
-#: eeschema/eelayer.h:123
+#: eeschema/eelayer.h:122
 msgid "Body"
 msgstr "主体"
 
-#: eeschema/eelayer.h:129
+#: eeschema/eelayer.h:128
 msgid "Body Bg"
 msgstr "主体背景"
 
-#: eeschema/eelayer.h:135
+#: eeschema/eelayer.h:134
 msgid "Pin"
 msgstr "引脚"
 
-#: eeschema/eelayer.h:147
+#: eeschema/eelayer.h:146
 msgid "PinNam"
 msgstr "引脚名称"
 
-#: eeschema/eelayer.h:178
+#: eeschema/eelayer.h:177
 msgid "Sheetfile"
 msgstr "图文件"
 
-#: eeschema/eelayer.h:184
+#: eeschema/eelayer.h:183
 msgid "SheetName"
 msgstr "图名称"
 
-#: eeschema/eelayer.h:190
-msgid "SheetLabel"
-msgstr "图标签"
+#: eeschema/eelayer.h:189
+msgid "SheetLabel (Pin Sheet)"
+msgstr "图标签(分图引脚)"
+
+#: eeschema/eelayer.h:195
+msgid "Hierarchical Label"
+msgstr "层次标签"
 
-#: eeschema/eelayer.h:197
+#: eeschema/eelayer.h:201
 msgid "Erc Warning"
 msgstr "ERC警告"
 
-#: eeschema/eelayer.h:203
+#: eeschema/eelayer.h:207
 msgid "Erc Error"
 msgstr "ERC错误"
 
-#: eeschema/eelayer.h:248
+#: eeschema/eelayer.h:253
 msgid "General"
 msgstr "基本"
 
-#: eeschema/eelayer.h:254
+#: eeschema/eelayer.h:259
 msgid "Device"
 msgstr "设备"
 
-#: eeschema/eelayer.h:260
+#: eeschema/eelayer.h:265
 msgid "Sheets"
 msgstr "图"
 
-#: eeschema/eelayer.h:266
+#: eeschema/eelayer.h:271
 msgid "Erc Mark"
 msgstr "ERC 记号"
 
-#: eeschema/eelayer.h:272
+#: eeschema/eelayer.h:277
 msgid "Other"
 msgstr "其他"
 
-#: eeschema/dialog_erc.h:57
-msgid "EESchema Erc"
-msgstr "EESchema ERC"
+#: eeschema/plotps.h:50
+msgid "EESchema Plot PS"
+msgstr "eeschema绘图 PostScript 输出"
 
 #: eeschema/dialog_find.h:39
 msgid "EESchema Locate"
-msgstr "EESchema 定位"
+msgstr "eeschema 定位"
 
-#: eeschema/annotate_dialog.h:53
-msgid "EESchema Annotation"
-msgstr "EESchema 原理图标注"
-
-#: eeschema/dialog_build_BOM.h:61
-msgid "List of Material"
-msgstr "材料列表"
+#: eeschema/dialog_erc.h:57
+msgid "EESchema Erc"
+msgstr "eeschema ERC"
 
 #: eeschema/dialog_edit_component_in_schematic.h:52
 msgid "Component properties"
 msgstr "元件属性"
 
-#: eeschema/sheet.h:43
-msgid "Sheet properties"
-msgstr "分图属性"
-
-#: eeschema/symbtext.h:42
-msgid "Graphic text properties"
-msgstr "图形文本属性"
-
-#: eeschema/dialog_create_component.h:55
-msgid "Component Creation"
-msgstr "建立新元件"
-
-#: eeschema/dialog_cmp_graphic_properties.h:43
-msgid "Graphic shape properties"
-msgstr "图形形状属性"
-
 #: cvpcb/dialog_cvpcb_config.h:50
 msgid "Cvpcb Configuration"
 msgstr "Cvpcb 配置"
 
 #: gerbview/set_color.h:38
 msgid "GerbView Layer Colors:"
-msgstr "GerbView 层颜色："
+msgstr "GerbView 层颜色:"
 
 #: gerbview/set_color.h:80
 msgid "Layers 1-16"
@@ -10122,10 +10921,6 @@ msgstr "其他"
 msgid "D codes id."
 msgstr "D codes 编号"
 
-#: share/svg_print.h:50
-msgid "Create SVG file"
-msgstr "建立 SVG 文件"
-
 #: share/dialog_print.h:51
 msgid "Print"
 msgstr "打印"
@@ -10134,3 +10929,7 @@ msgstr "打印"
 msgid "Page Settings"
 msgstr "页面设置"
 
+#: share/svg_print.h:50
+msgid "Create SVG file"
+msgstr "建立 SVG 文件"
+