diff options
| -rw-r--r-- | runtime/doc/if_perl.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/index.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/os_win32.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/tagsrch.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 66 | ||||
| -rw-r--r-- | runtime/doc/usr_25.txt | 2 | ||||
| -rw-r--r-- | runtime/ftplugin/fortran.vim | 20 | ||||
| -rw-r--r-- | runtime/ftplugin/python.vim | 19 | ||||
| -rw-r--r-- | runtime/syntax/d.vim | 31 | ||||
| -rw-r--r-- | src/po/uk.cp1251.po | 534 | ||||
| -rw-r--r-- | src/po/uk.po | 534 |
11 files changed, 807 insertions, 419 deletions
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index 95c607bcaa..7be5f06f68 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 7.4. Last change: 2012 Oct 25 +*if_perl.txt* For Vim version 7.4. Last change: 2013 Oct 05 VIM REFERENCE MANUAL by Sven Verdoolaege diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 91b7208da9..49f28f30a8 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.4. Last change: 2013 Jul 17 +*index.txt* For Vim version 7.4. Last change: 2013 Oct 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1191,12 +1191,12 @@ tag command action ~ |:digraphs| :dig[raphs] show or enter digraphs |:display| :di[splay] display registers |:djump| :dj[ump] jump to #define -|:dl| :dl short for |:delete| -|:dl| :del[ete]l short for |:delete| +|:dl| :dl short for |:delete| with the 'l' flag +|:dl| :del[ete]l short for |:delete| with the 'l' flag |:dlist| :dli[st] list #defines |:doautocmd| :do[autocmd] apply autocommands to current buffer |:doautoall| :doautoa[ll] apply autocommands for all loaded buffers -|:dp| :d[elete]p short for |:delete| +|:dp| :d[elete]p short for |:delete| with the 'p' flag |:drop| :dr[op] jump to window editing file or edit file in current window |:dsearch| :ds[earch] list one #define diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index f029a7a65a..a01a06c8ec 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -93,7 +93,7 @@ the default value of 'term' from the environment variable "TERM". $PATH *win32-PATH* The directory of the Vim executable is appended to $PATH. This is mostly to -make "!xxd' work, as it is in the Tools menu. And it also means that when +make "!xxd" work, as it is in the Tools menu. And it also means that when executable() returns 1 the executable can actually be executed. ============================================================================== diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 74f40e7db8..06c9838603 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 7.4. Last change: 2013 Jul 28 +*tagsrch.txt* For Vim version 7.4. Last change: 2013 Oct 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -771,11 +771,11 @@ CTRL-W i Open a new window, with the cursor on the first line *:dli* *:dlist* :[range]dli[st][!] [/]string[/] - Like "[D" and "]D", but search in [range] lines + Like `[D` and `]D`, but search in [range] lines (default: whole file). See |:search-args| for [/] and [!]. {not in Vi} - Note that ":dl" works like ":delete" with the "l" - register. + Note that `:dl` works like `:delete` with the "l" + flag, not `:dlist`. *[_CTRL-D* [ CTRL-D Jump to the first macro definition that contains the diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 0c61721c20..ae74a41d9f 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2013 Sep 22 +*todo.txt* For Vim version 7.4. Last change: 2013 Oct 05 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,19 +34,9 @@ not be repeated below, unless there is extra information. *known-bugs* -------------------- Known bugs and current work ----------------------- -NFA engine mismatch, with example. (ZyX, 2013 Aug 29) - -NFA engine difference, with test case. (Axel Bender, 2013 Sep 17) -Comments from Vlad Irnov Sep 18. - Problem positioning the cursor after auto-formatting without a comment. (Tor Perkins, 2013 Sep 1) -Patch to fix test 92 and 93 failing in a bad way. (Hirohito Higashi, 2013 Sep -11) - -Patch to fix using "p" in Visual block mode. (Christian Brabandt, 2013 Sep 19) - Using \1 in pattern goes one line too far. (Bohr Shaw, 2013 Sep 5) Column is OK. "/\v(^.+\n)\1/e" (John Little, Sep 5) Also, matches start of 2nd line, not the whole line. @@ -55,38 +45,30 @@ Error for incomplete help argument. (John Beckett, 2013 Sep 12) Popup menu: first item is not selected when typing more than one character? -Patch to add async functionality. (Geoff Greer, 2013 Sep 1) - -Patch to avoid mouse cursor flickering. (Ken Takata,, 2013 Sep 2) - -Patch to make zg and zb work better. (Christian Brabandt, 2013 Sep 8) - -Patch to fix that VC10 does not stat() a symlink to a directory. -(Ken Takata,, 2013 Sep 20) Update Sep 21 - Should win_redr_custom() not be allowed to use recursively? (Yasuhiro Matsumoto, 2013 Aug 15) NFA engine combining character mismatch. (glts, 2013 Aug 27) Remark Dominique, Aug 27 -Patch to make Tcl 8.6 work. (Issue 167) - -Patch to make input() work while inside :normal. (Yasuhiro Matsumoto, 2013 Sep -19) +Problem that a previous silent ":throw" causes a following try/catch not to +work. (ZyX, 2013 Sep 28) Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15) Issue 164: freeze on regexp search. -Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) +Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in +ftplugins. -Patch to fix substitute prompt with line number. (Benoit Pierre, 2013 Aug 27, -third message) +Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) Patch to avoid problem with colon in file name. (Yasuhiro Matsumoto, 2013 Sep 5) Only copy file name when needed: Sep 9. +Patch to make #N in 'cino' stop not indenting #lines. (Christian Brabandt, +2013 Sep 25) + Include systemverilog file? Two votes yes. Wrapping around end of file does not work for "." after "cgn". (Dimitar @@ -108,6 +90,12 @@ Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19) Patch to make has() check for Vim version and patch at the same time. (Marc Weber, 2013 Jun 7) +Patch to fix Visual-block insert using cursor keys. (Christian Brabandt, 2013 +Sep 28) With test Sept 29. + +VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow +instead. (Samuel Ferencik, 2013 Sep 28) + Several syntax file match "^\s*" which may get underlined if that's in the highlight group. Add a "\zs" after it? @@ -118,6 +106,14 @@ Patch 2013 Sept 10, test: Sept 11. Go through more coverity reports. +Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep +29) + +Patch to make ColorScheme autocommand match with the colorscheme name instead +of the buffer name. (Christian Brabandt, 2013 Sep 25) + +Patch to right-align signs. (James Kolb (email james), 2013 Sep 23) + With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa, 2013 Sep 5) @@ -131,6 +127,9 @@ Patches to fix this. (Ken Takata, 2013 Aug 9) :help gives example for z?, but it does not work. m? and t? do work. +Python: Extended funcrefs: use func_T* structure in place of char_u* function +names. (ZyX, 2013 Jul 15, update Sep 22, 24, 28) + Patch to add funcref to Lua. (Luis Carvalho, 2013 Sep 4) With tests: Sep 5. @@ -280,9 +279,6 @@ b:undo_ftplugin cannot call a script-local function. (Boris Danilov, 2013 Jan Win32: The Python interface only works with one version of Python, selected at compile time. Can this be made to work with version 2.1 and 2.2 dynamically? -Python: Extended funcrefs: use func_T* structure in place of char_u* function -names. (ZyX, 2013 Jul 15 and later) - Python: Be able to define a Python function that can be called directly from Vim script. Requires converting the arguments and return value, like with vim.bindeval(). @@ -387,6 +383,7 @@ And one for gui_x11.txt. More recent version: https://retracile.net/wiki/VimBreakIndent Posted to vim-dev by Taylor Hedberg, 2011 Nov 25 Update by Taylor Hedberg, 2013 May 30. + Updated for Vim 7.4 by Ken Takata, 2013 Oct 5. ":cd" doesn't work when current directory path contains "**". finddir() has the same problem. (Yukihiro Nakadaira, 2012 Jan 10) @@ -989,7 +986,7 @@ correct. Don't use it in the swap file. Completion for ":buf" doesn't work properly on Win32 when 'shellslash' is off. (Henrik Ohman, 2009, Jan 29) -shellescape() depends on 'shellshash' for quoting. That doesn't work when +shellescape() depends on 'shellslash' for quoting. That doesn't work when 'shellslash' is set but using cmd.exe. (Ben Fritz) Use a different option or let it depend on whether 'shell' looks like a unix-like shell? @@ -1403,7 +1400,7 @@ Ebersbach, 2008 Feb 1) Menu item that does "xxd -r" doesn't work when 'fileencoding' is utf-16. Check for this and use iconv? (Edward L. Fox, 2007 Sep 12) -Does the conversion in the other direction work when 'filenecodings' is set +Does the conversion in the other direction work when 'fileencodings' is set properly? Cursor displayed in the wrong position when using 'numberwidth'. (James Vega, @@ -1817,7 +1814,7 @@ Awaiting updated patches: How does this work? Missing comments. 8 Add a few more command names to the menus. Patch from Jiri Brezina (28 feb 2002). Will mess the translations... -7 ATTENTION dialog choices are more logical when "Delete it' appears +7 ATTENTION dialog choices are more logical when "Delete it" appears before "Quit". Patch by Robert Webb, 2004 May 3. - Include flipcase patch: ~/vim/patches/wall.flipcase2 ? Make it work for multi-byte characters. @@ -3250,6 +3247,7 @@ Syntax highlighting: Built-in script language: 8 Make the filename and line number available to script functions, so that they can give useful debugging info. The whole call stack would be ideal. + At least use this for error messages. 7 Execute a function with standard option values. No need to save and restore option values. Especially useful for new options. Problem: how to avoid a performance penalty (esp. for string options)? @@ -4752,7 +4750,7 @@ Marks: Digraphs: 7 Make "ga" show the keymap for a character, if it exists. - Also show the code of the character after conversion to 'filenecoding'. + Also show the code of the character after conversion to 'fileencoding'. - Use digraph table to tell Vim about the collating sequence of special characters? 8 Add command to remove one or more (all) digraphs. (Brown) diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt index 01f21a18a5..5a687599b3 100644 --- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -86,7 +86,7 @@ line, type: > v4jgq -"v" to start Visual mode, "4j' to move to the end of the paragraph and then +"v" to start Visual mode, "4j" to move to the end of the paragraph and then the "gq" operator. The result is: 1 2 3 diff --git a/runtime/ftplugin/fortran.vim b/runtime/ftplugin/fortran.vim index 110dab3a8d..7591edd821 100644 --- a/runtime/ftplugin/fortran.vim +++ b/runtime/ftplugin/fortran.vim @@ -1,12 +1,12 @@ " Vim settings file " Language: Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66) -" Version: 0.48 -" Last Change: 2012 Apr. 18 -" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www.unb.ca/chem/ajit/> +" Version: 0.49 +" Last Change: 2013 Oct. 01 +" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/> " Usage: Do :help fortran-plugin from Vim " Credits: -" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, and Ben -" Fritz. +" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, Ben +" Fritz, and David Barnett. " Only do these settings when not done yet for this buffer if exists("b:did_ftplugin") @@ -64,8 +64,8 @@ if (b:fortran_fixed_source == 1) " setlocal tw=73 else setlocal comments=:! - " Free format allows a textwidth of 132 for code but 80 is more usual - setlocal tw=80 + " Free format allows a textwidth of 132 + setlocal tw=132 endif " Set commentstring for foldmethod=marker @@ -76,8 +76,8 @@ if !exists("fortran_have_tabs") setlocal expandtab endif -" Set 'formatoptions' to break comment and text lines but allow long lines -setlocal fo+=tcql +" Set 'formatoptions' to break text lines +setlocal fo+=t setlocal include=^\\c#\\=\\s*include\\s\\+ setlocal suffixesadd+=.f08,.f03,.f95,.f90,.for,.f,.F,.f77,.ftn,.fpp @@ -114,7 +114,7 @@ if has("gui_win32") && !exists("b:browsefilter") \ "All Files (*.*)\t*.*\n" endif -let b:undo_ftplugin = "setl fo< com< tw< cms< et< inc<" +let b:undo_ftplugin = "setl fo< com< tw< cms< et< inc< sua<" \ . "| unlet! b:match_ignorecase b:match_words b:browsefilter" let &cpoptions=s:cposet diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim index 2b091a1745..d823d68c9b 100644 --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file " Language: python " Maintainer: Johannes Zellner <johannes@zellner.org> -" Last Change: Wed, 21 Apr 2004 13:13:08 CEST +" Last Change: 2013 Sep 25 +" Last Change By Johannes: Wed, 21 Apr 2004 13:13:08 CEST if exists("b:did_ftplugin") | finish | endif let b:did_ftplugin = 1 @@ -44,5 +45,21 @@ if has("gui_win32") && !exists("b:browsefilter") \ "All Files (*.*)\t*.*\n" endif +" As suggested by PEP8. +setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8 + +" First time: try finding "pydoc". +if !exists('g:pydoc_executable') + if executable('pydoc') + let g:pydoc_executable = 1 + else + let g:pydoc_executable = 0 + endif +endif +" If "pydoc" was found use it for keywordprg. +if g:pydoc_executable + setlocal keywordprg=pydoc +endif + let &cpo = s:keepcpo unlet s:keepcpo diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim index 65408643d5..52c83bf913 100644 --- a/runtime/syntax/d.vim +++ b/runtime/syntax/d.vim @@ -2,8 +2,8 @@ " " Language: D " Maintainer: Jesse Phillips <Jesse.K.Phillips+D@gmail.com> -" Last Change: 2013 May 21 -" Version: 0.25 +" Last Change: 2013 October 5 +" Version: 0.26 " " Contributors: " - Jason Mills: original Maintainer @@ -158,7 +158,7 @@ syn match dStatement "\<__traits\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+8 contains= " Pragma Statement syn match dPragma "\<pragma\>" -syn match dPragma "\<pragma\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+8 contains=dPragmaIdentifier +syn match dPragma "\<pragma\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+6 contains=dPragmaIdentifier " Necessary to highlight C++ in extern modifiers. syn match dExternIdentifier "C\(++\)\?" contained @@ -168,16 +168,18 @@ syn match dExternal "\<extern\>" syn match dExtern "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier " Make import a region to prevent highlighting keywords -syn region dImport start="import" end=";" contains=dExternal,@dComment +syn region dImport start="import\_s" end=";" contains=dExternal,@dComment " Make module a region to prevent highlighting keywords -syn region dImport start="module" end=";" contains=dExternal,@dComment +syn region dImport start="module\_s" end=";" contains=dExternal,@dComment " dTokens is used by the token string highlighting syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean syn cluster dTokens add=dConstant,dTypedef,dStructure,dOperator,dOpOverload syn cluster dTokens add=dType,dDebug,dExceptions,dScopeDecl,dStatement syn cluster dTokens add=dStorageClass,dPragma,dAssert,dAnnotation,dEnum +syn cluster dTokens add=dParenString,dBrackString,dAngleString,dCurlyString +syn cluster dTokens add=dTokenString,dDelimString,dHereString " Create a match for parameter lists to identify storage class syn region paramlist start="(" end=")" contains=@dTokens @@ -192,6 +194,9 @@ syn cluster dTokens add=dUserLabel,dLabel " Comments " +syn match dCommentError display "\*/" +syn match dNestedCommentError display "+/" + syn keyword dTodo contained TODO FIXME TEMP REFACTOR REVIEW HACK BUG XXX syn match dCommentStar contained "^\s*\*[^/]"me=e-1 syn match dCommentStar contained "^\s*\*$" @@ -201,15 +206,12 @@ if exists("d_comment_strings") syn region dBlockCommentString contained start=+"+ end=+"+ end=+\*/+me=s-1,he=s-1 contains=dCommentStar,dUnicode,dEscSequence,@Spell syn region dNestedCommentString contained start=+"+ end=+"+ end="+"me=s-1,he=s-1 contains=dCommentPlus,dUnicode,dEscSequence,@Spell syn region dLineCommentString contained start=+"+ end=+$\|"+ contains=dUnicode,dEscSequence,@Spell - syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell fold - syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell fold - syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell -else - syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell fold - syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell fold - syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell endif +syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,dCommentStartError,@Spell fold +syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell fold +syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell + hi link dLineCommentString dBlockCommentString hi link dBlockCommentString dString hi link dNestedCommentString dString @@ -249,7 +251,7 @@ syn region dRawString start=+`+ end=+`[cwd]\=+ contains=@Spell syn region dRawString start=+r"+ end=+"[cwd]\=+ contains=@Spell syn region dHexString start=+x"+ end=+"[cwd]\=+ contains=@Spell syn region dDelimString start=+q"\z(.\)+ end=+\z1"+ contains=@Spell -syn region dHereString start=+q"\z(\I\i*\)\n+ end=+\n\z1"+ contains=@Spell +syn region dHereString start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell " Nesting delimited string contents " @@ -368,6 +370,9 @@ hi def link dType Type hi def link dLineComment Comment hi def link dBlockComment Comment hi def link dNestedComment Comment +hi def link dCommentError Error +hi def link dNestedCommentError Error +hi def link dCommentStartError Error hi def link dExternal Include hi def link dAnnotation PreProc hi def link dSharpBang PreProc diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po index 7d4b572b3c..7e2457f3d3 100644 --- a/src/po/uk.cp1251.po +++ b/src/po/uk.cp1251.po @@ -12,9 +12,9 @@ # msgid "" msgstr "" -"Project-Id-Version: vim 7.3\n" +"Project-Id-Version: vim 7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-17 10:06+0200\n" +"POT-Creation-Date: 2013-09-29 09:05+0300\n" "PO-Revision-Date: 2010-06-18 21:53+0300\n" "Last-Translator: Анатолій Сахнік <sakhnik@gmail.com>\n" "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n" @@ -141,6 +141,9 @@ msgstr "[Новий файл]" msgid "[Read errors]" msgstr "[Помилки читання]" +msgid "[RO]" +msgstr "[RO]" + msgid "[readonly]" msgstr "[лише читати]" @@ -428,6 +431,10 @@ msgstr "E130: Невідома функція: %s" msgid "E461: Illegal variable name: %s" msgstr "E461: Неприпустима назва змінної: %s" +# msgstr "E373: " +msgid "E806: using Float as a String" +msgstr "E806: Float вжито як String" + msgid "E687: Less targets than List items" msgstr "E687: Цілей менше, ніж елементів списку" @@ -594,16 +601,16 @@ msgstr "E785: complete() можна вживати тільки в режимі вставки" msgid "&Ok" msgstr "&O:Гаразд" -# msgstr "E14: " -msgid "extend() argument" -msgstr "аргумент extend()" - # msgstr "E226: " #, c-format msgid "E737: Key already exists: %s" msgstr "E737: Ключ вже існує: %s" # msgstr "E14: " +msgid "extend() argument" +msgstr "аргумент extend()" + +# msgstr "E14: " msgid "map() argument" msgstr "аргумент map()" @@ -710,10 +717,6 @@ msgstr "E730: List вжито як String" msgid "E731: using Dictionary as a String" msgstr "E731: Dictionary вжито як String" -# msgstr "E373: " -msgid "E806: using Float as a String" -msgstr "E806: Float вжито як String" - #, c-format msgid "E706: Variable type mismatch for: %s" msgstr "E706: Неправильний тип змінної: %s" @@ -752,6 +755,9 @@ msgstr "E123: Невизначена функція: %s" msgid "E124: Missing '(': %s" msgstr "E124: Бракує '(': %s" +msgid "E862: Cannot use g: here" +msgstr "E862: Тут не можна використати g:" + #, c-format msgid "E125: Illegal argument: %s" msgstr "E125: Недозволений аргумент: %s" @@ -1152,6 +1158,10 @@ msgstr "E148: У global бракує зразка" msgid "Pattern found in every line: %s" msgstr "Зразок знайдено у кожному рядку: %s" +#, c-format +msgid "Pattern not found: %s" +msgstr "Зразок не знайдено: %s" + msgid "" "\n" "# Last Substitute String:\n" @@ -1332,7 +1342,8 @@ msgid "E183: User defined commands must start with an uppercase letter" msgstr "E183: Команди користувача повинні починатися з великої літери" msgid "E841: Reserved name, cannot be used for user defined command" -msgstr "E841: Зарезервована назва, не можна використати для користувацької команди" +msgstr "" +"E841: Зарезервована назва, не можна використати для користувацької команди" # msgstr "E183: " #, c-format @@ -1686,9 +1697,6 @@ msgstr "[сокет]" msgid "[character special]" msgstr "[спец. символьний]" -msgid "[RO]" -msgstr "[RO]" - msgid "[CR missing]" msgstr "[Бракує CR]" @@ -1940,8 +1948,7 @@ msgstr "Див. «:help W11» для уточнення." #, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" -msgstr "" -"W16: Застереження: Режим файлу «%s» змінився після початку редагування" +msgstr "W16: Застереження: Режим файлу «%s» змінився після початку редагування" msgid "See \":help W16\" for more info." msgstr "Див. «:help W16» для уточнення." @@ -2308,32 +2315,28 @@ msgid "Font '%s' is not fixed-width" msgstr "Шрифт '%s' не є моноширинним" #, c-format -msgid "E253: Fontset name: %s\n" -msgstr "E253: Назва набору шрифтів: %s\n" +msgid "E253: Fontset name: %s" +msgstr "E253: Назва набору шрифтів: %s" #, c-format -msgid "Font0: %s\n" -msgstr "Шрифт0: %s\n" +msgid "Font0: %s" +msgstr "Шрифт0: %s" #, c-format -msgid "Font1: %s\n" -msgstr "Шрифт1: %s\n" +msgid "Font1: %s" +msgstr "Шрифт1: %s" #, c-format -msgid "Font%ld width is not twice that of font0\n" -msgstr "Ширина шрифту%ld має бути удвічі більшою за ширину шрифту0\n" +msgid "Font%ld width is not twice that of font0" +msgstr "Ширина шрифту%ld не більша удвічі за ширину шрифту0" #, c-format -msgid "Font0 width: %ld\n" -msgstr "Ширина шрифту0: %ld\n" +msgid "Font0 width: %ld" +msgstr "Ширина шрифту0: %ld" #, c-format -msgid "" -"Font1 width: %ld\n" -"\n" -msgstr "" -"Ширина шрифту1: %ld\n" -"\n" +msgid "Font1 width: %ld" +msgstr "Ширина шрифту1: %ld" msgid "Invalid font specification" msgstr "Некоректна специфікація шрифту" @@ -2526,6 +2529,9 @@ msgstr "E566: Не вдалося створити канали до cscope" msgid "E622: Could not fork for cscope" msgstr "E622: Не вдалося розділити процес для cscope" +msgid "cs_create_connection setpgid failed" +msgstr "cs_create_connection: помилка setpgid" + msgid "cs_create_connection exec failed" msgstr "cs_create_connection: помилка під час виконання" @@ -2672,6 +2678,9 @@ msgstr "не вдалося вставити рядок" msgid "string cannot contain newlines" msgstr "більше ніж один рядок" +msgid "error converting Scheme values to Vim" +msgstr "не вдалося перетворити значення Scheme у Vim" + msgid "Vim error: ~a" msgstr "Помилка Vim: ~a" @@ -2693,9 +2702,6 @@ msgstr "не дозволено у пісочниці Vim" msgid "E837: This Vim cannot execute :py3 after using :python" msgstr "E837: Python: Не можна використати :py і :py3 в одному сеансі" -msgid "only string keys are allowed" -msgstr "Дозволено тільки текстові ключі" - msgid "" "E263: Sorry, this command is disabled, the Python library could not be " "loaded." @@ -2703,28 +2709,12 @@ msgstr "" "E263: Вибачте, ця команда вимкнена, бібліотека Python не може бути " "завантажена." -msgid "E860: Eval did not return a valid python 3 object" -msgstr "E860: Eval не повернув дійсний об’єкт python 3" - -msgid "E861: Failed to convert returned python 3 object to vim value" -msgstr "E861: Не вдалося перетворити об’єкт python 3 у значення vim" - -#, c-format -msgid "<buffer object (deleted) at %p>" -msgstr "<об'єкт буфера (знищено) за адресою %p>" - msgid "E836: This Vim cannot execute :python after using :py3" msgstr "E836: Python: Не можна використати :py і :py3 в одному сеансі" msgid "E659: Cannot invoke Python recursively" msgstr "E659: Не можна рекурсивно викликати Python" -msgid "E858: Eval did not return a valid python object" -msgstr "E858: Eval не повернув дійсний об’єкт python" - -msgid "E859: Failed to convert returned python object to vim value" -msgstr "E859: Не вдалося перетворити об’єкт python у значення vim" - msgid "E265: $_ must be an instance of String" msgstr "E265: $_ має бути екземпляром String" @@ -2942,8 +2932,7 @@ msgid "Garbage after option argument" msgstr "Сміття після аргументу опції" msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments" -msgstr "" -"Забагато аргументів у «+команда», «-c команда» або «--cmd команда»" +msgstr "Забагато аргументів у «+команда», «-c команда» або «--cmd команда»" # msgstr "E14: " msgid "Invalid argument for" @@ -3483,8 +3472,7 @@ msgstr "E302: Не вдалося перейменувати файлу обміну" # msgstr "E302: " #, c-format msgid "E303: Unable to open swap file for \"%s\", recovery impossible" -msgstr "" -"E303: Не вдалося прочитати файл обміну для «%s», відновлення неможливе" +msgstr "E303: Не вдалося прочитати файл обміну для «%s», відновлення неможливе" msgid "E304: ml_upd_block0(): Didn't get block 0??" msgstr "E304: ml_upd_block0(): Немає блоку 0??" @@ -4092,13 +4080,6 @@ msgstr " (Перервано)" msgid "Beep!" msgstr "Дзень!" -msgid "Vim: preserving files...\n" -msgstr "Vim: Заготовлюються файли...\n" - -#. close all memfiles, without deleting -msgid "Vim: Finished.\n" -msgstr "Vim: Завершено.\n" - msgid "ERROR: " msgstr "ПОМИЛКА: " @@ -4628,17 +4609,6 @@ msgstr "E244: Некоректна назва набору символів «%s» у назві шрифту «%s»" msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: Помилковий символ %c в назві шрифту «%s»" -msgid "Vim: Double signal, exiting\n" -msgstr "Vim: Двічі отримано сигнал, вихід\n" - -#, c-format -msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: Отримано фатальний сигнал (%s)\n" - -#, c-format -msgid "Vim: Caught deadly signal\n" -msgstr "Vim: Отримано фатальний сигнал\n" - #, c-format msgid "Opening the X display took %ld msec" msgstr "На відкриття дисплею X пішло %ld мілісекунд" @@ -4861,19 +4831,9 @@ msgstr "E777: Очікується String чи List" msgid "E369: invalid item in %s%%[]" msgstr "E369: Некоректний елемент у %s%%[]" -# msgstr "E382: " -msgid "E339: Pattern too long" -msgstr "E339: Зразок занадто довгий" - -msgid "E50: Too many \\z(" -msgstr "E50: Забагато \\z(" - #, c-format -msgid "E51: Too many %s(" -msgstr "E51: Забагато %s(" - -msgid "E52: Unmatched \\z(" -msgstr "E52: Немає пари \\z(" +msgid "E769: Missing ] after %s[" +msgstr "E769: Бракує ] після %s[" #, c-format msgid "E53: Unmatched %s%%(" @@ -4887,6 +4847,36 @@ msgstr "E54: Немає пари %s(" msgid "E55: Unmatched %s)" msgstr "E55: Немає пари %s)" +# msgstr "E406: " +msgid "E66: \\z( not allowed here" +msgstr "E66: \\z( тут не дозволено" + +# msgstr "E406: " +msgid "E67: \\z1 et al. not allowed here" +msgstr "E67: \\z1 та ін. тут не дозволено" + +#, c-format +msgid "E69: Missing ] after %s%%[" +msgstr "E69: Пропущено ] після %s%%[" + +#, c-format +msgid "E70: Empty %s%%[]" +msgstr "E70: %s%%[] порожній" + +# msgstr "E382: " +msgid "E339: Pattern too long" +msgstr "E339: Зразок занадто довгий" + +msgid "E50: Too many \\z(" +msgstr "E50: Забагато \\z(" + +#, c-format +msgid "E51: Too many %s(" +msgstr "E51: Забагато %s(" + +msgid "E52: Unmatched \\z(" +msgstr "E52: Немає пари \\z(" + #, c-format msgid "E59: invalid character after %s@" msgstr "E59: Недозволений символ після %s@" @@ -4916,26 +4906,10 @@ msgstr "E64: Після %s%c нічого немає" msgid "E65: Illegal back reference" msgstr "E65: Некоректне зворотнє посилання" -# msgstr "E406: " -msgid "E66: \\z( not allowed here" -msgstr "E66: \\z( тут не дозволено" - -# msgstr "E406: " -msgid "E67: \\z1 et al. not allowed here" -msgstr "E67: \\z1 та ін. тут не дозволено" - msgid "E68: Invalid character after \\z" msgstr "E68: Неправильний символ після \\z" #, c-format -msgid "E69: Missing ] after %s%%[" -msgstr "E69: Пропущено ] після %s%%[" - -#, c-format -msgid "E70: Empty %s%%[]" -msgstr "E70: %s%%[] порожній" - -#, c-format msgid "E678: Invalid character after %s%%[dxouU]" msgstr "E678: Недозволений символ після %s%%[dxouU]" @@ -4943,10 +4917,6 @@ msgstr "E678: Недозволений символ після %s%%[dxouU]" msgid "E71: Invalid character after %s%%" msgstr "E71: Недозволений символ після %s%%" -#, c-format -msgid "E769: Missing ] after %s[" -msgstr "E769: Бракує ] після %s[" - # msgstr "E64: " #, c-format msgid "E554: Syntax error in %s{...}" @@ -4955,6 +4925,80 @@ msgstr "E554: Синтаксична помилка в %s{...}" msgid "External submatches:\n" msgstr "Зовнішні під-збіги:\n" +msgid "" +"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " +"used " +msgstr "" +"E864: після \\%#= може бути тільки 0, 1, or 2. Буде використано автоматичний механізм " + +#, c-format +msgid "E866: (NFA regexp) Misplaced %c" +msgstr "E866: (NFA regexp) Не на місці %c" + +msgid "E865: (NFA) Regexp end encountered prematurely" +msgstr "E865: (NFA) Зарано трапився кінець регулярного виразу" + +#, c-format +msgid "E867: (NFA) Unknown operator '\\z%c'" +msgstr "E867: (NFA) Невідомий оператор '\\z%c'" + +#, c-format +msgid "E867: (NFA) Unknown operator '\\%%%c'" +msgstr "E867: (NFA) Невідомий оператор '\\%%%c'" + +#. should never happen +msgid "E868: Error building NFA with equivalence class!" +msgstr "E868: Не вдалося побудувати NFA з класом еквівалентності!" + +#, c-format +msgid "E869: (NFA) Unknown operator '\\@%c'" +msgstr "E869: (NFA) Невідомий оператор '\\@%c'" + +msgid "E870: (NFA regexp) Error reading repetition limits" +msgstr "E870: (NFA regexp) Не вдалося прочитати межі повторення" + +#. Can't have a multi follow a multi. +msgid "E871: (NFA regexp) Can't have a multi follow a multi !" +msgstr "E871: (NFA regexp) Мульти не може бути за мульти!" + +#. Too many `(' +msgid "E872: (NFA regexp) Too many '('" +msgstr "E872: (NFA regexp) Забагато '('" + +msgid "E879: (NFA regexp) Too many \\z(" +msgstr "E879: (NFA regexp) Забагато \\z(" + +msgid "E873: (NFA regexp) proper termination error" +msgstr "E873: (NFA regexp) помилка належного припинення" + +msgid "E874: (NFA) Could not pop the stack !" +msgstr "E874: (NFA) Стек порожній!" + +msgid "" +"E875: (NFA regexp) (While converting from postfix to NFA), too many states " +"left on stack" +msgstr "" +"E875: (NFA regexp) (Під час перетворення з постфікс у NFA) залишилося " +"забагато станів у стеку" + +msgid "E876: (NFA regexp) Not enough space to store the whole NFA " +msgstr "E876: (NFA regexp) Недостатньо пам’яті, щоб зберегти весь NFA " + +msgid "E878: (NFA) Could not allocate memory for branch traversal!" +msgstr "E878: (NFA) Не вдалося отримати пам’ять для обходу гілок!" + +msgid "" +"Could not open temporary log file for writing, displaying on stderr ... " +msgstr "" +"Не вдалося відкрити тимчасовий файл журналу для запису, показується на stderr ... " + +#, c-format +msgid "(NFA) COULD NOT OPEN %s !" +msgstr "(NFA) НЕ ВДАЛОСЯ ВІДКРИТИ %s!" + +msgid "Could not open temporary log file for writing " +msgstr "Не вдалося відкрити тимчасовий файл журналу для запису " + msgid " VREPLACE" msgstr " ВІРТ ЗАМІНА" @@ -5110,7 +5154,8 @@ msgstr "E756: Перевірка орфографії не дозволена" #, c-format msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\"" -msgstr "Застереження: Не вдалося знайти список слів «%s_%s.spl» чи «%s_ascii.spl»" +msgstr "" +"Застереження: Не вдалося знайти список слів «%s_%s.spl» чи «%s_ascii.spl»" #, c-format msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\"" @@ -5396,12 +5441,12 @@ msgid "E765: 'spellfile' does not have %ld entries" msgstr "E765: 'spellfile' не містить %ld елементів" #, c-format -msgid "Word removed from %s" -msgstr "Слово знищено з %s" +msgid "Word '%.*s' removed from %s" +msgstr "Слово '%.*s' знищено з %s" #, c-format -msgid "Word added to %s" -msgstr "Слово додано до %s" +msgid "Word '%.*s' added to %s" +msgstr "Слово '%.*s' додано до %s" msgid "E763: Word characters differ between spell files" msgstr "E763: Символи у слові відрізняються у файлах орфографії" @@ -5457,6 +5502,10 @@ msgstr "E782: Помилка читання файлу .sug: %s" msgid "E783: duplicate char in MAP entry" msgstr "E783: Повторено символ у елементі MAP" +# msgstr "E391: " +msgid "No Syntax items defined for this buffer" +msgstr "Для буфера не визначено елементів синтаксису" + #, c-format msgid "E390: Illegal argument: %s" msgstr "E390: Неправильний аргумент: %s" @@ -5465,10 +5514,6 @@ msgstr "E390: Неправильний аргумент: %s" msgid "E391: No such syntax cluster: %s" msgstr "E391: Немає такого синтаксичного кластера: %s" -# msgstr "E391: " -msgid "No Syntax items defined for this buffer" -msgstr "Для буфера не визначено елементів синтаксису" - msgid "syncing on C-style comments" msgstr "синхронізується по коментарях стилю С" @@ -5603,6 +5648,11 @@ msgstr "E409: Невідома назва групи: %s" msgid "E410: Invalid :syntax subcommand: %s" |