diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/haskellcomplete.vim | 5 | ||||
| -rw-r--r-- | runtime/delmenu.vim | 7 | ||||
| -rw-r--r-- | runtime/doc/channel.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/popup.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/tags | 3 | ||||
| -rw-r--r-- | runtime/doc/terminal.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/testing.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 43 | ||||
| -rw-r--r-- | runtime/gvim.desktop | 1 | ||||
| -rw-r--r-- | runtime/lang/menu_chinese_gb.936.vim | 608 | ||||
| -rw-r--r-- | runtime/lang/menu_zh_cn.gb2312.vim | 268 | ||||
| -rw-r--r-- | runtime/lang/menu_zh_cn.utf-8.vim | 608 | ||||
| -rw-r--r-- | runtime/syntax/debchangelog.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/debcopyright.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/debsources.vim | 6 | ||||
| -rw-r--r-- | runtime/syntax/freebasic.vim | 33 | ||||
| -rw-r--r-- | runtime/syntax/sshconfig.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/vim.vim | 3 | ||||
| -rw-r--r-- | runtime/syntax/yaml.vim | 2 | ||||
| -rw-r--r-- | runtime/vim.desktop | 1 |
23 files changed, 879 insertions, 742 deletions
diff --git a/runtime/autoload/haskellcomplete.vim b/runtime/autoload/haskellcomplete.vim index 520ab93700..48fbac7f9f 100644 --- a/runtime/autoload/haskellcomplete.vim +++ b/runtime/autoload/haskellcomplete.vim @@ -2,7 +2,7 @@ " Language: Haskell " Maintainer: Daniel Campoverde <alx@sillybytes.net> " URL: https://github.com/alx741/haskellcomplete.vim -" Last Change: 2018 Aug 26 +" Last Change: 2019 May 14 " Usage: setlocal omnifunc=haskellcomplete#Complete @@ -63,6 +63,7 @@ function! haskellcomplete#Complete(findstart, base) call add(l:matches, extension) endif endfor + let b:completingLangExtension = 0 return l:matches endif @@ -78,6 +79,7 @@ function! haskellcomplete#Complete(findstart, base) call add(l:matches, flag) endif endfor + let b:completingOptionsGHC = 0 return l:matches endif @@ -93,6 +95,7 @@ function! haskellcomplete#Complete(findstart, base) call add(l:matches, module) endif endfor + let b:completingModule = 0 return l:matches endif diff --git a/runtime/delmenu.vim b/runtime/delmenu.vim index 5cefe26d35..1372182641 100644 --- a/runtime/delmenu.vim +++ b/runtime/delmenu.vim @@ -2,7 +2,7 @@ " Warning: This also deletes all menus defined by the user! " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2001 May 27 +" Last Change: 2019 Sep 11 aunmenu * tlunmenu * @@ -21,6 +21,11 @@ silent! unlet menutrans_path_dialog silent! unlet menutrans_tags_dialog silent! unlet menutrans_textwidth_dialog silent! unlet menutrans_fileformat_dialog +silent! unlet menutrans_fileformat_choices silent! unlet menutrans_no_file +silent! unlet menutrans_set_lang_to +silent! unlet menutrans_spell_change_ARG_to +silent! unlet menutrans_spell_add_ARG_to_word_list +silent! unlet menutrans_spell_ignore_ARG " vim: set sw=2 : diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt index 9b36c0724c..8767d8714b 100644 --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -1,4 +1,4 @@ -*channel.txt* For Vim version 8.1. Last change: 2019 Aug 22 +*channel.txt* For Vim version 8.1. Last change: 2019 Sep 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -508,6 +508,9 @@ ch_evalexpr({handle}, {expr} [, {options}]) *ch_evalexpr()* expression. When there is an error or timeout it returns an empty string. + Note that while waiting for the response, Vim handles other + messages. You need to make sure this doesn't cause trouble. + Can also be used as a |method|: > GetChannel()->ch_evalexpr(expr) diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index f19e0c04a7..8cb2af1e66 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.1. Last change: 2019 Sep 06 +*eval.txt* For Vim version 8.1. Last change: 2019 Sep 10 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 82691e8fca..47c40a2f83 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 8.1. Last change: 2019 Aug 21 +*insert.txt* For Vim version 8.1. Last change: 2019 Sep 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1124,7 +1124,7 @@ is used when the info popup is created. The option is a comma separated list of values: height maximum height of the popup width maximum width of the popup - highlight highlight group of the popup (default is Pmenu) + highlight highlight group of the popup (default is PmenuSel) align "item" (default) or "menu" border "on" (default) or "off" Example: > diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c7247ff9da..0c8589f74f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.1. Last change: 2019 Aug 21 +*options.txt* For Vim version 8.1. Last change: 2019 Sep 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt index cff3b9e523..8f1eb5c565 100644 --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -1,4 +1,4 @@ -*popup.txt* For Vim version 8.1. Last change: 2019 Sep 04 +*popup.txt* For Vim version 8.1. Last change: 2019 Sep 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -204,7 +204,7 @@ popup_beval({what}, {options}) *popup_beval()* \ mousemoved: 'WORD', \ }) < Use {options} to change the properties. - See |popup_beval_example| for an example use. + See |popup_beval_example| for an example. Can also be used as a |method|: > GetText()->popup_beval({}) diff --git a/runtime/doc/tags b/runtime/doc/tags index e343579b94..ab0215e7e0 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -183,9 +183,11 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'csverb' options.txt /*'csverb'* 'cuc' options.txt /*'cuc'* 'cul' options.txt /*'cul'* +'culopt' options.txt /*'culopt'* 'cursorbind' options.txt /*'cursorbind'* 'cursorcolumn' options.txt /*'cursorcolumn'* 'cursorline' options.txt /*'cursorline'* +'cursorlineopt' options.txt /*'cursorlineopt'* 'cwh' options.txt /*'cwh'* 'debug' options.txt /*'debug'* 'deco' options.txt /*'deco'* @@ -9968,6 +9970,7 @@ win_gotoid() eval.txt /*win_gotoid()* win_id2tabwin() eval.txt /*win_id2tabwin()* win_id2win() eval.txt /*win_id2win()* win_screenpos() eval.txt /*win_screenpos()* +win_splitmove() eval.txt /*win_splitmove()* winbufnr() eval.txt /*winbufnr()* wincol() eval.txt /*wincol()* window windows.txt /*window* diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index 2484b73e9a..b6fba8b389 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -1,4 +1,4 @@ -*terminal.txt* For Vim version 8.1. Last change: 2019 Jul 04 +*terminal.txt* For Vim version 8.1. Last change: 2019 Sep 08 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt index 82fe64e7a1..10334f3143 100644 --- a/runtime/doc/testing.txt +++ b/runtime/doc/testing.txt @@ -1,4 +1,4 @@ -*testing.txt* For Vim version 8.1. Last change: 2019 Aug 21 +*testing.txt* For Vim version 8.1. Last change: 2019 Sep 08 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index bb3b927fff..754f09cde7 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.1. Last change: 2019 Sep 07 +*todo.txt* For Vim version 8.1. Last change: 2019 Sep 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,6 +38,8 @@ browser use: https://github.com/vim/vim/issues/1234 *known-bugs* -------------------- Known bugs and current work ----------------------- +Split off part of option.c: #4918 + Popup windows: - Implement flip option - Why does 'nrformats' leak from the popup window buffer??? @@ -132,14 +134,12 @@ Remove check for cmd_silent when calling search_stat()? (Gary Johnson) undo result wrong: Masato Nishihata, #4798 -Sound: support on Mac? Or does libcanberra work there? +Undo puts cursor in wrong line after "cG<Esc>" undo. -Patch to add win_splitmove() function. (Andy Massimino, #4561) +Sound: support on Mac? Or does libcanberra work there? Patch for #4733: #4734. Test needs improvements. -Add CmdwinLeavePost (#4762). Also add WinLeavePost then? - Patch to fix session file when using multiple tabs. (Jason Franklin, 2019 May 20) Also put :argadd commands at the start for all buffers, so that their order @@ -157,15 +157,6 @@ Ready to include now? Adding "10" to 'spellsuggest' causes spell suggestions to become very slow. (#4087) -Patch to support 'cursorlineopt' - only highlight the line number of the -cursor line: #4693 - -Let plugins know how much space is available in the last line before -triggering the hit-enter prompt. Internally called "sc_col". -(Daniel Hahler, #4732) - -Patch for Template string: #4491 Not ready yet. New pull: #4634 - ":bnext" in a help buffer is supposed to go to the next help buffer, but it goes to any buffer, and then :bnext skips help buffers, since they are unlisted. (#4478) @@ -191,9 +182,18 @@ with packages under "start". (xtal8, #1994) Modeless selection doesn't work in gvim. (#4783) Caused by patch 8.1.1534. +Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10) +Alternative from Christian Brabandt. (2010 Sep 19) +New one from Yasuhiro Matsumoto, #1277. + Visual highlight not removed when 'dipslay' is "lastline" and line doesn't fit. (Kevin Lawler, #4457) +Patch to add interrupt(). (Yasuhiro Matsumoto, #2834) + +Patch to add per-tabpage and per-window previous directory: "lcd -" and "tcd +-". (Yegappan Lakshmanan, #4362) + Does not build with MinGW out of the box: - _stat64 is not defined, need to use "struct stat" in vim.h - WINVER conflict, should use 0x0600 by default? @@ -203,6 +203,11 @@ Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May Check_external_diff() is used too often. (Daniel Hahler, #4800) +Incorrect formatting with autoindent. (Sebastian Gniazdowski, #4909) + +Patch to sort buffers on b_last_used time. (Andy Massimino, #4722) +Needs a test. + Errors found with random data: heap-buffer-overflow in alist_add (#2472) @@ -311,6 +316,9 @@ Support setting the character displayed below the last line? Neovim uses Check: __attribute__((format(printf, on semsg() and siemsg(). Where was this added? +Patch to add a flatten() function. #3676. Check that the doc explains the +maxdepth argument (applies to the input "recursiveness"). + Add test for urxvt mouse codes. Also test that mouse coordinates can be negative. (see #4326) @@ -639,6 +647,9 @@ Jan 15, #2555) ":bufdo e" disabled syntax HL in windows other than the current. (BPJ) +Patch for Template string: #4491. New pull: #4634 +It's an awful lot of code for something that is just a bit nicer syntax. + Check argument of systemlist(). (Pavlov) No maintainer for Vietnamese translations. @@ -989,10 +1000,6 @@ somewhere else. :{range}copy {dest} !cmd Patch to fix that empty first tab is not in session. (Hirohito Higashi, 2016 Nov 25, #1282) -Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10) -Alternative from Christian Brabandt. (2010 Sep 19) -New one from Yasuhiro Matsumoto, #1277. - Patch to fix escaping of job arguments. (Yasuhiro Matsumoto, 2016 Oct 5) Update Oct 14: https://gist.github.com/mattn/d47e7d3bfe5ade4be86062b565a4bfca Update Aug 2017: #1954 diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop index 91a5e7a4f5..7805cd5840 100644 --- a/runtime/gvim.desktop +++ b/runtime/gvim.desktop @@ -20,6 +20,7 @@ Comment=Edit text files GenericName[da]=Teksteditor GenericName[fr]=Éditeur de texte GenericName[pl]=Edytor tekstu +GenericName[sr]=Едитор текста GenericName[is]=Ritvinnsluforrit Comment[af]=Redigeer tekslêers Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim index b3276b5365..d96ab37802 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< |