From 016188fd8a30cfbaca3faa0daea9a47138dc5c4b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 6 Jun 2022 20:52:59 +0100 Subject: Update runtime files. --- runtime/doc/builtin.txt | 83 ++++- runtime/doc/channel.txt | 2 +- runtime/doc/popup.txt | 8 +- runtime/doc/starting.txt | 2 +- runtime/doc/todo.txt | 13 +- runtime/doc/usr_41.txt | 7 +- runtime/doc/usr_50.txt | 4 +- runtime/doc/usr_52.txt | 154 ++++++--- runtime/plugin/manpager.vim | 11 +- runtime/syntax/i3config.vim | 8 +- src/po/af.po | 352 -------------------- src/po/cleanup.vim | 3 + src/po/it.po | 768 +------------------------------------------- 13 files changed, 225 insertions(+), 1190 deletions(-) diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index fa9db949cb..e24bac80ad 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1,4 +1,4 @@ -*builtin.txt* For Vim version 8.2. Last change: 2022 May 27 +*builtin.txt* For Vim version 8.2. Last change: 2022 Jun 05 VIM REFERENCE MANUAL by Bram Moolenaar @@ -753,7 +753,7 @@ acos({expr}) *acos()* Return the arc cosine of {expr} measured in radians, as a |Float| in the range of [0, pi]. {expr} must evaluate to a |Float| or a |Number| in the range - [-1, 1]. + [-1, 1]. Otherwise acos() returns "nan". Examples: > :echo acos(0) < 1.570796 > @@ -775,6 +775,7 @@ add({object}, {expr}) *add()* item. Use |extend()| to concatenate |Lists|. When {object} is a |Blob| then {expr} must be a number. Use |insert()| to add an item at another position. + Returns 1 if {object} is not a |List| or a |Blob|. Can also be used as a |method|: > mylist->add(val1)->add(val2) @@ -877,11 +878,17 @@ argv([{nr} [, {winid}]]) The {winid} argument specifies the window ID, see |argc()|. For the Vim command line arguments see |v:argv|. + Returns an empty string if {nr}th argument is not present in + the argument list. Returns an empty List if the {winid} + argument is invalid. + asin({expr}) *asin()* Return the arc sine of {expr} measured in radians, as a |Float| in the range of [-pi/2, pi/2]. {expr} must evaluate to a |Float| or a |Number| in the range [-1, 1]. + Returns "nan" if {expr} is outside the range [-1, 1]. Returns + 0.0 if {expr} is not a |Float| or a |Number|. Examples: > :echo asin(0.8) < 0.927295 > @@ -902,6 +909,7 @@ atan({expr}) *atan()* Return the principal value of the arc tangent of {expr}, in the range [-pi/2, +pi/2] radians, as a |Float|. {expr} must evaluate to a |Float| or a |Number|. + Returns 0.0 if {expr} is not a |Float| or a |Number|. Examples: > :echo atan(100) < 1.560797 > @@ -918,6 +926,8 @@ atan2({expr1}, {expr2}) *atan2()* Return the arc tangent of {expr1} / {expr2}, measured in radians, as a |Float| in the range [-pi, pi]. {expr1} and {expr2} must evaluate to a |Float| or a |Number|. + Returns 0.0 if {expr1} or {expr2} is not a |Float| or a + |Number|. Examples: > :echo atan2(-1, 1) < -0.785398 > @@ -1002,7 +1012,7 @@ autocmd_delete({acmds}) *autocmd_delete()* {pattern} and {cmd} are not specified, then that autocmd group is deleted. - Returns v:true on success and v:false on failure. + Returns |v:true| on success and |v:false| on failure. Examples: > " :autocmd! BufLeave *.vim let acmd = #{event: 'BufLeave', pattern: '*.vim'} @@ -1060,6 +1070,9 @@ autocmd_get([{opts}]) *autocmd_get()* If there are multiple commands for an autocmd event in a group, then separate items are returned for each command. + Returns an empty List if an autocmd with the specified group + or event or pattern is not found. + Examples: > " :autocmd MyGroup echo autocmd_get(#{group: 'Mygroup'}) @@ -1080,7 +1093,8 @@ autocmd_get([{opts}]) *autocmd_get()* < balloon_gettext() *balloon_gettext()* Return the current text in the balloon. Only for the string, - not used for the List. + not used for the List. Returns an empty string if balloon + is not present. balloon_show({expr}) *balloon_show()* Show {expr} inside the balloon. For the GUI {expr} is used as @@ -1117,7 +1131,8 @@ balloon_split({msg}) *balloon_split()* Split String {msg} into lines to be displayed in a balloon. The splits are made for the current window size and optimize to show debugger output. - Returns a |List| with the split lines. + Returns a |List| with the split lines. Returns an empty List + on error. Can also be used as a |method|: > GetText()->balloon_split()->balloon_show() @@ -1171,7 +1186,8 @@ bufadd({name}) *bufadd()* let bufnr = bufadd('someName') call bufload(bufnr) call setbufline(bufnr, 1, ['some', 'text']) -< Can also be used as a |method|: > +< Returns 0 on error. + Can also be used as a |method|: > let bufnr = 'somename'->bufadd() bufexists({buf}) *bufexists()* @@ -1326,6 +1342,8 @@ byte2line({byte}) *byte2line()* one. Also see |line2byte()|, |go| and |:goto|. + Returns -1 if the {byte} value is invalid. + Can also be used as a |method|: > GetOffset()->byte2line() @@ -1397,6 +1415,8 @@ ceil({expr}) *ceil()* echo ceil(4.0) < 4.0 + Returns 0.0 if {expr} is not a |Float| or a |Number|. + Can also be used as a |method|: > Compute()->ceil() < @@ -1413,6 +1433,7 @@ changenr() *changenr()* When a change was made it is the number of that change. After redo it is the number of the redone change. After undo it is one less than the number of the undone change. + Returns 0 if the undo list is empty. char2nr({string} [, {utf8}]) *char2nr()* Return Number value of the first char in {string}. @@ -1431,10 +1452,11 @@ char2nr({string} [, {utf8}]) *char2nr()* let list = map(split(str, '\zs'), {_, val -> char2nr(val)}) < Result: [65, 66, 67] + Returns 0 if {string} is not a |String|. + Can also be used as a |method|: > GetChar()->char2nr() - charclass({string}) *charclass()* Return the character class of the first character in {string}. The character class is one of: @@ -1444,6 +1466,7 @@ charclass({string}) *charclass()* 3 emoji other specific Unicode class The class is used in patterns and word motions. + Returns 0 if {string} is not a |String|. charcol({expr}) *charcol()* @@ -1555,7 +1578,7 @@ col({expr}) The result is a Number, which is the byte index of the column col("$") length of cursor line plus one col("'t") column of mark t col("'" .. markname) column of mark markname -< The first column is 1. 0 is returned for an error. +< The first column is 1. Returns 0 if {expr} is invalid. For an uppercase mark the column may actually be in another buffer. For the cursor position, when 'virtualedit' is active, the @@ -1673,6 +1696,8 @@ complete_info([{what}]) *complete_info()* |pum_getpos()|. It's also available in |v:event| during the |CompleteChanged| event. + Returns an empty |Dictionary| on error. + Examples: > " Get all items call complete_info() @@ -1758,6 +1783,7 @@ copy({expr}) Make a copy of {expr}. For Numbers and Strings this isn't cos({expr}) *cos()* Return the cosine of {expr}, measured in radians, as a |Float|. {expr} must evaluate to a |Float| or a |Number|. + Returns 0.0 if {expr} is not a |Float| or a |Number|. Examples: > :echo cos(100) < 0.862319 > @@ -1774,6 +1800,7 @@ cosh({expr}) *cosh()* Return the hyperbolic cosine of {expr} as a |Float| in the range [1, inf]. {expr} must evaluate to a |Float| or a |Number|. + Returns 0.0 if {expr} is not a |Float| or a |Number|. Examples: > :echo cosh(0.5) < 1.127626 > @@ -1885,6 +1912,9 @@ debugbreak({pid}) *debugbreak()* processes is undefined. See |terminal-debugger|. {only available on MS-Windows} + Returns |TRUE| if successfully interrupted the program. + Otherwise returns |FALSE|. + Can also be used as a |method|: > GetPid()->debugbreak() @@ -2355,6 +2385,7 @@ exp({expr}) *exp()* Return the exponential of {expr} as a |Float| in the range [0, inf]. {expr} must evaluate to a |Float| or a |Number|. + Returns 0.0 if {expr} is not a |Float| or a |Number|. Examples: > :echo exp(2) < 7.389056 > @@ -2521,7 +2552,7 @@ extend({expr1}, {expr2} [, {expr3}]) *extend()* {expr2} remains unchanged. When {expr1} is locked and {expr2} is not empty the operation fails. - Returns {expr1}. + Returns {expr1}. Returns 0 on error. Can also be used as a |method|: > mylist->extend(otherlist) @@ -2695,6 +2726,8 @@ finddir({name} [, {path} [, {count}]]) *finddir()* {name} in {path} instead of the first one. When {count} is negative return all the matches in a |List|. + Returns an empty string if the directory is not found. + This is quite similar to the ex-command `:find`. {only available when compiled with the |+file_in_path| feature} @@ -2745,6 +2778,7 @@ float2nr({expr}) *float2nr()* Convert {expr} to a Number by omitting the part after the decimal point. {expr} must evaluate to a |Float| or a Number. + Returns 0 if {expr} is not a |Float| or a |Number|. When the value of {expr} is out of range for a |Number| the result is truncated to 0x7fffffff or -0x7fffffff (or when 64-bit Number support is enabled, 0x7fffffffffffffff or @@ -2772,6 +2806,7 @@ floor({expr}) *floor()* Return the largest integral value less than or equal to {expr} as a |Float| (round down). {expr} must evaluate to a |Float| or a |Number|. + Returns 0.0 if {expr} is not a |Float| or a |Number|. Examples: > echo floor(1.856) < 1.0 > @@ -2794,6 +2829,8 @@ fmod({expr1}, {expr2}) *fmod()* the magnitude of {expr2}. If {expr2} is zero, the value returned is zero. The value returned is a |Float|. {expr1} and {expr2} must evaluate to a |Float| or a |Number|. + Returns 0.0 if {expr1} or {expr2} is not a |Float| or a + |Number|. Examples: > :echo fmod(12.33, 1.22) < 0.13 > @@ -2815,6 +2852,7 @@ fnameescape({string}) *fnameescape()* appears in a filename, it depends on the value of 'isfname'. A leading '+' and '>' is also escaped (special after |:edit| and |:write|). And a "-" by itself (special after |:cd|). + Returns an empty string on error. Example: > :let fname = '+some str%nge|name' :exe "edit " .. fnameescape(fname) @@ -2832,7 +2870,8 @@ fnamemodify({fname}, {mods}) *fnamemodify()* :echo fnamemodify("main.c", ":p:h") < results in: > /home/mool/vim/vim/src -< If {mods} is empty then {fname} is returned. +< If {mods} is empty or an unsupported modifier is used then + {fname} is returned. Note: Environment variables don't work in {fname}, use |expand()| first then. @@ -2889,6 +2928,7 @@ foldtext() Returns a String, to be displayed for a closed fold. This is When used to draw the actual foldtext, the rest of the line will be filled with the fold char from the 'fillchars' setting. + Returns an empty string when there is no fold. {not available when compiled without the |+folding| feature} foldtextresult({lnum}) *foldtextresult()* @@ -2940,6 +2980,7 @@ funcref({name} [, {arglist}] [, {dict}]) been loaded (to avoid mistakenly loading the autoload script when only intending to use the function name, use |function()| instead). {name} cannot be a builtin function. + Returns 0 on error. Can also be used as a |method|: > GetFuncname()->funcref([arg]) @@ -3020,6 +3061,8 @@ function({name} [, {arglist}] [, {dict}]) < Invokes the function as with: > call context.Callback('one', 500) < + Returns 0 on error. + Can also be used as a |method|: > GetFuncname()->function([arg]) @@ -3073,6 +3116,7 @@ get({func}, {what}) "func" The function "dict" The dictionary "args" The list with arguments + Returns zero on error. Preferably used as a |method|: > myfunc->get(what) < @@ -3315,7 +3359,7 @@ getcharmod() *getcharmod()* 128 command (Macintosh only) Only the modifiers that have not been included in the character itself are obtained. Thus Shift-a results in "A" - without a modifier. + without a modifier. Returns 0 if no modifiers are used. *getcharpos()* getcharpos({expr}) @@ -3665,7 +3709,7 @@ getftype({fname}) *getftype()* getimstatus() *getimstatus()* The result is a Number, which is |TRUE| when the IME status is - active. + active and |FALSE| otherwise. See 'imstatusfunc'. getjumplist([{winnr} [, {tabnr}]]) *getjumplist()* @@ -3675,7 +3719,8 @@ getjumplist([{winnr} [, {tabnr}]]) *getjumplist()* With {winnr} only use this window in the current tab page. {winnr} can also be a |window-ID|. With {winnr} and {tabnr} use the window in the specified tab - page. + page. If {winnr} or {tabnr} is invalid, an empty list is + returned. The returned list contains two entries: a list with the jump locations and the last used jump position number in the list. @@ -3756,7 +3801,8 @@ getmarklist([{buf}]) *getmarklist()* If the optional {buf} argument is specified, returns the local marks defined in buffer {buf}. For the use of {buf}, - see |bufname()|. + see |bufname()|. If {buf} is invalid, an empty list is + returned. Each item in the returned List is a |Dict| with the following: mark name of the mark prefixed by "'" @@ -3778,7 +3824,8 @@ getmatches([{win}]) *getmatches()* as |setmatches()| can restore a list of matches saved by |getmatches()|. If {win} is specified, use the window with this number or - window ID instead of the current window. + window ID instead of the current window. If {win} is invalid, + an empty list is returned. Example: > :echo getmatches() < [{'group': 'MyGroup1', 'pattern': 'TODO', @@ -3850,6 +3897,7 @@ getpos({expr}) Get the position for String {expr}. For possible values of use |getcharpos()|. A very large column number equal to |v:maxcol| can be returned, in which case it means "after the end of the line". + If {expr} is invalid, returns a list with all zeros. This can be used to save and restore the position of a mark: > let save_a_mark = getpos("'a") ... @@ -6870,7 +6918,9 @@ reltime([{start} [, {end}]]) *reltime()* The item can be passed to |reltimestr()| to convert it to a string or |reltimefloat()| to convert to a Float. - Without an argument reltime() returns the current time. + Without an argument reltime() returns the current time (the + representation is system-dependend, it can not be used as the + wall-clock time, see |localtime()| for that). With one argument is returns the time passed since the time specified in the argument. With two arguments it returns the time passed between {start} @@ -10095,6 +10145,7 @@ winnr([{arg}]) The result is a Number, which is the number of the current current window (where |CTRL-W_l| goes to). The number can be used with |CTRL-W_w| and ":wincmd w" |:wincmd|. + When {arg} is invalid an error is given and zero is returned. Also see |tabpagewinnr()| and |win_getid()|. Examples: > let window_count = winnr('$') diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt index 6705c59c34..5d7e907dcb 100644 --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -1,4 +1,4 @@ -*channel.txt* For Vim version 8.2. Last change: 2022 Apr 16 +*channel.txt* For Vim version 8.2. Last change: 2022 Jun 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt index dd478aefeb..03dd3a24c7 100644 --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -1,4 +1,4 @@ -*popup.txt* For Vim version 8.2. Last change: 2022 May 29 +*popup.txt* For Vim version 8.2. Last change: 2022 Jun 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -999,7 +999,7 @@ To make the four corners transparent: ============================================================================== 4. Examples *popup-examples* -These examplese use |Vim9| script. +These examples use |Vim9| script. TODO: more interesting examples @@ -1043,6 +1043,10 @@ Extend popup_filter_menu() with shortcut keys: > " No shortcut, pass to generic filter return popup_filter_menu(a:id, a:key) endfunc + + func MyMenuHandler(id, result) + echo $'Result: {a:result}' + endfunc < *popup_beval_example* Example for using a popup window for 'ballooneval': > diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index ec095a472f..f50462a56a 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 8.2. Last change: 2022 May 10 +*starting.txt* For Vim version 8.2. Last change: 2022 Jun 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index b5dd99e197..8cf50b3dde 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.2. Last change: 2022 Jun 03 +*todo.txt* For Vim version 8.2. Last change: 2022 Jun 05 VIM REFERENCE MANUAL by Bram Moolenaar @@ -40,7 +40,6 @@ browser use: https://github.com/vim/vim/issues/1234 Prepare for Vim 9.0 release: - Update the user manual: - - Add import/export example to 52.1 - Add more to usr_50.txt as an "advanced section" of usr_41.txt - Move some from vim9.txt to the user manual? Keep the specification. - Use Vim9 for more runtime files. @@ -82,8 +81,8 @@ Update list of features to vote on: Popup windows: - Preview popup not properly updated when it overlaps with completion menu. - (Yegappan Lakshmanan, 2021 May 22 -- Srollbar thumb somtimes not visible #10492 + (Yegappan Lakshmanan, 2021 May 22) +- Srollbar thumb sometimes not visible #10492 - Add a function to redraw a specific popup window. Esp. to be used when editing the command line, when screen updating doesn't happen. (Shougo) - Add a flag to make a popup window focusable? @@ -204,6 +203,10 @@ Terminal emulator window: - When 'encoding' is not utf-8, or the job is using another encoding, setup conversions. +Autoconf: must use autoconf 2.69, later version generates lots of warnings + attempt in ~/tmp/configure.ac +- try using autoconf 2.71 and fix all "obsolete" warnings + Can deref_func_name() and deref_function_name() be merged? After patch 8.2.4915 w_botline is computed much more often. Can this be @@ -217,7 +220,7 @@ Improvement in terminal configuration mess: Request the terminfo entry from the terminal itself. The $TERM value then is only relevant for whether this feature is supported or not. Replaces the xterm mechanism to request each entry separately. #6609 -Multiplexers (screen, tmux) can request it to the underlaying terminal, and +Multiplexers (screen, tmux) can request it to the underlying terminal, and pass it on with modifications. Can "CSI nr X" be used instead of outputting spaces? Is it faster? #8002 diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 214b8c70ed..6d135364b4 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 8.2. Last change: 2022 Jun 03 +*usr_41.txt* For Vim version 8.2. Last change: 2022 Jun 04 VIM USER MANUAL - by Bram Moolenaar @@ -66,7 +66,8 @@ The output of the example code is: count is 4 ~ In the first line the `vim9script` command makes clear this is a new, |Vim9| -script file. That matters for how the rest of the file is used. +script file. That matters for how the rest of the file is used. It is +recommended to put it in the very fist line, before any comments. *vim9-declarations* The `var i = 1` command declares the "i" variable and initializes it. The generic form is: > @@ -1791,7 +1792,7 @@ encountered, execution of the script/function/mapping will be aborted. When the `read` command causes another error, the pattern "E484:" will not match in it. Thus this exception will not be caught and result in the usual -error message and excecution is aborted. +error message and execution is aborted. You might be tempted to do this: > diff --git a/runtime/doc/usr_50.txt b/runtime/doc/usr_50.txt index e4abf0534d..2dff27e041 100644 --- a/runtime/doc/usr_50.txt +++ b/runtime/doc/usr_50.txt @@ -15,8 +15,8 @@ Table of contents: |usr_toc.txt| ============================================================================== *50.1* Line continuation -In legacy Vim script line contination is done by preceding a contination line -with a backslash: > +In legacy Vim script line continuation is done by preceding a continuation +line with a backslash: > let mylist = [ \ 'one', \ 'two', diff --git a/runtime/doc/usr_52.txt b/runtime/doc/usr_52.txt index 0461d8ec63..2c3e13be36 100644 --- a/runtime/doc/usr_52.txt +++ b/runtime/doc/usr_52.txt @@ -1,14 +1,12 @@ -*usr_52.txt* For Vim version 8.2. Last change: 2022 Jun 03 +*usr_52.txt* For Vim version 8.2. Last change: 2022 Jun 04 VIM USER MANUAL - by Bram Moolenaar Write larger plugins -TODO: this file needs to be updated - When plugins do more than simple things, they tend to grow big. This file explains how to make sure they still load fast and how to split them up in -smaller parts +smaller parts. |52.1| Export and import |52.2| Autoloading @@ -29,45 +27,97 @@ functions are compiled into instructions that can be executed quickly. This makes Vim9 script a lot faster, up to a 100 times. The basic idea is that a script file has items that are private, only used -inside the script file, and items that are exported, used outside of the -script file. The exported items can then be used by scripts that import them. -That makes very clear what is defined where. +inside the script file, and items that are exported, which can be used by +scripts that import them. That makes very clear what is defined where. Let's start with an example, a script that exports one function and has one private function: > - vim9script " This indicates a Vim9 script file. + vim9script - export def GetMessage(): string - let result = '' - ... - result = GetPart(count) - ... + export def GetMessage(count: string): string + var nr = str2nr(count) + var result = $'To {nr} we say ' + result ..= GetReply(nr) return result enddef - def GetPart(nr: number): string - if nr == 4 + def GetReply(nr: number): string + if nr == 42 return 'yes' + elseif nr = 22 + return 'maybe' else return 'no' endif enddef -The `vim9script` command must be the very first command in the file. Without -it Vim will assume legacy script syntax. +The `vim9script` command is required, `export` only works in a |Vim9| script. + +The `export def GetMessage(...` line starts with `export`, meaning that this +function can be called by other scripts. The line `def GetReply(...` does not +start with `export`, this is a script-local function, it can only be used +inside this script file. + +Now about the script where this is imported. In this example we use this +layout, which works well for a plugin below the "pack" directory: + .../plugin/theplugin.vim + .../lib/getmessage.vim + +Assuming the "..." directory has been added to 'runtimepath', Vim will look +for plugins in the "plugin" directory and source "theplugin.vim". Vim does +not recognize the "lib" directory, you can put any scripts there. + +The above script that exports GetMessage() goes in lib/getmessage.vim. The +GetMessage() function is used in plugin/theplugin.vim: > + + vim9script + + import "../lib/getmessage.vim" + command -nargs=1 ShowMessage echomsg getmessage.GetMessage() + +The `import` command uses a relative path, it starts with "../", which means +to go one directory up. For other kinds of paths see the `:import` command. + +How we can try out the command that the plugin provides: > + ShowMessage 1 +< To 1 we say no ~ +> + ShowMessage 22 +< To 22 we say maybe ~ + +Notice that the function GetMessage() is prefixed with the imported script +name "getmessage". That way, for every imported function used, you know what +script it was imported from. If you import several scripts each of them could +define a GetMessage() function: > -The `export def GetMessage(): string` line starts with `export`, meaning that -this function can be imported and called by other scripts. The line -`def GetPart(...` does not start with `export`, this is a script-local -function, it can only be used inside this script file. + vim9script -In the `export def GetMessage(): string` line you will notice the colon and -the return type. Vim9 functions, defined with `def`, require specifying the -type of arguments and the return type. That way Vim can compile the code -efficiently. The GetPart function defines an argument "nr" of type "number". + import "../lib/getmessage.vim" + import "../lib/getother.vim" + command -nargs=1 ShowMessage echomsg getmessage.GetMessage() + command -nargs=1 ShowOther echomsg getother.GetMessage() + +If the imported script name is long or you use it in many places, you can +shorten it by adding an "as" argument: > + import "../lib/getmessage.vim" as msg + command -nargs=1 ShowMessage echomsg msg.GetMessage() + + +RELOADING + +One thing to keep in mind: the imported "lib/getmessage.vim" script will be +sourced only once. When it is imported a second time sourcing it will be +skipped, since the items in it have already been created. It does not matter +if this import command is in another script, or in the same script that is +sourced again. + +This is efficient when using a plugin, but when still developing a plugin it +means that changing "lib/getmessage.vim" after it has been imported will have +no effect. You need to quit Vim and start it again. (Rationale: the items +defined in the script could be used in a compiled function, sourcing the +script again may break those functions). -TODO: import/export example USING GLOBALS @@ -83,8 +133,6 @@ prefix that is very unlikely to be used elsewhere. For example, if you have a ============================================================================== *52.2* Autoloading -TODO: autoloading with import/export - After splitting your large script into pieces, all the lines will still be loaded and executed the moment the script is used. Every `import` loads the imported script to find the items defined there. Although that is good for @@ -92,27 +140,39 @@ finding errors early, it also takes time. Which is wasted if the functionality is not often used. Instead of having `import` load the script immediately, it can be postponed -until needed. > - import autoload "./LoadLater.vim" +until needed. Using the example above, only one change needs to be made in +the plugin/theplugin.vim script: > + import autoload "../lib/getmessage.vim" + +Nothing in the rest of the script needs to change. However, the types will +not be checked. Not even the existence of the GetMessage() function is +checked until it is used. You will have to decide what is more important for +your script: fast startup or getting errors early. You can also add the +"autoload" argument later, after you have checked everything works. + -Now you can use exported items as usual: "LoadLater.GetMonth(4)". -However, the type will not be checked. Not even the existence of the -GetMonth() function is checked until it is used. You will have to decide what -is more important for your script. You can also add the "autoload" argument -later, after you have checked everything works. +AUTOLOAD DIRECTORY -Another form is to use a script name that is not an absolute or relative -path: > +Another form is to use autoload with a script name that is not an absolute or +relative path: > import autload "monthlib.vim" This will search for the script "monthlib.vim" in the autoload directories of -'runtimepath'. With Unix the directory often is "~/.vim/autoload". +'runtimepath'. With Unix one of the directories often is "~/.vim/autoload". -The main advantage of this is that this script can be shared with other +The main advantage of this is that this script can be easily shared with other scripts. You do need to make sure that the script name is unique, since Vim will search all the "autoload" directories in 'runtimepath', and if you are -using several plugins, these may add several directories to 'runtimepath', -each of which might have an "autoload" directory. +using several plugins with a plugin manager, it may add a directory to +'runtimepath', each of which might have an "autoload" directory. + +Without autoload: > + import "monthlib.vim" + +Vim will search for the script "monthlib.vim" in the import directories of +'runtimepath'. Note that in this case adding or removing "autoload" changes +where the script is found. With a relative or absolute path the location does +not change. ============================================================================== *52.3* Autoloading without import/export @@ -256,13 +316,13 @@ In some cases you have a legacy Vim script where you want to use items from a Vim9 script. For example in your .vimrc you want to initialize a plugin. The best way to do this is to use `:import`. For example: > - import Init as NiceInit from 'myNicePlugin.vim' - call NiceInit('today') + import 'myNicePlugin.vim' + call myNicePlugin.NiceInit('today') -This finds the exported function "Init" in the Vim9 script file and makes it -available as script-local item "NiceInit". `:import` always uses the script -namespace, even when "s:" is not given. If "myNicePlugin.vim" was already -sourced it is not sourced again. +This finds the exported function "NiceInit" in the Vim9 script file and makes +it available as script-local item "myNicePlugin.NiceInit". `:import` always +uses the script namespace, even when "s:" is not given. If "myNicePlugin.vim" +was already sourced it is not sourced again. Besides avoiding putting any items in the global namespace (where name clashes can cause unexpected errors), this also means the script is sourced only once, diff --git a/runtime/plugin/manpager.vim b/runtime/plugin/manpager.vim index 13cba5ee39..6989bee494 100644 --- a/runtime/plugin/manpager.vim +++ b/runtime/plugin/manpager.vim @@ -1,11 +1,14 @@ " Vim plugin for using Vim as manpager. " Maintainer: Enno Nagel -" Last Change: 2020 Aug 05 +" Last Change: 2022 Jun 05 command! -nargs=0 MANPAGER call s:ManPager() | delcommand MANPAGER -function! s:ManPager() - set nocompatible +function s:ManPager() + " global options, keep these to a minimum to avoid side effects + if &compatible + set nocompatible + endif if exists('+viminfofile') set viminfofile=NONE endif @@ -27,7 +30,7 @@ function! s:ManPager() if n > 1 exe "1," . n-1 . "d" endif - setlocal nomodified readonly + setlocal nomodifiable nomodified readonly nowrite syntax on endfunction diff --git a/runtime/syntax/i3config.vim b/runtime/syntax/i3config.vim index 6163da29eb..0018081da7 100644 --- a/runtime/syntax/i3config.vim +++ b/runtime/syntax/i3config.vim @@ -3,7 +3,7 @@ " Original Author: Mohamed Boughaba " Maintainer: Quentin Hibon (github user hiqua) " Version: 0.4 -" Last Change: 2022 May 05 +" Last Change: 2022 Jun 05 " References: " http://i3wm.org/docs/userguide.html#configuring @@ -17,9 +17,6 @@ endif scriptencoding utf-8 -" Error -syn match i3ConfigError /.*/ - " Todo syn keyword i3ConfigTodo TODO FIXME XXX contained @@ -180,13 +177,12 @@ syn match i3ConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=i3C " Group mode/bar syn keyword i3ConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_min_width workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained -syn region i3ConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend +syn region i3ConfigBlock start=+^\s*[^#]*s\?{$+ end=+^\s*[^#]*}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend " Line continuation syn region i3ConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend " Define the highlighting. -hi def link i3ConfigError Error hi def link i3ConfigTodo Todo hi def link i3ConfigComment Comment hi def link i3ConfigFontContent Type diff --git a/src/po/af.po b/src/po/af.po index 5732641f7c..b2cf877fcc 100644 --- a/src/po/af.po +++ b/src/po/af.po @@ -40,7 +40,6 @@ msgstr "" msgid "ERROR: " msgstr "FOUT: " -#, c-format msgid "" "\n" "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n" @@ -48,7 +47,6 @@ msgstr "" "\n" "[grepe] totaal 'alloc'-vrygelaat %lu-%lu, in gebruik %lu, piekgebruik %lu\n" -#, c-format msgid "" "[calls] total re/malloc()'s %lu, total free()'s %lu\n" "\n" @@ -66,35 +64,28 @@ msgstr "" "\n" "--- Outobevele ---" -#, c-format msgid "No matching autocommands: %s" msgstr "Geen passende outobevele nie: %s" -#, c-format msgid "%s Autocommands for \"%s\"" msgstr "%s outobevele vir \"%s\"" -#, c-format msgid "Executing %s" msgstr "Voer %s uit" -#, c-format msgid "autocommand %s" msgstr "outobevel %s" -#, c-format msgid "%d buffer unloaded" msgid_plural "%d buffers unloaded" msgstr[0] "%d buffer uitgelaai" msgstr[1] "%d buffers uitgelaai" -#, c-format msgid "%d buffer deleted" msgid_plural "%d buffers deleted" msgstr[0] "%d buffer geskrap" msgstr[1] "%d buffers geskrap" -#, c-format msgid "%d buffer wiped out" msgid_plural "%d buffers wiped out" msgstr[0] "%d buffer geskrap" @@ -103,7 +94,6 @@ msgstr[1] "%d buffers geskrap" msgid "W14: Warning: List of file names overflow" msgstr "W14: Waarskuwing: Lêerlys loop oor" -#, c-format msgid "line %ld" msgstr "reël %ld" @@ -122,13 +112,11 @@ msgstr "[RO]" msgid "[readonly]" msgstr "[lees alleen]" -#, c-format msgid "%ld line --%d%%--" msgid_plural "%ld lines --%d%%--" msgstr[0] "%ld reël --%d%%--" msgstr[1] "%ld reëls --%d%%--" -#, c-format msgid "line %ld of %ld --%d%%-- col " msgstr "reël %ld van %ld --%d%%-- kolom " @@ -214,7 +202,6 @@ msgstr ": Stuur het gefaal.\n" msgid ": Send failed. Trying to execute locally\n" msgstr ": Stuur het gefaal. Probeer om lokaal uit te voer\n" -#, c-format msgid "%d of %d edited" msgstr "%d van %d lêers bewerk" @@ -251,22 +238,18 @@ msgstr "[gekodeer]" msgid "Entering Debug mode. Type \"cont\" to continue." msgstr "Ontfoutmodus begin nou. Tik \"cont\" om te verlaat." -#, c-format msgid "line %ld: %s" msgstr "reël %ld: %s" -#, c-format msgid "cmd: %s" msgstr "cmd: %s" -#, c-format msgid "Breakpoint in \"%s%s\" line %ld" msgstr "Inspeksiepunt in \"%s%s\" reël %ld" msgid "No breakpoints defined" msgstr "Geen inspeksiepunte gedefinieer nie" -#, c-format msgid "%3d %s %s line %ld" msgstr "%3d %s %s reël %ld" @@ -299,25 +282,20 @@ msgstr "" msgid "called inputrestore() more often than inputsave()" msgstr "inputrestore() is meer gereeld as inputsave() geroep" -#, c-format msgid "<%s>%s%s %d, Hex %02x, Octal %03o" msgstr "<%s>%s%s %d, Hex %02x, Oktaal %03o" -#, c-format msgid "> %d, Hex %04x, Octal %o" msgstr "> %d, Hex %04x, Oktaal %o" -#, c-format msgid "> %d, Hex %08x, Octal %o" msgstr "> %d, Hex %08x, Oktaal %o" -#, c-format msgid "%ld line moved" msgid_plural "%ld lines moved" msgstr[0] "%ld reël geskuif" msgstr[1] "%ld reëls geskuif" -#, c-format msgid "%ld lines filtered" msgstr "%ld reëls filtreer" @@ -330,11 +308,9 @@ msgstr "Stoor As" msgid "Write partial file?" msgstr "Skryf gedeeltelike lêer?" -#, c-format msgid "Overwrite existing file \"%s\"?" msgstr "Oorskryf bestaande lêer \"%s\"?" -#, c-format msgid "" "'readonly' option is set for \"%s\".\n" "Do you wish to write anyway?" @@ -345,22 +321,18 @@ msgstr "" msgid "Edit File" msgstr "Verander lêer" -#, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" msgstr "vervang met %s (y/n/a/q/l/^E/^Y)?" msgid "(Interrupted) " msgstr "(Onderbreek) " -#, c-format msgid "Pattern found in every line: %s" msgstr "Patroon gevind in elke reël: %s" -#, c-format msgid "Pattern not found: %s" msgstr "Patroon nie gevind nie: %s" -#, c-format msgid "Save changes to \"%s\"?" msgstr "Stoor veranderinge na \"%s\"?" @@ -379,7 +351,6 @@ msgstr "Einde van funksie " msgid "Backwards range given, OK to swap" msgstr "Terugwaardse omvang gegee, OK om te ruil" -#, c-format msgid "%d more file to edit. Quit anyway?" msgid_plural "%d more files to edit. Quit anyway?" msgstr[0] "Nog %d lêer om te bewerk. Stop in elk geval?" @@ -400,7 +371,6 @@ msgstr "Geen ruill msgid "Append File" msgstr "Las aan by lêer" -#, c-format msgid "Window position: X %d, Y %d" msgstr "Vensterposisie: X %d, Y %d" @@ -410,35 +380,27 @@ msgstr "Stoor Herversturing" msgid "Untitled" msgstr "Ongetiteld" -#, c-format msgid "Exception thrown: %s" msgstr "Uitsondering gegooi: %s" -#, c-format msgid "Exception finished: %s" msgstr "Uitsondering het klaar gemaak: %s" -#, c-format msgid "Exception discarded: %s" msgstr "Uitsondering weg gegooi: %s" -#, c-format msgid "%s, line %ld" msgstr "%s, reël %ld" -#, c-format msgid "Exception caught: %s" msgstr "Uitsondering gevang: %s" -#, c-format msgid "%s made pending" msgstr "%s is afwagtend gemaak" -#, c-format msgid "%s resumed" msgstr "%s teruggekeer" -#, c-format msgid "%s discarded" msgstr "%s weg gegooi" @@ -487,11 +449,9 @@ msgstr "[CR ontbreek]" msgid "[long lines split]" msgstr "[lang reëls verdeel]" -#, c-format msgid "[CONVERSION ERROR in line %ld]" msgstr "[OMSETTINGSFOUT in reël %ld]" -#, c-format msgid "[ILLEGAL BYTE in line %ld]" msgstr "[ONWETTIGE GREEP in reël %ld]" @@ -525,13 +485,11 @@ msgstr "[unix]" msgid "[unix format]" msgstr "[unix formaat]" -#, c-format msgid "%ld line, " msgid_plural "%ld lines, " msgstr[0] "%ld reël, " msgstr[1] "%ld reëls, " -#, c-format msgid "%lld byte" msgid_plural "%lld bytes" msgstr[0] "%lld greep" @@ -543,7 +501,6 @@ msgstr "[noeol]" msgid "[Incomplete last line]" msgstr "[Onvoltooide laaste reël]" -#, c-format msgid "" "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as " "well" @@ -551,14 +508,12 @@ msgstr "" "W12: Waarskuwing: Lêer \"%s\" het verander sedert bewerking begin het en die " "buffer in Vim het ook verander" -#, c-format msgid "W11: Warning: File \"%s\" has changed since editing started" msgstr "W11: Waarskuwing: Lêer \"%s\" het verander sedert bewerking begin het" msgid "See \":help W11\" for more info." msgstr "Sien \":help W11\" vir meer inligting." -#, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" msgstr "" "W16: Waarskuwing: Modus van lêer \"%s\" het verander sedert bewerking begin " @@ -567,7 +522,6 @@ msgstr "" msgid "See \":help W16\" for more info." msgstr "Sien \":help W16\" vir meer inligting." -#, c-format msgid "W13: Warning: File \"%s\" has been created after editing started" msgstr "W13: Waarskuwing: Lêer \"%s\" is geskep sedert bewerking begin het" @@ -583,13 +537,11 @@ msgstr "Maak l msgid "no matches" msgstr "geen treffers" -#, c-format msgid "+--%3ld line folded " msgid_plural "+--%3ld lines folded " msgstr[0] "+--%3ld reël gevou " msgstr[1] "+--%3ld reëls gevou " -#, c-format msgid "+-%s%3ld line: " msgid_plural "+-%s%3ld lines: " msgstr[0] "+-%s%3ld reël: " @@ -682,23 +634,18 @@ msgstr "Seleksie" msgid "Vim dialog" msgstr "Vim dialooghokkie" -#, c-format msgid "Font0: %s" msgstr "Font0: %s" -#, c-format msgid "Font%d: %s" msgstr "Font%d: %s" -#, c-format msgid "Font%d width is not twice that of font0" msgstr "Font%d wydte is nie twee keer díe van font0 nie" -#, c-format msgid "Font0 width: %d" msgstr "Font0 wydte: %d" -#, c-format msgid "Font%d width: %d" msgstr "Font%d wydte: %d" @@ -708,22 +655,18 @@ msgstr "Naam:" msgid "Font:" msgstr "Font:" -#, c-format msgid "Page %d" msgstr "Bladsy %d" msgid "No text to be printed" msgstr "Geen teks om te druk nie" -#, c-format msgid "Printing page %d (%d%%)" msgstr "Druk nou bladsy %d (%d%%)" -#, c-format msgid " Copy %d of %d" msgstr " Kopie %d van %d" -#, c-format msgid "Printed: %s" msgstr "Gedruk: %s" @@ -736,7 +679,6 @@ msgstr "Besig om te stuur na drukker..." msgid "Print job sent." msgstr "Druktaak gestuur." -#, c-format msgid "Sorry, help file \"%s\" not found" msgstr "Jammer, hulplêer \"%s\" kan nie gevind word nie" @@ -765,7 +707,6 @@ msgid "This cscope command does not support splitting the window.\n" msgstr "" "Hierdie 'cscope' bevel ondersteun nie die splitsing van die venster nie.\n" -#, c-format msgid "Added cscope database %s" msgstr "'cscope' databasis %s bygevoeg" @@ -781,15 +722,12 @@ msgstr "'cs_create_connection': 'fdopen' vir 'fr_fp' het misluk" msgid "cscope commands:\n" msgstr "'cscope' bevele:\n" -#, c-format msgid "%-5s: %s%*s (Usage: %s)" msgstr "%-5s: %s%*s: (Gebruik: %s)" -#, c-format msgid "cscope connection %s closed" msgstr "'cscope' verbinding %s gesluit" -#, c-format msgid "Cscope tag: %s" msgstr "Cscope etiket: %s" @@ -864,7 +802,6 @@ msgstr "onbekende merknaam" msgid "mark not set" msgstr "merker nie gestel nie" -#, c-format msgid "row %d column %d" msgstr "ry %d kolom %d" @@ -901,11 +838,9 @@ msgstr "kan nie re msgid "Unable to register a command server name" msgstr "Kon nie bevelbediener naam registreer nie" -#, c-format msgid "%ld lines to indent... " msgstr "%ld reëls om in te keep..." -#, c-format msgid "%ld line indented " msgid_plural "%ld lines indented " msgstr[0] "%ld reël ingekeep " @@ -953,7 +888,6 @@ msgstr "'dictionary' opsie is leeg" msgid "'thesaurus' option is empty" msgstr "'thesaurus' opsie is leeg" -#, c-format msgid "Scanning dictionary: %s" msgstr "Deursoek woordeboek: %s" @@ -963,7 +897,6 @@ msgstr " (invoeg) Rol (^E/^Y)" msgid " (replace) Scroll (^E/^Y)" msgstr " (vervang) Rol (^E/^Y)" -#, c-format msgid "Scanning: %s" msgstr "Soek vir: %s" @@ -985,15 +918,12 @@ msgstr "Woord van ander re msgid "The only match" msgstr "Die enigste treffer" -#, c-format msgid "match %d of %d" msgstr "treffer %d van %d" -#, c-format msgid "match %d" msgstr "treffer %d" -#, c-format msgid "Current %slanguage: \"%s\"" msgstr "Huidige %staal: \"%s\"" @@ -1015,7 +945,6 @@ msgstr "Te veel \"+command\", \"-c command\" of \"--cmd command\" parameters" msgid "Invalid argument for" msgstr "Ongeldige parameter vir" -#, c-format msgid "%d files to edit\n" msgstr "%d lêers om te bewerk\n" @@ -1393,11 +1322,9 @@ msgstr "" ",\n" "of die lêer is beskadig." -#, c-format msgid "Using swap file \"%s\"" msgstr "Gebruik ruillêer \"%s\"" -#, c-format msgid "Original file \"%s\"" msgstr "Oorspronklike lêer \"%s\"" @@ -1629,11 +1556,9 @@ msgstr "" msgid "Tear off this menu" msgstr "Skeur die kieslys af" -#, c-format msgid "Error detected while processing %s:" msgstr "Fout ontdek tydens verwerking van %s: " -#, c-format msgid "line %4ld:" msgstr "reël %4ld:" @@ -1649,7 +1574,6 @@ msgstr "Druk ENTER of tik 'n bevel om voort te gaan" msgid "Unknown" msgstr "Onbekend" -#, c-format msgid "%s line %ld" msgstr "%s reël %ld" @@ -1679,13 +1603,11 @@ msgstr "" "&Gooi alles weg\n" "&Kanselleer" -#, c-format msgid "%ld more line" msgid_plural "%ld more lines" msgstr[0] "%ld meer reël" msgstr[1] "%ld meer reëls" -#, c-format msgid "%ld line less" msgid_plural "%ld fewer lines" msgstr[0] "%ld reël minder" @@ -1694,7 +1616,6 @@ msgstr[1] "%ld re msgid " (Interrupted)" msgstr " (Onderbreek)" -#, c-format msgid "Calling shell to execute: \"%s\"" msgstr "Roep dop om uit te voer: \"%s\"" @@ -1704,19 +1625,16 @@ msgstr "Waarskuwing: terminaal kan nie teks uitlig nie" msgid "cannot yank; delete anyway" msgstr "kan nie pluk nie: verwyder in elk geval" -#, c-format msgid "%ld line changed" msgid_plural "%ld lines changed" msgstr[0] "%ld reël verander" msgstr[1] "%ld reëls verander" -#, c-format msgid "%d line changed" msgid_plural "%d lines changed" msgstr[0] "%d reël verander" msgstr[1] "%d reëls verander" -#, c-format msgid "%ld Cols; " msgstr "%ld Kolomme; " @@ -1724,7 +1642,6 @@ msgstr "%ld Kolomme; " # njj: Karakters kan meerdere grepe wees, sien ':h multibyte' -#, c-format msgid "(+%lld for BOM)" msgstr "(+%lld vir 'BOM')" @@ -1768,7 +1685,6 @@ msgstr "VIM: Kan nie venster oopmaak nie!\n" msgid "Need Amigados version 2.04 or later\n" msgstr "Benodig Amigados weergawe 2.04 of later\n" -#, c-format msgid "Need %s version %ld\n" msgstr "Benodig %s weergawe %ld\n" @@ -1778,7 +1694,6 @@ msgstr "Kan nie NIL: oopmaak nie\n" msgid "Cannot create " msgstr "Kan nie skep nie: " -#, c-format msgid "Vim exiting with %d\n" msgstr "Vim stop met %d\n" @@ -1803,15 +1718,12 @@ msgstr "'ANCHOR_BUF_SIZE' is te klein" msgid "I/O ERROR" msgstr "I/O FOUT" -#, c-format msgid "to %s on %s" msgstr "na %s op %s" -#, c-format msgid "Printing '%s'" msgstr "Druk nou '%s'" -#, c-format msgid "Opening the X display took %ld msec" msgstr "Om die X-vertoonskerm oop te maak het %ld msek gevat" @@ -1885,14 +1797,12 @@ msgstr "XSMP maak nou konneksie oop" msgid "XSMP ICE connection watch failed" msgstr "XSMP ICE konneksie beloer het gefaal" -#, c-format msgid "XSMP SmcOpenConnection failed: %s" msgstr "XSMP 'SmcOpenConnection' het gefaal: %s" msgid "At line" msgstr "By reël" -#, c-format msgid "Vim: Caught %s event\n" msgstr "Vim: Het %s gebeurtenis gevang\n" @@ -1917,25 +1827,21 @@ msgstr "" msgid "Vim Warning" msgstr "Vim Waarskuwing" -#, c-format msgid "shell returned %d" msgstr "dop het %d gelewer" -#, c-format msgid "(%d of %d)%s%s: " msgstr "(%d van %d)%s%s: " msgid " (line deleted)" msgstr " (reël verwyder)" -#, c-format msgid "Cannot open file \"%s\"" msgstr "Kan nie lêer \"%s\" oopmaak nie" msgid "External submatches:\n" msgstr "Eksterne subtreffers:\n" -#, c-format msgid "%ld line yanked%s" msgid_plural "%ld lines yanked%s" msgstr[0] "%ld reël gepluk%s" @@ -1992,42 +1898,33 @@ msgstr " KIES BLOK" msgid "recording" msgstr "besig om op te neem" -#, c-format msgid "Searching for \"%s\" in \"%s\"" msgstr "Besig om te soek vir \"%s\" in \"%s\"" -#, c-format msgid "Searching for \"%s\"" msgstr "Besig om te soek vir \"%s\"" msgid "Source Vim script" msgstr "Voer Vim skrip uit" -#, c-format msgid "Cannot source a directory: \"%s\"" msgstr "Kan nie gids uitvoer nie: \"%s\"" -#, c-format msgid "could not source \"%s\"" msgstr "kon nie \"%s\" uitvoer nie" -#, c-format msgid "line %ld: could not source \"%s\"" msgstr "reël %ld: kon nie \"%s\" uitvoer nie" -#, c-format msgid "sourcing \"%s\"" msgstr "besig om \"%s\" uit te voer" -#, c-format msgid "line %ld: sourcing \"%s\"" msgstr "reël %ld: voer nou \"%s\" uit" -#, c-format msgid "finished sourcing %s" msgstr "%s klaar uitgevoer" -#, c-format msgid "continuing in %s" msgstr "vervolg in %s" @@ -2052,11 +1949,9 @@ msgstr " (Alreeds gelys)" msgid " NOT FOUND" msgstr " NIE GEVIND NIE" -#, c-format msgid "Scanning included file: %s" msgstr "Deursoek ingeslote lêer: %s" -#, c-format msgid "Searching included file %s" msgstr "Deursoek ingeslote lêer: %s" @@ -2085,11 +1980,9 @@ msgstr "" "\n" "--- Tekens ---" -#, c-format msgid "Signs for %s:" msgstr "Tekens vir %s:" -#, c-format msgid " line=%ld id=%d%s name=%s priority=%d" msgstr " reël=%ld id=%d%s naam=%s prioriteit=%d" @@ -2147,11 +2040,9 @@ msgstr "; treffer " msgid " line breaks" msgstr " reël breuke" -#, c-format msgid "File \"%s\" does not exist" msgstr "Lêer \"%s\" bestaan nie" -#, c-format msgid "tag %d of %d%s" msgstr "etiket %d van %d%s" @@ -2174,11 +2065,9 @@ msgstr "" "\n" " # NA etiket VAN reël in lêer/teks" -#, c-format msgid "Before byte %ld" msgstr "Voor greep %ld" -#, c-format msgid "Searching tags file %s" msgstr "Deursoek etiketlêer %s" @@ -2227,15 +2116,12 @@ msgstr "na" msgid "No user-defined commands found" msgstr "Geen gebruiker-gedefinieerde bevele gevind nie" -#, c-format msgid "calling %s" msgstr "roep %s" -#, c-format msgid "%s aborted" msgstr "%s gekanselleer" -#, c-format msgid "%s returning #%ld" msgstr "%s lewer #%ld op" @@ -2508,7 +2394,6 @@ msgstr "" "\n" "# Buffer lys:\n" -#, c-format msgid "" "\n" "# %s History (newest to oldest):\n" @@ -2528,7 +2413,6 @@ msgstr "Uitdrukking" msgid "Input Line" msgstr "Invoer Lyn" -#, c-format msgid "%sviminfo: %s in line: " msgstr "%sviminfo: %s in reël: " @@ -2576,7 +2460,6 @@ msgstr "" "\n" "# Springlys (nuutste eerste):\n" -#, c-format msgid "# This viminfo file was generated by Vim %s.\n" msgstr "# Hierdie viminfo lêer is gegenereer deur Vim %s.\n" @@ -2590,7 +2473,6 @@ msgstr "" msgid "# Value of 'encoding' when this file was written\n" msgstr "# Waarde van 'encoding' toe hierdie lêer gestoor is\n" -#, c-format msgid "Reading viminfo file \"%s\"%s%s%s%s" msgstr "Besig om viminfo lêer \"%s\"%s%s%s%s te lees" @@ -2603,14 +2485,12 @@ msgstr " merkers" msgid " FAILED" msgstr " GEFAAL" -#, c-format msgid "Writing viminfo file \"%s\"" msgstr "Besig om viminfo lêer \"%s\" te stoor" msgid "Already only one window" msgstr "Daar is alreeds slegs een venster" -#, c-format msgid "E370: Could not load library %s" msgstr "E370: Kon nie biblioteek laai nie %s" @@ -2653,14 +2533,12 @@ msgstr "" msgid "E13: File exists (add ! to override)" msgstr "E13: Lêer bestaan (gebruik ! om te dwing)" -#, c-format msgid "E15: Invalid expression: \"%s\"" msgstr "E15: Ongeldige uitdrukking: \"%s\"" msgid "E16: Invalid range" msgstr "E16: Ongeldige omvang" -#, c-format msgid "E17: \"%s\" is a directory" msgstr "E17: \"%s\" is 'n gids" @@ -2692,7 +2570,6 @@ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n" msgstr "" "E26: Hebreeus kan nie gebruik word nie: Nie tydens kompilering gekies nie\n" -#, c-format msgid "E28: No such highlight group name: %s" msgstr "E28: Geen sodanige uitliggroepnaam nie: %s" @@ -2732,7 +2609,6 @@ msgstr "E38: Nul parameter" msgid "E39: Number expected" msgstr "E39: Nommer verwag" -#, c-format msgid "E40: Can't open errorfile %s" msgstr "E40: Kan nie foutlêer %s oopmaak nie" @@ -2754,7 +2630,6 @@ msgstr "E45: 'readonly' opsie is aan (gebruik ! om te dwing)" msgid "E46: Cannot change read-only variable" msgstr "E46: Kan nie lees-alleen veranderlike stel nie" -#, c-format msgid "E46: Cannot change read-only variable \"%s\"" msgstr "E46: Kan nie lees-alleen veranderlike stel nie \"%s\"" @@ -2770,45 +2645,36 @@ msgstr "E49: Ongeldige rolgrootte" msgid "E50: Too many \\z(" msgstr "E50: Te veel \\z(" -#, c-format msgid "E51: Too many %s(" msgstr "E51: Te veel %s(" msgid "E52: Unmatched \\z(" msgstr "E52: Onpaar \\z(" -#, c-format msgid "E53: Unmatched %s%%(" msgstr "E53: Onpaar %s%%(" -#, c-format msgid "E54: Unmatched %s(" msgstr "E54: Onpaar %s(" -#, c-format msgid "E55: Unmatched %s)" msgstr "E55: Onpaar %s)" -#, c-format msgid "E59: Invalid character after %s@" msgstr "E59: Ongeldige karakter na %s@" -#, c-format msgid "E60: Too many complex %s{...}s" msgstr "E60: Te veel komplekse %s{...}ies" -#, c-format msgid "E61: Nested %s*" msgstr "E61: Geneste %s*" -#, c-format msgid "E62: Nested %s%c" msgstr "E62: Geneste %s%c" msgid "E63: Invalid use of \\_" msgstr "E63: Ongeldige gebruik van \\_" -#, c-format msgid "E64: %s%c follows nothing" msgstr "E64: %s%c volg niks" @@ -2824,15 +2690,12 @@ msgstr "E67: \\z1 e.a. nie hier toegelaat nie" msgid "E68: Invalid character after \\z" msgstr "E68: ongeldige karakter na \\z" -#, c-format msgid "E69: Missing ] after %s%%[" msgstr "E69: Ontbrekende ] na %s%%[" -#, c-format msgid "E70: Empty %s%%[]" msgstr "E70: Leë %s%%[]" -#, c-format msgid "E71: Invalid character after %s%%" msgstr "E71: Ongeldige karakter na %s%%" @@ -2878,7 +2741,6 @@ msgstr "E84: Geen veranderde buffer gevind nie" msgid "E85: There is no listed buffer" msgstr "E85: Daar is geen gelyste buffer nie" -#, c-format msgid "E86: Buffer %ld does not exist" msgstr "E86: Buffer %ld bestaan nie" @@ -2888,7 +2750,6 @@ msgstr "E87: Kan nie verby laaste buffer gaan nie" msgid "E88: Cannot go before first buffer" msgstr "E88: Kan nie vóór eerste buffer gaan nie" -#, c-format msgid "E89: No write since last change for buffer %d (add ! to override)" msgstr "" "E89: Buffer %d nog ongestoor sedert vorige wysiging (gebruik ! om te dwing)" @@ -2899,22 +2760,18 @@ msgstr "E90: Kan nie laaste buffer uitlaai nie" msgid "E91: 'shell' option is empty" msgstr "E91: 'shell' (dop) opsie is leeg" -#, c-format msgid "E92: Buffer %d not found" msgstr "E92: Buffer %d kon nie gevind word nie" -#, c-format msgid "E93: More than one match for %s" msgstr "E93: Meer as een treffer vir %s" -#, c-format msgid "E94: No matching buffer for %s" msgstr "E94: Geen buffer wat by %s pas nie" msgid "E95: Buffer with this name already exists" msgstr "E95: Buffer met hierdie naam bestaan alreeds" -#, c-format msgid "E96: Cannot diff more than %d buffers" msgstr "E96: Kan nie meer as %d buffers 'diff' nie" @@ -2935,11 +2792,9 @@ msgstr "" "E101: Meer as twee buffers in 'diff' modus, weet nie watter een om te " "gebruik nie" -#, c-format msgid "E102: Can't find buffer \"%s\"" msgstr "E102: Kan buffer %s nie vind nie" -#, c-format msgid "E103: Buffer \"%s\" is not in diff mode" msgstr "E103: Buffer \"%s\" is nie in 'diff' modus nie" @@ -2949,11 +2804,9 @@ msgstr "E104: 'Escape' nie toegelaat in digraaf nie" msgid "E105: Using :loadkeymap not in a sourced file" msgstr "E105: :loadkeymap word buite 'n uitvoerlêer gebruik" -#, c-format msgid "E107: Missing parentheses: %s" msgstr "E107: Ontbrekende hakies: %s" -#, c-format msgid "E108: No such variable: \"%s\"" msgstr "E108: Geen veranderlike: \"%s\"" @@ -2966,73 +2819,57 @@ msgstr "E110: Ontbrekende ')'" msgid "E111: Missing ']'" msgstr "E111: Ontbrekende ']'" -#, c-format msgid "E112: Option name missing: %s" msgstr "E112: Opsienaam ontbreek: %s" -#, c-format msgid "E113: Unknown option: %s" msgstr "E113: Onbekende opsie: %s" -#, c-format msgid "E116: Invalid arguments for function %s" msgstr "E116: Ongeldige parameters vir funksie %s" -#, c-format msgid "E117: Unknown function: %s" msgstr "E117: Onbekende funksie: %s" -#, c-format msgid "E118: Too many arguments for function: %s" msgstr "E118: Te veel parameters vir funksie: %s" -#, c-format msgid "E119: Not enough arguments for function: %s" msgstr "E119: Te min parameters vir funksie: %s" -#, c-format msgid "E120: Using not in a script context: %s" msgstr "E120: word buite skripkonteks gebruik: %s" -#, c-format msgid "E121: Undefined variable: %s" msgstr "E121: Ongedefinieerde veranderlike: %s" -#, c-format msgid "E121: Undefined variable: %c:%s" msgstr "E121: Ongedefinieerde veranderlike: %c:%s" -#, c-format msgid "E122: Function %s already exists, add ! to replace it" msgstr "E122: Funksie %s bestaan alreeds, gebruik ! om te vervang" -#, c-format msgid "E123: Undefined function: %s" msgstr "E123: Ongedefinieerde funksie: %s" -#, c-format msgid "E124: Missing '(': %s" msgstr "E124: Ontbrekende '(': %s" -#, c-format msgid "E125: Illegal argument: %s" msgstr "E125: Ongeldige parameter: %s" msgid "E126: Missing :endfunction" msgstr "E126: Ontbrekende ':endfunction'" -#, c-format msgid "E127: Cannot redefine function %s: It is in use" msgstr "E127: Kan funksie %s nie herdefinieer nie: Dit is in gebruik" -#, c-format msgid "E128: Function name must start with a capital or \"s:\": %s" msgstr "E128: Funksienaam moet met 'n hoofletter of \"s:\" begin: %s" msgid "E129: Function name required" msgstr "E129: Funksienaam vereis" -#, c-format msgid "E131: Cannot delete function %s: It is in use" msgstr "E131: Kan funksie %s nie verwyder nie: Dit is in gebruik" @@ -3048,11 +2885,9 @@ msgstr "E135: *Filter* Outobevele mag nie die huidige buffer verander nie" msgid "E136: viminfo: Too many errors, skipping rest of file" msgstr "E136: viminfo: Te veel foute, slaan die res van die lêer oor" -#, c-format msgid "E137: Viminfo file is not writable: %s" msgstr "E137: Viminfo lêer is nie skryfbaar nie: %s" -#, c-format msgid "E138: Can't write viminfo file %s!" msgstr "E138: Kan nie viminfo lêer %s stoor nie!" @@ -3062,14 +2897,12 @@ msgstr "E139: L msgid "E140: Use ! to write partial buffer" msgstr "E140: Gebruik ! om gedeeltelike buffer te skryf" -#, c-format msgid "E141: No file name for buffer %ld" msgstr "E141: Geen lêernaam vir buffer %ld nie" msgid "E142: File not written: Writing is disabled by 'write' option" msgstr "E142: Lêer nie gestoor nie: Stoor is afgeskakel deur die 'write' opsie" -#, c-format msgid "E143: Autocommands unexpectedly deleted new buffer %s" msgstr "E143: Outobevele het nuwe buffer %s onverwags geskrap" @@ -3085,57 +2918,45 @@ msgstr "E146: Patrone kan nie deur letters afgebaken word nie" msgid "E148: Regular expression missing from :global" msgstr "E148: Patroon ontbreek uit globaal" -#, c-format msgid "E149: Sorry, no help for %s" msgstr "E149: Jammer, geen hulp vir %s nie" -#, c-format msgid "E150: Not a directory: %s" msgstr "E150: Nie 'n gids nie: %s" -#, c-format msgid "E151: No match: %s" msgstr "E151: Geen treffer: %s" -#, c-format msgid "E152: Cannot open %s for writing" msgstr "E152: Kan nie %s oopmaak om te skryf nie" -#, c-format msgid "E153: Unable to open %s for reading" msgstr "E153: Kan nie %s oop maak om te lees nie" -#, c-format msgid "E154: Duplicate tag \"%s\" in file %s/%s" msgstr "E154: Duplikaat etiket \"%s\" in lêer %s/%s" -#, c-format msgid "E155: Unknown sign: %s" msgstr "E155: Onbekende opsie: %s" msgid "E156: Missing sign name" msgstr "E156: Ontbrekende tekennaam" -#, c-format msgid "E157: Invalid sign ID: %d" msgstr "E157: Ongeldige teken ID: %d" -#, c-format msgid "E158: Invalid buffer name: %s" msgstr "E158: Ongeldige buffernaam: %s" msgid "E159: Missing sign number" msgstr "E159: Ontbrekende tekennommer" -#, c-format msgid "E160: Unknown sign command: %s" msgstr "E160: Onbekende funksie: %s" -#, c-format msgid "E161: Breakpoint not found: %s" msgstr "E161: Inspeksiepunt kon nie gevind word nie: %s" -#, c-format msgid "E162: No write since last change for buffer \"%s\"" msgstr "E162: Buffer \"%s\" is nie geskryf sedert vorige wysiging nie" @@ -3169,15 +2990,12 @@ msgstr "E170: Ontbrekende ':endfor'" msgid "E171: Missing :endif" msgstr "E171: Ontbrekende ':endif'" -#, c-format msgid "E173: %d more file to edit" msgstr "E173: Nog %d lêer om te bewerk" -#, c-format msgid "E173: %d more files to edit" msgstr "E173: Nog %d lêers om te bewerk" -#, c-format msgid "E174: Command already exists: add ! to replace it: %s" msgstr "E174: Bevel bestaan alreeds: gebruik ! om te herdefinieer: %s" @@ -3193,15 +3011,12 @@ msgstr "E177: Telling kan nie twee keer gespesifiseer word nie" msgid "E178: Invalid default value for count" msgstr "E178: Ongeldige verstekwaarde vir telling" -#, c-format msgid "E179: Argument required for %s" msgstr "E179: Parameter nodig vir %s" -#, c-format msgid "E180: Invalid complete value: %s" msgstr "E180: Ongeldige voltooiingswaarde: %s" -#, c-format msgid "E181: Invalid attribute: %s" msgstr "E181: Ongeldige eienskap: %s" @@ -3211,11 +3026,9 @@ msgstr "E182: Ongeldige bevelnaam" msgid "E183: User defined commands must start with an uppercase letter" msgstr "E183: Gebruiker-gedefinieerde bevele moet met 'n hoofletter begin" -#, c-format msgid "E184: No such user-defined command: %s" msgstr "E184: Geen gebruiker-gedefinieerde bevel nie: %s" -#, c-format msgid "E185: Cannot find color scheme '%s'" msgstr "E185: Kan nie kleurskema '%s' vind nie" @@ -3230,11 +3043,9 @@ msgstr "" "E188: Verkryging van vensterposisie is nie vir hierdie platform " "geïmplementeer nie" -#, c-format msgid "E189: \"%s\" exists (add ! to override)" msgstr "E189: \"%s\" bestaan (gebruik ! om te dwing)" -#, c-format msgid "E190: Cannot open \"%s\" for writing" msgstr "E190: Kan \"%s\" nie oopmaak vir skryf nie" @@ -3254,7 +3065,6 @@ msgstr "E195: Kan 'viminfo' l msgid "E196: No digraphs in this version" msgstr "E196: Geen digrawe in hierdie weergawe nie" -#, c-format msgid "E197: Cannot set language to \"%s\"" msgstr "E197: Kan nie taal na \"%s\" verander nie" @@ -3285,19 +3095,15 @@ msgstr "E206: patchmode: Kan le msgid "E207: Can't delete backup file" msgstr "E207: Kan rugsteunlêer nie verwyder nie" -#, c-format msgid "E208: Error writing to \"%s\"" msgstr "E208: Kan nie skryf na \"%s\"" -#, c-format msgid "E209: Error closing \"%s\"" msgstr "E209: Kan \"%s\" nie sluit nie" -#, c-format msgid "E210: Error reading \"%s\"" msgstr "E210: Kan \"%s\" nie lees nie" -#, c-format msgid "E211: File \"%s\" no longer available" msgstr "E211: Lêer \"%s\" is nie meer beskikbaar nie" @@ -3310,15 +3116,12 @@ msgstr "E213: Kan nie omsit nie (gebruik ! om te skryf sonder omsetting)" msgid "E214: Can't find temp file for writing" msgstr "E214: Kan nie tydelike lêer vind vir skryf nie" -#, c-format msgid "E215: Illegal character after *: %s" msgstr "E215: Ongeldige karakter na *: %s" -#, c-format msgid "E216: No such event: %s" msgstr "E216: Geen sodanige gebeurtenis nie: %s" -#, c-format msgid "E216: No such group or event: %s" msgstr "E216: Geen sodanige groep of gebeurtenis nie: %s" @@ -3337,19 +3140,15 @@ msgstr "E220: Ontbrekende }." msgid "E223: Recursive mapping" msgstr "E223: Rekursiewe binding" -#, c-format msgid "E224: Global abbreviation already exists for %s" msgstr "E224: Globale afkorting bestaan alreeds vir %s" -#, c-format msgid "E225: Global mapping already exists for %s" msgstr "E225: Globale binding bestaan alreeds vir %s" -#, c-format msgid "E226: Abbreviation already exists for %s" msgstr "E226: Afkorting bestaan already vir %s" -#, c-format msgid "E227: Mapping already exists for %s" msgstr "E227: Binding bestaan alreeds vir %s" @@ -3359,7 +3158,6 @@ msgstr "E228: makemap: Ongeldige modus" msgid "E229: Cannot start the GUI" msgstr "E229: Kan nie die GUI begin nie" -#, c-format msgid "E230: Cannot read from \"%s\"" msgstr "E230: Kan nie lees uit \"%s\" nie" @@ -3372,52 +3170,42 @@ msgstr "E232: Kan nie BalloonEval skep met beide boodskap en terugroep nie" msgid "E233: Cannot open display" msgstr "E233: Kan nie vertoonskerm oopmaak nie" -#, c-format msgid "E234: Unknown fontset: %s" msgstr "E234: Onbekende fontstel: %s" -#, c-format msgid "E235: Unknown font: %s" msgstr "E235: Onbekende font: %s" -#, c-format msgid "E236: Font \"%s\" is not fixed-width" msgstr "E236: Font \"%s\" is nie 'n vaste-wydte font nie" msgid "E237: Printer selection failed" msgstr "E237: Drukker-seleksie het gefaal" -#, c-format msgid "E238: Print error: %s" msgstr "E238: Drukfout: %s" -#, c-format msgid "E239: Invalid sign text: %s" msgstr "E239: Ongeldige tekenteks: %s" -#, c-format msgid "E241: Unable to send to %s" msgstr "E241: Kan nie na %s stuur nie" -#, c-format msgid "E243: Argument not supported: \"-%s\"; Use the OLE version." msgstr "E243: Parameter nie bekend: \"-%s\"; Gebruik die OLE weergawe." -#, c-format msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: Ongeldige karakter '%c' in fontnaam \"%s\"" msgid "E246: FileChangedShell autocommand deleted buffer" msgstr "E246: 'FileChangedShell' outobevel het buffer verwyder" -#, c-format msgid "E247: No registered server named \"%s\"" msgstr "E247: Geen geregistreerde bediener gena