diff options
-rw-r--r-- | runtime/autoload/getscript.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/phpcomplete.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/tar.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/vimball.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/zip.vim | 6 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 3 | ||||
-rw-r--r-- | runtime/doc/intro.txt | 14 | ||||
-rw-r--r-- | runtime/doc/pi_netrw.txt | 12 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 18 | ||||
-rw-r--r-- | runtime/indent/cdl.vim | 2 | ||||
-rw-r--r-- | runtime/indent/html.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/ave.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/fortran.vim | 14 | ||||
-rw-r--r-- | runtime/syntax/sh.vim | 2 | ||||
-rw-r--r-- | src/po/uk.cp1251.po | 1252 | ||||
-rw-r--r-- | src/po/uk.po | 1252 |
16 files changed, 1422 insertions, 1165 deletions
diff --git a/runtime/autoload/getscript.vim b/runtime/autoload/getscript.vim index d50bc2edc0..f64c5f199d 100644 --- a/runtime/autoload/getscript.vim +++ b/runtime/autoload/getscript.vim @@ -236,7 +236,7 @@ fun! getscript#GetLatestVimScripts() " call Decho("..depscript<".depscript.">") " found a "GetLatestVimScripts: # #" line in the script; - " check if its already in the datafile by searching backwards from llp1, + " check if it's already in the datafile by searching backwards from llp1, " the (prior to reading in the plugin script) last line plus one of the GetLatestVimScripts.dat file, " for the script-id with no wrapping allowed. let curline = line(".") diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim index 7f25d9df33..0d01bc8bf1 100644 --- a/runtime/autoload/phpcomplete.vim +++ b/runtime/autoload/phpcomplete.vim @@ -931,7 +931,7 @@ function! phpcomplete#EvaluateModifiers(modifiers, required_modifiers, prohibite endfor for modifier in a:modifiers - " if the modifier is prohibited its a no match + " if the modifier is prohibited it's a no match if index(a:prohibited_modifiers, modifier) != -1 return 0 endif diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim index 5e76870cce..9c518cb9d0 100644 --- a/runtime/autoload/tar.vim +++ b/runtime/autoload/tar.vim @@ -117,7 +117,7 @@ fun! tar#Browse(tarfile) if !filereadable(a:tarfile) " call Decho('a:tarfile<'.a:tarfile.'> not filereadable') if a:tarfile !~# '^\a\+://' - " if its an url, don't complain, let url-handlers such as vim do its thing + " if it's an url, don't complain, let url-handlers such as vim do its thing redraw! echohl Error | echo "***error*** (tar#Browse) File not readable<".a:tarfile.">" | echohl None endif diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim index 1af6b19c88..9c7dcbda0f 100644 --- a/runtime/autoload/vimball.vim +++ b/runtime/autoload/vimball.vim @@ -347,7 +347,7 @@ fun! vimball#Vimball(really,...) " call Decho("exe tabn ".curtabnr) exe "tabn ".curtabnr - " set up help if its a doc/*.txt file + " set up help if it's a doc/*.txt file " call Decho("didhelp<".didhelp."> fname<".fname.">") if a:really && didhelp == "" && fname =~ 'doc/[^/]\+\.\(txt\|..x\)$' let didhelp= substitute(fname,'^\(.*\<doc\)[/\\][^.]*\.\(txt\|..x\)$','\1','') diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 824af01fe8..ea086e0882 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -65,14 +65,14 @@ endif " zip#Browse: {{{2 fun! zip#Browse(zipfile) " call Dfunc("zip#Browse(zipfile<".a:zipfile.">)") - " sanity check: insure that the zipfile has "PK" as its first two letters + " sanity check: ensure that the zipfile has "PK" as its first two letters " (zipped files have a leading PK as a "magic cookie") if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK' exe "noautocmd e ".fnameescape(a:zipfile) " call Dret("zip#Browse : not a zipfile<".a:zipfile.">") return " else " Decho -" call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file") +" call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - it's a zip file") endif let repkeep= &report @@ -95,7 +95,7 @@ fun! zip#Browse(zipfile) endif if !filereadable(a:zipfile) if a:zipfile !~# '^\a\+://' - " if its an url, don't complain, let url-handlers such as vim do its thing + " if it's an url, don't complain, let url-handlers such as vim do its thing redraw! echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None " call inputsave()|call input("Press <cr> to continue")|call inputrestore() diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 658bc55386..d34fa5be26 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.0. Last change: 2016 Sep 22 +*eval.txt* For Vim version 8.0. Last change: 2016 Sep 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4788,6 +4788,7 @@ histadd({history}, {item}) *histadd()* "expr" or "=" typed expression history "input" or "@" input line history "debug" or ">" debug command history + empty the current or last used history The {history} string does not need to be the whole name, one character is sufficient. If {item} does already exist in the history, it will be diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 21ef5e3d4a..58459057d3 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 8.0. Last change: 2015 Jan 20 +*intro.txt* For Vim version 8.0. Last change: 2016 Sep 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -135,10 +135,14 @@ http://www.vim.org/maillist.php Bug reports: *bugs* *bug-reports* *bugreport.vim* -Send bug reports to: Vim Developers <vim-dev@vim.org> -This is a maillist, you need to become a member first and many people will see -the message. If you don't want that, e.g. because it is a security issue, -send it to <bugs@vim.org>, this only goes to the Vim maintainer (that's Bram). +There are two ways to report bugs, both work: +1. Send bug reports to: Vim Developers <vim-dev@vim.org> + This is a maillist, you need to become a member first and many people will + see the message. If you don't want that, e.g. because it is a security + issue, send it to <bugs@vim.org>, this only goes to the Vim maintainer + (that's Bram). +2. Open issue on GitHub: https://github.com/vim/vim/issues + The text will be forwarded to the vim-dev maillist. Please be brief; all the time that is spent on answering mail is subtracted from the time that is spent on improving Vim! Always give a reproducible diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 5c80095736..914c5767c7 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -532,7 +532,7 @@ variable (ex. scp uses the variable g:netrw_scp_cmd, which is defaulted to let g:netrw_sftp_cmd= '"c:\Program Files\PuTTY\psftp.exe"' < (note: it has been reported that windows 7 with putty v0.6's "-batch" option - doesn't work, so its best to leave it off for that system) + doesn't work, so it's best to leave it off for that system) See |netrw-p8| for more about putty, pscp, psftp, etc. @@ -1206,7 +1206,7 @@ The :NetrwMB command is available outside of netrw buffers (once netrw has been invoked in the session). The file ".netrwbook" holds bookmarks when netrw (and vim) is not active. By -default, its stored on the first directory on the user's |'runtimepath'|. +default, it's stored on the first directory on the user's |'runtimepath'|. Related Topics: |netrw-gb| how to return (go) to a bookmark @@ -1431,7 +1431,7 @@ be used in that count. *.netrwhist* See |g:netrw_dirhistmax| for how to control the quantity of history stack slots. The file ".netrwhist" holds history when netrw (and vim) is not -active. By default, its stored on the first directory on the user's +active. By default, it's stored on the first directory on the user's |'runtimepath'|. Related Topics: @@ -3271,7 +3271,7 @@ The user function is passed one argument; it resembles > fun! ExampleUserMapFunc(islocal) < -where a:islocal is 1 if its a local-directory system call or 0 when +where a:islocal is 1 if it's a local-directory system call or 0 when remote-directory system call. Use netrw#Expose("varname") to access netrw-internal (script-local) @@ -3595,7 +3595,7 @@ Example: Clear netrw's marked file list via a mapping on gu > *netrw-p16* P16. When editing remote files (ex. :e ftp://hostname/path/file), - under Windows I get an |E303| message complaining that its unable + under Windows I get an |E303| message complaining that it's unable to open a swap file. (romainl) It looks like you are starting Vim from a protected @@ -3649,7 +3649,7 @@ Example: Clear netrw's marked file list via a mapping on gu > P21. I've made a directory (or file) with an accented character, but netrw isn't letting me enter that directory/read that file: - Its likely that the shell or o/s is using a different encoding + It's likely that the shell or o/s is using a different encoding than you have vim (netrw) using. A patch to vim supporting "systemencoding" may address this issue in the future; for now, just have netrw use the proper encoding. For example: > diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 8b3c477050..2544c8d902 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.0. Last change: 2016 Sep 22 +*todo.txt* For Vim version 8.0. Last change: 2016 Sep 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,16 +34,7 @@ not be repeated below, unless there is extra information. *known-bugs* -------------------- Known bugs and current work ----------------------- -Ukrainian translations (Anatolii Sakhnik, 2016 Sep 15) - -Netbeans test fails with Python 3. (jonathon, 2016 Sep 13, #1070) - -Revert 7.4.990? (Christian Brabandt, 2016 Sep 16) - -Update for ratpoison (Magnus Woldrich, 2016 Sep 15) - -Crash when editing file with only encryption header. (igor2x, 2016 Sep 18, -#1096) Patch by Christian, Sep 22. +Move test71 tests to test_crypt. Idea from Sven: record sequence of keys. Useful to show others what they are doing (look over the shoulder), and also to see what happened. @@ -52,6 +43,7 @@ Could store in logfile to be able to analyise it with an external command. E.g. to see when's the last time a plugin command was used. Patch for typos. (Matthew Brener, 2016 Sep 16, #1088) +Lots of its to it's. After 8.0 is released: - Drop support for older MS-Windows systems, before XP. @@ -62,6 +54,7 @@ After 8.0 is released: Perhaps try to read once more? Possibly reproduced by Santiago Alejandro AgГјero, 2016 Sep 12, 13. Apparently select() returns an error while reading could work. + Another example from Daniel Hahler, Sep 24. - Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026) - Add 'cwd' argument to start_job(): directory to change to in the child. check for valid directory before forking. @@ -157,6 +150,9 @@ Add tests for using number larger than number of lines in buffer. Invalid behavior with NULL list. (Nikolai Pavlov, #768) E.g. deepcopy(test_null_list()) +Patch to make it possible to extend a list with itself. +(Nikolai Pavlov, 2016 Sep 23) + min() and max() spawn lots of error messages if sorted list/dictionary contains invalid data (Nikolay Pavlov, 2016 Sep 4, #1039) diff --git a/runtime/indent/cdl.vim b/runtime/indent/cdl.vim index db2b9052b2..5ec2a7b21a 100644 --- a/runtime/indent/cdl.vim +++ b/runtime/indent/cdl.vim @@ -16,7 +16,7 @@ if exists("*CdlGetIndent") "finish endif -" find out if an "...=..." expresion its an asignment (or a conditional) +" find out if an "...=..." expresion is an assignment (or a conditional) " it scans 'line' first, and then the previos lines fun! CdlAsignment(lnum, line) let f = -1 diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim index 828bc3120b..13adaae54c 100644 --- a/runtime/indent/html.vim +++ b/runtime/indent/html.vim @@ -749,7 +749,7 @@ func! s:CssPrevNonComment(lnum, stopline) while 1 let ccol = match(getline(lnum), '\*/') if ccol < 0 - " No comment end thus its something else. + " No comment end thus it's something else. return lnum endif call cursor(lnum, ccol + 1) diff --git a/runtime/syntax/ave.vim b/runtime/syntax/ave.vim index 3e82a8bc9b..e63e7d2c30 100644 --- a/runtime/syntax/ave.vim +++ b/runtime/syntax/ave.vim @@ -34,7 +34,7 @@ syn match aveNumber "[+-]\=\<[0-9]\+\>" " Operator syn keyword aveOperator or and max min xor mod by -" 'not' is a kind of a problem: Its an Operator as well as a method +" 'not' is a kind of a problem: It's an Operator as well as a method " 'not' is only marked as an Operator if not applied as method syn match aveOperator "[^\.]not[^a-zA-Z]" diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim index 0b56f5b3ad..9d9ab69a3a 100644 --- a/runtime/syntax/fortran.vim +++ b/runtime/syntax/fortran.vim @@ -1,17 +1,17 @@ " Vim syntax file " Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77) -" Version: 0.98 -" Last Change: 2016 Aug. 29 +" Version: 0.99 +" Last Change: 2016 Sep. 23 " Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/> " Usage: For instructions, do :help fortran-syntax from Vim " Credits: -" Version 0.1 (April 2000) was based on the fortran 77 syntax file by Mario Eusebio and -" Preben Guldberg. Since then, useful suggestions and contributions have been made, -" in chronological order, by: +" Version 0.1 (April 2000) for Fortran 95 was based on the Fortran 77 syntax file by +" Mario Eusebio and Preben Guldberg. Since then, useful suggestions and contributions +" have been made, in chronological order, by: " Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile, " Walter Dieudonnй, Alexander Wagner, Roman Bertle, Charles Rendleman, " Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann, -" Stefano Zaghi and Vishnu V. Krishnan. +" Stefano Zaghi, Vishnu V. Krishnan and Judicaлl Grasset if exists("b:current_syntax") finish @@ -368,7 +368,7 @@ else endif syn match fortranComment excludenl "!.*$" contains=@fortranCommentGroup,@spell -syn match fortranOpenMP excludenl "^\s*!\$\(OMP\)\=\s.*$" +syn match fortranOpenMP excludenl "^\s*!\$\(OMP\)\=&\=\s.*$" "cpp is often used with Fortran syn match cPreProc "^\s*#\s*\(define\|ifdef\)\>.*" diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 18da779764..6048aed4ec 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -381,7 +381,7 @@ ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \ " Here Strings: {{{1 " ============= -" available for: bash; ksh (really should be ksh93 only) but not if its a posix +" available for: bash; ksh (really should be ksh93 only) but not if it's a posix if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("g:is_posix")) syn match shHereString "<<<" skipwhite nextgroup=shCmdParenRegion endif diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po index 7126546e92..56bd8d1bc2 100644 --- a/src/po/uk.cp1251.po +++ b/src/po/uk.cp1251.po @@ -10,9 +10,9 @@ # msgid "" msgstr "" -"Project-Id-Version: vim 7.4\n" +"Project-Id-Version: vim 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-08 08:23+0200\n" +"POT-Creation-Date: 2016-09-12 18:50+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" @@ -51,6 +51,12 @@ msgstr "E82: Немає можливості розмістити хоч один буфер, завершення роботи..." msgid "E83: Cannot allocate buffer, using other one..." msgstr "E83: Немає можливості розмістити буфер, буде використано інший..." +msgid "E931: Buffer cannot be registered" +msgstr "E931: Неможливо зареєструвати буфер" + +msgid "E937: Attempt to delete a buffer that is in use" +msgstr "E937: Спроба видалити буфер, що використовується" + msgid "E515: No buffers were unloaded" msgstr "E515: Жоден з буферів не був вивантажений" @@ -91,10 +97,6 @@ msgstr "E84: Жоден буфер не змінено" msgid "E85: There is no listed buffer" msgstr "E85: У списку немає буферів" -#, c-format -msgid "E86: Buffer %ld does not exist" -msgstr "E86: Буфера %ld немає" - msgid "E87: Cannot go beyond last buffer" msgstr "E87: Це вже останній буфер" @@ -204,9 +206,62 @@ msgstr "Позначки для %s:" msgid " line=%ld id=%d name=%s" msgstr " рядок=%ld id=%d назва=%s" +msgid "E902: Cannot connect to port" +msgstr "E902: Не вдалося з'єднатися з портом" + +msgid "E901: gethostbyname() in channel_open()" +msgstr "E901: gethostbyname() у channel_open()" + +msgid "E898: socket() in channel_open()" +msgstr "E898: socket() у channel_open()" + +msgid "E903: received command with non-string argument" +msgstr "E903: отримано команду з нетекстовим аргументом" + +msgid "E904: last argument for expr/call must be a number" +msgstr "E904: останній аргумент у виразі/виклику має бути числом" + +msgid "E904: third argument for call must be a list" +msgstr "E904: третій аргумент у виклику має бути списком" + +#, c-format +msgid "E905: received unknown command: %s" +msgstr "E905: отримано невідому команду: %s" + +#, c-format +msgid "E630: %s(): write while not connected" +msgstr "E630: %s(): запис до під’єднання" + +#, c-format +msgid "E631: %s(): write failed" +msgstr "E631: %s(): збереження не вдалося" + +#, c-format +msgid "E917: Cannot use a callback with %s()" +msgstr "E917: Не можна використати зворотній виклик у %s()" + +msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel" +msgstr "E912: не можна використати ch_evalexpr()/ch_sendexpr() з raw чи nl каналом" + +msgid "E906: not an open channel" +msgstr "E906: не відкритий канал" + +msgid "E920: _io file requires _name to be set" +msgstr "E920: файл _io потребує встановленого _name" + +msgid "E915: in_io buffer requires in_buf or in_name to be set" +msgstr "E915: буфер in_io потребує встановленого in_buf чи in_name" + +#, c-format +msgid "E918: buffer must be loaded: %s" +msgstr "E918: буфер має бути завантажений: %s" + msgid "E821: File is encrypted with unknown method" msgstr "E821: Файл зашифровано невідомим методом" +msgid "Warning: Using a weak encryption method; see :help 'cm'" +msgstr "Увага: Використовується слабкий метод шифрування; див. :help 'cm'" + msgid "Enter encryption key: " msgstr "Вкажіть ключ шифру: " @@ -219,8 +274,35 @@ msgstr "Ключі не однакові!" msgid "[crypted]" msgstr "[зашифровано]" +# msgstr "E235: " +#, c-format +msgid "E720: Missing colon in Dictionary: %s" +msgstr "E720: Бракує двокрапки у словнику: %s" + +#, c-format +msgid "E721: Duplicate key in Dictionary: \"%s\"" +msgstr "E721: Повторення ключа в словнику: «%s»" + +# msgstr "E235: " +#, c-format +msgid "E722: Missing comma in Dictionary: %s" +msgstr "E722: Бракує коми у словнику: %s" + +#, c-format +msgid "E723: Missing end of Dictionary '}': %s" +msgstr "E723: Немає кінцівки словника '}': %s" + +# msgstr "E14: " +msgid "extend() argument" +msgstr "аргумент extend()" + +# msgstr "E226: " +#, c-format +msgid "E737: Key already exists: %s" +msgstr "E737: Ключ вже існує: %s" + #, c-format -msgid "E96: Can not diff more than %ld buffers" +msgid "E96: Cannot diff more than %ld buffers" msgstr "E96: Не можна порівнювати понад %ld буфери(ів)" msgid "E810: Cannot read or write temp files" @@ -289,7 +371,7 @@ msgid " File name completion (^F^N^P)" msgstr " Доповнення назви файлу (^F^N^P)" msgid " Tag completion (^]^N^P)" -msgstr " Доповнення теґів (^]^N^P)" +msgstr " Доповнення міток (^]^N^P)" msgid " Path pattern completion (^N^P)" msgstr " Доповнення шляху за зразком (^N^P)" @@ -349,7 +431,7 @@ msgid "Scanning: %s" msgstr "Пошук у: %s" msgid "Scanning tags." -msgstr "Пошук серед теґів." +msgstr "Пошук серед міток." msgid " Adding" msgstr " Додається" @@ -379,56 +461,17 @@ msgid "match %d" msgstr "збіг %d" # msgstr "E17: " +#. maximum nesting of lists and dicts msgid "E18: Unexpected characters in :let" msgstr "E18: Неочікувані символи у :let" #, c-format -msgid "E684: list index out of range: %ld" -msgstr "E684: Індекс списку поза межами: %ld" - -#, c-format msgid "E121: Undefined variable: %s" msgstr "E121: Невизначена змінна: %s" msgid "E111: Missing ']'" msgstr "E111: Бракує ']'" -#, c-format -msgid "E686: Argument of %s must be a List" -msgstr "E686: Аргумент у %s має бути списком" - -#, c-format -msgid "E712: Argument of %s must be a List or Dictionary" -msgstr "E712: Аргумент у %s має бути списком чи словником" - -msgid "E713: Cannot use empty key for Dictionary" -msgstr "E713: Ключ словника не може бути порожнім" - -# msgstr "E396: " -msgid "E714: List required" -msgstr "E714: Потрібен список" - -msgid "E715: Dictionary required" -msgstr "E715: Потрібен словник" - -#, c-format -msgid "E118: Too many arguments for function: %s" -msgstr "E118: Забагато аргументів для функції: %s" - -#, c-format -msgid "E716: Key not present in Dictionary: %s" -msgstr "E716: Немає такого ключа у словнику: %s" - -#, c-format -msgid "E122: Function %s already exists, add ! to replace it" -msgstr "E122: Функція %s уже існує, ! щоб замінити" - -msgid "E717: Dictionary entry already exists" -msgstr "E717: Запис у словнику вже існує" - -msgid "E718: Funcref required" -msgstr "E718: Треба посилання на функцію" - msgid "E719: Cannot use [:] with a Dictionary" msgstr "E719: Не можна використати [:] зі словником" @@ -437,10 +480,6 @@ msgid "E734: Wrong variable type for %s=" msgstr "E734: Неправильний тип змінної для %s=" #, c-format -msgid "E130: Unknown function: %s" -msgstr "E130: Невідома функція: %s" - -#, c-format msgid "E461: Illegal variable name: %s" msgstr "E461: Неприпустима назва змінної: %s" @@ -481,10 +520,6 @@ msgid "E690: Missing \"in\" after :for" msgstr "E690: Пропущено «in» після :for" #, c-format -msgid "E107: Missing parentheses: %s" -msgstr "E107: Пропущено дужки: %s" - -#, c-format msgid "E108: No such variable: \"%s\"" msgstr "E108: Змінної немає: «%s»" @@ -506,9 +541,6 @@ msgstr "E735: Словник можна порівняти тільки із словником" msgid "E736: Invalid operation for Dictionary" msgstr "E736: Некоректна операція над словником" -msgid "E693: Can only compare Funcref with Funcref" -msgstr "E693: Функцію можна порівняти тільки з функцією" - msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Некоректна операція над функцією" @@ -521,6 +553,9 @@ msgstr "E110: Пропущено ')'" msgid "E695: Cannot index a Funcref" msgstr "E695: Функція не має індексації" +msgid "E909: Cannot index a special variable" +msgstr "E909: Не можна індексувати спеціальну змінну" + #, c-format msgid "E112: Option name missing: %s" msgstr "E112: Бракує назви опції: %s" @@ -537,60 +572,121 @@ msgstr "E114: Бракує лапки: %s" msgid "E115: Missing quote: %s" msgstr "E115: Бракує лапки: %s" -# msgstr "E404: " -#, c-format -msgid "E696: Missing comma in List: %s" -msgstr "E696: Бракує коми у списку: %s" +msgid "Not enough memory to set references, garbage collection aborted!" +msgstr "Недостатньо пам’яті, щоб встановити посилання, збір сміття скасовано!" -#, c-format -msgid "E697: Missing end of List ']': %s" -msgstr "E697: Немає кінцівки списку ']': %s" +# msgstr "E21: " +msgid "E724: variable nested too deep for displaying" +msgstr "E724: У змінній забагато вкладень щоб її показати" -# msgstr "E235: " -#, c-format -msgid "E720: Missing colon in Dictionary: %s" -msgstr "E720: Бракує двокрапки у словнику: %s" +msgid "E805: Using a Float as a Number" +msgstr "E805: Float вжито як Number" -#, c-format -msgid "E721: Duplicate key in Dictionary: \"%s\"" -msgstr "E721: Повторення ключа в словнику: «%s»" +msgid "E703: Using a Funcref as a Number" +msgstr "E703: Funcref вжито як Number" -# msgstr "E235: " -#, c-format -msgid "E722: Missing comma in Dictionary: %s" -msgstr "E722: Бракує коми у словнику: %s" +msgid "E745: Using a List as a Number" +msgstr "E745: List вжито як Number" -#, c-format -msgid "E723: Missing end of Dictionary '}': %s" -msgstr "E723: Немає кінцівки словника '}': %s" +msgid "E728: Using a Dictionary as a Number" +msgstr "E728: Dictionary вжито як Number" -# msgstr "E21: " -msgid "E724: variable nested too deep for displaying" -msgstr "E724: У змінній забагато вкладень щоб її показати" +msgid "E910: Using a Job as a Number" +msgstr "E910: Job вжито як Number" + +msgid "E913: Using a Channel as a Number" +msgstr "E913: Channel вжито як Number" + +msgid "E891: Using a Funcref as a Float" +msgstr "E891: Funcref вжито як Float" + +msgid "E892: Using a String as a Float" +msgstr "E892: String вжито як Float" + +msgid "E893: Using a List as a Float" +msgstr "E893: List вжито як Float" + +msgid "E894: Using a Dictionary as a Float" +msgstr "E894: Dictionary вжито як Float" + +msgid "E907: Using a special value as a Float" +msgstr "E907: Спеціальне значення вжито як Float" + +msgid "E911: Using a Job as a Float" +msgstr "E911: Job вжито як Float" + +msgid "E914: Using a Channel as a Float" +msgstr "E914: Channel вжито як Float" + +msgid "E729: using Funcref as a String" +msgstr "E729: Funcref вжито як String" + +# msgstr "E373: " +msgid "E730: using List as a String" +msgstr "E730: List вжито як String" + +msgid "E731: using Dictionary as a String" +msgstr "E731: Dictionary вжито як String" + +# msgstr "E373: " +msgid "E908: using an invalid value as a String" +msgstr "E908: неправильне значення вжито як String" #, c-format -msgid "E740: Too many arguments for function %s" -msgstr "E740: Забагато аргументів для функції %s" +msgid "E795: Cannot delete variable %s" +msgstr "E795: Не можна знищити змінну %s" #, c-format -msgid "E116: Invalid arguments for function %s" -msgstr "E116: Неправильні аргументи функції %s" +msgid "E704: Funcref variable name must start with a capital: %s" +msgstr "E704: Назва змінної Funcref має починатися з великої літери: %s" #, c-format -msgid "E117: Unknown function: %s" -msgstr "E117: Невідома функція: %s" +msgid "E705: Variable name conflicts with existing function: %s" +msgstr "E705: Назва змінної співпадає з існуючою функцією: %s" #, c-format -msgid "E119: Not enough arguments for function: %s" -msgstr "E119: Замало аргументів для функції %s" +msgid "E741: Value is locked: %s" +msgstr "E741: Значення захищене: %s" + +msgid "Unknown" +msgstr "Невідомо" #, c-format -msgid "E120: Using <SID> not in a script context: %s" -msgstr "E120: <SID> використовується не у контексті скрипту: %s" +msgid "E742: Cannot change value of %s" +msgstr "E742: Не можна змінити значення %s" + +msgid "E698: variable nested too deep for making a copy" +msgstr "E698: Змінна вкладена занадто глибоко щоб зробити її копію" + +msgid "" +"\n" +"# global variables:\n" +msgstr "" +"\n" +"# глобальні змінні:\n" + +msgid "" +"\n" +"\tLast set from " +msgstr "" +"\n" +"\tВостаннє змінена у " + +# msgstr "E14: " +msgid "map() argument" +msgstr "аргумент map()" + +# msgstr "E14: " +msgid "filter() argument" +msgstr "аргумент filter()" #, c-format -msgid "E725: Calling dict function without Dictionary: %s" -msgstr "E725: Виклик dict-функції без словника: %s" +msgid "E686: Argument of %s must be a List" +msgstr "E686: Аргумент у %s має бути списком" + +# msgstr "E396: " +msgid "E928: String required" +msgstr "E928: Потрібно String" msgid "E808: Number or Float required" msgstr "E808: Треба вказати Number чи Float" @@ -599,9 +695,6 @@ msgstr "E808: Треба вказати Number чи Float" msgid "add() argument" msgstr "аргумент add()" -msgid "E699: Too many arguments" -msgstr "E699: Забагато аргументів" - # msgstr "E327: " msgid "E785: complete() can only be used in Insert mode" msgstr "E785: complete() можна вживати тільки в режимі вставки" @@ -614,31 +707,22 @@ msgstr "E785: complete() можна вживати тільки в режимі вставки" msgid "&Ok" msgstr "&O:Гаразд" -# 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()" - -# msgstr "E14: " -msgid "filter() argument" -msgstr "аргумент filter()" - -#, c-format -msgid "+-%s%3ld lines: " -msgstr "+-%s%3ld рядків: " +msgid "+-%s%3ld line: " +msgid_plural "+-%s%3ld lines: " +msgstr[0] "+-%s%3ld рядків: " +msgstr[1] "+-%s%3ld рядків: " #, c-format msgid "E700: Unknown function: %s" msgstr "E700: Невідома функція: %s" +msgid "E922: expected a dict" +msgstr "E922: очікується dict" + +msgid "E923: Second argument of function() must be a list or a dict" +msgstr "E923: Другий аргумент function() має бути списком чи словником" + msgid "" "&OK\n" "&Cancel" @@ -657,10 +741,17 @@ msgstr "аргумент insert()" msgid "E786: Range not allowed" msgstr "E786: Інтервал не дозволено" +msgid "E916: not a valid job" +msgstr "E916: некоректне завдання" + # msgstr "E177: " msgid "E701: Invalid type for len()" msgstr "E701: Некоректний тип для len()" +#, c-format +msgid "E798: ID is reserved for \":match\": %ld" +msgstr "E798: ID зарезервовано для «:match»: %ld" + msgid "E726: Stride is zero" msgstr "E726: Крок нульовий" @@ -694,6 +785,10 @@ msgstr "аргумент reverse()" msgid "E258: Unable to send to client" msgstr "E258: Не вдалося надіслати клієнту" +#, c-format +msgid "E927: Invalid action: '%s'" +msgstr "E927: Неправильна дія: '%s'" + # msgstr "E14: " msgid "sort() argument" msgstr "аргумент sort()" @@ -713,153 +808,16 @@ msgstr "E882: Помилка у функції порівняння uniq" msgid "(Invalid)" msgstr "(Неможливо)" -msgid "E677: Error writing temp file" -msgstr "E677: Не вдалося записати тимчасовий файл" - -msgid "E805: Using a Float as a Number" -msgstr "E805: Float вжито як Number" - -msgid "E703: Using a Funcref as a Number" -msgstr "E703: Funcref вжито як Number" - -msgid "E745: Using a List as a Number" -msgstr "E745: List вжито як Number" - -msgid "E728: Using a Dictionary as a Number" -msgstr "E728: Dictionary вжито як Number" - -msgid "E729: using Funcref as a String" -msgstr "E729: Funcref вжито як String" - -# msgstr "E373: " -msgid "E730: using List as a String" -msgstr "E730: List вжито як String" - -msgid "E731: using Dictionary as a String" -msgstr "E731: Dictionary вжито як String" - -#, c-format -msgid "E706: Variable type mismatch for: %s" -msgstr "E706: Неправильний тип змінної: %s" - -#, c-format -msgid "E795: Cannot delete variable %s" -msgstr "E795: Не можна знищити змінну %s" - -#, c-format -msgid "E704: Funcref variable name must start with a capital: %s" -msgstr "E704: Назва змінної Funcref має починатися з великої літери: %s" - -#, c-format -msgid "E705: Variable name conflicts with existing function: %s" -msgstr "E705: Назва змінної співпадає з існуючою функцією: %s" - -#, c-format -msgid "E741: Value is locked: %s" -msgstr "E741: Значення захищене: %s" - -msgid "Unknown" -msgstr "Невідомо" - -#, c-format -msgid "E742: Cannot change value of %s" -msgstr "E742: Не можна змінити значення %s" - -msgid "E698: variable nested too deep for making a copy" -msgstr "E698: Змінна вкладена занадто глибоко щоб зробити її копію" - -#, c-format -msgid "E123: Undefined function: %s" -msgstr "E123: Невизначена функція: %s" - -#, c-format -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" - -#, c-format -msgid "E853: Duplicate argument name: %s" -msgstr "E853: Назва аргументу повторюється: %s" - -msgid "E126: Missing :endfunction" -msgstr "E126: Бракує :endfunction" - -#, c-format -msgid "E707: Function name conflicts with variable: %s" -msgstr "E707: Назва функції співпадає зі змінною: %s" - -#, c-format -msgid "E127: Cannot redefine function %s: It is in use" -msgstr "E127: Не вдалося перевизначити функцію %s: вона використовується" |