summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-26 12:21:15 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-26 12:21:15 +0100
commit8a3b805c6c9cae341d560df9c3567ebbe42a7404 (patch)
treee4698c444eb52cbb7aff2138a8491debceda4c5a
parent0fbc9260a75dfc4d86f20e7c0eb76878f513a212 (diff)
downloadvim-git-8a3b805c6c9cae341d560df9c3567ebbe42a7404.tar.gz
Update runtime files
-rw-r--r--runtime/doc/builtin.txt7
-rw-r--r--runtime/doc/channel.txt33
-rw-r--r--runtime/doc/cmdline.txt4
-rw-r--r--runtime/doc/editing.txt2
-rw-r--r--runtime/doc/eval.txt6
-rw-r--r--runtime/doc/filetype.txt2
-rw-r--r--runtime/doc/if_pyth.txt10
-rw-r--r--runtime/doc/indent.txt2
-rw-r--r--runtime/doc/map.txt9
-rw-r--r--runtime/doc/message.txt158
-rw-r--r--runtime/doc/options.txt16
-rw-r--r--runtime/doc/quickref.txt2
-rw-r--r--runtime/doc/starting.txt2
-rw-r--r--runtime/doc/tabpage.txt2
-rw-r--r--runtime/doc/tags1
-rw-r--r--runtime/doc/terminal.txt13
-rw-r--r--runtime/doc/testing.txt6
-rw-r--r--runtime/doc/todo.txt6
-rw-r--r--runtime/doc/usr_41.txt8
-rw-r--r--runtime/doc/usr_50.txt4
-rw-r--r--runtime/doc/usr_51.txt4
-rw-r--r--runtime/doc/usr_toc.txt2
-rw-r--r--runtime/doc/various.txt3
-rw-r--r--runtime/doc/version8.txt2
-rw-r--r--runtime/doc/version9.txt35
-rw-r--r--runtime/doc/vim9.txt10
-rw-r--r--runtime/syntax/doxygen.vim2
-rw-r--r--src/po/zh_CN.UTF-8.po345
-rw-r--r--src/po/zh_CN.cp936.po345
-rw-r--r--src/po/zh_CN.po345
30 files changed, 689 insertions, 697 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index ad7c5fd1a..5f37c742e 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4898,10 +4898,10 @@ invert({expr}) *invert()*
< Can also be used as a |method|: >
:let bits = bits->invert()
-isabsolutepath({directory}) *isabsolutepath()*
+isabsolutepath({path}) *isabsolutepath()*
The result is a Number, which is |TRUE| when {path} is an
absolute path.
-< On Unix, a path is considered absolute when it starts with '/'.
+ On Unix, a path is considered absolute when it starts with '/'.
On MS-Windows, it is considered absolute when it starts with an
optional drive prefix and is followed by a '\' or '/'. UNC paths
are always absolute.
@@ -4911,7 +4911,7 @@ isabsolutepath({directory}) *isabsolutepath()*
echo isabsolutepath('C:\Windows') " 1
echo isabsolutepath('foobar') " 0
echo isabsolutepath('\\remote\file') " 1
-
+<
Can also be used as a |method|: >
GetName()->isabsolutepath()
@@ -10595,6 +10595,7 @@ viminfo Compiled with viminfo support.
vimscript-1 Compiled Vim script version 1 support
vimscript-2 Compiled Vim script version 2 support
vimscript-3 Compiled Vim script version 3 support
+vimscript-4 Compiled Vim script version 4 support
virtualedit Compiled with 'virtualedit' option. (always true)
visual Compiled with Visual mode. (always true)
visualextra Compiled with extra Visual mode commands. (always
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
index 669657aa0..b7ae4d430 100644
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -1554,36 +1554,5 @@ The "params" field is optional: >
"params": <list|dict>
}
-Depending on the use case, you can use the ch_evalexpr(), ch_sendexpr() and
-ch_sendraw() functions on the same channel.
-
-A LSP request message has the following format (expressed as a Vim Dict). The
-"params" field is optional: >
-
- {
- "jsonrpc": "2.0",
- "id": <number>,
- "method": <string>,
- "params": <list|dict>
- }
-
-A LSP response message has the following format (expressed as a Vim Dict). The
-"result" and "error" fields are optional: >
-
- {
- "jsonrpc": "2.0",
- "id": <number>,
- "result": <vim type>
- "error": <dict>
- }
-
-A LSP notification message has the following format (expressed as a Vim Dict).
-The "params" field is optional: >
-
- {
- "jsonrpc": "2.0",
- "method": <string>,
- "params": <list|dict>
- }
-
+<
vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 16c08b163..607eb3403 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -936,7 +936,7 @@ Note: these are typed literally, they are not special keys!
When the match is with a file name, it is expanded to the
full path.
*:<sfile>* *<sfile>*
- <sfile> When executing a ":source" command, is replaced with the
+ <sfile> When executing a `:source` command, is replaced with the
file name of the sourced file. *E498*
When executing a legacy function, is replaced with the call
stack, as with <stack> (this is for backwards
@@ -959,7 +959,7 @@ Note: these are typed literally, they are not special keys!
defined.
If the file name cannot be determined you get error *E1274* .
*:<slnum>* *<slnum>*
- <slnum> When executing a ":source" command, is replaced with the
+ <slnum> When executing a `:source` command, is replaced with the
line number. *E842*
When executing a function it's the line number relative to
the start of the function.
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 5130986a0..55543c7df 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1225,7 +1225,7 @@ Examples: >
If you want to always use ":confirm", set the 'confirm' option.
- *:browse* *:bro* *E338*
+ *:browse* *:bro* *E338*
:bro[wse] {command} Open a file selection dialog for an argument to
{command}. At present this works for |:e|, |:w|,
|:wall|, |:wq|, |:wqall|, |:x|, |:xall|, |:exit|,
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 6929f9c77..dd009d938 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -181,7 +181,7 @@ You will not get an error if you try to change the type of a variable.
1.2 Function references ~
- *Funcref* *E695* *E718* *E1192*
+ *Funcref* *E695* *E718* *E1192*
A Funcref variable is obtained with the |function()| function, the |funcref()|
function, (in |Vim9| script) the name of a function, or created with the
lambda expression |expr-lambda|. It can be used in an expression in the place
@@ -1289,7 +1289,7 @@ Generally, if a |List| index is equal to or higher than the length of the
error.
-expr10[expr1a : expr1b] substring or sublist *expr-[:]*
+expr10[expr1a : expr1b] substring or |sublist| *expr-[:]* *substring*
If expr10 is a String this results in the substring with the bytes or
characters from expr1a to and including expr1b. expr10 is used as a String,
@@ -3287,7 +3287,7 @@ text...
If "eval" is not specified, then each line of text is
used as a |literal-string|, except that single quotes
- doe not need to be doubled.
+ does not need to be doubled.
If "eval" is specified, then any Vim expression in the
form {expr} is evaluated and the result replaces the
expression, like with |interp-string|.
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 0ca8f38ab..37f7d61c7 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -143,7 +143,7 @@ variables can be used to overrule the filetype used for certain extensions:
*.asp g:filetype_asp |ft-aspvbs-syntax| |ft-aspperl-syntax|
*.bas g:filetype_bas |ft-basic-syntax|
*.cfg g:filetype_cfg
- *.csh g:filetype_csh |ft-csh-syntax|
+ *.csh g:filetype_csh |ft-csh-syntax|
*.dat g:filetype_dat
*.frm g:filetype_frm |ft-form-syntax|
*.fs g:filetype_fs |ft-forth-syntax|
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index a6767925f..9cbd35981 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -839,10 +839,10 @@ Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
:py vim.command("qall!")
<
*E1266*
-This error can occur when python 3 cannot load the required modules. This
-means that your python 3 is not correctly installed or there are some mistakes
+This error can occur when Python 3 cannot load the required modules. This
+means that your Python 3 is not correctly installed or there are some mistakes
in your settings. Please check the following items:
-1. Make sure that python 3 is correctly installed. Also check the version of
+1. Make sure that Python 3 is correctly installed. Also check the version of
python.
2. Check the 'pythonthreedll' option.
3. Check the 'pythonthreehome' option.
@@ -887,8 +887,8 @@ the runtime library cannot be found.
==============================================================================
11. Python X *python_x* *pythonx*
-Because most python code can be written so that it works with python 2.6+ and
-python 3 the pyx* functions and commands have been written. They work exactly
+Because most python code can be written so that it works with Python 2.6+ and
+Python 3 the pyx* functions and commands have been written. They work exactly
the same as the Python 2 and 3 variants, but select the Python version using
the 'pyxversion' setting.
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 4df0909f4..a0230cadc 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -291,7 +291,7 @@ The examples below assume a 'shiftwidth' of 4.
<
*cino-g*
gN Place C++ scope declarations N characters from the indent of the
- block they are in. (default 'shiftwidth'). By default, a scope
+ block they are in. (default 'shiftwidth'). By default, a scope
declaration is "public:", "protected:" or "private:". This can
be adjusted with the 'cinscopedecls' option.
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 91df903a3..91261050d 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -177,7 +177,7 @@ Because it tries to unmap "@@ ", including the white space before the command
separator "|". Other examples with trailing white space: >
unmap @@
unmap @@ # Vim9 script comment
- unmap @@ " legacy comment
+ unmap @@ " legacy script comment
An error will be issued, which is very hard to identify, because the ending
whitespace character in `unmap @@ ` is not visible.
@@ -185,8 +185,8 @@ whitespace character in `unmap @@ ` is not visible.
A generic solution is to put the command separator "|" right after the mapped
keys. After that white space and a comment may follow: >
- unmap @@| # Vim9 scriptcomment
- unmap @@| " legacy scriptcomment
+ unmap @@| # Vim9 script comment
+ unmap @@| " legacy script comment
1.2 SPECIAL ARGUMENTS *:map-arguments*
@@ -195,7 +195,8 @@ keys. After that white space and a comment may follow: >
"<unique>" can be used in any order. They must appear right after the
command, before any other arguments.
- *:map-local* *:map-<buffer>* *:map-buffer* *E224* *E225*
+ *:map-local* *:map-<buffer>* *:map-buffer*
+ *E224* *E225*
If the first argument to one of these commands is "<buffer>" the mapping will
be effective in the current buffer only. Example: >
:map <buffer> ,w /[.,;]<CR>
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 760e9ca10..962c86cf9 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -78,7 +78,7 @@ See `:messages` above.
LIST OF MESSAGES
*E222* *E228* *E232* *E293* *E298* *E304* *E317*
*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
- *E323* *E341* *E473* *E570* *E685* *E292*
+ *E323* *E341* *E473* *E570* *E685* *E292*
Add to read buffer ~
makemap: Illegal mode ~
Cannot create BalloonEval with both message and callback ~
@@ -109,26 +109,26 @@ report. |bugs|
See |ATTENTION|.
- *E92*
+ *E92*
Buffer {N} not found ~
The buffer you requested does not exist. This can also happen when you have
wiped out a buffer which contains a mark or is referenced in another way.
|:bwipeout|
- *E95*
+ *E95*
Buffer with this name already exists ~
You cannot have two buffers with exactly the same name. This includes the
path leading to the file.
- *E72*
+ *E72*
Close error on swap file ~
The |swap-file|, that is used to keep a copy of the edited text, could not be
closed properly. Mostly harmless.
- *E169*
+ *E169*
Command too recursive ~
This happens when an Ex command executes an Ex command that executes an Ex
@@ -136,18 +136,18 @@ command, etc. The limit is 200 or the value of 'maxfuncdepth', whatever is
larger. When it's more there probably is an endless loop. Probably a
|:execute| or |:source| command is involved.
- *E254*
+ *E254*
Cannot allocate color {name} ~
The color name {name} is unknown. See |gui-colors| for a list of colors that
are available on most systems.
- *E1244*
+ *E1244*
Bad color string: {str} ~
The provided color did not conform to the pattern #rrggbb
- *E458*
+ *E458*
Cannot allocate colormap entry, some colors may be incorrect ~
This means that there are not enough colors available for Vim. It will still
@@ -164,21 +164,21 @@ This can also be done with a line in your Xdefaults file:
or
Netscape*maxImageColors: 64 ~
- *E79*
+ *E79*
Cannot expand wildcards ~
A filename contains a strange combination of characters, which causes Vim to
attempt expanding wildcards but this fails. This does NOT mean that no
matching file names could be found, but that the pattern was illegal.
- *E459*
+ *E459*
Cannot go back to previous directory ~
While expanding a file name, Vim failed to go back to the previously used
directory. All file names being used may be invalid now! You need to have
execute permission on the current directory.
- *E190* *E212*
+ *E190* *E212*
Cannot open "{filename}" for writing ~
Can't open file for writing ~
@@ -186,7 +186,7 @@ For some reason the file you are writing to cannot be created or overwritten.
The reason could be that you do not have permission to write in the directory
or the file name is not valid.
- *E166*
+ *E166*
Can't open linked file for writing ~
You are trying to write to a file which can't be overwritten, and the file is
@@ -198,19 +198,19 @@ place. If you really want to write the file under this name, you have to
manually delete the link or the file, or change the permissions so that Vim
can overwrite.
- *E46*
+ *E46*
Cannot change read-only variable "{name}" ~
You are trying to assign a value to an argument of a function |a:var| or a Vim
internal variable |v:var| which is read-only.
- *E90*
+ *E90*
Cannot unload last buffer ~
Vim always requires one buffer to be loaded, otherwise there would be nothing
to display in the window.
- *E40*
+ *E40*
Can't open errorfile <filename> ~
When using the ":make" or ":grep" commands: The file used to save the error
@@ -223,7 +223,7 @@ messages or grep output cannot be opened. This can have several causes:
- The 'grepprg' or 'makeprg' could not be executed. This cannot always be
detected (especially on MS-Windows). Check your $PATH.
-
+
Can't open file C:\TEMP\VIoD243.TMP ~
On MS-Windows, this message appears when the output of an external command was
@@ -232,14 +232,14 @@ many things. Check the 'shell', 'shellquote', 'shellxquote', 'shellslash' and
related options. It might also be that the external command was not found,
there is no different error message for that.
- *E12*
+ *E12*
Command not allowed from exrc/vimrc in current dir or tag search ~
Some commands are not allowed for security reasons. These commands mostly
come from a .exrc or .vimrc file in the current directory, or from a tags
file. Also see 'secure'.
- *E74*
+ *E74*
Command too complex ~
A mapping resulted in a very long command string. Could be caused by a
@@ -258,20 +258,20 @@ If there is a backup file, when 'writebackup' or 'backup' is set, it will not
be deleted, so you can move it back into place if you want to discard the
changes.
- *E302*
+ *E302*
Could not rename swap file ~
When the file name changes, Vim tries to rename the |swap-file| as well.
This failed and the old swap file is now still used. Mostly harmless.
- *E43* *E44*
+ *E43* *E44*
Damaged match string ~
Corrupted regexp program ~
Something inside Vim went wrong and resulted in a corrupted regexp. If you
know how to reproduce this problem, please report it. |bugs|
- *E208* *E209* *E210*
+ *E208* *E209* *E210*
Error writing to "{filename}" ~
Error closing "{filename}" ~
Error reading "{filename}" ~
@@ -288,19 +288,19 @@ This occurs when Vim cannot read typed characters while input is required.
Vim got stuck, the only thing it can do is exit. This can happen when both
stdin and stderr are redirected and executing a script that doesn't exit Vim.
- *E47*
+ *E47*
Error while reading errorfile ~
Reading the error file was not possible. This is NOT caused by an error
message that was not recognized.
- *E80*
+ *E80*
Error while writing ~
Writing a file was not completed successfully. The file is probably
incomplete.
- *E13* *E189*
+ *E13* *E189*
File exists (add ! to override) ~
"{filename}" exists (add ! to override) ~
@@ -311,7 +311,7 @@ Example: >
changes to: >
:w! /tmp/test
<
- *E768*
+ *E768*
Swap file exists: {filename} (:silent! overrides) ~
You are protected from overwriting a file that is being edited by Vim. This
@@ -324,45 +324,45 @@ happens when you use ":w! filename" and a swapfile is found.
< The special command is needed, since you already added the ! for overwriting
an existing file.
- *E139*
+ *E139*
File is loaded in another buffer ~
You are trying to write a file under a name which is also used in another
buffer. This would result in two versions of the same file.
- *E142*
+ *E142*
File not written: Writing is disabled by 'write' option ~
The 'write' option is off. This makes all commands that try to write a file
generate this message. This could be caused by a |-m| commandline argument.
You can switch the 'write' option on with ":set write".
- *E25*
+ *E25*
GUI cannot be used: Not enabled at compile time ~
You are running a version of Vim that doesn't include the GUI code. Therefore
"gvim" and ":gui" don't work.
- *E49*
+ *E49*
Invalid scroll size ~
This is caused by setting an invalid value for the 'scroll', 'scrolljump' or
'scrolloff' options.
- *E17*
+ *E17*
"{filename}" is a directory ~
You tried to write a file with the name of a directory. This is not possible.
You probably need to append a file name.
- *E19*
+ *E19*
Mark has invalid line number ~
You are using a mark that has a line number that doesn't exist. This can
happen when you have a mark in another file, and some other program has
deleted lines from it.
- *E219* *E220*
+ *E219* *E220*
Missing {. ~
Missing }. ~
@@ -370,13 +370,13 @@ Using a {} construct in a file name, but there is a { without a matching } or
the other way around. It should be used like this: {foo,bar}. This matches
"foo" and "bar".
- *E315*
+ *E315*
ml_get: invalid lnum: {number} ~
This is an internal Vim error. Please try to find out how it can be
reproduced, and submit a bug report |bugreport.vim|.
- *E173*
+ *E173*
{number} more files to edit ~
You are trying to exit, while the last item in the argument list has not been
@@ -384,19 +384,19 @@ edited. This protects you from accidentally exiting when you still have more
files to work on. See |argument-list|. If you do want to exit, just do it
again and it will work.
- *E23* *E194*
+ *E23* *E194*
No alternate file ~
No alternate file name to substitute for '#' ~
The alternate file is not defined yet. See |alternate-file|.
- *E32*
+ *E32*
No file name ~
The current buffer has no name. To write it, use ":w fname". Or give the
buffer a name with ":file fname".
- *E141*
+ *E141*
No file name for buffer {number} ~
One of the buffers that was changed does not have a file name. Therefore it
@@ -404,7 +404,7 @@ cannot be written. You need to give the buffer a file name: >
:buffer {number}
:file {filename}
<
- *E33*
+ *E33*
No previous substitute regular expression ~
When using the '~' character in a pattern, it is replaced with the previously
@@ -412,13 +412,13 @@ used pattern in a ":substitute" command. This fails when no such command has
been used yet. See |/~|. This also happens when using ":s/pat/%/", where the
"%" stands for the previous substitute string.
- *E35*
+ *E35*
No previous regular expression ~
When using an empty search pattern, the previous search pattern is used. But
that is not possible if there was no previous search.
- *E24*
+ *E24*
No such abbreviation ~
You have used an ":unabbreviate" command with an argument which is not an
@@ -441,7 +441,7 @@ mapping. All variations of this command give the same message: ":cunmap",
- If the mapping is buffer-local you need to use ":unmap <buffer>".
|:map-<buffer>|
- *E37* *E89*
+ *E37* *E89*
No write since last change (add ! to override) ~
No write since last change for buffer {N} (add ! to override) ~
@@ -453,7 +453,7 @@ adding a '!' character just after the command you used. Example: >
changes to: >
:e! other_file
<
- *E162*
+ *E162*
No write since last change for buffer "{name}" ~
This appears when you try to exit Vim while some buffers are changed. You
@@ -468,13 +468,13 @@ about a buffer, especially when 'hidden' is set.
This appears when executing a shell command while at least one buffer was
changed. To avoid the message reset the 'warn' option.
- *E38*
+ *E38*
Null argument ~
Something inside Vim went wrong and resulted in a NULL pointer. If you know
how to reproduce this problem, please report it. |bugs|
- *E41* *E82* *E83* *E342*
+ *E41* *E82* *E83* *E342*
Out of memory! ~
Out of memory! (allocating {number} bytes) ~
Cannot allocate any buffer, exiting... ~
@@ -496,7 +496,7 @@ in memory, you can reduce that with these options:
helps for a change that affects all lines.
- 'undoreload' Set to zero to disable.
- *E339*
+ *E339*
Pattern too long ~
This happens on systems with 16 bit ints: The compiled regexp pattern is
@@ -504,7 +504,7 @@ longer than about 65000 characters. Try using a shorter pattern.
It also happens when the offset of a rule doesn't fit in the space available.
Try simplifying the pattern.
- *E45*
+ *E45*
'readonly' option is set (add ! to override) ~
You are trying to write a file that was marked as read-only. To write the
@@ -514,7 +514,7 @@ after the command you used. Example: >
changes to: >
:w!
<
- *E294* *E295* *E301*
+ *E294* *E295* *E301*
Read error in swap file ~
Seek error in swap file read ~
Oops, lost the swap file!!! ~
@@ -524,7 +524,7 @@ text in the related buffer may now be corrupted! Check carefully before you
write a buffer. You may want to write it in another file and check for
differences.
- *E192*
+ *E192*
Recursive use of :normal too deep ~
You are using a ":normal" command, whose argument again uses a ":normal"
@@ -533,7 +533,7 @@ example illustrates how to get this message: >
:map gq :normal gq<CR>
If you type "gq", it will execute this mapping, which will call "gq" again.
- *E22*
+ *E22*
Scripts nested too deep ~
Scripts can be read with the "-s" command-line argument and with the
@@ -541,7 +541,7 @@ Scripts can be read with the "-s" command-line argument and with the
continue for about 14 levels. When more nesting is done, Vim assumes that
there is a recursive loop and stops with this error message.
- *E319*
+ *E319*
Sorry, the command is not available in this version ~
You have used a command that is not present in the version of Vim you are
@@ -550,7 +550,7 @@ disabled. This depends on how big Vim has chosen to be and the operating
system. See |+feature-list| for when which feature is available. The
|:version| command shows which feature Vim was compiled with.
- *E300*
+ *E300*
Swap file already exists (symlink attack?) ~
This message appears when Vim is trying to open a swap file and finds it
@@ -560,7 +560,7 @@ opened the same file at exactly the same moment (very unlikely) or someone is
attempting a symlink attack (could happen when editing a file in /tmp or when
'directory' starts with "/tmp", which is a bad choice).
- *E432*
+ *E432*
Tags file not sorted: {file name} ~
Vim (and Vi) expect tags files to be sorted in ASCII order. Binary searching
@@ -570,20 +570,20 @@ This message is only given when Vim detects a problem when searching for a
tag. Sometimes this message is not given, even though the tags file is not
properly sorted.
- *E424*
+ *E424*
Too many different highlighting attributes in use ~
Vim can only handle about 223 different kinds of highlighting. If you run
into this limit, you have used too many |:highlight| commands with different
arguments. A ":highlight link" is not counted.
- *E77*
+ *E77*
Too many file names ~
When expanding file names, more than one match was found. Only one match is
allowed for the command that was used.
- *E303*
+ *E303*
Unable to open swap file for "{filename}", recovery impossible ~
Vim was not able to create a swap file. You can still edit the file, but if
@@ -592,7 +592,7 @@ memory when editing a big file. You may want to change the 'directory' option
to avoid this error. This error is not given when 'directory' is empty. See
|swap-file|.
- *E140*
+ *E140*
Use ! to write partial buffer ~
When using a range to write part of a buffer, it is unusual to overwrite the
@@ -609,7 +609,7 @@ X11 configuration is wrong. You can find a hint on how to solve this here:
http://groups.yahoo.com/group/solarisonintel/message/12179.
[this URL is no longer valid]
- *W10*
+ *W10*
Warning: Changing a readonly file ~
The file is read-only and you are making a change to it anyway. You can use
@@ -618,14 +618,14 @@ must reset the 'readonly' option). See 'modifiable' to completely disallow
making changes to a file.
This message is only given for the first change after 'readonly' has been set.
- *W13*
+ *W13*
Warning: File "{filename}" has been created after editing started ~
You are editing a file in Vim when it didn't exist, but it does exist now.
You will have to decide if you want to keep the version in Vim or the newly
created file. This message is not given when 'buftype' is not empty.
- *W11*
+ *W11*
Warning: File "{filename}" has changed since editing started ~
The file which you have started editing has got another timestamp and the
@@ -649,14 +649,14 @@ starts. It can be fixed in one of these ways:
If you get W11 all the time, you may need to disable "Acronis Active
Protection" or register Vim as a trusted service/application.
- *W12*
+ *W12*
Warning: File "{filename}" has changed and the buffer was changed in Vim as well ~
Like the above, and the buffer for the file was changed in this Vim as well.
You will have to decide if you want to keep the version in this Vim or the one
on disk. This message is not given when 'buftype' is not empty.
- *W16*
+ *W16*
Warning: Mode of file "{filename}" has changed since editing started ~
When the timestamp for a buffer was changed and the contents are still the
@@ -665,27 +665,27 @@ checking out a file from a version control system, which causes the read-only
bit to be reset. It should be safe to reload the file. Set 'autoread' to
automatically reload the file.
- *E211*
+ *E211*
File "{filename}" no longer available ~
The file which you have started editing has disappeared, or is no longer
accessible. Make sure you write the buffer somewhere to avoid losing
changes. This message is not given when 'buftype' is not empty.
- *W14*
+ *W14*
Warning: List of file names overflow ~
You must be using an awful lot of buffers. It's now possible that two buffers
have the same number, which causes various problems. You might want to exit
Vim and restart it.
- *E931*
+ *E931*
Buffer cannot be registered ~
Out of memory or a duplicate buffer number. May happen after W14. Looking up
a buffer will not always work, better restart Vim.
- *E296* *E297*
+ *E296* *E297*
Seek error in swap file write ~
Write error in swap file ~
@@ -694,7 +694,7 @@ This mostly happens when the disk is full. Vim could not write text into the
text may be lost without recovery being possible. Vim might run out of memory
when this problem persists.
- *connection-refused*
+ *connection-refused*
Xlib: connection to "<machine-name:0.0" refused by server ~
This happens when Vim tries to connect to the X server, but the X server does
@@ -703,7 +703,7 @@ to restore the title and for the xterm clipboard support. Unfortunately this
error message cannot be avoided, except by disabling the |+xterm_clipboard|
and |+X11| features.
- *E10*
+ *E10*
\\ should be followed by /, ? or & ~
A command line started with a backslash or the range of a command contained a
@@ -711,13 +711,13 @@ backslash in a wrong place. This is often caused by command-line continuation
being disabled. Remove the 'C' flag from the 'cpoptions' option to enable it.
Or use ":set nocp".
- *E471*
+ *E471*
Argument required ~
This happens when an Ex command with mandatory argument(s) was executed, but
no argument has been specified.
- *E474* *E475* *E983*
+ *E474* *E475* *E983*
Invalid argument ~
Invalid argument: {arg} ~
Duplicate argument: {arg} ~
@@ -725,32 +725,32 @@ no argument has been specified.
An Ex command or function has been executed, but an invalid argument has been
specified.
- *E488*
+ *E488*
Trailing characters ~
Trailing characters: {text} ~
An argument has been added to an Ex command that does not permit one.
Or the argument has invalid characters and has not been recognized.
- *E477* *E478*
+ *E477* *E478*
No ! allowed ~
Don't panic! ~
You have added a "!" after an Ex command that doesn't permit one.
- *E481*
+ *E481*
No range allowed ~
A range was specified for an Ex command that doesn't permit one. See
|cmdline-ranges|.
- *E482* *E483*
+ *E482* *E483*
Can't create file {filename} ~
Can't get temp file name ~
Vim cannot create a temporary file.
- *E484* *E485*
+ *E484* *E485*
Can't open file {filename} ~
Can't read file {filename} ~
@@ -760,7 +760,7 @@ changed with patch 7.3.443. Try using |shellescape()| for all shell arguments
given to |system()|, or explicitly add escaping with ^. Also see
'shellxquote' and 'shellxescape'.
- *E464*
+ *E464*
Ambiguous use of user-defined command ~
There are two user-defined commands with a common name prefix, and you used
@@ -770,20 +770,20 @@ Example: >
:command MyCommand2 echo "two"
:MyCommand
<
- *E492*
+ *E492*
Not an editor command ~
You tried to execute a command that is neither an Ex command nor
a user-defined command.
- *E943*
+ *E943*
Command table needs to be updated, run 'make cmdidxs' ~
This can only happen when changing the source code, when adding a command in
src/ex_cmds.h. The lookup table then needs to be updated, by running: >
make cmdidxs
<
- *E928* *E889*
+ *E928* *E889*
E928: String required ~
E889: Number required ~
@@ -842,7 +842,7 @@ Also see 'mouse'. The hit-enter message is highlighted with the |hl-Question|
group.
- *more-prompt* *pager*
+ *more-prompt* *pager*
-- More -- ~
-- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit ~
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 8d2d17aea..2f414cd60 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1427,7 +1427,7 @@ A jump table for the options with a short description can be found at |Q_op|.
hide hide the buffer (don't unload it), even if 'hidden' is
not set
unload unload the buffer, even if 'hidden' is set; the
- |:hide| command will also unlod the buffer
+ |:hide| command will also unload the buffer
delete delete the buffer from the buffer list, even if
'hidden' is set; the |:hide| command will also delete
the buffer, making it behave like |:bdelete|
@@ -4518,7 +4518,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'incsearch'* *'is'* *'noincsearch'* *'nois'*
'incsearch' 'is' boolean (default off, set in |defaults.vim| if the
- +reltime feature is supported)
+ |+reltime| feature is supported)
global
{not available when compiled without the
|+extra_search| features}
@@ -5090,9 +5090,9 @@ A jump table for the options with a short description can be found at |Q_op|.
< *lcs-leadmultispace*
leadmultispace:c...
Like multispace value, but only for leading whitespace
- Overrides |lcs-lead| for leading multiple spaces.
- `:set listchars=leadmultispace:---+` shows ten consecutive
- leading spaces as:
+ overrides |lcs-lead| for leading multiple spaces.
+ `:set listchars=leadmultispace:---+` shows ten
+ consecutive leading spaces as:
---+---+--XXX ~
Where "XXX" denotes the first non-blank characters in
the line.
@@ -7421,7 +7421,7 @@ A jump table for the options with a short description can be found at |Q_op|.
{millisec} milli seconds. Applies to the following
methods. When omitted the limit is 5000. When
negative there is no limit. {only works when built
- with the +reltime feature}
+ with the |+reltime| feature}
file:{filename} Read file {filename}, which must have two columns,
separated by a slash. The first column contains the
@@ -9021,7 +9021,7 @@ A jump table for the options with a short description can be found at |Q_op|.
mode. On pressing 'wildchar' (usually <Tab>) to invoke completion,
the possible matches are shown just above the command line, with the
first match highlighted (overwriting the status line, if there is
- one). This is the behavior without "pum" in 'wildoptions.
+ one). This is the behavior without "pum" in 'wildoptions'.
Keys that show the previous/next match, such as <Tab> or
CTRL-P/CTRL-N, cause the highlight to move to the appropriate match.
When 'wildmode' is used, "wildmenu" mode is used where "full" is
@@ -9132,7 +9132,7 @@ A jump table for the options with a short description can be found at |Q_op|.
expansion. Currently fuzzy matching based completion
is not supported for file and directory names and
instead wildcard expansion is used.
- pum Display the completion matches using the popupmenu
+ pum Display the completion matches using the popup menu
in the same style as the |ins-completion-menu|.
tagfile When using CTRL-D to list matching tags, the kind of
tag and the file of the tag is listed. Only one match
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 09549b50b..f8eef0ef6 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -643,7 +643,7 @@ Short explanation of each option: *option-list*
'cinkeys' 'cink' keys that trigger indent when 'cindent' is set
'cinoptions' 'cino' how to do indenting when 'cindent' is set
'cinwords' 'cinw' words where 'si' and 'cin' add an indent
-'cinscopedecls' 'cinsd' words that are recognized by 'cino-g'
+'cinscopedecls' 'cinsd' words that are recognized by 'cino-g'
'clipboard' 'cb' use the clipboard as the unnamed register
'cmdheight' 'ch' number of lines to use for the command-line
'cmdwinheight' 'cwh' height of the command-line window
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index e295b80a7..be33def10 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -348,7 +348,7 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
Start logging and write entries to {filename}.
This works like calling `ch_logfile({filename}, 'ao')` very
early during startup.
- {only available with the +channel feature}
+ {only available with the |+channel| feature}
*-D*
-D Debugging. Go to debugging mode when executing the first
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index a6941e1a1..c0744f669 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -138,7 +138,7 @@ something else.
:+tabclose " close the next tab page
:1tabclose " close the first tab page
:$tabclose " close the last tab page
- :tabclose -2 " close the 2nd previous tab page
+ :tabclose -2 " close the 2nd previous tab page
:tabclose + " close the next tab page
:tabclose 3 " close the third tab page
:tabclose $ " close the last tab page
diff --git a/runtime/doc/tags b/runtime/doc/tags
index cc002ecd0..b3b44e262 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -9649,6 +9649,7 @@ subscribe-maillist intro.txt /*subscribe-maillist*
subscript eval.txt /*subscript*
substitute() builtin.txt /*substitute()*
substitute-CR version6.txt /*substitute-CR*
+substring eval.txt /*substring*
suffixes cmdline.txt /*suffixes*
suspend starting.txt /*suspend*
swap-exists-choices usr_11.txt /*swap-exists-choices*
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 4004c632d..463ab26d7 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1415,7 +1415,7 @@ the "disasm_window_height" entry can be used to set the window height: >
let g:termdebug_config['disasm_window_height'] = 15
or, if there is no g:termdebug_config: >
let g:termdebug_disasm_window = 15
-Any value greater than 1 will set the Asm window height to that value: >
+Any value greater than 1 will set the Asm window height to that value.
Communication ~
*termdebug-communication*
@@ -1469,7 +1469,7 @@ get this error:
Then your gdb is too old.
-Colors~
+Colors ~
*hl-debugPC* *hl-debugBreakpoint*
The color of the signs can be adjusted with these highlight groups:
- debugPC the current position
@@ -1484,7 +1484,8 @@ When 'background' is "dark":
hi debugBreakpoint term=reverse ctermbg=red guibg=red
-Shortcuts *termdebug_shortcuts*
+Shortcuts ~
+ *termdebug_shortcuts*
You can define your own shortcuts (mappings) to control gdb, that can work in
any window, using the TermDebugSendCommand() function. Example: >
@@ -1492,7 +1493,8 @@ any window, using the TermDebugSendCommand() function. Example: >
The argument is the gdb command.
-Popup menu *termdebug_popup*
+Popup menu ~
+ *termdebug_popup*
By default the Termdebug plugin sets 'mousemodel' to "popup_setpos" and adds
these entries to the popup menu:
@@ -1505,7 +1507,8 @@ or if there is no g:termdebug_config: >
let g:termdebug_popup = 0
-Vim window width *termdebug_wide*
+Vim window width ~
+ *termdebug_wide*
To change the width of the Vim window when debugging starts and use a vertical
split: >
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index e6328e91e..42246c049 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -91,9 +91,9 @@ test_gui_event({event}, {args})
{event} is a String and the supported values are:
"dropfiles" drop one or more files in a window.
- "findrepl" search and replace text
+ "findrepl" search and replace text.
"mouse" mouse button click event.
- "scrollbar" move or drag the scrollbar
+ "scrollbar" move or drag the scrollbar.
"tabline" select a tab page by mouse click.
"tabmenu" select a tabline menu entry.
@@ -119,7 +119,7 @@ test_gui_event({event}, {args})
Perform a search and replace of text. The supported items
in {args} are:
find_text: string to find.
- repl_text: replacement string
+ repl_text: replacement string.
flags: flags controlling the find/replace. Supported
values are:
1 search next string (find dialog)
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 50661efc4..37dc6d4ae 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 8.2. Last change: 2022 Jun 25
+*todo.txt* For Vim version 8.2. Last change: 2022 Jun 26
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -206,14 +206,14 @@ Patches considered for including:
- move f_hasmapto() to map.c #10611
- allow for nesting of timeout, sketch in #10595
- Add "-n" option to xxd. #10599
-- Support %e and %k in 'errorformat'. #9624
- Add support for "underdouble", "underdot" and "underdash". #9553
- Patch to implement the vimtutor with a plugin: #6414
Was originally written by Felipe Morales.
- Patch to make fillchars global-local. (#5206)
- Version of getchar() that does not move the cursor - #10603
Use a separate argument for the new flag.
-- Improved VB filetype detection. (Doug Kearns, June 25)
+- Improved VB filetype detection. (Doug Kearns, June 26)
+- Improved FreeBasic runtime files (and a second one). (Doug Kearns, June 26)
Autoconf: must use autoconf 2.69, later version generates lots of warnings
- try using autoconf 2.71 and fix all "obsolete" warnings
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index f5527cd85..cd39dd367 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -322,7 +322,7 @@ want to give the variable a value yet, you need to specify the type: >
If you make a mistake and try to assign the wrong type of value you'll get an
error: >
-
+
age = "Peter"
< E1012: Type mismatch; expected number but got string ~
@@ -638,7 +638,7 @@ Make sure that the argument for `normal` is a complete command. Otherwise
Vim will run into the end of the argument and silently abort the command. For
example, if you start the delete operator, you must give the movement command
also. This works: >
-
+
normal d$
This does nothing: >
@@ -1567,7 +1567,7 @@ to "funcref". Example: >
def Wrong(): string
return 'Wrong!'
enddef
-
+
var Afunc = g:result == 1 ? Right : Wrong
echo Afunc()
< Wrong! ~
@@ -1815,7 +1815,7 @@ is ignored, except for commands that don't consider comments, as shown in
examples below. A comment can start on any character position on the line,
but not when it is part of the command, e.g. inside a string.
-The character " (the double quote mark) starts a comment in legacy script.
+The character " (the double quote mark) starts a comment in legacy script.
This involves some cleverness to make sure double quoted strings are not
recognized as comments (just one reason to prefer |Vim9| script).
diff --git a/runtime/doc/usr_50.txt b/runtime/doc/usr_50.txt
index 7d6936464..e8ebeb001 100644
--- a/runtime/doc/usr_50.txt
+++ b/runtime/doc/usr_50.txt
@@ -6,7 +6,7 @@
|50.1| Exceptions
-|50.2| Function with variable number of arguments
+|50.2| Function with variable number of arguments
|50.3| Restoring the view
Next chapter: |usr_51.txt| Create a plugin
@@ -104,7 +104,7 @@ You can call it like this: >
Show('Title', 'one', 'two', 'three')
< start is Title Arg 0 is one Arg 1 is two Arg 2 is three ~
-
+
This uses the `echohl` command to specify the highlighting used for the
following `echo` command. `echohl None` stops it again. The `echon` command
works like `echo`, but doesn't output a line break.
diff --git a/runtime/doc/usr_51.txt b/runtime/doc/usr_51.txt
index 73733f488..800946e51 100644
--- a/runtime/doc/usr_51.txt
+++ b/runtime/doc/usr_51.txt
@@ -72,7 +72,7 @@ FIRST LINE
>
1 vim9script noclear
-You need to use `vimscript` as the very first command. Best is to put it in
+You need to use `vim9script` as the very first command. Best is to put it in
the very first line.
The script we are writing will have a `finish` command to bail out when it is
@@ -615,7 +615,7 @@ noremap <script> Only remap mappings defined in this script that start
setlocal Set an option for the current buffer only.
-command -buffer Define a user command local to the buffer.
+command -buffer Define a user command local to the buffer.
exists("*s:Func") Check if a function was already defined.
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index 31576c610..59777cc98 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -345,7 +345,7 @@ Writing Vim script ~
|usr_50.txt| Advanced Vim script writing
|50.1| Exceptions
- |50.2| Function with variable number of arguments
+ |50.2| Function with variable number of arguments
|50.3| Restoring the view
|usr_51.txt| Write plugins
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 1414561c6..96f0f88ce 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -411,7 +411,8 @@ T *+mouse* Mouse handling |mouse-using|
N *+mouseshape* |'mouseshape'|
B *+mouse_dec* Unix only: Dec terminal mouse handling |dec-mouse|
N *+mouse_gpm* Unix only: Linux console mouse handling |gpm-mouse|
-m *+mouse_gpm/dyn* Same as |+mouse_gpm| with optional library dependency |/dyn|
+m *+mouse_gpm/dyn* Same as |+mouse_gpm| with optional library dependency
+ |/dyn|
N *+mouse_jsbterm* JSB mouse handling |jsbterm-mouse|
B *+mouse_netterm* Unix only: netterm mouse handling |netterm-mouse|
N *+mouse_pterm* QNX only: pterm mouse handling |qnx-terminal|
diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 670208fde..1cb95e0a0 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -370,8 +370,8 @@ New autocommand events: ~
|OptionSet| after setting any option
|TabClosed| after closing a tab page
|TabNew| after creating a new tab page
-|TextChangedI| after a change was made to the text in Insert mode
|TextChanged| after a change was made to the text in Normal mode
+|TextChangedI| after a change was made to the text in Insert mode
|WinNew| after creating a new window
diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt
index 37054001a..323829a59 100644
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -1,4 +1,4 @@
-*version9.txt* For Vim version 8.2. Last change: 2022 Jun 24
+*version9.txt* For Vim version 8.2. Last change: 2022 Jun 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -462,6 +462,10 @@ TermDebug enhancements:
xxd: Support for showing offset as a decimal number (-d).
+The C omni-complete plugin (|ft-c-omni|), the file type detection script
+(ft.vim) and the syntax menu generation script (makemenu.vim) have been
+rewritten using the Vim9 script syntax.
+
A large number of tests have been added to verify the Vim functionality. Most
of the old style tests have been converted to new style tests using the new
style assert_* functions.
@@ -27439,7 +27443,7 @@ Solution: Only check an autoload name when is prefixed.
Files: src/userfunc.c
Patch 8.2.4473
-Problem: Coverity warnds for not checking return value of ftell().
+Problem: Coverity warns for not checking return value of ftell().
Solution: Bail out if ftell() returns a negative value.
Files: src/spellfile.c
@@ -27813,7 +27817,7 @@ Solution: Consider empty string and null to be different for "is".
Files: src/typval.c, src/vim9execute.c, src/testdir/test_vim9_expr.vim
Patch 8.2.4535
-Problem: Filename modifer ":8" removes the filename.
+Problem: Filename modifier ":8" removes the filename.
Solution: Use strncpy() instead of vim_strncpy(). (Christian Brabandt,
closes #9918, closes #8600)
Files: src/filepath.c, src/testdir/test_shortpathname.vim
@@ -28668,7 +28672,7 @@ Files: src/screen.c
Patch 8.2.4674
Problem: Cannot force getting MouseMove events.
-Solution: Add the 'mousemoveevent' option with implementaiton for the GUI.
+Solution: Add the 'mousemoveevent' option with implementation for the GUI.
(Ernie Rael, closes #10044)
Files: runtime/doc/gui.txt, runtime/doc/options.txt,
runtime/doc/testing.txt, src/gui.c, src/option.h,
@@ -29432,7 +29436,7 @@ Solution: Uncomment the line that deletes the file.
Files: src/testdir/test_cursorline.vim
Patch 8.2.4797
-Problem: getwininfo() may get oudated values.
+Problem: getwininfo() may get outdated values.
Solution: Make sure w_botline is up-to-date. (closes #10226)
Files: src/evalwindow.c, src/testdir/test_bufwintabinfo.vim
@@ -30039,7 +30043,7 @@ Files: src/buffer.c, src/testdir/test_buffer.vim
Patch 8.2.4902
Problem: Mouse wheel scrolling is inconsistent.
-Solution: Use the MS-Winows system setting. (closes #10368)
+Solution: Use the MS-Windows system setting. (closes #10368)
Files: runtime/doc/scroll.txt, src/gui_w32.c, src/mouse.c,
src/proto/mouse.pro, src/testing.c, src/testdir/test_gui.vim
@@ -30719,7 +30723,7 @@ Files: src/change.c, src/vim.h, src/textformat.c,
src/testdir/test_textformat.vim
Patch 8.2.5009
-Problem: Fold may not be closeable after appending.
+Problem: Fold may not be closable after appending.
Solution: Set the fd_small flag to MAYBE. (Brandon Simmons, closes #10471)
Files: src/fold.c, src/testdir/test_fold.vim
@@ -31399,7 +31403,7 @@ Solution: Use assert_inrange().
Files: src/testdir/test_syntax.vim
Patch 8.2.5125
-Problem: MS-Windows: warnings from MinGW compyler.
+Problem: MS-Windows: warnings from MinGW compiler.
Solution: Use "volatile". (Yasuhiro Matsumoto, closes #10589) Initialize
variable.
Files: src/os_win32.c, src/proto/os_win32.pro, src/map.c
@@ -31581,5 +31585,20 @@ Solution: Handle special key combinations better. (closes #10613,
closes #10602, closes #10579)
Files: src/gui_w32.c
+Patch 8.2.5158
+Problem: TSTP and INT signal tests are not run with valgrind.
+Solution: Sleep a bit longer. (closes #10614)
+Files: src/testdir/test_signals.vim
+
+Patch 8.2.5159 (after 8.2.5157)
+Problem: Fix for CTRL-key combinations causes more problems than it solves.
+Solution: Roll back the change.
+Files: src/gui_w32.c
+
+Patch 8.2.5160
+Problem: Accessing invalid memory after changing terminal size.
+Solution: Adjust cmdline_row and msg_row to the value of Rows.
+Files: src/term.c
+
vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index 7b1bc261f..aef4230d9 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 Jun 20
+*vim9.txt* For Vim version 8.2. Last change: 2022 Jun 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -37,10 +37,10 @@ A secondary goal is to avoid Vim-specific constructs and get closer to
commonly used programming languages, such as JavaScript, TypeScript and Java.
The performance improvements can only be achieved by not being 100% backwards
-compatible. For example, making function arguments available in the
-"a:" dictionary adds quite a lot of overhead. In a Vim9 function this
-dictionary is not available. Other differences are more subtle, such as how
-errors are handled.
+compatible. For example, making function arguments available in the "a:"
+dictionary adds quite a lot of overhead. In a Vim9 function this dictionary
+is not available. Other differences are more subtle, such as how errors are
+handled.
The Vim9 script syntax and semantics are used in:
- a function defined with the `:def` command
diff --git a/runtime/syntax/doxygen.vim b/runtime/syntax/doxygen.vim
index 36d527b55..357c4302c 100644
--- a/runtime/syntax/doxygen.vim
+++ b/runtime/syntax/doxygen.vim
@@ -120,7 +120,7 @@ try
" end=+\(\n\s*\*\=\s*\([@\\]\([npcbea]\>\|em\>\|ref\>\|link\>\|f\$\|[$\\&<>#]\)\@!\)\|\s*$\)\@=+
"syn region doxygenBriefLine contained start=+\<\k+ skip=+^\s*\(\*/\@!\s*\)\=\(\<\|[@\\]\<\([npcbea]\>\|em\>\|ref\|link\>\>\|f\$\|[$\\&<>#]\)\|[^ \t\\@*]\)+ end=+^+ contains=doxygenContinueCommentWhite,doxygenSmallSpecial,@doxygenHtmlGroup,doxygenTODO,doxygenHyperLink,doxygenHashLink,@Spell skipwhite keepend matchgroup=xxx
-syn region doxygenBriefLine contained start=+\<\k+ skip=+^\s*\(\*/\@!\s*\)\=\(\<\|[@\\]\<\([npcbea]\>\|em\>\|ref\|link\>\>\|f\$\|[$\\&<>#]\)\|[^ \t\\@*]\)+ end=+^+ skipwhite keepend matchgroup=xxx
+syn region doxygenBriefLine contained start=+\<\k+ skip=+^\s*\(\*/\@!\s*\)\=\(\<\|[@\\]\<\([npcbea]\>\|em\>\|ref\|link\>\>\|f\$\|[$\\&<>#]\)\|[^ \t\\@*]\)+ end=+^+ skipwhite keepend matchgroup=xxx contains=@Spell
" syn region doxygenBriefLine matchgroup=xxxy contained start=+\<\k.\++ skip=+^\s*\k+ end=+end+ skipwhite keepend
"doxygenFindBriefSpecial,
"" syn region doxygenSpecialMultilineDesc start=+.\++ contained contains=doxygenSpecialContinueCommentWhite,doxygenSmallSpecial,doxygenHyperLink,doxygenHashLink,@doxygenHtmlGroup,@Spell skipwhite keepend
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index 87ace6571..83c0469b6 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -3614,8 +3614,8 @@ msgstr "绐楀彛"
msgid "tab"
msgstr "鏍囩椤"
-msgid "[end of lines]"
-msgstr "[缁撴潫鎵鏈夎鍒橾"
+#~ msgid "[end of lines]"
+#~ msgstr ""
msgid ""
"\n"
@@ -4599,8 +4599,8 @@ msgstr "E243: 涓嶆敮鎸佺殑鍙傛暟: \"-%s\"锛涜浣跨敤 OLE 鐗堟湰銆"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
-#~ msgstr "E244: 瀛椾綋鍚 \"%3$s\" 涓湁闈炴硶 %1$s 鍚嶇О \"%2$s\""
+# msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
+# msgstr "E244: 瀛椾綋鍚 \"%3$s\" 涓湁闈炴硶 %1$s 鍚嶇О \"%2$s\""
#, c-format
msgid "E245: Illegal char '%c' in font name \"%s\""
@@ -4838,8 +4838,8 @@ msgstr "E315: ml_get: 鏃犳晥鐨 lnum: %ld"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
-#~ msgstr "E316: ml_get: 鍦ㄧ紦鍐插尯 %2$d %3$s 涓壘涓嶅埌绗 %1$ld 琛"
+# msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
+# msgstr "E316: ml_get: 鍦ㄧ紦鍐插尯 %2$d %3$s 涓壘涓嶅埌绗 %1$ld 琛"
msgid "E317: Pointer block id wrong"
msgstr "E317: 鎸囬拡鍧 id 閿欒"
@@ -7248,8 +7248,8 @@ msgstr "E1036: %c 闇瑕佹暣鏁版垨鑰呮诞鐐规暟鍙傛暟"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E1037: Cannot use \"%s\" with %s"
-#~ msgstr "E1037: 涓嶈兘瀵 %2$s 浣跨敤 \"%1$s\""
+# msgid "E1037: Cannot use \"%s\" with %s"
+# msgstr "E1037: 涓嶈兘瀵 %2$s 浣跨敤 \"%1$s\""
msgid "E1038: \"vim9script\" can only be used in a script"
msgstr "E1038: \"vim9script\" 鍙兘鍦ㄨ剼鏈腑浣跨敤"
@@ -8567,7 +8567,7 @@ msgid "change the way backslashes are used in search patterns"
msgstr "鏀瑰彉鍙嶆枩鏉犲湪鎼滅储妯″紡涓殑浣跨敤鏂瑰紡"
msgid "select the default regexp engine used"
-msgstr "閫夋嫨浣跨敤鐨勭己鐪佺殑姝e垯琛ㄨ揪寮忓紩鎿"
+msgstr "閫夋嫨榛樿鐨勬鍒欒〃杈惧紡寮曟搸"
msgid "ignore case when using a search pattern"
msgstr "浣跨敤鎼滅储妯″紡鏃跺拷鐣ュぇ灏忓啓"
@@ -8579,7 +8579,7 @@ msgid "what method to use for changing case of letters"
msgstr "鐢ㄤ粈涔堟柟娉曟潵鏀瑰彉瀛楁瘝鐨勫ぇ灏忓啓"
msgid "maximum amount of memory in Kbyte used for pattern matching"
-msgstr "妯″紡鍖归厤浣跨敤鐨勬渶澶у唴瀛(浠ュ崈瀛楄妭涓哄崟浣)"
+msgstr "妯″紡鍖归厤浣跨敤鐨勬渶澶у唴瀛橈紙浠ュ崈瀛楄妭涓哄崟浣嶏級"
msgid "pattern for a macro definition line"
msgstr "瀹忓畾涔夎鐨勬ā寮"
@@ -8616,7 +8616,7 @@ msgid "a :tag command will use the tagstack"
msgstr ":tag 鍛戒护灏嗕娇鐢 tagstack"
msgid "when completing tags in Insert mode show more info"
-msgstr "褰撳畬鎴愭爣绛惧湪鎻掑叆妯″紡鏄剧ず鏇村淇℃伅"
+msgstr "鍦ㄦ彃鍏ユā寮忚ˉ鍏ㄦ爣绛炬椂鏄剧ず鏇村淇℃伅"
msgid "a function to be used to perform tag searches"
msgstr "鐢ㄤ簬鎵ц鏍囩鎼滅储鐨勫嚱鏁"
@@ -8628,16 +8628,16 @@ msgid "use cscope for tag commands"
msgstr "鏍囩鍛戒护浣跨敤 cscope"
msgid "0 or 1; the order in which \":cstag\" performs a search"
-msgstr "0鎴1; \":cstag\"鎵ц鎼滅储鐨勯『搴"
+msgstr "0 鎴 1; \":cstag\" 鎵ц鎼滅储鐨勯『搴"
msgid "give messages when adding a cscope database"
msgstr "鍦ㄦ坊鍔 cscope 鏁版嵁搴撴椂缁欏嚭娑堟伅"
msgid "how many components of the path to show"
-msgstr "瑕佹樉绀鸿矾寰勭殑澶氬皯涓粍浠"
+msgstr "鏄剧ず璺緞鐨勫灏戜釜閮ㄥ垎"
msgid "when to open a quickfix window for cscope"
-msgstr "浣曟椂鎵撳紑 cscope 鐨勫揩閫熶慨澶嶇獥鍙"
+msgstr "浣曟椂涓 cscope 鎵撳紑蹇熶慨澶嶇獥鍙"
msgid "file names in a cscope file are relative to that file"
msgstr "cscope 鏂囦欢涓殑鏂囦欢鍚嶆槸鐩稿浜庤鏂囦欢鐨"
@@ -8655,35 +8655,35 @@ msgid "long lines wrap"
msgstr "闀胯鎶樿"
msgid "wrap long lines at a character in 'breakat'"
-msgstr "鍦 'breakat' 涓殑瀛楃闀垮害杈冮暱鏃堕渶瑕佹崲琛"
+msgstr "鍦 'breakat' 涓殑瀛楃澶勫闀胯鎶樿"
msgid "preserve indentation in wrapped text"
-msgstr "鍦ㄦ崲琛屾枃鏈腑淇濇寔缂╄繘"
+msgstr "鍦ㄦ姌琛屾枃鏈腑淇濇寔缂╄繘"
msgid "adjust breakindent behaviour"
-msgstr "璋冩暣鎶樿缂╄繘鐨勮涓"
+msgstr "璋冩暣 breakindent 鐨勮涓"
msgid "which characters might cause a line break"
msgstr "鍝簺瀛楃鍙兘瀵艰嚧鎹㈣"
msgid "string to put before wrapped screen lines"
-msgstr "瑕佹斁鍦ㄥ洖缁曠殑灞忓箷绾夸箣鍓嶇殑瀛楃涓"
+msgstr "鏀惧湪鎶樺洖鐨勫睆骞曡涔嬪墠鐨勫瓧绗︿覆"
msgid "minimal number of columns to scroll horizontally"
msgstr "姘村钩婊氬姩鐨勬渶灏忓垪鏁"
msgid "minimal number of columns to keep left and right of the cursor"
-msgstr "淇濈暀鍏夋爣宸﹀彸鐨勬渶灏忓垪鏁"
+msgstr "淇濈暀鍦ㄥ厜鏍囧乏鍙崇殑鏈灏忓垪鏁"
msgid ""
"include \"lastline\" to show the last line even if it doesn't fit\n"
"include \"uhex\" to show unprintable characters as a hex number"
msgstr ""
"鍖呭惈 \"lastline\" 鏉ユ樉绀烘渶鍚庝竴琛岋紝鍗充娇瀹冩樉绀轰笉涓媆n"
-"鍖呭惈\"uhex\"浠ュ崄鍏繘鍒舵樉绀轰笉鍙墦鍗板瓧绗"
+"鍖呭惈 \"uhex\" 浠ュ崄鍏繘鍒舵樉绀轰笉鍙墦鍗板瓧绗"
msgid "characters to use for the status line, folds and filler lines"
-msgstr "鐢ㄤ簬鐘舵佽銆佹姌鍙犺鍜屽~鍏呰鐨勫瓧绗"
+msgstr "鐢ㄤ簬鐘舵佽銆佹姌鍙犲拰濉厖琛岀殑瀛楃"
msgid "number of lines used for the command-line"
msgstr "鐢ㄤ簬鍛戒护琛岀殑琛屾暟"
@@ -8712,7 +8712,7 @@ msgid "show <Tab> as ^I and end-of-line as $"
msgstr "浠 ^I 鏄剧ず <Tab>, 浠 $ 鏄剧ず琛屽熬"
msgid "list of strings used for list mode"
-msgstr "鐢ㄤ簬鍒楄〃妯″紡鐨勫瓧绗︿覆鍒楄〃"
+msgstr "鐢ㄤ簬 list 妯″紡鐨勫瓧绗︿覆鍒楄〃"
msgid "show the line number for each line"
msgstr "瀵规瘡涓琛屾樉绀鸿鍙"
@@ -8727,7 +8727,7 @@ msgid "controls whether concealable text is hidden"
msgstr "鎺у埗鏄惁闅愯棌鍙殣钘忔枃鏈"
msgid "modes in which text in the cursor line can be concealed"
-msgstr "闅愯棌鍏夋爣琛岀殑鏂囨湰鐨勬ā寮"
+msgstr "鍙殣钘忓厜鏍囪鐨勬枃鏈殑妯″紡"
msgid "syntax, highlighting and spelling"
msgstr "璇硶銆侀珮浜拰鎷煎啓"
@@ -8739,13 +8739,13 @@ msgid "type of file; triggers the FileType event when set"
msgstr "鏂囦欢绫诲瀷; 鍦ㄨ缃椂瑙﹀彂 FileType 浜嬩欢"
msgid "name of syntax highlighting used"
-msgstr "浣跨敤鐨勮娉曢珮浜樉绀虹殑鍚嶇О"
+msgstr "浣跨敤涓殑璇硶楂樹寒鏄剧ず鐨勫悕绉"
msgid "maximum column to look for syntax items"
-msgstr "鏌ユ壘璇硶椤圭殑鏈澶у垪"
+msgstr "瀵绘壘璇硶椤圭殑鏈澶у垪"
msgid "which highlighting to use for various occasions"
-msgstr "鍦ㄥ悇绉嶅満鍚堜娇鐢ㄥ摢浜涢珮浜彁绀"
+msgstr "鍦ㄤ笉鍚屽満鍚堜娇鐢ㄥ摢浜涢珮浜彁绀"
msgid "highlight all matches for the last used search pattern"
msgstr "楂樹寒鏄剧ず鏈鍚庝娇鐢ㄧ殑鎼滅储妯″紡鐨勬墍鏈夊尮閰嶉」"
@@ -8763,7 +8763,7 @@ msgid "highlight the screen line of the cursor"
msgstr "绐佸嚭鏄剧ず鍏夋爣鐨勫睆骞曡"
msgid "specifies which area 'cursorline' highlights"
-msgstr "鎸囧畾 'cursorline' 绐佸嚭鏄剧ず鐨勫尯鍩"
+msgstr "鎸囧畾 'cursorline' 楂樹寒鏄剧ず鐨勫尯鍩"
msgid "columns to highlight"
msgstr "瑕侀珮浜殑鍒"
@@ -8772,7 +8772,7 @@ msgid "highlight spelling mistakes"
msgstr "楂樹寒鎷煎啓閿欒"
msgid "list of accepted languages"
-msgstr "宸叉帴鍙楃殑璇█鍒楄〃"
+msgstr "鎺ュ彈鐨勮瑷鍒楄〃"
msgid "file that \"zg\" adds good words to"
msgstr "\"zg\" 娣诲姞姝g‘鍗曡瘝鐨勬枃浠"
@@ -8787,7 +8787,7 @@ msgid "methods used to suggest corrections"
msgstr "鐢ㄤ簬寤鸿淇鐨勬柟娉"
msgid "amount of memory used by :mkspell before compressing"
-msgstr ":mkspell 鍦ㄥ帇缂╁墠浣跨敤鐨勫唴瀛樻暟閲"
+msgstr ":mkspell 鍦ㄥ帇缂╁墠浣跨敤鐨勫唴瀛橀噺"
msgid "multiple windows"
msgstr "澶氫釜绐楀彛"
@@ -8808,7 +8808,7 @@ msgid "minimal number of lines used for the current window"
msgstr "褰撳墠绐楀彛鐨勬渶灏忚鏁"
msgid "minimal number of lines used for any window"
-msgstr "绐楀彛鐨勬渶灏忚鏁"
+msgstr "浠讳綍绐楀彛鐨勬渶灏忚鏁"
msgid "keep the height of the window"
msgstr "淇濇寔绐楀彛鐨勯珮搴"
@@ -8820,13 +8820,13 @@ msgid "minimal number of columns used for the current window"
msgstr "褰撳墠绐楀彛鐨勬渶灏忓垪鏁"
msgid "minimal number of columns used for any window"
-msgstr "绐楀彛鐨勬渶灏忓垪鏁"
+msgstr "浠讳綍绐楀彛鐨勬渶灏忓垪鏁"
msgid "initial height of the help window"
msgstr "甯姪绐楀彛鐨勫垵濮嬮珮搴"
msgid "use a popup window for preview"
-msgstr "浣跨敤涓涓脊鍑虹獥鍙i瑙"
+msgstr "浣跨敤寮瑰嚭绐楀彛鏉ラ瑙"
msgid "default height for the preview window"
msgstr "棰勮绐楀彛鐨勯粯璁ら珮搴"
@@ -8849,22 +8849,22 @@ msgid "a new window is put right of the current one"
msgstr "鏂扮獥鍙f斁鍦ㄥ綋鍓嶇獥鍙g殑鍙宠竟"
msgid "this window scrolls together with other bound windows"
-msgstr "姝ょ獥鍙d笌鍏朵粬缁戝畾绐楀彛涓璧锋粴鍔"
+msgstr "姝ょ獥鍙d笌鍏朵粬宸茬粦瀹氱殑绐楀彛涓璧锋粴鍔"
msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
-msgstr "'scrollbind'鐨勯夐」鍒楄〃: \"ver\", \"hor\" 鍜/鎴 \"jump\""
+msgstr "'scrollbind' 鐨勯夐」鍒楄〃: \"ver\", \"hor\" 鍜/鎴 \"jump\""
msgid "this window's cursor moves together with other bound windows"
-msgstr "姝ょ獥鍙g殑鍏夋爣涓庡叾浠栫粦瀹氱殑 Windows 涓璧风Щ鍔"
+msgstr "姝ょ獥鍙g殑鍏夋爣涓庡叾浠栧凡缁戝畾鐨勭獥鍙d竴璧风Щ鍔"
msgid "size of a terminal window"
msgstr "缁堢绐楀彛鐨勫ぇ灏"
msgid "key that precedes Vim commands in a terminal window"
-msgstr "缁堢绐楀彛涓 Vim 鍛戒护鍓嶉潰鐨勯敭"
+msgstr "缁堢绐楀彛涓 Vim 鍛戒护鐨勫墠瀵奸敭"
msgid "max number of lines to keep for scrollback in a terminal window"
-msgstr "缁堢绐楀彛涓敤浜庢粴鍔ㄧ殑鏈澶ц鏁"
+msgstr "缁堢绐楀彛涓敤浜庡洖婊氱殑鏈澶ц鏁"
msgid "type of pty to use for a terminal window"
msgstr "缁堢绐楀彛鐨 pty 绫诲瀷"
@@ -8879,22 +8879,22 @@ msgid "0, 1 or 2; when to use a tab pages line"
msgstr "0, 1 鎴 2; 浣曟椂浣跨敤鏍囩椤佃"
msgid "maximum number of tab pages to open for -p and \"tab all\""
-msgstr "-p 鍜 \"tab all\" 鎵撳紑鐨勬渶澶ф爣绛鹃〉鏁伴噺"
+msgstr "-p 鍜 \"tab all\" 鎵撳紑鐨勬渶澶ф爣绛鹃〉鏁"
msgid "custom tab pages line"
msgstr "鑷畾涔夋爣绛鹃〉琛"
msgid "custom tab page label for the GUI"
-msgstr "GUI 鐨勮嚜瀹氫箟鏍囩椤"
+msgstr "涓 GUI 鑷畾涔夋爣绛鹃〉鐨勬爣绛"
msgid "custom tab page tooltip for the GUI"
-msgstr "GUI 鑷畾涔夋爣绛鹃〉鐨勫伐鍏锋彁绀"
+msgstr "涓 GUI 鑷畾涔夋爣绛鹃〉鐨勫伐鍏锋彁绀"
msgid "terminal"
msgstr "缁堢"
msgid "name of the used terminal"
-msgstr "浣跨敤鐨勭粓绔殑鍚嶅瓧"
+msgstr "浣跨敤涓殑缁堢鐨勫悕瀛"
msgid "alias for 'term'"
msgstr "'term' 鐨勫埆鍚"
@@ -8909,7 +8909,7 @@ msgid "request terminal key codes when an xterm is detected"
msgstr "褰撴娴嬪埌 xterm 鏃讹紝璇锋眰缁堢閿爜"
msgid "terminal that requires extra redrawing"
-msgstr "闇瑕侀澶栭噸缁樼殑缁堢"
+msgstr "缁堢闇瑕侀澶栫殑閲嶇粯"
msgid "recognize keys that start with <Esc> in Insert mode"
msgstr "璇嗗埆鍦ㄦ彃鍏ユā寮忎笅浠 <Esc> 寮澶寸殑閿"
@@ -8939,7 +8939,7 @@ msgid "set the text of the icon for this window"
msgstr "璁剧疆姝ょ獥鍙e浘鏍囩殑鏂囨湰"
msgid "when not empty, text for the icon of this window"
-msgstr "姝ょ獥鍙e浘鏍囬潪绌虹殑鏂囨湰"
+msgstr "闈炵┖鏃讹紝璁剧疆姝ょ獥鍙e浘鏍囩殑鏂囨湰"
msgid "restore the screen contents when exiting Vim"
msgstr "閫鍑 Vim 鏃舵仮澶嶅睆骞曞唴瀹"
@@ -8965,13 +8965,13 @@ msgstr "鎶ュ憡榧犳爣绉诲姩浜嬩欢"
msgid ""
"\"extend\", \"popup\" or \"popup_setpos\"; what the right\n"
"mouse button is used for"
-msgstr "榧犳爣鎸夐挳鐢ㄤ簬"
+msgstr "\"extend\", \"popup\" 鎴 \"popup_setpos\"; 榧犳爣鍙抽敭鐢ㄤ簬浠涔"
msgid "maximum time in msec to recognize a double-click"
msgstr "璇嗗埆鍙屽嚮鐨勬渶澶ф椂闂达紙浠ユ绉掕锛"
msgid "\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse"
-msgstr "榧犳爣绫诲瀷锛歕"xterm\", \"xterm2\", \"sgr\" 绛"
+msgstr "\"xterm\", \"xterm2\", \"sgr\" 绛; 榧犳爣绫诲瀷"
msgid "what the mouse pointer looks like in different modes"
msgstr "榧犳爣鎸囬拡鍦ㄤ笉鍚屾ā寮忎笅鐨勬牱瀛"
@@ -8986,7 +8986,7 @@ msgid "pair of fonts to be used, for multibyte editing"
msgstr "鐢ㄤ簬澶氬瓧鑺傜紪杈戠殑瀛椾綋瀵"
msgid "list of font names to be used for double-wide characters"
-msgstr "鐢ㄤ簬鍙屽瀛楃鐨勫瓧浣撳悕绉板垪琛"
+msgstr "鐢ㄤ簬鍙屽搴﹀瓧绗︾殑瀛椾綋鍚嶇О鍒楄〃"
msgid "use smooth, antialiased fonts"
msgstr "浣跨敤骞虫粦銆佹姉閿娇鐨勫瓧浣"
@@ -8995,13 +8995,13 @@ msgid "list of flags that specify how the GUI works"
msgstr "鎸囧畾 GUI 宸ヤ綔鏂瑰紡鐨勬爣蹇楀垪琛"
msgid "\"icons\", \"text\" and/or \"tooltips\"; how to show the toolbar"
-msgstr "濡備綍鏄剧ず宸ュ叿鏉★細\"icons\", \"text\" 鍜/鎴 \"tooltips\""
+msgstr "\"icons\", \"text\" 鍜/鎴 \"tooltips\"; 濡備綍鏄剧ず宸ュ叿鏍"
msgid "size of toolbar icons"
msgstr "宸ュ叿鏍忓浘鏍囧ぇ灏"
msgid "room (in pixels) left above/below the window"
-msgstr "绐楀彛涓婃柟/涓嬫柟鐨勭┖闂(浠ュ儚绱犱负鍗曚綅)"
+msgstr "绐楀彛涓婃柟/涓嬫柟鐨勭┖闂达紙浠ュ儚绱犱负鍗曚綅锛"
msgid "list of ASCII characters that can be combined into complex shapes"
msgstr "鍙互缁勫悎鎴愬鏉傚舰鐘剁殑 ASCII 瀛楃鍒楄〃"
@@ -9010,63 +9010,63 @@ msgid "options for text rendering"
msgstr "鏂囨湰娓叉煋閫夐」"
msgid "use a pseudo-tty for I/O to external commands"
-msgstr "澶栭儴鍛戒护鐨 I/O 鐨勪吉 tty"
+msgstr "瀵瑰閮ㄥ懡浠ょ殑 I/O 浣跨敤浼粓绔"
msgid ""
"\"last\", \"buffer\" or \"current\": which directory used for the file "
"browser"
-msgstr "鏂囦欢娴忚鍣ㄤ娇鐢ㄥ摢涓洰褰曪細\"last\", \"buffer\" 鎴 \"current\""
+msgstr "\"last\", \"buffer\" 鎴 \"current\"; 鏂囦欢娴忚鍣ㄤ娇鐢ㄥ摢涓洰褰"
msgid "language to be used for the menus"
msgstr "鑿滃崟浣跨敤鐨勮瑷"
msgid "maximum number of items in one menu"
-msgstr "鑿滃崟涓殑鏈澶ч」鐩暟閲"
+msgstr "鍗曚釜鑿滃崟涓殑鏈澶ч」鐩暟閲"
msgid "\"no\", \"yes\" or \"menu\"; how to use the ALT key"
-msgstr "濡備綍浣跨敤ALT閿細\"no\", \"yes\" 鎴 \"menu\""
+msgstr "\"no\", \"yes\" 鎴 \"menu\"; 濡備綍浣跨敤 ALT 閿"
msgid "number of pixel lines to use between characters"
msgstr "瀛楃涔嬮棿浣跨敤鐨勫儚绱犺鏁"
msgid "delay in milliseconds before a balloon may pop up"
-msgstr "寤惰繜鏁版绉掑悗锛屾皵娉″彲鑳戒細寮瑰嚭"
+msgstr "寤惰繜鎸囧畾姣鍚庯紝姘旀场鍙兘浼氬脊鍑"
msgid "use balloon evaluation in the GUI"
-msgstr "鍦 GUI 涓娇鐢ㄦ皵娉¤瘎浼"
+msgstr "鍦 GUI 涓娇鐢ㄦ皵娉℃眰鍊"
msgid "use balloon evaluation in the terminal"
-msgstr "鍦ㄧ粓绔腑浣跨敤姘旀场璇勪及"
+msgstr "鍦ㄧ粓绔腑浣跨敤姘旀场姹傚"
msgid "expression to show in balloon eval"
-msgstr "瑕佸湪姘旀场 eval 涓樉绀虹殑琛ㄨ揪寮"
+msgstr "鍦ㄦ皵娉℃眰鍊间腑鏄剧ず鐨勮〃杈惧紡"
msgid "printing"
msgstr "鎵撳嵃"
msgid "list of items that control the format of :hardcopy output"
-msgstr "鎺у埗鏍煎紡鐨勯」鐩垪琛 :hardcopy 杈撳嚭"
+msgstr "鎺у埗 :hardcopy 杈撳嚭鏍煎紡鐨勯」鐩垪琛"
msgid "name of the printer to be used for :hardcopy"
-msgstr "浣跨敤鐨勬墦鍗版満鍚嶇О:hardcopy"
+msgstr "鐢ㄤ簬 :hardcopy 鐨勬墦鍗版満鍚嶇О"
msgid "expression used to print the PostScript file for :hardcopy"
-msgstr "鐢ㄤ簬鎵撳嵃 PostScript 鏂囦欢鐨勮〃杈惧紡 :hardcopy"
+msgstr "鐢ㄤ簬 :hardcopy 鎵撳嵃 PostScript 鏂囦欢鐨勮〃杈惧紡"
msgid "name of the font to be used for :hardcopy"
-msgstr "瑕佷娇鐢ㄧ殑瀛椾綋鍚嶇О:hardcopy"
+msgstr ":hardcopy 浣跨敤鐨勫瓧浣撳悕绉"
msgid "format of the header used for :hardcopy"
-msgstr "鐢ㄤ簬:hardcopy 鐨勬枃浠跺ご鏍煎紡"
+msgstr "鐢ㄤ簬 :hardcopy 鐨勬爣澶存牸寮"
msgid "encoding used to print the PostScript file for :hardcopy"
msgstr "鐢ㄤ簬 :hardcopy 鎵撳嵃 PostScript 鏂囦欢鐨勭紪鐮"
msgid "the CJK character set to be used for CJK output from :hardcopy"
-msgstr "浠 :hardcopy 鐢ㄤ簬 CJK 杈撳嚭鐨 CJK 瀛楃闆"
+msgstr ":hardcopy 鐢ㄤ簬 CJK 杈撳嚭鐨 CJK 瀛楃闆"
msgid "list of font names to be used for CJK output from :hardcopy"
-msgstr "浠 :hardcopy 鐢ㄤ簬 CJK 杈撳嚭鐨勫瓧浣撳悕绉板垪琛"
+msgstr ":hardcopy 鐢ㄤ簬 CJK 杈撳嚭鐨勫瓧浣撳悕绉板垪琛"
msgid "messages and info"
msgstr "娑堟伅鍜屼俊鎭"
@@ -9078,7 +9078,7 @@ msgid "list of flags to make messages shorter"
msgstr "浣挎秷鎭洿鐭殑鏍囧織鍒楄〃"
msgid "show (partial) command keys in the status line"
-msgstr "鍦ㄧ姸鎬佽涓樉绀(閮ㄥ垎)鍛戒护閿"
+msgstr "鍦ㄧ姸鎬佽涓樉绀猴紙涓嶅畬鏁寸殑锛夊懡浠ら敭"
msgid "display the current mode in the status line"
msgstr "鍦ㄧ姸鎬佽涓樉绀哄綋鍓嶆ā寮"
@@ -9087,10 +9087,10 @@ msgid "show cursor position below each window"
msgstr "鍦ㄦ瘡涓獥鍙d笅鏂规樉绀哄厜鏍囩殑浣嶇疆"
msgid "alternate format to be used for the ruler"
-msgstr "鏍囧昂鐨勬浛浠f牸寮"
+msgstr "ruler 鐨勬浛浠f牸寮"
msgid "threshold for reporting number of changed lines"
-msgstr "鎶ュ憡鏇存敼琛屾暟鐨勯槇鍊"
+msgstr "鎶ュ憡宸叉洿鏀硅鏁扮殑闃堝"
msgid "the higher the more messages are given"
msgstr "绛夌骇瓒婇珮锛岀粰鍑虹殑淇℃伅瓒婂"
@@ -9099,7 +9099,7 @@ msgid "file to write messages in"
msgstr "鐢ㄤ簬鍐欏叆娑堟伅鐨勬枃浠"
msgid "pause listings when the screen is full"
-msgstr "褰撳睆骞曟弧鏃剁殑鏆傚仠鏄剧ず娓呭崟"
+msgstr "褰撳睆骞曟弧鏃舵殏鍋滄樉绀烘竻鍗"
msgid "start a dialog when a command fails"
msgstr "褰撳懡浠ゅけ璐ユ椂寮鍚璇濇"
@@ -9120,76 +9120,76 @@ msgid "selecting text"
msgstr "閫夋嫨鏂囨湰"
msgid "\"old\", \"inclusive\" or \"exclusive\"; how selecting text behaves"
-msgstr "濡備綍閫夋嫨鏂囨湰: \"old\", \"inclusive\" 鎴 \"exclusive\""
+msgstr "\"old\", \"inclusive\" 鎴 \"exclusive\"; 濡備綍閫夋嫨鏂囨湰"
msgid ""
"\"mouse\", \"key\" and/or \"cmd\"; when to start Select mode\n"
"instead of Visual mode"
-msgstr "浣曟椂鍚姩閫夋嫨妯″紡鑰屼笉鏄彲瑙嗗寲妯″紡锛歕"mouse\", \"key\" 鍜/鎴 \"cmd\""
+msgstr "\"mouse\", \"key\" 鍜/鎴 \"cmd\"; 浣曟椂鍚姩閫夋嫨妯″紡鑰屼笉鏄彲瑙嗘ā寮"
msgid ""
"\"unnamed\" to use the * register like unnamed register\n"
"\"autoselect\" to always put selected text on the clipboard"
msgstr ""
-"鍍忔湭鍛藉悕瀵勫瓨鍣ㄤ竴鏍蜂娇鐢*瀵勫瓨鍣細\"unnamed\"\n"
-"灏嗛夋嫨鐨勬枃鏈缁堟斁鍦ㄥ壀璐存澘涓: \"autoselect\""
+"\"unnamed\": 鍍忔棤鍚嶅瘎瀛樺櫒涓鏍蜂娇鐢 * 瀵勫瓨鍣╘n"
+"\"autoselect\": 灏嗛夋嫨鐨勬枃鏈缁堟斁鍦ㄥ壀璐存澘涓"
msgid "\"startsel\" and/or \"stopsel\"; what special keys can do"
-msgstr "鐗规畩閿彲浠ュ仛锛歕"startsel\" 鍜/鎴 \"stopsel\""
+msgstr "\"startsel\" 鍜/鎴 \"stopsel\"; 鐗规畩閿彲浠ュ仛"
msgid "editing text"
msgstr "缂栬緫鏂囨湰"
msgid "maximum number of changes that can be undone"
-msgstr "鍙互鎾ゆ秷鐨勬渶澶ф洿鏀规暟"
+msgstr "鍙互鎾ら攢鐨勬渶澶ф洿鏀规暟"
msgid "automatically save and restore undo history"
-msgstr "鑷姩淇濆瓨鍜屾仮澶嶆挙娑堢殑鍘嗗彶璁板綍"
+msgstr "鑷姩淇濆瓨鍜屾仮澶嶆挙閿鍘嗗彶"
msgid "list of directories for undo files"
-msgstr "鎾ゆ秷鐨勬枃浠剁殑鐩綍鍒楄〃"
+msgstr "鎾ら攢鏂囦欢鐨勭洰褰曞垪琛"
msgid "maximum number lines to save for undo on a buffer reload"
msgstr "缂撳啿鍖洪噸鏂板姞杞芥椂涓烘挙閿淇濆瓨鐨勬渶澶ц鏁"
msgid "changes have been made and not written to a file"
-msgstr "宸茬粡杩涜浜嗕慨鏀癸紝浣嗘病鏈夎鍐欏叆鏂囦欢"
+msgstr "宸茬粡鍋氬嚭浜嗕慨鏀癸紝浣嗘病鏈夎鍐欏叆鏂囦欢"
msgid "buffer is not to be written"
-msgstr "缂撳啿鍖轰笉琚啓鍏"
+msgstr "缂撳啿鍖轰笉浼氳鍐欏叆"
msgid "changes to the text are possible"
msgstr "鍙互瀵规枃鏈繘琛屾洿鏀"
msgid "line length above which to break a line"
-msgstr "瓒呰繃琛岄暱搴﹀氨瑕佹柇琛"
+msgstr "瓒呰繃琛岄暱搴﹀氨鏂"
msgid "margin from the right in which to break a line"
-msgstr "浠庡彸渚у垝绾跨殑绌虹櫧"
+msgstr "鏂寮濮嬬殑鍙宠竟璺"
msgid "specifies what <BS>, CTRL-W, etc. can do in Insert mode"
msgstr "鎸囧畾 <BS>, CTRL-W 绛夊湪鎻掑叆妯″紡涓嬪彲浠ュ仛浠涔"
msgid "definition of what comment lines look like"
-msgstr "娉ㄩ噴琛屽瑙傜殑瀹氫箟"
+msgstr "瀹氫箟娉ㄩ噴琛岄暱浠涔堟牱"
msgid "list of flags that tell how automatic formatting works"
-msgstr "璇存槑鑷姩鏍煎紡鍖栧浣曞伐浣滅殑鏍囧織鍒楄〃"
+msgstr "鎺у埗鑷姩鏍煎紡鍖栧浣曞伐浣滅殑鏍囧織鍒楄〃"
msgid "pattern to recognize a numbered list"
msgstr "璇嗗埆缂栧彿鍒楄〃鐨勬ā寮"
msgid "expression used for \"gq\" to format lines"
-msgstr "鐢ㄤ簬鏍煎紡鍖栬鐨 \"gq\" 浣跨敤鐨勮〃杈惧紡"
+msgstr "鐢 \"gq\" 鏍煎紡鍖栬鏃朵娇鐢ㄧ殑琛ㄨ揪寮"
msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P"
-msgstr "鎸囧畾 CTRL-N 鍜 CTRL-P 鐨勬彃鍏ユā寮忚ˉ鍏ㄥ伐浣滄柟寮"
+msgstr "鎸囧畾浣跨敤 CTRL-N 鍜 CTRL-P 杩涜鎻掑叆妯″紡琛ュ叏鐨勫伐浣滄柟寮"
msgid "whether to use a popup menu for Insert mode completion"
msgstr "鏄惁鍦ㄦ彃鍏ユā寮忚ˉ鍏ㄦ椂浣跨敤寮瑰嚭鑿滃崟"
msgid "options for the Insert mode completion info popup"
-msgstr "鎻掑叆妯″紡琛ュ叏淇℃伅寮瑰嚭鐨勯夐」"
+msgstr "鎻掑叆妯″紡琛ュ叏淇℃伅寮规鐨勯夐」"
msgid "maximum height of the popup menu"
msgstr "寮瑰嚭鑿滃崟鐨勬渶澶ч珮搴"
@@ -9216,56 +9216,56 @@ msgid "adjust case of a keyword completion match"
msgstr "璋冩暣鍏抽敭瀛楄ˉ鍏ㄥ尮閰嶇殑澶у皬鍐"
msgid "enable entering digraphs with c1 <BS> c2"
-msgstr "鍏佽浣跨敤 c1 <BS> c2 杩涘叆鏈夊悜鍥;c2"
+msgstr "鏀寔浣跨敤 c1 <BS> c2 杈撳叆浜屽悎瀛楃"
msgid "the \"~\" command behaves like an operator"
-msgstr "\"~\"鍛戒护琛ㄧ幇鍦板儚鎿嶄綔绗"
+msgstr "\"~\"鍛戒护琛ㄧ幇寰楀儚鎿嶄綔绗"
msgid "function called for the \"g@\" operator"
-msgstr "鍑芥暟璋冪敤 \"g@\" 鎿嶄綔绗"
+msgstr "\"g@\" 鎿嶄綔绗﹁皟鐢ㄧ殑鍑芥暟"
msgid "when inserting a bracket, briefly jump to its match"
-msgstr "褰撴彃鍏ユ嫭鍙锋椂锛岀洿鎺ヨ烦杞埌瀹冨尮閰嶇殑鎷彿"
+msgstr "褰撴彃鍏ユ嫭鍙锋椂锛岀煭鏆傚湴璺宠浆鍒板尮閰嶅畠鐨勬嫭鍙"
msgid "tenth of a second to show a match for 'showmatch'"
-msgstr "闇瑕佸崄鍒嗕箣涓绉掓樉绀'showmatch'鐨勫尮閰"
+msgstr "鏄剧ず 'showmatch' 鐨勫尮閰嶇殑鏃堕暱锛堜互鍗佸垎涔嬩竴绉掕锛"
msgid "list of pairs that match for the \"%\" command"
-msgstr "涓 \"%\" 鍛戒护鍖归厤鐨勫鍒楄〃"
+msgstr "\"%\" 鍛戒护鍖归厤鐨勫鍒楄〃"
msgid "use two spaces after '.' when joining a line"
-msgstr "杩炴帴琛屾椂锛屽湪 '.' 鍚庨潰娣诲姞涓や釜绌烘牸銆"
+msgstr "杩炴帴琛屾椂锛屽湪 '.' 鍚庨潰娣诲姞涓や釜绌烘牸"
msgid ""
"\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\n"
"recognized for CTRL-A and CTRL-X commands"
msgstr ""
-"CTRL-A 鍜 CTRL-X 鍛戒护璇嗗埆鐨勬暟瀛楁牸寮忥細\n"
-"\"alpha\", \"octal\", \"hex\", \"bin\" 鍜/鎴 \"unsigned\""
+"\"alpha\", \"octal\", \"hex\", \"bin\" 鍜/鎴 \"unsigned\"\n"
+"CTRL-A 鍜 CTRL-X 鍛戒护璇嗗埆鐨勬暟瀛楃殑鏍煎紡"
msgid "tabs and indenting"
msgstr "Tab 鍜岀缉杩"
msgid "number of spaces a <Tab> in the text stands for"
-msgstr "<Tab> 鍦ㄦ枃涓唬琛ㄧ┖鏍肩殑鏁伴噺"
+msgstr "<Tab> 鍦ㄦ枃鏈腑浠h〃鐨勭┖鏍兼暟"
msgid "number of spaces used for each step of (auto)indent"
-msgstr "姣忔(鑷姩)缂╄繘鎵浣跨敤鐨勭┖鏍兼暟"
+msgstr "姣忔锛堣嚜鍔級缂╄繘鎵浣跨敤鐨勭┖鏍兼暟"
msgid "list of number of spaces a tab counts for"
-msgstr "tab 璁℃暟鐨勭┖鏍兼暟鍒楄〃"
+msgstr "tab 浠h〃鐨勭┖鏍兼暟鐨勫垪琛"
msgid "list of number of spaces a soft tabsstop counts for"
-msgstr "杞埗琛ㄧ璁℃暟鐨勭┖鏍兼暟鍒楄〃"
+msgstr "杞埗琛ㄧ浠h〃鐨勭┖鏍兼暟鐨勫垪琛"
msgid "a <Tab> in an indent inserts 'shiftwidth' spaces"
-msgstr "鐢 <Tab> 閿缉杩涚殑鏃跺欐彃鍏 'shiftwidth' 涓┖鏍"
+msgstr "鐢 <Tab> 閿缉杩涙椂鎻掑叆 'shiftwidth' 涓┖鏍"
msgid "if non-zero, number of spaces to insert for a <Tab>"
-msgstr "濡傛灉闈為浂锛屼负 <Tab> 鎻掑叆鐨勭┖鏍兼暟銆"
+msgstr "濡傛灉闈為浂锛屼负 <Tab> 鎻掑叆鐨勭┖鏍兼暟"
msgid "round to 'shiftwidth' for \"<<\" and \">>\""
-msgstr "鐢 \"<<\" 鎴 \">>\" 蹇嵎閿缉杩涙椂锛屾彃鍏 'shiftwidth' 鏁存暟鍊嶄釜绌烘牸"
+msgstr "鐢 \"<<\" 鍜 \">>\" 缂╄繘鏃讹紝鎻掑叆 'shiftwidth' 鏁存暟鍊嶄釜绌烘牸"
msgid "expand <Tab> to spaces in Insert mode"
msgstr "鍦ㄦ彃鍏ユā寮忎笅灏 <Tab> 灞曞紑涓虹┖鏍"
@@ -9274,7 +9274,7 @@ msgid "automatically set the indent of a new line"
msgstr "鑷姩璁剧疆鏂拌缂╄繘"
msgid "do clever autoindenting"
-msgstr "鑷姩缂╄繘"
+msgstr "鏅鸿兘鑷姩缂╄繘"
msgid "enable specific indenting for C code"
msgstr "涓 C 浠g爜鍚敤鐗瑰畾鐨勭缉杩"
@@ -9298,10 +9298,10 @@ msgid "keys that trigger indenting with 'indentexpr' in Insert mode"
msgstr "鍦ㄦ彃鍏ユā寮忎笅浣跨敤 'indentexpr' 瑙﹀彂缂╄繘鐨勯敭"
msgid "copy whitespace for indenting from previous line"
-msgstr "浠庝笂涓琛屽鍒剁敤浜庣缉杩涚殑绌烘牸"
+msgstr "涓虹缉杩涗粠涓婁竴琛屽鍒剁┖鐧藉瓧绗"
msgid "preserve kind of whitespace when changing indent"
-msgstr "鍦ㄦ洿鏀圭缉杩涙椂淇濈暀绌虹櫧"
+msgstr "鍦ㄦ洿鏀圭缉杩涙椂淇濈暀绌虹櫧绫诲瀷"
msgid "enable lisp mode"
msgstr "鍚敤 lisp 妯″紡"
@@ -9313,31 +9313,31 @@ msgid "folding"
msgstr "鎶樺彔"
msgid "unset to display all folds open"
-msgstr "鍙栨秷璁剧疆浠ユ樉绀烘墍鏈夋姌鍙犳墦寮"
+msgstr "鍙栨秷璁剧疆浠ユ墦寮鎵鏈夋姌鍙"
msgid "folds with a level higher than this number will be closed"
-msgstr "姣旇繖涓暟瀛楅珮涓绛夌骇鐨勬姌鍙犲皢琚叧闂"
+msgstr "绛夌骇姣旇繖涓暟瀛楅珮鐨勬姌鍙犲皢琚叧闂"
msgid "value for 'foldlevel' when starting to edit a file"
msgstr "寮濮嬬紪杈戞枃浠舵椂锛'foldlevel' 鐨勫"
msgid "width of the column used to indicate folds"
-msgstr "鐢ㄦ潵琛ㄧず鎶樺彔鐨勫垪瀹"
+msgstr "鐢ㄦ潵鎸囩ず鎶樺彔鐨勫垪鐨勫搴"
msgid "expression used to display the text of a closed fold"
-msgstr "鐢ㄤ簬鏄剧ず鍏抽棴鎶樺彔鐨勬枃鏈"
+msgstr "鐢ㄤ簬鏄剧ず宸插叧闂姌鍙犵殑琛ㄨ揪寮"
msgid "set to \"all\" to close a fold when the cursor leaves it"
-msgstr "璁剧疆涓 \"all\" 鐢ㄤ簬鍦ㄥ厜鏍囩寮鏃跺叧闂姌鍙"
+msgstr "璁剧疆涓 \"all\" 鏉ュ湪鍏夋爣绂诲紑鏃跺叧闂姌鍙"
msgid "specifies for which commands a fold will be opened"
-msgstr "鎸囧畾鎵撳紑鎶樺彔鐨勫懡浠"
+msgstr "鎸囧畾浼氭墦寮鎶樺彔鐨勫懡浠"
msgid "minimum number of screen lines for a fold to be closed"
-msgstr "瑕佸叧闂姌鍙犳墍闇鐨勬渶灏忚鏁"
+msgstr "鍙叧闂姌鍙犳墍闇鐨勬渶灏忓睆骞曡鏁"
msgid "template for comments; used to put the marker in"
-msgstr "娉ㄩ噴鐨勬ā鏉匡紝妯℃澘閲屾湁鍗犱綅绗"
+msgstr "娉ㄩ噴鐨勬ā鏉匡紝鐢ㄤ簬鏀剧疆鎶樺彔鏍囪"
msgid ""
"folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n"
@@ -9350,13 +9350,13 @@ msgid "expression used when 'foldmethod' is \"expr\""
msgstr "褰 'foldmethod' 涓 \"expr\" 鏃朵娇鐢ㄧ殑琛ㄨ揪寮"
msgid "used to ignore lines when 'foldmethod' is \"indent\""
-msgstr "褰 'foldmethod' 涓 \"indent\" 鏃跺拷鐣ョ殑琛"
+msgstr "褰 'foldmethod' 涓 \"indent\" 鏃剁敤浜庡拷鐣ヨ"
msgid "markers used when 'foldmethod' is \"marker\""
-msgstr "褰 'foldmethod' 涓 \"marker\" 鏃剁殑鏍囧織"
+msgstr "褰 'foldmethod' 涓 \"marker\" 鏃舵墍浣跨敤鐨勬爣璁"
msgid "maximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\""
-msgstr "褰 'foldmethod' 涓 \"indent\" 鎴 \"syntax\"鏃剁殑鏈澶ф姌鍙犳繁搴"
+msgstr "褰 'foldmethod' 涓 \"indent\" 鎴 \"syntax\" 鏃剁殑鏈澶ф姌鍙犳繁搴"
msgid "diff mode"
msgstr "宸紓妯″紡"
@@ -9380,37 +9380,37 @@ msgid "maximum depth of mapping"
msgstr "鏈澶ф槧灏勬繁搴"
msgid "recognize mappings in mapped keys"
-msgstr "璇嗗埆鏄犲皠閿腑鐨勬槧灏"
+msgstr "璇嗗埆宸叉槧灏勯敭涓殑鏄犲皠"
msgid "allow timing out halfway into a mapping"
msgstr "鍏佽鍦ㄦ槧灏勪腑閫旇秴鏃"
msgid "allow timing out halfway into a key code"
-msgstr "鍏佽鍦ㄦ槧灏勭殑涓旀殏鍋"
+msgstr "鍏佽鍦ㄩ敭鐮佷腑閫旇秴鏃"
msgid "time in msec for 'timeout'"
-msgstr "瓒呮椂鏃堕棿 (浠ユ绉掕)"
+msgstr "'timeout' 鐨勬椂闂达紙浠ユ绉掕锛"
msgid "time in msec for 'ttimeout'"
-msgstr "閿洏浠g爜瓒呮椂鏃堕棿 (浠ユ绉掕)"
+msgstr "'ttimeout' 鐨勬椂闂达紙浠ユ绉掕锛"
msgid "reading and writing files"
msgstr "璇诲啓鏂囦欢"
msgid "enable using settings from modelines when reading a file"
-msgstr "Vim 璇诲彇鏂囦欢鐨勬椂鍊欐槸鍚﹀厑璁镐娇鐢 modeline 閲屾寚瀹氱殑璁剧疆"
+msgstr "璇诲彇鏂囦欢鏃舵槸鍚︿娇鐢 modeline 閲岀殑璁剧疆"
msgid "allow setting expression options from a modeline"
msgstr "鍏佽浠 modeline 涓缃〃杈惧紡閫夐」"
msgid "number of lines to check for modelines"
-msgstr "妫鏌 modeline 鐨勮鏁"
+msgstr "涓 modeline 鑰屾鏌ョ殑琛屾暟"
msgid "binary file editing"
msgstr "浜岃繘鍒舵枃浠剁紪杈"
msgid "last line in the file has an end-of-line"
-msgstr "鏂囦欢鐨勬渶鍚庝竴琛屾湁涓涓崲琛岀"
+msgstr "鏂囦欢鐨勬渶鍚庝竴琛屾湁鎹㈣绗"
msgid "fixes missing end-of-line at end of text file"
msgstr "淇鏂囨湰鏂囦欢鏈熬缂哄皯鎹㈣绗︾殑闂"
@@ -9419,10 +9419,10 @@ msgid "prepend a Byte Order Mark to the file"
msgstr "鍦ㄦ枃浠跺墠鍔犱笂瀛楄妭椤哄簭鏍囪"
msgid "end-of-line format: \"dos\", \"unix\" or \"mac\""
-msgstr "鎹㈣绗︽牸寮忥細 \"dos\", \"unix\" or \"mac\""
+msgstr "鎹㈣绗︽牸寮忥細 \"dos\", \"unix\" 鎴 \"mac\""
msgid "list of file formats to look for when editing a file"
-msgstr "缂栬緫鏂囦欢鏃惰鏌ユ壘鐨勬枃浠舵牸寮忓垪琛"
+msgstr "缂栬緫鏂囦欢鏃惰妫鏌ョ殑鏂囦欢鏍煎紡鍒楄〃"
msgid "obsolete, use 'fileformat'"
msgstr "宸插簾姝紝鐢 'fileformat'"
@@ -9434,16 +9434,16 @@ msgid "writing files is allowed"
msgstr "鍏佽鍐欏叆鏂囦欢"
msgid "write a backup file before overwriting a file"
-msgstr "瑕嗙洊澶囦唤鏂囦欢鍓嶏紝璇峰厛鍐欏叆澶囦唤鏂囦欢"
+msgstr "瑕嗙洊鏂囦欢鍓嶅厛鍐欏叆澶囦唤鏂囦欢"
msgid "keep a backup after overwriting a file"
-msgstr "瑕嗙洊鏂囦欢鍚庤繘琛屽浠"
+msgstr "瑕嗙洊鏂囦欢鍚庝繚鐣欏浠"
msgid "patterns that specify for which files a backup is not made"
-msgstr "鎸囧畾涓嶄负鍝簺鏂囦欢杩涜澶囦唤鐨勬ā寮"
+msgstr "涓嶅浠界殑鏂囦欢鐨勬ā寮"
msgid "whether to make the backup as a copy or rename the existing file"
-msgstr "鏄惁浠ュ壇鏈舰寮忚繘琛屽浠芥垨閲嶅懡鍚嶇幇鏈夋枃浠"
+msgstr "閫氳繃澶嶅埗杩樻槸閲嶅懡鍚嶅凡鏈夋枃浠惰繘琛屽浠"
msgid "list of directories to put backup files in"
msgstr "瀛樻斁澶囦唤鏂囦欢鐨勭洰褰曞垪琛"
@@ -9458,22 +9458,22 @@ msgid "as 'autowrite', but works with more commands"
msgstr "绫讳技浜 'autowrite'锛屼絾閫傜敤浜庢洿澶氬懡浠"
msgid "always write without asking for confirmation"
-msgstr "鍐欐椂涓嶉渶瑕佺‘璁"
+msgstr "鍐欐枃浠舵椂鎬绘槸涓嶉渶瑕佺‘璁"
msgid "automatically read a file when it was modified outside of Vim"
-msgstr "褰撴枃浠跺湪Vim涔嬪琚慨鏀规椂锛岃嚜鍔ㄨ鍙栨枃浠"
+msgstr "鍦 Vim 涔嬪淇敼浜嗘枃浠舵椂锛岃嚜鍔ㄨ鍙栨枃浠"
msgid "keep oldest version of a file; specifies file name extension"
-msgstr "淇濆瓨鏈鏃х増鏈殑鏂囦欢; 鎸囧畾鏂囦欢鎵╁睍鍚"
+msgstr "淇濆瓨鏈鏃х増鏈殑鏂囦欢锛涙寚瀹氭枃浠舵墿灞曞悕"
msgid "forcibly sync the file to disk after writing it"
msgstr "鏂囦欢鍐欏叆鍚庡己鍒跺悓姝ュ埌纾佺洏"
msgid "use 8.3 file names"
-msgstr "鏂囦欢鍚嶄娇鐢ㄤ负 8.3 鏍煎紡"
+msgstr "浣跨敤 8.3 鏍煎紡鐨勬枃浠跺悕"
msgid "encryption method for file writing: zip, blowfish or blowfish2"
-msgstr "鏂囦欢鍐欏叆鍔犲瘑鏂规硶锛歾ip, blowfish 鎴 blowfish2"
+msgstr "鍐欏叆鏂囦欢鏃朵娇鐢ㄧ殑鍔犲瘑绠楁硶锛歾ip, blowfish 鎴 blowfish2"
msgid "the swap file"
msgstr "浜ゆ崲鏂囦欢"
@@ -9485,19 +9485,19 @@ msgid "use a swap file for this buffer"
msgstr "瀵硅繖涓紦鍐插尯浣跨敤浜ゆ崲鏂囦欢"
msgid "\"sync\", \"fsync\" or empty; how to flush a swap file to disk"
-msgstr "濡備綍灏嗕氦鎹㈡枃浠跺埛鏂板埌纾佺洏锛歕"sync\", \"fsync\" 鎴 empty"
+msgstr "\"sync\", \"fsync\" 鎴栫暀绌; 灏嗕氦鎹㈡枃浠跺埛鏂板埌纾佺洏鐨勬柟寮"
msgid "number of characters typed to cause a swap file update"
msgstr "瀵艰嚧浜ゆ崲鏂囦欢鏇存柊鐨勫瓧绗︽暟"
msgid "time in msec after which the swap file will be updated"
-msgstr "鍒锋柊浜ゆ崲鏂囦欢鎵闇鐨勬绉掓暟"
+msgstr "鏇存柊浜ゆ崲鏂囦欢鍓嶆墍闇鐨勬绉掓暟"
msgid "maximum amount of memory in Kbyte used for one buffer"
-msgstr "缂撳啿鍖轰娇鐢ㄧ殑鏈澶у唴瀛橀噺(浠ュ崈瀛楄妭涓哄崟浣)"
+msgstr "鍗曚釜缂撳啿鍖轰娇鐢ㄧ殑鏈澶у唴瀛橀噺锛堜互鍗冨瓧鑺備负鍗曚綅锛"
msgid "maximum amount of memory in Kbyte used for all buffers"
-msgstr "鎵鏈夌紦鍐插尯浣跨敤鐨勬渶澶у唴瀛橀噺(浠ュ崈瀛楄妭涓哄崟浣)"
+msgstr "鎵鏈夌紦鍐插尯浣跨敤鐨勬渶澶у唴瀛橀噺锛堜互鍗冨瓧鑺備负鍗曚綅锛"
# do not translate to avoid writing Chinese in files
msgid "command line editing"
@@ -9516,7 +9516,7 @@ msgid "specifies how command line completion works"
msgstr "鎸囧畾鍛戒护琛屽浣曡ˉ鍏"
msgid "empty or \"tagfile\" to list file name of matching tags"
-msgstr "绌烘垨 \"tagfile\" 鏉ュ垪鍑哄尮閰嶆爣璁扮殑鏂囦欢鍚"
+msgstr "绌烘垨 \"tagfile\" 鏉ュ垪鍑哄尮閰嶆爣绛剧殑鏂囦欢鍚"
msgid "list of file name extensions that have a lower priority"
msgstr "浼樺厛绾т綆鐨勬枃浠舵墿灞曞悕鍒楄〃"
@@ -9525,13 +9525,13 @@ msgid "list of file name extensions added when searching for a file"
msgstr "鎼滅储鏂囦欢鏃舵坊鍔犵殑鏂囦欢鎵╁睍鍚嶅垪琛"
msgid "list of patterns to ignore files for file name completion"
-msgstr "涓鸿ˉ鍏ㄦ枃浠跺悕鑰屽拷鐣ユ枃浠剁殑妯″紡鍒楄〃"
+msgstr "鏂囦欢鍚嶈ˉ鍏ㄦ墍蹇界暐鏂囦欢鐨勬ā寮忓垪琛"
msgid "ignore case when using file names"
msgstr "浣跨敤鏂囦欢鍚嶆椂蹇界暐澶у皬鍐"
msgid "ignore case when completing file names"
-msgstr "鍦ㄨˉ鍏ㄦ枃浠跺悕鏃跺拷鐣ュぇ灏忓啓"
+msgstr "琛ュ叏鏂囦欢鍚嶆椂蹇界暐澶у皬鍐"
msgid "command-line completion shows a list of matches"
msgstr "鍛戒护琛岃ˉ鍏ㄦ椂鏄剧ず鍖归厤鍒楄〃"
@@ -9549,37 +9549,37 @@ msgid "name of the shell program used for external commands"
msgstr "鐢ㄤ簬澶栭儴鍛戒护鐨 shell 绋嬪簭鐨勫悕绉"
msgid "when to use the shell or directly execute a command"
-msgstr "浣曟椂浣跨敤 shell 鎴栫洿鎺ユ墽琛屽懡浠"
+msgstr "浣曟椂浣跨敤 shell 杩樻槸鐩存帴鎵ц鍛戒护"
msgid "character(s) to enclose a shell command in"
-msgstr "鐢ㄤ簬灏佽 shell 鍛戒护鐨勫瓧绗"
+msgstr "鐢ㄤ簬鍖呭洿 shell 鍛戒护鐨勫瓧绗"
msgid "like 'shellquote' but include the redirection"
-msgstr "绫讳技'shellquote'锛屼絾鍖呭惈閲嶅畾鍚"
+msgstr "绫讳技 'shellquote'锛屼絾鍖呭惈閲嶅畾鍚"
msgid "characters to escape when 'shellxquote' is ("
-msgstr "'shellxquote' 涓 ( 鏃朵娇鐢ㄧ殑杞箟瀛楃"
+msgstr "'shellxquote' 涓 ( 鏃堕渶瑕佽浆涔夌殑瀛楃"
msgid "argument for 'shell' to execute a command"
msgstr "'shell' 鎵ц鍛戒护鐨勫弬鏁"
msgid "used to redirect command output to a file"
-msgstr "灏嗗懡浠よ緭鍑洪噸瀹氬悜鍒版枃浠"
+msgstr "鐢ㄤ簬灏嗗懡浠よ緭鍑洪噸瀹氬悜鍒版枃浠"
msgid "use a temp file for shell commands instead of using a pipe"
-msgstr "瀵 shell 鍛戒护浣跨敤涓存椂鏂囦欢锛岃屼笉鏄娇鐢ㄧ閬"
+msgstr "瀵 shell 鍛戒护浣跨敤涓存椂鏂囦欢鑰屼笉鏄閬"
msgid "program used for \"=\" command"
msgstr "鐢ㄤ簬 \"=\" 鍛戒护鐨勭▼搴"
msgid "program used to format lines with \"gq\" command"
-msgstr "鐢 \"gq\" 鍛戒护鏍煎紡鍖栦唬鐮佹椂锛屼娇鐢ㄧ殑澶栭儴鏍煎紡鍖栫▼搴"
+msgstr "鐢 \"gq\" 鍛戒护鏍煎紡鍖栦唬鐮佹椂浣跨敤鐨勭▼搴"
msgid "program used for the \"K\" command"
msgstr "鐢ㄤ簬 \"K\" 鍛戒护鐨勭▼搴"
msgid "warn when using a shell command and a buffer has changes"
-msgstr "褰撲娇鐢 shell 鍛戒护鍜岀紦鍐插尯鍙戠敓鍙樺寲鏃跺彂鍑鸿鍛"
+msgstr "褰撲娇鐢 shell 鍛戒护骞朵笖缂撳啿鍖烘湁淇敼鏃跺彂鍑鸿鍛"
msgid "running make and jumping to errors (quickfix)"
msgstr "杩愯 make 骞惰烦鍒伴敊璇紙蹇熶慨澶嶏級"
@@ -9609,13 +9609,13 @@ msgid "encoding of the \":make\" and \":grep\" output"
msgstr "\":make\" 鍜 \":grep\" 杈撳嚭鐨勭紪鐮"
msgid "function to display text in the quickfix window"
-msgstr "蹇熶慨澶嶇獥鍙d腑鏄剧ず鏂囨湰鐨勫嚱鏁"
+msgstr "鐢ㄤ簬鍦ㄥ揩閫熶慨澶嶇獥鍙d腑鏄剧ず鏂囨湰鐨勫嚱鏁"
msgid "system specific"
msgstr "绯荤粺鐗瑰畾"
msgid "use forward slashes in file names; for Unix-like shells"
-msgstr "绫 unix shells 涓紝鍦ㄦ枃浠跺悕涓娇鐢ㄦ鏂滄潬;"
+msgstr "鍦ㄦ枃浠跺悕涓娇鐢ㄦ鏂滄潬锛涚敤浜庣被 Unix shell"
msgid "specifies slash/backslash used for completion"
msgstr "鎸囧畾琛ュ叏鏃朵娇鐢ㄧ殑鏂滄潬/鍙嶆枩鏉"
@@ -9645,25 +9645,25 @@ msgid "when to edit the command-line right-to-left"
msgstr "浣曟椂浠庡彸鍒板乏缂栬緫鍛戒护琛"
msgid "insert characters backwards"
-msgstr "鍚戝悗鎻掑叆瀛楃"
+msgstr "鍊掑簭鎻掑叆瀛楃"
msgid "allow CTRL-_ in Insert and Command-line mode to toggle 'revins'"
-msgstr "鍏佽 CTRL-_ 鍦ㄦ彃鍏ュ拰鍛戒护琛屾ā寮忎笅鍒囨崲 'revins'"
+msgstr "鍦ㄦ彃鍏ュ拰鍛戒护琛屾ā寮忎笅鍏佽 CTRL-_ 鍒囨崲 'revins'"
msgid "the ASCII code for the first letter of the Hebrew alphabet"
msgstr "甯屼集鏉ュ瓧姣嶈〃绗竴涓瓧姣嶇殑 ASCII 鐮"
msgid "use Hebrew keyboard mapping"
-msgstr "浣跨敤甯屼集鏉ラ敭鐩樻槧灏"
+msgstr "浣跨敤甯屼集鏉ヨ閿洏鏄犲皠"
msgid "use phonetic Hebrew keyboard mapping"
-msgstr "浣跨敤甯屼集鏉ヨ鐨勯煶鑺傞敭鐩樻槧灏"
+msgstr "浣跨敤甯屼集鏉ヨ鐨勮闊抽敭鐩樻槧灏"
msgid "prepare for editing Arabic text"
msgstr "鍑嗗缂栬緫闃挎媺浼鏂囨湰"
msgid "perform shaping of Arabic characters"
-msgstr "闃挎媺浼鐨勫瓧鍨嬮噸鏁"
+msgstr "闃挎媺浼鐨勫瓧褰㈤噸鏁"
msgid "terminal will perform bidi handling"
msgstr "缁堢鏀寔鍙屽悜鏂囨湰"
@@ -9687,10 +9687,10 @@ msgid "input method style, 0: on-the-spot, 1: over-the-spot"
msgstr "杈撳叆娉曟牱寮忥細0锛歰n-the-spot锛1锛歰ver-the-spot"
msgid "entering a search pattern: 1: use :lmap; 2: use IM; 0: neither"
-msgstr "杩涘叆鎼滅储妯″紡锛1锛氫娇鐢 :lamp锛2锛氫娇鐢ㄨ緭鍏ユ硶锛0锛氶兘涓嶇敤"
+msgstr "杈撳叆鎼滅储妯″紡鏃讹細1锛氫娇鐢 :lamp锛2锛氫娇鐢ㄨ緭鍏ユ硶锛0锛氶兘涓嶇敤"
msgid "when set always use IM when starting to edit a command line"
-msgstr "濡傛灉璁剧疆锛屽湪寮濮嬬紪杈戝懡浠よ鏃舵绘槸浣跨敤杈撳叆娉"
+msgstr "濡傛灉璁剧疆锛屽紑濮嬬紪杈戝懡浠よ鏃舵绘槸浣跨敤杈撳叆娉"
msgid "function to obtain IME status"
msgstr "鑾峰彇杈撳叆娉曠姸鎬佺殑鍑芥暟"
@@ -9730,7 +9730,7 @@ msgid "key that activates the X input method"
msgstr "婵娲 X 杈撳叆鏂规硶鐨勯敭"
msgid "width of ambiguous width characters"
-msgstr "澶氬搴﹀瓧绗︾殑瀹藉害"
+msgstr "瀹藉害鏈夋涔夊瓧绗︾殑瀹藉害"
msgid "emoji characters are full width"
msgstr "琛ㄦ儏瀛楃瑙嗕綔鍏ㄥ"
@@ -9742,53 +9742,52 @@ msgid ""
"when to use virtual editing: \"block\", \"insert\", \"all\"\n"
"and/or \"onemore\""
msgstr ""
-"浣曟椂浣跨敤铏氭嫙缂栬緫锛歕"block\", \"insert\", \"all\"\n"
-"鍜/鎴 \"onemore\""
+"浣曟椂浣跨敤铏氭嫙缂栬緫锛歕"block\", \"insert\", \"all\" 鍜/鎴 \"onemore\""
msgid "list of autocommand events which are to be ignored"
-msgstr "闇瑕佸拷鐣ョ殑鑷姩鍛戒护浜嬩欢鍒楄〃"
+msgstr "瑕佸拷鐣ョ殑鑷姩鍛戒护浜嬩欢鍒楄〃"
msgid "load plugin scripts when starting up"
msgstr "鍚姩鏃跺姞杞芥彃浠惰剼鏈"
msgid "enable reading .vimrc/.exrc/.gvimrc in the current directory"
-msgstr "鍦ㄥ綋鍓嶇洰褰曚笅鑳藉闃呰 .vimrc/.exrc/.gvimrc"
+msgstr "鍚敤璇诲彇鍦ㄥ綋鍓嶇洰褰曚笅鐨 .vimrc/.exrc/.gvimrc"
msgid "safer working with script files in the current directory"
-msgstr "鍦ㄥ綋鍓嶇洰褰曚笅浣跨敤鑴氭湰鏂囦欢鏇村畨鍏"
+msgstr "鍦ㄥ綋鍓嶇洰褰曚笅浣跨敤鑴氭湰鏂囦欢鏃舵洿瀹夊叏"
msgid "use the 'g' flag for \":substitute\""
-msgstr "缂虹渷鎵撳紑 \":substitute\" 鐨 'g' 鏍囧織"
+msgstr "鎵撳紑 \":substitute\" 鐨 'g' 鏍囧織"
msgid "'g' and 'c' flags of \":substitute\" toggle"
-msgstr "\":substitute\" 寮鍏崇殑 'g' and 'c' 鏍囧織"
+msgstr "\":substitute\" 鐨 'g' and 'c' 鏍囧織鐢ㄤ綔寮鍏冲垏鎹"
msgid "allow reading/writing devices"
-msgstr "鍏佽璇/鍐欒澶"
+msgstr "鍏佽璇诲啓璁惧"
msgid "maximum depth of function calls"
msgstr "鍑芥暟璋冪敤鐨勬渶澶ф繁搴"
msgid "list of words that specifies what to put in a session file"
-msgstr "鎸囧畾鍦ㄤ細璇濇枃浠朵腑鏀惧叆鍐呭鐨勫崟璇嶅垪琛"
+msgstr "鎸囧畾鏀惧叆浼氳瘽鏂囦欢鐨勫唴瀹圭殑鍗曡瘝鍒楄〃"
msgid "list of words that specifies what to save for :mkview"
-msgstr "鎸囧畾淇濆瓨鍐呭鐨勫崟璇嶅垪琛 :mkview"
+msgstr "鎸囧畾 :mkview 淇濆瓨鐨勫唴瀹圭殑鍗曡瘝鍒楄〃"
msgid "directory where to store files with :mkview"
-msgstr "瀛樻斁鏂囦欢鐨勭洰褰 :mkview"
+msgstr ":mkview 瀛樻斁鏂囦欢鐨勭洰褰"
msgid "list that specifies what to write in the viminfo file"
-msgstr "鎸囧畾鍦 viminfo 鏂囦欢涓啓鍏ュ唴瀹圭殑鍒楄〃"
+msgstr "鎸囧畾鍦 viminfo 鏂囦欢涓啓鍏ョ殑鍐呭鐨勫垪琛"
msgid "file name used for the viminfo file"
-msgstr "viminfo鏂囦欢浣跨敤鐨勬枃浠跺悕"
+msgstr "viminfo 鏂囦欢浣跨敤鐨勬枃浠跺悕"
msgid "what happens with a buffer when it's no longer in a window"
msgstr "褰撶紦鍐插尯涓嶅啀浣嶄簬绐楀彛涓椂锛屼細鍙戠敓浠涔"
msgid "empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer"
-msgstr "缂撳啿鍖虹被鍨嬶細绌, \"nofile\", \"nowrite\", \"quickfix\"绛"
+msgstr "绌, \"nofile\", \"nowrite\", \"quickfix\" 绛; 缂撳啿鍖虹被鍨"
msgid "whether the buffer shows up in the buffer list"
msgstr "缂撳啿鍖烘槸鍚︽樉绀哄湪缂撳啿鍖哄垪琛ㄤ腑"
@@ -9800,7 +9799,7 @@ msgid "whether to show the signcolumn"
msgstr "鏄惁鏄剧ず鏍囧彿鍒"
msgid "interval in milliseconds between polls for MzScheme threads"
-msgstr "MzScheme 绾跨▼鐨勮疆璇㈤棿闅(浠ユ绉掍负鍗曚綅)"
+msgstr "MzScheme 绾跨▼鐨勮疆璇㈤棿闅旓紙浠ユ绉掍负鍗曚綅锛"
msgid "name of the Lua dynamic library"
msgstr "Lua 鍔ㄦ佸簱鐨勫悕瀛"
@@ -9809,7 +9808,7 @@ msgid "name of the Perl dynamic library"
msgstr "Perl 鍔ㄦ佸簱鐨勫悕瀛"
msgid "whether to use Python 2 or 3"
-msgstr "鏄惁浣跨敤 Python 2 鎴 3"
+msgstr "鏄惁浣跨敤 Python 2 鍜 3"
msgid "name of the Python 2 dynamic library"
msgstr "Python 2 鍔ㄦ佸簱鐨勫悕瀛"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 9d90355b7..489d39ecc 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -3614,8 +3614,8 @@ msgstr "窗口"
msgid "tab"
msgstr "标签页"
-msgid "[end of lines]"
-msgstr "[结束所有规则]"
+#~ msgid "[end of lines]"
+#~ msgstr ""
msgid ""
"\n"
@@ -4599,8 +4599,8 @@ msgstr "E243: 不支持的参数: \"-%s\";请使用 OLE 版本。"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
-#~ msgstr "E244: 字体名 \"%3$s\" 中有非法 %1$s 名称 \"%2$s\""
+# msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
+# msgstr "E244: 字体名 \"%3$s\" 中有非法 %1$s 名称 \"%2$s\""
#, c-format
msgid "E245: Illegal char '%c' in font name \"%s\""
@@ -4838,8 +4838,8 @@ msgstr "E315: ml_get: 无效的 lnum: %ld"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
-#~ msgstr "E316: ml_get: 在缓冲区 %2$d %3$s 中找不到第 %1$ld 行"
+# msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
+# msgstr "E316: ml_get: 在缓冲区 %2$d %3$s 中找不到第 %1$ld 行"
msgid "E317: Pointer block id wrong"
msgstr "E317: 指针块 id 错误"
@@ -7248,8 +7248,8 @@ msgstr "E1036: %c 需要整数或者浮点数参数"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E1037: Cannot use \"%s\" with %s"
-#~ msgstr "E1037: 不能对 %2$s 使用 \"%1$s\""
+# msgid "E1037: Cannot use \"%s\" with %s"
+# msgstr "E1037: 不能对 %2$s 使用 \"%1$s\""
msgid "E1038: \"vim9script\" can only be used in a script"
msgstr "E1038: \"vim9script\" 只能在脚本中使用"
@@ -8567,7 +8567,7 @@ msgid "change the way backslashes are used in search patterns"
msgstr "改变反斜杠在搜索模式中的使用方式"
msgid "select the default regexp engine used"
-msgstr "选择使用的缺省的正则表达式引擎"
+msgstr "选择默认的正则表达式引擎"
msgid "ignore case when using a search pattern"
msgstr "使用搜索模式时忽略大小写"
@@ -8579,7 +8579,7 @@ msgid "what method to use for changing case of letters"
msgstr "用什么方法来改变字母的大小写"
msgid "maximum amount of memory in Kbyte used for pattern matching"
-msgstr "模式匹配使用的最大内存(以千字节为单位)"
+msgstr "模式匹配使用的最大内存(以千字节为单位)"
msgid "pattern for a macro definition line"
msgstr "宏定义行的模式"
@@ -8616,7 +8616,7 @@ msgid "a :tag command will use the tagstack"
msgstr ":tag 命令将使用 tagstack"
msgid "when completing tags in Insert mode show more info"
-msgstr "当完成标签在插入模式显示更多信息"
+msgstr "在插入模式补全标签时显示更多信息"
msgid "a function to be used to perform tag searches"
msgstr "用于执行标签搜索的函数"
@@ -8628,16 +8628,16 @@ msgid "use cscope for tag commands"
msgstr "标签命令使用 cscope"
msgid "0 or 1; the order in which \":cstag\" performs a search"
-msgstr "0或1; \":cstag\"执行搜索的顺序"
+msgstr "0 或 1; \":cstag\" 执行搜索的顺序"
msgid "give messages when adding a cscope database"
msgstr "在添加 cscope 数据库时给出消息"
msgid "how many components of the path to show"
-msgstr "要显示路径的多少个组件"
+msgstr "显示路径的多少个部分"
msgid "when to open a quickfix window for cscope"
-msgstr "何时打开 cscope 的快速修复窗口"
+msgstr "何时为 cscope 打开快速修复窗口"
msgid "file names in a cscope file are relative to that file"
msgstr "cscope 文件中的文件名是相对于该文件的"
@@ -8655,35 +8655,35 @@ msgid "long lines wrap"
msgstr "长行折行"
msgid "wrap long lines at a character in 'breakat'"
-msgstr "在 'breakat' 中的字符长度较长时需要换行"
+msgstr "在 'breakat' 中的字符处对长行折行"
msgid "preserve indentation in wrapped text"
-msgstr "在换行文本中保持缩进"
+msgstr "在折行文本中保持缩进"
msgid "adjust breakindent behaviour"
-msgstr "调整折行缩进的行为"
+msgstr "调整 breakindent 的行为"
msgid "which characters might cause a line break"
msgstr "哪些字符可能导致换行"
msgid "string to put before wrapped screen lines"
-msgstr "要放在回绕的屏幕线之前的字符串"
+msgstr "放在折回的屏幕行之前的字符串"
msgid "minimal number of columns to scroll horizontally"
msgstr "水平滚动的最小列数"
msgid "minimal number of columns to keep left and right of the cursor"
-msgstr "保留光标左右的最小列数"
+msgstr "保留在光标左右的最小列数"
msgid ""
"include \"lastline\" to show the last line even if it doesn't fit\n"
"include \"uhex\" to show unprintable characters as a hex number"
msgstr ""
"包含 \"lastline\" 来显示最后一行,即使它显示不下\n"
-"包含\"uhex\"以十六进制显示不可打印字符"
+"包含 \"uhex\" 以十六进制显示不可打印字符"
msgid "characters to use for the status line, folds and filler lines"
-msgstr "用于状态行、折叠行和填充行的字符"
+msgstr "用于状态行、折叠和填充行的字符"
msgid "number of lines used for the command-line"
msgstr "用于命令行的行数"
@@ -8712,7 +8712,7 @@ msgid "show <Tab> as ^I and end-of-line as $"
msgstr "以 ^I 显示 <Tab>, 以 $ 显示行尾"
msgid "list of strings used for list mode"
-msgstr "用于列表模式的字符串列表"
+msgstr "用于 list 模式的字符串列表"
msgid "show the line number for each line"
msgstr "对每一行显示行号"
@@ -8727,7 +8727,7 @@ msgid "controls whether concealable text is hidden"
msgstr "控制是否隐藏可隐藏文本"
msgid "modes in which text in the cursor line can be concealed"
-msgstr "隐藏光标行的文本的模式"
+msgstr "可隐藏光标行的文本的模式"
msgid "syntax, highlighting and spelling"
msgstr "语法、高亮和拼写"
@@ -8739,13 +8739,13 @@ msgid "type of file; triggers the FileType event when set"
msgstr "文件类型; 在设置时触发 FileType 事件"
msgid "name of syntax highlighting used"
-msgstr "使用的语法高亮显示的名称"
+msgstr "使用中的语法高亮显示的名称"
msgid "maximum column to look for syntax items"
-msgstr "查找语法项的最大列"
+msgstr "寻找语法项的最大列"
msgid "which highlighting to use for various occasions"
-msgstr "在各种场合使用哪些高亮提示"
+msgstr "在不同场合使用哪些高亮提示"
msgid "highlight all matches for the last used search pattern"
msgstr "高亮显示最后使用的搜索模式的所有匹配项"
@@ -8763,7 +8763,7 @@ msgid "highlight the screen line of the cursor"
msgstr "突出显示光标的屏幕行"
msgid "specifies which area 'cursorline' highlights"
-msgstr "指定 'cursorline' 突出显示的区域"
+msgstr "指定 'cursorline' 高亮显示的区域"
msgid "columns to highlight"
msgstr "要高亮的列"
@@ -8772,7 +8772,7 @@ msgid "highlight spelling mistakes"
msgstr "高亮拼写错误"
msgid "list of accepted languages"
-msgstr "已接受的语言列表"
+msgstr "接受的语言列表"
msgid "file that \"zg\" adds good words to"
msgstr "\"zg\" 添加正确单词的文件"
@@ -8787,7 +8787,7 @@ msgid "methods used to suggest corrections"
msgstr "用于建议修正的方法"
msgid "amount of memory used by :mkspell before compressing"
-msgstr ":mkspell 在压缩前使用的内存数量"
+msgstr ":mkspell 在压缩前使用的内存量"
msgid "multiple windows"
msgstr "多个窗口"
@@ -8808,7 +8808,7 @@ msgid "minimal number of lines used for the current window"
msgstr "当前窗口的最小行数"
msgid "minimal number of lines used for any window"
-msgstr "窗口的最小行数"
+msgstr "任何窗口的最小行数"
msgid "keep the height of the window"
msgstr "保持窗口的高度"
@@ -8820,13 +8820,13 @@ msgid "minimal number of columns used for the current window"
msgstr "当前窗口的最小列数"
msgid "minimal number of columns used for any window"
-msgstr "窗口的最小列数"
+msgstr "任何窗口的最小列数"
msgid "initial height of the help window"
msgstr "帮助窗口的初始高度"
msgid "use a popup window for preview"
-msgstr "使用一个弹出窗口预览"
+msgstr "使用弹出窗口来预览"
msgid "default height for the preview window"
msgstr "预览窗口的默认高度"
@@ -8849,22 +8849,22 @@ msgid "a new window is put right of the current one"
msgstr "新窗口放在当前窗口的右边"
msgid "this window scrolls together with other bound windows"
-msgstr "此窗口与其他绑定窗口一起滚动"
+msgstr "此窗口与其他已绑定的窗口一起滚动"
msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
-msgstr "'scrollbind'的选项列表: \"ver\", \"hor\" 和/或 \"jump\""
+msgstr "'scrollbind' 的选项列表: \"ver\", \"hor\" 和/或 \"jump\""
msgid "this window's cursor moves together with other bound windows"
-msgstr "此窗口的光标与其他绑定的 Windows 一起移动"
+msgstr "此窗口的光标与其他已绑定的窗口一起移动"
msgid "size of a terminal window"
msgstr "终端窗口的大小"
msgid "key that precedes Vim commands in a terminal window"
-msgstr "终端窗口中 Vim 命令前面的键"
+msgstr "终端窗口中 Vim 命令的前导键"
msgid "max number of lines to keep for scrollback in a terminal window"
-msgstr "终端窗口中用于滚动的最大行数"
+msgstr "终端窗口中用于回滚的最大行数"
msgid "type of pty to use for a terminal window"
msgstr "终端窗口的 pty 类型"
@@ -8879,22 +8879,22 @@ msgid "0, 1 or 2; when to use a tab pages line"
msgstr "0, 1 或 2; 何时使用标签页行"
msgid "maximum number of tab pages to open for -p and \"tab all\""
-msgstr "-p 和 \"tab all\" 打开的最大标签页数量"
+msgstr "-p 和 \"tab all\" 打开的最大标签页数"
msgid "custom tab pages line"
msgstr "自定义标签页行"
msgid "custom tab page label for the GUI"
-msgstr "GUI 的自定义标签页"
+msgstr "为 GUI 自定义标签页的标签"
msgid "custom tab page tooltip for the GUI"
-msgstr "GUI 自定义标签页的工具提示"
+msgstr "为 GUI 自定义标签页的工具提示"
msgid "terminal"
msgstr "终端"
msgid "name of the used terminal"
-msgstr "使用的终端的名字"
+msgstr "使用中的终端的名字"
msgid "alias for 'term'"
msgstr "'term' 的别名"
@@ -8909,7 +8909,7 @@ msgid "request terminal key codes when an xterm is detected"
msgstr "当检测到 xterm 时,请求终端键码"
msgid "terminal that requires extra redrawing"
-msgstr "需要额外重绘的终端"
+msgstr "终端需要额外的重绘"
msgid "recognize keys that start with <Esc> in Insert mode"
msgstr "识别在插入模式下以 <Esc> 开头的键"
@@ -8939,7 +8939,7 @@ msgid "set the text of the icon for this window"
msgstr "设置此窗口图标的文本"
msgid "when not empty, text for the icon of this window"
-msgstr "此窗口图标非空的文本"
+msgstr "非空时,设置此窗口图标的文本"
msgid "restore the screen contents when exiting Vim"
msgstr "退出 Vim 时恢复屏幕内容"
@@ -8965,13 +8965,13 @@ msgstr "报告鼠标移动事件"
msgid ""
"\"extend\", \"popup\" or \"popup_setpos\"; what the right\n"
"mouse button is used for"
-msgstr "鼠标按钮用于"
+msgstr "\"extend\", \"popup\" 或 \"popup_setpos\"; 鼠标右键用于什么"
msgid "maximum time in msec to recognize a double-click"
msgstr "识别双击的最大时间(以毫秒计)"
msgid "\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse"
-msgstr "鼠标类型:\"xterm\", \"xterm2\", \"sgr\" 等"
+msgstr "\"xterm\", \"xterm2\", \"sgr\" 等; 鼠标类型"
msgid "what the mouse pointer looks like in different modes"
msgstr "鼠标指针在不同模式下的样子"
@@ -8986,7 +8986,7 @@ msgid "pair of fonts to be used, for multibyte editing"
msgstr "用于多字节编辑的字体对"
msgid "list of font names to be used for double-wide characters"
-msgstr "用于双宽字符的字体名称列表"
+msgstr "用于双宽度字符的字体名称列表"
msgid "use smooth, antialiased fonts"
msgstr "使用平滑、抗锯齿的字体"
@@ -8995,13 +8995,13 @@ msgid "list of flags that specify how the GUI works"
msgstr "指定 GUI 工作方式的标志列表"
msgid "\"icons\", \"text\" and/or \"tooltips\"; how to show the toolbar"
-msgstr "如何显示工具条:\"icons\", \"text\" 和/或 \"tooltips\""
+msgstr "\"icons\", \"text\" 和/或 \"tooltips\"; 如何显示工具栏"
msgid "size of toolbar icons"
msgstr "工具栏图标大小"
msgid "room (in pixels) left above/below the window"
-msgstr "窗口上方/下方的空间(以像素为单位)"
+msgstr "窗口上方/下方的空间(以像素为单位)"
msgid "list of ASCII characters that can be combined into complex shapes"
msgstr "可以组合成复杂形状的 ASCII 字符列表"
@@ -9010,63 +9010,63 @@ msgid "options for text rendering"
msgstr "文本渲染选项"
msgid "use a pseudo-tty for I/O to external commands"
-msgstr "外部命令的 I/O 的伪 tty"
+msgstr "对外部命令的 I/O 使用伪终端"
msgid ""
"\"last\", \"buffer\" or \"current\": which directory used for the file "
"browser"
-msgstr "文件浏览器使用哪个目录:\"last\", \"buffer\" 或 \"current\""
+msgstr "\"last\", \"buffer\" 或 \"current\"; 文件浏览器使用哪个目录"
msgid "language to be used for the menus"
msgstr "菜单使用的语言"
msgid "maximum number of items in one menu"
-msgstr "菜单中的最大项目数量"
+msgstr "单个菜单中的最大项目数量"
msgid "\"no\", \"yes\" or \"menu\"; how to use the ALT key"
-msgstr "如何使用ALT键:\"no\", \"yes\" 或 \"menu\""
+msgstr "\"no\", \"yes\" 或 \"menu\"; 如何使用 ALT 键"
msgid "number of pixel lines to use between characters"
msgstr "字符之间使用的像素行数"
msgid "delay in milliseconds before a balloon may pop up"
-msgstr "延迟数毫秒后,气泡可能会弹出"
+msgstr "延迟指定毫秒后,气泡可能会弹出"
msgid "use balloon evaluation in the GUI"
-msgstr "在 GUI 中使用气泡评估"
+msgstr "在 GUI 中使用气泡求值"
msgid "use balloon evaluation in the terminal"
-msgstr "在终端中使用气泡评估"
+msgstr "在终端中使用气泡求值"
msgid "expression to show in balloon eval"
-msgstr "要在气泡 eval 中显示的表达式"
+msgstr "在气泡求值中显示的表达式"
msgid "printing"
msgstr "打印"
msgid "list of items that control the format of :hardcopy output"
-msgstr "控制格式的项目列表 :hardcopy 输出"
+msgstr "控制 :hardcopy 输出格式的项目列表"
msgid "name of the printer to be used for :hardcopy"
-msgstr "使用的打印机名称:hardcopy"
+msgstr "用于 :hardcopy 的打印机名称"
msgid "expression used to print the PostScript file for :hardcopy"
-msgstr "用于打印 PostScript 文件的表达式 :hardcopy"
+msgstr "用于 :hardcopy 打印 PostScript 文件的表达式"
msgid "name of the font to be used for :hardcopy"
-msgstr "要使用的字体名称:hardcopy"
+msgstr ":hardcopy 使用的字体名称"
msgid "format of the header used for :hardcopy"
-msgstr "用于:hardcopy 的文件头格式"
+msgstr "用于 :hardcopy 的标头格式"
msgid "encoding used to print the PostScript file for :hardcopy"
msgstr "用于 :hardcopy 打印 PostScript 文件的编码"
msgid "the CJK character set to be used for CJK output from :hardcopy"
-msgstr "从 :hardcopy 用于 CJK 输出的 CJK 字符集"
+msgstr ":hardcopy 用于 CJK 输出的 CJK 字符集"
msgid "list of font names to be used for CJK output from :hardcopy"
-msgstr "从 :hardcopy 用于 CJK 输出的字体名称列表"
+msgstr ":hardcopy 用于 CJK 输出的字体名称列表"
msgid "messages and info"
msgstr "消息和信息"
@@ -9078,7 +9078,7 @@ msgid "list of flags to make messages shorter"
msgstr "使消息更短的标志列表"
msgid "show (partial) command keys in the status line"
-msgstr "在状态行中显示(部分)命令键"
+msgstr "在状态行中显示(不完整的)命令键"
msgid "display the current mode in the status line"
msgstr "在状态行中显示当前模式"
@@ -9087,10 +9087,10 @@ msgid "show cursor position below each window"
msgstr "在每个窗口下方显示光标的位置"
msgid "alternate format to be used for the ruler"
-msgstr "标尺的替代格式"
+msgstr "ruler 的替代格式"
msgid "threshold for reporting number of changed lines"
-msgstr "报告更改行数的阈值"
+msgstr "报告已更改行数的阈值"
msgid "the higher the more messages are given"
msgstr "等级越高,给出的信息越多"
@@ -9099,7 +9099,7 @@ msgid "file to write messages in"
msgstr "用于写入消息的文件"
msgid "pause listings when the screen is full"
-msgstr "当屏幕满时的暂停显示清单"
+msgstr "当屏幕满时暂停显示清单"
msgid "start a dialog when a command fails"
msgstr "当命令失败时开启对话框"
@@ -9120,76 +9120,76 @@ msgid "selecting text"
msgstr "选择文本"
msgid "\"old\", \"inclusive\" or \"exclusive\"; how selecting text behaves"
-msgstr "如何选择文本: \"old\", \"inclusive\" 或 \"exclusive\""
+msgstr "\"old\", \"inclusive\" 或 \"exclusive\"; 如何选择文本"
msgid ""
"\"mouse\", \"key\" and/or \"cmd\"; when to start Select mode\n"
"instead of Visual mode"
-msgstr "何时启动选择模式而不是可视化模式:\"mouse\", \"key\" 和/或 \"cmd\""
+msgstr "\"mouse\", \"key\" 和/或 \"cmd\"; 何时启动选择模式而不是可视模式"
msgid ""
"\"unnamed\" to use the * register like unnamed register\n"
"\"autoselect\" to always put selected text on the clipboard"
msgstr ""
-"像未命名寄存器一样使用*寄存器:\"unnamed\"\n"
-"将选择的文本始终放在剪贴板上: \"autoselect\""
+"\"unnamed\": 像无名寄存器一样使用 * 寄存器\n"
+"\"autoselect\": 将选择的文本始终放在剪贴板上"
msgid "\"startsel\" and/or \"stopsel\"; what special keys can do"
-msgstr "特殊键可以做:\"startsel\" 和/或 \"stopsel\""
+msgstr "\"startsel\" 和/或 \"stopsel\"; 特殊键可以做"
msgid "editing text"
msgstr "编辑文本"
msgid "maximum number of changes that can be undone"
-msgstr "可以撤消的最大更改数"
+msgstr "可以撤销的最大更改数"
msgid "automatically save and restore undo history"
-msgstr "自动保存和恢复撤消的历史记录"
+msgstr "自动保存和恢复撤销历史"
msgid "list of directories for undo files"
-msgstr "撤消的文件的目录列表"
+msgstr "撤销文件的目录列表"
msgid "maximum number lines to save for undo on a buffer reload"
msgstr "缓冲区重新加载时为撤销保存的最大行数"
msgid "changes have been made and not written to a file"
-msgstr "已经进行了修改,但没有被写入文件"
+msgstr "已经做出了修改,但没有被写入文件"
msgid "buffer is not to be written"
-msgstr "缓冲区不被写入"
+msgstr "缓冲区不会被写入"
msgid "changes to the text are possible"
msgstr "可以对文本进行更改"
msgid "line length above which to break a line"
-msgstr "超过行长度就要断行"
+msgstr "超过行长度就断行"
msgid "margin from the right in which to break a line"
-msgstr "从右侧划线的空白"
+msgstr "断行开始的右边距"
msgid "specifies what <BS>, CTRL-W, etc. can do in Insert mode"
msgstr "指定 <BS>, CTRL-W 等在插入模式下可以做什么"
msgid "definition of what comment lines look like"
-msgstr "注释行外观的定义"
+msgstr "定义注释行长什么样"
msgid "list of flags that tell how automatic formatting works"
-msgstr "说明自动格式化如何工作的标志列表"
+msgstr "控制自动格式化如何工作的标志列表"
msgid "pattern to recognize a numbered list"
msgstr "识别编号列表的模式"
msgid "expression used for \"gq\" to format lines"
-msgstr "用于格式化行的 \"gq\" 使用的表达式"
+msgstr "用 \"gq\" 格式化行时使用的表达式"
msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P"
-msgstr "指定 CTRL-N 和 CTRL-P 的插入模式补全工作方式"
+msgstr "指定使用 CTRL-N 和 CTRL-P 进行插入模式补全的工作方式"
msgid "whether to use a popup menu for Insert mode completion"
msgstr "是否在插入模式补全时使用弹出菜单"
msgid "options for the Insert mode completion info popup"
-msgstr "插入模式补全信息弹出的选项"
+msgstr "插入模式补全信息弹框的选项"
msgid "maximum height of the popup menu"
msgstr "弹出菜单的最大高度"
@@ -9216,56 +9216,56 @@ msgid "adjust case of a keyword completion match"
msgstr "调整关键字补全匹配的大小写"
msgid "enable entering digraphs with c1 <BS> c2"
-msgstr "允许使用 c1 <BS> c2 进入有向图;c2"
+msgstr "支持使用 c1 <BS> c2 输入二合字符"
msgid "the \"~\" command behaves like an operator"
-msgstr "\"~\"命令表现地像操作符"
+msgstr "\"~\"命令表现得像操作符"
msgid "function called for the \"g@\" operator"
-msgstr "函数调用 \"g@\" 操作符"
+msgstr "\"g@\" 操作符调用的函数"
msgid "when inserting a bracket, briefly jump to its match"
-msgstr "当插入括号时,直接跳转到它匹配的括号"
+msgstr "当插入括号时,短暂地跳转到匹配它的括号"
msgid "tenth of a second to show a match for 'showmatch'"
-msgstr "需要十分之一秒显示'showmatch'的匹配"
+msgstr "显示 'showmatch' 的匹配的时长(以十分之一秒计)"
msgid "list of pairs that match for the \"%\" command"
-msgstr "与 \"%\" 命令匹配的对列表"
+msgstr "\"%\" 命令匹配的对列表"
msgid "use two spaces after '.' when joining a line"
-msgstr "连接行时,在 '.' 后面添加两个空格。"
+msgstr "连接行时,在 '.' 后面添加两个空格"
msgid ""
"\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\n"
"recognized for CTRL-A and CTRL-X commands"
msgstr ""
-"CTRL-A 和 CTRL-X 命令识别的数字格式:\n"
-"\"alpha\", \"octal\", \"hex\", \"bin\" 和/或 \"unsigned\""
+"\"alpha\", \"octal\", \"hex\", \"bin\" 和/或 \"unsigned\"\n"
+"CTRL-A 和 CTRL-X 命令识别的数字的格式"
msgid "tabs and indenting"
msgstr "Tab 和缩进"
msgid "number of spaces a <Tab> in the text stands for"
-msgstr "<Tab> 在文中代表空格的数量"
+msgstr "<Tab> 在文本中代表的空格数"
msgid "number of spaces used for each step of (auto)indent"
-msgstr "每步(自动)缩进所使用的空格数"
+msgstr "每步(自动)缩进所使用的空格数"
msgid "list of number of spaces a tab counts for"
-msgstr "tab 计数的空格数列表"
+msgstr "tab 代表的空格数的列表"
msgid "list of number of spaces a soft tabsstop counts for"
-msgstr "软制表符计数的空格数列表"
+msgstr "软制表符代表的空格数的列表"
msgid "a <Tab> in an indent inserts 'shiftwidth' spaces"
-msgstr "用 <Tab> 键缩进的时候插入 'shiftwidth' 个空格"
+msgstr "用 <Tab> 键缩进时插入 'shiftwidth' 个空格"
msgid "if non-zero, number of spaces to insert for a <Tab>"
-msgstr "如果非零,为 <Tab> 插入的空格数。"
+msgstr "如果非零,为 <Tab> 插入的空格数"
msgid "round to 'shiftwidth' for \"<<\" and \">>\""
-msgstr "用 \"<<\" 或 \">>\" 快捷键缩进时,插入 'shiftwidth' 整数倍个空格"
+msgstr "用 \"<<\" 和 \">>\" 缩进时,插入 'shiftwidth' 整数倍个空格"
msgid "expand <Tab> to spaces in Insert mode"
msgstr "在插入模式下将 <Tab> 展开为空格"
@@ -9274,7 +9274,7 @@ msgid "automatically set the indent of a new line"
msgstr "自动设置新行缩进"
msgid "do clever autoindenting"
-msgstr "自动缩进"
+msgstr "智能自动缩进"
msgid "enable specific indenting for C code"
msgstr "为 C 代码启用特定的缩进"
@@ -9298,10 +9298,10 @@ msgid "keys that trigger indenting with 'indentexpr' in Insert mode"
msgstr "在插入模式下使用 'indentexpr' 触发缩进的键"
msgid "copy whitespace for indenting from previous line"
-msgstr "从上一行复制用于缩进的空格"
+msgstr "为缩进从上一行复制空白字符"
msgid "preserve kind of whitespace when changing indent"
-msgstr "在更改缩进时保留空白"
+msgstr "在更改缩进时保留空白类型"
msgid "enable lisp mode"
msgstr "启用 lisp 模式"
@@ -9313,31 +9313,31 @@ msgid "folding"
msgstr "折叠"
msgid "unset to display all folds open"
-msgstr "取消设置以显示所有折叠打开"
+msgstr "取消设置以打开所有折叠"
msgid "folds with a level higher than this number will be closed"
-msgstr "比这个数字高一等级的折叠将被关闭"
+msgstr "等级比这个数字高的折叠将被关闭"
msgid "value for 'foldlevel' when starting to edit a file"
msgstr "开始编辑文件时,'foldlevel' 的值"
msgid "width of the column used to indicate folds"
-msgstr "用来表示折叠的列宽"
+msgstr "用来指示折叠的列的宽度"
msgid "expression used to display the text of a closed fold"
-msgstr "用于显示关闭折叠的文本"
+msgstr "用于显示已关闭折叠的表达式"
msgid "set to \"all\" to close a fold when the cursor leaves it"
-msgstr "设置为 \"all\" 用于在光标离开时关闭折叠"
+msgstr "设置为 \"all\" 来在光标离开时关闭折叠"
msgid "specifies for which commands a fold will be opened"
-msgstr "指定打开折叠的命令"
+msgstr "指定会打开折叠的命令"
msgid "minimum number of screen lines for a fold to be closed"
-msgstr "要关闭折叠所需的最小行数"
+msgstr "可关闭折叠所需的最小屏幕行数"
msgid "template for comments; used to put the marker in"
-msgstr "注释的模板,模板里有占位符"
+msgstr "注释的模板,用于放置折叠标记"
msgid ""
"folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n"
@@ -9350,13 +9350,13 @@ msgid "expression used when 'foldmethod' is \"expr\""
msgstr "当 'foldmethod' 为 \"expr\" 时使用的表达式"
msgid "used to ignore lines when 'foldmethod' is \"indent\""
-msgstr "当 'foldmethod' 为 \"indent\" 时忽略的行"
+msgstr "当 'foldmethod' 为 \"indent\" 时用于忽略行"
msgid "markers used when 'foldmethod' is \"marker\""
-msgstr "当 'foldmethod' 为 \"marker\" 时的标志"
+msgstr "当 'foldmethod' 为 \"marker\" 时所使用的标记"
msgid "maximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\""
-msgstr "当 'foldmethod' 为 \"indent\" 或 \"syntax\"时的最大折叠深度"
+msgstr "当 'foldmethod' 为 \"indent\" 或 \"syntax\" 时的最大折叠深度"
msgid "diff mode"
msgstr "差异模式"
@@ -9380,37 +9380,37 @@ msgid "maximum depth of mapping"
msgstr "最大映射深度"
msgid "recognize mappings in mapped keys"
-msgstr "识别映射键中的映射"
+msgstr "识别已映射键中的映射"
msgid "allow timing out halfway into a mapping"
msgstr "允许在映射中途超时"
msgid "allow timing out halfway into a key code"
-msgstr "允许在映射的中途暂停"
+msgstr "允许在键码中途超时"
msgid "time in msec for 'timeout'"
-msgstr "超时时间 (以毫秒计)"
+msgstr "'timeout' 的时间(以毫秒计)"
msgid "time in msec for 'ttimeout'"
-msgstr "键盘代码超时时间 (以毫秒计)"
+msgstr "'ttimeout' 的时间(以毫秒计)"
msgid "reading and writing files"
msgstr "读写文件"
msgid "enable using settings from modelines when reading a file"
-msgstr "Vim 读取文件的时候是否允许使用 modeline 里指定的设置"
+msgstr "读取文件时是否使用 modeline 里的设置"
msgid "allow setting expression options from a modeline"
msgstr "允许从 modeline 中设置表达式选项"
msgid "number of lines to check for modelines"
-msgstr "检查 modeline 的行数"
+msgstr "为 modeline 而检查的行数"
msgid "binary file editing"
msgstr "二进制文件编辑"
msgid "last line in the file has an end-of-line"
-msgstr "文件的最后一行有一个换行符"
+msgstr "文件的最后一行有换行符"
msgid "fixes missing end-of-line at end of text file"
msgstr "修复文本文件末尾缺少换行符的问题"
@@ -9419,10 +9419,10 @@ msgid "prepend a Byte Order Mark to the file"
msgstr "在文件前加上字节顺序标记"
msgid "end-of-line format: \"dos\", \"unix\" or \"mac\""
-msgstr "换行符格式: \"dos\", \"unix\" or \"mac\""
+msgstr "换行符格式: \"dos\", \"unix\" 或 \"mac\""
msgid "list of file formats to look for when editing a file"
-msgstr "编辑文件时要查找的文件格式列表"
+msgstr "编辑文件时要检查的文件格式列表"
msgid "obsolete, use 'fileformat'"
msgstr "已废止,用 'fileformat'"
@@ -9434,16 +9434,16 @@ msgid "writing files is allowed"
msgstr "允许写入文件"
msgid "write a backup file before overwriting a file"
-msgstr "覆盖备份文件前,请先写入备份文件"
+msgstr "覆盖文件前先写入备份文件"
msgid "keep a backup after overwriting a file"
-msgstr "覆盖文件后进行备份"
+msgstr "覆盖文件后保留备份"
msgid "patterns that specify for which files a backup is not made"
-msgstr "指定不为哪些文件进行备份的模式"
+msgstr "不备份的文件的模式"
msgid "whether to make the backup as a copy or rename the existing file"
-msgstr "是否以副本形式进行备份或重命名现有文件"
+msgstr "通过复制还是重命名已有文件进行备份"
msgid "list of directories to put backup files in"
msgstr "存放备份文件的目录列表"
@@ -9458,22 +9458,22 @@ msgid "as 'autowrite', but works with more commands"
msgstr "类似于 'autowrite',但适用于更多命令"
msgid "always write without asking for confirmation"
-msgstr "写时不需要确认"
+msgstr "写文件时总是不需要确认"
msgid "automatically read a file when it was modified outside of Vim"
-msgstr "当文件在Vim之外被修改时,自动读取文件"
+msgstr "在 Vim 之外修改了文件时,自动读取文件"
msgid "keep oldest version of a file; specifies file name extension"
-msgstr "保存最旧版本的文件; 指定文件扩展名"
+msgstr "保存最旧版本的文件;指定文件扩展名"
msgid "forcibly sync the file to disk after writing it"
msgstr "文件写入后强制同步到磁盘"
msgid "use 8.3 file names"
-msgstr "文件名使用为 8.3 格式"
+msgstr "使用 8.3 格式的文件名"
msgid "encryption method for file writing: zip, blowfish or blowfish2"
-msgstr "文件写入加密方法:zip, blowfish 或 blowfish2"
+msgstr "写入文件时使用的加密算法:zip, blowfish 或 blowfish2"
msgid "the swap file"
msgstr "交换文件"
@@ -9485,19 +9485,19 @@ msgid "use a swap file for this buffer"
msgstr "对这个缓冲区使用交换文件"
msgid "\"sync\", \"fsync\" or empty; how to flush a swap file to disk"
-msgstr "如何将交换文件刷新到磁盘:\"sync\", \"fsync\" 或 empty"
+msgstr "\"sync\", \"fsync\" 或留空; 将交换文件刷新到磁盘的方式"
msgid "number of characters typed to cause a swap file update"
msgstr "导致交换文件更新的字符数"
msgid "time in msec after which the swap file will be updated"
-msgstr "刷新交换文件所需的毫秒数"
+msgstr "更新交换文件前所需的毫秒数"
msgid "maximum amount of memory in Kbyte used for one buffer"
-msgstr "缓冲区使用的最大内存量(以千字节为单位)"
+msgstr "单个缓冲区使用的最大内存量(以千字节为单位)"
msgid "maximum amount of memory in Kbyte used for all buffers"
-msgstr "所有缓冲区使用的最大内存量(以千字节为单位)"
+msgstr "所有缓冲区使用的最大内存量(以千字节为单位)"
# do not translate to avoid writing Chinese in files
msgid "command line editing"
@@ -9516,7 +9516,7 @@ msgid "specifies how command line completion works"
msgstr "指定命令行如何补全"
msgid "empty or \"tagfile\" to list file name of matching tags"
-msgstr "空或 \"tagfile\" 来列出匹配标记的文件名"
+msgstr "空或 \"tagfile\" 来列出匹配标签的文件名"
msgid "list of file name extensions that have a lower priority"
msgstr "优先级低的文件扩展名列表"
@@ -9525,13 +9525,13 @@ msgid "list of file name extensions added when searching for a file"
msgstr "搜索文件时添加的文件扩展名列表"
msgid "list of patterns to ignore files for file name completion"
-msgstr "为补全文件名而忽略文件的模式列表"
+msgstr "文件名补全所忽略文件的模式列表"
msgid "ignore case when using file names"
msgstr "使用文件名时忽略大小写"
msgid "ignore case when completing file names"
-msgstr "在补全文件名时忽略大小写"
+msgstr "补全文件名时忽略大小写"
msgid "command-line completion shows a list of matches"
msgstr "命令行补全时显示匹配列表"
@@ -9549,37 +9549,37 @@ msgid "name of the shell program used for external commands"
msgstr "用于外部命令的 shell 程序的名称"
msgid "when to use the shell or directly execute a command"
-msgstr "何时使用 shell 或直接执行命令"
+msgstr "何时使用 shell 还是直接执行命令"
msgid "character(s) to enclose a shell command in"
-msgstr "用于封装 shell 命令的字符"
+msgstr "用于包围 shell 命令的字符"
msgid "like 'shellquote' but include the redirection"
-msgstr "类似'shellquote',但包含重定向"
+msgstr "类似 'shellquote',但包含重定向"
msgid "characters to escape when 'shellxquote' is ("
-msgstr "'shellxquote' 为 ( 时使用的转义字符"
+msgstr "'shellxquote' 为 ( 时需要转义的字符"
msgid "argument for 'shell' to execute a command"
msgstr "'shell' 执行命令的参数"
msgid "used to redirect command output to a file"
-msgstr "将命令输出重定向到文件"
+msgstr "用于将命令输出重定向到文件"
msgid "use a temp file for shell commands instead of using a pipe"
-msgstr "对 shell 命令使用临时文件,而不是使用管道"
+msgstr "对 shell 命令使用临时文件而不是管道"
msgid "program used for \"=\" command"
msgstr "用于 \"=\" 命令的程序"
msgid "program used to format lines with \"gq\" command"
-msgstr "用 \"gq\" 命令格式化代码时,使用的外部格式化程序"
+msgstr "用 \"gq\" 命令格式化代码时使用的程序"
msgid "program used for the \"K\" command"
msgstr "用于 \"K\" 命令的程序"
msgid "warn when using a shell command and a buffer has changes"
-msgstr "当使用 shell 命令和缓冲区发生变化时发出警告"
+msgstr "当使用 shell 命令并且缓冲区有修改时发出警告"
msgid "running make and jumping to errors (quickfix)"
msgstr "运行 make 并跳到错误(快速修复)"
@@ -9609,13 +9609,13 @@ msgid "encoding of the \":make\" and \":grep\" output"
msgstr "\":make\" 和 \":grep\" 输出的编码"
msgid "function to display text in the quickfix window"
-msgstr "快速修复窗口中显示文本的函数"
+msgstr "用于在快速修复窗口中显示文本的函数"
msgid "system specific"
msgstr "系统特定"
msgid "use forward slashes in file names; for Unix-like shells"
-msgstr "类 unix shells 中,在文件名中使用正斜杠;"
+msgstr "在文件名中使用正斜杠;用于类 Unix shell"
msgid "specifies slash/backslash used for completion"
msgstr "指定补全时使用的斜杠/反斜杠"
@@ -9645,25 +9645,25 @@ msgid "when to edit the command-line right-to-left"
msgstr "何时从右到左编辑命令行"
msgid "insert characters backwards"
-msgstr "向后插入字符"
+msgstr "倒序插入字符"
msgid "allow CTRL-_ in Insert and Command-line mode to toggle 'revins'"
-msgstr "允许 CTRL-_ 在插入和命令行模式下切换 'revins'"
+msgstr "在插入和命令行模式下允许 CTRL-_ 切换 'revins'"
msgid "the ASCII code for the first letter of the Hebrew alphabet"
msgstr "希伯来字母表第一个字母的 ASCII 码"
msgid "use Hebrew keyboard mapping"
-msgstr "使用希伯来键盘映射"
+msgstr "使用希伯来语键盘映射"
msgid "use phonetic Hebrew keyboard mapping"
-msgstr "使用希伯来语的音节键盘映射"
+msgstr "使用希伯来语的语音键盘映射"
msgid "prepare for editing Arabic text"
msgstr "准备编辑阿拉伯语文本"
msgid "perform shaping of Arabic characters"
-msgstr "阿拉伯语的字型重整"
+msgstr "阿拉伯语的字形重整"
msgid "terminal will perform bidi handling"
msgstr "终端支持双向文本"
@@ -9687,10 +9687,10 @@ msgid "input method style, 0: on-the-spot, 1: over-the-spot"
msgstr "输入法样式:0:on-the-spot;1:over-the-spot"
msgid "entering a search pattern: 1: use :lmap; 2: use IM; 0: neither"
-msgstr "进入搜索模式:1:使用 :lamp;2:使用输入法;0:都不用"
+msgstr "输入搜索模式时:1:使用 :lamp;2:使用输入法;0:都不用"
msgid "when set always use IM when starting to edit a command line"
-msgstr "如果设置,在开始编辑命令行时总是使用输入法"
+msgstr "如果设置,开始编辑命令行时总是使用输入法"
msgid "function to obtain IME status"
msgstr "获取输入法状态的函数"
@@ -9730,7 +9730,7 @@ msgid "key that activates the X input method"
msgstr "激活 X 输入方法的键"
msgid "width of ambiguous width characters"
-msgstr "多宽度字符的宽度"
+msgstr "宽度有歧义字符的宽度"
msgid "emoji characters are full width"
msgstr "表情字符视作全宽"
@@ -9742,53 +9742,52 @@ msgid ""
"when to use virtual editing: \"block\", \"insert\", \"all\"\n"
"and/or \"onemore\""
msgstr ""
-"何时使用虚拟编辑:\"block\", \"insert\", \"all\"\n"
-"和/或 \"onemore\""
+"何时使用虚拟编辑:\"block\", \"insert\", \"all\" 和/或 \"onemore\""
msgid "list of autocommand events which are to be ignored"
-msgstr "需要忽略的自动命令事件列表"
+msgstr "要忽略的自动命令事件列表"
msgid "load plugin scripts when starting up"
msgstr "启动时加载插件脚本"
msgid "enable reading .vimrc/.exrc/.gvimrc in the current directory"
-msgstr "在当前目录下能够阅读 .vimrc/.exrc/.gvimrc"
+msgstr "启用读取在当前目录下的 .vimrc/.exrc/.gvimrc"
msgid "safer working with script files in the current directory"
-msgstr "在当前目录下使用脚本文件更安全"
+msgstr "在当前目录下使用脚本文件时更安全"
msgid "use the 'g' flag for \":substitute\""
-msgstr "缺省打开 \":substitute\" 的 'g' 标志"
+msgstr "打开 \":substitute\" 的 'g' 标志"
msgid "'g' and 'c' flags of \":substitute\" toggle"
-msgstr "\":substitute\" 开关的 'g' and 'c' 标志"
+msgstr "\":substitute\" 的 'g' and 'c' 标志用作开关切换"
msgid "allow reading/writing devices"
-msgstr "允许读/写设备"
+msgstr "允许读写设备"
msgid "maximum depth of function calls"
msgstr "函数调用的最大深度"
msgid "list of words that specifies what to put in a session file"
-msgstr "指定在会话文件中放入内容的单词列表"
+msgstr "指定放入会话文件的内容的单词列表"
msgid "list of words that specifies what to save for :mkview"
-msgstr "指定保存内容的单词列表 :mkview"
+msgstr "指定 :mkview 保存的内容的单词列表"
msgid "directory where to store files with :mkview"
-msgstr "存放文件的目录 :mkview"
+msgstr ":mkview 存放文件的目录"
msgid "list that specifies what to write in the viminfo file"
-msgstr "指定在 viminfo 文件中写入内容的列表"
+msgstr "指定在 viminfo 文件中写入的内容的列表"
msgid "file name used for the viminfo file"
-msgstr "viminfo文件使用的文件名"
+msgstr "viminfo 文件使用的文件名"
msgid "what happens with a buffer when it's no longer in a window"
msgstr "当缓冲区不再位于窗口中时,会发生什么"
msgid "empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer"
-msgstr "缓冲区类型:空, \"nofile\", \"nowrite\", \"quickfix\"等"
+msgstr "空, \"nofile\", \"nowrite\", \"quickfix\" 等; 缓冲区类型"
msgid "whether the buffer shows up in the buffer list"
msgstr "缓冲区是否显示在缓冲区列表中"
@@ -9800,7 +9799,7 @@ msgid "whether to show the signcolumn"
msgstr "是否显示标号列"
msgid "interval in milliseconds between polls for MzScheme threads"
-msgstr "MzScheme 线程的轮询间隔(以毫秒为单位)"
+msgstr "MzScheme 线程的轮询间隔(以毫秒为单位)"
msgid "name of the Lua dynamic library"
msgstr "Lua 动态库的名字"
@@ -9809,7 +9808,7 @@ msgid "name of the Perl dynamic library"
msgstr "Perl 动态库的名字"
msgid "whether to use Python 2 or 3"
-msgstr "是否使用 Python 2 或 3"
+msgstr "是否使用 Python 2 和 3"
msgid "name of the Python 2 dynamic library"
msgstr "Python 2 动态库的名字"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 668918d24..35a4a1d48 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -3614,8 +3614,8 @@ msgstr "窗口"
msgid "tab"
msgstr "标签页"
-msgid "[end of lines]"
-msgstr "[结束所有规则]"
+#~ msgid "[end of lines]"
+#~ msgstr ""
msgid ""
"\n"
@@ -4599,8 +4599,8 @@ msgstr "E243: 不支持的参数: \"-%s\";请使用 OLE 版本。"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
-#~ msgstr "E244: 字体名 \"%3$s\" 中有非法 %1$s 名称 \"%2$s\""
+# msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
+# msgstr "E244: 字体名 \"%3$s\" 中有非法 %1$s 名称 \"%2$s\""
#, c-format
msgid "E245: Illegal char '%c' in font name \"%s\""
@@ -4838,8 +4838,8 @@ msgstr "E315: ml_get: 无效的 lnum: %ld"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
-#~ msgstr "E316: ml_get: 在缓冲区 %2$d %3$s 中找不到第 %1$ld 行"
+# msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
+# msgstr "E316: ml_get: 在缓冲区 %2$d %3$s 中找不到第 %1$ld 行"
msgid "E317: Pointer block id wrong"
msgstr "E317: 指针块 id 错误"
@@ -7248,8 +7248,8 @@ msgstr "E1036: %c 需要整数或者浮点数参数"
# reorder if possible
#, fuzzy, c-format
-#~ msgid "E1037: Cannot use \"%s\" with %s"
-#~ msgstr "E1037: 不能对 %2$s 使用 \"%1$s\""
+# msgid "E1037: Cannot use \"%s\" with %s"
+# msgstr "E1037: 不能对 %2$s 使用 \"%1$s\""
msgid "E1038: \"vim9script\" can only be used in a script"
msgstr "E1038: \"vim9script\" 只能在脚本中使用"
@@ -8567,7 +8567,7 @@ msgid "change the way backslashes are used in search patterns"
msgstr "改变反斜杠在搜索模式中的使用方式"
msgid "select the default regexp engine used"
-msgstr "选择使用的缺省的正则表达式引擎"
+msgstr "选择默认的正则表达式引擎"
msgid "ignore case when using a search pattern"
msgstr "使用搜索模式时忽略大小写"
@@ -8579,7 +8579,7 @@ msgid "what method to use for changing case of letters"
msgstr "用什么方法来改变字母的大小写"
msgid "maximum amount of memory in Kbyte used for pattern matching"
-msgstr "模式匹配使用的最大内存(以千字节为单位)"
+msgstr "模式匹配使用的最大内存(以千字节为单位)"
msgid "pattern for a macro definition line"
msgstr "宏定义行的模式"
@@ -8616,7 +8616,7 @@ msgid "a :tag command will use the tagstack"
msgstr ":tag 命令将使用 tagstack"
msgid "when completing tags in Insert mode show more info"
-msgstr "当完成标签在插入模式显示更多信息"
+msgstr "在插入模式补全标签时显示更多信息"
msgid "a function to be used to perform tag searches"
msgstr "用于执行标签搜索的函数"
@@ -8628,16 +8628,16 @@ msgid "use cscope for tag commands"
msgstr "标签命令使用 cscope"
msgid "0 or 1; the order in which \":cstag\" performs a search"
-msgstr "0或1; \":cstag\"执行搜索的顺序"
+msgstr "0 或 1; \":cstag\" 执行搜索的顺序"
msgid "give messages when adding a cscope database"
msgstr "在添加 cscope 数据库时给出消息"
msgid "how many components of the path to show"
-msgstr "要显示路径的多少个组件"
+msgstr "显示路径的多少个部分"
msgid "when to open a quickfix window for cscope"
-msgstr "何时打开 cscope 的快速修复窗口"
+msgstr "何时为 cscope 打开快速修复窗口"
msgid "file names in a cscope file are relative to that file"
msgstr "cscope 文件中的文件名是相对于该文件的"
@@ -8655,35 +8655,35 @@ msgid "long lines wrap"
msgstr "长行折行"
msgid "wrap long lines at a character in 'breakat'"
-msgstr "在 'breakat' 中的字符长度较长时需要换行"
+msgstr "在 'breakat' 中的字符处对长行折行"
msgid "preserve indentation in wrapped text"
-msgstr "在换行文本中保持缩进"
+msgstr "在折行文本中保持缩进"
msgid "adjust breakindent behaviour"
-msgstr "调整折行缩进的行为"
+msgstr "调整 breakindent 的行为"
msgid "which characters might cause a line break"
msgstr "哪些字符可能导致换行"
msgid "string to put before wrapped screen lines"
-msgstr "要放在回绕的屏幕线之前的字符串"
+msgstr "放在折回的屏幕行之前的字符串"
msgid "minimal number of columns to scroll horizontally"
msgstr "水平滚动的最小列数"
msgid "minimal number of columns to keep left and right of the cursor"
-msgstr "保留光标左右的最小列数"
+msgstr "保留在光标左右的最小列数"
msgid ""
"include \"lastline\" to show the last line even if it doesn't fit\n"
"include \"uhex\" to show unprintable characters as a hex number"
msgstr ""
"包含 \"lastline\" 来显示最后一行,即使它显示不下\n"
-"包含\"uhex\"以十六进制显示不可打印字符"
+"包含 \"uhex\" 以十六进制显示不可打印字符"
msgid "characters to use for the status line, folds and filler lines"
-msgstr "用于状态行、折叠行和填充行的字符"
+msgstr "用于状态行、折叠和填充行的字符"
msgid "number of lines used for the command-line"
msgstr "用于命令行的行数"
@@ -8712,7 +8712,7 @@ msgid "show <Tab> as ^I and end-of-line as $"
msgstr "以 ^I 显示 <Tab>, 以 $ 显示行尾"
msgid "list of strings used for list mode"
-msgstr "用于列表模式的字符串列表"
+msgstr "用于 list 模式的字符串列表"
msgid "show the line number for each line"
msgstr "对每一行显示行号"
@@ -8727,7 +8727,7 @@ msgid "controls whether concealable text is hidden"
msgstr "控制是否隐藏可隐藏文本"
msgid "modes in which text in the cursor line can be concealed"
-msgstr "隐藏光标行的文本的模式"
+msgstr "可隐藏光标行的文本的模式"
msgid "syntax, highlighting and spelling"
msgstr "语法、高亮和拼写"
@@ -8739,13 +8739,13 @@ msgid "type of file; triggers the FileType event when set"
msgstr "文件类型; 在设置时触发 FileType 事件"
msgid "name of syntax highlighting used"
-msgstr "使用的语法高亮显示的名称"
+msgstr "使用中的语法高亮显示的名称"
msgid "maximum column to look for syntax items"
-msgstr "查找语法项的最大列"
+msgstr "寻找语法项的最大列"
msgid "which highlighting to use for various occasions"
-msgstr "在各种场合使用哪些高亮提示"
+msgstr "在不同场合使用哪些高亮提示"
msgid "highlight all matches for the last used search pattern"
msgstr "高亮显示最后使用的搜索模式的所有匹配项"
@@ -8763,7 +8763,7 @@ msgid "highlight the screen line of the cursor"
msgstr "突出显示光标的屏幕行"
msgid "specifies which area 'cursorline' highlights"
-msgstr "指定 'cursorline' 突出显示的区域"
+msgstr "指定 'cursorline' 高亮显示的区域"
msgid "columns to highlight"
msgstr "要高亮的列"
@@ -8772,7 +8772,7 @@ msgid "highlight spelling mistakes"
msgstr "高亮拼写错误"
msgid "list of accepted languages"
-msgstr "已接受的语言列表"
+msgstr "接受的语言列表"
msgid "file that \"zg\" adds good words to"
msgstr "\"zg\" 添加正确单词的文件"
@@ -8787,7 +8787,7 @@ msgid "methods used to suggest corrections"
msgstr "用于建议修正的方法"
msgid "amount of memory used by :mkspell before compressing"
-msgstr ":mkspell 在压缩前使用的内存数量"
+msgstr ":mkspell 在压缩前使用的内存量"
msgid "multiple windows"
msgstr "多个窗口"
@@ -8808,7 +8808,7 @@ msgid "minimal number of lines used for the current window"
msgstr "当前窗口的最小行数"
msgid "minimal number of lines used for any window"
-msgstr "窗口的最小行数"
+msgstr "任何窗口的最小行数"
msgid "keep the height of the window"
msgstr "保持窗口的高度"
@@ -8820,13 +8820,13 @@ msgid "minimal number of columns used for the current window"
msgstr "当前窗口的最小列数"
msgid "minimal number of columns used for any window"
-msgstr "窗口的最小列数"
+msgstr "任何窗口的最小列数"
msgid "initial height of the help window"
msgstr "帮助窗口的初始高度"
msgid "use a popup window for preview"
-msgstr "使用一个弹出窗口预览"
+msgstr "使用弹出窗口来预览"
msgid "default height for the preview window"
msgstr "预览窗口的默认高度"
@@ -8849,22 +8849,22 @@ msgid "a new window is put right of the current one"
msgstr "新窗口放在当前窗口的右边"
msgid "this window scrolls together with other bound windows"
-msgstr "此窗口与其他绑定窗口一起滚动"
+msgstr "此窗口与其他已绑定的窗口一起滚动"
msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
-msgstr "'scrollbind'的选项列表: \"ver\", \"hor\" 和/或 \"jump\""
+msgstr "'scrollbind' 的选项列表: \"ver\", \"hor\" 和/或 \"jump\""
msgid "this window's cursor moves together with other bound windows"
-msgstr "此窗口的光标与其他绑定的 Windows 一起移动"
+msgstr "此窗口的光标与其他已绑定的窗口一起移动"
msgid "size of a terminal window"
msgstr "终端窗口的大小"
msgid "key that precedes Vim commands in a terminal window"
-msgstr "终端窗口中 Vim 命令前面的键"
+msgstr "终端窗口中 Vim 命令的前导键"
msgid "max number of lines to keep for scrollback in a terminal window"
-msgstr "终端窗口中用于滚动的最大行数"
+msgstr "终端窗口中用于回滚的最大行数"
msgid "type of pty to use for a terminal window"
msgstr "终端窗口的 pty 类型"
@@ -8879,22 +8879,22 @@ msgid "0, 1 or 2; when to use a tab pages line"
msgstr "0, 1 或 2; 何时使用标签页行"
msgid "maximum number of tab pages to open for -p and \"tab all\""
-msgstr "-p 和 \"tab all\" 打开的最大标签页数量"
+msgstr "-p 和 \"tab all\" 打开的最大标签页数"
msgid "custom tab pages line"
msgstr "自定义标签页行"
msgid "custom tab page label for the GUI"
-msgstr "GUI 的自定义标签页"
+msgstr "为 GUI 自定义标签页的标签"
msgid "custom tab page tooltip for the GUI"
-msgstr "GUI 自定义标签页的工具提示"
+msgstr "为 GUI 自定义标签页的工具提示"
msgid "terminal"
msgstr "终端"
msgid "name of the used terminal"
-msgstr "使用的终端的名字"
+msgstr "使用中的终端的名字"
msgid "alias for 'term'"
msgstr "'term' 的别名"
@@ -8909,7 +8909,7 @@ msgid "request terminal key codes when an xterm is detected"
msgstr "当检测到 xterm 时,请求终端键码"
msgid "terminal that requires extra redrawing"
-msgstr "需要额外重绘的终端"
+msgstr "终端需要额外的重绘"
msgid "recognize keys that start with <Esc> in Insert mode"
msgstr "识别在插入模式下以 <Esc> 开头的键"
@@ -8939,7 +8939,7 @@ msgid "set the text of the icon for this window"
msgstr "设置此窗口图标的文本"
msgid "when not empty, text for the icon of this window"
-msgstr "此窗口图标非空的文本"
+msgstr "非空时,设置此窗口图标的文本"
msgid "restore the screen contents when exiting Vim"
msgstr "退出 Vim 时恢复屏幕内容"
@@ -8965,13 +8965,13 @@ msgstr "报告鼠标移动事件"
msgid ""
"\"extend\", \"popup\" or \"popup_setpos\"; what the right\n"
"mouse button is used for"
-msgstr "鼠标按钮用于"
+msgstr "\"extend\", \"popup\" 或 \"popup_setpos\"; 鼠标右键用于什么"
msgid "maximum time in msec to recognize a double-click"
msgstr "识别双击的最大时间(以毫秒计)"
msgid "\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse"
-msgstr "鼠标类型:\"xterm\", \"xterm2\", \"sgr\" 等"
+msgstr "\"xterm\", \"xterm2\", \"sgr\" 等; 鼠标类型"
msgid "what the mouse pointer looks like in different modes"
msgstr "鼠标指针在不同模式下的样子"
@@ -8986,7 +8986,7 @@ msgid "pair of fonts to be used, for multibyte editing"
msgstr "用于多字节编辑的字体对"
msgid "list of font names to be used for double-wide characters"
-msgstr "用于双宽字符的字体名称列表"
+msgstr "用于双宽度字符的字体名称列表"
msgid "use smooth, antialiased fonts"
msgstr "使用平滑、抗锯齿的字体"
@@ -8995,13 +8995,13 @@ msgid "list of flags that specify how the GUI works"
msgstr "指定 GUI 工作方式的标志列表"
msgid "\"icons\", \"text\" and/or \"tooltips\"; how to show the toolbar"
-msgstr "如何显示工具条:\"icons\", \"text\" 和/或 \"tooltips\""
+msgstr "\"icons\", \"text\" 和/或 \"tooltips\"; 如何显示工具栏"
msgid "size of toolbar icons"
msgstr "工具栏图标大小"
msgid "room (in pixels) left above/below the window"
-msgstr "窗口上方/下方的空间(以像素为单位)"
+msgstr "窗口上方/下方的空间(以像素为单位)"
msgid "list of ASCII characters that can be combined into complex shapes"
msgstr "可以组合成复杂形状的 ASCII 字符列表"
@@ -9010,63 +9010,63 @@ msgid "options for text rendering"
msgstr "文本渲染选项"
msgid "use a pseudo-tty for I/O to external commands"
-msgstr "外部命令的 I/O 的伪 tty"
+msgstr "对外部命令的 I/O 使用伪终端"
msgid ""
"\"last\", \"buffer\" or \"current\": which directory used for the file "
"browser"
-msgstr "文件浏览器使用哪个目录:\"last\", \"buffer\" 或 \"current\""
+msgstr "\"last\", \"buffer\" 或 \"current\"; 文件浏览器使用哪个目录"
msgid "language to be used for the menus"
msgstr "菜单使用的语言"
msgid "maximum number of items in one menu"
-msgstr "菜单中的最大项目数量"
+msgstr "单个菜单中的最大项目数量"
msgid "\"no\", \"yes\" or \"menu\"; how to use the ALT key"
-msgstr "如何使用ALT键:\"no\", \"yes\" 或 \"menu\""
+msgstr "\"no\", \"yes\" 或 \"menu\"; 如何使用 ALT 键"
msgid "number of pixel lines to use between characters"
msgstr "字符之间使用的像素行数"
msgid "delay in milliseconds before a balloon may pop up"
-msgstr "延迟数毫秒后,气泡可能会弹出"
+msgstr "延迟指定毫秒后,气泡可能会弹出"
msgid "use balloon evaluation in the GUI"
-msgstr "在 GUI 中使用气泡评估"
+msgstr "在 GUI 中使用气泡求值"
msgid "use balloon evaluation in the terminal"
-msgstr "在终端中使用气泡评估"
+msgstr "在终端中使用气泡求值"
msgid "expression to show in balloon eval"
-msgstr "要在气泡 eval 中显示的表达式"
+msgstr "在气泡求值中显示的表达式"
msgid "printing"
msgstr "打印"
msgid "list of items that control the format of :hardcopy output"
-msgstr "控制格式的项目列表 :hardcopy 输出"
+msgstr "控制 :hardcopy 输出格式的项目列表"
msgid "name of the printer to be used for :hardcopy"
-msgstr "使用的打印机名称:hardcopy"
+msgstr "用于 :hardcopy 的打印机名称"
msgid "expression used to print the PostScript file for :hardcopy"
-msgstr "用于打印 PostScript 文件的表达式 :hardcopy"
+msgstr "用于 :hardcopy 打印 PostScript 文件的表达式"
msgid "name of the font to be used for :hardcopy"
-msgstr "要使用的字体名称:hardcopy"
+msgstr ":hardcopy 使用的字体名称"
msgid "format of the header used for :hardcopy"
-msgstr "用于:hardcopy 的文件头格式"
+msgstr "用于 :hardcopy 的标头格式"
msgid "encoding used to print the PostScript file for :hardcopy"
msgstr "用于 :hardcopy 打印 PostScript 文件的编码"
msgid "the CJK character set to be used for CJK output from :hardcopy"
-msgstr "从 :hardcopy 用于 CJK 输出的 CJK 字符集"
+msgstr ":hardcopy 用于 CJK 输出的 CJK 字符集"
msgid "list of font names to be used for CJK output from :hardcopy"
-msgstr "从 :hardcopy 用于 CJK 输出的字体名称列表"
+msgstr ":hardcopy 用于 CJK 输出的字体名称列表"
msgid "messages and info"
msgstr "消息和信息"
@@ -9078,7 +9078,7 @@ msgid "list of flags to make messages shorter"
msgstr "使消息更短的标志列表"
msgid "show (partial) command keys in the status line"
-msgstr "在状态行中显示(部分)命令键"
+msgstr "在状态行中显示(不完整的)命令键"
msgid "display the current mode in the status line"
msgstr "在状态行中显示当前模式"
@@ -9087,10 +9087,10 @@ msgid "show cursor position below each window"
msgstr "在每个窗口下方显示光标的位置"
msgid "alternate format to be used for the ruler"
-msgstr "标尺的替代格式"
+msgstr "ruler 的替代格式"
msgid "threshold for reporting number of changed lines"
-msgstr "报告更改行数的阈值"
+msgstr "报告已更改行数的阈值"
msgid "the higher the more messages are given"
msgstr "等级越高,给出的信息越多"
@@ -9099,7 +9099,7 @@ msgid "file to write messages in"
msgstr "用于写入消息的文件"
msgid "pause listings when the screen is full"
-msgstr "当屏幕满时的暂停显示清单"
+msgstr "当屏幕满时暂停显示清单"
msgid "start a dialog when a command fails"
msgstr "当命令失败时开启对话框"
@@ -9120,76 +9120,76 @@ msgid "selecting text"
msgstr "选择文本"
msgid "\"old\", \"inclusive\" or \"exclusive\"; how selecting text behaves"
-msgstr "如何选择文本: \"old\", \"inclusive\" 或 \"exclusive\""
+msgstr "\"old\", \"inclusive\" 或 \"exclusive\"; 如何选择文本"
msgid ""
"\"mouse\", \"key\" and/or \"cmd\"; when to start Select mode\n"
"instead of Visual mode"
-msgstr "何时启动选择模式而不是可视化模式:\"mouse\", \"key\" 和/或 \"cmd\""
+msgstr "\"mouse\", \"key\" 和/或 \"cmd\"; 何时启动选择模式而不是可视模式"
msgid ""
"\"unnamed\" to use the * register like unnamed register\n"
"\"autoselect\" to always put selected text on the clipboard"
msgstr ""
-"像未命名寄存器一样使用*寄存器:\"unnamed\"\n"
-"将选择的文本始终放在剪贴板上: \"autoselect\""
+"\"unnamed\": 像无名寄存器一样使用 * 寄存器\n"
+"\"autoselect\": 将选择的文本始终放在剪贴板上"
msgid "\"startsel\" and/or \"stopsel\"; what special keys can do"
-msgstr "特殊键可以做:\"startsel\" 和/或 \"stopsel\""
+msgstr "\"startsel\" 和/或 \"stopsel\"; 特殊键可以做"
msgid "editing text"
msgstr "编辑文本"
msgid "maximum number of changes that can be undone"
-msgstr "可以撤消的最大更改数"
+msgstr "可以撤销的最大更改数"
msgid "automatically save and restore undo history"
-msgstr "自动保存和恢复撤消的历史记录"
+msgstr "自动保存和恢复撤销历史"
msgid "list of directories for undo files"
-msgstr "撤消的文件的目录列表"
+msgstr "撤销文件的目录列表"
msgid "maximum number lines to save for undo on a buffer reload"
msgstr "缓冲区重新加载时为撤销保存的最大行数"
msgid "changes have been made and not written to a file"
-msgstr "已经进行了修改,但没有被写入文件"
+msgstr "已经做出了修改,但没有被写入文件"
msgid "buffer is not to be written"
-msgstr "缓冲区不被写入"
+msgstr "缓冲区不会被写入"
msgid "changes to the text are possible"
msgstr "可以对文本进行更改"
msgid "line length above which to break a line"
-msgstr "超过行长度就要断行"
+msgstr "超过行长度就断行"
msgid "margin from the right in which to break a line"
-msgstr "从右侧划线的空白"
+msgstr "断行开始的右边距"
msgid "specifies what <BS>, CTRL-W, etc. can do in Insert mode"
msgstr "指定 <BS>, CTRL-W 等在插入模式下可以做什么"
msgid "definition of what comment lines look like"
-msgstr "注释行外观的定义"
+msgstr "定义注释行长什么样"
msgid "list of flags that tell how automatic formatting works"
-msgstr "说明自动格式化如何工作的标志列表"
+msgstr "控制自动格式化如何工作的标志列表"
msgid "pattern to recognize a numbered list"
msgstr "识别编号列表的模式"
msgid "expression used for \"gq\" to format lines"
-msgstr "用于格式化行的 \"gq\" 使用的表达式"
+msgstr "用 \"gq\" 格式化行时使用的表达式"
msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P"
-msgstr "指定 CTRL-N 和 CTRL-P 的插入模式补全工作方式"
+msgstr "指定使用 CTRL-N 和 CTRL-P 进行插入模式补全的工作方式"
msgid "whether to use a popup menu for Insert mode completion"
msgstr "是否在插入模式补全时使用弹出菜单"
msgid "options for the Insert mode completion info popup"
-msgstr "插入模式补全信息弹出的选项"
+msgstr "插入模式补全信息弹框的选项"
msgid "maximum height of the popup menu"
msgstr "弹出菜单的最大高度"
@@ -9216,56 +9216,56 @@ msgid "adjust case of a keyword completion match"
msgstr "调整关键字补全匹配的大小写"
msgid "enable entering digraphs with c1 <BS> c2"
-msgstr "允许使用 c1 <BS> c2 进入有向图;c2"
+msgstr "支持使用 c1 <BS> c2 输入二合字符"
msgid "the \"~\" command behaves like an operator"
-msgstr "\"~\"命令表现地像操作符"
+msgstr "\"~\"命令表现得像操作符"
msgid "function called for the \"g@\" operator"
-msgstr "函数调用 \"g@\" 操作符"
+msgstr "\"g@\" 操作符调用的函数"
msgid "when inserting a bracket, briefly jump to its match"
-msgstr "当插入括号时,直接跳转到它匹配的括号"
+msgstr "当插入括号时,短暂地跳转到匹配它的括号"
msgid "tenth of a second to show a match for 'showmatch'"
-msgstr "需要十分之一秒显示'showmatch'的匹配"
+msgstr "显示 'showmatch' 的匹配的时长(以十分之一秒计)"
msgid "list of pairs that match for the \"%\" command"
-msgstr "与 \"%\" 命令匹配的对列表"
+msgstr "\"%\" 命令匹配的对列表"
msgid "use two spaces after '.' when joining a line"
-msgstr "连接行时,在 '.' 后面添加两个空格。"
+msgstr "连接行时,在 '.' 后面添加两个空格"
msgid ""
"\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\n"
"recognized for CTRL-A and CTRL-X commands"
msgstr ""
-"CTRL-A 和 CTRL-X 命令识别的数字格式:\n"
-"\"alpha\", \"octal\", \"hex\", \"bin\" 和/或 \"unsigned\""
+"\"alpha\", \"octal\", \"hex\", \"bin\" 和/或 \"unsigned\"\n"
+"CTRL-A 和 CTRL-X 命令识别的数字的格式"
msgid "tabs and indenting"
msgstr "Tab 和缩进"
msgid "number of spaces a <Tab> in the text stands for"
-msgstr "<Tab> 在文中代表空格的数量"
+msgstr "<Tab> 在文本中代表的空格数"
msgid "number of spaces used for each step of (auto)indent"
-msgstr "每步(自动)缩进所使用的空格数"
+msgstr "每步(自动)缩进所使用的空格数"
msgid "list of number of spaces a tab counts for"
-msgstr "tab 计数的空格数列表"
+msgstr "tab 代表的空格数的列表"
msgid "list of number of spaces a soft tabsstop counts for"
-msgstr "软制表符计数的空格数列表"
+msgstr "软制表符代表的空格数的列表"
msgid "a <Tab> in an indent inserts 'shiftwidth' spaces"
-msgstr "用 <Tab> 键缩进的时候插入 'shiftwidth' 个空格"
+msgstr "用 <Tab> 键缩进时插入 'shiftwidth' 个空格"
msgid "if non-zero, number of spaces to insert for a <Tab>"
-msgstr "如果非零,为 <Tab> 插入的空格数。"
+msgstr "如果非零,为 <Tab> 插入的空格数"
msgid "round to 'shiftwidth' for \"<<\" and \">>\""
-msgstr "用 \"<<\" 或 \">>\" 快捷键缩进时,插入 'shiftwidth' 整数倍个空格"
+msgstr "用 \"<<\" 和 \">>\" 缩进时,插入 'shiftwidth' 整数倍个空格"
msgid "expand <Tab> to spaces in Insert mode"
msgstr "在插入模式下将 <Tab> 展开为空格"
@@ -9274,7 +9274,7 @@ msgid "automatically set the indent of a new line"
msgstr "自动设置新行缩进"
msgid "do clever autoindenting"
-msgstr "自动缩进"
+msgstr "智能自动缩进"
msgid "enable specific indenting for C code"
msgstr "为 C 代码启用特定的缩进"
@@ -9298,10 +9298,10 @@ msgid "keys that trigger indenting with 'indentexpr' in Insert mode"
msgstr "在插入模式下使用 'indentexpr' 触发缩进的键"
msgid "copy whitespace for indenting from previous line"
-msgstr "从上一行复制用于缩进的空格"
+msgstr "为缩进从上一行复制空白字符"
msgid "preserve kind of whitespace when changing indent"
-msgstr "在更改缩进时保留空白"
+msgstr "在更改缩进时保留空白类型"
msgid "enable lisp mode"
msgstr "启用 lisp 模式"
@@ -9313,31 +9313,31 @@ msgid "folding"
msgstr "折叠"
msgid "unset to display all folds open"
-msgstr "取消设置以显示所有折叠打开"
+msgstr "取消设置以打开所有折叠"
msgid "folds with a level higher than this number will be closed"
-msgstr "比这个数字高一等级的折叠将被关闭"
+msgstr "等级比这个数字高的折叠将被关闭"
msgid "value for 'foldlevel' when starting to edit a file"
msgstr "开始编辑文件时,'foldlevel' 的值"
msgid "width of the column used to indicate folds"
-msgstr "用来表示折叠的列宽"
+msgstr "用来指示折叠的列的宽度"
msgid "expression used to display the text of a closed fold"
-msgstr "用于显示关闭折叠的文本"
+msgstr "用于显示已关闭折叠的表达式"
msgid "set to \"all\" to close a fold when the cursor leaves it"
-msgstr "设置为 \"all\" 用于在光标离开时关闭折叠"
+msgstr "设置为 \"all\" 来在光标离开时关闭折叠"
msgid "specifies for which commands a fold will be opened"
-msgstr "指定打开折叠的命令"
+msgstr "指定会打开折叠的命令"
msgid "minimum number of screen lines for a fold to be closed"
-msgstr "要关闭折叠所需的最小行数"
+msgstr "可关闭折叠所需的最小屏幕行数"
msgid "template for comments; used to put the marker in"
-msgstr "注释的模板,模板里有占位符"
+msgstr "注释的模板,用于放置折叠标记"
msgid ""
"folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n"
@@ -9350,13 +9350,13 @@ msgid "expression used when 'foldmethod' is \"expr\""
msgstr "当 'foldmethod' 为 \"expr\" 时使用的表达式"
msgid "used to ignore lines when 'foldmethod' is \"indent\""
-msgstr "当 'foldmethod' 为 \"indent\" 时忽略的行"
+msgstr "当 'foldmethod' 为 \"indent\" 时用于忽略行"
msgid "markers used when 'foldmethod' is \"marker\""
-msgstr "当 'foldmethod' 为 \"marker\" 时的标志"
+msgstr "当 'foldmethod' 为 \"marker\" 时所使用的标记"
msgid "maximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\""
-msgstr "当 'foldmethod' 为 \"indent\" 或 \"syntax\"时的最大折叠深度"
+msgstr "当 'foldmethod' 为 \"indent\" 或 \"syntax\" 时的最大折叠深度"
msgid "diff mode"
msgstr "差异模式"
@@ -9380,37 +9380,37 @@ msgid "maximum depth of mapping"
msgstr "最大映射深度"
msgid "recognize mappings in mapped keys"
-msgstr "识别映射键中的映射"
+msgstr "识别已映射键中的映射"
msgid "allow timing out halfway into a mapping"
msgstr "允许在映射中途超时"
msgid "allow timing out halfway into a key code"
-msgstr "允许在映射的中途暂停"
+msgstr "允许在键码中途超时"
msgid "time in msec for 'timeout'"
-msgstr "超时时间 (以毫秒计)"
+msgstr "'timeout' 的时间(以毫秒计)"
msgid "time in msec for 'ttimeout'"
-msgstr "键盘代码超时时间 (以毫秒计)"
+msgstr "'ttimeout' 的时间(以毫秒计)"
msgid "reading and writing files"
msgstr "读写文件"
msgid "enable using settings from modelines when reading a file"
-msgstr "Vim 读取文件的时候是否允许使用 modeline 里指定的设置"
+msgstr "读取文件时是否使用 modeline 里的设置"
msgid "allow setting expression options from a modeline"
msgstr "允许从 modeline 中设置表达式选项"
msgid "number of lines to check for modelines"
-msgstr "检查 modeline 的行数"
+msgstr "为 modeline 而检查的行数"
msgid "binary file editing"
msgstr "二进制文件编辑"
msgid "last line in the file has an end-of-line"
-msgstr "文件的最后一行有一个换行符"
+msgstr "文件的最后一行有换行符"
msgid "fixes missing end-of-line at end of text file"
msgstr "修复文本文件末尾缺少换行符的问题"
@@ -9419,10 +9419,10 @@ msgid "prepend a Byte Order Mark to the file"
msgstr "在文件前加上字节顺序标记"
msgid "end-of-line format: \"dos\", \"unix\" or \"mac\""
-msgstr "换行符格式: \"dos\", \"unix\" or \"mac\""
+msgstr "换行符格式: \"dos\", \"unix\" 或 \"mac\""
msgid "list of file formats to look for when editing a file"
-msgstr "编辑文件时要查找的文件格式列表"
+msgstr "编辑文件时要检查的文件格式列表"
msgid "obsolete, use 'fileformat'"
msgstr "已废止,用 'fileformat'"
@@ -9434,16 +9434,16 @@ msgid "writing files is allowed"
msgstr "允许写入文件"
msgid "write a backup file before overwriting a file"
-msgstr "覆盖备份文件前,请先写入备份文件"
+msgstr "覆盖文件前先写入备份文件"
msgid "keep a backup after overwriting a file"
-msgstr "覆盖文件后进行备份"
+msgstr "覆盖文件后保留备份"
msgid "patterns that specify for which files a backup is not made"
-msgstr "指定不为哪些文件进行备份的模式"
+msgstr "不备份的文件的模式"
msgid "whether to make the backup as a copy or rename the existing file"
-msgstr "是否以副本形式进行备份或重命名现有文件"
+msgstr "通过复制还是重命名已有文件进行备份"
msgid "list of directories to put backup files in"
msgstr "存放备份文件的目录列表"
@@ -9458,22 +9458,22 @@ msgid "as 'autowrite', but works with more commands"
msgstr "类似于 'autowrite',但适用于更多命令"
msgid "always write without asking for confirmation"
-msgstr "写时不需要确认"
+msgstr "写文件时总是不需要确认"
msgid "automatically read a file when it was modified outside of Vim"
-msgstr "当文件在Vim之外被修改时,自动读取文件"
+msgstr "在 Vim 之外修改了文件时,自动读取文件"
msgid "keep oldest version of a file; specifies file name extension"
-msgstr "保存最旧版本的文件; 指定文件扩展名"
+msgstr "保存最旧版本的文件;指定文件扩展名"
msgid "forcibly sync the file to disk after writing it"
msgstr "文件写入后强制同步到磁盘"
msgid "use 8.3 file names"
-msgstr "文件名使用为 8.3 格式"
+msgstr "使用 8.3 格式的文件名"
msgid "encryption method for file writing: zip, blowfish or blowfish2"
-msgstr "文件写入加密方法:zip, blowfish 或 blowfish2"
+msgstr "写入文件时使用的加密算法:zip, blowfish 或 blowfish2"
msgid "the swap file"
msgstr "交换文件"
@@ -9485,19 +9485,19 @@ msgid "use a swap file for this buffer"
msgstr "对这个缓冲区使用交换文件"
msgid "\"sync\", \"fsync\" or empty; how to flush a swap file to disk"
-msgstr "如何将交换文件刷新到磁盘:\"sync\", \"fsync\" 或 empty"
+msgstr "\"sync\", \"fsync\" 或留空; 将交换文件刷新到磁盘的方式"
msgid "number of characters typed to cause a swap file update"
msgstr "导致交换文件更新的字符数"
msgid "time in msec after which the swap file will be updated"
-msgstr "刷新交换文件所需的毫秒数"
+msgstr "更新交换文件前所需的毫秒数"
msgid "maximum amount of memory in Kbyte used for one buffer"
-msgstr "缓冲区使用的最大内存量(以千字节为单位)"
+msgstr "单个缓冲区使用的最大内存量(以千字节为单位)"
msgid "maximum amount of memory in Kbyte used for all buffers"
-msgstr "所有缓冲区使用的最大内存量(以千字节为单位)"
+msgstr "所有缓冲区使用的最大内存量(以千字节为单位)"
# do not translate to avoid writing Chinese in files
msgid "command line editing"
@@ -9516,7 +9516,7 @@ msgid "specifies how command line completion works"
msgstr "指定命令行如何补全"
msgid "empty or \"tagfile\" to list file name of matching tags"
-msgstr "空或 \"tagfile\" 来列出匹配标记的文件名"
+msgstr "空或 \"tagfile\" 来列出匹配标签的文件名"
msgid "list of file name extensions that have a lower priority"
msgstr "优先级低的文件扩展名列表"
@@ -9525,13 +9525,13 @@ msgid "list of file name extensions added when searching for a file"
msgstr "搜索文件时添加的文件扩展名列表"
msgid "list of patterns to ignore files for file name completion"
-msgstr "为补全文件名而忽略文件的模式列表"
+msgstr "文件名补全所忽略文件的模式列表"
msgid "ignore case when using file names"
msgstr "使用文件名时忽略大小写"
msgid "ignore case when completing file names"
-msgstr "在补全文件名时忽略大小写"
+msgstr "补全文件名时忽略大小写"
msgid "command-line completion shows a list of matches"
msgstr "命令行补全时显示匹配列表"
@@ -9549,37 +9549,37 @@ msgid "name of the shell program used for external commands"
msgstr "用于外部命令的 shell 程序的名称"
msgid "when to use the shell or directly execute a command"
-msgstr "何时使用 shell 或直接执行命令"
+msgstr "何时使用 shell 还是直接执行命令"
msgid "character(s) to enclose a shell command in"
-msgstr "用于封装 shell 命令的字符"
+msgstr "用于包围 shell 命令的字符"
msgid "like 'shellquote' but include the redirection"
-msgstr "类似'shellquote',但包含重定向"
+msgstr "类似 'shellquote',但包含重定向"
msgid "characters to escape when 'shellxquote' is ("
-msgstr "'shellxquote' 为 ( 时使用的转义字符"
+msgstr "'shellxquote' 为 ( 时需要转义的字符"
msgid "argument for 'shell' to execute a command"
msgstr "'shell' 执行命令的参数"
msgid "used to redirect command output to a file"
-msgstr "将命令输出重定向到文件"
+msgstr "用于将命令输出重定向到文件"
msgid "use a temp file for shell commands instead of using a pipe"
-msgstr "对 shell 命令使用临时文件,而不是使用管道"
+msgstr "对 shell 命令使用临时文件而不是管道"
msgid "program used for \"=\" command"
msgstr "用于 \"=\" 命令的程序"
msgid "program used to format lines with \"gq\" command"
-msgstr "用 \"gq\" 命令格式化代码时,使用的外部格式化程序"
+msgstr "用 \"gq\" 命令格式化代码时使用的程序"
msgid "program used for the \"K\" command"
msgstr "用于 \"K\" 命令的程序"
msgid "warn when using a shell command and a buffer has changes"
-msgstr "当使用 shell 命令和缓冲区发生变化时发出警告"
+msgstr "当使用 shell 命令并且缓冲区有修改时发出警告"
msgid "running make and jumping to errors (quickfix)"
msgstr "运行 make 并跳到错误(快速修复)"
@@ -9609,13 +9609,13 @@ msgid "encoding of the \":make\" and \":grep\" output"
msgstr "\":make\" 和 \":grep\" 输出的编码"
msgid "function to display text in the quickfix window"
-msgstr "快速修复窗口中显示文本的函数"
+msgstr "用于在快速修复窗口中显示文本的函数"
msgid "system specific"
msgstr "系统特定"
msgid "use forward slashes in file names; for Unix-like shells"
-msgstr "类 unix shells 中,在文件名中使用正斜杠;"
+msgstr "在文件名中使用正斜杠;用于类 Unix shell"
msgid "specifies slash/backslash used for completion"
msgstr "指定补全时使用的斜杠/反斜杠"
@@ -9645,25 +9645,25 @@ msgid "when to edit the command-line right-to-left"
msgstr "何时从右到左编辑命令行"
msgid "insert characters backwards"
-msgstr "向后插入字符"
+msgstr "倒序插入字符"
msgid "allow CTRL-_ in Insert and Command-line mode to toggle 'revins'"
-msgstr "允许 CTRL-_ 在插入和命令行模式下切换 'revins'"
+msgstr "在插入和命令行模式下允许 CTRL-_ 切换 'revins'"
msgid "the ASCII code for the first letter of the Hebrew alphabet"
msgstr "希伯来字母表第一个字母的 ASCII 码"
msgid "use Hebrew keyboard mapping"
-msgstr "使用希伯来键盘映射"
+msgstr "使用希伯来语键盘映射"
msgid "use phonetic Hebrew keyboard mapping"
-msgstr "使用希伯来语的音节键盘映射"
+msgstr "使用希伯来语的语音键盘映射"
msgid "prepare for editing Arabic text"
msgstr "准备编辑阿拉伯语文本"
msgid "perform shaping of Arabic characters"
-msgstr "阿拉伯语的字型重整"
+msgstr "阿拉伯语的字形重整"
msgid "terminal will perform bidi handling"
msgstr "终端支持双向文本"
@@ -9687,10 +9687,10 @@ msgid "input method style, 0: on-the-spot, 1: over-the-spot"
msgstr "输入法样式:0:on-the-spot;1:over-the-spot"
msgid "entering a search pattern: 1: use :lmap; 2: use IM; 0: neither"
-msgstr "进入搜索模式:1:使用 :lamp;2:使用输入法;0:都不用"
+msgstr "输入搜索模式时:1:使用 :lamp;2:使用输入法;0:都不用"
msgid "when set always use IM when starting to edit a command line"
-msgstr "如果设置,在开始编辑命令行时总是使用输入法"
+msgstr "如果设置,开始编辑命令行时总是使用输入法"
msgid "function to obtain IME status"
msgstr "获取输入法状态的函数"
@@ -9730,7 +9730,7 @@ msgid "key that activates the X input method"
msgstr "激活 X 输入方法的键"
msgid "width of ambiguous width characters"
-msgstr "多宽度字符的宽度"
+msgstr "宽度有歧义字符的宽度"
msgid "emoji characters are full width"
msgstr "表情字符视作全宽"
@@ -9742,53 +9742,52 @@ msgid ""
"when to use virtual editing: \"block\", \"insert\", \"all\"\n"
"and/or \"onemore\""
msgstr ""
-"何时使用虚拟编辑:\"block\", \"insert\", \"all\"\n"
-"和/或 \"onemore\""
+"何时使用虚拟编辑:\"block\", \"insert\", \"all\" 和/或 \"onemore\""
msgid "list of autocommand events which are to be ignored"
-msgstr "需要忽略的自动命令事件列表"
+msgstr "要忽略的自动命令事件列表"
msgid "load plugin scripts when starting up"
msgstr "启动时加载插件脚本"
msgid "enable reading .vimrc/.exrc/.gvimrc in the current directory"
-msgstr "在当前目录下能够阅读 .vimrc/.exrc/.gvimrc"
+msgstr "启用读取在当前目录下的 .vimrc/.exrc/.gvimrc"
msgid "safer working with script files in the current directory"
-msgstr "在当前目录下使用脚本文件更安全"
+msgstr "在当前目录下使用脚本文件时更安全"
msgid "use the 'g' flag for \":substitute\""
-msgstr "缺省打开 \":substitute\" 的 'g' 标志"
+msgstr "打开 \":substitute\" 的 'g' 标志"
msgid "'g' and 'c' flags of \":substitute\" toggle"
-msgstr "\":substitute\" 开关的 'g' and 'c' 标志"
+msgstr "\":substitute\" 的 'g' and 'c' 标志用作开关切换"
msgid "allow reading/writing devices"
-msgstr "允许读/写设备"
+msgstr "允许读写设备"
msgid "maximum depth of function calls"
msgstr "函数调用的最大深度"
msgid "list of words that specifies what to put in a session file"
-msgstr "指定在会话文件中放入内容的单词列表"
+msgstr "指定放入会话文件的内容的单词列表"
msgid "list of words that specifies what to save for :mkview"
-msgstr "指定保存内容的单词列表 :mkview"
+msgstr "指定 :mkview 保存的内容的单词列表"
msgid "directory where to store files with :mkview"
-msgstr "存放文件的目录 :mkview"
+msgstr ":mkview 存放文件的目录"
msgid "list that specifies what to write in the viminfo file"
-msgstr "指定在 viminfo 文件中写入内容的列表"
+msgstr "指定在 viminfo 文件中写入的内容的列表"
msgid "file name used for the viminfo file"
-msgstr "viminfo文件使用的文件名"
+msgstr "viminfo 文件使用的文件名"
msgid "what happens with a buffer when it's no longer in a window"
msgstr "当缓冲区不再位于窗口中时,会发生什么"
msgid "empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer"
-msgstr "缓冲区类型:空, \"nofile\", \"nowrite\", \"quickfix\"等"
+msgstr "空, \"nofile\", \"nowrite\", \"quickfix\" 等; 缓冲区类型"
msgid "whether the buffer shows up in the buffer list"
msgstr "缓冲区是否显示在缓冲区列表中"
@@ -9800,7 +9799,7 @@ msgid "whether to show the signcolumn"
msgstr "是否显示标号列"
msgid "interval in milliseconds between polls for MzScheme threads"
-msgstr "MzScheme 线程的轮询间隔(以毫秒为单位)"
+msgstr "MzScheme 线程的轮询间隔(以毫秒为单位)"
msgid "name of the Lua dynamic library"
msgstr "Lua 动态库的名字"
@@ -9809,7 +9808,7 @@ msgid "name of the Perl dynamic library"
msgstr "Perl 动态库的名字"
msgid "whether to use Python 2 or 3"
-msgstr "是否使用 Python 2 或 3"
+msgstr "是否使用 Python 2 和 3"
msgid "name of the Python 2 dynamic library"
msgstr "Python 2 动态库的名字"