From 47c532e2bc55e8a48f7f47e1fae1ed30144f2fa1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 19 Mar 2022 15:18:53 +0000 Subject: [PATCH] Update runtime files --- runtime/doc/builtin.txt | 2 +- runtime/doc/ft_ada.txt | 26 +- runtime/doc/gui_w32.txt | 5 +- runtime/doc/if_perl.txt | 8 +- runtime/doc/insert.txt | 22 +- runtime/doc/options.txt | 9 +- runtime/doc/syntax.txt | 5 +- runtime/doc/tags | 1 + runtime/doc/tagsrch.txt | 3 +- runtime/doc/todo.txt | 88 +- runtime/doc/usr_29.txt | 21 +- runtime/doc/version9.txt | 59 +- runtime/doc/vim9.txt | 27 +- runtime/ftplugin/liquid.vim | 4 +- runtime/ftplugin/php.vim | 3 +- runtime/gvim.desktop | 5 +- runtime/indent/bst.vim | 6 +- runtime/indent/haml.vim | 4 +- runtime/indent/liquid.vim | 23 +- runtime/indent/sass.vim | 4 +- .../dist/opt/termdebug/plugin/termdebug.vim | 121 +- runtime/syntax/c.vim | 17 +- runtime/syntax/liquid.vim | 24 +- runtime/syntax/sass.vim | 3 +- runtime/syntax/vim.vim | 17 +- runtime/tools/demoserver.py | 3 - runtime/vim.desktop | 5 +- src/po/ca.po | 12642 ++++++++++------ src/po/gvim.desktop.in | 1 - src/po/vim.desktop.in | 1 - 30 files changed, 8187 insertions(+), 4972 deletions(-) diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 9e5b6f2f0..062ccc345 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -9034,7 +9034,7 @@ taglist({expr} [, {filename}]) *taglist()* entry depends on the language specific kind values. Only available when using a tags file generated by - Exuberant ctags or hdrtag. + Universal/Exuberant ctags or hdrtag. static A file specific tag. Refer to |static-tag| for more information. More entries may be present, depending on the content of the diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt index 9adfea9e3..8645ad9e9 100644 --- a/runtime/doc/ft_ada.txt +++ b/runtime/doc/ft_ada.txt @@ -1,4 +1,4 @@ -*ft_ada.txt* For Vim version 8.2. Last change: 2010 Jul 20 +*ft_ada.txt* For Vim version 8.2. Last change: 2022 Mar 13 ADA FILE TYPE PLUG-INS REFERENCE MANUAL~ @@ -89,9 +89,9 @@ file is opened and adds Ada related entries to the main and pop-up menu. *ft-ada-omni* The Ada omni-completions (|i_CTRL-X_CTRL-O|) uses tags database created either -by "gnat xref -v" or the "exuberant Ctags (http://ctags.sourceforge.net). The -complete function will automatically detect which tool was used to create the -tags file. +by "gnat xref -v" or the "Universal Ctags" (https://ctags.io). The complete +function will automatically detect which tool was used to create the tags +file. ------------------------------------------------------------------------------ 3.1 Omni Completion with "gnat xref" ~ @@ -125,18 +125,18 @@ NOTE: "gnat xref -v" is very tricky to use as it has almost no diagnostic 3.2 Omni Completion with "ctags"~ *ada-ctags* -Exuberant Ctags uses its own multi-language code parser. The parser is quite -fast, produces a lot of extra information (hence the name "Exuberant Ctags") -and can run on files which currently do not compile. +Universal/Exuberant Ctags use their own multi-language code parser. The +parser is quite fast, produces a lot of extra information and can run on files +which currently do not compile. -There are also lots of other Vim-tools which use exuberant Ctags. +There are also lots of other Vim-tools which use Universal/Exuberant Ctags. +Universal Ctags is preferred, Exuberant Ctags is no longer being developed. -You will need to install a version of the Exuberant Ctags which has Ada -support patched in. Such a version is available from the GNU Ada Project -(http://gnuada.sourceforge.net). +You will need to install Universal Ctags which is available from +https://ctags.io -The Ada parser for Exuberant Ctags is fairly new - don't expect complete -support yet. +The Ada parser for Universal/Exuberant Ctags is fairly new - don't expect +complete support yet. ============================================================================== 4. Compiler Support ~ diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index e43428668..93f68bd3d 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -1,4 +1,4 @@ -*gui_w32.txt* For Vim version 8.2. Last change: 2021 Oct 24 +*gui_w32.txt* For Vim version 8.2. Last change: 2022 Mar 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -236,7 +236,8 @@ The "* register reflects the contents of the clipboard. |quotestar| When the "unnamed" string is included in the 'clipboard' option, the unnamed register is the same. Thus you can yank to and paste from the clipboard -without prepending "* to commands. +without prepending "* to commands. If this doesn't work use the "unnamedplus" +string in the 'clipboard' option. The 'a' flag in 'guioptions' is not included by default. This means that text is only put on the clipboard when an operation is performed on it. Just diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index f1060e88d..61ad7c94b 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 8.2. Last change: 2022 Jan 28 +*if_perl.txt* For Vim version 8.2. Last change: 2022 Mar 13 VIM REFERENCE MANUAL by Sven Verdoolaege @@ -22,9 +22,9 @@ line of a file, regardless of the filename suffix, to check if a file is a Perl script (see scripts.vim in Vim's syntax directory). Vim assumes a file is POD text if the filename has a .POD suffix. -To use tags with Perl, you need a recent version of Exuberant ctags. Look -here: - http://ctags.sourceforge.net +To use tags with Perl, you need Universal/Exuberant Ctags. Look here: + Universal Ctags (preferred): https://ctags.io + Exuberant Ctags: http://ctags.sourceforge.net Alternatively, you can use the Perl script pltags.pl, which is shipped with Vim in the $VIMRUNTIME/tools directory. This script has currently more diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 3153d4641..5dc3348db 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 8.2. Last change: 2022 Mar 06 +*insert.txt* For Vim version 8.2. Last change: 2022 Mar 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1409,11 +1409,16 @@ in 'runtimepath'. Thus for "java" it is autoload/javacomplete.vim. C *ft-c-omni* -Completion of C code requires a tags file. You should use Exuberant ctags, -because it adds extra information that is needed for completion. You can find -it here: http://ctags.sourceforge.net/ Version 5.6 or later is recommended. +Completion of C code requires a tags file. You should use Universal/ +Exuberant ctags, because it adds extra information that is needed for +completion. You can find it here: + Universal Ctags: https://ctags.io + Exuberant Ctags: http://ctags.sourceforge.net -For version 5.5.4 you should add a patch that adds the "typename:" field: +Universal Ctags is preferred, Exuberant Ctags is no longer being developed. + +For Exuberant ctags, version 5.6 or later is recommended. For version 5.5.4 +you should add a patch that adds the "typename:" field: ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch A compiled .exe for MS-Windows can be found at: http://ctags.sourceforge.net/ @@ -1534,8 +1539,11 @@ will be suggested. All other elements are not placed in suggestion list. PHP *ft-php-omni* Completion of PHP code requires a tags file for completion of data from -external files and for class aware completion. You should use Exuberant ctags -version 5.5.4 or newer. You can find it here: http://ctags.sourceforge.net/ +external files and for class aware completion. You should use Universal/ +Exuberant ctags version 5.5.4 or newer. You can find it here: + + Universal Ctags: https://ctags.io + Exuberant Ctags: http://ctags.sourceforge.net Script completes: diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 9d353ac2d..5bafaff3d 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.2. Last change: 2022 Feb 18 +*options.txt* For Vim version 8.2. Last change: 2022 Mar 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7859,9 +7859,10 @@ A jump table for the options with a short description can be found at |Q_op|. linear search can be avoided when case is ignored. Use a value of '2' in the "!_TAG_FILE_SORTED" line for this. A tag file can be case-fold sorted with the -f switch to "sort" in most unices, as in the command: - "sort -f -o tags tags". For "Exuberant ctags" version 5.x or higher - (at least 5.5) the --sort=foldcase switch can be used for this as - well. Note that case must be folded to uppercase for this to work. + "sort -f -o tags tags". For Universal ctags and Exuberant ctags + version 5.x or higher (at least 5.5) the --sort=foldcase switch can be + used for this as well. Note that case must be folded to uppercase for + this to work. By default, tag searches are case-sensitive. Case is ignored when 'ignorecase' is set and 'tagcase' is "followic", or when 'tagcase' is diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index f43ab7c82..9451ff2b9 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -5553,11 +5553,12 @@ WARNING: The longer the tags file, the slower this will be, and the more memory Vim will consume. Only highlighting typedefs, unions and structs can be done too. For this you -must use Exuberant ctags (found at http://ctags.sf.net). +must use Universal Ctags (found at https://ctags.io) or Exuberant ctags (found +at http://ctags.sf.net). Put these lines in your Makefile: -# Make a highlight file for types. Requires Exuberant ctags and awk +# Make a highlight file for types. Requires Universal/Exuberant ctags and awk types: types.vim types.vim: *.[ch] ctags --c-kinds=gstu -o- *.[ch] |\ diff --git a/runtime/doc/tags b/runtime/doc/tags index 81ba7d9b4..e64bdd576 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4254,6 +4254,7 @@ E1265 eval.txt /*E1265* E1266 if_pyth.txt /*E1266* E127 eval.txt /*E127* E1270 change.txt /*E1270* +E1271 vim9.txt /*E1271* E128 eval.txt /*E128* E129 eval.txt /*E129* E13 message.txt /*E13* diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index b53131bf9..e2391190e 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -561,7 +561,8 @@ also works. The and characters can never appear inside a line. The second format is new. It includes additional information in optional fields at the end of each line. It is backwards compatible with Vi. It is -only supported by new versions of ctags (such as Exuberant ctags). +only supported by new versions of ctags (such as Universal ctags or Exuberant +ctags). {tagname} The identifier. Normally the name of a function, but it can be any identifier. It cannot contain a . diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 57a84e5cc..fd0817def 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 Mar 08 +*todo.txt* For Vim version 8.2. Last change: 2022 Mar 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,27 +38,10 @@ browser use: https://github.com/vim/vim/issues/1234 *known-bugs* -------------------- Known bugs and current work ----------------------- -Allow for assigning v:null to job/channel/funcref etc. -- Check that the declared type is not lost. -- Check: var d: dict = {a: function('tr'), b: null} - -Fix that with s being an empty string, this returns TRUE: - echo s is null_string - -Make sure null types work to: -- assign to a variable -- use as an argument -- use as default value of optional argument -- use as return value -- use in a list/dict constant, type is correct -- revert comparing with null? - -TODO item in eval.c - -Really drop the Athena GUI? And NeXtaw? +Really drop the Athena and NeXtaw GUI? Decide end of March. Once Vim9 is stable: -- Use Vim9 for runtime files. +- Use Vim9 for more runtime files. - Check code coverage, add more tests if needed. vim9execute.c line 1900 vim9expr.c @@ -123,7 +106,6 @@ Popup windows: - Should popup_getoptions() also return the mask? #7774 - Add a way to use popup_menu() synchronously: instead of invoking the callback, return the choice. (Ben Jackson, #6534) -- Use popup (or popup menu) for command line completion - When using a popup for the info of a completion menu, and there is not enough space, let the popup overlap with the menu. (#4544) - Implement flip option. @@ -2231,10 +2213,6 @@ Jan 7) Problem with editing file in binary mode. (Ingo Krabbe, 2009 Oct 8) -With 'wildmode' set to "longest:full,full" and pressing Tab once the first -entry in wildmenu is highlighted, that shouldn't happen. (Yuki Watanabe, 2011 -Feb 12) - Display error when 'tabline' that includes a file name with double-width characters. (2010 Aug 14, bootleq) @@ -2437,10 +2415,6 @@ is executed. first line. (Ingo Karkat, 2008 Jul 1) Ian Kelling is working on this. Similar problem with ":e". (Marc Montu, 2014 Apr 22) -Wildmenu not deleted: "gvim -u NONE", ":set nocp wildmenu cmdheight=3 -laststatus=2", CTRL-D CTRL-H CTRL-H CTRL-H. (A.Politz, 2008 April 1) -Works OK with Vim in an xterm. - Cursor line moves in other window when using CTRL-W J that doesn't change anything. (Dasn, 2009 Apr 7) @@ -2473,10 +2447,6 @@ backslash? (Robert Vibrant, 2008 Jun 5) When 'rightleft' is set, cursorcolumn isn't highlighted after the end of a line. It's also wrong in folds. (Dominique Pelle, 2010 Aug 21) -After using for command line completion after ":ta blah" and getting E33 -(no tags file), further editing the command to e.g., ":echo 'blah'", the -command is not executed. Fix by Ian Kelling? - ":help s/~" jumps to *s/\~*, while ":help s/\~" doesn't find anything. (Tim Chase) Fix by Ian Kelling, 2008 Jul 14. @@ -2652,16 +2622,6 @@ This should avoid flicker. Other solution by A.Politz, 2007 Aug 22. When a register contains illegal bytes, writing viminfo in utf-8 and reading it back doesn't result in utf-8. (Devin Bayer) -Command line completion: Scanning for tags doesn't check for typed key now and -then? Hangs for about 5 seconds. Appears to be caused by finding include -files with "foo/**" in 'path'. (Kalisiak, 2006 July 15) -Additional info: When using the |wildcards| ** globing, vim hangs -indefinitely on lots of directories. The |file-searching| globing, like in -":set path=/**" does not hang as often as with globing with |wildcards|, like -in ":1find /**/file". This is for files that unix "find" can find very -quickly. Merging the 2 kinds of globing might make this an easier fix. (Ian -Kelling, 2008 July 4) - When the file name has parenthesis, e.g., "foo (bar).txt", ":!ls '%'" has the parenthesis escaped but not the space. That's inconsistent. Either escape neither or both. No escaping might be best, because it doesn't depend on @@ -2740,8 +2700,6 @@ Cursor displayed in the wrong position when using 'numberwidth'. (James Vega, When $VAR contains a backslash expand('$VAR') removes it. (Teemu Likonen, 2008 Jun 18) -If the variable "g:x#y#z" exists completion after ":echo g:x#" doesn't work. - In debug mode, using CTRL-R = to evaluate a function causes stepping through the function. (Hari Krishna Dara, 2006 Jun 28) @@ -2850,13 +2808,6 @@ reload it then? For Aap: include a config.arg.example file with hints how to use config.arg. -Command line completion when 'cmdheight' is maximum and 'wildmenu' is set, -only one buffer line displayed, causes display errors. - -Completing with 'wildmenu' and using and to move through directory -tree stops unexpectedly when using ":cd " and entering a directory that -doesn't contain other directories. - Default for 'background' is wrong when using xterm with 256 colors. Table with estimates from Matteo Cavalleri, 2014 Jan 10. @@ -3538,8 +3489,6 @@ Macintosh: 8 When doing Insert mode completion a mapping cannot recursively call edit(), because the completion information is global. Put everything in an allocated structure? -8 Command line completion: buffers "foo.txt" and "../b/foo.txt", completing - ":buf foo" doesn't find the second one. (George V. Reilly) 7 mb_off2cells() doesn't work correctly on the tail byte of a double-byte character. (Yasuhiro Matsumoto) It should return 1 when used on a tail byte, like for utf-8. Store second byte of double-byte in ScreenLines2[] @@ -4274,8 +4223,6 @@ Syntax highlighting: 7 CTRL-] checks the highlight group for finding out what the tag is. 7 Add an explanation how a list of words can be used to highlight misspelled words. -8 Add more command line completion for :syntax. -8 Add more command line completion for :highlight. 7 Should find a better way to parse the :syntax and :highlight commands. Use tables or lists that can be shared by parsing for execution and completion? @@ -5061,6 +5008,35 @@ Command line completion: - Add 'wildlongest' option: Key to use to find longest common match for command line completion (default CTRL-L), like 'wildchar'. (Cregut) Also: when there are several matches, show them line a CTRL-D. +- With 'wildmode' set to "longest:full,full" and pressing Tab once the first + entry in wildmenu is highlighted, that shouldn't happen. (Yuki Watanabe, + 2011 Feb 12) +- After using for command line completion after ":ta blah" and getting + E33 (no tags file), further editing the command to e.g., ":echo 'blah'", + the command is not executed. Fix by Ian Kelling? +- Command line completion: Scanning for tags doesn't check for typed key now + and then? Hangs for about 5 seconds. Appears to be caused by finding + include files with "foo/**" in 'path'. (Kalisiak, 2006 July 15) + Additional info: When using the |wildcards| ** globing, vim hangs + indefinitely on lots of directories. The |file-searching| globing, like in + ":set path=/**" does not hang as often as with globing with |wildcards|, + like in ":1find /**/file". This is for files that unix "find" can find + very quickly. Merging the 2 kinds of globing might make this an easier + fix. (Ian Kelling, 2008 July 4) +- Command line completion when 'cmdheight' is maximum and 'wildmenu' is set, + only one buffer line displayed, causes display errors. +- Completing with 'wildmenu' and using and to move through + directory tree stops unexpectedly when using ":cd " and entering a + directory that doesn't contain other directories. +8 Command line completion: buffers "foo.txt" and "../b/foo.txt", completing + ":buf foo" doesn't find the second one. (George V. Reilly) +8 Add more command line completion for :syntax. +8 Add more command line completion for :highlight. +- Wildmenu not deleted: "gvim -u NONE", ":set nocp wildmenu cmdheight=3 + laststatus=2", CTRL-D CTRL-H CTRL-H CTRL-H. (A.Politz, 2008 April 1) Works + OK with Vim in an xterm. +- If the variable "g:x#y#z" exists completion after ":echo g:x#" doesn't + work. Command line history: diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index 594020603..de1b91151 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 8.2. Last change: 2016 Feb 27 +*usr_29.txt* For Vim version 8.2. Last change: 2022 Mar 13 VIM USER MANUAL - by Bram Moolenaar @@ -33,10 +33,12 @@ following command: > ctags *.c "ctags" is a separate program. Most Unix systems already have it installed. -If you do not have it yet, you can find Exuberant ctags here: - +If you do not have it yet, you can find Universal/Exuberant ctags at: + http://ctags.io ~ http://ctags.sf.net ~ +Universal ctags is preferred, Exuberant ctags is no longer being developed. + Now when you are in Vim and you want to go to a function definition, you can jump to it by using the following command: > @@ -142,15 +144,15 @@ ONE TAGS FILE When Vim has to search many places for tags files, you can hear the disk rattling. It may get a bit slow. In that case it's better to spend this time while generating one big tags file. You might do this overnight. - This requires the Exuberant ctags program, mentioned above. It offers an -argument to search a whole directory tree: > + This requires the Universal or Exuberant ctags program, mentioned above. +It offers an argument to search a whole directory tree: > cd ~/proj ctags -R . -The nice thing about this is that Exuberant ctags recognizes various file -types. Thus this doesn't work just for C and C++ programs, also for Eiffel -and even Vim scripts. See the ctags documentation to tune this. +The nice thing about this is that Universal/Exuberant ctags recognizes various +file types. Thus this doesn't work just for C and C++ programs, also for +Eiffel and even Vim scripts. See the ctags documentation to tune this. Now you only need to tell Vim where your big tags file is: > :set tags=~/proj/tags @@ -232,7 +234,8 @@ A TAGS BROWSER Since CTRL-] takes you to the definition of the identifier under the cursor, you can use a list of identifier names as a table of contents. Here is an example. - First create a list of identifiers (this requires Exuberant ctags): > + First create a list of identifiers (this requires Universal or Exuberant +ctags): > ctags --c-types=f -f functions *.c diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt index 0e1ecf55d..7d5c2585e 100644 --- a/runtime/doc/version9.txt +++ b/runtime/doc/version9.txt @@ -837,7 +837,7 @@ Files: runtime/tools/ccfilter.c, src/libvterm/src/parser.c, Patch 8.2.0107 Problem: Hgignore is out of sync from gitignore. Solution: Add lines to hgignore. (Ken Takata) -Files: .hgigmore +Files: .hgignore Patch 8.2.0108 Problem: When sign text is changed a manual redraw is needed. (Pontus @@ -2474,7 +2474,7 @@ Files: src/testdir/test_hardcopy.vim Patch 8.2.0367 Problem: Can use :pedit in a popup window. Solution: Disallow it. -Files: src/ex_docmd.c, src/testdir/test_popuwin.vim +Files: src/ex_docmd.c, src/testdir/test_popupwin.vim Patch 8.2.0368 Problem: Vim9: import that redefines local variable does not fail. @@ -2513,7 +2513,7 @@ Patch 8.2.0372 Problem: Prop_find() may not find text property at start of the line. Solution: Adjust the loop to find properties. (Axel Forsman, closes #5761, closes #5663) -Files: src/testprop.c, src/testdir/test_textprop.vim +Files: src/textprop.c, src/testdir/test_textprop.vim Patch 8.2.0373 Problem: Type of term_sendkeys() is unknown. @@ -3743,7 +3743,7 @@ Patch 8.2.0570 Problem: Vim9: no error when omitting type from argument. Solution: Enforce specifying argument types. Files: src/userfunc.c, src/ex_eval.c, src/testdir/test_vim9_script.vim, - src/testdir/test_vim9_func.vim, src/testdir/test_vim9_expr.vim + src/testdir/test_vim9_func.vim, src/testdir/test_vim9_expr.vim, src/testdir/test_vim9_disassemble.vim Patch 8.2.0571 @@ -3921,7 +3921,7 @@ Files: runtime/doc/netbeans.txt, src/netbeans.c, src/os_win32.c, Patch 8.2.0600 Problem: Vim9: cannot read or write w:, t: and b: variables. Solution: Implement load and store for w:, t: and b: variables. - (closes #5950) + (closes #5950) Files: src/testdir/test_vim9_disassemble.vim, src/testdir/test_vim9_expr.vim, src/testdir/test_vim9_script.vim, src/vim9.h, src/vim9compile.c, src/vim9execute.c @@ -4042,7 +4042,7 @@ Files: runtime/lang/menu_sv_se.latin1.vim Patch 8.2.0618 Problem: Echoing a null list results in no output. (Yegappan Lakshmanan) -Solution: Return "[]" instead of NULL in echo_string_core(). +Solution: Return "[]" instead of NULL in echo_string_core(). Files: src/eval.c, src/testdir/test_messages.vim Patch 8.2.0619 @@ -4095,7 +4095,7 @@ Solution: Give error for missing space. Implement :echomsg and :echoerr. (closes #5670) Files: src/vim9compile.c, src/vim9execute.c, src/vim9.h, src/userfunc.c, src/eval.c, src/globals.h, src/testdir/test_vim9_func.vim, - src/testdir/test_vim9_disassemble.vim + src/testdir/test_vim9_disassemble.vim, src/testdir/test_vim9_script.vim Patch 8.2.0627 @@ -5205,8 +5205,9 @@ Problem: Libvterm code lags behind the upstream version. Solution: Include revision 727, but add the index instead of switching between RGB and indexed. Files: src/terminal.c, src/term.c, src/libvterm/include/vterm.h, - src/libvterm/src/pen.c src/libvterm/src/screen.c - src/libvterm/src/vterm_internal.h src/libvterm/t/30state_pen.test + src/libvterm/src/pen.c, src/libvterm/src/screen.c, + src/libvterm/src/vterm_internal.h, + src/libvterm/t/30state_pen.test, src/libvterm/t/harness.c, src/libvterm/src/state.c, src/libvterm/t/26state_query.test, src/libvterm/t/64screen_pen.test @@ -5299,7 +5300,7 @@ Files: runtime/doc/vim9.txt, src/vim9script.c, src/structs.h, src/evalvars.c, src/proto/evalvars.pro, src/vim9compile.c, src/proto/vim9compile.pro, src/vim9execute.c, src/ex_cmds.h, src/ex_docmd.c, src/ex_cmdidxs.h, src/vim.h, src/testdir/vim9.vim, - src/testdir/test_vim9_disassemble.vim + src/testdir/test_vim9_disassemble.vim, src/testdir/test_vim9_func.vim, src/testdir/test_vim9_script.vim Patch 8.2.0819 @@ -5667,7 +5668,7 @@ Patch 8.2.0875 Problem: Getting attributes for directory entries is slow. Solution: Add readdirex(). (Ken Takata, closes #5619) Files: runtime/doc/eval.txt, runtime/doc/usr_41.txt, src/evalfunc.c, - src/fileio.c, src/filepath.c src/proto/fileio.pro, + src/fileio.c, src/filepath.c, src/proto/fileio.pro, src/proto/filepath.pro, src/testdir/test_functions.vim Patch 8.2.0876 @@ -6292,7 +6293,7 @@ Patch 8.2.0981 Problem: Vim9: cannot compile "[var, var] = list". Solution: Implement list assignment. Files: src/vim9compile.c, src/vim9.h, src/vim9execute.c, src/evalvars.c, - src/proto/evalvars.pro src/eval.c, src/testdir/test_vim9_script.vim + src/proto/evalvars.pro, src/eval.c, src/testdir/test_vim9_script.vim Patch 8.2.0982 Problem: Insufficient testing for reading/writing files. @@ -6335,7 +6336,7 @@ Files: runtime/doc/eval.txt, runtime/doc/mlang.txt, src/auto/configure, src/cmdexpand.c, src/config.h.in, src/configure.ac, src/evalfunc.c, src/evalvars.c, src/ex_cmds2.c, src/fileio.c, src/filepath.c, src/globals.h, src/proto/fileio.pro, - src/testdir/test_cmdline.vim, src/testdir/test_functions.vim + src/testdir/test_cmdline.vim, src/testdir/test_functions.vim, src/vim.h Patch 8.2.0989 @@ -9545,7 +9546,7 @@ Patch 8.2.1518 Problem: Vim9: cannot assign to local option. Solution: Skip over "&l:" and "&g:". (closes #6749) Files: src/ex_docmd.c, src/proto/ex_docmd.pro, src/testdir/vim9.vim, - src/vim9compile.c src/testdir/test_vim9_script.vim + src/vim9compile.c, src/testdir/test_vim9_script.vim Patch 8.2.1519 Problem: Vim9: Ex command default range is not set. @@ -11740,7 +11741,7 @@ Files: src/structs.h, src/ex_docmd.c, src/proto/ex_docmd.pro, Patch 8.2.1898 Problem: Command modifier parsing always uses global cmdmod. Solution: Pass in cmdmod_T to use. Rename struct fields consistently. -Files: src/structs.h, src/arglist.c src/buffer.c, src/bufwrite.c, +Files: src/structs.h, src/arglist.c, src/buffer.c, src/bufwrite.c, src/diff.c, src/change.c, src/cmdhist.c, src/edit.c, src/ex_cmds.c, src/ex_cmds2.c, src/ex_docmd.c, src/ex_getln.c, src/fileio.c, src/filepath.c, src/gui.c, src/gui_gtk_x11.c, @@ -13549,7 +13550,7 @@ Patch 8.2.2209 Problem: Vim9: return type of => lambda not parsed. Solution: Parse and use the return type. Files: src/vim9compile.c, src/userfunc.c, src/vim9type.c, - src/proto/vim9type.pro, src/vim9script.c, src/eval.c + src/proto/vim9type.pro, src/vim9script.c, src/eval.c, src/testdir/test_vim9_expr.vim Patch 8.2.2210 @@ -13776,7 +13777,7 @@ Solution: Check the window still has lines. (Christian Brabandt, Files: src/term.c Patch 8.2.2249 -Problem: Termcodes test is flaky when used over ssh with X forwarding. +Problem: Termcodes test is flaky when used over ssh with X forwarding. Solution: Set 'mousetime' to a larger value. (Dominique Pellé, closes #7576, closes #7563) Files: src/testdir/test_termcodes.vim @@ -15482,7 +15483,7 @@ Problem: Vim9: cannot use a range with :unlet. Solution: Implement ISN_UNLETRANGE. Files: src/errors.h, src/eval.c, src/evalvars.c, src/list.c, src/proto/evalvars.pro, src/proto/list.pro, src/vim9.h, - src/vim9compile.c, src/vim9execute.c + src/vim9compile.c, src/vim9execute.c, src/testdir/test_vim9_assign.vim Patch 8.2.2534 @@ -15518,7 +15519,7 @@ Problem: Vim9: return from finally block causes a hang. Solution: Store both the finally and endtry indexes. (closes #7885) Files: src/vim9execute.c, src/vim9compile.c, src/vim9.h, src/testdir/test_vim9_script.vim, - + Patch 8.2.2540 Problem: Vim9: no error for using script var name for argument. Solution: Check for this error. (closes #7868) @@ -17249,7 +17250,7 @@ Files: src/vim9compile.c, src/testdir/test_vim9_expr.vim Patch 8.2.2841 Problem: MS-Windows: cursor in wrong position when 'lazyredraw' and - 'statusline' are set. + 'statusline' are set. Solution: Call compute_cmdrow(). (closes #8170, closes #8184) Files: src/os_win32.c @@ -17936,7 +17937,7 @@ Patch 8.2.2957 Problem: Using getchar() in Vim9 script is problematic. Solution: Add getcharstr(). (closes #8343) Files: runtime/doc/eval.txt, src/evalfunc.c, src/getchar.c, - src/proto/getchar.pro, src/testdir/test_getchar.vim + src/proto/getchar.pro, src/testdir/test_functions.vim Patch 8.2.2958 (after 8.2.2957) Problem: Function list test fails. @@ -18849,7 +18850,7 @@ Solution: Use eval(). Files: src/testdir/check.vim Patch 8.2.3110 -Problem: A pattern that matches the cursor position is bit complicated. +Problem: A pattern that matches the cursor position is a bit complicated. Solution: Use a dot to indicate the cursor line and column. (Christian Brabandt, closes #8497, closes #8179) Files: runtime/doc/pattern.txt, src/errors.h, src/regexp_bt.c, @@ -18864,7 +18865,7 @@ Patch 8.2.3112 (after 8.2.3090) Problem: With concealing enabled and indirectly closing a fold the cursor may be somewhere in a folded line when it is not on the first line of the fold. -Solution: Check if he cursor is somewhere in the folded text. +Solution: Check if the cursor is somewhere in the folded text. Files: src/drawscreen.c Patch 8.2.3113 @@ -23950,7 +23951,7 @@ Patch 8.2.3957 Problem: Error messages are spread out. Solution: Move more errors to errors.h. Files: src/errors.h, src/globals.h, src/arglist.c, src/bufwrite.c, - src/evalvars.c, src/ex_cmds2.c, src/ex_docmd.c src/ex_eval.c, + src/evalvars.c, src/ex_cmds2.c, src/ex_docmd.c, src/ex_eval.c, src/help.c, src/scriptfile.c, src/usercmd.c, src/userfunc.c, src/vim9cmds.c, src/vim9compile.c @@ -23975,7 +23976,7 @@ Files: src/errors.h, src/alloc.c, src/arglist.c, src/autocmd.c, Patch 8.2.3961 Problem: Error messages are spread out. Solution: Move more errors to errors.h. -Files: src/errors.h, src/globals.h src/arglist.c, src/autocmd.c, +Files: src/errors.h, src/globals.h, src/arglist.c, src/autocmd.c, src/blob.c, src/bufwrite.c, src/channel.c, src/clipboard.c, src/cmdexpand.c, src/debugger.c, src/dict.c, src/eval.c, src/evalfunc.c, src/evalvars.c, src/evalwindow.c, src/ex_cmds.c, @@ -24291,7 +24292,7 @@ Files: src/errors.h, src/channel.c, src/ex_docmd.c, src/ex_eval.c, Patch 8.2.4004 Problem: Old compiler complains about struct init with variable. -Solution: Set the struct member later. (John Marriott) +Solution: Set the struct member later. (John Marriott) Files: src/evalfunc.c Patch 8.2.4005 @@ -24494,7 +24495,7 @@ Files: src/time.c Patch 8.2.4036 Problem: Vim9: script test file is getting too long. Solution: Split the import/export functionality to a separate file. -Files: src/testdir/test_vim9_script.vim src/testdir/test_vim9_import.vim, +Files: src/testdir/test_vim9_script.vim, src/testdir/test_vim9_import.vim, src/testdir/Make_all.mak Patch 8.2.4037 @@ -25457,7 +25458,7 @@ Patch 8.2.4202 Problem: Vim9: cannot export function that exists globally. Solution: When checking if a function already exists only check for script-local functions. (closes #9615) -Files: src/userfunc.c, src/proto/userfunc.pro, src/vim.h, +Files: src/userfunc.c, src/proto/userfunc.pro, src/vim.h, src/vim9compile.c, src/vim9instr.c, src/testdir/test_vim9_import.vim @@ -25853,7 +25854,7 @@ Patch 8.2.4265 (after 8.2.4264) Problem: Autoload tests fails. Solution: Use export instead of name with #. Files: src/testdir/sautest/autoload/auto9.vim, - src/testdir/test_autoload.vim src/testdir/test_ins_complete.vim + src/testdir/test_autoload.vim, src/testdir/test_ins_complete.vim Patch 8.2.4266 Problem: Compiler warning for uninitialized variable. diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt index 54e02aecb..f494880e2 100644 --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -1,4 +1,4 @@ -*vim9.txt* For Vim version 8.2. Last change: 2022 Mar 08 +*vim9.txt* For Vim version 8.2. Last change: 2022 Mar 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -995,6 +995,11 @@ The values can also be useful as the default value for an argument: > if b == null_blob # b argument was not given +It is possible to compare `null` with any value, this will not give a type +error. However, comparing `null` with a number, float or bool will always +result in `false`. This is different from legacy script, where comparing +`null` with zero or `false` would return `true`. + When converting a boolean to a string `false` and `true` are used, not `v:false` and `v:true` like in legacy script. `v:none` has no `none` replacement, it has no equivalent in other languages. @@ -1234,6 +1239,11 @@ Closures defined in a loop will share the same context. For example: > endfor echo range(5)->map((i, _) => flist[i]()) # Result: [4, 4, 4, 4, 4] +< *E1271* +A closure must be compiled in the context that it is defined in, so that +variables in that context can be found. This mostly happens correctly, except +when a function is marked for debugging with `breakadd` after it was compiled. +Make sure the define the breakpoint before compiling the outerh function. The "inloop" variable will exist only once, all closures put in the list refer to the same instance, which in the end will have the value 4. This is @@ -1739,7 +1749,8 @@ actually needed. Using the autoload mechanism is recommended: prefix is obtained from the file name, as you would to manually in a legacy autoload script. Thus the exported function can be found with "for#search#Stuff", but you would normally use `import autoload` and not - use the prefix. + use the prefix (which has the side effect of loading the autoload script + when compiling a function that encounters this name). You can split up the functionality and import other scripts from the autoload script as you like. This way you can share code between plugins. @@ -1751,7 +1762,17 @@ script context of where the mapping was defined. When compiling a `:def` function and a function in an autoload script is encountered, the script is not loaded until the `:def` function is called. This also means you get any errors only at runtime, since the argument and -return types are not known yet. +return types are not known yet. If you would use the name with '#' characters +then the autoload script IS loaded. + +Be careful to not refer to an item in an autoload script that does trigger +loading it unintentionally. For example, when setting an option that takes a +function name, make sure to use a string, not a function reference: > + import autoload 'qftf.vim' + &quickfixtextfunc = 'qftf.Func' # autoload script NOT loaded + &quickfixtextfunc = qftf.Func # autoload script IS loaded +On the other hand, it can be useful to load the script early, at a time when +any errors should be given. For testing the |test_override()| function can be used to have the `import autoload` load the script right away, so that the items and types can diff --git a/runtime/ftplugin/liquid.vim b/runtime/ftplugin/liquid.vim index b211a884c..f24ec4cbb 100644 --- a/runtime/ftplugin/liquid.vim +++ b/runtime/ftplugin/liquid.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Liquid " Maintainer: Tim Pope -" Last Change: 2010 May 21 +" Last Change: 2022 Mar 15 if exists('b:did_ftplugin') finish @@ -53,7 +53,7 @@ if has('gui_win32') endif if exists('loaded_matchit') - let b:match_words .= '\<\%(if\w*\|unless\|case\)\>:\<\%(elsif\|else\|when\)\>:\,\<\%(for\|tablerow\)\>:\%({%\s*\)\@<=empty\>:\,<\(capture\|comment\|highlight\)\>:\' + let b:match_words .= '\<\%(if\w*\|unless\|case\)\>:\<\%(elsif\|else\|when\)\>:\,\<\%(for\|tablerow\)\>:\%({%\s*\)\@<=empty\>:\,\<\(capture\|comment\|highlight\)\>:\' endif setlocal commentstring={%\ comment\ %}%s{%\ endcomment\ %} diff --git a/runtime/ftplugin/php.vim b/runtime/ftplugin/php.vim index 3ff0828ff..2824a5853 100644 --- a/runtime/ftplugin/php.vim +++ b/runtime/ftplugin/php.vim @@ -73,10 +73,11 @@ exe 'nno ]] /' . escape(s:section, '|') . '/:nohls' exe 'ono [[ ?' . escape(s:section, '|') . '?:nohls' exe 'ono ]] /' . escape(s:section, '|') . '/:nohls' +setlocal suffixesadd=.php setlocal commentstring=/*%s*/ " Undo the stuff we changed. -let b:undo_ftplugin = "setlocal commentstring< include< omnifunc<" . +let b:undo_ftplugin = "setlocal suffixesadd< commentstring< include< omnifunc<" . \ " | unlet! b:browsefilter b:match_words | " . \ s:undo_ftplugin diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop index 2fc06c2f5..3c5ff1ce4 100644 --- a/runtime/gvim.desktop +++ b/runtime/gvim.desktop @@ -2,6 +2,7 @@ # Edit the src/po/gvim.desktop.in file instead. [Desktop Entry] # Translators: This is the Application Name used in the GVim desktop file +Name[ca]=GVim Name[de]=GVim Name[eo]=GVim Name[fi]=GVim @@ -13,6 +14,7 @@ Name[sr]=GVim Name[tr]=GVim Name=GVim # Translators: This is the Generic Application Name used in the Vim desktop file +GenericName[ca]=Editor de text GenericName[de]=Texteditor GenericName[eo]=Tekstoredaktilo GenericName[fi]=Tekstinmuokkain @@ -25,6 +27,7 @@ GenericName[sr]=Едитор текст GenericName[tr]=Metin Düzenleyici GenericName=Text Editor # Translators: This is the comment used in the Vim desktop file +Comment[ca]=Edita fitxers de text Comment[de]=Textdateien bearbeiten Comment[eo]=Redakti tekstajn dosierojn Comment[fi]=Muokkaa tekstitiedostoja @@ -49,7 +52,6 @@ Comment[be]=Рэдагаваньне тэкставых файлаў Comment[bg]=Редактиране на текстови файлове Comment[bn]=টেক্স্ট ফাইল এডিট করুন Comment[bs]=Izmijeni tekstualne datoteke -Comment[ca]=Edita fitxers de text Comment[cs]=Úprava textových souborů Comment[cy]=Golygu ffeiliau testun Comment[da]=Rediger tekstfiler @@ -105,6 +107,7 @@ Exec=gvim -f %F Terminal=false Type=Application # Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon! +Keywords[ca]=Text;editor; Keywords[de]=Text;Editor; Keywords[eo]=Teksto;redaktilo; Keywords[fi]=Teksti;muokkain;editori; diff --git a/runtime/indent/bst.vim b/runtime/indent/bst.vim index 47e305881..3dd8d711a 100644 --- a/runtime/indent/bst.vim +++ b/runtime/indent/bst.vim @@ -1,20 +1,18 @@ " Vim indent file " Language: bst " Author: Tim Pope -" $Id: bst.vim,v 1.1 2007/05/05 18:11:12 vimboss Exp $ +" Last Change: 2022 Mar 15 if exists("b:did_indent") finish endif let b:did_indent = 1 -setlocal expandtab setlocal indentexpr=GetBstIndent(v:lnum) -"setlocal smartindent setlocal cinkeys& setlocal cinkeys-=0# setlocal indentkeys& -"setlocal indentkeys+=0% +let b:undo_indent = 'setlocal indentexpr< cinkeys< indentkeys<' " Only define the function once. if exists("*GetBstIndent") diff --git a/runtime/indent/haml.vim b/runtime/indent/haml.vim index baca1d49d..acd99d9c7 100644 --- a/runtime/indent/haml.vim +++ b/runtime/indent/haml.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Haml " Maintainer: Tim Pope -" Last Change: 2019 Dec 05 +" Last Change: 2022 Mar 15 if exists("b:did_indent") finish @@ -14,6 +14,8 @@ setlocal autoindent setlocal indentexpr=GetHamlIndent() setlocal indentkeys=o,O,*,},],0),!^F,=end,=else,=elsif,=rescue,=ensure,=when +let b:undo_indent = "setl ai< inde< indk<" + " Only define the function once. if exists("*GetHamlIndent") finish diff --git a/runtime/indent/liquid.vim b/runtime/indent/liquid.vim index 7beb0388d..6fc933797 100644 --- a/runtime/indent/liquid.vim +++ b/runtime/indent/liquid.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Liquid " Maintainer: Tim Pope -" Last Change: 2017 Jun 13 +" Last Change: 2022 Mar 15 if exists('b:did_indent') finish @@ -29,17 +29,19 @@ let b:did_indent = 1 setlocal indentexpr=GetLiquidIndent() setlocal indentkeys=o,O,*,<>>,{,},0),0],o,O,!^F,=end,=endif,=endunless,=endifchanged,=endcase,=endfor,=endtablerow,=endcapture,=else,=elsif,=when,=empty +let b:undo_indent = "setl inde< indk<" + " Only define the function once. if exists('*GetLiquidIndent') finish endif -function! s:count(string,pattern) +function! s:count(string, pattern) abort let string = substitute(a:string,'\C'.a:pattern,"\n",'g') return strlen(substitute(string,"[^\n]",'','g')) endfunction -function! GetLiquidIndent(...) +function! GetLiquidIndent(...) abort if a:0 && a:1 == '.' let v:lnum = line('.') elseif a:0 && a:1 =~ '^\d' @@ -51,13 +53,14 @@ function! GetLiquidIndent(...) let lnum = prevnonblank(v:lnum-1) let line = getline(lnum) let cline = getline(v:lnum) - let line = substitute(line,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','') - let line .= matchstr(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+') - let cline = substitute(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','') + let line = substitute(line,'\C^\%(\s*{%-\=\s*end\w*\s*-\=%}\)\+','','') + let line = substitute(line,'\C\%(\s*{%-\=\s*if.\+-\=%}.\+{%-\=\s*endif\s*-\=%}\)\+','','g') + let line .= matchstr(cline,'\C^\%(\s*{%-\=\s*end\w*\s*-\=%}\)\+') + let cline = substitute(cline,'\C^\%(\s*{%-\=\s*end\w*\s*-\=%}\)\+','','') let sw = shiftwidth() - let ind += sw * s:count(line,'{%\s*\%(if\|elsif\|else\|unless\|ifchanged\|case\|when\|for\|empty\|tablerow\|capture\)\>') - let ind -= sw * s:count(line,'{%\s*end\%(if\|unless\|ifchanged\|case\|for\|tablerow\|capture\)\>') - let ind -= sw * s:count(cline,'{%\s*\%(elsif\|else\|when\|empty\)\>') - let ind -= sw * s:count(cline,'{%\s*end\w*$') + let ind += sw * s:count(line,'{%-\=\s*\%(if\|elsif\|else\|unless\|ifchanged\|case\|when\|for\|empty\|tablerow\|capture\)\>') + let ind -= sw * s:count(line,'{%-\=\s*end\%(if\|unless\|ifchanged\|case\|for\|tablerow\|capture\)\>') + let ind -= sw * s:count(cline,'{%-\=\s*\%(elsif\|else\|when\|empty\)\>') + let ind -= sw * s:count(cline,'{%-\=\s*end\w*$') return ind endfunction diff --git a/runtime/indent/sass.vim b/runtime/indent/sass.vim index d6dbf3a8b..8c0ecd074 100644 --- a/runtime/indent/sass.vim +++ b/runtime/indent/sass.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Sass " Maintainer: Tim Pope -" Last Change: 2017 Jun 13 +" Last Change: 2022 Mar 15 if exists("b:did_indent") finish @@ -12,6 +12,8 @@ setlocal autoindent sw=2 et setlocal indentexpr=GetSassIndent() setlocal indentkeys=o,O,*,<:>,!^F +let b:undo_indent = "setl ai< inde< indk<" + " Only define the function once. if exists("*GetSassIndent") finish diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index bde9140f9..00a9ca97b 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -4,10 +4,11 @@ " Copyright: Vim license applies, see ":help license" " Last Change: 2022 Jan 17 " -" WORK IN PROGRESS - Only the basics work -" Note: On MS-Windows you need a recent version of gdb. The one included with -" MingW is too old (7.6.1). -" I used version 7.12 from http://www.equation.com/servlet/equation.cmd?fa=gdb +" WORK IN PROGRESS - The basics works stable, more to come +" Note: In general you need at least GDB 7.12 because this provides the +" frame= response in MI thread-selected events we need to sync stack to file. +" The one included with "old" MingW is too old (7.6.1), you may upgrade it or +" use a newer version from http://www.equation.com/servlet/equation.cmd?fa=gdb " " There are two ways to run gdb: " - In a terminal window; used if possible, does not work on MS-Windows @@ -313,7 +314,7 @@ func s:StartDebug_term(dict) let response = line1 . line2 if response =~ 'Undefined command' echoerr 'Sorry, your gdb is too old, gdb 7.12 is required' - " CHECKME: possibly send a "server show version" here + " CHECKME: possibly send a "server show version" here call s:CloseBuffers() return endif @@ -396,7 +397,7 @@ func s:StartDebug_prompt(dict) endif " Mark the buffer modified so that it's not easy to close. set modified - let s:gdb_channel = job_getchannel(s:gdbjob) + let s:gdb_channel = job_getchannel(s:gdbjob) let s:ptybuf = 0 if has('win32') @@ -662,8 +663,8 @@ func s:EndDebugCommon() if bufexists(bufnr) exe bufnr .. "buf" if exists('b:save_signcolumn') - let &signcolumn = b:save_signcolumn - unlet b:save_signcolumn + let &signcolumn = b:save_signcolumn + unlet b:save_signcolumn endif endif endfor @@ -739,8 +740,8 @@ func s:HandleDisasmMsg(msg) let lnum = search('^' . s:asm_addr) if lnum != 0 - exe 'sign unplace ' . s:asm_id - exe 'sign place ' . s:asm_id . ' line=' . lnum . ' name=debugPC' + exe 'sign unplace ' . s:asm_id + exe 'sign place ' . s:asm_id . ' line=' . lnum . ' name=debugPC' endif call win_gotoid(curwinid) @@ -789,22 +790,22 @@ func s:CommOutput(chan, msg) call s:HandleDisasmMsg(msg) elseif msg != '' if msg =~ '^\(\*stopped\|\*running\|=thread-selected\)' - call s:HandleCursor(msg) + call s:HandleCursor(msg) elseif msg =~ '^\^done,bkpt=' || msg =~ '^=breakpoint-created,' call s:HandleNewBreakpoint(msg, 0) elseif msg =~ '^=breakpoint-modified,' call s:HandleNewBreakpoint(msg, 1) elseif msg =~ '^=breakpoint-deleted,' - call s:HandleBreakpointDelete(msg) + call s:HandleBreakpointDelete(msg) elseif msg =~ '^=thread-group-started' - call s:HandleProgramRun(msg) + call s:HandleProgramRun(msg) elseif msg =~ '^\^done,value=' - call s:HandleEvaluate(msg) + call s:HandleEvaluate(msg) elseif msg =~ '^\^error,msg=' - call s:HandleError(msg) + call s:HandleError(msg) elseif msg =~ '^disassemble' - let s:parsing_disasm_msg = 1 - let s:asm_lines = [] + let s:parsing_disasm_msg = 1 + let s:asm_lines = [] endif endif endfor @@ -986,22 +987,22 @@ func s:ClearBreakpoint() let nr = 0 for id in s:breakpoint_locations[bploc] if has_key(s:breakpoints, id) - " Assume this always works, the reply is simply "^done". - call s:SendCommand('-break-delete ' . id) - for subid in keys(s:breakpoints[id]) - exe 'sign unplace ' . s:Breakpoint2SignNumber(id, subid) - endfor - unlet s:breakpoints[id] - unlet s:breakpoint_locations[bploc][idx] - let nr = id - break + " Assume this always works, the reply is simply "^done". + call s:SendCommand('-break-delete ' . id) + for subid in keys(s:breakpoints[id]) + exe 'sign unplace ' . s:Breakpoint2SignNumber(id, subid) + endfor + unlet s:breakpoints[id] + unlet s:breakpoint_locations[bploc][idx] + let nr = id + break else - let idx += 1 + let idx += 1 endif endfor if nr != 0 if empty(s:breakpoint_locations[bploc]) - unlet s:breakpoint_locations[bploc] + unlet s:breakpoint_locations[bploc] endif echomsg 'Breakpoint ' . id . ' cleared from line ' . lnum . '.' else @@ -1027,7 +1028,7 @@ func s:SendEval(expr) " remove text that is likely an assignment let exprLHS = substitute(a:expr, ' *=.*', '', '') endif - + " encoding expression to prevent bad errors let expr = a:expr let expr = substitute(expr, '\\', '\\\\', 'g') @@ -1036,14 +1037,14 @@ func s:SendEval(expr) let s:evalexpr = exprLHS endfunc -" :Evaluate - evaluate what is specified / under the cursor +" :Evaluate - evaluate what is specified / under the cursor func s:Evaluate(range, arg) let expr = s:GetEvaluationExpression(a:range, a:arg) let s:ignoreEvalError = 0 call s:SendEval(expr) endfunc -" get what is specified / under the cursor +" get what is specified / under the cursor func s:GetEvaluationExpression(range, arg) if a:arg != '' " user supplied evaluation @@ -1192,7 +1193,7 @@ func s:GotoAsmwinOrCreateIt() if exists('g:termdebug_disasm_window') if g:termdebug_disasm_window > 1 - exe 'resize ' . g:termdebug_disasm_window + exe 'resize ' . g:termdebug_disasm_window endif endif endif @@ -1201,7 +1202,7 @@ func s:GotoAsmwinOrCreateIt() let lnum = search('^' . s:asm_addr) if lnum == 0 if s:stopped - call s:SendCommand('disassemble $pc') + call s:SendCommand('disassemble $pc') endif else exe 'sign unplace ' . s:asm_id @@ -1236,15 +1237,15 @@ func s:HandleCursor(msg) let curwinid = win_getid(winnr()) if win_gotoid(s:asmwin) - let lnum = search('^' . s:asm_addr) - if lnum == 0 - call s:SendCommand('disassemble $pc') - else - exe 'sign unplace ' . s:asm_id - exe 'sign place ' . s:asm_id . ' line=' . lnum . ' name=debugPC' - endif - - call win_gotoid(curwinid) + let lnum = search('^' . s:asm_addr) + if lnum == 0 + call s:SendCommand('disassemble $pc') + else + exe 'sign unplace ' . s:asm_id + exe 'sign place ' . s:asm_id . ' line=' . lnum . ' name=debugPC' + endif + + call win_gotoid(curwinid) endif endif endif @@ -1263,26 +1264,26 @@ echomsg 'different fname: "' .. expand('%:p') .. '" vs "' .. fnamemodify(fname, \ | echo 'Warning: file is being edited elsewhere' \ | echohl None \ | let v:swapchoice = '0' - augroup END - if &modified - " TODO: find existing window - exe 'split ' . fnameescape(fname) - let s:sourcewin = win_getid(winnr()) - call s:InstallWinbar() - else - exe 'edit ' . fnameescape(fname) - endif - augroup Termdebug - au! SwapExists - augroup END + augroup END + if &modified + " TODO: find existing window + exe 'split ' . fnameescape(fname) + let s:sourcewin = win_getid(winnr()) + call s:InstallWinbar() + else + exe 'edit ' . fnameescape(fname) + endif + augroup Termdebug + au! SwapExists + augroup END endif exe lnum normal! zv exe 'sign unplace ' . s:pc_id exe 'sign place ' . s:pc_id . ' line=' . lnum . ' name=debugPC priority=110 file=' . fname if !exists('b:save_signcolumn') - let b:save_signcolumn = &signcolumn - call add(s:signcolumn_buflist, bufnr()) + let b:save_signcolumn = &signcolumn + call add(s:signcolumn_buflist, bufnr()) endif setlocal signcolumn=yes endif @@ -1396,8 +1397,8 @@ func s:HandleBreakpointDelete(msg) if has_key(s:breakpoints, id) for [subid, entry] in items(s:breakpoints[id]) if has_key(entry, 'placed') - exe 'sign unplace ' . s:Breakpoint2SignNumber(id, subid) - unlet entry['placed'] + exe 'sign unplace ' . s:Breakpoint2SignNumber(id, subid) + unlet entry['placed'] endif endfor unlet s:breakpoints[id] @@ -1422,7 +1423,7 @@ func s:BufRead() for [id, entries] in items(s:breakpoints) for [subid, entry] in items(entries) if entry['fname'] == fname - call s:PlaceSign(id, subid, entry) + call s:PlaceSign(id, subid, entry) endif endfor endfor @@ -1434,7 +1435,7 @@ func s:BufUnloaded() for [id, entries] in items(s:breakpoints) for [subid, entry] in items(entries) if entry['fname'] == fname - let entry['placed'] = 0 + let entry['placed'] = 0 endif endfor endfor diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim index e86e1b866..2dc21f0b6 100644 --- a/runtime/syntax/c.vim +++ b/runtime/syntax/c.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: C " Maintainer: Bram Moolenaar -" Last Change: 2021 Dec 07 +" Last Change: 2022 Mar 17 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -245,8 +245,14 @@ syn match cWrongComTail display "\*/" syn keyword cOperator sizeof if exists("c_gnu") + syn keyword cType __label__ __complex__ syn keyword cStatement __asm__ - syn keyword cOperator typeof __real__ __imag__ + syn keyword cOperator __alignof__ + syn keyword cOperator typeof __typeof__ + syn keyword cOperator __real__ __imag__ + syn keyword cStorageClass __attribute__ __const__ __extension__ + syn keyword cStorageClass inline __inline__ + syn keyword cStorageClass __restrict__ __volatile__ __noreturn__ endif syn keyword cType int long short char void syn keyword cType signed unsigned float double @@ -270,16 +276,10 @@ if !exists("c_no_c99") " ISO C99 syn keyword cType intptr_t uintptr_t syn keyword cType intmax_t uintmax_t endif -if exists("c_gnu") - syn keyword cType __label__ __complex__ __volatile__ -endif syn keyword cTypedef typedef syn keyword cStructure struct union enum syn keyword cStorageClass static register auto volatile extern const -if exists("c_gnu") - syn keyword cStorageClass inline __attribute__ -endif if !exists("c_no_c99") && !s:in_cpp_family syn keyword cStorageClass inline restrict endif @@ -292,6 +292,7 @@ if !exists("c_no_c11") syn keyword cOperator _Static_assert static_assert syn keyword cStorageClass _Thread_local thread_local syn keyword cType char16_t char32_t + syn keyword cType max_align_t " C11 atomics (take down the shield wall!) syn keyword cType atomic_bool atomic_char atomic_schar atomic_uchar syn keyword Ctype atomic_short atomic_ushort atomic_int atomic_uint diff --git a/runtime/syntax/liquid.vim b/runtime/syntax/liquid.vim index 295a91775..966b60f6f 100644 --- a/runtime/syntax/liquid.vim +++ b/runtime/syntax/liquid.vim @@ -2,7 +2,7 @@ " Language: Liquid " Maintainer: Tim Pope " Filenames: *.liquid -" Last Change: 2013 May 30 +" Last Change: 2022 Mar 15 if exists('b:current_syntax') finish @@ -68,10 +68,10 @@ if !exists('s:subtype') unlet s:subtype endif -syn region liquidStatement matchgroup=liquidDelimiter start="{%" end="%}" contains=@liquidStatement containedin=ALLBUT,@liquidExempt keepend -syn region liquidExpression matchgroup=liquidDelimiter start="{{" end="}}" contains=@liquidExpression containedin=ALLBUT,@liquidExempt keepend -syn region liquidComment matchgroup=liquidDelimiter start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=liquidTodo,@Spell containedin=ALLBUT,@liquidExempt keepend -syn region liquidRaw matchgroup=liquidDelimiter start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" contains=TOP,@liquidExempt containedin=ALLBUT,@liquidExempt keepend +syn region liquidStatement matchgroup=liquidDelimiter start="{%-\=" end="-\=%}" contains=@liquidStatement containedin=ALLBUT,@liquidExempt keepend +syn region liquidExpression matchgroup=liquidDelimiter start="{{-\=" end="-\=}}" contains=@liquidExpression containedin=ALLBUT,@liquidExempt keepend +syn region liquidComment matchgroup=liquidDelimiter start="{%-\=\s*comment\s*-\=%}" end="{%-\=\s*endcomment\s*-\=%}" contains=liquidTodo,@Spell containedin=ALLBUT,@liquidExempt keepend +syn region liquidRaw matchgroup=liquidDelimiter start="{%-\=\s*raw\s*-\=%}" end="{%-\=\s*endraw\s*-\=%}" contains=TOP,@liquidExempt containedin=ALLBUT,@liquidExempt keepend syn cluster liquidExempt contains=liquidStatement,liquidExpression,liquidComment,liquidRaw,@liquidStatement,liquidYamlHead syn cluster liquidStatement contains=liquidConditional,liquidRepeat,liquidKeyword,@liquidExpression @@ -79,11 +79,11 @@ syn cluster liquidExpression contains=liquidOperator,liquidString,liquidNumber,l syn keyword liquidKeyword highlight nextgroup=liquidTypeHighlight skipwhite contained syn keyword liquidKeyword endhighlight contained -syn region liquidHighlight start="{%\s*highlight\s\+\w\+\s*%}" end="{% endhighlight %}" keepend +syn region liquidHighlight start="{%-\=\s*highlight\s\+\w\+\s*-\=%}" end="{%-\= endhighlight -\=%}" keepend for s:type in g:liquid_highlight_types exe 'syn match liquidTypeHighlight "\<'.matchstr(s:type,'[^=]*').'\>" contained' - exe 'syn region liquidHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' start="{%\s*highlight\s\+'.matchstr(s:type,'[^=]*').'\s*%}" end="{% endhighlight %}" keepend contains=@liquidHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g') + exe 'syn region liquidHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' start="{%-\=\s*highlight\s\+'.matchstr(s:type,'[^=]*').'\s*-\=%}" end="{%-\= endhighlight -\=%}" keepend contains=@liquidHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g') endfor unlet! s:type @@ -92,18 +92,18 @@ syn region liquidString matchgroup=liquidQuote start=+'+ end=+'+ contained syn match liquidNumber "-\=\<\d\+\>" contained syn match liquidFloat "-\=\<\d\+\>\.\.\@!\%(\d\+\>\)\=" contained syn keyword liquidBoolean true false contained -syn keyword liquidNull null nil contained +syn keyword liquidNull null nil blank contained syn match liquidEmpty "\" contained syn keyword liquidOperator and or not contained syn match liquidPipe '|' contained skipwhite nextgroup=liquidFilter -syn keyword liquidFilter date capitalize downcase upcase first last join sort size strip_html strip_newlines newline_to_br replace replace_first remove remove_first truncate truncatewords prepend append minus plus times divided_by contained +syn keyword liquidFilter date capitalize downcase upcase escape escape_once first last join sort size where uniq strip_html strip_newlines newline_to_br replace replace_first remove remove_first slice split strip truncate truncatewords prepend append url_encode url_decode abs at_most at_least ceil divided_by floor minus plus round times modulo contained syn keyword liquidConditional if elsif else endif unless endunless case when endcase ifchanged endifchanged contained -syn keyword liquidRepeat for endfor tablerow endtablerow in contained -syn match liquidRepeat "\%({%\s*\)\@<=empty\>" contained -syn keyword liquidKeyword assign cycle include with contained +syn keyword liquidRepeat for endfor tablerow endtablerow in break continue limit offset reversed contained +syn match liquidRepeat "\%({%-\=\s*\)\@<=empty\>" contained +syn keyword liquidKeyword assign capture endcapture increasement decreasement cycle include with render contained syn keyword liquidForloop forloop nextgroup=liquidForloopDot contained syn match liquidForloopDot "\." nextgroup=liquidForloopAttribute contained diff --git a/runtime/syntax/sass.vim b/runtime/syntax/sass.vim index b51a0ae26..8f41aba4f 100644 --- a/runtime/syntax/sass.vim +++ b/runtime/syntax/sass.vim @@ -2,7 +2,7 @@ " Language: Sass " Maintainer: Tim Pope " Filenames: *.sass -" Last Change: 2019 Dec 05 +" Last Change: 2022 Mar 15 if exists("b:current_syntax") finish @@ -58,6 +58,7 @@ syn match sassAmpersand "&" " TODO: Arithmetic (including strings and concatenation) syn region sassMediaQuery matchgroup=sassMedia start="@media" end="[{};]\@=\|$" contains=sassMediaOperators +syn region sassKeyframe matchgroup=cssAtKeyword start=/@\(-[a-z]\+-\)\=keyframes\>/ end=";\|$" contains=cssVendor,cssComment nextgroup=cssDefinition syn keyword sassMediaOperators and not only contained syn region sassCharset start="@charset" end=";\|$" contains=scssComment,cssStringQ,cssStringQQ,cssURL,cssUnicodeEscape,cssMediaType syn region sassInclude start="@import" end=";\|$" contains=scssComment,cssStringQ,cssStringQQ,cssURL,cssUnicodeEscape,cssMediaType diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index e42c270e9..dfa5e43ab 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Vim 8.2 script " Maintainer: Charles E. Campbell -" Last Change: February 09, 2022 -" Version: 8.2-28 +" Last Change: March 14, 2022 +" Version: 8.2-29 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM " Automatically generated keyword lists: {{{1 @@ -19,12 +19,13 @@ syn keyword vimTodo contained COMBAK FIXME TODO XXX syn cluster vimCommentGroup contains=vimTodo,@Spell " regular vim commands {{{2 -syn keyword vimCommand contained a ar[gs] argg[lobal] b[uffer] bf[irst] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec elsei[f] endt[ry] exp filetype fix[del] for gui helpg[rep] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stopi[nsert] sunmenu sync tab tabfir[st] tabp[revious] tcl th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] up[date] vi[sual] viu[sage] wh[ile] wn[ext] wv[iminfo] xmenu xunme -syn keyword vimCommand contained ab arga[dd] argl[ocal] ba[ll] bl[ast] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoc[onsole] em[enu] endw[hile] export filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] sts[elect] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] v vie[w] vne[w] win[size] wp[revious] x[it] xnoreme xunmenu -syn keyword vimCommand contained abc[lear] argd[elete] argu[ment] bad[d] bm[odified] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delep dell diffg[et] dig[raphs] do dsp[lit] echoe[rr] en[dif] ene[w] exu[sage] fin[d] foldc[lose] g h[elp] hi if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes[sages] mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] substitutepattern sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] var vim9[cmd] vs[plit] winc[md] wq xa[ll] xnoremenu xwininfo -syn keyword vimCommand contained abo[veleft] argded[upe] as[cii] balt bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] deletel delm[arks] diffo[ff] dir doau e[dit] echom[sg] enddef eval f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] substituterepeat sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type unl ve[rsion] vim9s[cript] wN[ext] windo wqa[ll] xmapc[lear] xprop y[ank] -syn keyword vimCommand contained addd argdo au bd[elete] bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletep delp diffp[atch] disa[ssemble] doaut ea echon endf[unction] ex files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] sun[hide] sy tN[ext] tabe[dit] tabnew tc[d] ter[minal] tlmenu tma[p] tr[ewind] u[ndo] unlo[ckvar] verb[ose] vim[grep] w[rite] winp[os] wundo xme xr[estore] z[^.=] -syn keyword vimCommand contained al[l] arge[dit] bN[ext] bel[owright] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletl dep diffpu[t] dj[ump] dp earlier el[se] endfo[r] exi[t] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] leg[acy] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp stj[ump] sunme syn ta[g] tabf[ind] tabo[nly] tch[dir] tf[irst] tln tmapc[lear] try una[bbreviate] uns[ilent] vert[ical] vimgrepa[dd] wa[ll] +syn keyword vimCommand contained a ar[gs] argg[lobal] b[uffer] bf[irst] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec elsei[f] endf[unction] enum exu[sage] fin[d] foldc[lose] g h[elp] hi if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes[sages] mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] sts[elect] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] v vie[w] vne[w] win[size] wq xmapc[lear] xr[estore] +syn keyword vimCommand contained ab arga[dd] argl[ocal] ba[ll] bl[ast] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoc[onsole] em[enu] endfo[r] eval f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] substitutepattern sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] var vim9[cmd] vs[plit] winc[md] wqa[ll] xme xunme +syn keyword vimCommand contained abc[lear] argd[elete] argu[ment] bad[d] bm[odified] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delep dell diffg[et] dig[raphs] do dsp[lit] echoe[rr] en[dif] endinterface ex files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] substituterepeat sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type unl ve[rsion] vim9s[cript] wN[ext] windo wundo xmenu xunmenu +syn keyword vimCommand contained abo[veleft] argded[upe] as[cii] balt bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] deletel delm[arks] diffo[ff] dir doau e[dit] echom[sg] endclass endt[ry] exi[t] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] leg[acy] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp static sun[hide] sy tN[ext] tabe[dit] tabnew tc[d] ter[minal] tlmenu tma[p] tr[ewind] u[ndo] unlo[ckvar] verb[ose] vim[grep] w[rite] winp[os] wv[iminfo] xnoreme xwininfo +syn keyword vimCommand contained abstract argdo au bd[elete] bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletep delp diffp[atch] disa[ssemble] doaut ea echon enddef endw[hile] exp filetype fix[del] for gui helpg[rep] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stj[ump] sunme syn ta[g] tabf[ind] tabo[nly] tch[dir] tf[irst] tln tmapc[lear] try una[bbreviate] uns[ilent] vert[ical] vimgrepa[dd] wa[ll] wn[ext] x[it] xnoremenu y[ank] +syn keyword vimCommand contained addd arge[dit] bN[ext] bel[owright] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletl dep diffpu[t] dj[ump] dp earlier el[se] endenum ene[w] export filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] stopi[nsert] sunmenu sync tab tabfir[st] tabp[revious] tcl th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] up[date] vi[sual] viu[sage] wh[ile] wp[revious] xa[ll] xprop z[^.=] +syn keyword vimCommand contained al[l] syn match vimCommand contained "\" syn keyword vimStdPlugin contained Arguments Asm Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Winbar XMLent XMLns diff --git a/runtime/tools/demoserver.py b/runtime/tools/demoserver.py index 150ddbee7..2667aed39 100644 --- a/runtime/tools/demoserver.py +++ b/runtime/tools/demoserver.py @@ -44,9 +44,6 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): except socket.error: print("=== socket error ===") break - except IOError: - print("=== socket closed ===") - break if data == '': print("=== socket closed ===") break diff --git a/runtime/vim.desktop b/runtime/vim.desktop index 2d6e7c110..cd3bdef9b 100644 --- a/runtime/vim.desktop +++ b/runtime/vim.desktop @@ -2,6 +2,7 @@ # Edit the src/po/vim.desktop.in file instead. [Desktop Entry] # Translators: This is the Application Name used in the Vim desktop file +Name[ca]=Vim Name[de]=Vim Name[eo]=Vim Name[fi]=Vim @@ -13,6 +14,7 @@ Name[sr]=Vim Name[tr]=Vim Name=Vim # Translators: This is the Generic Application Name used in the Vim desktop file +GenericName[ca]=Editor de text GenericName[de]=Texteditor GenericName[eo]=Tekstoredaktilo GenericName[fi]=Tekstinmuokkain @@ -25,6 +27,7 @@ GenericName[sr]=Едитор текст GenericName[tr]=Metin Düzenleyici GenericName=Text Editor # Translators: This is the comment used in the Vim desktop file +Comment[ca]=Edita fitxers de text Comment[de]=Textdateien bearbeiten Comment[eo]=Redakti tekstajn dosierojn Comment[fi]=Muokkaa tekstitiedostoja @@ -49,7 +52,6 @@ Comment[be]=Рэдагаваньне тэкставых файлаў Comment[bg]=Редактиране на текстови файлове Comment[bn]=টেক্স্ট ফাইল এডিট করুন Comment[bs]=Izmijeni tekstualne datoteke -Comment[ca]=Edita fitxers de text Comment[cs]=Úprava textových souborů Comment[cy]=Golygu ffeiliau testun Comment[da]=Rediger tekstfiler @@ -105,6 +107,7 @@ Exec=vim %F Terminal=true Type=Application # Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon! +Keywords[ca]=Text;editor; Keywords[de]=Text;Editor; Keywords[eo]=Teksto;redaktilo; Keywords[fi]=Teksti;muokkain;editori; diff --git a/src/po/ca.po b/src/po/ca.po index c8de579e5..74ffcc033 100644 --- a/src/po/ca.po +++ b/src/po/ca.po @@ -1,139 +1,118 @@ # Catalan messages for vim. -# Copyright (C) 2003-2017 Ernest Adrogué . +# Copyright (C) 2003-2022 Ernest Adrogué . # This file is distributed under the Vim License. # msgid "" msgstr "" -"Project-Id-Version: vim 8.0\n" +"Project-Id-Version: vim 8.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-11 23:51+0200\n" -"PO-Revision-Date: 2017-07-26 13:29+0200\n" -"Last-Translator: Ernest Adrogué \n" +"POT-Creation-Date: 2022-03-13 14:14+0100\n" +"PO-Revision-Date: 2022-03-15 19:03+0100\n" +"Last-Translator: Ernest Adrogué \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" -msgid "E831: bf_key_init() called with empty password" -msgstr "E831: s'ha cridat bf_key_init() amb una contrasenya buida" - -msgid "E820: sizeof(uint32_t) != 4" -msgstr "E820: sizeof(uint32_t) != 4" - -msgid "E817: Blowfish big/little endian use wrong" -msgstr "E817: ús de Blowfish amb una ordenació dels bytes incorrecta" - -msgid "E818: sha256 test failed" -msgstr "E818: el test sha256 ha fallat" - -msgid "E819: Blowfish test failed" -msgstr "E819: el test Blowfish ha fallat" - -msgid "[Location List]" -msgstr "[Llista de posicions]" - -msgid "[Quickfix List]" -msgstr "[Llista Quickfix]" - -msgid "E855: Autocommands caused command to abort" -msgstr "E855: Una ordre automàtica a provocat que l'ordre avortés" - -msgid "E82: Cannot allocate any buffer, exiting..." -msgstr "E82: No s'ha pogut assignar memòria per a cap buffer, sortint..." - -msgid "E83: Cannot allocate buffer, using other one..." -msgstr "E83: No s'ha pogut assignar memòria per al buffer, usant-ne un altre..." +msgid "ERROR: " +msgstr "ERROR: " -msgid "E931: Buffer cannot be registered" -msgstr "E931: No s'ha pogut registrar el buffer" +#, c-format +msgid "" +"\n" +"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n" +msgstr "" +"\n" +"[octets] total assignat-alliberat %lu-%lu, en ús %lu, màxim ús %lu\n" -msgid "E937: Attempt to delete a buffer that is in use" -msgstr "E937: Intent d'eliminar un buffer que es troba en ús" +#, c-format +msgid "" +"[calls] total re/malloc()'s %lu, total free()'s %lu\n" +"\n" +msgstr "" +"[crides] total re/malloc() %lu, total free() %lu\n" +"\n" -# unload: treu el buffer de la memòria però el deixa a la llista -# delete: treu el buffer de la memòria i de la llista de buffers -# wipe out: elimina el buffer amb totes les opcions, marques, etc. -msgid "E515: No buffers were unloaded" -msgstr "E515: No s'ha alliberat cap buffer" +msgid "--Deleted--" +msgstr "--Eliminat--" -msgid "E516: No buffers were deleted" -msgstr "E516: No s'ha eliminat cap buffer" +#, c-format +msgid "auto-removing autocommand: %s " +msgstr "s'elimina l'ordre automàtica: %s " -msgid "E517: No buffers were wiped out" -msgstr "E517: No s'ha destruït cap buffer" +msgid "W19: Deleting augroup that is still in use" +msgstr "W19: S'elimina un grup d'ordres automàtiques que està en ús" -msgid "1 buffer unloaded" -msgstr "S'ha alliberat 1 buffer" +msgid "" +"\n" +"--- Autocommands ---" +msgstr "" +"\n" +"--- Ordres automàtiques ---" #, c-format -msgid "%d buffers unloaded" -msgstr "S'han alliberat %d buffers" - -msgid "1 buffer deleted" -msgstr "S'ha eliminat 1 buffer" +msgid "No matching autocommands: %s" +msgstr "No hi ha ordres automàtiques coincidents: %s" +# todo: substitucions +# ... #, c-format -msgid "%d buffers deleted" -msgstr "S'han eliminat %d buffers" - -msgid "1 buffer wiped out" -msgstr "S'ha destruït 1 buffer" +msgid "%s Autocommands for \"%s\"" +msgstr "Ordres automàtiques de %s per a \"%s\"" #, c-format -msgid "%d buffers wiped out" -msgstr "S'han destruït %d buffers" +msgid "Executing %s" +msgstr "Executant %s" -msgid "E90: Cannot unload last buffer" -msgstr "E90: No es pot alliberar l'últim buffer" +#, c-format +msgid "autocommand %s" +msgstr "ordre automàtica %s" -msgid "E84: No modified buffer found" -msgstr "E84: No s'ha trobat cap buffer modificat" +msgid "add() argument" +msgstr "argument a add()" -msgid "E85: There is no listed buffer" -msgstr "E85: No hi ha cap buffer a la llista" +msgid "insert() argument" +msgstr "argument a insert()" -msgid "E87: Cannot go beyond last buffer" -msgstr "E87: No es pot anar més enllà de l'últim buffer" +msgid "[Location List]" +msgstr "[Llista de posicions]" -msgid "E88: Cannot go before first buffer" -msgstr "E88: No es pot anar més enllà del primer buffer" +msgid "[Quickfix List]" +msgstr "[Llista Quickfix]" #, c-format -msgid "E89: No write since last change for buffer %ld (add ! to override)" -msgstr "E89: No s'ha desat el buffer %ld (afegiu ! per a forçar)" - -msgid "W14: Warning: List of file names overflow" -msgstr "W14: Atenció: S'ha desbordat la llista de noms de fitxers" +msgid "%d buffer unloaded" +msgid_plural "%d buffers unloaded" +msgstr[0] "S'ha alliberat %d buffer" +msgstr[1] "S'han alliberat %d buffers" #, c-format -msgid "E92: Buffer %ld not found" -msgstr "E92: No s'ha trobat el buffer %ld" +msgid "%d buffer deleted" +msgid_plural "%d buffers deleted" +msgstr[0] "S'ha eliminat %d buffer" +msgstr[1] "S'han eliminat %d buffers" #, c-format -msgid "E93: More than one match for %s" -msgstr "E93: Hi ha més d'una coincidència per a %s" +msgid "%d buffer wiped out" +msgid_plural "%d buffers wiped out" +msgstr[0] "S'ha destruït %d buffer" +msgstr[1] "S'han destruït %d buffers" -#, c-format -msgid "E94: No matching buffer for %s" -msgstr "E94: No hi ha cap coincidència per a %s" +msgid "W14: Warning: List of file names overflow" +msgstr "W14: Atenció: S'ha desbordat la llista de noms de fitxers" #, c-format msgid "line %ld" msgstr "línia %ld" -msgid "E95: Buffer with this name already exists" -msgstr "E95: Ja existeix un buffer amb aquest nom" - msgid " [Modified]" msgstr " [Modificat]" msgid "[Not edited]" msgstr "[No editat]" -msgid "[New file]" -msgstr "[Fitxer nou]" - msgid "[Read errors]" msgstr "[Errors de lectura]" @@ -145,12 +124,10 @@ msgid "[readonly]" msgstr "[només lectura]" #, c-format -msgid "1 line --%d%%--" -msgstr "1 línia --%d%%--" - -#, c-format -msgid "%ld lines --%d%%--" -msgstr "%ld línies --%d%%--" +msgid "%ld line --%d%%--" +msgid_plural "%ld lines --%d%%--" +msgstr[0] "%ld línia --%d%%--" +msgstr[1] "%ld línies --%d%%--" #, c-format msgid "line %ld of %ld --%d%%-- col " @@ -177,94 +154,112 @@ msgstr "Baix" msgid "Top" msgstr "Dalt" -msgid "" -"\n" -"# Buffer list:\n" -msgstr "" -"\n" -"# Llista de buffers:\n" +msgid "[Prompt]" +msgstr "[Indicador]" + +msgid "[Popup]" +msgstr "[Emergent]" # :h special-buffers msgid "[Scratch]" msgstr "[Esborrany]" -# :sign place -msgid "" -"\n" -"--- Signs ---" -msgstr "" -"\n" -"--- Senyals ---" +msgid "WARNING: The file has been changed since reading it!!!" +msgstr "ATENCIÓ: El fitxer ha canviat des de que s'ha llegit!!!" -# :sign place -#, c-format -msgid "Signs for %s:" -msgstr "Senyals a %s:" +# pregunta ask_yesno() +msgid "Do you really want to write to it" +msgstr "Esteu segur que voleu escriure'l" + +msgid "[New]" +msgstr "[Nou]" + +msgid "[New File]" +msgstr "[Fitxer nou]" + +msgid " CONVERSION ERROR" +msgstr " ERROR DE CONVERSIÓ" -# :sign place #, c-format -msgid " line=%ld id=%d name=%s" -msgstr " línia=%ld id=%d nom=%s" +msgid " in line %ld;" +msgstr " a la línia %ld" -msgid "E902: Cannot connect to port" -msgstr "E902: No s'ha pogut connectar al port" +msgid "[NOT converted]" +msgstr "[NO convertit]" -msgid "E901: gethostbyname() in channel_open()" -msgstr "E901: gethostbyname() a channel_open()" +msgid "[converted]" +msgstr "[convertit]" -msgid "E898: socket() in channel_open()" -msgstr "E898: socket() a channel_open()" +msgid "[Device]" +msgstr "[Dispositiu]" -msgid "E903: received command with non-string argument" -msgstr "E903: s'ha rebut una ordre amb un argument que no és text" +msgid " [a]" +msgstr " [a]" -# expr i call són ordres (:h channel-commands) -msgid "E904: last argument for expr/call must be a number" -msgstr "E904: l'últim argument a expr/call ha de ser un número" +msgid " appended" +msgstr " afegits" -msgid "E904: third argument for call must be a list" -msgstr "E904: el tercer argument a call ha de ser una llista" +msgid " [w]" +msgstr " [e]" -#, c-format -msgid "E905: received unknown command: %s" -msgstr "E905: s'ha rebut una ordre desconeguda: %s" +msgid " written" +msgstr " escrits" -#, c-format -msgid "E630: %s(): write while not connected" -msgstr "E630: %s(): s'ha escrit sense estar connectat" +msgid "" +"\n" +"WARNING: Original file may be lost or damaged\n" +msgstr "" +"\n" +"ATENCIÓ: El fitxer original es pot haver perdut o fet malbé\n" -#, c-format -msgid "E631: %s(): write failed" -msgstr "E631: %s(): l'escriptura ha fallat" +msgid "don't quit the editor until the file is successfully written!" +msgstr "no sortiu de l'editor fins que s'hagi desat el fitxer amb èxit!" + +msgid "W10: Warning: Changing a readonly file" +msgstr "W10: Atenció: S'està modificant un fitxer de només lectura" + +msgid "No display" +msgstr "No hi ha cap pantalla" + +msgid ": Send failed.\n" +msgstr ": Error en enviar.\n" + +msgid ": Send failed. Trying to execute locally\n" +msgstr ": Error en enviar. Intentant executar vim localment\n" #, c-format -msgid "E917: Cannot use a callback with %s()" -msgstr "E917: No es poden utilitzar callbacks amb %s()" +msgid "%d of %d edited" +msgstr "editat %d de %d" -msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel" -msgstr "E912: no es pot usar ch_evalexpr()/ch_sendexpr() amb canals raw o nl" +msgid "No display: Send expression failed.\n" +msgstr "No hi ha cap pantalla: Error en enviar l'expressió.\n" -msgid "E906: not an open channel" -msgstr "E906: el canal no està obert" +msgid ": Send expression failed.\n" +msgstr ": Error en enviar l'expressió.\n" -msgid "E920: _io file requires _name to be set" -msgstr "E920: els fitxers _io han de tenir l'atribut _name" +msgid "Used CUT_BUFFER0 instead of empty selection" +msgstr "S'ha usat CUT_BUFFER0 en lloc d'una selecció buida" -msgid "E915: in_io buffer requires in_buf or in_name to be set" -msgstr "E915: els buffers in_io han de tenir l'atribut in_buf o in_name" +# :set wop=tagfile +# :ts +msgid "tagname" +msgstr "etiqueta" -#, c-format -msgid "E918: buffer must be loaded: %s" -msgstr "E918: el buffer no està carregat: %s" +# +msgid " kind file\n" +msgstr " tip fitxer\n" -msgid "E821: File is encrypted with unknown method" -msgstr "E821: El fitxer està xifrat amb un mètode desconegut" +msgid "'history' option is zero" +msgstr "el valor de 'history' és zero" msgid "Warning: Using a weak encryption method; see :help 'cm'" -msgstr "Atenció: esteu utilitzant un xifrat poc potent; vegeu :help 'cm'" +msgstr "Atenció: esteu utilitzant un xifratge poc potent; vegeu :help 'cm'" + +msgid "Note: Encryption of swapfile not supported, disabling swap file" +msgstr "Nota: No es suporta xifratge en el fitxer d'intercanvi, es desabilita" msgid "Enter encryption key: " -msgstr "Introduïu la clau de xifrat: " +msgstr "Introduïu la clau de xifratge: " msgid "Enter same key again: " msgstr "Introduïu la mateixa clau un altre cop: " @@ -275,6653 +270,9848 @@ msgstr "La claus no coincideixen!" msgid "[crypted]" msgstr "[xifrat]" -# :let foo = {1 2} +msgid "Entering Debug mode. Type \"cont\" to continue." +msgstr "Mode de depuració. Escriviu \"cont\" per a continuar." + #, c-format -msgid "E720: Missing colon in Dictionary: %s" -msgstr "E720: Falta un caràcter ':': %s" +msgid "Oldval = \"%s\"" +msgstr "Valor antic = \"%s\"" #, c-format -msgid "E721: Duplicate key in Dictionary: \"%s\"" -msgstr "E721: Clau duplicada: \"%s\"" +msgid "Newval = \"%s\"" +msgstr "Valor nou = \"%s\"" #, c-format -msgid "E722: Missing comma in Dictionary: %s" -msgstr "E722: Falta una coma: %s" +msgid "line %ld: %s" +msgstr "línia %ld: %s" #, c-format -msgid "E723: Missing end of Dictionary '}': %s" -msgstr "E723: Falta un '}': %s" +msgid "cmd: %s" +msgstr "ordre: %s" -# :let foo = [1,2] -# :let bar = [3,4] -# :lockvar foo -# :echo extend(foo, bar) -# -# la forma fun() argument es repeteix més avall -msgid "extend() argument" -msgstr "argument a extend()" +msgid "frame is zero" +msgstr "el marc és zero" #, c-format -msgid "E737: Key already exists: %s" -msgstr "E737: La clau ja existeix: %s" +msgid "frame at highest level: %d" +msgstr "marc al nivell màxim: %d" #, c-format -msgid "E96: Cannot diff more than %ld buffers" -msgstr "E96: No es pot fer diff amb més de %ld buffers" +msgid "Breakpoint in \"%s%s\" line %ld" +msgstr "Punt de ruptura a \"%s%s\" línia %ld" -msgid "E810: Cannot read or write temp files" -msgstr "E810: No s'han pogut escriure o llegir fitxers temporals" +msgid "No breakpoints defined" +msgstr "No s'han definit punts de ruptura" -msgid "E97: Cannot create diffs" -msgstr "E97: No s'han pogut crear diffs" +#, c-format +msgid "%3d %s %s line %ld" +msgstr "%3d %s %s línia %ld" + +#, c-format +msgid "%3d expr %s" +msgstr "%3d expr %s" + +# :let foo = [1,2] +# :let bar = [3,4] +# :lockvar foo +# :echo extend(foo, bar) +# +# la forma fun() argument es repeteix més avall +msgid "extend() argument" +msgstr "argument a extend()" + +#, c-format +msgid "Not enough memory to use internal diff for buffer \"%s\"" +msgstr "No hi ha prou memòria per a computar diferències per al buffer \"%s\"" # És el nom d'un diàleg. Menú "Split patched by..." msgid "Patch file" msgstr "Fitxer de diferències" -msgid "E816: Cannot read patch output" -msgstr "E816: No s'ha pogut llegir la sortida de patch" +msgid "Custom" +msgstr "Personalitzat" -msgid "E98: Cannot read diff output" -msgstr "E98: No s'ha pogut llegir la sortida de diff" +msgid "Latin supplement" +msgstr "Suplement llatí" -msgid "E99: Current buffer is not in diff mode" -msgstr "E99: El buffer actual no es troba en mode diff" +msgid "Greek and Coptic" +msgstr "Grec i còptic" -msgid "E793: No other buffer in diff mode is modifiable" -msgstr "E793: No hi ha cap altre buffer en mode diff que sigui modificable" +msgid "Cyrillic" +msgstr "Ciríl·lic" -msgid "E100: No other buffer in diff mode" -msgstr "E100: No hi ha cap altre buffer en mode diff" +msgid "Hebrew" +msgstr "Hebreu" -msgid "E101: More than two buffers in diff mode, don't know which one to use" -msgstr "E101: Hi ha més de 2 buffers en mode diff" +msgid "Arabic" +msgstr "Àrab" -#, c-format -msgid "E102: Can't find buffer \"%s\"" -msgstr "E102: No s'ha trobat el buffer \"%s\"" +msgid "Latin extended" +msgstr "Llatí estès" -#, c-format -msgid "E103: Buffer \"%s\" is not in diff mode" -msgstr "E103: El buffer \"%s\" no es troba en mode diff" +msgid "Greek extended" +msgstr "Grec estès" -msgid "E787: Buffer changed unexpectedly" -msgstr "E787: El buffer ha canviat inesperadament" +msgid "Punctuation" +msgstr "Puntuació" -msgid "E104: Escape not allowed in digraph" -msgstr "E104: El dígraf conté caràcters d'escapada" +msgid "Super- and subscripts" +msgstr "Superíndexs i subíndexs" -msgid "E544: Keymap file not found" -msgstr "E544: No s'ha trobat el fitxer de mapa de tecles" +msgid "Currency" +msgstr "Moneda" -# sourced file == script -msgid "E105: Using :loadkeymap not in a sourced file" -msgstr "E105: Ús de :loadkeymap fora d'un script" +msgid "Other" +msgstr "Altres" -msgid "E791: Empty keymap entry" -msgstr "E791: Entrada buida al mapa de tecles" +msgid "Roman numbers" +msgstr "Números romans" -msgid " Keyword completion (^N^P)" -msgstr " Compleció de paraules clau (^N^P)" +msgid "Arrows" +msgstr "Fletxes" -msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" -msgstr " Mode ^X (^]^D^E^F^|^K^L^N^O^Ps^U^V^Y)" +msgid "Mathematical operators" +msgstr "Operadors matemàtics" -msgid " Whole line completion (^L^N^P)" -msgstr " Compleció de línies senceres (^L^N^P)" +msgid "Technical" +msgstr "Tècnic" -msgid " File name completion (^F^N^P)" -msgstr " Compleció de noms de fitxer (^F^N^P)" +msgid "Box drawing" +msgstr "Caixes" -msgid " Tag completion (^]^N^P)" -msgstr " Compleció d'etiquetes (^]^N^P)" +msgid "Block elements" +msgstr "Elements de bloc" -msgid " Path pattern completion (^N^P)" -msgstr " Compleció d'ubicacions (^N^P)" +msgid "Geometric shapes" +msgstr "Formes geomètriques" -msgid " Definition completion (^D^N^P)" -msgstr " Compleció de definicions (^D^N^P)" +msgid "Symbols" +msgstr "Símbols" -# todo: expecificar diccionari? -msgid " Dictionary completion (^K^N^P)" -msgstr " Compleció de paraules (^K^N^P)" +msgid "Dingbats" +msgstr "Dingbats" -msgid " Thesaurus completion (^T^N^P)" -msgstr " Compleció de sinònims (^T^N^P)" +msgid "CJK symbols and punctuation" +msgstr "Símbols i puntuació CJK" -msgid " Command-line completion (^V^N^P)" -msgstr " Compleció de la línia d'ordres (^V^N^P)" +msgid "Hiragana" +msgstr "Hiragana" -msgid " User defined completion (^U^N^P)" -msgstr " Compleció definida per l'usuari (^U^N^P)" +msgid "Katakana" +msgstr "Katakana" -msgid " Omni completion (^O^N^P)" -msgstr " Omni-compleció (^O^N^P)" +msgid "Bopomofo" +msgstr "Bopomofo" -msgid " Spelling suggestion (s^N^P)" -msgstr " Suggeriment d'ortografia (s^N^P)" +msgid "Not enough memory to set references, garbage collection aborted!" +msgstr "No hi ha prou memòria, s'avorta el col·lector de brossa!" -# i C-x C-p -msgid " Keyword Local completion (^N^P)" -msgstr " Compleció de paraules clau locals (^N^P)" +msgid "" +"\n" +"\tLast set from " +msgstr "" +"\n" +"\tDefinit per últim cop a " -msgid "Hit end of paragraph" -msgstr "S'ha arribat al final del paràgraf" +msgid "&Ok" +msgstr "&D'acord" -msgid "E839: Completion function changed window" -msgstr "E839: La funció de compleció ha modificat la finestra" +msgid "" +"&OK\n" +"&Cancel" +msgstr "" +"&D'acord\n" +"&Cancel·la" -msgid "E840: Completion function deleted text" -msgstr "E840: La funció de compleció ha esborrat text" +msgid "called inputrestore() more often than inputsave()" +msgstr "s'ha cridat inputrestore() més sovint que inputsave()" -msgid "'dictionary' option is empty" -msgstr "El paràmetre 'dictionary' està en blanc" +# E.G: :ascii +#, c-format +msgid "<%s>%s%s %d, Hex %02x, Oct %03o, Digr %s" +msgstr "<%s>%s%s %d, Hex %02x, Octal %03o, Digr %s" -msgid "'thesaurus' option is empty" -msgstr "El paràmetre 'thesaurus' està en blanc" +# E.G: :ascii +#, c-format +msgid "<%s>%s%s %d, Hex %02x, Octal %03o" +msgstr "<%s>%s%s %d, Hex %02x, Octal %03o" -# i C-x C-k +# E.G: :ascii #, c-format -msgid "Scanning dictionary: %s" -msgstr "Cercant al diccionari: %s" +msgid "> %d, Hex %04x, Oct %o, Digr %s" +msgstr "> %d, Hex %04x, Octal %o, Digr %s" -# i C-x C-e -msgid " (insert) Scroll (^E/^Y)" -msgstr " (inserir) Desplaçament (^E/^Y)" +# E.G: :ascii +#, c-format +msgid "> %d, Hex %08x, Oct %o, Digr %s" +msgstr "> %d, Hex %08x, Octal %o, Digr %s" -msgid " (replace) Scroll (^E/^Y)" -msgstr " (substituir) Desplaçament (^E/^Y)" +# E.G: :ascii +#, c-format +msgid "> %d, Hex %04x, Octal %o" +msgstr "> %d, Hex %04x, Octal %o" +# E.G: :ascii #, c-format -msgid "Scanning: %s" -msgstr "Cercant: %s" +msgid "> %d, Hex %08x, Octal %o" +msgstr "> %d, Hex %08x, Octal %o" -msgid "Scanning tags." -msgstr "Cercant etiquetes." +#, c-format +msgid "%ld line moved" +msgid_plural "%ld lines moved" +msgstr[0] "%ld línies desplaçades" +msgstr[1] "%ld línies desplaçades" -msgid "match in file" -msgstr "coincidència al fitxer" +#, c-format +msgid "%ld lines filtered" +msgstr "%ld línies filtrades" -msgid " Adding" -msgstr " Afegint" +msgid "[No write since last change]\n" +msgstr "[No s'han desat els últims canvis]\n" -msgid "-- Searching..." -msgstr "-- Cercant..." +# GUI :browse w +msgid "Save As" +msgstr "Anomena i desa" -msgid "Back at original" -msgstr "Original" +msgid "Write partial file?" +msgstr "Voleu escriure un fitxer parcial?" -msgid "Word from other line" -msgstr "Paraula d'una altra línia" +#, c-format +msgid "Overwrite existing file \"%s\"?" +msgstr "Voleu sobreescriure el fitxer existent \"%s\"?" -msgid "The only match" -msgstr "L'única coincidència" +#, c-format +msgid "Swap file \"%s\" exists, overwrite anyway?" +msgstr "El fitxer d'intercanvi \"%s\" existeix, el voleu sobreescriure?" #, c-format -msgid "match %d of %d" -msgstr "coincidència %d de %d" +msgid "" +"'readonly' option is set for \"%s\".\n" +"Do you wish to write anyway?" +msgstr "" +"S'ha establert l'opció 'readonly' per a \"%s\".\n" +"El voleu escriure de totes maneres?" #, c-format -msgid "match %d" -msgstr "coincidència %d" +msgid "" +"File permissions of \"%s\" are read-only.\n" +"It may still be possible to write it.\n" +"Do you wish to try?" +msgstr "" +"El fitxer \"%s\" és de només lectura.\n" +"Tot i això pot ser possible escriure-hi.\n" +"Voleu intentar-ho?" -msgid "E18: Unexpected characters in :let" -msgstr "E18: Caràcters inesperats a :let" +# :browse edit +msgid "Edit File" +msgstr "Edita un fitxer" #, c-format -msgid "E121: Undefined variable: %s" -msgstr "E121: Variable no definida: %s" - -msgid "E111: Missing ']'" -msgstr "E111: Falta un ']'" +msgid "replace with %s (y/n/a/q/l/^E/^Y)?" +msgstr "substituir per %s (y/n/a/q/l/^E/^Y)?" -# :let foo={1: 2} -# :let foo[1:3]=0 -msgid "E719: Cannot use [:] with a Dictionary" -msgstr "E719: No es pot usar [:] amb un diccionari" +msgid "(Interrupted) " +msgstr "(Interromput) " -# :let foo += 1 #, c-format -msgid "E734: Wrong variable type for %s=" -msgstr "E734: Tipus de variable incorrecte per a %s=" +msgid "%ld match on %ld line" +msgid_plural "%ld matches on %ld line" +msgstr[0] "%ld coincidència a %ld línia" +msgstr[1] "%ld coincidències a %ld línia" #, c-format -msgid "E461: Illegal variable name: %s" -msgstr "E461: El nom de la variable és il·legal: %s" - -# semblant a eval.c:7120 i següents -msgid "E806: using Float as a String" -msgstr "E806: Ús de Float com a String" - -# :let [foo,bar] = [1] -msgid "E687: Less targets than List items" -msgstr "E687: Menys valors per assignar que elements a la llista" - -# :let [a,b]=[1,2,3] -msgid "E688: More targets than List items" -msgstr "E688: Més valors per assignar que elements a la llista" - -msgid "Double ; in list of variables" -msgstr "La llista de variables conté un ; doble" +msgid "%ld substitution on %ld line" +msgid_plural "%ld substitutions on %ld line" +msgstr[0] "%ld substitució a %ld línia" +msgstr[1] "%ld substitucions a %ld línia" #, c-format -msgid "E738: Can't list variables for %s" -msgstr "E738: No s'han pogut mostrar les variables de tipus %s" +msgid "%ld match on %ld lines" +msgid_plural "%ld matches on %ld lines" +msgstr[0] "%ld coincidència a %ld línies" +msgstr[1] "%ld coincidències a %ld línies" -msgid "E689: Can only index a List or Dictionary" -msgstr "E689: Només és possible indexar List i Dictionary" +#, c-format +msgid "%ld substitution on %ld lines" +msgid_plural "%ld substitutions on %ld lines" +msgstr[0] "%ld substitució a %ld línies" +msgstr[1] "%ld substitucions a %ld línies" -msgid "E708: [:] must come last" -msgstr "E708: [:] ha d'anar al final" +#, c-format +msgid "Pattern found in every line: %s" +msgstr "El patró apareix a totes les línies: %s" -msgid "E709: [:] requires a List value" -msgstr "E709: [:] requereix un valor List" +#, c-format +msgid "Pattern not found: %s" +msgstr "No s'ha trobat el patró: %s" -msgid "E710: List value has more items than target" -msgstr "E710: La llista conté més elements que valors per assignar" +msgid "No old files" +msgstr "No hi ha fitxers antics" -msgid "E711: List value has not enough items" -msgstr "E711: La llista no conté prou elements" +#, c-format +msgid "Save changes to \"%s\"?" +msgstr "Voleu desar els canvis a \"%s\"?" -msgid "E690: Missing \"in\" after :for" -msgstr "E690: Falta un \"in\" després de :for" +msgid "Warning: Entered other buffer unexpectedly (check autocommands)" +msgstr "Atenció: S'ha canviat de buffer (reviseu les ordres automàtiques)" #, c-format -msgid "E108: No such variable: \"%s\"" -msgstr "E108: No existeix tal variable: \"%s\"" +msgid "W20: Required python version 2.x not supported, ignoring file: %s" +msgstr "W20: La versió 2.x de Python està suportada, s'ignora: %s" #, c-format -msgid "E940: Cannot lock or unlock variable %s" -msgstr "E940: No s'ha pogut bloquejar o desbloquejar la variable %s" +msgid "W21: Required python version 3.x not supported, ignoring file: %s" +msgstr "W21: La versió 3.x de Python no està suportada, s'ignora: %s" -msgid "E743: variable nested too deep for (un)lock" -msgstr "E743: el nivell d'imbricació de la variable és massa elevat" +msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." +msgstr "Mode Ex. Escriviu \"visual\" per a tornar al mode Normal." -msgid "E109: Missing ':' after '?'" -msgstr "E109: Falta un ':' després de '?'" +#, c-format +msgid "Executing: %s" +msgstr "Executant %s" -msgid "E691: Can only compare List with List" -msgstr "E691: List només es pot comparar amb List" +msgid "End of sourced file" +msgstr "Final de l'script" -msgid "E692: Invalid operation for List" -msgstr "E692: Operació no vàlida amb llistes" +msgid "End of function" +msgstr "Final de la funció" -msgid "E735: Can only compare Dictionary with Dictionary" -msgstr "E735: Dictionary només es pot comparar amb Dictionary" +# és una pregunta. +msgid "Backwards range given, OK to swap" +msgstr "Interval decreixent. El voleu invertir" -msgid "E736: Invalid operation for Dictionary" -msgstr "E736: Operació no vàlida per a Dictionary" +msgid "" +"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX" +msgstr "" +"INTERN: No es pot usar EX_DFLALL amb ADDR_NONE, ADDR_UNSIGNED o ADDR_QUICKFIX" -msgid "E694: Invalid operation for Funcrefs" -msgstr "E694: Operació no vàlida per a Funcref" +#, c-format +msgid "%d more file to edit. Quit anyway?" +msgid_plural "%d more files to edit. Quit anyway?" +msgstr[0] "Queda %d fitxer per editar. Voleu sortir de totes maneres?" +msgstr[1] "Queden %d fitxers per editar. Voleu sortir de totes maneres?" -msgid "E804: Cannot use '%' with Float" -msgstr "E804: No és possible utilitzar '%' amb Float" +# esquema de colors +msgid "unknown" +msgstr "desconegut" -msgid "E110: Missing ')'" -msgstr "E110: Falta un ')'" +msgid "Greetings, Vim user!" +msgstr "Salutacions, usuari del Vim!" -msgid "E695: Cannot index a Funcref" -msgstr "E695: No és possible indexar Funcref" +msgid "Already only one tab page" +msgstr "Només hi ha una pestanya" -msgid "E909: Cannot index a special variable" -msgstr "E909: Les variables especials no són indexables" +# :browse split +msgid "Edit File in new tab page" +msgstr "Edita un fitxer en una pestanya nova" -#, c-format -msgid "E112: Option name missing: %s" -msgstr "E112: Falta el nom de l'opció: %s" +# :browse split +msgid "Edit File in new window" +msgstr "Edita un fitxer en una finestra nova" #, c-format -msgid "E113: Unknown option: %s" -msgstr "E113: Opció desconeguda: %s" +msgid "Tab page %d" +msgstr "Pestanya %d" -#, c-format -msgid "E114: Missing quote: %s" -msgstr "E114: Falten cometes: %s" +msgid "No swap file" +msgstr "No existeix cap fitxer d'intercanvi" + +# :browse read +msgid "Append File" +msgstr "Afegeix un fitxer" #, c-format -msgid "E115: Missing quote: %s" -msgstr "E115: Falten cometes: %s" +msgid "Window position: X %d, Y %d" +msgstr "Posició de la finestra: X %d, Y %d" -msgid "Not enough memory to set references, garbage collection aborted!" -msgstr "No hi ha prou memòria, s'avorta el col·lector de brossa!" +msgid "Save Redirection" +msgstr "Desa la redirecció" -# veure eval.c:2935 -msgid "E724: variable nested too deep for displaying" -msgstr "E724: el nivell d'imbricació de la variable és massa elevat" +msgid "Untitled" +msgstr "Sense-nom" -msgid "E805: Using a Float as a Number" -msgstr "E805: Ús de Float com a Number" +#, c-format +msgid "Exception thrown: %s" +msgstr "Excepció generada: %s" -msgid "E703: Using a Funcref as a Number" -msgstr "E703: Ús de Funcref com a Number" +#, c-format +msgid "Exception finished: %s" +msgstr "Excepció finalitzada: %s" -msgid "E745: Using a List as a Number" -msgstr "E745: Ús de List com a Number" +#, c-format +msgid "Exception discarded: %s" +msgstr "Excepció descartada: %s" -msgid "E728: Using a Dictionary as a Number" -msgstr "E728: Ús de Dictionary com a Number" +#, c-format +msgid "%s, line %ld" +msgstr "%s, línia %ld" -msgid "E910: Using a Job as a Number" -msgstr "E910: Ús de Job com a Number" +#, c-format +msgid "Exception caught: %s" +msgstr "Excepció interceptada: %s" -msgid "E913: Using a Channel as a Number" -msgstr "E913: Ús de Channel com a Number" +#, c-format +msgid "%s made pending" +msgstr "%s s'ha posposat" -msgid "E891: Using a Funcref as a Float" -msgstr "E891: Ús de Funcref com a Float" +#, c-format +msgid "%s resumed" +msgstr "%s s'ha reprès" -msgid "E892: Using a String as a Float" -msgstr "E892: Ús de String com a Float" +#, c-format +msgid "%s discarded" +msgstr "%s s'ha descartat" -msgid "E893: Using a List as a Float" -msgstr "E893: Ús de List com a Float" +msgid "Exception" +msgstr "Excepció" -msgid "E894: Using a Dictionary as a Float" -msgstr "E894: Ús de Dictionary com a Float" +msgid "Error and interrupt" +msgstr "Error i interrupció" -msgid "E907: Using a special value as a Float" -msgstr "E907: Ús de Special com a Float" +msgid "Error" +msgstr "Error" -msgid "E911: Using a Job as a Float" -msgstr "E911: Ús de Job com a Float" +msgid "Interrupt" +msgstr "Interrupció" -msgid "E914: Using a Channel as a Float" -msgstr "E914: Ús de Channel com a Float" +msgid "[Command Line]" +msgstr "[Línia d'ordres]" -msgid "E729: using Funcref as a String" -msgstr "E729: Ús de Funcref com a String" +msgid "is a directory" +msgstr "és un directori" -msgid "E730: using List as a String" -msgstr "E730: Ús de List com a String" +msgid "Illegal file name" +msgstr "El nom de fitxer és il·legal" -msgid "E731: using Dictionary as a String" -msgstr "E731: Ús de Dictionary com a String" +msgid "is not a file" +msgstr "no és un fitxer" -msgid "E908: using an invalid value as a String" -msgstr "E908: Ús d'un valor invàlid com a String" +msgid "is a device (disabled with 'opendevice' option)" +msgstr "és un dispositiu (deshabilitat amb el paràmetre 'opendevice')" -#, c-format -msgid "E795: Cannot delete variable %s" -msgstr "E795: No s'ha pogut eliminar la variable %s" +msgid "[New DIRECTORY]" +msgstr "[Nou DIRECTORI]" -#, c-format -msgid "E704: Funcref variable name must start with a capital: %s" -msgstr "E704: Les variables Funcref han de començar amb majúscula: %s" +msgid "[File too big]" +msgstr "[Fitxer massa gran]" -#, c-format -msgid "E705: Variable name conflicts with existing function: %s" -msgstr "E705: La variable entra en conflicte amb una funció existent: %s" +msgid "[Permission Denied]" +msgstr "[Permís denegat]" -#, c-format -msgid "E741: Value is locked: %s" -msgstr "E741: El valor està bloquejat: %s" +msgid "Vim: Reading from stdin...\n" +msgstr "Vim: Llegint l'entrada estàndard...\n" -msgid "Unknown" -msgstr "Desconegut" +msgid "Reading from stdin..." +msgstr "Llegint l'entrada estàndard..." -#, c-format -msgid "E742: Cannot change value of %s" -msgstr "E742: No s'ha pogut canviar el valor de %s" +msgid "[fifo]" +msgstr "[fifo]" -msgid "E698: variable nested too deep for making a copy" -msgstr "E698: el nivell d'imbricació de la variable és massa elevat" +msgid "[socket]" +msgstr "[socket]" -msgid "" -"\n" -"# global variables:\n" -msgstr "" -"\n" -"# variables globals:\n" +msgid "[character special]" +msgstr "[caràcter especial]" -msgid "" -"\n" -"\tLast set from " -msgstr "" -"\n" -"\tDefinit per últim cop a " +msgid "[CR missing]" +msgstr "[falta retorn-de-carro]" -msgid "map() argument" -msgstr "argument a map()" +msgid "[long lines split]" +msgstr "[línies llargues partides]" -msgid "filter() argument" -msgstr "argument a filter()" +#, c-format +msgid "[CONVERSION ERROR in line %ld]" +msgstr "[ERROR DE CONVERSIÓ a la línia %ld]" #, c-format -msgid "E686: Argument of %s must be a List" -msgstr "E686: L'argument a %s ha de ser List" +msgid "[ILLEGAL BYTE in line %ld]" +msgstr "[OCTET IL·LEGAL a la línia %ld]" -msgid "E928: String required" -msgstr "E928: Es necessita String" +msgid "[READ ERRORS]" +msgstr "[ERRORS DE LECTURA]" -msgid "E808: Number or Float required" -msgstr "E808: Es necessita Number o Float" +msgid "Can't find temp file for conversion" +msgstr "No s'ha trobat el fitxer temporal per a fer la conversió" -msgid "add() argument" -msgstr "argument a add()" +msgid "Conversion with 'charconvert' failed" +msgstr "La conversió amb 'charconvert' ha fallat" -msgid "E785: complete() can only be used in Insert mode" -msgstr "E785: complete() només es pot utilitzar en mode d'inserció" +msgid "can't read output of 'charconvert'" +msgstr "No s'ha pogut llegir la sortida de 'charconvert'" -msgid "&Ok" -msgstr "&D'acord" +msgid "[dos]" +msgstr "[dos]" -#, c-format -msgid "E700: Unknown function: %s" -msgstr "E700: Funció desconeguda: %s" +msgid "[dos format]" +msgstr "[format dos]" -msgid "E922: expected a dict" -msgstr "E922: s'esperava un diccionari" +msgid "[mac]" +msgstr "[mac]" -msgid "E923: Second argument of function() must be a list or a dict" -msgstr "E923: El segon argument a function() ha de ser una llista o diccionari" +msgid "[mac format]" +msgstr "[format mac]" -msgid "" -"&OK\n" -"&Cancel" -msgstr "" -"&D'acord\n" -"&Cancel·la" +msgid "[unix]" +msgstr "[unix]" -msgid "called inputrestore() more often than inputsave()" -msgstr "s'ha cridat inputrestore() més sovint que inputsave()" +msgid "[unix format]" +msgstr "[format unix]" -msgid "insert() argument" -msgstr "argument a insert()" +#, c-format +msgid "%ld line, " +msgid_plural "%ld lines, " +msgstr[0] "%ld línia, " +msgstr[1] "%ld línies, " -msgid "E786: Range not allowed" -msgstr "E786: Interval no permès" +#, c-format +msgid "%lld byte" +msgid_plural "%lld bytes" +msgstr[0] "%lld octet" +msgstr[1] "%lld octets" -msgid "E916: not a valid job" -msgstr "E916: no és una feina vàlida" +# eol = final de línia +msgid "[noeol]" +msgstr "[nofl]" -msgid "E701: Invalid type for len()" -msgstr "E701: Tipus invàlid per a len()" +msgid "[Incomplete last line]" +msgstr "[Última línia incompleta]" #, c-format -msgid "E798: ID is reserved for \":match\": %ld" -msgstr "E798: ID reservat per a \":match\": %ld" +msgid "" +"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as " +"well" +msgstr "W12: Atenció: Tant el fitxer \"%s\" com el buffer del Vim han canviat" -msgid "E726: Stride is zero" -msgstr "E726: L'increment és zero" +msgid "See \":help W12\" for more info." +msgstr "Vegeu \":help W12\" per a més informació." -msgid "E727: Start past end" -msgstr "E727: Inici després del final" +#, c-format +msgid "W11: Warning: File \"%s\" has changed since editing started" +msgstr "W11: Atenció: El fitxer \"%s\" ha canviat després de ser obert" -msgid "" -msgstr "" +msgid "See \":help W11\" for more info." +msgstr "Vegeu \":help W11\" per a més informació." -msgid "E240: No connection to the X server" -msgstr "E240: No hi ha connexió amb el servidor X" +#, c-format +msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" +msgstr "W16: Atenció: Els permisos de \"%s\" han canviat després de ser obert" + +msgid "See \":help W16\" for more info." +msgstr "Vegeu \":help W16\" per a més informació." #, c-format -msgid "E241: Unable to send to %s" -msgstr "E241: No s'ha pogut enviar a %s" +msgid "W13: Warning: File \"%s\" has been created after editing started" +msgstr "W13: Atenció: El fitxer \"%s\" ha estat creat després de ser obert" -msgid "E277: Unable to read a server reply" -msgstr "E277: No s'ha pogut llegir la resposta del servidor" +msgid "Warning" +msgstr "Atenció" -msgid "E941: already started a server" -msgstr "E941: ja s'ha iniciat un servidor" +msgid "" +"&OK\n" +"&Load File\n" +"Load File &and Options" +msgstr "" +"&D'acord\n" +"&Carrega el fitxer\n" +"Carrega el fitxer &i opcions" -msgid "E942: +clientserver feature not available" -msgstr "E942: la característica +clientserver no està disponible" +msgid "" +msgstr "" -msgid "remove() argument" -msgstr "argument a remove()" +msgid "writefile() first argument must be a List or a Blob" +msgstr "writefile() el primer argument ha de ser List o Blob" -msgid "E655: Too many symbolic links (cycle?)" -msgstr "E655: Massa enllaços simbòlics (circulars?)" +msgid "Select Directory dialog" +msgstr "Selecció de directori" -msgid "reverse() argument" -msgstr "argument a reverse()" +msgid "Save File dialog" +msgstr "Desa el fitxer" -msgid "E258: Unable to send to client" -msgstr "E258: No s'ha pogut enviar al client" +msgid "Open File dialog" +msgstr "Obre el fitxer" -#, c-format -msgid "E927: Invalid action: '%s'" -msgstr "E927: Acció invàlida: '%s'" +msgid "no matches" +msgstr "cap coincidència" -msgid "sort() argument" -msgstr "argument a sort()" +#, c-format +msgid "+--%3ld line folded " +msgid_plural "+--%3ld lines folded " +msgstr[0] "+--%3ld línia plegada" +msgstr[1] "+--%3ld línies plegades" -msgid "uniq() argument" -msgstr "argument a uniq()" +#, c-format +msgid "+-%s%3ld line: " +msgid_plural "+-%s%3ld lines: " +msgstr[0] "+-%s%3ld línia: " +msgstr[1] "+-%s%3ld línies: " -msgid "E702: Sort compare function failed" -msgstr "E702: La funció de comparació a sort() ha fallat" +msgid "No match at cursor, finding next" +msgstr "Cap coincidència al cursor, cercant la següent" -msgid "E882: Uniq compare function failed" -msgstr "E882: La funció de comparació a unique() ha fallat" +msgid " " +msgstr " " -msgid "(Invalid)" -msgstr "(No vàlid)" +msgid "Pathname:" +msgstr "Ubicació:" -#, c-format -msgid "E935: invalid submatch number: %d" -msgstr "E935: referència invàlida a una coincidència: %d" +msgid "OK" +msgstr "D'acord" -msgid "E677: Error writing temp file" -msgstr "E677: Error en escriure el fitxer temporal" +msgid "Cancel" +msgstr "Cancel·la" -msgid "E921: Invalid callback argument" -msgstr "E921: L'argument del callback no és vàlid" +msgid "Scrollbar Widget: Could not get geometry of thumb pixmap." +msgstr "Barra de desplaçament: No s'ha obtingut la mida del mapa de bits." -# E.G: :ascii -#, c-format -msgid "<%s>%s%s %d, Hex %02x, Octal %03o" -msgstr "<%s>%s%s %d, Hex %02x, Octal %03o" +msgid "Vim dialog" +msgstr "Diàleg del Vim" -# E.G: :ascii -#, c-format -msgid "> %d, Hex %04x, Octal %o" -msgstr "> %d, Hex %04x, Octal %o" +# :browse w +msgid "_Save" +msgstr "_Desa" -# E.G: :ascii -#, c-format -msgid "> %d, Hex %08x, Octal %o" -msgstr "> %d, Hex %08x, Octal %o" +msgid "_Open" +msgstr "_Obre" -msgid "E134: Move lines into themselves" -msgstr "E134: No es poden moure línies cap a elles mateixes" +msgid "_Cancel" +msgstr "_Cancel·la" -msgid "1 line moved" -msgstr "1 línia desplaçada" +msgid "_OK" +msgstr "D'_acord" -#, c-format -msgid "%ld lines moved" -msgstr "%ld línies desplaçades" +msgid "" +"&Yes\n" +"&No\n" +"&Cancel" +msgstr "" +"&Sí\n" +"&No\n" +"&Cancel·la" -#, c-format -msgid "%ld lines filtered" -msgstr "%ld línies filtrades" +msgid "Yes" +msgstr "Sí" -msgid "E135: *Filter* Autocommands must not change current buffer" -msgstr "E135: Les ordres automàtiques *Filter* han de no modificar el buffer" +msgid "No" +msgstr "No" -msgid "[No write since last change]\n" -msgstr "[No s'han desat els últims canvis]\n" +msgid "Input _Methods" +msgstr "_Mètodes d'entrada" -#, c-format -msgid "%sviminfo: %s in line: " -msgstr "%sviminfo: %s a la línia: " +msgid "VIM - Search and Replace..." +msgstr "VIM - Cerca i substitueix..." -msgid "E136: viminfo: Too many errors, skipping rest of file" -msgstr "E136: viminfo: Hi ha massa errors, s'omet la resta del fitxer" +msgid "VIM - Search..." +msgstr "VIM - Cerca..." -# vim -V5 -#, c-format -msgid "Reading viminfo file \"%s\"%s%s%s" -msgstr "Llegint el fitxer viminfo \"%s\"%s%s%s" +msgid "Find what:" +msgstr "Cerca:" -msgid " info" -msgstr " / info" +msgid "Replace with:" +msgstr "Substitueix amb:" -msgid " marks" -msgstr " / marques" +msgid "Match whole word only" +msgstr "Només paraules senceres" -msgid " oldfiles" -msgstr " / fitxers vells" +msgid "Match case" +msgstr "Sensible a les majúscules" -msgid " FAILED" -msgstr " ERROR" +msgid "Direction" +msgstr "Direcció" -#, c-format -msgid "E137: Viminfo file is not writable: %s" -msgstr "E137: El fitxer viminfo no és modificable: %s" +msgid "Up" +msgstr "Amunt" -#, c-format -msgid "E929: Too many viminfo temp files, like %s!" -msgstr "E929: Massa fitxers viminfo temporals, anomenats %s!" +msgid "Down" +msgstr "Avall" -#, c-format -msgid "E138: Can't write viminfo file %s!" -msgstr "E138: No s'ha pogut escriure el fitxer viminfo %s!" +msgid "Find Next" +msgstr "Cerca el següent" -#, c-format -msgid "Writing viminfo file \"%s\"" -msgstr "Escrivint el fitxer viminfo \"%s\"" +msgid "Replace" +msgstr "Substitueix" -#, c-format -msgid "E886: Can't rename viminfo file to %s!" -msgstr "E886: No s'ha pogut reanomenar el fitxer viminfo a %s!" +msgid "Replace All" +msgstr "Substitueix-les totes" -#, c-format -msgid "# This viminfo file was generated by Vim %s.\n" -msgstr "# Aquest fitxer viminfo ha estat generat per Vim %s.\n" +msgid "_Close" +msgstr "_Tanca" -msgid "" -"# You may edit it if you're careful!\n" -"\n" -msgstr "" -"# El podeu editar si aneu amb compte!\n" -"\n" +msgid "Vim: Received \"die\" request from session manager\n" +msgstr "Vim: S'ha rebut una petició \"die\" del gestor de sessions\n" -msgid "# Value of 'encoding' when this file was written\n" -msgstr "# Valor de 'encoding' en el moment d'escriure aquest fitxer\n" +msgid "Close tab" +msgstr "Tanca la pestanya" -msgid "Illegal starting char" -msgstr "Caràcter inicial il·legal" +msgid "New tab" +msgstr "Nova pestanya" -# viminfo -msgid "" -"\n" -"# Bar lines, copied verbatim:\n" -msgstr "\n# Línies copiades literalment sense modificar:\n" +msgid "Open Tab..." +msgstr "Obre una pestanya..." -# GUI :browse w -msgid "Save As" -msgstr "Anomena i desa" +msgid "Vim: Main window unexpectedly destroyed\n" +msgstr "Vim: La finestra principal s'ha destruït inesperadament\n" -msgid "Write partial file?" -msgstr "Voleu escriure un fitxer parcial?" +msgid "&Filter" +msgstr "&Filtre" -msgid "E140: Use ! to write partial buffer" -msgstr "E140: Useu ! per a desar una part del buffer" +msgid "&Cancel" +msgstr "&Cancel·la" -#, c-format -msgid "Overwrite existing file \"%s\"?" -msgstr "Voleu sobreescriure el fitxer existent \"%s\"?" +msgid "Directories" +msgstr "Directoris" -#, c-format -msgid "Swap file \"%s\" exists, overwrite anyway?" -msgstr "El fitxer d'intercanvi \"%s\" existeix, sobreescriure igualment?" +msgid "Filter" +msgstr "Filtre" -#, c-format -msgid "E768: Swap file exists: %s (:silent! overrides)" -msgstr "E768: El fitxer d'intercanvi existeix: %s (:silent! per a forçar)" +msgid "&Help" +msgstr "&Ajuda" -#, c-format -msgid "E141: No file name for buffer %ld" -msgstr "E141: No hi ha nom de fitxer per al buffer %ld" +msgid "Files" +msgstr "Fitxers" -msgid "E142: File not written: Writing is disabled by 'write' option" -msgstr "E142: No s'ha escrit el fitxer: El paràmetre 'write' ho impedeix" +msgid "&OK" +msgstr "&D'acord" -#, c-format -msgid "" -"'readonly' option is set for \"%s\".\n" -"Do you wish to write anyway?" -msgstr "" -"S'ha establert l'opció 'readonly' per a \"%s\".\n" -"Voleu escriure de totes maneres?" +msgid "Selection" +msgstr "Selecció" -#, c-format -msgid "" -"File permissions of \"%s\" are read-only.\n" -"It may still be possible to write it.\n" -"Do you wish to try?" -msgstr "" -"El fitxer \"%s\" és de només lectura.\n" -"Tot i això pot ser possible escriure-hi.\n" -"Voleu intentar-ho?" +msgid "Find &Next" +msgstr "&Cerca el següent" -#, c-format -msgid "E505: \"%s\" is read-only (add ! to override)" -msgstr "E505: \"%s\" és de només lectura (afegiu ! per a forçar)" - -# :browse edit -msgid "Edit File" -msgstr "Edita un fitxer" +msgid "&Replace" +msgstr "&Substitueix" -#, c-format -msgid "E143: Autocommands unexpectedly deleted new buffer %s" -msgstr "E143: Una ordre automàtica ha eliminat el nou buffer %s" +msgid "Replace &All" +msgstr "Substitueix-les &totes" -msgid "E144: non-numeric argument to :z" -msgstr "E144: Argument no numèric a :z" +msgid "&Undo" +msgstr "&Desfés" -msgid "E145: Shell commands not allowed in rvim" -msgstr "E145: El mode restringit no permet executar ordres de l'intèrpret" +msgid "Open tab..." +msgstr "Obre una pestanya..." -msgid "E146: Regular expressions can't be delimited by letters" -msgstr "E146: Expressions regulars delimitades amb caràcters alfabètics" +msgid "Find string" +msgstr "Cerca" -#, c-format -msgid "replace with %s (y/n/a/q/l/^E/^Y)?" -msgstr "substituir per %s (y/n/a/q/l/^E/^Y)?" +msgid "Find & Replace" +msgstr "Cerca i substitueix" -msgid "(Interrupted) " -msgstr "(Interromput) " +msgid "Not Used" +msgstr "No Usat" -msgid "1 match" -msgstr "1 coincidència " +msgid "Directory\t*.nothing\n" +msgstr "Directori\t*.res\n" -msgid "1 substitution" -msgstr "1 substitució" +#, c-format +msgid "Font0: %s" +msgstr "Fosa0: %s" #, c-format -msgid "%ld matches" -msgstr "%ld coincidències" +msgid "Font%d: %s" +msgstr "Fosa%d: %s" #, c-format -msgid "%ld substitutions" -msgstr "%ld substitucions" +msgid "Font%d width is not twice that of font0" +msgstr "L'amplada de fosa%d no és el doble que la de fosa0" -msgid " on 1 line" -msgstr " en 1 línia" +#, c-format +msgid "Font0 width: %d" +msgstr "Amplada de fosa0: %d" #, c-format -msgid " on %ld lines" -msgstr " en %ld línies" +msgid "Font%d width: %d" +msgstr "Amplada de fosa%d: %d" -msgid "E147: Cannot do :global recursive with a range" -msgstr "E147: No és possible usar :global recursivament amb un interval" +msgid "Invalid font specification" +msgstr "L'especificació de tipus de lletra no és vàlida" -# :g -msgid "E148: Regular expression missing from global" -msgstr "E148: Falta una expressió regular a :global" +msgid "&Dismiss" +msgstr "&Ignora" -#, c-format -msgid "Pattern found in every line: %s" -msgstr "El patró apareix a totes les línies: %s" +msgid "no specific match" +msgstr "no hi ha coincidències" -#, c-format -msgid "Pattern not found: %s" -msgstr "No s'ha trobat el patró: %s" +msgid "Vim - Font Selector" +msgstr "Vim - Selector de fosa" -msgid "" -"\n" -"# Last Substitute String:\n" -"$" -msgstr "" -"\n" -"# Última cadena substituïda:\n" -"$" +msgid "Name:" +msgstr "Nom:" -msgid "E478: Don't panic!" -msgstr "E478: Mantingueu la calma!" +msgid "Show size in Points" +msgstr "Mostra la mida en punts" -#, c-format -msgid "E661: Sorry, no '%s' help for %s" -msgstr "E661: No hi ha ajuda en '%s' sobre %s" +msgid "Encoding:" +msgstr "Codificació:" -# :h zzzzzzzzz -#, c-format -msgid "E149: Sorry, no help for %s" -msgstr "E149: No hi ha ajuda sobre %s" +msgid "Font:" +msgstr "Fosa:" -#, c-format -msgid "Sorry, help file \"%s\" not found" -msgstr "No s'ha trobat el fitxer d'ajuda \"%s\"" +msgid "Style:" +msgstr "Estil:" -#, c-format -msgid "E151: No match: %s" -msgstr "E151: Cap coincidència: %s" +msgid "Size:" +msgstr "Mida:" #, c-format -msgid "E152: Cannot open %s for writing" -msgstr "E152: No es obrir %s per a escriptura" +msgid "Page %d" +msgstr "Pàgina %d" -#, c-format -msgid "E153: Unable to open %s for reading" -msgstr "E153: No es pot obrir %s per a lectura" +msgid "No text to be printed" +msgstr "No hi ha text per imprimir" #, c-format -msgid "E670: Mix of help file encodings within a language: %s" -msgstr "E670: Fitxers d'ajuda amb codificacions heterogènies: %s" +msgid "Printing page %d (%d%%)" +msgstr "Imprimint la pàgina %d (%d%%)" #, c-format -msgid "E154: Duplicate tag \"%s\" in file %s/%s" -msgstr "E154: L'etiqueta \"%s\" està duplicada en el fitxer %s/%s" +msgid " Copy %d of %d" +msgstr " Còpia %d de %d" #, c-format -msgid "E150: Not a directory: %s" -msgstr "E150: No és un directori: %s" +msgid "Printed: %s" +msgstr "S'ha imprès: %s" -#, c-format -msgid "E160: Unknown sign command: %s" -msgstr "E160: Ordre de senyals desconeguda: %s" +msgid "Printing aborted" +msgstr "S'ha avortat la impressió" -msgid "E156: Missing sign name" -msgstr "E156: Falta el nom del senyal" +msgid "Sending to printer..." +msgstr "Enviant a la impressora..." -msgid "E612: Too many signs defined" -msgstr "E612: S'han definit massa senyals" +msgid "Print job sent." +msgstr "S'ha enviat la feina d'impressió." #, c-format -msgid "E239: Invalid sign text: %s" -msgstr "E239: El text del senyal no és vàlid: %s" +msgid "Sorry, help file \"%s\" not found" +msgstr "No s'ha trobat el fitxer d'ajuda \"%s\"" -#, c-format -msgid "E155: Unknown sign: %s" -msgstr "E155: El senyal és desconegut: %s" +msgid "W18: Invalid character in group name" +msgstr "W18: Hi ha un caràcter no vàlid en el nom del grup" -msgid "E159: Missing sign number" -msgstr "E159: Falta el número del senyal" +msgid "Add a new database" +msgstr "Afegeix una base de dades nova" -#, c-format -msgid "E158: Invalid buffer name: %s" -msgstr "E158: El nom del buffer no és vàlid: %s" +msgid "Query for a pattern" +msgstr "Cerca un patró" -msgid "E934: Cannot jump to a buffer that does not have a name" -msgstr "E934: No és possible saltar a un buffer que no té nom" +msgid "Show this message" +msgstr "Mostra aquest missatge" -#, c-format -msgid "E157: Invalid sign ID: %ld" -msgstr "E157: L'ID del senyal no és vàlid: %ld" +msgid "Kill a connection" +msgstr "Talla una connexió" -#, c-format -msgid "E885: Not possible to change sign %s" -msgstr "E885: No és possible canviar el senyal %s" +msgid "Reinit all connections" +msgstr "Reinicia totes les connexions" -msgid " (NOT FOUND)" -msgstr " (NO TROBAT)" +msgid "Show connections" +msgstr "Mostra les connexions" -msgid " (not supported)" -msgstr " (no suportat)" +msgid "This cscope command does not support splitting the window.\n" +msgstr "Aquesta ordre de cscope no permet dividir la finestra.\n" -msgid "[Deleted]" -msgstr "[Eliminat]" +#, c-format +msgid "Added cscope database %s" +msgstr "S'ha afegit la base de dades cscope %s" -msgid "No old files" -msgstr "No hi ha fitxers antics" +msgid "cs_create_connection setpgid failed" +msgstr "cs_create_connection setpgid ha fallat" -msgid "Entering Debug mode. Type \"cont\" to continue." -msgstr "Mode de depuració. Escriviu \"cont\" per a continuar." +msgid "cs_create_connection exec failed" +msgstr "cs_create_connection exec ha fallat" -#, c-format -msgid "line %ld: %s" -msgstr "línia %ld: %s" +msgid "cs_create_connection: fdopen for to_fp failed" +msgstr "cs_create_connection: fdopen per a to_fp ha fallat" -#, c-format -msgid "cmd: %s" -msgstr "ordre: %s" +msgid "cs_create_connection: fdopen for fr_fp failed" +msgstr "cs_create_connection: fdopen per a fr_fp ha fallat" -msgid "frame is zero" -msgstr "el marc és zero" +msgid "cscope commands:\n" +msgstr "ordres de cscope:\n" #, c-format -msgid "frame at highest level: %d" -msgstr "marc al nivell màxim: %d" +msgid "%-5s: %s%*s (Usage: %s)" +msgstr "%-5s: %s%*s (Sintaxi: %s)" -#, c-format -msgid "Breakpoint in \"%s%s\" line %ld" -msgstr "Punt de ruptura a \"%s%s\" línia %ld" +msgid "" +"\n" +" a: Find assignments to this symbol\n" +" c: Find functions calling this function\n" +" d: Find functions called by this function\n" +" e: Find this egrep pattern\n" +" f: Find this file\n" +" g: Find this definition\n" +" i: Find files #including this file\n" +" s: Find this C symbol\n" +" t: Find this text string\n" +msgstr "" +"\n" +" a: Cerca assignacions a aquest símbol\n" +" c: Cerca funcions que criden aquesta funció\n" +" d: Cerca funcions cridades per aquesta funció\n" +" e: Cerca aquest patró egrep\n" +" f: Cerca aquest fitxer\n" +" g: Cerca aquesta definició\n" +" i: Cerca fitxers que fan #include amb aquest fitxer\n" +" s: Cerca aquest símbol C\n" +" t: Cerca aquesta cadena de caràcters\n" #, c-format -msgid "E161: Breakpoint not found: %s" -msgstr "E161: Punt de ruptura no trobat: %s" - -msgid "No breakpoints defined" -msgstr "No s'han definit punts de ruptura" +msgid "cscope connection %s closed" +msgstr "s'ha tancat la connexió cscope %s" #, c-format -msgid "%3d %s %s line %ld" -msgstr "%3d %s %s línia %ld" +msgid "Cscope tag: %s" +msgstr "Etiqueta cscope: %s" -msgid "E750: First use \":profile start {fname}\"" -msgstr "E750: Primer feu \":profile start {nomfitxer}\"" +msgid "" +"\n" +" # line" +msgstr "" +"\n" +" # línia" -#, c-format -msgid "Save changes to \"%s\"?" -msgstr "Voleu desar els canvis a \"%s\"?" +msgid "filename / context / line\n" +msgstr "fitxer / context / línia\n" -msgid "Untitled" -msgstr "Sense-nom" +msgid "All cscope databases reset" +msgstr "S'han restablert totes les bases de dades cscope" -#, c-format -msgid "E162: No write since last change for buffer \"%s\"" -msgstr "E162: No s'han desat els canvis en el buffer \"%s\"" +msgid "no cscope connections\n" +msgstr "no hi ha connexions cscope\n" -msgid "Warning: Entered other buffer unexpectedly (check autocommands)" -msgstr "Atenció: S'ha canviat de buffer (reviseu les ordres automàtiques)" +msgid " # pid database name prepend path\n" +msgstr " # pid base de dades prefix d'ubicació\n" -msgid "E163: There is only one file to edit" -msgstr "E163: Només hi ha un fitxer per editar" +msgid "Lua library cannot be loaded." +msgstr "No s'ha pogut carregar la biblioteca Lua." -msgid "E164: Cannot go before first file" -msgstr "E164: No es pot anar més enllà del primer fitxer" - -msgid "E165: Cannot go beyond last file" -msgstr "E165: No es pot anar més enllà de l'últim fitxer" +msgid "cannot save undo information" +msgstr "no s'ha pogut desar la informació de desfer" -#, c-format -msgid "E666: compiler not supported: %s" -msgstr "E666: el compilador no està suportat: %s" +msgid "invalid expression" +msgstr "l'expressió no és vàlida" -#, c-format -msgid "Searching for \"%s\" in \"%s\"" -msgstr "Cercant \"%s\" a \"%s\"" +msgid "expressions disabled at compile time" +msgstr "no s'ha compilat suport per a expressions" -#, c-format -msgid "Searching for \"%s\"" -msgstr "Cercant \"%s\"" +msgid "hidden option" +msgstr "opció amagada" -#, c-format -msgid "not found in '%s': \"%s\"" -msgstr "no s'ha trobat a '%s': \"%s\"" +msgid "unknown option" +msgstr "opció desconeguda" -#, c-format -msgid "W20: Required python version 2.x not supported, ignoring file: %s" -msgstr "W20: la versió 2.x de Python està suportada, s'ignora: %s" +msgid "window index is out of range" +msgstr "l'índex de la finestra està fora d'interval" -#, c-format -msgid "W21: Required python version 3.x not supported, ignoring file: %s" -msgstr "W21: La versió 3.x de Python no està suportada, s'ignora: %s" +msgid "couldn't open buffer" +msgstr "no s'ha pogut obrir el buffer" -# :browse source -msgid "Source Vim script" -msgstr "Executa un script Vim" +msgid "cannot delete line" +msgstr "no s'ha pogut esborrar la línia" -#, c-format -msgid "Cannot source a directory: \"%s\"" -msgstr "No és possible executar un directori: \"%s\"" +msgid "cannot replace line" +msgstr "no s'ha pogut substituir la línia" -#, c-format -msgid "could not source \"%s\"" -msgstr "no s'ha pogut executar \"%s\"" +msgid "cannot insert line" +msgstr "no s'ha pogut inserir la línia" -#, c-format -msgid "line %ld: could not source \"%s\"" -msgstr "línia %ld: no s'ha pogut executar \"%s\"" +msgid "string cannot contain newlines" +msgstr "la cadena no pot contenir salts de línia" -#, c-format -msgid "sourcing \"%s\"" -msgstr "executant \"%s\"" +msgid "error converting Scheme values to Vim" +msgstr "error en convertir els valors de Scheme a Vim" -#, c-format -msgid "line %ld: sourcing \"%s\"" -msgstr "línia %ld: executant \"%s\"" +msgid "Vim error: ~a" +msgstr "Error del Vim: ~a" -#, c-format -msgid "finished sourcing %s" -msgstr "ha finalitzat l'execució de %s" +msgid "Vim error" +msgstr "Error del Vim" -#, c-format -msgid "continuing in %s" -msgstr "continuant a %s" +msgid "buffer is invalid" +msgstr "el buffer no és vàlid" -msgid "modeline" -msgstr "línia de mode" +msgid "window is invalid" +msgstr "la finestra no és vàlida" -msgid "--cmd argument" -msgstr "argument --cmd" +msgid "linenr out of range" +msgstr "número de línia fora d'interval" -msgid "-c argument" -msgstr "argument -c" +msgid "not allowed in the Vim sandbox" +msgstr "no permès a l'entorn d'aïllament del Vim" -msgid "environment variable" -msgstr "variable d'entorn" +msgid "invalid buffer number" +msgstr "número de buffer no vàlid" -# todo: handler -msgid "error handler" -msgstr "conductor d'errors" +msgid "not implemented yet" +msgstr "no implementat (de moment)" -msgid "W15: Warning: Wrong line separator, ^M may be missing" -msgstr "W15: Atenció: Separador de línia incorrecte, potser falta un ^M" +msgid "cannot set line(s)" +msgstr "no s'han pogut establir les línies" -msgid "E167: :scriptencoding used outside of a sourced file" -msgstr "E167: ús de :scriptencoding fora d'un script" +msgid "invalid mark name" +msgstr "nom de marca no vàlid" -msgid "E168: :finish used outside of a sourced file" -msgstr "E168: ús de :finish fora d'un script" +msgid "mark not set" +msgstr "marca no establerta" #, c-format -msgid "Current %slanguage: \"%s\"" -msgstr "Idioma actual ( %s): \"%s\"" +msgid "row %d column %d" +msgstr "fila %d columna %d" -#, c-format -msgid "E197: Cannot set language to \"%s\"" -msgstr "E197: No s'ha pogut canviar l'idioma a \"%s\"" +msgid "cannot insert/append line" +msgstr "no s'ha pogut inserir/afegir la línia" -msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." -msgstr "Mode Ex. Escriviu \"visual\" per a tornar al mode Normal." +msgid "line number out of range" +msgstr "número de línia fora d'interval" -msgid "E501: At end-of-file" -msgstr "E501: Final del fitxer" +msgid "unknown flag: " +msgstr "paràmetre desconegut: " -msgid "E169: Command too recursive" -msgstr "E169: L'ordre és massa recursiva" +msgid "unknown vimOption" +msgstr "opció del Vim desconeguda" -#, c-format -msgid "E605: Exception not caught: %s" -msgstr "E605: No s'ha interceptat l'excepció: %s" +msgid "keyboard interrupt" +msgstr "interrupció de teclat" -msgid "End of sourced file" -msgstr "Final de l'script" +msgid "cannot create buffer/window command: object is being deleted" +msgstr "no es pot crear l'ordre Tcl: l'objecte està sent eliminant" -msgid "End of function" -msgstr "Final de la funció" +msgid "" +"cannot register callback command: buffer/window is already being deleted" +msgstr "no es pot registrar el callback: l'objecte està sent eliminant" -msgid "E464: Ambiguous use of user-defined command" -msgstr "E464: Ús ambigu d'una ordre definida per l'usuari" +msgid "cannot register callback command: buffer/window reference not found" +msgstr "no es pot registrar el callback: no s'ha trobat la referència" -msgid "E492: Not an editor command" -msgstr "E492: No és una ordre de l'editor" +msgid "cannot get line" +msgstr "no s'ha pogut obtenir la línia" -msgid "E493: Backwards range given" -msgstr "E493: Interval decreixent" +msgid "Unable to register a command server name" +msgstr "No s'ha pogut registrar un nom de servidor d'ordres" -# és una pregunta. -msgid "Backwards range given, OK to swap" -msgstr "Interval decreixent. El voleu invertir" +#, c-format +msgid "%ld lines to indent... " +msgstr "%ld línies a sagnar... " -msgid "E494: Use w or w>>" -msgstr "E494: Useu w o bé w>>" +#, c-format +msgid "%ld line indented " +msgid_plural "%ld lines indented " +msgstr[0] "%ld línia sagnada " +msgstr[1] "%ld línies sagnades " -msgid "E943: Command table needs to be updated, run 'make cmdidxs'" -msgstr "E943: La taula d'ordres s'ha d'actualitzar, executeu 'make cmdidxs'" +msgid " Keyword completion (^N^P)" +msgstr " Compleció de paraules clau (^N^P)" -msgid "E319: Sorry, the command is not available in this version" -msgstr "E319: Aquesta ordre no està disponible en aquesta versió" +msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" +msgstr " Mode ^X (^]^D^E^F^|^K^L^N^O^Ps^U^V^Y)" -msgid "E172: Only one file name allowed" -msgstr "E172: Només podeu especificar un nom de fitxer" +msgid " Whole line completion (^L^N^P)" +msgstr " Compleció de línies senceres (^L^N^P)" -msgid "1 more file to edit. Quit anyway?" -msgstr "Queda 1 fitxer per editar. Voleu sortir de totes maneres?" +msgid " File name completion (^F^N^P)" +msgstr " Compleció de noms de fitxer (^F^N^P)" -#, c-format -msgid "%d more files to edit. Quit anyway?" -msgstr "Queden %d fitxers per editar. Voleu sortir de totes maneres?" +msgid " Tag completion (^]^N^P)" +msgstr " Compleció d'etiquetes (^]^N^P)" -msgid "E173: 1 more file to edit" -msgstr "E173: Queda 1 fitxer per editar" +msgid " Path pattern completion (^N^P)" +msgstr " Compleció d'ubicacions (^N^P)" -#, c-format -msgid "E173: %ld more files to edit" -msgstr "E173: Queden %ld fitxers per editar" +msgid " Definition completion (^D^N^P)" +msgstr " Compleció de definicions (^D^N^P)" -msgid "E174: Command already exists: add ! to replace it" -msgstr "E174: L'ordre ja existeix: afegiu ! per a substituir-la" +# todo: expecificar diccionari? +msgid " Dictionary completion (^K^N^P)" +msgstr " Compleció de paraules (^K^N^P)" -# :command -# -msgid "" -"\n" -" Name Args Address Complete Definition" -msgstr "\n Nom Arguments Adreça Compleció Definició " +msgid " Thesaurus completion (^T^N^P)" +msgstr " Compleció de sinònims (^T^N^P)" -msgid "No user-defined commands found" -msgstr "No s'han trobat ordres definides per l'usuari" +msgid " Command-line completion (^V^N^P)" +msgstr " Compleció de la línia d'ordres (^V^N^P)" -msgid "E175: No attribute specified" -msgstr "E175: No heu especificat cap atribut" +msgid " User defined completion (^U^N^P)" +msgstr " Compleció definida per l'usuari (^U^N^P)" -msgid "E176: Invalid number of arguments" -msgstr "E176: El nombre d'arguments no és vàlid" +msgid " Omni completion (^O^N^P)" +msgstr " Omni-compleció (^O^N^P)" -msgid "E177: Count cannot be specified twice" -msgstr "E177: El paràmetre de quantitat no es pot especificar dos cops" +msgid " Spelling suggestion (s^N^P)" +msgstr " Suggeriment d'ortografia (s^N^P)" -msgid "E178: Invalid default value for count" -msgstr "E178: El valor per omissió del paràmetre de quantitat no és vàlid" +# i C-x C-p +msgid " Keyword Local completion (^N^P)" +msgstr " Compleció de paraules clau locals (^N^P)" -# :command -complete Echo :echo "foo" -msgid "E179: argument required for -complete" -msgstr "E179: l'atribut -complete requereix un argument" +msgid "Hit end of paragraph" +msgstr "S'ha arribat al final del paràgraf" -msgid "E179: argument required for -addr" -msgstr "E179: l'atribut -addr requereix un argument" +msgid "'dictionary' option is empty" +msgstr "El paràmetre 'dictionary' està en blanc" -# :command -foo Foo :echo "bar" -#, c-format -msgid "E181: Invalid attribute: %s" -msgstr "E181: L'atribut no és vàlid: %s" +msgid "'thesaurus' option is empty" +msgstr "El paràmetre 'thesaurus' està en blanc" -msgid "E182: Invalid command name" -msgstr "E182: El nom de l'ordre no és vàlid" +# i C-x C-k +#, c-format +msgid "Scanning dictionary: %s" +msgstr "Cercant al diccionari: %s" -msgid "E183: User defined commands must start with an uppercase letter" -msgstr "E183: Les ordres definides per l'usuari han de començar amb majúscula" +# i C-x C-e +msgid " (insert) Scroll (^E/^Y)" +msgstr " (inserir) Desplaçament (^E/^Y)" -msgid "E841: Reserved name, cannot be used for user defined command" -msgstr "E841: Nom reservat, no es pot usar com a ordre definida per l'usuari" +msgid " (replace) Scroll (^E/^Y)" +msgstr " (substituir) Desplaçament (^E/^Y)" #, c-format -msgid "E184: No such user-defined command: %s" -msgstr "E184: No existeix tal ordre definida per l'usuari: %s" +msgid "Scanning: %s" +msgstr "Cercant: %s" -# :command -addr=foo Bar :echo "bar" -#, c-format -msgid "E180: Invalid address type value: %s" -msgstr "E180: El tipus d'adreça no és vàlid: %s" +msgid "Scanning tags." +msgstr "Cercant etiquetes." -#, c-format -msgid "E180: Invalid complete value: %s" -msgstr "E180: El tipus de compleció no és vàlid: %s" +msgid "match in file" +msgstr "coincidència al fitxer" -msgid "E468: Completion argument only allowed for custom completion" -msgstr "E468: La compleció estàndard no admet arguments" +msgid " Adding" +msgstr " Afegint" -msgid "E467: Custom completion requires a function argument" -msgstr "E467: La compleció no estàndard requereix una funció com a argument" +msgid "-- Searching..." +msgstr "-- Cercant..." -# esquema de colors -msgid "unknown" -msgstr "desconegut" - -#, c-format -msgid "E185: Cannot find color scheme '%s'" -msgstr "E185: No s'ha trobat l'esquema de colors '%s'" - -msgid "Greetings, Vim user!" -msgstr "Salutacions, usuari de Vim!" +msgid "Back at original" +msgstr "Original" -msgid "E784: Cannot close last tab page" -msgstr "E784: No és possible tancar l'última pestanya" +msgid "Word from other line" +msgstr "Paraula d'una altra línia" -msgid "Already only one tab page" -msgstr "Només hi ha una pestanya" +msgid "The only match" +msgstr "L'única coincidència" -# :browse split -msgid "Edit File in new window" -msgstr "Edita un fitxer en una finestra nova" +#, c-format +msgid "match %d of %d" +msgstr "coincidència %d de %d" #, c-format -msgid "Tab page %d" -msgstr "Pestanya %d" +msgid "match %d" +msgstr "coincidència %d" -msgid "No swap file" -msgstr "No existeix cap fitxer d'intercanvi" +msgid "flatten() argument" +msgstr "argument per a filter()" -# :browse read -msgid "Append File" -msgstr "Afegeix un fitxer" +msgid "sort() argument" +msgstr "argument per a sort()" -msgid "E747: Cannot change directory, buffer is modified (add ! to override)" -msgstr "E747: Buffer modificat, no es canvia de directori (! per a forçar)" +msgid "uniq() argument" +msgstr "argument per a uniq()" -msgid "E186: No previous directory" -msgstr "E186: No hi ha cap directori anterior" +msgid "map() argument" +msgstr "argument per a map()" -msgid "E187: Unknown" -msgstr "E187: Desconegut" +msgid "mapnew() argument" +msgstr "argument per a mapnew()" -msgid "E465: :winsize requires two number arguments" -msgstr "E465: :winsize requereix dos arguments numèrics" +msgid "filter() argument" +msgstr "argument per a filter()" -#, c-format -msgid "Window position: X %d, Y %d" -msgstr "Posició de la finestra: X %d, Y %d" +# :let foo = [1,2] +# :let bar = [3,4] +# :lockvar foo +# :echo extend(foo, bar) +# +# la forma fun() argument es repeteix més avall +msgid "extendnew() argument" +msgstr "argument per a extendnew()" -msgid "E188: Obtaining window position not implemented for this platform" -msgstr "E188: Aquesta plataforma no permet obtenir la posició de la finestra" +msgid "remove() argument" +msgstr "argument per a remove()" -msgid "E466: :winpos requires two number arguments" -msgstr "E466: :winpos requereix dos arguments numèrics" +msgid "reverse() argument" +msgstr "argument per a reverse()" -msgid "E930: Cannot use :redir inside execute()" -msgstr "E930: No es pot utilitzar :redir a dins de execute()" +#, c-format +msgid "Current %slanguage: \"%s\"" +msgstr "Idioma actual ( %s): \"%s\"" -msgid "Save Redirection" -msgstr "Desa la redirecció" +# vim --foo +msgid "Unknown option argument" +msgstr "Opció desconeguda" -# :browse mkview -msgid "Save View" -msgstr "Desa la vista" +msgid "Too many edit arguments" +msgstr "Sobren arguments d'edició" -# :browse mksession -msgid "Save Session" -msgstr "Desa la sessió" +msgid "Argument missing after" +msgstr "Falta un argument després de" -# :browse mkvimrc -msgid "Save Setup" -msgstr "Desa la configuració" +# vim -Tx +msgid "Garbage after option argument" +msgstr "Caràcters sobrants després de l'opció" -#, c-format -msgid "E739: Cannot create directory: %s" -msgstr "E739: No s'ha pogut crear el directori: %s" +msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments" +msgstr "Sobren arguments \"+ordre\", \"-c ordre\" o \"--cmd ordre\"" -#, c-format -msgid "E189: \"%s\" exists (add ! to override)" -msgstr "E189: \"%s\" existeix (afegiu ! per a forçar)" +msgid "Invalid argument for" +msgstr "Argument no vàlid per a" #, c-format -msgid "E190: Cannot open \"%s\" for writing" -msgstr "E190: No es pot obrir \"%s\" per a escriptura" - -msgid "E191: Argument must be a letter or forward/backward quote" -msgstr "E191: L'argument ha de ser una lletra o bé un accent obert o tancat" +msgid "%d files to edit\n" +msgstr "%d fitxers per editar\n" -msgid "E192: Recursive use of :normal too deep" -msgstr "E192: Ús de :normal amb un grau de recursivitat massa elevat" +msgid "netbeans is not supported with this GUI\n" +msgstr "aquesta interfície gràfica no suporta NetBeans\n" -msgid "E809: #< is not available without the +eval feature" -msgstr "E809: #< no està disponible sense la característica +eval" +msgid "'-nb' cannot be used: not enabled at compile time\n" +msgstr "'-nb' no està disponible: no s'ha compilat el suport\n" -msgid "E194: No alternate file name to substitute for '#'" -msgstr "E194: no hi ha cap nom de fitxer alternatiu per substituir" +msgid "This Vim was not compiled with the diff feature." +msgstr "Aquest Vim no ha estat compilat amb la característica diff." -msgid "E495: no autocommand file name to substitute for \"\"" -msgstr "E495: no hi ha cap nom de fitxer d'ordres automàtiques per substituir" +msgid "Attempt to open script file again: \"" +msgstr "Es torna a intentar obrir l'script: \"" -msgid "E496: no autocommand buffer number to substitute for \"\"" -msgstr "E496: no hi ha cap buffer d'ordres automàtiques per substituir" +msgid "Cannot open for reading: \"" +msgstr "No es pot obrir per a lectura: \"" -msgid "E497: no autocommand match name to substitute for \"\"" -msgstr "E497: no hi ha cap coincidència d'ordre automàtica per substituir" +msgid "Cannot open for script output: \"" +msgstr "No es pot obrir per a la sortida de l'script: \"" -msgid "E498: no :source file name to substitute for \"\"" -msgstr "E498: no hi ha cap nom de fitxer :source per substituir" +msgid "Vim: Error: Failure to start gvim from NetBeans\n" +msgstr "Vim: Error: No s'ha pogut iniciar gvim des de NetBeans\n" -msgid "E842: no line number to use for \"\"" -msgstr "E842: no hi ha cap script per substituir \"\"" +msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n" +msgstr "Vim: Error: Aquesta versió de Vim no funciona en terminals Cygwin\n" -#, no-c-format -msgid "E499: Empty file name for '%' or '#', only works with \":p:h\"" -msgstr "E499: Nom de fitxer per a '%' o '#' en blanc, només funciona amb \":p:h\"" +msgid "Vim: Warning: Output is not to a terminal\n" +msgstr "Vim: Atenció: La sortida no està connectada a un terminal\n" -msgid "E500: Evaluates to an empty string" -msgstr "E500: L'avaluació és una cadena en blanc" +msgid "Vim: Warning: Input is not from a terminal\n" +msgstr "Vim: Atenció: L'entrada no està connectada a un terminal\n" -msgid "E195: Cannot open viminfo file for reading" -msgstr "E195: No s'ha pogut obrir el fitxer viminfo per a lectura" +msgid "pre-vimrc command line" +msgstr "línia d'ordres prèvia a vimrc" -msgid "E196: No digraphs in this version" -msgstr "E196: Aquesta versió no suporta dígrafs" +msgid "" +"\n" +"More info with: \"vim -h\"\n" +msgstr "" +"\n" +"Més informació amb: \"vim -h\"\n" -msgid "E608: Cannot :throw exceptions with 'Vim' prefix" -msgstr "E608: No és possible generar excepcions amb el prefix 'Vim'" +# max 56 caràcters +msgid "[file ..] edit specified file(s)" +msgstr "[fitxer ...] edita el(s) fitxer(s) especificat(s)" -#, c-format -msgid "Exception thrown: %s" -msgstr "Excepció generada: %s" +# max 56 caràcters +msgid "- read text from stdin" +msgstr "- edita el text de l'entrada estàndard" -#, c-format -msgid "Exception finished: %s" -msgstr "Excepció finalitzada: %s" +# max 56 caràcters +msgid "-t tag edit file where tag is defined" +msgstr "-t etiqueta edita el fitxer on hi ha l'etiqueta" -#, c-format -msgid "Exception discarded: %s" -msgstr "Excepció descartada: %s" +# max 56 caràcters +msgid "-q [errorfile] edit file with first error" +msgstr "-q [ftxerrors] edita el fitxer on hi ha el primer error" -#, c-format -msgid "%s, line %ld" -msgstr "%s, línia %ld" +# alineat amb main.c:3279 +msgid "" +"\n" +"\n" +"Usage:" +msgstr "" +"\n" +"\n" +" ús:" -#, c-format -msgid "Exception caught: %s" -msgstr "Excepció interceptada: %s" +msgid " vim [arguments] " +msgstr " vim [arguments] " -#, c-format -msgid "%s made pending" -msgstr "%s s'ha posposat" +msgid "" +"\n" +" or:" +msgstr "" +"\n" +"o bé:" -#, c-format -msgid "%s resumed" -msgstr "%s s'ha continuat" +# VMS +msgid "" +"\n" +"Where case is ignored prepend / to make flag upper case" +msgstr "" +"\n" +"On no es distingeixen majúscules el prefix / indica majúscules" -#, c-format -msgid "%s discarded" -msgstr "%s s'ha descartat" +msgid "" +"\n" +"\n" +"Arguments:\n" +msgstr "" +"\n" +"\n" +"Arguments:\n" -msgid "Exception" -msgstr "Excepció" +msgid "--\t\t\tOnly file names after this" +msgstr "--\t\t\tDesprés d'això només noms de fitxers" -msgid "Error and interrupt" -msgstr "Error i interrupció" +msgid "--literal\t\tDon't expand wildcards" +msgstr "--literal\t\tNo expandeix patrons de noms" -msgid "Error" -msgstr "Error" +msgid "-register\t\tRegister this gvim for OLE" +msgstr "-register\t\tRegistra aquest gvim a OLE" -msgid "Interrupt" -msgstr "Interrupció" +msgid "-unregister\t\tUnregister gvim for OLE" +msgstr "-unregister\t\tDóna de baixa aquest gvim a OLE" -msgid "E579: :if nesting too deep" -msgstr "E579: nivell d'imbricació :if massa elevat" +msgid "-g\t\t\tRun using GUI (like \"gvim\")" +msgstr "-g\t\t\tUsa la interfície gràfica (com \"gvim\")" -msgid "E580: :endif without :if" -msgstr "E580: :endif sense :if" +msgid "-f or --nofork\tForeground: Don't fork when starting GUI" +msgstr "-f o --nofork\tNo crea un procés nou per al GUI" -msgid "E581: :else without :if" -msgstr "E581: :else sense :if" +msgid "-v\t\t\tVi mode (like \"vi\")" +msgstr "-v\t\t\tMode Vi (com \"vi\")" -msgid "E582: :elseif without :if" -msgstr "E582: :elseif sense :if" +msgid "-e\t\t\tEx mode (like \"ex\")" +msgstr "-e\t\t\tMode Ex (com \"ex\")" -msgid "E583: multiple :else" -msgstr "E583: múltiples :else" +msgid "-E\t\t\tImproved Ex mode" +msgstr "-E\t\t\tMode Ex millorat" -msgid "E584: :elseif after :else" -msgstr "E584: :elseif després de :else" +msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" +msgstr "-s\t\t\tMode silenciós per lots (només per a \"ex\")" -msgid "E585: :while/:for nesting too deep" -msgstr "E585: nivell d'imbricació :while/:for massa elevat" +msgid "-d\t\t\tDiff mode (like \"vimdiff\")" +msgstr "-d\t\t\tMode diff (com \"vimdiff\")" -msgid "E586: :continue without :while or :for" -msgstr "E586: :continue sense :while o :for" +msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" +msgstr "-y\t\t\tMode senzill (com \"evim\", sense modes)" -msgid "E587: :break without :while or :for" -msgstr "E587: :break sense :while" +msgid "-R\t\t\tReadonly mode (like \"view\")" +msgstr "-R\t\t\tMode només lectura (com \"view\")" -msgid "E732: Using :endfor with :while" -msgstr "E732: Ús de :endfor amb :while" +msgid "-Z\t\t\tRestricted mode (like \"rvim\")" +msgstr "-Z\t\t\tMode restringit (com \"rvim)" -msgid "E733: Using :endwhile with :for" -msgstr "E733: Ús de :endwhile amb :for" +msgid "-m\t\t\tModifications (writing files) not allowed" +msgstr "-m\t\t\tNo permet modificar (escriure) fitxers" -msgid "E601: :try nesting too deep" -msgstr "E601: nivell d'imbricació :try massa elevat" +msgid "-M\t\t\tModifications in text not allowed" +msgstr "-M\t\t\tNo permet modificar el text" -msgid "E603: :catch without :try" -msgstr "E603: :catch sense :try" +msgid "-b\t\t\tBinary mode" +msgstr "-b\t\t\tMode binari" -msgid "E604: :catch after :finally" -msgstr "E604: :catch després de :finally" +msgid "-l\t\t\tLisp mode" +msgstr "-l\t\t\tMode Lisp" -msgid "E606: :finally without :try" -msgstr "E606: :finally sense :try" +msgid "-C\t\t\tCompatible with Vi: 'compatible'" +msgstr "-C\t\t\tCompatible amb Vi: 'compatible'" -msgid "E607: multiple :finally" -msgstr "E607: múltiples :finally" +msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" +msgstr "-N\t\t\tNo del tot compatible amb Vi: 'nocompatible'" -msgid "E602: :endtry without :try" -msgstr "E602: :endtry sense :try" +msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]" +msgstr "-V[N][nomf]\t\tLoquacitat [nivell N] [desa missatges a nomf]" -msgid "E193: :endfunction not inside a function" -msgstr "E193: :endfunction fora d'una funció" +msgid "-D\t\t\tDebugging mode" +msgstr "-D\t\t\tMode de depuració" -msgid "E788: Not allowed to edit another buffer now" -msgstr "E788: No està permès editar un altre buffer ara" +msgid "-n\t\t\tNo swap file, use memory only" +msgstr "-n\t\t\tNo usa fitxers d'intercanvi, només memòria" -msgid "E811: Not allowed to change buffer information now" -msgstr "E811: No està permès canviar la informació del buffer ara" +msgid "-r\t\t\tList swap files and exit" +msgstr "-r\t\t\tLlistat dels fitxers d'intercanvi" -# :set wop=tagfile -# :ts -msgid "tagname" -msgstr "etiqueta" +msgid "-r (with file name)\tRecover crashed session" +msgstr "-r (amb nom de fitxer) Recupera una sessió accidentada" -# -msgid " kind file\n" -msgstr " tip fitxer\n" +msgid "-L\t\t\tSame as -r" +msgstr "-L\t\t\tIgual que -r" -msgid "'history' option is zero" -msgstr "el paràmetre 'history' és zero" +msgid "-f\t\t\tDon't use newcli to open window" +msgstr "-f\t\t\tNo obre una finestra nova amb newcli" -#, c-format -msgid "" -"\n" -"# %s History (newest to oldest):\n" -msgstr "" -"\n" -"# Historial %s (de més a menys recent):\n" +msgid "-dev \t\tUse for I/O" +msgstr "-dev \t\tUsa per a l'E/S" -msgid "Command Line" -msgstr "de la línia d'ordres" +msgid "-A\t\t\tStart in Arabic mode" +msgstr "-A\t\t\tComença en mode aràbic" -msgid "Search String" -msgstr "de cerques" +msgid "-H\t\t\tStart in Hebrew mode" +msgstr "-H\t\t\tComença en mode hebreu" -msgid "Expression" -msgstr "d'expressions" +msgid "-T \tSet terminal type to " +msgstr "-T \tDefineix el tipus de terminal" -msgid "Input Line" -msgstr "de línies d'entrada" +msgid "--not-a-term\t\tSkip warning for input/output not being a terminal" +msgstr "--not-a-term\t\tOmet avisos relacionats amb el terminal" -msgid "Debug Line" -msgstr "d'ordres de depuració" +msgid "--ttyfail\t\tExit if input or output is not a terminal" +msgstr "--ttyfail\t\tSurt si l'entrada/sortida no són un terminal" -msgid "E198: cmd_pchar beyond the command length" -msgstr "E198: cmd_pchar fora de l'àrea de l'ordre" +msgid "-u \t\tUse instead of any .vimrc" +msgstr "-u \t\tUsa en lloc de qualsevol altre .vimrc" -msgid "E199: Active window or buffer deleted" -msgstr "E199: S'ha eliminat la finestra o el buffer actiu" +msgid "-U \t\tUse instead of any .gvimrc" +msgstr "-U \t\tUsa en lloc de qualsevol altre .gvimrc" -msgid "E812: Autocommands changed buffer or buffer name" -msgstr "E812: Ordres automàtiques han canviat el buffer o el nom del buffer" +msgid "--noplugin\t\tDon't load plugin scripts" +msgstr "--noplugin\t\tNo carrega plugins" -msgid "Illegal file name" -msgstr "El nom de fitxer és il·legal" +msgid "-p[N]\t\tOpen N tab pages (default: one for each file)" +msgstr "-p[N]\t\tObre N pestanyes (per omissió: una per fitxer)" -msgid "is a directory" -msgstr "és un directori" +msgid "-o[N]\t\tOpen N windows (default: one for each file)" +msgstr "-o[N]\t\tObre N finestres (per omissió: una per fitxer)" -msgid "is not a file" -msgstr "no és un fitxer" +msgid "-O[N]\t\tLike -o but split vertically" +msgstr "-O[N]\t\tCom -o però amb divisió vertical" -msgid "is a device (disabled with 'opendevice' option)" -msgstr "és un dispositiu (deshabilitat amb el paràmetre 'opendevice')" +msgid "+\t\t\tStart at end of file" +msgstr "+\t\t\tComença al final del fitxer" -msgid "[New File]" -msgstr "[Fitxer nou]" +msgid "+\t\tStart at line " +msgstr "+\t\tComença a la línia " -msgid "[New DIRECTORY]" -msgstr "[Nou DIRECTORI]" +msgid "--cmd \tExecute before loading any vimrc file" +msgstr "--cmd \tExecuta abans de llegir els fitxers vimrc" -msgid "[File too big]" -msgstr "[Fitxer massa gran]" +msgid "-c \t\tExecute after loading the first file" +msgstr "-c \t\tExecuta després de carregar el primer fitxer" -msgid "[Permission Denied]" -msgstr "[Permís denegat]" +msgid "-S \t\tSource file after loading the first file" +msgstr "-S \t\tExecuta un cop carregat el primer fitxer" -msgid "E200: *ReadPre autocommands made the file unreadable" -msgstr "E200: Ordres automàtiques *ReadPre han deixat el fitxer illegible" +msgid "-s \tRead Normal mode commands from file " +msgstr "-s