aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

Update runtime files and translations.

Browse Source
This commit is contained in:
Bram Moolenaar 2014-10-15 22:51:52 +02:00
parent 1df52d798f
commit 7d76c804af
14 changed files with 2055 additions and 1404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/doc/map.txt
View File

@ -1,4 +1,4 @@
*map.txt* For Vim version 7.4. Last change: 2014 Sep 30 *map.txt* For Vim version 7.4. Last change: 2014 Oct 03
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -923,9 +923,11 @@ Examples: ({CURSOR} is where you type a non-keyword character) >
< "test;;" is not expanded < "test;;" is not expanded
"test ;;" is expanded to "test <endofline>" "test ;;" is expanded to "test <endofline>"
To avoid the abbreviation in insert mode: Type part of the abbreviation, exit To avoid the abbreviation in Insert mode: Type CTRL-V before the character
insert mode with <Esc>, re-enter insert mode with "a" and type the rest. Or that would trigger the abbreviation. E.g. CTRL-V <Space>. Or type part of
type CTRL-V before the character after the abbreviation. the abbreviation, exit insert mode with <Esc>, re-enter insert mode with "a"
and type the rest.
To avoid the abbreviation in Command-line mode: Type CTRL-V twice somewhere in To avoid the abbreviation in Command-line mode: Type CTRL-V twice somewhere in
the abbreviation to avoid it to be replaced. A CTRL-V in front of a normal the abbreviation to avoid it to be replaced. A CTRL-V in front of a normal
character is mostly ignored otherwise. character is mostly ignored otherwise.

83
runtime/doc/todo.txt
View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 7.4. Last change: 2014 Oct 02 *todo.txt* For Vim version 7.4. Last change: 2014 Oct 15
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -35,6 +35,8 @@ not be repeated below, unless there is extra information.
-------------------- Known bugs and current work ----------------------- -------------------- Known bugs and current work -----------------------
Regexp problems: Regexp problems:
- The NFA engine does not implement the time limit passed to
nfa_regexec_multi()
- Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$' - Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$'
(Lech Lorens, 2014 Feb 3) (Lech Lorens, 2014 Feb 3)
- Issue 164: freeze on regexp search. - Issue 164: freeze on regexp search.
@ -58,15 +60,6 @@ Patch to make getregtype() return the right size for non-linux systems.
(Yasuhiro Matsumoto, 2014 Jul 8) (Yasuhiro Matsumoto, 2014 Jul 8)
Breaks test_eval. Inefficient, can we only compute y_width when needed? Breaks test_eval. Inefficient, can we only compute y_width when needed?
Patch to fix 'linebreak' when applying an operator. And fix the test not
actually testing. (Christian Brabandt, 2014 Sep 23)
patch to fix issue 26. (Christian)
Test 11 and 100 do not work properly on Windows.
Patch by Ken Takata (2014 Sep 25)
Alternative patch Oct 1.
Problem that a previous silent ":throw" causes a following try/catch not to Problem that a previous silent ":throw" causes a following try/catch not to
work. (ZyX, 2013 Sep 28) work. (ZyX, 2013 Sep 28)
@ -74,15 +67,9 @@ Patch to avoid problems with encoding conversion with diff.vim.
(Yasuhiro Matsumoto, 2014 Sep 1. (Yasuhiro Matsumoto, 2014 Sep 1.
Depends on current language, language of file can be different. Depends on current language, language of file can be different.
Add books from Steve Oualline to Vim website. (2014 Sep 25)
":cd C:\Windows\System32\drivers\etc*" does not work, even though the ":cd C:\Windows\System32\drivers\etc*" does not work, even though the
directory exists. (Sergio Gallelli, 2013 Dec 29) directory exists. (Sergio Gallelli, 2013 Dec 29)
Patch to have the fold and sign column and at the last line of the buffer.
(Marco Hinz, 2014 Sep 25)
Alternate suggestion: let all columns continue, also number column.
Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
14, Aug 30) 14, Aug 30)
Make ":1close" close the first window. Make ":1close" close the first window.
@ -90,28 +77,31 @@ Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
Make ":-1close" close the previous window. Make ":-1close" close the previous window.
Doesn't look right, asked for updates. Doesn't look right, asked for updates.
Patch to handle multi-byte printer name on MS-Windows. (Yasuhiro Matsumoto,
2014 Sept 28)
Two patches by Christian, 2014 Sep 29:
- Combination of precedes listchar and 'showbreak' doesn't work well.
- Moving cursor is off when 'nu' and 'sbr' are set.
The entries added by matchaddpos() are returned by getmatches() but can't be The entries added by matchaddpos() are returned by getmatches() but can't be
set with setmatches(). (lcd47, 2014 Jun 29) set with setmatches(). (lcd47, 2014 Jun 29)
Patch to fix window title for a command window on MS-Windows. (Yasuhiro
Matsumoto, 2014 Sep 28)
Patch to fix that 0x80 in abbreviation isn't handled correctly. Patch to fix that 0x80 in abbreviation isn't handled correctly.
(Christian Brabandt, 2014 Oct 1) (Christian Brabandt, 2014 Oct 1)
Check for valid yank reg seems wrong. Patch by Zyx, 2014 Oct 12.
":sign-jump" uses first window in buffer instead of current window.
Patch by James McCoy, 2013 Nov 22. Update 2014 Oct 5.
Patch to fix issue 57, on the issue. Patch to fix issue 57, on the issue.
Patch for issue 101, maintainer unreachable. Patch for issue 101, maintainer unreachable.
Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab.
Patch to fix that last_changedtick is not update on saving. (Christian
Brabandt, 2014 Oct 10, second one)
substitute() can be slow with long strings. Patch by Ozaki Kiichi, 2014 Oct
12.
Remove restriction in NSIS installer that the end of the path must be "Vim". Remove restriction in NSIS installer that the end of the path must be "Vim".
(Tim Lebedkov, 2014 Sep 24) (Tim Lebedkov, 2014 Sep 24) Again Oct 12.
Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15) Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
@ -119,6 +109,14 @@ Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
'foldexpr' applies to help. (Paul Marshall, 2014 Sep 24) 'foldexpr' applies to help. (Paul Marshall, 2014 Sep 24)
Patch to fix issue 203. (Christian Brabandt, 2014 Oct 8)
Patch to fix issue 253. (Christian Brabandt, 2014 Oct 8)
Patch to fix issue 78. (Christian Brabandt, 2014 Oct 8)
Patch to fix leak in map() with error. (Christian Brabandt, 2014 Oct 11)
Value returned by virtcol() changes depending on how lines wrap. This is Value returned by virtcol() changes depending on how lines wrap. This is
inconsistent with the documentation. inconsistent with the documentation.
@ -142,9 +140,19 @@ Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19)
Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12) Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
Patch for building a 32bit Vim with 64bit MingW compiler.
(Michael Soyka, 2014 Oct 15)
Delete old code in os_msdos.c, mch_FullName().
"hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014 "hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014
Jun 8) Jun 8)
Patch to switch to the BT regexp engine when the NFA engine uses many states.
(Christian Brabandt, 2014 Oct 3)
Patch to add argument to :cquit. (Thinca, 2014 Oct 12)
No error for missing endwhile. (ZyX, 2014 Mar 20) No error for missing endwhile. (ZyX, 2014 Mar 20)
start_global_changes() plus end_global_changes() causes problem for start_global_changes() plus end_global_changes() causes problem for
@ -338,9 +346,6 @@ buffer. (2013 Dec 9)
Patch for drag&drop reordering of GUI tab pages reordering. Patch for drag&drop reordering of GUI tab pages reordering.
(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe) (Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
":sign-jump" uses first window in buffer instead of current window.
Patch by James McCoy, 2013 Nov 22.
GTK: problem with 'L' in 'guioptions' changing the window width. GTK: problem with 'L' in 'guioptions' changing the window width.
(Aaron Cornelius, 2012 Feb 6) (Aaron Cornelius, 2012 Feb 6)
@ -414,7 +419,7 @@ Patch to allow setting w:quickfix_title via setqflist() and setloclist()
functions. (Christian Brabandt, 2013 May 8, update May 21) functions. (Christian Brabandt, 2013 May 8, update May 21)
Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14) Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
Second one. Update May 22. Second one. Update May 22.
Update by Daniel Hahler, 2014 Jul 4, Aug 14. Update by Daniel Hahler, 2014 Jul 4, Aug 14, Oct 14, Oct 15.
Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec) Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
@ -551,6 +556,10 @@ URXVT:
- Use urxvt mouse support also in xterm. Explanations: - Use urxvt mouse support also in xterm. Explanations:
http://www.midnight-commander.org/ticket/2662 http://www.midnight-commander.org/ticket/2662
Patch to have the fold and sign column and at the last line of the buffer.
(Marco Hinz, 2014 Sep 25)
Alternate suggestion: let all columns continue, also the number column.
Patch to add tests for if_xcmdsrv.c., Jul 8, need some more work. (Brian Burns) Patch to add tests for if_xcmdsrv.c., Jul 8, need some more work. (Brian Burns)
New tests Jul 13. Update Jul 17. Discussion Jul 18. New tests Jul 13. Update Jul 17. Discussion Jul 18.
@ -1007,6 +1016,12 @@ to avoid changing 'eventignore'?
Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6) Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6)
Probably needs a bit of work. Probably needs a bit of work.
Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
Added test, updates, June 23.
Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
With modification for Tatweel character: https://dpaste.de/VmFw
Remark from Ameretat Reith (2014 Oct 13)
List of encoding aliases. (Takao Fujiwara, 2009 Jul 18) List of encoding aliases. (Takao Fujiwara, 2009 Jul 18)
Are they all OK? Update Jul 22. Are they all OK? Update Jul 22.
@ -1025,10 +1040,6 @@ on the first character. (John Beckett, 2010 Aug 7)
Setting 'tags' to "tagsdir/*" does not find "tagsdir/tags". (Steven K. Wong, Setting 'tags' to "tagsdir/*" does not find "tagsdir/tags". (Steven K. Wong,
2009 Jul 18) 2009 Jul 18)
Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
Added test, updates, June 23.
Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
Patch to add "focusonly" to 'scrollopt', so that scrollbind also applies in Patch to add "focusonly" to 'scrollopt', so that scrollbind also applies in
window that doesn't have focus. (Jonathon Mah, 2009 Jan 12) window that doesn't have focus. (Jonathon Mah, 2009 Jan 12)
Needs more work. Needs more work.
@ -1960,7 +1971,7 @@ More patches:
- testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008 - testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008
Sep 13) Sep 13)
- Patch for adding "space" item in 'listchars'. (Jérémie Roquet, 2009 Oct 29, - Patch for adding "space" item in 'listchars'. (Jérémie Roquet, 2009 Oct 29,
Docs patch Oct 30, update David Burgin (glts) 2013 Aug 24) Docs patch Oct 30, update David Burgin (glts) 2013 Aug 24, 2014 Oct 10)
- Replace ccomplete.vim by cppcomplete.vim from www.vim.org? script 1520 by - Replace ccomplete.vim by cppcomplete.vim from www.vim.org? script 1520 by
Vissale Neang. (Martin Stubenschrott) Asked Vissale to make the scripts Vissale Neang. (Martin Stubenschrott) Asked Vissale to make the scripts
more friendly for the Vim distribution. more friendly for the Vim distribution.

8
runtime/filetype.vim
View File

@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2014 Sep 05 " Last Change: 2014 Oct 09
" Listen very carefully, I will say this only once " Listen very carefully, I will say this only once
if exists("did_load_filetypes") if exists("did_load_filetypes")
@ -1151,7 +1151,7 @@ au BufNewFile,BufRead *.mv,*.mpl,*.mws setf maple
au BufNewFile,BufRead *.map setf map au BufNewFile,BufRead *.map setf map
" Markdown " Markdown
au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,README.md setf markdown au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md setf markdown
" Mason " Mason
au BufNewFile,BufRead *.mason,*.mhtml,*.comp setf mason au BufNewFile,BufRead *.mason,*.mhtml,*.comp setf mason
@ -1243,8 +1243,8 @@ au BufNewFile,BufRead *.mod
\ setf modsim3 | \ setf modsim3 |
\ endif \ endif
" Modula 2 " Modula 2 (.md removed in favor of Markdown)
au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.md,*.mi setf modula2 au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi setf modula2
" Modula 3 (.m3, .i3, .mg, .ig) " Modula 3 (.m3, .i3, .mg, .ig)
au BufNewFile,BufRead *.[mi][3g] setf modula3 au BufNewFile,BufRead *.[mi][3g] setf modula3

22
runtime/lang/menu_chinese_gb.936.vim
View File

@ -1,6 +1,7 @@
" Menu Translations: Simplified Chinese <i18n-translation@lists.linux.net.cn> " Menu Translations: Simplified Chinese
" Translated By: Yuheng Xie <elephant@linux.net.cn> " Maintainer: Shun Bai <baishunde@gmail.com>
" Last Change: Tue Apr 18 22:00:00 2006 " Previous Maintainer: Yuheng Xie <elephant@linux.net.cn>
" Last Change: 2014 Oct 15
" vim: ts=8 sw=8 noet " vim: ts=8 sw=8 noet
@ -90,13 +91,14 @@ menutrans Toggle\ &Right\ Scrollbar
menutrans F&ile\ Settings 文件设定(&I) menutrans F&ile\ Settings 文件设定(&I)
" Boolean options " Boolean options
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关显示行号(&N)<Tab>:set\ nu! menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关显示行号(&N)<Tab>:set\ nu!
menutrans Toggle\ &List\ Mode<Tab>:set\ list! 开/关\ list\ 模式(&L)<Tab>:set\ list! menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu! 开/关相对行号(&V)<Tab>:set\ rnu!
menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! 开/关折行(&W)<Tab>:set\ wrap! menutrans Toggle\ &List\ Mode<Tab>:set\ list! 开/关\ list\ 模式(&L)<Tab>:set\ list!
menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! 开/关整词折行(&R)<Tab>:set\ lbr! menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! 开/关折行(&W)<Tab>:set\ wrap!
menutrans Toggle\ &expand-tab<Tab>:set\ et! 开/关扩展\ tab(&E)<Tab>:set\ et! menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! 开/关整词折行(&R)<Tab>:set\ lbr!
menutrans Toggle\ &auto-indent<Tab>:set\ ai! 开/关自动缩进(&A)<Tab>:set\ ai! menutrans Toggle\ &expand-tab<Tab>:set\ et! 开/关扩展\ tab(&E)<Tab>:set\ et!
menutrans Toggle\ &C-indenting<Tab>:set\ cin! 开/关\ C\ 缩进(&C)<Tab>:set\ cin! 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 " other options
menutrans &Shiftwidth 缩进宽度(&S) menutrans &Shiftwidth 缩进宽度(&S)

8
runtime/lang/menu_zh_cn.gb2312.vim
View File

@ -1,6 +1,7 @@
" Menu Translations: Simplified Chinese <i18n-translation@lists.linux.net.cn> " Menu Translations: Simplified Chinese
" Translated By: Yuheng Xie <elephant@linux.net.cn> " Maintainer: Shun Bai <baishunde@gmail.com>
" Last Change: Tue Apr 18 22:00:00 2006 " Previous Maintainer: Yuheng Xie <elephant@linux.net.cn>
" Last Change: 2014 Oct 15
" vim: ts=8 sw=8 noet " vim: ts=8 sw=8 noet
@ -94,6 +95,7 @@ menutrans F&ile\ Settings
" Boolean options " Boolean options
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关显示行号(&N)<Tab>:set\ nu! 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\ &List\ Mode<Tab>:set\ list! 开/关\ list\ 模式(&L)<Tab>:set\ list!
menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! 开/关折行(&W)<Tab>:set\ wrap! 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\ W&rap\ at\ word<Tab>:set\ lbr! 开/关整词折行(&R)<Tab>:set\ lbr!

8
runtime/lang/menu_zh_cn.utf-8.vim
View File

@ -1,6 +1,7 @@
" Menu Translations: Simplified Chinese <i18n-translation@lists.linux.net.cn> " Menu Translations: Simplified Chinese
" Translated By: Yuheng Xie <elephant@linux.net.cn> " Maintainer: Shun Bai <baishunde@gmail.com>
" Last Change: Tue Apr 18 22:00:00 2006 " Previous Maintainer: Yuheng Xie <elephant@linux.net.cn>
" Last Change: 2014 Oct 15
" vim: ts=8 sw=8 noet " vim: ts=8 sw=8 noet
@ -91,6 +92,7 @@ menutrans F&ile\ Settings 文件设定(&I)
" Boolean options " Boolean options
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关显示行号(&N)<Tab>:set\ nu! 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\ &List\ Mode<Tab>:set\ list! 开/关\ list\ 模式(&L)<Tab>:set\ list!
menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! 开/关折行(&W)<Tab>:set\ wrap! 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\ W&rap\ at\ word<Tab>:set\ lbr! 开/关整词折行(&R)<Tab>:set\ lbr!

4
runtime/optwin.vim
View File

@ -1,7 +1,7 @@
" These commands create the option window. " These commands create the option window.
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2014 Aug 06 " Last Change: 2014 Oct 09
" If there already is an option window, jump to that one. " If there already is an option window, jump to that one.
if bufwinnr("option-window") > 0 if bufwinnr("option-window") > 0
@ -728,6 +728,7 @@ call <SID>OptionG("km", &km)
call <SID>Header("editing text") call <SID>Header("editing text")
call append("$", "undolevels\tmaximum number of changes that can be undone") call append("$", "undolevels\tmaximum number of changes that can be undone")
call append("$", "\t(global or local to buffer)")
call append("$", " \tset ul=" . &ul) call append("$", " \tset ul=" . &ul)
call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload") call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload")
call append("$", " \tset ur=" . &ur) call append("$", " \tset ur=" . &ur)
@ -977,6 +978,7 @@ call <SID>BinOptionG("bk", &bk)
call append("$", "backupskip\tpatterns that specify for which files a backup is not made") call append("$", "backupskip\tpatterns that specify for which files a backup is not made")
call append("$", " \tset bsk=" . &bsk) call append("$", " \tset bsk=" . &bsk)
call append("$", "backupcopy\twhether to make the backup as a copy or rename the existing file") call append("$", "backupcopy\twhether to make the backup as a copy or rename the existing file")
call append("$", "\t(global or local to buffer)")
call append("$", " \tset bkc=" . &bkc) call append("$", " \tset bkc=" . &bkc)
call append("$", "backupdir\tlist of directories to put backup files in") call append("$", "backupdir\tlist of directories to put backup files in")
call <SID>OptionG("bdir", &bdir) call <SID>OptionG("bdir", &bdir)

42
runtime/syntax/j.vim
View File

@ -2,7 +2,7 @@
" Language: J " Language: J
" Maintainer: David Bürgin <676c7473@gmail.com> " Maintainer: David Bürgin <676c7473@gmail.com>
" URL: https://github.com/glts/vim-j " URL: https://github.com/glts/vim-j
" Last Change: 2014-05-25 " Last Change: 2014-10-05
if exists('b:current_syntax') if exists('b:current_syntax')
finish finish
@ -12,7 +12,7 @@ let s:save_cpo = &cpo
set cpo&vim set cpo&vim
syntax case match syntax case match
syntax sync minlines=50 syntax sync minlines=100
syntax cluster jStdlibItems contains=jStdlibNoun,jStdlibAdverb,jStdlibConjunction,jStdlibVerb syntax cluster jStdlibItems contains=jStdlibNoun,jStdlibAdverb,jStdlibConjunction,jStdlibVerb
syntax cluster jPrimitiveItems contains=jNoun,jAdverb,jConjunction,jVerb,jCopula syntax cluster jPrimitiveItems contains=jNoun,jAdverb,jConjunction,jVerb,jCopula
@ -30,26 +30,32 @@ syntax keyword jStdlibVerb AND Endian IFDEF Note OR XOR alpha17 alpha27 anddf an
syntax match jStdlibNoun /\<\%(adverb\|conjunction\|dyad\|monad\|noun\|verb\)\>/ syntax match jStdlibNoun /\<\%(adverb\|conjunction\|dyad\|monad\|noun\|verb\)\>/
syntax match jStdlibVerb /\<\%(assert\|break\|do\)\>\.\@!/ syntax match jStdlibVerb /\<\%(assert\|break\|do\)\>\.\@!/
" Numbers. Matching J numbers is difficult. The regular expression used for " Numbers. Matching J numbers is difficult. In fact, the job cannot be done
" the general case roughly embodies this grammar sketch: " with regular expressions alone. Below is a sketch of the pattern used. It
" accepts most well-formed numbers and rejects most of the ill-formed ones.
" See http://www.jsoftware.com/help/dictionary/dcons.htm for reference.
" "
" BASE := /_?\d+(\.\d*)?([eE]_?\d+)?/ " "double1" and "double2" patterns:
" RATIONAL := BASE | BASE r BASE " (_?\d+(\.\d*)?|_\.\d+)([eE]_?\d+)?
" COMPLEX := BASE | BASE (j|a[dr]) BASE " (_?\d+(\.\d*)?|_\.\d+|\.\d+)([eE]_?\d+)?
" JNUMBER := RATIONAL | RATIONAL [px] RATIONAL | COMPLEX | COMPLEX [px] COMPLEX
" "
" The grammar is implemented as shown in this pseudo-regexp: " "rational1" and "rational2" patterns:
" \k<double1>(r\k<double2>)?|__?
" \k<double2>(r\k<double2>)?|__?
" "
" base rational complex remainder " "complex1" and "complex2" patterns:
" /\< B ( [r]B ([px]B([r]B)?)? | (j|a[dr])B ([px]B((j|a[dr])B)?)? | [px]B ((j|a[dr]|r)B)? )?/ " \k<rational1>((j|a[dr])\k<rational2>)?
" \k<rational2>((j|a[dr])\k<rational2>)?
" "
" All in all, a compromise between correctness and practicality had to be " "basevalue" pattern:
" made. See http://www.jsoftware.com/help/dictionary/dcons.htm for reference. " _?[0-9a-z]+(\.[0-9a-z]*)?|_?\.[0-9a-z]+
syntax match jNumber /\<_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\|r\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\)\=/ "
syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+\%(\.[0-9a-z]\+\)\=/ " all numbers:
syntax match jNumber /\<__\=\>/ " \b\k<complex1>([px]\k<complex2>)?(b\k<basevalue>)?(?![0-9A-Za-z_.])
syntax match jNumber /\<_\./ syntax match jNumber /\<_\.[0-9A-Za-z_.]\@!/
syntax match jNumber /\<_\=\d\+x\>/ syntax match jNumber /\<_\=\d\+x[0-9A-Za-z_.]\@!/
syntax match jNumber /\<\%(__\=r_\=\d\+\|_\=\d\+r__\=\)[0-9A-Za-z_.]\@!/
syntax match jNumber /\<\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\%([px]\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\)\=\%(b\%(_\=[0-9a-z]\+\%(\.[0-9a-z]*\)\=\|_\=\.[0-9a-z]\+\)\)\=[0-9A-Za-z_.]\@!/
syntax region jString oneline start=/'/ skip=/''/ end=/'/ syntax region jString oneline start=/'/ skip=/''/ end=/'/

13
runtime/syntax/rst.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: reStructuredText documentation format " Language: reStructuredText documentation format
" Maintainer: Marshall Ward <marshall.ward@gmail.com> " Maintainer: Marshall Ward <marshall.ward@gmail.com>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2014-08-23 " Latest Revision: 2014-10-03
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -150,12 +150,19 @@ endif
for code in g:rst_syntax_code_list for code in g:rst_syntax_code_list
unlet! b:current_syntax unlet! b:current_syntax
" guard against setting 'isk' option which might cause problems (issue #108)
let prior_isk = &l:iskeyword
exe 'syn include @rst'.code.' syntax/'.code.'.vim' exe 'syn include @rst'.code.' syntax/'.code.'.vim'
exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold ' exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold '
\.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# ' \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# '
\.'skip=#^$# ' \.'skip=#^$# '
\.'end=#^\z1\@!# contains=@NoSpell,@rst'.code \.'end=#^\z1\@!# contains=@NoSpell,@rst'.code
exe 'syn cluster rstDirectives add=rstDirective'.code exe 'syn cluster rstDirectives add=rstDirective'.code
" reset 'isk' setting, if it has been changed
if &l:iskeyword !=# prior_isk
let &l:iskeyword = prior_isk
endif
unlet! prior_isk
endfor endfor
" TODO: Use better syncing. " TODO: Use better syncing.

1021
runtime/tutor/tutor.ru
View File

File diff suppressed because it is too large Load Diff

1021
runtime/tutor/tutor.ru.cp1251
View File

File diff suppressed because it is too large Load Diff

1021
runtime/tutor/tutor.ru.utf-8
View File

File diff suppressed because it is too large Load Diff

99
src/po/ru.cp1251.po
View File

@ -7,10 +7,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vim_7.4_ru\n" "Project-Id-Version: vim_ru\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-03-24 12:18+0400\n" "POT-Creation-Date: 2014-10-10 11:52+0400\n"
"PO-Revision-Date: 2014-03-24 12:18 +0400\n" "PO-Revision-Date: 2014-10-10 12:00+0400\n"
"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n" "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: Russian\n" "Language: Russian\n"
@ -203,6 +203,21 @@ msgstr "
msgid " line=%ld id=%d name=%s" msgid " line=%ld id=%d name=%s"
msgstr " ñòðîêà=%ld id=%d èìÿ=%s" msgstr " ñòðîêà=%ld id=%d èìÿ=%s"
msgid "E821: File is encrypted with unknown method"
msgstr "E821: Ôàéë çàøèôðîâàí íåèçâåñòíûì ìåòîäîì"
msgid "Enter encryption key: "
msgstr "Ââåäèòå ïàðîëü äëÿ øèôðîâàíèÿ: "
msgid "Enter same key again: "
msgstr "Ïîâòîðèòå ââîä ïàðîëÿ: "
msgid "Keys don't match!"
msgstr "Ââåä¸ííûå ïàðîëè íå ñîâïàäàþò!"
msgid "[crypted]"
msgstr "[çàøèôðîâàíî]"
#, c-format #, c-format
msgid "E96: Can not diff more than %ld buffers" msgid "E96: Can not diff more than %ld buffers"
msgstr "E96: Ñëåäèòü çà îòëè÷èÿìè ìîæíî íå áîëåå ÷åì â %ld áóôåðàõ" msgstr "E96: Ñëåäèòü çà îòëè÷èÿìè ìîæíî íå áîëåå ÷åì â %ld áóôåðàõ"
@ -659,9 +674,16 @@ msgstr "E258:
msgid "sort() argument" msgid "sort() argument"
msgstr "ïàðàìåòðà sort()" msgstr "ïàðàìåòðà sort()"
msgid "uniq() argument"
msgstr "ïàðàìåòðà uniq()"
msgid "E702: Sort compare function failed" msgid "E702: Sort compare function failed"
msgstr "E702: Íåóäà÷íîå çàâåðøåíèå ôóíêöèè ñðàâíåíèÿ ïðè ñîðòèðîâêå" msgstr "E702: Íåóäà÷íîå çàâåðøåíèå ôóíêöèè ñðàâíåíèÿ ïðè ñîðòèðîâêå"
msgid "E882: Uniq compare function failed"
msgstr ""
"E882: Íåóäà÷íîå çàâåðøåíèå ôóíêöèè ñðàâíåíèÿ ïðè ïðîâåðêå åäèíñòâåííîñòè"
msgid "(Invalid)" msgid "(Invalid)"
msgstr "(Íåïðàâèëüíî)" msgstr "(Íåïðàâèëüíî)"
@ -759,10 +781,12 @@ msgid "E129: Function name required"
msgstr "E129: Òðåáóåòñÿ èìÿ ôóíêöèè" msgstr "E129: Òðåáóåòñÿ èìÿ ôóíêöèè"
#, c-format #, c-format
msgid "E128: Function name must start with a capital or contain a colon: %s" msgid "E128: Function name must start with a capital or \"s:\": %s"
msgstr "" msgstr "E128: Èìÿ ôóíêöèè äîëæíî íà÷èíàòüñÿ ñ çàãëàâíîé áóêâû èëè \"s:\": %s"
"E128: Èìÿ ôóíêöèè äîëæíî íà÷èíàòüñÿ ñ çàãëàâíîé áóêâû èëè ñîäåðæàòü "
"äâîåòî÷èå: %s" #, c-format
msgid "E884: Function name cannot contain a colon: %s"
msgstr "E884: Èìÿ ôóíêöèè íå ìîæåò ñîäåðæàòü äâîåòî÷èå: %s"
#, c-format #, c-format
msgid "E131: Cannot delete function %s: It is in use" msgid "E131: Cannot delete function %s: It is in use"
@ -880,6 +904,10 @@ msgstr "E138:
msgid "Writing viminfo file \"%s\"" msgid "Writing viminfo file \"%s\""
msgstr "Çàïèñü ôàéëà viminfo \"%s\"" msgstr "Çàïèñü ôàéëà viminfo \"%s\""
#, c-format
msgid "E886: Can't rename viminfo file to %s!"
msgstr "E886: Íåâîçìîæíî ïåðåèìåíîâàòü ôàéë viminfo â %s!"
#. Write the info: #. Write the info:
#, c-format #, c-format
msgid "# This viminfo file was generated by Vim %s.\n" msgid "# This viminfo file was generated by Vim %s.\n"
@ -1080,6 +1108,10 @@ msgstr "E158:
msgid "E157: Invalid sign ID: %ld" msgid "E157: Invalid sign ID: %ld"
msgstr "E157: Íåïðàâèëüíûé ID çíà÷êà: %ld" msgstr "E157: Íåïðàâèëüíûé ID çíà÷êà: %ld"
#, c-format
msgid "E885: Not possible to change sign %s"
msgstr "E885: Íåâîçìîæíî èçìåíèòü çíà÷îê %s"
msgid " (NOT FOUND)" msgid " (NOT FOUND)"
msgstr " (ÍÅ ÍÀÉÄÅÍÎ)" msgstr " (ÍÅ ÍÀÉÄÅÍÎ)"
@ -1663,12 +1695,6 @@ msgstr "[
msgid "[converted]" msgid "[converted]"
msgstr "[ïåðåêîäèðîâàíî]" msgstr "[ïåðåêîäèðîâàíî]"
msgid "[blowfish]"
msgstr "[blowfish]"
msgid "[crypted]"
msgstr "[çàøèôðîâàíî]"
#, c-format #, c-format
msgid "[CONVERSION ERROR in line %ld]" msgid "[CONVERSION ERROR in line %ld]"
msgstr "[ÎØÈÁÊÀ ÏÐÅÎÁÐÀÇÎÂÀÍÈß â ñòðîêå %ld]" msgstr "[ÎØÈÁÊÀ ÏÐÅÎÁÐÀÇÎÂÀÍÈß â ñòðîêå %ld]"
@ -1689,9 +1715,6 @@ msgstr "
msgid "can't read output of 'charconvert'" msgid "can't read output of 'charconvert'"
msgstr "íåâîçìîæíî ïðî÷èòàòü âûâîä 'charconvert'" msgstr "íåâîçìîæíî ïðî÷èòàòü âûâîä 'charconvert'"
msgid "E821: File is encrypted with unknown method"
msgstr "E821: Ôàéë çàøèôðîâàí íåèçâåñòíûì ìåòîäîì"
msgid "E676: No matching autocommands for acwrite buffer" msgid "E676: No matching autocommands for acwrite buffer"
msgstr "E676: Íåò ïîäõîäÿùèõ àâòîêîìàíä äëÿ áóôåðà acwrite" msgstr "E676: Íåò ïîäõîäÿùèõ àâòîêîìàíä äëÿ áóôåðà acwrite"
@ -2654,6 +2677,13 @@ msgstr ""
"E263: Ê ñîæàëåíèþ ýòà êîìàíäà íå ðàáîòàåò, ïîñêîëüêó íå çàãðóæåíà áèáëèîòåêà " "E263: Ê ñîæàëåíèþ ýòà êîìàíäà íå ðàáîòàåò, ïîñêîëüêó íå çàãðóæåíà áèáëèîòåêà "
"Python" "Python"
msgid ""
"E887: Sorry, this command is disabled, the Python's site module could not be "
"loaded."
msgstr ""
"E887: Ê ñîæàëåíèþ ýòà êîìàíäà íå ðàáîòàåò, ïîñêîëüêó íå çàãðóæåí ìîäóëü "
"Python site."
msgid "E659: Cannot invoke Python recursively" msgid "E659: Cannot invoke Python recursively"
msgstr "E659: Íåâîçìîæíî âûïîëíèòü ðåêóðñèâíûé âûçîâ Python" msgstr "E659: Íåâîçìîæíî âûïîëíèòü ðåêóðñèâíûé âûçîâ Python"
@ -4068,15 +4098,6 @@ msgstr "E548:
msgid "E549: Illegal percentage" msgid "E549: Illegal percentage"
msgstr "E549: Íåäîïóñòèìîå çíà÷åíèå ïðîöåíòîâ" msgstr "E549: Íåäîïóñòèìîå çíà÷åíèå ïðîöåíòîâ"
msgid "Enter encryption key: "
msgstr "Ââåäèòå ïàðîëü äëÿ øèôðîâàíèÿ: "
msgid "Enter same key again: "
msgstr "Ïîâòîðèòå ââîä ïàðîëÿ: "
msgid "Keys don't match!"
msgstr "Ââåä¸ííûå ïàðîëè íå ñîâïàäàþò!"
msgid "E854: path too long for completion" msgid "E854: path too long for completion"
msgstr "E854: ñëèøêîì áîëüøîé ïóòü äëÿ àâòîäîïîëíåíèÿ" msgstr "E854: ñëèøêîì áîëüøîé ïóòü äëÿ àâòîäîïîëíåíèÿ"
@ -4248,6 +4269,13 @@ msgstr ""
msgid "E574: Unknown register type %d" msgid "E574: Unknown register type %d"
msgstr "E574: Íåèçâåñòíûé òèï ðåãèñòðà %d" msgstr "E574: Íåèçâåñòíûé òèï ðåãèñòðà %d"
msgid ""
"E883: search pattern and expression register may not contain two or more "
"lines"
msgstr ""
"E883: øàáëîí ïîèñêà è ðåãèñòð âûðàæåíèÿ íå ìîãóò ñîäåðæàòü äâóõ èëè áîëåå "
"ñòðîê"
#, c-format #, c-format
msgid "%ld Cols; " msgid "%ld Cols; "
msgstr "Êîëîíîê: %ld; " msgstr "Êîëîíîê: %ld; "
@ -4565,6 +4593,19 @@ msgstr ""
"\n" "\n"
"Íåâîçìîæíî óñòàíîâèòü êîíòåêñò áåçîïàñíîñòè äëÿ " "Íåâîçìîæíî óñòàíîâèòü êîíòåêñò áåçîïàñíîñòè äëÿ "
msgid "Could not set security context "
msgstr "Íåâîçìîæíî óñòàíîâèòü êîíòåêñò áåçîïàñíîñòè "
msgid " for "
msgstr " äëÿ "
#. no enough size OR unexpected error
msgid "Could not get security context "
msgstr "Íåâîçìîæíî ïîëó÷èòü êîíòåêñò áåçîïàñíîñòè "
msgid ". Removing it!\n"
msgstr ". Áóäåò óäàë¸í!\n"
msgid "" msgid ""
"\n" "\n"
"Cannot execute shell " "Cannot execute shell "
@ -4834,6 +4875,10 @@ msgstr "E554:
msgid "External submatches:\n" msgid "External submatches:\n"
msgstr "Âíåøíèå ïîäñîîòâåòñòâèÿ:\n" msgstr "Âíåøíèå ïîäñîîòâåòñòâèÿ:\n"
#, c-format
msgid "E888: (NFA regexp) cannot repeat %s"
msgstr "E888: (ðåã. âûðàæåíèå ÍÊÀ) íåâîçìîæíî ïîâòîðèòü %s"
msgid "" msgid ""
"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
"used " "used "
@ -6232,6 +6277,9 @@ msgstr "E446:
msgid "E447: Can't find file \"%s\" in path" msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: Ôàéë \"%s\" íå íàéäåí ïî èçâåñòíûì ïóòÿì" msgstr "E447: Ôàéë \"%s\" íå íàéäåí ïî èçâåñòíûì ïóòÿì"
msgid "List or number required"
msgstr "Òðåáóåòñÿ ñïèñîê èëè ÷èñëî"
#, c-format #, c-format
msgid "E370: Could not load library %s" msgid "E370: Could not load library %s"
msgstr "E370: Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó %s" msgstr "E370: Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó %s"
@ -6888,3 +6936,4 @@ msgid ""
msgstr "" msgstr ""
"Îøèáêà ïðè óñòàíîâêå ïóòè: sys.path íå ÿâëÿåòñÿ ñïèñêîì\n" "Îøèáêà ïðè óñòàíîâêå ïóòè: sys.path íå ÿâëÿåòñÿ ñïèñêîì\n"
"Ñëåäóåò äîáàâèòü vim.VIM_SPECIAL_PATH â sys.path" "Ñëåäóåò äîáàâèòü vim.VIM_SPECIAL_PATH â sys.path"

99
src/po/ru.po
View File

@ -7,10 +7,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vim_7.4_ru\n" "Project-Id-Version: vim_ru\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-03-24 12:18+0400\n" "POT-Creation-Date: 2014-10-10 11:52+0400\n"
"PO-Revision-Date: 2014-03-24 12:18 +0400\n" "PO-Revision-Date: 2014-10-10 12:00+0400\n"
"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n" "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: Russian\n" "Language: Russian\n"
@ -203,6 +203,21 @@ msgstr "Значки для %s:"
msgid " line=%ld id=%d name=%s" msgid " line=%ld id=%d name=%s"
msgstr " строка=%ld id=%d имя=%s" msgstr " строка=%ld id=%d имя=%s"
msgid "E821: File is encrypted with unknown method"
msgstr "E821: Файл зашифрован неизвестным методом"
msgid "Enter encryption key: "
msgstr "Введите пароль для шифрования: "
msgid "Enter same key again: "
msgstr "Повторите ввод пароля: "
msgid "Keys don't match!"
msgstr "Введённые пароли не совпадают!"
msgid "[crypted]"
msgstr "[зашифровано]"
#, c-format #, c-format
msgid "E96: Can not diff more than %ld buffers" msgid "E96: Can not diff more than %ld buffers"
msgstr "E96: Следить за отличиями можно не более чем в %ld буферах" msgstr "E96: Следить за отличиями можно не более чем в %ld буферах"
@ -659,9 +674,16 @@ msgstr "E258: Не могу ответить клиенту"
msgid "sort() argument" msgid "sort() argument"
msgstr "параметра sort()" msgstr "параметра sort()"
msgid "uniq() argument"
msgstr "параметра uniq()"
msgid "E702: Sort compare function failed" msgid "E702: Sort compare function failed"
msgstr "E702: Неудачное завершение функции сравнения при сортировке" msgstr "E702: Неудачное завершение функции сравнения при сортировке"
msgid "E882: Uniq compare function failed"
msgstr ""
"E882: Неудачное завершение функции сравнения при проверке единственности"
msgid "(Invalid)" msgid "(Invalid)"
msgstr "(Неправильно)" msgstr "(Неправильно)"
@ -759,10 +781,12 @@ msgid "E129: Function name required"
msgstr "E129: Требуется имя функции" msgstr "E129: Требуется имя функции"
#, c-format #, c-format
msgid "E128: Function name must start with a capital or contain a colon: %s" msgid "E128: Function name must start with a capital or \"s:\": %s"
msgstr "" msgstr "E128: Имя функции должно начинаться с заглавной буквы или \"s:\": %s"
"E128: Имя функции должно начинаться с заглавной буквы или содержать "
"двоеточие: %s" #, c-format
msgid "E884: Function name cannot contain a colon: %s"
msgstr "E884: Имя функции не может содержать двоеточие: %s"
#, c-format #, c-format
msgid "E131: Cannot delete function %s: It is in use" msgid "E131: Cannot delete function %s: It is in use"
@ -880,6 +904,10 @@ msgstr "E138: Невозможно записать файл viminfo %s!"
msgid "Writing viminfo file \"%s\"" msgid "Writing viminfo file \"%s\""
msgstr "Запись файла viminfo \"%s\"" msgstr "Запись файла viminfo \"%s\""
#, c-format
msgid "E886: Can't rename viminfo file to %s!"
msgstr "E886: Невозможно переименовать файл viminfo в %s!"
#. Write the info: #. Write the info:
#, c-format #, c-format
msgid "# This viminfo file was generated by Vim %s.\n" msgid "# This viminfo file was generated by Vim %s.\n"
@ -1080,6 +1108,10 @@ msgstr "E158: Неправильное имя буфера: %s"
msgid "E157: Invalid sign ID: %ld" msgid "E157: Invalid sign ID: %ld"
msgstr "E157: Неправильный ID значка: %ld" msgstr "E157: Неправильный ID значка: %ld"
#, c-format
msgid "E885: Not possible to change sign %s"
msgstr "E885: Невозможно изменить значок %s"
msgid " (NOT FOUND)" msgid " (NOT FOUND)"
msgstr " (НЕ НАЙДЕНО)" msgstr " (НЕ НАЙДЕНО)"
@ -1663,12 +1695,6 @@ msgstr "[БЕЗ преобразований]"
msgid "[converted]" msgid "[converted]"
msgstr "[перекодировано]" msgstr "[перекодировано]"
msgid "[blowfish]"
msgstr "[blowfish]"
msgid "[crypted]"
msgstr "[зашифровано]"
#, c-format #, c-format
msgid "[CONVERSION ERROR in line %ld]" msgid "[CONVERSION ERROR in line %ld]"
msgstr "[ОШИБКА ПРЕОБРАЗОВАНИЯ в строке %ld]" msgstr "[ОШИБКА ПРЕОБРАЗОВАНИЯ в строке %ld]"
@ -1689,9 +1715,6 @@ msgstr "Преобразование с помощью 'charconvert' не вып
msgid "can't read output of 'charconvert'" msgid "can't read output of 'charconvert'"
msgstr "невозможно прочитать вывод 'charconvert'" msgstr "невозможно прочитать вывод 'charconvert'"
msgid "E821: File is encrypted with unknown method"
msgstr "E821: Файл зашифрован неизвестным методом"
msgid "E676: No matching autocommands for acwrite buffer" msgid "E676: No matching autocommands for acwrite buffer"
msgstr "E676: Нет подходящих автокоманд для буфера acwrite" msgstr "E676: Нет подходящих автокоманд для буфера acwrite"
@ -2654,6 +2677,13 @@ msgstr ""
"E263: К сожалению эта команда не работает, поскольку не загружена библиотека " "E263: К сожалению эта команда не работает, поскольку не загружена библиотека "
"Python" "Python"
msgid ""
"E887: Sorry, this command is disabled, the Python's site module could not be "
"loaded."
msgstr ""
"E887: К сожалению эта команда не работает, поскольку не загружен модуль "
"Python site."
msgid "E659: Cannot invoke Python recursively" msgid "E659: Cannot invoke Python recursively"
msgstr "E659: Невозможно выполнить рекурсивный вызов Python" msgstr "E659: Невозможно выполнить рекурсивный вызов Python"
@ -4068,15 +4098,6 @@ msgstr "E548: Требуется ввести цифру"
msgid "E549: Illegal percentage" msgid "E549: Illegal percentage"
msgstr "E549: Недопустимое значение процентов" msgstr "E549: Недопустимое значение процентов"
msgid "Enter encryption key: "
msgstr "Введите пароль для шифрования: "
msgid "Enter same key again: "
msgstr "Повторите ввод пароля: "
msgid "Keys don't match!"
msgstr "Введённые пароли не совпадают!"
msgid "E854: path too long for completion" msgid "E854: path too long for completion"
msgstr "E854: слишком большой путь для автодополнения" msgstr "E854: слишком большой путь для автодополнения"
@ -4248,6 +4269,13 @@ msgstr ""
msgid "E574: Unknown register type %d" msgid "E574: Unknown register type %d"
msgstr "E574: Неизвестный тип регистра %d" msgstr "E574: Неизвестный тип регистра %d"
msgid ""
"E883: search pattern and expression register may not contain two or more "
"lines"
msgstr ""
"E883: шаблон поиска и регистр выражения не могут содержать двух или более "
"строк"
#, c-format #, c-format
msgid "%ld Cols; " msgid "%ld Cols; "
msgstr "Колонок: %ld; " msgstr "Колонок: %ld; "
@ -4565,6 +4593,19 @@ msgstr ""
"\n" "\n"
"Невозможно установить контекст безопасности для " "Невозможно установить контекст безопасности для "
msgid "Could not set security context "
msgstr "Невозможно установить контекст безопасности "
msgid " for "
msgstr " для "
#. no enough size OR unexpected error
msgid "Could not get security context "
msgstr "Невозможно получить контекст безопасности "
msgid ". Removing it!\n"
msgstr ". Будет удалён!\n"
msgid "" msgid ""
"\n" "\n"
"Cannot execute shell " "Cannot execute shell "
@ -4834,6 +4875,10 @@ msgstr "E554: Синтаксическая ошибка в %s{...}"
msgid "External submatches:\n" msgid "External submatches:\n"
msgstr "Внешние подсоответствия:\n" msgstr "Внешние подсоответствия:\n"
#, c-format
msgid "E888: (NFA regexp) cannot repeat %s"
msgstr "E888: (рег. выражение НКА) невозможно повторить %s"
msgid "" msgid ""
"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
"used " "used "
@ -6232,6 +6277,9 @@ msgstr "E446: Нет имени файла в позиции курсора"
msgid "E447: Can't find file \"%s\" in path" msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: Файл \"%s\" не найден по известным путям" msgstr "E447: Файл \"%s\" не найден по известным путям"
msgid "List or number required"
msgstr "Требуется список или число"
#, c-format #, c-format
msgid "E370: Could not load library %s" msgid "E370: Could not load library %s"
msgstr "E370: Невозможно загрузить библиотеку %s" msgstr "E370: Невозможно загрузить библиотеку %s"
@ -6888,3 +6936,4 @@ msgid ""
msgstr "" msgstr ""
"Ошибка при установке пути: sys.path не является списком\n" "Ошибка при установке пути: sys.path не является списком\n"
"Следует добавить vim.VIM_SPECIAL_PATH в sys.path" "Следует добавить vim.VIM_SPECIAL_PATH в sys.path"