Update runtime files

3 files changed, 794 insertions, 690 deletions

diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim
index b3276b536..d96ab3780 100644
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -1,270 +1,452 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2014 Oct 15
-
-" vim: ts=8 sw=8 noet
+" Last Change:          2019-09-10
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
   finish
 endif
 let did_menu_trans = 1
-let s:keepcpo= &cpo
+let s:keepcpo = &cpo
 set cpo&vim
 
 scriptencoding cp936
 
 " Help menu
-menutrans &Help			帮助(&H)
-menutrans &Overview<Tab><F1>	纵览(&O)<Tab><F1>
-menutrans &User\ Manual		用户手册(&U)
-menutrans &How-to\ links	How-to\ 指引(&H)
-menutrans &Find\.\.\.		查找(&F)\.\.\.
-menutrans &Credits		致谢(&C)
-menutrans Co&pying		版权(&P)
-menutrans &Sponsor/Register	赞助/注册(&S)
-menutrans O&rphans		孤儿(&R)
-menutrans &Version		版本(&V)
-menutrans &About		关于(&A)
+menutrans &Help		帮助(&H)
+" Help menuitems and dialog {{{1
+menutrans &Overview<Tab><F1>	概述(&O)<Tab><F1>
+menutrans &User\ Manual			用户手册(&U)
+menutrans &How-to\ Links		如何使用(&H)
+menutrans &Find\.\.\.			查找(&F)\.\.\.
+menutrans &Credits				致谢(&C)
+menutrans Co&pying				版权(&P)
+menutrans &Sponsor/Register		赞助/注册(&S)
+menutrans O&rphans				拯救孤儿(&R)
+menutrans &Version				版本(&V)
+menutrans &About				关于(&A)
+
+" fun! s:Helpfind()
+if !exists("g:menutrans_help_dialog")
+  let g:menutrans_help_dialog = "输入命令或单词以获得帮助:\n\n前缀 i_ 表示输入模式下的命令(如: i_CTRL-X)\n前缀 c_ 表示命令行下的编辑命令(如: c_<Del>)\n前缀 ' 表示选项名(如: 'shiftwidth')"
+endif
+" }}}
 
 " File menu
-menutrans &File				文件(&F)
-menutrans &Open\.\.\.<Tab>:e		打开(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	分割并打开(&L)\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	打开标签\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		新建(&N)<Tab>:enew
-menutrans &Close<Tab>:close		关闭(&C)<Tab>:close
-menutrans &Save<Tab>:w			保存(&S)<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	另存为(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\.	分割比较(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	分割打补丁(Patch)(&B)\.\.\.
-menutrans &Print			打印(&P)
-menutrans Sa&ve-Exit<Tab>:wqa		保存并退出(&V)<Tab>:wqa
-menutrans E&xit<Tab>:qa			退出(&X)<Tab>:qa
+menutrans &File		文件(&F)
+" File menuitems {{{1
+menutrans &Open\.\.\.<Tab>:e			打开(&O)\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp		在拆分窗口打开(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	在标签页打开\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew				新建(&N)<Tab>:enew
+menutrans &Close<Tab>:close				关闭(&C)<Tab>:close
+menutrans &Save<Tab>:w					保存(&S)<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav		另存为(&A)\.\.\.<Tab>:sav
+menutrans Split\ &Diff\ With\.\.\.		拆分窗口以对比差异(Diff)(&D)\.\.\.
+menutrans Split\ Patched\ &By\.\.\.		拆分窗口以进行修补(Patch)(&B)\.\.\.
+menutrans &Print						打印(&P)
+menutrans Sa&ve-Exit<Tab>:wqa			保存并退出(&V)<Tab>:wqa
+menutrans E&xit<Tab>:qa					退出(&X)<Tab>:qa
+" }}}
 
 " Edit menu
-menutrans &Edit				编辑(&E)
-menutrans &Undo<Tab>u			撤销(&U)<Tab>u
-menutrans &Redo<Tab>^R			重做(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.		重复上次操作(&E)<Tab>\.
-menutrans Cu&t<Tab>"+x			剪切(&T)<Tab>"+x
-menutrans &Copy<Tab>"+y			复制(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP		粘贴(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		粘贴到光标前(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p		粘贴到光标后(&A)<Tab>]p
-menutrans &Delete<Tab>x			删除(&D)<Tab>x
-menutrans &Select\ All<Tab>ggVG		全选(&S)<Tab>ggVG
-menutrans &Find\.\.\.			查找(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.	查找和替换(&L)\.\.\.
-menutrans &Find<Tab>/			查找(&F)<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	查找和替换(&L)<Tab>:%s
-menutrans Settings\ &Window		设定窗口(&W)
-menutrans Startup\ &Settings		启动设定(&S)
-menutrans &Global\ Settings		全局设定(&G)
+menutrans &Edit		编辑(&E)
+" Edit menuitems {{{1
+menutrans &Undo<Tab>u						撤销(&U)<Tab>u
+menutrans &Redo<Tab>^R						恢复(&R)<Tab>^R
+menutrans Rep&eat<Tab>\.					重复(&E)<Tab>\.
+menutrans Cu&t<Tab>"+x						剪切(&T)<Tab>"+x
+menutrans &Copy<Tab>"+y						复制(&C)<Tab>"+y
+menutrans &Paste<Tab>"+gP					粘贴(&P)<Tab>"+gP
+menutrans Put\ &Before<Tab>[p				粘贴到光标前(&B)<Tab>[p
+menutrans Put\ &After<Tab>]p				粘贴到光标后(&A)<Tab>]p
+menutrans &Delete<Tab>x						删除(&D)<Tab>x
+menutrans &Select\ All<Tab>ggVG				全选(&S)<Tab>ggVG
+menutrans &Find\.\.\.						查找(&F)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.			查找和替换(&L)\.\.\.
+menutrans &Find<Tab>/						查找(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s		查找和替换(&L)<Tab>:%s
+menutrans Settings\ &Window					设置窗口(&W)
+menutrans Startup\ &Settings				启动设置(&S)
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	开/关模式高亮(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		开/关忽略大小写(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		开/关显示配对(&S)<Tab>:set\ sm!
-menutrans &Context\ lines			上下文行数(&C)
-
-menutrans &Virtual\ Edit			虚拟编辑(&V)
+menutrans &Global\ Settings					全局设置(&G)
+" Edit.Global Settings menuitems and dialogs {{{2
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!		开/关高亮查找内容(&H)<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!				开/关忽略大小写(&I)<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	开/关显示括号匹配(&S)<Tab>:set\ sm!
+menutrans &Context\ Lines									上下文行数(&C)
+menutrans &Virtual\ Edit									虚拟编辑(&V)
+" Edit.Global Settings.Virtual Edit menuitems {{{3
 menutrans Never					从不
-menutrans Block\ Selection			块选择
-menutrans Insert\ mode				插入模式
-menutrans Block\ and\ Insert			块选择和插入模式
-menutrans Always				总是
-
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	开/关插入模式(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	开/关\ Vi\ 兼容<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.			查找路径(&P)\.\.\.
-menutrans Ta&g\ Files\.\.\.			Tag\ 文件(&T)\.\.\.
+menutrans Block\ Selection		只在选定矩形块时
+menutrans Insert\ Mode			只在插入模式时
+menutrans Block\ and\ Insert	在选定矩形块和插入模式时
+menutrans Always				始终
+" }}}
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!				开/关插入模式(&M)<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!			开/关\ Vi\ 兼容性(&O)<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.								搜索路径(&P)\.\.\.
+menutrans Ta&g\ Files\.\.\.									标记文件(Tags)(&G)\.\.\.
 
 " GUI options
-menutrans Toggle\ &Toolbar			开/关工具栏(&T)
-menutrans Toggle\ &Bottom\ Scrollbar		开/关底部滚动条(&B)
-menutrans Toggle\ &Left\ Scrollbar		开/关左端滚动条(&L)
-menutrans Toggle\ &Right\ Scrollbar		开/关右端滚动条(&R)
+menutrans Toggle\ &Toolbar									开/关工具栏(&T)
+menutrans Toggle\ &Bottom\ Scrollbar						开/关底部滚动条(&B)
+menutrans Toggle\ &Left\ Scrollbar							开/关左侧滚动条(&L)
+menutrans Toggle\ &Right\ Scrollbar							开/关右侧滚动条(&R)
 
-" Edit/File Settings
-menutrans F&ile\ Settings			文件设定(&I)
+" fun! s:SearchP()
+if !exists("g:menutrans_path_dialog")
+  let g:menutrans_path_dialog = "输入搜索路径。\n用逗号分隔目录名。"
+endif
+
+" fun! s:TagFiles()
+if !exists("g:menutrans_tags_dialog")
+  let g:menutrans_tags_dialog = "输入标记文件(Tags)名称。\n用逗号分隔文件名。"
+endif
+" }}}
 
+" Edit/File Settings
+menutrans F&ile\ Settings					文件设置(&I)
+" Edit.File Settings menuitems and dialogs {{{2
 " Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!		开/关显示行号(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!	开/关相对行号(&V)<Tab>:set\ rnu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!			开/关\ list\ 模式(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!			开/关折行(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!		开/关整词折行(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!			开/关扩展\ tab(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!			开/关自动缩进(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!			开/关\ C\ 缩进(&C)<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!			开/关行号(&N)<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	开/关相对行号(&V)<Tab>:set\ rnu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!				开/关列表模式(&L)<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!			开/关换行(&W)<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!		开/关词尾换行(&R)<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!				开/关制表符扩展(&E)<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!			开/关自动缩进(&A)<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!		开/关\ C\ 语言式缩进(&C)<Tab>:set\ cin!
 
 " other options
-menutrans &Shiftwidth			缩进宽度(&S)
-menutrans Soft\ &Tabstop		Soft\ Tab\ 宽度(&T)
-menutrans Te&xt\ Width\.\.\.		文本宽度(&X)\.\.\.
-menutrans &File\ Format\.\.\.		文件格式(&F)\.\.\.
-menutrans C&olor\ Scheme		配色方案(&O)
-menutrans Select\ Fo&nt\.\.\.		选择字体(&N)\.\.\.
-menutrans &Keymap			键盘映射(&K)
+menutrans &Shiftwidth										缩进宽度(&S)
+menutrans Soft\ &Tabstop									软制表位宽度(Soft Tabstop)(&T)
+menutrans Te&xt\ Width\.\.\.								文本宽度(&X)\.\.\.
+menutrans &File\ Format\.\.\.								文件格式(&F)\.\.\.
+
+" fun! s:TextWidth()
+if !exists("g:menutrans_textwidth_dialog")
+  let g:menutrans_textwidth_dialog = "输入文本宽度(每行最大字符数，0 表示禁用):"
+endif
+
+" fun! s:FileFormat()
+if !exists("g:menutrans_fileformat_dialog")
+  let g:menutrans_fileformat_dialog = "选择文件的保存格式:"
+endif
+if !exists("g:menutrans_fileformat_choices")
+  let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n取消(&C)"
+endif
+" }}}
+menutrans Show\ C&olor\ Schemes\ in\ Menu	在菜单中显示配色方案(&O)
+menutrans C&olor\ Scheme					配色方案(&O)
+menutrans Show\ &Keymaps\ in\ Menu			在菜单中显示键盘映射(&K)
+menutrans &Keymap							键盘映射(&K)
+menutrans Select\ Fo&nt\.\.\.				选择字体(&N)\.\.\.
+" }}}
 
 " Programming menu
-menutrans &Tools			工具(&T)
-menutrans &Jump\ to\ this\ tag<Tab>g^]	跳转到这个\ tag(&J)<Tab>g^]
-menutrans Jump\ &back<Tab>^T		跳转返回(&B)<Tab>^T
-menutrans Build\ &Tags\ File		建立\ Tags\ 文件(&T)
+menutrans &Tools	工具(&T)
+" Tools menuitems {{{1
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			跳转到这个标记(Tag)(&J)<Tab>g^]
+menutrans Jump\ &Back<Tab>^T					跳转回(&B)<Tab>^T
+menutrans Build\ &Tags\ File					生成标记文件(Tags)(&T)
 
 " Tools.Spelling Menu
-menutrans &Spelling				拼写检查(&S)
-menutrans &Spell\ Check\ On			打开拼写检查(&S)
-menutrans Spell\ Check\ &Off			关闭拼写检查(&O)
-menutrans To\ &Next\ error<Tab>]s		上一个错误(&N)<Tab>]s
-menutrans To\ &Previous\ error<Tab>[s		下一个错误(&P)<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=		修正建议(&C)<Tab>z=
-menutrans &Repeat\ correction<Tab>:spellrepall	重复修正(&R)<Tab>:spellrepall
-menutrans Set\ language\ to\ "en"		设定语言为\ "en"
-menutrans Set\ language\ to\ "en_au"		设定语言为\ "en_au"
-menutrans Set\ language\ to\ "en_ca"		设定语言为\ "en_ca"
-menutrans Set\ language\ to\ "en_gb"		设定语言为\ "en_gb"
-menutrans Set\ language\ to\ "en_nz"		设定语言为\ "en_nz"
-menutrans Set\ language\ to\ "en_us"		设定语言为\ "en_us"
-menutrans &Find\ More\ Languages		查找更多语言(&F)
+menutrans &Spelling								拼写检查(&S)
+" Tools.Spelling menuitems and dialog {{{2
+menutrans &Spell\ Check\ On						打开拼写检查(&S)
+menutrans Spell\ Check\ &Off					关闭拼写检查(&O)
+menutrans To\ &Next\ Error<Tab>]s				上一个错误(&N)<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			下一个错误(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			更正建议(&C)<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall	更正全部同类错误(&R)<Tab>:spellrepall
+menutrans Set\ Language\ to\ "en"				设置语言为\ "en"
+menutrans Set\ Language\ to\ "en_au"			设置语言为\ "en_au"
+menutrans Set\ Language\ to\ "en_ca"			设置语言为\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			设置语言为\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			设置语言为\ "en_nz"
+menutrans Set\ Language\ to\ "en_us"			设置语言为\ "en_us"
+menutrans &Find\ More\ Languages				查找更多语言(&F)
+
+" func! s:SpellLang()
+if !exists("g:menutrans_set_lang_to")
+  let g:menutrans_set_lang_to = "设置语言为"
+endif
+" }}}
 
 " Tools.Fold Menu
+menutrans &Folding								折叠(&F)
+" Tools.Fold menuitems {{{2
 " open close folds
-menutrans &Folding				折叠(&F)
-menutrans &Enable/Disable\ folds<Tab>zi		启用/禁用折叠(&E)<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv		查看此行(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx	仅查看此行(&W)<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm		关闭更多折叠(&L)<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM		关闭所有折叠(&C)<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr		打开更多折叠(&P)<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR		打开所有折叠(&O)<Tab>zR
+menutrans &Enable/Disable\ Folds<Tab>zi			启用/禁用折叠(&E)<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			展开光标所在行(&V)<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	只展开光标所在行(&W)<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			折叠一级(&L)<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM				折叠全部(&C)<Tab>zM
+menutrans O&pen\ More\ Folds<Tab>zr				展开一级(&P)<Tab>zr
+menutrans &Open\ All\ Folds<Tab>zR				展开全部(&O)<Tab>zR
 " fold method
-menutrans Fold\ Met&hod			折叠方法(&H)
-menutrans M&anual			手工(&A)
-menutrans I&ndent			缩进(&N)
-menutrans E&xpression			表达式(&X)
-menutrans S&yntax			语法(&Y)
-menutrans &Diff				比较(Diff)(&D)
-menutrans Ma&rker			标记(&R)
+menutrans Fold\ Met&hod							折叠方式(&H)
+" Tools.Fold.Fold Method menuitems {{{3
+menutrans M&anual		手动(&A)
+menutrans I&ndent		缩进(&N)
+menutrans E&xpression	表达式(&X)
+menutrans S&yntax		语法(&Y)
+menutrans &Diff			差异(Diff)(&D)
+menutrans Ma&rker		记号(Marker)(&R)
+" }}}
 " create and delete folds
-menutrans Create\ &Fold<Tab>zf		创建折叠(&F)<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		删除折叠(&D)<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	删除所有折叠(&A)<Tab>zD
+menutrans Create\ &Fold<Tab>zf					创建折叠(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd					删除折叠(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD			删除全部折叠(&A)<Tab>zD
 " moving around in folds
-menutrans Fold\ column\ &width		折叠栏宽度(&W)
+menutrans Fold\ Col&umn\ Width					折叠操作栏宽度(&W)
+" }}}
 
 " Tools.Diff Menu
-menutrans &Diff				比较(Diff)(&D)
-menutrans &Update			更新(&U)
-menutrans &Get\ Block			得到块(&G)
-menutrans &Put\ Block			放置块(&P)
+menutrans &Diff									差异(Diff)(&D)
+" Tools.Diff menuitems {{{2
+menutrans &Update		刷新(&U)
+menutrans &Get\ Block	采用对侧文本块(&G)
+menutrans &Put\ Block	采用本侧文本块(&P)
+" }}}
 
-menutrans &Make<Tab>:make		Make(&M)<Tab>:make
-menutrans &List\ Errors<Tab>:cl		列出错误(&L)<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!	列出消息(&I)<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn		下一个错误(&N)<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp	上一个错误(&P)<Tab>:cp
-menutrans &Older\ List<Tab>:cold	更旧的错误列表(&O)<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew	更新的错误列表(&E)<Tab>:cnew
-menutrans Error\ &Window		错误窗口(&W)
-menutrans &Update<Tab>:cwin		更新(&U)<Tab>:cwin
+menutrans &Make<Tab>:make						生成(Make)(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl					列出错误(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!				列出消息(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn					下一个错误(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp				上一个错误(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold				较旧的错误列表(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew				较新的错误列表(&E)<Tab>:cnew
+menutrans Error\ &Window						错误窗口(&W)
+" Tools.Error Window menuitems {{{2
+menutrans &Update<Tab>:cwin		刷新(&U)<Tab>:cwin
 menutrans &Open<Tab>:copen		打开(&O)<Tab>:copen
-menutrans &Close<Tab>:cclose		关闭(&C)<Tab>:cclose
-menutrans &Convert\ to\ HEX<Tab>:%!xxd	转换成十六进制<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r	转换返回<Tab>:%!xxd\ -r
-menutrans Se&T\ Compiler		设定编译器(&T)
+menutrans &Close<Tab>:cclose	关闭(&C)<Tab>:cclose
+" }}}
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu	在菜单中显示编译器设置(&T)
+menutrans Se&t\ Compiler						设置编译器(&T)
+menutrans &Convert\ to\ HEX<Tab>:%!xxd			转换成十六进制(&C)<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			转换回(&R)<Tab>:%!xxd\ -r
+" }}}
 
-" Names for buffer menu.
-menutrans &Buffers		缓冲区(&B)
-menutrans &Refresh\ menu	更新菜单(&R)
-menutrans &Delete		删除(&D)
-menutrans &Alternate		交替(&A)
-menutrans &Next			下一个(&N)
-menutrans &Previous		上一个(&P)
+" Buffer menu
+menutrans &Buffers	缓冲区(&B)
+" Buffer menuitems and dialog {{{1
+menutrans &Refresh\ Menu	刷新本菜单(&R)
+menutrans &Delete			删除(&D)
+menutrans &Alternate		切换(&A)
+menutrans &Next				下一个(&N)
+menutrans &Previous			上一个(&P)
+
+" func! s:BMMunge(fname, bnum) 
+if !exists("g:menutrans_no_file")
+  let g:menutrans_no_file = "[无文件]"
+endif
+" }}}
 
 " Window menu
-menutrans &Window			窗口(&W)
-menutrans &New<Tab>^Wn			新建(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws		分割(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^	分割到\ #(&L)<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv	垂直分割(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer	分割文件浏览器(&X)
-menutrans &Close<Tab>^Wc		关闭(&C)<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo	关闭其它窗口(&O)<Tab>^Wo
-menutrans Move\ &To			移动到(&T)
-menutrans &Top<Tab>^WK			顶端(&T)<Tab>^WK
-menutrans &Bottom<Tab>^WJ		底端(&B)<Tab>^WJ
-menutrans &Left\ side<Tab>^WH		左边(&L)<Tab>^WH
-menutrans &Right\ side<Tab>^WL		右边(&R)<Tab>^WL
-" menutrans Ne&xt<Tab>^Ww		下一个(&X)<Tab>^Ww
-" menutrans P&revious<Tab>^WW		上一个(&R)<Tab>^WW
-menutrans Rotate\ &Up<Tab>^WR		向上轮换(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr		向下轮换(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W=		等大(&E)<Tab>^W=
-menutrans &Max\ Height<Tab>^W_		最大高度(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_		最小高度(&I)<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|		最大宽度(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|		最小宽度(&H)<Tab>^W1\|
-"
-" The popup menu
-menutrans &Undo			撤销(&U)
-menutrans Cu&t			剪切(&T)
-menutrans &Copy			复制(&C)
-menutrans &Paste		粘贴(&P)
-menutrans &Delete		删除(&D)
-menutrans Select\ Blockwise	选择块
-menutrans Select\ &Word		选择单词(&W)
-menutrans Select\ &Sentence	选择句子(&S)
-menutrans Select\ Pa&ragraph	选择段落(&R)
-menutrans Select\ &Line		选择行(&L)
-menutrans Select\ &Block	选择块(&B)
-menutrans Select\ &All		全选(&A)
-"
-" The GUI toolbar
+menutrans &Window	窗口(&W)
+" Window menuitems {{{1
+menutrans &New<Tab>^Wn					新建(&N)<Tab>^Wn
+menutrans S&plit<Tab>^Ws				拆分(&P)<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^		拆分并显示缓冲区\ #(&L)<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv	垂直拆分(&V)<Tab>^Wv
+menutrans Split\ File\ E&xplorer		拆分并打开文件浏览器(&X)
+menutrans &Close<Tab>^Wc				关闭(&C)<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo		除此之外全部关闭(&O)<Tab>^Wo
+menutrans Move\ &To						移动到(&T)
+menutrans &Top<Tab>^WK					顶端(&T)<Tab>^WK
+menutrans &Bottom<Tab>^WJ				底端(&B)<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH			左边(&L)<Tab>^WH
+menutrans &Right\ Side<Tab>^WL			右边(&R)<Tab>^WL
+menutrans Rotate\ &Up<Tab>^WR			向上轮换(&U)<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr			向下轮换(&D)<Tab>^Wr
+menutrans &Equal\ Size<Tab>^W=			平均分布(&E)<Tab>^W=
+menutrans &Max\ Height<Tab>^W_			最大高度(&M)<Tab>^W
+menutrans M&in\ Height<Tab>^W1_			最小高度(&I)<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|			最大宽度(&W)<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|			最小宽度(&H)<Tab>^W1\|
+" }}}
+
+" The popup menu {{{1
+menutrans &Undo					撤销(&U)
+menutrans Cu&t					剪切(&T)
+menutrans &Copy					复制(&C)
+menutrans &Paste				粘贴(&P)
+menutrans &Delete				删除(&D)
+menutrans Select\ Blockwise		改为选定矩形块
+menutrans Select\ &Word			选定单词(&W)
+menutrans Select\ &Sentence		选定句(&S)
+menutrans Select\ Pa&ragraph	选定段落(&R)
+menutrans Select\ &Line			选定行(&L)
+menutrans Select\ &Block		选定矩形块(&B)
+menutrans Select\ &All			全选(&A)
+
+" func! <SID>SpellPopup()
+if !exists("g:menutrans_spell_change_ARG_to")
+  let g:menutrans_spell_change_ARG_to = '将\ "%s"\ 更改为'
+endif
+if !exists("g:menutrans_spell_add_ARG_to_word_list")
+  let g:menutrans_spell_add_ARG_to_word_list = '将\ "%s"\ 添加到词典'
+endif
+if !exists("g:menutrans_spell_ignore_ARG")
+  let g:menutrans_spell_ignore_ARG = '忽略\ "%s"'
+endif
+" }}}
+
+" The GUI toolbar {{{1
 if has("toolbar")
   if exists("*Do_toolbar_tmenu")
     delfun Do_toolbar_tmenu
   endif
   fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open		打开文件
-    tmenu ToolBar.Save		保存当前文件
-    tmenu ToolBar.SaveAll	保存全部文件
-    tmenu ToolBar.Print		打印
-    tmenu ToolBar.Undo		撤销
-    tmenu ToolBar.Redo		重做
-    tmenu ToolBar.Cut		剪切到剪贴板
-    tmenu ToolBar.Copy		复制到剪贴板
-    tmenu ToolBar.Paste		从剪贴板粘贴
-    tmenu ToolBar.Find		查找...
-    tmenu ToolBar.FindNext	查找下一个
-    tmenu ToolBar.FindPrev	查找上一个
-    tmenu ToolBar.Replace	查找和替换...
-    tmenu ToolBar.LoadSesn	加载会话
-    tmenu ToolBar.SaveSesn	保存当前会话
-    tmenu ToolBar.RunScript	运行 Vim 脚本
-    tmenu ToolBar.Make		执行 Make (:make)
-    tmenu ToolBar.RunCtags	在当前目录建立 tags (!ctags -R .)
-    tmenu ToolBar.TagJump	跳转到光标位置的 tag
-    tmenu ToolBar.Help		Vim 帮助
-    tmenu ToolBar.FindHelp	查找 Vim 帮助
+    let did_toolbar_tmenu = 1
+    tmenu ToolBar.Open			打开文件
+    tmenu ToolBar.Save			保存当前文件
+    tmenu ToolBar.SaveAll		全部保存
+    tmenu ToolBar.Print			打印
+    tmenu ToolBar.Undo			撤销
+    tmenu ToolBar.Redo			恢复
+    tmenu ToolBar.Cut			剪切到剪贴板
+    tmenu ToolBar.Copy			复制到剪贴板
+    tmenu ToolBar.Paste			从剪贴板粘贴
+    if !has("gui_athena")
+      tmenu ToolBar.Replace		查找和替换...
+      tmenu ToolBar.FindNext	查找下一个
+      tmenu ToolBar.FindPrev	查找上一个
+    endif
+    tmenu ToolBar.LoadSesn		加载会话
+    tmenu ToolBar.SaveSesn		保存当前会话
+    tmenu ToolBar.RunScript		运行 Vim 脚本
+    tmenu ToolBar.Make			生成当前项目 (:make)
+    tmenu ToolBar.RunCtags		在当前目录生成标记(Tags) (!ctags -R .)
+    tmenu ToolBar.TagJump		跳转到光标所在标记(Tag)
+    tmenu ToolBar.Help			Vim 帮助
+    tmenu ToolBar.FindHelp		在 Vim 帮助中查找
   endfun
 endif
+" }}}
 
 " Syntax menu
-menutrans &Syntax			语法(&S)
-menutrans &Show\ filetypes\ in\ menu	在菜单中显示文件类型(&S)
-menutrans &Off				关闭(&O)
-menutrans &Manual			手工(&M)
-menutrans A&utomatic			自动(&U)
-menutrans on/off\ for\ &This\ file	仅对这个文件开/关(&T)
-menutrans Co&lor\ test			色彩测试(&L)
-menutrans &Highlight\ test		高亮测试(&H)
-menutrans &Convert\ to\ HTML		转换成\ HTML(&C)
-menutrans Set\ '&syntax'\ only		仅设定\ 'syntax'(&S)
-menutrans Set\ '&filetype'\ too		也设定\ 'filetype'(&F)
+menutrans &Syntax	语法(&S)
+" Syntax menuitems {{{1
+menutrans &Show\ File\ Types\ in\ Menu	在菜单中显示文件类型(&S)
+menutrans &Off							关闭(&O)
+menutrans &Manual						手动(&M)
+menutrans A&utomatic					自动(&U)
+menutrans On/Off\ for\ &This\ File		只对这个文件开/关(&T)
+menutrans Co&lor\ Test					色彩测试(&L)
+menutrans &Highlight\ Test				高亮测试(&H)
+menutrans &Convert\ to\ HTML			转换成\ HTML(&C)
+" From synmenu.vim
+menutrans Set\ '&syntax'\ Only			只设置\ 'syntax'(&S)
+menutrans Set\ '&filetype'\ Too			也设置\ 'filetype'(&F)
+" }}}
+
+" Netrw menu {{{1
+" Plugin loading may be after menu translation
+" So giveup testing if Netrw Plugin is loaded
+" if exists("g:loaded_netrwPlugin")
+  menutrans Help<tab><F1>					帮助<tab><F1>
+  menutrans Bookmarks						书签
+  menutrans History							历史记录
+  menutrans Go\ Up\ Directory<tab>-			向上一级<tab>-
+  menutrans Apply\ Special\ Viewer<tab>x	用默认程序打开<tab>x
+  menutrans Bookmarks\ and\ History			书签和历史记录
+  " Netrw.Bookmarks and History menuitems {{{2
+  menutrans Bookmark\ Current\ Directory<tab>mb		添加书签<tab>mb
+  menutrans Bookmark\ Delete						移除书签
+  menutrans Goto\ Prev\ Dir\ (History)<tab>u		后退(历史记录)<tab>u
+  menutrans Goto\ Next\ Dir\ (History)<tab>U		前进(历史记录)<tab>U
+  menutrans List<tab>qb								完整列表<tab>qb
+  " }}}
+  menutrans Browsing\ Control				控制
+  " Netrw.Browsing Control menuitems {{{2
+  menutrans Horizontal\ Split<tab>o					在拆分窗口打开<tab>o
+  menutrans Vertical\ Split<tab>v					在垂直拆分窗口打开<tab>v
+  menutrans New\ Tab<tab>t							在标签页打开<tab>t	
+  menutrans Preview<tab>p							预览<tab>p
+  menutrans Edit\ File\ Hiding\ List<tab><ctrl-h>	编辑隐藏条件(Hiding\ List)<tab><ctrl-h>
+  menutrans Edit\ Sorting\ Sequence<tab>S			编辑排序条件(Sorting\ Sequence)<tab>S
+  menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh	快速隐藏/显示以\.开头的文件<tab>gh
+  menutrans Refresh\ Listing<tab><ctrl-l>			刷新<tab><ctrl-l>
+  menutrans Settings/Options<tab>:NetrwSettings		设置/选项<tab>:NetrwSettings
+  " }}}
+  menutrans Delete\ File/Directory<tab>D	删除文件/目录<tab>D
+  menutrans Edit\ File/Dir					编辑文件/目录
+  " Netrw.Edit File menuitems {{{2
+  menutrans Create\ New\ File<tab>%				新建文件<tab>%
+  menutrans In\ Current\ Window<tab><cr>		在当前窗口<tab><cr>
+  menutrans Preview\ File/Directory<tab>p		预览文件/目录<tab>p
+  menutrans In\ Previous\ Window<tab>P			在上一个窗口<tab>P
+  menutrans In\ New\ Window<tab>o				在新窗口<tab>o
+  menutrans In\ New\ Tab<tab>t					在新标签页<tab>t
+  menutrans In\ New\ Vertical\ Window<tab>v		在新垂直窗口<tab>v
+  " }}}
+  menutrans Explore							浏览
+  " Netrw.Explore menuitems {{{2
+  menutrans Directory\ Name															指定目录名
+  menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */			匹配指定文件名模式(当前目录)<tab>:Explore\ */
+  menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/				匹配指定文件名模式(含子目录)<tab>:Explore\ **/
+  menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *//	内容包含指定字符串模式(当前目录)<tab>:Explore\ *//
+  menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **//		内容包含指定字符串模式(含子目录)<tab>:Explore\ **//
+  menutrans Next\ Match<tab>:Nexplore												下一个匹配项<tab>:Nexplore
+  menutrans Prev\ Match<tab>:Pexplore												上一个匹配项<tab>:Pexplore
+  " }}}
+  menutrans Make\ Subdirectory<tab>d		新建子目录<tab>d
+  menutrans Marked\ Files					选定的(Marked)文件
+  " Netrw.Marked Files menuitems {{{2
+  menutrans Mark\ File<tab>mf						选定(Mark)/取消<tab>mf
+  menutrans Mark\ Files\ by\ Regexp<tab>mr			用正则表达式(Regexp)选定<tab>mr
+  menutrans Hide-Show-List\ Control<tab>a			隐藏/显示<tab>a
+  menutrans Copy\ To\ Target<tab>mc					复制到目标<tab>mc
+  menutrans Delete<tab>D							删除<tab>D
+  menutrans Diff<tab>md								差异(Diff)<tab>md
+  menutrans Edit<tab>me								编辑<tab>me
+  menutrans Exe\ Cmd<tab>mx							作为参数运行命令<tab>mx
+  menutrans Move\ To\ Target<tab>mm					移动到目标<tab>mm
+  menutrans Obtain<tab>O							获取<tab>O
+  menutrans Print<tab>mp							打印<tab>mp
+  menutrans Replace<tab>R							替换<tab>R
+  menutrans Set\ Target<tab>mt						设置目标<tab>mt
+  menutrans Tag<tab>mT								生成标记文件(Tags)<tab>mT
+  menutrans Zip/Unzip/Compress/Uncompress<tab>mz	压缩/解压缩<tab>mz
+  " }}}
+  menutrans Obtain\ File<tab>O				获取文件<tab>O
+  menutrans Style							显示风格
+  " Netrw.Style menuitems {{{2
+  menutrans Listing							列表形式
+  " Netrw.Style.Listing menuitems {{{3
+  menutrans thin<tab>i	紧凑<thin)<tab>i
+  menutrans long<tab>i	详细(long)<tab>i
+  menutrans wide<tab>i	多列(wide)<tab>i
+  menutrans tree<tab>i	树状(tree)<tab>i
+  " }}}
+  menutrans Normal-Hide-Show				显示/隐藏
+  " Netrw.Style.Normal-Hide_show menuitems {{{3
+  menutrans Show\ All<tab>a		显示全部
+  menutrans Normal<tab>a		不显示隐藏文件
+  menutrans Hidden\ Only<tab>a	只显示隐藏文件
+  " }}}
+  menutrans Reverse\ Sorting\ Order<tab>r	升序/降序<tab>r
+  menutrans Sorting\ Method					排序方式
+  " Netrw.Style.Sorting Method menuitems {{{3
+  menutrans Name<tab>s		文件名<tab>s
+  menutrans Time<tab>s  	修改时间<tab>s
+  menutrans Size<tab>s  	大小<tab>s
+  menutrans Exten<tab>s		扩展名<tab>s
+  " }}}
+  " }}}
+  menutrans Rename\ File/Directory<tab>R	重命名文件/目录<tab>R
+  menutrans Set\ Current\ Directory<tab>c	设置\ Vim\ 工作目录<tab>c
+  menutrans Targets							目标
+" endif
+" }}}
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+
+" vim: set nu ts=4 sw=4 noet fdm=marker fdc=4 :
diff --git a/runtime/lang/menu_zh_cn.gb2312.vim b/runtime/lang/menu_zh_cn.gb2312.vim
index 0df51885f..f0d7ccabf 100644
--- a/runtime/lang/menu_zh_cn.gb2312.vim
+++ b/runtime/lang/menu_zh_cn.gb2312.vim
@@ -1,273 +1,13 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2014 Oct 15
-
-" vim: ts=8 sw=8 noet
-
-" Quit when menu translations have already been done.
-if exists("did_menu_trans")
-  finish
-endif
-let did_menu_trans = 1
-let s:keepcpo= &cpo
-set cpo&vim
+" Last Change:          2019-09-09
 
 " This causes trouble for a broken iconv (symptom: last character is always
 " ??).  Without this it works fine anyway, because gbk/cp936 is a superset of
 " gb2312. (suggested by Edward L. Fox)
 " scriptencoding gb2312
 
-" Help menu
-menutrans &Help			帮助(&H)
-menutrans &Overview<Tab><F1>	纵览(&O)<Tab><F1>
-menutrans &User\ Manual		用户手册(&U)
-menutrans &How-to\ links	How-to\ 指引(&H)
-menutrans &Find\.\.\.		查找(&F)\.\.\.
-menutrans &Credits		致谢(&C)
-menutrans Co&pying		版权(&P)
-menutrans &Sponsor/Register	赞助/注册(&S)
-menutrans O&rphans		孤儿(&R)
-menutrans &Version		版本(&V)
-menutrans &About		关于(&A)
-
-" File menu
-menutrans &File				文件(&F)
-menutrans &Open\.\.\.<Tab>:e		打开(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	分割并打开(&L)\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	打开标签\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		新建(&N)<Tab>:enew
-menutrans &Close<Tab>:close		关闭(&C)<Tab>:close
-menutrans &Save<Tab>:w			保存(&S)<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	另存为(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\.	分割比较(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	分割打补丁(Patch)(&B)\.\.\.
-menutrans &Print			打印(&P)
-menutrans Sa&ve-Exit<Tab>:wqa		保存并退出(&V)<Tab>:wqa
-menutrans E&xit<Tab>:qa			退出(&X)<Tab>:qa
-
-" Edit menu
-menutrans &Edit				编辑(&E)
-menutrans &Undo<Tab>u			撤销(&U)<Tab>u
-menutrans &Redo<Tab>^R			重做(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.		重复上次操作(&E)<Tab>\.
-menutrans Cu&t<Tab>"+x			剪切(&T)<Tab>"+x
-menutrans &Copy<Tab>"+y			复制(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP		粘贴(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		粘贴到光标前(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p		粘贴到光标后(&A)<Tab>]p
-menutrans &Delete<Tab>x			删除(&D)<Tab>x
-menutrans &Select\ All<Tab>ggVG		全选(&S)<Tab>ggVG
-menutrans &Find\.\.\.			查找(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.	查找和替换(&L)\.\.\.
-menutrans &Find<Tab>/			查找(&F)<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	查找和替换(&L)<Tab>:%s
-menutrans Settings\ &Window		设定窗口(&W)
-menutrans Startup\ &Settings		启动设定(&S)
-menutrans &Global\ Settings		全局设定(&G)
-
-" Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	开/关模式高亮(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		开/关忽略大小写(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		开/关显示配对(&S)<Tab>:set\ sm!
-menutrans &Context\ lines			上下文行数(&C)
-
-menutrans &Virtual\ Edit			虚拟编辑(&V)
-menutrans Never					从不
-menutrans Block\ Selection			块选择
-menutrans Insert\ mode				插入模式
-menutrans Block\ and\ Insert			块选择和插入模式
-menutrans Always				总是
-
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	开/关插入模式(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	开/关\ Vi\ 兼容<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.			查找路径(&P)\.\.\.
-menutrans Ta&g\ Files\.\.\.			Tag\ 文件(&T)\.\.\.
-
-" GUI options
-menutrans Toggle\ &Toolbar			开/关工具栏(&T)
-menutrans Toggle\ &Bottom\ Scrollbar		开/关底部滚动条(&B)
-menutrans Toggle\ &Left\ Scrollbar		开/关左端滚动条(&L)
-menutrans Toggle\ &Right\ Scrollbar		开/关右端滚动条(&R)
-
-" Edit/File Settings
-menutrans F&ile\ Settings			文件设定(&I)
-
-" Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	开/关显示行号(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu! 开/关相对行号(&V)<Tab>:set\ rnu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		开/关\ list\ 模式(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		开/关折行(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	开/关整词折行(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		开/关扩展\ tab(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		开/关自动缩进(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		开/关\ C\ 缩进(&C)<Tab>:set\ cin!
-
-" other options
-menutrans &Shiftwidth			缩进宽度(&S)
-menutrans Soft\ &Tabstop		Soft\ Tab\ 宽度(&T)
-menutrans Te&xt\ Width\.\.\.		文本宽度(&X)\.\.\.
-menutrans &File\ Format\.\.\.		文件格式(&F)\.\.\.
-menutrans C&olor\ Scheme		配色方案(&O)
-menutrans Select\ Fo&nt\.\.\.		选择字体(&N)\.\.\.
-menutrans &Keymap			键盘映射(&K)
-
-" Programming menu
-menutrans &Tools			工具(&T)
-menutrans &Jump\ to\ this\ tag<Tab>g^]	跳转到这个\ tag(&J)<Tab>g^]
-menutrans Jump\ &back<Tab>^T		跳转返回(&B)<Tab>^T
-menutrans Build\ &Tags\ File		建立\ Tags\ 文件(&T)
-
-" Tools.Spelling Menu
-menutrans &Spelling				拼写检查(&S)
-menutrans &Spell\ Check\ On			打开拼写检查(&S)
-menutrans Spell\ Check\ &Off			关闭拼写检查(&O)
-menutrans To\ &Next\ error<Tab>]s		上一个错误(&N)<Tab>]s
-menutrans To\ &Previous\ error<Tab>[s		下一个错误(&P)<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=		修正建议(&C)<Tab>z=
-menutrans &Repeat\ correction<Tab>:spellrepall	重复修正(&R)<Tab>:spellrepall
-menutrans Set\ language\ to\ "en"		设定语言为\ "en"
-menutrans Set\ language\ to\ "en_au"		设定语言为\ "en_au"
-menutrans Set\ language\ to\ "en_ca"		设定语言为\ "en_ca"
-menutrans Set\ language\ to\ "en_gb"		设定语言为\ "en_gb"
-menutrans Set\ language\ to\ "en_nz"		设定语言为\ "en_nz"
-menutrans Set\ language\ to\ "en_us"		设定语言为\ "en_us"
-menutrans &Find\ More\ Languages		查找更多语言(&F)
-
-" Tools.Fold Menu
-" open close folds
-menutrans &Folding				折叠(&F)
-menutrans &Enable/Disable\ folds<Tab>zi		启用/禁用折叠(&E)<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv		查看此行(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx	仅查看此行(&W)<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm		关闭更多折叠(&L)<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM		关闭所有折叠(&C)<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr		打开更多折叠(&P)<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR		打开所有折叠(&O)<Tab>zR
-" fold method
-menutrans Fold\ Met&hod			折叠方法(&H)
-menutrans M&anual			手工(&A)
-menutrans I&ndent			缩进(&N)
-menutrans E&xpression			表达式(&X)
-menutrans S&yntax			语法(&Y)
-menutrans &Diff				比较(Diff)(&D)
-menutrans Ma&rker			标记(&R)
-" create and delete folds
-menutrans Create\ &Fold<Tab>zf		创建折叠(&F)<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		删除折叠(&D)<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	删除所有折叠(&A)<Tab>zD
-" moving around in folds
-menutrans Fold\ column\ &width		折叠栏宽度(&W)
-
-" Tools.Diff Menu
-menutrans &Diff				比较(Diff)(&D)
-menutrans &Update			更新(&U)
-menutrans &Get\ Block			得到块(&G)
-menutrans &Put\ Block			放置块(&P)
-
-menutrans &Make<Tab>:make		Make(&M)<Tab>:make
-menutrans &List\ Errors<Tab>:cl		列出错误(&L)<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!	列出消息(&I)<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn		下一个错误(&N)<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp	上一个错误(&P)<Tab>:cp
-menutrans &Older\ List<Tab>:cold	更旧的错误列表(&O)<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew	更新的错误列表(&E)<Tab>:cnew
-menutrans Error\ &Window		错误窗口(&W)
-menutrans &Update<Tab>:cwin		更新(&U)<Tab>:cwin
-menutrans &Open<Tab>:copen		打开(&O)<Tab>:copen
-menutrans &Close<Tab>:cclose		关闭(&C)<Tab>:cclose
-menutrans &Convert\ to\ HEX<Tab>:%!xxd	转换成十六进制<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r	转换返回<Tab>:%!xxd\ -r
-menutrans Se&T\ Compiler		设定编译器(&T)
-
-" Names for buffer menu.
-menutrans &Buffers		缓冲区(&B)
-menutrans &Refresh\ menu	更新菜单(&R)
-menutrans &Delete		删除(&D)
-menutrans &Alternate		交替(&A)
-menutrans &Next			下一个(&N)
-menutrans &Previous		上一个(&P)
-
-" Window menu
-menutrans &Window			窗口(&W)
-menutrans &New<Tab>^Wn			新建(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws		分割(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^	分割到\ #(&L)<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv	垂直分割(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer	分割文件浏览器(&X)
-menutrans &Close<Tab>^Wc		关闭(&C)<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo	关闭其它窗口(&O)<Tab>^Wo
-menutrans Move\ &To			移动到(&T)
-menutrans &Top<Tab>^WK			顶端(&T)<Tab>^WK
-menutrans &Bottom<Tab>^WJ		底端(&B)<Tab>^WJ
-menutrans &Left\ side<Tab>^WH		左边(&L)<Tab>^WH
-menutrans &Right\ side<Tab>^WL		右边(&R)<Tab>^WL
-" menutrans Ne&xt<Tab>^Ww		下一个(&X)<Tab>^Ww
-" menutrans P&revious<Tab>^WW		上一个(&R)<Tab>^WW
-menutrans Rotate\ &Up<Tab>^WR		向上轮换(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr		向下轮换(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W=		等大(&E)<Tab>^W=
-menutrans &Max\ Height<Tab>^W_		最大高度(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_		最小高度(&I)<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|		最大宽度(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|		最小宽度(&H)<Tab>^W1\|
-"
-" The popup menu
-menutrans &Undo			撤销(&U)
-menutrans Cu&t			剪切(&T)
-menutrans &Copy			复制(&C)
-menutrans &Paste		粘贴(&P)
-menutrans &Delete		删除(&D)
-menutrans Select\ Blockwise	选择块
-menutrans Select\ &Word		选择单词(&W)
-menutrans Select\ &Sentence	选择句子(&S)
-menutrans Select\ Pa&ragraph	选择段落(&R)
-menutrans Select\ &Line		选择行(&L)
-menutrans Select\ &Block	选择块(&B)
-menutrans Select\ &All		全选(&A)
-"
-" The GUI toolbar
-if has("toolbar")
-  if exists("*Do_toolbar_tmenu")
-    delfun Do_toolbar_tmenu
-  endif
-  fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open		打开文件
-    tmenu ToolBar.Save		保存当前文件
-    tmenu ToolBar.SaveAll	保存全部文件
-    tmenu ToolBar.Print		打印
-    tmenu ToolBar.Undo		撤销
-    tmenu ToolBar.Redo		重做
-    tmenu ToolBar.Cut		剪切到剪贴板
-    tmenu ToolBar.Copy		复制到剪贴板
-    tmenu ToolBar.Paste		从剪贴板粘贴
-    tmenu ToolBar.Find		查找...
-    tmenu ToolBar.FindNext	查找下一个
-    tmenu ToolBar.FindPrev	查找上一个
-    tmenu ToolBar.Replace	查找和替换...
-    tmenu ToolBar.LoadSesn	加载会话
-    tmenu ToolBar.SaveSesn	保存当前会话
-    tmenu ToolBar.RunScript	运行 Vim 脚本
-    tmenu ToolBar.Make		执行 Make (:make)
-    tmenu ToolBar.RunCtags	在当前目录建立 tags (!ctags -R .)
-    tmenu ToolBar.TagJump	跳转到光标位置的 tag
-    tmenu ToolBar.Help		Vim 帮助
-    tmenu ToolBar.FindHelp	查找 Vim 帮助
-  endfun
-endif
-
-" Syntax menu
-menutrans &Syntax			语法(&S)
-menutrans &Show\ filetypes\ in\ menu	在菜单中显示文件类型(&S)
-menutrans &Off				关闭(&O)
-menutrans &Manual			手工(&M)
-menutrans A&utomatic			自动(&U)
-menutrans on/off\ for\ &This\ file	仅对这个文件开/关(&T)
-menutrans Co&lor\ test			色彩测试(&L)
-menutrans &Highlight\ test		高亮测试(&H)
-menutrans &Convert\ to\ HTML		转换成\ HTML(&C)
-menutrans Set\ '&syntax'\ only		仅设定\ 'syntax'(&S)
-menutrans Set\ '&filetype'\ too		也设定\ 'filetype'(&F)
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
+" As mentioned above, gbk/cp936 is a superset of (and backward compatible with)
+" gb2312, then source the translation encoded in cp936 should be ok. -- Shun
+source <sfile>:p:h/menu_zh_cn.cp936.vim
diff --git a/runtime/lang/menu_zh_cn.utf-8.vim b/runtime/lang/menu_zh_cn.utf-8.vim
index cb1288f63..c8e2eb382 100644
--- a/runtime/lang/menu_zh_cn.utf-8.vim
+++ b/runtime/lang/menu_zh_cn.utf-8.vim
@@ -1,270 +1,452 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2014 Oct 15
-
-" vim: ts=8 sw=8 noet
+" Last Change:          2019 Sep 11
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
   finish
 endif
 let did_menu_trans = 1
-let s:keepcpo= &cpo
+let s:keepcpo = &cpo
 set cpo&vim
 
 scriptencoding utf-8
 
 " Help menu
-menutrans &Help			甯姪(&H)
-menutrans &Overview<Tab><F1>	绾佃(&O)<Tab><F1>
-menutrans &User\ Manual		鐢ㄦ埛鎵嬪唽(&U)
-menutrans &How-to\ links	How-to\ 鎸囧紩(&H)
-menutrans &Find\.\.\.		鏌ユ壘(&F)\.\.\.
-menutrans &Credits		鑷磋阿(&C)
-menutrans Co&pying		鐗堟潈(&P)
-menutrans &Sponsor/Register	璧炲姪/娉ㄥ唽(&S)
-menutrans O&rphans		瀛ゅ効(&R)
-menutrans &Version		鐗堟湰(&V)
-menutrans &About		鍏充簬(&A)
+menutrans &Help		甯姪(&H)
+" Help menuitems and dialog {{{1
+menutrans &Overview<Tab><F1>	姒傝堪(&O)<Tab><F1>
+menutrans &User\ Manual			鐢ㄦ埛鎵嬪唽(&U)
+menutrans &How-to\ Links		濡備綍浣跨敤(&H)
+menutrans &Find\.\.\.			鏌ユ壘(&F)\.\.\.
+menutrans &Credits				鑷磋阿(&C)
+menutrans Co&pying				鐗堟潈(&P)
+menutrans &Sponsor/Register		璧炲姪/娉ㄥ唽(&S)
+menutrans O&rphans				鎷晳瀛ゅ効(&R)
+menutrans &Version				鐗堟湰(&V)
+menutrans &About				鍏充簬(&A)
+
+" fun! s:Helpfind()
+if !exists("g:menutrans_help_dialog")
+  let g:menutrans_help_dialog = "杈撳叆鍛戒护鎴栧崟璇嶄互鑾峰緱甯姪:\n\n鍓嶇紑 i_ 琛ㄧず杈撳叆妯″紡涓嬬殑鍛戒护(濡�: i_CTRL-X)\n鍓嶇紑 c_ 琛ㄧず鍛戒护琛屼笅鐨勭紪杈戝懡浠�(濡�: c_<Del>)\n鍓嶇紑 ' 琛ㄧず閫夐」鍚�(濡�: 'shiftwidth')"
+endif
+" }}}
 
 " File menu
-menutrans &File				鏂囦欢(&F)
-menutrans &Open\.\.\.<Tab>:e		鎵撳紑(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	鍒嗗壊骞舵墦寮�(&L)\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	鎵撳紑鏍囩\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		鏂板缓(&N)<Tab>:enew
-menutrans &Close<Tab>:close		鍏抽棴(&C)<Tab>:close
-menutrans &Save<Tab>:w			淇濆瓨(&S)<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	鍙﹀瓨涓�(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\.	鍒嗗壊姣旇緝(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	鍒嗗壊鎵撹ˉ涓�(Patch)(&B)\.\.\.
-menutrans &Print			鎵撳嵃(&P)
-menutrans Sa&ve-Exit<Tab>:wqa		淇濆瓨骞堕��鍑�(&V)<Tab>:wqa
-menutrans E&xit<Tab>:qa			閫�鍑�(&X)<Tab>:qa
+menutrans &File		鏂囦欢(&F)
+" File menuitems {{{1
+menutrans &Open\.\.\.<Tab>:e			鎵撳紑(&O)\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp		鍦ㄦ媶鍒嗙獥鍙ｆ墦寮�(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	鍦ㄦ爣绛鹃〉鎵撳紑\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew				鏂板缓(&N)<Tab>:enew
+menutrans &Close<Tab>:close				鍏抽棴(&C)<Tab>:close
+menutrans &Save<Tab>:w					淇濆瓨(&S)<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav		鍙﹀瓨涓�(&A)\.\.\.<Tab>:sav
+menutrans Split\ &Diff\ With\.\.\.		鎷嗗垎绐楀彛浠ュ姣斿樊寮�(Diff)(&D)\.\.\.
+menutrans Split\ Patched\ &By\.\.\.		鎷嗗垎绐楀彛浠ヨ繘琛屼慨琛�(Patch)(&B)\.\.\.
+menutrans &Print						鎵撳嵃(&P)
+menutrans Sa&ve-Exit<Tab>:wqa			淇濆瓨骞堕��鍑�(&V)<Tab>:wqa
+menutrans E&xit<Tab>:qa					閫�鍑�(&X)<Tab>:qa
+" }}}
 
 " Edit menu
-menutrans &Edit				缂栬緫(&E)
-menutrans &Undo<Tab>u			鎾ら攢(&U)<Tab>u
-menutrans &Redo<Tab>^R			閲嶅仛(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.		閲嶅涓婃鎿嶄綔(&E)<Tab>\.
-menutrans Cu&t<Tab>"+x			鍓垏(&T)<Tab>"+x
-menutrans &Copy<Tab>"+y			澶嶅埗(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP		绮樿创(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		绮樿创鍒板厜鏍囧墠(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p		绮樿创鍒板厜鏍囧悗(&A)<Tab>]p
-menutrans &Delete<Tab>x			鍒犻櫎(&D)<Tab>x
-menutrans &Select\ All<Tab>ggVG		鍏ㄩ��(&S)<Tab>ggVG
-menutrans &Find\.\.\.			鏌ユ壘(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.	鏌ユ壘鍜屾浛鎹�(&L)\.\.\.
-menutrans &Find<Tab>/			鏌ユ壘(&F)<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	鏌ユ壘鍜屾浛鎹�(&L)<Tab>:%s
-menutrans Settings\ &Window		璁惧畾绐楀彛(&W)
-menutrans Startup\ &Settings		鍚姩璁惧畾(&S)
-menutrans &Global\ Settings		鍏ㄥ眬璁惧畾(&G)
+menutrans &Edit		缂栬緫(&E)
+" Edit menuitems {{{1
+menutrans &Undo<Tab>u						鎾ら攢(&U)<Tab>u
+menutrans &Redo<Tab>^R						鎭㈠(&R)<Tab>^R
+menutrans Rep&eat<Tab>\.					閲嶅(&E)<Tab>\.
+menutrans Cu&t<Tab>"+x						鍓垏(&T)<Tab>"+x
+menutrans &Copy<Tab>"+y						澶嶅埗(&C)<Tab>"+y
+menutrans &Paste<Tab>"+gP					绮樿创(&P)<Tab>"+gP
+menutrans Put\ &Before<Tab>[p				绮樿创鍒板厜鏍囧墠(&B)<Tab>[p
+menutrans Put\ &After<Tab>]p				绮樿创鍒板厜鏍囧悗(&A)<Tab>]p
+menutrans &Delete<Tab>x						鍒犻櫎(&D)<Tab>x
+menutrans &Select\ All<Tab>ggVG				鍏ㄩ��(&S)<Tab>ggVG
+menutrans &Find\.\.\.						鏌ユ壘(&F)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.			鏌ユ壘鍜屾浛鎹�(&L)\.\.\.
+menutrans &Find<Tab>/						鏌ユ壘(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s		鏌ユ壘鍜屾浛鎹�(&L)<Tab>:%s
+menutrans Settings\ &Window					璁剧疆绐楀彛(&W)
+menutrans Startup\ &Settings				鍚姩璁剧疆(&S)
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	寮�/鍏虫ā寮忛珮浜�(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		寮�/鍏冲拷鐣ュぇ灏忓啓(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		寮�/鍏虫樉绀洪厤瀵�(&S)<Tab>:set\ sm!
-menutrans &Context\ lines			涓婁笅鏂囪鏁�(&C)
-
-menutrans &Virtual\ Edit			铏氭嫙缂栬緫(&V)
+menutrans &Global\ Settings					鍏ㄥ眬璁剧疆(&G)
+" Edit.Global Settings menuitems and dialogs {{{2
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!		寮�/鍏抽珮浜煡鎵惧唴瀹�(&H)<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!				寮�/鍏冲拷鐣ュぇ灏忓啓(&I)<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	寮�/鍏虫樉绀烘嫭鍙峰尮閰�(&S)<Tab>:set\ sm!
+menutrans &Context\ Lines									涓婁笅鏂囪鏁�(&C)
+menutrans &Virtual\ Edit									铏氭嫙缂栬緫(&V)
+" Edit.Global Settings.Virtual Edit menuitems {{{3
 menutrans Never					浠庝笉
-menutrans Block\ Selection			鍧楅�夋嫨
-menutrans Insert\ mode				鎻掑叆妯″紡
-menutrans Block\ and\ Insert			鍧楅�夋嫨鍜屾彃鍏ユā寮�
-menutrans Always				鎬绘槸
-
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	寮�/鍏虫彃鍏ユā寮�(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	寮�/鍏砛 Vi\ 鍏煎<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.			鏌ユ壘璺緞(&P)\.\.\.
-menutrans Ta&g\ Files\.\.\.			Tag\ 鏂囦欢(&T)\.\.\.
+menutrans Block\ Selection		鍙湪閫夊畾鐭╁舰鍧楁椂
+menutrans Insert\ Mode			鍙湪鎻掑叆妯″紡鏃�
+menutrans Block\ and\ Insert	鍦ㄩ�夊畾鐭╁舰鍧楀拰鎻掑叆妯″紡鏃�
+menutrans Always				濮嬬粓
+" }}}
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!				寮�/鍏虫彃鍏ユā寮�(&M)<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!			寮�/鍏砛 Vi\ 鍏煎鎬�(&O)<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.								鎼滅储璺緞(&P)\.\.\.
+menutrans Ta&g\ Files\.\.\.									鏍囪鏂囦欢(Tags)(&G)\.\.\.
 
 " GUI options
-menutrans Toggle\ &Toolbar			寮�/鍏冲伐鍏锋爮(&T)
-menutrans Toggle\ &Bottom\ Scrollbar		寮�/鍏冲簳閮ㄦ粴鍔ㄦ潯(&B)
-menutrans Toggle\ &Left\ Scrollbar		寮�/鍏冲乏绔粴鍔ㄦ潯(&L)
-menutrans Toggle\ &Right\ Scrollbar		寮�/鍏冲彸绔粴鍔ㄦ潯(&R)
+menutrans Toggle\ &Toolbar									寮�/鍏冲伐鍏锋爮(&T)
+menutrans Toggle\ &Bottom\ Scrollbar						寮�/鍏冲簳閮ㄦ粴鍔ㄦ潯(&B)
+menutrans Toggle\ &Left\ Scrollbar							寮�/鍏冲乏渚ф粴鍔ㄦ潯(&L)
+menutrans Toggle\ &Right\ Scrollbar							寮�/鍏冲彸渚ф粴鍔ㄦ潯(&R)
 
-" Edit/File Settings
-menutrans F&ile\ Settings			鏂囦欢璁惧畾(&I)
+" fun! s:SearchP()
+if !exists("g:menutrans_path_dialog")
+  let g:menutrans_path_dialog = "杈撳叆鎼滅储璺緞銆俓n鐢ㄩ�楀彿鍒嗛殧鐩綍鍚嶃��"
+endif
+
+" fun! s:TagFiles()
+if !exists("g:menutrans_tags_dialog")
+  let g:menutrans_tags_dialog = "杈撳叆鏍囪鏂囦欢(Tags)鍚嶇О銆俓n鐢ㄩ�楀彿鍒嗛殧鏂囦欢鍚嶃��"
+endif
+" }}}
 
+" Edit/File Settings
+menutrans F&ile\ Settings					鏂囦欢璁剧疆(&I)
+" Edit.File Settings menuitems and dialogs {{{2
 " Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	寮�/鍏虫樉绀鸿鍙�(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu! 寮�/鍏崇浉瀵硅鍙�(&V)<Tab>:set\ rnu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		寮�/鍏砛 list\ 妯″紡(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		寮�/鍏虫姌琛�(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	寮�/鍏虫暣璇嶆姌琛�(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		寮�/鍏虫墿灞昞 tab(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		寮�/鍏宠嚜鍔ㄧ缉杩�(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		寮�/鍏砛 C\ 缂╄繘(&C)<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!			寮�/鍏宠鍙�(&N)<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	寮�/鍏崇浉瀵硅鍙�(&V)<Tab>:set\ rnu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!				寮�/鍏冲垪琛ㄦā寮�(&L)<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!			寮�/鍏虫崲琛�(&W)<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!		寮�/鍏宠瘝灏炬崲琛�(&R)<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!				寮�/鍏冲埗琛ㄧ鎵╁睍(&E)<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!			寮�/鍏宠嚜鍔ㄧ缉杩�(&A)<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!		寮�/鍏砛 C\ 璇█寮忕缉杩�(&C)<Tab>:set\ cin!
 
 " other options
-menutrans &Shiftwidth			缂╄繘瀹藉害(&S)
-menutrans Soft\ &Tabstop		Soft\ Tab\ 瀹藉害(&T)
-menutrans Te&xt\ Width\.\.\.		鏂囨湰瀹藉害(&X)\.\.\.
-menutrans &File\ Format\.\.\.		鏂囦欢鏍煎紡(&F)\.\.\.
-menutrans C&olor\ Scheme		閰嶈壊鏂规(&O)
-menutrans Select\ Fo&nt\.\.\.		閫夋嫨瀛椾綋(&N)\.\.\.
-menutrans &Keymap			閿洏鏄犲皠(&K)
+menutrans &Shiftwidth										缂╄繘瀹藉害(&S)
+menutrans Soft\ &Tabstop									杞埗琛ㄤ綅瀹藉害(Soft Tabstop)(&T)
+menutrans Te&xt\ Width\.\.\.								鏂囨湰瀹藉害(&X)\.\.\.
+menutrans &File\ Format\.\.\.								鏂囦欢鏍煎紡(&F)\.\.\.
+
+" fun! s:TextWidth()
+if !exists("g:menutrans_textwidth_dialog")
+  let g:menutrans_textwidth_dialog = "杈撳叆鏂囨湰瀹藉害(姣忚鏈�澶у瓧绗︽暟锛�0 琛ㄧず绂佺敤):"
+endif
+
+" fun! s:FileFormat()
+if !exists("g:menutrans_fileformat_dialog")
+  let g:menutrans_fileformat_dialog = "閫夋嫨鏂囦欢鐨勪繚瀛樻牸寮�:"
+endif
+if !exists("g:menutrans_fileformat_choices")
+  let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n鍙栨秷(&C)"
+endif
+" }}}
+menutrans Show\ C&olor\ Schemes\ in\ Menu	鍦ㄨ彍鍗曚腑鏄剧ず閰嶈壊鏂规(&O)
+menutrans C&olor\ Scheme					閰嶈壊鏂规(&O)
+menutrans Show\ &Keymaps\ in\ Menu			鍦ㄨ彍鍗曚腑鏄剧ず閿洏鏄犲皠(&K)
+menutrans &Keymap							閿洏鏄犲皠(&K)
+menutrans Select\ Fo&nt\.\.\.				閫夋嫨瀛椾綋(&N)\.\.\.
+" }}}
 
 " Programming menu
-menutrans &Tools			宸ュ叿(&T)
-menutrans &Jump\ to\ this\ tag<Tab>g^]	璺宠浆鍒拌繖涓猏 tag(&J)<Tab>g^]
-menutrans Jump\ &back<Tab>^T		璺宠浆杩斿洖(&B)<Tab>^T
-menutrans Build\ &Tags\ File		寤虹珛\ Tags\ 鏂囦欢(&T)
+menutrans &Tools	宸ュ叿(&T)
+" Tools menuitems {{{1
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			璺宠浆鍒拌繖涓爣璁�(Tag)(&J)<Tab>g^]
+menutrans Jump\ &Back<Tab>^T					璺宠浆鍥�(&B)<Tab>^T
+menutrans Build\ &Tags\ File					鐢熸垚鏍囪鏂囦欢(Tags)(&T)
 
 " Tools.Spelling Menu
-menutrans &Spelling				鎷煎啓妫�鏌�(&S)
-menutrans &Spell\ Check\ On			鎵撳紑鎷煎啓妫�鏌�(&S)
-menutrans Spell\ Check\ &Off			鍏抽棴鎷煎啓妫�鏌�(&O)
-menutrans To\ &Next\ error<Tab>]s		涓婁竴涓敊璇�(&N)<Tab>]s
-menutrans To\ &Previous\ error<Tab>[s		涓嬩竴涓敊璇�(&P)<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=		淇寤鸿(&C)<Tab>z=
-menutrans &Repeat\ correction<Tab>:spellrepall	閲嶅淇(&R)<Tab>:spellrepall
-menutrans Set\ language\ to\ "en"		璁惧畾璇█涓篭 "en"
-menutrans Set\ language\ to\ "en_au"		璁惧畾璇█涓篭 "en_au"
-menutrans Set\ language\ to\ "en_ca"		璁惧畾璇█涓篭 "en_ca"
-menutrans Set\ language\ to\ "en_gb"		璁惧畾璇█涓篭 "en_gb"
-menutrans Set\ language\ to\ "en_nz"		璁惧畾璇█涓篭 "en_nz"
-menutrans Set\ language\ to\ "en_us"		璁惧畾璇█涓篭 "en_us"
-menutrans &Find\ More\ Languages		鏌ユ壘鏇村璇█(&F)
+menutrans &Spelling								鎷煎啓妫�鏌�(&S)
+" Tools.Spelling menuitems and dialog {{{2
+menutrans &Spell\ Check\ On						鎵撳紑鎷煎啓妫�鏌�(&S)
+menutrans Spell\ Check\ &Off					鍏抽棴鎷煎啓妫�鏌�(&O)
+menutrans To\ &Next\ Error<Tab>]s				涓婁竴涓敊璇�(&N)<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			涓嬩竴涓敊璇�(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			鏇存寤鸿(&C)<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall	鏇存鍏ㄩ儴鍚岀被閿欒(&R)<Tab>:spellrepall
+menutrans Set\ Language\ to\ "en"				璁剧疆璇█涓篭 "en"
+menutrans Set\ Language\ to\ "en_au"			璁剧疆璇█涓篭 "en_au"
+menutrans Set\ Language\ to\ "en_ca"			璁剧疆璇█涓篭 "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			璁剧疆璇█涓篭 "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			璁剧疆璇█涓篭 "en_nz"
+menutrans Set\ Language\ to\ "en_us"			璁剧疆璇█涓篭 "en_us"
+menutrans &Find\ More\ Languages				鏌ユ壘鏇村璇█(&F)
+
+" func! s:SpellLang()
+if !exists("g:menutrans_set_lang_to")
+  let g:menutrans_set_lang_to = "璁剧疆璇█涓�"
+endif
+" }}}
 
 " Tools.Fold Menu
+menutrans &Folding								鎶樺彔(&F)
+" Tools.Fold menuitems {{{2
 " open close folds
-menutrans &Folding				鎶樺彔(&F)
-menutrans &Enable/Disable\ folds<Tab>zi		鍚敤/绂佺敤鎶樺彔(&E)<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv		鏌ョ湅姝よ(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx	浠呮煡鐪嬫琛�(&W)<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm		鍏抽棴鏇村鎶樺彔(&L)<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM		鍏抽棴鎵�鏈夋姌鍙�(&C)<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr		鎵撳紑鏇村鎶樺彔(&P)<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR		鎵撳紑鎵�鏈夋姌鍙�(&O)<Tab>zR
+menutrans &Enable/Disable\ Folds<Tab>zi			鍚敤/绂佺敤鎶樺彔(&E)<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			灞曞紑鍏夋爣鎵�鍦ㄨ(&V)<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	鍙睍寮�鍏夋爣鎵�鍦ㄨ(&W)<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			鎶樺彔涓�绾�(&L)<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM				鎶樺彔鍏ㄩ儴(&C)<Tab>zM
+menutrans O&pen\ More\ Folds<Tab>zr				灞曞紑涓�绾�(&P)<Tab>zr
+menutrans &Open\ All\ Folds<Tab>zR				灞曞紑鍏ㄩ儴(&O)<Tab>zR
 " fold method
-menutrans Fold\ Met&hod			鎶樺彔鏂规硶(&H)
-menutrans M&anual			鎵嬪伐(&A)
-menutrans I&ndent			缂╄繘(&N)
-menutrans E&xpression			琛ㄨ揪寮�(&X)
-menutrans S&yntax			璇硶(&Y)
-menutrans &Diff				姣旇緝(Diff)(&D)
-menutrans Ma&rker			鏍囪(&R)
+menutrans Fold\ Met&hod							鎶樺彔鏂瑰紡(&H)
+" Tools.Fold.Fold Method menuitems {{{3
+menutrans M&anual		鎵嬪姩(&A)
+menutrans I&ndent		缂╄繘(&N)
+menutrans E&xpression	琛ㄨ揪寮�(&X)
+menutrans S&yntax		璇硶(&Y)
+menutrans &Diff			宸紓(Diff)(&D)
+menutrans Ma&rker		璁板彿(Marker)(&R)
+" }}}
 " create and delete folds
-menutrans Create\ &Fold<Tab>zf		鍒涘缓鎶樺彔(&F)<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		鍒犻櫎鎶樺彔(&D)<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	鍒犻櫎鎵�鏈夋姌鍙�(&A)<Tab>zD
+menutrans Create\ &Fold<Tab>zf					鍒涘缓鎶樺彔(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd					鍒犻櫎鎶樺彔(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD			鍒犻櫎鍏ㄩ儴鎶樺彔(&A)<Tab>zD
 " moving around in folds
-menutrans Fold\ column\ &width		鎶樺彔鏍忓搴�(&W)
+menutrans Fold\ Col&umn\ Width					鎶樺彔鎿嶄綔鏍忓搴�(&W)
+" }}}
 
 " Tools.Diff Menu
-menutrans &Diff				姣旇緝(Diff)(&D)
-menutrans &Update			鏇存柊(&U)
-menutrans &Get\ Block			寰楀埌鍧�(&G)
-menutrans &Put\ Block			鏀剧疆鍧�(&P)
+menutrans &Diff									宸紓(Diff)(&D)
+" Tools.Diff menuitems {{{2
+menutrans &Update		鍒锋柊(&U)
+menutrans &Get\ Block	閲囩敤瀵逛晶鏂囨湰鍧�(&G)
+menutrans &Put\ Block	閲囩敤鏈晶鏂囨湰鍧�(&P)
+" }}}
 
-menutrans &Make<Tab>:make		Make(&M)<Tab>:make
-menutrans &List\ Errors<Tab>:cl		鍒楀嚭閿欒(&L)<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!	鍒楀嚭娑堟伅(&I)<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn		涓嬩竴涓敊璇�(&N)<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp	涓婁竴涓敊璇�(&P)<Tab>:cp
-menutrans &Older\ List<Tab>:cold	鏇存棫鐨勯敊璇垪琛�(&O)<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew	鏇存柊鐨勯敊璇垪琛�(&E)<Tab>:cnew
-menutrans Error\ &Window		閿欒绐楀彛(&W)
-menutrans &Update<Tab>:cwin		鏇存柊(&U)<Tab>:cwin
+menutrans &Make<Tab>:make						鐢熸垚(Make)(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl					鍒楀嚭閿欒(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!				鍒楀嚭娑堟伅(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn					涓嬩竴涓敊璇�(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp				涓婁竴涓敊璇�(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold				杈冩棫鐨勯敊璇垪琛�(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew				杈冩柊鐨勯敊璇垪琛�(&E)<Tab>:cnew
+menutrans Error\ &Window						閿欒绐楀彛(&W)
+" Tools.Error Window menuitems {{{2
+menutrans &Update<Tab>:cwin		鍒锋柊(&U)<Tab>:cwin
 menutrans &Open<Tab>:copen		鎵撳紑(&O)<Tab>:copen
-menutrans &Close<Tab>:cclose		鍏抽棴(&C)<Tab>:cclose
-menutrans &Convert\ to\ HEX<Tab>:%!xxd	杞崲鎴愬崄鍏繘鍒�<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r	杞崲杩斿洖<Tab>:%!xxd\ -r
-menutrans Se&T\ Compiler		璁惧畾缂栬瘧鍣�(&T)
+menutrans &Close<Tab>:cclose	鍏抽棴(&C)<Tab>:cclose
+" }}}
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu	鍦ㄨ彍鍗曚腑鏄剧ず缂栬瘧鍣ㄨ缃�(&T)
+menutrans Se&t\ Compiler						璁剧疆缂栬瘧鍣�(&T)
+menutrans &Convert\ to\ HEX<Tab>:%!xxd			杞崲鎴愬崄鍏繘鍒�(&C)<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			杞崲鍥�(&R)<Tab>:%!xxd\ -r
+" }}}
 
-" Names for buffer menu.
-menutrans &Buffers		缂撳啿鍖�(&B)
-menutrans &Refresh\ menu	鏇存柊鑿滃崟(&R)
-menutrans &Delete		鍒犻櫎(&D)
-menutrans &Alternate		浜ゆ浛(&A)
-menutrans &Next			涓嬩竴涓�(&N)
-menutrans &Previous		涓婁竴涓�(&P)
+" Buffer menu
+menutrans &Buffers	缂撳啿鍖�(&B)
+" Buffer menuitems and dialog {{{1
+menutrans &Refresh\ Menu	鍒锋柊鏈彍鍗�(&R)
+menutrans &Delete			鍒犻櫎(&D)
+menutrans &Alternate		鍒囨崲(&A)
+menutrans &Next				涓嬩竴涓�(&N)
+menutrans &Previous			涓婁竴涓�(&P)
+
+" func! s:BMMunge(fname, bnum) 
+if !exists("g:menutrans_no_file")
+  let g:menutrans_no_file = "[鏃犳枃浠禲"
+endif
+" }}}
 
 " Window menu
-menutrans &Window			绐楀彛(&W)
-menutrans &New<Tab>^Wn			鏂板缓(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws		鍒嗗壊(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^	鍒嗗壊鍒癨 #(&L)<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv	鍨傜洿鍒嗗壊(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer	鍒嗗壊鏂囦欢娴忚鍣�(&X)
-menutrans &Close<Tab>^Wc		鍏抽棴(&C)<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo	鍏抽棴鍏跺畠绐楀彛(&O)<Tab>^Wo
-menutrans Move\ &To			绉诲姩鍒�(&T)
-menutrans &Top<Tab>^WK			椤剁(&T)<Tab>^WK
-menutrans &Bottom<Tab>^WJ		搴曠(&B)<Tab>^WJ
-menutrans &Left\ side<Tab>^WH		宸﹁竟(&L)<Tab>^WH
-menutrans &Right\ side<Tab>^WL		鍙宠竟(&R)<Tab>^WL
-" menutrans Ne&xt<Tab>^Ww		涓嬩竴涓�(&X)<Tab>^Ww
-" menutrans P&revious<Tab>^WW		涓婁竴涓�(&R)<Tab>^WW
-menutrans Rotate\ &Up<Tab>^WR		鍚戜笂杞崲(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr		鍚戜笅杞崲(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W=		绛夊ぇ(&E)<Tab>^W=
-menutrans &Max\ Height<Tab>^W_		鏈�澶ч珮搴�(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_		鏈�灏忛珮搴�(&I)<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|		鏈�澶у搴�(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|		鏈�灏忓搴�(&H)<Tab>^W1\|
-"
-" The popup menu
-menutrans &Undo			鎾ら攢(&U)
-menutrans Cu&t			鍓垏(&T)
-menutrans &Copy			澶嶅埗(&C)
-menutrans &Paste		绮樿创(&P)
-menutrans &Delete		鍒犻櫎(&D)
-menutrans Select\ Blockwise	閫夋嫨鍧�
-menutrans Select\ &Word		閫夋嫨鍗曡瘝(&W)
-menutrans Select\ &Sentence	閫夋嫨鍙ュ瓙(&S)
-menutrans Select\ Pa&ragraph	閫夋嫨娈佃惤(&R)
-menutrans Select\ &Line		閫夋嫨琛�(&L)
-menutrans Select\ &Block	閫夋嫨鍧�(&B)
-menutrans Select\ &All		鍏ㄩ��(&A)
-"
-" The GUI toolbar
+menutrans &Window	绐楀彛(&W)
+" Window menuitems {{{1
+menutrans &New<Tab>^Wn					鏂板缓(&N)<Tab>^Wn
+menutrans S&plit<Tab>^Ws				鎷嗗垎(&P)<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^		鎷嗗垎骞舵樉绀虹紦鍐插尯\ #(&L)<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv	鍨傜洿鎷嗗垎(&V)<Tab>^Wv
+menutrans Split\ File\ E&xplorer		鎷嗗垎骞舵墦寮�鏂囦欢娴忚鍣�(&X)
+menutrans &Close<Tab>^Wc				鍏抽棴(&C)<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo		闄ゆ涔嬪鍏ㄩ儴鍏抽棴(&O)<Tab>^Wo
+menutrans Move\ &To						绉诲姩鍒�(&T)
+menutrans &Top<Tab>^WK					椤剁(&T)<Tab>^WK
+menutrans &Bottom<Tab>^WJ				搴曠(&B)<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH			宸﹁竟(&L)<Tab>^WH
+menutrans &Right\ Side<Tab>^WL			鍙宠竟(&R)<Tab>^WL
+menutrans Rotate\ &Up<Tab>^WR			鍚戜笂杞崲(&U)<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr			鍚戜笅杞崲(&D)<Tab>^Wr
+menutrans &Equal\ Size<Tab>^W=			骞冲潎鍒嗗竷(&E)<Tab>^W=
+menutrans &Max\ Height<Tab>^W_			鏈�澶ч珮搴�(&M)<Tab>^W
+menutrans M&in\ Height<Tab>^W1_			鏈�灏忛珮搴�(&I)<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|			鏈�澶у搴�(&W)<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|			鏈�灏忓搴�(&H)<Tab>^W1\|
+" }}}
+
+" The popup menu {{{1
+menutrans &Undo					鎾ら攢(&U)
+menutrans Cu&t					鍓垏(&T)
+menutrans &Copy					澶嶅埗(&C)
+menutrans &Paste				绮樿创(&P)
+menutrans &Delete				鍒犻櫎(&D)
+menutrans Select\ Blockwise		鏀逛负閫夊畾鐭╁舰鍧�
+menutrans Select\ &Word			閫夊畾鍗曡瘝(&W)
+menutrans Select\ &Sentence		閫夊畾鍙�(&S)
+menutrans Select\ Pa&ragraph	閫夊畾娈佃惤(&R)
+menutrans Select\ &Line			閫夊畾琛�(&L)
+menutrans Select\ &Block		閫夊畾鐭╁舰鍧�(&B)
+menutrans Select\ &All			鍏ㄩ��(&A)
+
+" func! <SID>SpellPopup()
+if !exists("g:menutrans_spell_change_ARG_to")
+  let g:menutrans_spell_change_ARG_to = '灏哱 "%s"\ 鏇存敼涓�'
+endif
+if !exists("g:menutrans_spell_add_ARG_to_word_list")
+  let g:menutrans_spell_add_ARG_to_word_list = '灏哱 "%s"\ 娣诲姞鍒拌瘝鍏�'
+endif
+if !exists("g:menutrans_spell_ignore_ARG")
+  let g:menutrans_spell_ignore_ARG = '蹇界暐\ "%s"'
+endif
+" }}}
+
+" The GUI toolbar {{{1
 if has("toolbar")
   if exists("*Do_toolbar_tmenu")
     delfun Do_toolbar_tmenu
   endif
   fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open		鎵撳紑鏂囦欢
-    tmenu ToolBar.Save		淇濆瓨褰撳墠鏂囦欢
-    tmenu ToolBar.SaveAll	淇濆瓨鍏ㄩ儴鏂囦欢
-    tmenu ToolBar.Print		鎵撳嵃
-    tmenu ToolBar.Undo		鎾ら攢
-    tmenu ToolBar.Redo		閲嶅仛
-    tmenu ToolBar.Cut		鍓垏鍒板壀璐存澘
-    tmenu ToolBar.Copy		澶嶅埗鍒板壀璐存澘
-    tmenu ToolBar.Paste		浠庡壀璐存澘绮樿创
-    tmenu ToolBar.Find		鏌ユ壘...
-    tmenu ToolBar.FindNext	鏌ユ壘涓嬩竴涓�
-    tmenu ToolBar.FindPrev	鏌ユ壘涓婁竴涓�
-    tmenu ToolBar.Replace	鏌ユ壘鍜屾浛鎹�...
-    tmenu ToolBar.LoadSesn	鍔犺浇浼氳瘽
-    tmenu ToolBar.SaveSesn	淇濆瓨褰撳墠浼氳瘽
-    tmenu ToolBar.RunScript	杩愯 Vim 鑴氭湰
-    tmenu ToolBar.Make		鎵ц Make (:make)
-    tmenu ToolBar.RunCtags	鍦ㄥ綋鍓嶇洰褰曞缓绔� tags (!ctags -R .)
-    tmenu ToolBar.TagJump	璺宠浆鍒板厜鏍囦綅缃殑 tag
-    tmenu ToolBar.Help		Vim 甯姪
-    tmenu ToolBar.FindHelp	鏌ユ壘 Vim 甯姪
+    let did_toolbar_tmenu = 1
+    tmenu ToolBar.Open			鎵撳紑鏂囦欢
+    tmenu ToolBar.Save			淇濆瓨褰撳墠鏂囦欢
+    tmenu ToolBar.SaveAll		鍏ㄩ儴淇濆瓨
+    tmenu ToolBar.Print			鎵撳嵃
+    tmenu ToolBar.Undo			鎾ら攢
+    tmenu ToolBar.Redo			鎭㈠
+    tmenu ToolBar.Cut			鍓垏鍒板壀璐存澘
+    tmenu ToolBar.Copy			澶嶅埗鍒板壀璐存澘
+    tmenu ToolBar.Paste			浠庡壀璐存澘绮樿创
+    if !has("gui_athena")
+      tmenu ToolBar.Replace		鏌ユ壘鍜屾浛鎹�...
+      tmenu ToolBar.FindNext	鏌ユ壘涓嬩竴涓�
+      tmenu ToolBar.FindPrev	鏌ユ壘涓婁竴涓�
+    endif
+    tmenu ToolBar.LoadSesn		鍔犺浇浼氳瘽
+    tmenu ToolBar.SaveSesn		淇濆瓨褰撳墠浼氳瘽
+    tmenu ToolBar.RunScript		杩愯 Vim 鑴氭湰
+    tmenu ToolBar.Make			鐢熸垚褰撳墠椤圭洰 (:make)
+    tmenu ToolBar.RunCtags		鍦ㄥ綋鍓嶇洰褰曠敓鎴愭爣璁�(Tags) (!ctags -R .)
+    tmenu ToolBar.TagJump		璺宠浆鍒板厜鏍囨墍鍦ㄦ爣璁�(Tag)
+    tmenu ToolBar.Help			Vim 甯姪
+    tmenu ToolBar.FindHelp		鍦� Vim 甯姪涓煡鎵�
   endfun
 endif
+" }}}
 
 " Syntax menu
-menutrans &Syntax			璇硶(&S)
-menutrans &Show\ filetypes\ in\ menu	鍦ㄨ彍鍗曚腑鏄剧ず鏂囦欢绫诲瀷(&S)
-menutrans &Off				鍏抽棴(&O)
-menutrans &Manual			鎵嬪伐(&M)
-menutrans A&utomatic			鑷姩(&U)
-menutrans on/off\ for\ &This\ file	浠呭杩欎釜鏂囦欢寮�/鍏�(&T)
-menutrans Co&lor\ test			鑹插僵娴嬭瘯(&L)
-menutrans &Highlight\ test		楂樹寒娴嬭瘯(&H)
-menutrans &Convert\ to\ HTML		杞崲鎴怽 HTML(&C)
-menutrans Set\ '&syntax'\ only		浠呰瀹歕 'syntax'(&S)
-menutrans Set\ '&filetype'\ too		涔熻瀹歕 'filetype'(&F)
+menutrans &Syntax	璇硶(&S)
+" Syntax menuitems {{{1
+menutrans &Show\ File\ Types\ in\ Menu	鍦ㄨ彍鍗曚腑鏄剧ず鏂囦欢绫诲瀷(&S)
+menutrans &Off							鍏抽棴(&O)
+menutrans &Manual						鎵嬪姩(&M)
+menutrans A&utomatic					鑷姩(&U)
+menutrans On/Off\ for\ &This\ File		鍙杩欎釜鏂囦欢寮�/鍏�(&T)
+menutrans Co&lor\ Test					鑹插僵娴嬭瘯(&L)
+menutrans &Highlight\ Test				楂樹寒娴嬭瘯(&H)
+menutrans &Convert\ to\ HTML			杞崲鎴怽 HTML(&C)
+" From synmenu.vim
+menutrans Set\ '&syntax'\ Only			鍙缃甛 'syntax'(&S)
+menutrans Set\ '&filetype'\ Too			涔熻缃甛 'filetype'(&F)
+" }}}
+
+" Netrw menu {{{1
+" Plugin loading may be after menu translation
+" So giveup testing if Netrw Plugin is loaded
+" if exists("g:loaded_netrwPlugin")
+  menutrans Help<tab><F1>					甯姪<tab><F1>
+  menutrans Bookmarks						涔︾
+  menutrans History							鍘嗗彶璁板綍
+  menutrans Go\ Up\ Directory<tab>-			鍚戜笂涓�绾�<tab>-
+  menutrans Apply\ Special\ Viewer<tab>x	鐢ㄩ粯璁ょ▼搴忔墦寮�<tab>x
+  menutrans Bookmarks\ and\ History			涔︾鍜屽巻鍙茶褰�
+  " Netrw.Bookmarks and History menuitems {{{2
+  menutrans Bookmark\ Current\ Directory<tab>mb		娣诲姞涔︾<tab>mb
+  menutrans Bookmark\ Delete						绉婚櫎涔︾
+  menutrans Goto\ Prev\ Dir\ (History)<tab>u		鍚庨��(鍘嗗彶璁板綍)<tab>u
+  menutrans Goto\ Next\ Dir\ (History)<tab>U		鍓嶈繘(鍘嗗彶璁板綍)<tab>U
+  menutrans List<tab>qb								瀹屾暣鍒楄〃<tab>qb
+  " }}}
+  menutrans Browsing\ Control				鎺у埗
+  " Netrw.Browsing Control menuitems {{{2
+  menutrans Horizontal\ Split<tab>o					鍦ㄦ媶鍒嗙獥鍙ｆ墦寮�<tab>o
+  menutrans Vertical\ Split<tab>v					鍦ㄥ瀭鐩存媶鍒嗙獥鍙ｆ墦寮�<tab>v
+  menutrans New\ Tab<tab>t							鍦ㄦ爣绛鹃〉鎵撳紑<tab>t	
+  menutrans Preview<tab>p							棰勮<tab>p
+  menutrans Edit\ File\ Hiding\ List<tab><ctrl-h>	缂栬緫闅愯棌鏉′欢(Hiding\ List)<tab><ctrl-h>
+  menutrans Edit\ Sorting\ Sequence<tab>S			缂栬緫鎺掑簭鏉′欢(Sorting\ Sequence)<tab>S
+  menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh	蹇�熼殣钘�/鏄剧ず浠.寮�澶寸殑鏂囦欢<tab>gh
+  menutrans Refresh\ Listing<tab><ctrl-l>			鍒锋柊<tab><ctrl-l>
+  menutrans Settings/Options<tab>:NetrwSettings		璁剧疆/閫夐」<tab>:NetrwSettings
+  " }}}
+  menutrans Delete\ File/Directory<tab>D	鍒犻櫎鏂囦欢/鐩綍<tab>D
+  menutrans Edit\ File/Dir					缂栬緫鏂囦欢/鐩綍
+  " Netrw.Edit File menuitems {{{2
+  menutrans Create\ New\ File<tab>%				鏂板缓鏂囦欢<tab>%
+  menutrans In\ Current\ Window<tab><cr>		鍦ㄥ綋鍓嶇獥鍙�<tab><cr>
+  menutrans Preview\ File/Directory<tab>p		棰勮鏂囦欢/鐩綍<tab>p
+  menutrans In\ Previous\ Window<tab>P			鍦ㄤ笂涓�涓獥鍙�<tab>P
+  menutrans In\ New\ Window<tab>o				鍦ㄦ柊绐楀彛<tab>o
+  menutrans In\ New\ Tab<tab>t					鍦ㄦ柊鏍囩椤�<tab>t
+  menutrans In\ New\ Vertical\ Window<tab>v		鍦ㄦ柊鍨傜洿绐楀彛<tab>v
+  " }}}
+  menutrans Explore							娴忚
+  " Netrw.Explore menuitems {{{2
+  menutrans Directory\ Name															鎸囧畾鐩綍鍚�
+  menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */			鍖归厤鎸囧畾鏂囦欢鍚嶆ā寮�(褰撳墠鐩綍)<tab>:Explore\ */
+  menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/				鍖归厤鎸囧畾鏂囦欢鍚嶆ā寮�(鍚瓙鐩綍)<tab>:Explore\ **/
+  menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *//	鍐呭鍖呭惈鎸囧畾瀛楃涓叉ā寮�(褰撳墠鐩綍)<tab>:Explore\ *//
+  menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **//		鍐呭鍖呭惈鎸囧畾瀛楃涓叉ā寮�(鍚瓙鐩綍)<tab>:Explore\ **//
+  menutrans Next\ Match<tab>:Nexplore												涓嬩竴涓尮閰嶉」<tab>:Nexplore
+  menutrans Prev\ Match<tab>:Pexplore												涓婁竴涓尮閰嶉」<tab>:Pexplore
+  " }}}
+  menutrans Make\ Subdirectory<tab>d		鏂板缓瀛愮洰褰�<tab>d
+  menutrans Marked\ Files					閫夊畾鐨�(Marked)鏂囦欢
+  " Netrw.Marked Files menuitems {{{2
+  menutrans Mark\ File<tab>mf						閫夊畾(Mark)/鍙栨秷<tab>mf
+  menutrans Mark\ Files\ by\ Regexp<tab>mr			鐢ㄦ鍒欒〃杈惧紡(Regexp)閫夊畾<tab>mr
+  menutrans Hide-Show-List\ Control<tab>a			闅愯棌/鏄剧ず<tab>a
+  menutrans Copy\ To\ Target<tab>mc					澶嶅埗鍒扮洰鏍�<tab>mc
+  menutrans Delete<tab>D							鍒犻櫎<tab>D
+  menutrans Diff<tab>md								宸紓(Diff)<tab>md
+  menutrans Edit<tab>me								缂栬緫<tab>me
+  menutrans Exe\ Cmd<tab>mx							浣滀负鍙傛暟杩愯鍛戒护<tab>mx
+  menutrans Move\ To\ Target<tab>mm					绉诲姩鍒扮洰鏍�<tab>mm
+  menutrans Obtain<tab>O							鑾峰彇<tab>O
+  menutrans Print<tab>mp							鎵撳嵃<tab>mp
+  menutrans Replace<tab>R							鏇挎崲<tab>R
+  menutrans Set\ Target<tab>mt						璁剧疆鐩爣<tab>mt
+  menutrans Tag<tab>mT								鐢熸垚鏍囪鏂囦欢(Tags)<tab>mT
+  menutrans Zip/Unzip/Compress/Uncompress<tab>mz	鍘嬬缉/瑙ｅ帇缂�<tab>mz
+  " }}}
+  menutrans Obtain\ File<tab>O				鑾峰彇鏂囦欢<tab>O
+  menutrans Style							鏄剧ず椋庢牸
+  " Netrw.Style menuitems {{{2
+  menutrans Listing							鍒楄〃褰㈠紡
+  " Netrw.Style.Listing menuitems {{{3
+  menutrans thin<tab>i	绱у噾<thin)<tab>i
+  menutrans long<tab>i	璇︾粏(long)<tab>i
+  menutrans wide<tab>i	澶氬垪(wide)<tab>i
+  menutrans tree<tab>i	鏍戠姸(tree)<tab>i
+  " }}}
+  menutrans Normal-Hide-Show				鏄剧ず/闅愯棌
+  " Netrw.Style.Normal-Hide_show menuitems {{{3
+  menutrans Show\ All<tab>a		鏄剧ず鍏ㄩ儴
+  menutrans Normal<tab>a		涓嶆樉绀洪殣钘忔枃浠�
+  menutrans Hidden\ Only<tab>a	鍙樉绀洪殣钘忔枃浠�
+  " }}}
+  menutrans Reverse\ Sorting\ Order<tab>r	鍗囧簭/闄嶅簭<tab>r
+  menutrans Sorting\ Method					鎺掑簭鏂瑰紡
+  " Netrw.Style.Sorting Method menuitems {{{3
+  menutrans Name<tab>s		鏂囦欢鍚�<tab>s
+  menutrans Time<tab>s  	淇敼鏃堕棿<tab>s
+  menutrans Size<tab>s  	澶у皬<tab>s
+  menutrans Exten<tab>s		鎵╁睍鍚�<tab>s
+  " }}}
+  " }}}
+  menutrans Rename\ File/Directory<tab>R	閲嶅懡鍚嶆枃浠�/鐩綍<tab>R
+  menutrans Set\ Current\ Directory<tab>c	璁剧疆\ Vim\ 宸ヤ綔鐩綍<tab>c
+  menutrans Targets							鐩爣
+" endif
+" }}}
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+
+" vim: set ts=4 sw=4 noet fdm=marker fdc=4 :