updated for version 7.0e02
diff --git a/runtime/autoload/htmlcomplete.vim b/runtime/autoload/htmlcomplete.vim
index 61d2a09..c663e3c 100644
--- a/runtime/autoload/htmlcomplete.vim
+++ b/runtime/autoload/htmlcomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
-" Language: XHTML 1.0 Strict
+" Language: HTML (XHTML 1.0 Strict by default)
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2006 Mar 25
+" Last Change: 2006 Apr 17
function! htmlcomplete#CompleteTags(findstart, base)
if a:findstart
@@ -159,12 +159,12 @@
if exists("b:entitiescompl")
unlet! b:entitiescompl
- if !exists("g:xmldata_xhtml10s")
- runtime! autoload/xml/xhtml10s.vim
- "call htmlcomplete#LoadData()
+ if !exists("g:html_omni")
+ "runtime! autoload/xml/xhtml10s.vim
+ call htmlcomplete#LoadData()
endif
- let entities = g:xmldata_xhtml10s['vimxmlentities']
+ let entities = g:html_omni['vimxmlentities']
if len(a:base) == 1
for m in entities
@@ -443,29 +443,7 @@
let attrname = matchstr(attr, '.*\ze\s*=')
let entered_value = matchstr(attr, ".*=\\s*[\"']\\zs.*")
let values = []
- if attrname == 'media'
- let values = ["screen", "tty", "tv", "projection", "handheld", "print", "braille", "aural", "all"]
- elseif attrname == 'xml:space'
- let values = ["preserve"]
- elseif attrname == 'shape'
- let values = ["rect", "circle", "poly", "default"]
- elseif attrname == 'valuetype'
- let values = ["data", "ref", "object"]
- elseif attrname == 'method'
- let values = ["get", "post"]
- elseif attrname == 'dir'
- let values = ["ltr", "rtl"]
- elseif attrname == 'frame'
- let values = ["void", "above", "below", "hsides", "lhs", "rhs", "vsides", "box", "border"]
- elseif attrname == 'rules'
- let values = ["none", "groups", "rows", "all"]
- elseif attrname == 'align'
- let values = ["left", "center", "right", "justify", "char"]
- elseif attrname == 'valign'
- let values = ["top", "middle", "bottom", "baseline"]
- elseif attrname == 'scope'
- let values = ["row", "col", "rowgroup", "colgroup"]
- elseif attrname == 'href'
+ if attrname == 'href'
" Now we are looking for local anchors defined by name or id
if entered_value =~ '^#'
let file = join(getline(1, line('$')), ' ')
@@ -476,18 +454,12 @@
let values += ['#'.matchstr(i, "^[a-zA-Z][a-zA-Z0-9%_-]*")]
endfor
endif
- elseif attrname == 'type'
- if context =~ '^input'
- let values = ["text", "password", "checkbox", "radio", "submit", "reset", "file", "hidden", "image", "button"]
- elseif context =~ '^button'
- let values = ["button", "submit", "reset"]
- elseif context =~ '^style'
- let values = ["text/css"]
- elseif context =~ '^script'
- let values = ["text/javascript"]
- endif
else
- return []
+ if has_key(g:html_omni, tag) && has_key(g:html_omni[tag][1], attrname)
+ let values = g:html_omni[tag][1][attrname]
+ else
+ return []
+ endif
endif
if len(values) == 0
@@ -518,13 +490,12 @@
let sbase = matchstr(context, '.*\ze\s.*')
" Load data {{{
- if !exists("g:xmldata_xhtml10s")
- runtime! autoload/xml/xhtml10s.vim
- "call htmlcomplete#LoadData()
+ if !exists("g:html_omni_gen")
+ call htmlcomplete#LoadData()
endif
" }}}
"
- let attrs = keys(g:xmldata_xhtml10s[tag][1])
+ let attrs = keys(g:html_omni[tag][1])
for m in sort(attrs)
if m =~ '^'.attr
@@ -534,13 +505,13 @@
endif
endfor
let menu = res + res2
- if has_key(g:xmldata_xhtml10s, 'vimxmlattrinfo')
+ if has_key(g:html_omni, 'vimxmlattrinfo')
let final_menu = []
for i in range(len(menu))
let item = menu[i]
- if has_key(g:xmldata_xhtml10s['vimxmlattrinfo'], item)
- let m_menu = g:xmldata_xhtml10s['vimxmlattrinfo'][item][0]
- let m_info = g:xmldata_xhtml10s['vimxmlattrinfo'][item][1]
+ if has_key(g:html_omni['vimxmlattrinfo'], item)
+ let m_menu = g:html_omni['vimxmlattrinfo'][item][0]
+ let m_info = g:html_omni['vimxmlattrinfo'][item][1]
if m_menu !~ 'Bool'
let item .= '="'
endif
@@ -569,9 +540,9 @@
endif
endif
" Load data {{{
- if !exists("g:xmldata_xhtml10s")
- runtime! autoload/xml/xhtml10s.vim
- "call htmlcomplete#LoadData()
+ if !exists("g:html_omni")
+ "runtime! autoload/xml/xhtml10s.vim
+ call htmlcomplete#LoadData()
endif
" }}}
" Tag completion {{{
@@ -580,15 +551,15 @@
" MM: TODO: GLOT works always the same but with some weird situation it
" behaves as intended in HTML but screws in PHP
let g:ot = opentag
- if opentag == '' || &ft == 'php' && !has_key(g:xmldata_xhtml10s, opentag)
+ if opentag == '' || &ft == 'php' && !has_key(g:html_omni, opentag)
" Hack for sometimes failing GetLastOpenTag.
" As far as I tested fail isn't GLOT fault but problem
" of invalid document - not properly closed tags and other mish-mash.
" Also when document is empty. Return list of *all* tags.
- let tags = keys(g:xmldata_xhtml10s)
+ let tags = keys(g:html_omni)
call filter(tags, 'v:val !~ "^vimxml"')
else
- let tags = g:xmldata_xhtml10s[opentag][0]
+ let tags = g:html_omni[opentag][0]
endif
" }}}
@@ -600,13 +571,13 @@
endif
endfor
let menu = res + res2
- if has_key(g:xmldata_xhtml10s, 'vimxmltaginfo')
+ if has_key(g:html_omni, 'vimxmltaginfo')
let final_menu = []
for i in range(len(menu))
let item = menu[i]
- if has_key(g:xmldata_xhtml10s['vimxmltaginfo'], item)
- let m_menu = g:xmldata_xhtml10s['vimxmltaginfo'][item][0]
- let m_info = g:xmldata_xhtml10s['vimxmltaginfo'][item][1]
+ if has_key(g:html_omni['vimxmltaginfo'], item)
+ let m_menu = g:html_omni['vimxmltaginfo'][item][0]
+ let m_info = g:html_omni['vimxmltaginfo'][item][1]
else
let m_menu = ''
let m_info = ''
@@ -621,4 +592,27 @@
" }}}
endif
endfunction
+
+function! htmlcomplete#LoadData() " {{{
+ if !exists("g:html_omni_flavor")
+ let g:html_omni_flavor = 'xhtml10s'
+ endif
+ exe 'runtime! autoload/xml/'.g:html_omni_flavor.'.vim'
+ " This one is necessary because we don't know if
+ " g:html_omni_flavor file exists and was sourced
+ " Proper checking for files would require iterating through 'rtp'
+ " and could introduce OS dependent mess.
+ if !exists("g:xmldata_".g:html_omni_flavor)
+ let g:html_omni_flavor = 'xhtml10s'
+ runtime! autoload/xml/xhtml10s.vim
+ endif
+
+ exe 'let g:html_omni = g:xmldata_'.g:html_omni_flavor
+
+ " Free some memory
+ exe 'unlet! g:xmldata_'.g:html_omni_flavor
+
+ "call htmlcomplete#LoadData()
+endfunction
+" }}}
" vim:set foldmethod=marker:
diff --git a/runtime/autoload/xml/xhtml10s.vim b/runtime/autoload/xml/xhtml10s.vim
index 1d15cef..2fe68cd 100644
--- a/runtime/autoload/xml/xhtml10s.vim
+++ b/runtime/autoload/xml/xhtml10s.vim
@@ -1460,9 +1460,21 @@
\ 'style' : [[],
\ {
\ 'lang' : [],
-\ 'media' : [],
+\ 'media' : [
+\ 'screen',
+\ 'tty',
+\ 'tv',
+\ 'projection',
+\ 'handheld',
+\ 'print',
+\ 'braille',
+\ 'aural',
+\ 'all'
+\ ],
\ 'title' : [],
-\ 'type' : [],
+\ 'type' : [
+\ 'text/css'
+\ ],
\ 'xml:space' : [
\ 'preserve'
\ ],
@@ -3342,7 +3354,17 @@
\ ],
\ 'onkeydown' : [],
\ 'onkeyup' : [],
-\ 'media' : [],
+\ 'media' : [
+\ 'screen',
+\ 'tty',
+\ 'tv',
+\ 'projection',
+\ 'handheld',
+\ 'print',
+\ 'braille',
+\ 'aural',
+\ 'all'
+\ ],
\ 'href' : [],
\ 'onmouseup' : [],
\ 'id' : [],
@@ -3369,7 +3391,9 @@
\ 'BOOL'
\ ],
\ 'src' : [],
-\ 'type' : [],
+\ 'type' : [
+\ 'text/javascript'
+\ ],
\ 'charset' : [],
\ 'xml:space' : [
\ 'preserve'
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 550bb30..1b6d597 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.0e. Last change: 2006 Apr 14
+*insert.txt* For Vim version 7.0e. Last change: 2006 Apr 18
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1103,7 +1103,7 @@
The menu is used when:
- The 'completeopt' option contains "menu" or "menuone".
- The terminal supports at least 8 colors.
-- There are at least two matches.
+- There are at least two matches. One of "menuone" is used.
The 'pumheight' option can be used to set a maximum height. The default is to
use all space available.
@@ -1264,6 +1264,26 @@
run |:make| command to detect formatting problems.
+HTML flavor *html-flavor*
+
+By default HTML completion provides completion for XHTML 1.0 Strict. This is
+not the only HTML version. To use another data file and still have benefits of
+custom completion for class, style, etc. attributes set g:html_omni_flavor
+variable. Example (in .vimrc or filetype plugin file): >
+
+ let g:html_omni_flavor = 'xhtml10t'
+
+Data for HTML completion will be read from 'autoload/xml/xhtml10t.vim' file
+located somewhere in 'runtimepath' (not in default distribution).
+
+More about format of data file in |xml-omni-datafile|. Some of data files may
+in future be found on vim-online site (|www|).
+
+Note that g:html_omni_flavor may point to file with any XML data. This makes
+possible to mix PHP (|ft-php-omni|) completion with whatever XML dialect
+(assuming you have data file for it).
+
+
JAVASCRIPT *ft-javascript-omni*
Completion of most elements of JavaScript language and DOM elements.
@@ -1479,10 +1499,23 @@
names, as value two element List for additional menu info and long
description.
-Note: Tag names in data file MUST not contain namespace description. Check
+Note: Tag names in data file MUST not contain namespace description. Check
xsl.vim for example.
+DTD -> Vim *dtd2vim*
+
+On |www| is script |dtd2vim| which parses DTD and creates XML data file
+for Vim XML omni completion.
+
+ dtd2vim: http://www.vim.org/scripts/script.php?script_id=1462
+
+Check there and beginning of file for details of usage.
+Script requires perl and:
+
+ perlSGML: http://savannah.nongnu.org/projects/perlsgml
+
+
Commands
:XMLns {name} [{namespace}] *:XMLns*
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index af12147..8555788 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt* For Vim version 7.0e. Last change: 2006 Jan 02
+*motion.txt* For Vim version 7.0e. Last change: 2006 Apr 18
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1059,7 +1059,8 @@
only once.
When the |:keepjumps| command modifier is used, jumps are not stored in the
-jumplist.
+jumplist. Jumps are also not stored in other cases, e.g., in a |:global|
+command. You can explicitly add a jump by setting the ' mark.
After the CTRL-O command that got you into line 1154 you could give another
jump command (e.g., "G"). The jump list would then become:
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 2cfd730..1b18f80 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0e. Last change: 2006 Apr 12
+*options.txt* For Vim version 7.0e. Last change: 2006 Apr 18
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1651,10 +1651,11 @@
Useful when there is additional information about the
match, e.g., what file it comes from.
- longest Only insert the longest common text of the matches. Use
- CTRL-L to add more characters. Whether case is ignored
- depends on the kind of completion. For buffer text the
- 'ignorecase' option is used.
+ longest Only insert the longest common text of the matches. If
+ the menu is displayed you can use CTRL-L to add more
+ characters. Whether case is ignored depends on the kind
+ of completion. For buffer text the 'ignorecase' option is
+ used.
preview Show extra information about the currently selected
completion in the preview window.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index a327261..e8d6853 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4984,6 +4984,7 @@
drag-n-drop-win32 gui_w32.txt /*drag-n-drop-win32*
drag-status-line term.txt /*drag-status-line*
dtd.vim syntax.txt /*dtd.vim*
+dtd2vim insert.txt /*dtd2vim*
dying-variable eval.txt /*dying-variable*
e motion.txt /*e*
easy starting.txt /*easy*
@@ -5716,6 +5717,7 @@
howto.txt howto.txt /*howto.txt*
hpterm term.txt /*hpterm*
hpterm-color syntax.txt /*hpterm-color*
+html-flavor insert.txt /*html-flavor*
html.vim syntax.txt /*html.vim*
htmlos.vim syntax.txt /*htmlos.vim*
http pi_netrw.txt /*http*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 599e370..4f98431 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0e. Last change: 2006 Apr 17
+*todo.txt* For Vim version 7.0e. Last change: 2006 Apr 18
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt
index 308337a..4c148c4 100644
--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -1,4 +1,4 @@
-*usr_44.txt* For Vim version 7.0e. Last change: 2006 Mar 27
+*usr_44.txt* For Vim version 7.0e. Last change: 2006 Apr 18
VIM USER MANUAL - by Bram Moolenaar
@@ -667,8 +667,13 @@
syntax group (nameType, nameStatement, nameString, etc).
Start with a check for "b:current_syntax". If it is defined, some other
-syntax file, earlier in 'runtimepath' was already loaded. To be compatible
-with Vim 5.8 use: >
+syntax file, earlier in 'runtimepath' was already loaded: >
+
+ if exists("b:current_syntax")
+ finish
+ endif
+
+To be compatible with Vim 5.8 use: >
if version < 600
syntax clear
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 6d0183d..4bafdbe 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0e. Last change: 2006 Apr 17
+*version7.txt* For Vim version 7.0e. Last change: 2006 Apr 18
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -350,6 +350,10 @@
matching paren can be highlighted. This uses the new |CursorMoved|
autocommand event.
+This means some commands are executed every time you move the cursor. If this
+slows you down too much switch it off with: >
+ :NoMatchParen
+
See |matchparen| for more information.
The plugin uses the |:match| command. It now supports three match patterns.
@@ -890,6 +894,7 @@
BTM ftplugin file. (Bram Moolenaar)
calendar ftplugin file. (Nikolai Weibull)
Changelog indent file. (Nikolai Weibull)
+Cmake indent and syntax file. (Andy Cedilnik)
conf ftplugin file. (Nikolai Weibull)
context syntax and ftplugin file. (Nikolai Weibull)
CRM114 ftplugin file. (Nikolai Weibull)
@@ -949,6 +954,7 @@
rd syntax file. (Johannes Ranke)
readline ftplugin file. (Nikolai Weibull)
rhelp syntax file. (Johannes Ranke)
+rnoweb syntax file. (Johannes Ranke)
Relax NG compact ftplugin file. (Nikolai Weibull)
Scheme indent file. (Sergey Khorev)
screen ftplugin file. (Nikolai Weibull)
@@ -970,6 +976,7 @@
sysctl syntax and ftplugin file. (Nikolai Weibull)
terminfo ftplugin file. (Nikolai Weibull)
trustees syntax file. (Nima Talebi)
+Vera syntax file. (David Eggum)
udev config, permissions and rules syntax and ftplugin files. (Nikolai Weibull)
updatedb syntax and ftplugin file. (Nikolai Weibull)
VHDL indent file (Gerald Lai)
@@ -2520,4 +2527,33 @@
Spell checking: spellbadword() didn't see a missing capital in the first word
of a line. Popup menu now only suggest the capitalized word when appropriate.
+When using whole line completion CTRL-L moves throught the matches but it
+didn't work when at the original text.
+
+When completion finds the longest match, don't go to the first match but stick
+at the original text, so that CTRL-N selects the first one.
+
+Recognize "zsh-beta" like "zsh" for setting the 'shellpipe' default. (James
+Vega)
+
+When using ":map <expr>" and the expression results in something with a
+special byte (NUL or CSI) then it didn't work properly. Now escape special
+bytes.
+
+The default Visual highlighting for a color xterm with 8 colors was a magenta
+background, which made magenta text disappear. Now use reverse in this
+specific situation.
+
+After completing the longest match "." didn't insert the same text. Repeating
+also didn't work correctly for multi-byte text.
+
+When using Insert mode completion and BS the whole word that was completed
+would result in all possible matches. Now stop completion. Also fixes that
+for spell completion the previous word was deleted.
+
+GTK: When 'encoding' is "latin1" and using non-ASCII characters in a file name
+the tab page label was wrong and an error message would be given.
+
+The taglist() function could hang on a tags line with a non-ASCII character.
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 26463a8..2e14397 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 15
+" Last Change: 2006 Apr 18
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -427,6 +427,9 @@
\ setf clipper |
\ endif
+" Cmake
+au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in setf cmake
+
" Cobol
au BufNewFile,BufRead *.cbl,*.cob,*.lib setf cobol
" cobol or zope form controller python script? (heuristic)
@@ -1332,10 +1335,25 @@
au BufNewFile,BufRead *.rexx,*.rex setf rexx
" R (Splus)
-au BufNewFile,BufRead *.s,*.S setf r
+if has("fname_case")
+ au BufNewFile,BufRead *.s,*.S setf r
+else
+ au BufNewFile,BufRead *.s setf r
+endif
" R Help file
-au BufNewFile,BufRead *.rd,*.Rd setf rhelp
+if has("fname_case")
+ au BufNewFile,BufRead *.rd,*.Rd setf rhelp
+else
+ au BufNewFile,BufRead *.rd setf rhelp
+endif
+
+" R noweb file
+if has("fname_case")
+ au BufNewFile,BufRead *.Rnw,*.rnw,*.Snw,*.snw setf rnoweb
+else
+ au BufNewFile,BufRead *.rnw,*.snw setf rnoweb
+endif
" Rexx, Rebol or R
au BufNewFile,BufRead *.r,*.R call s:FTr()
@@ -1822,6 +1840,9 @@
" Updatedb
au BufNewFile,BufRead /etc/updatedb.conf setf updatedb
+" Vera
+au BufNewFile,BufRead *.vr,*.vri,*.vrh setf vera
+
" Verilog HDL
au BufNewFile,BufRead *.v setf verilog
diff --git a/runtime/indent/cmake.vim b/runtime/indent/cmake.vim
new file mode 100644
index 0000000..e36937d
--- /dev/null
+++ b/runtime/indent/cmake.vim
@@ -0,0 +1,92 @@
+" =============================================================================
+"
+" Program: CMake - Cross-Platform Makefile Generator
+" Module: $RCSfile$
+" Language: VIM
+" Date: $Date$
+" Version: $Revision$
+"
+" =============================================================================
+
+" Vim indent file
+" Language: CMake (ft=cmake)
+" Author: Andy Cedilnik <andy.cedilnik@kitware.com>
+" Maintainer: Andy Cedilnik <andy.cedilnik@kitware.com>
+" Last Change: $Date$
+" Version: $Revision$
+"
+" Licence: The CMake license applies to this file. See
+" http://www.cmake.org/HTML/Copyright.html
+" This implies that distribution with Vim is allowed
+
+if exists("b:did_indent")
+ finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=CMakeGetIndent(v:lnum)
+
+" Only define the function once.
+if exists("*CMakeGetIndent")
+ finish
+endif
+
+fun! CMakeGetIndent(lnum)
+ let this_line = getline(a:lnum)
+
+ " Find a non-blank line above the current line.
+ let lnum = a:lnum
+ let lnum = prevnonblank(lnum - 1)
+ let previous_line = getline(lnum)
+
+ " Hit the start of the file, use zero indent.
+ if lnum == 0
+ return 0
+ endif
+
+ let ind = indent(lnum)
+
+ let or = '\|'
+ " Regular expressions used by line indentation function.
+ let cmake_regex_comment = '#.*'
+ let cmake_regex_identifier = '[A-Za-z][A-Za-z0-9_]*'
+ let cmake_regex_quoted = '"\([^"\\]\|\\.\)*"'
+ let cmake_regex_arguments = '\(' . cmake_regex_quoted .
+ \ or . '\$(' . cmake_regex_identifier . ')' .
+ \ or . '[^()\\#"]' . or . '\\.' . '\)*'
+
+ let cmake_indent_comment_line = '^\s*' . cmake_regex_comment
+ let cmake_indent_blank_regex = '^\s*$')
+ let cmake_indent_open_regex = '^\s*' . cmake_regex_identifier .
+ \ '\s*(' . cmake_regex_arguments .
+ \ '\(' . cmake_regex_comment . '\)\?$'
+
+ let cmake_indent_close_regex = '^' . cmake_regex_arguments .
+ \ ')\s*' .
+ \ '\(' . cmake_regex_comment . '\)\?$'
+
+ let cmake_indent_begin_regex = '^\s*\(IF\|MACRO\|FOREACH\|ELSE\)\s*('
+ let cmake_indent_end_regex = '^\s*\(ENDIF\|ENDFOREACH\|ENDMACRO\|ELSE\)\s*('
+
+ " Add
+ if previous_line =~? cmake_indent_comment_line " Handle comments
+ let ind = ind
+ else
+ if previous_line =~? cmake_indent_begin_regex
+ let ind = ind + &sw
+ endif
+ if previous_line =~? cmake_indent_open_regex
+ let ind = ind + &sw
+ endif
+ endif
+
+ " Subtract
+ if this_line =~? cmake_indent_end_regex
+ let ind = ind - &sw
+ endif
+ if previous_line =~? cmake_indent_close_regex
+ let ind = ind - &sw
+ endif
+
+ return ind
+endfun
diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim
index 9c3bf6d..55a2442 100644
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -1,6 +1,8 @@
-" Menu Translations: Simplified Chinese (Windows)
-" Translated By: Wang Jun <junw@turbolinux.com.cn>
-" Last Change: Tue Sep 4 11:26:52 CST 2001
+" Menu Translations: Simplified Chinese <i18n-translation@lists.linux.net.cn>
+" Translated By: Yuheng Xie <elephant@linux.net.cn>
+" Last Change: Tue Apr 18 22:00:00 2006
+
+" vim: ts=8 sw=8 noet
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -14,62 +16,68 @@
menutrans &Help °ïÖú(&H)
menutrans &Overview<Tab><F1> Ô¤ÀÀ(&O)<Tab><F1>
menutrans &User\ Manual Óû§ÊÖ²á(&U)
-menutrans &GUI ͼÐνçÃæ(&G)
-menutrans &How-to\ links HOWTOÎĵµ\.\.\.(&H)
+menutrans &How-to\ links How-to\ Á¬½Ó(&H)
+menutrans &Find\.\.\. ²éÕÒ(&F)\.\.\.
menutrans &Credits ×÷Õß(&C)
menutrans Co&pying °æȨ(&P)
menutrans &Version °æ±¾(&V)
-menutrans &About ¹ØÓÚ\ Vim(&A)
+menutrans &Sponsor/Register ÔÞÖú/×¢²á(&S)
+menutrans O&rphans ¹Â¶ù(&R)
+menutrans &Version °æ±¾(&V)
+menutrans &About ¹ØÓÚ(&A)
" File menu
menutrans &File Îļþ(&F)
menutrans &Open\.\.\.<Tab>:e ´ò¿ª(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp ·Ö¸î´°¿Ú²¢´ò¿ª(&L)<Tab>:sp
+menutrans Sp&lit-Open\.\.\.<Tab>:sp ·Ö¸î²¢´ò¿ª(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew ´ò¿ª±êÇ©\.\.\.<Tab>:tabnew
menutrans &New<Tab>:enew н¨(&N)<Tab>:enew
menutrans &Close<Tab>:close ¹Ø±Õ(&C)<Tab>:close
menutrans &Save<Tab>:w ±£´æ(&S)<Tab>:w
menutrans Save\ &As\.\.\.<Tab>:sav Áí´æΪ(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\. ·Ö¸î±È½Ï(&Diff)\.\.\.
-menutrans Split\ Patched\ &By\.\.\. ·Ö¸î´ò²¹¶¡(&Patch)\.\.\.
+menutrans Split\ &Diff\ with\.\.\. ·Ö¸î±È½Ï(Diff)(&D)\.\.\.
+menutrans Split\ Patched\ &By\.\.\. ·Ö¸î´ò²¹¶¡(Patch)(&B)\.\.\.
menutrans &Print ´òÓ¡(&P)
menutrans Sa&ve-Exit<Tab>:wqa ±£´æ²¢Í˳ö(&V)<Tab>:wqa
menutrans E&xit<Tab>:qa Í˳ö(&X)<Tab>:qa
" Edit menu
menutrans &Edit ±à¼(&E)
-menutrans &Undo<Tab>u »Ö¸´(&U)<Tab>u
+menutrans &Undo<Tab>u ³·Ïú(&U)<Tab>u
menutrans &Redo<Tab>^R ÖØ×ö(&R)<Tab>^R
-menutrans Rep&eat<Tab>\. Öظ´Éϴζ¯×÷(&E)<Tab>\.
+menutrans Rep&eat<Tab>\. Öظ´ÉϴβÙ×÷(&E)<Tab>\.
menutrans Cu&t<Tab>"+x ¼ôÇÐ(&T)<Tab>"+x
menutrans &Copy<Tab>"+y ¸´ÖÆ(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP Õ³Ìû(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p Ìùµ½¹â±êÇ°(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p Ìùµ½¹â±êºó(&A)<Tab>]p
+menutrans &Paste<Tab>"+gP Õ³Ìù(&P)<Tab>"+gP
+menutrans Put\ &Before<Tab>[p Õ³Ìùµ½¹â±êÇ°(&B)<Tab>[p
+menutrans Put\ &After<Tab>]p Õ³Ìùµ½¹â±êºó(&A)<Tab>]p
menutrans &Delete<Tab>x ɾ³ý(&D)<Tab>x
-menutrans &Select\ all<Tab>ggVG ȫѡ(&S)<Tab>ggvG
+menutrans &Select\ all<Tab>ggVG ȫѡ(&S)<Tab>ggVG
menutrans &Find\.\.\. ²éÕÒ(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\. ²éÕÒÌæ»»(&L)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\. ²éÕÒºÍÌæ»»(&L)\.\.\.
+menutrans &Find<Tab>/ ²éÕÒ(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s ²éÕÒºÍÌæ»»(&L)<Tab>:%s
menutrans Settings\ &Window É趨´°¿Ú(&W)
+menutrans Startup\ &Settings Æô¶¯É趨(&S)
menutrans &Global\ Settings È«¾ÖÉ趨(&G)
-" Build boolean options
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ¿ª/¹ØÔöÁ¿²éÕÒģʽ<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic! ¿ª/¹ØºöÂÔ´óСдģʽ<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm! ¿ª/¹ØÆ¥ÅäÏÔʾ<Tab>:set sm!
+" Edit/Global Settings
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ¿ª/¹Øģʽ¸ßÁÁ(&H)<Tab>:set\ hls!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic! ¿ª/¹ØºöÂÔ´óСд(&I)<Tab>:set\ ic!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm! ¿ª/¹ØÏÔʾÅä¶Ô(&S)<Tab>:set\ sm!
menutrans &Context\ lines ÉÏÏÂÎÄÐÐÊý(&C)
-menutrans &Virtual\ Edit ¿ÉÊÓ»¯±à¼Ä£Ê½(&V)
+menutrans &Virtual\ Edit ÐéÄâ±à¼(&V)
menutrans Never ´Ó²»
menutrans Block\ Selection ¿éÑ¡Ôñ
menutrans Insert\ mode ²åÈëģʽ
-menutrans Block\ and\ Insert ¿éÑ¡ÔñÓë²åÈëģʽ
-menutrans Always ËùÓÐģʽ
+menutrans Block\ and\ Insert ¿éÑ¡ÔñºÍ²åÈëģʽ
+menutrans Always ×ÜÊÇ
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! ¿ª/¹Ø²åÈëģʽ<Tab>:set\ im!
-
-menutrans Search\ &Path\.\.\. ²éÕÒ·¾¶\.\.\.(&P)
-
-menutrans Ta&g\ Files\.\.\. ±êÇ©Îļþ\.\.\.(&g)
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! ¿ª/¹Ø²åÈëģʽ(&M)<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! ¿ª/¹Ø\ Vi\ ¼æÈÝ<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\. ²éÕÒ·¾¶(&P)\.\.\.
+menutrans Ta&g\ Files\.\.\. Tag\ Îļþ(&T)\.\.\.
" GUI options
menutrans Toggle\ &Toolbar ¿ª/¹Ø¹¤¾ßÌõ(&T)
@@ -77,87 +85,111 @@
menutrans Toggle\ &Left\ Scrollbar ¿ª/¹Ø×ó¶Ë¹ö¶¯Ìõ(&L)
menutrans Toggle\ &Right\ Scrollbar ¿ª/¹ØÓҶ˹ö¶¯Ìõ(&R)
-
" Edit/File Settings
-menutrans F&ile\ Settings ÎļþÉ趨(&i)
+menutrans F&ile\ Settings ÎļþÉ趨(&I)
" Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! ¿ª/¹ØÏÔʾÐкÅ<Tab>:set\ nu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list! ¿ª/¹ØÏÔʾTab<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! ¿ª/¹Ø×Ô¶¯ÕÛÐÐ<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! ¿ª/¹Ø´ÊβÕÛÐÐ<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et! ¿ª/¹Øexpand-tab<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai! ¿ª/¹Øauto-indent<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin! ¿ª/¹ØC-indent<Tab>:set\ cin!
-
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! ¿ª/¹ØÏÔʾÐкÅ(&N)<Tab>:set\ nu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list! ¿ª/¹Ø\ list\ ģʽ(&L)<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! ¿ª/¹ØÕÛÐÐ(&W)<Tab>:set\ wrap!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! ¿ª/¹ØÕû´ÊÕÛÐÐ(&R)<Tab>:set\ lbr!
+menutrans Toggle\ &expand-tab<Tab>:set\ et! ¿ª/¹ØÀ©Õ¹\ tab(&E)<Tab>:set\ et!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai! ¿ª/¹Ø×Ô¶¯Ëõ½ø(&A)<Tab>:set\ ai!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin! ¿ª/¹Ø\ C\ Ëõ½ø(&C)<Tab>:set\ cin!
" other options
-menutrans &Shiftwidth ËõÅÅ¿í¶È(&S)
-menutrans Soft\ &Tabstop αTab¿í¶È(&T)
-menutrans Te&xt\ Width\.\.\. Ò³Ãæ¿í¶È(&x)\.\.\.
+menutrans &Shiftwidth Ëõ½ø¿í¶È(&S)
+menutrans Soft\ &Tabstop Soft\ Tab\ ¿í¶È(&T)
+menutrans Te&xt\ Width\.\.\. Îı¾¿í¶È(&X)\.\.\.
menutrans &File\ Format\.\.\. Îļþ¸ñʽ(&F)\.\.\.
-
-menutrans C&olor\ Scheme µ÷É«°å(&o)
-menutrans Select\ Fo&nt\.\.\. Ñ¡Ôñ×ÖÌå(&n)\.\.\.
-
+menutrans C&olor\ Scheme ÅäÉ«·½°¸(&O)
+menutrans Select\ Fo&nt\.\.\. Ñ¡Ôñ×ÖÌå(&N)\.\.\.
+menutrans &Keymap Keymap(&K)
" Programming menu
menutrans &Tools ¹¤¾ß(&T)
-menutrans &Jump\ to\ this\ tag<Tab>g^] ¼ìË÷¹â±ê´¦µÄ±êÇ©¹Ø¼ü×Ö(tag)(&J)<Tab>g^]
-menutrans Jump\ &back<Tab>^T Ìø»Ø¼ìË÷Ç°µÄλÖÃ(&B)<Tab>^T
-menutrans Build\ &Tags\ File ½¨Á¢±êÇ©Ë÷ÒýÎļþ\ Tags(&T)
-menutrans &Folding FoldingÉ趨(&F)
-menutrans &Diff ±È½Ï(&D)
-menutrans &Make<Tab>:make Ö´ÐÐ\ Make(&M)<Tab>:make
-menutrans &List\ Errors<Tab>:cl Áгö±àÒë´íÎó(&E)<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl! ÁгöËùÓÐÐÅÏ¢(&I)<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn ÏÂÒ»¸ö±àÒë´íÎó´¦(&N)<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp ÉÏÒ»¸ö±àÒë´íÎó´¦(&P)<Tab>:cp
-menutrans &Older\ List<Tab>:cold ¾É´íÎóÁбí(&O)<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew дíÎóÁбí(&E)<Tab>:cnew
-menutrans Error\ &Window ´íÎóÐÅÏ¢´°¿Ú(&W)
-menutrans &Set\ Compiler ÉèÖñàÒëÆ÷(&S)
-menutrans &Convert\ to\ HEX<Tab>:%!xxd ת»»³É16½øÖÆ<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r ´Ó16½øÖÆת»»»ØÎÄ×Ö<Tab>:%!xxd\ -r
+menutrans &Jump\ to\ this\ tag<Tab>g^] Ìøתµ½Õâ¸ö\ tag(&J)<Tab>g^]
+menutrans Jump\ &back<Tab>^T Ìøת·µ»Ø(&B)<Tab>^T
+menutrans Build\ &Tags\ File ½¨Á¢ Tags Îļþ(&T)
+
+" Tools.Spelling Menu
+menutrans &Spelling ƴд¼ì²é(&S)
+menutrans &Spell\ Check\ On ´ò¿ªÆ´Ð´¼ì²é(&S)
+menutrans Spell\ Check\ &Off ¹Ø±Õƴд¼ì²é(&O)
+menutrans To\ &Next\ error<Tab>]s ÉÏÒ»¸ö´íÎó(&N)<Tab>]s
+menutrans To\ &Previous\ error<Tab>[s ÏÂÒ»¸ö´íÎó(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z= ÐÞÕý½¨Òé(&C)<Tab>z=
+menutrans &Repeat\ correction<Tab>:spellrepall Öظ´ÐÞÕý(&R)<Tab>:spellrepall
+menutrans Set\ language\ to\ "en" É趨ÓïÑÔΪ\ "en"
+menutrans Set\ language\ to\ "en_au" É趨ÓïÑÔΪ\ "en_au"
+menutrans Set\ language\ to\ "en_ca" É趨ÓïÑÔΪ\ "en_ca"
+menutrans Set\ language\ to\ "en_gb" É趨ÓïÑÔΪ\ "en_gb"
+menutrans Set\ language\ to\ "en_nz" É趨ÓïÑÔΪ\ "en_nz"
+menutrans Set\ language\ to\ "en_us" É趨ÓïÑÔΪ\ "en_us"
+menutrans &Find\ More\ Languages ²éÕÒ¸ü¶àÓïÑÔ(&F)
" Tools.Fold Menu
-menutrans &Enable/Disable\ folds<Tab>zi ʹÓÃ/²»Ê¹ÓÃFolding(&E)<Tab>zi
+" open close folds
+menutrans &Folding ÕÛµþ(&F)
+menutrans &Enable/Disable\ folds<Tab>zi ÆôÓÃ/½ûÓÃÕÛµþ(&E)<Tab>zi
menutrans &View\ Cursor\ Line<Tab>zv ²é¿´´ËÐÐ(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Ö»²é¿´´ËÐÐ(&W)<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm ¹Ø±ÕFolds(&L)<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM ¹Ø±ÕËùÓÐFolds(&C)<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr Õ¹¿ªFolds(&P)<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR Õ¹¿ªËùÓÐFolds(&O)<Tab>zR
+menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx ½ö²é¿´´ËÐÐ(&W)<Tab>zMzx
+menutrans C&lose\ more\ folds<Tab>zm ¹Ø±Õ¸ü¶àÕÛµþ(&L)<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM ¹Ø±ÕËùÓÐÕÛµþ(&C)<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr ´ò¿ª¸ü¶àÕÛµþ(&P)<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR ´ò¿ªËùÓÐÕÛµþ(&O)<Tab>zR
" fold method
-menutrans Fold\ Met&hod Fold·½Ê½(&H)
-menutrans Create\ &Fold<Tab>zf ½¨Á¢Fold(&F)<Tab>zf
-menutrans &Delete\ Fold<Tab>zd ɾ³ýFold(&D)<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD ɾ³ýËùÓÐFold(&A)<Tab>zD
+menutrans Fold\ Met&hod ÕÛµþ·½·¨(&H)
+menutrans M&anual ÊÖ¹¤(&A)
+menutrans I&ndent Ëõ½ø(&N)
+menutrans E&xpression ±í´ïʽ(&X)
+menutrans S&yntax Óï·¨(&Y)
+menutrans &Diff ±È½Ï(Diff)(&D)
+menutrans Ma&rker 񈬀(&R)
+" create and delete folds
+menutrans Create\ &Fold<Tab>zf ´´½¨ÕÛµþ(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd ɾ³ýÕÛµþ(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD ɾ³ýËùÓÐÕÛµþ(&A)<Tab>zD
" moving around in folds
-menutrans Fold\ column\ &width É趨FoldÀ¸¿í(&W)
+menutrans Fold\ column\ &width ÕÛµþÀ¸¿í¶È(&W)
" Tools.Diff Menu
-menutrans &Update ¸üÐÂ(&U)
-menutrans &Get\ Block È¡µÃ²»Í¬²¿·Ö(&G)
-menutrans &Put\ Block ½«²»Í¬²¿·ÖÓ¦Óõ½¶Ô·½(&P)
+menutrans &Diff ±È½Ï(Diff)(&D)
+menutrans &Update ¸üÐÂ(&U)
+menutrans &Get\ Block µÃµ½¿é(&G)
+menutrans &Put\ Block ·ÅÖÿé(&P)
+menutrans &Make<Tab>:make Make(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl Áгö´íÎó(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl! ÁгöÏûÏ¢(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn ÏÂÒ»¸ö´íÎó(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp ÉÏÒ»¸ö´íÎó(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold ¸ü¾ÉµÄ´íÎóÁбí(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew ¸üеĴíÎóÁбí(&E)<Tab>:cnew
+menutrans Error\ &Window ´íÎó´°¿Ú(&W)
+menutrans &Update<Tab>:cwin ¸üÐÂ(&U)<Tab>:cwin
+menutrans &Open<Tab>:copen ´ò¿ª(&O)<Tab>:copen
+menutrans &Close<Tab>:cclose ¹Ø±Õ(&C)<Tab>:cclose
+menutrans &Convert\ to\ HEX<Tab>:%!xxd ת»»³ÉÊ®Áù½øÖÆ<Tab>:%!xxd
+menutrans Conve&rt\ back<Tab>:%!xxd\ -r ת»»·µ»Ø<Tab>:%!xxd\ -r
+menutrans Se&T\ Compiler É趨±àÒëÆ÷(&T)
" Names for buffer menu.
menutrans &Buffers »º³åÇø(&B)
-menutrans &Refresh\ menu ¸üÐÂ(&R)
+menutrans &Refresh\ menu ¸üв˵¥(&R)
menutrans &Delete ɾ³ý(&D)
-menutrans &Alternate ÐÞ¸Ä(&L)
+menutrans &Alternate ½»Ìæ(&A)
menutrans &Next ÏÂÒ»¸ö(&N)
-menutrans &Previous Ç°Ò»¸ö(&P)
+menutrans &Previous ÉÏÒ»¸ö(&P)
" Window menu
menutrans &Window ´°¿Ú(&W)
-menutrans &New<Tab>^Wn н¨´°¿Ú(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws ·Ö¸î´°¿Ú(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^ ·Ö¸îµ½#(&L)<Tab>^W^^
+menutrans &New<Tab>^Wn н¨(&N)<Tab>^Wn
+menutrans S&plit<Tab>^Ws ·Ö¸î(&P)<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^ ·Ö¸îµ½\ #(&L)<Tab>^W^^
menutrans Split\ &Vertically<Tab>^Wv ´¹Ö±·Ö¸î(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer Îļþä¯ÀÀÆ÷ʽ·Ö¸î(&X)
-menutrans &Close<Tab>^Wc ¹Ø±Õ´°¿Ú(&C)<Tab>^Wc
+menutrans Split\ File\ E&xplorer ·Ö¸îÎļþä¯ÀÀÆ÷(&X)
+menutrans &Close<Tab>^Wc ¹Ø±Õ(&C)<Tab>^Wc
menutrans Close\ &Other(s)<Tab>^Wo ¹Ø±ÕÆäËü´°¿Ú(&O)<Tab>^Wo
menutrans Move\ &To Òƶ¯µ½(&T)
menutrans &Top<Tab>^WK ¶¥¶Ë(&T)<Tab>^WK
@@ -166,13 +198,13 @@
menutrans &Right\ side<Tab>^WL ÓÒ±ß(&R)<Tab>^WL
" menutrans Ne&xt<Tab>^Ww ÏÂÒ»¸ö(&X)<Tab>^Ww
" menutrans P&revious<Tab>^WW ÉÏÒ»¸ö(&R)<Tab>^WW
-menutrans Rotate\ &Up<Tab>^WR ÉÏÒÆ´°¿Ú(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr ÏÂÒÆ´°¿Ú(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W= ËùÓд°¿ÚµÈ¸ß(&E)<Tab>^W=
+menutrans Rotate\ &Up<Tab>^WR ÏòÉÏÂÖ»»(&U)<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr ÏòÏÂÂÖ»»(&D)<Tab>^Wr
+menutrans &Equal\ Size<Tab>^W= µÈ´ó(&E)<Tab>^W=
menutrans &Max\ Height<Tab>^W_ ×î´ó¸ß¶È(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_ ×îС¸ß¶È(&i)<Tab>^W1_
+menutrans M&in\ Height<Tab>^W1_ ×îС¸ß¶È(&I)<Tab>^W1_
menutrans Max\ &Width<Tab>^W\| ×î´ó¿í¶È(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\| ×îС¿í¶È(&h)<Tab>^W1\|
+menutrans Min\ Widt&h<Tab>^W1\| ×îС¿í¶È(&H)<Tab>^W1\|
"
" The popup menu
menutrans &Undo ³·Ïú(&U)
@@ -180,8 +212,10 @@
menutrans &Copy ¸´ÖÆ(&C)
menutrans &Paste Õ³Ìû(&P)
menutrans &Delete ɾ³ý(&D)
-menutrans Select\ Blockwise BlockwiseÑ¡Ôñ
+menutrans Select\ Blockwise Ñ¡Ôñ¿é
menutrans Select\ &Word Ñ¡Ôñµ¥´Ê(&W)
+menutrans Select\ &Sentence Ñ¡Ôñ¾ä×Ó(&S)
+menutrans Select\ Pa&ragraph Ñ¡Ôñ¶ÎÂä(&R)
menutrans Select\ &Line Ñ¡ÔñÐÐ(&L)
menutrans Select\ &Block Ñ¡Ôñ¿é(&B)
menutrans Select\ &All ȫѡ(&A)
@@ -196,35 +230,35 @@
tmenu ToolBar.Save ±£´æµ±Ç°Îļþ
tmenu ToolBar.SaveAll ±£´æÈ«²¿Îļþ
tmenu ToolBar.Print ´òÓ¡
- tmenu ToolBar.Undo ³·ÏúÉÏ´ÎÐÞ¸Ä
- tmenu ToolBar.Redo ÖØ×öÉϴγ·ÏúµÄ¶¯×÷
- tmenu ToolBar.Cut ¼ôÇÐÖÁ¼ôÌù°å
+ tmenu ToolBar.Undo ³·Ïú
+ tmenu ToolBar.Redo ÖØ×ö
+ tmenu ToolBar.Cut ¼ôÇе½¼ôÌù°å
tmenu ToolBar.Copy ¸´ÖƵ½¼ôÌù°å
- tmenu ToolBar.Paste ÓɼôÌù°åÕ³Ìû
+ tmenu ToolBar.Paste ´Ó¼ôÌù°åÕ³Ìû
tmenu ToolBar.Find ²éÕÒ...
tmenu ToolBar.FindNext ²éÕÒÏÂÒ»¸ö
tmenu ToolBar.FindPrev ²éÕÒÉÏÒ»¸ö
- tmenu ToolBar.Replace Ìæ»»...
+ tmenu ToolBar.Replace ²éÕÒºÍÌæ»»...
tmenu ToolBar.LoadSesn ¼ÓÔػỰ
- tmenu ToolBar.SaveSesn ±£´æµ±Ç°µÄ»á»°
- tmenu ToolBar.RunScript ÔËÐÐVim½Å±¾
- tmenu ToolBar.Make Ö´ÐÐ Make
- tmenu ToolBar.Shell ´ò¿ªÒ»¸öÃüÁî´°¿Ú
- tmenu ToolBar.RunCtags Ö´ÐÐ ctags
- tmenu ToolBar.TagJump Ìøµ½µ±Ç°¹â±êλÖõıêÇ©
+ tmenu ToolBar.SaveSesn ±£´æµ±Ç°»á»°
+ tmenu ToolBar.RunScript ÔËÐÐ Vim ½Å±¾
+ tmenu ToolBar.Make Ö´ÐÐ Make (:make)
+ tmenu ToolBar.RunCtags ÔÚµ±Ç°Ä¿Â¼½¨Á¢ tags (!ctags -R .)
+ tmenu ToolBar.TagJump Ìøתµ½¹â±êλÖÃµÄ tag
tmenu ToolBar.Help Vim °ïÖú
tmenu ToolBar.FindHelp ²éÕÒ Vim °ïÖú
endfun
endif
" Syntax menu
-menutrans &Syntax Óï·¨(&S)
-menutrans Set\ '&syntax'\ only Ö»É趨\ 'syntax'(&s)
-menutrans Set\ '&filetype'\ too Ò²É趨\ 'filetype'(&f)
-menutrans &Off ¹Ø±Õ(&O)
-menutrans &Manual ÊÖ¶¯É趨(&M)
-menutrans A&utomatic ×Ô¶¯É趨(&U)
-menutrans on/off\ for\ &This\ file Ö»¶ÔÕâ¸öÎļþ´ò¿ª/¹Ø±Õ(&T)
-menutrans Co&lor\ test É«²ÊÏÔʾ²âÊÔ(&L)
-menutrans &Highlight\ test Ó﷨Ч¹û²âÊÔ(&H)
-menutrans &Convert\ to\ HTML ת»»³É\ HTML\ ¸ñʽ(&C)
+menutrans &Syntax Óï·¨(&S)
+menutrans &Manual ÊÖ¹¤(&M)
+menutrans A&utomatic ×Ô¶¯(&U)
+menutrans on/off\ for\ &This\ file ½ö¶ÔÕâ¸öÎļþ¿ª/¹Ø(&T)
+menutrans &Show\ filetypes\ in\ menu Ôڲ˵¥ÖÐÏÔʾÎļþÀàÐÍ(&S)
+menutrans &Off ¹Ø±Õ(&O)
+menutrans Co&lor\ test É«²Ê²âÊÔ(&L)
+menutrans &Highlight\ test ¸ßÁÁ²âÊÔ(&H)
+menutrans &Convert\ to\ HTML ת»»³É\ HTML(&C)
+menutrans Set\ '&syntax'\ only ½öÉ趨\ 'syntax'(&S)
+menutrans Set\ '&filetype'\ too Ò²É趨\ 'filetype'(&F)
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index e73376c..ee9f0e5 100644
--- a/runtime/lang/menu_ja_jp.euc-jp.vim
+++ b/runtime/lang/menu_ja_jp.euc-jp.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (EUC-JP)
" Translated By: MURAOKA Taro <koron@tka.att.ne.jp>
-" Last Change: 28-Mar-2006.
+" Last Change: 18-Apr-2006.
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -60,6 +60,7 @@
menutrans Find\ and\ Rep&lace<Tab>:s ÃÖ´¹(&L)<Tab>:s
"menutrans Options\.\.\. ¥ª¥×¥·¥ç¥ó(&O)\.\.\.
menutrans Settings\ &Window ÀßÄꥦ¥£¥ó¥É¥¦(&W)
+menutrans Startup\ &Settings µ¯Æ°»þ¤ÎÀßÄê(&S)
" Edit/Global Settings
menutrans &Global\ Settings Á´ÂÎÀßÄê(&G)
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index 2491f0c..c36d6a0 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (UTF-8)
" Translated By: MURAOKA Taro <koron@tka.att.ne.jp>
-" Last Change: 06-Feb-2006.
+" Last Change: 18-Apr-2006.
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -60,6 +60,7 @@
menutrans Find\ and\ Rep&lace<Tab>:s 置換(&L)<Tab>:s
"menutrans Options\.\.\. オプション(&O)\.\.\.
menutrans Settings\ &Window 設定ウィンドウ(&W)
+menutrans Startup\ &Settings 起動時の設定(&S)
" Edit/Global Settings
menutrans &Global\ Settings 全体設定(&G)
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index 16a2635..5c836be 100644
--- a/runtime/lang/menu_japanese_japan.932.vim
+++ b/runtime/lang/menu_japanese_japan.932.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (CP932)
" Translated By: MURAOKA Taro <koron@tka.att.ne.jp>
-" Last Change: 28-Mar-2006.
+" Last Change: 18-Apr-2006.
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -60,6 +60,7 @@
menutrans Find\ and\ Rep&lace<Tab>:s u·(&L)<Tab>:s
"menutrans Options\.\.\. IvV(&O)\.\.\.
menutrans Settings\ &Window ÝèEBhE(&W)
+menutrans Startup\ &Settings N®ÌÝè(&S)
" Edit/Global Settings
menutrans &Global\ Settings SÌÝè(&G)
diff --git a/runtime/lang/menu_sv_se.latin1.vim b/runtime/lang/menu_sv_se.latin1.vim
index 744d272..8935e0d 100644
--- a/runtime/lang/menu_sv_se.latin1.vim
+++ b/runtime/lang/menu_sv_se.latin1.vim
@@ -1,6 +1,6 @@
" Menu Translations: Swedish
" Maintainer: Johan Svedberg <johan@svedberg.com>
-" Last Change: 2005 Oct 09
+" Last Change: 2006 Apr 13
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -31,6 +31,7 @@
menutrans &File &Arkiv
menutrans &Open\.\.\.<Tab>:e &Öppna\.\.\.<Tab>:e
menutrans Sp&lit-Open\.\.\.<Tab>:sp Öppna\ i\ splitt-vy\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew Öppna\ flik\.\.\.<Tab>:tabnew
menutrans &New<Tab>:enew &Ny<Tab>:enew
menutrans &Close<Tab>:close S&täng<Tab>:close
menutrans &Save<Tab>:w &Spara<Tab>:w
@@ -66,24 +67,24 @@
" Edit.Global Settings
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Växla\ mönsterframhävning<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic! Växla\ ignorering\ av\ storlek<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm! Växla\ matchningsvisning<Tab>:set\ sm!
-menutrans &Context\ lines Sammanhangsrader
-menutrans &Virtual\ Edit Virtuell\ redigering
-menutrans Never Aldrig
-menutrans Block\ Selection Blockval
-menutrans Insert\ mode Infogningsläge
-menutrans Block\ and\ Insert Block\ och\ infogning
-menutrans Always Alltid
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! Växla\ infogningsläge<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! Växla\ Vi-kompabilitet<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\. Sökväg\.\.\.
-menutrans Ta&g\ Files\.\.\. Taggfiler\.\.\.
-menutrans Toggle\ &Toolbar Växla\ verktygsrad
-menutrans Toggle\ &Bottom\ Scrollbar Växla\ rullningslista\ i\ botten
-menutrans Toggle\ &Left\ Scrollbar Växla\ vänster\ rullningslista
-menutrans Toggle\ &Right\ Scrollbar Växla\ höger\ rullningslista
-menutrans None Ingen
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic! Växla\ ignorering\ av\ storlek<Tab>:set\ ic!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm! Växla\ matchningsvisning<Tab>:set\ sm!
+menutrans &Context\ lines Sammanhangsrader
+menutrans &Virtual\ Edit Virtuell\ redigering
+menutrans Never Aldrig
+menutrans Block\ Selection Blockval
+menutrans Insert\ mode Infogningsläge
+menutrans Block\ and\ Insert Block\ och\ infogning
+menutrans Always Alltid
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! Växla\ infogningsläge<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! Växla\ Vi-kompabilitet<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\. Sökväg\.\.\.
+menutrans Ta&g\ Files\.\.\. Taggfiler\.\.\.
+menutrans Toggle\ &Toolbar Växla\ verktygsrad
+menutrans Toggle\ &Bottom\ Scrollbar Växla\ rullningslista\ i\ botten
+menutrans Toggle\ &Left\ Scrollbar Växla\ vänster\ rullningslista
+menutrans Toggle\ &Right\ Scrollbar Växla\ höger\ rullningslista
+menutrans None Ingen
" Edit.File Settings
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! Växla\ radnumrering<Tab>:set\ nu!
@@ -94,7 +95,7 @@
menutrans Toggle\ &auto-indent<Tab>:set\ ai! Växla\ auto-indentering<Tab>:set\ ai!
menutrans Toggle\ &C-indenting<Tab>:set\ cin! Växla\ C-indentering<Tab>:set\ cin!
menutrans &Shiftwidth Shiftbredd
-menutrans Soft &Tabstop Mjuk tab-stopp
+menutrans Soft\ &Tabstop Mjuk\ tab-stopp
menutrans Te&xt\ Width\.\.\. Textbredd\.\.\.
menutrans &File\ Format\.\.\. Filformat\.\.\.
@@ -116,7 +117,16 @@
menutrans &Close<Tab>:cclose &Stäng<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd Konvertera\ till\ HEX<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r Konvertera\ tillbaka<Tab>:%!xxd\ -r
-menutrans &Set\ Compiler Sätt\ kompilerare
+menutrans Se&T\ Compiler Sätt\ &kompilerare
+
+" Tools.Spelling
+menutrans &Spelling &Stavning
+menutrans &Spell\ Check\ On &Stavningskontroll\ på
+menutrans &Spell\ Check\ Off Stavningskontroll\ &av
+menutrans To\ &Next\ error<Tab>]s Till\ &nästa\ fel
+menutrans To\ &Previous\ error<Tab>[s Till\ &föregående\ fel
+menutrans Suggest\ &Corrections<Tab>z= Föreslå\ &korrigeringar
+menutrans &Repeat\ correction<Tab>:spellrepall &Upprepa\ korrigering
" Tools.Folding
menutrans &Enable/Disable\ folds<Tab>zi Växla\ veck<Tab>zi
diff --git a/runtime/lang/menu_zh_cn.gb2312.vim b/runtime/lang/menu_zh_cn.gb2312.vim
index b0eac38..78840ec 100644
--- a/runtime/lang/menu_zh_cn.gb2312.vim
+++ b/runtime/lang/menu_zh_cn.gb2312.vim
@@ -1,6 +1,8 @@
-" Menu Translations: Simplified Chinese (UNIX)
-" Translated By: Wang Jun <junw@turbolinux.com.cn>
-" Last Change: Tue Sep 4 11:26:52 CST 2001
+" Menu Translations: Simplified Chinese <i18n-translation@lists.linux.net.cn>
+" Translated By: Yuheng Xie <elephant@linux.net.cn>
+" Last Change: Tue Apr 18 22:00:00 2006
+
+" vim: ts=8 sw=8 noet
" Quit when menu translations have already been done.
if exists("did_menu_trans")
@@ -14,62 +16,68 @@
menutrans &Help °ïÖú(&H)
menutrans &Overview<Tab><F1> Ô¤ÀÀ(&O)<Tab><F1>
menutrans &User\ Manual Óû§ÊÖ²á(&U)
-menutrans &GUI ͼÐνçÃæ(&G)
-menutrans &How-to\ links HOWTOÎĵµ\.\.\.(&H)
+menutrans &How-to\ links How-to\ Á¬½Ó(&H)
+menutrans &Find\.\.\. ²éÕÒ(&F)\.\.\.
menutrans &Credits ×÷Õß(&C)
menutrans Co&pying °æȨ(&P)
menutrans &Version °æ±¾(&V)
-menutrans &About ¹ØÓÚ\ Vim(&A)
+menutrans &Sponsor/Register ÔÞÖú/×¢²á(&S)
+menutrans O&rphans ¹Â¶ù(&R)
+menutrans &Version °æ±¾(&V)
+menutrans &About ¹ØÓÚ(&A)
" File menu
menutrans &File Îļþ(&F)
menutrans &Open\.\.\.<Tab>:e ´ò¿ª(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp ·Ö¸î´°¿Ú²¢´ò¿ª(&L)<Tab>:sp
+menutrans Sp&lit-Open\.\.\.<Tab>:sp ·Ö¸î²¢´ò¿ª(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew ´ò¿ª±êÇ©\.\.\.<Tab>:tabnew
menutrans &New<Tab>:enew н¨(&N)<Tab>:enew
menutrans &Close<Tab>:close ¹Ø±Õ(&C)<Tab>:close
menutrans &Save<Tab>:w ±£´æ(&S)<Tab>:w
menutrans Save\ &As\.\.\.<Tab>:sav Áí´æΪ(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\. ·Ö¸î±È½Ï(&Diff)\.\.\.
-menutrans Split\ Patched\ &By\.\.\. ·Ö¸î´ò²¹¶¡(&Patch)\.\.\.
+menutrans Split\ &Diff\ with\.\.\. ·Ö¸î±È½Ï(Diff)(&D)\.\.\.
+menutrans Split\ Patched\ &By\.\.\. ·Ö¸î´ò²¹¶¡(Patch)(&B)\.\.\.
menutrans &Print ´òÓ¡(&P)
menutrans Sa&ve-Exit<Tab>:wqa ±£´æ²¢Í˳ö(&V)<Tab>:wqa
menutrans E&xit<Tab>:qa Í˳ö(&X)<Tab>:qa
" Edit menu
menutrans &Edit ±à¼(&E)
-menutrans &Undo<Tab>u »Ö¸´(&U)<Tab>u
+menutrans &Undo<Tab>u ³·Ïú(&U)<Tab>u
menutrans &Redo<Tab>^R ÖØ×ö(&R)<Tab>^R
-menutrans Rep&eat<Tab>\. Öظ´Éϴζ¯×÷(&E)<Tab>\.
+menutrans Rep&eat<Tab>\. Öظ´ÉϴβÙ×÷(&E)<Tab>\.
menutrans Cu&t<Tab>"+x ¼ôÇÐ(&T)<Tab>"+x
menutrans &Copy<Tab>"+y ¸´ÖÆ(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP Õ³Ìû(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p Ìùµ½¹â±êÇ°(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p Ìùµ½¹â±êºó(&A)<Tab>]p
+menutrans &Paste<Tab>"+gP Õ³Ìù(&P)<Tab>"+gP
+menutrans Put\ &Before<Tab>[p Õ³Ìùµ½¹â±êÇ°(&B)<Tab>[p
+menutrans Put\ &After<Tab>]p Õ³Ìùµ½¹â±êºó(&A)<Tab>]p
menutrans &Delete<Tab>x ɾ³ý(&D)<Tab>x
-menutrans &Select\ all<Tab>ggVG ȫѡ(&S)<Tab>ggvG
+menutrans &Select\ all<Tab>ggVG ȫѡ(&S)<Tab>ggVG
menutrans &Find\.\.\. ²éÕÒ(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\. ²éÕÒÌæ»»(&L)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\. ²éÕÒºÍÌæ»»(&L)\.\.\.
+menutrans &Find<Tab>/ ²éÕÒ(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s ²éÕÒºÍÌæ»»(&L)<Tab>:%s
menutrans Settings\ &Window É趨´°¿Ú(&W)
+menutrans Startup\ &Settings Æô¶¯É趨(&S)
menutrans &Global\ Settings È«¾ÖÉ趨(&G)
-" Build boolean options
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ¿ª/¹ØÔöÁ¿²éÕÒģʽ<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic! ¿ª/¹ØºöÂÔ´óСдģʽ<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm! ¿ª/¹ØÆ¥ÅäÏÔʾ<Tab>:set sm!
+" Edit/Global Settings
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! ¿ª/¹Øģʽ¸ßÁÁ(&H)<Tab>:set\ hls!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic! ¿ª/¹ØºöÂÔ´óСд(&I)<Tab>:set\ ic!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm! ¿ª/¹ØÏÔʾÅä¶Ô(&S)<Tab>:set\ sm!
menutrans &Context\ lines ÉÏÏÂÎÄÐÐÊý(&C)
-menutrans &Virtual\ Edit ¿ÉÊÓ»¯±à¼Ä£Ê½(&V)
+menutrans &Virtual\ Edit ÐéÄâ±à¼(&V)
menutrans Never ´Ó²»
menutrans Block\ Selection ¿éÑ¡Ôñ
menutrans Insert\ mode ²åÈëģʽ
-menutrans Block\ and\ Insert ¿éÑ¡ÔñÓë²åÈëģʽ
-menutrans Always ËùÓÐģʽ
+menutrans Block\ and\ Insert ¿éÑ¡ÔñºÍ²åÈëģʽ
+menutrans Always ×ÜÊÇ
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! ¿ª/¹Ø²åÈëģʽ<Tab>:set\ im!
-
-menutrans Search\ &Path\.\.\. ²éÕÒ·¾¶\.\.\.(&P)
-
-menutrans Ta&g\ Files\.\.\. ±êÇ©Îļþ\.\.\.(&g)
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! ¿ª/¹Ø²åÈëģʽ(&M)<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! ¿ª/¹Ø\ Vi\ ¼æÈÝ<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\. ²éÕÒ·¾¶(&P)\.\.\.
+menutrans Ta&g\ Files\.\.\. Tag\ Îļþ(&T)\.\.\.
" GUI options
menutrans Toggle\ &Toolbar ¿ª/¹Ø¹¤¾ßÌõ(&T)
@@ -77,87 +85,111 @@
menutrans Toggle\ &Left\ Scrollbar ¿ª/¹Ø×ó¶Ë¹ö¶¯Ìõ(&L)
menutrans Toggle\ &Right\ Scrollbar ¿ª/¹ØÓҶ˹ö¶¯Ìõ(&R)
-
" Edit/File Settings
-menutrans F&ile\ Settings ÎļþÉ趨(&i)
+menutrans F&ile\ Settings ÎļþÉ趨(&I)
" Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! ¿ª/¹ØÏÔʾÐкÅ<Tab>:set\ nu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list! ¿ª/¹ØÏÔʾTab<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! ¿ª/¹Ø×Ô¶¯ÕÛÐÐ<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! ¿ª/¹Ø´ÊβÕÛÐÐ<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et! ¿ª/¹Øexpand-tab<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai! ¿ª/¹Øauto-indent<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin! ¿ª/¹ØC-indent<Tab>:set\ cin!
-
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! ¿ª/¹ØÏÔʾÐкÅ(&N)<Tab>:set\ nu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list! ¿ª/¹Ø\ list\ ģʽ(&L)<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! ¿ª/¹ØÕÛÐÐ(&W)<Tab>:set\ wrap!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! ¿ª/¹ØÕû´ÊÕÛÐÐ(&R)<Tab>:set\ lbr!
+menutrans Toggle\ &expand-tab<Tab>:set\ et! ¿ª/¹ØÀ©Õ¹\ tab(&E)<Tab>:set\ et!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai! ¿ª/¹Ø×Ô¶¯Ëõ½ø(&A)<Tab>:set\ ai!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin! ¿ª/¹Ø\ C\ Ëõ½ø(&C)<Tab>:set\ cin!
" other options
-menutrans &Shiftwidth ËõÅÅ¿í¶È(&S)
-menutrans Soft\ &Tabstop αTab¿í¶È(&T)
-menutrans Te&xt\ Width\.\.\. Ò³Ãæ¿í¶È(&x)\.\.\.
+menutrans &Shiftwidth Ëõ½ø¿í¶È(&S)
+menutrans Soft\ &Tabstop Soft\ Tab\ ¿í¶È(&T)
+menutrans Te&xt\ Width\.\.\. Îı¾¿í¶È(&X)\.\.\.
menutrans &File\ Format\.\.\. Îļþ¸ñʽ(&F)\.\.\.
-
-menutrans C&olor\ Scheme µ÷É«°å(&o)
-menutrans Select\ Fo&nt\.\.\. Ñ¡Ôñ×ÖÌå(&n)\.\.\.
-
+menutrans C&olor\ Scheme ÅäÉ«·½°¸(&O)
+menutrans Select\ Fo&nt\.\.\. Ñ¡Ôñ×ÖÌå(&N)\.\.\.
+menutrans &Keymap Keymap(&K)
" Programming menu
menutrans &Tools ¹¤¾ß(&T)
-menutrans &Jump\ to\ this\ tag<Tab>g^] ¼ìË÷¹â±ê´¦µÄ±êÇ©¹Ø¼ü×Ö(tag)(&J)<Tab>g^]
-menutrans Jump\ &back<Tab>^T Ìø»Ø¼ìË÷Ç°µÄλÖÃ(&B)<Tab>^T
-menutrans Build\ &Tags\ File ½¨Á¢±êÇ©Ë÷ÒýÎļþ\ Tags(&T)
-menutrans &Folding FoldingÉ趨(&F)
-menutrans &Diff ±È½Ï(&D)
-menutrans &Make<Tab>:make Ö´ÐÐ\ Make(&M)<Tab>:make
-menutrans &List\ Errors<Tab>:cl Áгö±àÒë´íÎó(&E)<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl! ÁгöËùÓÐÐÅÏ¢(&I)<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn ÏÂÒ»¸ö±àÒë´íÎó´¦(&N)<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp ÉÏÒ»¸ö±àÒë´íÎó´¦(&P)<Tab>:cp
-menutrans &Older\ List<Tab>:cold ¾É´íÎóÁбí(&O)<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew дíÎóÁбí(&E)<Tab>:cnew
-menutrans Error\ &Window ´íÎóÐÅÏ¢´°¿Ú(&W)
-menutrans &Set\ Compiler ÉèÖñàÒëÆ÷(&S)
-menutrans &Convert\ to\ HEX<Tab>:%!xxd ת»»³É16½øÖÆ<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r ´Ó16½øÖÆת»»»ØÎÄ×Ö<Tab>:%!xxd\ -r
+menutrans &Jump\ to\ this\ tag<Tab>g^] Ìøתµ½Õâ¸ö\ tag(&J)<Tab>g^]
+menutrans Jump\ &back<Tab>^T Ìøת·µ»Ø(&B)<Tab>^T
+menutrans Build\ &Tags\ File ½¨Á¢ Tags Îļþ(&T)
+
+" Tools.Spelling Menu
+menutrans &Spelling ƴд¼ì²é(&S)
+menutrans &Spell\ Check\ On ´ò¿ªÆ´Ð´¼ì²é(&S)
+menutrans Spell\ Check\ &Off ¹Ø±Õƴд¼ì²é(&O)
+menutrans To\ &Next\ error<Tab>]s ÉÏÒ»¸ö´íÎó(&N)<Tab>]s
+menutrans To\ &Previous\ error<Tab>[s ÏÂÒ»¸ö´íÎó(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z= ÐÞÕý½¨Òé(&C)<Tab>z=
+menutrans &Repeat\ correction<Tab>:spellrepall Öظ´ÐÞÕý(&R)<Tab>:spellrepall
+menutrans Set\ language\ to\ "en" É趨ÓïÑÔΪ\ "en"
+menutrans Set\ language\ to\ "en_au" É趨ÓïÑÔΪ\ "en_au"
+menutrans Set\ language\ to\ "en_ca" É趨ÓïÑÔΪ\ "en_ca"
+menutrans Set\ language\ to\ "en_gb" É趨ÓïÑÔΪ\ "en_gb"
+menutrans Set\ language\ to\ "en_nz" É趨ÓïÑÔΪ\ "en_nz"
+menutrans Set\ language\ to\ "en_us" É趨ÓïÑÔΪ\ "en_us"
+menutrans &Find\ More\ Languages ²éÕÒ¸ü¶àÓïÑÔ(&F)
" Tools.Fold Menu
-menutrans &Enable/Disable\ folds<Tab>zi ʹÓÃ/²»Ê¹ÓÃFolding(&E)<Tab>zi
+" open close folds
+menutrans &Folding ÕÛµþ(&F)
+menutrans &Enable/Disable\ folds<Tab>zi ÆôÓÃ/½ûÓÃÕÛµþ(&E)<Tab>zi
menutrans &View\ Cursor\ Line<Tab>zv ²é¿´´ËÐÐ(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Ö»²é¿´´ËÐÐ(&W)<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm ¹Ø±ÕFolds(&L)<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM ¹Ø±ÕËùÓÐFolds(&C)<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr Õ¹¿ªFolds(&P)<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR Õ¹¿ªËùÓÐFolds(&O)<Tab>zR
+menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx ½ö²é¿´´ËÐÐ(&W)<Tab>zMzx
+menutrans C&lose\ more\ folds<Tab>zm ¹Ø±Õ¸ü¶àÕÛµþ(&L)<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM ¹Ø±ÕËùÓÐÕÛµþ(&C)<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr ´ò¿ª¸ü¶àÕÛµþ(&P)<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR ´ò¿ªËùÓÐÕÛµþ(&O)<Tab>zR
" fold method
-menutrans Fold\ Met&hod Fold·½Ê½(&H)
-menutrans Create\ &Fold<Tab>zf ½¨Á¢Fold(&F)<Tab>zf
-menutrans &Delete\ Fold<Tab>zd ɾ³ýFold(&D)<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD ɾ³ýËùÓÐFold(&A)<Tab>zD
+menutrans Fold\ Met&hod ÕÛµþ·½·¨(&H)
+menutrans M&anual ÊÖ¹¤(&A)
+menutrans I&ndent Ëõ½ø(&N)
+menutrans E&xpression ±í´ïʽ(&X)
+menutrans S&yntax Óï·¨(&Y)
+menutrans &Diff ±È½Ï(Diff)(&D)
+menutrans Ma&rker 񈬀(&R)
+" create and delete folds
+menutrans Create\ &Fold<Tab>zf ´´½¨ÕÛµþ(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd ɾ³ýÕÛµþ(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD ɾ³ýËùÓÐÕÛµþ(&A)<Tab>zD
" moving around in folds
-menutrans Fold\ column\ &width É趨FoldÀ¸¿í(&W)
+menutrans Fold\ column\ &width ÕÛµþÀ¸¿í¶È(&W)
" Tools.Diff Menu
-menutrans &Update ¸üÐÂ(&U)
-menutrans &Get\ Block È¡µÃ²»Í¬²¿·Ö(&G)
-menutrans &Put\ Block ½«²»Í¬²¿·ÖÓ¦Óõ½¶Ô·½(&P)
+menutrans &Diff ±È½Ï(Diff)(&D)
+menutrans &Update ¸üÐÂ(&U)
+menutrans &Get\ Block µÃµ½¿é(&G)
+menutrans &Put\ Block ·ÅÖÿé(&P)
+menutrans &Make<Tab>:make Make(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl Áгö´íÎó(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl! ÁгöÏûÏ¢(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn ÏÂÒ»¸ö´íÎó(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp ÉÏÒ»¸ö´íÎó(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold ¸ü¾ÉµÄ´íÎóÁбí(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew ¸üеĴíÎóÁбí(&E)<Tab>:cnew
+menutrans Error\ &Window ´íÎó´°¿Ú(&W)
+menutrans &Update<Tab>:cwin ¸üÐÂ(&U)<Tab>:cwin
+menutrans &Open<Tab>:copen ´ò¿ª(&O)<Tab>:copen
+menutrans &Close<Tab>:cclose ¹Ø±Õ(&C)<Tab>:cclose
+menutrans &Convert\ to\ HEX<Tab>:%!xxd ת»»³ÉÊ®Áù½øÖÆ<Tab>:%!xxd
+menutrans Conve&rt\ back<Tab>:%!xxd\ -r ת»»·µ»Ø<Tab>:%!xxd\ -r
+menutrans Se&T\ Compiler É趨±àÒëÆ÷(&T)
" Names for buffer menu.
menutrans &Buffers »º³åÇø(&B)
-menutrans &Refresh\ menu ¸üÐÂ(&R)
+menutrans &Refresh\ menu ¸üв˵¥(&R)
menutrans &Delete ɾ³ý(&D)
-menutrans &Alternate ÐÞ¸Ä(&L)
+menutrans &Alternate ½»Ìæ(&A)
menutrans &Next ÏÂÒ»¸ö(&N)
-menutrans &Previous Ç°Ò»¸ö(&P)
+menutrans &Previous ÉÏÒ»¸ö(&P)
" Window menu
menutrans &Window ´°¿Ú(&W)
-menutrans &New<Tab>^Wn н¨´°¿Ú(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws ·Ö¸î´°¿Ú(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^ ·Ö¸îµ½#(&L)<Tab>^W^^
+menutrans &New<Tab>^Wn н¨(&N)<Tab>^Wn
+menutrans S&plit<Tab>^Ws ·Ö¸î(&P)<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^ ·Ö¸îµ½\ #(&L)<Tab>^W^^
menutrans Split\ &Vertically<Tab>^Wv ´¹Ö±·Ö¸î(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer Îļþä¯ÀÀÆ÷ʽ·Ö¸î(&X)
-menutrans &Close<Tab>^Wc ¹Ø±Õ´°¿Ú(&C)<Tab>^Wc
+menutrans Split\ File\ E&xplorer ·Ö¸îÎļþä¯ÀÀÆ÷(&X)
+menutrans &Close<Tab>^Wc ¹Ø±Õ(&C)<Tab>^Wc
menutrans Close\ &Other(s)<Tab>^Wo ¹Ø±ÕÆäËü´°¿Ú(&O)<Tab>^Wo
menutrans Move\ &To Òƶ¯µ½(&T)
menutrans &Top<Tab>^WK ¶¥¶Ë(&T)<Tab>^WK
@@ -166,13 +198,13 @@
menutrans &Right\ side<Tab>^WL ÓÒ±ß(&R)<Tab>^WL
" menutrans Ne&xt<Tab>^Ww ÏÂÒ»¸ö(&X)<Tab>^Ww
" menutrans P&revious<Tab>^WW ÉÏÒ»¸ö(&R)<Tab>^WW
-menutrans Rotate\ &Up<Tab>^WR ÉÏÒÆ´°¿Ú(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr ÏÂÒÆ´°¿Ú(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W= ËùÓд°¿ÚµÈ¸ß(&E)<Tab>^W=
+menutrans Rotate\ &Up<Tab>^WR ÏòÉÏÂÖ»»(&U)<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr ÏòÏÂÂÖ»»(&D)<Tab>^Wr
+menutrans &Equal\ Size<Tab>^W= µÈ´ó(&E)<Tab>^W=
menutrans &Max\ Height<Tab>^W_ ×î´ó¸ß¶È(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_ ×îС¸ß¶È(&i)<Tab>^W1_
+menutrans M&in\ Height<Tab>^W1_ ×îС¸ß¶È(&I)<Tab>^W1_
menutrans Max\ &Width<Tab>^W\| ×î´ó¿í¶È(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\| ×îС¿í¶È(&h)<Tab>^W1\|
+menutrans Min\ Widt&h<Tab>^W1\| ×îС¿í¶È(&H)<Tab>^W1\|
"
" The popup menu
menutrans &Undo ³·Ïú(&U)
@@ -180,8 +212,10 @@
menutrans &Copy ¸´ÖÆ(&C)
menutrans &Paste Õ³Ìû(&P)
menutrans &Delete ɾ³ý(&D)
-menutrans Select\ Blockwise BlockwiseÑ¡Ôñ
+menutrans Select\ Blockwise Ñ¡Ôñ¿é
menutrans Select\ &Word Ñ¡Ôñµ¥´Ê(&W)
+menutrans Select\ &Sentence Ñ¡Ôñ¾ä×Ó(&S)
+menutrans Select\ Pa&ragraph Ñ¡Ôñ¶ÎÂä(&R)
menutrans Select\ &Line Ñ¡ÔñÐÐ(&L)
menutrans Select\ &Block Ñ¡Ôñ¿é(&B)
menutrans Select\ &All ȫѡ(&A)
@@ -196,35 +230,35 @@
tmenu ToolBar.Save ±£´æµ±Ç°Îļþ
tmenu ToolBar.SaveAll ±£´æÈ«²¿Îļþ
tmenu ToolBar.Print ´òÓ¡
- tmenu ToolBar.Undo ³·ÏúÉÏ´ÎÐÞ¸Ä
- tmenu ToolBar.Redo ÖØ×öÉϴγ·ÏúµÄ¶¯×÷
- tmenu ToolBar.Cut ¼ôÇÐÖÁ¼ôÌù°å
+ tmenu ToolBar.Undo ³·Ïú
+ tmenu ToolBar.Redo ÖØ×ö
+ tmenu ToolBar.Cut ¼ôÇе½¼ôÌù°å
tmenu ToolBar.Copy ¸´ÖƵ½¼ôÌù°å
- tmenu ToolBar.Paste ÓɼôÌù°åÕ³Ìû
+ tmenu ToolBar.Paste ´Ó¼ôÌù°åÕ³Ìû
tmenu ToolBar.Find ²éÕÒ...
tmenu ToolBar.FindNext ²éÕÒÏÂÒ»¸ö
tmenu ToolBar.FindPrev ²éÕÒÉÏÒ»¸ö
- tmenu ToolBar.Replace Ìæ»»...
+ tmenu ToolBar.Replace ²éÕÒºÍÌæ»»...
tmenu ToolBar.LoadSesn ¼ÓÔػỰ
- tmenu ToolBar.SaveSesn ±£´æµ±Ç°µÄ»á»°
- tmenu ToolBar.RunScript ÔËÐÐVim½Å±¾
- tmenu ToolBar.Make Ö´ÐÐ Make
- tmenu ToolBar.Shell ´ò¿ªÒ»¸öÃüÁî´°¿Ú
- tmenu ToolBar.RunCtags Ö´ÐÐ ctags
- tmenu ToolBar.TagJump Ìøµ½µ±Ç°¹â±êλÖõıêÇ©
+ tmenu ToolBar.SaveSesn ±£´æµ±Ç°»á»°
+ tmenu ToolBar.RunScript ÔËÐÐ Vim ½Å±¾
+ tmenu ToolBar.Make Ö´ÐÐ Make (:make)
+ tmenu ToolBar.RunCtags ÔÚµ±Ç°Ä¿Â¼½¨Á¢ tags (!ctags -R .)
+ tmenu ToolBar.TagJump Ìøתµ½¹â±êλÖÃµÄ tag
tmenu ToolBar.Help Vim °ïÖú
tmenu ToolBar.FindHelp ²éÕÒ Vim °ïÖú
endfun
endif
" Syntax menu
-menutrans &Syntax Óï·¨(&S)
-menutrans Set\ '&syntax'\ only Ö»É趨\ 'syntax'(&s)
-menutrans Set\ '&filetype'\ too Ò²É趨\ 'filetype'(&f)
-menutrans &Off ¹Ø±Õ(&O)
-menutrans &Manual ÊÖ¶¯É趨(&M)
-menutrans A&utomatic ×Ô¶¯É趨(&U)
-menutrans on/off\ for\ &This\ file Ö»¶ÔÕâ¸öÎļþ´ò¿ª/¹Ø±Õ(&T)
-menutrans Co&lor\ test É«²ÊÏÔʾ²âÊÔ(&L)
-menutrans &Highlight\ test Ó﷨Ч¹û²âÊÔ(&H)
-menutrans &Convert\ to\ HTML ת»»³É\ HTML\ ¸ñʽ(&C)
+menutrans &Syntax Óï·¨(&S)
+menutrans &Manual ÊÖ¹¤(&M)
+menutrans A&utomatic ×Ô¶¯(&U)
+menutrans on/off\ for\ &This\ file ½ö¶ÔÕâ¸öÎļþ¿ª/¹Ø(&T)
+menutrans &Show\ filetypes\ in\ menu Ôڲ˵¥ÖÐÏÔʾÎļþÀàÐÍ(&S)
+menutrans &Off ¹Ø±Õ(&O)
+menutrans Co&lor\ test É«²Ê²âÊÔ(&L)
+menutrans &Highlight\ test ¸ßÁÁ²âÊÔ(&H)
+menutrans &Convert\ to\ HTML ת»»³É\ HTML(&C)
+menutrans Set\ '&syntax'\ only ½öÉ趨\ 'syntax'(&S)
+menutrans Set\ '&filetype'\ too Ò²É趨\ 'filetype'(&F)
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 097e96a..845393d 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,6 +1,6 @@
" Script to define the syntax menu in synmenu.vim
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 16
+" Last Change: 2006 Apr 18
" This is used by "make menu" in the src directory.
edit <sfile>:p:h/synmenu.vim
@@ -119,6 +119,7 @@
SynMenu C.Clean:clean
SynMenu C.Clever:cl
SynMenu C.Clipper:clipper
+SynMenu C.Cmake:cmake
SynMenu C.Cold\ Fusion:cf
SynMenu C.Config.Cfg\ Config\ file:cfg
SynMenu C.Config.Generic\ Config\ file:conf
@@ -363,8 +364,9 @@
SynMenu PQ.Quake:quake
SynMenu PQ.Quickfix\ window:qf
-SynMenu R-Sg.R:r
-SynMenu R-Sg.R\ help:rhelp
+SynMenu R-Sg.R.R:r
+SynMenu R-Sg.R.R\ help:rhelp
+SynMenu R-Sg.R.R\ noweb:rnoweb
SynMenu R-Sg.Racc\ input:racc
SynMenu R-Sg.Radiance:radiance
SynMenu R-Sg.Ratpoison:ratpoison
@@ -490,6 +492,7 @@
SynMenu TUV.UnrealScript:uc
SynMenu TUV.Updatedb\.conf:updatedb
SynMenu TUV.Valgrind:valgrind
+SynMenu TUV.Vera:vera
SynMenu TUV.Verilog-AMS\ HDL:verilogams
SynMenu TUV.Verilog\ HDL:verilog
SynMenu TUV.Vgrindefs:vgrindefs
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 1dd2f00..c6b96b7 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -100,19 +100,20 @@
an 50.20.240 &Syntax.C.Clean :cal SetSyn("clean")<CR>
an 50.20.250 &Syntax.C.Clever :cal SetSyn("cl")<CR>
an 50.20.260 &Syntax.C.Clipper :cal SetSyn("clipper")<CR>
-an 50.20.270 &Syntax.C.Cold\ Fusion :cal SetSyn("cf")<CR>
-an 50.20.280 &Syntax.C.Config.Cfg\ Config\ file :cal SetSyn("cfg")<CR>
-an 50.20.290 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
-an 50.20.300 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
-an 50.20.310 &Syntax.C.ConTeXt :cal SetSyn("context")<CR>
-an 50.20.320 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
-an 50.20.330 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
-an 50.20.340 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
-an 50.20.350 &Syntax.C.CSP :cal SetSyn("csp")<CR>
-an 50.20.360 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
-an 50.20.370 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
-an 50.20.380 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
-an 50.20.390 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
+an 50.20.270 &Syntax.C.Cmake :cal SetSyn("cmake")<CR>
+an 50.20.280 &Syntax.C.Cold\ Fusion :cal SetSyn("cf")<CR>
+an 50.20.290 &Syntax.C.Config.Cfg\ Config\ file :cal SetSyn("cfg")<CR>
+an 50.20.300 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
+an 50.20.310 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
+an 50.20.320 &Syntax.C.ConTeXt :cal SetSyn("context")<CR>
+an 50.20.330 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
+an 50.20.340 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
+an 50.20.350 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
+an 50.20.360 &Syntax.C.CSP :cal SetSyn("csp")<CR>
+an 50.20.370 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
+an 50.20.380 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
+an 50.20.390 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
+an 50.20.400 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
an 50.30.100 &Syntax.DE.D :cal SetSyn("d")<CR>
an 50.30.110 &Syntax.DE.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog")<CR>
an 50.30.120 &Syntax.DE.Debian.Debian\ Control :cal SetSyn("debcontrol")<CR>
@@ -335,49 +336,50 @@
an 50.80.440 &Syntax.PQ.Python :cal SetSyn("python")<CR>
an 50.80.460 &Syntax.PQ.Quake :cal SetSyn("quake")<CR>
an 50.80.470 &Syntax.PQ.Quickfix\ window :cal SetSyn("qf")<CR>
-an 50.90.100 &Syntax.R-Sg.R :cal SetSyn("r")<CR>
-an 50.90.110 &Syntax.R-Sg.R\ help :cal SetSyn("rhelp")<CR>
-an 50.90.120 &Syntax.R-Sg.Racc\ input :cal SetSyn("racc")<CR>
-an 50.90.130 &Syntax.R-Sg.Radiance :cal SetSyn("radiance")<CR>
-an 50.90.140 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison")<CR>
-an 50.90.150 &Syntax.R-Sg.RCS.RCS\ log\ output :cal SetSyn("rcslog")<CR>
-an 50.90.160 &Syntax.R-Sg.RCS.RCS\ file :cal SetSyn("rcs")<CR>
-an 50.90.170 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline")<CR>
-an 50.90.180 &Syntax.R-Sg.Rebol :cal SetSyn("rebol")<CR>
-an 50.90.190 &Syntax.R-Sg.Remind :cal SetSyn("remind")<CR>
-an 50.90.200 &Syntax.R-Sg.Relax\ NG\ compact :cal SetSyn("rnc")<CR>
-an 50.90.210 &Syntax.R-Sg.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR>
-an 50.90.220 &Syntax.R-Sg.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR>
-an 50.90.230 &Syntax.R-Sg.Resolv\.conf :cal SetSyn("resolv")<CR>
-an 50.90.240 &Syntax.R-Sg.Rexx :cal SetSyn("rexx")<CR>
-an 50.90.250 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots")<CR>
-an 50.90.260 &Syntax.R-Sg.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR>
-an 50.90.270 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen")<CR>
-an 50.90.280 &Syntax.R-Sg.RPL/2 :cal SetSyn("rpl")<CR>
-an 50.90.290 &Syntax.R-Sg.ReStructuredText :cal SetSyn("rst")<CR>
-an 50.90.300 &Syntax.R-Sg.RTF :cal SetSyn("rtf")<CR>
-an 50.90.310 &Syntax.R-Sg.Ruby :cal SetSyn("ruby")<CR>
-an 50.90.330 &Syntax.R-Sg.S-Lang :cal SetSyn("slang")<CR>
-an 50.90.340 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba")<CR>
-an 50.90.350 &Syntax.R-Sg.SAS :cal SetSyn("sas")<CR>
-an 50.90.360 &Syntax.R-Sg.Sather :cal SetSyn("sather")<CR>
-an 50.90.370 &Syntax.R-Sg.Scheme :cal SetSyn("scheme")<CR>
-an 50.90.380 &Syntax.R-Sg.Scilab :cal SetSyn("scilab")<CR>
-an 50.90.390 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen")<CR>
-an 50.90.400 &Syntax.R-Sg.SDL :cal SetSyn("sdl")<CR>
-an 50.90.410 &Syntax.R-Sg.Sed :cal SetSyn("sed")<CR>
-an 50.90.420 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm")<CR>
-an 50.90.430 &Syntax.R-Sg.Send-pr :cal SetSyn("sendpr")<CR>
-an 50.90.440 &Syntax.R-Sg.Sensors\.conf :cal SetSyn("sensors")<CR>
-an 50.90.450 &Syntax.R-Sg.Service\ Location\ config :cal SetSyn("slpconf")<CR>
-an 50.90.460 &Syntax.R-Sg.Service\ Location\ registration :cal SetSyn("slpreg")<CR>
-an 50.90.470 &Syntax.R-Sg.Service\ Location\ SPI :cal SetSyn("slpspi")<CR>
-an 50.90.480 &Syntax.R-Sg.Services :cal SetSyn("services")<CR>
-an 50.90.490 &Syntax.R-Sg.Setserial\ config :cal SetSyn("setserial")<CR>
-an 50.90.500 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
-an 50.90.510 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
-an 50.90.520 &Syntax.R-Sg.SGML.SGML\ Declaration :cal SetSyn("sgmldecl")<CR>
-an 50.90.530 &Syntax.R-Sg.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx")<CR>
+an 50.90.100 &Syntax.R-Sg.R.R :cal SetSyn("r")<CR>
+an 50.90.110 &Syntax.R-Sg.R.R\ help :cal SetSyn("rhelp")<CR>
+an 50.90.120 &Syntax.R-Sg.R.R\ noweb :cal SetSyn("rnoweb")<CR>
+an 50.90.130 &Syntax.R-Sg.Racc\ input :cal SetSyn("racc")<CR>
+an 50.90.140 &Syntax.R-Sg.Radiance :cal SetSyn("radiance")<CR>
+an 50.90.150 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison")<CR>
+an 50.90.160 &Syntax.R-Sg.RCS.RCS\ log\ output :cal SetSyn("rcslog")<CR>
+an 50.90.170 &Syntax.R-Sg.RCS.RCS\ file :cal SetSyn("rcs")<CR>
+an 50.90.180 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline")<CR>
+an 50.90.190 &Syntax.R-Sg.Rebol :cal SetSyn("rebol")<CR>
+an 50.90.200 &Syntax.R-Sg.Remind :cal SetSyn("remind")<CR>
+an 50.90.210 &Syntax.R-Sg.Relax\ NG\ compact :cal SetSyn("rnc")<CR>
+an 50.90.220 &Syntax.R-Sg.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR>
+an 50.90.230 &Syntax.R-Sg.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR>
+an 50.90.240 &Syntax.R-Sg.Resolv\.conf :cal SetSyn("resolv")<CR>
+an 50.90.250 &Syntax.R-Sg.Rexx :cal SetSyn("rexx")<CR>
+an 50.90.260 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots")<CR>
+an 50.90.270 &Syntax.R-Sg.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR>
+an 50.90.280 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen")<CR>
+an 50.90.290 &Syntax.R-Sg.RPL/2 :cal SetSyn("rpl")<CR>
+an 50.90.300 &Syntax.R-Sg.ReStructuredText :cal SetSyn("rst")<CR>
+an 50.90.310 &Syntax.R-Sg.RTF :cal SetSyn("rtf")<CR>
+an 50.90.320 &Syntax.R-Sg.Ruby :cal SetSyn("ruby")<CR>
+an 50.90.340 &Syntax.R-Sg.S-Lang :cal SetSyn("slang")<CR>
+an 50.90.350 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba")<CR>
+an 50.90.360 &Syntax.R-Sg.SAS :cal SetSyn("sas")<CR>
+an 50.90.370 &Syntax.R-Sg.Sather :cal SetSyn("sather")<CR>
+an 50.90.380 &Syntax.R-Sg.Scheme :cal SetSyn("scheme")<CR>
+an 50.90.390 &Syntax.R-Sg.Scilab :cal SetSyn("scilab")<CR>
+an 50.90.400 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen")<CR>
+an 50.90.410 &Syntax.R-Sg.SDL :cal SetSyn("sdl")<CR>
+an 50.90.420 &Syntax.R-Sg.Sed :cal SetSyn("sed")<CR>
+an 50.90.430 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm")<CR>
+an 50.90.440 &Syntax.R-Sg.Send-pr :cal SetSyn("sendpr")<CR>
+an 50.90.450 &Syntax.R-Sg.Sensors\.conf :cal SetSyn("sensors")<CR>
+an 50.90.460 &Syntax.R-Sg.Service\ Location\ config :cal SetSyn("slpconf")<CR>
+an 50.90.470 &Syntax.R-Sg.Service\ Location\ registration :cal SetSyn("slpreg")<CR>
+an 50.90.480 &Syntax.R-Sg.Service\ Location\ SPI :cal SetSyn("slpspi")<CR>
+an 50.90.490 &Syntax.R-Sg.Services :cal SetSyn("services")<CR>
+an 50.90.500 &Syntax.R-Sg.Setserial\ config :cal SetSyn("setserial")<CR>
+an 50.90.510 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
+an 50.90.520 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
+an 50.90.530 &Syntax.R-Sg.SGML.SGML\ Declaration :cal SetSyn("sgmldecl")<CR>
+an 50.90.540 &Syntax.R-Sg.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx")<CR>
an 50.100.100 &Syntax.Sh-S.Shell\ script.sh\ and\ ksh :cal SetSyn("sh")<CR>
an 50.100.110 &Syntax.Sh-S.Shell\ script.csh :cal SetSyn("csh")<CR>
an 50.100.120 &Syntax.Sh-S.Shell\ script.tcsh :cal SetSyn("tcsh")<CR>
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 49fecee..b852f48 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
" Vim syntax support file
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Dec 04
+" Last Change: 2006 Apr 18
" (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
" (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
@@ -224,14 +224,16 @@
endif
let s:HtmlSpace = ' '
+let s:LeadingSpace = ' '
let s:HtmlEndline = ''
if exists("html_no_pre")
let s:HtmlEndline = '<br' . s:tag_close
if exists("use_xhtml")
- let s:HtmlSpace = '\ '
+ let s:LeadingSpace = ' '
else
- let s:HtmlSpace = '\ '
+ let s:LeadingSpace = ' '
endif
+ let s:HtmlSpace = '\' . s:LeadingSpace
endif
" HTML header, with the title and generator ;-). Left free space for the CSS,
@@ -246,9 +248,17 @@
exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
endif
if exists("html_no_pre")
- exe "normal! a</head>\n<body>\n\e"
+ if exists("use_xhtml")
+ exe "normal! a</head>\n<body>\n<p>\n\e"
+ else
+ exe "normal! a</head>\n<body>\n\e"
+ endif
else
- exe "normal! a</head>\n<body>\n<pre>\n\e"
+ if exists("use_xhtml")
+ exe "normal! a</head>\n<body>\n<p>\n<pre>\n\e"
+ else
+ exe "normal! a</head>\n<body>\n<pre>\n\e"
+ endif
endif
exe s:orgwin . "wincmd w"
@@ -296,7 +306,7 @@
while s:n > 0
if s:numblines
" Indent if line numbering is on
- let s:new = repeat(' ', strlen(s:end) + 1) . repeat(s:difffillchar, 3)
+ let s:new = repeat(s:LeadingSpace, strlen(s:end) + 1) . repeat(s:difffillchar, 3)
else
let s:new = repeat(s:difffillchar, 3)
endif
@@ -406,9 +416,17 @@
" Finish with the last line
exe s:newwin . "wincmd w"
if exists("html_no_pre")
- exe "normal! a\n</body>\n</html>\e"
+ if exists("use_xhtml")
+ exe "normal! a</p>\n</body>\n</html>\e"
+ else
+ exe "normal! a\n</body>\n</html>\e"
+ endif
else
- exe "normal! a</pre>\n</body>\n</html>\e"
+ if exists("use_xhtml")
+ exe "normal! a</pre>\n</p>\n</body>\n</html>\e"
+ else
+ exe "normal! a</pre>\n</body>\n</html>\e"
+ endif
endif
@@ -525,4 +543,4 @@
delfunc s:HtmlClosing
endif
endif
-silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:HtmlEndline
+silent! unlet s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:LeadingSpace s:HtmlEndline
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
new file mode 100644
index 0000000..8dfe3d7
--- /dev/null
+++ b/runtime/syntax/cmake.vim
@@ -0,0 +1,85 @@
+" =============================================================================
+"
+" Program: CMake - Cross-Platform Makefile Generator
+" Module: $RCSfile$
+" Language: VIM
+" Date: $Date$
+" Version: $Revision$
+"
+" =============================================================================
+
+" Vim syntax file
+" Language: CMake
+" Author: Andy Cedilnik <andy.cedilnik@kitware.com>
+" Maintainer: Andy Cedilnik <andy.cedilnik@kitware.com>
+" Last Change: $Date$
+" Version: $Revision$
+"
+" Licence: The CMake license applies to this file. See
+" http://www.cmake.org/HTML/Copyright.html
+" This implies that distribution with Vim is allowed
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+syn case ignore
+syn match cmakeComment /#.*$/
+syn region cmakeRegistry start=/\[/ end=/\]/ skip=/\\[\[\]]/
+ \ contained
+syn match cmakeArgument /[^()"]+/
+ \ contained
+syn match cmakeVariableValue /\${[^}]*}/
+ \ contained oneline
+syn match cmakeEnvironment /\$ENV{.*}/
+ \ contained
+syn keyword cmakeSystemVariables
+ \ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80
+syn keyword cmakeOperators
+ \ AND BOOL CACHE COMMAND DEFINED DOC EQUAL EXISTS FALSE GREATER INTERNAL LESS MATCHES NAME NAMES NAME_WE NOT OFF ON OR PATH PATHS PROGRAM STREQUAL STRGREATER STRING STRLESS TRUE
+" \ contained
+syn region cmakeString start=/"/ end=/"/ skip=/\\"/
+ \ contains=ALLBUT,cmakeString
+syn region cmakeArguments start=/\s*(/ end=/)/
+ \ contains=ALLBUT,cmakeArguments
+syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_REMOVE VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WRAP_EXCLUDE_FILES
+ \ nextgroup=cmakeArgument
+syn keyword cmakeStatement
+ \ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDIF ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE
+ \ nextgroup=cmakeArgumnts
+
+"syn match cmakeMacro /^\s*[A-Z_]\+/ nextgroup=cmakeArgumnts
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_cmake_syntax_inits")
+ if version < 508
+ let did_cmake_syntax_inits = 1
+ command -nargs=+ HiLink hi link <args>
+ else
+ command -nargs=+ HiLink hi def link <args>
+ endif
+
+ HiLink cmakeStatement Statement
+ HiLink cmakeComment Comment
+ HiLink cmakeString String
+ HiLink cmakeVariableValue Type
+ HiLink cmakeRegistry Underlined
+ HiLink cmakeArguments Identifier
+ HiLink cmakeArgument Constant
+ HiLink cmakeEnvironment Special
+ HiLink cmakeOperators Operator
+ HiLink cmakeMacro PreProc
+ HiLink cmakeError Error
+
+ delcommand HiLink
+endif
+
+let b:current_syntax = "cmake"
+
+"EOF"
diff --git a/runtime/syntax/rnoweb.vim b/runtime/syntax/rnoweb.vim
new file mode 100644
index 0000000..7a106ec
--- /dev/null
+++ b/runtime/syntax/rnoweb.vim
@@ -0,0 +1,55 @@
+" Vim syntax file
+" Language: R noweb Files
+" Maintainer: Johannes Ranke <jranke@uni-bremen.de>
+" Last Change: 2006 Apr 18
+" Version: 0.5
+" SVN: $Id$
+" Remarks: - This file is inspired by the proposal of
+" Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
+" http://www.ime.usp.br/~feferraz/en/sweavevim.html
+" - It extends some clusters from syntax/tex.vim (version 33,
+" March 06 2006) and therefore depends on some contents
+" of this file
+"
+
+" Version Clears: {{{1
+" For version 5.x: Clear all syntax items
+" For version 6.x and 7.x: Quit when a syntax file was already loaded
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+syn case match
+
+" Extension of Tex regions {{{1
+runtime syntax/tex.vim
+unlet b:current_syntax
+
+syn cluster texDocGroup contains=texPartZone,@texPartGroup,@rnoweb
+syn cluster texPartGroup contains=texChapterZone,texSectionZone,texParaZone,@rnoweb
+syn cluster texChapterGroup contains=texSectionZone,texParaZone,@rnoweb
+syn cluster texSectionGroup contains=texSubSectionZone,texParaZone,@rnoweb
+syn cluster texSubSectionGroup contains=texSubSubSectionZone,texParaZone,@rnoweb
+syn cluster texSubSubSectionGroup contains=texParaZone,@rnoweb
+syn cluster texParaGroup contains=texSubParaZone,@rnoweb
+
+" Highlighting of R code using an existing r.vim syntax file if available {{{1
+syn include @rnowebR syntax/r.vim
+syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk keepend
+syn match rnowebChunkReference "^<<.*>>$" contained
+syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR
+
+" Sweave options command {{{1
+syn region rnowebSweaveopts matchgroup=Delimiter start="\\SweaveOpts{" matchgroup=Delimiter end="}"
+
+" rnoweb Cluster {{{1
+syn cluster rnoweb contains=rnowebChunk,rnowebChunkReference,rnowebDelimiter,rnowebSexpr,rnowebSweaveopts
+
+" Highlighting {{{1
+hi def link rnowebDelimiter Delimiter
+hi def link rnowebSweaveOpts Statement
+
+let b:current_syntax = "rnoweb"
+" vim: foldmethod=marker:
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index 5a5e6a2..6452e72 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
" Vim syntax file
" Language: TeX
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change: Apr 12, 2006
-" Version: 34
+" Last Change: Apr 18, 2006
+" Version: 35
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
"
" Notes: {{{1
@@ -391,6 +391,12 @@
" will appropriately terminate. Ideally vim would let me save a
" character from the start pattern and re-use it in the end-pattern.
syn region texZone start="\\begin{verbatim}" end="\\end{verbatim}\|%stopzone\>" contains=@Spell
+" listings package:
+syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" contains=@Spell
+" moreverb package:
+syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>" contains=@Spell
+syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>" contains=@Spell
+syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>" contains=@Spell
if version < 600
syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>"
syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>"
diff --git a/runtime/syntax/vera.vim b/runtime/syntax/vera.vim
new file mode 100644
index 0000000..b8e25cf
--- /dev/null
+++ b/runtime/syntax/vera.vim
@@ -0,0 +1,361 @@
+" Vim syntax file
+" Language: Vera
+" Maintainer: Dave Eggum (opine at bluebottle dOt com)
+" Last Change: 2005 Dec 19
+
+" NOTE: extra white space at the end of the line will be highlighted if you
+" add this line to your colorscheme:
+
+" highlight SpaceError guibg=#204050
+
+" (change the value for guibg to any color you like)
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+" A bunch of useful Vera keywords
+syn keyword veraStatement break return continue fork join terminate
+syn keyword veraStatement breakpoint proceed
+
+syn keyword veraLabel bad_state bad_trans bind constraint coverage_group
+syn keyword veraLabel class CLOCK default function interface m_bad_state
+syn keyword veraLabel m_bad_trans m_state m_trans program randseq state
+syn keyword veraLabel task trans
+
+syn keyword veraConditional if else case casex casez randcase
+syn keyword veraRepeat repeat while for do foreach
+syn keyword veraModifier after all any around assoc_size async
+syn keyword veraModifier before big_endian bit_normal bit_reverse export
+syn keyword veraModifier extends extern little_endian local hdl_node hdl_task
+syn keyword veraModifier negedge none packed protected posedge public rules
+syn keyword veraModifier shadow soft static super this typedef unpacked var
+syn keyword veraModifier vca virtual virtuals wildcard with
+
+syn keyword veraType reg string enum event bit
+syn keyword veraType rand randc integer port prod
+
+syn keyword veraDeprecated call_func call_task close_conn get_bind get_bind_id
+syn keyword veraDeprecated get_conn_err mailbox_receive mailbox_send make_client
+syn keyword veraDeprecated make_server simwave_plot up_connections
+
+" predefined tasks and functions
+syn keyword veraTask alloc assoc_index cast_assign cm_coverage
+syn keyword veraTask cm_get_coverage cm_get_limit delay error error_mode
+syn keyword veraTask exit fclose feof ferror fflush flag fopen fprintf
+syn keyword veraTask freadb freadh freadstr get_cycle get_env get_memsize
+syn keyword veraTask get_plus_arg getstate get_systime get_time get_time_unit
+syn keyword veraTask initstate lock_file mailbox_get mailbox_put os_command
+syn keyword veraTask printf prodget prodset psprintf query query_str query_x
+syn keyword veraTask rand48 random region_enter region_exit rewind
+syn keyword veraTask semaphore_get semaphore_put setstate signal_connect
+syn keyword veraTask sprintf srandom sscanf stop suspend_thread sync
+syn keyword veraTask timeout trace trigger unit_delay unlock_file urand48
+syn keyword veraTask urandom urandom_range vera_bit_reverse vera_crc
+syn keyword veraTask vera_pack vera_pack_big_endian vera_plot
+syn keyword veraTask vera_report_profile vera_unpack vera_unpack_big_endian
+syn keyword veraTask vsv_call_func vsv_call_task vsv_get_conn_err
+syn keyword veraTask vsv_make_client vsv_make_server vsv_up_connections
+syn keyword veraTask vsv_wait_for_done vsv_wait_for_input wait_child wait_var
+
+syn cluster veraOperGroup contains=veraOperator,veraOperParen,veraNumber,veraString,veraOperOk,veraType
+" syn match veraOperator "++\|--\|&\|\~&\||\|\~|\|^\|\~^\|\~\|><"
+" syn match veraOperator "*\|/\|%\|+\|-\|<<\|>>\|<\|<=\|>\|>=\|!in"
+" syn match veraOperator "=?=\|!?=\|==\|!=\|===\|!==\|&\~\|^\~\||\~"
+" syn match veraOperator "&&\|||\|=\|+=\|-=\|*=\|/=\|%=\|<<=\|>>=\|&="
+" syn match veraOperator "|=\|^=\|\~&=\|\~|=\|\~^="
+
+syn match veraOperator "[&|\~><!*@+/=,.\^\-]"
+syn keyword veraOperator or in dist not
+
+" open vera class methods
+syn keyword veraMethods atobin atohex atoi atooct backref bittostr capacity
+syn keyword veraMethods compare Configure constraint_mode delete DisableTrigger
+syn keyword veraMethods DoAction empty EnableCount EnableTrigger Event find
+syn keyword veraMethods find_index first first_index GetAssert get_at_least
+syn keyword veraMethods get_auto_bin getc GetCount get_coverage_goal get_cov_weight
+syn keyword veraMethods get_cross_bin_max GetFirstAssert GetName GetNextAssert
+syn keyword veraMethods get_status get_status_msg hide hash icompare insert
+syn keyword veraMethods inst_get_at_least inst_get_auto_bin_max inst_get_collect
+syn keyword veraMethods inst_get_coverage_goal inst_get_cov_weight inst_getcross_bin_max
+syn keyword veraMethods inst_query inst_set_at_least inst_set_auto_bin_max
+syn keyword veraMethods inst_set_bin_activiation inst_set_collect inst_set_coverage_goal
+syn keyword veraMethods inst_set_cov_weight inst_set_cross_bin_max itoa last last_index
+syn keyword veraMethods len load match max max_index min min_index new object_compare
+syn keyword veraMethods object_compare object_copy object_print pack pick_index
+syn keyword veraMethods pop_back pop_front post_boundary postmatch post_pack post_pack
+syn keyword veraMethods post_randomize post_randomize post_unpack post_unpack
+syn keyword veraMethods pre_boundary prematch pre_pack pre_pack pre_randomize
+syn keyword veraMethods pre-randomize pre_unpack push_back push_front putc query
+syn keyword veraMethods query_str rand_mode randomize reserve reverse rsort search
+syn keyword veraMethods set_at_least set_auto_bin_max set_bin_activiation
+syn keyword veraMethods set_coverage_goal set_cov_weight set_cross_bin_max set_name
+syn keyword veraMethods size sort substr sum thismatch tolower toupper unique_index
+syn keyword veraMethods unpack Wait
+
+" interface keywords
+syn keyword veraInterface ASYNC CLOCK gnr gr0 gr1 grx grz NHOLD nr NR0 NR1
+syn keyword veraInterface NRZ NRZ NSAMPLE PHOLD PR0 PR1 PRX PRZ r0 r1 rx snr
+syn keyword veraInterface sr0 sr1 srx srz depth inout input output
+syn match veraInterface "\$\w\+"
+
+
+syn keyword veraTodo contained TODO FIXME XXX FINISH
+
+" veraCommentGroup allows adding matches for special things in comments
+syn cluster veraCommentGroup contains=veraTodo
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match veraSpecial display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
+syn match veraFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpnm]\|\[\^\=.[^]]*\]\)" contained
+syn match veraFormat display "%%" contained
+syn region veraString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=veraSpecial,veraFormat,@Spell
+syn region veraConcat contained transparent oneline start='{' end='}'
+
+" veraCppString: same as veraString, but ends at end of line
+syn region veraCppString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=veraSpecial,veraFormat,@Spell
+
+syn match veraCharacter "'[^\\]'"
+syn match veraCharacter "L'[^']*'" contains=veraSpecial
+syn match veraSpecialError "'\\[^'\"?\\abefnrtv]'"
+syn match veraSpecialCharacter "'\\['\"?\\abefnrtv]'"
+syn match veraSpecialCharacter display "'\\\o\{1,3}'"
+syn match veraSpecialCharacter display "'\\x\x\{1,2}'"
+syn match veraSpecialCharacter display "L'\\x\x\+'"
+
+" highlight trailing white space
+syn match veraSpaceError display excludenl "\s\+$"
+syn match veraSpaceError display " \+\t"me=e-1
+
+"catch errors caused by wrong parenthesis and brackets
+syn cluster veraParenGroup contains=veraParenError,veraIncluded,veraSpecial,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraUserCont,veraUserLabel,veraBitField,veraCommentSkip,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom
+
+syn region veraParen transparent start='(' end=')' contains=ALLBUT,@veraParenGroup,veraCppParen,veraErrInBracket,veraCppBracket,veraCppString,@Spell
+" veraCppParen: same as veraParen but ends at end-of-line; used in veraDefine
+syn region veraCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@veraParenGroup,veraErrInBracket,veraParen,veraBracket,veraString,@Spell
+syn match veraParenError display "[\])]"
+" syn match veraErrInParen display contained "[\]{}]"
+syn match veraErrInParen display contained "[\]]"
+syn region veraBracket transparent start='\[' end=']' contains=ALLBUT,@veraParenGroup,veraErrInParen,veraCppParen,veraCppBracket,veraCppString,@Spell
+
+" veraCppBracket: same as veraParen but ends at end-of-line; used in veraDefine
+syn region veraCppBracket transparent start='\[' skip='\\$' excludenl end=']' end='$' contained contains=ALLBUT,@veraParenGroup,veraErrInParen,veraParen,veraBracket,veraString,@Spell
+syn match veraErrInBracket display contained "[);{}]"
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match veraNumbers display transparent "\<\d\|\.\d" contains=veraNumber,veraFloat,veraOctalError,veraOctal
+" Same, but without octal error (for comments)
+syn match veraNumbersCom display contained transparent "\<\d\|\.\d" contains=veraNumber,veraFloat,veraOctal
+" syn match veraNumber display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
+" "hex number
+" syn match veraNumber display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" syn match veraNumber "\(\<[0-9]\+\|\)'[bdoh][0-9a-fxzA-FXZ_]\+\>"
+syn match veraNumber "\<\(\<[0-9]\+\)\?\('[bdoh]\)\?[0-9a-fxz_]\+\>"
+" syn match veraNumber "\<[+-]\=[0-9]\+\>"
+" Flag the first zero of an octal number as something special
+syn match veraOctal display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=veraOctalZero
+syn match veraOctalZero display contained "\<0"
+syn match veraFloat display contained "\d\+f"
+"floating point number, with dot, optional exponent
+syn match veraFloat display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+"floating point number, starting with a dot, optional exponent
+syn match veraFloat display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match veraFloat display contained "\d\+e[-+]\=\d\+[fl]\=\>"
+"hexadecimal floating point number, optional leading digits, with dot, with exponent
+syn match veraFloat display contained "0x\x*\.\x\+p[-+]\=\d\+[fl]\=\>"
+"hexadecimal floating point number, with leading digits, optional dot, with exponent
+syn match veraFloat display contained "0x\x\+\.\=p[-+]\=\d\+[fl]\=\>"
+
+" flag an octal number with wrong digits
+syn match veraOctalError display contained "0\o*[89]\d*"
+syn case match
+
+let vera_comment_strings = 1
+
+if exists("vera_comment_strings")
+ " A comment can contain veraString, veraCharacter and veraNumber.
+ " But a "*/" inside a veraString in a veraComment DOES end the comment! So we
+ " need to use a special type of veraString: veraCommentString, which also ends on
+ " "*/", and sees a "*" at the start of the line as comment again.
+ " Unfortunately this doesn't work very well for // type of comments :-(
+ syntax match veraCommentSkip contained "^\s*\*\($\|\s\+\)"
+ syntax region veraCommentString contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=veraSpecial,veraCommentSkip
+ syntax region veraComment2String contained start=+\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=veraSpecial
+ syntax region veraCommentL start="//" skip="\\$" end="$" keepend contains=@veraCommentGroup,veraComment2String,veraCharacter,veraNumbersCom,veraSpaceError,@Spell
+ if exists("vera_no_comment_fold")
+ syntax region veraComment matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraCommentString,veraCharacter,veraNumbersCom,veraSpaceError,@Spell
+ else
+ syntax region veraComment matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraCommentString,veraCharacter,veraNumbersCom,veraSpaceError,@Spell fold
+ endif
+else
+ syn region veraCommentL start="//" skip="\\$" end="$" keepend contains=@veraCommentGroup,veraSpaceError,@Spell
+ if exists("vera_no_comment_fold")
+ syn region veraComment matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraSpaceError,@Spell
+ else
+ syn region veraComment matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraSpaceError,@Spell fold
+ endif
+endif
+" keep a // comment separately, it terminates a preproc. conditional
+syntax match veraCommentError display "\*/"
+syntax match veraCommentStartError display "/\*"me=e-1 contained
+
+syntax region veraBlock start="{" end="}" transparent fold
+
+" open vera pre-defined constants
+syn keyword veraConstant ALL ANY BAD_STATE BAD_TRANS CALL CHECK CHGEDGE
+syn keyword veraConstant CLEAR COPY_NO_WAIT COPY_WAIT CROSS CROSS_TRANS
+syn keyword veraConstant DEBUG DELETE EC_ARRAYX EC_CODE_END EC_CONFLICT
+syn keyword veraConstant EC_EVNTIMOUT EC_EXPECT EC_FULLEXPECT EC_MBXTMOUT
+syn keyword veraConstant EC_NEXPECT EC_RETURN EC_RGNTMOUT EC_SCONFLICT
+syn keyword veraConstant EC_SEMTMOUT EC_SEXPECT EC_SFULLEXPECT EC_SNEXTPECT
+syn keyword veraConstant EC_USERSET EQ EVENT FAIL FIRST FORK GE GOAL GT
+syn keyword veraConstant HAND_SHAKE HI HIGH HNUM LE LIC_EXIT LIC_PRERR
+syn keyword veraConstant LIC_PRWARN LIC_WAIT LO LOAD LOW LT MAILBOX MAX_COM
+syn keyword veraConstant NAME NE NEGEDGE NEXT NO_OVERLAP NO_OVERLAP_STATE
+syn keyword veraConstant NO_OVERLAP_TRANS NO_VARS NO_WAIT NUM NUM_BIN
+syn keyword veraConstant NUM_DET null OFF OK OK_LAST ON ONE_BLAST ONE_SHOT ORDER
+syn keyword veraConstant PAST_IT PERCENT POSEDGE PROGRAM RAWIN REGION REPORT
+syn keyword veraConstant SAMPLE SAVE SEMAPHORE SET SILENT STATE stderr
+syn keyword veraConstant stdin stdout STR STR_ERR_OUT_OF_RANGE
+syn keyword veraConstant STR_ERR_REGEXP_SYNTAX SUM TRANS VERBOSE void WAIT
+syn keyword veraConstant __LINE__ __FILE__ __DATE__ __TIME__ __VERA__
+syn keyword veraConstant __VERSION__ __VERA_VERSION__ __VERA_MINOR__
+syn keyword veraConstant __VERA_PATCH__ __VERA_VMC__ __VERA_VMC_MINOR__
+
+syn match veraUserConstant "\<[A-Z][A-Z0-9_]\+\>"
+
+syn match veraClass "\zs\w\+\ze::"
+syn match veraClass "\zs\w\+\ze\s\+\w\+\s*[=;,)\[]" contains=veraConstant,veraUserConstant
+syn match veraClass "\zs\w\+\ze\s\+\w\+\s*$" contains=veraConstant,veraUserConstant
+syn match veraUserMethod "\zs\w\+\ze\s*(" contains=veraConstant,veraUserConstant
+syn match veraObject "\zs\w\+\ze\.\w"
+syn match veraObject "\zs\w\+\ze\.\$\w"
+
+" Accept ` for # (Verilog)
+syn region veraPreCondit start="^\s*\(`\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=veraComment,veraCppString,veraCharacter,veraCppParen,veraParenError,veraNumbers,veraCommentError,veraSpaceError
+syn match veraPreCondit display "^\s*\(`\|#\)\s*\(else\|endif\)\>"
+if !exists("vera_no_if0")
+ syn region veraCppOut start="^\s*\(`\|#\)\s*if\s\+0\+\>" end=".\@=\|$" contains=veraCppOut2
+ syn region veraCppOut2 contained start="0" end="^\s*\(`\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=veraSpaceError,veraCppSkip
+ syn region veraCppSkip contained start="^\s*\(`\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(`\|#\)\s*endif\>" contains=veraSpaceError,veraCppSkip
+endif
+syn region veraIncluded display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match veraIncluded display contained "<[^>]*>"
+syn match veraInclude display "^\s*\(`\|#\)\s*include\>\s*["<]" contains=veraIncluded
+"syn match veraLineSkip "\\$"
+syn cluster veraPreProcGroup contains=veraPreCondit,veraIncluded,veraInclude,veraDefine,veraErrInParen,veraErrInBracket,veraUserLabel,veraSpecial,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom,veraString,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraParen,veraBracket,veraMulti
+syn region veraDefine start="^\s*\(`\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" end="//"me=s-1 contains=ALLBUT,@veraPreProcGroup,@Spell
+syn region veraPreProc start="^\s*\(`\|#\)\s*\(pragma\>\|line\>\|warning\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@veraPreProcGroup,@Spell
+
+" Highlight User Labels
+syn cluster veraMultiGroup contains=veraIncluded,veraSpecial,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraUserCont,veraUserLabel,veraBitField,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom,veraCppParen,veraCppBracket,veraCppString
+syn region veraMulti transparent start='?' skip='::' end=':' contains=ALLBUT,@veraMultiGroup,@Spell
+" syn region veraMulti transparent start='?' skip='::' end=':' contains=ALL
+" The above causes veraCppOut2 to catch on:
+" i = (isTrue) ? 0 : 1;
+" which ends up commenting the rest of the file
+
+" Avoid matching foo::bar() by requiring that the next char is not ':'
+syn cluster veraLabelGroup contains=veraUserLabel
+syn match veraUserCont display "^\s*\I\i*\s*:$" contains=@veraLabelGroup
+syn match veraUserCont display ";\s*\I\i*\s*:$" contains=@veraLabelGroup
+syn match veraUserCont display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@veraLabelGroup
+syn match veraUserCont display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@veraLabelGroup
+
+syn match veraUserLabel display "\I\i*" contained
+
+" Avoid recognizing most bitfields as labels
+syn match veraBitField display "^\s*\I\i*\s*:\s*[1-9]"me=e-1
+syn match veraBitField display ";\s*\I\i*\s*:\s*[1-9]"me=e-1
+
+if exists("vera_minlines")
+ let b:vera_minlines = vera_minlines
+else
+ if !exists("vera_no_if0")
+ let b:vera_minlines = 50 " #if 0 constructs can be long
+ else
+ let b:vera_minlines = 15 " mostly for () constructs
+ endif
+endif
+exec "syn sync ccomment veraComment minlines=" . b:vera_minlines
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_vera_syn_inits")
+ if version < 508
+ let did_vera_syn_inits = 1
+ command -nargs=+ HiLink hi link <args>
+ else
+ command -nargs=+ HiLink hi def link <args>
+ endif
+
+ HiLink veraClass Identifier
+ HiLink veraObject Identifier
+ HiLink veraUserMethod Function
+ HiLink veraTask Keyword
+ HiLink veraModifier Tag
+ HiLink veraDeprecated veraError
+ HiLink veraMethods Statement
+ " HiLink veraInterface Label
+ HiLink veraInterface Function
+
+ HiLink veraFormat veraSpecial
+ HiLink veraCppString veraString
+ HiLink veraCommentL veraComment
+ HiLink veraCommentStart veraComment
+ HiLink veraLabel Label
+ HiLink veraUserLabel Label
+ HiLink veraConditional Conditional
+ HiLink veraRepeat Repeat
+ HiLink veraCharacter Character
+ HiLink veraSpecialCharacter veraSpecial
+ HiLink veraNumber Number
+ HiLink veraOctal Number
+ HiLink veraOctalZero PreProc " link this to Error if you want
+ HiLink veraFloat Float
+ HiLink veraOctalError veraError
+ HiLink veraParenError veraError
+ HiLink veraErrInParen veraError
+ HiLink veraErrInBracket veraError
+ HiLink veraCommentError veraError
+ HiLink veraCommentStartError veraError
+ HiLink veraSpaceError SpaceError
+ HiLink veraSpecialError veraError
+ HiLink veraOperator Operator
+ HiLink veraStructure Structure
+ HiLink veraInclude Include
+ HiLink veraPreProc PreProc
+ HiLink veraDefine Macro
+ HiLink veraIncluded veraString
+ HiLink veraError Error
+ HiLink veraStatement Statement
+ HiLink veraPreCondit PreCondit
+ HiLink veraType Type
+ " HiLink veraConstant Constant
+ HiLink veraConstant Keyword
+ HiLink veraUserConstant Constant
+ HiLink veraCommentString veraString
+ HiLink veraComment2String veraString
+ HiLink veraCommentSkip veraComment
+ HiLink veraString String
+ HiLink veraComment Comment
+ HiLink veraSpecial SpecialChar
+ HiLink veraTodo Todo
+ HiLink veraCppSkip veraCppOut
+ HiLink veraCppOut2 veraCppOut
+ HiLink veraCppOut Comment
+
+ delcommand HiLink
+endif
+
+let b:current_syntax = "vera"
+
+" vim: ts=8
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index f5e654a..5b8b32e 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
" Vim syntax file
" Language: Vim 7.0 script
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Apr 12, 2006
-" Version: 7.0-42
+" Last Change: Apr 18, 2006
+" Version: 7.0-44
" Automatically generated keyword lists: {{{1
" Quit when a syntax file was already loaded {{{2
@@ -129,7 +129,7 @@
syn match vimOper "\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
syn match vimOper "||\|&&\|[-+.]" skipwhite nextgroup=vimString,vimSpecFile
syn region vimOperParen oneline matchgroup=vimOper start="(" end=")" contains=@vimOperGroup
-syn region vimOperParen matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar
+syn region vimOperParen oneline matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar
if !exists("g:vimsyntax_noerror")
syn match vimOperError ")"
endif
@@ -252,7 +252,7 @@
"syn match vimCmplxRepeat '@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)'
" Set command and associated set-options (vimOptions) with comment {{{2
-syn region vimSet matchgroup=vimCommand start="\<setlocal\|set\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
+syn region vimSet matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|set\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
syn region vimSetEqual contained start="=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation oneline
syn region vimSetString contained start=+="+hs=s+1 skip=+\\\\\|\\"+ end=+"+ contains=vimCtrlChar
syn match vimSetSep contained "[,:]"
diff --git a/runtime/tutor/tutor.sk b/runtime/tutor/tutor.sk
index 243493b..f56cdfb 100644
--- a/runtime/tutor/tutor.sk
+++ b/runtime/tutor/tutor.sk
@@ -1,5 +1,5 @@
===============================================================================
-= V i t a j t e v o V I M T u t o r i a l i - Verzia 1.5 =
+= V i t a j t e v o V I M T u t o r i a l i - Verzia 1.7 =
===============================================================================
Vim je veµmi výkonný editor, ktorý má príli¾ veµa príkazov na to aby
@@ -10,6 +10,7 @@
Pribli¾ný èas potrebný na prebratie tejto výuky je 25-30 minút,
závisí na tom, koµko je stráveného èasu s preskú¹avaním.
+ UPOZORNENIE:
Príkazy v lekciách modifikujú text. Vytvor kópiu tohto súboru aby
sa mohlo precvièova» na òom (pri ¹tarte "vimtutor" je toto kópia).
@@ -20,16 +21,17 @@
Presvedè sa, ¾e Shift-Lock NIEJE stlaèený a stlaèt klávesu
j niekoµko krát, aby sa kurzor posunul natoµko, ¾e lekcia 1.1
celkom zaplní obrazovku.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Lekcia 1.1: POHYB KURZOROM
** Pre pohyb kurzorum stlaè klávesy h,j,k,l ako je znázornené. **
- ^
- k Funkcia: Klávesa h je naµavo a vykoná pohyb doµava.
- < h l > Klávesa l je napravo a vykoná pohyb doprava.
- j Klávesa j vyzerá ako ¹ípka dole
- v
+ ^
+ k Funkcia: Klávesa h je naµavo a vykoná pohyb doµava.
+ < h l > Klávesa l je napravo a vykoná pohyb doprava.
+ j Klávesa j vyzerá ako ¹ípka dole
+ v
1. Pohybuj kurzorom po obrazovke, kým si na to nezvykne¹.
2. Dr¾ stlaèenú klávesu pre pohyb dole (j), kým sa jej funkcia nezopakuje.
@@ -38,34 +40,33 @@
3. Pou¾itím klávesy pre pohyb dole prejdi na Lekciu 1.2.
Poznámka: Ak si niesi istý tým èo si napísal, stlaè <ESC>
- na prechod do normálneho módu.
+ na prechod do normálneho módu.
Poznámka: Kurzorové klávesy sú tie¾ funkèné. Ale pou¾ívaním hjkl sa bude¹
- schopný pohybova» rýchlej¹ie, keï si zvykne¹ ich pou¾íva».
+ schopný pohybova» rýchlej¹ie, keï si zvykne¹ ich pou¾íva». Naozaj!
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- LEKCIA 1.2: SPÚ©«ANIE A ZATVÁRANIE VIMU
+ LEKCIA 1.2: ZATVÁRANIE VIMU
+
!! POZNÁMKA: Pred vykonaním týchto krokov si preèítaj celú túto lekciu !!
1. Stlaè klávesu <ESC> (aby si sa uèite nachádzal v normálnom móde)
- 2. Napí¹: :q! <ENTER>.
-
----> Tým ukonèí¹ prácu s editorom BEZ ulo¾enia zmien, ktoré si vykonal.
- Ak chce¹ ulo¾i» vykonané zmeny a ukonèi» prácu s editorom napí¹:
- :wq <ENTER>
+ 2. Napí¹: :q! <ENTER>.
+ Tým ukonèí¹ prácu s editorom BEZ ulo¾enia zmien, ktoré si vykonal.
3. Keï sa dostane¹ na príkazový riadok, napí¹ príkaz, ktorým sa dostane¹
spe» do tejto výuky. To mô¾e by»: vimtutor <ENTER>
- Zvyèajne sa pou¾íva: vim tutor <ENTER>
-
----> 'vim' znamená spustenie editora vim, 'tutor' je názov súboru, ktorý
- chce¹ editova».
4. Ak si si tieto kroky spoµahlivo zapamätal, vykonaj kroky 1 a¾ 3, pre
- ukonèenie a znovu spustenie editora. Potom presuò kurzor dole na
- lekciu 1.3.
+ ukonèenie a znovu spustenie editora.
+
+POZNÁMKA: :q! <ENTER> neulo¾í zmeny, ktoré si vykonal. O niekoµko lekcií
+ sa nauèí¹ ako ulo¾i» zmeny do súboru
+
+ 5. presuò kurzor dole na lekciu 1.3.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Lekcia 1.3: EDITÁCIA TEXTU - MAZANIE
@@ -85,7 +86,7 @@
5. Ak je veta správna, prejdi na lekciu 1.4.
-POZNÁMKA: Neskú¹aj si zapametä» obsah tejto výuky, ale sa uè pou¾ívaním.
+POZNÁMKA: Neskú¹aj si zapamäta» obsah tejto výuky, ale sa uè pou¾ívaním.
@@ -93,7 +94,7 @@
Lekcia 1.4: EDITÁCIA TEXTU - VKLADANIE
- ** Stlaèenie klávesy i v normálnom móde umo¾òuje vkladanie textu. **
+ ** Stlaèenie klávesy i umo¾òuje vkladanie textu. **
1. Presuò kurzor ni¾¹ie na prvý riadok za znaèku --->.
@@ -111,26 +112,73 @@
5. Keï sa dostatoène nauèí¹ vklada» text, prejdi na nasledujúce zhrnutie.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 1.5: EDITÁCIA TEXTU - PRIDÁVANIE
+
+
+ ** Stlaèenie klávesy A umo¾òuje pridáva» text. **
+
+ 1. Presuò kurozr ni¾¹ie na prvý riadok za znaèkou --->.
+ Nezále¾í na tom, na ktorom znaku sa kurzor v tom riadku nachádza.
+
+ 2. Stlaè klávesu A a napí¹ potrebný text.
+
+ 3. Po pridaní textu stlaè klávesu <ESC> pre návrat do Normálneho módu.
+
+ 4. Presuò kurozr na druhý riadok oznaèený ---> a zopakuj
+ kroky 2 a 3 kým nieje veta správna.
+
+---> Tu je nejaký text chýbajúci o
+ Tu je nejaký text chýbajúci od tiaµto.
+---> Tu tie¾ chýba nej
+ Tu tie¾ chýba nejaký text.
+
+ 5. Keï sa dostatoène nauèí¹ pridáva» text, prejdi na lekciu 1.6.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 1.6: EDITÁCIA SÚBORU
+
+
+ ** Napísaním :wq sa súbor ulo¾í a zavrie **
+
+!! POZNÁMKA: Pred vykonaním týchto krokov si preèítaj celú lekciu!!
+
+1. Opusti túto výuku, ako si to urobil v lekcii 1.2: :q!
+
+2. Do príkazového riadku napí¹ príkaz: vim tutor <ENTER>
+ 'vim' je príkaz, ktorý spustí editor Vim, 'tutor' je meno súboru,
+ ktorý chce¹ editova». Pou¾i taký súbor, ktorý mô¾e¹ meni».
+
+3. Vlo¾ a zma¾ text tak, ako si sa nauèil v predo¹lých lekciach.
+
+4. Ulo¾ súbor so zmenami a opusti Vim príkazom: :wq <ENTER>
+
+5. Re¹tartuj vimtutor a presuò sa dole na nasledujúce zhrnutie.
+
+6. Urob tak po preèítaní predo¹lých krokov a porozumeniu im.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ZHRNUTIE LEKCIE 1
1. Kurzor sa pohybuje pou¾itím kláves so ¹ípkami alebo klávesmi hjkl.
- h (do lava) j (dole) k (hore) l (doprava)
+ h (do lava) j (dole) k (hore) l (doprava)
2. Pre spustenie Vimu (z príkazového riadku) napí¹: vim FILENAME <ENTER>
3. Na ukonèenie Vimu napí¹: <ESC> :q! <ENTER> pre zru¹enie v¹etkých zmien
alebo napí¹: <ESC> :wq <ENTER> pre ulo¾enie zmien.
- 4. Na zmazanie znaku na mieste kurzora napí¹ v normálnom móde: x
+ 4. Na zmazanie znaku na mieste kurzora napí¹: x
5. Pre vlo¾enie textu na mieste kurzora v normálnom móde napí¹:
- i vkladaný text <ESC>
+ i napí¹ vkladaný text <ESC> vkladanie pred kurzor
+ A napí¹ pridávaný text <EXC> vkladanie za riadok
POZNÁMKA: Stlaèenie <ESC> »a premiestní do normálneho módu alebo zru¹í
- nejaký nechcený a èiastoène dokonèený príkaz.
+ nejaký nechcený a èiastoène dokonèený príkaz.
Teraz pokraèuj lekciou 2.
@@ -149,8 +197,10 @@
4. Napí¹ dw aby slovo zmizlo.
-POZNÁMKA: Písmená dw sa zobrazia na poslednom riadku obrazovky tak ako ich
- pí¹e¹. Ak pí¹e¹ nieèo zle, stlaè <ESC> a zaèni znova.
+POZNÁMKA: Písmeno d sa zobrazí na poslednom riadku obrazovky keï ho
+ napí¹e¹. Vim na teba poèká, aby si mohol napísa»
+ písmeno w. Ak vidí¹ nieèo iné ako d , tak si napísal
+ nesprávny znak; stlaè <ESC> a zaèni znova.
---> Tu je niekoµko slov zábava, ktoré nie patria list do tejto vety.
@@ -178,34 +228,75 @@
5. Prejdi na lekciu 2.3 pre pochopenie toho èo sa stalo.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.3: OPERÁTORY A POHYBY
+ Veµa príkazov, ktoré menia text sú odvodené od operátorov a pohybov.
+ Formát pre príkaz mazania klávesou d je nasledovný:
+
+ d pohyb
+
+ kde:
+ d - je mazací operátor
+ pohyb - je to èo operátor vykonáva (vypísané ni¾¹ie)
+
+ Krátky list pohybov:
+ w - do zaèiatku ïal¹ieho slova, okrem jeho prvého písmena.
+ e - do konca teraj¹ieho slova, vrátane posledného znaku.
+ $ - do konca riadku, vrátane posledného znaku
+
+ Tak¾e napísaním de sa zma¾e v¹etko od kurzora do konca slova.
+
+POZNÁMKA: Stlaèením iba pohybu v normálnom móde bez operátora
+ sa presunie kurzor tak ako je to ¹pecivikované.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.4: Pou¾itie viacnásobného pohybu
+
+
+ ** Napísaním èísla pred pohyb ho zopakuje zadný poèet krát **
+
+ 1. Presuò kurozr ni¾¹ie na zaèiatok riadku oznaèeného --->.
+
+ 2. Napí¹ 2w a kurozr sa presunie o dve slová vpred.
+
+ 3. Napí¹ 3e a kurozr sa presunie vpred na koniec tretieho slova.
+
+ 4. Napí¹ 0 (nula) a kurozr sa presunie na zaèiatok riadku.
+
+ 5. Zopakuj kroky 2 a 3 s rôznymi èíslami.
+
+---> Toto je riadok so slovami po kotrých sa mô¾ete pohybova».
+
+ 6. Prejdi na lekciu 2.5.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 2.3: ROZ©IROVACIE PRÍKAZY A OBJEKTY
+ Lekcia 2.5: POU®ITIE VIACNÁSOBNÉHO MAZANIA PRE HROMADNÉ MAZANIE
- Formát mazacieho príkazu d je nasledovný:
+ ** Napísanie èísla spolu s operátorom ho zopakuje zadaný poèet krát **
- [èíslo] d objekt ALEBO d [èíslo] objekt
- Kde:
- èíslo - udáva koµko krát sa príkaz vykoná (voliteµné, implicitne=1)
- d - je príkaz pre mazanie
- objekt - udáva na èom sa príkaz vykonáva (vypísané ni¾¹ie)
+ V kombinácii operátorov mazania a pohybu spomínaného vy¹¹ie vlo¾ poèet
+ pred pohyb pre docielenie hromadného mazania:
+ d èíslo pohyb
- Krátky výpis objektov:
- w - od kurzora do konca slova, vrátanie medzier
- e - od kurzora do konca slova, BEZ medzier
- $ - od kurzora do konca riadku.
+ 1. Presuò kurzor na prvé slovo písané VE¥KÝMI PÍSMENAMI
+ v riadku oznaèenom --->.
-POZNÁMKA: Ak stlaèí¹ klávesu objektu v normálnom móde bez príkazu, kurzor
- sa presunie na miesto ¹pecifikované vo výpise objektov.
+ 2. Napí¹ 2dw a zma¾e¹ dve slová písané VE¥KÝMI PÍSMENAMI
+ 3. Zopakuj kroky 1 a 2 s pou¾itím rôzneho èísla tak aby si zmazal slová
+ písané veµkými písmenami jedným príkazom.
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny.
+
+POZNÁMKA: Èíslo medzi operátorom d a pohybom funguje podobne ako pri
+ pou¾ití s pohybom bez operátora.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 2.4: VÝNIMKA V 'PRÍKAZOVOM OBJEKTE'
+ Lekcia 2.6: OPERÁCIE S RIADKAMI
** Napísanie príkazu dd zma¾e celý riadok. **
@@ -216,7 +307,7 @@
1. Presuò kurzor na druhý riadok v texte na spodu.
2. Napí¹ dd aby si zmazal riadok.
3. Prejdi na ¹tvrtý riadok.
-4. Napí¹ 2dd (pametaj si èíslo-príkaz-objekt) aby si zmazal dva riadky.
+4. Napí¹ 2dd aby si zmazal dva riadky.
1) Ru¾e sú èervené,
2) Blato je zábavné,
@@ -228,7 +319,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 2.5: PRÍKAZ UNDO
+ Lekcia 2.7: PRÍKAZ UNDO
** Stlaè u pre vrátenie posledného príkazu, U pre úpravu celého riadku. **
@@ -241,7 +332,7 @@
5. Teraz napí¹ veµké U èím vrátí¹ riadok do pôvodného stavu.
6. Teraz napí¹ u niekoµko krát, èím vrátí¹ spä» príkaz U.
7. Teraz napí¹ CTRL-R (dr¾ klávesu CTRL stlaèenú kým stláèa¹ R) niekoµko
- krát, èím vrátí¹ spä» predtým vrátené príkazy (redo).
+ krát, èím vrátí¹ spä» predtým vrátené príkazy (undo z undo).
---> Opprav chybby nna toomto riadku a zmeeò ich pommocou undo.
@@ -260,18 +351,22 @@
3. Pre zmazanie celého riadku napí¹: dd
- 4. Formát pre píkaz v norálnom móde je:
+ 4. Pre zopakovanie pohybu, napí¹ pred neho èíslo: 2w
- [èíslo] príkaz objekt ALEBO príkaz [èíslo] objekt
+ 5. Formát pre píkaz:
+
+ operátor [èíslo] pohyb
kde:
- èíslo - udáva koµko krát sa príkaz zopakuje
- príkaz - udáva vykonávaný príkaz, ako napríklad d pre mazanie
- objekt - udáva rozsah príkazu, ako napríklad w(slovo),
+ operátor - èo treba robi», napríklad d pre zmazanie
+ [èíslo] - je voliteµný poèet pre opakovanie pohybu
+ pohyb - pohyb po texte vzhµadom na operátor, napríklad w (slovo),
$ (do konca riadku), atï.
- 5. Pre vrátenie spä» predo¹lej operácie napí¹: u (malé u)
- Pre vrátenie v¹etkých úprav na riadku napí¹: U (veµké U)
- Pre vrátenie vrátených úprav napí¹: CTRL-R
+ 6. Pre pohyb na zaèiatok riadku pou¾i nulu: 0
+
+ 7. Pre vrátenie spä» predo¹lej operácie napí¹: u (malé u)
+ Pre vrátenie v¹etkých úprav na riadku napí¹: U (veµké U)
+ Pre vrátenie vrátených úprav napí¹: CTRL-R
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Lekcia 3.1: PRÍKAZ VLO®I«
@@ -289,10 +384,10 @@
5. Zopakuj kroky 2 a¾ 4, kým riadky niesú v správnom poradí.
- d) Tie¾ sa doká¾e¹ vzdeláva»?
- b) Fialky sú modré,
- c) Inteligencia sa vzdeláva,
- a) Ru¾e sú èervené,
+---> d) Tie¾ sa doká¾e¹ vzdeláva»?
+---> b) Fialky sú modré,
+---> c) Inteligencia sa vzdeláva,
+---> a) Ru¾e sú èervené,
@@ -300,15 +395,15 @@
Lekcia 3.2: PRÍKAZ NAHRADENIA
- ** Napísaním r a znaku sa nahradí znak na mieste kurzora. **
+ ** Napísaním rx sa nahradí znak na mieste kurzora znakom x . **
1. Presuò kurzor ni¾¹ie na prví riadok textu oznaèeného znaèkou --->.
2. Presuò kurzor na zaèiatok prvej chyby.
- 3. napí¹ r a potom znak, ktorý nahradí chybu.
+ 3. napí¹ r a potom znak, ktorý tam má by».
- 4. Zopakuj kroky 2 a 3, kým prvý riadok nieje správny.
+ 4. Zopakuj kroky 2 a 3, kým prvý riadok nieje zhodný s druhým.
---> Kaï bol tento riasok píaaný, niekro stla¹il nesprábne klávesy!
---> Keï bol tento riadok písaný, niekto stlaèil nesprávne klávesy!
@@ -323,22 +418,22 @@
Lekcia 3.3. PRÍKAZ ÚPRAVY
- ** Ak chce¹ zmeni» èas» slova alebo celé slovo, napí¹ cw . **
+ ** Ak chce¹ zmeni» èas» slova do konca slova, napí¹ ce . **
1. Presuò kurzor ni¾¹ie na prvý riadok oznaèený znaèkou --->.
2. Umiestni kurzor na písmeno o v slove rosfpl.
- 3. Napí¹ cw a oprav slovo (v tomto prípade napí¹ 'iadok'.)
+ 3. Napí¹ ce a oprav slovo (v tomto prípade napí¹ 'iadok'.)
- 4. Stlaè <ESC> a prejdi na ïal¹iu chybu (prvý znak, ktorý treba zmeni».)
+ 4. Stlaè <ESC> a prejdi na ïal¹í znak, ktorý treba zmeni».
5. Zopakuj kroky 3 a 4, kým prvá veta nieje rovnaká ako druhá.
---> Tento rosfpl má niekoµko skic, ktoré je pirewvbí zmeni» piy»uèán príkazu.
---> Tento riadok má niekoµko slov, ktoré je potrebné zmeni» pou¾itím príkazu.
-Poznámka, ¾e cw nielen nahrádza slovo, ale »a aj premiestní do vkladania.
+Poznámka, ¾e ce zma¾e slovo a nastaví vkladací mód.
@@ -346,13 +441,13 @@
Lekcia 3.4: VIAC ZMIEN POU®ITÍM c
- ** Príkaz pre úpravy sa pou¾íva s rovnakými objektami ako pre mazanie **
+ ** Príkaz pre úpravy sa pou¾íva s rovnakými pohybmi ako pre mazanie **
1. Príkaz pre úpravy pracuje rovnako ako pre mazanie. Formát je:
- [èíslo] c objekt ALEBO c [èíslo] objekt
+ c [èíslo] pohyb
- 2. Objekty sú rovnaké, ako napríklad w (slovo), $ (koniec riadku), atï.
+ 2. Pohyby sú rovnaké, ako napríklad w (slovo) a $ (koniec riadku).
3. Presuò kurzor ni¾¹ie na prvý riadok oznaèený znaèkou --->.
@@ -364,6 +459,7 @@
---> Koniec tohto riadku potrebuje pomoc, aby bol ako druhy.
---> Koniec tohto riadku potrebuje opravi» pou¾itím príkazu c$ .
+POZNÁMKA: Mô¾e¹ pou¾i» klávesu backspace na úpravu zmien poèas písania.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,13 +472,13 @@
2. Pre naradenie znaku na mieste kurzora, napí¹ r a potom znak, ktorý
nahradí pôvodný znak.
- 3. Príkaz na upravenie umo¾òuje zmeni» ¹pecifikovaný objekt od kurzora
- a¾ po koniec objektu. napr. Napí¹ cw èím zmní¹ text od pozície
+ 3. Príkaz na upravenie umo¾òuje zmeni» od kurzora a¾ po miesto, ktoré
+ urèuje pohyb. napr. Napí¹ ce èím zmní¹ text od pozície
kurzora do konca slova, c$ zmení text do konca riadku.
- 4. Format pre nahradenie je:
+ 4. Formát pre nahradenie je:
- [èíslo] c objekt ALEBO c [èíslo] objekt
+ c [èíslo] pohyb
Teraz prejdi na nalsedujúcu lekciu.
@@ -394,19 +490,19 @@
** Stlaè CTRL-g pre zobrazenie svojej pozície v súbore a statusu súboru.
- Stlaè SHIFT-G pre prechod na riadok v súbore. **
+ Napí¹ G pre presun na riadok v súbore. **
Poznámka: Preèítaj si celú túto lekciu skôr ako zaène¹ vykonáva» kroky!!
- 1. Dr¾ stlaèenú klávesu Ctrl a stlaè g . Na spodu obrazovky sa zobrazí
- stavový riadok s názvom súboru a riadkom na ktorom práve si. Zapamätaj
- si si èíslo riadku pre krok 3.
+ 1. Dr¾ stlaèenú klávesu Ctrl a stlaè g . Toto nazývame CTRL-G.
+ Na spodu obrazovky sa zobrazí správa s názvom súboru a pozíciou
+ v súbore. Zapamätajsi si èíslo riadku pre pou¾itie v kroku 3.
- 2. Stlaè Shift-G èím sa dostane¹ na spodok súboru.
+ 2. Stlaè G èím sa dostane¹ na spodok súboru.
+ Napí¹ gg èím sa dostane¹ na zaèiatok súboru.
- 3. Napí¹ èíslo riadku na ktorom si sa nachádzal a stlaè Shift-G. To »a
- vráti na riadok, na ktorom si prvý krát stlaèil Ctrl-g.
- (Keï pí¹e¹ èísla, tieto sa nezobrazujú na obrazovke.)
+ 3. Napí¹ èíslo riadku na ktorom si sa nachádzal a stlaè G. To »a
+ vráti na riadok, na ktorom si prvý krát stlaèil CTRL-G.
4. Ak sa cítí¹ schopný vykona» teto kroky, vykonaj kroky 1 a¾ 3.
@@ -419,24 +515,24 @@
** Napí¹ / nasledované re»azcom pre vyhµadanie príslu¹ného re»azca. **
1. Napí¹ znak / v normálnom móde. Poznámka, ¾e tento znak sa spolu
- s kurzorom zobrazí v dolnej èasti obrazovky ako s : príkazom.
+ s kurzorom zobrazí v dolnej èasti obrazovky s : príkazom.
2. Teraz napí¹ 'errroor' <ENTER>. To je slovo, ktoré chce¹ vyhµada».
3. Pre vyhµadanie ïal¹ieho výskytu rovnakého re»azca, stlaè jednoducho n.
Pre vyhµadanie ïal¹ieho výskytu rovnakého re»azca opaèným smerom,
- napí¹ Shift-N.
+ N.
4. Ak chce¹ vyhµada» re»azec v spätnom smere, pou¾í príkaz ? miesto
príkazu /.
- ---> Keï vyhµadávanie dosiahne koniec tohto súboru, bude pokraèova» na
- zaèiatku.
+ 5. Pre návrat na miesto z ktorého si pri¹iel stlaè CTRL-O (dr¾ stlaèenú
+ klávesu Ctrl poèas stlaèenia klávesy o). Zopakuj pre ïal¹í návrat
+ spä». CTRL-I ide vpred.
- "errroor" nie je spôsob ako nahradi» error; errroor je error.
-
-POZNÁMKA: Keï vyhµadávanie dosiahne koniec súboru, bude pokraèova» na jeho
- zaèiatku.
+POZNÁMKA: "errroor" nieje spôsob hláskovania error; errroor je error.
+POZNÁMKA: Keï vyhµadávanie dosiahne koniec tohto súboru, bude pokraèova» na
+ zaèiatku, dokiaµ nieje resetované nastavenie 'wrapscan' .
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -454,16 +550,18 @@
4. Napí¹ % pre presun kurzoru spä» na otvárajúcu zátvorku.
+ 5. Presuò kurzor na iný zo znakov (,),[,],{ alebo } a v¹imni si
+ èo % vykonáva.
+
---> Toto ( je testovací riadok s ('s, ['s ] a {'s } v riadku. ))
Poznámka: Toto je veµmi výhodné pou¾í» pri ladení programu s chýbajúcimi
- uzatvárajúcimi zátvorkami.
-
+ uzatvárajúcimi zátvorkami!
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 4.4: SPOSOB AKO ZMENI« CHYBY
+ Lekcia 4.4: PRÍKAZ NAHRADENIA
** Napí¹ :s/starý/nový/g pre nahradenie slova 'starý' za slovo 'nový'. **
@@ -471,7 +569,7 @@
1. Presuò kurzor ni¾¹ie na riadok oznaèený znaèkou --->.
2. Napí¹ :s/thee/the <ENTER> . Poznamka, ¾e tento príkaz zmení len prvý
- výskyt v riadku.
+ výskyt "thee" v riadku.
3. Teraz napí¹ :s/thee/the/g èo znamená celkové nahradenie v riadku.
Toto nahradí v¹etky výskyty v riadku.
@@ -479,9 +577,11 @@
---> Thee best time to see thee flowers in thee spring.
4. Pre zmenu v¹etkých výskytov daného re»azca medzi dvomi ridakami,
- napí¹ :#,#s/starý/nový/g kde #,# sú èísla dvoch riadkov.
+ napí¹ :#,#s/starý/nový/g kde #,# sú èísla dvoch riadkov, v rozsahu
+ ktorých sa nahradenie vykoná.
napí¹ :%s/starý/nový/g pre zmenu v¹etkých výskytov v celom riadku
-
+ napí¹ :%s/starý/nový/gc nájde v¹etky výskyty v celom súbore,
+ s otázkou èi nahradi» alebo nie
@@ -489,23 +589,25 @@
LEKCIA 4 ZHRNUTIE
- 1. Ctrl-g vypí¹e tvoju pozíciu v súbore a status súboru.
- Shift-g »a premiestni na koniec riadku. Èíslo riadku nasledované
- Shift-g »a presunie na dané èíslo riadku.
+ 1. CTRL-g vypí¹e tvoju pozíciu v súbore a status súboru.
+ G »a premiestni na koniec riadku.
+ èíslo G »a premiestni na riadok s èíslom.
+ gg »a presunie na prvý riadok
2. Napísanie / nasledované re»azcom vyhµadá re»azec smerom DOPREDU.
Napísanie ? nasledované re»azcom vyhµada re»azec smerom DOZADU.
Napísanie n po vyhµadávaní, vyhµadá nasledujúci výskyt re»azca
- v rovnakom smere, prièom Shift-N vyhµadá v opaènom smere.
+ v rovnakom smere, prièom N vyhµadá v opaènom smere.
+ CTRL-O »a vráti spä» na star¹iu pozíciu, CTRL-I na nov¹iu pozíciu.
3. Napísanie % keï kurzor je na (,),[,],{, alebo } nájde zodpovdajúcu
- párú zátvorku.
+ párnu zátvorku.
- 4. Pre nahradenie nového za prvý starý v riadku napí¹ :s/nový/starý
- Pre nahradenie nového za v¹etky staré v riadku napí¹ :s/nový/starý/g
- Pre nahradenie re»azcov medzi dvoma riadkami 3 napí¹ :#,#/nový/starý/g
+ 4. Pre nahradenie nového za prvý starý v riadku napí¹ :s/starý/nový
+ Pre nahradenie nového za v¹etky staré v riadku napí¹ :s/starý/nový/g
+ Pre nahradenie re»azcov medzi dvoma riadkami 3 napí¹ :#,#/starý/nový/g
Pre nahradenie v¹etkých výskytov v súbore napí¹ :%s/starý/nový/g
- Pre potvrdenie ka¾dého nahradenia pridaj 'c' :%s/nový/starý/gc
+ Pre potvrdenie ka¾dého nahradenia pridaj 'c' :%s/starý/nový/gc
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -524,7 +626,7 @@
zobrazí obsah tvojho adresára rovnako ako na príkazovom riadku.
Alebo pou¾i :!dir ak ls nefunguje.
-Poznámka: Takto je mo¾né spusti» hociaký vonkaj¹í príkaz.
+Poznámka: Takto je mo¾né spusti» hociaký vonkaj¹í príkaz s argumentami.
Poznámka: V¹etky príkazy : musia by» dokonèené stlaèením <ENTER>
@@ -539,41 +641,43 @@
1. Napí¹ :!dir alebo :!ls pre výpis aktuálneho adresára.
U¾ vie¹, ¾e musí¹ za týmto stlaèi» <ENTER> .
- 2. Vyber názov súboru, ktorý E©TE neexistuje.
+ 2. Vyber názov súboru, ktorý e¹te neexistuje, ako napr. TEST.
3. Teraz napí¹: :w TEST (kde TEST je názov vybratého súboru.)
4. To ulo¾í celý súbor (Vim Tutor) pod názovm TEST.
Pre overenie napí¹ :!dir , èím zobrazí¹ obsah adresára.
-Poznámka: ¾e ak ukonèí¹ prácu s editorom Vim a znovu ho spustí¹ s názvom
- súboru TEST, súbor bude kópia výuky, keï si ho ulo¾il.
+Poznámka: ¾e ak ukonèí¹ prácu s editorom Vim a znovu ho spustí¹ príkazom
+ vim TEST, súbor bude kópia výuky, keï si ho ulo¾il.
5. Teraz odstráò súbor napísaním (MS-DOS): :!del TEST
alebo (Unix): :!rm TEST
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 5.3 VÝBEROVÝ PRÍKAZ PRE ULO®ENIE
+ Lekcia 5.3 VÝBER TEXTU PRE ULO®ENIE
- ** Pre ulo¾enie èasti súboru, napí¹ :#,# w FILENAME **
+ ** Pre ulo¾enie èasti súboru, napí¹ v pohyb :w FILENAME **
- 1. Znovu napí¹ :!dir alebo :!ls pre zobrazenie obsahu aktuálneho
- adresára a vyber vhodný súbor ako TEST.
+ 1. Presuò kurozr na tento riadok.
- 2. Presuò kurzor na vrch tejto strany a napí¹ Ctrl-g pre vyhµadanie èísla
- tohto riadku. PAMETAJ SI TOTO ÈÍSLO!
+ 2. Stlaè v a presuò kurozr na piatu polo¾ku dole. Poznámka, ¾e
+ tento text je vyznaèený (highlighted).
- 3. Teraz prejdi na spodok strany a napí¹ Ctrl-g znovu. ZAPAMETAJ SI ÈÍSLO
- AJ TOHTO RIADKU!
+ 3. Stlaè klávesu : . V spodnej èasti okna sa objaví :'<,'>.
- 4. Pre ulo¾enie LEN èasti súboru, napí¹ :#,# w TEST kde #,# sú dve èísla
- zapamätaných riadkov (vrch, spodok) a TEST je názov súboru.
+ 4. Napí¹ w TEST , kde TEST je meno súboru, ktorý zatial neexistuje.
+ Skontroluj, e vidí¹ :'<,'>w TEST predtým ne¾ stlaèí¹ Enter.
- 5. Znova sa pozri, èi tam ten súbor je pomocou príkazu :!dir ale
- NEODSTRAÒUJ ho.
+ 5. Vim zapí¹e oznaèené riadky do súboru TEST. Pou¾i :!dir alebo !ls
+ pre overenie. Zatial ho e¹te nema¾! Pou¾ijeme ho v ïal¹ej lekcii.
+POZNÁMKA: Stlaèením klávesy v sa spustí vizuálne oznaèovanie.
+ Mô¾e¹ pohybova» kurzorom pre upresnenie vyznaèeného textu.
+ Potom mô¾e¹ pou¾i» operátor pre vykonanie nejakej akcie
+ s textom. Napríklad d zma¾e vyznaèený text.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -582,21 +686,16 @@
** Pre vlo¾enie obsahu súboru, napí¹ :r FILENAME **
- 1. Napí¹ :!dir aby si sa presvedèil, ¾e súbor TEST stále existuje.
+ 1. Premiestni kurzor nad tento riadok.
- 2. Presuò kurzor na vrch tejto strany.
-
-POZNÁMKA: Po vykonaní kroku 3 uvidí¹ Lekciu 5.3. Potom sa presuò dole
- na túto lekciu.
+POZNÁMKA: Po vykonaní kroku 2 uvidí¹ text z lekcie 5.3. Potom sa presuò
+ dole, aby si videl túto lekciu.
3. Teraz vlo¾ súbor TEST pou¾itím príkazu :r TEST kde TEST je názov
- súboru.
+ súboru. Súbor, ktorý si pou¾il je umiestnený pod riadkom s kurzorom.
-POZNÁMKA: Súbor, ktorý si vlo¾il sa vlo¾í od miesta, kde sa nachádza kurzor.
-
- 4. Pre kontrolu vlo¾enia súboru, presuò kurzor spä» a v¹imni si, ¾e teraz
- má¹ dve kópie lekcie 5.3, originál a súborovú verziu.
-
+POZNÁMKA: Mô¾e¹ tie¾ naèíta» výstup vonkaj¹ieho príkazu. Napríklad :r !ls
+ naèíta výstup príkazu ls a umiestni ho za pozíciu kurzora.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -606,20 +705,19 @@
1. :!príkaz spustí vonkaj¹í príkaz.
Niektoré vyu¾iteµné príklady sú:
- (MS_DOS) (UNIX)
- :!dir :!ls - zobrazí obsah adresára
+ (MS_DOS) (UNIX)
+ :!dir :!ls - zobrazí obsah adresára
:!del FILENAME :!rm FILENAME - odstráni súbor FILENAME
2. :w FILENAME ulo¾í aktuálny súbor na disk pod menom FILENAME.
-
- 3. :#,#w FILENAME ulo¾í riadky od # do # do súboru FILENAME.
+
+ 3. v pohyb :w FILENAME ulo¾í vizuálne oznaèené riadky do
+ súboru FILENAME.
4. :r FILENAME vyberie z disku súbor FILENAME a vlo¾í ho do aktuálneho
súboru za pozíciou kurzora.
-
-
-
+ 5. :r !dir naèíta výstup z príkazu dir a vlo¾í ho za pozíciu kurzora.
@@ -640,9 +738,10 @@
---> Po napísaní o sa kurzor premiestní na vlo¾ený riadok do vkladacieho
módu.
- 4. Pre otvorenie riadku nad kurzorom, jednotucho napí¹ veµké O , namiesto
- malého o. Vyskú¹aj si to na nasledujúcom riadku.
-Vlo¾ riadok nad týmto napísaním Shift-O, keï kurzor je na tomto riadku.
+ 4. Pre otvorenie riadku nad kurzorom, jednotucho napí¹ veµké O ,
+ namiesto malého o. Vyskú¹aj si to na riadku dole.
+
+---> Vlo¾ riadok nad týmto napísaním O, keï kurzor je na tomto riadku.
@@ -653,20 +752,21 @@
** Napí¹ a pre vlo¾enie textu ZA kurzor. **
1. Presuò kurzor ni¾¹ie na koniec prvého riadku oznaèeného znaèkou --->
- napísaním $ v normálnom móde.
- 2. Napí¹ a (malé písmeno) pre pridanie textu ZA znakom na mieste
- kurzora. (Veµké A pridá na koniec riadku.)
+ 2. Stlaè klávesu e dokiaµ kurozr nieje na konci riadku.
-Poznámka: Toto obchádza písanie i , posledný znak, text na vlo¾enie, <ESC>,
- kurzor doprava, a nakoniec, x , na pridávanie na koniec riadku!
+ 3. Napí¹ a (malé písmeno) pre pridanie textu ZA kurzorom.
- 3. Teraz dokonèi prvý riadok. Poznámka, ¾e pridávanie je vlastne rovnaké
- ako vkladací mód, okrem miesta, kde sa text vkladá.
+ 4. Dokonèí slovo tak ako je to v druhom riadku. Stla¹ <ESC> pre
+ opustenie vkladacieho módu.
----> Tento riadok ti dovoµuje nácvik
+ 5. Pou¾i e na presun na ïal¹ie nedokonèené slovo a zopakuj kroky 3 a 4.
+
+---> Tento ri ti dovoµuje nácv priávan testu na koniec riadku.
---> Tento riadok ti dovoµuje nácvik pridávania textu na koniec riadku.
+POZNÁMKA: a, i, A ¹tartujú rovnaký vkladací mód, jediný rozidel je, kde
+ sa znaky vkladajú.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -675,24 +775,52 @@
** Napí¹ veµké R pre nahradenie viac ako jedného znaku. **
- 1. Presuò kurzor ni¾¹ie na prvý riadok oznaèený znaèkou --->.
+ 1. Presuò kurzor ni¾¹ie na prvý riadok oznaèený znaèkou --->. Premiestni
+ kurzor na zaèiatok prvého výskytu xxx.
- 2. Premiestni kurzor na zaèiatok prvého slova, ktoré je odli¹né od druhého
- riadku oznaèeného ---> (slovo 'posledná').
+ 2. Teraz napí¹ R a napí¹ èíslo uvedené v druhom riadku, tak¾e
+ sa ním nahradí pôvodné xxx.
- 3. Teraz napí¹ R a nahraï zvy¹ok textu na prvom riadku písaním cez starý
- text tak, aby prvý riadok bol rovnaký ako druhý.
+ 3. Stlaè <ESC> pre opustenie nahradzovacieho módu. Poznámka, ¾e zvy¹ok
+ riadku zostane nezmenený.
----> Na úpravu prvého riadku do tvaru ako je posledný na strane pou¾i klávesy.
----> Na úpravu prvého riadku do tavru ako je druhý, napí¹ R a nový text.
+ 4. Zopakuj tieto kroky pre nahradenie zvy¹ných xxx.
- 4. Poznámka, ¾e ak stlaèí¹ <ESC> pre ukonèenie, v¹etok nezmenený text
- zostane.
+---> Pridaním 123 ku xxx dostane¹ xxx.
+---> Pridaním 123 ku 456 dostane¹ 579.
+POZNÁMKA: Nahradzovací mód je ako vkladací mód, ale ka¾dý napísaný znak
+ zma¾e existujúci znak.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 6.4: NASTAVENIE MO®NOSTÍ
+
+ Lekcia 6.4: Copy Paste textu
+
+ ** pou¾í operátor y pre copy textku a p pre jeho paste **
+
+ 1. Choï ni¾¹ie na riadok oznaèený ---> a umiestni kurozr za "a)".
+
+ 2. Na¹tartuj vizuálny mód pou¾itím v a presuò kurozr pred "first".
+
+ 3. Napí¹ y pre vystrihnutie (copy) oznaèeného textu.
+
+ 4. Presuò kurozr na koniec ïal¹ieho riadku: j$
+
+ 5. Napí¹ p pre vlo¾nie (paste) textu. Potom napí¹: a druha <ESC>.
+
+ 6. Pou¾i vizuálny mód pre oznaèenie "polo¾ka.", vystrihni to
+ pou¾itím y, presuò sa na koniec nasledujúceho riadku pou¾itím j$
+ a vlo¾ sem text pou¾itím p.
+
+---> a) toto je prvá polo¾ka
+---> b)
+
+POZNÁMKA: Mô¾e¹ pou¾i» tie¾ y ako operátor; yw vystrihne jedno slovo.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 6.5: NASTAVENIE MO®NOSTÍ
** Nastav mo¾nosti, tak¾e vyhµadávanie alebo nahradzovanie ignoruje
@@ -700,40 +828,52 @@
1. Vyhµadaj re»azec 'ignore' napísaním:
- /ignore
- Zopakuj vyhµadávanie niekoµko krát stlaèením klávesy n
+ /ignore <ENTER>
+ Zopakuj vyhµadávanie niekoµko krát stlaèením klávesy n .
2. Nastav mo¾nos» 'ic' (Ignore case) napísaním príkazu:
:set ic
- 3. Teraz vyhµadaj re»azec 'ingore' znova stlaèením klávesy: n
- Zopakuj vyhµadávanie niekoµko krát stlaèením klávesy n
+ 3. Teraz vyhµadaj re»azec 'ingore' znova stlaèením klávesy n
+ Poznámka, ¾e teraz sú vyhµadané aj Ignore a IGNORE.
4. Nastav mo¾nos»i 'hlsearch' a 'incsearch':
:set hls is
5. Teraz spusti vyhµadávací príkaz znovu, a pozri èo sa stalo:
- /ignore
+ /ignore <ENTER>
- 6. Na odstránenie zvýraznenia výrazov napí¹:
- :nohlsearch
+ 6. Pre opetovné zapnutie rozly¹ovania veµkých a malých písmen
+ napí¹: :set noic
+
+POZNÁMKA: Na odstránenie zvýraznenia výrazov napí¹: :nohlsearch
+POZNÁMKA: Ak chce¹ nerozly¹ova» veµkos» písmen len pre jedno
+ pou¾itie vyhµadávacieho príkazu, pou¾i \c: /ignore\c <ENTER>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LEKCIA 6 ZHRNUTIE
- 1. Napísaním o sa otvorí nový riadok pod kurzorom a premiestni sa kurzor
- na vlo¾ený riadok do vkladacieho módu.
- napísaním veµkého O sa otvorí riadok nad aktuálnym riadkom s kurzorom.
+ 1. Napí¹ o pre otvorenie riadku pod kurzorom a ¹tart vkladacieho módu.
+ Napí¹ O pre otvorenie riadku nad kurzorom.
- 2. Napí¹ a pre vkladanie textu ZA znak na pozícii kurzoru.
- Napísaním veµkého A sa text automatický pridáva na koniec riadku.
+ 2. Napí¹ a pre vkladanie textu ZA kurzor.
+ Napí¹ A pre vkladanie textu za koncom riadku.
- 3. Napísanie veµkého R prepne do nahradzovacieho módu, kým nieje
- stlaèené <ESC> pre ukonèenie nahradzovacieho módu.
+ 3. Príkaz e presunie kurozr na koniec slova
- 4. Napísanie ":set xxx" nastaví mo¾nos» "xxx".
+ 4. Operátor y vystrihne (skopíruje) text, p ho vlo¾í.
+ 5. Napísanie veµkého R prepne do nahradzovacieho módu, kým nieje
+ stlaèené <ESC>.
+
+ 6. Napísanie ":set xxx" nastaví mo¾nos» "xxx". Niektoré nastavenia sú:
+ 'ic' 'ignorecase' ignoruje veµké a malé písmená poèas vyhµadávania.
+ 'is' 'incsearch' zobrazuje èiastoèné re»azce vyhµadávaného re»azca.
+ 'hls' 'hlsearch' vyznaèí v¹etky vyhµadávané re»azce.
+ Mô¾e¹ pou¾i» hociktorý z dlhých a krátkych názvov mo¾ností.
+
+ 7. Vlo¾ "no" pred nastavenie pre jeho vypnutie: :set noic
@@ -742,7 +882,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- LEKCIA 7: PRÍKAZY ON-LINE NÁPOVEDY
+ LEKCIA 7.1: ZÍSKANIE NÁPOVEDY
** Pou¾ívaj on-line systém nápovedy **
@@ -753,19 +893,21 @@
- stlaè klávesu <F1> (ak nejakú má¹)
- napí¹ :help <ENTER>
- Napí¹ :q <ENTER> èím zatvorí¹ okno nápovedy.
+ Èítaj text v okne nápovedy pre získanie predstavy ako nápoveda funguje.
+ Napí¹ CTRL-W CTRL-W pre skok z jedného okna do druhého.
+ Napí¹ :q <ENTER> èím zatvorí¹ okno nápovedy.
Mô¾e¹ nájs» help ku hociakej téme pridaním argumentu ku príkazu ":help".
Vyskú¹aj tieto (nezabudni stlaèi» <ENTER>):
:help w
- :help c_<T
+ :help c_CTRL-D
:help insert-index
:help user-manual
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- LEKCIA 8: VYTVORENIE ©TARTOVACIEHO SKRIPTU
+ LEKCIA 7.2: VYTVORENIE ©TARTOVACIEHO SKRIPTU
** Zapni funkcie editora Vim **
@@ -773,22 +915,67 @@
vypnutá. Pre pou¾ívanie viac Vim funkcii vytvor "vimrc" súbor.
1. Zaèni editova» "vimrc" súbor, to závisí na pou¾itom systéme:
- :edit ~/.vimrc pre Unix
- :edit $VIM/_vimrc pre MS-Windows
+ :e ~/.vimrc pre Unix
+ :e $VIM/_vimrc pre MS-Windows
2. Teraz si preèítaj text príkladu "vimrc" súboru:
- :read $VIMRUNTIME/vimrc_example.vim
+ :r $VIMRUNTIME/vimrc_example.vim
3. Ulo¾ súbor:
-
- :write
+ :w
Pri nasledujúcom ¹tarte editora Vim sa pou¾ije zvýrazòovanie syntaxe.
Do "vimrc" súboru mô¾e¹ prida» v¹etky svoje uprednostòované nastavenia.
+ Pre viac informácii napí¹ :help vimrc-intro
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 7.3 DOKONÈENIE
+
+ ** Dokonèi príkaz na príkazovom riadku pou¾itím CTRL-D a <TAB> **
+
+ 1. Uisti sa, ¾e Vim nieje v kompatibilnom móde: :set nocp
+
+ 2. Pozri sa aké súbory sa nachádzajú v adresári: :!ls alebo :!dir
+
+ 3. Napí¹ zaèiatok príkazu: :e
+
+ 4. Stlaè CTRL-D a Vim zobrazí zoznam príkazov zaèínajúcich "e".
+
+ 5. Stlaè <TAB> a Vim dokonèí meno príkazu na ":edit".
+
+ 6. Teraz pridaj medzerník a zaèiatok mena existujúceho súboru:
+ :edit FIL
+
+ 7. Stlaè <TAB>. Vim dokonèí meno (ak je jedineèné).
+
+POZNÁMKA: Dokonèovanie funguje pre veµa príkazov. Vyskú¹aj stlaèenie
+ CTRL-D a <TAB>. ©peciálne je to u¾itoèné pre príkaz :help.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ LEKCIA 7 ZHRNUTIE
+
+ 1. Napí¹ :help alebo stlaè <F1> alebo <Help> pre otvorenie okna nápovedy.
+
+ 2. Napí¹ :help príkaz pre vyhµadanie nápovedy ku príkazu príkaz.
+
+ 3. Napí¹ CTRL-W CTRL-W na preskoèenie do iného okna.
+
+ 4. Napí¹ :q pre zatvorenie okna nápovedy
+
+ 5. Vytvor ¹tartovací skript vimrc pre udr¾anie uprednostòovaných nastavení.
+
+ 6. Poèas písania príkazu : stlaè CTRL-D pre zobrazenie dokonèení.
+ Stlaè <TAB> pre pou¾itie jedného z dokonèení.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
Toto vymedzuje výuku Vimu. Toto je urèené pre strucný prehµad o editore
Vim, úplne postaèujúce pre µahké a obstojné pou¾ívanie tohto editora.
Táto výuka je ïaleko od kompletnosti, preto¾e Vim má omnoho viacej príkazov.
@@ -817,5 +1004,5 @@
Preklad do Slovenèiny: ¥ubo¹ Èelko
e-mail: celbos@inmail.sk
- Last Change: 2004 Apr 29
- Encoding: iso8859-2
+ Last Change: 2006 Apr 18
+ encoding: iso8859-2
diff --git a/runtime/tutor/tutor.sk.cp1250 b/runtime/tutor/tutor.sk.cp1250
index dc13b26..891b355 100644
--- a/runtime/tutor/tutor.sk.cp1250
+++ b/runtime/tutor/tutor.sk.cp1250
@@ -1,5 +1,5 @@
===============================================================================
-= V i t a j t e v o V I M T u t o r i a l i - Verzia 1.5 =
+= V i t a j t e v o V I M T u t o r i a l i - Verzia 1.7 =
===============================================================================
Vim je ve¾mi výkonný editor, ktorý má príli ve¾a príkazov na to aby
@@ -10,6 +10,7 @@
Pribliný èas potrebný na prebratie tejto výuky je 25-30 minút,
závisí na tom, ko¾ko je stráveného èasu s preskúavaním.
+ UPOZORNENIE:
Príkazy v lekciách modifikujú text. Vytvor kópiu tohto súboru aby
sa mohlo precvièova na òom (pri tarte "vimtutor" je toto kópia).
@@ -20,16 +21,17 @@
Presvedè sa, e Shift-Lock NIEJE stlaèený a stlaèt klávesu
j nieko¾ko krát, aby sa kurzor posunul nato¾ko, e lekcia 1.1
celkom zaplní obrazovku.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Lekcia 1.1: POHYB KURZOROM
** Pre pohyb kurzorum stlaè klávesy h,j,k,l ako je znázornené. **
- ^
- k Funkcia: Klávesa h je na¾avo a vykoná pohyb do¾ava.
- < h l > Klávesa l je napravo a vykoná pohyb doprava.
- j Klávesa j vyzerá ako ípka dole
- v
+ ^
+ k Funkcia: Klávesa h je na¾avo a vykoná pohyb do¾ava.
+ < h l > Klávesa l je napravo a vykoná pohyb doprava.
+ j Klávesa j vyzerá ako ípka dole
+ v
1. Pohybuj kurzorom po obrazovke, kým si na to nezvykne.
2. Dr stlaèenú klávesu pre pohyb dole (j), kým sa jej funkcia nezopakuje.
@@ -38,34 +40,33 @@
3. Pouitím klávesy pre pohyb dole prejdi na Lekciu 1.2.
Poznámka: Ak si niesi istý tým èo si napísal, stlaè <ESC>
- na prechod do normálneho módu.
+ na prechod do normálneho módu.
Poznámka: Kurzorové klávesy sú tie funkèné. Ale pouívaním hjkl sa bude
- schopný pohybova rýchlejie, keï si zvykne ich pouíva.
+ schopný pohybova rýchlejie, keï si zvykne ich pouíva. Naozaj!
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- LEKCIA 1.2: SPÚANIE A ZATVÁRANIE VIMU
+ LEKCIA 1.2: ZATVÁRANIE VIMU
+
!! POZNÁMKA: Pred vykonaním týchto krokov si preèítaj celú túto lekciu !!
1. Stlaè klávesu <ESC> (aby si sa uèite nachádzal v normálnom móde)
- 2. Napí: :q! <ENTER>.
-
----> Tým ukonèí prácu s editorom BEZ uloenia zmien, ktoré si vykonal.
- Ak chce uloi vykonané zmeny a ukonèi prácu s editorom napí:
- :wq <ENTER>
+ 2. Napí: :q! <ENTER>.
+ Tým ukonèí prácu s editorom BEZ uloenia zmien, ktoré si vykonal.
3. Keï sa dostane na príkazový riadok, napí príkaz, ktorým sa dostane
spe do tejto výuky. To môe by: vimtutor <ENTER>
- Zvyèajne sa pouíva: vim tutor <ENTER>
-
----> 'vim' znamená spustenie editora vim, 'tutor' je názov súboru, ktorý
- chce editova.
4. Ak si si tieto kroky spo¾ahlivo zapamätal, vykonaj kroky 1 a 3, pre
- ukonèenie a znovu spustenie editora. Potom presuò kurzor dole na
- lekciu 1.3.
+ ukonèenie a znovu spustenie editora.
+
+POZNÁMKA: :q! <ENTER> neuloí zmeny, ktoré si vykonal. O nieko¾ko lekcií
+ sa nauèí ako uloi zmeny do súboru
+
+ 5. presuò kurzor dole na lekciu 1.3.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Lekcia 1.3: EDITÁCIA TEXTU - MAZANIE
@@ -85,7 +86,7 @@
5. Ak je veta správna, prejdi na lekciu 1.4.
-POZNÁMKA: Neskúaj si zapametä obsah tejto výuky, ale sa uè pouívaním.
+POZNÁMKA: Neskúaj si zapamäta obsah tejto výuky, ale sa uè pouívaním.
@@ -93,7 +94,7 @@
Lekcia 1.4: EDITÁCIA TEXTU - VKLADANIE
- ** Stlaèenie klávesy i v normálnom móde umoòuje vkladanie textu. **
+ ** Stlaèenie klávesy i umoòuje vkladanie textu. **
1. Presuò kurzor niie na prvý riadok za znaèku --->.
@@ -111,26 +112,73 @@
5. Keï sa dostatoène nauèí vklada text, prejdi na nasledujúce zhrnutie.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 1.5: EDITÁCIA TEXTU - PRIDÁVANIE
+
+
+ ** Stlaèenie klávesy A umoòuje pridáva text. **
+
+ 1. Presuò kurozr niie na prvý riadok za znaèkou --->.
+ Nezáleí na tom, na ktorom znaku sa kurzor v tom riadku nachádza.
+
+ 2. Stlaè klávesu A a napí potrebný text.
+
+ 3. Po pridaní textu stlaè klávesu <ESC> pre návrat do Normálneho módu.
+
+ 4. Presuò kurozr na druhý riadok oznaèený ---> a zopakuj
+ kroky 2 a 3 kým nieje veta správna.
+
+---> Tu je nejaký text chýbajúci o
+ Tu je nejaký text chýbajúci od tia¾to.
+---> Tu tie chýba nej
+ Tu tie chýba nejaký text.
+
+ 5. Keï sa dostatoène nauèí pridáva text, prejdi na lekciu 1.6.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 1.6: EDITÁCIA SÚBORU
+
+
+ ** Napísaním :wq sa súbor uloí a zavrie **
+
+!! POZNÁMKA: Pred vykonaním týchto krokov si preèítaj celú lekciu!!
+
+1. Opusti túto výuku, ako si to urobil v lekcii 1.2: :q!
+
+2. Do príkazového riadku napí príkaz: vim tutor <ENTER>
+ 'vim' je príkaz, ktorý spustí editor Vim, 'tutor' je meno súboru,
+ ktorý chce editova. Poui taký súbor, ktorý môe meni.
+
+3. Vlo a zma text tak, ako si sa nauèil v predolých lekciach.
+
+4. Ulo súbor so zmenami a opusti Vim príkazom: :wq <ENTER>
+
+5. Retartuj vimtutor a presuò sa dole na nasledujúce zhrnutie.
+
+6. Urob tak po preèítaní predolých krokov a porozumeniu im.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ZHRNUTIE LEKCIE 1
1. Kurzor sa pohybuje pouitím kláves so ípkami alebo klávesmi hjkl.
- h (do lava) j (dole) k (hore) l (doprava)
+ h (do lava) j (dole) k (hore) l (doprava)
2. Pre spustenie Vimu (z príkazového riadku) napí: vim FILENAME <ENTER>
3. Na ukonèenie Vimu napí: <ESC> :q! <ENTER> pre zruenie vetkých zmien
alebo napí: <ESC> :wq <ENTER> pre uloenie zmien.
- 4. Na zmazanie znaku na mieste kurzora napí v normálnom móde: x
+ 4. Na zmazanie znaku na mieste kurzora napí: x
5. Pre vloenie textu na mieste kurzora v normálnom móde napí:
- i vkladaný text <ESC>
+ i napí vkladaný text <ESC> vkladanie pred kurzor
+ A napí pridávaný text <EXC> vkladanie za riadok
POZNÁMKA: Stlaèenie <ESC> a premiestní do normálneho módu alebo zruí
- nejaký nechcený a èiastoène dokonèený príkaz.
+ nejaký nechcený a èiastoène dokonèený príkaz.
Teraz pokraèuj lekciou 2.
@@ -149,8 +197,10 @@
4. Napí dw aby slovo zmizlo.
-POZNÁMKA: Písmená dw sa zobrazia na poslednom riadku obrazovky tak ako ich
- píe. Ak píe nieèo zle, stlaè <ESC> a zaèni znova.
+POZNÁMKA: Písmeno d sa zobrazí na poslednom riadku obrazovky keï ho
+ napíe. Vim na teba poèká, aby si mohol napísa
+ písmeno w. Ak vidí nieèo iné ako d , tak si napísal
+ nesprávny znak; stlaè <ESC> a zaèni znova.
---> Tu je nieko¾ko slov zábava, ktoré nie patria list do tejto vety.
@@ -178,34 +228,75 @@
5. Prejdi na lekciu 2.3 pre pochopenie toho èo sa stalo.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.3: OPERÁTORY A POHYBY
+ Ve¾a príkazov, ktoré menia text sú odvodené od operátorov a pohybov.
+ Formát pre príkaz mazania klávesou d je nasledovný:
+
+ d pohyb
+
+ kde:
+ d - je mazací operátor
+ pohyb - je to èo operátor vykonáva (vypísané niie)
+
+ Krátky list pohybov:
+ w - do zaèiatku ïalieho slova, okrem jeho prvého písmena.
+ e - do konca terajieho slova, vrátane posledného znaku.
+ $ - do konca riadku, vrátane posledného znaku
+
+ Take napísaním de sa zmae vetko od kurzora do konca slova.
+
+POZNÁMKA: Stlaèením iba pohybu v normálnom móde bez operátora
+ sa presunie kurzor tak ako je to pecivikované.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.4: Pouitie viacnásobného pohybu
+
+
+ ** Napísaním èísla pred pohyb ho zopakuje zadný poèet krát **
+
+ 1. Presuò kurozr niie na zaèiatok riadku oznaèeného --->.
+
+ 2. Napí 2w a kurozr sa presunie o dve slová vpred.
+
+ 3. Napí 3e a kurozr sa presunie vpred na koniec tretieho slova.
+
+ 4. Napí 0 (nula) a kurozr sa presunie na zaèiatok riadku.
+
+ 5. Zopakuj kroky 2 a 3 s rôznymi èíslami.
+
+---> Toto je riadok so slovami po kotrých sa môete pohybova.
+
+ 6. Prejdi na lekciu 2.5.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 2.3: ROZIROVACIE PRÍKAZY A OBJEKTY
+ Lekcia 2.5: POUITIE VIACNÁSOBNÉHO MAZANIA PRE HROMADNÉ MAZANIE
- Formát mazacieho príkazu d je nasledovný:
+ ** Napísanie èísla spolu s operátorom ho zopakuje zadaný poèet krát **
- [èíslo] d objekt ALEBO d [èíslo] objekt
- Kde:
- èíslo - udáva ko¾ko krát sa príkaz vykoná (volite¾né, implicitne=1)
- d - je príkaz pre mazanie
- objekt - udáva na èom sa príkaz vykonáva (vypísané niie)
+ V kombinácii operátorov mazania a pohybu spomínaného vyie vlo poèet
+ pred pohyb pre docielenie hromadného mazania:
+ d èíslo pohyb
- Krátky výpis objektov:
- w - od kurzora do konca slova, vrátanie medzier
- e - od kurzora do konca slova, BEZ medzier
- $ - od kurzora do konca riadku.
+ 1. Presuò kurzor na prvé slovo písané VE¼KÝMI PÍSMENAMI
+ v riadku oznaèenom --->.
-POZNÁMKA: Ak stlaèí klávesu objektu v normálnom móde bez príkazu, kurzor
- sa presunie na miesto pecifikované vo výpise objektov.
+ 2. Napí 2dw a zmae dve slová písané VE¼KÝMI PÍSMENAMI
+ 3. Zopakuj kroky 1 a 2 s pouitím rôzneho èísla tak aby si zmazal slová
+ písané ve¾kými písmenami jedným príkazom.
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny.
+
+POZNÁMKA: Èíslo medzi operátorom d a pohybom funguje podobne ako pri
+ pouití s pohybom bez operátora.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 2.4: VÝNIMKA V 'PRÍKAZOVOM OBJEKTE'
+ Lekcia 2.6: OPERÁCIE S RIADKAMI
** Napísanie príkazu dd zmae celý riadok. **
@@ -216,7 +307,7 @@
1. Presuò kurzor na druhý riadok v texte na spodu.
2. Napí dd aby si zmazal riadok.
3. Prejdi na tvrtý riadok.
-4. Napí 2dd (pametaj si èíslo-príkaz-objekt) aby si zmazal dva riadky.
+4. Napí 2dd aby si zmazal dva riadky.
1) Rue sú èervené,
2) Blato je zábavné,
@@ -228,7 +319,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 2.5: PRÍKAZ UNDO
+ Lekcia 2.7: PRÍKAZ UNDO
** Stlaè u pre vrátenie posledného príkazu, U pre úpravu celého riadku. **
@@ -241,7 +332,7 @@
5. Teraz napí ve¾ké U èím vrátí riadok do pôvodného stavu.
6. Teraz napí u nieko¾ko krát, èím vrátí spä príkaz U.
7. Teraz napí CTRL-R (dr klávesu CTRL stlaèenú kým stláèa R) nieko¾ko
- krát, èím vrátí spä predtým vrátené príkazy (redo).
+ krát, èím vrátí spä predtým vrátené príkazy (undo z undo).
---> Opprav chybby nna toomto riadku a zmeeò ich pommocou undo.
@@ -260,16 +351,20 @@
3. Pre zmazanie celého riadku napí: dd
- 4. Formát pre píkaz v norálnom móde je:
+ 4. Pre zopakovanie pohybu, napí pred neho èíslo: 2w
- [èíslo] príkaz objekt ALEBO príkaz [èíslo] objekt
+ 5. Formát pre píkaz:
+
+ operátor [èíslo] pohyb
kde:
- èíslo - udáva ko¾ko krát sa príkaz zopakuje
- príkaz - udáva vykonávaný príkaz, ako napríklad d pre mazanie
- objekt - udáva rozsah príkazu, ako napríklad w(slovo),
+ operátor - èo treba robi, napríklad d pre zmazanie
+ [èíslo] - je volite¾ný poèet pre opakovanie pohybu
+ pohyb - pohyb po texte vzh¾adom na operátor, napríklad w (slovo),
$ (do konca riadku), atï.
- 5. Pre vrátenie spä predolej operácie napí: u (malé u)
+ 6. Pre pohyb na zaèiatok riadku poui nulu: 0
+
+ 7. Pre vrátenie spä predolej operácie napí: u (malé u)
Pre vrátenie vetkých úprav na riadku napí: U (ve¾ké U)
Pre vrátenie vrátených úprav napí: CTRL-R
@@ -289,10 +384,10 @@
5. Zopakuj kroky 2 a 4, kým riadky niesú v správnom poradí.
- d) Tie sa dokáe vzdeláva?
- b) Fialky sú modré,
- c) Inteligencia sa vzdeláva,
- a) Rue sú èervené,
+---> d) Tie sa dokáe vzdeláva?
+---> b) Fialky sú modré,
+---> c) Inteligencia sa vzdeláva,
+---> a) Rue sú èervené,
@@ -300,15 +395,15 @@
Lekcia 3.2: PRÍKAZ NAHRADENIA
- ** Napísaním r a znaku sa nahradí znak na mieste kurzora. **
+ ** Napísaním rx sa nahradí znak na mieste kurzora znakom x . **
1. Presuò kurzor niie na prví riadok textu oznaèeného znaèkou --->.
2. Presuò kurzor na zaèiatok prvej chyby.
- 3. napí r a potom znak, ktorý nahradí chybu.
+ 3. napí r a potom znak, ktorý tam má by.
- 4. Zopakuj kroky 2 a 3, kým prvý riadok nieje správny.
+ 4. Zopakuj kroky 2 a 3, kým prvý riadok nieje zhodný s druhým.
---> Kaï bol tento riasok píaaný, niekro stlail nesprábne klávesy!
---> Keï bol tento riadok písaný, niekto stlaèil nesprávne klávesy!
@@ -323,22 +418,22 @@
Lekcia 3.3. PRÍKAZ ÚPRAVY
- ** Ak chce zmeni èas slova alebo celé slovo, napí cw . **
+ ** Ak chce zmeni èas slova do konca slova, napí ce . **
1. Presuò kurzor niie na prvý riadok oznaèený znaèkou --->.
2. Umiestni kurzor na písmeno o v slove rosfpl.
- 3. Napí cw a oprav slovo (v tomto prípade napí 'iadok'.)
+ 3. Napí ce a oprav slovo (v tomto prípade napí 'iadok'.)
- 4. Stlaè <ESC> a prejdi na ïaliu chybu (prvý znak, ktorý treba zmeni.)
+ 4. Stlaè <ESC> a prejdi na ïalí znak, ktorý treba zmeni.
5. Zopakuj kroky 3 a 4, kým prvá veta nieje rovnaká ako druhá.
---> Tento rosfpl má nieko¾ko skic, ktoré je pirewvbí zmeni piyuèán príkazu.
---> Tento riadok má nieko¾ko slov, ktoré je potrebné zmeni pouitím príkazu.
-Poznámka, e cw nielen nahrádza slovo, ale a aj premiestní do vkladania.
+Poznámka, e ce zmae slovo a nastaví vkladací mód.
@@ -346,13 +441,13 @@
Lekcia 3.4: VIAC ZMIEN POUITÍM c
- ** Príkaz pre úpravy sa pouíva s rovnakými objektami ako pre mazanie **
+ ** Príkaz pre úpravy sa pouíva s rovnakými pohybmi ako pre mazanie **
1. Príkaz pre úpravy pracuje rovnako ako pre mazanie. Formát je:
- [èíslo] c objekt ALEBO c [èíslo] objekt
+ c [èíslo] pohyb
- 2. Objekty sú rovnaké, ako napríklad w (slovo), $ (koniec riadku), atï.
+ 2. Pohyby sú rovnaké, ako napríklad w (slovo) a $ (koniec riadku).
3. Presuò kurzor niie na prvý riadok oznaèený znaèkou --->.
@@ -364,6 +459,7 @@
---> Koniec tohto riadku potrebuje pomoc, aby bol ako druhy.
---> Koniec tohto riadku potrebuje opravi pouitím príkazu c$ .
+POZNÁMKA: Môe poui klávesu backspace na úpravu zmien poèas písania.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,13 +472,13 @@
2. Pre naradenie znaku na mieste kurzora, napí r a potom znak, ktorý
nahradí pôvodný znak.
- 3. Príkaz na upravenie umoòuje zmeni pecifikovaný objekt od kurzora
- a po koniec objektu. napr. Napí cw èím zmní text od pozície
+ 3. Príkaz na upravenie umoòuje zmeni od kurzora a po miesto, ktoré
+ urèuje pohyb. napr. Napí ce èím zmní text od pozície
kurzora do konca slova, c$ zmení text do konca riadku.
- 4. Format pre nahradenie je:
+ 4. Formát pre nahradenie je:
- [èíslo] c objekt ALEBO c [èíslo] objekt
+ c [èíslo] pohyb
Teraz prejdi na nalsedujúcu lekciu.
@@ -394,19 +490,19 @@
** Stlaè CTRL-g pre zobrazenie svojej pozície v súbore a statusu súboru.
- Stlaè SHIFT-G pre prechod na riadok v súbore. **
+ Napí G pre presun na riadok v súbore. **
Poznámka: Preèítaj si celú túto lekciu skôr ako zaène vykonáva kroky!!
- 1. Dr stlaèenú klávesu Ctrl a stlaè g . Na spodu obrazovky sa zobrazí
- stavový riadok s názvom súboru a riadkom na ktorom práve si. Zapamätaj
- si si èíslo riadku pre krok 3.
+ 1. Dr stlaèenú klávesu Ctrl a stlaè g . Toto nazývame CTRL-G.
+ Na spodu obrazovky sa zobrazí správa s názvom súboru a pozíciou
+ v súbore. Zapamätajsi si èíslo riadku pre pouitie v kroku 3.
- 2. Stlaè Shift-G èím sa dostane na spodok súboru.
+ 2. Stlaè G èím sa dostane na spodok súboru.
+ Napí gg èím sa dostane na zaèiatok súboru.
- 3. Napí èíslo riadku na ktorom si sa nachádzal a stlaè Shift-G. To a
- vráti na riadok, na ktorom si prvý krát stlaèil Ctrl-g.
- (Keï píe èísla, tieto sa nezobrazujú na obrazovke.)
+ 3. Napí èíslo riadku na ktorom si sa nachádzal a stlaè G. To a
+ vráti na riadok, na ktorom si prvý krát stlaèil CTRL-G.
4. Ak sa cítí schopný vykona teto kroky, vykonaj kroky 1 a 3.
@@ -419,24 +515,24 @@
** Napí / nasledované reazcom pre vyh¾adanie prísluného reazca. **
1. Napí znak / v normálnom móde. Poznámka, e tento znak sa spolu
- s kurzorom zobrazí v dolnej èasti obrazovky ako s : príkazom.
+ s kurzorom zobrazí v dolnej èasti obrazovky s : príkazom.
2. Teraz napí 'errroor' <ENTER>. To je slovo, ktoré chce vyh¾ada.
3. Pre vyh¾adanie ïalieho výskytu rovnakého reazca, stlaè jednoducho n.
Pre vyh¾adanie ïalieho výskytu rovnakého reazca opaèným smerom,
- napí Shift-N.
+ N.
4. Ak chce vyh¾ada reazec v spätnom smere, pouí príkaz ? miesto
príkazu /.
- ---> Keï vyh¾adávanie dosiahne koniec tohto súboru, bude pokraèova na
- zaèiatku.
+ 5. Pre návrat na miesto z ktorého si priiel stlaè CTRL-O (dr stlaèenú
+ klávesu Ctrl poèas stlaèenia klávesy o). Zopakuj pre ïalí návrat
+ spä. CTRL-I ide vpred.
- "errroor" nie je spôsob ako nahradi error; errroor je error.
-
-POZNÁMKA: Keï vyh¾adávanie dosiahne koniec súboru, bude pokraèova na jeho
- zaèiatku.
+POZNÁMKA: "errroor" nieje spôsob hláskovania error; errroor je error.
+POZNÁMKA: Keï vyh¾adávanie dosiahne koniec tohto súboru, bude pokraèova na
+ zaèiatku, dokia¾ nieje resetované nastavenie 'wrapscan' .
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -454,16 +550,18 @@
4. Napí % pre presun kurzoru spä na otvárajúcu zátvorku.
+ 5. Presuò kurzor na iný zo znakov (,),[,],{ alebo } a vimni si
+ èo % vykonáva.
+
---> Toto ( je testovací riadok s ('s, ['s ] a {'s } v riadku. ))
Poznámka: Toto je ve¾mi výhodné pouí pri ladení programu s chýbajúcimi
- uzatvárajúcimi zátvorkami.
-
+ uzatvárajúcimi zátvorkami!
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 4.4: SPOSOB AKO ZMENI CHYBY
+ Lekcia 4.4: PRÍKAZ NAHRADENIA
** Napí :s/starý/nový/g pre nahradenie slova 'starý' za slovo 'nový'. **
@@ -471,7 +569,7 @@
1. Presuò kurzor niie na riadok oznaèený znaèkou --->.
2. Napí :s/thee/the <ENTER> . Poznamka, e tento príkaz zmení len prvý
- výskyt v riadku.
+ výskyt "thee" v riadku.
3. Teraz napí :s/thee/the/g èo znamená celkové nahradenie v riadku.
Toto nahradí vetky výskyty v riadku.
@@ -479,9 +577,11 @@
---> Thee best time to see thee flowers in thee spring.
4. Pre zmenu vetkých výskytov daného reazca medzi dvomi ridakami,
- napí :#,#s/starý/nový/g kde #,# sú èísla dvoch riadkov.
+ napí :#,#s/starý/nový/g kde #,# sú èísla dvoch riadkov, v rozsahu
+ ktorých sa nahradenie vykoná.
napí :%s/starý/nový/g pre zmenu vetkých výskytov v celom riadku
-
+ napí :%s/starý/nový/gc nájde vetky výskyty v celom súbore,
+ s otázkou èi nahradi alebo nie
@@ -489,23 +589,25 @@
LEKCIA 4 ZHRNUTIE
- 1. Ctrl-g vypíe tvoju pozíciu v súbore a status súboru.
- Shift-g a premiestni na koniec riadku. Èíslo riadku nasledované
- Shift-g a presunie na dané èíslo riadku.
+ 1. CTRL-g vypíe tvoju pozíciu v súbore a status súboru.
+ G a premiestni na koniec riadku.
+ èíslo G a premiestni na riadok s èíslom.
+ gg a presunie na prvý riadok
2. Napísanie / nasledované reazcom vyh¾adá reazec smerom DOPREDU.
Napísanie ? nasledované reazcom vyh¾ada reazec smerom DOZADU.
Napísanie n po vyh¾adávaní, vyh¾adá nasledujúci výskyt reazca
- v rovnakom smere, prièom Shift-N vyh¾adá v opaènom smere.
+ v rovnakom smere, prièom N vyh¾adá v opaènom smere.
+ CTRL-O a vráti spä na stariu pozíciu, CTRL-I na noviu pozíciu.
3. Napísanie % keï kurzor je na (,),[,],{, alebo } nájde zodpovdajúcu
- párú zátvorku.
+ párnu zátvorku.
- 4. Pre nahradenie nového za prvý starý v riadku napí :s/nový/starý
- Pre nahradenie nového za vetky staré v riadku napí :s/nový/starý/g
- Pre nahradenie reazcov medzi dvoma riadkami 3 napí :#,#/nový/starý/g
+ 4. Pre nahradenie nového za prvý starý v riadku napí :s/starý/nový
+ Pre nahradenie nového za vetky staré v riadku napí :s/starý/nový/g
+ Pre nahradenie reazcov medzi dvoma riadkami 3 napí :#,#/starý/nový/g
Pre nahradenie vetkých výskytov v súbore napí :%s/starý/nový/g
- Pre potvrdenie kadého nahradenia pridaj 'c' :%s/nový/starý/gc
+ Pre potvrdenie kadého nahradenia pridaj 'c' :%s/starý/nový/gc
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -524,7 +626,7 @@
zobrazí obsah tvojho adresára rovnako ako na príkazovom riadku.
Alebo poui :!dir ak ls nefunguje.
-Poznámka: Takto je moné spusti hociaký vonkají príkaz.
+Poznámka: Takto je moné spusti hociaký vonkají príkaz s argumentami.
Poznámka: Vetky príkazy : musia by dokonèené stlaèením <ENTER>
@@ -539,41 +641,43 @@
1. Napí :!dir alebo :!ls pre výpis aktuálneho adresára.
U vie, e musí za týmto stlaèi <ENTER> .
- 2. Vyber názov súboru, ktorý ETE neexistuje.
+ 2. Vyber názov súboru, ktorý ete neexistuje, ako napr. TEST.
3. Teraz napí: :w TEST (kde TEST je názov vybratého súboru.)
4. To uloí celý súbor (Vim Tutor) pod názovm TEST.
Pre overenie napí :!dir , èím zobrazí obsah adresára.
-Poznámka: e ak ukonèí prácu s editorom Vim a znovu ho spustí s názvom
- súboru TEST, súbor bude kópia výuky, keï si ho uloil.
+Poznámka: e ak ukonèí prácu s editorom Vim a znovu ho spustí príkazom
+ vim TEST, súbor bude kópia výuky, keï si ho uloil.
5. Teraz odstráò súbor napísaním (MS-DOS): :!del TEST
alebo (Unix): :!rm TEST
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 5.3 VÝBEROVÝ PRÍKAZ PRE ULOENIE
+ Lekcia 5.3 VÝBER TEXTU PRE ULOENIE
- ** Pre uloenie èasti súboru, napí :#,# w FILENAME **
+ ** Pre uloenie èasti súboru, napí v pohyb :w FILENAME **
- 1. Znovu napí :!dir alebo :!ls pre zobrazenie obsahu aktuálneho
- adresára a vyber vhodný súbor ako TEST.
+ 1. Presuò kurozr na tento riadok.
- 2. Presuò kurzor na vrch tejto strany a napí Ctrl-g pre vyh¾adanie èísla
- tohto riadku. PAMETAJ SI TOTO ÈÍSLO!
+ 2. Stlaè v a presuò kurozr na piatu poloku dole. Poznámka, e
+ tento text je vyznaèený (highlighted).
- 3. Teraz prejdi na spodok strany a napí Ctrl-g znovu. ZAPAMETAJ SI ÈÍSLO
- AJ TOHTO RIADKU!
+ 3. Stlaè klávesu : . V spodnej èasti okna sa objaví :'<,'>.
- 4. Pre uloenie LEN èasti súboru, napí :#,# w TEST kde #,# sú dve èísla
- zapamätaných riadkov (vrch, spodok) a TEST je názov súboru.
+ 4. Napí w TEST , kde TEST je meno súboru, ktorý zatial neexistuje.
+ Skontroluj, e vidí :'<,'>w TEST predtým ne stlaèí Enter.
- 5. Znova sa pozri, èi tam ten súbor je pomocou príkazu :!dir ale
- NEODSTRAÒUJ ho.
+ 5. Vim zapíe oznaèené riadky do súboru TEST. Poui :!dir alebo !ls
+ pre overenie. Zatial ho ete nema! Pouijeme ho v ïalej lekcii.
+POZNÁMKA: Stlaèením klávesy v sa spustí vizuálne oznaèovanie.
+ Môe pohybova kurzorom pre upresnenie vyznaèeného textu.
+ Potom môe poui operátor pre vykonanie nejakej akcie
+ s textom. Napríklad d zmae vyznaèený text.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -582,21 +686,16 @@
** Pre vloenie obsahu súboru, napí :r FILENAME **
- 1. Napí :!dir aby si sa presvedèil, e súbor TEST stále existuje.
+ 1. Premiestni kurzor nad tento riadok.
- 2. Presuò kurzor na vrch tejto strany.
-
-POZNÁMKA: Po vykonaní kroku 3 uvidí Lekciu 5.3. Potom sa presuò dole
- na túto lekciu.
+POZNÁMKA: Po vykonaní kroku 2 uvidí text z lekcie 5.3. Potom sa presuò
+ dole, aby si videl túto lekciu.
3. Teraz vlo súbor TEST pouitím príkazu :r TEST kde TEST je názov
- súboru.
+ súboru. Súbor, ktorý si pouil je umiestnený pod riadkom s kurzorom.
-POZNÁMKA: Súbor, ktorý si vloil sa vloí od miesta, kde sa nachádza kurzor.
-
- 4. Pre kontrolu vloenia súboru, presuò kurzor spä a vimni si, e teraz
- má dve kópie lekcie 5.3, originál a súborovú verziu.
-
+POZNÁMKA: Môe tie naèíta výstup vonkajieho príkazu. Napríklad :r !ls
+ naèíta výstup príkazu ls a umiestni ho za pozíciu kurzora.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -606,20 +705,19 @@
1. :!príkaz spustí vonkají príkaz.
Niektoré vyuite¾né príklady sú:
- (MS_DOS) (UNIX)
- :!dir :!ls - zobrazí obsah adresára
+ (MS_DOS) (UNIX)
+ :!dir :!ls - zobrazí obsah adresára
:!del FILENAME :!rm FILENAME - odstráni súbor FILENAME
2. :w FILENAME uloí aktuálny súbor na disk pod menom FILENAME.
-
- 3. :#,#w FILENAME uloí riadky od # do # do súboru FILENAME.
+
+ 3. v pohyb :w FILENAME uloí vizuálne oznaèené riadky do
+ súboru FILENAME.
4. :r FILENAME vyberie z disku súbor FILENAME a vloí ho do aktuálneho
súboru za pozíciou kurzora.
-
-
-
+ 5. :r !dir naèíta výstup z príkazu dir a vloí ho za pozíciu kurzora.
@@ -640,9 +738,10 @@
---> Po napísaní o sa kurzor premiestní na vloený riadok do vkladacieho
módu.
- 4. Pre otvorenie riadku nad kurzorom, jednotucho napí ve¾ké O , namiesto
- malého o. Vyskúaj si to na nasledujúcom riadku.
-Vlo riadok nad týmto napísaním Shift-O, keï kurzor je na tomto riadku.
+ 4. Pre otvorenie riadku nad kurzorom, jednotucho napí ve¾ké O ,
+ namiesto malého o. Vyskúaj si to na riadku dole.
+
+---> Vlo riadok nad týmto napísaním O, keï kurzor je na tomto riadku.
@@ -653,20 +752,21 @@
** Napí a pre vloenie textu ZA kurzor. **
1. Presuò kurzor niie na koniec prvého riadku oznaèeného znaèkou --->
- napísaním $ v normálnom móde.
- 2. Napí a (malé písmeno) pre pridanie textu ZA znakom na mieste
- kurzora. (Ve¾ké A pridá na koniec riadku.)
+ 2. Stlaè klávesu e dokia¾ kurozr nieje na konci riadku.
-Poznámka: Toto obchádza písanie i , posledný znak, text na vloenie, <ESC>,
- kurzor doprava, a nakoniec, x , na pridávanie na koniec riadku!
+ 3. Napí a (malé písmeno) pre pridanie textu ZA kurzorom.
- 3. Teraz dokonèi prvý riadok. Poznámka, e pridávanie je vlastne rovnaké
- ako vkladací mód, okrem miesta, kde sa text vkladá.
+ 4. Dokonèí slovo tak ako je to v druhom riadku. Stla <ESC> pre
+ opustenie vkladacieho módu.
----> Tento riadok ti dovo¾uje nácvik
+ 5. Poui e na presun na ïalie nedokonèené slovo a zopakuj kroky 3 a 4.
+
+---> Tento ri ti dovo¾uje nácv priávan testu na koniec riadku.
---> Tento riadok ti dovo¾uje nácvik pridávania textu na koniec riadku.
+POZNÁMKA: a, i, A tartujú rovnaký vkladací mód, jediný rozidel je, kde
+ sa znaky vkladajú.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -675,24 +775,52 @@
** Napí ve¾ké R pre nahradenie viac ako jedného znaku. **
- 1. Presuò kurzor niie na prvý riadok oznaèený znaèkou --->.
+ 1. Presuò kurzor niie na prvý riadok oznaèený znaèkou --->. Premiestni
+ kurzor na zaèiatok prvého výskytu xxx.
- 2. Premiestni kurzor na zaèiatok prvého slova, ktoré je odliné od druhého
- riadku oznaèeného ---> (slovo 'posledná').
+ 2. Teraz napí R a napí èíslo uvedené v druhom riadku, take
+ sa ním nahradí pôvodné xxx.
- 3. Teraz napí R a nahraï zvyok textu na prvom riadku písaním cez starý
- text tak, aby prvý riadok bol rovnaký ako druhý.
+ 3. Stlaè <ESC> pre opustenie nahradzovacieho módu. Poznámka, e zvyok
+ riadku zostane nezmenený.
----> Na úpravu prvého riadku do tvaru ako je posledný na strane poui klávesy.
----> Na úpravu prvého riadku do tavru ako je druhý, napí R a nový text.
+ 4. Zopakuj tieto kroky pre nahradenie zvyných xxx.
- 4. Poznámka, e ak stlaèí <ESC> pre ukonèenie, vetok nezmenený text
- zostane.
+---> Pridaním 123 ku xxx dostane xxx.
+---> Pridaním 123 ku 456 dostane 579.
+POZNÁMKA: Nahradzovací mód je ako vkladací mód, ale kadý napísaný znak
+ zmae existujúci znak.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lekcia 6.4: NASTAVENIE MONOSTÍ
+
+ Lekcia 6.4: Copy Paste textu
+
+ ** pouí operátor y pre copy textku a p pre jeho paste **
+
+ 1. Choï niie na riadok oznaèený ---> a umiestni kurozr za "a)".
+
+ 2. Natartuj vizuálny mód pouitím v a presuò kurozr pred "first".
+
+ 3. Napí y pre vystrihnutie (copy) oznaèeného textu.
+
+ 4. Presuò kurozr na koniec ïalieho riadku: j$
+
+ 5. Napí p pre vlonie (paste) textu. Potom napí: a druha <ESC>.
+
+ 6. Poui vizuálny mód pre oznaèenie "poloka.", vystrihni to
+ pouitím y, presuò sa na koniec nasledujúceho riadku pouitím j$
+ a vlo sem text pouitím p.
+
+---> a) toto je prvá poloka
+---> b)
+
+POZNÁMKA: Môe poui tie y ako operátor; yw vystrihne jedno slovo.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 6.5: NASTAVENIE MONOSTÍ
** Nastav monosti, take vyh¾adávanie alebo nahradzovanie ignoruje
@@ -700,40 +828,52 @@
1. Vyh¾adaj reazec 'ignore' napísaním:
- /ignore
- Zopakuj vyh¾adávanie nieko¾ko krát stlaèením klávesy n
+ /ignore <ENTER>
+ Zopakuj vyh¾adávanie nieko¾ko krát stlaèením klávesy n .
2. Nastav monos 'ic' (Ignore case) napísaním príkazu:
:set ic
- 3. Teraz vyh¾adaj reazec 'ingore' znova stlaèením klávesy: n
- Zopakuj vyh¾adávanie nieko¾ko krát stlaèením klávesy n
+ 3. Teraz vyh¾adaj reazec 'ingore' znova stlaèením klávesy n
+ Poznámka, e teraz sú vyh¾adané aj Ignore a IGNORE.
4. Nastav monosi 'hlsearch' a 'incsearch':
:set hls is
5. Teraz spusti vyh¾adávací príkaz znovu, a pozri èo sa stalo:
- /ignore
+ /ignore <ENTER>
- 6. Na odstránenie zvýraznenia výrazov napí:
- :nohlsearch
+ 6. Pre opetovné zapnutie rozlyovania ve¾kých a malých písmen
+ napí: :set noic
+
+POZNÁMKA: Na odstránenie zvýraznenia výrazov napí: :nohlsearch
+POZNÁMKA: Ak chce nerozlyova ve¾kos písmen len pre jedno
+ pouitie vyh¾adávacieho príkazu, poui \c: /ignore\c <ENTER>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LEKCIA 6 ZHRNUTIE
- 1. Napísaním o sa otvorí nový riadok pod kurzorom a premiestni sa kurzor
- na vloený riadok do vkladacieho módu.
- napísaním ve¾kého O sa otvorí riadok nad aktuálnym riadkom s kurzorom.
+ 1. Napí o pre otvorenie riadku pod kurzorom a tart vkladacieho módu.
+ Napí O pre otvorenie riadku nad kurzorom.
- 2. Napí a pre vkladanie textu ZA znak na pozícii kurzoru.
- Napísaním ve¾kého A sa text automatický pridáva na koniec riadku.
+ 2. Napí a pre vkladanie textu ZA kurzor.
+ Napí A pre vkladanie textu za koncom riadku.
- 3. Napísanie ve¾kého R prepne do nahradzovacieho módu, kým nieje
- stlaèené <ESC> pre ukonèenie nahradzovacieho módu.
+ 3. Príkaz e presunie kurozr na koniec slova
- 4. Napísanie ":set xxx" nastaví monos "xxx".
+ 4. Operátor y vystrihne (skopíruje) text, p ho vloí.
+ 5. Napísanie ve¾kého R prepne do nahradzovacieho módu, kým nieje
+ stlaèené <ESC>.
+
+ 6. Napísanie ":set xxx" nastaví monos "xxx". Niektoré nastavenia sú:
+ 'ic' 'ignorecase' ignoruje ve¾ké a malé písmená poèas vyh¾adávania.
+ 'is' 'incsearch' zobrazuje èiastoèné reazce vyh¾adávaného reazca.
+ 'hls' 'hlsearch' vyznaèí vetky vyh¾adávané reazce.
+ Môe poui hociktorý z dlhých a krátkych názvov moností.
+
+ 7. Vlo "no" pred nastavenie pre jeho vypnutie: :set noic
@@ -742,7 +882,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- LEKCIA 7: PRÍKAZY ON-LINE NÁPOVEDY
+ LEKCIA 7.1: ZÍSKANIE NÁPOVEDY
** Pouívaj on-line systém nápovedy **
@@ -753,19 +893,21 @@
- stlaè klávesu <F1> (ak nejakú má)
- napí :help <ENTER>
- Napí :q <ENTER> èím zatvorí okno nápovedy.
+ Èítaj text v okne nápovedy pre získanie predstavy ako nápoveda funguje.
+ Napí CTRL-W CTRL-W pre skok z jedného okna do druhého.
+ Napí :q <ENTER> èím zatvorí okno nápovedy.
Môe nájs help ku hociakej téme pridaním argumentu ku príkazu ":help".
Vyskúaj tieto (nezabudni stlaèi <ENTER>):
:help w
- :help c_<T
+ :help c_CTRL-D
:help insert-index
:help user-manual
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- LEKCIA 8: VYTVORENIE TARTOVACIEHO SKRIPTU
+ LEKCIA 7.2: VYTVORENIE TARTOVACIEHO SKRIPTU
** Zapni funkcie editora Vim **
@@ -773,22 +915,67 @@
vypnutá. Pre pouívanie viac Vim funkcii vytvor "vimrc" súbor.
1. Zaèni editova "vimrc" súbor, to závisí na pouitom systéme:
- :edit ~/.vimrc pre Unix
- :edit $VIM/_vimrc pre MS-Windows
+ :e ~/.vimrc pre Unix
+ :e $VIM/_vimrc pre MS-Windows
2. Teraz si preèítaj text príkladu "vimrc" súboru:
- :read $VIMRUNTIME/vimrc_example.vim
+ :r $VIMRUNTIME/vimrc_example.vim
3. Ulo súbor:
-
- :write
+ :w
Pri nasledujúcom tarte editora Vim sa pouije zvýrazòovanie syntaxe.
Do "vimrc" súboru môe prida vetky svoje uprednostòované nastavenia.
+ Pre viac informácii napí :help vimrc-intro
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 7.3 DOKONÈENIE
+
+ ** Dokonèi príkaz na príkazovom riadku pouitím CTRL-D a <TAB> **
+
+ 1. Uisti sa, e Vim nieje v kompatibilnom móde: :set nocp
+
+ 2. Pozri sa aké súbory sa nachádzajú v adresári: :!ls alebo :!dir
+
+ 3. Napí zaèiatok príkazu: :e
+
+ 4. Stlaè CTRL-D a Vim zobrazí zoznam príkazov zaèínajúcich "e".
+
+ 5. Stlaè <TAB> a Vim dokonèí meno príkazu na ":edit".
+
+ 6. Teraz pridaj medzerník a zaèiatok mena existujúceho súboru:
+ :edit FIL
+
+ 7. Stlaè <TAB>. Vim dokonèí meno (ak je jedineèné).
+
+POZNÁMKA: Dokonèovanie funguje pre ve¾a príkazov. Vyskúaj stlaèenie
+ CTRL-D a <TAB>. peciálne je to uitoèné pre príkaz :help.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ LEKCIA 7 ZHRNUTIE
+
+ 1. Napí :help alebo stlaè <F1> alebo <Help> pre otvorenie okna nápovedy.
+
+ 2. Napí :help príkaz pre vyh¾adanie nápovedy ku príkazu príkaz.
+
+ 3. Napí CTRL-W CTRL-W na preskoèenie do iného okna.
+
+ 4. Napí :q pre zatvorenie okna nápovedy
+
+ 5. Vytvor tartovací skript vimrc pre udranie uprednostòovaných nastavení.
+
+ 6. Poèas písania príkazu : stlaè CTRL-D pre zobrazenie dokonèení.
+ Stlaè <TAB> pre pouitie jedného z dokonèení.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
Toto vymedzuje výuku Vimu. Toto je urèené pre strucný preh¾ad o editore
Vim, úplne postaèujúce pre ¾ahké a obstojné pouívanie tohto editora.
Táto výuka je ïaleko od kompletnosti, pretoe Vim má omnoho viacej príkazov.
@@ -817,5 +1004,5 @@
Preklad do Slovenèiny: ¼ubo Èelko
e-mail: celbos@inmail.sk
- Last Change: 2004 Apr 29
+ Last Change: 2006 Apr 18
encoding: cp1250
diff --git a/src/edit.c b/src/edit.c
index c6287e0..ed416f3 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -709,15 +709,20 @@
{
/* BS: Delete one character from "compl_leader". */
if ((c == K_BS || c == Ctrl_H)
- && curwin->w_cursor.col > compl_col && ins_compl_bs())
+ && curwin->w_cursor.col > compl_col
+ && (c = ins_compl_bs()) == NUL)
continue;
/* When no match was selected or it was edited. */
if (!compl_used_match)
{
/* CTRL-L: Add one character from the current match to
- * "compl_leader". */
- if (c == Ctrl_L)
+ * "compl_leader". Except when at the original match and
+ * there is nothing to add, CTRL-L works like CTRL-P then. */
+ if (c == Ctrl_L
+ && (ctrl_x_mode != CTRL_X_WHOLE_LINE
+ || STRLEN(compl_shown_match->cp_str)
+ > curwin->w_cursor.col - compl_col))
{
ins_compl_addfrommatch();
continue;
@@ -2943,7 +2948,8 @@
/*
* Delete one character before the cursor and show the subset of the matches
* that match the word that is now before the cursor.
- * Returns TRUE if the work is done and another char to be got from the user.
+ * Returns the character to be used, NUL if the work is done and another char
+ * to be got from the user.
*/
static int
ins_compl_bs()
@@ -2951,6 +2957,14 @@
char_u *line;
char_u *p;
+ line = ml_get_curline();
+ p = line + curwin->w_cursor.col;
+ mb_ptr_back(line, p);
+
+ /* Stop completion when the whole word was deleted. */
+ if ((int)(p - line) - (int)compl_col <= 0)
+ return K_BS;
+
if (curwin->w_cursor.col <= compl_col + compl_length)
{
/* Deleted more than what was used to find matches, need to look for
@@ -2962,10 +2976,6 @@
compl_cont_mode = 0;
}
- line = ml_get_curline();
- p = line + curwin->w_cursor.col;
- mb_ptr_back(line, p);
-
vim_free(compl_leader);
compl_leader = vim_strnsave(line + compl_col, (int)(p - line) - compl_col);
if (compl_leader != NULL)
@@ -3006,9 +3016,9 @@
compl_used_match = FALSE;
compl_enter_selects = FALSE;
- return TRUE;
+ return NUL;
}
- return FALSE;
+ return K_BS;
}
/*
@@ -3255,26 +3265,34 @@
/* Get here when we have finished typing a sequence of ^N and
* ^P or other completion characters in CTRL-X mode. Free up
* memory that was used, and make sure we can redo the insert. */
- if (compl_curr_match != NULL)
+ if (compl_curr_match != NULL || compl_leader != NULL || c == Ctrl_E)
{
char_u *p;
/*
- * If any of the original typed text has been changed,
- * eg when ignorecase is set, we must add back-spaces to
- * the redo buffer. We add as few as necessary to delete
- * just the part of the original text that has changed.
+ * If any of the original typed text has been changed, eg when
+ * ignorecase is set, we must add back-spaces to the redo
+ * buffer. We add as few as necessary to delete just the part
+ * of the original text that has changed.
+ * When using the longest match, edited the match or used
+ * CTRL-E then don't use the current match.
*/
- ptr = compl_curr_match->cp_str;
+ if (compl_curr_match != NULL && compl_used_match && c != Ctrl_E)
+ ptr = compl_curr_match->cp_str;
+ else if (compl_leader != NULL)
+ ptr = compl_leader;
+ else
+ ptr = compl_orig_text;
p = compl_orig_text;
- while (*p && *p == *ptr)
- {
- ++p;
- ++ptr;
- }
- for (temp = 0; p[temp]; ++temp)
+ for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
+ ;
+#ifdef FEAT_MBYTE
+ if (temp > 0)
+ temp -= (*mb_head_off)(compl_orig_text, p + temp);
+#endif
+ for (p += temp; *p != NUL; mb_ptr_adv(p))
AppendCharToRedobuff(K_BS);
- AppendToRedobuffLit(ptr, -1);
+ AppendToRedobuffLit(ptr + temp, -1);
}
#ifdef FEAT_CINDENT
@@ -3981,6 +3999,7 @@
int todo = count;
compl_T *found_compl = NULL;
int found_end = FALSE;
+ int advance;
if (compl_leader != NULL
&& (compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0)
@@ -3999,6 +4018,10 @@
/* Delete old text to be replaced */
ins_compl_delete();
+ /* When finding the longest common text we stick at the original text,
+ * don't let CTRL-N or CTRL-P move to the first match. */
+ advance = count != 1 || !allow_get_expansion || !compl_get_longest;
+
/* Repeat this for when <PageUp> or <PageDown> is typed. But don't wrap
* around. */
while (--todo >= 0)
@@ -4023,15 +4046,19 @@
}
else
{
- if (compl_shows_dir == BACKWARD)
- --compl_pending;
- else
- ++compl_pending;
+ if (advance)
+ {
+ if (compl_shows_dir == BACKWARD)
+ --compl_pending;
+ else
+ ++compl_pending;
+ }
if (!allow_get_expansion)
return -1;
num_matches = ins_compl_get_exp(&compl_startpos);
- if (compl_pending != 0 && compl_direction == compl_shows_dir)
+ if (compl_pending != 0 && compl_direction == compl_shows_dir
+ && advance)
compl_shown_match = compl_curr_match;
found_end = FALSE;
}
diff --git a/src/fileio.c b/src/fileio.c
index 1c4cab8..34a53e6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1113,7 +1113,7 @@
size = 0x7ff0L - linerest; /* limit buffer to 32K */
#endif
- for ( ; size >= 10; size = (long_u)size >> 1)
+ for ( ; size >= 10; size = (long)((long_u)size >> 1))
{
if ((new_buffer = lalloc((long_u)(size + linerest + 1),
FALSE)) != NULL)
diff --git a/src/getchar.c b/src/getchar.c
index 3d85165..0ba97b4 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -128,6 +128,9 @@
static void map_free __ARGS((mapblock_T **));
static void validate_maphash __ARGS((void));
static void showmap __ARGS((mapblock_T *mp, int local));
+#ifdef FEAT_EVAL
+static char_u *eval_map_expr __ARGS((char_u *str));
+#endif
/*
* Free and clear a buffer.
@@ -2328,7 +2331,7 @@
if (tabuf.typebuf_valid)
{
vgetc_busy = 0;
- s = eval_to_string(mp->m_str, NULL, FALSE);
+ s = eval_map_expr(mp->m_str);
vgetc_busy = save_vgetc_busy;
}
else
@@ -4251,7 +4254,7 @@
}
#ifdef FEAT_EVAL
if (mp->m_expr)
- s = eval_to_string(mp->m_str, NULL, FALSE);
+ s = eval_map_expr(mp->m_str);
else
#endif
s = mp->m_str;
@@ -4281,6 +4284,36 @@
return FALSE;
}
+#ifdef FEAT_EVAL
+/*
+ * Evaluate the RHS of a mapping or abbreviations and take care of escaping
+ * special characters.
+ */
+ static char_u *
+eval_map_expr(str)
+ char_u *str;
+{
+ char_u *res;
+ char_u *s;
+ int len;
+
+ s = eval_to_string(str, NULL, FALSE);
+ if (s == NULL)
+ return NULL;
+
+ /* Need a buffer to hold up to three times as much. */
+ len = (int)STRLEN(s);
+ res = alloc((unsigned)(len * 3) + 1);
+ if (res != NULL)
+ {
+ STRCPY(res, s);
+ (void)fix_input_buffer(res, len, TRUE);
+ }
+ vim_free(s);
+ return res;
+}
+#endif
+
/*
* Write map commands for the current mappings to an .exrc file.
* Return FAIL on error, OK otherwise.
diff --git a/src/gui.h b/src/gui.h
index f221c29..36156f9 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -504,3 +504,46 @@
# define FRD_WHOLE_WORD 0x08 /* match whole word only */
# define FRD_MATCH_CASE 0x10 /* match case */
#endif
+
+#ifdef HAVE_GTK2
+/*
+ * Convenience macros to convert from 'encoding' to 'termencoding' and
+ * vice versa. If no conversion is necessary the passed-in pointer is
+ * returned as is, without allocating any memory. Thus additional _FREE()
+ * macros are provided. The _FREE() macros also set the pointer to NULL,
+ * in order to avoid bugs due to illegal memory access only happening if
+ * 'encoding' != utf-8...
+ *
+ * Defining these macros as pure expressions looks a bit tricky but
+ * avoids depending on the context of the macro expansion. One of the
+ * rare occasions where the comma operator comes in handy :)
+ *
+ * Note: Do NOT keep the result around when handling control back to
+ * the main Vim! The user could change 'encoding' at any time.
+ */
+# define CONVERT_TO_UTF8(String) \
+ ((output_conv.vc_type == CONV_NONE || (String) == NULL) \
+ ? (String) \
+ : string_convert(&output_conv, (String), NULL))
+
+# define CONVERT_TO_UTF8_FREE(String) \
+ ((String) = ((output_conv.vc_type == CONV_NONE) \
+ ? (char_u *)NULL \
+ : (vim_free(String), (char_u *)NULL)))
+
+# define CONVERT_FROM_UTF8(String) \
+ ((input_conv.vc_type == CONV_NONE || (String) == NULL) \
+ ? (String) \
+ : string_convert(&input_conv, (String), NULL))
+
+# define CONVERT_FROM_UTF8_FREE(String) \
+ ((String) = ((input_conv.vc_type == CONV_NONE) \
+ ? (char_u *)NULL \
+ : (vim_free(String), (char_u *)NULL)))
+
+#else
+# define CONVERT_TO_UTF8(String) (String)
+# define CONVERT_TO_UTF8_FREE(String) ((String) = (char_u *)NULL)
+# define CONVERT_FROM_UTF8(String) (String)
+# define CONVERT_FROM_UTF8_FREE(String) ((String) = (char_u *)NULL)
+#endif /* HAVE_GTK2 */
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index a1c4375..d9477d5 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -131,44 +131,6 @@
# define CancelData int
#endif
-#ifdef HAVE_GTK2
-/*
- * Convenience macros to convert from 'encoding' to 'termencoding' and
- * vice versa. If no conversion is necessary the passed-in pointer is
- * returned as is, without allocating any memory. Thus additional _FREE()
- * macros are provided. The _FREE() macros also set the pointer to NULL,
- * in order to avoid bugs due to illegal memory access only happening if
- * 'encoding' != utf-8...
- *
- * Defining these macros as pure expressions looks a bit tricky but
- * avoids depending on the context of the macro expansion. One of the
- * rare occasions where the comma operator comes in handy :)
- *
- * Note: Do NOT keep the result around when handling control back to
- * the main Vim! The user could change 'encoding' at any time.
- */
-# define CONVERT_TO_UTF8(String) \
- ((output_conv.vc_type == CONV_NONE || (String) == NULL) \
- ? (String) \
- : string_convert(&output_conv, (String), NULL))
-
-# define CONVERT_TO_UTF8_FREE(String) \
- ((String) = ((output_conv.vc_type == CONV_NONE) \
- ? (char_u *)NULL \
- : (vim_free(String), (char_u *)NULL)))
-
-# define CONVERT_FROM_UTF8(String) \
- ((input_conv.vc_type == CONV_NONE || (String) == NULL) \
- ? (String) \
- : string_convert(&input_conv, (String), NULL))
-
-# define CONVERT_FROM_UTF8_FREE(String) \
- ((String) = ((input_conv.vc_type == CONV_NONE) \
- ? (char_u *)NULL \
- : (vim_free(String), (char_u *)NULL)))
-
-#endif /* HAVE_GTK2 */
-
static void entry_activate_cb(GtkWidget *widget, gpointer data);
static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog);
static void find_replace_cb(GtkWidget *widget, gpointer data);
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 9eb85ce..23318bb 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3293,6 +3293,7 @@
tabpage_T *tp;
int nr = 0;
int curtabidx = 0;
+ char_u *labeltext;
if (gui.tabline == NULL)
return;
@@ -3320,8 +3321,10 @@
}
get_tabline_label(tp);
+ labeltext = CONVERT_TO_UTF8(NameBuff);
gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(gui.tabline), page,
- (const gchar *)NameBuff);
+ (const gchar *)labeltext);
+ CONVERT_TO_UTF8_FREE(labeltext);
}
/* Remove any old labels. */
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 81c7a6a..1eb3616 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -723,7 +723,7 @@
char *prog, *cmd, *ppath = NULL;
#ifndef UNIX
int in_save, out_save, err_save;
- long ph;
+ long_i ph;
# ifdef FEAT_GUI
HWND activewnd = NULL;
HWND consolewnd = NULL;
@@ -881,9 +881,9 @@
/* May be use &shell, &shellquote etc */
# ifdef __BORLANDC__
/* BCC 5.5 uses a different function name for spawnlp */
- ph = (long)spawnlp(P_NOWAIT, prog, cmd, NULL);
+ ph = (long_i)spawnlp(P_NOWAIT, prog, cmd, NULL);
# else
- ph = (long)_spawnlp(_P_NOWAIT, prog, cmd, NULL);
+ ph = (long_i)_spawnlp(_P_NOWAIT, prog, cmd, NULL);
# endif
vim_free(prog);
vim_free(cmd);
diff --git a/src/netbeans.c b/src/netbeans.c
index 8928342..731b98b 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -169,7 +169,7 @@
* Tell gdk we are interested in being called when there
* is input on the editor connection socket
*/
- inputHandler = gdk_input_add(sd, (GdkInputCondition)
+ inputHandler = gdk_input_add((gint)sd, (GdkInputCondition)
((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION),
messageFromNetbeans, NULL);
}
diff --git a/src/option.c b/src/option.c
index cb456bf..29ab1ef 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3496,7 +3496,7 @@
* 'scroll' defaults to half the window height. Note that this default is
* wrong when the window height changes.
*/
- set_number_default("scroll", (long_u)Rows >> 1);
+ set_number_default("scroll", (long)((long_u)Rows >> 1));
idx = findoption((char_u *)"scroll");
if (!(options[idx].flags & P_WAS_SET))
set_option_default(idx, OPT_LOCAL, p_cp);
@@ -3643,12 +3643,14 @@
if ( fnamecmp(p, "sh") == 0
|| fnamecmp(p, "ksh") == 0
|| fnamecmp(p, "zsh") == 0
+ || fnamecmp(p, "zsh-beta") == 0
|| fnamecmp(p, "bash") == 0
# ifdef WIN3264
|| fnamecmp(p, "cmd") == 0
|| fnamecmp(p, "sh.exe") == 0
|| fnamecmp(p, "ksh.exe") == 0
|| fnamecmp(p, "zsh.exe") == 0
+ || fnamecmp(p, "zsh-beta.exe") == 0
|| fnamecmp(p, "bash.exe") == 0
|| fnamecmp(p, "cmd.exe") == 0
# endif
diff --git a/src/po/ja.po b/src/po/ja.po
index db6bedd..67d877d 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -4,13 +4,13 @@
# Do ":help credits" in Vim to see a list of people who contributed.
#
# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-6.
-# Last Change: 28-Mar-2006.
+# Last Change: 18-Apr-2006.
#
msgid ""
msgstr ""
"Project-Id-Version: Vim 7.0\n"
-"POT-Creation-Date: 2006-03-28 20:12+0900\n"
-"PO-Revision-Date: 2006-03-28 21:10+0900\n"
+"POT-Creation-Date: 2006-04-18 11:00+0900\n"
+"PO-Revision-Date: 2006-04-18 11:30+0900\n"
"Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"MIME-Version: 1.0\n"
@@ -204,6 +204,9 @@
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤Ïº¹Ê¬¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: ͽ´ü¤»¤º¥Ð¥Ã¥Õ¥¡¤¬Êѹ¹Êѹ¹¤µ¤ì¤Þ¤·¤¿"
+
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ¹ç»ú¤ËEscape¤Ï»ÈÍѤǤ¤Þ¤»¤ó"
@@ -217,8 +220,8 @@
msgstr " ¥¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-msgstr " ^X ¥â¡¼¥É (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X ¥â¡¼¥É (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
msgid " Whole line completion (^L^N^P)"
msgstr " ¹Ô(Á´ÂÎ)Êä´° (^L^N^P)"
@@ -250,8 +253,8 @@
msgid " Omni completion (^O^N^P)"
msgstr " ¥ª¥à¥ËÊä´° (^O^N^P)"
-msgid " Spelling suggestion (^S^N^P)"
-msgstr " Ä֤꽤Àµ¸õÊä (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
+msgstr " Ä֤꽤Àµ¸õÊä (s^N^P)"
msgid " Keyword Local completion (^N^P)"
msgstr " ¶É½ê¥¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
@@ -486,6 +489,22 @@
msgid "E724: variable nested too deep for displaying"
msgstr "E724: ɽ¼¨¤¹¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ̤ÃΤδؿô¤Ç¤¹: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: ´Ø¿ô¤Î°ú¿ô¤¬¾¯¤Ê²á¤®¤Þ¤¹: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç<SID>¤¬»È¤ï¤ì¤Þ¤·¤¿: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: ¼½ñÍÑ´Ø¿ô¤¬¸Æ¤Ð¤ì¤Þ¤·¤¿¤¬¼½ñ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
msgid "E699: Too many arguments"
msgstr "E699: ¤¬Â¿²á¤®¤Þ¤¹"
@@ -522,8 +541,8 @@
msgid "called inputrestore() more often than inputsave()"
msgstr "inputrestore() ¤¬ inputsave() ¤è¤ê¤â¿¤¯¸Æ¤Ð¤ì¤Þ¤·¤¿"
-msgid "E745: Range not allowed"
-msgstr "E745: ÈÏ°Ï»ØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgid "E786: Range not allowed"
+msgstr "E786: ÈÏ°Ï»ØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
msgid "E701: Invalid type for len()"
msgstr "E701: len() ¤Ë¤Ï̵¸ú¤Ê·¿¤Ç¤¹"
@@ -1380,6 +1399,9 @@
msgid "E193: :endfunction not inside a function"
msgstr "E193: ´Ø¿ô¤Î³°¤Ë :endfunction ¤¬¤¢¤ê¤Þ¤·¤¿"
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: ¸½ºß¤Ï¾¤Î¥Ð¥Ã¥Õ¥¡¤òÊÔ½¸¤¹¤ë¤³¤È¤Ïµö¤µ¤ì¤Þ¤»¤ó"
+
msgid "tagname"
msgstr "¥¿¥°Ì¾"
@@ -2484,12 +2506,33 @@
msgid "no such window"
msgstr "¤½¤Î¤è¤¦¤Ê¥¦¥£¥ó¥É¥¦¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ ¤Ïʸ»úÎó¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
"E266: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤: "
"Ruby¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿."
+msgid "E267: unexpected return"
+msgstr "E265: ͽ´ü¤»¤Ì return ¤Ç¤¹"
+
+msgid "E268: unexpected next"
+msgstr "E268: ͽ´ü¤»¤Ì next ¤Ç¤¹"
+
+msgid "E269: unexpected break"
+msgstr "E269: ͽ´ü¤»¤Ì break ¤Ç¤¹"
+
+msgid "E270: unexpected redo"
+msgstr "E270: ͽ´ü¤»¤Ì redo ¤Ç¤¹"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue ¤Î³°¤Î retry ¤Ç¤¹"
+
+msgid "E272: unhandled exception"
+msgstr "E272: ¼è¤ê°·¤ï¤ì¤Ê¤«¤Ã¤¿Îã³°¤¬¤¢¤ê¤Þ¤¹"
+
#, c-format
msgid "E273: unknown longjmp status %d"
msgstr "E273: ̤ÃΤÎlongjmp¾õÂÖ: %d"
@@ -4184,9 +4227,6 @@
msgid "I/O ERROR"
msgstr "Æþ½ÐÎÏ¥¨¥é¡¼"
-msgid "...(truncated)"
-msgstr "...(¾Êά)"
-
msgid "Message"
msgstr "¥á¥Ã¥»¡¼¥¸"
@@ -4621,6 +4661,16 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: ¥Ñ¥¿¡¼¥ó¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# ºÇ¸å¤Î %s¸¡º÷¥Ñ¥¿¡¼¥ó:\n"
+"~"
+
msgid "E759: Format error in spell file"
msgstr "E759: ¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤Î½ñ¼°¥¨¥é¡¼¤Ç¤¹"
@@ -4646,7 +4696,7 @@
msgstr "ñ¸ì¥Ä¥ê¡¼¤ò°µ½Ì¤·¤Æ¤¤¤Þ¤¹..."
msgid "E756: Spell checking is not enabled"
-msgstr "E756: ¤¹¤Ú¤¯¥Á¥§¥Ã¥¯¤Ï̵¸ú²½¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "E756: ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤Ï̵¸ú²½¤µ¤ì¤Æ¤¤¤Þ¤¹"
#, c-format
msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
@@ -4698,6 +4748,22 @@
msgstr "%s Æâ¤Î %d ¹ÔÌܤ˥ե饰¤ÎÆó½Å»ÈÍѤ¬¤¢¤ê¤Þ¤¹: %s"
#, c-format
+msgid ""
+"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s ¤Î %d ¹ÔÌܤΠPFX ¹àÌܤθå¤Î COMPOUNDFORBIDFLAG "
+"¤ÎÄêµÁ¤Ï¸í¤Ã¤¿·ë²Ì¤òÀ¸¤¸¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹"
+
+#, c-format
+msgid ""
+"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s ¤Î %d ¹ÔÌܤΠPFX ¹àÌܤθå¤Î COMPOUNDPERMITFLAG "
+"¤ÎÄêµÁ¤Ï¸í¤Ã¤¿·ë²Ì¤òÀ¸¤¸¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹"
+
+#, c-format
msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
msgstr "%s ¤Î %d ¹ÔÌܤΠCOMPOUNDWORDMAX ¤ÎÃͤ˸í¤ê¤¬¤¢¤ê¤Þ¤¹: %s"
@@ -4739,10 +4805,6 @@
msgstr "%s ¤Î %d ¹ÔÌܤΠ¾ò·ï¤Ï²õ¤ì¤Æ¤¤¤Þ¤¹: %s"
#, c-format
-msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-msgstr "PFXPOSTPONE¤¬»ØÄꤵ¤ì¤¿¤Î¤Ç %s ¤Î %d ¹ÔÌܤΠaffix ¥Õ¥é¥°¤ò̵»ë¤·¤Þ¤·¤¿: %s"
-
-#, c-format
msgid "Expected REP(SAL) count in %s line %d"
msgstr "%s ¤Î %d ¹ÔÌÜ¤Ë¤Ï REP(SAL) ¤Î²ó¿ô¤¬É¬ÍפǤ¹"
@@ -5299,7 +5361,7 @@
msgid "more line"
msgstr "¹Ô Äɲä·¤Þ¤·¤¿"
-msgid "¹Ô¤¢¤ê¤Þ¤¹"
+msgid "more lines"
msgstr "¹Ô Äɲä·¤Þ¤·¤¿"
msgid "line less"
@@ -5330,6 +5392,10 @@
msgid "number changes time"
msgstr "ÈÖ¹æ Êѹ¹ »þ¹ï"
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld É÷вᤷ¤Æ¤¤¤Þ¤¹"
+
msgid "E439: undo list corrupt"
msgstr "E439: ¥¢¥ó¥É¥¥¥ê¥¹¥È¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
@@ -5636,6 +5702,9 @@
msgid "type :help windows95<Enter> for info on this"
msgstr " ¾ÜºÙ¤Ê¾ðÊó¤Ï :help windows95<Enter> "
+msgid "Already only one window"
+msgstr "´û¤Ë¥¦¥£¥ó¥É¥¦¤Ï1¤Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
+
msgid "E441: There is no preview window"
msgstr "E441: ¥×¥ì¥Ó¥å¡¼¥¦¥£¥ó¥É¥¦¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -5648,9 +5717,6 @@
msgid "E444: Cannot close last window"
msgstr "E444: ºÇ¸å¤Î¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó"
-msgid "Already only one window"
-msgstr "´û¤Ë¥¦¥£¥ó¥É¥¦¤Ï1¤Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
-
msgid "E445: Other window contains changes"
msgstr "E445: ¾¤Î¥¦¥£¥ó¥É¥¦¤Ë¤ÏÊѹ¹¤¬¤¢¤ê¤Þ¤¹"
@@ -5680,7 +5746,8 @@
msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òVim¤ÇÊÔ½¸¤¹¤ë"
msgid "Error creating process: Check if gvim is in your path!"
-msgstr "µ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: gvim ¤Ø¤Î¥Ñ¥¹¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤!"
+msgstr ""
+"µ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: gvim ¤Ø¤Î¥Ñ¥¹¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤!"
msgid "gvimext.dll error"
msgstr "gvimext.dll ¥¨¥é¡¼"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index f663ea2..29592bb 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -4,13 +4,13 @@
# Do ":help credits" in Vim to see a list of people who contributed.
#
# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-6.
-# Last Change: 28-Mar-2006.
+# Last Change: 18-Apr-2006.
#
msgid ""
msgstr ""
"Project-Id-Version: Vim 7.0\n"
-"POT-Creation-Date: 2006-03-28 20:12+0900\n"
-"PO-Revision-Date: 2006-03-28 21:10+0900\n"
+"POT-Creation-Date: 2006-04-18 11:00+0900\n"
+"PO-Revision-Date: 2006-04-18 11:30+0900\n"
"Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"MIME-Version: 1.0\n"
@@ -204,6 +204,9 @@
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: obt@ \"%s\" Í·ª[hÅÍ èܹñ"
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: \\ú¹¸obt@ªÏXÏX³êܵ½"
+
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ÉEscapeÍgpūܹñ"
@@ -217,8 +220,8 @@
msgstr " L[[hâ® (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-msgstr " ^X [h (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X [h (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
msgid " Whole line completion (^L^N^P)"
msgstr " s(SÌ)â® (^L^N^P)"
@@ -250,8 +253,8 @@
msgid " Omni completion (^O^N^P)"
msgstr " Ijâ® (^O^N^P)"
-msgid " Spelling suggestion (^S^N^P)"
-msgstr " ÔèC³óâ (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
+msgstr " ÔèC³óâ (s^N^P)"
msgid " Keyword Local completion (^N^P)"
msgstr " ÇL[[hâ® (^N^P)"
@@ -486,6 +489,22 @@
msgid "E724: variable nested too deep for displaying"
msgstr "E724: \\¦·éÉÍÏÌüêqª[ܷ߬"
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ¢mÌÖÅ·: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: ÖÌøªÈܷ߬: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: XNvgÈOÅ<SID>ªgíêܵ½: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: «pÖªÄÎêܵ½ª«ª èܹñ: %s"
+
msgid "E699: Too many arguments"
msgstr "E699: ª½ß¬Ü·"
@@ -522,8 +541,8 @@
msgid "called inputrestore() more often than inputsave()"
msgstr "inputrestore() ª inputsave() æèà½ÄÎêܵ½"
-msgid "E745: Range not allowed"
-msgstr "E745: ÍÍwèͳêĢܹñ"
+msgid "E786: Range not allowed"
+msgstr "E786: ÍÍwèͳêĢܹñ"
msgid "E701: Invalid type for len()"
msgstr "E701: len() ÉͳøÈ^Å·"
@@ -1380,6 +1399,9 @@
msgid "E193: :endfunction not inside a function"
msgstr "E193: ÖÌOÉ :endfunction ª èܵ½"
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: »ÝͼÌobt@ðÒW·é±Æͳêܹñ"
+
msgid "tagname"
msgstr "^O¼"
@@ -2484,12 +2506,33 @@
msgid "no such window"
msgstr "»Ìæ¤ÈEBhEÍ èܹñ"
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ ͶñÌCX^XÅȯêÎÈèܹñ"
+
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
"E266: ±ÌR}hͳøÅ·,²ßñȳ¢: "
"RubyCuð[hūܹñŵ½."
+msgid "E267: unexpected return"
+msgstr "E265: \\ú¹Ê return Å·"
+
+msgid "E268: unexpected next"
+msgstr "E268: \\ú¹Ê next Å·"
+
+msgid "E269: unexpected break"
+msgstr "E269: \\ú¹Ê break Å·"
+
+msgid "E270: unexpected redo"
+msgstr "E270: \\ú¹Ê redo Å·"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue ÌOÌ retry Å·"
+
+msgid "E272: unhandled exception"
+msgstr "E272: æèµíêÈ©Á½áOª èÜ·"
+
#, c-format
msgid "E273: unknown longjmp status %d"
msgstr "E273: ¢mÌlongjmpóÔ: %d"
@@ -4184,9 +4227,6 @@
msgid "I/O ERROR"
msgstr "üoÍG["
-msgid "...(truncated)"
-msgstr "...(Ȫ)"
-
msgid "Message"
msgstr "bZ[W"
@@ -4621,6 +4661,16 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: p^[ðݯçêܹñ"
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# ÅãÌ %sõp^[:\n"
+"~"
+
msgid "E759: Format error in spell file"
msgstr "E759: Xyt@C̮G[ŷ"
@@ -4646,7 +4696,7 @@
msgstr "Pêc[ð³kµÄ¢Ü·..."
msgid "E756: Spell checking is not enabled"
-msgstr "E756: ·Ø`FbNͳø»³êĢܷ"
+msgstr "E756: Xy`FbNͳø»³êĢܷ"
#, c-format
msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
@@ -4698,6 +4748,22 @@
msgstr "%s àÌ %d sÚÉtOÌñdgpª èÜ·: %s"
#, c-format
+msgid ""
+"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s Ì %d sÚÌ PFX ÚÌãÌ COMPOUNDFORBIDFLAG "
+"Ìè`ÍëÁ½Êð¶¶é±Æª èÜ·"
+
+#, c-format
+msgid ""
+"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s Ì %d sÚÌ PFX ÚÌãÌ COMPOUNDPERMITFLAG "
+"Ìè`ÍëÁ½Êð¶¶é±Æª èÜ·"
+
+#, c-format
msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
msgstr "%s Ì %d sÚÌ COMPOUNDWORDMAX ÌlÉëèª èÜ·: %s"
@@ -4739,10 +4805,6 @@
msgstr "%s Ì %d sÚÌ ðÍóêĢܷ: %s"
#, c-format
-msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-msgstr "PFXPOSTPONEªwè³ê½ÌÅ %s Ì %d sÚÌ affix tOð³µÜµ½: %s"
-
-#, c-format
msgid "Expected REP(SAL) count in %s line %d"
msgstr "%s Ì %d sÚÉÍ REP(SAL) ÌñªKvÅ·"
@@ -5299,7 +5361,7 @@
msgid "more line"
msgstr "s ÇÁµÜµ½"
-msgid "s èÜ·"
+msgid "more lines"
msgstr "s ÇÁµÜµ½"
msgid "line less"
@@ -5330,6 +5392,10 @@
msgid "number changes time"
msgstr "Ô ÏX "
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld boߵĢܷ"
+
msgid "E439: undo list corrupt"
msgstr "E439: AhDXgªóêĢܷ"
@@ -5636,6 +5702,9 @@
msgid "type :help windows95<Enter> for info on this"
msgstr " Ú×ÈîñÍ :help windows95<Enter> "
+msgid "Already only one window"
+msgstr "ùÉEBhEÍ1µ© èܹñ"
+
msgid "E441: There is no preview window"
msgstr "E441: vr
[EBhEª èܹñ"
@@ -5648,9 +5717,6 @@
msgid "E444: Cannot close last window"
msgstr "E444: ÅãÌEBhEð¶é±ÆÍūܹñ"
-msgid "Already only one window"
-msgstr "ùÉEBhEÍ1µ© èܹñ"
-
msgid "E445: Other window contains changes"
msgstr "E445: ¼ÌEBhEÉÍÏXª èÜ·"
@@ -5680,7 +5746,8 @@
msgstr "Ið³ê½t@CðVimÅÒW·é"
msgid "Error creating process: Check if gvim is in your path!"
-msgstr "N®É¸sµÜµ½: gvim ÖÌpXª³µÝè³êÄ¢é©mFµÄ¾³¢!"
+msgstr ""
+"N®É¸sµÜµ½: gvim ÖÌpXª³µÝè³êÄ¢é©mFµÄ¾³¢!"
msgid "gvimext.dll error"
msgstr "gvimext.dll G["
diff --git a/src/po/sv.po b/src/po/sv.po
index 9697f91..e4a92df 100644
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -1,12 +1,12 @@
# Swedish translation for Vim.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
-# Johan Svedberg <johan@svedberg.com>, 2003-2005.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
+# Johan Svedberg <johan@svedberg.com>, 2003-2006.
msgid ""
msgstr ""
"Project-Id-Version: Vim 7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-01 22:51+0100\n"
-"PO-Revision-Date: 2005-12-04 20:33+0100\n"
+"POT-Creation-Date: 2006-04-10 17:24+0200\n"
+"PO-Revision-Date: 2006-04-11 01:08+0200\n"
"Last-Translator: Johan Svedberg <johan@svedberg.com>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@@ -131,8 +131,8 @@
msgid "help"
msgstr "hjälp"
-msgid "[help]"
-msgstr "[hjälp]"
+msgid "[Help]"
+msgstr "[Hjälp]"
msgid "[Preview]"
msgstr "[Förhandsvisning]"
@@ -154,8 +154,11 @@
"\n"
"# Buffertlista:\n"
-msgid "[Error List]"
-msgstr "[Fellista]"
+msgid "[Location List]"
+msgstr "[Positionslista]"
+
+msgid "[Quickfix List]"
+msgstr "[Quickfix-lista]"
msgid ""
"\n"
@@ -488,6 +491,9 @@
msgid "E699: Too many arguments"
msgstr "E699: För många argument"
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() kan bara användas i infogningsläge"
+
#.
#. * Yes this is ugly, I don't particularly like it either. But doing it
#. * this way has the compelling advantage that translations need not to
@@ -670,6 +676,136 @@
"\n"
"\tSenast satt från "
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "Går in i felsökningsläge. Skriv \"cont\" för att fortsätta."
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "rad %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "kommando: %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Brytpunkt i \"%s%s\" rad %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Brytpunkt hittades inte: %s"
+
+msgid "No breakpoints defined"
+msgstr "Inga brytpunkter definierade"
+
+#, c-format
+msgid "%3d %s %s line %ld"
+msgstr "%3d %s %s rad %ld"
+
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: Använd :profile start <fnamn> först"
+
+msgid "Save As"
+msgstr "Spara som"
+
+#, c-format
+msgid "Save changes to \"%s\"?"
+msgstr "Spara ändringar till \"%s\"?"
+
+msgid "Untitled"
+msgstr "Namnlös"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162: Ingen skrivning sedan senaste ändring för buffert \"%s\""
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr "Varning: Gick in i andra buffertar oväntat (kontrollera autokommandon)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: Det finns bara en fil att redigera"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: Kan inte gå före första filen"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Kan inte gå bortom sista filen"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: kompilator stöds inte: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "Söker efter \"%s\" i \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "Söker efter \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr "hittades inte i 'runtimepath': \"%s\""
+
+msgid "Source Vim script"
+msgstr "Läs Vim-skript"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Kan inte läsa en katalog: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "kunde inte läsa \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "rad %ld: kunde inte läsa \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "läser \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "rad %ld: läser \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "läste klart %s"
+
+msgid "modeline"
+msgstr "lägesrad"
+
+msgid "--cmd argument"
+msgstr "--cmd argument"
+
+msgid "-c argument"
+msgstr "-c argument"
+
+msgid "environment variable"
+msgstr "miljövariabel"
+
+msgid "error handler"
+msgstr "felhanterare"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: Varning: Fel radavskiljare, ^M kan saknas"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding används utanför en körd fil"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish används utanför en körd fil"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Aktuellt %sspråk: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Kan inte sätta språk till \"%s\""
+
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, Hex %02x, Oktalt %03o"
@@ -754,9 +890,6 @@
msgid "Illegal starting char"
msgstr "Otillåtet starttecken"
-msgid "Save As"
-msgstr "Spara som"
-
msgid "Write partial file?"
msgstr "Skriv ofullständig fil?"
@@ -927,118 +1060,6 @@
msgid "[Deleted]"
msgstr "[Borttagen]"
-msgid "Entering Debug mode. Type \"cont\" to continue."
-msgstr "Går in i felsökningsläge. Skriv \"cont\" för att fortsätta."
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "rad %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "kommando: %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Brytpunkt i \"%s%s\" rad %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Brytpunkt hittades inte: %s"
-
-msgid "No breakpoints defined"
-msgstr "Inga brytpunkter definierade"
-
-#, c-format
-msgid "%3d %s %s line %ld"
-msgstr "%3d %s %s rad %ld"
-
-msgid "E750: First use :profile start <fname>"
-msgstr "E750: Använd :profile start <fnamn> först"
-
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "Spara ändringar till \"%s\"?"
-
-msgid "Untitled"
-msgstr "Namnlös"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Ingen skrivning sedan senaste ändring för buffert \"%s\""
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Varning: Gick in i andra buffertar oväntat (kontrollera autokommandon)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: Det finns bara en fil att redigera"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Kan inte gå före första filen"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Kan inte gå bortom sista filen"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: kompilator stöds inte: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Söker efter \"%s\" i \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Söker efter \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "hittades inte i 'runtimepath': \"%s\""
-
-msgid "Source Vim script"
-msgstr "Läs Vim-skript"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Kan inte läsa en katalog: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "kunde inte läsa \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "rad %ld: kunde inte läsa \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "läser \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "rad %ld: läser \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "läste klart %s"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Varning: Fel radavskiljare, ^M kan saknas"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding används utanför en körd fil"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish används utanför en körd fil"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Aktuellt %sspråk: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Kan inte sätta språk till \"%s\""
-
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "Går in i Ex-läge. Skriv \"visual\" för att gå till Normal-läge."
@@ -1152,9 +1173,19 @@
msgid "Greetings, Vim user!"
msgstr "Välkommen, Vim-användare!"
+msgid "E784: Cannot close last tab page"
+msgstr "E784: Kan inte stänga senaste flik"
+
+msgid "Already only one tab page"
+msgstr "Redan bara en flik"
+
msgid "Edit File in new window"
msgstr "Redigera fil i nytt fönster"
+#, c-format
+msgid "Tab page %d"
+msgstr "Flik %d"
+
msgid "No swap file"
msgstr "Ingen växlingsfil"
@@ -1399,6 +1430,9 @@
msgid "[New File]"
msgstr "[Ny fil]"
+msgid "[New DIRECTORY]"
+msgstr "[Ny KATALOG]"
+
msgid "[File too big]"
msgstr "[Fil för stor]"
@@ -1451,8 +1485,9 @@
msgid "[crypted]"
msgstr "[krypterad]"
-msgid "[CONVERSION ERROR]"
-msgstr "[KONVERTERINGSFEL]"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[KONVERTERINGSFEL på rad %ld]"
#, c-format
msgid "[ILLEGAL BYTE in line %ld]"
@@ -1798,29 +1833,6 @@
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: Otillåtet läge"
-msgid "E229: Cannot start the GUI"
-msgstr "E229: Kan inte starta GUI"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: Kan inte läsa från \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: Kan inte starta GUI, ingen giltig font hittad"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: 'guifontwide' ogiltig"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: Värdet av 'imactivatekey' är ogiltigt"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Kan inte allokera färg %s"
-
-msgid "No match at cursor, finding next"
-msgstr "Ingen matchning vid markör, söker nästa"
-
msgid "<cannot open> "
msgstr "<kan inte öppna> "
@@ -1843,15 +1855,38 @@
msgid "Cancel"
msgstr "Avbryt"
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Rullningslist: Kunde inte hämta geometrin på miniatyrbild."
-
msgid "Vim dialog"
msgstr "Vim-dialog"
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Rullningslist: Kunde inte hämta geometrin på miniatyrbild."
+
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: Kan inte skapa BalloonEval med både meddelande och återkallning"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Kan inte starta GUI"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Kan inte läsa från \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: Kan inte starta GUI, ingen giltig font hittad"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' ogiltig"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Värdet av 'imactivatekey' är ogiltigt"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Kan inte allokera färg %s"
+
+msgid "No match at cursor, finding next"
+msgstr "Ingen matchning vid markör, söker nästa"
+
msgid "Vim dialog..."
msgstr "Vim-dialog..."
@@ -1909,6 +1944,15 @@
msgid "Vim: Received \"die\" request from session manager\n"
msgstr "Vim: Tog emot \"die\"-begäran från sessionshanteraren\n"
+msgid "Close"
+msgstr "Stäng"
+
+msgid "New tab"
+msgstr "Ny flik"
+
+msgid "Open Tab..."
+msgstr "Öppna flik..."
+
msgid "Vim: Main window unexpectedly destroyed\n"
msgstr "Vim: Huvudfönster oväntat förstört\n"
@@ -1980,6 +2024,12 @@
msgid "E672: Unable to open window inside MDI application"
msgstr "E672: Kunde inte öppna fönster inuti MDI-applikation"
+msgid "Close tab"
+msgstr "Stäng flik"
+
+msgid "Open tab..."
+msgstr "Öppna flik..."
+
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "Sök sträng (använd '\\\\' för att hitta '\\')"
@@ -2819,6 +2869,9 @@
msgid "--noplugin\t\tDon't load plugin scripts"
msgstr "--noplugin\t\tLäs inte in insticksskript"
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-p[N]\t\tÖppna N flikar (standard: en för varje fil)"
+
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
msgstr "-o[N]\t\tÖppna N fönster (standard: ett för varje fil)"
@@ -2877,6 +2930,9 @@
"--remote-wait-silent <filer>\tSamma, klaga inte om det inte finns någon "
"server"
+msgid "--remote-tab <files> As --remote but open tab page for each file"
+msgstr "--remote-tab <filer> Som --remote men öppna flik för varje fil"
+
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr ""
"--remote-send <nycklar>\tSkicka <nycklar> till en Vim-server och avsluta"
@@ -3001,25 +3057,6 @@
msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
msgstr "--socketid <xid>\tÖppna Vim innanför en annan GTK-widget"
-msgid ""
-"\n"
-"Arguments recognised by kvim (KDE version):\n"
-msgstr ""
-"\n"
-"Argument igenkända av kvim (KDE-version):\n"
-
-msgid "-black\t\tUse reverse video"
-msgstr "-black\t\tAnvänd omvänd video"
-
-msgid "-tip\t\t\tDisplay the tip dialog on startup"
-msgstr "-tip\t\tVisa tipsdialogen vid uppstart"
-
-msgid "-notip\t\tDisable the tip dialog"
-msgstr "-notip\t\tInaktivera tipsdialogen"
-
-msgid "--display <display>\tRun vim on <display>"
-msgstr "--display <display>\tKör vim på <display>"
-
msgid "-P <parent title>\tOpen Vim inside parent application"
msgstr "-P <förälder fönster>\tÖppna Vim inuti förälderapplikation"
@@ -3444,6 +3481,10 @@
msgid "E317: pointer block id wrong 2"
msgstr "E317: pekarblock-id fel 2"
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: Symbolisk länk-loop för \"%s\""
+
msgid "E325: ATTENTION"
msgstr "E325: LYSTRING"
@@ -3532,16 +3573,16 @@
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
+"&Delete it\n"
"&Quit\n"
-"&Abort\n"
-"&Delete it"
+"&Abort"
msgstr ""
"&Öppna skrivskyddad\n"
"&Redigera ändå\n"
"&Återskapa\n"
+"&Ta bort den\n"
"&Avsluta\n"
-"A&vbryt\n"
-"&Ta bort den"
+"A&vbryt"
msgid "E326: Too many swap files found"
msgstr "E326: För många växlingsfiler hittade"
@@ -3808,6 +3849,12 @@
msgid "E505: "
msgstr "E505: "
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' är tom"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: Eval-funktionen inte tillgänglig"
+
msgid "Warning: terminal cannot highlight"
msgstr "Varning: terminal kan inte framhäva"
@@ -3930,8 +3977,9 @@
msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
-msgstr "Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld tecken; %ld "
-"av %ld bitar"
+msgstr ""
+"Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld tecken; %ld av %ld "
+"bitar"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
@@ -3941,8 +3989,9 @@
msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
-msgstr "Kol %s av %s; rad %ld av %ld; ord %ld av %ld; tecken %ld av %ld; bit "
-"%ld av %ld"
+msgstr ""
+"Kol %s av %s; rad %ld av %ld; ord %ld av %ld; tecken %ld av %ld; bit %ld av %"
+"ld"
#, c-format
msgid "(+%ld for BOM)"
@@ -4153,6 +4202,9 @@
msgid "...(truncated)"
msgstr "...(trunkerade)"
+msgid "Message"
+msgstr "Meddelande"
+
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' är inte 80, kan inte köra externa kommandon"
@@ -4201,14 +4253,6 @@
msgid "Opening the X display took %ld msec"
msgstr "Öppning av X-display tog %ld ms"
-#. KDE sometimes produces X error that we want to ignore
-msgid ""
-"\n"
-"Vim: Got X error but we continue...\n"
-msgstr ""
-"\n"
-"Vim: Fick X-error men vi fortsätter...\n"
-
msgid ""
"\n"
"Vim: Got X error\n"
@@ -4287,9 +4331,6 @@
msgid "XSMP SmcOpenConnection failed: %s"
msgstr "XSMP SmcOpenConnection misslyckades: %s"
-msgid "At line"
-msgstr "På rad"
-
msgid "Could not load vim32.dll!"
msgstr "Kunde inte läsa in vim32.dll!"
@@ -4331,6 +4372,9 @@
msgid "Vim Warning"
msgstr "Vim-varning"
+msgid "At line"
+msgstr "På rad"
+
#, c-format
msgid "E372: Too many %%%c in format string"
msgstr "E372: För många %%%c i formatsträng"
@@ -4393,6 +4437,9 @@
msgid "E681: Buffer is not loaded"
msgstr "E681: Buffert är inte laddad"
+msgid "E777: String or List expected"
+msgstr "E777: Sträng eller Lista förväntades"
+
#, c-format
msgid "E369: invalid item in %s%%[]"
msgstr "E369: ogiltigt föremål i %s%%[]"
@@ -4576,6 +4623,10 @@
msgid "Scanning included file: %s"
msgstr "Söker igenom inkluderad fil: %s"
+#, c-format
+msgid "Searching included file %s"
+msgstr "Söker igenom inkluderad fil %s"
+
msgid "E387: Match is on current line"
msgstr "E387: Matchning är på aktuell rad"
@@ -4666,12 +4717,8 @@
msgstr "FLAG efter användning av flags i %s rad %d: %s"
#, c-format
-msgid "Character used for SLASH must be ASCII; in %s line %d: %s"
-msgstr "Tecken använt för SLASH måste vara ASCII; i %s rad %d: %s"
-
-#, c-format
-msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
-msgstr "Fel COMPOUNDMAX-värde i %s rad %d: %s"
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "Fel COMPOUNDWORDMAX-värde i %s rad %d: %s"
#, c-format
msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
@@ -4682,6 +4729,10 @@
msgstr "Fel COMPOUNDSYLMAX-värde i %s rad %d: %s"
#, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "Fel CHECKCOMPOUNDPATTERN-värde i %s rad %d: %s"
+
+#, c-format
msgid "Different combining flag in continued affix block in %s line %d: %s"
msgstr "Annan kombinerande flagga i efterföljande affix-block i %s rad %d: %s"
@@ -4691,9 +4742,11 @@
#, c-format
msgid ""
-"Affix also used for BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
msgstr ""
-"Affix också använd för BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND i %s rad %d: %s"
+"Affix också använd för BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST i "
+"%s rad %d: %s"
#, c-format
msgid "Expected Y or N in %s line %d: %s"
@@ -4704,8 +4757,12 @@
msgstr "Trasigt villkor i %s rad %d: %s"
#, c-format
-msgid "Expected REP count in %s line %d"
-msgstr "Förväntade REP-antal i %s rad %d"
+msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+msgstr "Affix-flaggor ignorerade när PFXPOSTPONE används i %s rad %d: %s"
+
+#, c-format
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "Förväntade REP(SAL)-antal i %s rad %d"
#, c-format
msgid "Expected MAP count in %s line %d"
@@ -4820,8 +4877,34 @@
msgstr "Ignorerade %d ord med icke-ASCII tecken"
#, c-format
-msgid "Compressed %d of %d nodes; %d%% remaining"
-msgstr "Komprimerade %d av %d noder; %d%% återstår"
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "Komprimerade %d av %d noder; %d (%d%%) återstår"
+
+msgid "Reading back spell file..."
+msgstr "Läser tillbaka stavningsfil..."
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+msgid "Performing soundfolding..."
+msgstr "Utför ljudvikning..."
+
+#, c-format
+msgid "Number of words after soundfolding: %ld"
+msgstr "Antal ord efter ljudvikning: %ld"
+
+#, c-format
+msgid "Total number of words: %d"
+msgstr "Totalt antal ord: %d"
+
+#, c-format
+msgid "Writing suggestion file %s ..."
+msgstr "Skriver förslagsfil %s ..."
+
+#, c-format
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "Beräknat körtidsminne använt: %d byte"
msgid "E751: Output file name must not have region name"
msgstr "E751: Utmatningsfilnamn får inte ha regionnamn"
@@ -4844,13 +4927,17 @@
msgstr "Klar!"
#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "Beräknat körtidsminne använt: %d byte"
-
-#, c-format
msgid "E765: 'spellfile' does not have %ld entries"
msgstr "E765: 'spellfile' har inte %ld poster"
+#, c-format
+msgid "Word removed from %s"
+msgstr "Ord borttaget från %s"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "Ord lagd till %s"
+
msgid "E763: Word characters differ between spell files"
msgstr "E763: Ordtecken skiljer sig mellan stavningsfiler"
@@ -4877,10 +4964,30 @@
msgid "E753: Not found: %s"
msgstr "E753: Hittades inte: %s"
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: Det här ser inte ut som en .sug-fil: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Gammal .sug-fil, behöver bli uppdaterad: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: .sug-fil är för nyare version av Vim: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug-fil matchar inte .spl-fil: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: fel vid läsning av .sug-fil: %s"
+
#. This should have been checked when generating the .spl
#. * file.
-msgid "E999: duplicate char in MAP entry"
-msgstr "E999: dubblerat tecken i MAP-post"
+msgid "E783: duplicate char in MAP entry"
+msgstr "E783: dubblerat tecken i MAP-post"
#, c-format
msgid "E390: Illegal argument: %s"
@@ -5195,15 +5302,52 @@
msgid "No undo possible; continue anyway"
msgstr "Ingen ångring möjlig; fortsätter ändå"
+msgid "Already at oldest change"
+msgstr "Redan vid äldsta ändring"
+
+msgid "Already at newest change"
+msgstr "Redan vid nyaste ändring"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "Ångra-nummer %ld hittades inte"
+
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: radnummer fel"
-msgid "1 change"
-msgstr "1 ändring"
+msgid "more line"
+msgstr "en rad till"
+
+msgid "more lines"
+msgstr "fler rader"
+
+msgid "line less"
+msgstr "en rad mindre"
+
+msgid "fewer lines"
+msgstr "färre rader"
+
+msgid "change"
+msgstr "ändring"
+
+msgid "changes"
+msgstr "ändringar"
#, c-format
-msgid "%ld changes"
-msgstr "%ld ändringar"
+msgid "%ld %s; %s #%ld %s"
+msgstr "%ld %s; %s #%ld %s"
+
+msgid "before"
+msgstr "före"
+
+msgid "after"
+msgstr "efter"
+
+msgid "Nothing to undo"
+msgstr "Inget att ångra"
+
+msgid "number changes time"
+msgstr "antal ändringar tid"
msgid "E439: undo list corrupt"
msgstr "E439: ångra-lista trasig"
@@ -5382,9 +5526,6 @@
msgid "with (classic) GUI."
msgstr "med (klassiskt) GUI."
-msgid "with KDE GUI."
-msgstr "med KDE-GUI."
-
msgid " Features included (+) or not (-):\n"
msgstr " Funktioner inkluderade (+) eller inte (-):\n"
@@ -5803,6 +5944,9 @@
msgid "E42: No Errors"
msgstr "E42: Inga fel"
+msgid "E776: No location list"
+msgstr "E776: Ingen positionslista"
+
msgid "E43: Damaged match string"
msgstr "E43: Skadad träffsträng"
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index df8722a..83eaaf1 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -7,53 +7,53 @@
#
# Original translations.
#
-#, no-wrap
msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n"
-"POT-Creation-Date: 2001-09-24 10:10+0800\n"
-"PO-Revision-Date: 2001-09-24 11:13+0800\n"
-"Last-Translator: Wang Jun <junw@turbolinux.com.cn>\n"
-"Language-Team: Wang Jun <junw@turbolinux.com.cn>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-28 21:47+0800\n"
+"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
+"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8-bit\n"
msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: 不能分配任何缓冲区，退出程序..."
+msgstr "E82: 无法分配任何缓冲区，退出程序..."
msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: 不能分配缓冲区，使用另一个缓冲区...."
+msgstr "E83: 无法分配缓冲区，使用另一个缓冲区..."
-msgid "No buffers were unloaded"
-msgstr "没有释放任何缓冲区"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: 没有释放任何缓冲区"
-msgid "No buffers were deleted"
-msgstr "没有删除任何缓冲区"
+msgid "E516: No buffers were deleted"
+msgstr "E516: 没有删除任何缓冲区"
-msgid "No buffers were wiped out"
-msgstr "没有删除任何缓冲区"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: 没有清除任何缓冲区"
msgid "1 buffer unloaded"
-msgstr "已释放一个缓冲区"
+msgstr "释放了 1 个缓冲区"
#, c-format
msgid "%d buffers unloaded"
-msgstr "已释放 %d 个缓冲区"
+msgstr "释放了 %d 个缓冲区"
msgid "1 buffer deleted"
-msgstr "已删除一个缓冲区"
+msgstr "删除了 1 个缓冲区"
#, c-format
msgid "%d buffers deleted"
-msgstr "已删除 %d 个缓冲区"
+msgstr "删除了 %d 个缓冲区"
msgid "1 buffer wiped out"
-msgstr "已删除一个缓冲区"
+msgstr "清除了 1 个缓冲区"
#, c-format
msgid "%d buffers wiped out"
-msgstr "已删除 %d 个缓冲区"
+msgstr "清除了 %d 个缓冲区"
msgid "E84: No modified buffer found"
msgstr "E84: 没有修改过的缓冲区"
@@ -63,43 +63,43 @@
msgstr "E85: 没有可列出的缓冲区"
#, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: 不能切换到第 %ld 个缓冲区"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: 缓冲区 %ld 不存在"
msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: 不能切换到更后面的缓冲区"
+msgstr "E87: 无法切换，已是最后一个缓冲区"
msgid "E88: Cannot go before first buffer"
-msgstr "E88: 不能切换到更前面的缓冲区"
+msgstr "E88: 无法切换，已是第一个缓冲区"
#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: 已更改过缓冲区 %ld 但尚未保存 (可用 ! 强制执行)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: 缓冲区 %ld 已修改但尚未保存 (请加 ! 强制执行)"
msgid "E90: Cannot unload last buffer"
-msgstr "E90: 不能释放最后一个缓冲区"
+msgstr "E90: 无法释放最后一个缓冲区"
msgid "W14: Warning: List of file names overflow"
msgstr "W14: 警告: 文件名过多"
#, c-format
msgid "E92: Buffer %ld not found"
-msgstr "E92: 找不到第 %ld 个缓冲区"
+msgstr "E92: 找不到缓冲区 %ld"
#, c-format
msgid "E93: More than one match for %s"
-msgstr "E93: 找到一个以上的 %s"
+msgstr "E93: 找到不止一个 %s"
#, c-format
msgid "E94: No matching buffer for %s"
-msgstr "E94: 找不到 %s"
+msgstr "E94: 没有匹配的缓冲区 %s"
#, c-format
msgid "line %ld"
-msgstr "行 %ld"
+msgstr "第 %ld 行"
msgid "E95: Buffer with this name already exists"
-msgstr "E95: 已有缓冲区使用这个名字"
+msgstr "E95: 已有缓冲区使用该名称"
msgid " [Modified]"
msgstr " [已修改]"
@@ -118,24 +118,24 @@
#, c-format
msgid "1 line --%d%%--"
-msgstr "行数 1 --%d%%--"
+msgstr "1 行 --%d%%--"
#, c-format
msgid "%ld lines --%d%%--"
-msgstr "行数 %ld --%d%%--"
+msgstr "%ld 行 --%d%%--"
#, c-format
msgid "line %ld of %ld --%d%%-- col "
-msgstr "行 %ld/%ld --%d%%-- 列 "
+msgstr "行 %ld / %ld --%d%%-- 列 "
-msgid "[No file]"
+msgid "[No Name]"
msgstr "[未命名]"
#. must be a help buffer
msgid "help"
-msgstr "[帮助]"
+msgstr "帮助"
-msgid "[help]"
+msgid "[Help]"
msgstr "[帮助]"
msgid "[Preview]"
@@ -150,6 +150,7 @@
msgid "Top"
msgstr "顶端"
+#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -157,22 +158,22 @@
"\n"
"# 缓冲区列表:\n"
-msgid "[Error List]"
-msgstr "[错误列表]"
+msgid "[Location List]"
+msgstr "[Location 列表]"
-msgid "[No File]"
-msgstr "[未命名]"
+msgid "[Quickfix List]"
+msgstr "[Quickfix 列表]"
msgid ""
"\n"
"--- Signs ---"
msgstr ""
"\n"
-"--- 符号 ---"
+"--- Signs ---"
#, c-format
msgid "Signs for %s:"
-msgstr "%s 的符号:"
+msgstr "%s 的 Signs:"
#, c-format
msgid " line=%ld id=%d name=%s"
@@ -180,91 +181,99 @@
#, c-format
msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: 不能比较(diff) %ld个以上的缓冲区"
+msgstr "E96: 不能比较(diff) %ld 个以上的缓冲区"
msgid "E97: Cannot create diffs"
-msgstr "E97: 不能创建 diff "
+msgstr "E97: 无法创建 diff"
msgid "Patch file"
msgstr "Patch 文件"
msgid "E98: Cannot read diff output"
-msgstr "E98: 不能读取 diff 的输出"
+msgstr "E98: 无法读取 diff 的输出"
msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: 目前的缓冲区不是在 diff 模式"
+msgstr "E99: 当前缓冲区不在 diff 模式"
msgid "E100: No other buffer in diff mode"
-msgstr "E100: 没有缓冲区在 diff 模式"
+msgstr "E100: 没有其它处于 diff 模式的缓冲区"
msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: 有两个以上的缓冲区在 diff 模式，不能决定要用哪一个"
+msgstr "E101: 有两个以上的缓冲区处于 diff 模式，不能决定用哪一个"
#, c-format
msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: 找不到缓冲区: \"%s\""
+msgstr "E102: 找不到缓冲区 \"%s\""
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: 缓冲区 \"%s\" 不是在 diff 模式"
+msgstr "E103: 缓冲区 \"%s\" 不在 diff 模式"
msgid "E104: Escape not allowed in digraph"
msgstr "E104: 复合字符(digraph)中不能使用 Escape"
-msgid "Keymap file not found"
-msgstr "找不到 keymap 文件"
+msgid "E544: Keymap file not found"
+msgstr "E544: 找不到 Keymap 文件"
msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: 使用 :loadkeymap "
+msgstr "E105: 不是在脚本文件中使用 :loadkeymap "
-msgid " Keyword completion (^N/^P)"
-msgstr " 关键字自动完成 (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " 关键字补全 (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X 模式 (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X 模式 (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " 区域关键字自动完成 (^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " 整行补全 (^L^N^P)"
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " 整行自动完成 (^L/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " 文件名补全 (^F^N^P)"
-msgid " File name completion (^F/^N/^P)"
-msgstr " 文件名自动完成 (^F/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag 补全 (^]^N^P)"
-msgid " Tag completion (^]/^N/^P)"
-msgstr " 标签自动完成 (^]/^N/^P)"
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " 路径模式补全 (^N^P)"
-msgid " Path pattern completion (^N/^P)"
-msgstr " 路径自动完成 (^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " 定义补全 (^D^N^P)"
-msgid " Definition completion (^D/^N/^P)"
-msgstr " 定义自动完成 (^D/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary 补全 (^K^N^P)"
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " 字典自动完成 (^K/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus 补全 (^T^N^P)"
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus 自动完成 (^T/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " 命令行补全 (^V^N^P)"
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " 命令自动完成 (^V/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " 用户自定义补全 (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " 全能补全 (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " 拼写建议 (^S^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " 关键字局部补全 (^N^P)"
msgid "Hit end of paragraph"
msgstr "已到段落结尾"
-msgid "'thesaurus' option is empty"
-msgstr "选项 'thesaurus' 未设定"
-
msgid "'dictionary' option is empty"
msgstr "选项 'dictionary' 为空"
+msgid "'thesaurus' option is empty"
+msgstr "选项 'thesaurus' 为空"
+
#, c-format
msgid "Scanning dictionary: %s"
-msgstr "扫描字典: %s"
+msgstr "正在扫描 dictionary: %s"
msgid " (insert) Scroll (^E/^Y)"
msgstr " (插入) Scroll (^E/^Y)"
@@ -274,8 +283,9 @@
#, c-format
msgid "Scanning: %s"
-msgstr "扫描中: %s"
+msgstr "正在扫描: %s"
+#, c-format
msgid "Scanning tags."
msgstr "扫描标签."
@@ -287,45 +297,157 @@
#. * longer needed. -- Acevedo.
#.
msgid "-- Searching..."
-msgstr "-- 搜寻中..."
+msgstr "-- 查找中..."
msgid "Back at original"
msgstr "回到起点"
msgid "Word from other line"
-msgstr "从其它行开始的词 (?)"
+msgstr "另一行的词"
msgid "The only match"
-msgstr "只有此项匹配"
+msgstr "唯一匹配"
#, c-format
msgid "match %d of %d"
-msgstr "找到 %d / %d"
+msgstr "匹配 %d / %d"
#, c-format
msgid "match %d"
msgstr "匹配 %d"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let 中出现异常字符"
+
#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 未定义的变量: \"%s\""
+msgid "E684: list index out of range: %ld"
+msgstr "E684: List 索引超出范围: %ld"
+
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: 未定义的变量: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: 缺少 ']'"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s 的参数必须是 List"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s 的参数必须是 List 或者 Dictionary"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary 的键不能为空"
+
+msgid "E714: List required"
+msgstr "E714: 需要 List"
+
+msgid "E715: Dictionary required"
+msgstr "E715: 需要 Dictionary"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 函数的参数过多: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary 中不存在键: %s"
+
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 函数 %s 已存在，请加 ! 强制替换"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Dictionary 项已存在"
+
+msgid "E718: Funcref required"
+msgstr "E718: 需要 Funcref"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: 不能对 Dictionary 使用 [:]"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: %s= 的变量类型不正确"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知的函数: %s"
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: 无效的变量名: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: 目标比 List 项数少"
+
+msgid "E688: More targets than List items"
+msgstr "E688: 目标比 List 项数多"
+
+msgid "Double ; in list of variables"
+msgstr "变量列表中出现两个 ;"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: 无法列出 %s 的变量"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: 只能索引 List 或 Dictionary"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] 必须在最后"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] 需要一个 List 值"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: List 值的项比目标多"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: List 值没有足够多的项"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for 后缺少 \"in\""
#, c-format
msgid "E107: Missing braces: %s"
-msgstr "E107: 缺少对应的括号: %s"
+msgstr "E107: 缺少括号: %s"
#, c-format
msgid "E108: No such variable: \"%s\""
msgstr "E108: 无此变量: \"%s\""
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (un)lock 的变量嵌套过深"
+
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' 后缺少 ':'"
-msgid "E110: Missing ')'"
-msgstr "E110: 缺少对应的 \")\""
+msgid "E691: Can only compare List with List"
+msgstr "E691: 只能比较 List 和 List"
-msgid "E111: Missing ']'"
-msgstr "E111: 缺少对应的 \"]\""
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: 对 List 无效的操作"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: 只能比较 Dictionary 和 Dictionary"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: 对 Dictionary 无效的操作"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: 只能比较 Funcref 和 Funcref"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: 对 Funcrefs 无效的操作"
+
+msgid "E110: Missing ')'"
+msgstr "E110: 缺少 ')'"
+
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: 不能索引一个 Funcref"
#, c-format
msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@
#, c-format
msgid "E113: Unknown option: %s"
-msgstr "E113: 不正确的选项: %s"
+msgstr "E113: 未知的选项: %s"
#, c-format
msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@
msgstr "E115: 缺少引号: %s"
#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 函数 %s 的参数不正确"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List 中缺少逗号: %s"
#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未定义的函数: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List 缺少结束符 ']': %s"
#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 函数 %s 的参数过多"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary 中缺少冒号: %s"
#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 函数 %s 的参数太少"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary 中出现重复的键: \"%s\""
#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> 不能在 script 上下文外使用: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary 中缺少逗号: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary 缺少结束符 '}': %s"
+
+#, fuzzy
+#~ msgid "E724: variable nested too deep for displaying"
+#~ msgstr "E724: 变量嵌套过深"
+
+msgid "E699: Too many arguments"
+msgstr "E699: 参数过多"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() 只能在插入模式中使用"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either. But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all. See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "确定(&O)"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: 键已存在: %s"
#, c-format
msgid "+-%s%3ld lines: "
msgstr "+-%s%3ld 行: "
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: 未知的函数: %s"
+
msgid ""
"&OK\n"
"&Cancel"
@@ -374,91 +526,148 @@
"确定(&O)\n"
"取消(&C)"
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() 的调用次数多于 inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: 不允许的范围"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() 的类型无效"
+
+msgid "E726: Stride is zero"
+msgstr "E726: 步长为零"
+
+msgid "E727: Start past end"
+msgstr "E727: 起始值在终止值后"
+
+msgid "<empty>"
+msgstr "<空>"
+
msgid "E240: No connection to Vim server"
-msgstr "E240: 没有与 Vim Server 创建连接"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: 不能读取服务器的响应"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: 不能传送到客户端"
+msgstr "E240: 没有到 Vim 服务器的连接"
#, c-format
msgid "E241: Unable to send to %s"
-msgstr "E241: 不能传送到 %s"
+msgstr "E241: 无法发送到 %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: 无法读取服务器响应"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: 符号连接过多(循环？)"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: 无法发送到客户端"
+
+#, fuzzy
+#~ msgid "E702: Sort compare function failed"
+#~ msgstr "E702: Sort 比较函数失败"
msgid "(Invalid)"
msgstr "(无效)"
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: 变量 %s 尚未定义"
+msgid "E677: Error writing temp file"
+msgstr "E677: 写临时文件出错"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: 将 Funcref 作数字使用"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: 将 List 作数字使用"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: 将 Dictionary 作数字使用"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: 将 Funcref 作 String 使用"
+
+msgid "E730: using List as a String"
+msgstr "E730: 将 List 作 String 使用"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: 将 Dictionary 作 String 使用"
#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: 函数 %s 已经存在, 请使用 ! 强制替换"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref 变量名必须以大写字母开头: %s"
#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 函数 %s 尚未定义"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 变量名与已有函数名冲突: %s"
+
+#, c-format
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: 变量类型不匹配: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: 值已锁定: %s"
+
+msgid "Unknown"
+msgstr "未知"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: 无法改变 %s 的值"
+
+#, fuzzy
+#~ msgid "E698: variable nested too deep for making a copy"
+#~ msgstr "E698: 变量嵌套过深"
#, c-format
msgid "E124: Missing '(': %s"
-msgstr "E124: 缺少 \"(\": %s"
+msgstr "E124: 缺少 '(': %s"
#, c-format
msgid "E125: Illegal argument: %s"
-msgstr "E125: 参数不正确: %s"
+msgstr "E125: 无效的参数: %s"
msgid "E126: Missing :endfunction"
msgstr "E126: 缺少 :endfunction"
#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 函数 %s 正在使用中，不能重新定义"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: 函数名称第一个字母必须大写: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 函数名与脚本文件名不匹配: %s"
msgid "E129: Function name required"
-msgstr "E129: 需要函数名称"
-
-msgid "function "
-msgstr "函数 "
+msgstr "E129: 需要函数名"
#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: 函数 %s 尚未定义"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: 函数名必须以大写字母开头或者包含冒号: %s"
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: 函数 %s 正在使用中，不能删除"
+msgstr "E131: 无法删除函数 %s: 正在使用中"
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 函数递归调用层数超过 'maxfuncdepth'"
+msgstr "E132: 函数调用深度超出 'maxfuncdepth'"
-#. always scroll up, don't overwrite
#, c-format
msgid "calling %s"
msgstr "调用 %s"
-#. always scroll up, don't overwrite
#, c-format
-msgid "continuing in %s"
-msgstr "继续: %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return 必须在函数里使用"
+msgid "%s aborted"
+msgstr "%s 已中止"
#, c-format
msgid "%s returning #%ld"
-msgstr "%s 返回值 #%ld "
+msgstr "%s 返回 #%ld "
#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s 返回值 \"%s\""
+msgid "%s returning %s"
+msgstr "%s 返回 %s"
+#, c-format
+msgid "continuing in %s"
+msgstr "在 %s 中继续"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return 不在函数中"
+
+#, c-format
msgid ""
"\n"
"# global variables:\n"
@@ -466,76 +675,90 @@
"\n"
"# 全局变量:\n"
-msgid "Entering Debug mode. Type \"cont\" to leave."
-msgstr "进入调试模式. 输入 \"cont\" 以回到正常模式."
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t最近修改于 "
+
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "进入调试模式。输入 \"cont\" 继续运行。"
#, c-format
msgid "line %ld: %s"
-msgstr "行 %ld: %s"
+msgstr "第 %ld 行: %s"
#, c-format
msgid "cmd: %s"
-msgstr "cmd: %s"
+msgstr "命令: %s"
#, c-format
msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" 中断点: 第 %ld 行"
+msgstr "断点 \"%s%s\" 第 %ld 行"
#, c-format
msgid "E161: Breakpoint not found: %s"
-msgstr "E161: 找不到中断点: %s"
+msgstr "E161: 找不到断点: %s"
msgid "No breakpoints defined"
-msgstr "没有定义中断点"
+msgstr "没有定义断点"
#, c-format
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s 第 %ld 行"
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: 请先使用 :profile start <fname>"
+
msgid "Save As"
msgstr "另存为"
#, c-format
-msgid "Save changes to \"%.*s\"?"
-msgstr "将改变保存到 \"%.*s\"?"
+msgid "Save changes to \"%s\"?"
+msgstr "将改变保存到 \"%s\" 吗？"
msgid "Untitled"
msgstr "未命名"
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: 已更改过缓冲区 \"%s\" 但尚未保存 (可用 ! 强制执行)"
+msgstr "E162: 缓冲区 \"%s\" 已修改但尚未保存"
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "注意: 已切换到其它缓冲区 (请检查 Autocommands 有无错误)"
+msgstr "警告: 意外地进入了其它缓冲区 (请检查自动命令)"
msgid "E163: There is only one file to edit"
msgstr "E163: 只有一个文件可编辑"
msgid "E164: Cannot go before first file"
-msgstr "E164: 已经在第一个文件了"
+msgstr "E164: 无法切换，已是第一个文件"
msgid "E165: Cannot go beyond last file"
-msgstr "E165: 已经在最后一个文件了"
+msgstr "E165: 无法切换，已是最后一个文件"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: 不支持编译器: %s"
#, c-format
msgid "Searching for \"%s\" in \"%s\""
-msgstr "查找中: \"%s\" -- \"%s\""
+msgstr "正在查找 \"%s\"，在 \"%s\" 中"
#, c-format
msgid "Searching for \"%s\""
-msgstr "查找中: \"%s\""
+msgstr "正在查找 \"%s\""
#, c-format
msgid "not found in 'runtimepath': \"%s\""
-msgstr "在 'runtimepath' 里找不到 \"%s\""
+msgstr "在 'runtimepath' 中找不到 \"%s\""
-msgid "Run Macro"
-msgstr "执行宏"
+msgid "Source Vim script"
+msgstr "执行 Vim 脚本"
#, c-format
msgid "Cannot source a directory: \"%s\""
-msgstr "不能执行目录： \"%s\""
+msgstr "不能执行目录: \"%s\""
#, c-format
msgid "could not source \"%s\""
@@ -547,69 +770,43 @@
#, c-format
msgid "sourcing \"%s\""
-msgstr "执行 \"%s\" 中"
+msgstr "执行 \"%s\""
#, c-format
msgid "line %ld: sourcing \"%s\""
-msgstr "第 %ld 行: 结束执行 %s"
+msgstr "第 %ld 行: 执行 \"%s\""
#, c-format
msgid "finished sourcing %s"
msgstr "结束执行 %s"
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd 参数"
+
+msgid "-c argument"
+msgstr "-c 参数"
+
+msgid "environment variable"
+msgstr "环境变量"
+
+#~ msgid "error handler"
+#~ msgstr ""
+
msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: 注意: 错误的行分隔字符，可能是少了 ^M"
+msgstr "W15: 警告: 错误的行分隔符，可能是少了 ^M"
msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: 在执行 script 文件外不可使用 :scriptencoding"
+msgstr "E167: 在脚本文件外使用了 :scriptencoding"
msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: 在执行 script 文件外不可使用 :finish"
-
-msgid "No text to be printed"
-msgstr "没有要打印的文字"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "打印中: 第 %d 页 (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "复制 %d / %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "已打印: %s"
-
-msgid "Printing aborted"
-msgstr "打印中断"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: 写入 PostScript 文件出错"
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: 不能打开 PostScript 输出文件"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: 不能打开文件 \"%s\""
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: 不能读 PostScript 资源文件 \"%s\""
-
-msgid "Sending to printer..."
-msgstr "发送到打印机..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: 打印 PostScript 文件失败"
-
-#~ msgid "Print job sent."
-#~ msgstr ""
+msgstr "E168: 在脚本文件外使用了 :finish"
#, c-format
msgid "Current %slanguage: \"%s\""
-msgstr "目前的 %s语言: \"%s\""
+msgstr "当前的 %s语言: \"%s\""
#, c-format
msgid "E197: Cannot set language to \"%s\""
@@ -619,32 +816,41 @@
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 十六进制 %02x, 八进制 %03o"
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, 十六进制 %04x, 八进制 %o"
+
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, 十六进制 %08x, 八进制 %o"
+
msgid "E134: Move lines into themselves"
-msgstr "E134: 不能把行移到它自已内"
+msgstr "E134: 把行移动到自已中"
msgid "1 line moved"
-msgstr "已移动 1 行"
+msgstr "移动了 1 行"
#, c-format
msgid "%ld lines moved"
-msgstr "已搬移 %ld 行"
+msgstr "移动了 %ld 行"
#, c-format
msgid "%ld lines filtered"
-msgstr "已处理 %ld 行"
+msgstr "过滤了 %ld 行"
msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* Autocommand 不可以更改缓冲区的内容"
+msgstr "E135: *Filter* 自动命令不可以改变当前缓冲区"
msgid "[No write since last change]\n"
-msgstr "[更新后尚未保存]\n"
+msgstr "[已修改但尚未保存]\n"
#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s 在行中: "
+# bad to translate
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s 位于行: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: 过多错误, 忽略文件其余部分"
+msgstr "E136: viminfo: 错误过多，忽略文件的剩余部分"
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -661,39 +867,39 @@
#, c-format
msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo 文件不能写入: %s"
+msgstr "E137: Viminfo 文件不可写入: %s"
#, c-format
msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: 不能写入 viminfo 文件 %s !"
+msgstr "E138: 无法写入 viminfo 文件 %s！"
#, c-format
msgid "Writing viminfo file \"%s\""
-msgstr "写入 viminfo 文件 \"%s\" 中"
+msgstr "写入 viminfo 文件 \"%s\""
#. Write the info:
-#, c-format
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# viminfo 文件是由 vim %s 所产生.\n"
+msgstr "# 这个 viminfo 文件是由 vim %s 生成的。\n"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"# You may edit it if you're careful!\n"
"\n"
msgstr ""
-"# 如果想要自行修改请特别小心！\n"
+"# 如果要自行修改请特别小心！\n"
"\n"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# 'encoding' 在此文件建立时的值\n"
msgid "Illegal starting char"
msgstr "无效的启动字符"
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: 您在另一个缓冲区也加载了这个文件"
-
msgid "Write partial file?"
msgstr "要写入部分文件吗？"
@@ -701,30 +907,38 @@
msgstr "E140: 请使用 ! 来写入部分缓冲区"
#, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "要覆盖已存在的文件 \"%.*s\"？"
+msgid "Overwrite existing file \"%s\"?"
+msgstr "覆盖已存在的文件 \"%s\" 吗？"
+
+#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "交换文件 \"%s\" 已存在，确实要覆盖吗？"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: 交换文件已存在: %s (:silent! 强制执行)"
#, c-format
msgid "E141: No file name for buffer %ld"
msgstr "E141: 缓冲区 %ld 没有文件名"
msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: 文件未写入，因为 'write' 选项关闭"
+msgstr "E142: 文件未写入: 写入被 'write' 选项禁用"
#, c-format
msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
"Do you wish to write anyway?"
msgstr ""
-"\"%.*s\" 已设定 'readonly' 选项.\n"
-"确定要覆盖吗？"
+"\"%s\" 已设定 'readonly' 选项。\n"
+"确实要覆盖吗？"
msgid "Edit File"
msgstr "编辑文件"
#, c-format
msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommands 意外地删除新缓冲区 %s"
+msgstr "E143: 自动命令意外地删除了新缓冲区 %s"
msgid "E144: non-numeric argument to :z"
msgstr "E144: :z 不接受非数字的参数"
@@ -733,232 +947,283 @@
msgstr "E145: rvim 中禁止使用 shell 命令"
msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: 正则表达式不能用字母分隔 (?)"
+msgstr "E146: 正则表达式不能用字母作分界"
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "替换为 %s (y/n/a/q/^E/^Y)?"
+msgstr "替换为 %s (y/n/a/q/l/^E/^Y)？"
msgid "(Interrupted) "
msgstr "(已中断) "
+msgid "1 match"
+msgstr "1 个匹配，"
+
msgid "1 substitution"
-msgstr "替换一组"
+msgstr "1 次替换，"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld 个匹配，"
#, c-format
msgid "%ld substitutions"
-msgstr "替换 %ld 组"
+msgstr "%ld 次替换，"
msgid " on 1 line"
-msgstr " 一行中"
+msgstr "共 1 行"
#, c-format
msgid " on %ld lines"
-msgstr " %ld 行中"
+msgstr "共 %ld 行"
msgid "E147: Cannot do :global recursive"
msgstr "E147: :global 不能递归执行"
msgid "E148: Regular expression missing from global"
-msgstr "E148: 没有使用过正则表达式 (?)"
+msgstr "E148: global 缺少正则表达式"
#, c-format
msgid "Pattern found in every line: %s"
-msgstr "每一行都找不到模式: %s"
+msgstr "每行都匹配表达式: %s"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"\n"
"# Last Substitute String:\n"
"$"
msgstr ""
"\n"
-"# 前一组替代字符串:\n"
+"# 最近的替换字符串:\n"
"$"
+msgid "E478: Don't panic!"
+msgstr "E478: 不要慌！"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: 抱歉，没有 '%s' 的 %s 的说明"
+
#, c-format
msgid "E149: Sorry, no help for %s"
-msgstr "E149: 抱歉, 没有 %s 的说明"
+msgstr "E149: 抱歉，没有 %s 的说明"
#, c-format
msgid "Sorry, help file \"%s\" not found"
-msgstr "抱歉, 找不到帮助文件 \"%s\""
+msgstr "抱歉，找不到帮助文件 \"%s\""
#, c-format
msgid "E150: Not a directory: %s"
-msgstr "E150: %s 不是目录"
+msgstr "E150: 不是目录: %s"
#, c-format
msgid "E152: Cannot open %s for writing"
-msgstr "E152: 不能以写入模式打开 \"%s\""
+msgstr "E152: 无法打开并写入 %s"
#, c-format
msgid "E153: Unable to open %s for reading"
-msgstr "E153: 不能读取文件: %s"
+msgstr "E153: 无法打开并读取 %s"
#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: 在一种语言中混合了多种帮助文件编码: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Tag \"%s\" 在文件 %s/%s 中重复出现"
#, c-format
msgid "E160: Unknown sign command: %s"
-msgstr "E160: 未定义的 sign command: %s"
+msgstr "E160: 未知的 sign 命令: %s"
msgid "E156: Missing sign name"
msgstr "E156: 缺少 sign 名称"
-msgid "E255: Too many signs defined"
-msgstr "E326: 找到太多 signs"
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs 定义过多"
#, c-format
msgid "E239: Invalid sign text: %s"
-msgstr "E239: 不正确的 sign 文字: %s"
+msgstr "E239: 无效的 sign 文字: %s"
#, c-format
msgid "E155: Unknown sign: %s"
-msgstr "E155: 不正确的 sign: %s"
+msgstr "E155: 未知的 sign: %s"
msgid "E159: Missing sign number"
-msgstr "E159: 缺少 sign number"
+msgstr "E159: 缺少 sign 号"
#, c-format
msgid "E158: Invalid buffer name: %s"
-msgstr "E158: 缓冲区名称错误: %s"
+msgstr "E158: 无效的缓冲区名: %s"
#, c-format
msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Sign ID 错误: %ld"
+msgstr "E157: 无效的 sign ID: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (找不到)"
+
+msgid " (not supported)"
+msgstr " (不支持)"
msgid "[Deleted]"
msgstr "[已删除]"
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
-msgstr "进入 Ex 模式. 输入 \"visua\" 以回到正常模式."
+msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "已到文件结尾"
+msgid "E501: At end-of-file"
+msgstr "E501: 已到文件末尾"
msgid "E169: Command too recursive"
msgstr "E169: 命令递归层数过多"
-msgid "E170: Missing :endwhile"
-msgstr "E170: 缺少 :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: 缺少 :endif"
+#, c-format
+msgid "E605: Exception not caught: %s"
+msgstr "E605: 异常没有被捕获: %s"
msgid "End of sourced file"
-msgstr "命令文件结束"
+msgstr "脚本文件结束"
msgid "End of function"
-msgstr "函数结尾"
+msgstr "函数结束"
-msgid "Ambiguous use of user-defined command"
-msgstr "用户定义的命令会混淆"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: 不确定的用户自定义命令"
-msgid "Not an editor command"
-msgstr "不是编辑器的命令"
+msgid "E492: Not an editor command"
+msgstr "E492: 不是编辑器的命令"
-msgid "Don't panic!"
-msgstr "不要惊慌!"
-
-msgid "Backwards range given"
-msgstr "指定了向前参考的范围"
+msgid "E493: Backwards range given"
+msgstr "E493: 使用了逆向的范围"
msgid "Backwards range given, OK to swap"
-msgstr "指定了向前参考的范围，OK to swap"
+msgstr "使用了逆向的范围，确定交换吗"
-msgid "Use w or w>>"
-msgstr "请使用 w 或 w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: 请使用 w 或 w>>"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: 抱歉, 本命令在此版本中未实现"
+msgstr "E319: 抱歉，命令在此版本中不可用"
msgid "E172: Only one file name allowed"
-msgstr "E172: 只能有一个文件名"
+msgstr "E172: 只允许一个文件名"
+
+msgid "1 more file to edit. Quit anyway?"
+msgstr "还有 1 个文件未编辑。确实要退出吗？"
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "还有 %d 个文件未编辑. 确定要退出？"
+msgstr "还有 %d 个文件未编辑。确实要退出吗？"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: 还有 1 个文件未编辑"
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: 还有 %ld 个文件未编辑"
-msgid "E174: Command already exists: use ! to redefine"
-msgstr "E174: 命令已经存在, 请使用 ! 强制重新定义"
+msgid "E174: Command already exists: add ! to replace it"
+msgstr "E174: 命令已存在: 请加 ! 强制替换"
msgid ""
"\n"
" Name Args Range Complete Definition"
msgstr ""
"\n"
-" 名称 参数 范围 完整 定义 "
+" 名称 参数 范围 补全 定义 "
msgid "No user-defined commands found"
-msgstr "找不到用户自定义的命令"
+msgstr "找不到用户自定义命令"
msgid "E175: No attribute specified"
-msgstr "E175: 没有指定的属性"
+msgstr "E175: 没有指定属性"
msgid "E176: Invalid number of arguments"
-msgstr "E176: 不正确的参数个数"
+msgstr "E176: 无效的参数个数"
msgid "E177: Count cannot be specified twice"
-msgstr "E177: 不能指定两次"
+msgstr "E177: 不能指定两次计数"
msgid "E178: Invalid default value for count"
-msgstr "E178: 计数的缺省值不正确"
+msgstr "E178: 无效的计数默认值"
-msgid "E179: argument required for complete"
-msgstr "E179: 指令需要参数才能完成"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: 不完整的值: '%s'"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete 需要参数"
#, c-format
msgid "E181: Invalid attribute: %s"
-msgstr "E181: 不正确的属性: %s"
+msgstr "E181: 无效的属性: %s"
msgid "E182: Invalid command name"
-msgstr "E182: 命令名称不正确"
+msgstr "E182: 无效的命令名"
msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: 用户自定义命令必须以大写字母开始"
+msgstr "E183: 用户自定义命令必须以大写字母开头"
#, c-format
msgid "E184: No such user-defined command: %s"
-msgstr "E184: 没有用户自定义的命令： %s"
+msgstr "E184: 没有这个用户自定义命令: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: 无效的补全类型: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: 只有 custom 补全才允许参数"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Custom 补全需要一个函数参数"
#, c-format
msgid "E185: Cannot find color scheme %s"
-msgstr "E185: 找不到颜色样式 %s"
+msgstr "E185: 找不到颜色主题 %s"
msgid "Greetings, Vim user!"
-msgstr "你好, Vim 用户！"
+msgstr "您好，Vim 用户！"
+
+msgid "E784: Cannot close last tab page"
+msgstr "E784: 不能关闭最后一个 tab 页"
+
+msgid "Already only one tab page"
+msgstr "已经只剩一个 tab 页了"
msgid "Edit File in new window"
msgstr "在新窗口编辑文件"
+#, c-format
+msgid "Tab page %d"
+msgstr "Tab 页 %d"
+
msgid "No swap file"
msgstr "无交换文件"
msgid "Append File"
-msgstr "附加文件"
+msgstr "追加文件"
+
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: 不能改变目录，缓冲区已修改 (请加 ! 强制执行)"
msgid "E186: No previous directory"
msgstr "E186: 前一个目录不存在"
msgid "E187: Unknown"
-msgstr "E187: 不能识别的标记"
+msgstr "E187: 未知"
+
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize 需要两个数字参数"
#, c-format
msgid "Window position: X %d, Y %d"
msgstr "窗口位置: X %d, Y %d"
msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: 在您的平台上不能获得窗口位置"
+msgstr "E188: 在此平台上不能获得窗口位置"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos 需要两个数字参数"
msgid "Save Redirection"
msgstr "保存重定向"
@@ -973,85 +1238,170 @@
msgstr "保存设定"
#, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
-msgstr "E189: \"%s\" 已存在 (请用 ! 强制执行)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: 无法创建目录: %s"
+
+#, c-format
+msgid "E189: \"%s\" exists (add ! to override)"
+msgstr "E189: \"%s\" 已存在 (请加 ! 强制执行)"
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: 不能以写入模式打开 \"%s\""
+msgstr "E190: 无法打开并写入 \"%s\""
#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: 参数必须是英文字母或向前/后的引号"
+msgstr "E191: 参数必须是一个字母或者正/反引号"
msgid "E192: Recursive use of :normal too deep"
msgstr "E192: :normal 递归层数过深"
-msgid ":if nesting too deep"
-msgstr ":if 层数过深"
-
-msgid ":endif without :if"
-msgstr ":endif 缺少对应的 :if"
-
-msgid ":else without :if"
-msgstr ":else 缺少对应的 :if"
-
-msgid ":elseif without :if"
-msgstr ":elseif 缺少对应的 :if"
-
-msgid ":while nesting too deep"
-msgstr ":while 层数过深"
-
-msgid ":continue without :while"
-msgstr ":continue 缺少对应的 :while"
-
-msgid ":break without :while"
-msgstr ":break 缺少对应的 :while"
-
-msgid ":endwhile without :while"
-msgstr ":endwhile 缺少对应的 :while"
-
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction 必须在函数内部使用"
-
msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: 没有 '#' 可替代的文件名"
+msgstr "E194: 没有用于替换 '#' 的交替文件名"
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "没有 Autocommand 文件名以替换 \"<afile>\""
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: 没有用于替换 \"<afile>\" 的自动命令文件名"
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "没有 Autocommand 缓冲区名称以替换 \"<abuf>\""
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: 没有用于替换 \"<abuf>\" 的自动命令缓冲区号"
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "没有 Autocommand Match name 以替换 \"<amatch>\""
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: 没有用于替换 \"<amatch>\" 的自动命令匹配名"
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "没有 :source 文件名以替换 \"<sfile>\""
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: 没有用于替换 \"<sfile>\" 的 :source 文件名"
#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' 或 '#' 指向空文件名，只能用於 \":p:h\""
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' 或 '#' 为空文件名，只能用于 \":p:h\""
-msgid "Evaluates to an empty string"
-msgstr "输入为空字符串"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: 结果为空字符串"
msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: 不能读取 viminfo"
+msgstr "E195: 无法打开并读取 viminfo 文件"
msgid "E196: No digraphs in this version"
-msgstr "E196: 本版本无复合字符(digraph)"
+msgstr "E196: 此版本无复合字符(digraph)"
-msgid "tagname"
-msgstr "标签名称"
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: 不能 :throw 前缀为 'Vim' 的异常"
-msgid " kind file\n"
-msgstr "类文件\n"
-
-msgid "'history' option is zero"
-msgstr "选项 'history' 是零"
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "抛出异常: %s"
#, c-format
+msgid "Exception finished: %s"
+msgstr "完成异常: %s"
+
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "丢弃异常: %s"
+
+#, c-format
+msgid "%s, line %ld"
+msgstr "%s，第 %ld 行"
+
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception caught: %s"
+msgstr "捕获异常: %s"
+
+#, c-format
+#~ msgid "%s made pending"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "%s resumed"
+#~ msgstr " 已返回\n"
+
+#, c-format
+#~ msgid "%s discarded"
+#~ msgstr ""
+
+msgid "Exception"
+msgstr "异常"
+
+msgid "Error and interrupt"
+msgstr "错误和中断"
+
+msgid "Error"
+msgstr "错误"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "中断"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: :if 嵌套层数过深"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif 缺少对应的 :if"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else 缺少对应的 :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif 缺少对应的 :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: 多个 :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif 在 :else 后面"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while/:for 嵌套层数过深"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue 缺少对应的 :while 或 :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break 缺少对应的 :while 或 :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :while 以 :endfor 结尾"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :for 以 :endwhile 结尾"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: :try 嵌套层数过深"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch 缺少对应的 :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch 在 :finally 后面"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally 缺少对应的 :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: 多个 :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry 缺少对应的 :try"
+
+msgid "E193: :endfunction not inside a function"
+msgstr "E193: :endfunction 不在函数内"
+
+msgid "tagname"
+msgstr "tag 名"
+
+msgid " kind file\n"
+msgstr " 类型 文件\n"
+
+msgid "'history' option is zero"
+msgstr "选项 'history' 为零"
+
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"\n"
"# %s History (newest to oldest):\n"
@@ -1075,10 +1425,10 @@
msgstr "E198: cmd_pchar 超过命令长度"
msgid "E199: Active window or buffer deleted"
-msgstr "E199: 已删除活动窗口或缓存"
+msgstr "E199: 活动窗口或缓冲区已被删除"
msgid "Illegal file name"
-msgstr "不正确的文件名"
+msgstr "无效的文件名"
msgid "is a directory"
msgstr "是目录"
@@ -1087,26 +1437,32 @@
msgstr "不是文件"
msgid "[New File]"
-msgstr "[未命名]"
+msgstr "[新文件]"
+
+msgid "[New DIRECTORY]"
+msgstr "[新目录]"
+
+msgid "[File too big]"
+msgstr "[文件过大]"
msgid "[Permission Denied]"
msgstr "[权限不足]"
msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre Autocommand 使程序不能读取此文件"
+msgstr "E200: *ReadPre 自动命令导致文件不可读"
msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *Filter* Autocommand 不可以更改缓冲区的内容"
+msgstr "E201: *ReadPre 自动命令不允许改变当前缓冲区"
msgid "Vim: Reading from stdin...\n"
msgstr "Vim: 从标准输入读取...\n"
msgid "Reading from stdin..."
-msgstr "从标准输入读..."
+msgstr "从标准输入读取..."
#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
-msgstr "E202: 转换错误"
+msgstr "E202: 转换导致文件不可读"
msgid "[fifo/socket]"
msgstr "[fifo/socket]"
@@ -1121,13 +1477,13 @@
msgstr "[只读]"
msgid "[CR missing]"
-msgstr "[缺少CR]'"
+msgstr "[缺少 CR]'"
msgid "[NL found]"
-msgstr "[找到NL]"
+msgstr "[找到 NL]"
msgid "[long lines split]"
-msgstr "[分割过长行]"
+msgstr "[长行分割]"
msgid "[NOT converted]"
msgstr "[未转换]"
@@ -1138,74 +1494,92 @@
msgid "[crypted]"
msgstr "[已加密]"
-msgid "[CONVERSION ERROR]"
-msgstr "转换错误"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[第 %ld 行转换错误]"
+
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[第 %ld 行无效字符]"
msgid "[READ ERRORS]"
msgstr "[读错误]"
msgid "Can't find temp file for conversion"
-msgstr "找不到转换用的临时文件"
+msgstr "找不到用于转换的临时文件"
msgid "Conversion with 'charconvert' failed"
-msgstr "字符集转换错误"
+msgstr "'charconvert' 转换失败"
msgid "can't read output of 'charconvert'"
-msgstr "不能读取 'charconvert' 的输出"
+msgstr "无法读取 'charconvert' 的输出"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: 找不到 acwrite 缓冲区对应的自动命令"
msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Autocommand 删除或释放了要写入的缓冲区"
+msgstr "E203: 自动命令删除或释放了要写入的缓冲区"
msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand 意外地改变了行号"
+msgstr "E204: 自动命令意外地改变了行数"
+
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans 不允许未修改的缓冲区写入"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeans 不允许缓冲区部分写入"
msgid "is not a file or writable device"
msgstr "不是文件或可写的设备"
-msgid "is read-only (use ! to override)"
-msgstr "是只读文件 (请使用 ! 强制执行)"
+msgid "is read-only (add ! to override)"
+msgstr "只读 (请加 ! 强制执行)"
-msgid "Can't write to backup file (use ! to override)"
-msgstr "不能写备份文件 (请使用 ! 强制执行)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: 无法写入备份文件 (请加 ! 强制执行)"
-msgid "Close error for backup file (use ! to override)"
-msgstr "关闭备份文件出错 (请使用 ! 强制执行)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: 关闭备份文件出错 (请加 ! 强制执行)"
-msgid "Can't read file for backup (use ! to override)"
-msgstr "不能读取文件以供备份 (请使用 ! 强制执行)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: 无法读取文件以供备份 (请加 ! 强制执行)"
-msgid "Cannot create backup file (use ! to override)"
-msgstr "不能创建备份文件 (请使用 ! 强制执行)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: 无法创建备份文件 (请加 ! 强制执行)"
-msgid "Can't make backup file (use ! to override)"
-msgstr "不能作备份文件 (请使用 ! 强制执行)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: 无法生成备份文件 (请加 ! 强制执行)"
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork 会消失 (请使用 ! 强制执行)"
+#, fuzzy
+#~ msgid "E460: The resource fork would be lost (add ! to override)"
+#~ msgstr "E460: Resource fork 会消失 (请加 ! 强制执行)"
msgid "E214: Can't find temp file for writing"
-msgstr "E214: 找不到写入用的交换文件"
+msgstr "E214: 找不到用于写入的临时文件"
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: 不能转换 (请使用 ! 强制不转换写入)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: 无法转换 (请加 ! 强制不转换写入)"
msgid "E166: Can't open linked file for writing"
-msgstr "E166: 不能以写入模式打开链接文件"
+msgstr "E166: 无法打开并写入链接文件"
msgid "E212: Can't open file for writing"
-msgstr "E212: 不能以写入模式打开"
+msgstr "E212: 无法打开并写入文件"
-msgid "Close failed"
-msgstr "关闭失败"
+msgid "E667: Fsync failed"
+msgstr "E667: 同步失败"
-msgid "write error, conversion failed"
-msgstr "不能写入 -- 转换失败"
+msgid "E512: Close failed"
+msgstr "E512: 关闭失败"
-msgid "write error (file system full?)"
-msgstr "写入错误 (文件系统已满？)"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: 写入错误，转换失败 (请将 'fenc' 置空以强制执行)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: 写入错误 (文件系统已满？)"
msgid " CONVERSION ERROR"
-msgstr "转换错误"
+msgstr " 转换错误"
msgid "[Device]"
msgstr "[设备]"
@@ -1214,35 +1588,35 @@
msgstr "[新]"
msgid " [a]"
-msgstr "[a]"
+msgstr " [a]"
msgid " appended"
-msgstr " 已附加"
+msgstr " 已追加"
msgid " [w]"
-msgstr "[w]"
+msgstr " [w]"
msgid " written"
msgstr " 已写入"
msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch 模式: 不能储存原始文件"
+msgstr "E205: Patchmode: 无法保存原始文件"
msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patch 模式: 不能改变空的原始文件"
+msgstr "E206: Patchmode: 无法生成空的原始文件"
msgid "E207: Can't delete backup file"
-msgstr "E207: 不能删除备份文件"
+msgstr "E207: 无法删除备份文件"
msgid ""
"\n"
"WARNING: Original file may be lost or damaged\n"
msgstr ""
"\n"
-"警告: 原始文件丢失或损坏\n"
+"警告: 原始文件可能已丢失或损坏\n"
msgid "don't quit the editor until the file is successfully written!"
-msgstr "在文件正确写入前请勿退出编辑器!"
+msgstr "在文件正确写入前请勿退出编辑器！"
msgid "[dos]"
msgstr "[dos]"
@@ -1263,18 +1637,18 @@
msgstr "[unix 格式]"
msgid "1 line, "
-msgstr "1 行, "
+msgstr "1 行，"
#, c-format
msgid "%ld lines, "
-msgstr "%ld 行, "
+msgstr "%ld 行，"
msgid "1 character"
-msgstr "一个字符"
+msgstr "1 个字符"
#, c-format
msgid "%ld characters"
-msgstr "%ld个字符"
+msgstr "%ld 个字符"
msgid "[noeol]"
msgstr "[noeol]"
@@ -1286,47 +1660,56 @@
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "警告: 本文件自上次读入后已变动!!!"
+msgstr "警告: 此文件自读入后已发生变动！！！"
msgid "Do you really want to write to it"
-msgstr "确定要写入吗"
+msgstr "确实要写入吗"
#, c-format
msgid "E208: Error writing to \"%s\""
-msgstr "E208: 写入文件 \"%s\" 错误"
+msgstr "E208: 写入文件 \"%s\" 出错"
#, c-format
msgid "E209: Error closing \"%s\""
-msgstr "E209: 关闭文件 \"%s\" 错误"
+msgstr "E209: 关闭文件 \"%s\" 出错"
#, c-format
msgid "E210: Error reading \"%s\""
-msgstr "E210: 读取文件 \"%s\" 错误"
+msgstr "E210: 读取文件 \"%s\" 出错"
msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell autocommand 删除缓冲区"
+msgstr "E246: FileChangedShell 自动命令删除了缓冲区"
#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: 警告: 文件 \"%s\" 已经不存在"
+msgid "E211: File \"%s\" no longer available"
+msgstr "E211: 文件 \"%s\" 已经不存在"
#, c-format
msgid ""
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
-msgstr "W12: 警告: 文件 \"%s\" 自上次读入后已变动, 而且编辑中的缓冲区也更动了"
+msgstr "W12: 警告: 文件 \"%s\" 已变动，并且在 Vim 中的缓冲区也已变动"
+
+msgid "See \":help W12\" for more info."
+msgstr "进一步说明请见 \":help W12\""
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: 警告: 文件 \"%s\" 自上次读入后已改变"
+msgstr "W11: 警告: 编辑开始后，文件 \"%s\" 已变动"
+
+msgid "See \":help W11\" for more info."
+msgstr "进一步说明请见 \":help W11\""
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: 警告: 文件 \"%s\" 自上次读入后已改变"
+msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的模式已变动"
+
+msgid "See \":help W16\" for more info."
+msgstr "进一步说明请见 \":help W16\""
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: 警告: 文件 \"%s\" 在开始编辑后又被创建了"
+msgstr "W13: 警告: 编辑开始后，文件 \"%s\" 已被创建"
msgid "Warning"
msgstr "警告"
@@ -1339,124 +1722,139 @@
"加载文件(&L)"
#, c-format
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: 无法为重新加载 \"%s\" 做准备"
+
+#, c-format
msgid "E321: Could not reload \"%s\""
-msgstr "E321: 不能重新加载 \"%s\""
+msgstr "E321: 无法重新加载 \"%s\""
msgid "--Deleted--"
msgstr "--已删除--"
+#, c-format
+#~ msgid "auto-removing autocommand: %s <buffer=%d>"
+#~ msgstr ""
+
#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
-msgstr "E367: 组不存在: \"%s\""
+msgstr "E367: 无此组: \"%s\""
#, c-format
msgid "E215: Illegal character after *: %s"
-msgstr "E215: * 后面有不正确的字符: %s"
+msgstr "E215: * 后面有无效字符: %s"
#, c-format
msgid "E216: No such event: %s"
msgstr "E216: 无此事件: %s"
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: 无此组或事件: %s"
+
#. Highlight title
msgid ""
"\n"
"--- Auto-Commands ---"
msgstr ""
"\n"
-"--- Auto-Commands ---"
+"--- 自动命令 ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: 无效的缓冲区号 "
msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: 不能对所有事件执行 autocommand"
+msgstr "E217: 不能对所有事件执行自动命令"
msgid "No matching autocommands"
-msgstr "找不到对应的 autocommand"
+msgstr "没有匹配的自动命令"
msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand 层数过深"
+msgstr "E218: 自动命令嵌套层数过深"
#, c-format
msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgstr "%s 自动命令 \"%s\""
#, c-format
msgid "Executing %s"
msgstr "执行 %s"
-#. always scroll up, don't overwrite
#, c-format
msgid "autocommand %s"
-msgstr "autocommand %s"
+msgstr "自动命令 %s"
msgid "E219: Missing {."
-msgstr "E219: 缺少 {."
+msgstr "E219: 缺少 {。"
msgid "E220: Missing }."
-msgstr "E220: 缺少 }."
+msgstr "E220: 缺少 }。"
-msgid "No fold found"
-msgstr "找不到任何 fold"
+msgid "E490: No fold found"
+msgstr "E490: 找不到折叠"
msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: 不能在目前的 'foldmethod' 下创建 fold"
+msgstr "E350: 不能在当前的 'foldmethod' 下创建折叠"
msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: 不能在目前的 'foldmethod' 下删除 fold"
+msgstr "E351: 不能在当前的 'foldmethod' 下删除折叠"
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: 选项 'commentstring' 未设定"
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--已折叠 %3ld 行"
msgid "E222: Add to read buffer"
-msgstr "E222: 加入读缓冲中"
+msgstr "E222: 添加到已读缓冲区中"
msgid "E223: recursive mapping"
-msgstr "E223: 递归 mapping"
+msgstr "E223: 递归映射"
#, c-format
msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s 已经有全局 abbreviation 了"
+msgstr "E224: 全局缩写 %s 已存在"
#, c-format
msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s 已经有全局 mapping 了"
+msgstr "E225: 全局映射 %s 已存在"
#, c-format
msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s 已经有 abbreviation 了"
+msgstr "E226: 缩写 %s 已存在"
#, c-format
msgid "E227: mapping already exists for %s"
-msgstr "E227: %s 的 mapping 已经存在"
+msgstr "E227: 映射 %s 已存在"
msgid "No abbreviation found"
msgstr "找不到缩写"
msgid "No mapping found"
-msgstr "没有这个对应"
+msgstr "找不到映射"
msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: 不正确的模式"
+msgstr "E228: makemap: 无效的模式"
msgid "<cannot open> "
-msgstr "<不能打开>"
+msgstr "<无法打开>"
#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: 不能使用 %s 字体"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: 无法获取字体 %s"
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: 不能回到目前目录"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: 无法返回当前目录"
msgid "Pathname:"
msgstr "路径:"
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: 不能取得目前目录"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: 无法获取当前目录"
msgid "OK"
msgstr "确定"
-#. 'Cancel' button
msgid "Cancel"
msgstr "取消"
@@ -1464,45 +1862,68 @@
msgstr "Vim 对话框"
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "滚动条: 不能设定 thumb pixmap 的位置"
+msgstr "滚动条部件: 无法获取滑块图像的几何大小"
msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: 不能对信息与 callback 创建 BallonEval"
+msgstr "E232: 不能同时使用消息和回调函数来创建 BalloonEval"
msgid "E229: Cannot start the GUI"
-msgstr "E229: 不能启动图型界面"
+msgstr "E229: 无法启动图形界面"
#, c-format
msgid "E230: Cannot read from \"%s\""
msgstr "E230: 不能读取文件 \"%s\""
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: 无法启动图形界面，找不到有效的字体"
+
msgid "E231: 'guifontwide' invalid"
-msgstr "E231: 不正确的 'guifontwide'"
+msgstr "E231: 无效的 'guifontwide'"
-msgid "Error"
-msgstr "错误"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' 的值无效"
-msgid "&Ok"
-msgstr "确定(&O)"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: 无法分配颜色 %s"
+
+msgid "No match at cursor, finding next"
+msgstr "在光标处没有匹配，查找下一个"
msgid "Vim dialog..."
msgstr "Vim 对话框..."
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"是(&Y)\n"
+"否(&N)\n"
+"取消(&C)"
+
+msgid "Input _Methods"
+msgstr "输入法(_M)"
+
msgid "VIM - Search and Replace..."
-msgstr "VIM - 查找与替换..."
+msgstr "VIM - 查找和替换..."
msgid "VIM - Search..."
msgstr "VIM - 查找..."
msgid "Find what:"
-msgstr "查找:"
+msgstr "查找内容:"
msgid "Replace with:"
msgstr "替换为:"
-#. exact match only button
-msgid "Match exact word only"
-msgstr "只匹配完全相同的字"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "匹配完整的词"
+
+#. match case button
+msgid "Match case"
+msgstr "匹配大小写"
msgid "Direction"
msgstr "方向"
@@ -1514,108 +1935,130 @@
msgid "Down"
msgstr "向下"
-#. 'Find Next' button
msgid "Find Next"
-msgstr "找下一个"
+msgstr "查找下一个"
-#. 'Replace' button
msgid "Replace"
msgstr "替换"
-#. 'Replace All' button
msgid "Replace All"
-msgstr "替换全部"
+msgstr "全部替换"
-msgid "E233: cannot open display"
-msgstr "E233: <不能打开 X Server DISPLAY>"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: 从会话管理器收到 \"die\" 请求\n"
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: 不正确的字符集 (Fontset): %s"
+msgid "Close"
+msgstr "关闭"
+
+msgid "New tab"
+msgstr "新建标签"
+
+msgid "Open Tab..."
+msgstr "打开标签..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: 主窗口被意外地摧毁\n"
msgid "Font Selection"
-msgstr "字体选择"
-
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "不正确的字体名称: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: \"%s\" 不是固定宽度字体"
-
-#, c-format
-msgid "E242: Color name not recognized: %s"
-msgstr "E242: %s 为不能识别的颜色名称"
+msgstr "选择字体"
msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "使用 CUT_BUFFER0 来替换空选择"
+msgstr "使用 CUT_BUFFER0 来取代空选择"
-msgid "Filter"
-msgstr "过滤器"
+msgid "&Filter"
+msgstr "过滤(&F)"
+
+msgid "&Cancel"
+msgstr "取消(&C)"
msgid "Directories"
msgstr "目录"
-msgid "Help"
-msgstr "帮助"
+msgid "Filter"
+msgstr "过滤器"
+
+msgid "&Help"
+msgstr "帮助(&H)"
msgid "Files"
msgstr "文件"
+msgid "&OK"
+msgstr "确定(&O)"
+
msgid "Selection"
msgstr "选择"
-msgid "Undo"
-msgstr "撤消"
+msgid "Find &Next"
+msgstr "查找下一个(&N)"
+
+msgid "&Replace"
+msgstr "替换(&R)"
+
+msgid "Replace &All"
+msgstr "全部替换(&A)"
+
+msgid "&Undo"
+msgstr "撤销(&U)"
#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: 不能打开 Zap 字体 '%s'"
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: 无法加载 Zap 字体 '%s'"
#, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: 不能使用字体 %s"
-
-#, c-format
-msgid "E242: Missing color: %s"
-msgstr "E242: 找不到颜色: %s"
+msgid "E611: Can't use font %s"
+msgstr "E611: 无法使用字体 %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
-"正在发送中断子程序的信息.\n"
+"正在发送消息终止子进程。\n"
+
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: 找不到窗口标题 \"%s\""
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: 不支持参数 \"-%s\"。请用 OLE 版本。"
+msgstr "E243: 不支持的参数: \"-%s\"；请使用 OLE 版本。"
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: 无法在 MDI 应用程序中打开窗口"
msgid "Find string (use '\\\\' to find a '\\')"
-msgstr "查找字符串 (使用 '\\\\' 来表示 '\\')"
+msgstr "查找字符串 (使用 '\\\\' 来查找 '\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')"
-msgstr "查找及替换字符串 (使用 '\\\\' 来表示 '\\')"
+msgstr "查找和替换字符串 (使用 '\\\\' 来查找 '\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "未使用"
+
+msgid "Directory\t*.nothing\n"
+msgstr "目录\t*.nothing\n"
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-msgstr "Vim E458: 不能配置 color map 对象，有些颜色看起来会怪怪的"
+msgstr "Vim E458: 无法分配颜色表项，某些颜色可能不正确"
#, c-format
msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: Fontset %s 没有设定正确的字体以供显示这些字符集:"
+msgstr "E250: Fontset %s 缺少下列字符集的字体:"
#, c-format
msgid "E252: Fontset name: %s"
-msgstr "E252: 字体集(Fontset)名称: %s"
+msgstr "E252: Fontset 名称: %s"
#, c-format
msgid "Font '%s' is not fixed-width"
-msgstr "'%s' 不是固定宽度字体"
+msgstr "'%s' 不是固定宽度的字体"
#, c-format
msgid "E253: Fontset name: %s\n"
-msgstr "E253: 字体集(Fontset)名称: %s\n"
+msgstr "E253: Fontset 名称: %s\n"
#, c-format
msgid "Font0: %s\n"
@@ -1626,8 +2069,8 @@
msgstr "字体1: %s\n"
#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "字体%d宽度不是字体0的两倍\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "字体%ld的宽度不是字体0的两倍\n"
#, c-format
msgid "Font0 width: %ld\n"
@@ -1638,199 +2081,384 @@
"Font1 width: %ld\n"
"\n"
msgstr ""
-"字体1宽度: %ld\n"
+"字体1的宽度: %ld\n"
"\n"
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: 不能配置颜色 %s"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "不正确的字体集(Fontset)"
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: 不能读取 sign data!"
+#~ msgid "&Dismiss"
+#~ msgstr ""
+
+#~ msgid "no specific match"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Vim - Font Selector"
+#~ msgstr "字体选择"
+
+#~ msgid "Name:"
+#~ msgstr ""
+
+#. create toggle button
+#~ msgid "Show size in Points"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoding:"
+#~ msgstr "记录中"
+
+#, fuzzy
+#~ msgid "Font:"
+#~ msgstr "字体1: %s\n"
+
+#~ msgid "Style:"
+#~ msgstr ""
+
+#~ msgid "Size:"
+#~ msgstr ""
msgid "E256: Hangul automata ERROR"
msgstr "E256: Hangul automata 错误"
+msgid "E550: Missing colon"
+msgstr "E550: 缺少冒号"
+
+msgid "E551: Illegal component"
+msgstr "E551: 无效的部分"
+
+msgid "E552: digit expected"
+msgstr "E552: 应该要有数字"
+
#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "Page %d"
+msgstr "第 %d 页"
+
+msgid "No text to be printed"
+msgstr "没有要打印的文字"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "正在打印第 %d 页 (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr "复制 %d / %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "已打印: %s"
+
+msgid "Printing aborted"
+msgstr "打印中止"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: 写入 PostScript 输出文件出错"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: 无法打开文件 \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: 无法读取 PostScript 资源文件 \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: 文件 \"%s\" 不是 PostScript 资源文件"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: 文件 \"%s\" 不是已支持的 PostScript 资源文件"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" 资源文件版本不正确"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: 不兼容的多字节编码和字符集。"
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset 在多字节编码下不能为空。"
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: 没有指定多字节打印的默认字体。"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: 无法打开 PostScript 输出文件"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: 无法打开文件 \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: 找不到 PostScript 资源文件 \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: 找不到 PostScript 资源文件 \"cidfont.ps\""
+
+#, c-format
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: 找不到 PostScript 资源文件 \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: 无法转换至打印编码 \"%s\""
+
+msgid "Sending to printer..."
+msgstr "发送到打印机……"
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: 无法打印 PostScript 文件"
+
+msgid "Print job sent."
+msgstr "打印任务已被发送。"
msgid "Add a new database"
-msgstr "新增数据库"
+msgstr "添加一个新的数据库"
msgid "Query for a pattern"
-msgstr "查询模式"
+msgstr "查询一个模式"
msgid "Show this message"
msgstr "显示此信息"
msgid "Kill a connection"
-msgstr "结束连接"
+msgstr "结束一个连接"
msgid "Reinit all connections"
-msgstr "重设所有连接"
+msgstr "重置所有连接"
msgid "Show connections"
msgstr "显示连接"
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "这个 cscope 命令不支持分割屏幕\n"
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: 用法: cs[cope] %s"
-msgid "Usage: cstag <ident>"
-msgstr "用法: cstag <识别字>"
+msgid "This cscope command does not support splitting the window.\n"
+msgstr "这个 cscope 命令不支持分割窗口。\n"
+
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: 用法: cstag <ident>"
msgid "E257: cstag: tag not found"
msgstr "E257: cstag: 找不到 tag"
#, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) 错误: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) 错误: %d"
+
+msgid "E563: stat error"
+msgstr "E563: stat 错误"
+
+#, c-format
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s 不是目录或有效的 cscope 数据库"
#, c-format
msgid "Added cscope database %s"
-msgstr "新增 cscope 数据库 %s"
+msgstr "添加了 cscope 数据库 %s"
#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s 不是目录或 cscope 数据库"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: 读取 cscope 连接 %ld 出错"
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "读取 cscope 连接 %d 时错误"
+msgid "E561: unknown cscope search type"
+msgstr "E561: 未知的 cscope 查找类型"
-msgid "unknown cscope search type"
-msgstr "未知的 cscope 查找形态"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: 无法创建 cscope 管道"
-msgid "Could not create cscope pipes"
-msgstr "不能创建与 cscope 连接的管道"
+msgid "E622: Could not fork for cscope"
+msgstr "E622: 无法对 cscope 进行 fork"
msgid "cs_create_connection exec failed"
msgstr "cs_create_connection 执行失败"
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: 无法生成 cscope 进程"
+
msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen 失败 (to_fp)"
+msgstr "cs_create_connection: fdopen to_fp 失败"
msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen 失败 (fr_fp)"
+msgstr "cs_create_connection: fdopen fr_fp 失败"
-msgid "no cscope connections"
-msgstr "没有 cscope 连接"
+msgid "E567: no cscope connections"
+msgstr "E567: 没有 cscope 连接"
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: 找不到符合 cscope 的搜寻 %s / %s"
+msgstr "E259: cscope 查询 %s %s 没有找到匹配的结果"
+
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix 标志 %c 对 %c 无效"
msgid "cscope commands:\n"
msgstr "cscope 命令:\n"
#, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (用法: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (用法: %s)"
-msgid "duplicate cscope database not added"
-msgstr "重复的 cscope 数据库未被加入"
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: 无法打开 cscope 数据库: %s"
-msgid "maximum number of cscope connections reached"
-msgstr "已达到 cscope 最大连接数目"
+msgid "E626: cannot get cscope database information"
+msgstr "E626: 无法获取 cscope 数据库信息"
-msgid "E260: cscope connection not found"
-msgstr "E260: 找不到 cscope 连接"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: 重复的 cscope 数据库未被加入"
+
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: 已达到 cscope 的最大连接数"
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: 找不到 cscope 连接 %s"
-msgid "cscope connection closed"
-msgstr "cscope 连接已关闭"
-
#, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope 连接 %s 已关闭\n"
+msgid "cscope connection %s closed"
+msgstr "cscope 连接 %s 已关闭"
#. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches 严重错误"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches 严重错误"
#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: 读取 cscope 连接 %d 错误"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
-msgid "couldn't malloc\n"
-msgstr "不能使用 malloc\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope 标签(tag): %s\n"
-
-msgid " # line"
-msgstr " # 行 "
+msgid ""
+"\n"
+" # line"
+msgstr ""
+"\n"
+" # 行 "
msgid "filename / context / line\n"
-msgstr "文件名 / 上下文 / 行号\n"
+msgstr "文件名 / 上下文 / 行\n"
+
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Cscope 错误: %s"
msgid "All cscope databases reset"
-msgstr "重设所有 cscope 数据库"
+msgstr "所有 cscope 数据库已被重置"
msgid "no cscope connections\n"
msgstr "没有 cscope 连接\n"
msgid " # pid database name prepend path\n"
-msgstr " # pid 数据库名称 prepend path\n"
+msgstr " # pid 数据库名 prepend path\n"
-#, c-format
-msgid "%2d %-5ld %-34s <none>\n"
-msgstr "%2d %-5ld %-34s <无>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: 抱歉，此命令不可用，无法加载 MzScheme 库"
+
+msgid "invalid expression"
+msgstr "无效的表达式"
+
+msgid "expressions disabled at compile time"
+msgstr "编译时没有启用表达式"
+
+msgid "hidden option"
+msgstr "隐藏的选项"
+
+msgid "unknown option"
+msgstr "未知的选项"
+
+msgid "window index is out of range"
+msgstr "窗口索引超出范围"
+
+msgid "couldn't open buffer"
+msgstr "无法打开缓冲区"
+
+msgid "cannot save undo information"
+msgstr "无法保存撤销信息"
+
+msgid "cannot delete line"
+msgstr "无法删除行"
+
+msgid "cannot replace line"
+msgstr "无法替换行"
+
+msgid "cannot insert line"
+msgstr "无法插入行"
+
+msgid "string cannot contain newlines"
+msgstr "字符串不能包含换行(NL)"
+
+msgid "Vim error: ~a"
+msgstr "Vim 错误: ~a"
+
+msgid "Vim error"
+msgstr "Vim 错误"
+
+msgid "buffer is invalid"
+msgstr "缓冲区无效"
+
+msgid "window is invalid"
+msgstr "窗口无效"
+
+msgid "linenr out of range"
+msgstr "行号超出范围"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "不允许在 sandbox 中使用"
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
-msgstr "E263: 抱歉，这个命令不能使用，Python 程序库没有加载。"
+msgstr "E263: 抱歉，此命令不可用，无法加载 Python 库。"
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: 不能递归调用 Python"
msgid "can't delete OutputObject attributes"
msgstr "不能删除 OutputObject 属性"
msgid "softspace must be an integer"
-msgstr "softspace 必需是整数"
+msgstr "softspace 必须是整数"
msgid "invalid attribute"
-msgstr "不正确的属性"
+msgstr "无效的属性"
msgid "writelines() requires list of strings"
-msgstr "writelines() 需要 string list 当参数"
+msgstr "writelines() 需要字符串列表作参数"
msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: 不能初始化 I/O 对象"
-
-msgid "invalid expression"
-msgstr "不正确的表达式"
-
-msgid "expressions disabled at compile time"
-msgstr "因为编译时没有加入表达式(expression)的程序代码，所以不能使用表达式"
+msgstr "E264: Python: 初始化 I/O 对象出错"
msgid "attempt to refer to deleted buffer"
-msgstr "试图使用已被删除的缓冲区"
+msgstr "试图引用已被删除的缓冲区"
msgid "line number out of range"
msgstr "行号超出范围"
#, c-format
msgid "<buffer object (deleted) at %8lX>"
-msgstr "<buffer 对象 (已删除): %8lX>"
+msgstr "<缓冲区对象(已删除): %8lX>"
msgid "invalid mark name"
-msgstr "标记名称不正确"
+msgstr "无效的标记名称"
msgid "no such buffer"
msgstr "无此缓冲区"
msgid "attempt to refer to deleted window"
-msgstr "试图使用已被删除的窗口"
+msgstr "试图引用已被删除的窗口"
msgid "readonly attribute"
msgstr "只读属性"
msgid "cursor position outside buffer"
-msgstr "光标定位在缓冲区之外"
+msgstr "光标位置在缓冲区外"
#, c-format
msgid "<window object (deleted) at %.8lX>"
@@ -1847,24 +2475,9 @@
msgid "no such window"
msgstr "无此窗口"
-msgid "cannot save undo information"
-msgstr "不能保存复原信息"
-
-msgid "cannot delete line"
-msgstr "不能删除此行"
-
-msgid "cannot replace line"
-msgstr "不能替换此行"
-
-msgid "cannot insert line"
-msgstr "不能插入此行"
-
-msgid "string cannot contain newlines"
-msgstr "字符串不能包含新行"
-
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: 此命令不能使用，无法加载 Ruby 程序库(Library)"
+msgstr "E266: 抱歉，此命令不可用，无法加载 Ruby 库"
#, c-format
msgid "E273: unknown longjmp status %d"
@@ -1958,33 +2571,30 @@
msgstr "Sniff: 写入错误。结束连接"
msgid "invalid buffer number"
-msgstr "不正确的缓冲区号"
+msgstr "无效的缓冲区号"
msgid "not implemented yet"
msgstr "尚未实现"
-msgid "unknown option"
-msgstr "不正确的选项"
-
#. ???
msgid "cannot set line(s)"
-msgstr "不能设定行"
+msgstr "无法设定行"
msgid "mark not set"
msgstr "没有设定标记"
#, c-format
msgid "row %d column %d"
-msgstr "列 %d 行 %d"
+msgstr "第 %d 行 第 %d 列"
msgid "cannot insert/append line"
-msgstr "不能插入或添加此行"
+msgstr "无法插入/追加行"
msgid "unknown flag: "
-msgstr "错误的标志: "
+msgstr "未知的标志: "
msgid "unknown vimOption"
-msgstr "不正确的 VIM 选项"
+msgstr "未知的 vim 选项"
msgid "keyboard interrupt"
msgstr "键盘中断"
@@ -1993,93 +2603,91 @@
msgstr "vim 错误"
msgid "cannot create buffer/window command: object is being deleted"
-msgstr "不能创建缓冲区/窗口命令: 对象将被删除"
+msgstr "无法创建缓冲区/窗口命令: 对象将被删除"
msgid ""
"cannot register callback command: buffer/window is already being deleted"
-msgstr "不能注册 callback 命令: 缓冲区/窗口已经被删除了"
+msgstr "无法注册回调命令: 缓冲区/窗口已被删除"
#. This should never happen. Famous last word?
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
"org"
-msgstr "E280: TCL 严重错误: reflist 不可靠!? 请报告给 to vim-dev@vim.org"
+msgstr "E280: TCL 严重错误: reflist 损坏！？请报告给 vim-dev@vim.org"
msgid "cannot register callback command: buffer/window reference not found"
-msgstr "不能注册 callback 命令: 找不到缓冲区/窗口"
+msgstr "无法注册回调命令: 找不到缓冲区/窗口引用"
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "此命令不能使用, 因为无法加载 Tcl 程序库(Library)"
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr "E571: 抱歉，此命令不可用，无法加载 Tcl 库"
msgid ""
"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr "E281: TCL 错误: 退出返回值不是整数!? 请报告给 to vim-dev@vim.org"
+msgstr "E281: TCL 错误: 退出返回值不是整数！？请报告给 vim-dev@vim.org"
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: 退出返回值 %d"
msgid "cannot get line"
-msgstr "不能取得此行"
+msgstr "无法获取行"
msgid "Unable to register a command server name"
-msgstr "不能注册命令服务器名称"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: 没有注册为 \"%s\" 的服务器"
+msgstr "无法注册命令服务器名"
msgid "E248: Failed to send command to the destination program"
-msgstr "E248: 不能送出命令到目的地程序"
+msgstr "E248: 无法发送命令到目的程序"
#, c-format
-msgid "Invalid server id used: %s"
-msgstr "不正确的服务器 id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: 不能读取 VIM 的 注册表属性"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: 使用了无效的服务器 id: %s"
msgid "E251: VIM instance registry property is badly formed. Deleted!"
-msgstr "E251: VIM 的注册表属性有误。已删除。"
+msgstr "E251: VIM 实例注册属性有误。已删除！"
-msgid "Unknown option"
-msgstr "不正确的选项"
+msgid "Unknown option argument"
+msgstr "未知的选项参数"
msgid "Too many edit arguments"
-msgstr "太多编辑参数"
+msgstr "编辑参数过多"
msgid "Argument missing after"
-msgstr "缺少必要的参数:"
+msgstr "缺少必要的参数"
-msgid "Garbage after option"
-msgstr "不能辨认此选项后的命令: "
+msgid "Garbage after option argument"
+msgstr "选项参数后的内容无效"
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "太多 \"+command\" 或 \"-c command\" 参数"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "\"+command\"、\"-c command\" 或 \"--cmd command\" 参数过多"
msgid "Invalid argument for"
-msgstr "不正确的参数: "
-
-msgid "This Vim was not compiled with the diff feature."
-msgstr "您的 Vim 编译时没有加入 diff 的能力"
-
-msgid "Attempt to open script file again: \""
-msgstr "试图再次打开 script 文件: \""
-
-msgid "\"\n"
-msgstr "\"\n"
-
-msgid "Cannot open for reading: \""
-msgstr "不能为读而打开: \""
-
-msgid "Cannot open for script output: \""
-msgstr "不能为 script 输出而打开: \""
+msgstr "无效的参数"
#, c-format
msgid "%d files to edit\n"
msgstr "还有 %d 个文件等待编辑\n"
+msgid "This Vim was not compiled with the diff feature."
+msgstr "此 Vim 编译时没有加入 diff 功能"
+
+msgid "Attempt to open script file again: \""
+msgstr "试图再次打开脚本文件: \""
+
+msgid "Cannot open for reading: \""
+msgstr "无法打开并读取: \""
+
+msgid "Cannot open for script output: \""
+msgstr "无法打开并输出脚本: \""
+
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: 错误: 无法从 NetBeans 中启动 gvim\n"
+
msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: 注意: 输出不是终端(屏幕)\n"
+msgstr "Vim: 警告: 输出不是到终端(屏幕)\n"
msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: 注意: 输入不是终端(键盘)\n"
+msgstr "Vim: 警告: 输入不是来自终端(键盘)\n"
#. just in case..
msgid "pre-vimrc command line"
@@ -2087,14 +2695,14 @@
#, c-format
msgid "E282: Cannot read from \"%s\""
-msgstr "E282: 不能读取文件 \"%s\""
+msgstr "E282: 无法读取 \"%s\""
msgid ""
"\n"
"More info with: \"vim -h\"\n"
msgstr ""
"\n"
-"查询更多信息请执行: \"vim -h\"\n"
+"更多信息请见: \"vim -h\"\n"
msgid "[file ..] edit specified file(s)"
msgstr "[文件 ..] 编辑指定的文件"
@@ -2103,10 +2711,10 @@
msgstr "- 从标准输入(stdin)读取文本"
msgid "-t tag edit file where tag is defined"
-msgstr "-t tag 编辑时使用指定的 tag"
+msgstr "-t tag 编辑 tag 定义处的文件"
msgid "-q [errorfile] edit file with first error"
-msgstr "-q [errorfile] 编辑时加载第一个错误"
+msgstr "-q [errorfile] 编辑第一个出错处的文件"
msgid ""
"\n"
@@ -2115,17 +2723,20 @@
msgstr ""
"\n"
"\n"
-" 用法:"
+"用法:"
msgid " vim [arguments] "
-msgstr "vim [参数] "
+msgstr " vim [参数] "
msgid ""
"\n"
" or:"
msgstr ""
"\n"
-" 或:"
+" 或:"
+
+#~ msgid "where case is ignored prepend / to make flag upper case"
+#~ msgstr ""
msgid ""
"\n"
@@ -2137,10 +2748,13 @@
"参数:\n"
msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t只有在这之后的文件"
+msgstr "--\t\t\t在这以后只有文件名"
+
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\t不扩展通配符"
msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\t注册 gvim 到 OLE"
+msgstr "-register\t\t注册此 gvim 到 OLE"
msgid "-unregister\t\tUnregister gvim for OLE"
msgstr "-unregister\t\t取消 OLE 中的 gvim 注册"
@@ -2148,8 +2762,8 @@
msgid "-g\t\t\tRun using GUI (like \"gvim\")"
msgstr "-g\t\t\t使用图形界面 (同 \"gvim\")"
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\t前景: 启动图形界面时不 fork"
+msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f 或 --nofork\t前台: 启动图形界面时不 fork"
msgid "-v\t\t\tVi mode (like \"vi\")"
msgstr "-v\t\t\tVi 模式 (同 \"vi\")"
@@ -2158,13 +2772,13 @@
msgstr "-e\t\t\tEx 模式 (同 \"ex\")"
msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t安静 (batch) 模式 (只能与 \"ex\" 一起使用)"
+msgstr "-s\t\t\t安静(批处理)模式 (只能与 \"ex\" 一起使用)"
msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff 模式 (同 \"vimdiff\", 可迅速比较两文件不同处)"
+msgstr "-d\t\t\tDiff 模式 (同 \"vimdiff\")"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t简易模式 (同 \"evim\", modeless)"
+msgstr "-y\t\t\t容易模式 (同 \"evim\"，无模式)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\t只读模式 (同 \"view\")"
@@ -2173,7 +2787,7 @@
msgstr "-Z\t\t\t限制模式 (同 \"rvim\")"
msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t不可修改 (写入文件)"
+msgstr "-m\t\t\t不可修改(写入文件)"
msgid "-M\t\t\tModifications in text not allowed"
msgstr "-M\t\t\t文本不可修改"
@@ -2185,10 +2799,10 @@
msgstr "-l\t\t\tLisp 模式"
msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t'compatible' 传统 Vi 兼容模式"
+msgstr "-C\t\t\t兼容传统的 Vi: 'compatible'"
msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t'nocompatible' 不完全与传统 Vi 兼容，可使用 Vim 加强能力"
+msgstr "-N\t\t\t不完全兼容传统的 Vi: 'nocompatible'"
msgid "-V[N]\t\tVerbose level"
msgstr "-V[N]\t\tVerbose 等级"
@@ -2197,163 +2811,183 @@
msgstr "-D\t\t\t调试模式"
msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t不使用交换文件, 只使用内存"
+msgstr "-n\t\t\t不使用交换文件，只使用内存"
msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t列出交换文件后退出"
+msgstr "-r\t\t\t列出交换文件并退出"
msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (加文件名) \t恢复上次崩溃的资料(Recover crashed session)"
+msgstr "-r (跟文件名)\t\t恢复崩溃的会话"
msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t与 -r 一样"
+msgstr "-L\t\t\t同 -r"
msgid "-f\t\t\tDon't use newcli to open window"
msgstr "-f\t\t\t不使用 newcli 来打开窗口"
msgid "-dev <device>\t\tUse <device> for I/O"
-msgstr "-dev <device>\t\t使用 <device> 做输入输出设备"
+msgstr "-dev <device>\t\t使用 <device> 进行输入输出"
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\t启动为 希伯莱模式"
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t以 Arabic 模式启动"
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\t启动为 Farsi 模式"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\t以 Hebrew 模式启动"
+
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\t以 Farsi 模式启动"
msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t设定终端为 <terminal>"
+msgstr "-T <terminal>\t设定终端类型为 <terminal>"
msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\t使用 <vimrc> 替换任何 .vimrc"
+msgstr "-u <vimrc>\t\t使用 <vimrc> 替代任何 .vimrc"
msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-msgstr "-U <gvimrc>\t\t使用 <gvimrc> 替换任何 .gvimrc"
+msgstr "-U <gvimrc>\t\t使用 <gvimrc> 替代任何 .gvimrc"
msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t不加载任何 plugin"
+msgstr "--noplugin\t\t不加载 plugin 脚本"
+
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-P[N]\t\t打开 N 个标签页 (默认值: 每个文件一个)"
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t打开 N 个窗口 (预设是每个文件一个)"
+msgstr "-o[N]\t\t打开 N 个窗口 (默认值: 每个文件一个)"
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\t同 -o 但使用垂直分割"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\t同 -o 但垂直分割"
msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t启动后跳到文件结尾"
+msgstr "+\t\t\t启动后跳到文件末尾"
msgid "+<lnum>\t\tStart at line <lnum>"
msgstr "+<lnum>\t\t启动后跳到第 <lnum> 行"
msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t加载任何 vimrc 前执行 <command>"
+msgstr "--cmd <command>\t加载任何 vimrc 文件前执行 <command>"
msgid "-c <command>\t\tExecute <command> after loading the first file"
msgstr "-c <command>\t\t加载第一个文件后执行 <command>"
msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t加载第一个文件后载入 Session 文件<session>"
+msgstr "-S <session>\t\t加载第一个文件后执行文件 <session>"
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t从 <scriptin> 读入一般模式命令"
+msgstr "-s <scriptin>\t从文件 <scriptin> 读入正常模式的命令"
msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t对文件 <scriptout> 附加(append)所有输入的命令"
+msgstr "-w <scriptout>\t将所有输入的命令追加到文件 <scriptout>"
msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t对文件 <scriptout> 写入所有输入的命令"
+msgstr "-W <scriptout>\t将所有输入的命令写入到文件 <scriptout>"
msgid "-x\t\t\tEdit encrypted files"
-msgstr "-x\t\t\t编辑编码过的文件"
+msgstr "-x\t\t\t编辑加密的文件"
msgid "-display <display>\tConnect vim to this particular X-server"
msgstr "-display <display>\t将 vim 与指定的 X-server 连接"
msgid "-X\t\t\tDo not connect to X server"
-msgstr "-X\t\t\t不要连接到 X Server"
+msgstr "-X\t\t\t不连接到 X Server"
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t在另一个 GTK 组件内打开 Vim"
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t如有可能，在 Vim 服务器上编辑文件 <files>"
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t编辑 Vim 服务器上的文件并退出"
+msgid "--remote-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-silent <files> 同上，找不到服务器时不抱怨"
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files> 等效于 --remote, 但会等候文件完成编辑"
+msgstr "--remote-wait <files> 同 --remote 但会等待文件完成编辑"
+
+msgid ""
+"--remote-wait-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <files> 同上，找不到服务器时不抱怨"
+
+msgid "--remote-tab <files> As --remote but open tab page for each file"
+msgstr "--remote-tab <files> 同 --remote 但对每个文件打开一个标签页"
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\t送出 <keys> 到 Vim 服务器并退出"
msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-msgstr "--remote-expr <expr>\t在服务器上求表达式的值并打印结果"
+msgstr "--remote-expr <expr>\t在 Vim 服务器上求 <expr> 的值并打印结果"
msgid "--serverlist\t\tList available Vim server names and exit"
msgstr "--serverlist\t\t列出可用的 Vim 服务器名称并退出"
msgid "--servername <name>\tSend to/become the Vim server <name>"
-msgstr "--servername <name>\t送至/成为 Vim 服务器 <name>"
+msgstr "--servername <name>\t发送到或成为 Vim 服务器 <name>"
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t使用 <viminfo> 而非 .viminfo"
+msgstr "-i <viminfo>\t\t使用 <viminfo> 取代 .viminfo"
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t打印说明(也就是本信息)后退出"
+msgid "-h or --help\tPrint Help (this message) and exit"
+msgstr "-h 或 --help\t打印帮助(本信息)并退出"
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t打印版本信息后退出"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\t打印版本信息并退出"
msgid ""
"\n"
"Arguments recognised by gvim (Motif version):\n"
msgstr ""
"\n"
-"gvim 可识别的参数 (Motif 版):\n"
+"gvim (Motif 版本) 可识别的参数:\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim (neXtaw 版本) 可识别的参数:\n"
msgid ""
"\n"
"Arguments recognised by gvim (Athena version):\n"
msgstr ""
"\n"
-"gvim 可识别的参数 (Athena 版):\n"
+"gvim (Athena 版本) 可识别的参数:\n"
msgid "-display <display>\tRun vim on <display>"
-msgstr "-display <display>\t在窗口 <display> 执行 vim"
+msgstr "-display <display>\t在 <display> 上运行 vim"
msgid "-iconic\t\tStart vim iconified"
-msgstr "-iconic\t\t启动后最小化(iconified)"
+msgstr "-iconic\t\t启动后最小化"
msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t读取 Resource 时把 vim 的名称视为 <name>"
+msgstr "-name <name>\t\t读取 Resource 时把 vim 视为 <name>"
msgid "\t\t\t (Unimplemented)\n"
msgstr "\t\t\t (尚未实现)\n"
msgid "-background <color>\tUse <color> for the background (also: -bg)"
-msgstr "-background <color>\t设定 <color> 为背景色 (也可用 -bg)"
+msgstr "-background <color>\t使用 <color> 作为背景色 (也可用 -bg)"
msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-msgstr "-foreground <color>\t设定 <color> 为一般文字颜色 (也可用 -fg)"
+msgstr "-foreground <color>\t使用 <color> 作为一般文字颜色 (也可用 -fg)"
msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-msgstr "-font <font>\t使用 <font> 为一般字体 (也可用 -fn)"
+msgstr "-font <font>\t使用 <font> 作为一般字体 (也可用 -fn)"
msgid "-boldfont <font>\tUse <font> for bold text"
-msgstr "-boldfont <font>\t使用 <font> 为粗体字体"
+msgstr "-boldfont <font>\t使用 <font> 作为粗体字体"
msgid "-italicfont <font>\tUse <font> for italic text"
-msgstr "-italicfont <font>\t使用 <font> 为斜体字体"
+msgstr "-italicfont <font>\t使用 <font> 作为斜体字体"
msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr "-geometry <geom>\t使用<geom>为初始位置 (也可用 -geom)"
+msgstr "-geometry <geom>\t使用 <geom> 作为初始位置 (也可用 -geom)"
msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidth <width>\t使用宽度为 <width> 的边框 (也可用 -bw)"
+msgstr "-borderwidth <width>\t设定边框宽度为 <width> (也可用 -bw)"
msgid "-scrollbarwidth <width> Use a scrollbar width of <width> (also: -sw)"
msgstr "-scrollbarwidth <width> 设定滚动条宽度为 <width> (也可用 -sw)"
msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <height>\t设定菜单列的高度为 <height> (也可用 -mh)"
+msgstr "-menuheight <height>\t设定菜单栏高度为 <height> (也可用 -mh)"
msgid "-reverse\t\tUse reverse video (also: -rv)"
msgstr "-reverse\t\t使用反显 (也可用 -rv)"
@@ -2369,7 +3003,7 @@
"Arguments recognised by gvim (RISC OS version):\n"
msgstr ""
"\n"
-"gvim 可识别的参数 (RISC OS 版):\n"
+"gvim (RISC OS 版本) 可识别的参数:\n"
msgid "--columns <number>\tInitial width of window in columns"
msgstr "--columns <number>\t窗口初始宽度"
@@ -2382,43 +3016,48 @@
"Arguments recognised by gvim (GTK+ version):\n"
msgstr ""
"\n"
-"gvim 可识别的参数 (GTK+ 版):\n"
+"gvim (GTK+ 版本) 可识别的参数:\n"
msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <display>\t在 <display> 执行 vim (也可用 --display)"
+msgstr "-display <display>\t在 <display> 上运行 vim (也可用 --display)"
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t显示 Gnome 相关参数"
+#~ msgid "--role <role>\tSet a unique role to identify the main window"
+#~ msgstr ""
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t在另一个 GTK 部件中打开 Vim"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\t在父应用程序中打开 Vim"
+
+#~ msgid "No display"
+#~ msgstr ""
#. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"发送表达式失败。\n"
+msgid ": Send failed.\n"
+msgstr ": 发送失败。\n"
#. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"送出失败。试图在本地执行\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": 发送失败。尝试本地执行\n"
#, c-format
msgid "%d of %d edited"
msgstr "%d 中 %d 已编辑"
-msgid "Send expression failed.\n"
-msgstr "发送表达式失败。\n"
+#, fuzzy
+#~ msgid "No display: Send expression failed.\n"
+#~ msgstr "发送表达式失败。\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": 发送表达式失败。\n"
msgid "No marks set"
-msgstr "没有设定标记 (mark)"
+msgstr "没有设定标记"
#, c-format
msgid "E283: No marks matching \"%s\""
-msgstr "E283: 找不到符合 \"%s\" 的标记(mark)"
+msgstr "E283: 没有匹配 \"%s\" 的标记"
#. Highlight title
msgid ""
@@ -2426,7 +3065,7 @@
"mark line col file/text"
msgstr ""
"\n"
-"标记 行号 列 文件/文本"
+"标记 行 列 文件/文本"
#. Highlight title
msgid ""
@@ -2434,8 +3073,17 @@
" jump line col file/text"
msgstr ""
"\n"
-" 跳到 行号 列 文件/文本"
+" 跳转 行 列 文件/文本"
+#. Highlight title
+msgid ""
+"\n"
+"change line col text"
+msgstr ""
+"\n"
+" 改变 行 列 文本"
+
+#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -2444,117 +3092,119 @@
"# 文件标记:\n"
#. Write the jumplist with -'
+#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
msgstr ""
"\n"
-"# Jumplist (从新到旧):\n"
+"# 跳转列表 (从新到旧):\n"
+#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
msgstr ""
"\n"
-"# 文件内历史记录 (从新到旧):\n"
+"# 文件内的标记历史记录 (从新到旧):\n"
msgid "Missing '>'"
-msgstr "缺少对应的 '>'"
+msgstr "缺少 '>'"
-msgid "Not a valid codepage"
-msgstr "不正确的代码页"
+msgid "E543: Not a valid codepage"
+msgstr "E543: 无效的代码页"
msgid "E284: Cannot set IC values"
-msgstr "E284: 不能设定 IC 数值"
+msgstr "E284: 不能设定 IC 值"
msgid "E285: Failed to create input context"
-msgstr "E285: 不能创建输入上下文"
+msgstr "E285: 无法创建输入上下文"
msgid "E286: Failed to open input method"
-msgstr "E286: 不能打开输入法"
+msgstr "E286: 无法打开输入法"
msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr "E287: 警告: 不能移除 IM 的 callback"
+msgstr "E287: 警告: 无法设定输入法的释放回调函数"
msgid "E288: input method doesn't support any style"
-msgstr "E288: 输入法不支持任何 style"
+msgstr "E288: 输入法不支持任何风格"
msgid "E289: input method doesn't support my preedit type"
-msgstr "E289: 输入法不支持任何 style"
+msgstr "E289: 输入法不支持我的预编辑类型"
msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot 需要字体集(Fontset)"
+msgstr "E290: over-the-spot 风格需要 Fontset"
msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: 你的 GTK+ 比 1.2.3 老。不能使用状态区。"
+msgstr "E291: 你的 GTK+ 比 1.2.3 旧。状态区不可用。"
msgid "E292: Input Method Server is not running"
-msgstr "E292: 输入法管理程序(Input Method Server)未运行"
+msgstr "E292: 输入法服务器未运行"
msgid "E293: block was not locked"
msgstr "E293: 块未被锁定"
msgid "E294: Seek error in swap file read"
-msgstr "E294: 交换文件读取错误"
+msgstr "E294: 交换文件读取定位错误"
msgid "E295: Read error in swap file"
msgstr "E295: 交换文件读取错误"
msgid "E296: Seek error in swap file write"
-msgstr "E296: 交换文件写入错误"
+msgstr "E296: 交换文件写入定位错误"
msgid "E297: Write error in swap file"
msgstr "E297: 交换文件写入错误"
msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: 交换文件已经存在! (小心符号连结的安全漏洞!?)"
+msgstr "E300: 交换文件已存在 (符号连接攻击？)"
msgid "E298: Didn't get block nr 0?"
-msgstr "E298: 找不到块 0?"
+msgstr "E298: 找不到块 0？"
msgid "E298: Didn't get block nr 1?"
-msgstr "E298: 找不到块 1?"
+msgstr "E298: 找不到块 1？"
msgid "E298: Didn't get block nr 2?"
-msgstr "E298: 找不到块 2?"
+msgstr "E298: 找不到块 2？"
#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: 噢噢, 交换文件不见了!!!"
+msgstr "E301: 噢，交换文件不见了！！！"
msgid "E302: Could not rename swap file"
-msgstr "E302: 不能改变交换文件的名称"
+msgstr "E302: 无法重命名交换文件"
#, c-format
msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: 不能打开交换文件 \"%s\", 不可能恢复了"
+msgstr "E303: 无法打开 \"%s\" 的交换文件，恢复将不可能"
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: 找不到块 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): 找不到块 0？"
#, c-format
msgid "E305: No swap file found for %s"
msgstr "E305: 找不到 %s 的交换文件"
msgid "Enter number of swap file to use (0 to quit): "
-msgstr "请选择你要使用的交换文件 (按0 退出): "
+msgstr "请输入要使用的交换文件编号 (0 退出): "
#, c-format
msgid "E306: Cannot open %s"
-msgstr "E306: 不能打开 %s"
+msgstr "E306: 无法打开 %s"
msgid "Unable to read block 0 from "
-msgstr "不能读取块 0:"
+msgstr "无法读取块 0: "
msgid ""
"\n"
"Maybe no changes were made or Vim did not update the swap file."
msgstr ""
"\n"
-"可能你没做过任何修改或是 Vim 还来不及更新交换文件."
+"可能你没做过任何修改或是 Vim 还来不及更新交换文件。"
msgid " cannot be used with this version of Vim.\n"
-msgstr " 不能在本版本的 Vim 中使用.\n"
+msgstr " 不能在该版本的 Vim 中使用。\n"
msgid "Use Vim version 3.0.\n"
msgstr "使用 Vim 3.0。\n"
@@ -2564,17 +3214,17 @@
msgstr "E307: %s 看起来不像是 Vim 交换文件"
msgid " cannot be used on this computer.\n"
-msgstr " 不能在这台电脑上使用.\n"
+msgstr " 不能在这台电脑上使用。\n"
msgid "The file was created on "
-msgstr "本文件创建于 "
+msgstr "此文件创建于 "
msgid ""
",\n"
"or the file has been damaged."
msgstr ""
-",\n"
-"或是这文件已被破坏。"
+"，\n"
+"或是此文件已损坏。"
#, c-format
msgid "Using swap file \"%s\""
@@ -2582,82 +3232,101 @@
#, c-format
msgid "Original file \"%s\""
-msgstr "原文件 \"%s\""
+msgstr "原始文件 \"%s\""
msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: 警告: 原始文件可能已经修改过了"
+msgstr "E308: 警告: 原始文件可能已被修改"
#, c-format
msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: 不能从 %s 读取块 1"
+msgstr "E309: 无法从 %s 读取块 1"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???MANY LINES MISSING"
-msgstr "???缺少太多行"
+msgstr "???缺少了太多行"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???LINE COUNT WRONG"
-msgstr "???行号错误"
+msgstr "???行数错误"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???EMPTY BLOCK"
-msgstr "???空的 块"
+msgstr "???空的块"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???LINES MISSING"
-msgstr "???找不到一些行"
+msgstr "???缺少了一些行"
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: 块 1 ID 错误 (%s 不是交换文件?)"
+msgstr "E310: 块 1 ID 错误 (%s 不是交换文件？)"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???BLOCK MISSING"
-msgstr "???找不到块"
+msgstr "???缺少块"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "??? from here until ???END lines may be messed up"
-msgstr "??? 从这里到 ???END 的内容可能有问题"
+msgstr "??? 从这里到 ???END 的行可能已混乱"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? 从这里到 ???END 的内容可能被删除/插入过"
+msgstr "??? 从这里到 ???END 的行可能已被插入/删除过"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???END"
msgstr "???END"
msgid "E311: Recovery Interrupted"
-msgstr "E311: 恢复已中断"
+msgstr "E311: 恢复已被中断"
msgid ""
"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: 恢复时发生错误; 请注意开头为 ??? 的行"
+msgstr "E312: 恢复时发生错误；请注意开头为 ??? 的行"
+
+msgid "See \":help E312\" for more information."
+msgstr "更多信息请见 \":help E312\""
msgid "Recovery completed. You should check if everything is OK."
-msgstr "恢复完成. 请确定一切正常."
+msgstr "恢复完毕。请确定一切正常。"
msgid ""
"\n"
"(You might want to write out this file under another name\n"
msgstr ""
"\n"
-"(你可能想要把这个文件另存为别的文件名，\n"
+"(你可能想要将这个文件另存为别的文件名\n"
msgid "and run diff with the original file to check for changes)\n"
-msgstr "再执行 diff 与原文件比较以检查是否有改变)\n"
+msgstr "再运行 diff 与原文件比较以检查是否有改变)\n"
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
msgstr ""
-"(D)直接删除 .swp 交换文件\n"
+"然后把 .swp 文件删掉。\n"
"\n"
#. use msg() to start the scrolling properly
msgid "Swap files found:"
-msgstr "找到以下的交换文件:"
+msgstr "找到交换文件:"
msgid " In current directory:\n"
-msgstr " 在目前目录:\n"
+msgstr " 位于当前目录:\n"
msgid " Using specified name:\n"
-msgstr " Using specified name:\n"
+msgstr " 使用指定的名字:\n"
msgid " In directory "
-msgstr " 在目录 "
+msgstr " 位于目录 "
msgid " -- none --\n"
msgstr " -- 无 --\n"
@@ -2672,13 +3341,13 @@
msgstr " 日期: "
msgid " [from Vim version 3.0]"
-msgstr " [从 Vim 版本 3.0]"
+msgstr " [来自 Vim 版本 3.0]"
msgid " [does not look like a Vim swap file]"
-msgstr " [不像 Vim 的交换文件]"
+msgstr " [不像是 Vim 交换文件]"
msgid " file name: "
-msgstr " 文件名: "
+msgstr " 文件名: "
msgid ""
"\n"
@@ -2718,14 +3387,14 @@
" 进程 ID: "
msgid " (still running)"
-msgstr " (正在执行)"
+msgstr " (仍在运行)"
msgid ""
"\n"
" [not usable with this version of Vim]"
msgstr ""
"\n"
-" [不能在本版本的 Vim 上使用]"
+" [不能在该版本的 Vim 上使用]"
msgid ""
"\n"
@@ -2735,13 +3404,13 @@
" [不能在本机上使用]"
msgid " [cannot be read]"
-msgstr " [不能读取]"
+msgstr " [无法读取]"
msgid " [cannot be opened]"
-msgstr " [不能打开]"
+msgstr " [无法打开]"
msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: 不能保留, 不使用交换文件"
+msgstr "E313: 无法保留，没有交换文件"
msgid "File preserved"
msgstr "文件已保留"
@@ -2751,7 +3420,7 @@
#, c-format
msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: 错误的 lnum: %ld"
+msgstr "E315: ml_get: 无效的 lnum: %ld"
#, c-format
msgid "E316: ml_get: cannot find line %ld"
@@ -2764,13 +3433,13 @@
msgstr "stack_idx 应该是 0"
msgid "E318: Updated too many blocks?"
-msgstr "E318: 更新太多块?"
+msgstr "E318: 更新了太多的块？"
msgid "E317: pointer block id wrong 4"
msgstr "E317: 指针块 id 错误 4"
msgid "deleted block 1?"
-msgstr "删除块 1?"
+msgstr "删除了块 1？"
#, c-format
msgid "E320: Cannot find line %ld"
@@ -2784,7 +3453,7 @@
#, c-format
msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: 行号超出范围: %ld 超过结尾"
+msgstr "E322: 行号超出范围: %ld 超出结尾"
#, c-format
msgid "E323: line count wrong in block %ld"
@@ -2794,7 +3463,11 @@
msgstr "堆栈大小增加"
msgid "E317: pointer block id wrong 2"
-msgstr "E317: 指针块 id 错 2"
+msgstr "E317: 指针块 id 错误 2"
+
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: \"%s\" 符号连接出现循环"
msgid "E325: ATTENTION"
msgstr "E325: 注意"
@@ -2807,10 +3480,10 @@
"发现交换文件 \""
msgid "While opening file \""
-msgstr "当打开文件时 \""
+msgstr "正在打开文件 \""
msgid " NEWER than swap file!\n"
-msgstr " 比交换文件新!\n"
+msgstr " 比交换文件新！\n"
#. Some of these messages are long to allow translation to
#. * other languages.
@@ -2821,95 +3494,101 @@
" different instances of the same file when making changes.\n"
msgstr ""
"\n"
-"(1) 可能有另一个程序也在编辑同一个文件.\n"
-" 如果是这样，请注意不要一起写入，不然你的努力都会付诸东流。\n"
+"(1) 另一个程序可能也在编辑同一个文件。\n"
+" 如果是这样，修改时请注意避免同一个文件产生两个不同的版本。\n"
+"\n"
msgid " Quit, or continue with caution.\n"
-msgstr " 退出，或是继续编辑。\n"
+msgstr " 退出，或小心地继续。\n"
msgid ""
"\n"
"(2) An edit session for this file crashed.\n"
msgstr ""
"\n"
-"(2) 上一次编辑此文件时崩溃\n"
+"(2) 上次编辑此文件时崩溃。\n"
msgid " If this is the case, use \":recover\" or \"vim -r "
-msgstr " 如果是这样, 请用 \":recover\" 或 \"vim -r"
+msgstr " 如果是这样，请用 \":recover\" 或 \"vim -r "
msgid ""
"\"\n"
" to recover the changes (see \":help recovery\").\n"
msgstr ""
"\"\n"
-" 恢复修改内容 (进一步说明请看 \":help recovery\").\n"
+" 恢复修改的内容 (请见 \":help recovery\")。\n"
msgid " If you did this already, delete the swap file \""
-msgstr " 如果该恢复的都已经恢复了, 请直接删除此交换文件 \""
+msgstr " 如果你已经进行了恢复，请删除交换文件 \""
msgid ""
"\"\n"
" to avoid this message.\n"
msgstr ""
"\"\n"
-" 以避免再看到此信息.\n"
+" 以避免再看到此消息。\n"
msgid "Swap file \""
msgstr "交换文件 \""
msgid "\" already exists!"
-msgstr "\" 已经存在了!"
+msgstr "\" 已存在！"
msgid "VIM - ATTENTION"
msgstr "VIM - 注意"
msgid "Swap file already exists!"
-msgstr "交换文件已经存在!"
-
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit"
-msgstr ""
-"以只读方式打开(&O)\n"
-"直接编辑(&E)\n"
-"恢复(&R)\n"
-"退出(&Q)"
+msgstr "交换文件已存在！"
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
"&Quit\n"
-"&Delete it"
+"&Abort"
msgstr ""
"以只读方式打开(&O)\n"
"直接编辑(&E)\n"
"恢复(&R)\n"
"退出(&Q)\n"
-"删除交换文件(&D)"
+"中止(&A)"
+
+msgid ""
+"&Open Read-Only\n"
+"&Edit anyway\n"
+"&Recover\n"
+"&Delete it\n"
+"&Quit\n"
+"&Abort"
+msgstr ""
+"以只读方式打开(&O)\n"
+"直接编辑(&E)\n"
+"恢复(&R)\n"
+"删除交换文件(&D)\n"
+"退出(&Q)\n"
+"中止(&A)"
msgid "E326: Too many swap files found"
msgstr "E326: 找到太多交换文件"
msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: 部份菜单项不是子菜单"
+msgstr "E327: 菜单项的某部分路径不是子菜单"
msgid "E328: Menu only exists in another mode"
-msgstr "E328: 菜单只能在其它模式中使用"
+msgstr "E328: 菜单只在其它模式中存在"
-msgid "E329: No menu of that name"
-msgstr "E329: 没有那样的菜单"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: 没有菜单 \"%s\""
msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: 菜单不能指向子选单"
+msgstr "E330: 菜单路径不能指向子菜单"
msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: 不能直接把菜单项加到菜单条中"
+msgstr "E331: 不能把菜单项直接加到菜单栏中"
msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: 分隔线不能是菜单的一部分"
+msgstr "E332: 分隔线不能是菜单路径的一部分"
#. Now we have found the matching menu, and we list the mappings
#. Highlight title
@@ -2921,21 +3600,21 @@
"--- 菜单 ---"
msgid "Tear off this menu"
-msgstr "切下此菜单"
+msgstr "撕下此菜单"
msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: 菜单必需指向一个菜单项"
+msgstr "E333: 菜单路径必须指向菜单项"
#, c-format
msgid "E334: Menu not found: %s"
-msgstr "E334: [菜单] 找不到 %s"
+msgstr "E334: 找不到菜单: %s"
#, c-format
msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s 模式未定义菜单"
+msgstr "E335: %s 模式中菜单未定义"
msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: 菜单必需指向子菜单"
+msgstr "E336: 菜单路径必须指向子菜单"
msgid "E337: Menu not found - check menu names"
msgstr "E337: 找不到菜单 - 请检查菜单名称"
@@ -2946,31 +3625,30 @@
#, c-format
msgid "line %4ld:"
-msgstr "行 %4ld:"
+msgstr "第 %4ld 行:"
-msgid "[string too long]"
-msgstr "[字符串太长]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: 无效的寄存器名: '%s'"
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "简体中文信息维护者: Wang Jun <junw@turbolinux.com.cn>"
+msgstr "简体中文消息维护者: Yuheng Xie <elephant@linux.net.cn>"
msgid "Interrupt: "
msgstr "已中断: "
-msgid "Hit ENTER to continue"
-msgstr "请按 ENTER 继续"
-
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
msgstr "请按 ENTER 或其它命令继续"
+#, c-format
+msgid "%s line %ld"
+msgstr "%s 第 %ld 行"
+
msgid "-- More --"
msgstr "-- 更多 --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: 向下/向上一行, 空格/b: 一页, d/u: 半页, q: 退出)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: 向下一行, 空白键: 一页, d: 半页, q: 退出)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " 空格/d/j: 屏幕/页/行 下翻，b/u/k: 上翻，q: 退出"
msgid "Question"
msgstr "问题"
@@ -2979,17 +3657,8 @@
"&Yes\n"
"&No"
msgstr ""
-"&Y是\n"
-"&N否"
-
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Y是\n"
-"&N否\n"
-"&C取消"
+"是(&Y)\n"
+"否(&N)"
msgid ""
"&Yes\n"
@@ -2998,11 +3667,14 @@
"&Discard All\n"
"&Cancel"
msgstr ""
-"&Y是\n"
-"&N否\n"
-"&A全部保存\n"
-"&D全部不存\n"
-"&C取消"
+"是(&Y)\n"
+"否(&N)\n"
+"全部保存(&A)\n"
+"全部丢弃(&D)\n"
+"取消(&C)"
+
+msgid "Select Directory dialog"
+msgstr "选择目录对话框"
msgid "Save File dialog"
msgstr "保存文件对话框"
@@ -3012,35 +3684,51 @@
#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: 主控台(Console)模式时没有文件浏览器(file browser)"
+msgstr "E338: 抱歉，控制台模式下没有文件浏览器"
+
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf() 的参数不足"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: printf() 的参数过多"
msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: 注意: 你正在修改一个只读文件"
+msgstr "W10: 警告: 正在修改一个只读文件"
+
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "请输入数字或点击鼠标 (<Enter> 取消): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "请选择数字 (<Enter> 取消): "
msgid "1 more line"
-msgstr "还有一行"
+msgstr "多了 1 行"
msgid "1 line less"
-msgstr "少于一行"
+msgstr "少了 1 行"
#, c-format
msgid "%ld more lines"
-msgstr " 还有 %ld 行"
+msgstr "多了 %ld 行"
#, c-format
msgid "%ld fewer lines"
-msgstr "只剩 %ld 行"
+msgstr "少了 %ld 行"
msgid " (Interrupted)"
msgstr " (已中断)"
+msgid "Beep!"
+msgstr "Beep!"
+
msgid "Vim: preserving files...\n"
-msgstr "Vim: 保留文件中...\n"
+msgstr "Vim: 正在保留文件……\n"
#. close all memfiles, without deleting
msgid "Vim: Finished.\n"
-msgstr "Vim: 结束.\n"
+msgstr "Vim: 结束。\n"
+#, c-format
msgid "ERROR: "
msgstr "错误: "
@@ -3050,14 +3738,14 @@
"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
msgstr ""
"\n"
-"[bytes] 全部 alloc-freed %lu-%lu, 使用中 %lu, peak 使用 %lu\n"
+"[字节] 总共 alloc-free %lu-%lu，使用中 %lu，高峰使用 %lu\n"
#, c-format
msgid ""
"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
"\n"
msgstr ""
-"[调用] 全部 re/malloc(): %lu, 全部 free()': %lu\n"
+"[调用] 总共 re/malloc(): %lu，总共 free()': %lu\n"
"\n"
msgid "E340: Line is becoming too long"
@@ -3069,26 +3757,26 @@
#, c-format
msgid "E342: Out of memory! (allocating %lu bytes)"
-msgstr "E342: 内存不足! (尝试配置 %lu 字节组)"
+msgstr "E342: 内存不足！(分配 %lu 字节)"
#, c-format
msgid "Calling shell to execute: \"%s\""
msgstr "调用 shell 执行: \"%s\""
-msgid "Missing colon"
-msgstr "缺少冒号"
+msgid "E545: Missing colon"
+msgstr "E545: 缺少冒号"
-msgid "Illegal mode"
-msgstr "不正确的模式"
+msgid "E546: Illegal mode"
+msgstr "E546: 无效的模式"
-msgid "Illegal mouseshape"
-msgstr "不正确的鼠标形状"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: 无效的鼠标形状"
-msgid "digit expected"
-msgstr "应该为数字"
+msgid "E548: digit expected"
+msgstr "E548: 此处需要数字"
-msgid "Illegal percentage"
-msgstr "不正确的百分比"
+msgid "E549: Illegal percentage"
+msgstr "E549: 无效的百分比"
msgid "Enter encryption key: "
msgstr "输入密码: "
@@ -3097,17 +3785,17 @@
msgstr "请再输入一次: "
msgid "Keys don't match!"
-msgstr "两次输入密码不同!"
+msgstr "两次密码不匹配！"
#, c-format
msgid ""
"E343: Invalid path: '**[number]' must be at the end of the path or be "
"followed by '%s'."
-msgstr "E343: 不正确的路径: '**[number]' 必需要在路径结尾或要接著 '%s'"
+msgstr "E343: 无效的路径: '**[number]' 必须在路径末尾或者后面接 '%s'。"
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath 中没有目录 \"%s\""
+msgstr "E344: cdpath 中找不到目录 \"%s\""
#, c-format
msgid "E345: Can't find file \"%s\" in path"
@@ -3121,11 +3809,35 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: 在路径中找不到更多的文件 \"%s\""
-msgid "Illegal component"
-msgstr "不正确的组件"
+#. Get here when the server can't be found.
+#~ msgid "Cannot connect to Netbeans #2"
+#~ msgstr ""
+
+#~ msgid "Cannot connect to Netbeans"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+#~ msgstr ""
+
+#~ msgid "read from Netbeans socket"
+#~ msgstr ""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: 缓冲区 %ld 丢失 NetBeans 连接"
+
+msgid "E505: "
+msgstr "E505: "
+
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' 为空"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: 求值功能不可用"
msgid "Warning: terminal cannot highlight"
-msgstr "注意: 你的终端不能显示高亮度"
+msgstr "警告: 你的终端不能显示高亮"
msgid "E348: No string under cursor"
msgstr "E348: 光标处没有字符串"
@@ -3134,56 +3846,78 @@
msgstr "E349: 光标处没有识别字"
msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: 不能在目前的 'foldmethod' 下删除 fold"
+msgstr "E352: 不能在当前的 'foldmethod' 下删除 fold"
+
+msgid "E664: changelist is empty"
+msgstr "E664: 改变列表为空"
+
+msgid "E662: At start of changelist"
+msgstr "E662: 已在改变列表的开始处"
+
+msgid "E663: At end of changelist"
+msgstr "E663: 已在改变列表的末尾处"
+
+msgid "Type :quit<Enter> to exit Vim"
+msgstr "输入 :quit<Enter> 退出 Vim"
#, c-format
msgid "1 line %sed 1 time"
-msgstr "一行 %s 过 一次"
+msgstr "1 行 %s 了 1 次"
#, c-format
msgid "1 line %sed %d times"
-msgstr "一行 %s 过 %d 次"
+msgstr "1 行 %s 了 %d 次"
#, c-format
msgid "%ld lines %sed 1 time"
-msgstr "%ld 行 %s 过 一次"
+msgstr "%ld 行 %s 了 1 次"
#, c-format
msgid "%ld lines %sed %d times"
-msgstr "%ld 行 %s 过 %d 次"
+msgstr "%ld 行 %s 了 %d 次"
#, c-format
msgid "%ld lines to indent... "
-msgstr "识别 %ld 行..."
+msgstr "缩进 %ld 行…… "
msgid "1 line indented "
-msgstr "一行已识别"
+msgstr "缩进了 1 行 "
#, c-format
msgid "%ld lines indented "
-msgstr "已识别 %ld 行"
+msgstr "缩进了 %ld 行 "
+
+msgid "E748: No previously used register"
+msgstr "E748: 没有前一个使用的寄存器"
#. must display the prompt
msgid "cannot yank; delete anyway"
-msgstr "不能复制; 直接删除"
+msgstr "无法复制；改为删除"
msgid "1 line changed"
-msgstr " 1 行 ~ed"
+msgstr "改变了 1 行"
#, c-format
msgid "%ld lines changed"
-msgstr " %ld 行 ~ed"
+msgstr "改变了 %ld 行"
#, c-format
msgid "freeing %ld lines"
-msgstr "释放 %ld 行中"
+msgstr "释放了 %ld 行"
+
+msgid "block of 1 line yanked"
+msgstr "复制了 1 行的块"
msgid "1 line yanked"
-msgstr "已复制 1 行"
+msgstr "复制了 1 行"
+
+#, c-format
+msgid "block of %ld lines yanked"
+msgstr "复制了 %ld 行的块"
#, c-format
msgid "%ld lines yanked"
-msgstr "已复制 %ld 行"
+msgstr "复制了 %ld 行"
#, c-format
msgid "E353: Nothing in register %s"
@@ -3198,8 +3932,9 @@
"--- 寄存器 ---"
msgid "Illegal register name"
-msgstr "不正确的寄存器名称"
+msgstr "无效的寄存器名"
+#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -3208,144 +3943,152 @@
"# 寄存器:\n"
#, c-format
-msgid "Unknown register type %d"
-msgstr "未知的注册类型: %d"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: 寄存器名称错误: '%s'"
+msgid "E574: Unknown register type %d"
+msgstr "E574: 未知的寄存器类型 %d"
#, c-format
msgid "%ld Cols; "
msgstr "%ld 列; "
-#, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "选择了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字符(Bytes)"
+#, fuzzy, c-format
+#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+#~ msgstr "选择了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字符(Bytes)"
+
+#, fuzzy, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "选择了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字符(Chars); %ld/%ld"
+
+#, fuzzy, c-format
+#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+#~ msgstr "列 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字符(Byte) %ld/%ld"
+
+#, fuzzy, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"列 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字符(Char) %ld/%ld; 字符(Byte) %ld/%ld"
#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "列 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字符(Byte) %ld/%ld"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
-#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
msgid "Thanks for flying Vim"
msgstr "感谢您选择 Vim"
-msgid "Option not supported"
-msgstr "不支持该选项"
+msgid "E518: Unknown option"
+msgstr "E518: 未知的选项"
-msgid "Not allowed in a modeline"
-msgstr "不能在模式行里出现"
+msgid "E519: Option not supported"
+msgstr "E519: 不支持该选项"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t当前设置: "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: 不允许在 modeline 中使用"
-msgid "Number required after ="
-msgstr "= 后需要有数字"
+msgid "E521: Number required after ="
+msgstr "E521: = 后面需要数字"
-msgid "Not found in termcap"
-msgstr "Termcap 里面找不到"
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap 里面找不到"
#, c-format
-msgid "Illegal character <%s>"
-msgstr "不正确的字符 <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: 无效的字符 <%s>"
-msgid "Not allowed here"
-msgstr "这里不可使用"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: 不能设定 'term' 为空字符串"
-msgid "Cannot set 'term' to empty string"
-msgstr "不能设定 'term' 为空字符串"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: 在图形界面中不能改变终端"
-msgid "Cannot change term in GUI"
-msgstr "在图型界面中不能切换终端"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: 请用 \":gui\" 启动图形界面"
-msgid "Use \":gui\" to start the GUI"
-msgstr "输入 \":gui\" 来启动图形界面"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' 和 'patchmode' 相等"
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' 跟 'patchmode' 是一样的"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: 在 GTK+ 2 图形界面中不能更改"
-msgid "Zero length string"
-msgstr "零长度字符串"
+msgid "E524: Missing colon"
+msgstr "E524: 缺少冒号"
+
+msgid "E525: Zero length string"
+msgstr "E525: 字符串长度为零"
#, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> 后缺少数字"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> 后面缺少数字"
-msgid "Missing comma"
-msgstr "缺少逗号"
+msgid "E527: Missing comma"
+msgstr "E527: 缺少逗号"
-msgid "Must specify a ' value"
-msgstr "必需指定一个 ' 值"
+msgid "E528: Must specify a ' value"
+msgstr "E528: 必须指定一个 ' 值"
-msgid "contains unprintable character"
-msgstr "包含不能显示的字符"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: 包含不可显示字符或宽字符"
-msgid "Invalid font(s)"
-msgstr "不正确的字体"
+msgid "E596: Invalid font(s)"
+msgstr "E596: 无效的字体"
-msgid "can't select fontset"
-msgstr "不能使用字体集(Fontset)"
+msgid "E597: can't select fontset"
+msgstr "E597: 无法选择 Fontset"
-msgid "Invalid fontset"
-msgstr "不正确的字体集(Fontset)"
+msgid "E598: Invalid fontset"
+msgstr "E598: 无效的 Fontset"
-msgid "can't select wide font"
-msgstr "不能使用设定的宽字体(Widefont)"
+msgid "E533: can't select wide font"
+msgstr "E533: 无法选择宽字体"
-msgid "Invalid wide font"
-msgstr "不正确的宽字体(Widefont)"
+msgid "E534: Invalid wide font"
+msgstr "E534: 无效的宽字体"
#, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> 后有不正确的字符"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> 后面有无效的字符"
-msgid "comma required"
-msgstr "需要逗号"
+msgid "E536: comma required"
+msgstr "E536: 需要逗号"
#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' 必需是空白或包含 %s"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' 必须为空或包含 %s"
-msgid "No mouse support"
-msgstr "不支持鼠标"
+msgid "E538: No mouse support"
+msgstr "E538: 不支持鼠标"
-msgid "Unclosed expression sequence"
-msgstr "没有结束的表达式: "
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: 没有结束的表达式序列"
-msgid "too many items"
-msgstr "太多对象"
+msgid "E541: too many items"
+msgstr "E541: 项目过多"
-msgid "unbalanced groups"
-msgstr "不对称的组"
+msgid "E542: unbalanced groups"
+msgstr "E542: 错乱的组"
-msgid "A preview window already exists"
-msgstr "预览窗口已经存在了"
+msgid "E590: A preview window already exists"
+msgstr "E590: 预览窗口已存在"
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' 不能比 'winminheight' 更少"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' 不能比 'winminwidth' 更少"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic 需要 UTF-8，请执行 ':set encoding=utf-8'"
#, c-format
-msgid "Need at least %d lines"
-msgstr "至少需要 %d 行"
+msgid "E593: Need at least %d lines"
+msgstr "E593: 至少需要 %d 行"
#, c-format
-msgid "Need at least %d columns"
-msgstr "至少需要 %d 列"
+msgid "E594: Need at least %d columns"
+msgstr "E594: 至少需要 %d 列"
#, c-format
msgid "E355: Unknown option: %s"
-msgstr "E355: 不正确的选项: %s"
+msgstr "E355: 未知的选项: %s"
msgid ""
"\n"
@@ -3359,14 +4102,14 @@
"--- Global option values ---"
msgstr ""
"\n"
-"--- 全局 选项值 ---"
+"--- 全局选项值 ---"
msgid ""
"\n"
"--- Local option values ---"
msgstr ""
"\n"
-"--- 本地 选项值 ---"
+"--- 局部选项值 ---"
msgid ""
"\n"
@@ -3412,9 +4155,6 @@
msgid "cannot change console mode ?!\n"
msgstr "不能切换主控台(console)模式 !?\n"
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: 不支持设定屏幕模式"
-
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: 不是主控台(console)??\n"
@@ -3440,13 +4180,12 @@
#~ msgid "...(truncated)"
#~ msgstr ""
+#~ msgid "Message"
+#~ msgstr ""
+
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' 不是 80, 不能执行外部命令"
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: 调用函数库 \"%s\"() 失败"
-
msgid "E237: Printer selection failed"
msgstr "E237: 不能选择此打印机"
@@ -3455,12 +4194,13 @@
msgstr "从 %s 到 %s"
#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: 未知的打印机字体: %s"
+
+#, c-format
msgid "E238: Print error: %s"
msgstr "E238: 打印错误: %s"
-msgid "Unknown"
-msgstr "未知"
-
#, c-format
msgid "Printing '%s'"
msgstr "已打印: '%s'"
@@ -3483,6 +4223,7 @@
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: CVim: 拦截到信号(signal) %s\n"
+#, c-format
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: 拦截到致命的信号(deadly signale)\n"
@@ -3545,9 +4286,31 @@
"\n"
"命令已结束\n"
+#, fuzzy
+#~ msgid "XSMP lost ICE connection"
+#~ msgstr "显示连接"
+
+#, c-format
+#~ msgid "dlerror = \"%s\""
+#~ msgstr ""
+
msgid "Opening the X display failed"
msgstr "打开 X Window 失败"
+#~ msgid "XSMP handling save-yourself request"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "XSMP opening connection"
+#~ msgstr "没有 cscope 连接"
+
+#~ msgid "XSMP ICE connection watch failed"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "XSMP SmcOpenConnection failed: %s"
+#~ msgstr ""
+
msgid "At line"
msgstr "在行号 "
@@ -3587,7 +4350,7 @@
msgstr ""
"在你的 $PATH 中找不到 VIMRUN.EXE.\n"
"外部命令执行完毕后将不会暂停.\n"
-"进一步说明请执行 :help win32-vimrun "
+"进一步说明请见 :help win32-vimrun"
msgid "Vim Warning"
msgstr "Vim 警告"
@@ -3621,8 +4384,8 @@
msgid "E379: Missing or empty directory name"
msgstr "E379: 找不到目录名称或是空的目录名称"
-msgid "No more items"
-msgstr "没有其它对象"
+msgid "E553: No more items"
+msgstr "E553: 没有更多的项"
#, c-format
msgid "(%d of %d)%s%s: "
@@ -3632,50 +4395,122 @@
msgstr " (行已删除)"
msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix 堆栈结尾"
+msgstr "E380: Quickfix 堆栈底端"
msgid "E381: At top of quickfix stack"
msgstr "E381: Quickfix 堆栈顶端"
#, c-format
msgid "error list %d of %d; %d errors"
-msgstr "错误列表 %d/%d; 共有 %d 项错误"
+msgstr "错误列表 %d / %d；共 %d 个错误"
msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: 不能写入，'buftype' 选项已设定"
+msgstr "E382: 无法写入，已设定选项 'buftype'"
+
+#~ msgid "E683: File name missing or invalid pattern"
+#~ msgstr ""
+
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "无法打开文件 \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: 缓冲区未加载"
+
+msgid "E777: String or List expected"
+msgstr "E777: 此处需要 String 或者 List"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: %s%%[] 中有无效的项"
msgid "E339: Pattern too long"
-msgstr "E339: 名字太长"
+msgstr "E339: 模式太长"
+
+msgid "E50: Too many \\z("
+msgstr "E50: 太多 \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: 太多 %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: 不匹配的 \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: 不匹配的 %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: 不匹配的 %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: 不匹配的 %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ 后面有无效的字符"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: 太多复杂的 %s{...}s"
#, c-format
msgid "E61: Nested %s*"
-msgstr "E61: 巢状 %s*"
+msgstr "E61: 嵌套的 %s*"
#, c-format
msgid "E62: Nested %s%c"
-msgstr "E62: 巢状 %s%c"
+msgstr "E62: 嵌套的 %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: 不正确地使用 \\_"
#, c-format
msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c 没有接东西"
+msgstr "E64: %s%c 前面无内容"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: 无效的回引"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: 此处不允许 \\z("
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: 此处不允许 \\z1 等"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: \\z 后面有无效的字符"
#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "语法错误: %s{...}"
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ 后缺少 ]"
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: 不能执行; regular expression 太复杂?"
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: 空的 %s%%[]"
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression 造成堆栈用光的错误"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] 后面有无效的字符"
+
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: %s%% 后面有无效的字符"
+
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ 后缺少 ]"
+
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} 中语法错误"
msgid "External submatches:\n"
msgstr "外部符合:\n"
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--已 fold %3ld 行"
-
msgid " VREPLACE"
msgstr " V-替换"
@@ -3683,7 +4518,7 @@
msgstr " 替换"
msgid " REVERSE"
-msgstr " 反转"
+msgstr " 反向"
msgid " INSERT"
msgstr " 插入"
@@ -3695,10 +4530,13 @@
msgstr " (替换)"
msgid " (vreplace)"
-msgstr " (v-替换)"
+msgstr " (V-替换)"
msgid " Hebrew"
-msgstr " 希伯莱"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
msgid " (lang)"
msgstr " (语言)"
@@ -3706,30 +4544,30 @@
msgid " (paste)"
msgstr " (粘帖)"
-msgid " SELECT"
-msgstr " 选取"
-
msgid " VISUAL"
msgstr " 可视"
-msgid " BLOCK"
-msgstr " 块"
+msgid " VISUAL LINE"
+msgstr " 可视 行"
-msgid " LINE"
-msgstr " 行"
+msgid " VISUAL BLOCK"
+msgstr " 可视 块"
+
+msgid " SELECT"
+msgstr " 选择"
+
+msgid " SELECT LINE"
+msgstr " 选择 行"
+
+msgid " SELECT BLOCK"
+msgstr " 选择 块"
msgid "recording"
msgstr "记录中"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "已查找到文件开头；再从结尾继续查找"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "已查找到文件结尾；再从开头继续查找"
-
#, c-format
msgid "E383: Invalid search string: %s"
-msgstr "E383: 错误的查找字符串: %s"
+msgstr "E383: 无效的查找字符串: %s"
#, c-format
msgid "E384: search hit TOP without match for: %s"
@@ -3765,6 +4603,10 @@
msgid "Scanning included file: %s"
msgstr "查找包含文件: %s"
+#, fuzzy, c-format
+#~ msgid "Searching included file %s"
+#~ msgstr "查找包含文件: %s"
+
msgid "E387: Match is on current line"
msgstr "E387: 当前行匹配"
@@ -3780,9 +4622,364 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: 找不到 pattern"
+#, fuzzy
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E297: 交换文件写入错误"
+
+#, fuzzy
+#~ msgid "E758: Truncated spell file"
+#~ msgstr "E237: 不能选择此打印机"
+
+#, fuzzy, c-format
+#~ msgid "Trailing text in %s line %d: %s"
+#~ msgstr "\"%s%s\" 中断点: 第 %ld 行"
+
+#, c-format
+#~ msgid "Affix name too long in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
+#~ msgstr "E431: Tag 文件 \"%s\" 格式错误"
+
+#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
+#~ msgstr ""
+
+#~ msgid "Compressing word tree..."
+#~ msgstr ""
+
+#~ msgid "E756: Spell checking is not enabled"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading spell file \"%s\""
+#~ msgstr "使用交换文件 \"%s\""
+
+#, fuzzy
+#~ msgid "E757: This does not look like a spell file"
+#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+
+#, fuzzy
+#~ msgid "E771: Old spell file, needs to be updated"
+#~ msgstr "E173: 还有 %ld 个文件未编辑"
+
+#~ msgid "E772: Spell file is for newer version of Vim"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E770: Unsupported section in spell file"
+#~ msgstr "E297: 交换文件写入错误"
+
+#, fuzzy, c-format
+#~ msgid "Warning: region %s not supported"
+#~ msgstr "不支持该选项"
+
+#, fuzzy, c-format
+#~ msgid "Reading affix file %s ..."
+#~ msgstr "查找 tag 文件 \"%s\""
+
+#, c-format
+#~ msgid "Conversion failure for word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Conversion in %s not supported: from %s to %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Conversion in %s not supported"
+#~ msgstr "不支持该选项"
+
+#, fuzzy, c-format
+#~ msgid "Invalid value for FLAG in %s line %d: %s"
+#~ msgstr "不正确的服务器 id : %s"
+
+#, c-format
+#~ msgid "FLAG after using flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate affix in %s line %d: %s"
+#~ msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+
+#, c-format
+#~ msgid ""
+#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+#~ "line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected Y or N in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Broken condition in %s line %d: %s"
+#~ msgstr "\"%s%s\" 中断点: 第 %ld 行"
+
+#, c-format
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected REP(SAL) count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected MAP count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate character in MAP in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Missing FOL/LOW/UPP line in %s"
+#~ msgstr ""
+
+#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Too many postponed prefixes"
+#~ msgstr "太多编辑参数"
+
+#, fuzzy
+#~ msgid "Too many compound flags"
+#~ msgstr "太多编辑参数"
+
+#~ msgid "Too many posponed prefixes and/or compound flags"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Missing SOFO%s line in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Both SAL and SOFO lines in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Flag is not a number in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Illegal flag in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%s value differs from what is used in another .aff file"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading dictionary file %s ..."
+#~ msgstr "扫描字典: %s"
+
+#, c-format
+#~ msgid "E760: No word count in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "line %6d, word %6d - %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate word in %s line %d: %s"
+#~ msgstr "每一行都找不到模式: %s"
+
+#, c-format
+#~ msgid "First duplicate word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%d duplicate word(s) in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading word file %s ..."
+#~ msgstr "从标准输入读..."
+
+#, c-format
+#~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "/encoding= line after word ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Too many regions in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "/ line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Invalid region nr in %s line %d: %s"
+#~ msgstr "不正确的服务器 id : %s"
+
+#, c-format
+#~ msgid "Unrecognized flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d words with non-ASCII characters"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+#~ msgstr ""
+
+#~ msgid "Reading back spell file..."
+#~ msgstr ""
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+#~ msgid "Performing soundfolding..."
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Number of words after soundfolding: %ld"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Total number of words: %d"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing suggestion file %s ..."
+#~ msgstr "写入 viminfo 文件 \"%s\" 中"
+
+#, c-format
+#~ msgid "Estimated runtime memory use: %d bytes"
+#~ msgstr ""
+
+#~ msgid "E751: Output file name must not have region name"
+#~ msgstr ""
+
+#~ msgid "E754: Only up to 8 regions supported"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E755: Invalid region in %s"
+#~ msgstr "E15: 不正确的表达式: %s"
+
+#~ msgid "Warning: both compounding and NOBREAK specified"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing spell file %s ..."
+#~ msgstr "写入 viminfo 文件 \"%s\" 中"
+
+#, fuzzy
+#~ msgid "Done!"
+#~ msgstr "向下"
+
+#, c-format
+#~ msgid "E765: 'spellfile' does not have %ld entries"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word removed from %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word added to %s"
+#~ msgstr ""
+
+#~ msgid "E763: Word characters differ between spell files"
+#~ msgstr ""
+
+#~ msgid "Sorry, no suggestions"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Sorry, only %ld suggestions"
+#~ msgstr ""
+
+#. avoid more prompt
+#, fuzzy, c-format
+#~ msgid "Change \"%.*s\" to:"
+#~ msgstr "将改变保存到 \"%.*s\"?"
+
+#, c-format
+#~ msgid " < \"%.*s\""
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E752: No previous spell replacement"
+#~ msgstr "E35: 没有前一个查找命令"
+
+#, fuzzy, c-format
+#~ msgid "E753: Not found: %s"
+#~ msgstr "E334: [菜单] 找不到 %s"
+
+#, fuzzy, c-format
+#~ msgid "E778: This does not look like a .sug file: %s"
+#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+
+#, c-format
+#~ msgid "E779: Old .sug file, needs to be updated: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E780: .sug file is for newer version of Vim: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E781: .sug file doesn't match .spl file: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E782: error while reading .sug file: %s"
+#~ msgstr "E47: 读取错误文件失败"
+
+#. This should have been checked when generating the .spl
+#. * file.
+#~ msgid "E783: duplicate char in MAP entry"
+#~ msgstr ""
+
#, c-format
msgid "E390: Illegal argument: %s"
-msgstr "E390: 参数不正确: %s"
+msgstr "E390: 无效的参数: %s"
#, c-format
msgid "E391: No such syntax cluster: %s"
@@ -3834,12 +5031,13 @@
msgid "maximal "
msgstr "最大"
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: 使用了不正确的参数"
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "匹配 %d"
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: 找不到 %s 的 region item"
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "少于一行"
msgid "E395: contains argument not accepted here"
msgstr "E395: 使用了不正确的参数"
@@ -3847,12 +5045,23 @@
msgid "E396: containedin argument not accepted here"
msgstr "E396: 使用了不正确的参数"
+msgid "E393: group[t]here not accepted here"
+msgstr "E393: 使用了不正确的参数"
+
+#, c-format
+msgid "E394: Didn't find region item for %s"
+msgstr "E394: 找不到 %s 的 region item"
+
msgid "E397: Filename required"
msgstr "E397: 需要文件名称"
#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: 缺少 ']': %s"
+
+#, c-format
msgid "E398: Missing '=': %s"
-msgstr "E398: 缺少 \"=\": %s"
+msgstr "E398: 缺少 '=': %s"
#, c-format
msgid "E399: Not enough arguments: syntax region %s"
@@ -3874,7 +5083,7 @@
#, c-format
msgid "E404: Illegal arguments: %s"
-msgstr "E404: 参数不正确: %s"
+msgstr "E404: 无效的参数: %s"
#, c-format
msgid "E405: Missing equal sign: %s"
@@ -3882,7 +5091,7 @@
#, c-format
msgid "E406: Empty argument: %s"
-msgstr "E406: 空参数: %s"
+msgstr "E406: 空的参数: %s"
#, c-format
msgid "E407: %s not allowed here"
@@ -3900,6 +5109,9 @@
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: 不正确的 :syntax 子命令: %s"
+#~ msgid "E679: recursive loop loading syncolor.vim"
+#~ msgstr ""
+
#, c-format
msgid "E411: highlight group not found: %s"
msgstr "E411: 找不到 highlight group: %s"
@@ -3947,23 +5159,30 @@
#, c-format
msgid "E423: Illegal argument: %s"
-msgstr "E423: 参数不正确: %s"
+msgstr "E423: 无效的参数: %s"
msgid "E424: Too many different highlighting attributes in use"
msgstr "E424: 使用了太多不同的高亮度属性"
-msgid "at bottom of tag stack"
-msgstr "标签(tag)堆栈结尾"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
-msgid "at top of tag stack"
-msgstr "标签(tag)堆栈开头"
+#, fuzzy
+#~ msgid "W18: Invalid character in group name"
+#~ msgstr "E182: 命令名称不正确"
+
+msgid "E555: at bottom of tag stack"
+msgstr "E555: 已在 tag 堆栈底部"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: 已在 tag 堆栈顶部"
msgid "E425: Cannot go before first matching tag"
-msgstr "E425: 已经在最前面的标签(tag)了"
+msgstr "E425: 已到第一个匹配的 tag"
#, c-format
msgid "E426: tag not found: %s"
-msgstr "E426: 找不到标签(tag): %s"
+msgstr "E426: 找不到 tag: %s"
msgid " # pri kind tag"
msgstr " # pri kind tag"
@@ -3971,18 +5190,11 @@
msgid "file\n"
msgstr "文件\n"
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "输入 nr 或选择 (<CR> 退出): "
-
msgid "E427: There is only one matching tag"
-msgstr "E427: 只有此项符合"
+msgstr "E427: 只有一个匹配的 tag"
msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: 己经在最后一个符合的标签(tag)了"
+msgstr "E428: 己到最后一个匹配的 tag"
#, c-format
msgid "File \"%s\" does not exist"
@@ -3991,13 +5203,13 @@
#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
-msgstr "找到 tag: %d/%d%s"
+msgstr "找到 tag: %d / %d%s"
msgid " or more"
msgstr " 或更多"
msgid " Using tag with different case!"
-msgstr " 以不同大小写来使用 tag!"
+msgstr " 以不同大小写来使用 tag！"
#, c-format
msgid "E429: File \"%s\" does not exist"
@@ -4011,15 +5223,9 @@
"\n"
" # 到 tag 从 行 在 文件/文本"
-msgid "Linear tag search"
-msgstr "线性查找标签 (Tags)"
-
-msgid "Binary tag search"
-msgstr "二进制查找(Binary search) 标签(Tags)"
-
#, c-format
msgid "Searching tags file %s"
-msgstr "查找 tag 文件 \"%s\""
+msgstr "查找 tag 文件 %s"
#, c-format
msgid "E430: Tag file path truncated for %s\n"
@@ -4031,7 +5237,7 @@
#, c-format
msgid "Before byte %ld"
-msgstr "在 %ld 字节之前"
+msgstr "在第 %ld 字节之前"
#, c-format
msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@
msgstr "E433: 没有 tag 文件"
msgid "E434: Can't find tag pattern"
-msgstr "E434: 找不到 tag"
+msgstr "E434: 找不到 tag 模式"
msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: 找不到 tag, 试着猜!"
+msgstr "E435: 找不到 tag，试着猜！"
msgid "' not known. Available builtin terminals are:"
-msgstr "' 不能加载。可用的内建终端形式有:"
+msgstr "' 未知。可用的内建终端有:"
msgid "defaulting to '"
-msgstr "预设: '"
+msgstr "默认值为: '"
-msgid "Cannot open termcap file"
-msgstr "不能打开 termcap 文件"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: 无法打开 termcap 文件"
-msgid "Terminal entry not found in terminfo"
-msgstr "在terminfo中未找到终端项"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: 在 terminfo 中找不到终端项"
-msgid "Terminal entry not found in termcap"
-msgstr "在termcap中未找到终端项"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: 在 termcap 中找不到终端项"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap 没有 \"%s\" 项"
+msgstr "E436: termcap 中没有 \"%s\" 项"
msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: 终端需要 \"cm\" 的能力"
+msgstr "E437: 终端需要能力 \"cm\""
#. Highlight title
msgid ""
@@ -4085,23 +5291,60 @@
#. must display the prompt
msgid "No undo possible; continue anyway"
-msgstr "不能还原；请继续"
+msgstr "无法撤销；请继续"
+
+msgid "Already at oldest change"
+msgstr "已位于最旧的改变"
+
+msgid "Already at newest change"
+msgstr "已位于最新的改变"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "找不到撤销号 %ld"
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: 行号错误"
-msgid "1 change"
-msgstr "一项改变"
+msgid "more line"
+msgstr "行被加入"
+
+msgid "more lines"
+msgstr "行被加入"
+
+msgid "line less"
+msgstr "行被去掉"
+
+msgid "fewer lines"
+msgstr "行被去掉"
+
+msgid "change"
+msgstr "行发生改变"
+
+msgid "changes"
+msgstr "行发生改变"
#, c-format
-msgid "%ld changes"
-msgstr "%ld 项改变"
+msgid "%ld %s; %s #%ld %s"
+msgstr "%ld %s；%s #%ld %s"
+
+msgid "before"
+msgstr "before"
+
+msgid "after"
+msgstr "after"
+
+msgid "Nothing to undo"
+msgstr "无可撤销"
+
+msgid "number changes time"
+msgstr " 编号 改变 时间"
msgid "E439: undo list corrupt"
msgstr "E439: 撤销列表损坏"
msgid "E440: undo line missing"
-msgstr "E440: 找不到要撤销操作的行"
+msgstr "E440: 找不到要撤销的行"
#. Only MS VC 4.1 and earlier can do Win32s
msgid ""
@@ -4109,34 +5352,34 @@
"MS-Windows 16/32 bit GUI version"
msgstr ""
"\n"
-"MS-Windows 16/32位 图型界面版本"
+"MS-Windows 16/32 位图形界面版本"
msgid ""
"\n"
"MS-Windows 32 bit GUI version"
msgstr ""
"\n"
-"MS-Windows 32 Bit 图型界面版本"
+"MS-Windows 32 位图形界面版本"
msgid " in Win32s mode"
-msgstr "Win32s 模式"
+msgstr " Win32s 模式"
msgid " with OLE support"
-msgstr "支持 OLE"
+msgstr " 带 OLE 支持"
msgid ""
"\n"
"MS-Windows 32 bit console version"
msgstr ""
"\n"
-"MS-Windows 32位 字符界面版本"
+"MS-Windows 32 位控制台版本"
msgid ""
"\n"
"MS-Windows 16 bit version"
msgstr ""
"\n"
-"MS-Windows 32位 字符界面版本"
+"MS-Windows 16 位控制台版本"
msgid ""
"\n"
@@ -4185,7 +5428,10 @@
"Included patches: "
msgstr ""
"\n"
-"加入补丁: "
+"包含补丁: "
+
+msgid "Modified by "
+msgstr "修改者 "
msgid ""
"\n"
@@ -4195,14 +5441,14 @@
"编译"
msgid "by "
-msgstr "者:"
+msgstr "者 "
msgid ""
"\n"
"Huge version "
msgstr ""
"\n"
-"超强版本 "
+"巨型版本 "
msgid ""
"\n"
@@ -4216,96 +5462,102 @@
"Normal version "
msgstr ""
"\n"
-"一般版本 "
+"正常版本 "
msgid ""
"\n"
"Small version "
msgstr ""
"\n"
-"简易版本 "
+"小型版本 "
msgid ""
"\n"
"Tiny version "
msgstr ""
"\n"
-"精简版本 "
+"微型版本 "
msgid "without GUI."
-msgstr "不使用图型界面。"
+msgstr "无图形界面。"
+
+msgid "with GTK2-GNOME GUI."
+msgstr "带 GTK2-GNOME 图形界面。"
msgid "with GTK-GNOME GUI."
-msgstr "使用 GTK-GNOME 图型界面。"
+msgstr "带 GTK-GNOME 图形界面。"
+
+msgid "with GTK2 GUI."
+msgstr "带 GTK2 图形界面。"
msgid "with GTK GUI."
-msgstr "使用 GTK 图型界面。"
+msgstr "带 GTK 图形界面。"
msgid "with X11-Motif GUI."
-msgstr "使用 X11-Motif 图型界面。"
+msgstr "带 X11-Motif 图形界面。"
+
+msgid "with X11-neXtaw GUI."
+msgstr "带 X11-neXtaw 图形界面。"
msgid "with X11-Athena GUI."
-msgstr "使用 X11-Athena 图型界面。"
-
-msgid "with BeOS GUI."
-msgstr "使用 BeOS 图型界面。"
+msgstr "带 X11-Athena 图形界面。"
msgid "with Photon GUI."
-msgstr "使用Photon图型界面。"
+msgstr "带 Photon 图形界面。"
msgid "with GUI."
-msgstr "使用图型界面。"
+msgstr "带图形界面。"
msgid "with Carbon GUI."
-msgstr "使用 Carbon 图型界面。"
+msgstr "带 Carbon 图形界面。"
msgid "with Cocoa GUI."
-msgstr "使用 Cocoa 图型界面。"
+msgstr "带 Cocoa 图形界面。"
msgid "with (classic) GUI."
-msgstr "使用 (传统) 图型界面。"
+msgstr "带(传统)图形界面。"
msgid " Features included (+) or not (-):\n"
-msgstr " 目前可使用(+)与不可使用(-)的模块列表:\n"
+msgstr " 可使用(+)与不可使用(-)的功能:\n"
msgid " system vimrc file: \""
-msgstr " 系统 vimrc 配置文件: \""
+msgstr " 系统 vimrc 文件: \""
msgid " user vimrc file: \""
-msgstr " 用户的 vimrc 配置文件: \""
+msgstr " 用户 vimrc 文件: \""
msgid " 2nd user vimrc file: \""
-msgstr " 第二组用户 vimrc 文件: \""
+msgstr " 第二用户 vimrc 文件: \""
msgid " 3rd user vimrc file: \""
-msgstr " 第三组用户 vimrc 文件: \""
+msgstr " 第三用户 vimrc 文件: \""
msgid " user exrc file: \""
-msgstr " 用户的 exrc 配置文件: \""
+msgstr " 用户 exrc 文件: \""
msgid " 2nd user exrc file: \""
-msgstr " 第二组用户 exrc 文件: \""
+msgstr " 第二用户 exrc 文件: \""
msgid " system gvimrc file: \""
-msgstr " 系统 gvimrc 文件: \""
+msgstr " 系统 gvimrc 文件: \""
msgid " user gvimrc file: \""
-msgstr " 用户的 gvimrc 配置文件: \""
+msgstr " 用户 gvimrc 文件: \""
msgid "2nd user gvimrc file: \""
-msgstr " 第二组用户 gvimrc 文件: \""
+msgstr "第二用户 gvimrc 文件: \""
msgid "3rd user gvimrc file: \""
-msgstr " 第三组用户 gvimrc 文件: \""
+msgstr "第三用户 gvimrc 文件: \""
msgid " system menu file: \""
-msgstr " 系统菜单配置文件: \""
+msgstr " 系统菜单文件: \""
msgid " fall-back for $VIM: \""
-msgstr " $VIM 预设值: \""
+msgstr " $VIM 预设值: \""
msgid " f-b for $VIMRUNTIME: \""
-msgstr " $VIMRUNTIME 预设值: \""
+msgstr " $VIMRUNTIME 预设值: \""
msgid "Compilation: "
msgstr "编译方式: "
@@ -4314,7 +5566,7 @@
msgstr "编译器: "
msgid "Linking: "
-msgstr "链结方式: "
+msgstr "链接方式: "
msgid " DEBUG BUILD"
msgstr " 调试版本"
@@ -4323,49 +5575,84 @@
msgstr "VIM - Vi IMproved"
msgid "version "
-msgstr "版本 "
+msgstr "版本 "
msgid "by Bram Moolenaar et al."
-msgstr "维护人: Bram Moolenaar et al."
+msgstr "维护人 Bram Moolenaar 等"
msgid "Vim is open source and freely distributable"
-msgstr "Vim 为可自由发行的开放源代码软件"
+msgstr "Vim 是可自由分发的开放源代码软件"
msgid "Help poor children in Uganda!"
-msgstr "帮助乌干达的可怜儿童!"
+msgstr "帮助乌干达的可怜儿童！"
msgid "type :help iccf<Enter> for information "
-msgstr "进一步说明请输入 :help iccf<Enter>"
+msgstr "输入 :help iccf<Enter> 查看说明 "
msgid "type :q<Enter> to exit "
-msgstr "要退出请输入 :q<Enter> "
+msgstr "输入 :q<Enter> 退出 "
msgid "type :help<Enter> or <F1> for on-line help"
-msgstr "在线帮助请输入 :help<Enter> "
+msgstr "输入 :help<Enter> 或 <F1> 查看在线帮助 "
-msgid "type :help version6<Enter> for version info"
-msgstr "新版本信息请输入 :help version6<Enter>"
+msgid "type :help version7<Enter> for version info"
+msgstr "输入 :help version7<Enter> 查看版本信息 "
msgid "Running in Vi compatible mode"
-msgstr "Vi 兼容模式"
+msgstr "运行于 Vi 兼容模式"
msgid "type :set nocp<Enter> for Vim defaults"
-msgstr "如果要完全模拟传统 Vi 请输入 :set nocp<Enter>"
+msgstr "输入 :set nocp<Enter> 恢复默认的 Vim "
msgid "type :help cp-default<Enter> for info on this"
-msgstr "如果需要对 Vi 兼容模式进一步说明请输入 :help cp-default<Enter>"
+msgstr "输入 :help cp-default<Enter> 查看相关说明 "
+
+msgid "menu Help->Orphans for information "
+msgstr "菜单 Help->Orphans 查看说明 "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "无模式运行，输入文字即插入"
+
+msgid "menu Edit->Global Settings->Toggle Insert Mode "
+msgstr "菜单 Edit->Global Settings->Toggle Insert Mode "
+
+#, fuzzy
+#~ msgid " for two modes "
+#~ msgstr " # pid 数据库名称 prepend path\n"
+
+#~ msgid "menu Edit->Global Settings->Toggle Vi Compatible"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid " for Vim defaults "
+#~ msgstr " # pid 数据库名称 prepend path\n"
+
+msgid "Sponsor Vim development!"
+msgstr "赞助 Vim 的开发！"
+
+msgid "Become a registered Vim user!"
+msgstr "成为 Vim 的注册用户！"
+
+msgid "type :help sponsor<Enter> for information "
+msgstr "输入 :help sponsor<Enter> 查看说明 "
+
+msgid "type :help register<Enter> for information "
+msgstr "输入 :help register<Enter> 查看说明 "
+
+msgid "menu Help->Sponsor/Register for information "
+msgstr "菜单 Help->Sponsor/Register 查看说明 "
msgid "WARNING: Windows 95/98/ME detected"
-msgstr "注意: 检测到 Windows 95/98/ME"
+msgstr "警告: 检测到 Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
-msgstr "如果需要对 Windows 95 支持的更多信息请输入 :help windows95<Enter>"
+msgstr "输入 :help windows95<Enter> 查看相关说明 "
msgid "E441: There is no preview window"
msgstr "E441: 没有预览窗口"
msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: 不能同时分割窗口为左上和右下角"
+msgstr "E442: 不能同时进行 topleft 和 botright 分割"
msgid "E443: Cannot rotate when another window is split"
msgstr "E443: 有其它分割窗口时不能旋转"
@@ -4386,261 +5673,472 @@
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: 在路径中找不到文件 \"%s\""
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: 无法加载库 %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "抱歉，此命令不可用: 无法加载 Perl 库。"
+
+#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+#~ msgstr ""
+
msgid "Edit with &multiple Vims"
-msgstr "用 &multiple Vims 编辑"
+msgstr "用多个 Vim 编辑(&M)"
msgid "Edit with single &Vim"
-msgstr "用 single &Vim 编辑"
+msgstr "用单个 Vim 编辑(&V)"
+
+msgid "Diff with Vim"
+msgstr "用 Vim 比较(diff)"
msgid "Edit with &Vim"
-msgstr "用 &Vim 编辑"
+msgstr "用 Vim 编辑(&V)"
#. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "用当前的 Vim 编辑 - &"
+msgid "Edit with existing Vim - "
+msgstr "用当前的 Vim 编辑 - "
msgid "Edits the selected file(s) with Vim"
-msgstr "用 Vim 编辑选择的文件"
+msgstr "用 Vim 编辑选中的文件"
msgid "Error creating process: Check if gvim is in your path!"
-msgstr "创建进程失败: 请检查gvim是否在可执行路径中!"
+msgstr "创建进程失败: 请检查 gvim 是否在路径中！"
msgid "gvimext.dll error"
-msgstr "gvimext.dll 出错"
+msgstr "gvimext.dll 错误"
msgid "Path length too long!"
-msgstr "路径名太长"
+msgstr "路径太长！"
msgid "--No lines in buffer--"
-msgstr "--缓冲区无资料--"
+msgstr "--缓冲区无内容--"
#.
#. * The error messages that can be shared are included here.
#. * Excluded are errors that are only used once and debugging messages.
#.
-msgid "Command aborted"
-msgstr "命令被强制中断"
+msgid "E470: Command aborted"
+msgstr "E470: 命令被中止"
-msgid "Argument required"
-msgstr "需要指令参数"
+msgid "E471: Argument required"
+msgstr "E471: 需要参数"
msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ 后面应该有 / ? 或 &"
+msgstr "E10: \\ 后面应该跟有 /、? 或 &"
msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: 不能在命令行窗口中使用。<CR>执行，CTRL-C 退出"
+msgstr "E11: 在命令行窗口中无效；<CR> 执行，CTRL-C 退出"
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc 里的指令不能执行"
+msgstr "E12: 当前目录中的 exrc/vimrc 或 tag 查找中不允许此命令"
+
+msgid "E171: Missing :endif"
+msgstr "E171: 缺少 :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: 缺少 :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: 缺少 :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: 缺少 :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile 缺少对应的 :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor 缺少对应的 :for"
msgid "E13: File exists (add ! to override)"
-msgstr "E13: 文件已经存在 (可用 ! 强制替换)"
+msgstr "E13: 文件已存在 (请加 ! 强制执行)"
-msgid "Command failed"
-msgstr "命令执行失败"
+msgid "E472: Command failed"
+msgstr "E472: 命令执行失败"
-msgid "Internal error"
-msgstr "内部错误"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: 未知的 Fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: 未知的字体: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: 字体 \"%s\" 不是等宽字体"
+
+msgid "E473: Internal error"
+msgstr "E473: 内部错误"
msgid "Interrupted"
msgstr "已中断"
msgid "E14: Invalid address"
-msgstr "E14: 不正确的地址"
+msgstr "E14: 无效的地址"
-msgid "Invalid argument"
-msgstr "不正确的参数"
+msgid "E474: Invalid argument"
+msgstr "E474: 无效的参数"
#, c-format
-msgid "Invalid argument: %s"
-msgstr "不正确的参数: %s"
+msgid "E475: Invalid argument: %s"
+msgstr "E475: 无效的参数: %s"
#, c-format
msgid "E15: Invalid expression: %s"
-msgstr "E15: 不正确的表达式: %s"
+msgstr "E15: 无效的表达式: %s"
msgid "E16: Invalid range"
-msgstr "E16: 不正确的范围"
+msgstr "E16: 无效的范围"
-msgid "Invalid command"
-msgstr "不正确的命令"
+msgid "E476: Invalid command"
+msgstr "E476: 无效的命令"
#, c-format
msgid "E17: \"%s\" is a directory"
msgstr "E17: \"%s\" 是目录"
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: '=' 前面出现了错误的字符"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: 调用函数库 \"%s()\" 失败"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: 无法加载库函数 %s"
msgid "E19: Mark has invalid line number"
-msgstr "E19: 标记的行号错误"
+msgstr "E19: 标记的行号无效"
msgid "E20: Mark not set"
msgstr "E20: 没有设定标记"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 因为 'modifiable' 选项是关闭的，所以不能修改"
+msgstr "E21: 不能修改，因为选项 'modifiable' 是关的"
msgid "E22: Scripts nested too deep"
-msgstr "E22: 递归调用太多层"
+msgstr "E22: 脚本嵌套过深"
msgid "E23: No alternate file"
-msgstr "E23: 没有替代的文件"
+msgstr "E23: 没有交替文件"
msgid "E24: No such abbreviation"
-msgstr "E24: 没有这个 abbreviation 对应"
+msgstr "E24: 没有这个缩写"
-msgid "No ! allowed"
-msgstr "不可使用 '!'"
+msgid "E477: No ! allowed"
+msgstr "E477: 不能使用 \"!\""
msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: 因为编译时没有加入图型界面的程序代码，所以不能使用图型界面"
+msgstr "E25: 无法使用图形界面: 编译时没有启用"
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: 因为编译时没有加入希伯莱的程序代码，所以不能使用 Hebrew\n"
+msgstr "E26: 无法使用 Hebrew: 编译时没有启用\n"
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: 因为编译时没有加入 Farsi 的程序代码，所以不能使用 Farsi\n"
+msgstr "E27: 无法使用 Farsi: 编译时没有启用\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: 无法使用 Arabic: 编译时没有启用\n"
#, c-format
msgid "E28: No such highlight group name: %s"
-msgstr "E28: 没有名为 '%s' 的 highlight group"
+msgstr "E28: 没有这个高亮群组名: %s"
msgid "E29: No inserted text yet"
msgstr "E29: 没有插入过文字"
msgid "E30: No previous command line"
-msgstr "E30: 没有前一项命令"
+msgstr "E30: 没有前一个命令行"
msgid "E31: No such mapping"
-msgstr "E31: 没有这个 mapping 对应"
+msgstr "E31: 没有这个映射"
-msgid "No match"
-msgstr "找不到"
+msgid "E479: No match"
+msgstr "E479: 没有匹配"
#, c-format
-msgid "No match: %s"
-msgstr "找不到: %s"
+msgid "E480: No match: %s"
+msgstr "E480: 没有匹配: %s"
msgid "E32: No file name"
msgstr "E32: 没有文件名"
msgid "E33: No previous substitute regular expression"
-msgstr "E33: 没有前一个查找/替换的命令"
+msgstr "E33: 没有前一个替换正则表达式"
msgid "E34: No previous command"
msgstr "E34: 没有前一个命令"
msgid "E35: No previous regular expression"
-msgstr "E35: 没有前一个查找命令"
+msgstr "E35: 没有前一个正则表达式"
-msgid "No range allowed"
-msgstr "不可使用范围命令"
+msgid "E481: No range allowed"
+msgstr "E481: 不能使用范围"
msgid "E36: Not enough room"
msgstr "E36: 没有足够的空间"
#, c-format
-msgid "Can't create file %s"
-msgstr "不能创建文件 %s"
-
-msgid "Can't get temp file name"
-msgstr "不能得到临时文件名"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: 没有名叫 \"%s\" 的已注册的服务器"
#, c-format
-msgid "Can't open file %s"
-msgstr "不能打开文件 %s"
+msgid "E482: Can't create file %s"
+msgstr "E482: 无法创建文件 %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: 无法获取临时文件名"
#, c-format
-msgid "Can't read file %s"
-msgstr "不能读取文件 %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: 无法打开文件 %s"
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: 文件内容已改变但尚未保存 (可用 ! 强制执行)"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: 无法读取文件 %s"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: 已修改但尚未保存 (可用 ! 强制执行)"
msgid "E38: Null argument"
-msgstr "E38: 空的 (Null) 参数"
+msgstr "E38: 空的参数"
msgid "E39: Number expected"
-msgstr "E39: 应该要有数字"
+msgstr "E39: 此处需要数字"
#, c-format
msgid "E40: Can't open errorfile %s"
-msgstr "E40: 不能打开错误文件 %s"
+msgstr "E40: 无法打开错误文件 %s"
+
+msgid "E233: cannot open display"
+msgstr "E233: 无法打开 display"
msgid "E41: Out of memory!"
-msgstr "E41: 内存不足!"
+msgstr "E41: 内存不足！"
msgid "Pattern not found"
msgstr "找不到模式"
#, c-format
-msgid "Pattern not found: %s"
-msgstr "找不到模式 %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: 找不到模式: %s"
-msgid "Argument must be positive"
-msgstr "参数应该是正数"
+msgid "E487: Argument must be positive"
+msgstr "E487: 参数必须是正数"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: 无法回到前一个目录"
msgid "E42: No Errors"
msgstr "E42: 没有错误"
+msgid "E776: No location list"
+msgstr "E776: 没有 location 列表"
+
msgid "E43: Damaged match string"
-msgstr "E43: 匹配字符串有问题"
+msgstr "E43: 已损坏的匹配字符串"
msgid "E44: Corrupted regexp program"
-msgstr "E44: 正则表达式有问题"
+msgstr "E44: 已损坏的正则表达式程序"
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: 设定 'readonly' 选项(只读) (可用 ! 强制执行)"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 已设定选项 'readonly' (请加 ! 强制执行)"
#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: 不能设定只读变量 \"%s\""
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: 不能改变只读变量 \"%s\""
+
+#, c-format
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: 不能在 sandbox 中设定变量: \"%s\""
msgid "E47: Error while reading errorfile"
msgstr "E47: 读取错误文件失败"
msgid "E48: Not allowed in sandbox"
-msgstr "E48: 不能在 sandbox 里出现"
+msgstr "E48: 不允许在 sandbox 中使用"
+
+msgid "E523: Not allowed here"
+msgstr "E523: 不允许在此使用"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: 不支持设定屏幕模式"
msgid "E49: Invalid scroll size"
-msgstr "E49: 错误的滚动大小"
+msgstr "E49: 无效的滚动大小"
msgid "E91: 'shell' option is empty"
-msgstr "E91: 'E71: 选项 'shell' 未设定"
+msgstr "E91: 选项 'shell' 为空"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: 无法读取 sign 数据！"
msgid "E72: Close error on swap file"
msgstr "E72: 交换文件关闭错误"
msgid "E73: tag stack empty"
-msgstr "E73: 标签堆栈已空"
+msgstr "E73: tag 堆栈为空"
msgid "E74: Command too complex"
-msgstr "E74: 命令太复杂"
+msgstr "E74: 命令过复杂"
msgid "E75: Name too long"
-msgstr "E75: 名字太长"
+msgstr "E75: 名字过长"
msgid "E76: Too many ["
-msgstr "E76: 太多 ["
+msgstr "E76: [ 过多"
msgid "E77: Too many file names"
-msgstr "E77: 太多文件名"
+msgstr "E77: 文件名过多"
-msgid "Trailing characters"
-msgstr "你输入了多余的字符"
+msgid "E488: Trailing characters"
+msgstr "E488: 多余的尾部字符"
msgid "E78: Unknown mark"
-msgstr "E78: 不能办识的标记"
+msgstr "E78: 未知的标记"
msgid "E79: Cannot expand wildcards"
-msgstr "E79: 不能扩展通配符"
+msgstr "E79: 无法扩展通配符"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' 不能小于 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' 不能小于 'winminwidth'"
msgid "E80: Error while writing"
-msgstr "E80: 写入错误"
+msgstr "E80: 写入出错"
msgid "Zero count"
-msgstr "数到零 (?)"
+msgstr "计数为零"
msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> 不能在 script 本文外使用."
+msgstr "E81: 在脚本环境外使用了 <SID>"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: 收到无效的表达式"
+
+#~ msgid "E463: Region is guarded, cannot modify"
+#~ msgstr ""
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans 不允许改变只读文件"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部错误: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: 表达式的内存使用超出 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: 空的缓冲区"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: 无效的搜索表达式或分隔符"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: 文件已在另一个缓冲区中被加载"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: 没有设定选项 '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "已查找到文件开头，再从结尾继续查找"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "已查找到文件结尾，再从开头继续查找"
+
+#~ msgid "[No file]"
+#~ msgstr "[未命名]"
+
+#~ msgid "[Error List]"
+#~ msgstr "[错误列表]"
+
+#~ msgid "E106: Unknown variable: \"%s\""
+#~ msgstr "E106: 未定义的变量: \"%s\""
+
+#~ msgid "E119: Not enough arguments for function: %s"
+#~ msgstr "E119: 函数 %s 的参数太少"
+
+#~ msgid "E120: Using <SID> not in a script context: %s"
+#~ msgstr "E120: <SID> 不能在 script 上下文外使用: %s"
+
+#~ msgid "E123: Undefined function: %s"
+#~ msgstr "E123: 函数 %s 尚未定义"
+
+#~ msgid "E127: Cannot redefine function %s: It is in use"
+#~ msgstr "E127: 函数 %s 正在使用中，不能重新定义"
+
+#~ msgid "function "
+#~ msgstr "函数 "
+
+#~ msgid "E130: Undefined function: %s"
+#~ msgstr "E130: 函数 %s 尚未定义"
+
+#~ msgid "Run Macro"
+#~ msgstr "执行宏"
+
+#~ msgid "E242: Color name not recognized: %s"
+#~ msgstr "E242: %s 为不能识别的颜色名称"
+
+#~ msgid "error reading cscope connection %d"
+#~ msgstr "读取 cscope 连接 %d 时错误"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: 找不到 cscope 连接"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope 连接已关闭"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "不能使用 malloc\n"
+
+#~ msgid "%2d %-5ld %-34s <none>\n"
+#~ msgstr "%2d %-5ld %-34s <无>\n"
+
+#~ msgid "E249: couldn't read VIM instance registry property"
+#~ msgstr "E249: 不能读取 VIM 的 注册表属性"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\t显示 Gnome 相关参数"
+
+#~ msgid "[string too long]"
+#~ msgstr "[字符串太长]"
+
+#~ msgid "Hit ENTER to continue"
+#~ msgstr "请按 ENTER 继续"
+
+#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
+#~ msgstr " (RET/BS: 向下/向上一行, 空格/b: 一页, d/u: 半页, q: 退出)"
+
+#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
+#~ msgstr " (RET: 向下一行, 空白键: 一页, d: 半页, q: 退出)"
+
+#~ msgid "E361: Crash intercepted; regexp too complex?"
+#~ msgstr "E361: 不能执行; regular expression 太复杂?"
+
+#~ msgid "E363: pattern caused out-of-stack error"
+#~ msgstr "E363: regular expression 造成堆栈用光的错误"
+
+#~ msgid " BLOCK"
+#~ msgstr " 块"
+
+#~ msgid " LINE"
+#~ msgstr " 行"
+
+#~ msgid "Enter nr of choice (<CR> to abort): "
+#~ msgstr "输入 nr 或选择 (<CR> 退出): "
+
+#~ msgid "Linear tag search"
+#~ msgstr "线性查找标签 (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "二进制查找(Binary search) 标签(Tags)"
+
+#~ msgid "with BeOS GUI."
+#~ msgstr "使用 BeOS 图形界面。"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 0a5b7a7..6e701ac 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -7,53 +7,53 @@
#
# Generated from zh_CN.po, DO NOT EDIT.
#
-#, no-wrap
msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n"
-"POT-Creation-Date: 2001-09-24 10:10+0800\n"
-"PO-Revision-Date: 2001-09-24 11:13+0800\n"
-"Last-Translator: Wang Jun <junw@turbolinux.com.cn>\n"
-"Language-Team: Wang Jun <junw@turbolinux.com.cn>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-28 21:47+0800\n"
+"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
+"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=gbk\n"
"Content-Transfer-Encoding: 8-bit\n"
msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ²»ÄÜ·ÖÅäÈκλº³åÇø£¬Í˳ö³ÌÐò..."
+msgstr "E82: ÎÞ·¨·ÖÅäÈκλº³åÇø£¬Í˳ö³ÌÐò..."
msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ²»ÄÜ·ÖÅ仺³åÇø£¬Ê¹ÓÃÁíÒ»¸ö»º³åÇø...."
+msgstr "E83: ÎÞ·¨·ÖÅ仺³åÇø£¬Ê¹ÓÃÁíÒ»¸ö»º³åÇø..."
-msgid "No buffers were unloaded"
-msgstr "ûÓÐÊÍ·ÅÈκλº³åÇø"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: ûÓÐÊÍ·ÅÈκλº³åÇø"
-msgid "No buffers were deleted"
-msgstr "ûÓÐɾ³ýÈκλº³åÇø"
+msgid "E516: No buffers were deleted"
+msgstr "E516: ûÓÐɾ³ýÈκλº³åÇø"
-msgid "No buffers were wiped out"
-msgstr "ûÓÐɾ³ýÈκλº³åÇø"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: ûÓÐÇå³ýÈκλº³åÇø"
msgid "1 buffer unloaded"
-msgstr "ÒÑÊÍ·ÅÒ»¸ö»º³åÇø"
+msgstr "ÊÍ·ÅÁË 1 ¸ö»º³åÇø"
#, c-format
msgid "%d buffers unloaded"
-msgstr "ÒÑÊÍ·Å %d ¸ö»º³åÇø"
+msgstr "ÊÍ·ÅÁË %d ¸ö»º³åÇø"
msgid "1 buffer deleted"
-msgstr "ÒÑɾ³ýÒ»¸ö»º³åÇø"
+msgstr "ɾ³ýÁË 1 ¸ö»º³åÇø"
#, c-format
msgid "%d buffers deleted"
-msgstr "ÒÑɾ³ý %d ¸ö»º³åÇø"
+msgstr "ɾ³ýÁË %d ¸ö»º³åÇø"
msgid "1 buffer wiped out"
-msgstr "ÒÑɾ³ýÒ»¸ö»º³åÇø"
+msgstr "Çå³ýÁË 1 ¸ö»º³åÇø"
#, c-format
msgid "%d buffers wiped out"
-msgstr "ÒÑɾ³ý %d ¸ö»º³åÇø"
+msgstr "Çå³ýÁË %d ¸ö»º³åÇø"
msgid "E84: No modified buffer found"
msgstr "E84: ûÓÐÐ޸ĹýµÄ»º³åÇø"
@@ -63,43 +63,43 @@
msgstr "E85: ûÓпÉÁгöµÄ»º³åÇø"
#, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: ²»ÄÜÇл»µ½µÚ %ld ¸ö»º³åÇø"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: »º³åÇø %ld ²»´æÔÚ"
msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: ²»ÄÜÇл»µ½¸üºóÃæµÄ»º³åÇø"
+msgstr "E87: ÎÞ·¨Çл»£¬ÒÑÊÇ×îºóÒ»¸ö»º³åÇø"
msgid "E88: Cannot go before first buffer"
-msgstr "E88: ²»ÄÜÇл»µ½¸üÇ°ÃæµÄ»º³åÇø"
+msgstr "E88: ÎÞ·¨Çл»£¬ÒÑÊǵÚÒ»¸ö»º³åÇø"
#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: ÒѸü¸Ä¹ý»º³åÇø %ld µ«ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: »º³åÇø %ld ÒÑÐ޸ĵ«ÉÐδ±£´æ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E90: Cannot unload last buffer"
-msgstr "E90: ²»ÄÜÊÍ·Å×îºóÒ»¸ö»º³åÇø"
+msgstr "E90: ÎÞ·¨ÊÍ·Å×îºóÒ»¸ö»º³åÇø"
msgid "W14: Warning: List of file names overflow"
msgstr "W14: ¾¯¸æ: ÎļþÃû¹ý¶à"
#, c-format
msgid "E92: Buffer %ld not found"
-msgstr "E92: ÕÒ²»µ½µÚ %ld ¸ö»º³åÇø"
+msgstr "E92: ÕÒ²»µ½»º³åÇø %ld"
#, c-format
msgid "E93: More than one match for %s"
-msgstr "E93: ÕÒµ½Ò»¸öÒÔÉ쵀 %s"
+msgstr "E93: ÕÒµ½²»Ö¹Ò»¸ö %s"
#, c-format
msgid "E94: No matching buffer for %s"
-msgstr "E94: ÕÒ²»µ½ %s"
+msgstr "E94: ûÓÐÆ¥ÅäµÄ»º³åÇø %s"
#, c-format
msgid "line %ld"
-msgstr "ÐÐ %ld"
+msgstr "µÚ %ld ÐÐ"
msgid "E95: Buffer with this name already exists"
-msgstr "E95: ÒÑÓлº³åÇøʹÓÃÕâ¸öÃû×Ö"
+msgstr "E95: ÒÑÓлº³åÇøʹÓøÃÃû³Æ"
msgid " [Modified]"
msgstr " [ÒÑÐÞ¸Ä]"
@@ -118,24 +118,24 @@
#, c-format
msgid "1 line --%d%%--"
-msgstr "ÐÐÊý 1 --%d%%--"
+msgstr "1 ÐÐ --%d%%--"
#, c-format
msgid "%ld lines --%d%%--"
-msgstr "ÐÐÊý %ld --%d%%--"
+msgstr "%ld ÐÐ --%d%%--"
#, c-format
msgid "line %ld of %ld --%d%%-- col "
-msgstr "ÐÐ %ld/%ld --%d%%-- ÁÐ "
+msgstr "ÐÐ %ld / %ld --%d%%-- ÁÐ "
-msgid "[No file]"
+msgid "[No Name]"
msgstr "[δÃüÃû]"
#. must be a help buffer
msgid "help"
-msgstr "[°ïÖú]"
+msgstr "°ïÖú"
-msgid "[help]"
+msgid "[Help]"
msgstr "[°ïÖú]"
msgid "[Preview]"
@@ -150,6 +150,7 @@
msgid "Top"
msgstr "¶¥¶Ë"
+#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -157,22 +158,22 @@
"\n"
"# »º³åÇøÁбí:\n"
-msgid "[Error List]"
-msgstr "[´íÎóÁбí]"
+msgid "[Location List]"
+msgstr "[Location Áбí]"
-msgid "[No File]"
-msgstr "[δÃüÃû]"
+msgid "[Quickfix List]"
+msgstr "[Quickfix Áбí]"
msgid ""
"\n"
"--- Signs ---"
msgstr ""
"\n"
-"--- ·ûºÅ ---"
+"--- Signs ---"
#, c-format
msgid "Signs for %s:"
-msgstr "%s µÄ·ûºÅ:"
+msgstr "%s µÄ Signs:"
#, c-format
msgid " line=%ld id=%d name=%s"
@@ -180,91 +181,99 @@
#, c-format
msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: ²»ÄܱȽÏ(diff) %ld¸öÒÔÉϵĻº³åÇø"
+msgstr "E96: ²»ÄܱȽÏ(diff) %ld ¸öÒÔÉϵĻº³åÇø"
msgid "E97: Cannot create diffs"
-msgstr "E97: ²»ÄÜ´´½¨ diff "
+msgstr "E97: ÎÞ·¨´´½¨ diff"
msgid "Patch file"
msgstr "Patch Îļþ"
msgid "E98: Cannot read diff output"
-msgstr "E98: ²»ÄܶÁÈ¡ diff µÄÊä³ö"
+msgstr "E98: ÎÞ·¨¶ÁÈ¡ diff µÄÊä³ö"
msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Ä¿Ç°µÄ»º³åÇø²»ÊÇÔÚ diff ģʽ"
+msgstr "E99: µ±Ç°»º³åÇø²»ÔÚ diff ģʽ"
msgid "E100: No other buffer in diff mode"
-msgstr "E100: ûÓлº³åÇøÔÚ diff ģʽ"
+msgstr "E100: ûÓÐÆäËü´¦ÓÚ diff ģʽµÄ»º³åÇø"
msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ÓÐÁ½¸öÒÔÉϵĻº³åÇøÔÚ diff ģʽ£¬²»Äܾö¶¨ÒªÓÃÄÄÒ»¸ö"
+msgstr "E101: ÓÐÁ½¸öÒÔÉϵĻº³åÇø´¦ÓÚ diff ģʽ£¬²»Äܾö¶¨ÓÃÄÄÒ»¸ö"
#, c-format
msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: ÕÒ²»µ½»º³åÇø: \"%s\""
+msgstr "E102: ÕÒ²»µ½»º³åÇø \"%s\""
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: »º³åÇø \"%s\" ²»ÊÇÔÚ diff ģʽ"
+msgstr "E103: »º³åÇø \"%s\" ²»ÔÚ diff ģʽ"
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ¸´ºÏ×Ö·û(digraph)Öв»ÄÜʹÓà Escape"
-msgid "Keymap file not found"
-msgstr "ÕÒ²»µ½ keymap Îļþ"
+msgid "E544: Keymap file not found"
+msgstr "E544: ÕÒ²»µ½ Keymap Îļþ"
msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: ʹÓà :loadkeymap "
+msgstr "E105: ²»ÊÇÔڽű¾ÎļþÖÐʹÓà :loadkeymap "
-msgid " Keyword completion (^N/^P)"
-msgstr " ¹Ø¼ü×Ö×Ô¶¯Íê³É (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " ¹Ø¼ü×Ö²¹È« (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X ģʽ (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " ÇøÓò¹Ø¼ü×Ö×Ô¶¯Íê³É (^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " ÕûÐв¹È« (^L^N^P)"
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " ÕûÐÐ×Ô¶¯Íê³É (^L/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " ÎļþÃû²¹È« (^F^N^P)"
-msgid " File name completion (^F/^N/^P)"
-msgstr " ÎļþÃû×Ô¶¯Íê³É (^F/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag ²¹È« (^]^N^P)"
-msgid " Tag completion (^]/^N/^P)"
-msgstr " ±êÇ©×Ô¶¯Íê³É (^]/^N/^P)"
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " ·¾¶Ä£Ê½²¹È« (^N^P)"
-msgid " Path pattern completion (^N/^P)"
-msgstr " ·¾¶×Ô¶¯Íê³É (^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " ¶¨Ò岹ȫ (^D^N^P)"
-msgid " Definition completion (^D/^N/^P)"
-msgstr " ¶¨Òå×Ô¶¯Íê³É (^D/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary ²¹È« (^K^N^P)"
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " ×Öµä×Ô¶¯Íê³É (^K/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus ²¹È« (^T^N^P)"
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus ×Ô¶¯Íê³É (^T/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " ÃüÁîÐв¹È« (^V^N^P)"
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " ÃüÁî×Ô¶¯Íê³É (^V/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " Óû§×Ô¶¨Ò岹ȫ (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " È«Äܲ¹È« (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " ƴд½¨Òé (^S^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " ¹Ø¼ü×Ö¾Ö²¿²¹È« (^N^P)"
msgid "Hit end of paragraph"
msgstr "Òѵ½¶ÎÂä½áβ"
-msgid "'thesaurus' option is empty"
-msgstr "Ñ¡Ïî 'thesaurus' δÉ趨"
-
msgid "'dictionary' option is empty"
msgstr "Ñ¡Ïî 'dictionary' Ϊ¿Õ"
+msgid "'thesaurus' option is empty"
+msgstr "Ñ¡Ïî 'thesaurus' Ϊ¿Õ"
+
#, c-format
msgid "Scanning dictionary: %s"
-msgstr "ɨÃè×Öµä: %s"
+msgstr "ÕýÔÚɨÃè dictionary: %s"
msgid " (insert) Scroll (^E/^Y)"
msgstr " (²åÈë) Scroll (^E/^Y)"
@@ -274,8 +283,9 @@
#, c-format
msgid "Scanning: %s"
-msgstr "ɨÃèÖÐ: %s"
+msgstr "ÕýÔÚɨÃè: %s"
+#, c-format
msgid "Scanning tags."
msgstr "ɨÃè±êÇ©."
@@ -287,45 +297,157 @@
#. * longer needed. -- Acevedo.
#.
msgid "-- Searching..."
-msgstr "-- ËÑÑ°ÖÐ..."
+msgstr "-- ²éÕÒÖÐ..."
msgid "Back at original"
msgstr "»Øµ½Æðµã"
msgid "Word from other line"
-msgstr "´ÓÆäËüÐпªÊ¼µÄ´Ê (?)"
+msgstr "ÁíÒ»ÐеĴÊ"
msgid "The only match"
-msgstr "Ö»ÓдËÏîÆ¥Åä"
+msgstr "ΨһƥÅä"
#, c-format
msgid "match %d of %d"
-msgstr "ÕÒµ½ %d / %d"
+msgstr "Æ¥Åä %d / %d"
#, c-format
msgid "match %d"
msgstr "Æ¥Åä %d"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let ÖгöÏÖÒì³£×Ö·û"
+
#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 䶨ÒåµÄ±äÁ¿: \"%s\""
+msgid "E684: list index out of range: %ld"
+msgstr "E684: List Ë÷Òý³¬³ö·¶Î§: %ld"
+
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: 䶨ÒåµÄ±äÁ¿: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: ȱÉÙ ']'"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s µÄ²ÎÊý±ØÐëÊÇ List"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s µÄ²ÎÊý±ØÐëÊÇ List »òÕß Dictionary"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary µÄ¼ü²»ÄÜΪ¿Õ"
+
+msgid "E714: List required"
+msgstr "E714: ÐèÒª List"
+
+msgid "E715: Dictionary required"
+msgstr "E715: ÐèÒª Dictionary"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: º¯ÊýµÄ²ÎÊý¹ý¶à: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary Öв»´æÔÚ¼ü: %s"
+
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: º¯Êý %s ÒÑ´æÔÚ£¬Çë¼Ó ! Ç¿ÖÆÌæ»»"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Dictionary ÏîÒÑ´æÔÚ"
+
+msgid "E718: Funcref required"
+msgstr "E718: ÐèÒª Funcref"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: ²»ÄÜ¶Ô Dictionary ʹÓà [:]"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: %s= µÄ±äÁ¿ÀàÐͲ»ÕýÈ·"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: δ֪µÄº¯Êý: %s"
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: ÎÞЧµÄ±äÁ¿Ãû: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Ä¿±ê±È List ÏîÊýÉÙ"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Ä¿±ê±È List ÏîÊý¶à"
+
+msgid "Double ; in list of variables"
+msgstr "±äÁ¿ÁбíÖгöÏÖÁ½¸ö ;"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: ÎÞ·¨Áгö %s µÄ±äÁ¿"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: Ö»ÄÜË÷Òý List »ò Dictionary"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] ±ØÐëÔÚ×îºó"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] ÐèÒªÒ»¸ö List Öµ"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: List ÖµµÄÏî±ÈÄ¿±ê¶à"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: List ֵûÓÐ×ã¹»¶àµÄÏî"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for ºóȱÉÙ \"in\""
#, c-format
msgid "E107: Missing braces: %s"
-msgstr "E107: ȱÉÙ¶ÔÓ¦µÄÀ¨ºÅ: %s"
+msgstr "E107: ȱÉÙÀ¨ºÅ: %s"
#, c-format
msgid "E108: No such variable: \"%s\""
msgstr "E108: Î޴˱äÁ¿: \"%s\""
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (un)lock µÄ±äÁ¿Ç¶Ì×¹ýÉî"
+
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' ºóȱÉÙ ':'"
-msgid "E110: Missing ')'"
-msgstr "E110: ȱÉÙ¶ÔÓ¦µÄ \")\""
+msgid "E691: Can only compare List with List"
+msgstr "E691: Ö»ÄÜ±È½Ï List ºÍ List"
-msgid "E111: Missing ']'"
-msgstr "E111: ȱÉÙ¶ÔÓ¦µÄ \"]\""
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: ¶Ô List ÎÞЧµÄ²Ù×÷"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Ö»ÄÜ±È½Ï Dictionary ºÍ Dictionary"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: ¶Ô Dictionary ÎÞЧµÄ²Ù×÷"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: Ö»ÄÜ±È½Ï Funcref ºÍ Funcref"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: ¶Ô Funcrefs ÎÞЧµÄ²Ù×÷"
+
+msgid "E110: Missing ')'"
+msgstr "E110: ȱÉÙ ')'"
+
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: ²»ÄÜË÷ÒýÒ»¸ö Funcref"
#, c-format
msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@
#, c-format
msgid "E113: Unknown option: %s"
-msgstr "E113: ²»ÕýÈ·µÄÑ¡Ïî: %s"
+msgstr "E113: δ֪µÄÑ¡Ïî: %s"
#, c-format
msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@
msgstr "E115: ȱÉÙÒýºÅ: %s"
#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: º¯Êý %s µÄ²ÎÊý²»ÕýÈ·"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List ÖÐȱÉÙ¶ººÅ: %s"
#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 䶨ÒåµÄº¯Êý: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List ȱÉÙ½áÊø·û ']': %s"
#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: º¯Êý %s µÄ²ÎÊý¹ý¶à"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary ÖÐȱÉÙðºÅ: %s"
#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: º¯Êý %s µÄ²ÎÊýÌ«ÉÙ"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary ÖгöÏÖÖظ´µÄ¼ü: \"%s\""
#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ²»ÄÜÔÚ script ÉÏÏÂÎÄÍâʹÓÃ: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary ÖÐȱÉÙ¶ººÅ: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary ȱÉÙ½áÊø·û '}': %s"
+
+#, fuzzy
+#~ msgid "E724: variable nested too deep for displaying"
+#~ msgstr "E724: ±äÁ¿Ç¶Ì×¹ýÉî"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ²ÎÊý¹ý¶à"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() Ö»ÄÜÔÚ²åÈëģʽÖÐʹÓÃ"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either. But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all. See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "È·¶¨(&O)"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: ¼üÒÑ´æÔÚ: %s"
#, c-format
msgid "+-%s%3ld lines: "
msgstr "+-%s%3ld ÐÐ: "
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: δ֪µÄº¯Êý: %s"
+
msgid ""
"&OK\n"
"&Cancel"
@@ -374,91 +526,148 @@
"È·¶¨(&O)\n"
"È¡Ïû(&C)"
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() µÄµ÷ÓôÎÊý¶àÓÚ inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: ²»ÔÊÐíµÄ·¶Î§"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() µÄÀàÐÍÎÞЧ"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ²½³¤ÎªÁã"
+
+msgid "E727: Start past end"
+msgstr "E727: ÆðʼֵÔÚÖÕÖ¹Öµºó"
+
+msgid "<empty>"
+msgstr "<¿Õ>"
+
msgid "E240: No connection to Vim server"
-msgstr "E240: ûÓÐÓë Vim Server ´´½¨Á¬½Ó"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: ²»ÄܶÁÈ¡·þÎñÆ÷µÄÏìÓ¦"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: ²»ÄÜ´«Ë͵½¿Í»§¶Ë"
+msgstr "E240: ûÓе½ Vim ·þÎñÆ÷µÄÁ¬½Ó"
#, c-format
msgid "E241: Unable to send to %s"
-msgstr "E241: ²»ÄÜ´«Ë͵½ %s"
+msgstr "E241: ÎÞ·¨·¢Ë͵½ %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: ÎÞ·¨¶ÁÈ¡·þÎñÆ÷ÏìÓ¦"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ·ûºÅÁ¬½Ó¹ý¶à(Ñ»·£¿)"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: ÎÞ·¨·¢Ë͵½¿Í»§¶Ë"
+
+#, fuzzy
+#~ msgid "E702: Sort compare function failed"
+#~ msgstr "E702: Sort ±È½Ïº¯Êýʧ°Ü"
msgid "(Invalid)"
msgstr "(ÎÞЧ)"
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ±äÁ¿ %s ÉÐ䶨Òå"
+msgid "E677: Error writing temp file"
+msgstr "E677: дÁÙʱÎļþ³ö´í"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: ½« Funcref ×÷Êý×ÖʹÓÃ"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: ½« List ×÷Êý×ÖʹÓÃ"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: ½« Dictionary ×÷Êý×ÖʹÓÃ"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: ½« Funcref ×÷ String ʹÓÃ"
+
+msgid "E730: using List as a String"
+msgstr "E730: ½« List ×÷ String ʹÓÃ"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: ½« Dictionary ×÷ String ʹÓÃ"
#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: º¯Êý %s ÒѾ´æÔÚ, ÇëʹÓà ! Ç¿ÖÆÌæ»»"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref ±äÁ¿Ãû±ØÐëÒÔ´óд×Öĸ¿ªÍ·: %s"
#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: º¯Êý %s ÉÐ䶨Òå"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: ±äÁ¿ÃûÓëÒÑÓк¯ÊýÃû³åÍ»: %s"
+
+#, c-format
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: ±äÁ¿ÀàÐͲ»Æ¥Åä: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: ÖµÒÑËø¶¨: %s"
+
+msgid "Unknown"
+msgstr "δ֪"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: ÎÞ·¨¸Ä±ä %s µÄÖµ"
+
+#, fuzzy
+#~ msgid "E698: variable nested too deep for making a copy"
+#~ msgstr "E698: ±äÁ¿Ç¶Ì×¹ýÉî"
#, c-format
msgid "E124: Missing '(': %s"
-msgstr "E124: ȱÉÙ \"(\": %s"
+msgstr "E124: ȱÉÙ '(': %s"
#, c-format
msgid "E125: Illegal argument: %s"
-msgstr "E125: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E125: ÎÞЧµÄ²ÎÊý: %s"
msgid "E126: Missing :endfunction"
msgstr "E126: ȱÉÙ :endfunction"
#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: º¯Êý %s ÕýÔÚʹÓÃÖУ¬²»ÄÜÖØж¨Òå"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: º¯ÊýÃû³ÆµÚÒ»¸ö×Öĸ±ØÐë´óд: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: º¯ÊýÃûÓë½Å±¾ÎļþÃû²»Æ¥Åä: %s"
msgid "E129: Function name required"
-msgstr "E129: ÐèÒªº¯ÊýÃû³Æ"
-
-msgid "function "
-msgstr "º¯Êý "
+msgstr "E129: ÐèÒªº¯ÊýÃû"
#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: º¯Êý %s ÉÐ䶨Òå"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: º¯ÊýÃû±ØÐëÒÔ´óд×Öĸ¿ªÍ·»òÕß°üº¬Ã°ºÅ: %s"
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: º¯Êý %s ÕýÔÚʹÓÃÖУ¬²»ÄÜɾ³ý"
+msgstr "E131: ÎÞ·¨É¾³ýº¯Êý %s: ÕýÔÚʹÓÃÖÐ"
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: º¯ÊýµÝ¹éµ÷ÓòãÊý³¬¹ý 'maxfuncdepth'"
+msgstr "E132: º¯Êýµ÷ÓÃÉî¶È³¬³ö 'maxfuncdepth'"
-#. always scroll up, don't overwrite
#, c-format
msgid "calling %s"
msgstr "µ÷ÓÃ %s"
-#. always scroll up, don't overwrite
#, c-format
-msgid "continuing in %s"
-msgstr "¼ÌÐø: %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return ±ØÐëÔÚº¯ÊýÀïʹÓÃ"
+msgid "%s aborted"
+msgstr "%s ÒÑÖÐÖ¹"
#, c-format
msgid "%s returning #%ld"
-msgstr "%s ·µ»ØÖµ #%ld "
+msgstr "%s ·µ»Ø #%ld "
#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s ·µ»ØÖµ \"%s\""
+msgid "%s returning %s"
+msgstr "%s ·µ»Ø %s"
+#, c-format
+msgid "continuing in %s"
+msgstr "ÔÚ %s ÖмÌÐø"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return ²»ÔÚº¯ÊýÖÐ"
+
+#, c-format
msgid ""
"\n"
"# global variables:\n"
@@ -466,76 +675,90 @@
"\n"
"# È«¾Ö±äÁ¿:\n"
-msgid "Entering Debug mode. Type \"cont\" to leave."
-msgstr "½øÈëµ÷ÊÔģʽ. ÊäÈë \"cont\" ÒԻص½Õý³£Ä£Ê½."
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t×î½üÐÞ¸ÄÓÚ "
+
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "½øÈëµ÷ÊÔģʽ¡£ÊäÈë \"cont\" ¼ÌÐøÔËÐС£"
#, c-format
msgid "line %ld: %s"
-msgstr "ÐÐ %ld: %s"
+msgstr "µÚ %ld ÐÐ: %s"
#, c-format
msgid "cmd: %s"
-msgstr "cmd: %s"
+msgstr "ÃüÁî: %s"
#, c-format
msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" Öжϵã: µÚ %ld ÐÐ"
+msgstr "¶Ïµã \"%s%s\" µÚ %ld ÐÐ"
#, c-format
msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ÕÒ²»µ½Öжϵã: %s"
+msgstr "E161: ÕÒ²»µ½¶Ïµã: %s"
msgid "No breakpoints defined"
-msgstr "ûÓж¨ÒåÖжϵã"
+msgstr "ûÓж¨Òå¶Ïµã"
#, c-format
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s µÚ %ld ÐÐ"
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: ÇëÏÈʹÓà :profile start <fname>"
+
msgid "Save As"
msgstr "Áí´æΪ"
#, c-format
-msgid "Save changes to \"%.*s\"?"
-msgstr "½«¸Ä±ä±£´æµ½ \"%.*s\"?"
+msgid "Save changes to \"%s\"?"
+msgstr "½«¸Ä±ä±£´æµ½ \"%s\" Âð£¿"
msgid "Untitled"
msgstr "δÃüÃû"
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ÒѸü¸Ä¹ý»º³åÇø \"%s\" µ«ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgstr "E162: »º³åÇø \"%s\" ÒÑÐ޸ĵ«ÉÐδ±£´æ"
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "×¢Òâ: ÒÑÇл»µ½ÆäËü»º³åÇø (Çë¼ì²é Autocommands ÓÐÎÞ´íÎó)"
+msgstr "¾¯¸æ: ÒâÍâµØ½øÈëÁËÆäËü»º³åÇø (Çë¼ì²é×Ô¶¯ÃüÁî)"
msgid "E163: There is only one file to edit"
msgstr "E163: Ö»ÓÐÒ»¸öÎļþ¿É±à¼"
msgid "E164: Cannot go before first file"
-msgstr "E164: ÒѾÔÚµÚÒ»¸öÎļþÁË"
+msgstr "E164: ÎÞ·¨Çл»£¬ÒÑÊǵÚÒ»¸öÎļþ"
msgid "E165: Cannot go beyond last file"
-msgstr "E165: ÒѾÔÚ×îºóÒ»¸öÎļþÁË"
+msgstr "E165: ÎÞ·¨Çл»£¬ÒÑÊÇ×îºóÒ»¸öÎļþ"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: ²»Ö§³Ö±àÒëÆ÷: %s"
#, c-format
msgid "Searching for \"%s\" in \"%s\""
-msgstr "²éÕÒÖÐ: \"%s\" -- \"%s\""
+msgstr "ÕýÔÚ²éÕÒ \"%s\"£¬ÔÚ \"%s\" ÖÐ"
#, c-format
msgid "Searching for \"%s\""
-msgstr "²éÕÒÖÐ: \"%s\""
+msgstr "ÕýÔÚ²éÕÒ \"%s\""
#, c-format
msgid "not found in 'runtimepath': \"%s\""
-msgstr "ÔÚ 'runtimepath' ÀïÕÒ²»µ½ \"%s\""
+msgstr "ÔÚ 'runtimepath' ÖÐÕÒ²»µ½ \"%s\""
-msgid "Run Macro"
-msgstr "Ö´Ðкê"
+msgid "Source Vim script"
+msgstr "Ö´ÐÐ Vim ½Å±¾"
#, c-format
msgid "Cannot source a directory: \"%s\""
-msgstr "²»ÄÜÖ´ÐÐĿ¼£º \"%s\""
+msgstr "²»ÄÜÖ´ÐÐĿ¼: \"%s\""
#, c-format
msgid "could not source \"%s\""
@@ -547,69 +770,43 @@
#, c-format
msgid "sourcing \"%s\""
-msgstr "Ö´ÐÐ \"%s\" ÖÐ"
+msgstr "Ö´ÐÐ \"%s\""
#, c-format
msgid "line %ld: sourcing \"%s\""
-msgstr "µÚ %ld ÐÐ: ½áÊøÖ´ÐÐ %s"
+msgstr "µÚ %ld ÐÐ: Ö´ÐÐ \"%s\""
#, c-format
msgid "finished sourcing %s"
msgstr "½áÊøÖ´ÐÐ %s"
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd ²ÎÊý"
+
+msgid "-c argument"
+msgstr "-c ²ÎÊý"
+
+msgid "environment variable"
+msgstr "»·¾³±äÁ¿"
+
+#~ msgid "error handler"
+#~ msgstr ""
+
msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ×¢Òâ: ´íÎóµÄÐзָô×Ö·û£¬¿ÉÄÜÊÇÉÙÁË ^M"
+msgstr "W15: ¾¯¸æ: ´íÎóµÄÐзָô·û£¬¿ÉÄÜÊÇÉÙÁË ^M"
msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ÔÚÖ´ÐÐ script ÎļþÍâ²»¿ÉʹÓà :scriptencoding"
+msgstr "E167: Ôڽű¾ÎļþÍâʹÓÃÁË :scriptencoding"
msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ÔÚÖ´ÐÐ script ÎļþÍâ²»¿ÉʹÓà :finish"
-
-msgid "No text to be printed"
-msgstr "ûÓÐÒª´òÓ¡µÄÎÄ×Ö"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "´òÓ¡ÖÐ: µÚ %d Ò³ (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "¸´ÖÆ %d / %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "ÒÑ´òÓ¡: %s"
-
-msgid "Printing aborted"
-msgstr "´òÓ¡ÖжÏ"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: дÈë PostScript Îļþ³ö´í"
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: ²»ÄÜ´ò¿ª PostScript Êä³öÎļþ"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: ²»ÄÜ´ò¿ªÎļþ \"%s\""
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: ²»ÄܶÁ PostScript ×ÊÔ´Îļþ \"%s\""
-
-msgid "Sending to printer..."
-msgstr "·¢Ë͵½´òÓ¡»ú..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: ´òÓ¡ PostScript Îļþʧ°Ü"
-
-#~ msgid "Print job sent."
-#~ msgstr ""
+msgstr "E168: Ôڽű¾ÎļþÍâʹÓÃÁË :finish"
#, c-format
msgid "Current %slanguage: \"%s\""
-msgstr "Ä¿Ç°µÄ %sÓïÑÔ: \"%s\""
+msgstr "µ±Ç°µÄ %sÓïÑÔ: \"%s\""
#, c-format
msgid "E197: Cannot set language to \"%s\""
@@ -619,32 +816,41 @@
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, Ê®Áù½øÖÆ %02x, °Ë½øÖÆ %03o"
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %04x, °Ë½øÖÆ %o"
+
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %08x, °Ë½øÖÆ %o"
+
msgid "E134: Move lines into themselves"
-msgstr "E134: ²»ÄÜ°ÑÐÐÒƵ½Ëü×ÔÒÑÄÚ"
+msgstr "E134: °ÑÐÐÒƶ¯µ½×ÔÒÑÖÐ"
msgid "1 line moved"
-msgstr "ÒÑÒƶ¯ 1 ÐÐ"
+msgstr "Òƶ¯ÁË 1 ÐÐ"
#, c-format
msgid "%ld lines moved"
-msgstr "ÒÑ°áÒÆ %ld ÐÐ"
+msgstr "Òƶ¯ÁË %ld ÐÐ"
#, c-format
msgid "%ld lines filtered"
-msgstr "ÒÑ´¦Àí %ld ÐÐ"
+msgstr "¹ýÂËÁË %ld ÐÐ"
msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* Autocommand ²»¿ÉÒÔ¸ü¸Ä»º³åÇøµÄÄÚÈÝ"
+msgstr "E135: *Filter* ×Ô¶¯ÃüÁî²»¿ÉÒԸı䵱ǰ»º³åÇø"
msgid "[No write since last change]\n"
-msgstr "[¸üкóÉÐδ±£´æ]\n"
+msgstr "[ÒÑÐ޸ĵ«ÉÐδ±£´æ]\n"
#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s ÔÚÐÐÖÐ: "
+# bad to translate
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s λÓÚÐÐ: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: ¹ý¶à´íÎó, ºöÂÔÎļþÆäÓಿ·Ö"
+msgstr "E136: viminfo: ´íÎó¹ý¶à£¬ºöÂÔÎļþµÄÊ£Óಿ·Ö"
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -661,39 +867,39 @@
#, c-format
msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo Îļþ²»ÄÜдÈë: %s"
+msgstr "E137: Viminfo Îļþ²»¿ÉдÈë: %s"
#, c-format
msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: ²»ÄÜдÈë viminfo Îļþ %s !"
+msgstr "E138: ÎÞ·¨Ð´Èë viminfo Îļþ %s£¡"
#, c-format
msgid "Writing viminfo file \"%s\""
-msgstr "дÈë viminfo Îļþ \"%s\" ÖÐ"
+msgstr "дÈë viminfo Îļþ \"%s\""
#. Write the info:
-#, c-format
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# viminfo ÎļþÊÇÓÉ vim %s Ëù²úÉú.\n"
+msgstr "# Õâ¸ö viminfo ÎļþÊÇÓÉ vim %s Éú³ÉµÄ¡£\n"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"# You may edit it if you're careful!\n"
"\n"
msgstr ""
-"# Èç¹ûÏëÒª×ÔÐÐÐÞ¸ÄÇëÌرðСÐÄ£¡\n"
+"# Èç¹ûÒª×ÔÐÐÐÞ¸ÄÇëÌرðСÐÄ£¡\n"
"\n"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# 'encoding' ÔÚ´ËÎļþ½¨Á¢Ê±µÄÖµ\n"
msgid "Illegal starting char"
msgstr "ÎÞЧµÄÆô¶¯×Ö·û"
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ÄúÔÚÁíÒ»¸ö»º³åÇøÒ²¼ÓÔØÁËÕâ¸öÎļþ"
-
msgid "Write partial file?"
msgstr "ҪдÈ벿·ÖÎļþÂð£¿"
@@ -701,30 +907,38 @@
msgstr "E140: ÇëʹÓà ! À´Ð´È벿·Ö»º³åÇø"
#, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "Òª¸²¸ÇÒÑ´æÔÚµÄÎļþ \"%.*s\"£¿"
+msgid "Overwrite existing file \"%s\"?"
+msgstr "¸²¸ÇÒÑ´æÔÚµÄÎļþ \"%s\" Âð£¿"
+
+#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "½»»»Îļþ \"%s\" ÒÑ´æÔÚ£¬È·ÊµÒª¸²¸ÇÂð£¿"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: ½»»»ÎļþÒÑ´æÔÚ: %s (:silent! Ç¿ÖÆÖ´ÐÐ)"
#, c-format
msgid "E141: No file name for buffer %ld"
msgstr "E141: »º³åÇø %ld ûÓÐÎļþÃû"
msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: ÎļþδдÈ룬ÒòΪ 'write' Ñ¡Ïî¹Ø±Õ"
+msgstr "E142: ÎļþδдÈë: дÈë±» 'write' Ñ¡Ïî½ûÓÃ"
#, c-format
msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
"Do you wish to write anyway?"
msgstr ""
-"\"%.*s\" ÒÑÉ趨 'readonly' Ñ¡Ïî.\n"
-"È·¶¨Òª¸²¸ÇÂð£¿"
+"\"%s\" ÒÑÉ趨 'readonly' Ñ¡Ïî¡£\n"
+"ȷʵҪ¸²¸ÇÂð£¿"
msgid "Edit File"
msgstr "±à¼Îļþ"
#, c-format
msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommands ÒâÍâµØɾ³ýлº³åÇø %s"
+msgstr "E143: ×Ô¶¯ÃüÁîÒâÍâµØɾ³ýÁËлº³åÇø %s"
msgid "E144: non-numeric argument to :z"
msgstr "E144: :z ²»½ÓÊÜ·ÇÊý×ֵIJÎÊý"
@@ -733,232 +947,283 @@
msgstr "E145: rvim ÖнûֹʹÓà shell ÃüÁî"
msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ÕýÔò±í´ïʽ²»ÄÜÓÃ×Öĸ·Ö¸ô (?)"
+msgstr "E146: ÕýÔò±í´ïʽ²»ÄÜÓÃ×Öĸ×÷·Ö½ç"
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Ì滻Ϊ %s (y/n/a/q/^E/^Y)?"
+msgstr "Ì滻Ϊ %s (y/n/a/q/l/^E/^Y)£¿"
msgid "(Interrupted) "
msgstr "(ÒÑÖжÏ) "
+msgid "1 match"
+msgstr "1 ¸öÆ¥Å䣬"
+
msgid "1 substitution"
-msgstr "Ìæ»»Ò»×é"
+msgstr "1 ´ÎÌæ»»£¬"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ¸öÆ¥Å䣬"
#, c-format
msgid "%ld substitutions"
-msgstr "Ìæ»» %ld ×é"
+msgstr "%ld ´ÎÌæ»»£¬"
msgid " on 1 line"
-msgstr " Ò»ÐÐÖÐ"
+msgstr "¹² 1 ÐÐ"
#, c-format
msgid " on %ld lines"
-msgstr " %ld ÐÐÖÐ"
+msgstr "¹² %ld ÐÐ"
msgid "E147: Cannot do :global recursive"
msgstr "E147: :global ²»ÄܵݹéÖ´ÐÐ"
msgid "E148: Regular expression missing from global"
-msgstr "E148: ûÓÐʹÓùýÕýÔò±í´ïʽ (?)"
+msgstr "E148: global ȱÉÙÕýÔò±í´ïʽ"
#, c-format
msgid "Pattern found in every line: %s"
-msgstr "ÿһÐж¼ÕÒ²»µ½Ä£Ê½: %s"
+msgstr "ÿÐж¼Æ¥Åä±í´ïʽ: %s"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"\n"
"# Last Substitute String:\n"
"$"
msgstr ""
"\n"
-"# Ç°Ò»×éÌæ´ú×Ö·û´®:\n"
+"# ×î½üµÄÌæ»»×Ö·û´®:\n"
"$"
+msgid "E478: Don't panic!"
+msgstr "E478: ²»Òª»Å£¡"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: ±§Ç¸£¬Ã»ÓÐ '%s' µÄ %s µÄ˵Ã÷"
+
#, c-format
msgid "E149: Sorry, no help for %s"
-msgstr "E149: ±§Ç¸, ûÓÐ %s µÄ˵Ã÷"
+msgstr "E149: ±§Ç¸£¬Ã»ÓÐ %s µÄ˵Ã÷"
#, c-format
msgid "Sorry, help file \"%s\" not found"
-msgstr "±§Ç¸, ÕÒ²»µ½°ïÖúÎļþ \"%s\""
+msgstr "±§Ç¸£¬ÕÒ²»µ½°ïÖúÎļþ \"%s\""
#, c-format
msgid "E150: Not a directory: %s"
-msgstr "E150: %s ²»ÊÇĿ¼"
+msgstr "E150: ²»ÊÇĿ¼: %s"
#, c-format
msgid "E152: Cannot open %s for writing"
-msgstr "E152: ²»ÄÜÒÔдÈëģʽ´ò¿ª \"%s\""
+msgstr "E152: ÎÞ·¨´ò¿ª²¢Ð´Èë %s"
#, c-format
msgid "E153: Unable to open %s for reading"
-msgstr "E153: ²»ÄܶÁÈ¡Îļþ: %s"
+msgstr "E153: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ %s"
#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: ±êÇ©(tag) \"%s\" ÔÚÎļþ %s ÀïÖظ´³öÏÖ¶à´Î"
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: ÔÚÒ»ÖÖÓïÑÔÖлìºÏÁ˶àÖÖ°ïÖúÎļþ±àÂë: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Tag \"%s\" ÔÚÎļþ %s/%s ÖÐÖظ´³öÏÖ"
#, c-format
msgid "E160: Unknown sign command: %s"
-msgstr "E160: 䶨ÒåµÄ sign command: %s"
+msgstr "E160: δ֪µÄ sign ÃüÁî: %s"
msgid "E156: Missing sign name"
msgstr "E156: ȱÉÙ sign Ãû³Æ"
-msgid "E255: Too many signs defined"
-msgstr "E326: ÕÒµ½Ì«¶à signs"
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs ¶¨Òå¹ý¶à"
#, c-format
msgid "E239: Invalid sign text: %s"
-msgstr "E239: ²»ÕýÈ·µÄ sign ÎÄ×Ö: %s"
+msgstr "E239: ÎÞЧµÄ sign ÎÄ×Ö: %s"
#, c-format
msgid "E155: Unknown sign: %s"
-msgstr "E155: ²»ÕýÈ·µÄ sign: %s"
+msgstr "E155: δ֪µÄ sign: %s"
msgid "E159: Missing sign number"
-msgstr "E159: ȱÉÙ sign number"
+msgstr "E159: ȱÉÙ sign ºÅ"
#, c-format
msgid "E158: Invalid buffer name: %s"
-msgstr "E158: »º³åÇøÃû³Æ´íÎó: %s"
+msgstr "E158: ÎÞЧµÄ»º³åÇøÃû: %s"
#, c-format
msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Sign ID ´íÎó: %ld"
+msgstr "E157: ÎÞЧµÄ sign ID: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (ÕÒ²»µ½)"
+
+msgid " (not supported)"
+msgstr " (²»Ö§³Ö)"
msgid "[Deleted]"
msgstr "[ÒÑɾ³ý]"
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
-msgstr "½øÈë Ex ģʽ. ÊäÈë \"visua\" ÒԻص½Õý³£Ä£Ê½."
+msgstr "½øÈë Ex ģʽ¡£ÊäÈë \"visual\" »Øµ½Õý³£Ä£Ê½¡£"
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "Òѵ½Îļþ½áβ"
+msgid "E501: At end-of-file"
+msgstr "E501: Òѵ½Îļþĩβ"
msgid "E169: Command too recursive"
msgstr "E169: ÃüÁîµÝ¹é²ãÊý¹ý¶à"
-msgid "E170: Missing :endwhile"
-msgstr "E170: ȱÉÙ :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: ȱÉÙ :endif"
+#, c-format
+msgid "E605: Exception not caught: %s"
+msgstr "E605: Ò쳣ûÓб»²¶»ñ: %s"
msgid "End of sourced file"
-msgstr "ÃüÁîÎļþ½áÊø"
+msgstr "½Å±¾Îļþ½áÊø"
msgid "End of function"
-msgstr "º¯Êý½áβ"
+msgstr "º¯Êý½áÊø"
-msgid "Ambiguous use of user-defined command"
-msgstr "Óû§¶¨ÒåµÄÃüÁî»á»ìÏý"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: ²»È·¶¨µÄÓû§×Ô¶¨ÒåÃüÁî"
-msgid "Not an editor command"
-msgstr "²»ÊDZà¼Æ÷µÄÃüÁî"
+msgid "E492: Not an editor command"
+msgstr "E492: ²»ÊDZà¼Æ÷µÄÃüÁî"
-msgid "Don't panic!"
-msgstr "²»Òª¾ª»Å!"
-
-msgid "Backwards range given"
-msgstr "Ö¸¶¨ÁËÏòÇ°²Î¿¼µÄ·¶Î§"
+msgid "E493: Backwards range given"
+msgstr "E493: ʹÓÃÁËÄæÏòµÄ·¶Î§"
msgid "Backwards range given, OK to swap"
-msgstr "Ö¸¶¨ÁËÏòÇ°²Î¿¼µÄ·¶Î§£¬OK to swap"
+msgstr "ʹÓÃÁËÄæÏòµÄ·¶Î§£¬È·¶¨½»»»Âð"
-msgid "Use w or w>>"
-msgstr "ÇëʹÓà w »ò w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: ÇëʹÓà w »ò w>>"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ±§Ç¸, ±¾ÃüÁîÔÚ´Ë°æ±¾ÖÐδʵÏÖ"
+msgstr "E319: ±§Ç¸£¬ÃüÁîÔÚ´Ë°æ±¾Öв»¿ÉÓÃ"
msgid "E172: Only one file name allowed"
-msgstr "E172: Ö»ÄÜÓÐÒ»¸öÎļþÃû"
+msgstr "E172: Ö»ÔÊÐíÒ»¸öÎļþÃû"
+
+msgid "1 more file to edit. Quit anyway?"
+msgstr "»¹ÓÐ 1 ¸öÎļþδ±à¼¡£È·ÊµÒªÍ˳öÂð£¿"
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "»¹ÓÐ %d ¸öÎļþδ±à¼. È·¶¨ÒªÍ˳ö£¿"
+msgstr "»¹ÓÐ %d ¸öÎļþδ±à¼¡£È·ÊµÒªÍ˳öÂð£¿"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: »¹ÓÐ 1 ¸öÎļþδ±à¼"
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: »¹ÓÐ %ld ¸öÎļþδ±à¼"
-msgid "E174: Command already exists: use ! to redefine"
-msgstr "E174: ÃüÁîÒѾ´æÔÚ, ÇëʹÓà ! Ç¿ÖÆÖØж¨Òå"
+msgid "E174: Command already exists: add ! to replace it"
+msgstr "E174: ÃüÁîÒÑ´æÔÚ: Çë¼Ó ! Ç¿ÖÆÌæ»»"
msgid ""
"\n"
" Name Args Range Complete Definition"
msgstr ""
"\n"
-" Ãû³Æ ²ÎÊý ·¶Î§ ÍêÕû ¶¨Òå "
+" Ãû³Æ ²ÎÊý ·¶Î§ ²¹È« ¶¨Òå "
msgid "No user-defined commands found"
-msgstr "ÕÒ²»µ½Óû§×Ô¶¨ÒåµÄÃüÁî"
+msgstr "ÕÒ²»µ½Óû§×Ô¶¨ÒåÃüÁî"
msgid "E175: No attribute specified"
-msgstr "E175: ûÓÐÖ¸¶¨µÄÊôÐÔ"
+msgstr "E175: ûÓÐÖ¸¶¨ÊôÐÔ"
msgid "E176: Invalid number of arguments"
-msgstr "E176: ²»ÕýÈ·µÄ²ÎÊý¸öÊý"
+msgstr "E176: ÎÞЧµÄ²ÎÊý¸öÊý"
msgid "E177: Count cannot be specified twice"
-msgstr "E177: ²»ÄÜÖ¸¶¨Á½´Î"
+msgstr "E177: ²»ÄÜÖ¸¶¨Á½´Î¼ÆÊý"
msgid "E178: Invalid default value for count"
-msgstr "E178: ¼ÆÊýµÄȱʡֵ²»ÕýÈ·"
+msgstr "E178: ÎÞЧµÄ¼ÆÊýĬÈÏÖµ"
-msgid "E179: argument required for complete"
-msgstr "E179: Ö¸ÁîÐèÒª²ÎÊý²ÅÄÜÍê³É"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ²»ÍêÕûµÄÖµ: '%s'"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete ÐèÒª²ÎÊý"
#, c-format
msgid "E181: Invalid attribute: %s"
-msgstr "E181: ²»ÕýÈ·µÄÊôÐÔ: %s"
+msgstr "E181: ÎÞЧµÄÊôÐÔ: %s"
msgid "E182: Invalid command name"
-msgstr "E182: ÃüÁîÃû³Æ²»ÕýÈ·"
+msgstr "E182: ÎÞЧµÄÃüÁîÃû"
msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: Óû§×Ô¶¨ÒåÃüÁî±ØÐëÒÔ´óд×Öĸ¿ªÊ¼"
+msgstr "E183: Óû§×Ô¶¨ÒåÃüÁî±ØÐëÒÔ´óд×Öĸ¿ªÍ·"
#, c-format
msgid "E184: No such user-defined command: %s"
-msgstr "E184: ûÓÐÓû§×Ô¶¨ÒåµÄÃüÁ %s"
+msgstr "E184: ûÓÐÕâ¸öÓû§×Ô¶¨ÒåÃüÁî: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: ÎÞЧµÄ²¹È«ÀàÐÍ: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Ö»ÓÐ custom ²¹È«²ÅÔÊÐí²ÎÊý"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Custom ²¹È«ÐèÒªÒ»¸öº¯Êý²ÎÊý"
#, c-format
msgid "E185: Cannot find color scheme %s"
-msgstr "E185: ÕÒ²»µ½ÑÕÉ«Ñùʽ %s"
+msgstr "E185: ÕÒ²»µ½ÑÕÉ«Ö÷Ìâ %s"
msgid "Greetings, Vim user!"
-msgstr "ÄãºÃ, Vim Óû§£¡"
+msgstr "ÄúºÃ£¬Vim Óû§£¡"
+
+msgid "E784: Cannot close last tab page"
+msgstr "E784: ²»ÄܹرÕ×îºóÒ»¸ö tab Ò³"
+
+msgid "Already only one tab page"
+msgstr "ÒѾֻʣһ¸ö tab Ò³ÁË"
msgid "Edit File in new window"
msgstr "ÔÚд°¿Ú±à¼Îļþ"
+#, c-format
+msgid "Tab page %d"
+msgstr "Tab ҳ %d"
+
msgid "No swap file"
msgstr "ÎÞ½»»»Îļþ"
msgid "Append File"
-msgstr "¸½¼ÓÎļþ"
+msgstr "×·¼ÓÎļþ"
+
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: ²»ÄܸıäĿ¼£¬»º³åÇøÒÑÐÞ¸Ä (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E186: No previous directory"
msgstr "E186: Ç°Ò»¸öĿ¼²»´æÔÚ"
msgid "E187: Unknown"
-msgstr "E187: ²»ÄÜʶ±ðµÄ±ê¼Ç"
+msgstr "E187: δ֪"
+
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize ÐèÒªÁ½¸öÊý×Ö²ÎÊý"
#, c-format
msgid "Window position: X %d, Y %d"
msgstr "´°¿ÚλÖÃ: X %d, Y %d"
msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: ÔÚÄúµÄƽ̨Éϲ»ÄÜ»ñµÃ´°¿ÚλÖÃ"
+msgstr "E188: ÔÚ´Ëƽ̨Éϲ»ÄÜ»ñµÃ´°¿ÚλÖÃ"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos ÐèÒªÁ½¸öÊý×Ö²ÎÊý"
msgid "Save Redirection"
msgstr "±£´æÖض¨Ïò"
@@ -973,85 +1238,170 @@
msgstr "±£´æÉ趨"
#, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
-msgstr "E189: \"%s\" ÒÑ´æÔÚ (ÇëÓÃ ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: ÎÞ·¨´´½¨Ä¿Â¼: %s"
+
+#, c-format
+msgid "E189: \"%s\" exists (add ! to override)"
+msgstr "E189: \"%s\" ÒÑ´æÔÚ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: ²»ÄÜÒÔдÈëģʽ´ò¿ª \"%s\""
+msgstr "E190: ÎÞ·¨´ò¿ª²¢Ð´Èë \"%s\""
#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ²ÎÊý±ØÐëÊÇÓ¢ÎÄ×Öĸ»òÏòÇ°/ºóµÄÒýºÅ"
+msgstr "E191: ²ÎÊý±ØÐëÊÇÒ»¸ö×Öĸ»òÕßÕý/·´ÒýºÅ"
msgid "E192: Recursive use of :normal too deep"
msgstr "E192: :normal µÝ¹é²ãÊý¹ýÉî"
-msgid ":if nesting too deep"
-msgstr ":if ²ãÊý¹ýÉî"
-
-msgid ":endif without :if"
-msgstr ":endif ȱÉÙ¶ÔÓ¦µÄ :if"
-
-msgid ":else without :if"
-msgstr ":else ȱÉÙ¶ÔÓ¦µÄ :if"
-
-msgid ":elseif without :if"
-msgstr ":elseif ȱÉÙ¶ÔÓ¦µÄ :if"
-
-msgid ":while nesting too deep"
-msgstr ":while ²ãÊý¹ýÉî"
-
-msgid ":continue without :while"
-msgstr ":continue ȱÉÙ¶ÔÓ¦µÄ :while"
-
-msgid ":break without :while"
-msgstr ":break ȱÉÙ¶ÔÓ¦µÄ :while"
-
-msgid ":endwhile without :while"
-msgstr ":endwhile ȱÉÙ¶ÔÓ¦µÄ :while"
-
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction ±ØÐëÔÚº¯ÊýÄÚ²¿Ê¹ÓÃ"
-
msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: ûÓÐ '#' ¿ÉÌæ´úµÄÎļþÃû"
+msgstr "E194: ûÓÐÓÃÓÚÌæ»» '#' µÄ½»ÌæÎļþÃû"
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "ûÓÐ Autocommand ÎļþÃûÒÔÌæ»» \"<afile>\""
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: ûÓÐÓÃÓÚÌæ»» \"<afile>\" µÄ×Ô¶¯ÃüÁîÎļþÃû"
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "ûÓÐ Autocommand »º³åÇøÃû³ÆÒÔÌæ»» \"<abuf>\""
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: ûÓÐÓÃÓÚÌæ»» \"<abuf>\" µÄ×Ô¶¯ÃüÁ³åÇøºÅ"
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "ûÓÐ Autocommand Match name ÒÔÌæ»» \"<amatch>\""
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: ûÓÐÓÃÓÚÌæ»» \"<amatch>\" µÄ×Ô¶¯ÃüÁîÆ¥ÅäÃû"
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "ûÓÐ :source ÎļþÃûÒÔÌæ»» \"<sfile>\""
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: ûÓÐÓÃÓÚÌæ»» \"<sfile>\" µÄ :source ÎļþÃû"
#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' »ò '#' Ö¸Ïò¿ÕÎļþÃû£¬Ö»ÄÜÓÃì¶ \":p:h\""
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' »ò '#' Ϊ¿ÕÎļþÃû£¬Ö»ÄÜÓÃÓÚ \":p:h\""
-msgid "Evaluates to an empty string"
-msgstr "ÊäÈëΪ¿Õ×Ö·û´®"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: ½á¹ûΪ¿Õ×Ö·û´®"
msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: ²»ÄܶÁÈ¡ viminfo"
+msgstr "E195: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ viminfo Îļþ"
msgid "E196: No digraphs in this version"
-msgstr "E196: ±¾°æ±¾ÎÞ¸´ºÏ×Ö·û(digraph)"
+msgstr "E196: ´Ë°æ±¾ÎÞ¸´ºÏ×Ö·û(digraph)"
-msgid "tagname"
-msgstr "±êÇ©Ãû³Æ"
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: ²»ÄÜ :throw ǰ׺Ϊ 'Vim' µÄÒì³£"
-msgid " kind file\n"
-msgstr "ÀàÎļþ\n"
-
-msgid "'history' option is zero"
-msgstr "Ñ¡Ïî 'history' ÊÇÁã"
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "Å׳öÒì³£: %s"
#, c-format
+msgid "Exception finished: %s"
+msgstr "Íê³ÉÒì³£: %s"
+
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "¶ªÆúÒì³£: %s"
+
+#, c-format
+msgid "%s, line %ld"
+msgstr "%s£¬µÚ %ld ÐÐ"
+
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception caught: %s"
+msgstr "²¶»ñÒì³£: %s"
+
+#, c-format
+#~ msgid "%s made pending"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "%s resumed"
+#~ msgstr " ÒÑ·µ»Ø\n"
+
+#, c-format
+#~ msgid "%s discarded"
+#~ msgstr ""
+
+msgid "Exception"
+msgstr "Òì³£"
+
+msgid "Error and interrupt"
+msgstr "´íÎóºÍÖжÏ"
+
+msgid "Error"
+msgstr "´íÎó"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "ÖжÏ"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: :if ǶÌײãÊý¹ýÉî"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif ȱÉÙ¶ÔÓ¦µÄ :if"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else ȱÉÙ¶ÔÓ¦µÄ :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif ȱÉÙ¶ÔÓ¦µÄ :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: ¶à¸ö :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif ÔÚ :else ºóÃæ"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while/:for ǶÌײãÊý¹ýÉî"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue ȱÉÙ¶ÔÓ¦µÄ :while »ò :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break ȱÉÙ¶ÔÓ¦µÄ :while »ò :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :while ÒÔ :endfor ½áβ"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :for ÒÔ :endwhile ½áβ"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: :try ǶÌײãÊý¹ýÉî"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch ȱÉÙ¶ÔÓ¦µÄ :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch ÔÚ :finally ºóÃæ"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally ȱÉÙ¶ÔÓ¦µÄ :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: ¶à¸ö :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry ȱÉÙ¶ÔÓ¦µÄ :try"
+
+msgid "E193: :endfunction not inside a function"
+msgstr "E193: :endfunction ²»ÔÚº¯ÊýÄÚ"
+
+msgid "tagname"
+msgstr "tag Ãû"
+
+msgid " kind file\n"
+msgstr " ÀàÐÍ Îļþ\n"
+
+msgid "'history' option is zero"
+msgstr "Ñ¡Ïî 'history' ΪÁã"
+
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"\n"
"# %s History (newest to oldest):\n"
@@ -1075,10 +1425,10 @@
msgstr "E198: cmd_pchar ³¬¹ýÃüÁ¶È"
msgid "E199: Active window or buffer deleted"
-msgstr "E199: ÒÑɾ³ý»î¶¯´°¿Ú»ò»º´æ"
+msgstr "E199: »î¶¯´°¿Ú»ò»º³åÇøÒѱ»É¾³ý"
msgid "Illegal file name"
-msgstr "²»ÕýÈ·µÄÎļþÃû"
+msgstr "ÎÞЧµÄÎļþÃû"
msgid "is a directory"
msgstr "ÊÇĿ¼"
@@ -1087,26 +1437,32 @@
msgstr "²»ÊÇÎļþ"
msgid "[New File]"
-msgstr "[δÃüÃû]"
+msgstr "[ÐÂÎļþ]"
+
+msgid "[New DIRECTORY]"
+msgstr "[ÐÂĿ¼]"
+
+msgid "[File too big]"
+msgstr "[Îļþ¹ý´ó]"
msgid "[Permission Denied]"
msgstr "[ȨÏÞ²»×ã]"
msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre Autocommand ʹ³ÌÐò²»ÄܶÁÈ¡´ËÎļþ"
+msgstr "E200: *ReadPre ×Ô¶¯ÃüÁîµ¼ÖÂÎļþ²»¿É¶Á"
msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *Filter* Autocommand ²»¿ÉÒÔ¸ü¸Ä»º³åÇøµÄÄÚÈÝ"
+msgstr "E201: *ReadPre ×Ô¶¯ÃüÁî²»ÔÊÐí¸Ä±äµ±Ç°»º³åÇø"
msgid "Vim: Reading from stdin...\n"
msgstr "Vim: ´Ó±ê×¼ÊäÈë¶ÁÈ¡...\n"
msgid "Reading from stdin..."
-msgstr "´Ó±ê×¼ÊäÈë¶Á..."
+msgstr "´Ó±ê×¼ÊäÈë¶ÁÈ¡..."
#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ת»»´íÎó"
+msgstr "E202: ת»»µ¼ÖÂÎļþ²»¿É¶Á"
msgid "[fifo/socket]"
msgstr "[fifo/socket]"
@@ -1121,13 +1477,13 @@
msgstr "[Ö»¶Á]"
msgid "[CR missing]"
-msgstr "[ȱÉÙCR]'"
+msgstr "[ȱÉÙ CR]'"
msgid "[NL found]"
-msgstr "[ÕÒµ½NL]"
+msgstr "[ÕÒµ½ NL]"
msgid "[long lines split]"
-msgstr "[·Ö¸î¹ý³¤ÐÐ]"
+msgstr "[³¤Ðзָî]"
msgid "[NOT converted]"
msgstr "[δת»»]"
@@ -1138,74 +1494,92 @@
msgid "[crypted]"
msgstr "[ÒѼÓÃÜ]"
-msgid "[CONVERSION ERROR]"
-msgstr "ת»»´íÎó"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[µÚ %ld ÐÐת»»´íÎó]"
+
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[µÚ %ld ÐÐÎÞЧ×Ö·û]"
msgid "[READ ERRORS]"
msgstr "[¶Á´íÎó]"
msgid "Can't find temp file for conversion"
-msgstr "ÕÒ²»µ½×ª»»ÓõÄÁÙʱÎļþ"
+msgstr "ÕÒ²»µ½ÓÃÓÚת»»µÄÁÙʱÎļþ"
msgid "Conversion with 'charconvert' failed"
-msgstr "×Ö·û¼¯×ª»»´íÎó"
+msgstr "'charconvert' ת»»Ê§°Ü"
msgid "can't read output of 'charconvert'"
-msgstr "²»ÄܶÁÈ¡ 'charconvert' µÄÊä³ö"
+msgstr "ÎÞ·¨¶ÁÈ¡ 'charconvert' µÄÊä³ö"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: ÕÒ²»µ½ acwrite »º³åÇø¶ÔÓ¦µÄ×Ô¶¯ÃüÁî"
msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Autocommand ɾ³ý»òÊÍ·ÅÁËҪдÈëµÄ»º³åÇø"
+msgstr "E203: ×Ô¶¯ÃüÁîɾ³ý»òÊÍ·ÅÁËҪдÈëµÄ»º³åÇø"
msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand ÒâÍâµØ¸Ä±äÁËÐкÅ"
+msgstr "E204: ×Ô¶¯ÃüÁîÒâÍâµØ¸Ä±äÁËÐÐÊý"
+
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans ²»ÔÊÐíδÐ޸ĵĻº³åÇøдÈë"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeans ²»ÔÊÐí»º³åÇø²¿·ÖдÈë"
msgid "is not a file or writable device"
msgstr "²»ÊÇÎļþ»ò¿ÉдµÄÉ豸"
-msgid "is read-only (use ! to override)"
-msgstr "ÊÇÖ»¶ÁÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "is read-only (add ! to override)"
+msgstr "Ö»¶Á (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Can't write to backup file (use ! to override)"
-msgstr "²»ÄÜд±¸·ÝÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: ÎÞ·¨Ð´È뱸·ÝÎļþ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Close error for backup file (use ! to override)"
-msgstr "¹Ø±Õ±¸·ÝÎļþ³ö´í (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: ¹Ø±Õ±¸·ÝÎļþ³ö´í (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Can't read file for backup (use ! to override)"
-msgstr "²»ÄܶÁÈ¡ÎļþÒÔ¹©±¸·Ý (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: ÎÞ·¨¶ÁÈ¡ÎļþÒÔ¹©±¸·Ý (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Cannot create backup file (use ! to override)"
-msgstr "²»ÄÜ´´½¨±¸·ÝÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: ÎÞ·¨´´½¨±¸·ÝÎļþ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Can't make backup file (use ! to override)"
-msgstr "²»ÄÜ×÷±¸·ÝÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: ÎÞ·¨Éú³É±¸·ÝÎļþ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork »áÏûʧ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+#, fuzzy
+#~ msgid "E460: The resource fork would be lost (add ! to override)"
+#~ msgstr "E460: Resource fork »áÏûʧ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E214: Can't find temp file for writing"
-msgstr "E214: ÕÒ²»µ½Ð´ÈëÓõĽ»»»Îļþ"
+msgstr "E214: ÕÒ²»µ½ÓÃÓÚдÈëµÄÁÙʱÎļþ"
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: ²»ÄÜת»» (ÇëʹÓà ! Ç¿ÖƲ»×ª»»Ð´Èë)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: ÎÞ·¨×ª»» (Çë¼Ó ! Ç¿ÖƲ»×ª»»Ð´Èë)"
msgid "E166: Can't open linked file for writing"
-msgstr "E166: ²»ÄÜÒÔдÈëģʽ´ò¿ªÁ´½ÓÎļþ"
+msgstr "E166: ÎÞ·¨´ò¿ª²¢Ð´ÈëÁ´½ÓÎļþ"
msgid "E212: Can't open file for writing"
-msgstr "E212: ²»ÄÜÒÔдÈëģʽ´ò¿ª"
+msgstr "E212: ÎÞ·¨´ò¿ª²¢Ð´ÈëÎļþ"
-msgid "Close failed"
-msgstr "¹Ø±Õʧ°Ü"
+msgid "E667: Fsync failed"
+msgstr "E667: ͬ²½Ê§°Ü"
-msgid "write error, conversion failed"
-msgstr "²»ÄÜдÈë -- ת»»Ê§°Ü"
+msgid "E512: Close failed"
+msgstr "E512: ¹Ø±Õʧ°Ü"
-msgid "write error (file system full?)"
-msgstr "дÈë´íÎó (ÎļþϵͳÒÑÂú£¿)"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: дÈë´íÎó£¬×ª»»Ê§°Ü (Ç뽫 'fenc' ÖÿÕÒÔÇ¿ÖÆÖ´ÐÐ)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: дÈë´íÎó (ÎļþϵͳÒÑÂú£¿)"
msgid " CONVERSION ERROR"
-msgstr "ת»»´íÎó"
+msgstr " ת»»´íÎó"
msgid "[Device]"
msgstr "[É豸]"
@@ -1214,35 +1588,35 @@
msgstr "[ÐÂ]"
msgid " [a]"
-msgstr "[a]"
+msgstr " [a]"
msgid " appended"
-msgstr " ÒѸ½¼Ó"
+msgstr " ÒÑ×·¼Ó"
msgid " [w]"
-msgstr "[w]"
+msgstr " [w]"
msgid " written"
msgstr " ÒÑдÈë"
msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch ģʽ: ²»ÄÜ´¢´æÔʼÎļþ"
+msgstr "E205: Patchmode: ÎÞ·¨±£´æÔʼÎļþ"
msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patch ģʽ: ²»Äܸıä¿ÕµÄÔʼÎļþ"
+msgstr "E206: Patchmode: ÎÞ·¨Éú³É¿ÕµÄÔʼÎļþ"
msgid "E207: Can't delete backup file"
-msgstr "E207: ²»ÄÜɾ³ý±¸·ÝÎļþ"
+msgstr "E207: ÎÞ·¨É¾³ý±¸·ÝÎļþ"
msgid ""
"\n"
"WARNING: Original file may be lost or damaged\n"
msgstr ""
"\n"
-"¾¯¸æ: ÔʼÎļþ¶ªÊ§»òËð»µ\n"
+"¾¯¸æ: ÔʼÎļþ¿ÉÄÜÒѶªÊ§»òËð»µ\n"
msgid "don't quit the editor until the file is successfully written!"
-msgstr "ÔÚÎļþÕýȷдÈëÇ°ÇëÎðÍ˳ö±à¼Æ÷!"
+msgstr "ÔÚÎļþÕýȷдÈëÇ°ÇëÎðÍ˳ö±à¼Æ÷£¡"
msgid "[dos]"
msgstr "[dos]"
@@ -1263,18 +1637,18 @@
msgstr "[unix ¸ñʽ]"
msgid "1 line, "
-msgstr "1 ÐÐ, "
+msgstr "1 ÐУ¬"
#, c-format
msgid "%ld lines, "
-msgstr "%ld ÐÐ, "
+msgstr "%ld ÐУ¬"
msgid "1 character"
-msgstr "Ò»¸ö×Ö·û"
+msgstr "1 ¸ö×Ö·û"
#, c-format
msgid "%ld characters"
-msgstr "%ld¸ö×Ö·û"
+msgstr "%ld ¸ö×Ö·û"
msgid "[noeol]"
msgstr "[noeol]"
@@ -1286,47 +1660,56 @@
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "¾¯¸æ: ±¾Îļþ×ÔÉϴζÁÈëºóÒѱ䶯!!!"
+msgstr "¾¯¸æ: ´ËÎļþ×Ô¶ÁÈëºóÒÑ·¢Éú±ä¶¯£¡£¡£¡"
msgid "Do you really want to write to it"
-msgstr "È·¶¨ÒªÐ´ÈëÂð"
+msgstr "ȷʵҪдÈëÂð"
#, c-format
msgid "E208: Error writing to \"%s\""
-msgstr "E208: дÈëÎļþ \"%s\" ´íÎó"
+msgstr "E208: дÈëÎļþ \"%s\" ³ö´í"
#, c-format
msgid "E209: Error closing \"%s\""
-msgstr "E209: ¹Ø±ÕÎļþ \"%s\" ´íÎó"
+msgstr "E209: ¹Ø±ÕÎļþ \"%s\" ³ö´í"
#, c-format
msgid "E210: Error reading \"%s\""
-msgstr "E210: ¶ÁÈ¡Îļþ \"%s\" ´íÎó"
+msgstr "E210: ¶ÁÈ¡Îļþ \"%s\" ³ö´í"
msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell autocommand ɾ³ý»º³åÇø"
+msgstr "E246: FileChangedShell ×Ô¶¯ÃüÁîɾ³ýÁË»º³åÇø"
#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: ¾¯¸æ: Îļþ \"%s\" ÒѾ²»´æÔÚ"
+msgid "E211: File \"%s\" no longer available"
+msgstr "E211: Îļþ \"%s\" ÒѾ²»´æÔÚ"
#, c-format
msgid ""
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
-msgstr "W12: ¾¯¸æ: Îļþ \"%s\" ×ÔÉϴζÁÈëºóÒѱ䶯, ¶øÇÒ±à¼ÖеĻº³åÇøÒ²¸ü¶¯ÁË"
+msgstr "W12: ¾¯¸æ: Îļþ \"%s\" Òѱ䶯£¬²¢ÇÒÔÚ Vim ÖеĻº³åÇøÒ²Òѱ䶯"
+
+msgid "See \":help W12\" for more info."
+msgstr "½øÒ»²½ËµÃ÷Çë¼û \":help W12\""
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ¾¯¸æ: Îļþ \"%s\" ×ÔÉϴζÁÈëºóÒѸıä"
+msgstr "W11: ¾¯¸æ: ±à¼¿ªÊ¼ºó£¬Îļþ \"%s\" Òѱ䶯"
+
+msgid "See \":help W11\" for more info."
+msgstr "½øÒ»²½ËµÃ÷Çë¼û \":help W11\""
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ¾¯¸æ: Îļþ \"%s\" ×ÔÉϴζÁÈëºóÒѸıä"
+msgstr "W16: ¾¯¸æ: ±à¼¿ªÊ¼ºó£¬Îļþ \"%s\" µÄģʽÒѱ䶯"
+
+msgid "See \":help W16\" for more info."
+msgstr "½øÒ»²½ËµÃ÷Çë¼û \":help W16\""
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ¾¯¸æ: Îļþ \"%s\" ÔÚ¿ªÊ¼±à¼ºóÓÖ±»´´½¨ÁË"
+msgstr "W13: ¾¯¸æ: ±à¼¿ªÊ¼ºó£¬Îļþ \"%s\" Òѱ»´´½¨"
msgid "Warning"
msgstr "¾¯¸æ"
@@ -1339,124 +1722,139 @@
"¼ÓÔØÎļþ(&L)"
#, c-format
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: ÎÞ·¨ÎªÖØмÓÔØ \"%s\" ×ö×¼±¸"
+
+#, c-format
msgid "E321: Could not reload \"%s\""
-msgstr "E321: ²»ÄÜÖØмÓÔØ \"%s\""
+msgstr "E321: ÎÞ·¨ÖØмÓÔØ \"%s\""
msgid "--Deleted--"
msgstr "--ÒÑɾ³ý--"
+#, c-format
+#~ msgid "auto-removing autocommand: %s <buffer=%d>"
+#~ msgstr ""
+
#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
-msgstr "E367: ×é²»´æÔÚ: \"%s\""
+msgstr "E367: ÎÞ´Ë×é: \"%s\""
#, c-format
msgid "E215: Illegal character after *: %s"
-msgstr "E215: * ºóÃæÓв»ÕýÈ·µÄ×Ö·û: %s"
+msgstr "E215: * ºóÃæÓÐÎÞЧ×Ö·û: %s"
#, c-format
msgid "E216: No such event: %s"
msgstr "E216: ÎÞ´Ëʼþ: %s"
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: ÎÞ´Ë×é»òʼþ: %s"
+
#. Highlight title
msgid ""
"\n"
"--- Auto-Commands ---"
msgstr ""
"\n"
-"--- Auto-Commands ---"
+"--- ×Ô¶¯ÃüÁî ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: ÎÞЧµÄ»º³åÇøºÅ "
msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ²»ÄܶÔËùÓÐʼþÖ´ÐÐ autocommand"
+msgstr "E217: ²»ÄܶÔËùÓÐʼþÖ´ÐÐ×Ô¶¯ÃüÁî"
msgid "No matching autocommands"
-msgstr "ÕÒ²»µ½¶ÔÓ¦µÄ autocommand"
+msgstr "ûÓÐÆ¥ÅäµÄ×Ô¶¯ÃüÁî"
msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand ²ãÊý¹ýÉî"
+msgstr "E218: ×Ô¶¯ÃüÁîǶÌײãÊý¹ýÉî"
#, c-format
msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgstr "%s ×Ô¶¯ÃüÁî \"%s\""
#, c-format
msgid "Executing %s"
msgstr "Ö´ÐÐ %s"
-#. always scroll up, don't overwrite
#, c-format
msgid "autocommand %s"
-msgstr "autocommand %s"
+msgstr "×Ô¶¯ÃüÁî %s"
msgid "E219: Missing {."
-msgstr "E219: ȱÉÙ {."
+msgstr "E219: ȱÉÙ {¡£"
msgid "E220: Missing }."
-msgstr "E220: ȱÉÙ }."
+msgstr "E220: ȱÉÙ }¡£"
-msgid "No fold found"
-msgstr "ÕÒ²»µ½ÈκΠfold"
+msgid "E490: No fold found"
+msgstr "E490: ÕÒ²»µ½ÕÛµþ"
msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: ²»ÄÜÔÚÄ¿Ç°µÄ 'foldmethod' Ï´´½¨ fold"
+msgstr "E350: ²»ÄÜÔÚµ±Ç°µÄ 'foldmethod' Ï´´½¨ÕÛµþ"
msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: ²»ÄÜÔÚÄ¿Ç°µÄ 'foldmethod' ÏÂɾ³ý fold"
+msgstr "E351: ²»ÄÜÔÚµ±Ç°µÄ 'foldmethod' ÏÂɾ³ýÕÛµþ"
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: Ñ¡Ïî 'commentstring' δÉ趨"
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--ÒÑÕÛµþ %3ld ÐÐ"
msgid "E222: Add to read buffer"
-msgstr "E222: ¼ÓÈë¶Á»º³åÖÐ"
+msgstr "E222: Ìí¼Óµ½ÒѶÁ»º³åÇøÖÐ"
msgid "E223: recursive mapping"
-msgstr "E223: µÝ¹é mapping"
+msgstr "E223: µÝ¹éÓ³Éä"
#, c-format
msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s ÒѾÓÐÈ«¾Ö abbreviation ÁË"
+msgstr "E224: È«¾ÖËõд %s ÒÑ´æÔÚ"
#, c-format
msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s ÒѾÓÐÈ«¾Ö mapping ÁË"
+msgstr "E225: È«¾ÖÓ³Éä %s ÒÑ´æÔÚ"
#, c-format
msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s ÒѾÓÐ abbreviation ÁË"
+msgstr "E226: Ëõд %s ÒÑ´æÔÚ"
#, c-format
msgid "E227: mapping already exists for %s"
-msgstr "E227: %s µÄ mapping ÒѾ´æÔÚ"
+msgstr "E227: Ó³Éä %s ÒÑ´æÔÚ"
msgid "No abbreviation found"
msgstr "ÕÒ²»µ½Ëõд"
msgid "No mapping found"
-msgstr "ûÓÐÕâ¸ö¶ÔÓ¦"
+msgstr "ÕÒ²»µ½Ó³Éä"
msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ²»ÕýÈ·µÄģʽ"
+msgstr "E228: makemap: ÎÞЧµÄģʽ"
msgid "<cannot open> "
-msgstr "<²»ÄÜ´ò¿ª>"
+msgstr "<ÎÞ·¨´ò¿ª>"
#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: ²»ÄÜʹÓà %s ×ÖÌå"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: ÎÞ·¨»ñÈ¡×ÖÌå %s"
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: ²»Äܻص½Ä¿Ç°Ä¿Â¼"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: ÎÞ·¨·µ»Øµ±Ç°Ä¿Â¼"
msgid "Pathname:"
msgstr "·¾¶:"
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: ²»ÄÜÈ¡µÃĿǰĿ¼"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: ÎÞ·¨»ñÈ¡µ±Ç°Ä¿Â¼"
msgid "OK"
msgstr "È·¶¨"
-#. 'Cancel' button
msgid "Cancel"
msgstr "È¡Ïû"
@@ -1464,45 +1862,68 @@
msgstr "Vim ¶Ô»°¿ò"
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "¹ö¶¯Ìõ: ²»ÄÜÉ趨 thumb pixmap µÄλÖÃ"
+msgstr "¹ö¶¯Ìõ²¿¼þ: ÎÞ·¨»ñÈ¡»¬¿éͼÏñµÄ¼¸ºÎ´óС"
msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: ²»ÄܶÔÐÅÏ¢Óë callback ´´½¨ BallonEval"
+msgstr "E232: ²»ÄÜͬʱʹÓÃÏûÏ¢ºÍ»Øµ÷º¯ÊýÀ´´´½¨ BalloonEval"
msgid "E229: Cannot start the GUI"
-msgstr "E229: ²»ÄÜÆô¶¯Í¼ÐͽçÃæ"
+msgstr "E229: ÎÞ·¨Æô¶¯Í¼ÐνçÃæ"
#, c-format
msgid "E230: Cannot read from \"%s\""
msgstr "E230: ²»ÄܶÁÈ¡Îļþ \"%s\""
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ÎÞ·¨Æô¶¯Í¼ÐνçÃ棬ÕÒ²»µ½ÓÐЧµÄ×ÖÌå"
+
msgid "E231: 'guifontwide' invalid"
-msgstr "E231: ²»ÕýÈ·µÄ 'guifontwide'"
+msgstr "E231: ÎÞЧµÄ 'guifontwide'"
-msgid "Error"
-msgstr "´íÎó"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' µÄÖµÎÞЧ"
-msgid "&Ok"
-msgstr "È·¶¨(&O)"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: ÎÞ·¨·ÖÅäÑÕÉ« %s"
+
+msgid "No match at cursor, finding next"
+msgstr "ÔÚ¹â±ê´¦Ã»ÓÐÆ¥Å䣬²éÕÒÏÂÒ»¸ö"
msgid "Vim dialog..."
msgstr "Vim ¶Ô»°¿ò..."
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"ÊÇ(&Y)\n"
+"·ñ(&N)\n"
+"È¡Ïû(&C)"
+
+msgid "Input _Methods"
+msgstr "ÊäÈë·¨(_M)"
+
msgid "VIM - Search and Replace..."
-msgstr "VIM - ²éÕÒÓëÌæ»»..."
+msgstr "VIM - ²éÕÒºÍÌæ»»..."
msgid "VIM - Search..."
msgstr "VIM - ²éÕÒ..."
msgid "Find what:"
-msgstr "²éÕÒ:"
+msgstr "²éÕÒÄÚÈÝ:"
msgid "Replace with:"
msgstr "Ì滻Ϊ:"
-#. exact match only button
-msgid "Match exact word only"
-msgstr "ֻƥÅäÍêÈ«ÏàͬµÄ×Ö"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "Æ¥ÅäÍêÕûµÄ´Ê"
+
+#. match case button
+msgid "Match case"
+msgstr "Æ¥Åä´óСд"
msgid "Direction"
msgstr "·½Ïò"
@@ -1514,108 +1935,130 @@
msgid "Down"
msgstr "ÏòÏÂ"
-#. 'Find Next' button
msgid "Find Next"
-msgstr "ÕÒÏÂÒ»¸ö"
+msgstr "²éÕÒÏÂÒ»¸ö"
-#. 'Replace' button
msgid "Replace"
msgstr "Ìæ»»"
-#. 'Replace All' button
msgid "Replace All"
-msgstr "Ì滻ȫ²¿"
+msgstr "È«²¿Ìæ»»"
-msgid "E233: cannot open display"
-msgstr "E233: <²»ÄÜ´ò¿ª X Server DISPLAY>"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: ´Ó»á»°¹ÜÀíÆ÷ÊÕµ½ \"die\" ÇëÇó\n"
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: ²»ÕýÈ·µÄ×Ö·û¼¯ (Fontset): %s"
+msgid "Close"
+msgstr "¹Ø±Õ"
+
+msgid "New tab"
+msgstr "н¨±êÇ©"
+
+msgid "Open Tab..."
+msgstr "´ò¿ª±êÇ©..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Ö÷´°¿Ú±»ÒâÍâµØ´Ý»Ù\n"
msgid "Font Selection"
-msgstr "×ÖÌåÑ¡Ôñ"
-
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "²»ÕýÈ·µÄ×ÖÌåÃû³Æ: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: \"%s\" ²»Êǹ̶¨¿í¶È×ÖÌå"
-
-#, c-format
-msgid "E242: Color name not recognized: %s"
-msgstr "E242: %s Ϊ²»ÄÜʶ±ðµÄÑÕÉ«Ãû³Æ"
+msgstr "Ñ¡Ôñ×ÖÌå"
msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "ʹÓà CUT_BUFFER0 À´Ìæ»»¿ÕÑ¡Ôñ"
+msgstr "ʹÓà CUT_BUFFER0 À´È¡´ú¿ÕÑ¡Ôñ"
-msgid "Filter"
-msgstr "¹ýÂËÆ÷"
+msgid "&Filter"
+msgstr "¹ýÂË(&F)"
+
+msgid "&Cancel"
+msgstr "È¡Ïû(&C)"
msgid "Directories"
msgstr "Ŀ¼"
-msgid "Help"
-msgstr "°ïÖú"
+msgid "Filter"
+msgstr "¹ýÂËÆ÷"
+
+msgid "&Help"
+msgstr "°ïÖú(&H)"
msgid "Files"
msgstr "Îļþ"
+msgid "&OK"
+msgstr "È·¶¨(&O)"
+
msgid "Selection"
msgstr "Ñ¡Ôñ"
-msgid "Undo"
-msgstr "³·Ïû"
+msgid "Find &Next"
+msgstr "²éÕÒÏÂÒ»¸ö(&N)"
+
+msgid "&Replace"
+msgstr "Ìæ»»(&R)"
+
+msgid "Replace &All"
+msgstr "È«²¿Ìæ»»(&A)"
+
+msgid "&Undo"
+msgstr "³·Ïú(&U)"
#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: ²»ÄÜ´ò¿ª Zap ×ÖÌå '%s'"
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: ÎÞ·¨¼ÓÔØ Zap ×ÖÌå '%s'"
#, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: ²»ÄÜʹÓÃ×ÖÌå %s"
-
-#, c-format
-msgid "E242: Missing color: %s"
-msgstr "E242: ÕÒ²»µ½ÑÕÉ«: %s"
+msgid "E611: Can't use font %s"
+msgstr "E611: ÎÞ·¨Ê¹ÓÃ×ÖÌå %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
-"ÕýÔÚ·¢ËÍÖжÏ×Ó³ÌÐòµÄÐÅÏ¢.\n"
+"ÕýÔÚ·¢ËÍÏûÏ¢ÖÕÖ¹×Ó½ø³Ì¡£\n"
+
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: ÕÒ²»µ½´°¿Ú±êÌâ \"%s\""
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ²»Ö§³Ö²ÎÊý \"-%s\"¡£ÇëÓà OLE °æ±¾¡£"
+msgstr "E243: ²»Ö§³ÖµÄ²ÎÊý: \"-%s\"£»ÇëʹÓà OLE °æ±¾¡£"
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: ÎÞ·¨ÔÚ MDI Ó¦ÓóÌÐòÖдò¿ª´°¿Ú"
msgid "Find string (use '\\\\' to find a '\\')"
-msgstr "²éÕÒ×Ö·û´® (ʹÓà '\\\\' À´±íʾ '\\')"
+msgstr "²éÕÒ×Ö·û´® (ʹÓà '\\\\' À´²éÕÒ '\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')"
-msgstr "²éÕÒ¼°Ìæ»»×Ö·û´® (ʹÓà '\\\\' À´±íʾ '\\')"
+msgstr "²éÕÒºÍÌæ»»×Ö·û´® (ʹÓà '\\\\' À´²éÕÒ '\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "δʹÓÃ"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Ŀ¼\t*.nothing\n"
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-msgstr "Vim E458: ²»ÄÜÅäÖà color map ¶ÔÏó£¬ÓÐЩÑÕÉ«¿´ÆðÀ´»á¹Ö¹ÖµÄ"
+msgstr "Vim E458: ÎÞ·¨·ÖÅäÑÕÉ«±íÏijЩÑÕÉ«¿ÉÄܲ»ÕýÈ·"
#, c-format
msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: Fontset %s ûÓÐÉ趨ÕýÈ·µÄ×ÖÌåÒÔ¹©ÏÔʾÕâЩ×Ö·û¼¯:"
+msgstr "E250: Fontset %s ȱÉÙÏÂÁÐ×Ö·û¼¯µÄ×ÖÌå:"
#, c-format
msgid "E252: Fontset name: %s"
-msgstr "E252: ×ÖÌ弯(Fontset)Ãû³Æ: %s"
+msgstr "E252: Fontset Ãû³Æ: %s"
#, c-format
msgid "Font '%s' is not fixed-width"
-msgstr "'%s' ²»Êǹ̶¨¿í¶È×ÖÌå"
+msgstr "'%s' ²»Êǹ̶¨¿í¶ÈµÄ×ÖÌå"
#, c-format
msgid "E253: Fontset name: %s\n"
-msgstr "E253: ×ÖÌ弯(Fontset)Ãû³Æ: %s\n"
+msgstr "E253: Fontset Ãû³Æ: %s\n"
#, c-format
msgid "Font0: %s\n"
@@ -1626,8 +2069,8 @@
msgstr "×ÖÌå1: %s\n"
#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "×ÖÌå%d¿í¶È²»ÊÇ×ÖÌå0µÄÁ½±¶\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "×ÖÌå%ldµÄ¿í¶È²»ÊÇ×ÖÌå0µÄÁ½±¶\n"
#, c-format
msgid "Font0 width: %ld\n"
@@ -1638,199 +2081,384 @@
"Font1 width: %ld\n"
"\n"
msgstr ""
-"×ÖÌå1¿í¶È: %ld\n"
+"×ÖÌå1µÄ¿í¶È: %ld\n"
"\n"
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ²»ÄÜÅäÖÃÑÕÉ« %s"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "²»ÕýÈ·µÄ×ÖÌ弯(Fontset)"
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: ²»ÄܶÁÈ¡ sign data!"
+#~ msgid "&Dismiss"
+#~ msgstr ""
+
+#~ msgid "no specific match"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Vim - Font Selector"
+#~ msgstr "×ÖÌåÑ¡Ôñ"
+
+#~ msgid "Name:"
+#~ msgstr ""
+
+#. create toggle button
+#~ msgid "Show size in Points"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoding:"
+#~ msgstr "¼Ç¼ÖÐ"
+
+#, fuzzy
+#~ msgid "Font:"
+#~ msgstr "×ÖÌå1: %s\n"
+
+#~ msgid "Style:"
+#~ msgstr ""
+
+#~ msgid "Size:"
+#~ msgstr ""
msgid "E256: Hangul automata ERROR"
msgstr "E256: Hangul automata ´íÎó"
+msgid "E550: Missing colon"
+msgstr "E550: ȱÉÙðºÅ"
+
+msgid "E551: Illegal component"
+msgstr "E551: ÎÞЧµÄ²¿·Ö"
+
+msgid "E552: digit expected"
+msgstr "E552: Ó¦¸ÃÒªÓÐÊý×Ö"
+
#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "Page %d"
+msgstr "µÚ %d Ò³"
+
+msgid "No text to be printed"
+msgstr "ûÓÐÒª´òÓ¡µÄÎÄ×Ö"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "ÕýÔÚ´òÓ¡µÚ %d Ò³ (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr "¸´ÖÆ %d / %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "ÒÑ´òÓ¡: %s"
+
+msgid "Printing aborted"
+msgstr "´òÓ¡ÖÐÖ¹"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: дÈë PostScript Êä³öÎļþ³ö´í"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: ÎÞ·¨´ò¿ªÎļþ \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: ÎÞ·¨¶ÁÈ¡ PostScript ×ÊÔ´Îļþ \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: Îļþ \"%s\" ²»ÊÇ PostScript ×ÊÔ´Îļþ"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: Îļþ \"%s\" ²»ÊÇÒÑÖ§³ÖµÄ PostScript ×ÊÔ´Îļþ"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" ×ÊÔ´Îļþ°æ±¾²»ÕýÈ·"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: ²»¼æÈݵĶà×Ö½Ú±àÂëºÍ×Ö·û¼¯¡£"
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset ÔÚ¶à×Ö½Ú±àÂëϲ»ÄÜΪ¿Õ¡£"
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: ûÓÐÖ¸¶¨¶à×Ö½Ú´òÓ¡µÄĬÈÏ×ÖÌå¡£"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: ÎÞ·¨´ò¿ª PostScript Êä³öÎļþ"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: ÎÞ·¨´ò¿ªÎļþ \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: ÕÒ²»µ½ PostScript ×ÊÔ´Îļþ \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: ÕÒ²»µ½ PostScript ×ÊÔ´Îļþ \"cidfont.ps\""
+
+#, c-format
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: ÕÒ²»µ½ PostScript ×ÊÔ´Îļþ \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: ÎÞ·¨×ª»»ÖÁ´òÓ¡±àÂë \"%s\""
+
+msgid "Sending to printer..."
+msgstr "·¢Ë͵½´òÓ¡»ú¡¡"
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: ÎÞ·¨´òÓ¡ PostScript Îļþ"
+
+msgid "Print job sent."
+msgstr "´òÓ¡ÈÎÎñÒѱ»·¢ËÍ¡£"
msgid "Add a new database"
-msgstr "ÐÂÔöÊý¾Ý¿â"
+msgstr "Ìí¼ÓÒ»¸öеÄÊý¾Ý¿â"
msgid "Query for a pattern"
-msgstr "²éѯģʽ"
+msgstr "²éѯһ¸öģʽ"
msgid "Show this message"
msgstr "ÏÔʾ´ËÐÅÏ¢"
msgid "Kill a connection"
-msgstr "½áÊøÁ¬½Ó"
+msgstr "½áÊøÒ»¸öÁ¬½Ó"
msgid "Reinit all connections"
-msgstr "ÖØÉèËùÓÐÁ¬½Ó"
+msgstr "ÖØÖÃËùÓÐÁ¬½Ó"
msgid "Show connections"
msgstr "ÏÔʾÁ¬½Ó"
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "Õâ¸ö cscope ÃüÁî²»Ö§³Ö·Ö¸îÆÁÄ»\n"
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: Ó÷¨: cs[cope] %s"
-msgid "Usage: cstag <ident>"
-msgstr "Ó÷¨: cstag <ʶ±ð×Ö>"
+msgid "This cscope command does not support splitting the window.\n"
+msgstr "Õâ¸ö cscope ÃüÁî²»Ö§³Ö·Ö¸î´°¿Ú¡£\n"
+
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: Ó÷¨: cstag <ident>"
msgid "E257: cstag: tag not found"
msgstr "E257: cstag: ÕÒ²»µ½ tag"
#, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) ´íÎó: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) ´íÎó: %d"
+
+msgid "E563: stat error"
+msgstr "E563: stat ´íÎó"
+
+#, c-format
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s ²»ÊÇĿ¼»òÓÐЧµÄ cscope Êý¾Ý¿â"
#, c-format
msgid "Added cscope database %s"
-msgstr "ÐÂÔö cscope Êý¾Ý¿â %s"
+msgstr "Ìí¼ÓÁË cscope Êý¾Ý¿â %s"
#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s ²»ÊÇĿ¼»ò cscope Êý¾Ý¿â"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: ¶ÁÈ¡ cscope Á¬½Ó %ld ³ö´í"
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "¶ÁÈ¡ cscope Á¬½Ó %d ʱ´íÎó"
+msgid "E561: unknown cscope search type"
+msgstr "E561: δ֪µÄ cscope ²éÕÒÀàÐÍ"
-msgid "unknown cscope search type"
-msgstr "δ֪µÄ cscope ²éÕÒÐÎ̬"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: ÎÞ·¨´´½¨ cscope ¹ÜµÀ"
-msgid "Could not create cscope pipes"
-msgstr "²»ÄÜ´´½¨Óë cscope Á¬½ÓµÄ¹ÜµÀ"
+msgid "E622: Could not fork for cscope"
+msgstr "E622: ÎÞ·¨¶Ô cscope ½øÐÐ fork"
msgid "cs_create_connection exec failed"
msgstr "cs_create_connection Ö´ÐÐʧ°Ü"
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: ÎÞ·¨Éú³É cscope ½ø³Ì"
+
msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen ʧ°Ü (to_fp)"
+msgstr "cs_create_connection: fdopen to_fp ʧ°Ü"
msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen ʧ°Ü (fr_fp)"
+msgstr "cs_create_connection: fdopen fr_fp ʧ°Ü"
-msgid "no cscope connections"
-msgstr "ûÓÐ cscope Á¬½Ó"
+msgid "E567: no cscope connections"
+msgstr "E567: ûÓÐ cscope Á¬½Ó"
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: ÕÒ²»µ½·ûºÏ cscope µÄËÑÑ° %s / %s"
+msgstr "E259: cscope ²éѯ %s %s ûÓÐÕÒµ½Æ¥ÅäµÄ½á¹û"
+
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix ±êÖ¾ %c ¶Ô %c ÎÞЧ"
msgid "cscope commands:\n"
msgstr "cscope ÃüÁî:\n"
#, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (Ó÷¨: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (Ó÷¨: %s)"
-msgid "duplicate cscope database not added"
-msgstr "Öظ´µÄ cscope Êý¾Ý¿âδ±»¼ÓÈë"
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: ÎÞ·¨´ò¿ª cscope Êý¾Ý¿â: %s"
-msgid "maximum number of cscope connections reached"
-msgstr "ÒÑ´ïµ½ cscope ×î´óÁ¬½ÓÊýÄ¿"
+msgid "E626: cannot get cscope database information"
+msgstr "E626: ÎÞ·¨»ñÈ¡ cscope Êý¾Ý¿âÐÅÏ¢"
-msgid "E260: cscope connection not found"
-msgstr "E260: ÕÒ²»µ½ cscope Á¬½Ó"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: Öظ´µÄ cscope Êý¾Ý¿âδ±»¼ÓÈë"
+
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: ÒÑ´ïµ½ cscope µÄ×î´óÁ¬½ÓÊý"
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: ÕÒ²»µ½ cscope Á¬½Ó %s"
-msgid "cscope connection closed"
-msgstr "cscope Á¬½ÓÒѹرÕ"
-
#, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope Á¬½Ó %s ÒѹرÕ\n"
+msgid "cscope connection %s closed"
+msgstr "cscope Á¬½Ó %s ÒѹرÕ"
#. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches ÑÏÖØ´íÎó"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches ÑÏÖØ´íÎó"
#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: ¶ÁÈ¡ cscope Á¬½Ó %d ´íÎó"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
-msgid "couldn't malloc\n"
-msgstr "²»ÄÜʹÓà malloc\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope ±êÇ©(tag): %s\n"
-
-msgid " # line"
-msgstr " # ÐÐ "
+msgid ""
+"\n"
+" # line"
+msgstr ""
+"\n"
+" # ÐÐ "
msgid "filename / context / line\n"
-msgstr "ÎļþÃû / ÉÏÏÂÎÄ / ÐкÅ\n"
+msgstr "ÎļþÃû / ÉÏÏÂÎÄ / ÐÐ\n"
+
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Cscope ´íÎó: %s"
msgid "All cscope databases reset"
-msgstr "ÖØÉèËùÓÐ cscope Êý¾Ý¿â"
+msgstr "ËùÓÐ cscope Êý¾Ý¿âÒѱ»ÖØÖÃ"
msgid "no cscope connections\n"
msgstr "ûÓÐ cscope Á¬½Ó\n"
msgid " # pid database name prepend path\n"
-msgstr " # pid Êý¾Ý¿âÃû³Æ prepend path\n"
+msgstr " # pid Êý¾Ý¿âÃû prepend path\n"
-#, c-format
-msgid "%2d %-5ld %-34s <none>\n"
-msgstr "%2d %-5ld %-34s <ÎÞ>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ MzScheme ¿â"
+
+msgid "invalid expression"
+msgstr "ÎÞЧµÄ±í´ïʽ"
+
+msgid "expressions disabled at compile time"
+msgstr "±àÒëʱûÓÐÆôÓñí´ïʽ"
+
+msgid "hidden option"
+msgstr "Òþ²ØµÄÑ¡Ïî"
+
+msgid "unknown option"
+msgstr "δ֪µÄÑ¡Ïî"
+
+msgid "window index is out of range"
+msgstr "´°¿ÚË÷Òý³¬³ö·¶Î§"
+
+msgid "couldn't open buffer"
+msgstr "ÎÞ·¨´ò¿ª»º³åÇø"
+
+msgid "cannot save undo information"
+msgstr "ÎÞ·¨±£´æ³·ÏúÐÅÏ¢"
+
+msgid "cannot delete line"
+msgstr "ÎÞ·¨É¾³ýÐÐ"
+
+msgid "cannot replace line"
+msgstr "ÎÞ·¨Ìæ»»ÐÐ"
+
+msgid "cannot insert line"
+msgstr "ÎÞ·¨²åÈëÐÐ"
+
+msgid "string cannot contain newlines"
+msgstr "×Ö·û´®²»ÄÜ°üº¬»»ÐÐ(NL)"
+
+msgid "Vim error: ~a"
+msgstr "Vim ´íÎó: ~a"
+
+msgid "Vim error"
+msgstr "Vim ´íÎó"
+
+msgid "buffer is invalid"
+msgstr "»º³åÇøÎÞЧ"
+
+msgid "window is invalid"
+msgstr "´°¿ÚÎÞЧ"
+
+msgid "linenr out of range"
+msgstr "Ðкų¬³ö·¶Î§"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "²»ÔÊÐíÔÚ sandbox ÖÐʹÓÃ"
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
-msgstr "E263: ±§Ç¸£¬Õâ¸öÃüÁî²»ÄÜʹÓã¬Python ³ÌÐò¿âûÓмÓÔØ¡£"
+msgstr "E263: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ Python ¿â¡£"
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: ²»Äܵݹéµ÷Óà Python"
msgid "can't delete OutputObject attributes"
msgstr "²»ÄÜɾ³ý OutputObject ÊôÐÔ"
msgid "softspace must be an integer"
-msgstr "softspace ±ØÐèÊÇÕûÊý"
+msgstr "softspace ±ØÐëÊÇÕûÊý"
msgid "invalid attribute"
-msgstr "²»ÕýÈ·µÄÊôÐÔ"
+msgstr "ÎÞЧµÄÊôÐÔ"
msgid "writelines() requires list of strings"
-msgstr "writelines() ÐèÒª string list µ±²ÎÊý"
+msgstr "writelines() ÐèÒª×Ö·û´®Áбí×÷²ÎÊý"
msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: ²»Äܳõʼ»¯ I/O ¶ÔÏó"
-
-msgid "invalid expression"
-msgstr "²»ÕýÈ·µÄ±í´ïʽ"
-
-msgid "expressions disabled at compile time"
-msgstr "ÒòΪ±àÒëʱûÓмÓÈë±í´ïʽ(expression)µÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓñí´ïʽ"
+msgstr "E264: Python: ³õʼ»¯ I/O ¶ÔÏó³ö´í"
msgid "attempt to refer to deleted buffer"
-msgstr "ÊÔͼʹÓÃÒѱ»É¾³ýµÄ»º³åÇø"
+msgstr "ÊÔͼÒýÓÃÒѱ»É¾³ýµÄ»º³åÇø"
msgid "line number out of range"
msgstr "Ðкų¬³ö·¶Î§"
#, c-format
msgid "<buffer object (deleted) at %8lX>"
-msgstr "<buffer ¶ÔÏó (ÒÑɾ³ý): %8lX>"
+msgstr "<»º³åÇø¶ÔÏó(ÒÑɾ³ý): %8lX>"
msgid "invalid mark name"
-msgstr "±ê¼ÇÃû³Æ²»ÕýÈ·"
+msgstr "ÎÞЧµÄ±ê¼ÇÃû³Æ"
msgid "no such buffer"
msgstr "ÎÞ´Ë»º³åÇø"
msgid "attempt to refer to deleted window"
-msgstr "ÊÔͼʹÓÃÒѱ»É¾³ýµÄ´°¿Ú"
+msgstr "ÊÔͼÒýÓÃÒѱ»É¾³ýµÄ´°¿Ú"
msgid "readonly attribute"
msgstr "Ö»¶ÁÊôÐÔ"
msgid "cursor position outside buffer"
-msgstr "¹â±ê¶¨Î»ÔÚ»º³åÇøÖ®Íâ"
+msgstr "¹â±êλÖÃÔÚ»º³åÇøÍâ"
#, c-format
msgid "<window object (deleted) at %.8lX>"
@@ -1847,24 +2475,9 @@
msgid "no such window"
msgstr "ÎÞ´Ë´°¿Ú"
-msgid "cannot save undo information"
-msgstr "²»Äܱ£´æ¸´ÔÐÅÏ¢"
-
-msgid "cannot delete line"
-msgstr "²»ÄÜɾ³ý´ËÐÐ"
-
-msgid "cannot replace line"
-msgstr "²»ÄÜÌæ»»´ËÐÐ"
-
-msgid "cannot insert line"
-msgstr "²»ÄܲåÈë´ËÐÐ"
-
-msgid "string cannot contain newlines"
-msgstr "×Ö·û´®²»ÄÜ°üº¬ÐÂÐÐ"
-
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: ´ËÃüÁî²»ÄÜʹÓã¬ÎÞ·¨¼ÓÔØ Ruby ³ÌÐò¿â(Library)"
+msgstr "E266: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ Ruby ¿â"
#, c-format
msgid "E273: unknown longjmp status %d"
@@ -1958,33 +2571,30 @@
msgstr "Sniff: дÈë´íÎó¡£½áÊøÁ¬½Ó"
msgid "invalid buffer number"
-msgstr "²»ÕýÈ·µÄ»º³åÇøºÅ"
+msgstr "ÎÞЧµÄ»º³åÇøºÅ"
msgid "not implemented yet"
msgstr "ÉÐδʵÏÖ"
-msgid "unknown option"
-msgstr "²»ÕýÈ·µÄÑ¡Ïî"
-
#. ???
msgid "cannot set line(s)"
-msgstr "²»ÄÜÉ趨ÐÐ"
+msgstr "ÎÞ·¨É趨ÐÐ"
msgid "mark not set"
msgstr "ûÓÐÉ趨±ê¼Ç"
#, c-format
msgid "row %d column %d"
-msgstr "ÁÐ %d ÐÐ %d"
+msgstr "µÚ %d ÐÐ µÚ %d ÁÐ"
msgid "cannot insert/append line"
-msgstr "²»ÄܲåÈë»òÌí¼Ó´ËÐÐ"
+msgstr "ÎÞ·¨²åÈë/×·¼ÓÐÐ"
msgid "unknown flag: "
-msgstr "´íÎóµÄ±êÖ¾: "
+msgstr "δ֪µÄ±êÖ¾: "
msgid "unknown vimOption"
-msgstr "²»ÕýÈ·µÄ VIM Ñ¡Ïî"
+msgstr "δ֪µÄ vim Ñ¡Ïî"
msgid "keyboard interrupt"
msgstr "¼üÅÌÖжÏ"
@@ -1993,93 +2603,91 @@
msgstr "vim ´íÎó"
msgid "cannot create buffer/window command: object is being deleted"
-msgstr "²»ÄÜ´´½¨»º³åÇø/´°¿ÚÃüÁî: ¶ÔÏ󽫱»É¾³ý"
+msgstr "ÎÞ·¨´´½¨»º³åÇø/´°¿ÚÃüÁî: ¶ÔÏ󽫱»É¾³ý"
msgid ""
"cannot register callback command: buffer/window is already being deleted"
-msgstr "²»ÄÜ×¢²á callback ÃüÁî: »º³åÇø/´°¿ÚÒѾ±»É¾³ýÁË"
+msgstr "ÎÞ·¨×¢²á»Øµ÷ÃüÁî: »º³åÇø/´°¿ÚÒѱ»É¾³ý"
#. This should never happen. Famous last word?
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
"org"
-msgstr "E280: TCL ÑÏÖØ´íÎó: reflist ²»¿É¿¿!? Ç뱨¸æ¸ø to vim-dev@vim.org"
+msgstr "E280: TCL ÑÏÖØ´íÎó: reflist Ë𻵣¡£¿Ç뱨¸æ¸ø vim-dev@vim.org"
msgid "cannot register callback command: buffer/window reference not found"
-msgstr "²»ÄÜ×¢²á callback ÃüÁî: ÕÒ²»µ½»º³åÇø/´°¿Ú"
+msgstr "ÎÞ·¨×¢²á»Øµ÷ÃüÁî: ÕÒ²»µ½»º³åÇø/´°¿ÚÒýÓÃ"
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "´ËÃüÁî²»ÄÜʹÓÃ, ÒòΪÎÞ·¨¼ÓÔØ Tcl ³ÌÐò¿â(Library)"
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr "E571: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ Tcl ¿â"
msgid ""
"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr "E281: TCL ´íÎó: Í˳ö·µ»ØÖµ²»ÊÇÕûÊý!? Ç뱨¸æ¸ø to vim-dev@vim.org"
+msgstr "E281: TCL ´íÎó: Í˳ö·µ»ØÖµ²»ÊÇÕûÊý£¡£¿Ç뱨¸æ¸ø vim-dev@vim.org"
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: Í˳ö·µ»ØÖµ %d"
msgid "cannot get line"
-msgstr "²»ÄÜÈ¡µÃ´ËÐÐ"
+msgstr "ÎÞ·¨»ñÈ¡ÐÐ"
msgid "Unable to register a command server name"
-msgstr "²»ÄÜ×¢²áÃüÁî·þÎñÆ÷Ãû³Æ"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: ûÓÐ×¢²áΪ \"%s\" µÄ·þÎñÆ÷"
+msgstr "ÎÞ·¨×¢²áÃüÁî·þÎñÆ÷Ãû"
msgid "E248: Failed to send command to the destination program"
-msgstr "E248: ²»ÄÜËͳöÃüÁĿµÄµØ³ÌÐò"
+msgstr "E248: ÎÞ·¨·¢ËÍÃüÁĿµÄ³ÌÐò"
#, c-format
-msgid "Invalid server id used: %s"
-msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: ²»ÄܶÁÈ¡ VIM µÄ ×¢²á±íÊôÐÔ"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: ʹÓÃÁËÎÞЧµÄ·þÎñÆ÷ id: %s"
msgid "E251: VIM instance registry property is badly formed. Deleted!"
-msgstr "E251: VIM µÄ×¢²á±íÊôÐÔÓÐÎó¡£ÒÑɾ³ý¡£"
+msgstr "E251: VIM ʵÀý×¢²áÊôÐÔÓÐÎó¡£ÒÑɾ³ý£¡"
-msgid "Unknown option"
-msgstr "²»ÕýÈ·µÄÑ¡Ïî"
+msgid "Unknown option argument"
+msgstr "δ֪µÄÑ¡Ïî²ÎÊý"
msgid "Too many edit arguments"
-msgstr "Ì«¶à±à¼²ÎÊý"
+msgstr "±à¼²ÎÊý¹ý¶à"
msgid "Argument missing after"
-msgstr "ȱÉÙ±ØÒªµÄ²ÎÊý:"
+msgstr "ȱÉÙ±ØÒªµÄ²ÎÊý"
-msgid "Garbage after option"
-msgstr "²»ÄܱæÈÏ´ËÑ¡ÏîºóµÄÃüÁî: "
+msgid "Garbage after option argument"
+msgstr "Ñ¡Ïî²ÎÊýºóµÄÄÚÈÝÎÞЧ"
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "Ì«¶à \"+command\" »ò \"-c command\" ²ÎÊý"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "\"+command\"¡¢\"-c command\" »ò \"--cmd command\" ²ÎÊý¹ý¶à"
msgid "Invalid argument for"
-msgstr "²»ÕýÈ·µÄ²ÎÊý: "
-
-msgid "This Vim was not compiled with the diff feature."
-msgstr "ÄúµÄ Vim ±àÒëʱûÓмÓÈë diff µÄÄÜÁ¦"
-
-msgid "Attempt to open script file again: \""
-msgstr "ÊÔͼÔٴδò¿ª script Îļþ: \""
-
-msgid "\"\n"
-msgstr "\"\n"
-
-msgid "Cannot open for reading: \""
-msgstr "²»ÄÜΪ¶Á¶ø´ò¿ª: \""
-
-msgid "Cannot open for script output: \""
-msgstr "²»ÄÜΪ script Êä³ö¶ø´ò¿ª: \""
+msgstr "ÎÞЧµÄ²ÎÊý"
#, c-format
msgid "%d files to edit\n"
msgstr "»¹ÓÐ %d ¸öÎļþµÈ´ý±à¼\n"
+msgid "This Vim was not compiled with the diff feature."
+msgstr "´Ë Vim ±àÒëʱûÓмÓÈë diff ¹¦ÄÜ"
+
+msgid "Attempt to open script file again: \""
+msgstr "ÊÔͼÔٴδò¿ª½Å±¾Îļþ: \""
+
+msgid "Cannot open for reading: \""
+msgstr "ÎÞ·¨´ò¿ª²¢¶ÁÈ¡: \""
+
+msgid "Cannot open for script output: \""
+msgstr "ÎÞ·¨´ò¿ª²¢Êä³ö½Å±¾: \""
+
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ´íÎó: ÎÞ·¨´Ó NetBeans ÖÐÆô¶¯ gvim\n"
+
msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ×¢Òâ: Êä³ö²»ÊÇÖÕ¶Ë(ÆÁÄ»)\n"
+msgstr "Vim: ¾¯¸æ: Êä³ö²»Êǵ½ÖÕ¶Ë(ÆÁÄ»)\n"
msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ×¢Òâ: ÊäÈë²»ÊÇÖÕ¶Ë(¼üÅÌ)\n"
+msgstr "Vim: ¾¯¸æ: ÊäÈë²»ÊÇÀ´×ÔÖÕ¶Ë(¼üÅÌ)\n"
#. just in case..
msgid "pre-vimrc command line"
@@ -2087,14 +2695,14 @@
#, c-format
msgid "E282: Cannot read from \"%s\""
-msgstr "E282: ²»ÄܶÁÈ¡Îļþ \"%s\""
+msgstr "E282: ÎÞ·¨¶ÁÈ¡ \"%s\""
msgid ""
"\n"
"More info with: \"vim -h\"\n"
msgstr ""
"\n"
-"²éѯ¸ü¶àÐÅÏ¢ÇëÖ´ÐÐ: \"vim -h\"\n"
+"¸ü¶àÐÅÏ¢Çë¼û: \"vim -h\"\n"
msgid "[file ..] edit specified file(s)"
msgstr "[Îļþ ..] ±à¼Ö¸¶¨µÄÎļþ"
@@ -2103,10 +2711,10 @@
msgstr "- ´Ó±ê×¼ÊäÈë(stdin)¶ÁÈ¡Îı¾"
msgid "-t tag edit file where tag is defined"
-msgstr "-t tag ±à¼Ê±Ê¹ÓÃÖ¸¶¨µÄ tag"
+msgstr "-t tag ±à¼ tag ¶¨Òå´¦µÄÎļþ"
msgid "-q [errorfile] edit file with first error"
-msgstr "-q [errorfile] ±à¼Ê±¼ÓÔصÚÒ»¸ö´íÎó"
+msgstr "-q [errorfile] ±à¼µÚÒ»¸ö³ö´í´¦µÄÎļþ"
msgid ""
"\n"
@@ -2115,17 +2723,20 @@
msgstr ""
"\n"
"\n"
-" Ó÷¨:"
+"Ó÷¨:"
msgid " vim [arguments] "
-msgstr "vim [²ÎÊý] "
+msgstr " vim [²ÎÊý] "
msgid ""
"\n"
" or:"
msgstr ""
"\n"
-" »ò:"
+" »ò:"
+
+#~ msgid "where case is ignored prepend / to make flag upper case"
+#~ msgstr ""
msgid ""
"\n"
@@ -2137,10 +2748,13 @@
"²ÎÊý:\n"
msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tÖ»ÓÐÔÚÕâÖ®ºóµÄÎļþ"
+msgstr "--\t\t\tÔÚÕâÒÔºóÖ»ÓÐÎļþÃû"
+
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\t²»À©Õ¹Í¨Åä·û"
msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\t×¢²á gvim µ½ OLE"
+msgstr "-register\t\t×¢²á´Ë gvim µ½ OLE"
msgid "-unregister\t\tUnregister gvim for OLE"
msgstr "-unregister\t\tÈ¡Ïû OLE ÖÐµÄ gvim ×¢²á"
@@ -2148,8 +2762,8 @@
msgid "-g\t\t\tRun using GUI (like \"gvim\")"
msgstr "-g\t\t\tʹÓÃͼÐνçÃæ (ͬ \"gvim\")"
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\tÇ°¾°: Æô¶¯Í¼ÐνçÃæʱ²» fork"
+msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f »ò --nofork\tǰ̨: Æô¶¯Í¼ÐνçÃæʱ²» fork"
msgid "-v\t\t\tVi mode (like \"vi\")"
msgstr "-v\t\t\tVi ģʽ (ͬ \"vi\")"
@@ -2158,13 +2772,13 @@
msgstr "-e\t\t\tEx ģʽ (ͬ \"ex\")"
msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t°²¾² (batch) ģʽ (Ö»ÄÜÓë \"ex\" Ò»ÆðʹÓÃ)"
+msgstr "-s\t\t\t°²¾²(Åú´¦Àí)ģʽ (Ö»ÄÜÓë \"ex\" Ò»ÆðʹÓÃ)"
msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\", ¿ÉѸËٱȽÏÁ½Îļþ²»Í¬´¦)"
+msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\")"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t¼òÒ×ģʽ (ͬ \"evim\", modeless)"
+msgstr "-y\t\t\tÈÝÒ×ģʽ (ͬ \"evim\"£¬ÎÞģʽ)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\tÖ»¶Áģʽ (ͬ \"view\")"
@@ -2173,7 +2787,7 @@
msgstr "-Z\t\t\tÏÞÖÆģʽ (ͬ \"rvim\")"
msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t²»¿ÉÐÞ¸Ä (дÈëÎļþ)"
+msgstr "-m\t\t\t²»¿ÉÐÞ¸Ä(дÈëÎļþ)"
msgid "-M\t\t\tModifications in text not allowed"
msgstr "-M\t\t\tÎı¾²»¿ÉÐÞ¸Ä"
@@ -2185,10 +2799,10 @@
msgstr "-l\t\t\tLisp ģʽ"
msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t'compatible' ´«Í³ Vi ¼æÈÝģʽ"
+msgstr "-C\t\t\t¼æÈÝ´«Í³µÄ Vi: 'compatible'"
msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t'nocompatible' ²»ÍêÈ«Ó봫ͳ Vi ¼æÈÝ£¬¿ÉʹÓà Vim ¼ÓÇ¿ÄÜÁ¦"
+msgstr "-N\t\t\t²»ÍêÈ«¼æÈÝ´«Í³µÄ Vi: 'nocompatible'"
msgid "-V[N]\t\tVerbose level"
msgstr "-V[N]\t\tVerbose µÈ¼¶"
@@ -2197,163 +2811,183 @@
msgstr "-D\t\t\tµ÷ÊÔģʽ"
msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t²»Ê¹Óý»»»Îļþ, ֻʹÓÃÄÚ´æ"
+msgstr "-n\t\t\t²»Ê¹Óý»»»Îļþ£¬Ö»Ê¹ÓÃÄÚ´æ"
msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tÁгö½»»»ÎļþºóÍ˳ö"
+msgstr "-r\t\t\tÁгö½»»»Îļþ²¢Í˳ö"
msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (¼ÓÎļþÃû) \t»Ö¸´ÉϴαÀÀ£µÄ×ÊÁÏ(Recover crashed session)"
+msgstr "-r (¸úÎļþÃû)\t\t»Ö¸´±ÀÀ£µÄ»á»°"
msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tÓë -r Ò»Ñù"
+msgstr "-L\t\t\tͬ -r"
msgid "-f\t\t\tDon't use newcli to open window"
msgstr "-f\t\t\t²»Ê¹Óà newcli À´´ò¿ª´°¿Ú"
msgid "-dev <device>\t\tUse <device> for I/O"
-msgstr "-dev <device>\t\tʹÓà <device> ×öÊäÈëÊä³öÉ豸"
+msgstr "-dev <device>\t\tʹÓà <device> ½øÐÐÊäÈëÊä³ö"
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\tÆô¶¯Îª Ï£²®À³Ä£Ê½"
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\tÒÔ Arabic ģʽÆô¶¯"
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\tÆô¶¯Îª Farsi ģʽ"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\tÒÔ Hebrew ģʽÆô¶¯"
+
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\tÒÔ Farsi ģʽÆô¶¯"
msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\tÉ趨ÖÕ¶ËΪ <terminal>"
+msgstr "-T <terminal>\tÉ趨ÖÕ¶ËÀàÐÍΪ <terminal>"
msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tʹÓà <vimrc> Ìæ»»ÈκΠ.vimrc"
+msgstr "-u <vimrc>\t\tʹÓà <vimrc> Ìæ´úÈκΠ.vimrc"
msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-msgstr "-U <gvimrc>\t\tʹÓà <gvimrc> Ìæ»»ÈκΠ.gvimrc"
+msgstr "-U <gvimrc>\t\tʹÓà <gvimrc> Ìæ´úÈκΠ.gvimrc"
msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t²»¼ÓÔØÈκΠplugin"
+msgstr "--noplugin\t\t²»¼ÓÔØ plugin ½Å±¾"
+
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-P[N]\t\t´ò¿ª N ¸ö±êÇ©Ò³ (ĬÈÏÖµ: ÿ¸öÎļþÒ»¸ö)"
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t´ò¿ª N ¸ö´°¿Ú (Ô¤ÉèÊÇÿ¸öÎļþÒ»¸ö)"
+msgstr "-o[N]\t\t´ò¿ª N ¸ö´°¿Ú (ĬÈÏÖµ: ÿ¸öÎļþÒ»¸ö)"
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\tͬ -o µ«Ê¹Óô¹Ö±·Ö¸î"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tͬ -o µ«´¹Ö±·Ö¸î"
msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\tÆô¶¯ºóÌøµ½Îļþ½áβ"
+msgstr "+\t\t\tÆô¶¯ºóÌøµ½Îļþĩβ"
msgid "+<lnum>\t\tStart at line <lnum>"
msgstr "+<lnum>\t\tÆô¶¯ºóÌøµ½µÚ <lnum> ÐÐ"
msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t¼ÓÔØÈκΠvimrc Ç°Ö´ÐÐ <command>"
+msgstr "--cmd <command>\t¼ÓÔØÈκΠvimrc ÎļþÇ°Ö´ÐÐ <command>"
msgid "-c <command>\t\tExecute <command> after loading the first file"
msgstr "-c <command>\t\t¼ÓÔصÚÒ»¸öÎļþºóÖ´ÐÐ <command>"
msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t¼ÓÔصÚÒ»¸öÎļþºóÔØÈë Session Îļþ<session>"
+msgstr "-S <session>\t\t¼ÓÔصÚÒ»¸öÎļþºóÖ´ÐÐÎļþ <session>"
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t´Ó <scriptin> ¶ÁÈëÒ»°ãģʽÃüÁî"
+msgstr "-s <scriptin>\t´ÓÎļþ <scriptin> ¶ÁÈëÕý³£Ä£Ê½µÄÃüÁî"
msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t¶ÔÎļþ <scriptout> ¸½¼Ó(append)ËùÓÐÊäÈëµÄÃüÁî"
+msgstr "-w <scriptout>\t½«ËùÓÐÊäÈëµÄÃüÁî×·¼Óµ½Îļþ <scriptout>"
msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t¶ÔÎļþ <scriptout> дÈëËùÓÐÊäÈëµÄÃüÁî"
+msgstr "-W <scriptout>\t½«ËùÓÐÊäÈëµÄÃüÁîдÈëµ½Îļþ <scriptout>"
msgid "-x\t\t\tEdit encrypted files"
-msgstr "-x\t\t\t±à¼±àÂë¹ýµÄÎļþ"
+msgstr "-x\t\t\t±à¼¼ÓÃܵÄÎļþ"
msgid "-display <display>\tConnect vim to this particular X-server"
msgstr "-display <display>\t½« vim ÓëÖ¸¶¨µÄ X-server Á¬½Ó"
msgid "-X\t\t\tDo not connect to X server"
-msgstr "-X\t\t\t²»ÒªÁ¬½Óµ½ X Server"
+msgstr "-X\t\t\t²»Á¬½Óµ½ X Server"
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\tÔÚÁíÒ»¸ö GTK ×é¼þÄÚ´ò¿ª Vim"
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\tÈçÓпÉÄÜ£¬ÔÚ Vim ·þÎñÆ÷Éϱà¼Îļþ <files>"
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t±à¼ Vim ·þÎñÆ÷ÉϵÄÎļþ²¢Í˳ö"
+msgid "--remote-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-silent <files> ͬÉÏ£¬ÕÒ²»µ½·þÎñÆ÷ʱ²»±§Ô¹"
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files> µÈЧÓÚ --remote, µ«»áµÈºòÎļþÍê³É±à¼"
+msgstr "--remote-wait <files> ͬ --remote µ«»áµÈ´ýÎļþÍê³É±à¼"
+
+msgid ""
+"--remote-wait-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <files> ͬÉÏ£¬ÕÒ²»µ½·þÎñÆ÷ʱ²»±§Ô¹"
+
+msgid "--remote-tab <files> As --remote but open tab page for each file"
+msgstr "--remote-tab <files> ͬ --remote µ«¶Ôÿ¸öÎļþ´ò¿ªÒ»¸ö±êÇ©Ò³"
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\tËͳö <keys> µ½ Vim ·þÎñÆ÷²¢Í˳ö"
msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-msgstr "--remote-expr <expr>\tÔÚ·þÎñÆ÷ÉÏÇó±í´ïʽµÄÖµ²¢´òÓ¡½á¹û"
+msgstr "--remote-expr <expr>\tÔÚ Vim ·þÎñÆ÷ÉÏÇó <expr> µÄÖµ²¢´òÓ¡½á¹û"
msgid "--serverlist\t\tList available Vim server names and exit"
msgstr "--serverlist\t\tÁгö¿ÉÓÃµÄ Vim ·þÎñÆ÷Ãû³Æ²¢Í˳ö"
msgid "--servername <name>\tSend to/become the Vim server <name>"
-msgstr "--servername <name>\tËÍÖÁ/³ÉΪ Vim ·þÎñÆ÷ <name>"
+msgstr "--servername <name>\t·¢Ë͵½»ò³ÉΪ Vim ·þÎñÆ÷ <name>"
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tʹÓà <viminfo> ¶ø·Ç .viminfo"
+msgstr "-i <viminfo>\t\tʹÓà <viminfo> È¡´ú .viminfo"
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t´òӡ˵Ã÷(Ò²¾ÍÊDZ¾ÐÅÏ¢)ºóÍ˳ö"
+msgid "-h or --help\tPrint Help (this message) and exit"
+msgstr "-h »ò --help\t´òÓ¡°ïÖú(±¾ÐÅÏ¢)²¢Í˳ö"
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t´òÓ¡°æ±¾ÐÅÏ¢ºóÍ˳ö"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\t´òÓ¡°æ±¾ÐÅÏ¢²¢Í˳ö"
msgid ""
"\n"
"Arguments recognised by gvim (Motif version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (Motif °æ):\n"
+"gvim (Motif °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim (neXtaw °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid ""
"\n"
"Arguments recognised by gvim (Athena version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (Athena °æ):\n"
+"gvim (Athena °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid "-display <display>\tRun vim on <display>"
-msgstr "-display <display>\tÔÚ´°¿Ú <display> Ö´ÐÐ vim"
+msgstr "-display <display>\tÔÚ <display> ÉÏÔËÐÐ vim"
msgid "-iconic\t\tStart vim iconified"
-msgstr "-iconic\t\tÆô¶¯ºó×îС»¯(iconified)"
+msgstr "-iconic\t\tÆô¶¯ºó×îС»¯"
msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t¶ÁÈ¡ Resource ʱ°Ñ vim µÄÃû³ÆÊÓΪ <name>"
+msgstr "-name <name>\t\t¶ÁÈ¡ Resource ʱ°Ñ vim ÊÓΪ <name>"
msgid "\t\t\t (Unimplemented)\n"
msgstr "\t\t\t (ÉÐδʵÏÖ)\n"
msgid "-background <color>\tUse <color> for the background (also: -bg)"
-msgstr "-background <color>\tÉ趨 <color> Ϊ±³¾°É« (Ò²¿ÉÓà -bg)"
+msgstr "-background <color>\tʹÓà <color> ×÷Ϊ±³¾°É« (Ò²¿ÉÓà -bg)"
msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-msgstr "-foreground <color>\tÉ趨 <color> Ϊһ°ãÎÄ×ÖÑÕÉ« (Ò²¿ÉÓà -fg)"
+msgstr "-foreground <color>\tʹÓà <color> ×÷Ϊһ°ãÎÄ×ÖÑÕÉ« (Ò²¿ÉÓà -fg)"
msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-msgstr "-font <font>\tʹÓà <font> Ϊһ°ã×ÖÌå (Ò²¿ÉÓà -fn)"
+msgstr "-font <font>\tʹÓà <font> ×÷Ϊһ°ã×ÖÌå (Ò²¿ÉÓà -fn)"
msgid "-boldfont <font>\tUse <font> for bold text"
-msgstr "-boldfont <font>\tʹÓà <font> Ϊ´ÖÌå×ÖÌå"
+msgstr "-boldfont <font>\tʹÓà <font> ×÷Ϊ´ÖÌå×ÖÌå"
msgid "-italicfont <font>\tUse <font> for italic text"
-msgstr "-italicfont <font>\tʹÓà <font> ΪбÌå×ÖÌå"
+msgstr "-italicfont <font>\tʹÓà <font> ×÷ΪбÌå×ÖÌå"
msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr "-geometry <geom>\tʹÓÃ<geom>Ϊ³õʼλÖà (Ò²¿ÉÓà -geom)"
+msgstr "-geometry <geom>\tʹÓà <geom> ×÷Ϊ³õʼλÖà (Ò²¿ÉÓà -geom)"
msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidth <width>\tʹÓÿí¶ÈΪ <width> µÄ±ß¿ò (Ò²¿ÉÓà -bw)"
+msgstr "-borderwidth <width>\tÉ趨±ß¿ò¿í¶ÈΪ <width> (Ò²¿ÉÓà -bw)"
msgid "-scrollbarwidth <width> Use a scrollbar width of <width> (also: -sw)"
msgstr "-scrollbarwidth <width> É趨¹ö¶¯Ìõ¿í¶ÈΪ <width> (Ò²¿ÉÓà -sw)"
msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <height>\tÉ趨²Ëµ¥Áеĸ߶ÈΪ <height> (Ò²¿ÉÓà -mh)"
+msgstr "-menuheight <height>\tÉ趨²Ëµ¥À¸¸ß¶ÈΪ <height> (Ò²¿ÉÓà -mh)"
msgid "-reverse\t\tUse reverse video (also: -rv)"
msgstr "-reverse\t\tʹÓ÷´ÏÔ (Ò²¿ÉÓà -rv)"
@@ -2369,7 +3003,7 @@
"Arguments recognised by gvim (RISC OS version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (RISC OS °æ):\n"
+"gvim (RISC OS °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid "--columns <number>\tInitial width of window in columns"
msgstr "--columns <number>\t´°¿Ú³õʼ¿í¶È"
@@ -2382,43 +3016,48 @@
"Arguments recognised by gvim (GTK+ version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (GTK+ °æ):\n"
+"gvim (GTK+ °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <display>\tÔÚ <display> Ö´ÐÐ vim (Ò²¿ÉÓà --display)"
+msgstr "-display <display>\tÔÚ <display> ÉÏÔËÐÐ vim (Ò²¿ÉÓà --display)"
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\tÏÔʾ Gnome Ïà¹Ø²ÎÊý"
+#~ msgid "--role <role>\tSet a unique role to identify the main window"
+#~ msgstr ""
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tÔÚÁíÒ»¸ö GTK ²¿¼þÖдò¿ª Vim"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\tÔÚ¸¸Ó¦ÓóÌÐòÖдò¿ª Vim"
+
+#~ msgid "No display"
+#~ msgstr ""
#. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"·¢Ëͱí´ïʽʧ°Ü¡£\n"
+msgid ": Send failed.\n"
+msgstr ": ·¢ËÍʧ°Ü¡£\n"
#. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"Ëͳöʧ°Ü¡£ÊÔͼÔÚ±¾µØÖ´ÐÐ\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": ·¢ËÍʧ°Ü¡£³¢ÊÔ±¾µØÖ´ÐÐ\n"
#, c-format
msgid "%d of %d edited"
msgstr "%d ÖÐ %d Òѱà¼"
-msgid "Send expression failed.\n"
-msgstr "·¢Ëͱí´ïʽʧ°Ü¡£\n"
+#, fuzzy
+#~ msgid "No display: Send expression failed.\n"
+#~ msgstr "·¢Ëͱí´ïʽʧ°Ü¡£\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": ·¢Ëͱí´ïʽʧ°Ü¡£\n"
msgid "No marks set"
-msgstr "ûÓÐÉ趨±ê¼Ç (mark)"
+msgstr "ûÓÐÉ趨±ê¼Ç"
#, c-format
msgid "E283: No marks matching \"%s\""
-msgstr "E283: ÕÒ²»µ½·ûºÏ \"%s\" µÄ±ê¼Ç(mark)"
+msgstr "E283: ûÓÐÆ¥Åä \"%s\" µÄ±ê¼Ç"
#. Highlight title
msgid ""
@@ -2426,7 +3065,7 @@
"mark line col file/text"
msgstr ""
"\n"
-"±ê¼Ç ÐкŠÁÐ Îļþ/Îı¾"
+"±ê¼Ç ÐÐ ÁÐ Îļþ/Îı¾"
#. Highlight title
msgid ""
@@ -2434,8 +3073,17 @@
" jump line col file/text"
msgstr ""
"\n"
-" Ìøµ½ ÐкŠÁÐ Îļþ/Îı¾"
+" Ìøת ÐÐ ÁÐ Îļþ/Îı¾"
+#. Highlight title
+msgid ""
+"\n"
+"change line col text"
+msgstr ""
+"\n"
+" ¸Ä±ä ÐÐ ÁÐ Îı¾"
+
+#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -2444,117 +3092,119 @@
"# Îļþ±ê¼Ç:\n"
#. Write the jumplist with -'
+#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
msgstr ""
"\n"
-"# Jumplist (´Óе½¾É):\n"
+"# ÌøתÁбí (´Óе½¾É):\n"
+#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
msgstr ""
"\n"
-"# ÎļþÄÚÀúÊ·¼Ç¼ (´Óе½¾É):\n"
+"# ÎļþÄڵıê¼ÇÀúÊ·¼Ç¼ (´Óе½¾É):\n"
msgid "Missing '>'"
-msgstr "ȱÉÙ¶ÔÓ¦µÄ '>'"
+msgstr "ȱÉÙ '>'"
-msgid "Not a valid codepage"
-msgstr "²»ÕýÈ·µÄ´úÂëÒ³"
+msgid "E543: Not a valid codepage"
+msgstr "E543: ÎÞЧµÄ´úÂëÒ³"
msgid "E284: Cannot set IC values"
-msgstr "E284: ²»ÄÜÉ趨 IC ÊýÖµ"
+msgstr "E284: ²»ÄÜÉ趨 IC Öµ"
msgid "E285: Failed to create input context"
-msgstr "E285: ²»ÄÜ´´½¨ÊäÈëÉÏÏÂÎÄ"
+msgstr "E285: ÎÞ·¨´´½¨ÊäÈëÉÏÏÂÎÄ"
msgid "E286: Failed to open input method"
-msgstr "E286: ²»ÄÜ´ò¿ªÊäÈë·¨"
+msgstr "E286: ÎÞ·¨´ò¿ªÊäÈë·¨"
msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr "E287: ¾¯¸æ: ²»ÄÜÒƳý IM µÄ callback"
+msgstr "E287: ¾¯¸æ: ÎÞ·¨É趨ÊäÈë·¨µÄÊͷŻص÷º¯Êý"
msgid "E288: input method doesn't support any style"
-msgstr "E288: ÊäÈë·¨²»Ö§³ÖÈκΠstyle"
+msgstr "E288: ÊäÈë·¨²»Ö§³ÖÈκηç¸ñ"
msgid "E289: input method doesn't support my preedit type"
-msgstr "E289: ÊäÈë·¨²»Ö§³ÖÈκΠstyle"
+msgstr "E289: ÊäÈë·¨²»Ö§³ÖÎÒµÄÔ¤±à¼ÀàÐÍ"
msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot ÐèÒª×ÖÌ弯(Fontset)"
+msgstr "E290: over-the-spot ·ç¸ñÐèÒª Fontset"
msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: ÄãµÄ GTK+ ±È 1.2.3 ÀÏ¡£²»ÄÜʹÓÃ״̬Çø¡£"
+msgstr "E291: ÄãµÄ GTK+ ±È 1.2.3 ¾É¡£×´Ì¬Çø²»¿ÉÓá£"
msgid "E292: Input Method Server is not running"
-msgstr "E292: ÊäÈë·¨¹ÜÀí³ÌÐò(Input Method Server)δÔËÐÐ"
+msgstr "E292: ÊäÈë·¨·þÎñÆ÷δÔËÐÐ"
msgid "E293: block was not locked"
msgstr "E293: ¿éδ±»Ëø¶¨"
msgid "E294: Seek error in swap file read"
-msgstr "E294: ½»»»Îļþ¶ÁÈ¡´íÎó"
+msgstr "E294: ½»»»Îļþ¶ÁÈ¡¶¨Î»´íÎó"
msgid "E295: Read error in swap file"
msgstr "E295: ½»»»Îļþ¶ÁÈ¡´íÎó"
msgid "E296: Seek error in swap file write"
-msgstr "E296: ½»»»ÎļþдÈë´íÎó"
+msgstr "E296: ½»»»ÎļþдÈ붨λ´íÎó"
msgid "E297: Write error in swap file"
msgstr "E297: ½»»»ÎļþдÈë´íÎó"
msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: ½»»»ÎļþÒѾ´æÔÚ! (СÐÄ·ûºÅÁ¬½áµÄ°²È«Â©¶´!?)"
+msgstr "E300: ½»»»ÎļþÒÑ´æÔÚ (·ûºÅÁ¬½Ó¹¥»÷£¿)"
msgid "E298: Didn't get block nr 0?"
-msgstr "E298: ÕÒ²»µ½¿é 0?"
+msgstr "E298: ÕÒ²»µ½¿é 0£¿"
msgid "E298: Didn't get block nr 1?"
-msgstr "E298: ÕÒ²»µ½¿é 1?"
+msgstr "E298: ÕÒ²»µ½¿é 1£¿"
msgid "E298: Didn't get block nr 2?"
-msgstr "E298: ÕÒ²»µ½¿é 2?"
+msgstr "E298: ÕÒ²»µ½¿é 2£¿"
#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: àÞàÞ, ½»»»Îļþ²»¼ûÁË!!!"
+msgstr "E301: àÞ£¬½»»»Îļþ²»¼ûÁË£¡£¡£¡"
msgid "E302: Could not rename swap file"
-msgstr "E302: ²»Äܸı佻»»ÎļþµÄÃû³Æ"
+msgstr "E302: ÎÞ·¨ÖØÃüÃû½»»»Îļþ"
#, c-format
msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: ²»ÄÜ´ò¿ª½»»»Îļþ \"%s\", ²»¿ÉÄָܻ´ÁË"
+msgstr "E303: ÎÞ·¨´ò¿ª \"%s\" µÄ½»»»Îļþ£¬»Ö¸´½«²»¿ÉÄÜ"
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: ÕÒ²»µ½¿é 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): ÕÒ²»µ½¿é 0£¿"
#, c-format
msgid "E305: No swap file found for %s"
msgstr "E305: ÕÒ²»µ½ %s µÄ½»»»Îļþ"
msgid "Enter number of swap file to use (0 to quit): "
-msgstr "ÇëÑ¡ÔñÄãҪʹÓõĽ»»»Îļþ (°´0 Í˳ö): "
+msgstr "ÇëÊäÈëҪʹÓõĽ»»»Îļþ±àºÅ (0 Í˳ö): "
#, c-format
msgid "E306: Cannot open %s"
-msgstr "E306: ²»ÄÜ´ò¿ª %s"
+msgstr "E306: ÎÞ·¨´ò¿ª %s"
msgid "Unable to read block 0 from "
-msgstr "²»ÄܶÁÈ¡¿é 0:"
+msgstr "ÎÞ·¨¶ÁÈ¡¿é 0: "
msgid ""
"\n"
"Maybe no changes were made or Vim did not update the swap file."
msgstr ""
"\n"
-"¿ÉÄÜÄãû×ö¹ýÈκÎÐ޸ĻòÊÇ Vim »¹À´²»¼°¸üн»»»Îļþ."
+"¿ÉÄÜÄãû×ö¹ýÈκÎÐ޸ĻòÊÇ Vim »¹À´²»¼°¸üн»»»Îļþ¡£"
msgid " cannot be used with this version of Vim.\n"
-msgstr " ²»ÄÜÔÚ±¾°æ±¾µÄ Vim ÖÐʹÓÃ.\n"
+msgstr " ²»ÄÜÔڸð汾µÄ Vim ÖÐʹÓá£\n"
msgid "Use Vim version 3.0.\n"
msgstr "ʹÓà Vim 3.0¡£\n"
@@ -2564,17 +3214,17 @@
msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»Îļþ"
msgid " cannot be used on this computer.\n"
-msgstr " ²»ÄÜÔÚÕą̂µçÄÔÉÏʹÓÃ.\n"
+msgstr " ²»ÄÜÔÚÕą̂µçÄÔÉÏʹÓá£\n"
msgid "The file was created on "
-msgstr "±¾Îļþ´´½¨ÓÚ "
+msgstr "´ËÎļþ´´½¨ÓÚ "
msgid ""
",\n"
"or the file has been damaged."
msgstr ""
-",\n"
-"»òÊÇÕâÎļþÒѱ»ÆÆ»µ¡£"
+"£¬\n"
+"»òÊÇ´ËÎļþÒÑË𻵡£"
#, c-format
msgid "Using swap file \"%s\""
@@ -2582,82 +3232,101 @@
#, c-format
msgid "Original file \"%s\""
-msgstr "ÔÎļþ \"%s\""
+msgstr "ÔʼÎļþ \"%s\""
msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ¾¯¸æ: ÔʼÎļþ¿ÉÄÜÒѾÐ޸ĹýÁË"
+msgstr "E308: ¾¯¸æ: ÔʼÎļþ¿ÉÄÜÒѱ»ÐÞ¸Ä"
#, c-format
msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: ²»ÄÜ´Ó %s ¶ÁÈ¡¿é 1"
+msgstr "E309: ÎÞ·¨´Ó %s ¶ÁÈ¡¿é 1"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???MANY LINES MISSING"
-msgstr "???ȱÉÙÌ«¶àÐÐ"
+msgstr "???ȱÉÙÁËÌ«¶àÐÐ"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???LINE COUNT WRONG"
-msgstr "???ÐкŴíÎó"
+msgstr "???ÐÐÊý´íÎó"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???EMPTY BLOCK"
-msgstr "???¿ÕµÄ ¿é"
+msgstr "???¿ÕµÄ¿é"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???LINES MISSING"
-msgstr "???ÕÒ²»µ½Ò»Ð©ÐÐ"
+msgstr "???ȱÉÙÁËһЩÐÐ"
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: ¿é 1 ID ´íÎó (%s ²»Êǽ»»»Îļþ?)"
+msgstr "E310: ¿é 1 ID ´íÎó (%s ²»Êǽ»»»Îļþ£¿)"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???BLOCK MISSING"
-msgstr "???ÕÒ²»µ½¿é"
+msgstr "???ȱÉÙ¿é"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÄÚÈÝ¿ÉÄÜÓÐÎÊÌâ"
+msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐпÉÄÜÒÑ»ìÂÒ"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÄÚÈÝ¿ÉÄܱ»É¾³ý/²åÈë¹ý"
+msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐпÉÄÜÒѱ»²åÈë/ɾ³ý¹ý"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???END"
msgstr "???END"
msgid "E311: Recovery Interrupted"
-msgstr "E311: »Ö¸´ÒÑÖжÏ"
+msgstr "E311: »Ö¸´Òѱ»ÖжÏ"
msgid ""
"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: »Ö¸´Ê±·¢Éú´íÎó; Çë×¢Ò⿪ͷΪ ??? µÄÐÐ"
+msgstr "E312: »Ö¸´Ê±·¢Éú´íÎó£»Çë×¢Ò⿪ͷΪ ??? µÄÐÐ"
+
+msgid "See \":help E312\" for more information."
+msgstr "¸ü¶àÐÅÏ¢Çë¼û \":help E312\""
msgid "Recovery completed. You should check if everything is OK."
-msgstr "»Ö¸´Íê³É. ÇëÈ·¶¨Ò»ÇÐÕý³£."
+msgstr "»Ö¸´Íê±Ï¡£ÇëÈ·¶¨Ò»ÇÐÕý³£¡£"
msgid ""
"\n"
"(You might want to write out this file under another name\n"
msgstr ""
"\n"
-"(Äã¿ÉÄÜÏëÒª°ÑÕâ¸öÎļþÁí´æΪ±ðµÄÎļþÃû£¬\n"
+"(Äã¿ÉÄÜÏëÒª½«Õâ¸öÎļþÁí´æΪ±ðµÄÎļþÃû\n"
msgid "and run diff with the original file to check for changes)\n"
-msgstr "ÔÙÖ´ÐÐ diff ÓëÔÎļþ±È½ÏÒÔ¼ì²éÊÇ·ñÓиıä)\n"
+msgstr "ÔÙÔËÐÐ diff ÓëÔÎļþ±È½ÏÒÔ¼ì²éÊÇ·ñÓиıä)\n"
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
msgstr ""
-"(D)Ö±½Óɾ³ý .swp ½»»»Îļþ\n"
+"È»ºó°Ñ .swp Îļþɾµô¡£\n"
"\n"
#. use msg() to start the scrolling properly
msgid "Swap files found:"
-msgstr "ÕÒµ½ÒÔϵĽ»»»Îļþ:"
+msgstr "ÕÒµ½½»»»Îļþ:"
msgid " In current directory:\n"
-msgstr " ÔÚĿǰĿ¼:\n"
+msgstr " λÓÚµ±Ç°Ä¿Â¼:\n"
msgid " Using specified name:\n"
-msgstr " Using specified name:\n"
+msgstr " ʹÓÃÖ¸¶¨µÄÃû×Ö:\n"
msgid " In directory "
-msgstr " ÔÚĿ¼ "
+msgstr " λÓÚĿ¼ "
msgid " -- none --\n"
msgstr " -- ÎÞ --\n"
@@ -2672,13 +3341,13 @@
msgstr " ÈÕÆÚ: "
msgid " [from Vim version 3.0]"
-msgstr " [´Ó Vim °æ±¾ 3.0]"
+msgstr " [À´×Ô Vim °æ±¾ 3.0]"
msgid " [does not look like a Vim swap file]"
-msgstr " [²»Ïñ Vim µÄ½»»»Îļþ]"
+msgstr " [²»ÏñÊÇ Vim ½»»»Îļþ]"
msgid " file name: "
-msgstr " ÎļþÃû: "
+msgstr " ÎļþÃû: "
msgid ""
"\n"
@@ -2718,14 +3387,14 @@
" ½ø³Ì ID: "
msgid " (still running)"
-msgstr " (ÕýÔÚÖ´ÐÐ)"
+msgstr " (ÈÔÔÚÔËÐÐ)"
msgid ""
"\n"
" [not usable with this version of Vim]"
msgstr ""
"\n"
-" [²»ÄÜÔÚ±¾°æ±¾µÄ Vim ÉÏʹÓÃ]"
+" [²»ÄÜÔڸð汾µÄ Vim ÉÏʹÓÃ]"
msgid ""
"\n"
@@ -2735,13 +3404,13 @@
" [²»ÄÜÔÚ±¾»úÉÏʹÓÃ]"
msgid " [cannot be read]"
-msgstr " [²»ÄܶÁÈ¡]"
+msgstr " [ÎÞ·¨¶ÁÈ¡]"
msgid " [cannot be opened]"
-msgstr " [²»ÄÜ´ò¿ª]"
+msgstr " [ÎÞ·¨´ò¿ª]"
msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: ²»Äܱ£Áô, ²»Ê¹Óý»»»Îļþ"
+msgstr "E313: ÎÞ·¨±£Áô£¬Ã»Óн»»»Îļþ"
msgid "File preserved"
msgstr "ÎļþÒѱ£Áô"
@@ -2751,7 +3420,7 @@
#, c-format
msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: ´íÎóµÄ lnum: %ld"
+msgstr "E315: ml_get: ÎÞЧµÄ lnum: %ld"
#, c-format
msgid "E316: ml_get: cannot find line %ld"
@@ -2764,13 +3433,13 @@
msgstr "stack_idx Ó¦¸ÃÊÇ 0"
msgid "E318: Updated too many blocks?"
-msgstr "E318: ¸üÐÂÌ«¶à¿é?"
+msgstr "E318: ¸üÐÂÁËÌ«¶àµÄ¿é£¿"
msgid "E317: pointer block id wrong 4"
msgstr "E317: Ö¸Õë¿é id ´íÎó 4"
msgid "deleted block 1?"
-msgstr "ɾ³ý¿é 1?"
+msgstr "ɾ³ýÁË¿é 1£¿"
#, c-format
msgid "E320: Cannot find line %ld"
@@ -2784,7 +3453,7 @@
#, c-format
msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Ðкų¬³ö·¶Î§: %ld ³¬¹ý½áβ"
+msgstr "E322: Ðкų¬³ö·¶Î§: %ld ³¬³ö½áβ"
#, c-format
msgid "E323: line count wrong in block %ld"
@@ -2794,7 +3463,11 @@
msgstr "¶ÑÕ»´óСÔö¼Ó"
msgid "E317: pointer block id wrong 2"
-msgstr "E317: Ö¸Õë¿é id ´í 2"
+msgstr "E317: Ö¸Õë¿é id ´íÎó 2"
+
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: \"%s\" ·ûºÅÁ¬½Ó³öÏÖÑ»·"
msgid "E325: ATTENTION"
msgstr "E325: ×¢Òâ"
@@ -2807,10 +3480,10 @@
"·¢ÏÖ½»»»Îļþ \""
msgid "While opening file \""
-msgstr "µ±´ò¿ªÎļþʱ \""
+msgstr "ÕýÔÚ´ò¿ªÎļþ \""
msgid " NEWER than swap file!\n"
-msgstr " ±È½»»»ÎļþÐÂ!\n"
+msgstr " ±È½»»»ÎļþУ¡\n"
#. Some of these messages are long to allow translation to
#. * other languages.
@@ -2821,95 +3494,101 @@
" different instances of the same file when making changes.\n"
msgstr ""
"\n"
-"(1) ¿ÉÄÜÓÐÁíÒ»¸ö³ÌÐòÒ²ÔÚ±à¼Í¬Ò»¸öÎļþ.\n"
-" Èç¹ûÊÇÕâÑù£¬Çë×¢Òâ²»ÒªÒ»ÆðдÈ룬²»È»ÄãµÄŬÁ¦¶¼»á¸¶ÖÁ÷¡£\n"
+"(1) ÁíÒ»¸ö³ÌÐò¿ÉÄÜÒ²ÔÚ±à¼Í¬Ò»¸öÎļþ¡£\n"
+" Èç¹ûÊÇÕâÑù£¬ÐÞ¸ÄʱÇë×¢Òâ±ÜÃâͬһ¸öÎļþ²úÉúÁ½¸ö²»Í¬µÄ°æ±¾¡£\n"
+"\n"
msgid " Quit, or continue with caution.\n"
-msgstr " Í˳ö£¬»òÊǼÌÐø±à¼¡£\n"
+msgstr " Í˳ö£¬»òСÐĵؼÌÐø¡£\n"
msgid ""
"\n"
"(2) An edit session for this file crashed.\n"
msgstr ""
"\n"
-"(2) ÉÏÒ»´Î±à¼´ËÎļþʱ±ÀÀ£\n"
+"(2) Éϴα༴ËÎļþʱ±ÀÀ£¡£\n"
msgid " If this is the case, use \":recover\" or \"vim -r "
-msgstr " Èç¹ûÊÇÕâÑù, ÇëÓà \":recover\" »ò \"vim -r"
+msgstr " Èç¹ûÊÇÕâÑù£¬ÇëÓà \":recover\" »ò \"vim -r "
msgid ""
"\"\n"
" to recover the changes (see \":help recovery\").\n"
msgstr ""
"\"\n"
-" »Ö¸´ÐÞ¸ÄÄÚÈÝ (½øÒ»²½ËµÃ÷Çë¿´ \":help recovery\").\n"
+" »Ö¸´Ð޸ĵÄÄÚÈÝ (Çë¼û \":help recovery\")¡£\n"
msgid " If you did this already, delete the swap file \""
-msgstr " Èç¹û¸Ã»Ö¸´µÄ¶¼ÒѾ»Ö¸´ÁË, ÇëÖ±½Óɾ³ý´Ë½»»»Îļþ \""
+msgstr " Èç¹ûÄãÒѾ½øÐÐÁ˻ָ´£¬Çëɾ³ý½»»»Îļþ \""
msgid ""
"\"\n"
" to avoid this message.\n"
msgstr ""
"\"\n"
-" ÒÔ±ÜÃâÔÙ¿´µ½´ËÐÅÏ¢.\n"
+" ÒÔ±ÜÃâÔÙ¿´µ½´ËÏûÏ¢¡£\n"
msgid "Swap file \""
msgstr "½»»»Îļþ \""
msgid "\" already exists!"
-msgstr "\" ÒѾ´æÔÚÁË!"
+msgstr "\" ÒÑ´æÔÚ£¡"
msgid "VIM - ATTENTION"
msgstr "VIM - ×¢Òâ"
msgid "Swap file already exists!"
-msgstr "½»»»ÎļþÒѾ´æÔÚ!"
-
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit"
-msgstr ""
-"ÒÔÖ»¶Á·½Ê½´ò¿ª(&O)\n"
-"Ö±½Ó±à¼(&E)\n"
-"»Ö¸´(&R)\n"
-"Í˳ö(&Q)"
+msgstr "½»»»ÎļþÒÑ´æÔÚ£¡"
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
"&Quit\n"
-"&Delete it"
+"&Abort"
msgstr ""
"ÒÔÖ»¶Á·½Ê½´ò¿ª(&O)\n"
"Ö±½Ó±à¼(&E)\n"
"»Ö¸´(&R)\n"
"Í˳ö(&Q)\n"
-"ɾ³ý½»»»Îļþ(&D)"
+"ÖÐÖ¹(&A)"
+
+msgid ""
+"&Open Read-Only\n"
+"&Edit anyway\n"
+"&Recover\n"
+"&Delete it\n"
+"&Quit\n"
+"&Abort"
+msgstr ""
+"ÒÔÖ»¶Á·½Ê½´ò¿ª(&O)\n"
+"Ö±½Ó±à¼(&E)\n"
+"»Ö¸´(&R)\n"
+"ɾ³ý½»»»Îļþ(&D)\n"
+"Í˳ö(&Q)\n"
+"ÖÐÖ¹(&A)"
msgid "E326: Too many swap files found"
msgstr "E326: ÕÒµ½Ì«¶à½»»»Îļþ"
msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ²¿·Ý²Ëµ¥Ïî²»ÊÇ×Ӳ˵¥"
+msgstr "E327: ²Ëµ¥ÏîµÄij²¿·Ö·¾¶²»ÊÇ×Ӳ˵¥"
msgid "E328: Menu only exists in another mode"
-msgstr "E328: ²Ëµ¥Ö»ÄÜÔÚÆäËüģʽÖÐʹÓÃ"
+msgstr "E328: ²Ëµ¥Ö»ÔÚÆäËüģʽÖдæÔÚ"
-msgid "E329: No menu of that name"
-msgstr "E329: ûÓÐÄÇÑùµÄ²Ëµ¥"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: ûÓв˵¥ \"%s\""
msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: ²Ëµ¥²»ÄÜÖ¸Ïò×ÓÑ¡µ¥"
+msgstr "E330: ²Ëµ¥Â·¾¶²»ÄÜÖ¸Ïò×Ӳ˵¥"
msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ²»ÄÜÖ±½Ó°Ñ²Ëµ¥Ïî¼Óµ½²Ëµ¥ÌõÖÐ"
+msgstr "E331: ²»ÄܰѲ˵¥ÏîÖ±½Ó¼Óµ½²Ëµ¥À¸ÖÐ"
msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: ·Ö¸ôÏß²»ÄÜÊDz˵¥µÄÒ»²¿·Ö"
+msgstr "E332: ·Ö¸ôÏß²»ÄÜÊDz˵¥Â·¾¶µÄÒ»²¿·Ö"
#. Now we have found the matching menu, and we list the mappings
#. Highlight title
@@ -2921,21 +3600,21 @@
"--- ²Ëµ¥ ---"
msgid "Tear off this menu"
-msgstr "ÇÐÏ´˲˵¥"
+msgstr "˺Ï´˲˵¥"
msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: ²Ëµ¥±ØÐèÖ¸ÏòÒ»¸ö²Ëµ¥Ïî"
+msgstr "E333: ²Ëµ¥Â·¾¶±ØÐëÖ¸Ïò²Ëµ¥Ïî"
#, c-format
msgid "E334: Menu not found: %s"
-msgstr "E334: [²Ëµ¥] ÕÒ²»µ½ %s"
+msgstr "E334: ÕÒ²»µ½²Ëµ¥: %s"
#, c-format
msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ģʽ䶨Òå²Ëµ¥"
+msgstr "E335: %s ģʽÖв˵¥Î´¶¨Òå"
msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: ²Ëµ¥±ØÐèÖ¸Ïò×Ӳ˵¥"
+msgstr "E336: ²Ëµ¥Â·¾¶±ØÐëÖ¸Ïò×Ӳ˵¥"
msgid "E337: Menu not found - check menu names"
msgstr "E337: ÕÒ²»µ½²Ëµ¥ - Çë¼ì²é²Ëµ¥Ãû³Æ"
@@ -2946,31 +3625,30 @@
#, c-format
msgid "line %4ld:"
-msgstr "ÐÐ %4ld:"
+msgstr "µÚ %4ld ÐÐ:"
-msgid "[string too long]"
-msgstr "[×Ö·û´®Ì«³¤]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: ÎÞЧµÄ¼Ä´æÆ÷Ãû: '%s'"
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "¼òÌåÖÐÎÄÐÅϢά»¤Õß: Wang Jun <junw@turbolinux.com.cn>"
+msgstr "¼òÌåÖÐÎÄÏûϢά»¤Õß: Yuheng Xie <elephant@linux.net.cn>"
msgid "Interrupt: "
msgstr "ÒÑÖжÏ: "
-msgid "Hit ENTER to continue"
-msgstr "Çë°´ ENTER ¼ÌÐø"
-
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
msgstr "Çë°´ ENTER »òÆäËüÃüÁî¼ÌÐø"
+#, c-format
+msgid "%s line %ld"
+msgstr "%s µÚ %ld ÐÐ"
+
msgid "-- More --"
msgstr "-- ¸ü¶à --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: ÏòÏÂ/ÏòÉÏÒ»ÐÐ, ¿Õ¸ñ/b: Ò»Ò³, d/u: °ëÒ³, q: Í˳ö)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: ÏòÏÂÒ»ÐÐ, ¿Õ°×¼ü: Ò»Ò³, d: °ëÒ³, q: Í˳ö)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " ¿Õ¸ñ/d/j: ÆÁÄ»/Ò³/ÐÐ Ï·£¬b/u/k: ÉÏ·£¬q: Í˳ö"
msgid "Question"
msgstr "ÎÊÌâ"
@@ -2979,17 +3657,8 @@
"&Yes\n"
"&No"
msgstr ""
-"&YÊÇ\n"
-"&N·ñ"
-
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&YÊÇ\n"
-"&N·ñ\n"
-"&CÈ¡Ïû"
+"ÊÇ(&Y)\n"
+"·ñ(&N)"
msgid ""
"&Yes\n"
@@ -2998,11 +3667,14 @@
"&Discard All\n"
"&Cancel"
msgstr ""
-"&YÊÇ\n"
-"&N·ñ\n"
-"&AÈ«²¿±£´æ\n"
-"&DÈ«²¿²»´æ\n"
-"&CÈ¡Ïû"
+"ÊÇ(&Y)\n"
+"·ñ(&N)\n"
+"È«²¿±£´æ(&A)\n"
+"È«²¿¶ªÆú(&D)\n"
+"È¡Ïû(&C)"
+
+msgid "Select Directory dialog"
+msgstr "Ñ¡ÔñĿ¼¶Ô»°¿ò"
msgid "Save File dialog"
msgstr "±£´æÎļþ¶Ô»°¿ò"
@@ -3012,35 +3684,51 @@
#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: Ö÷¿Ø̨(Console)ģʽʱûÓÐÎļþä¯ÀÀÆ÷(file browser)"
+msgstr "E338: ±§Ç¸£¬¿ØÖÆ̨ģʽÏÂûÓÐÎļþä¯ÀÀÆ÷"
+
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf() µÄ²ÎÊý²»×ã"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: printf() µÄ²ÎÊý¹ý¶à"
msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ×¢Òâ: ÄãÕýÔÚÐÞ¸ÄÒ»¸öÖ»¶ÁÎļþ"
+msgstr "W10: ¾¯¸æ: ÕýÔÚÐÞ¸ÄÒ»¸öÖ»¶ÁÎļþ"
+
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "ÇëÊäÈëÊý×Ö»òµã»÷Êó±ê (<Enter> È¡Ïû): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "ÇëÑ¡ÔñÊý×Ö (<Enter> È¡Ïû): "
msgid "1 more line"
-msgstr "»¹ÓÐÒ»ÐÐ"
+msgstr "¶àÁË 1 ÐÐ"
msgid "1 line less"
-msgstr "ÉÙÓÚÒ»ÐÐ"
+msgstr "ÉÙÁË 1 ÐÐ"
#, c-format
msgid "%ld more lines"
-msgstr " »¹ÓÐ %ld ÐÐ"
+msgstr "¶àÁË %ld ÐÐ"
#, c-format
msgid "%ld fewer lines"
-msgstr "ֻʣ %ld ÐÐ"
+msgstr "ÉÙÁË %ld ÐÐ"
msgid " (Interrupted)"
msgstr " (ÒÑÖжÏ)"
+msgid "Beep!"
+msgstr "Beep!"
+
msgid "Vim: preserving files...\n"
-msgstr "Vim: ±£ÁôÎļþÖÐ...\n"
+msgstr "Vim: ÕýÔÚ±£ÁôÎļþ¡¡\n"
#. close all memfiles, without deleting
msgid "Vim: Finished.\n"
-msgstr "Vim: ½áÊø.\n"
+msgstr "Vim: ½áÊø¡£\n"
+#, c-format
msgid "ERROR: "
msgstr "´íÎó: "
@@ -3050,14 +3738,14 @@
"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
msgstr ""
"\n"
-"[bytes] È«²¿ alloc-freed %lu-%lu, ʹÓÃÖÐ %lu, peak ʹÓà %lu\n"
+"[×Ö½Ú] ×ܹ² alloc-free %lu-%lu£¬Ê¹ÓÃÖÐ %lu£¬¸ß·åʹÓà %lu\n"
#, c-format
msgid ""
"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
"\n"
msgstr ""
-"[µ÷ÓÃ] È«²¿ re/malloc(): %lu, È«²¿ free()': %lu\n"
+"[µ÷ÓÃ] ×ܹ² re/malloc(): %lu£¬×ܹ² free()': %lu\n"
"\n"
msgid "E340: Line is becoming too long"
@@ -3069,26 +3757,26 @@
#, c-format
msgid "E342: Out of memory! (allocating %lu bytes)"
-msgstr "E342: ÄÚ´æ²»×ã! (³¢ÊÔÅäÖà %lu ×Ö½Ú×é)"
+msgstr "E342: ÄÚ´æ²»×㣡(·ÖÅä %lu ×Ö½Ú)"
#, c-format
msgid "Calling shell to execute: \"%s\""
msgstr "µ÷ÓÃ shell Ö´ÐÐ: \"%s\""
-msgid "Missing colon"
-msgstr "ȱÉÙðºÅ"
+msgid "E545: Missing colon"
+msgstr "E545: ȱÉÙðºÅ"
-msgid "Illegal mode"
-msgstr "²»ÕýÈ·µÄģʽ"
+msgid "E546: Illegal mode"
+msgstr "E546: ÎÞЧµÄģʽ"
-msgid "Illegal mouseshape"
-msgstr "²»ÕýÈ·µÄÊó±êÐÎ×´"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: ÎÞЧµÄÊó±êÐÎ×´"
-msgid "digit expected"
-msgstr "Ó¦¸ÃΪÊý×Ö"
+msgid "E548: digit expected"
+msgstr "E548: ´Ë´¦ÐèÒªÊý×Ö"
-msgid "Illegal percentage"
-msgstr "²»ÕýÈ·µÄ°Ù·Ö±È"
+msgid "E549: Illegal percentage"
+msgstr "E549: ÎÞЧµÄ°Ù·Ö±È"
msgid "Enter encryption key: "
msgstr "ÊäÈëÃÜÂë: "
@@ -3097,17 +3785,17 @@
msgstr "ÇëÔÙÊäÈëÒ»´Î: "
msgid "Keys don't match!"
-msgstr "Á½´ÎÊäÈëÃÜÂ벻ͬ!"
+msgstr "Á½´ÎÃÜÂ벻ƥÅ䣡"
#, c-format
msgid ""
"E343: Invalid path: '**[number]' must be at the end of the path or be "
"followed by '%s'."
-msgstr "E343: ²»ÕýÈ·µÄ·¾¶: '**[number]' ±ØÐèÒªÔÚ·¾¶½áβ»òÒª½ÓÖø '%s'"
+msgstr "E343: ÎÞЧµÄ·¾¶: '**[number]' ±ØÐëÔÚ·¾¶Ä©Î²»òÕߺóÃæ½Ó '%s'¡£"
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath ÖÐûÓÐĿ¼ \"%s\""
+msgstr "E344: cdpath ÖÐÕÒ²»µ½Ä¿Â¼ \"%s\""
#, c-format
msgid "E345: Can't find file \"%s\" in path"
@@ -3121,11 +3809,35 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: ÔÚ·¾¶ÖÐÕÒ²»µ½¸ü¶àµÄÎļþ \"%s\""
-msgid "Illegal component"
-msgstr "²»ÕýÈ·µÄ×é¼þ"
+#. Get here when the server can't be found.
+#~ msgid "Cannot connect to Netbeans #2"
+#~ msgstr ""
+
+#~ msgid "Cannot connect to Netbeans"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+#~ msgstr ""
+
+#~ msgid "read from Netbeans socket"
+#~ msgstr ""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: »º³åÇø %ld ¶ªÊ§ NetBeans Á¬½Ó"
+
+msgid "E505: "
+msgstr "E505: "
+
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' Ϊ¿Õ"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: ÇóÖµ¹¦Äܲ»¿ÉÓÃ"
msgid "Warning: terminal cannot highlight"
-msgstr "×¢Òâ: ÄãµÄÖն˲»ÄÜÏÔʾ¸ßÁÁ¶È"
+msgstr "¾¯¸æ: ÄãµÄÖն˲»ÄÜÏÔʾ¸ßÁÁ"
msgid "E348: No string under cursor"
msgstr "E348: ¹â±ê´¦Ã»ÓÐ×Ö·û´®"
@@ -3134,56 +3846,78 @@
msgstr "E349: ¹â±ê´¦Ã»ÓÐʶ±ð×Ö"
msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: ²»ÄÜÔÚÄ¿Ç°µÄ 'foldmethod' ÏÂɾ³ý fold"
+msgstr "E352: ²»ÄÜÔÚµ±Ç°µÄ 'foldmethod' ÏÂɾ³ý fold"
+
+msgid "E664: changelist is empty"
+msgstr "E664: ¸Ä±äÁбíΪ¿Õ"
+
+msgid "E662: At start of changelist"
+msgstr "E662: ÒÑÔڸıäÁбíµÄ¿ªÊ¼´¦"
+
+msgid "E663: At end of changelist"
+msgstr "E663: ÒÑÔڸıäÁбíµÄĩβ´¦"
+
+msgid "Type :quit<Enter> to exit Vim"
+msgstr "ÊäÈë :quit<Enter> Í˳ö Vim"
#, c-format
msgid "1 line %sed 1 time"
-msgstr "Ò»ÐÐ %s ¹ý Ò»´Î"
+msgstr "1 ÐÐ %s ÁË 1 ´Î"
#, c-format
msgid "1 line %sed %d times"
-msgstr "Ò»ÐÐ %s ¹ý %d ´Î"
+msgstr "1 ÐÐ %s ÁË %d ´Î"
#, c-format
msgid "%ld lines %sed 1 time"
-msgstr "%ld ÐÐ %s ¹ý Ò»´Î"
+msgstr "%ld ÐÐ %s ÁË 1 ´Î"
#, c-format
msgid "%ld lines %sed %d times"
-msgstr "%ld ÐÐ %s ¹ý %d ´Î"
+msgstr "%ld ÐÐ %s ÁË %d ´Î"
#, c-format
msgid "%ld lines to indent... "
-msgstr "ʶ±ð %ld ÐÐ..."
+msgstr "Ëõ½ø %ld ÐС¡ "
msgid "1 line indented "
-msgstr "Ò»ÐÐÒÑʶ±ð"
+msgstr "Ëõ½øÁË 1 ÐÐ "
#, c-format
msgid "%ld lines indented "
-msgstr "ÒÑʶ±ð %ld ÐÐ"
+msgstr "Ëõ½øÁË %ld ÐÐ "
+
+msgid "E748: No previously used register"
+msgstr "E748: ûÓÐÇ°Ò»¸öʹÓõļĴæÆ÷"
#. must display the prompt
msgid "cannot yank; delete anyway"
-msgstr "²»Äܸ´ÖÆ; Ö±½Óɾ³ý"
+msgstr "ÎÞ·¨¸´ÖÆ£»¸ÄΪɾ³ý"
msgid "1 line changed"
-msgstr " 1 ÐÐ ~ed"
+msgstr "¸Ä±äÁË 1 ÐÐ"
#, c-format
msgid "%ld lines changed"
-msgstr " %ld ÐÐ ~ed"
+msgstr "¸Ä±äÁË %ld ÐÐ"
#, c-format
msgid "freeing %ld lines"
-msgstr "ÊÍ·Å %ld ÐÐÖÐ"
+msgstr "ÊÍ·ÅÁË %ld ÐÐ"
+
+msgid "block of 1 line yanked"
+msgstr "¸´ÖÆÁË 1 ÐеĿé"
msgid "1 line yanked"
-msgstr "ÒѸ´ÖÆ 1 ÐÐ"
+msgstr "¸´ÖÆÁË 1 ÐÐ"
+
+#, c-format
+msgid "block of %ld lines yanked"
+msgstr "¸´ÖÆÁË %ld ÐеĿé"
#, c-format
msgid "%ld lines yanked"
-msgstr "ÒѸ´ÖÆ %ld ÐÐ"
+msgstr "¸´ÖÆÁË %ld ÐÐ"
#, c-format
msgid "E353: Nothing in register %s"
@@ -3198,8 +3932,9 @@
"--- ¼Ä´æÆ÷ ---"
msgid "Illegal register name"
-msgstr "²»ÕýÈ·µÄ¼Ä´æÆ÷Ãû³Æ"
+msgstr "ÎÞЧµÄ¼Ä´æÆ÷Ãû"
+#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -3208,144 +3943,152 @@
"# ¼Ä´æÆ÷:\n"
#, c-format
-msgid "Unknown register type %d"
-msgstr "δ֪µÄ×¢²áÀàÐÍ: %d"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ¼Ä´æÆ÷Ãû³Æ´íÎó: '%s'"
+msgid "E574: Unknown register type %d"
+msgstr "E574: δ֪µÄ¼Ä´æÆ÷ÀàÐÍ %d"
#, c-format
msgid "%ld Cols; "
msgstr "%ld ÁÐ; "
-#, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Bytes)"
+#, fuzzy, c-format
+#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+#~ msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Bytes)"
+
+#, fuzzy, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Chars); %ld/%ld"
+
+#, fuzzy, c-format
+#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+#~ msgstr "ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+
+#, fuzzy, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Char) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
-#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
msgid "Thanks for flying Vim"
msgstr "¸ÐлÄúÑ¡Ôñ Vim"
-msgid "Option not supported"
-msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+msgid "E518: Unknown option"
+msgstr "E518: δ֪µÄÑ¡Ïî"
-msgid "Not allowed in a modeline"
-msgstr "²»ÄÜÔÚģʽÐÐÀï³öÏÖ"
+msgid "E519: Option not supported"
+msgstr "E519: ²»Ö§³Ö¸ÃÑ¡Ïî"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tµ±Ç°ÉèÖÃ: "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: ²»ÔÊÐíÔÚ modeline ÖÐʹÓÃ"
-msgid "Number required after ="
-msgstr "= ºóÐèÒªÓÐÊý×Ö"
+msgid "E521: Number required after ="
+msgstr "E521: = ºóÃæÐèÒªÊý×Ö"
-msgid "Not found in termcap"
-msgstr "Termcap ÀïÃæÕÒ²»µ½"
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap ÀïÃæÕÒ²»µ½"
#, c-format
-msgid "Illegal character <%s>"
-msgstr "²»ÕýÈ·µÄ×Ö·û <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: ÎÞЧµÄ×Ö·û <%s>"
-msgid "Not allowed here"
-msgstr "ÕâÀï²»¿ÉʹÓÃ"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: ²»ÄÜÉ趨 'term' Ϊ¿Õ×Ö·û´®"
-msgid "Cannot set 'term' to empty string"
-msgstr "²»ÄÜÉ趨 'term' Ϊ¿Õ×Ö·û´®"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: ÔÚͼÐνçÃæÖв»ÄܸıäÖÕ¶Ë"
-msgid "Cannot change term in GUI"
-msgstr "ÔÚͼÐͽçÃæÖв»ÄÜÇл»ÖÕ¶Ë"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: ÇëÓà \":gui\" Æô¶¯Í¼ÐνçÃæ"
-msgid "Use \":gui\" to start the GUI"
-msgstr "ÊäÈë \":gui\" À´Æô¶¯Í¼ÐνçÃæ"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' ºÍ 'patchmode' ÏàµÈ"
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' ¸ú 'patchmode' ÊÇÒ»ÑùµÄ"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: ÔÚ GTK+ 2 ͼÐνçÃæÖв»Äܸü¸Ä"
-msgid "Zero length string"
-msgstr "Á㳤¶È×Ö·û´®"
+msgid "E524: Missing colon"
+msgstr "E524: ȱÉÙðºÅ"
+
+msgid "E525: Zero length string"
+msgstr "E525: ×Ö·û´®³¤¶ÈΪÁã"
#, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> ºóȱÉÙÊý×Ö"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> ºóÃæȱÉÙÊý×Ö"
-msgid "Missing comma"
-msgstr "ȱÉÙ¶ººÅ"
+msgid "E527: Missing comma"
+msgstr "E527: ȱÉÙ¶ººÅ"
-msgid "Must specify a ' value"
-msgstr "±ØÐèÖ¸¶¨Ò»¸ö ' Öµ"
+msgid "E528: Must specify a ' value"
+msgstr "E528: ±ØÐëÖ¸¶¨Ò»¸ö ' Öµ"
-msgid "contains unprintable character"
-msgstr "°üº¬²»ÄÜÏÔʾµÄ×Ö·û"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: °üº¬²»¿ÉÏÔʾ×Ö·û»ò¿í×Ö·û"
-msgid "Invalid font(s)"
-msgstr "²»ÕýÈ·µÄ×ÖÌå"
+msgid "E596: Invalid font(s)"
+msgstr "E596: ÎÞЧµÄ×ÖÌå"
-msgid "can't select fontset"
-msgstr "²»ÄÜʹÓÃ×ÖÌ弯(Fontset)"
+msgid "E597: can't select fontset"
+msgstr "E597: ÎÞ·¨Ñ¡Ôñ Fontset"
-msgid "Invalid fontset"
-msgstr "²»ÕýÈ·µÄ×ÖÌ弯(Fontset)"
+msgid "E598: Invalid fontset"
+msgstr "E598: ÎÞЧµÄ Fontset"
-msgid "can't select wide font"
-msgstr "²»ÄÜʹÓÃÉ趨µÄ¿í×ÖÌå(Widefont)"
+msgid "E533: can't select wide font"
+msgstr "E533: ÎÞ·¨Ñ¡Ôñ¿í×ÖÌå"
-msgid "Invalid wide font"
-msgstr "²»ÕýÈ·µÄ¿í×ÖÌå(Widefont)"
+msgid "E534: Invalid wide font"
+msgstr "E534: ÎÞЧµÄ¿í×ÖÌå"
#, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> ºóÓв»ÕýÈ·µÄ×Ö·û"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> ºóÃæÓÐÎÞЧµÄ×Ö·û"
-msgid "comma required"
-msgstr "ÐèÒª¶ººÅ"
+msgid "E536: comma required"
+msgstr "E536: ÐèÒª¶ººÅ"
#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' ±ØÐèÊÇ¿Õ°×»ò°üº¬ %s"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' ±ØÐëΪ¿Õ»ò°üº¬ %s"
-msgid "No mouse support"
-msgstr "²»Ö§³ÖÊó±ê"
+msgid "E538: No mouse support"
+msgstr "E538: ²»Ö§³ÖÊó±ê"
-msgid "Unclosed expression sequence"
-msgstr "ûÓнáÊøµÄ±í´ïʽ: "
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: ûÓнáÊøµÄ±í´ïʽÐòÁÐ"
-msgid "too many items"
-msgstr "Ì«¶à¶ÔÏó"
+msgid "E541: too many items"
+msgstr "E541: ÏîÄ¿¹ý¶à"
-msgid "unbalanced groups"
-msgstr "²»¶Ô³ÆµÄ×é"
+msgid "E542: unbalanced groups"
+msgstr "E542: ´íÂÒµÄ×é"
-msgid "A preview window already exists"
-msgstr "Ô¤ÀÀ´°¿ÚÒѾ´æÔÚÁË"
+msgid "E590: A preview window already exists"
+msgstr "E590: Ô¤ÀÀ´°¿ÚÒÑ´æÔÚ"
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' ²»ÄÜ±È 'winminheight' ¸üÉÙ"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' ²»ÄÜ±È 'winminwidth' ¸üÉÙ"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic ÐèÒª UTF-8£¬ÇëÖ´ÐÐ ':set encoding=utf-8'"
#, c-format
-msgid "Need at least %d lines"
-msgstr "ÖÁÉÙÐèÒª %d ÐÐ"
+msgid "E593: Need at least %d lines"
+msgstr "E593: ÖÁÉÙÐèÒª %d ÐÐ"
#, c-format
-msgid "Need at least %d columns"
-msgstr "ÖÁÉÙÐèÒª %d ÁÐ"
+msgid "E594: Need at least %d columns"
+msgstr "E594: ÖÁÉÙÐèÒª %d ÁÐ"
#, c-format
msgid "E355: Unknown option: %s"
-msgstr "E355: ²»ÕýÈ·µÄÑ¡Ïî: %s"
+msgstr "E355: δ֪µÄÑ¡Ïî: %s"
msgid ""
"\n"
@@ -3359,14 +4102,14 @@
"--- Global option values ---"
msgstr ""
"\n"
-"--- È«¾Ö Ñ¡ÏîÖµ ---"
+"--- È«¾ÖÑ¡ÏîÖµ ---"
msgid ""
"\n"
"--- Local option values ---"
msgstr ""
"\n"
-"--- ±¾µØ Ñ¡ÏîÖµ ---"
+"--- ¾Ö²¿Ñ¡ÏîÖµ ---"
msgid ""
"\n"
@@ -3412,9 +4155,6 @@
msgid "cannot change console mode ?!\n"
msgstr "²»ÄÜÇл»Ö÷¿Ø̨(console)ģʽ !?\n"
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ²»Ö§³ÖÉ趨ÆÁĻģʽ"
-
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: ²»ÊÇÖ÷¿Ø̨(console)??\n"
@@ -3440,13 +4180,12 @@
#~ msgid "...(truncated)"
#~ msgstr ""
+#~ msgid "Message"
+#~ msgstr ""
+
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' ²»ÊÇ 80, ²»ÄÜÖ´ÐÐÍⲿÃüÁî"
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: µ÷Óú¯Êý¿â \"%s\"() ʧ°Ü"
-
msgid "E237: Printer selection failed"
msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
@@ -3455,12 +4194,13 @@
msgstr "´Ó %s µ½ %s"
#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: δ֪µÄ´òÓ¡»ú×ÖÌå: %s"
+
+#, c-format
msgid "E238: Print error: %s"
msgstr "E238: ´òÓ¡´íÎó: %s"
-msgid "Unknown"
-msgstr "δ֪"
-
#, c-format
msgid "Printing '%s'"
msgstr "ÒÑ´òÓ¡: '%s'"
@@ -3483,6 +4223,7 @@
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: CVim: À¹½Øµ½ÐźÅ(signal) %s\n"
+#, c-format
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: À¹½Øµ½ÖÂÃüµÄÐźÅ(deadly signale)\n"
@@ -3545,9 +4286,31 @@
"\n"
"ÃüÁîÒѽáÊø\n"
+#, fuzzy
+#~ msgid "XSMP lost ICE connection"
+#~ msgstr "ÏÔʾÁ¬½Ó"
+
+#, c-format
+#~ msgid "dlerror = \"%s\""
+#~ msgstr ""
+
msgid "Opening the X display failed"
msgstr "´ò¿ª X Window ʧ°Ü"
+#~ msgid "XSMP handling save-yourself request"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "XSMP opening connection"
+#~ msgstr "ûÓÐ cscope Á¬½Ó"
+
+#~ msgid "XSMP ICE connection watch failed"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "XSMP SmcOpenConnection failed: %s"
+#~ msgstr ""
+
msgid "At line"
msgstr "ÔÚÐкŠ"
@@ -3587,7 +4350,7 @@
msgstr ""
"ÔÚÄãµÄ $PATH ÖÐÕÒ²»µ½ VIMRUN.EXE.\n"
"ÍⲿÃüÁîÖ´ÐÐÍê±Ïºó½«²»»áÔÝÍ£.\n"
-"½øÒ»²½ËµÃ÷ÇëÖ´ÐÐ :help win32-vimrun "
+"½øÒ»²½ËµÃ÷Çë¼û :help win32-vimrun"
msgid "Vim Warning"
msgstr "Vim ¾¯¸æ"
@@ -3621,8 +4384,8 @@
msgid "E379: Missing or empty directory name"
msgstr "E379: ÕÒ²»µ½Ä¿Â¼Ãû³Æ»òÊÇ¿ÕµÄĿ¼Ãû³Æ"
-msgid "No more items"
-msgstr "ûÓÐÆäËü¶ÔÏó"
+msgid "E553: No more items"
+msgstr "E553: ûÓиü¶àµÄÏî"
#, c-format
msgid "(%d of %d)%s%s: "
@@ -3632,50 +4395,122 @@
msgstr " (ÐÐÒÑɾ³ý)"
msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix ¶ÑÕ»½áβ"
+msgstr "E380: Quickfix ¶ÑÕ»µ×¶Ë"
msgid "E381: At top of quickfix stack"
msgstr "E381: Quickfix ¶ÑÕ»¶¥¶Ë"
#, c-format
msgid "error list %d of %d; %d errors"
-msgstr "´íÎóÁбí %d/%d; ¹²ÓÐ %d Ïî´íÎó"
+msgstr "´íÎóÁбí %d / %d£»¹² %d ¸ö´íÎó"
msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: ²»ÄÜдÈ룬'buftype' Ñ¡ÏîÒÑÉ趨"
+msgstr "E382: ÎÞ·¨Ð´È룬ÒÑÉ趨ѡÏî 'buftype'"
+
+#~ msgid "E683: File name missing or invalid pattern"
+#~ msgstr ""
+
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "ÎÞ·¨´ò¿ªÎļþ \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: »º³åÇøδ¼ÓÔØ"
+
+msgid "E777: String or List expected"
+msgstr "E777: ´Ë´¦ÐèÒª String »òÕß List"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: %s%%[] ÖÐÓÐÎÞЧµÄÏî"
msgid "E339: Pattern too long"
-msgstr "E339: Ãû×ÖÌ«³¤"
+msgstr "E339: ģʽ̫³¤"
+
+msgid "E50: Too many \\z("
+msgstr "E50: Ì«¶à \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Ì«¶à %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: ²»Æ¥ÅäµÄ \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: ²»Æ¥ÅäµÄ %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: ²»Æ¥ÅäµÄ %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: ²»Æ¥ÅäµÄ %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ ºóÃæÓÐÎÞЧµÄ×Ö·û"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Ì«¶à¸´Ô %s{...}s"
#, c-format
msgid "E61: Nested %s*"
-msgstr "E61: ³²×´ %s*"
+msgstr "E61: ǶÌ×µÄ %s*"
#, c-format
msgid "E62: Nested %s%c"
-msgstr "E62: ³²×´ %s%c"
+msgstr "E62: ǶÌ×µÄ %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: ²»ÕýÈ·µØʹÓà \\_"
#, c-format
msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c ûÓнӶ«Î÷"
+msgstr "E64: %s%c Ç°ÃæÎÞÄÚÈÝ"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: ÎÞЧµÄ»ØÒý"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: ´Ë´¦²»ÔÊÐí \\z("
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: ´Ë´¦²»ÔÊÐí \\z1 µÈ"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: \\z ºóÃæÓÐÎÞЧµÄ×Ö·û"
#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "Óï·¨´íÎó: %s{...}"
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ ºóȱÉÙ ]"
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: ²»ÄÜÖ´ÐÐ; regular expression Ì«¸´ÔÓ?"
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: ¿ÕµÄ %s%%[]"
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression Ôì³É¶ÑÕ»ÓùâµÄ´íÎó"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] ºóÃæÓÐÎÞЧµÄ×Ö·û"
+
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: %s%% ºóÃæÓÐÎÞЧµÄ×Ö·û"
+
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ºóȱÉÙ ]"
+
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} ÖÐÓï·¨´íÎó"
msgid "External submatches:\n"
msgstr "Íⲿ·ûºÏ:\n"
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--ÒÑ fold %3ld ÐÐ"
-
msgid " VREPLACE"
msgstr " V-Ìæ»»"
@@ -3683,7 +4518,7 @@
msgstr " Ìæ»»"
msgid " REVERSE"
-msgstr " ·´×ª"
+msgstr " ·´Ïò"
msgid " INSERT"
msgstr " ²åÈë"
@@ -3695,10 +4530,13 @@
msgstr " (Ìæ»»)"
msgid " (vreplace)"
-msgstr " (v-Ìæ»»)"
+msgstr " (V-Ìæ»»)"
msgid " Hebrew"
-msgstr " Ï£²®À³"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
msgid " (lang)"
msgstr " (ÓïÑÔ)"
@@ -3706,30 +4544,30 @@
msgid " (paste)"
msgstr " (Õ³Ìû)"
-msgid " SELECT"
-msgstr " ѡȡ"
-
msgid " VISUAL"
msgstr " ¿ÉÊÓ"
-msgid " BLOCK"
-msgstr " ¿é"
+msgid " VISUAL LINE"
+msgstr " ¿ÉÊÓ ÐÐ"
-msgid " LINE"
-msgstr " ÐÐ"
+msgid " VISUAL BLOCK"
+msgstr " ¿ÉÊÓ ¿é"
+
+msgid " SELECT"
+msgstr " Ñ¡Ôñ"
+
+msgid " SELECT LINE"
+msgstr " Ñ¡Ôñ ÐÐ"
+
+msgid " SELECT BLOCK"
+msgstr " Ñ¡Ôñ ¿é"
msgid "recording"
msgstr "¼Ç¼ÖÐ"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "ÒѲéÕÒµ½Îļþ¿ªÍ·£»ÔÙ´Ó½áβ¼ÌÐø²éÕÒ"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "ÒѲéÕÒµ½Îļþ½áβ£»ÔÙ´Ó¿ªÍ·¼ÌÐø²éÕÒ"
-
#, c-format
msgid "E383: Invalid search string: %s"
-msgstr "E383: ´íÎóµÄ²éÕÒ×Ö·û´®: %s"
+msgstr "E383: ÎÞЧµÄ²éÕÒ×Ö·û´®: %s"
#, c-format
msgid "E384: search hit TOP without match for: %s"
@@ -3765,6 +4603,10 @@
msgid "Scanning included file: %s"
msgstr "²éÕÒ°üº¬Îļþ: %s"
+#, fuzzy, c-format
+#~ msgid "Searching included file %s"
+#~ msgstr "²éÕÒ°üº¬Îļþ: %s"
+
msgid "E387: Match is on current line"
msgstr "E387: µ±Ç°ÐÐÆ¥Åä"
@@ -3780,9 +4622,364 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: ÕÒ²»µ½ pattern"
+#, fuzzy
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E297: ½»»»ÎļþдÈë´íÎó"
+
+#, fuzzy
+#~ msgid "E758: Truncated spell file"
+#~ msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
+
+#, fuzzy, c-format
+#~ msgid "Trailing text in %s line %d: %s"
+#~ msgstr "\"%s%s\" Öжϵã: µÚ %ld ÐÐ"
+
+#, c-format
+#~ msgid "Affix name too long in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
+#~ msgstr "E431: Tag Îļþ \"%s\" ¸ñʽ´íÎó"
+
+#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
+#~ msgstr ""
+
+#~ msgid "Compressing word tree..."
+#~ msgstr ""
+
+#~ msgid "E756: Spell checking is not enabled"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading spell file \"%s\""
+#~ msgstr "ʹÓý»»»Îļþ \"%s\""
+
+#, fuzzy
+#~ msgid "E757: This does not look like a spell file"
+#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»Îļþ"
+
+#, fuzzy
+#~ msgid "E771: Old spell file, needs to be updated"
+#~ msgstr "E173: »¹ÓÐ %ld ¸öÎļþδ±à¼"
+
+#~ msgid "E772: Spell file is for newer version of Vim"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E770: Unsupported section in spell file"
+#~ msgstr "E297: ½»»»ÎļþдÈë´íÎó"
+
+#, fuzzy, c-format
+#~ msgid "Warning: region %s not supported"
+#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+
+#, fuzzy, c-format
+#~ msgid "Reading affix file %s ..."
+#~ msgstr "²éÕÒ tag Îļþ \"%s\""
+
+#, c-format
+#~ msgid "Conversion failure for word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Conversion in %s not supported: from %s to %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Conversion in %s not supported"
+#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+
+#, fuzzy, c-format
+#~ msgid "Invalid value for FLAG in %s line %d: %s"
+#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+
+#, c-format
+#~ msgid "FLAG after using flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate affix in %s line %d: %s"
+#~ msgstr "E154: ±êÇ©(tag) \"%s\" ÔÚÎļþ %s ÀïÖظ´³öÏÖ¶à´Î"
+
+#, c-format
+#~ msgid ""
+#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+#~ "line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected Y or N in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Broken condition in %s line %d: %s"
+#~ msgstr "\"%s%s\" Öжϵã: µÚ %ld ÐÐ"
+
+#, c-format
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected REP(SAL) count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected MAP count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate character in MAP in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Missing FOL/LOW/UPP line in %s"
+#~ msgstr ""
+
+#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Too many postponed prefixes"
+#~ msgstr "Ì«¶à±à¼²ÎÊý"
+
+#, fuzzy
+#~ msgid "Too many compound flags"
+#~ msgstr "Ì«¶à±à¼²ÎÊý"
+
+#~ msgid "Too many posponed prefixes and/or compound flags"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Missing SOFO%s line in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Both SAL and SOFO lines in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Flag is not a number in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Illegal flag in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%s value differs from what is used in another .aff file"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading dictionary file %s ..."
+#~ msgstr "ɨÃè×Öµä: %s"
+
+#, c-format
+#~ msgid "E760: No word count in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "line %6d, word %6d - %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate word in %s line %d: %s"
+#~ msgstr "ÿһÐж¼ÕÒ²»µ½Ä£Ê½: %s"
+
+#, c-format
+#~ msgid "First duplicate word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%d duplicate word(s) in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading word file %s ..."
+#~ msgstr "´Ó±ê×¼ÊäÈë¶Á..."
+
+#, c-format
+#~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "/encoding= line after word ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Too many regions in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "/ line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Invalid region nr in %s line %d: %s"
+#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+
+#, c-format
+#~ msgid "Unrecognized flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d words with non-ASCII characters"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+#~ msgstr ""
+
+#~ msgid "Reading back spell file..."
+#~ msgstr ""
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+#~ msgid "Performing soundfolding..."
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Number of words after soundfolding: %ld"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Total number of words: %d"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing suggestion file %s ..."
+#~ msgstr "дÈë viminfo Îļþ \"%s\" ÖÐ"
+
+#, c-format
+#~ msgid "Estimated runtime memory use: %d bytes"
+#~ msgstr ""
+
+#~ msgid "E751: Output file name must not have region name"
+#~ msgstr ""
+
+#~ msgid "E754: Only up to 8 regions supported"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E755: Invalid region in %s"
+#~ msgstr "E15: ²»ÕýÈ·µÄ±í´ïʽ: %s"
+
+#~ msgid "Warning: both compounding and NOBREAK specified"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing spell file %s ..."
+#~ msgstr "дÈë viminfo Îļþ \"%s\" ÖÐ"
+
+#, fuzzy
+#~ msgid "Done!"
+#~ msgstr "ÏòÏÂ"
+
+#, c-format
+#~ msgid "E765: 'spellfile' does not have %ld entries"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word removed from %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word added to %s"
+#~ msgstr ""
+
+#~ msgid "E763: Word characters differ between spell files"
+#~ msgstr ""
+
+#~ msgid "Sorry, no suggestions"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Sorry, only %ld suggestions"
+#~ msgstr ""
+
+#. avoid more prompt
+#, fuzzy, c-format
+#~ msgid "Change \"%.*s\" to:"
+#~ msgstr "½«¸Ä±ä±£´æµ½ \"%.*s\"?"
+
+#, c-format
+#~ msgid " < \"%.*s\""
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E752: No previous spell replacement"
+#~ msgstr "E35: ûÓÐÇ°Ò»¸ö²éÕÒÃüÁî"
+
+#, fuzzy, c-format
+#~ msgid "E753: Not found: %s"
+#~ msgstr "E334: [²Ëµ¥] ÕÒ²»µ½ %s"
+
+#, fuzzy, c-format
+#~ msgid "E778: This does not look like a .sug file: %s"
+#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»Îļþ"
+
+#, c-format
+#~ msgid "E779: Old .sug file, needs to be updated: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E780: .sug file is for newer version of Vim: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E781: .sug file doesn't match .spl file: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E782: error while reading .sug file: %s"
+#~ msgstr "E47: ¶ÁÈ¡´íÎóÎļþʧ°Ü"
+
+#. This should have been checked when generating the .spl
+#. * file.
+#~ msgid "E783: duplicate char in MAP entry"
+#~ msgstr ""
+
#, c-format
msgid "E390: Illegal argument: %s"
-msgstr "E390: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E390: ÎÞЧµÄ²ÎÊý: %s"
#, c-format
msgid "E391: No such syntax cluster: %s"
@@ -3834,12 +5031,13 @@
msgid "maximal "
msgstr "×î´ó"
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "Æ¥Åä %d"
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: ÕÒ²»µ½ %s µÄ region item"
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "ÉÙÓÚÒ»ÐÐ"
msgid "E395: contains argument not accepted here"
msgstr "E395: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
@@ -3847,12 +5045,23 @@
msgid "E396: containedin argument not accepted here"
msgstr "E396: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
+msgid "E393: group[t]here not accepted here"
+msgstr "E393: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
+
+#, c-format
+msgid "E394: Didn't find region item for %s"
+msgstr "E394: ÕÒ²»µ½ %s µÄ region item"
+
msgid "E397: Filename required"
msgstr "E397: ÐèÒªÎļþÃû³Æ"
#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ȱÉÙ ']': %s"
+
+#, c-format
msgid "E398: Missing '=': %s"
-msgstr "E398: ȱÉÙ \"=\": %s"
+msgstr "E398: ȱÉÙ '=': %s"
#, c-format
msgid "E399: Not enough arguments: syntax region %s"
@@ -3874,7 +5083,7 @@
#, c-format
msgid "E404: Illegal arguments: %s"
-msgstr "E404: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E404: ÎÞЧµÄ²ÎÊý: %s"
#, c-format
msgid "E405: Missing equal sign: %s"
@@ -3882,7 +5091,7 @@
#, c-format
msgid "E406: Empty argument: %s"
-msgstr "E406: ¿Õ²ÎÊý: %s"
+msgstr "E406: ¿ÕµÄ²ÎÊý: %s"
#, c-format
msgid "E407: %s not allowed here"
@@ -3900,6 +5109,9 @@
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: ²»ÕýÈ·µÄ :syntax ×ÓÃüÁî: %s"
+#~ msgid "E679: recursive loop loading syncolor.vim"
+#~ msgstr ""
+
#, c-format
msgid "E411: highlight group not found: %s"
msgstr "E411: ÕÒ²»µ½ highlight group: %s"
@@ -3947,23 +5159,30 @@
#, c-format
msgid "E423: Illegal argument: %s"
-msgstr "E423: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E423: ÎÞЧµÄ²ÎÊý: %s"
msgid "E424: Too many different highlighting attributes in use"
msgstr "E424: ʹÓÃÁËÌ«¶à²»Í¬µÄ¸ßÁÁ¶ÈÊôÐÔ"
-msgid "at bottom of tag stack"
-msgstr "±êÇ©(tag)¶ÑÕ»½áβ"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
-msgid "at top of tag stack"
-msgstr "±êÇ©(tag)¶ÑÕ»¿ªÍ·"
+#, fuzzy
+#~ msgid "W18: Invalid character in group name"
+#~ msgstr "E182: ÃüÁîÃû³Æ²»ÕýÈ·"
+
+msgid "E555: at bottom of tag stack"
+msgstr "E555: ÒÑÔÚ tag ¶ÑÕ»µ×²¿"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: ÒÑÔÚ tag ¶ÑÕ»¶¥²¿"
msgid "E425: Cannot go before first matching tag"
-msgstr "E425: ÒѾÔÚ×îÇ°ÃæµÄ±êÇ©(tag)ÁË"
+msgstr "E425: Òѵ½µÚÒ»¸öÆ¥ÅäµÄ tag"
#, c-format
msgid "E426: tag not found: %s"
-msgstr "E426: ÕÒ²»µ½±êÇ©(tag): %s"
+msgstr "E426: ÕÒ²»µ½ tag: %s"
msgid " # pri kind tag"
msgstr " # pri kind tag"
@@ -3971,18 +5190,11 @@
msgid "file\n"
msgstr "Îļþ\n"
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "ÊäÈë nr »òÑ¡Ôñ (<CR> Í˳ö): "
-
msgid "E427: There is only one matching tag"
-msgstr "E427: Ö»ÓдËÏî·ûºÏ"
+msgstr "E427: Ö»ÓÐÒ»¸öÆ¥ÅäµÄ tag"
msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ¼º¾ÔÚ×îºóÒ»¸ö·ûºÏµÄ±êÇ©(tag)ÁË"
+msgstr "E428: ¼ºµ½×îºóÒ»¸öÆ¥ÅäµÄ tag"
#, c-format
msgid "File \"%s\" does not exist"
@@ -3991,13 +5203,13 @@
#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
-msgstr "ÕÒµ½ tag: %d/%d%s"
+msgstr "ÕÒµ½ tag: %d / %d%s"
msgid " or more"
msgstr " »ò¸ü¶à"
msgid " Using tag with different case!"
-msgstr " ÒÔ²»Í¬´óСдÀ´Ê¹Óà tag!"
+msgstr " ÒÔ²»Í¬´óСдÀ´Ê¹Óà tag£¡"
#, c-format
msgid "E429: File \"%s\" does not exist"
@@ -4011,15 +5223,9 @@
"\n"
" # µ½ tag ´Ó ÐÐ ÔÚ Îļþ/Îı¾"
-msgid "Linear tag search"
-msgstr "ÏßÐÔ²éÕÒ±êÇ© (Tags)"
-
-msgid "Binary tag search"
-msgstr "¶þ½øÖƲéÕÒ(Binary search) ±êÇ©(Tags)"
-
#, c-format
msgid "Searching tags file %s"
-msgstr "²éÕÒ tag Îļþ \"%s\""
+msgstr "²éÕÒ tag Îļþ %s"
#, c-format
msgid "E430: Tag file path truncated for %s\n"
@@ -4031,7 +5237,7 @@
#, c-format
msgid "Before byte %ld"
-msgstr "ÔÚ %ld ×Ö½Ú֮ǰ"
+msgstr "ÔÚµÚ %ld ×Ö½Ú֮ǰ"
#, c-format
msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@
msgstr "E433: ûÓÐ tag Îļþ"
msgid "E434: Can't find tag pattern"
-msgstr "E434: ÕÒ²»µ½ tag"
+msgstr "E434: ÕÒ²»µ½ tag ģʽ"
msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: ÕÒ²»µ½ tag, ÊÔ×ŲÂ!"
+msgstr "E435: ÕÒ²»µ½ tag£¬ÊÔ×Ų£¡"
msgid "' not known. Available builtin terminals are:"
-msgstr "' ²»ÄܼÓÔØ¡£¿ÉÓõÄÄÚ½¨ÖÕ¶ËÐÎʽÓÐ:"
+msgstr "' δ֪¡£¿ÉÓõÄÄÚ½¨ÖÕ¶ËÓÐ:"
msgid "defaulting to '"
-msgstr "Ô¤Éè: '"
+msgstr "ĬÈÏֵΪ: '"
-msgid "Cannot open termcap file"
-msgstr "²»ÄÜ´ò¿ª termcap Îļþ"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: ÎÞ·¨´ò¿ª termcap Îļþ"
-msgid "Terminal entry not found in terminfo"
-msgstr "ÔÚterminfoÖÐδÕÒµ½ÖÕ¶ËÏî"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: ÔÚ terminfo ÖÐÕÒ²»µ½ÖÕ¶ËÏî"
-msgid "Terminal entry not found in termcap"
-msgstr "ÔÚtermcapÖÐδÕÒµ½ÖÕ¶ËÏî"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: ÔÚ termcap ÖÐÕÒ²»µ½ÖÕ¶ËÏî"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap ûÓÐ \"%s\" Ïî"
+msgstr "E436: termcap ÖÐûÓÐ \"%s\" Ïî"
msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: ÖÕ¶ËÐèÒª \"cm\" µÄÄÜÁ¦"
+msgstr "E437: ÖÕ¶ËÐèÒªÄÜÁ¦ \"cm\""
#. Highlight title
msgid ""
@@ -4085,23 +5291,60 @@
#. must display the prompt
msgid "No undo possible; continue anyway"
-msgstr "²»ÄÜ»¹Ô£»Çë¼ÌÐø"
+msgstr "ÎÞ·¨³·Ïú£»Çë¼ÌÐø"
+
+msgid "Already at oldest change"
+msgstr "ÒÑλÓÚ×î¾ÉµÄ¸Ä±ä"
+
+msgid "Already at newest change"
+msgstr "ÒÑλÓÚ×îеĸıä"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "ÕÒ²»µ½³·ÏúºÅ %ld"
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: ÐкŴíÎó"
-msgid "1 change"
-msgstr "Ò»Ïî¸Ä±ä"
+msgid "more line"
+msgstr "Ðб»¼ÓÈë"
+
+msgid "more lines"
+msgstr "Ðб»¼ÓÈë"
+
+msgid "line less"
+msgstr "Ðб»È¥µô"
+
+msgid "fewer lines"
+msgstr "Ðб»È¥µô"
+
+msgid "change"
+msgstr "Ðз¢Éú¸Ä±ä"
+
+msgid "changes"
+msgstr "Ðз¢Éú¸Ä±ä"
#, c-format
-msgid "%ld changes"
-msgstr "%ld Ïî¸Ä±ä"
+msgid "%ld %s; %s #%ld %s"
+msgstr "%ld %s£»%s #%ld %s"
+
+msgid "before"
+msgstr "before"
+
+msgid "after"
+msgstr "after"
+
+msgid "Nothing to undo"
+msgstr "Î޿ɳ·Ïú"
+
+msgid "number changes time"
+msgstr " ±àºÅ ¸Ä±ä ʱ¼ä"
msgid "E439: undo list corrupt"
msgstr "E439: ³·ÏúÁбíËð»µ"
msgid "E440: undo line missing"
-msgstr "E440: ÕÒ²»µ½Òª³·Ïú²Ù×÷µÄÐÐ"
+msgstr "E440: ÕÒ²»µ½Òª³·ÏúµÄÐÐ"
#. Only MS VC 4.1 and earlier can do Win32s
msgid ""
@@ -4109,34 +5352,34 @@
"MS-Windows 16/32 bit GUI version"
msgstr ""
"\n"
-"MS-Windows 16/32λ ͼÐͽçÃæ°æ±¾"
+"MS-Windows 16/32 λͼÐνçÃæ°æ±¾"
msgid ""
"\n"
"MS-Windows 32 bit GUI version"
msgstr ""
"\n"
-"MS-Windows 32 Bit ͼÐͽçÃæ°æ±¾"
+"MS-Windows 32 λͼÐνçÃæ°æ±¾"
msgid " in Win32s mode"
-msgstr "Win32s ģʽ"
+msgstr " Win32s ģʽ"
msgid " with OLE support"
-msgstr "Ö§³Ö OLE"
+msgstr " ´ø OLE Ö§³Ö"
msgid ""
"\n"
"MS-Windows 32 bit console version"
msgstr ""
"\n"
-"MS-Windows 32λ ×Ö·û½çÃæ°æ±¾"
+"MS-Windows 32 λ¿ØÖÆ̨°æ±¾"
msgid ""
"\n"
"MS-Windows 16 bit version"
msgstr ""
"\n"
-"MS-Windows 32λ ×Ö·û½çÃæ°æ±¾"
+"MS-Windows 16 λ¿ØÖÆ̨°æ±¾"
msgid ""
"\n"
@@ -4185,7 +5428,10 @@
"Included patches: "
msgstr ""
"\n"
-"¼ÓÈë²¹¶¡: "
+"°üº¬²¹¶¡: "
+
+msgid "Modified by "
+msgstr "ÐÞ¸ÄÕß "
msgid ""
"\n"
@@ -4195,14 +5441,14 @@
"±àÒë"
msgid "by "
-msgstr "Õß:"
+msgstr "Õß "
msgid ""
"\n"
"Huge version "
msgstr ""
"\n"
-"³¬Ç¿°æ±¾ "
+"¾ÞÐÍ°æ±¾ "
msgid ""
"\n"
@@ -4216,96 +5462,102 @@
"Normal version "
msgstr ""
"\n"
-"Ò»°ã°æ±¾ "
+"Õý³£°æ±¾ "
msgid ""
"\n"
"Small version "
msgstr ""
"\n"
-"¼òÒ×°æ±¾ "
+"СÐÍ°æ±¾ "
msgid ""
"\n"
"Tiny version "
msgstr ""
"\n"
-"¾«¼ò°æ±¾ "
+"΢ÐÍ°æ±¾ "
msgid "without GUI."
-msgstr "²»Ê¹ÓÃͼÐͽçÃæ¡£"
+msgstr "ÎÞͼÐνçÃæ¡£"
+
+msgid "with GTK2-GNOME GUI."
+msgstr "´ø GTK2-GNOME ͼÐνçÃæ¡£"
msgid "with GTK-GNOME GUI."
-msgstr "ʹÓà GTK-GNOME ͼÐͽçÃæ¡£"
+msgstr "´ø GTK-GNOME ͼÐνçÃæ¡£"
+
+msgid "with GTK2 GUI."
+msgstr "´ø GTK2 ͼÐνçÃæ¡£"
msgid "with GTK GUI."
-msgstr "ʹÓà GTK ͼÐͽçÃæ¡£"
+msgstr "´ø GTK ͼÐνçÃæ¡£"
msgid "with X11-Motif GUI."
-msgstr "ʹÓà X11-Motif ͼÐͽçÃæ¡£"
+msgstr "´ø X11-Motif ͼÐνçÃæ¡£"
+
+msgid "with X11-neXtaw GUI."
+msgstr "´ø X11-neXtaw ͼÐνçÃæ¡£"
msgid "with X11-Athena GUI."
-msgstr "ʹÓà X11-Athena ͼÐͽçÃæ¡£"
-
-msgid "with BeOS GUI."
-msgstr "ʹÓà BeOS ͼÐͽçÃæ¡£"
+msgstr "´ø X11-Athena ͼÐνçÃæ¡£"
msgid "with Photon GUI."
-msgstr "ʹÓÃPhotonͼÐͽçÃæ¡£"
+msgstr "´ø Photon ͼÐνçÃæ¡£"
msgid "with GUI."
-msgstr "ʹÓÃͼÐͽçÃæ¡£"
+msgstr "´øͼÐνçÃæ¡£"
msgid "with Carbon GUI."
-msgstr "ʹÓà Carbon ͼÐͽçÃæ¡£"
+msgstr "´ø Carbon ͼÐνçÃæ¡£"
msgid "with Cocoa GUI."
-msgstr "ʹÓà Cocoa ͼÐͽçÃæ¡£"
+msgstr "´ø Cocoa ͼÐνçÃæ¡£"
msgid "with (classic) GUI."
-msgstr "ʹÓà (´«Í³) ͼÐͽçÃæ¡£"
+msgstr "´ø(´«Í³)ͼÐνçÃæ¡£"
msgid " Features included (+) or not (-):\n"
-msgstr " Ä¿Ç°¿ÉʹÓÃ(+)Óë²»¿ÉʹÓÃ(-)µÄÄ£¿éÁбí:\n"
+msgstr " ¿ÉʹÓÃ(+)Óë²»¿ÉʹÓÃ(-)µÄ¹¦ÄÜ:\n"
msgid " system vimrc file: \""
-msgstr " ϵͳ vimrc ÅäÖÃÎļþ: \""
+msgstr " ϵͳ vimrc Îļþ: \""
msgid " user vimrc file: \""
-msgstr " Óû§µÄ vimrc ÅäÖÃÎļþ: \""
+msgstr " Óû§ vimrc Îļþ: \""
msgid " 2nd user vimrc file: \""
-msgstr " µÚ¶þ×éÓû§ vimrc Îļþ: \""
+msgstr " µÚ¶þÓû§ vimrc Îļþ: \""
msgid " 3rd user vimrc file: \""
-msgstr " µÚÈý×éÓû§ vimrc Îļþ: \""
+msgstr " µÚÈýÓû§ vimrc Îļþ: \""
msgid " user exrc file: \""
-msgstr " Óû§µÄ exrc ÅäÖÃÎļþ: \""
+msgstr " Óû§ exrc Îļþ: \""
msgid " 2nd user exrc file: \""
-msgstr " µÚ¶þ×éÓû§ exrc Îļþ: \""
+msgstr " µÚ¶þÓû§ exrc Îļþ: \""
msgid " system gvimrc file: \""
-msgstr " ϵͳ gvimrc Îļþ: \""
+msgstr " ϵͳ gvimrc Îļþ: \""
msgid " user gvimrc file: \""
-msgstr " Óû§µÄ gvimrc ÅäÖÃÎļþ: \""
+msgstr " Óû§ gvimrc Îļþ: \""
msgid "2nd user gvimrc file: \""
-msgstr " µÚ¶þ×éÓû§ gvimrc Îļþ: \""
+msgstr "µÚ¶þÓû§ gvimrc Îļþ: \""
msgid "3rd user gvimrc file: \""
-msgstr " µÚÈý×éÓû§ gvimrc Îļþ: \""
+msgstr "µÚÈýÓû§ gvimrc Îļþ: \""
msgid " system menu file: \""
-msgstr " ϵͳ²Ëµ¥ÅäÖÃÎļþ: \""
+msgstr " ϵͳ²Ëµ¥Îļþ: \""
msgid " fall-back for $VIM: \""
-msgstr " $VIM Ô¤ÉèÖµ: \""
+msgstr " $VIM Ô¤ÉèÖµ: \""
msgid " f-b for $VIMRUNTIME: \""
-msgstr " $VIMRUNTIME Ô¤ÉèÖµ: \""
+msgstr " $VIMRUNTIME Ô¤ÉèÖµ: \""
msgid "Compilation: "
msgstr "±àÒ뷽ʽ: "
@@ -4314,7 +5566,7 @@
msgstr "±àÒëÆ÷: "
msgid "Linking: "
-msgstr "Á´½á·½Ê½: "
+msgstr "Á´½Ó·½Ê½: "
msgid " DEBUG BUILD"
msgstr " µ÷ÊÔ°æ±¾"
@@ -4323,49 +5575,84 @@
msgstr "VIM - Vi IMproved"
msgid "version "
-msgstr "°æ±¾ "
+msgstr "°æ±¾ "
msgid "by Bram Moolenaar et al."
-msgstr "ά»¤ÈË: Bram Moolenaar et al."
+msgstr "ά»¤ÈË Bram Moolenaar µÈ"
msgid "Vim is open source and freely distributable"
-msgstr "Vim Ϊ¿É×ÔÓÉ·¢ÐеĿª·ÅÔ´´úÂëÈí¼þ"
+msgstr "Vim ÊÇ¿É×ÔÓÉ·Ö·¢µÄ¿ª·ÅÔ´´úÂëÈí¼þ"
msgid "Help poor children in Uganda!"
-msgstr "°ïÖúÎڸɴïµÄ¿ÉÁ¯¶ùͯ!"
+msgstr "°ïÖúÎڸɴïµÄ¿ÉÁ¯¶ùͯ£¡"
msgid "type :help iccf<Enter> for information "
-msgstr "½øÒ»²½ËµÃ÷ÇëÊäÈë :help iccf<Enter>"
+msgstr "ÊäÈë :help iccf<Enter> ²é¿´ËµÃ÷ "
msgid "type :q<Enter> to exit "
-msgstr "ÒªÍ˳öÇëÊäÈë :q<Enter> "
+msgstr "ÊäÈë :q<Enter> Í˳ö "
msgid "type :help<Enter> or <F1> for on-line help"
-msgstr "ÔÚÏß°ïÖúÇëÊäÈë :help<Enter> "
+msgstr "ÊäÈë :help<Enter> »ò <F1> ²é¿´ÔÚÏß°ïÖú "
-msgid "type :help version6<Enter> for version info"
-msgstr "а汾ÐÅÏ¢ÇëÊäÈë :help version6<Enter>"
+msgid "type :help version7<Enter> for version info"
+msgstr "ÊäÈë :help version7<Enter> ²é¿´°æ±¾ÐÅÏ¢ "
msgid "Running in Vi compatible mode"
-msgstr "Vi ¼æÈÝģʽ"
+msgstr "ÔËÐÐÓÚ Vi ¼æÈÝģʽ"
msgid "type :set nocp<Enter> for Vim defaults"
-msgstr "Èç¹ûÒªÍêÈ«Ä£Ä⴫ͳ Vi ÇëÊäÈë :set nocp<Enter>"
+msgstr "ÊäÈë :set nocp<Enter> »Ö¸´Ä¬È쵀 Vim "
msgid "type :help cp-default<Enter> for info on this"
-msgstr "Èç¹ûÐèÒª¶Ô Vi ¼æÈÝģʽ½øÒ»²½ËµÃ÷ÇëÊäÈë :help cp-default<Enter>"
+msgstr "ÊäÈë :help cp-default<Enter> ²é¿´Ïà¹Ø˵Ã÷ "
+
+msgid "menu Help->Orphans for information "
+msgstr "²Ëµ¥ Help->Orphans ²é¿´ËµÃ÷ "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "ÎÞģʽÔËÐУ¬ÊäÈëÎÄ×Ö¼´²åÈë"
+
+msgid "menu Edit->Global Settings->Toggle Insert Mode "
+msgstr "²Ëµ¥ Edit->Global Settings->Toggle Insert Mode "
+
+#, fuzzy
+#~ msgid " for two modes "
+#~ msgstr " # pid Êý¾Ý¿âÃû³Æ prepend path\n"
+
+#~ msgid "menu Edit->Global Settings->Toggle Vi Compatible"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid " for Vim defaults "
+#~ msgstr " # pid Êý¾Ý¿âÃû³Æ prepend path\n"
+
+msgid "Sponsor Vim development!"
+msgstr "ÔÞÖú Vim µÄ¿ª·¢£¡"
+
+msgid "Become a registered Vim user!"
+msgstr "³ÉΪ Vim µÄ×¢²áÓû§£¡"
+
+msgid "type :help sponsor<Enter> for information "
+msgstr "ÊäÈë :help sponsor<Enter> ²é¿´ËµÃ÷ "
+
+msgid "type :help register<Enter> for information "
+msgstr "ÊäÈë :help register<Enter> ²é¿´ËµÃ÷ "
+
+msgid "menu Help->Sponsor/Register for information "
+msgstr "²Ëµ¥ Help->Sponsor/Register ²é¿´ËµÃ÷ "
msgid "WARNING: Windows 95/98/ME detected"
-msgstr "×¢Òâ: ¼ì²âµ½ Windows 95/98/ME"
+msgstr "¾¯¸æ: ¼ì²âµ½ Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
-msgstr "Èç¹ûÐèÒª¶Ô Windows 95 Ö§³ÖµÄ¸ü¶àÐÅÏ¢ÇëÊäÈë :help windows95<Enter>"
+msgstr "ÊäÈë :help windows95<Enter> ²é¿´Ïà¹Ø˵Ã÷ "
msgid "E441: There is no preview window"
msgstr "E441: ûÓÐÔ¤ÀÀ´°¿Ú"
msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ²»ÄÜͬʱ·Ö¸î´°¿ÚΪ×óÉϺÍÓÒϽÇ"
+msgstr "E442: ²»ÄÜͬʱ½øÐÐ topleft ºÍ botright ·Ö¸î"
msgid "E443: Cannot rotate when another window is split"
msgstr "E443: ÓÐÆäËü·Ö¸î´°¿Úʱ²»ÄÜÐýת"
@@ -4386,261 +5673,472 @@
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: ÔÚ·¾¶ÖÐÕÒ²»µ½Îļþ \"%s\""
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ÎÞ·¨¼ÓÔØ¿â %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "±§Ç¸£¬´ËÃüÁî²»¿ÉÓÃ: ÎÞ·¨¼ÓÔØ Perl ¿â¡£"
+
+#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+#~ msgstr ""
+
msgid "Edit with &multiple Vims"
-msgstr "Óà &multiple Vims ±à¼"
+msgstr "Óöà¸ö Vim ±à¼(&M)"
msgid "Edit with single &Vim"
-msgstr "Óà single &Vim ±à¼"
+msgstr "Óõ¥¸ö Vim ±à¼(&V)"
+
+msgid "Diff with Vim"
+msgstr "Óà Vim ±È½Ï(diff)"
msgid "Edit with &Vim"
-msgstr "Óà &Vim ±à¼"
+msgstr "Óà Vim ±à¼(&V)"
#. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "Óõ±Ç°µÄ Vim ±à¼ - &"
+msgid "Edit with existing Vim - "
+msgstr "Óõ±Ç°µÄ Vim ±à¼ - "
msgid "Edits the selected file(s) with Vim"
-msgstr "Óà Vim ±à¼Ñ¡ÔñµÄÎļþ"
+msgstr "Óà Vim ±à¼Ñ¡ÖеÄÎļþ"
msgid "Error creating process: Check if gvim is in your path!"
-msgstr "´´½¨½ø³Ìʧ°Ü: Çë¼ì²égvimÊÇ·ñÔÚ¿ÉÖ´Ðз¾¶ÖÐ!"
+msgstr "´´½¨½ø³Ìʧ°Ü: Çë¼ì²é gvim ÊÇ·ñÔÚ·¾¶ÖУ¡"
msgid "gvimext.dll error"
-msgstr "gvimext.dll ³ö´í"
+msgstr "gvimext.dll ´íÎó"
msgid "Path length too long!"
-msgstr "·¾¶ÃûÌ«³¤"
+msgstr "·¾¶Ì«³¤£¡"
msgid "--No lines in buffer--"
-msgstr "--»º³åÇøÎÞ×ÊÁÏ--"
+msgstr "--»º³åÇøÎÞÄÚÈÝ--"
#.
#. * The error messages that can be shared are included here.
#. * Excluded are errors that are only used once and debugging messages.
#.
-msgid "Command aborted"
-msgstr "ÃüÁǿÖÆÖжÏ"
+msgid "E470: Command aborted"
+msgstr "E470: ÃüÁî±»ÖÐÖ¹"
-msgid "Argument required"
-msgstr "ÐèÒªÖ¸Áî²ÎÊý"
+msgid "E471: Argument required"
+msgstr "E471: ÐèÒª²ÎÊý"
msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ºóÃæÓ¦¸ÃÓÐ / ? »ò &"
+msgstr "E10: \\ ºóÃæÓ¦¸Ã¸úÓÐ /¡¢? »ò &"
msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ²»ÄÜÔÚÃüÁîÐд°¿ÚÖÐʹÓá£<CR>Ö´ÐУ¬CTRL-C Í˳ö"
+msgstr "E11: ÔÚÃüÁîÐд°¿ÚÖÐÎÞЧ£»<CR> Ö´ÐУ¬CTRL-C Í˳ö"
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc ÀïµÄÖ¸Áî²»ÄÜÖ´ÐÐ"
+msgstr "E12: µ±Ç°Ä¿Â¼ÖÐµÄ exrc/vimrc »ò tag ²éÕÒÖв»ÔÊÐí´ËÃüÁî"
+
+msgid "E171: Missing :endif"
+msgstr "E171: ȱÉÙ :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: ȱÉÙ :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: ȱÉÙ :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: ȱÉÙ :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile ȱÉÙ¶ÔÓ¦µÄ :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ȱÉÙ¶ÔÓ¦µÄ :for"
msgid "E13: File exists (add ! to override)"
-msgstr "E13: ÎļþÒѾ´æÔÚ (¿ÉÓà ! Ç¿ÖÆÌæ»»)"
+msgstr "E13: ÎļþÒÑ´æÔÚ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Command failed"
-msgstr "ÃüÁîÖ´ÐÐʧ°Ü"
+msgid "E472: Command failed"
+msgstr "E472: ÃüÁîÖ´ÐÐʧ°Ü"
-msgid "Internal error"
-msgstr "ÄÚ²¿´íÎó"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: δ֪µÄ Fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: δ֪µÄ×ÖÌå: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: ×ÖÌå \"%s\" ²»Êǵȿí×ÖÌå"
+
+msgid "E473: Internal error"
+msgstr "E473: ÄÚ²¿´íÎó"
msgid "Interrupted"
msgstr "ÒÑÖжÏ"
msgid "E14: Invalid address"
-msgstr "E14: ²»ÕýÈ·µÄµØÖ·"
+msgstr "E14: ÎÞЧµÄµØÖ·"
-msgid "Invalid argument"
-msgstr "²»ÕýÈ·µÄ²ÎÊý"
+msgid "E474: Invalid argument"
+msgstr "E474: ÎÞЧµÄ²ÎÊý"
#, c-format
-msgid "Invalid argument: %s"
-msgstr "²»ÕýÈ·µÄ²ÎÊý: %s"
+msgid "E475: Invalid argument: %s"
+msgstr "E475: ÎÞЧµÄ²ÎÊý: %s"
#, c-format
msgid "E15: Invalid expression: %s"
-msgstr "E15: ²»ÕýÈ·µÄ±í´ïʽ: %s"
+msgstr "E15: ÎÞЧµÄ±í´ïʽ: %s"
msgid "E16: Invalid range"
-msgstr "E16: ²»ÕýÈ·µÄ·¶Î§"
+msgstr "E16: ÎÞЧµÄ·¶Î§"
-msgid "Invalid command"
-msgstr "²»ÕýÈ·µÄÃüÁî"
+msgid "E476: Invalid command"
+msgstr "E476: ÎÞЧµÄÃüÁî"
#, c-format
msgid "E17: \"%s\" is a directory"
msgstr "E17: \"%s\" ÊÇĿ¼"
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: '=' Ç°Ãæ³öÏÖÁË´íÎóµÄ×Ö·û"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: µ÷Óú¯Êý¿â \"%s()\" ʧ°Ü"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: ÎÞ·¨¼ÓÔؿ⺯Êý %s"
msgid "E19: Mark has invalid line number"
-msgstr "E19: ±ê¼ÇµÄÐкŴíÎó"
+msgstr "E19: ±ê¼ÇµÄÐкÅÎÞЧ"
msgid "E20: Mark not set"
msgstr "E20: ûÓÐÉ趨±ê¼Ç"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: ÒòΪ 'modifiable' Ñ¡ÏîÊǹرյģ¬ËùÒÔ²»ÄÜÐÞ¸Ä"
+msgstr "E21: ²»ÄÜÐ޸ģ¬ÒòΪѡÏî 'modifiable' ÊǹصÄ"
msgid "E22: Scripts nested too deep"
-msgstr "E22: µÝ¹éµ÷ÓÃÌ«¶à²ã"
+msgstr "E22: ½Å±¾Ç¶Ì×¹ýÉî"
msgid "E23: No alternate file"
-msgstr "E23: ûÓÐÌæ´úµÄÎļþ"
+msgstr "E23: ûÓн»ÌæÎļþ"
msgid "E24: No such abbreviation"
-msgstr "E24: ûÓÐÕâ¸ö abbreviation ¶ÔÓ¦"
+msgstr "E24: ûÓÐÕâ¸öËõд"
-msgid "No ! allowed"
-msgstr "²»¿ÉʹÓà '!'"
+msgid "E477: No ! allowed"
+msgstr "E477: ²»ÄÜʹÓà \"!\""
msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: ÒòΪ±àÒëʱûÓмÓÈëͼÐͽçÃæµÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓÃͼÐͽçÃæ"
+msgstr "E25: ÎÞ·¨Ê¹ÓÃͼÐνçÃæ: ±àÒëʱûÓÐÆôÓÃ"
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: ÒòΪ±àÒëʱûÓмÓÈëÏ£²®À³µÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓà Hebrew\n"
+msgstr "E26: ÎÞ·¨Ê¹Óà Hebrew: ±àÒëʱûÓÐÆôÓÃ\n"
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ÒòΪ±àÒëʱûÓмÓÈë Farsi µÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓà Farsi\n"
+msgstr "E27: ÎÞ·¨Ê¹Óà Farsi: ±àÒëʱûÓÐÆôÓÃ\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ÎÞ·¨Ê¹Óà Arabic: ±àÒëʱûÓÐÆôÓÃ\n"
#, c-format
msgid "E28: No such highlight group name: %s"
-msgstr "E28: ûÓÐÃûΪ '%s' µÄ highlight group"
+msgstr "E28: ûÓÐÕâ¸ö¸ßÁÁȺ×éÃû: %s"
msgid "E29: No inserted text yet"
msgstr "E29: ûÓвåÈë¹ýÎÄ×Ö"
msgid "E30: No previous command line"
-msgstr "E30: ûÓÐÇ°Ò»ÏîÃüÁî"
+msgstr "E30: ûÓÐÇ°Ò»¸öÃüÁîÐÐ"
msgid "E31: No such mapping"
-msgstr "E31: ûÓÐÕâ¸ö mapping ¶ÔÓ¦"
+msgstr "E31: ûÓÐÕâ¸öÓ³Éä"
-msgid "No match"
-msgstr "ÕÒ²»µ½"
+msgid "E479: No match"
+msgstr "E479: ûÓÐÆ¥Åä"
#, c-format
-msgid "No match: %s"
-msgstr "ÕÒ²»µ½: %s"
+msgid "E480: No match: %s"
+msgstr "E480: ûÓÐÆ¥Åä: %s"
msgid "E32: No file name"
msgstr "E32: ûÓÐÎļþÃû"
msgid "E33: No previous substitute regular expression"
-msgstr "E33: ûÓÐÇ°Ò»¸ö²éÕÒ/Ìæ»»µÄÃüÁî"
+msgstr "E33: ûÓÐÇ°Ò»¸öÌæ»»ÕýÔò±í´ïʽ"
msgid "E34: No previous command"
msgstr "E34: ûÓÐÇ°Ò»¸öÃüÁî"
msgid "E35: No previous regular expression"
-msgstr "E35: ûÓÐÇ°Ò»¸ö²éÕÒÃüÁî"
+msgstr "E35: ûÓÐÇ°Ò»¸öÕýÔò±í´ïʽ"
-msgid "No range allowed"
-msgstr "²»¿ÉʹÓ÷¶Î§ÃüÁî"
+msgid "E481: No range allowed"
+msgstr "E481: ²»ÄÜʹÓ÷¶Î§"
msgid "E36: Not enough room"
msgstr "E36: ûÓÐ×ã¹»µÄ¿Õ¼ä"
#, c-format
-msgid "Can't create file %s"
-msgstr "²»ÄÜ´´½¨Îļþ %s"
-
-msgid "Can't get temp file name"
-msgstr "²»Äܵõ½ÁÙʱÎļþÃû"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: ûÓÐÃû½Ð \"%s\" µÄÒÑ×¢²áµÄ·þÎñÆ÷"
#, c-format
-msgid "Can't open file %s"
-msgstr "²»ÄÜ´ò¿ªÎļþ %s"
+msgid "E482: Can't create file %s"
+msgstr "E482: ÎÞ·¨´´½¨Îļþ %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: ÎÞ·¨»ñÈ¡ÁÙʱÎļþÃû"
#, c-format
-msgid "Can't read file %s"
-msgstr "²»ÄܶÁÈ¡Îļþ %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: ÎÞ·¨´ò¿ªÎļþ %s"
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: ÎļþÄÚÈÝÒѸı䵫ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: ÎÞ·¨¶ÁÈ¡Îļþ %s"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ÒÑÐ޸ĵ«ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E38: Null argument"
-msgstr "E38: ¿ÕµÄ (Null) ²ÎÊý"
+msgstr "E38: ¿ÕµÄ²ÎÊý"
msgid "E39: Number expected"
-msgstr "E39: Ó¦¸ÃÒªÓÐÊý×Ö"
+msgstr "E39: ´Ë´¦ÐèÒªÊý×Ö"
#, c-format
msgid "E40: Can't open errorfile %s"
-msgstr "E40: ²»ÄÜ´ò¿ª´íÎóÎļþ %s"
+msgstr "E40: ÎÞ·¨´ò¿ª´íÎóÎļþ %s"
+
+msgid "E233: cannot open display"
+msgstr "E233: ÎÞ·¨´ò¿ª display"
msgid "E41: Out of memory!"
-msgstr "E41: ÄÚ´æ²»×ã!"
+msgstr "E41: ÄÚ´æ²»×㣡"
msgid "Pattern not found"
msgstr "ÕÒ²»µ½Ä£Ê½"
#, c-format
-msgid "Pattern not found: %s"
-msgstr "ÕÒ²»µ½Ä£Ê½ %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: ÕÒ²»µ½Ä£Ê½: %s"
-msgid "Argument must be positive"
-msgstr "²ÎÊýÓ¦¸ÃÊÇÕýÊý"
+msgid "E487: Argument must be positive"
+msgstr "E487: ²ÎÊý±ØÐëÊÇÕýÊý"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: ÎÞ·¨»Øµ½Ç°Ò»¸öĿ¼"
msgid "E42: No Errors"
msgstr "E42: ûÓдíÎó"
+msgid "E776: No location list"
+msgstr "E776: ûÓÐ location Áбí"
+
msgid "E43: Damaged match string"
-msgstr "E43: Æ¥Åä×Ö·û´®ÓÐÎÊÌâ"
+msgstr "E43: ÒÑË𻵵ÄÆ¥Åä×Ö·û´®"
msgid "E44: Corrupted regexp program"
-msgstr "E44: ÕýÔò±í´ïʽÓÐÎÊÌâ"
+msgstr "E44: ÒÑË𻵵ÄÕýÔò±í´ïʽ³ÌÐò"
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: É趨 'readonly' Ñ¡Ïî(Ö»¶Á) (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: ÒÑÉ趨ѡÏî 'readonly' (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: ²»ÄÜÉ趨ֻ¶Á±äÁ¿ \"%s\""
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: ²»ÄܸıäÖ»¶Á±äÁ¿ \"%s\""
+
+#, c-format
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: ²»ÄÜÔÚ sandbox ÖÐÉ趨±äÁ¿: \"%s\""
msgid "E47: Error while reading errorfile"
msgstr "E47: ¶ÁÈ¡´íÎóÎļþʧ°Ü"
msgid "E48: Not allowed in sandbox"
-msgstr "E48: ²»ÄÜÔÚ sandbox Àï³öÏÖ"
+msgstr "E48: ²»ÔÊÐíÔÚ sandbox ÖÐʹÓÃ"
+
+msgid "E523: Not allowed here"
+msgstr "E523: ²»ÔÊÐíÔÚ´ËʹÓÃ"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: ²»Ö§³ÖÉ趨ÆÁĻģʽ"
msgid "E49: Invalid scroll size"
-msgstr "E49: ´íÎóµÄ¹ö¶¯´óС"
+msgstr "E49: ÎÞЧµÄ¹ö¶¯´óС"
msgid "E91: 'shell' option is empty"
-msgstr "E91: 'E71: Ñ¡Ïî 'shell' δÉ趨"
+msgstr "E91: Ñ¡Ïî 'shell' Ϊ¿Õ"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: ÎÞ·¨¶ÁÈ¡ sign Êý¾Ý£¡"
msgid "E72: Close error on swap file"
msgstr "E72: ½»»»Îļþ¹Ø±Õ´íÎó"
msgid "E73: tag stack empty"
-msgstr "E73: ±êÇ©¶ÑÕ»ÒÑ¿Õ"
+msgstr "E73: tag ¶ÑջΪ¿Õ"
msgid "E74: Command too complex"
-msgstr "E74: ÃüÁîÌ«¸´ÔÓ"
+msgstr "E74: ÃüÁî¹ý¸´ÔÓ"
msgid "E75: Name too long"
-msgstr "E75: Ãû×ÖÌ«³¤"
+msgstr "E75: Ãû×Ö¹ý³¤"
msgid "E76: Too many ["
-msgstr "E76: Ì«¶à ["
+msgstr "E76: [ ¹ý¶à"
msgid "E77: Too many file names"
-msgstr "E77: Ì«¶àÎļþÃû"
+msgstr "E77: ÎļþÃû¹ý¶à"
-msgid "Trailing characters"
-msgstr "ÄãÊäÈëÁ˶àÓàµÄ×Ö·û"
+msgid "E488: Trailing characters"
+msgstr "E488: ¶àÓàµÄβ²¿×Ö·û"
msgid "E78: Unknown mark"
-msgstr "E78: ²»ÄÜ°ìʶµÄ±ê¼Ç"
+msgstr "E78: δ֪µÄ±ê¼Ç"
msgid "E79: Cannot expand wildcards"
-msgstr "E79: ²»ÄÜÀ©Õ¹Í¨Åä·û"
+msgstr "E79: ÎÞ·¨À©Õ¹Í¨Åä·û"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ²»ÄÜСÓÚ 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ²»ÄÜСÓÚ 'winminwidth'"
msgid "E80: Error while writing"
-msgstr "E80: дÈë´íÎó"
+msgstr "E80: дÈë³ö´í"
msgid "Zero count"
-msgstr "Êýµ½Áã (?)"
+msgstr "¼ÆÊýΪÁã"
msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> ²»ÄÜÔÚ script ±¾ÎÄÍâʹÓÃ."
+msgstr "E81: Ôڽű¾»·¾³ÍâʹÓÃÁË <SID>"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: ÊÕµ½ÎÞЧµÄ±í´ïʽ"
+
+#~ msgid "E463: Region is guarded, cannot modify"
+#~ msgstr ""
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ²»ÔÊÐí¸Ä±äÖ»¶ÁÎļþ"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: ÄÚ²¿´íÎó: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ±í´ïʽµÄÄÚ´æʹÓó¬³ö 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: ¿ÕµÄ»º³åÇø"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ÎÞЧµÄËÑË÷±í´ïʽ»ò·Ö¸ô·û"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: ÎļþÒÑÔÚÁíÒ»¸ö»º³åÇøÖб»¼ÓÔØ"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: ûÓÐÉ趨ѡÏî '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "ÒѲéÕÒµ½Îļþ¿ªÍ·£¬ÔÙ´Ó½áβ¼ÌÐø²éÕÒ"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "ÒѲéÕÒµ½Îļþ½á⣬ÔÙ´Ó¿ªÍ·¼ÌÐø²éÕÒ"
+
+#~ msgid "[No file]"
+#~ msgstr "[δÃüÃû]"
+
+#~ msgid "[Error List]"
+#~ msgstr "[´íÎóÁбí]"
+
+#~ msgid "E106: Unknown variable: \"%s\""
+#~ msgstr "E106: 䶨ÒåµÄ±äÁ¿: \"%s\""
+
+#~ msgid "E119: Not enough arguments for function: %s"
+#~ msgstr "E119: º¯Êý %s µÄ²ÎÊýÌ«ÉÙ"
+
+#~ msgid "E120: Using <SID> not in a script context: %s"
+#~ msgstr "E120: <SID> ²»ÄÜÔÚ script ÉÏÏÂÎÄÍâʹÓÃ: %s"
+
+#~ msgid "E123: Undefined function: %s"
+#~ msgstr "E123: º¯Êý %s ÉÐ䶨Òå"
+
+#~ msgid "E127: Cannot redefine function %s: It is in use"
+#~ msgstr "E127: º¯Êý %s ÕýÔÚʹÓÃÖУ¬²»ÄÜÖØж¨Òå"
+
+#~ msgid "function "
+#~ msgstr "º¯Êý "
+
+#~ msgid "E130: Undefined function: %s"
+#~ msgstr "E130: º¯Êý %s ÉÐ䶨Òå"
+
+#~ msgid "Run Macro"
+#~ msgstr "Ö´Ðкê"
+
+#~ msgid "E242: Color name not recognized: %s"
+#~ msgstr "E242: %s Ϊ²»ÄÜʶ±ðµÄÑÕÉ«Ãû³Æ"
+
+#~ msgid "error reading cscope connection %d"
+#~ msgstr "¶ÁÈ¡ cscope Á¬½Ó %d ʱ´íÎó"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: ÕÒ²»µ½ cscope Á¬½Ó"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope Á¬½ÓÒѹرÕ"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "²»ÄÜʹÓà malloc\n"
+
+#~ msgid "%2d %-5ld %-34s <none>\n"
+#~ msgstr "%2d %-5ld %-34s <ÎÞ>\n"
+
+#~ msgid "E249: couldn't read VIM instance registry property"
+#~ msgstr "E249: ²»ÄܶÁÈ¡ VIM µÄ ×¢²á±íÊôÐÔ"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\tÏÔʾ Gnome Ïà¹Ø²ÎÊý"
+
+#~ msgid "[string too long]"
+#~ msgstr "[×Ö·û´®Ì«³¤]"
+
+#~ msgid "Hit ENTER to continue"
+#~ msgstr "Çë°´ ENTER ¼ÌÐø"
+
+#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
+#~ msgstr " (RET/BS: ÏòÏÂ/ÏòÉÏÒ»ÐÐ, ¿Õ¸ñ/b: Ò»Ò³, d/u: °ëÒ³, q: Í˳ö)"
+
+#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
+#~ msgstr " (RET: ÏòÏÂÒ»ÐÐ, ¿Õ°×¼ü: Ò»Ò³, d: °ëÒ³, q: Í˳ö)"
+
+#~ msgid "E361: Crash intercepted; regexp too complex?"
+#~ msgstr "E361: ²»ÄÜÖ´ÐÐ; regular expression Ì«¸´ÔÓ?"
+
+#~ msgid "E363: pattern caused out-of-stack error"
+#~ msgstr "E363: regular expression Ôì³É¶ÑÕ»ÓùâµÄ´íÎó"
+
+#~ msgid " BLOCK"
+#~ msgstr " ¿é"
+
+#~ msgid " LINE"
+#~ msgstr " ÐÐ"
+
+#~ msgid "Enter nr of choice (<CR> to abort): "
+#~ msgstr "ÊäÈë nr »òÑ¡Ôñ (<CR> Í˳ö): "
+
+#~ msgid "Linear tag search"
+#~ msgstr "ÏßÐÔ²éÕÒ±êÇ© (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "¶þ½øÖƲéÕÒ(Binary search) ±êÇ©(Tags)"
+
+#~ msgid "with BeOS GUI."
+#~ msgstr "ʹÓà BeOS ͼÐνçÃæ¡£"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index abc6521..83bd7f4 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -7,53 +7,53 @@
#
# Original translations.
#
-#, no-wrap
msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n"
-"POT-Creation-Date: 2001-09-24 10:10+0800\n"
-"PO-Revision-Date: 2001-09-24 11:13+0800\n"
-"Last-Translator: Wang Jun <junw@turbolinux.com.cn>\n"
-"Language-Team: Wang Jun <junw@turbolinux.com.cn>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-28 21:47+0800\n"
+"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
+"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=gb2312\n"
"Content-Transfer-Encoding: 8-bit\n"
msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ²»ÄÜ·ÖÅäÈκλº³åÇø£¬Í˳ö³ÌÐò..."
+msgstr "E82: ÎÞ·¨·ÖÅäÈκλº³åÇø£¬Í˳ö³ÌÐò..."
msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ²»ÄÜ·ÖÅ仺³åÇø£¬Ê¹ÓÃÁíÒ»¸ö»º³åÇø...."
+msgstr "E83: ÎÞ·¨·ÖÅ仺³åÇø£¬Ê¹ÓÃÁíÒ»¸ö»º³åÇø..."
-msgid "No buffers were unloaded"
-msgstr "ûÓÐÊÍ·ÅÈκλº³åÇø"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: ûÓÐÊÍ·ÅÈκλº³åÇø"
-msgid "No buffers were deleted"
-msgstr "ûÓÐɾ³ýÈκλº³åÇø"
+msgid "E516: No buffers were deleted"
+msgstr "E516: ûÓÐɾ³ýÈκλº³åÇø"
-msgid "No buffers were wiped out"
-msgstr "ûÓÐɾ³ýÈκλº³åÇø"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: ûÓÐÇå³ýÈκλº³åÇø"
msgid "1 buffer unloaded"
-msgstr "ÒÑÊÍ·ÅÒ»¸ö»º³åÇø"
+msgstr "ÊÍ·ÅÁË 1 ¸ö»º³åÇø"
#, c-format
msgid "%d buffers unloaded"
-msgstr "ÒÑÊÍ·Å %d ¸ö»º³åÇø"
+msgstr "ÊÍ·ÅÁË %d ¸ö»º³åÇø"
msgid "1 buffer deleted"
-msgstr "ÒÑɾ³ýÒ»¸ö»º³åÇø"
+msgstr "ɾ³ýÁË 1 ¸ö»º³åÇø"
#, c-format
msgid "%d buffers deleted"
-msgstr "ÒÑɾ³ý %d ¸ö»º³åÇø"
+msgstr "ɾ³ýÁË %d ¸ö»º³åÇø"
msgid "1 buffer wiped out"
-msgstr "ÒÑɾ³ýÒ»¸ö»º³åÇø"
+msgstr "Çå³ýÁË 1 ¸ö»º³åÇø"
#, c-format
msgid "%d buffers wiped out"
-msgstr "ÒÑɾ³ý %d ¸ö»º³åÇø"
+msgstr "Çå³ýÁË %d ¸ö»º³åÇø"
msgid "E84: No modified buffer found"
msgstr "E84: ûÓÐÐ޸ĹýµÄ»º³åÇø"
@@ -63,43 +63,43 @@
msgstr "E85: ûÓпÉÁгöµÄ»º³åÇø"
#, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: ²»ÄÜÇл»µ½µÚ %ld ¸ö»º³åÇø"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: »º³åÇø %ld ²»´æÔÚ"
msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: ²»ÄÜÇл»µ½¸üºóÃæµÄ»º³åÇø"
+msgstr "E87: ÎÞ·¨Çл»£¬ÒÑÊÇ×îºóÒ»¸ö»º³åÇø"
msgid "E88: Cannot go before first buffer"
-msgstr "E88: ²»ÄÜÇл»µ½¸üÇ°ÃæµÄ»º³åÇø"
+msgstr "E88: ÎÞ·¨Çл»£¬ÒÑÊǵÚÒ»¸ö»º³åÇø"
#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: ÒѸü¸Ä¹ý»º³åÇø %ld µ«ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: »º³åÇø %ld ÒÑÐ޸ĵ«ÉÐδ±£´æ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E90: Cannot unload last buffer"
-msgstr "E90: ²»ÄÜÊÍ·Å×îºóÒ»¸ö»º³åÇø"
+msgstr "E90: ÎÞ·¨ÊÍ·Å×îºóÒ»¸ö»º³åÇø"
msgid "W14: Warning: List of file names overflow"
msgstr "W14: ¾¯¸æ: ÎļþÃû¹ý¶à"
#, c-format
msgid "E92: Buffer %ld not found"
-msgstr "E92: ÕÒ²»µ½µÚ %ld ¸ö»º³åÇø"
+msgstr "E92: ÕÒ²»µ½»º³åÇø %ld"
#, c-format
msgid "E93: More than one match for %s"
-msgstr "E93: ÕÒµ½Ò»¸öÒÔÉ쵀 %s"
+msgstr "E93: ÕÒµ½²»Ö¹Ò»¸ö %s"
#, c-format
msgid "E94: No matching buffer for %s"
-msgstr "E94: ÕÒ²»µ½ %s"
+msgstr "E94: ûÓÐÆ¥ÅäµÄ»º³åÇø %s"
#, c-format
msgid "line %ld"
-msgstr "ÐÐ %ld"
+msgstr "µÚ %ld ÐÐ"
msgid "E95: Buffer with this name already exists"
-msgstr "E95: ÒÑÓлº³åÇøʹÓÃÕâ¸öÃû×Ö"
+msgstr "E95: ÒÑÓлº³åÇøʹÓøÃÃû³Æ"
msgid " [Modified]"
msgstr " [ÒÑÐÞ¸Ä]"
@@ -118,24 +118,24 @@
#, c-format
msgid "1 line --%d%%--"
-msgstr "ÐÐÊý 1 --%d%%--"
+msgstr "1 ÐÐ --%d%%--"
#, c-format
msgid "%ld lines --%d%%--"
-msgstr "ÐÐÊý %ld --%d%%--"
+msgstr "%ld ÐÐ --%d%%--"
#, c-format
msgid "line %ld of %ld --%d%%-- col "
-msgstr "ÐÐ %ld/%ld --%d%%-- ÁÐ "
+msgstr "ÐÐ %ld / %ld --%d%%-- ÁÐ "
-msgid "[No file]"
+msgid "[No Name]"
msgstr "[δÃüÃû]"
#. must be a help buffer
msgid "help"
-msgstr "[°ïÖú]"
+msgstr "°ïÖú"
-msgid "[help]"
+msgid "[Help]"
msgstr "[°ïÖú]"
msgid "[Preview]"
@@ -150,6 +150,7 @@
msgid "Top"
msgstr "¶¥¶Ë"
+#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -157,22 +158,22 @@
"\n"
"# »º³åÇøÁбí:\n"
-msgid "[Error List]"
-msgstr "[´íÎóÁбí]"
+msgid "[Location List]"
+msgstr "[Location Áбí]"
-msgid "[No File]"
-msgstr "[δÃüÃû]"
+msgid "[Quickfix List]"
+msgstr "[Quickfix Áбí]"
msgid ""
"\n"
"--- Signs ---"
msgstr ""
"\n"
-"--- ·ûºÅ ---"
+"--- Signs ---"
#, c-format
msgid "Signs for %s:"
-msgstr "%s µÄ·ûºÅ:"
+msgstr "%s µÄ Signs:"
#, c-format
msgid " line=%ld id=%d name=%s"
@@ -180,91 +181,99 @@
#, c-format
msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: ²»ÄܱȽÏ(diff) %ld¸öÒÔÉϵĻº³åÇø"
+msgstr "E96: ²»ÄܱȽÏ(diff) %ld ¸öÒÔÉϵĻº³åÇø"
msgid "E97: Cannot create diffs"
-msgstr "E97: ²»ÄÜ´´½¨ diff "
+msgstr "E97: ÎÞ·¨´´½¨ diff"
msgid "Patch file"
msgstr "Patch Îļþ"
msgid "E98: Cannot read diff output"
-msgstr "E98: ²»ÄܶÁÈ¡ diff µÄÊä³ö"
+msgstr "E98: ÎÞ·¨¶ÁÈ¡ diff µÄÊä³ö"
msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Ä¿Ç°µÄ»º³åÇø²»ÊÇÔÚ diff ģʽ"
+msgstr "E99: µ±Ç°»º³åÇø²»ÔÚ diff ģʽ"
msgid "E100: No other buffer in diff mode"
-msgstr "E100: ûÓлº³åÇøÔÚ diff ģʽ"
+msgstr "E100: ûÓÐÆäËü´¦ÓÚ diff ģʽµÄ»º³åÇø"
msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ÓÐÁ½¸öÒÔÉϵĻº³åÇøÔÚ diff ģʽ£¬²»Äܾö¶¨ÒªÓÃÄÄÒ»¸ö"
+msgstr "E101: ÓÐÁ½¸öÒÔÉϵĻº³åÇø´¦ÓÚ diff ģʽ£¬²»Äܾö¶¨ÓÃÄÄÒ»¸ö"
#, c-format
msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: ÕÒ²»µ½»º³åÇø: \"%s\""
+msgstr "E102: ÕÒ²»µ½»º³åÇø \"%s\""
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: »º³åÇø \"%s\" ²»ÊÇÔÚ diff ģʽ"
+msgstr "E103: »º³åÇø \"%s\" ²»ÔÚ diff ģʽ"
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ¸´ºÏ×Ö·û(digraph)Öв»ÄÜʹÓà Escape"
-msgid "Keymap file not found"
-msgstr "ÕÒ²»µ½ keymap Îļþ"
+msgid "E544: Keymap file not found"
+msgstr "E544: ÕÒ²»µ½ Keymap Îļþ"
msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: ʹÓà :loadkeymap "
+msgstr "E105: ²»ÊÇÔڽű¾ÎļþÖÐʹÓà :loadkeymap "
-msgid " Keyword completion (^N/^P)"
-msgstr " ¹Ø¼ü×Ö×Ô¶¯Íê³É (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " ¹Ø¼ü×Ö²¹È« (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X ģʽ (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " ÇøÓò¹Ø¼ü×Ö×Ô¶¯Íê³É (^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " ÕûÐв¹È« (^L^N^P)"
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " ÕûÐÐ×Ô¶¯Íê³É (^L/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " ÎļþÃû²¹È« (^F^N^P)"
-msgid " File name completion (^F/^N/^P)"
-msgstr " ÎļþÃû×Ô¶¯Íê³É (^F/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag ²¹È« (^]^N^P)"
-msgid " Tag completion (^]/^N/^P)"
-msgstr " ±êÇ©×Ô¶¯Íê³É (^]/^N/^P)"
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " ·¾¶Ä£Ê½²¹È« (^N^P)"
-msgid " Path pattern completion (^N/^P)"
-msgstr " ·¾¶×Ô¶¯Íê³É (^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " ¶¨Ò岹ȫ (^D^N^P)"
-msgid " Definition completion (^D/^N/^P)"
-msgstr " ¶¨Òå×Ô¶¯Íê³É (^D/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary ²¹È« (^K^N^P)"
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " ×Öµä×Ô¶¯Íê³É (^K/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus ²¹È« (^T^N^P)"
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus ×Ô¶¯Íê³É (^T/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " ÃüÁîÐв¹È« (^V^N^P)"
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " ÃüÁî×Ô¶¯Íê³É (^V/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " Óû§×Ô¶¨Ò岹ȫ (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " È«Äܲ¹È« (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " ƴд½¨Òé (^S^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " ¹Ø¼ü×Ö¾Ö²¿²¹È« (^N^P)"
msgid "Hit end of paragraph"
msgstr "Òѵ½¶ÎÂä½áβ"
-msgid "'thesaurus' option is empty"
-msgstr "Ñ¡Ïî 'thesaurus' δÉ趨"
-
msgid "'dictionary' option is empty"
msgstr "Ñ¡Ïî 'dictionary' Ϊ¿Õ"
+msgid "'thesaurus' option is empty"
+msgstr "Ñ¡Ïî 'thesaurus' Ϊ¿Õ"
+
#, c-format
msgid "Scanning dictionary: %s"
-msgstr "ɨÃè×Öµä: %s"
+msgstr "ÕýÔÚɨÃè dictionary: %s"
msgid " (insert) Scroll (^E/^Y)"
msgstr " (²åÈë) Scroll (^E/^Y)"
@@ -274,8 +283,9 @@
#, c-format
msgid "Scanning: %s"
-msgstr "ɨÃèÖÐ: %s"
+msgstr "ÕýÔÚɨÃè: %s"
+#, c-format
msgid "Scanning tags."
msgstr "ɨÃè±êÇ©."
@@ -287,45 +297,157 @@
#. * longer needed. -- Acevedo.
#.
msgid "-- Searching..."
-msgstr "-- ËÑÑ°ÖÐ..."
+msgstr "-- ²éÕÒÖÐ..."
msgid "Back at original"
msgstr "»Øµ½Æðµã"
msgid "Word from other line"
-msgstr "´ÓÆäËüÐпªÊ¼µÄ´Ê (?)"
+msgstr "ÁíÒ»ÐеĴÊ"
msgid "The only match"
-msgstr "Ö»ÓдËÏîÆ¥Åä"
+msgstr "ΨһƥÅä"
#, c-format
msgid "match %d of %d"
-msgstr "ÕÒµ½ %d / %d"
+msgstr "Æ¥Åä %d / %d"
#, c-format
msgid "match %d"
msgstr "Æ¥Åä %d"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let ÖгöÏÖÒì³£×Ö·û"
+
#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 䶨ÒåµÄ±äÁ¿: \"%s\""
+msgid "E684: list index out of range: %ld"
+msgstr "E684: List Ë÷Òý³¬³ö·¶Î§: %ld"
+
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: 䶨ÒåµÄ±äÁ¿: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: ȱÉÙ ']'"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s µÄ²ÎÊý±ØÐëÊÇ List"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s µÄ²ÎÊý±ØÐëÊÇ List »òÕß Dictionary"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary µÄ¼ü²»ÄÜΪ¿Õ"
+
+msgid "E714: List required"
+msgstr "E714: ÐèÒª List"
+
+msgid "E715: Dictionary required"
+msgstr "E715: ÐèÒª Dictionary"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: º¯ÊýµÄ²ÎÊý¹ý¶à: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary Öв»´æÔÚ¼ü: %s"
+
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: º¯Êý %s ÒÑ´æÔÚ£¬Çë¼Ó ! Ç¿ÖÆÌæ»»"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Dictionary ÏîÒÑ´æÔÚ"
+
+msgid "E718: Funcref required"
+msgstr "E718: ÐèÒª Funcref"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: ²»ÄÜ¶Ô Dictionary ʹÓà [:]"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: %s= µÄ±äÁ¿ÀàÐͲ»ÕýÈ·"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: δ֪µÄº¯Êý: %s"
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: ÎÞЧµÄ±äÁ¿Ãû: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Ä¿±ê±È List ÏîÊýÉÙ"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Ä¿±ê±È List ÏîÊý¶à"
+
+msgid "Double ; in list of variables"
+msgstr "±äÁ¿ÁбíÖгöÏÖÁ½¸ö ;"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: ÎÞ·¨Áгö %s µÄ±äÁ¿"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: Ö»ÄÜË÷Òý List »ò Dictionary"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] ±ØÐëÔÚ×îºó"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] ÐèÒªÒ»¸ö List Öµ"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: List ÖµµÄÏî±ÈÄ¿±ê¶à"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: List ֵûÓÐ×ã¹»¶àµÄÏî"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for ºóȱÉÙ \"in\""
#, c-format
msgid "E107: Missing braces: %s"
-msgstr "E107: ȱÉÙ¶ÔÓ¦µÄÀ¨ºÅ: %s"
+msgstr "E107: ȱÉÙÀ¨ºÅ: %s"
#, c-format
msgid "E108: No such variable: \"%s\""
msgstr "E108: Î޴˱äÁ¿: \"%s\""
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (un)lock µÄ±äÁ¿Ç¶Ì×¹ýÉî"
+
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' ºóȱÉÙ ':'"
-msgid "E110: Missing ')'"
-msgstr "E110: ȱÉÙ¶ÔÓ¦µÄ \")\""
+msgid "E691: Can only compare List with List"
+msgstr "E691: Ö»ÄÜ±È½Ï List ºÍ List"
-msgid "E111: Missing ']'"
-msgstr "E111: ȱÉÙ¶ÔÓ¦µÄ \"]\""
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: ¶Ô List ÎÞЧµÄ²Ù×÷"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Ö»ÄÜ±È½Ï Dictionary ºÍ Dictionary"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: ¶Ô Dictionary ÎÞЧµÄ²Ù×÷"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: Ö»ÄÜ±È½Ï Funcref ºÍ Funcref"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: ¶Ô Funcrefs ÎÞЧµÄ²Ù×÷"
+
+msgid "E110: Missing ')'"
+msgstr "E110: ȱÉÙ ')'"
+
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: ²»ÄÜË÷ÒýÒ»¸ö Funcref"
#, c-format
msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@
#, c-format
msgid "E113: Unknown option: %s"
-msgstr "E113: ²»ÕýÈ·µÄÑ¡Ïî: %s"
+msgstr "E113: δ֪µÄÑ¡Ïî: %s"
#, c-format
msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@
msgstr "E115: ȱÉÙÒýºÅ: %s"
#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: º¯Êý %s µÄ²ÎÊý²»ÕýÈ·"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List ÖÐȱÉÙ¶ººÅ: %s"
#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 䶨ÒåµÄº¯Êý: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List ȱÉÙ½áÊø·û ']': %s"
#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: º¯Êý %s µÄ²ÎÊý¹ý¶à"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary ÖÐȱÉÙðºÅ: %s"
#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: º¯Êý %s µÄ²ÎÊýÌ«ÉÙ"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary ÖгöÏÖÖظ´µÄ¼ü: \"%s\""
#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ²»ÄÜÔÚ script ÉÏÏÂÎÄÍâʹÓÃ: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary ÖÐȱÉÙ¶ººÅ: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary ȱÉÙ½áÊø·û '}': %s"
+
+#, fuzzy
+#~ msgid "E724: variable nested too deep for displaying"
+#~ msgstr "E724: ±äÁ¿Ç¶Ì×¹ýÉî"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ²ÎÊý¹ý¶à"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() Ö»ÄÜÔÚ²åÈëģʽÖÐʹÓÃ"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either. But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all. See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "È·¶¨(&O)"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: ¼üÒÑ´æÔÚ: %s"
#, c-format
msgid "+-%s%3ld lines: "
msgstr "+-%s%3ld ÐÐ: "
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: δ֪µÄº¯Êý: %s"
+
msgid ""
"&OK\n"
"&Cancel"
@@ -374,91 +526,148 @@
"È·¶¨(&O)\n"
"È¡Ïû(&C)"
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() µÄµ÷ÓôÎÊý¶àÓÚ inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: ²»ÔÊÐíµÄ·¶Î§"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() µÄÀàÐÍÎÞЧ"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ²½³¤ÎªÁã"
+
+msgid "E727: Start past end"
+msgstr "E727: ÆðʼֵÔÚÖÕÖ¹Öµºó"
+
+msgid "<empty>"
+msgstr "<¿Õ>"
+
msgid "E240: No connection to Vim server"
-msgstr "E240: ûÓÐÓë Vim Server ´´½¨Á¬½Ó"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: ²»ÄܶÁÈ¡·þÎñÆ÷µÄÏìÓ¦"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: ²»ÄÜ´«Ë͵½¿Í»§¶Ë"
+msgstr "E240: ûÓе½ Vim ·þÎñÆ÷µÄÁ¬½Ó"
#, c-format
msgid "E241: Unable to send to %s"
-msgstr "E241: ²»ÄÜ´«Ë͵½ %s"
+msgstr "E241: ÎÞ·¨·¢Ë͵½ %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: ÎÞ·¨¶ÁÈ¡·þÎñÆ÷ÏìÓ¦"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ·ûºÅÁ¬½Ó¹ý¶à(Ñ»·£¿)"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: ÎÞ·¨·¢Ë͵½¿Í»§¶Ë"
+
+#, fuzzy
+#~ msgid "E702: Sort compare function failed"
+#~ msgstr "E702: Sort ±È½Ïº¯Êýʧ°Ü"
msgid "(Invalid)"
msgstr "(ÎÞЧ)"
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ±äÁ¿ %s ÉÐ䶨Òå"
+msgid "E677: Error writing temp file"
+msgstr "E677: дÁÙʱÎļþ³ö´í"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: ½« Funcref ×÷Êý×ÖʹÓÃ"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: ½« List ×÷Êý×ÖʹÓÃ"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: ½« Dictionary ×÷Êý×ÖʹÓÃ"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: ½« Funcref ×÷ String ʹÓÃ"
+
+msgid "E730: using List as a String"
+msgstr "E730: ½« List ×÷ String ʹÓÃ"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: ½« Dictionary ×÷ String ʹÓÃ"
#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: º¯Êý %s ÒѾ´æÔÚ, ÇëʹÓà ! Ç¿ÖÆÌæ»»"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref ±äÁ¿Ãû±ØÐëÒÔ´óд×Öĸ¿ªÍ·: %s"
#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: º¯Êý %s ÉÐ䶨Òå"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: ±äÁ¿ÃûÓëÒÑÓк¯ÊýÃû³åÍ»: %s"
+
+#, c-format
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: ±äÁ¿ÀàÐͲ»Æ¥Åä: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: ÖµÒÑËø¶¨: %s"
+
+msgid "Unknown"
+msgstr "δ֪"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: ÎÞ·¨¸Ä±ä %s µÄÖµ"
+
+#, fuzzy
+#~ msgid "E698: variable nested too deep for making a copy"
+#~ msgstr "E698: ±äÁ¿Ç¶Ì×¹ýÉî"
#, c-format
msgid "E124: Missing '(': %s"
-msgstr "E124: ȱÉÙ \"(\": %s"
+msgstr "E124: ȱÉÙ '(': %s"
#, c-format
msgid "E125: Illegal argument: %s"
-msgstr "E125: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E125: ÎÞЧµÄ²ÎÊý: %s"
msgid "E126: Missing :endfunction"
msgstr "E126: ȱÉÙ :endfunction"
#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: º¯Êý %s ÕýÔÚʹÓÃÖУ¬²»ÄÜÖØж¨Òå"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: º¯ÊýÃû³ÆµÚÒ»¸ö×Öĸ±ØÐë´óд: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: º¯ÊýÃûÓë½Å±¾ÎļþÃû²»Æ¥Åä: %s"
msgid "E129: Function name required"
-msgstr "E129: ÐèÒªº¯ÊýÃû³Æ"
-
-msgid "function "
-msgstr "º¯Êý "
+msgstr "E129: ÐèÒªº¯ÊýÃû"
#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: º¯Êý %s ÉÐ䶨Òå"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: º¯ÊýÃû±ØÐëÒÔ´óд×Öĸ¿ªÍ·»òÕß°üº¬Ã°ºÅ: %s"
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: º¯Êý %s ÕýÔÚʹÓÃÖУ¬²»ÄÜɾ³ý"
+msgstr "E131: ÎÞ·¨É¾³ýº¯Êý %s: ÕýÔÚʹÓÃÖÐ"
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: º¯ÊýµÝ¹éµ÷ÓòãÊý³¬¹ý 'maxfuncdepth'"
+msgstr "E132: º¯Êýµ÷ÓÃÉî¶È³¬³ö 'maxfuncdepth'"
-#. always scroll up, don't overwrite
#, c-format
msgid "calling %s"
msgstr "µ÷ÓÃ %s"
-#. always scroll up, don't overwrite
#, c-format
-msgid "continuing in %s"
-msgstr "¼ÌÐø: %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return ±ØÐëÔÚº¯ÊýÀïʹÓÃ"
+msgid "%s aborted"
+msgstr "%s ÒÑÖÐÖ¹"
#, c-format
msgid "%s returning #%ld"
-msgstr "%s ·µ»ØÖµ #%ld "
+msgstr "%s ·µ»Ø #%ld "
#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s ·µ»ØÖµ \"%s\""
+msgid "%s returning %s"
+msgstr "%s ·µ»Ø %s"
+#, c-format
+msgid "continuing in %s"
+msgstr "ÔÚ %s ÖмÌÐø"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return ²»ÔÚº¯ÊýÖÐ"
+
+#, c-format
msgid ""
"\n"
"# global variables:\n"
@@ -466,76 +675,90 @@
"\n"
"# È«¾Ö±äÁ¿:\n"
-msgid "Entering Debug mode. Type \"cont\" to leave."
-msgstr "½øÈëµ÷ÊÔģʽ. ÊäÈë \"cont\" ÒԻص½Õý³£Ä£Ê½."
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t×î½üÐÞ¸ÄÓÚ "
+
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "½øÈëµ÷ÊÔģʽ¡£ÊäÈë \"cont\" ¼ÌÐøÔËÐС£"
#, c-format
msgid "line %ld: %s"
-msgstr "ÐÐ %ld: %s"
+msgstr "µÚ %ld ÐÐ: %s"
#, c-format
msgid "cmd: %s"
-msgstr "cmd: %s"
+msgstr "ÃüÁî: %s"
#, c-format
msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" Öжϵã: µÚ %ld ÐÐ"
+msgstr "¶Ïµã \"%s%s\" µÚ %ld ÐÐ"
#, c-format
msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ÕÒ²»µ½Öжϵã: %s"
+msgstr "E161: ÕÒ²»µ½¶Ïµã: %s"
msgid "No breakpoints defined"
-msgstr "ûÓж¨ÒåÖжϵã"
+msgstr "ûÓж¨Òå¶Ïµã"
#, c-format
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s µÚ %ld ÐÐ"
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: ÇëÏÈʹÓà :profile start <fname>"
+
msgid "Save As"
msgstr "Áí´æΪ"
#, c-format
-msgid "Save changes to \"%.*s\"?"
-msgstr "½«¸Ä±ä±£´æµ½ \"%.*s\"?"
+msgid "Save changes to \"%s\"?"
+msgstr "½«¸Ä±ä±£´æµ½ \"%s\" Âð£¿"
msgid "Untitled"
msgstr "δÃüÃû"
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ÒѸü¸Ä¹ý»º³åÇø \"%s\" µ«ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgstr "E162: »º³åÇø \"%s\" ÒÑÐ޸ĵ«ÉÐδ±£´æ"
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "×¢Òâ: ÒÑÇл»µ½ÆäËü»º³åÇø (Çë¼ì²é Autocommands ÓÐÎÞ´íÎó)"
+msgstr "¾¯¸æ: ÒâÍâµØ½øÈëÁËÆäËü»º³åÇø (Çë¼ì²é×Ô¶¯ÃüÁî)"
msgid "E163: There is only one file to edit"
msgstr "E163: Ö»ÓÐÒ»¸öÎļþ¿É±à¼"
msgid "E164: Cannot go before first file"
-msgstr "E164: ÒѾÔÚµÚÒ»¸öÎļþÁË"
+msgstr "E164: ÎÞ·¨Çл»£¬ÒÑÊǵÚÒ»¸öÎļþ"
msgid "E165: Cannot go beyond last file"
-msgstr "E165: ÒѾÔÚ×îºóÒ»¸öÎļþÁË"
+msgstr "E165: ÎÞ·¨Çл»£¬ÒÑÊÇ×îºóÒ»¸öÎļþ"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: ²»Ö§³Ö±àÒëÆ÷: %s"
#, c-format
msgid "Searching for \"%s\" in \"%s\""
-msgstr "²éÕÒÖÐ: \"%s\" -- \"%s\""
+msgstr "ÕýÔÚ²éÕÒ \"%s\"£¬ÔÚ \"%s\" ÖÐ"
#, c-format
msgid "Searching for \"%s\""
-msgstr "²éÕÒÖÐ: \"%s\""
+msgstr "ÕýÔÚ²éÕÒ \"%s\""
#, c-format
msgid "not found in 'runtimepath': \"%s\""
-msgstr "ÔÚ 'runtimepath' ÀïÕÒ²»µ½ \"%s\""
+msgstr "ÔÚ 'runtimepath' ÖÐÕÒ²»µ½ \"%s\""
-msgid "Run Macro"
-msgstr "Ö´Ðкê"
+msgid "Source Vim script"
+msgstr "Ö´ÐÐ Vim ½Å±¾"
#, c-format
msgid "Cannot source a directory: \"%s\""
-msgstr "²»ÄÜÖ´ÐÐĿ¼£º \"%s\""
+msgstr "²»ÄÜÖ´ÐÐĿ¼: \"%s\""
#, c-format
msgid "could not source \"%s\""
@@ -547,69 +770,43 @@
#, c-format
msgid "sourcing \"%s\""
-msgstr "Ö´ÐÐ \"%s\" ÖÐ"
+msgstr "Ö´ÐÐ \"%s\""
#, c-format
msgid "line %ld: sourcing \"%s\""
-msgstr "µÚ %ld ÐÐ: ½áÊøÖ´ÐÐ %s"
+msgstr "µÚ %ld ÐÐ: Ö´ÐÐ \"%s\""
#, c-format
msgid "finished sourcing %s"
msgstr "½áÊøÖ´ÐÐ %s"
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd ²ÎÊý"
+
+msgid "-c argument"
+msgstr "-c ²ÎÊý"
+
+msgid "environment variable"
+msgstr "»·¾³±äÁ¿"
+
+#~ msgid "error handler"
+#~ msgstr ""
+
msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ×¢Òâ: ´íÎóµÄÐзָô×Ö·û£¬¿ÉÄÜÊÇÉÙÁË ^M"
+msgstr "W15: ¾¯¸æ: ´íÎóµÄÐзָô·û£¬¿ÉÄÜÊÇÉÙÁË ^M"
msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ÔÚÖ´ÐÐ script ÎļþÍâ²»¿ÉʹÓà :scriptencoding"
+msgstr "E167: Ôڽű¾ÎļþÍâʹÓÃÁË :scriptencoding"
msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ÔÚÖ´ÐÐ script ÎļþÍâ²»¿ÉʹÓà :finish"
-
-msgid "No text to be printed"
-msgstr "ûÓÐÒª´òÓ¡µÄÎÄ×Ö"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "´òÓ¡ÖÐ: µÚ %d Ò³ (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "¸´ÖÆ %d / %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "ÒÑ´òÓ¡: %s"
-
-msgid "Printing aborted"
-msgstr "´òÓ¡ÖжÏ"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: дÈë PostScript Îļþ³ö´í"
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: ²»ÄÜ´ò¿ª PostScript Êä³öÎļþ"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: ²»ÄÜ´ò¿ªÎļþ \"%s\""
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: ²»ÄܶÁ PostScript ×ÊÔ´Îļþ \"%s\""
-
-msgid "Sending to printer..."
-msgstr "·¢Ë͵½´òÓ¡»ú..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: ´òÓ¡ PostScript Îļþʧ°Ü"
-
-#~ msgid "Print job sent."
-#~ msgstr ""
+msgstr "E168: Ôڽű¾ÎļþÍâʹÓÃÁË :finish"
#, c-format
msgid "Current %slanguage: \"%s\""
-msgstr "Ä¿Ç°µÄ %sÓïÑÔ: \"%s\""
+msgstr "µ±Ç°µÄ %sÓïÑÔ: \"%s\""
#, c-format
msgid "E197: Cannot set language to \"%s\""
@@ -619,32 +816,41 @@
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, Ê®Áù½øÖÆ %02x, °Ë½øÖÆ %03o"
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %04x, °Ë½øÖÆ %o"
+
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %08x, °Ë½øÖÆ %o"
+
msgid "E134: Move lines into themselves"
-msgstr "E134: ²»ÄÜ°ÑÐÐÒƵ½Ëü×ÔÒÑÄÚ"
+msgstr "E134: °ÑÐÐÒƶ¯µ½×ÔÒÑÖÐ"
msgid "1 line moved"
-msgstr "ÒÑÒƶ¯ 1 ÐÐ"
+msgstr "Òƶ¯ÁË 1 ÐÐ"
#, c-format
msgid "%ld lines moved"
-msgstr "ÒÑ°áÒÆ %ld ÐÐ"
+msgstr "Òƶ¯ÁË %ld ÐÐ"
#, c-format
msgid "%ld lines filtered"
-msgstr "ÒÑ´¦Àí %ld ÐÐ"
+msgstr "¹ýÂËÁË %ld ÐÐ"
msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* Autocommand ²»¿ÉÒÔ¸ü¸Ä»º³åÇøµÄÄÚÈÝ"
+msgstr "E135: *Filter* ×Ô¶¯ÃüÁî²»¿ÉÒԸı䵱ǰ»º³åÇø"
msgid "[No write since last change]\n"
-msgstr "[¸üкóÉÐδ±£´æ]\n"
+msgstr "[ÒÑÐ޸ĵ«ÉÐδ±£´æ]\n"
#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s ÔÚÐÐÖÐ: "
+# bad to translate
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s λÓÚÐÐ: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: ¹ý¶à´íÎó, ºöÂÔÎļþÆäÓಿ·Ö"
+msgstr "E136: viminfo: ´íÎó¹ý¶à£¬ºöÂÔÎļþµÄÊ£Óಿ·Ö"
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -661,39 +867,39 @@
#, c-format
msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo Îļþ²»ÄÜдÈë: %s"
+msgstr "E137: Viminfo Îļþ²»¿ÉдÈë: %s"
#, c-format
msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: ²»ÄÜдÈë viminfo Îļþ %s !"
+msgstr "E138: ÎÞ·¨Ð´Èë viminfo Îļþ %s£¡"
#, c-format
msgid "Writing viminfo file \"%s\""
-msgstr "дÈë viminfo Îļþ \"%s\" ÖÐ"
+msgstr "дÈë viminfo Îļþ \"%s\""
#. Write the info:
-#, c-format
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# viminfo ÎļþÊÇÓÉ vim %s Ëù²úÉú.\n"
+msgstr "# Õâ¸ö viminfo ÎļþÊÇÓÉ vim %s Éú³ÉµÄ¡£\n"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"# You may edit it if you're careful!\n"
"\n"
msgstr ""
-"# Èç¹ûÏëÒª×ÔÐÐÐÞ¸ÄÇëÌرðСÐÄ£¡\n"
+"# Èç¹ûÒª×ÔÐÐÐÞ¸ÄÇëÌرðСÐÄ£¡\n"
"\n"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# 'encoding' ÔÚ´ËÎļþ½¨Á¢Ê±µÄÖµ\n"
msgid "Illegal starting char"
msgstr "ÎÞЧµÄÆô¶¯×Ö·û"
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ÄúÔÚÁíÒ»¸ö»º³åÇøÒ²¼ÓÔØÁËÕâ¸öÎļþ"
-
msgid "Write partial file?"
msgstr "ҪдÈ벿·ÖÎļþÂð£¿"
@@ -701,30 +907,38 @@
msgstr "E140: ÇëʹÓà ! À´Ð´È벿·Ö»º³åÇø"
#, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "Òª¸²¸ÇÒÑ´æÔÚµÄÎļþ \"%.*s\"£¿"
+msgid "Overwrite existing file \"%s\"?"
+msgstr "¸²¸ÇÒÑ´æÔÚµÄÎļþ \"%s\" Âð£¿"
+
+#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "½»»»Îļþ \"%s\" ÒÑ´æÔÚ£¬È·ÊµÒª¸²¸ÇÂð£¿"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: ½»»»ÎļþÒÑ´æÔÚ: %s (:silent! Ç¿ÖÆÖ´ÐÐ)"
#, c-format
msgid "E141: No file name for buffer %ld"
msgstr "E141: »º³åÇø %ld ûÓÐÎļþÃû"
msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: ÎļþδдÈ룬ÒòΪ 'write' Ñ¡Ïî¹Ø±Õ"
+msgstr "E142: ÎļþδдÈë: дÈë±» 'write' Ñ¡Ïî½ûÓÃ"
#, c-format
msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
"Do you wish to write anyway?"
msgstr ""
-"\"%.*s\" ÒÑÉ趨 'readonly' Ñ¡Ïî.\n"
-"È·¶¨Òª¸²¸ÇÂð£¿"
+"\"%s\" ÒÑÉ趨 'readonly' Ñ¡Ïî¡£\n"
+"ȷʵҪ¸²¸ÇÂð£¿"
msgid "Edit File"
msgstr "±à¼Îļþ"
#, c-format
msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommands ÒâÍâµØɾ³ýлº³åÇø %s"
+msgstr "E143: ×Ô¶¯ÃüÁîÒâÍâµØɾ³ýÁËлº³åÇø %s"
msgid "E144: non-numeric argument to :z"
msgstr "E144: :z ²»½ÓÊÜ·ÇÊý×ֵIJÎÊý"
@@ -733,232 +947,283 @@
msgstr "E145: rvim ÖнûֹʹÓà shell ÃüÁî"
msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ÕýÔò±í´ïʽ²»ÄÜÓÃ×Öĸ·Ö¸ô (?)"
+msgstr "E146: ÕýÔò±í´ïʽ²»ÄÜÓÃ×Öĸ×÷·Ö½ç"
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Ì滻Ϊ %s (y/n/a/q/^E/^Y)?"
+msgstr "Ì滻Ϊ %s (y/n/a/q/l/^E/^Y)£¿"
msgid "(Interrupted) "
msgstr "(ÒÑÖжÏ) "
+msgid "1 match"
+msgstr "1 ¸öÆ¥Å䣬"
+
msgid "1 substitution"
-msgstr "Ìæ»»Ò»×é"
+msgstr "1 ´ÎÌæ»»£¬"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ¸öÆ¥Å䣬"
#, c-format
msgid "%ld substitutions"
-msgstr "Ìæ»» %ld ×é"
+msgstr "%ld ´ÎÌæ»»£¬"
msgid " on 1 line"
-msgstr " Ò»ÐÐÖÐ"
+msgstr "¹² 1 ÐÐ"
#, c-format
msgid " on %ld lines"
-msgstr " %ld ÐÐÖÐ"
+msgstr "¹² %ld ÐÐ"
msgid "E147: Cannot do :global recursive"
msgstr "E147: :global ²»ÄܵݹéÖ´ÐÐ"
msgid "E148: Regular expression missing from global"
-msgstr "E148: ûÓÐʹÓùýÕýÔò±í´ïʽ (?)"
+msgstr "E148: global ȱÉÙÕýÔò±í´ïʽ"
#, c-format
msgid "Pattern found in every line: %s"
-msgstr "ÿһÐж¼ÕÒ²»µ½Ä£Ê½: %s"
+msgstr "ÿÐж¼Æ¥Åä±í´ïʽ: %s"
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"\n"
"# Last Substitute String:\n"
"$"
msgstr ""
"\n"
-"# Ç°Ò»×éÌæ´ú×Ö·û´®:\n"
+"# ×î½üµÄÌæ»»×Ö·û´®:\n"
"$"
+msgid "E478: Don't panic!"
+msgstr "E478: ²»Òª»Å£¡"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: ±§Ç¸£¬Ã»ÓÐ '%s' µÄ %s µÄ˵Ã÷"
+
#, c-format
msgid "E149: Sorry, no help for %s"
-msgstr "E149: ±§Ç¸, ûÓÐ %s µÄ˵Ã÷"
+msgstr "E149: ±§Ç¸£¬Ã»ÓÐ %s µÄ˵Ã÷"
#, c-format
msgid "Sorry, help file \"%s\" not found"
-msgstr "±§Ç¸, ÕÒ²»µ½°ïÖúÎļþ \"%s\""
+msgstr "±§Ç¸£¬ÕÒ²»µ½°ïÖúÎļþ \"%s\""
#, c-format
msgid "E150: Not a directory: %s"
-msgstr "E150: %s ²»ÊÇĿ¼"
+msgstr "E150: ²»ÊÇĿ¼: %s"
#, c-format
msgid "E152: Cannot open %s for writing"
-msgstr "E152: ²»ÄÜÒÔдÈëģʽ´ò¿ª \"%s\""
+msgstr "E152: ÎÞ·¨´ò¿ª²¢Ð´Èë %s"
#, c-format
msgid "E153: Unable to open %s for reading"
-msgstr "E153: ²»ÄܶÁÈ¡Îļþ: %s"
+msgstr "E153: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ %s"
#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: ±êÇ©(tag) \"%s\" ÔÚÎļþ %s ÀïÖظ´³öÏÖ¶à´Î"
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: ÔÚÒ»ÖÖÓïÑÔÖлìºÏÁ˶àÖÖ°ïÖúÎļþ±àÂë: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Tag \"%s\" ÔÚÎļþ %s/%s ÖÐÖظ´³öÏÖ"
#, c-format
msgid "E160: Unknown sign command: %s"
-msgstr "E160: 䶨ÒåµÄ sign command: %s"
+msgstr "E160: δ֪µÄ sign ÃüÁî: %s"
msgid "E156: Missing sign name"
msgstr "E156: ȱÉÙ sign Ãû³Æ"
-msgid "E255: Too many signs defined"
-msgstr "E326: ÕÒµ½Ì«¶à signs"
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs ¶¨Òå¹ý¶à"
#, c-format
msgid "E239: Invalid sign text: %s"
-msgstr "E239: ²»ÕýÈ·µÄ sign ÎÄ×Ö: %s"
+msgstr "E239: ÎÞЧµÄ sign ÎÄ×Ö: %s"
#, c-format
msgid "E155: Unknown sign: %s"
-msgstr "E155: ²»ÕýÈ·µÄ sign: %s"
+msgstr "E155: δ֪µÄ sign: %s"
msgid "E159: Missing sign number"
-msgstr "E159: ȱÉÙ sign number"
+msgstr "E159: ȱÉÙ sign ºÅ"
#, c-format
msgid "E158: Invalid buffer name: %s"
-msgstr "E158: »º³åÇøÃû³Æ´íÎó: %s"
+msgstr "E158: ÎÞЧµÄ»º³åÇøÃû: %s"
#, c-format
msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Sign ID ´íÎó: %ld"
+msgstr "E157: ÎÞЧµÄ sign ID: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (ÕÒ²»µ½)"
+
+msgid " (not supported)"
+msgstr " (²»Ö§³Ö)"
msgid "[Deleted]"
msgstr "[ÒÑɾ³ý]"
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
-msgstr "½øÈë Ex ģʽ. ÊäÈë \"visua\" ÒԻص½Õý³£Ä£Ê½."
+msgstr "½øÈë Ex ģʽ¡£ÊäÈë \"visual\" »Øµ½Õý³£Ä£Ê½¡£"
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "Òѵ½Îļþ½áβ"
+msgid "E501: At end-of-file"
+msgstr "E501: Òѵ½Îļþĩβ"
msgid "E169: Command too recursive"
msgstr "E169: ÃüÁîµÝ¹é²ãÊý¹ý¶à"
-msgid "E170: Missing :endwhile"
-msgstr "E170: ȱÉÙ :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: ȱÉÙ :endif"
+#, c-format
+msgid "E605: Exception not caught: %s"
+msgstr "E605: Ò쳣ûÓб»²¶»ñ: %s"
msgid "End of sourced file"
-msgstr "ÃüÁîÎļþ½áÊø"
+msgstr "½Å±¾Îļþ½áÊø"
msgid "End of function"
-msgstr "º¯Êý½áβ"
+msgstr "º¯Êý½áÊø"
-msgid "Ambiguous use of user-defined command"
-msgstr "Óû§¶¨ÒåµÄÃüÁî»á»ìÏý"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: ²»È·¶¨µÄÓû§×Ô¶¨ÒåÃüÁî"
-msgid "Not an editor command"
-msgstr "²»ÊDZà¼Æ÷µÄÃüÁî"
+msgid "E492: Not an editor command"
+msgstr "E492: ²»ÊDZà¼Æ÷µÄÃüÁî"
-msgid "Don't panic!"
-msgstr "²»Òª¾ª»Å!"
-
-msgid "Backwards range given"
-msgstr "Ö¸¶¨ÁËÏòÇ°²Î¿¼µÄ·¶Î§"
+msgid "E493: Backwards range given"
+msgstr "E493: ʹÓÃÁËÄæÏòµÄ·¶Î§"
msgid "Backwards range given, OK to swap"
-msgstr "Ö¸¶¨ÁËÏòÇ°²Î¿¼µÄ·¶Î§£¬OK to swap"
+msgstr "ʹÓÃÁËÄæÏòµÄ·¶Î§£¬È·¶¨½»»»Âð"
-msgid "Use w or w>>"
-msgstr "ÇëʹÓà w »ò w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: ÇëʹÓà w »ò w>>"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ±§Ç¸, ±¾ÃüÁîÔÚ´Ë°æ±¾ÖÐδʵÏÖ"
+msgstr "E319: ±§Ç¸£¬ÃüÁîÔÚ´Ë°æ±¾Öв»¿ÉÓÃ"
msgid "E172: Only one file name allowed"
-msgstr "E172: Ö»ÄÜÓÐÒ»¸öÎļþÃû"
+msgstr "E172: Ö»ÔÊÐíÒ»¸öÎļþÃû"
+
+msgid "1 more file to edit. Quit anyway?"
+msgstr "»¹ÓÐ 1 ¸öÎļþδ±à¼¡£È·ÊµÒªÍ˳öÂð£¿"
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "»¹ÓÐ %d ¸öÎļþδ±à¼. È·¶¨ÒªÍ˳ö£¿"
+msgstr "»¹ÓÐ %d ¸öÎļþδ±à¼¡£È·ÊµÒªÍ˳öÂð£¿"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: »¹ÓÐ 1 ¸öÎļþδ±à¼"
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: »¹ÓÐ %ld ¸öÎļþδ±à¼"
-msgid "E174: Command already exists: use ! to redefine"
-msgstr "E174: ÃüÁîÒѾ´æÔÚ, ÇëʹÓà ! Ç¿ÖÆÖØж¨Òå"
+msgid "E174: Command already exists: add ! to replace it"
+msgstr "E174: ÃüÁîÒÑ´æÔÚ: Çë¼Ó ! Ç¿ÖÆÌæ»»"
msgid ""
"\n"
" Name Args Range Complete Definition"
msgstr ""
"\n"
-" Ãû³Æ ²ÎÊý ·¶Î§ ÍêÕû ¶¨Òå "
+" Ãû³Æ ²ÎÊý ·¶Î§ ²¹È« ¶¨Òå "
msgid "No user-defined commands found"
-msgstr "ÕÒ²»µ½Óû§×Ô¶¨ÒåµÄÃüÁî"
+msgstr "ÕÒ²»µ½Óû§×Ô¶¨ÒåÃüÁî"
msgid "E175: No attribute specified"
-msgstr "E175: ûÓÐÖ¸¶¨µÄÊôÐÔ"
+msgstr "E175: ûÓÐÖ¸¶¨ÊôÐÔ"
msgid "E176: Invalid number of arguments"
-msgstr "E176: ²»ÕýÈ·µÄ²ÎÊý¸öÊý"
+msgstr "E176: ÎÞЧµÄ²ÎÊý¸öÊý"
msgid "E177: Count cannot be specified twice"
-msgstr "E177: ²»ÄÜÖ¸¶¨Á½´Î"
+msgstr "E177: ²»ÄÜÖ¸¶¨Á½´Î¼ÆÊý"
msgid "E178: Invalid default value for count"
-msgstr "E178: ¼ÆÊýµÄȱʡֵ²»ÕýÈ·"
+msgstr "E178: ÎÞЧµÄ¼ÆÊýĬÈÏÖµ"
-msgid "E179: argument required for complete"
-msgstr "E179: Ö¸ÁîÐèÒª²ÎÊý²ÅÄÜÍê³É"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ²»ÍêÕûµÄÖµ: '%s'"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete ÐèÒª²ÎÊý"
#, c-format
msgid "E181: Invalid attribute: %s"
-msgstr "E181: ²»ÕýÈ·µÄÊôÐÔ: %s"
+msgstr "E181: ÎÞЧµÄÊôÐÔ: %s"
msgid "E182: Invalid command name"
-msgstr "E182: ÃüÁîÃû³Æ²»ÕýÈ·"
+msgstr "E182: ÎÞЧµÄÃüÁîÃû"
msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: Óû§×Ô¶¨ÒåÃüÁî±ØÐëÒÔ´óд×Öĸ¿ªÊ¼"
+msgstr "E183: Óû§×Ô¶¨ÒåÃüÁî±ØÐëÒÔ´óд×Öĸ¿ªÍ·"
#, c-format
msgid "E184: No such user-defined command: %s"
-msgstr "E184: ûÓÐÓû§×Ô¶¨ÒåµÄÃüÁ %s"
+msgstr "E184: ûÓÐÕâ¸öÓû§×Ô¶¨ÒåÃüÁî: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: ÎÞЧµÄ²¹È«ÀàÐÍ: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Ö»ÓÐ custom ²¹È«²ÅÔÊÐí²ÎÊý"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Custom ²¹È«ÐèÒªÒ»¸öº¯Êý²ÎÊý"
#, c-format
msgid "E185: Cannot find color scheme %s"
-msgstr "E185: ÕÒ²»µ½ÑÕÉ«Ñùʽ %s"
+msgstr "E185: ÕÒ²»µ½ÑÕÉ«Ö÷Ìâ %s"
msgid "Greetings, Vim user!"
-msgstr "ÄãºÃ, Vim Óû§£¡"
+msgstr "ÄúºÃ£¬Vim Óû§£¡"
+
+msgid "E784: Cannot close last tab page"
+msgstr "E784: ²»ÄܹرÕ×îºóÒ»¸ö tab Ò³"
+
+msgid "Already only one tab page"
+msgstr "ÒѾֻʣһ¸ö tab Ò³ÁË"
msgid "Edit File in new window"
msgstr "ÔÚд°¿Ú±à¼Îļþ"
+#, c-format
+msgid "Tab page %d"
+msgstr "Tab ҳ %d"
+
msgid "No swap file"
msgstr "ÎÞ½»»»Îļþ"
msgid "Append File"
-msgstr "¸½¼ÓÎļþ"
+msgstr "×·¼ÓÎļþ"
+
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: ²»ÄܸıäĿ¼£¬»º³åÇøÒÑÐÞ¸Ä (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E186: No previous directory"
msgstr "E186: Ç°Ò»¸öĿ¼²»´æÔÚ"
msgid "E187: Unknown"
-msgstr "E187: ²»ÄÜʶ±ðµÄ±ê¼Ç"
+msgstr "E187: δ֪"
+
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize ÐèÒªÁ½¸öÊý×Ö²ÎÊý"
#, c-format
msgid "Window position: X %d, Y %d"
msgstr "´°¿ÚλÖÃ: X %d, Y %d"
msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: ÔÚÄúµÄƽ̨Éϲ»ÄÜ»ñµÃ´°¿ÚλÖÃ"
+msgstr "E188: ÔÚ´Ëƽ̨Éϲ»ÄÜ»ñµÃ´°¿ÚλÖÃ"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos ÐèÒªÁ½¸öÊý×Ö²ÎÊý"
msgid "Save Redirection"
msgstr "±£´æÖض¨Ïò"
@@ -973,85 +1238,170 @@
msgstr "±£´æÉ趨"
#, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
-msgstr "E189: \"%s\" ÒÑ´æÔÚ (ÇëÓÃ ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: ÎÞ·¨´´½¨Ä¿Â¼: %s"
+
+#, c-format
+msgid "E189: \"%s\" exists (add ! to override)"
+msgstr "E189: \"%s\" ÒÑ´æÔÚ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: ²»ÄÜÒÔдÈëģʽ´ò¿ª \"%s\""
+msgstr "E190: ÎÞ·¨´ò¿ª²¢Ð´Èë \"%s\""
#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ²ÎÊý±ØÐëÊÇÓ¢ÎÄ×Öĸ»òÏòÇ°/ºóµÄÒýºÅ"
+msgstr "E191: ²ÎÊý±ØÐëÊÇÒ»¸ö×Öĸ»òÕßÕý/·´ÒýºÅ"
msgid "E192: Recursive use of :normal too deep"
msgstr "E192: :normal µÝ¹é²ãÊý¹ýÉî"
-msgid ":if nesting too deep"
-msgstr ":if ²ãÊý¹ýÉî"
-
-msgid ":endif without :if"
-msgstr ":endif ȱÉÙ¶ÔÓ¦µÄ :if"
-
-msgid ":else without :if"
-msgstr ":else ȱÉÙ¶ÔÓ¦µÄ :if"
-
-msgid ":elseif without :if"
-msgstr ":elseif ȱÉÙ¶ÔÓ¦µÄ :if"
-
-msgid ":while nesting too deep"
-msgstr ":while ²ãÊý¹ýÉî"
-
-msgid ":continue without :while"
-msgstr ":continue ȱÉÙ¶ÔÓ¦µÄ :while"
-
-msgid ":break without :while"
-msgstr ":break ȱÉÙ¶ÔÓ¦µÄ :while"
-
-msgid ":endwhile without :while"
-msgstr ":endwhile ȱÉÙ¶ÔÓ¦µÄ :while"
-
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction ±ØÐëÔÚº¯ÊýÄÚ²¿Ê¹ÓÃ"
-
msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: ûÓÐ '#' ¿ÉÌæ´úµÄÎļþÃû"
+msgstr "E194: ûÓÐÓÃÓÚÌæ»» '#' µÄ½»ÌæÎļþÃû"
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "ûÓÐ Autocommand ÎļþÃûÒÔÌæ»» \"<afile>\""
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: ûÓÐÓÃÓÚÌæ»» \"<afile>\" µÄ×Ô¶¯ÃüÁîÎļþÃû"
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "ûÓÐ Autocommand »º³åÇøÃû³ÆÒÔÌæ»» \"<abuf>\""
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: ûÓÐÓÃÓÚÌæ»» \"<abuf>\" µÄ×Ô¶¯ÃüÁ³åÇøºÅ"
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "ûÓÐ Autocommand Match name ÒÔÌæ»» \"<amatch>\""
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: ûÓÐÓÃÓÚÌæ»» \"<amatch>\" µÄ×Ô¶¯ÃüÁîÆ¥ÅäÃû"
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "ûÓÐ :source ÎļþÃûÒÔÌæ»» \"<sfile>\""
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: ûÓÐÓÃÓÚÌæ»» \"<sfile>\" µÄ :source ÎļþÃû"
#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' »ò '#' Ö¸Ïò¿ÕÎļþÃû£¬Ö»ÄÜÓÃì¶ \":p:h\""
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' »ò '#' Ϊ¿ÕÎļþÃû£¬Ö»ÄÜÓÃÓÚ \":p:h\""
-msgid "Evaluates to an empty string"
-msgstr "ÊäÈëΪ¿Õ×Ö·û´®"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: ½á¹ûΪ¿Õ×Ö·û´®"
msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: ²»ÄܶÁÈ¡ viminfo"
+msgstr "E195: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ viminfo Îļþ"
msgid "E196: No digraphs in this version"
-msgstr "E196: ±¾°æ±¾ÎÞ¸´ºÏ×Ö·û(digraph)"
+msgstr "E196: ´Ë°æ±¾ÎÞ¸´ºÏ×Ö·û(digraph)"
-msgid "tagname"
-msgstr "±êÇ©Ãû³Æ"
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: ²»ÄÜ :throw ǰ׺Ϊ 'Vim' µÄÒì³£"
-msgid " kind file\n"
-msgstr "ÀàÎļþ\n"
-
-msgid "'history' option is zero"
-msgstr "Ñ¡Ïî 'history' ÊÇÁã"
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "Å׳öÒì³£: %s"
#, c-format
+msgid "Exception finished: %s"
+msgstr "Íê³ÉÒì³£: %s"
+
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "¶ªÆúÒì³£: %s"
+
+#, c-format
+msgid "%s, line %ld"
+msgstr "%s£¬µÚ %ld ÐÐ"
+
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception caught: %s"
+msgstr "²¶»ñÒì³£: %s"
+
+#, c-format
+#~ msgid "%s made pending"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "%s resumed"
+#~ msgstr " ÒÑ·µ»Ø\n"
+
+#, c-format
+#~ msgid "%s discarded"
+#~ msgstr ""
+
+msgid "Exception"
+msgstr "Òì³£"
+
+msgid "Error and interrupt"
+msgstr "´íÎóºÍÖжÏ"
+
+msgid "Error"
+msgstr "´íÎó"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "ÖжÏ"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: :if ǶÌײãÊý¹ýÉî"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif ȱÉÙ¶ÔÓ¦µÄ :if"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else ȱÉÙ¶ÔÓ¦µÄ :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif ȱÉÙ¶ÔÓ¦µÄ :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: ¶à¸ö :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif ÔÚ :else ºóÃæ"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while/:for ǶÌײãÊý¹ýÉî"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue ȱÉÙ¶ÔÓ¦µÄ :while »ò :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break ȱÉÙ¶ÔÓ¦µÄ :while »ò :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :while ÒÔ :endfor ½áβ"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :for ÒÔ :endwhile ½áβ"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: :try ǶÌײãÊý¹ýÉî"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch ȱÉÙ¶ÔÓ¦µÄ :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch ÔÚ :finally ºóÃæ"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally ȱÉÙ¶ÔÓ¦µÄ :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: ¶à¸ö :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry ȱÉÙ¶ÔÓ¦µÄ :try"
+
+msgid "E193: :endfunction not inside a function"
+msgstr "E193: :endfunction ²»ÔÚº¯ÊýÄÚ"
+
+msgid "tagname"
+msgstr "tag Ãû"
+
+msgid " kind file\n"
+msgstr " ÀàÐÍ Îļþ\n"
+
+msgid "'history' option is zero"
+msgstr "Ñ¡Ïî 'history' ΪÁã"
+
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
msgid ""
"\n"
"# %s History (newest to oldest):\n"
@@ -1075,10 +1425,10 @@
msgstr "E198: cmd_pchar ³¬¹ýÃüÁ¶È"
msgid "E199: Active window or buffer deleted"
-msgstr "E199: ÒÑɾ³ý»î¶¯´°¿Ú»ò»º´æ"
+msgstr "E199: »î¶¯´°¿Ú»ò»º³åÇøÒѱ»É¾³ý"
msgid "Illegal file name"
-msgstr "²»ÕýÈ·µÄÎļþÃû"
+msgstr "ÎÞЧµÄÎļþÃû"
msgid "is a directory"
msgstr "ÊÇĿ¼"
@@ -1087,26 +1437,32 @@
msgstr "²»ÊÇÎļþ"
msgid "[New File]"
-msgstr "[δÃüÃû]"
+msgstr "[ÐÂÎļþ]"
+
+msgid "[New DIRECTORY]"
+msgstr "[ÐÂĿ¼]"
+
+msgid "[File too big]"
+msgstr "[Îļþ¹ý´ó]"
msgid "[Permission Denied]"
msgstr "[ȨÏÞ²»×ã]"
msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre Autocommand ʹ³ÌÐò²»ÄܶÁÈ¡´ËÎļþ"
+msgstr "E200: *ReadPre ×Ô¶¯ÃüÁîµ¼ÖÂÎļþ²»¿É¶Á"
msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *Filter* Autocommand ²»¿ÉÒÔ¸ü¸Ä»º³åÇøµÄÄÚÈÝ"
+msgstr "E201: *ReadPre ×Ô¶¯ÃüÁî²»ÔÊÐí¸Ä±äµ±Ç°»º³åÇø"
msgid "Vim: Reading from stdin...\n"
msgstr "Vim: ´Ó±ê×¼ÊäÈë¶ÁÈ¡...\n"
msgid "Reading from stdin..."
-msgstr "´Ó±ê×¼ÊäÈë¶Á..."
+msgstr "´Ó±ê×¼ÊäÈë¶ÁÈ¡..."
#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ת»»´íÎó"
+msgstr "E202: ת»»µ¼ÖÂÎļþ²»¿É¶Á"
msgid "[fifo/socket]"
msgstr "[fifo/socket]"
@@ -1121,13 +1477,13 @@
msgstr "[Ö»¶Á]"
msgid "[CR missing]"
-msgstr "[ȱÉÙCR]'"
+msgstr "[ȱÉÙ CR]'"
msgid "[NL found]"
-msgstr "[ÕÒµ½NL]"
+msgstr "[ÕÒµ½ NL]"
msgid "[long lines split]"
-msgstr "[·Ö¸î¹ý³¤ÐÐ]"
+msgstr "[³¤Ðзָî]"
msgid "[NOT converted]"
msgstr "[δת»»]"
@@ -1138,74 +1494,92 @@
msgid "[crypted]"
msgstr "[ÒѼÓÃÜ]"
-msgid "[CONVERSION ERROR]"
-msgstr "ת»»´íÎó"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[µÚ %ld ÐÐת»»´íÎó]"
+
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[µÚ %ld ÐÐÎÞЧ×Ö·û]"
msgid "[READ ERRORS]"
msgstr "[¶Á´íÎó]"
msgid "Can't find temp file for conversion"
-msgstr "ÕÒ²»µ½×ª»»ÓõÄÁÙʱÎļþ"
+msgstr "ÕÒ²»µ½ÓÃÓÚת»»µÄÁÙʱÎļþ"
msgid "Conversion with 'charconvert' failed"
-msgstr "×Ö·û¼¯×ª»»´íÎó"
+msgstr "'charconvert' ת»»Ê§°Ü"
msgid "can't read output of 'charconvert'"
-msgstr "²»ÄܶÁÈ¡ 'charconvert' µÄÊä³ö"
+msgstr "ÎÞ·¨¶ÁÈ¡ 'charconvert' µÄÊä³ö"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: ÕÒ²»µ½ acwrite »º³åÇø¶ÔÓ¦µÄ×Ô¶¯ÃüÁî"
msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Autocommand ɾ³ý»òÊÍ·ÅÁËҪдÈëµÄ»º³åÇø"
+msgstr "E203: ×Ô¶¯ÃüÁîɾ³ý»òÊÍ·ÅÁËҪдÈëµÄ»º³åÇø"
msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand ÒâÍâµØ¸Ä±äÁËÐкÅ"
+msgstr "E204: ×Ô¶¯ÃüÁîÒâÍâµØ¸Ä±äÁËÐÐÊý"
+
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans ²»ÔÊÐíδÐ޸ĵĻº³åÇøдÈë"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeans ²»ÔÊÐí»º³åÇø²¿·ÖдÈë"
msgid "is not a file or writable device"
msgstr "²»ÊÇÎļþ»ò¿ÉдµÄÉ豸"
-msgid "is read-only (use ! to override)"
-msgstr "ÊÇÖ»¶ÁÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "is read-only (add ! to override)"
+msgstr "Ö»¶Á (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Can't write to backup file (use ! to override)"
-msgstr "²»ÄÜд±¸·ÝÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: ÎÞ·¨Ð´È뱸·ÝÎļþ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Close error for backup file (use ! to override)"
-msgstr "¹Ø±Õ±¸·ÝÎļþ³ö´í (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: ¹Ø±Õ±¸·ÝÎļþ³ö´í (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Can't read file for backup (use ! to override)"
-msgstr "²»ÄܶÁÈ¡ÎļþÒÔ¹©±¸·Ý (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: ÎÞ·¨¶ÁÈ¡ÎļþÒÔ¹©±¸·Ý (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Cannot create backup file (use ! to override)"
-msgstr "²»ÄÜ´´½¨±¸·ÝÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: ÎÞ·¨´´½¨±¸·ÝÎļþ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Can't make backup file (use ! to override)"
-msgstr "²»ÄÜ×÷±¸·ÝÎļþ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: ÎÞ·¨Éú³É±¸·ÝÎļþ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork »áÏûʧ (ÇëʹÓà ! Ç¿ÖÆÖ´ÐÐ)"
+#, fuzzy
+#~ msgid "E460: The resource fork would be lost (add ! to override)"
+#~ msgstr "E460: Resource fork »áÏûʧ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E214: Can't find temp file for writing"
-msgstr "E214: ÕÒ²»µ½Ð´ÈëÓõĽ»»»Îļþ"
+msgstr "E214: ÕÒ²»µ½ÓÃÓÚдÈëµÄÁÙʱÎļþ"
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: ²»ÄÜת»» (ÇëʹÓà ! Ç¿ÖƲ»×ª»»Ð´Èë)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: ÎÞ·¨×ª»» (Çë¼Ó ! Ç¿ÖƲ»×ª»»Ð´Èë)"
msgid "E166: Can't open linked file for writing"
-msgstr "E166: ²»ÄÜÒÔдÈëģʽ´ò¿ªÁ´½ÓÎļþ"
+msgstr "E166: ÎÞ·¨´ò¿ª²¢Ð´ÈëÁ´½ÓÎļþ"
msgid "E212: Can't open file for writing"
-msgstr "E212: ²»ÄÜÒÔдÈëģʽ´ò¿ª"
+msgstr "E212: ÎÞ·¨´ò¿ª²¢Ð´ÈëÎļþ"
-msgid "Close failed"
-msgstr "¹Ø±Õʧ°Ü"
+msgid "E667: Fsync failed"
+msgstr "E667: ͬ²½Ê§°Ü"
-msgid "write error, conversion failed"
-msgstr "²»ÄÜдÈë -- ת»»Ê§°Ü"
+msgid "E512: Close failed"
+msgstr "E512: ¹Ø±Õʧ°Ü"
-msgid "write error (file system full?)"
-msgstr "дÈë´íÎó (ÎļþϵͳÒÑÂú£¿)"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: дÈë´íÎó£¬×ª»»Ê§°Ü (Ç뽫 'fenc' ÖÿÕÒÔÇ¿ÖÆÖ´ÐÐ)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: дÈë´íÎó (ÎļþϵͳÒÑÂú£¿)"
msgid " CONVERSION ERROR"
-msgstr "ת»»´íÎó"
+msgstr " ת»»´íÎó"
msgid "[Device]"
msgstr "[É豸]"
@@ -1214,35 +1588,35 @@
msgstr "[ÐÂ]"
msgid " [a]"
-msgstr "[a]"
+msgstr " [a]"
msgid " appended"
-msgstr " ÒѸ½¼Ó"
+msgstr " ÒÑ×·¼Ó"
msgid " [w]"
-msgstr "[w]"
+msgstr " [w]"
msgid " written"
msgstr " ÒÑдÈë"
msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch ģʽ: ²»ÄÜ´¢´æÔʼÎļþ"
+msgstr "E205: Patchmode: ÎÞ·¨±£´æÔʼÎļþ"
msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patch ģʽ: ²»Äܸıä¿ÕµÄÔʼÎļþ"
+msgstr "E206: Patchmode: ÎÞ·¨Éú³É¿ÕµÄÔʼÎļþ"
msgid "E207: Can't delete backup file"
-msgstr "E207: ²»ÄÜɾ³ý±¸·ÝÎļþ"
+msgstr "E207: ÎÞ·¨É¾³ý±¸·ÝÎļþ"
msgid ""
"\n"
"WARNING: Original file may be lost or damaged\n"
msgstr ""
"\n"
-"¾¯¸æ: ÔʼÎļþ¶ªÊ§»òËð»µ\n"
+"¾¯¸æ: ÔʼÎļþ¿ÉÄÜÒѶªÊ§»òËð»µ\n"
msgid "don't quit the editor until the file is successfully written!"
-msgstr "ÔÚÎļþÕýȷдÈëÇ°ÇëÎðÍ˳ö±à¼Æ÷!"
+msgstr "ÔÚÎļþÕýȷдÈëÇ°ÇëÎðÍ˳ö±à¼Æ÷£¡"
msgid "[dos]"
msgstr "[dos]"
@@ -1263,18 +1637,18 @@
msgstr "[unix ¸ñʽ]"
msgid "1 line, "
-msgstr "1 ÐÐ, "
+msgstr "1 ÐУ¬"
#, c-format
msgid "%ld lines, "
-msgstr "%ld ÐÐ, "
+msgstr "%ld ÐУ¬"
msgid "1 character"
-msgstr "Ò»¸ö×Ö·û"
+msgstr "1 ¸ö×Ö·û"
#, c-format
msgid "%ld characters"
-msgstr "%ld¸ö×Ö·û"
+msgstr "%ld ¸ö×Ö·û"
msgid "[noeol]"
msgstr "[noeol]"
@@ -1286,47 +1660,56 @@
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "¾¯¸æ: ±¾Îļþ×ÔÉϴζÁÈëºóÒѱ䶯!!!"
+msgstr "¾¯¸æ: ´ËÎļþ×Ô¶ÁÈëºóÒÑ·¢Éú±ä¶¯£¡£¡£¡"
msgid "Do you really want to write to it"
-msgstr "È·¶¨ÒªÐ´ÈëÂð"
+msgstr "ȷʵҪдÈëÂð"
#, c-format
msgid "E208: Error writing to \"%s\""
-msgstr "E208: дÈëÎļþ \"%s\" ´íÎó"
+msgstr "E208: дÈëÎļþ \"%s\" ³ö´í"
#, c-format
msgid "E209: Error closing \"%s\""
-msgstr "E209: ¹Ø±ÕÎļþ \"%s\" ´íÎó"
+msgstr "E209: ¹Ø±ÕÎļþ \"%s\" ³ö´í"
#, c-format
msgid "E210: Error reading \"%s\""
-msgstr "E210: ¶ÁÈ¡Îļþ \"%s\" ´íÎó"
+msgstr "E210: ¶ÁÈ¡Îļþ \"%s\" ³ö´í"
msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell autocommand ɾ³ý»º³åÇø"
+msgstr "E246: FileChangedShell ×Ô¶¯ÃüÁîɾ³ýÁË»º³åÇø"
#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: ¾¯¸æ: Îļþ \"%s\" ÒѾ²»´æÔÚ"
+msgid "E211: File \"%s\" no longer available"
+msgstr "E211: Îļþ \"%s\" ÒѾ²»´æÔÚ"
#, c-format
msgid ""
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
-msgstr "W12: ¾¯¸æ: Îļþ \"%s\" ×ÔÉϴζÁÈëºóÒѱ䶯, ¶øÇÒ±à¼ÖеĻº³åÇøÒ²¸ü¶¯ÁË"
+msgstr "W12: ¾¯¸æ: Îļþ \"%s\" Òѱ䶯£¬²¢ÇÒÔÚ Vim ÖеĻº³åÇøÒ²Òѱ䶯"
+
+msgid "See \":help W12\" for more info."
+msgstr "½øÒ»²½ËµÃ÷Çë¼û \":help W12\""
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ¾¯¸æ: Îļþ \"%s\" ×ÔÉϴζÁÈëºóÒѸıä"
+msgstr "W11: ¾¯¸æ: ±à¼¿ªÊ¼ºó£¬Îļþ \"%s\" Òѱ䶯"
+
+msgid "See \":help W11\" for more info."
+msgstr "½øÒ»²½ËµÃ÷Çë¼û \":help W11\""
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ¾¯¸æ: Îļþ \"%s\" ×ÔÉϴζÁÈëºóÒѸıä"
+msgstr "W16: ¾¯¸æ: ±à¼¿ªÊ¼ºó£¬Îļþ \"%s\" µÄģʽÒѱ䶯"
+
+msgid "See \":help W16\" for more info."
+msgstr "½øÒ»²½ËµÃ÷Çë¼û \":help W16\""
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ¾¯¸æ: Îļþ \"%s\" ÔÚ¿ªÊ¼±à¼ºóÓÖ±»´´½¨ÁË"
+msgstr "W13: ¾¯¸æ: ±à¼¿ªÊ¼ºó£¬Îļþ \"%s\" Òѱ»´´½¨"
msgid "Warning"
msgstr "¾¯¸æ"
@@ -1339,124 +1722,139 @@
"¼ÓÔØÎļþ(&L)"
#, c-format
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: ÎÞ·¨ÎªÖØмÓÔØ \"%s\" ×ö×¼±¸"
+
+#, c-format
msgid "E321: Could not reload \"%s\""
-msgstr "E321: ²»ÄÜÖØмÓÔØ \"%s\""
+msgstr "E321: ÎÞ·¨ÖØмÓÔØ \"%s\""
msgid "--Deleted--"
msgstr "--ÒÑɾ³ý--"
+#, c-format
+#~ msgid "auto-removing autocommand: %s <buffer=%d>"
+#~ msgstr ""
+
#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
-msgstr "E367: ×é²»´æÔÚ: \"%s\""
+msgstr "E367: ÎÞ´Ë×é: \"%s\""
#, c-format
msgid "E215: Illegal character after *: %s"
-msgstr "E215: * ºóÃæÓв»ÕýÈ·µÄ×Ö·û: %s"
+msgstr "E215: * ºóÃæÓÐÎÞЧ×Ö·û: %s"
#, c-format
msgid "E216: No such event: %s"
msgstr "E216: ÎÞ´Ëʼþ: %s"
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: ÎÞ´Ë×é»òʼþ: %s"
+
#. Highlight title
msgid ""
"\n"
"--- Auto-Commands ---"
msgstr ""
"\n"
-"--- Auto-Commands ---"
+"--- ×Ô¶¯ÃüÁî ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: ÎÞЧµÄ»º³åÇøºÅ "
msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ²»ÄܶÔËùÓÐʼþÖ´ÐÐ autocommand"
+msgstr "E217: ²»ÄܶÔËùÓÐʼþÖ´ÐÐ×Ô¶¯ÃüÁî"
msgid "No matching autocommands"
-msgstr "ÕÒ²»µ½¶ÔÓ¦µÄ autocommand"
+msgstr "ûÓÐÆ¥ÅäµÄ×Ô¶¯ÃüÁî"
msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand ²ãÊý¹ýÉî"
+msgstr "E218: ×Ô¶¯ÃüÁîǶÌײãÊý¹ýÉî"
#, c-format
msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgstr "%s ×Ô¶¯ÃüÁî \"%s\""
#, c-format
msgid "Executing %s"
msgstr "Ö´ÐÐ %s"
-#. always scroll up, don't overwrite
#, c-format
msgid "autocommand %s"
-msgstr "autocommand %s"
+msgstr "×Ô¶¯ÃüÁî %s"
msgid "E219: Missing {."
-msgstr "E219: ȱÉÙ {."
+msgstr "E219: ȱÉÙ {¡£"
msgid "E220: Missing }."
-msgstr "E220: ȱÉÙ }."
+msgstr "E220: ȱÉÙ }¡£"
-msgid "No fold found"
-msgstr "ÕÒ²»µ½ÈκΠfold"
+msgid "E490: No fold found"
+msgstr "E490: ÕÒ²»µ½ÕÛµþ"
msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: ²»ÄÜÔÚÄ¿Ç°µÄ 'foldmethod' Ï´´½¨ fold"
+msgstr "E350: ²»ÄÜÔÚµ±Ç°µÄ 'foldmethod' Ï´´½¨ÕÛµþ"
msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: ²»ÄÜÔÚÄ¿Ç°µÄ 'foldmethod' ÏÂɾ³ý fold"
+msgstr "E351: ²»ÄÜÔÚµ±Ç°µÄ 'foldmethod' ÏÂɾ³ýÕÛµþ"
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: Ñ¡Ïî 'commentstring' δÉ趨"
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--ÒÑÕÛµþ %3ld ÐÐ"
msgid "E222: Add to read buffer"
-msgstr "E222: ¼ÓÈë¶Á»º³åÖÐ"
+msgstr "E222: Ìí¼Óµ½ÒѶÁ»º³åÇøÖÐ"
msgid "E223: recursive mapping"
-msgstr "E223: µÝ¹é mapping"
+msgstr "E223: µÝ¹éÓ³Éä"
#, c-format
msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s ÒѾÓÐÈ«¾Ö abbreviation ÁË"
+msgstr "E224: È«¾ÖËõд %s ÒÑ´æÔÚ"
#, c-format
msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s ÒѾÓÐÈ«¾Ö mapping ÁË"
+msgstr "E225: È«¾ÖÓ³Éä %s ÒÑ´æÔÚ"
#, c-format
msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s ÒѾÓÐ abbreviation ÁË"
+msgstr "E226: Ëõд %s ÒÑ´æÔÚ"
#, c-format
msgid "E227: mapping already exists for %s"
-msgstr "E227: %s µÄ mapping ÒѾ´æÔÚ"
+msgstr "E227: Ó³Éä %s ÒÑ´æÔÚ"
msgid "No abbreviation found"
msgstr "ÕÒ²»µ½Ëõд"
msgid "No mapping found"
-msgstr "ûÓÐÕâ¸ö¶ÔÓ¦"
+msgstr "ÕÒ²»µ½Ó³Éä"
msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ²»ÕýÈ·µÄģʽ"
+msgstr "E228: makemap: ÎÞЧµÄģʽ"
msgid "<cannot open> "
-msgstr "<²»ÄÜ´ò¿ª>"
+msgstr "<ÎÞ·¨´ò¿ª>"
#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: ²»ÄÜʹÓà %s ×ÖÌå"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: ÎÞ·¨»ñÈ¡×ÖÌå %s"
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: ²»Äܻص½Ä¿Ç°Ä¿Â¼"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: ÎÞ·¨·µ»Øµ±Ç°Ä¿Â¼"
msgid "Pathname:"
msgstr "·¾¶:"
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: ²»ÄÜÈ¡µÃĿǰĿ¼"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: ÎÞ·¨»ñÈ¡µ±Ç°Ä¿Â¼"
msgid "OK"
msgstr "È·¶¨"
-#. 'Cancel' button
msgid "Cancel"
msgstr "È¡Ïû"
@@ -1464,45 +1862,68 @@
msgstr "Vim ¶Ô»°¿ò"
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "¹ö¶¯Ìõ: ²»ÄÜÉ趨 thumb pixmap µÄλÖÃ"
+msgstr "¹ö¶¯Ìõ²¿¼þ: ÎÞ·¨»ñÈ¡»¬¿éͼÏñµÄ¼¸ºÎ´óС"
msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: ²»ÄܶÔÐÅÏ¢Óë callback ´´½¨ BallonEval"
+msgstr "E232: ²»ÄÜͬʱʹÓÃÏûÏ¢ºÍ»Øµ÷º¯ÊýÀ´´´½¨ BalloonEval"
msgid "E229: Cannot start the GUI"
-msgstr "E229: ²»ÄÜÆô¶¯Í¼ÐͽçÃæ"
+msgstr "E229: ÎÞ·¨Æô¶¯Í¼ÐνçÃæ"
#, c-format
msgid "E230: Cannot read from \"%s\""
msgstr "E230: ²»ÄܶÁÈ¡Îļþ \"%s\""
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ÎÞ·¨Æô¶¯Í¼ÐνçÃ棬ÕÒ²»µ½ÓÐЧµÄ×ÖÌå"
+
msgid "E231: 'guifontwide' invalid"
-msgstr "E231: ²»ÕýÈ·µÄ 'guifontwide'"
+msgstr "E231: ÎÞЧµÄ 'guifontwide'"
-msgid "Error"
-msgstr "´íÎó"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' µÄÖµÎÞЧ"
-msgid "&Ok"
-msgstr "È·¶¨(&O)"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: ÎÞ·¨·ÖÅäÑÕÉ« %s"
+
+msgid "No match at cursor, finding next"
+msgstr "ÔÚ¹â±ê´¦Ã»ÓÐÆ¥Å䣬²éÕÒÏÂÒ»¸ö"
msgid "Vim dialog..."
msgstr "Vim ¶Ô»°¿ò..."
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"ÊÇ(&Y)\n"
+"·ñ(&N)\n"
+"È¡Ïû(&C)"
+
+msgid "Input _Methods"
+msgstr "ÊäÈë·¨(_M)"
+
msgid "VIM - Search and Replace..."
-msgstr "VIM - ²éÕÒÓëÌæ»»..."
+msgstr "VIM - ²éÕÒºÍÌæ»»..."
msgid "VIM - Search..."
msgstr "VIM - ²éÕÒ..."
msgid "Find what:"
-msgstr "²éÕÒ:"
+msgstr "²éÕÒÄÚÈÝ:"
msgid "Replace with:"
msgstr "Ì滻Ϊ:"
-#. exact match only button
-msgid "Match exact word only"
-msgstr "ֻƥÅäÍêÈ«ÏàͬµÄ×Ö"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "Æ¥ÅäÍêÕûµÄ´Ê"
+
+#. match case button
+msgid "Match case"
+msgstr "Æ¥Åä´óСд"
msgid "Direction"
msgstr "·½Ïò"
@@ -1514,108 +1935,130 @@
msgid "Down"
msgstr "ÏòÏÂ"
-#. 'Find Next' button
msgid "Find Next"
-msgstr "ÕÒÏÂÒ»¸ö"
+msgstr "²éÕÒÏÂÒ»¸ö"
-#. 'Replace' button
msgid "Replace"
msgstr "Ìæ»»"
-#. 'Replace All' button
msgid "Replace All"
-msgstr "Ì滻ȫ²¿"
+msgstr "È«²¿Ìæ»»"
-msgid "E233: cannot open display"
-msgstr "E233: <²»ÄÜ´ò¿ª X Server DISPLAY>"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: ´Ó»á»°¹ÜÀíÆ÷ÊÕµ½ \"die\" ÇëÇó\n"
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: ²»ÕýÈ·µÄ×Ö·û¼¯ (Fontset): %s"
+msgid "Close"
+msgstr "¹Ø±Õ"
+
+msgid "New tab"
+msgstr "н¨±êÇ©"
+
+msgid "Open Tab..."
+msgstr "´ò¿ª±êÇ©..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Ö÷´°¿Ú±»ÒâÍâµØ´Ý»Ù\n"
msgid "Font Selection"
-msgstr "×ÖÌåÑ¡Ôñ"
-
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "²»ÕýÈ·µÄ×ÖÌåÃû³Æ: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: \"%s\" ²»Êǹ̶¨¿í¶È×ÖÌå"
-
-#, c-format
-msgid "E242: Color name not recognized: %s"
-msgstr "E242: %s Ϊ²»ÄÜʶ±ðµÄÑÕÉ«Ãû³Æ"
+msgstr "Ñ¡Ôñ×ÖÌå"
msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "ʹÓà CUT_BUFFER0 À´Ìæ»»¿ÕÑ¡Ôñ"
+msgstr "ʹÓà CUT_BUFFER0 À´È¡´ú¿ÕÑ¡Ôñ"
-msgid "Filter"
-msgstr "¹ýÂËÆ÷"
+msgid "&Filter"
+msgstr "¹ýÂË(&F)"
+
+msgid "&Cancel"
+msgstr "È¡Ïû(&C)"
msgid "Directories"
msgstr "Ŀ¼"
-msgid "Help"
-msgstr "°ïÖú"
+msgid "Filter"
+msgstr "¹ýÂËÆ÷"
+
+msgid "&Help"
+msgstr "°ïÖú(&H)"
msgid "Files"
msgstr "Îļþ"
+msgid "&OK"
+msgstr "È·¶¨(&O)"
+
msgid "Selection"
msgstr "Ñ¡Ôñ"
-msgid "Undo"
-msgstr "³·Ïû"
+msgid "Find &Next"
+msgstr "²éÕÒÏÂÒ»¸ö(&N)"
+
+msgid "&Replace"
+msgstr "Ìæ»»(&R)"
+
+msgid "Replace &All"
+msgstr "È«²¿Ìæ»»(&A)"
+
+msgid "&Undo"
+msgstr "³·Ïú(&U)"
#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: ²»ÄÜ´ò¿ª Zap ×ÖÌå '%s'"
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: ÎÞ·¨¼ÓÔØ Zap ×ÖÌå '%s'"
#, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: ²»ÄÜʹÓÃ×ÖÌå %s"
-
-#, c-format
-msgid "E242: Missing color: %s"
-msgstr "E242: ÕÒ²»µ½ÑÕÉ«: %s"
+msgid "E611: Can't use font %s"
+msgstr "E611: ÎÞ·¨Ê¹ÓÃ×ÖÌå %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
-"ÕýÔÚ·¢ËÍÖжÏ×Ó³ÌÐòµÄÐÅÏ¢.\n"
+"ÕýÔÚ·¢ËÍÏûÏ¢ÖÕÖ¹×Ó½ø³Ì¡£\n"
+
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: ÕÒ²»µ½´°¿Ú±êÌâ \"%s\""
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ²»Ö§³Ö²ÎÊý \"-%s\"¡£ÇëÓà OLE °æ±¾¡£"
+msgstr "E243: ²»Ö§³ÖµÄ²ÎÊý: \"-%s\"£»ÇëʹÓà OLE °æ±¾¡£"
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: ÎÞ·¨ÔÚ MDI Ó¦ÓóÌÐòÖдò¿ª´°¿Ú"
msgid "Find string (use '\\\\' to find a '\\')"
-msgstr "²éÕÒ×Ö·û´® (ʹÓà '\\\\' À´±íʾ '\\')"
+msgstr "²éÕÒ×Ö·û´® (ʹÓà '\\\\' À´²éÕÒ '\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')"
-msgstr "²éÕÒ¼°Ìæ»»×Ö·û´® (ʹÓà '\\\\' À´±íʾ '\\')"
+msgstr "²éÕÒºÍÌæ»»×Ö·û´® (ʹÓà '\\\\' À´²éÕÒ '\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "δʹÓÃ"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Ŀ¼\t*.nothing\n"
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-msgstr "Vim E458: ²»ÄÜÅäÖà color map ¶ÔÏó£¬ÓÐЩÑÕÉ«¿´ÆðÀ´»á¹Ö¹ÖµÄ"
+msgstr "Vim E458: ÎÞ·¨·ÖÅäÑÕÉ«±íÏijЩÑÕÉ«¿ÉÄܲ»ÕýÈ·"
#, c-format
msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: Fontset %s ûÓÐÉ趨ÕýÈ·µÄ×ÖÌåÒÔ¹©ÏÔʾÕâЩ×Ö·û¼¯:"
+msgstr "E250: Fontset %s ȱÉÙÏÂÁÐ×Ö·û¼¯µÄ×ÖÌå:"
#, c-format
msgid "E252: Fontset name: %s"
-msgstr "E252: ×ÖÌ弯(Fontset)Ãû³Æ: %s"
+msgstr "E252: Fontset Ãû³Æ: %s"
#, c-format
msgid "Font '%s' is not fixed-width"
-msgstr "'%s' ²»Êǹ̶¨¿í¶È×ÖÌå"
+msgstr "'%s' ²»Êǹ̶¨¿í¶ÈµÄ×ÖÌå"
#, c-format
msgid "E253: Fontset name: %s\n"
-msgstr "E253: ×ÖÌ弯(Fontset)Ãû³Æ: %s\n"
+msgstr "E253: Fontset Ãû³Æ: %s\n"
#, c-format
msgid "Font0: %s\n"
@@ -1626,8 +2069,8 @@
msgstr "×ÖÌå1: %s\n"
#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "×ÖÌå%d¿í¶È²»ÊÇ×ÖÌå0µÄÁ½±¶\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "×ÖÌå%ldµÄ¿í¶È²»ÊÇ×ÖÌå0µÄÁ½±¶\n"
#, c-format
msgid "Font0 width: %ld\n"
@@ -1638,199 +2081,384 @@
"Font1 width: %ld\n"
"\n"
msgstr ""
-"×ÖÌå1¿í¶È: %ld\n"
+"×ÖÌå1µÄ¿í¶È: %ld\n"
"\n"
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ²»ÄÜÅäÖÃÑÕÉ« %s"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "²»ÕýÈ·µÄ×ÖÌ弯(Fontset)"
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: ²»ÄܶÁÈ¡ sign data!"
+#~ msgid "&Dismiss"
+#~ msgstr ""
+
+#~ msgid "no specific match"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Vim - Font Selector"
+#~ msgstr "×ÖÌåÑ¡Ôñ"
+
+#~ msgid "Name:"
+#~ msgstr ""
+
+#. create toggle button
+#~ msgid "Show size in Points"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoding:"
+#~ msgstr "¼Ç¼ÖÐ"
+
+#, fuzzy
+#~ msgid "Font:"
+#~ msgstr "×ÖÌå1: %s\n"
+
+#~ msgid "Style:"
+#~ msgstr ""
+
+#~ msgid "Size:"
+#~ msgstr ""
msgid "E256: Hangul automata ERROR"
msgstr "E256: Hangul automata ´íÎó"
+msgid "E550: Missing colon"
+msgstr "E550: ȱÉÙðºÅ"
+
+msgid "E551: Illegal component"
+msgstr "E551: ÎÞЧµÄ²¿·Ö"
+
+msgid "E552: digit expected"
+msgstr "E552: Ó¦¸ÃÒªÓÐÊý×Ö"
+
#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "Page %d"
+msgstr "µÚ %d Ò³"
+
+msgid "No text to be printed"
+msgstr "ûÓÐÒª´òÓ¡µÄÎÄ×Ö"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "ÕýÔÚ´òÓ¡µÚ %d Ò³ (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr "¸´ÖÆ %d / %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "ÒÑ´òÓ¡: %s"
+
+msgid "Printing aborted"
+msgstr "´òÓ¡ÖÐÖ¹"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: дÈë PostScript Êä³öÎļþ³ö´í"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: ÎÞ·¨´ò¿ªÎļþ \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: ÎÞ·¨¶ÁÈ¡ PostScript ×ÊÔ´Îļþ \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: Îļþ \"%s\" ²»ÊÇ PostScript ×ÊÔ´Îļþ"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: Îļþ \"%s\" ²»ÊÇÒÑÖ§³ÖµÄ PostScript ×ÊÔ´Îļþ"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" ×ÊÔ´Îļþ°æ±¾²»ÕýÈ·"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: ²»¼æÈݵĶà×Ö½Ú±àÂëºÍ×Ö·û¼¯¡£"
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset ÔÚ¶à×Ö½Ú±àÂëϲ»ÄÜΪ¿Õ¡£"
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: ûÓÐÖ¸¶¨¶à×Ö½Ú´òÓ¡µÄĬÈÏ×ÖÌå¡£"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: ÎÞ·¨´ò¿ª PostScript Êä³öÎļþ"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: ÎÞ·¨´ò¿ªÎļþ \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: ÕÒ²»µ½ PostScript ×ÊÔ´Îļþ \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: ÕÒ²»µ½ PostScript ×ÊÔ´Îļþ \"cidfont.ps\""
+
+#, c-format
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: ÕÒ²»µ½ PostScript ×ÊÔ´Îļþ \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: ÎÞ·¨×ª»»ÖÁ´òÓ¡±àÂë \"%s\""
+
+msgid "Sending to printer..."
+msgstr "·¢Ë͵½´òÓ¡»ú¡¡"
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: ÎÞ·¨´òÓ¡ PostScript Îļþ"
+
+msgid "Print job sent."
+msgstr "´òÓ¡ÈÎÎñÒѱ»·¢ËÍ¡£"
msgid "Add a new database"
-msgstr "ÐÂÔöÊý¾Ý¿â"
+msgstr "Ìí¼ÓÒ»¸öеÄÊý¾Ý¿â"
msgid "Query for a pattern"
-msgstr "²éѯģʽ"
+msgstr "²éѯһ¸öģʽ"
msgid "Show this message"
msgstr "ÏÔʾ´ËÐÅÏ¢"
msgid "Kill a connection"
-msgstr "½áÊøÁ¬½Ó"
+msgstr "½áÊøÒ»¸öÁ¬½Ó"
msgid "Reinit all connections"
-msgstr "ÖØÉèËùÓÐÁ¬½Ó"
+msgstr "ÖØÖÃËùÓÐÁ¬½Ó"
msgid "Show connections"
msgstr "ÏÔʾÁ¬½Ó"
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "Õâ¸ö cscope ÃüÁî²»Ö§³Ö·Ö¸îÆÁÄ»\n"
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: Ó÷¨: cs[cope] %s"
-msgid "Usage: cstag <ident>"
-msgstr "Ó÷¨: cstag <ʶ±ð×Ö>"
+msgid "This cscope command does not support splitting the window.\n"
+msgstr "Õâ¸ö cscope ÃüÁî²»Ö§³Ö·Ö¸î´°¿Ú¡£\n"
+
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: Ó÷¨: cstag <ident>"
msgid "E257: cstag: tag not found"
msgstr "E257: cstag: ÕÒ²»µ½ tag"
#, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) ´íÎó: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) ´íÎó: %d"
+
+msgid "E563: stat error"
+msgstr "E563: stat ´íÎó"
+
+#, c-format
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s ²»ÊÇĿ¼»òÓÐЧµÄ cscope Êý¾Ý¿â"
#, c-format
msgid "Added cscope database %s"
-msgstr "ÐÂÔö cscope Êý¾Ý¿â %s"
+msgstr "Ìí¼ÓÁË cscope Êý¾Ý¿â %s"
#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s ²»ÊÇĿ¼»ò cscope Êý¾Ý¿â"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: ¶ÁÈ¡ cscope Á¬½Ó %ld ³ö´í"
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "¶ÁÈ¡ cscope Á¬½Ó %d ʱ´íÎó"
+msgid "E561: unknown cscope search type"
+msgstr "E561: δ֪µÄ cscope ²éÕÒÀàÐÍ"
-msgid "unknown cscope search type"
-msgstr "δ֪µÄ cscope ²éÕÒÐÎ̬"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: ÎÞ·¨´´½¨ cscope ¹ÜµÀ"
-msgid "Could not create cscope pipes"
-msgstr "²»ÄÜ´´½¨Óë cscope Á¬½ÓµÄ¹ÜµÀ"
+msgid "E622: Could not fork for cscope"
+msgstr "E622: ÎÞ·¨¶Ô cscope ½øÐÐ fork"
msgid "cs_create_connection exec failed"
msgstr "cs_create_connection Ö´ÐÐʧ°Ü"
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: ÎÞ·¨Éú³É cscope ½ø³Ì"
+
msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen ʧ°Ü (to_fp)"
+msgstr "cs_create_connection: fdopen to_fp ʧ°Ü"
msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen ʧ°Ü (fr_fp)"
+msgstr "cs_create_connection: fdopen fr_fp ʧ°Ü"
-msgid "no cscope connections"
-msgstr "ûÓÐ cscope Á¬½Ó"
+msgid "E567: no cscope connections"
+msgstr "E567: ûÓÐ cscope Á¬½Ó"
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: ÕÒ²»µ½·ûºÏ cscope µÄËÑÑ° %s / %s"
+msgstr "E259: cscope ²éѯ %s %s ûÓÐÕÒµ½Æ¥ÅäµÄ½á¹û"
+
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix ±êÖ¾ %c ¶Ô %c ÎÞЧ"
msgid "cscope commands:\n"
msgstr "cscope ÃüÁî:\n"
#, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (Ó÷¨: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (Ó÷¨: %s)"
-msgid "duplicate cscope database not added"
-msgstr "Öظ´µÄ cscope Êý¾Ý¿âδ±»¼ÓÈë"
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: ÎÞ·¨´ò¿ª cscope Êý¾Ý¿â: %s"
-msgid "maximum number of cscope connections reached"
-msgstr "ÒÑ´ïµ½ cscope ×î´óÁ¬½ÓÊýÄ¿"
+msgid "E626: cannot get cscope database information"
+msgstr "E626: ÎÞ·¨»ñÈ¡ cscope Êý¾Ý¿âÐÅÏ¢"
-msgid "E260: cscope connection not found"
-msgstr "E260: ÕÒ²»µ½ cscope Á¬½Ó"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: Öظ´µÄ cscope Êý¾Ý¿âδ±»¼ÓÈë"
+
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: ÒÑ´ïµ½ cscope µÄ×î´óÁ¬½ÓÊý"
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: ÕÒ²»µ½ cscope Á¬½Ó %s"
-msgid "cscope connection closed"
-msgstr "cscope Á¬½ÓÒѹرÕ"
-
#, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope Á¬½Ó %s ÒѹرÕ\n"
+msgid "cscope connection %s closed"
+msgstr "cscope Á¬½Ó %s ÒѹرÕ"
#. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches ÑÏÖØ´íÎó"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches ÑÏÖØ´íÎó"
#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: ¶ÁÈ¡ cscope Á¬½Ó %d ´íÎó"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
-msgid "couldn't malloc\n"
-msgstr "²»ÄÜʹÓà malloc\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope ±êÇ©(tag): %s\n"
-
-msgid " # line"
-msgstr " # ÐÐ "
+msgid ""
+"\n"
+" # line"
+msgstr ""
+"\n"
+" # ÐÐ "
msgid "filename / context / line\n"
-msgstr "ÎļþÃû / ÉÏÏÂÎÄ / ÐкÅ\n"
+msgstr "ÎļþÃû / ÉÏÏÂÎÄ / ÐÐ\n"
+
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Cscope ´íÎó: %s"
msgid "All cscope databases reset"
-msgstr "ÖØÉèËùÓÐ cscope Êý¾Ý¿â"
+msgstr "ËùÓÐ cscope Êý¾Ý¿âÒѱ»ÖØÖÃ"
msgid "no cscope connections\n"
msgstr "ûÓÐ cscope Á¬½Ó\n"
msgid " # pid database name prepend path\n"
-msgstr " # pid Êý¾Ý¿âÃû³Æ prepend path\n"
+msgstr " # pid Êý¾Ý¿âÃû prepend path\n"
-#, c-format
-msgid "%2d %-5ld %-34s <none>\n"
-msgstr "%2d %-5ld %-34s <ÎÞ>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ MzScheme ¿â"
+
+msgid "invalid expression"
+msgstr "ÎÞЧµÄ±í´ïʽ"
+
+msgid "expressions disabled at compile time"
+msgstr "±àÒëʱûÓÐÆôÓñí´ïʽ"
+
+msgid "hidden option"
+msgstr "Òþ²ØµÄÑ¡Ïî"
+
+msgid "unknown option"
+msgstr "δ֪µÄÑ¡Ïî"
+
+msgid "window index is out of range"
+msgstr "´°¿ÚË÷Òý³¬³ö·¶Î§"
+
+msgid "couldn't open buffer"
+msgstr "ÎÞ·¨´ò¿ª»º³åÇø"
+
+msgid "cannot save undo information"
+msgstr "ÎÞ·¨±£´æ³·ÏúÐÅÏ¢"
+
+msgid "cannot delete line"
+msgstr "ÎÞ·¨É¾³ýÐÐ"
+
+msgid "cannot replace line"
+msgstr "ÎÞ·¨Ìæ»»ÐÐ"
+
+msgid "cannot insert line"
+msgstr "ÎÞ·¨²åÈëÐÐ"
+
+msgid "string cannot contain newlines"
+msgstr "×Ö·û´®²»ÄÜ°üº¬»»ÐÐ(NL)"
+
+msgid "Vim error: ~a"
+msgstr "Vim ´íÎó: ~a"
+
+msgid "Vim error"
+msgstr "Vim ´íÎó"
+
+msgid "buffer is invalid"
+msgstr "»º³åÇøÎÞЧ"
+
+msgid "window is invalid"
+msgstr "´°¿ÚÎÞЧ"
+
+msgid "linenr out of range"
+msgstr "Ðкų¬³ö·¶Î§"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "²»ÔÊÐíÔÚ sandbox ÖÐʹÓÃ"
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
-msgstr "E263: ±§Ç¸£¬Õâ¸öÃüÁî²»ÄÜʹÓã¬Python ³ÌÐò¿âûÓмÓÔØ¡£"
+msgstr "E263: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ Python ¿â¡£"
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: ²»Äܵݹéµ÷Óà Python"
msgid "can't delete OutputObject attributes"
msgstr "²»ÄÜɾ³ý OutputObject ÊôÐÔ"
msgid "softspace must be an integer"
-msgstr "softspace ±ØÐèÊÇÕûÊý"
+msgstr "softspace ±ØÐëÊÇÕûÊý"
msgid "invalid attribute"
-msgstr "²»ÕýÈ·µÄÊôÐÔ"
+msgstr "ÎÞЧµÄÊôÐÔ"
msgid "writelines() requires list of strings"
-msgstr "writelines() ÐèÒª string list µ±²ÎÊý"
+msgstr "writelines() ÐèÒª×Ö·û´®Áбí×÷²ÎÊý"
msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: ²»Äܳõʼ»¯ I/O ¶ÔÏó"
-
-msgid "invalid expression"
-msgstr "²»ÕýÈ·µÄ±í´ïʽ"
-
-msgid "expressions disabled at compile time"
-msgstr "ÒòΪ±àÒëʱûÓмÓÈë±í´ïʽ(expression)µÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓñí´ïʽ"
+msgstr "E264: Python: ³õʼ»¯ I/O ¶ÔÏó³ö´í"
msgid "attempt to refer to deleted buffer"
-msgstr "ÊÔͼʹÓÃÒѱ»É¾³ýµÄ»º³åÇø"
+msgstr "ÊÔͼÒýÓÃÒѱ»É¾³ýµÄ»º³åÇø"
msgid "line number out of range"
msgstr "Ðкų¬³ö·¶Î§"
#, c-format
msgid "<buffer object (deleted) at %8lX>"
-msgstr "<buffer ¶ÔÏó (ÒÑɾ³ý): %8lX>"
+msgstr "<»º³åÇø¶ÔÏó(ÒÑɾ³ý): %8lX>"
msgid "invalid mark name"
-msgstr "±ê¼ÇÃû³Æ²»ÕýÈ·"
+msgstr "ÎÞЧµÄ±ê¼ÇÃû³Æ"
msgid "no such buffer"
msgstr "ÎÞ´Ë»º³åÇø"
msgid "attempt to refer to deleted window"
-msgstr "ÊÔͼʹÓÃÒѱ»É¾³ýµÄ´°¿Ú"
+msgstr "ÊÔͼÒýÓÃÒѱ»É¾³ýµÄ´°¿Ú"
msgid "readonly attribute"
msgstr "Ö»¶ÁÊôÐÔ"
msgid "cursor position outside buffer"
-msgstr "¹â±ê¶¨Î»ÔÚ»º³åÇøÖ®Íâ"
+msgstr "¹â±êλÖÃÔÚ»º³åÇøÍâ"
#, c-format
msgid "<window object (deleted) at %.8lX>"
@@ -1847,24 +2475,9 @@
msgid "no such window"
msgstr "ÎÞ´Ë´°¿Ú"
-msgid "cannot save undo information"
-msgstr "²»Äܱ£´æ¸´ÔÐÅÏ¢"
-
-msgid "cannot delete line"
-msgstr "²»ÄÜɾ³ý´ËÐÐ"
-
-msgid "cannot replace line"
-msgstr "²»ÄÜÌæ»»´ËÐÐ"
-
-msgid "cannot insert line"
-msgstr "²»ÄܲåÈë´ËÐÐ"
-
-msgid "string cannot contain newlines"
-msgstr "×Ö·û´®²»ÄÜ°üº¬ÐÂÐÐ"
-
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: ´ËÃüÁî²»ÄÜʹÓã¬ÎÞ·¨¼ÓÔØ Ruby ³ÌÐò¿â(Library)"
+msgstr "E266: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ Ruby ¿â"
#, c-format
msgid "E273: unknown longjmp status %d"
@@ -1958,33 +2571,30 @@
msgstr "Sniff: дÈë´íÎó¡£½áÊøÁ¬½Ó"
msgid "invalid buffer number"
-msgstr "²»ÕýÈ·µÄ»º³åÇøºÅ"
+msgstr "ÎÞЧµÄ»º³åÇøºÅ"
msgid "not implemented yet"
msgstr "ÉÐδʵÏÖ"
-msgid "unknown option"
-msgstr "²»ÕýÈ·µÄÑ¡Ïî"
-
#. ???
msgid "cannot set line(s)"
-msgstr "²»ÄÜÉ趨ÐÐ"
+msgstr "ÎÞ·¨É趨ÐÐ"
msgid "mark not set"
msgstr "ûÓÐÉ趨±ê¼Ç"
#, c-format
msgid "row %d column %d"
-msgstr "ÁÐ %d ÐÐ %d"
+msgstr "µÚ %d ÐÐ µÚ %d ÁÐ"
msgid "cannot insert/append line"
-msgstr "²»ÄܲåÈë»òÌí¼Ó´ËÐÐ"
+msgstr "ÎÞ·¨²åÈë/×·¼ÓÐÐ"
msgid "unknown flag: "
-msgstr "´íÎóµÄ±êÖ¾: "
+msgstr "δ֪µÄ±êÖ¾: "
msgid "unknown vimOption"
-msgstr "²»ÕýÈ·µÄ VIM Ñ¡Ïî"
+msgstr "δ֪µÄ vim Ñ¡Ïî"
msgid "keyboard interrupt"
msgstr "¼üÅÌÖжÏ"
@@ -1993,93 +2603,91 @@
msgstr "vim ´íÎó"
msgid "cannot create buffer/window command: object is being deleted"
-msgstr "²»ÄÜ´´½¨»º³åÇø/´°¿ÚÃüÁî: ¶ÔÏ󽫱»É¾³ý"
+msgstr "ÎÞ·¨´´½¨»º³åÇø/´°¿ÚÃüÁî: ¶ÔÏ󽫱»É¾³ý"
msgid ""
"cannot register callback command: buffer/window is already being deleted"
-msgstr "²»ÄÜ×¢²á callback ÃüÁî: »º³åÇø/´°¿ÚÒѾ±»É¾³ýÁË"
+msgstr "ÎÞ·¨×¢²á»Øµ÷ÃüÁî: »º³åÇø/´°¿ÚÒѱ»É¾³ý"
#. This should never happen. Famous last word?
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
"org"
-msgstr "E280: TCL ÑÏÖØ´íÎó: reflist ²»¿É¿¿!? Ç뱨¸æ¸ø to vim-dev@vim.org"
+msgstr "E280: TCL ÑÏÖØ´íÎó: reflist Ë𻵣¡£¿Ç뱨¸æ¸ø vim-dev@vim.org"
msgid "cannot register callback command: buffer/window reference not found"
-msgstr "²»ÄÜ×¢²á callback ÃüÁî: ÕÒ²»µ½»º³åÇø/´°¿Ú"
+msgstr "ÎÞ·¨×¢²á»Øµ÷ÃüÁî: ÕÒ²»µ½»º³åÇø/´°¿ÚÒýÓÃ"
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "´ËÃüÁî²»ÄÜʹÓÃ, ÒòΪÎÞ·¨¼ÓÔØ Tcl ³ÌÐò¿â(Library)"
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr "E571: ±§Ç¸£¬´ËÃüÁî²»¿ÉÓã¬ÎÞ·¨¼ÓÔØ Tcl ¿â"
msgid ""
"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr "E281: TCL ´íÎó: Í˳ö·µ»ØÖµ²»ÊÇÕûÊý!? Ç뱨¸æ¸ø to vim-dev@vim.org"
+msgstr "E281: TCL ´íÎó: Í˳ö·µ»ØÖµ²»ÊÇÕûÊý£¡£¿Ç뱨¸æ¸ø vim-dev@vim.org"
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: Í˳ö·µ»ØÖµ %d"
msgid "cannot get line"
-msgstr "²»ÄÜÈ¡µÃ´ËÐÐ"
+msgstr "ÎÞ·¨»ñÈ¡ÐÐ"
msgid "Unable to register a command server name"
-msgstr "²»ÄÜ×¢²áÃüÁî·þÎñÆ÷Ãû³Æ"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: ûÓÐ×¢²áΪ \"%s\" µÄ·þÎñÆ÷"
+msgstr "ÎÞ·¨×¢²áÃüÁî·þÎñÆ÷Ãû"
msgid "E248: Failed to send command to the destination program"
-msgstr "E248: ²»ÄÜËͳöÃüÁĿµÄµØ³ÌÐò"
+msgstr "E248: ÎÞ·¨·¢ËÍÃüÁĿµÄ³ÌÐò"
#, c-format
-msgid "Invalid server id used: %s"
-msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: ²»ÄܶÁÈ¡ VIM µÄ ×¢²á±íÊôÐÔ"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: ʹÓÃÁËÎÞЧµÄ·þÎñÆ÷ id: %s"
msgid "E251: VIM instance registry property is badly formed. Deleted!"
-msgstr "E251: VIM µÄ×¢²á±íÊôÐÔÓÐÎó¡£ÒÑɾ³ý¡£"
+msgstr "E251: VIM ʵÀý×¢²áÊôÐÔÓÐÎó¡£ÒÑɾ³ý£¡"
-msgid "Unknown option"
-msgstr "²»ÕýÈ·µÄÑ¡Ïî"
+msgid "Unknown option argument"
+msgstr "δ֪µÄÑ¡Ïî²ÎÊý"
msgid "Too many edit arguments"
-msgstr "Ì«¶à±à¼²ÎÊý"
+msgstr "±à¼²ÎÊý¹ý¶à"
msgid "Argument missing after"
-msgstr "ȱÉÙ±ØÒªµÄ²ÎÊý:"
+msgstr "ȱÉÙ±ØÒªµÄ²ÎÊý"
-msgid "Garbage after option"
-msgstr "²»ÄܱæÈÏ´ËÑ¡ÏîºóµÄÃüÁî: "
+msgid "Garbage after option argument"
+msgstr "Ñ¡Ïî²ÎÊýºóµÄÄÚÈÝÎÞЧ"
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "Ì«¶à \"+command\" »ò \"-c command\" ²ÎÊý"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "\"+command\"¡¢\"-c command\" »ò \"--cmd command\" ²ÎÊý¹ý¶à"
msgid "Invalid argument for"
-msgstr "²»ÕýÈ·µÄ²ÎÊý: "
-
-msgid "This Vim was not compiled with the diff feature."
-msgstr "ÄúµÄ Vim ±àÒëʱûÓмÓÈë diff µÄÄÜÁ¦"
-
-msgid "Attempt to open script file again: \""
-msgstr "ÊÔͼÔٴδò¿ª script Îļþ: \""
-
-msgid "\"\n"
-msgstr "\"\n"
-
-msgid "Cannot open for reading: \""
-msgstr "²»ÄÜΪ¶Á¶ø´ò¿ª: \""
-
-msgid "Cannot open for script output: \""
-msgstr "²»ÄÜΪ script Êä³ö¶ø´ò¿ª: \""
+msgstr "ÎÞЧµÄ²ÎÊý"
#, c-format
msgid "%d files to edit\n"
msgstr "»¹ÓÐ %d ¸öÎļþµÈ´ý±à¼\n"
+msgid "This Vim was not compiled with the diff feature."
+msgstr "´Ë Vim ±àÒëʱûÓмÓÈë diff ¹¦ÄÜ"
+
+msgid "Attempt to open script file again: \""
+msgstr "ÊÔͼÔٴδò¿ª½Å±¾Îļþ: \""
+
+msgid "Cannot open for reading: \""
+msgstr "ÎÞ·¨´ò¿ª²¢¶ÁÈ¡: \""
+
+msgid "Cannot open for script output: \""
+msgstr "ÎÞ·¨´ò¿ª²¢Êä³ö½Å±¾: \""
+
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ´íÎó: ÎÞ·¨´Ó NetBeans ÖÐÆô¶¯ gvim\n"
+
msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ×¢Òâ: Êä³ö²»ÊÇÖÕ¶Ë(ÆÁÄ»)\n"
+msgstr "Vim: ¾¯¸æ: Êä³ö²»Êǵ½ÖÕ¶Ë(ÆÁÄ»)\n"
msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ×¢Òâ: ÊäÈë²»ÊÇÖÕ¶Ë(¼üÅÌ)\n"
+msgstr "Vim: ¾¯¸æ: ÊäÈë²»ÊÇÀ´×ÔÖÕ¶Ë(¼üÅÌ)\n"
#. just in case..
msgid "pre-vimrc command line"
@@ -2087,14 +2695,14 @@
#, c-format
msgid "E282: Cannot read from \"%s\""
-msgstr "E282: ²»ÄܶÁÈ¡Îļþ \"%s\""
+msgstr "E282: ÎÞ·¨¶ÁÈ¡ \"%s\""
msgid ""
"\n"
"More info with: \"vim -h\"\n"
msgstr ""
"\n"
-"²éѯ¸ü¶àÐÅÏ¢ÇëÖ´ÐÐ: \"vim -h\"\n"
+"¸ü¶àÐÅÏ¢Çë¼û: \"vim -h\"\n"
msgid "[file ..] edit specified file(s)"
msgstr "[Îļþ ..] ±à¼Ö¸¶¨µÄÎļþ"
@@ -2103,10 +2711,10 @@
msgstr "- ´Ó±ê×¼ÊäÈë(stdin)¶ÁÈ¡Îı¾"
msgid "-t tag edit file where tag is defined"
-msgstr "-t tag ±à¼Ê±Ê¹ÓÃÖ¸¶¨µÄ tag"
+msgstr "-t tag ±à¼ tag ¶¨Òå´¦µÄÎļþ"
msgid "-q [errorfile] edit file with first error"
-msgstr "-q [errorfile] ±à¼Ê±¼ÓÔصÚÒ»¸ö´íÎó"
+msgstr "-q [errorfile] ±à¼µÚÒ»¸ö³ö´í´¦µÄÎļþ"
msgid ""
"\n"
@@ -2115,17 +2723,20 @@
msgstr ""
"\n"
"\n"
-" Ó÷¨:"
+"Ó÷¨:"
msgid " vim [arguments] "
-msgstr "vim [²ÎÊý] "
+msgstr " vim [²ÎÊý] "
msgid ""
"\n"
" or:"
msgstr ""
"\n"
-" »ò:"
+" »ò:"
+
+#~ msgid "where case is ignored prepend / to make flag upper case"
+#~ msgstr ""
msgid ""
"\n"
@@ -2137,10 +2748,13 @@
"²ÎÊý:\n"
msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tÖ»ÓÐÔÚÕâÖ®ºóµÄÎļþ"
+msgstr "--\t\t\tÔÚÕâÒÔºóÖ»ÓÐÎļþÃû"
+
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\t²»À©Õ¹Í¨Åä·û"
msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\t×¢²á gvim µ½ OLE"
+msgstr "-register\t\t×¢²á´Ë gvim µ½ OLE"
msgid "-unregister\t\tUnregister gvim for OLE"
msgstr "-unregister\t\tÈ¡Ïû OLE ÖÐµÄ gvim ×¢²á"
@@ -2148,8 +2762,8 @@
msgid "-g\t\t\tRun using GUI (like \"gvim\")"
msgstr "-g\t\t\tʹÓÃͼÐνçÃæ (ͬ \"gvim\")"
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\tÇ°¾°: Æô¶¯Í¼ÐνçÃæʱ²» fork"
+msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f »ò --nofork\tǰ̨: Æô¶¯Í¼ÐνçÃæʱ²» fork"
msgid "-v\t\t\tVi mode (like \"vi\")"
msgstr "-v\t\t\tVi ģʽ (ͬ \"vi\")"
@@ -2158,13 +2772,13 @@
msgstr "-e\t\t\tEx ģʽ (ͬ \"ex\")"
msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t°²¾² (batch) ģʽ (Ö»ÄÜÓë \"ex\" Ò»ÆðʹÓÃ)"
+msgstr "-s\t\t\t°²¾²(Åú´¦Àí)ģʽ (Ö»ÄÜÓë \"ex\" Ò»ÆðʹÓÃ)"
msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\", ¿ÉѸËٱȽÏÁ½Îļþ²»Í¬´¦)"
+msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\")"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t¼òÒ×ģʽ (ͬ \"evim\", modeless)"
+msgstr "-y\t\t\tÈÝÒ×ģʽ (ͬ \"evim\"£¬ÎÞģʽ)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\tÖ»¶Áģʽ (ͬ \"view\")"
@@ -2173,7 +2787,7 @@
msgstr "-Z\t\t\tÏÞÖÆģʽ (ͬ \"rvim\")"
msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t²»¿ÉÐÞ¸Ä (дÈëÎļþ)"
+msgstr "-m\t\t\t²»¿ÉÐÞ¸Ä(дÈëÎļþ)"
msgid "-M\t\t\tModifications in text not allowed"
msgstr "-M\t\t\tÎı¾²»¿ÉÐÞ¸Ä"
@@ -2185,10 +2799,10 @@
msgstr "-l\t\t\tLisp ģʽ"
msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t'compatible' ´«Í³ Vi ¼æÈÝģʽ"
+msgstr "-C\t\t\t¼æÈÝ´«Í³µÄ Vi: 'compatible'"
msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t'nocompatible' ²»ÍêÈ«Ó봫ͳ Vi ¼æÈÝ£¬¿ÉʹÓà Vim ¼ÓÇ¿ÄÜÁ¦"
+msgstr "-N\t\t\t²»ÍêÈ«¼æÈÝ´«Í³µÄ Vi: 'nocompatible'"
msgid "-V[N]\t\tVerbose level"
msgstr "-V[N]\t\tVerbose µÈ¼¶"
@@ -2197,163 +2811,183 @@
msgstr "-D\t\t\tµ÷ÊÔģʽ"
msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t²»Ê¹Óý»»»Îļþ, ֻʹÓÃÄÚ´æ"
+msgstr "-n\t\t\t²»Ê¹Óý»»»Îļþ£¬Ö»Ê¹ÓÃÄÚ´æ"
msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tÁгö½»»»ÎļþºóÍ˳ö"
+msgstr "-r\t\t\tÁгö½»»»Îļþ²¢Í˳ö"
msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (¼ÓÎļþÃû) \t»Ö¸´ÉϴαÀÀ£µÄ×ÊÁÏ(Recover crashed session)"
+msgstr "-r (¸úÎļþÃû)\t\t»Ö¸´±ÀÀ£µÄ»á»°"
msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tÓë -r Ò»Ñù"
+msgstr "-L\t\t\tͬ -r"
msgid "-f\t\t\tDon't use newcli to open window"
msgstr "-f\t\t\t²»Ê¹Óà newcli À´´ò¿ª´°¿Ú"
msgid "-dev <device>\t\tUse <device> for I/O"
-msgstr "-dev <device>\t\tʹÓà <device> ×öÊäÈëÊä³öÉ豸"
+msgstr "-dev <device>\t\tʹÓà <device> ½øÐÐÊäÈëÊä³ö"
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\tÆô¶¯Îª Ï£²®À³Ä£Ê½"
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\tÒÔ Arabic ģʽÆô¶¯"
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\tÆô¶¯Îª Farsi ģʽ"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\tÒÔ Hebrew ģʽÆô¶¯"
+
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\tÒÔ Farsi ģʽÆô¶¯"
msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\tÉ趨ÖÕ¶ËΪ <terminal>"
+msgstr "-T <terminal>\tÉ趨ÖÕ¶ËÀàÐÍΪ <terminal>"
msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tʹÓà <vimrc> Ìæ»»ÈκΠ.vimrc"
+msgstr "-u <vimrc>\t\tʹÓà <vimrc> Ìæ´úÈκΠ.vimrc"
msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-msgstr "-U <gvimrc>\t\tʹÓà <gvimrc> Ìæ»»ÈκΠ.gvimrc"
+msgstr "-U <gvimrc>\t\tʹÓà <gvimrc> Ìæ´úÈκΠ.gvimrc"
msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t²»¼ÓÔØÈκΠplugin"
+msgstr "--noplugin\t\t²»¼ÓÔØ plugin ½Å±¾"
+
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-P[N]\t\t´ò¿ª N ¸ö±êÇ©Ò³ (ĬÈÏÖµ: ÿ¸öÎļþÒ»¸ö)"
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t´ò¿ª N ¸ö´°¿Ú (Ô¤ÉèÊÇÿ¸öÎļþÒ»¸ö)"
+msgstr "-o[N]\t\t´ò¿ª N ¸ö´°¿Ú (ĬÈÏÖµ: ÿ¸öÎļþÒ»¸ö)"
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\tͬ -o µ«Ê¹Óô¹Ö±·Ö¸î"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tͬ -o µ«´¹Ö±·Ö¸î"
msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\tÆô¶¯ºóÌøµ½Îļþ½áβ"
+msgstr "+\t\t\tÆô¶¯ºóÌøµ½Îļþĩβ"
msgid "+<lnum>\t\tStart at line <lnum>"
msgstr "+<lnum>\t\tÆô¶¯ºóÌøµ½µÚ <lnum> ÐÐ"
msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t¼ÓÔØÈκΠvimrc Ç°Ö´ÐÐ <command>"
+msgstr "--cmd <command>\t¼ÓÔØÈκΠvimrc ÎļþÇ°Ö´ÐÐ <command>"
msgid "-c <command>\t\tExecute <command> after loading the first file"
msgstr "-c <command>\t\t¼ÓÔصÚÒ»¸öÎļþºóÖ´ÐÐ <command>"
msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t¼ÓÔصÚÒ»¸öÎļþºóÔØÈë Session Îļþ<session>"
+msgstr "-S <session>\t\t¼ÓÔصÚÒ»¸öÎļþºóÖ´ÐÐÎļþ <session>"
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t´Ó <scriptin> ¶ÁÈëÒ»°ãģʽÃüÁî"
+msgstr "-s <scriptin>\t´ÓÎļþ <scriptin> ¶ÁÈëÕý³£Ä£Ê½µÄÃüÁî"
msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t¶ÔÎļþ <scriptout> ¸½¼Ó(append)ËùÓÐÊäÈëµÄÃüÁî"
+msgstr "-w <scriptout>\t½«ËùÓÐÊäÈëµÄÃüÁî×·¼Óµ½Îļþ <scriptout>"
msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t¶ÔÎļþ <scriptout> дÈëËùÓÐÊäÈëµÄÃüÁî"
+msgstr "-W <scriptout>\t½«ËùÓÐÊäÈëµÄÃüÁîдÈëµ½Îļþ <scriptout>"
msgid "-x\t\t\tEdit encrypted files"
-msgstr "-x\t\t\t±à¼±àÂë¹ýµÄÎļþ"
+msgstr "-x\t\t\t±à¼¼ÓÃܵÄÎļþ"
msgid "-display <display>\tConnect vim to this particular X-server"
msgstr "-display <display>\t½« vim ÓëÖ¸¶¨µÄ X-server Á¬½Ó"
msgid "-X\t\t\tDo not connect to X server"
-msgstr "-X\t\t\t²»ÒªÁ¬½Óµ½ X Server"
+msgstr "-X\t\t\t²»Á¬½Óµ½ X Server"
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\tÔÚÁíÒ»¸ö GTK ×é¼þÄÚ´ò¿ª Vim"
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\tÈçÓпÉÄÜ£¬ÔÚ Vim ·þÎñÆ÷Éϱà¼Îļþ <files>"
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t±à¼ Vim ·þÎñÆ÷ÉϵÄÎļþ²¢Í˳ö"
+msgid "--remote-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-silent <files> ͬÉÏ£¬ÕÒ²»µ½·þÎñÆ÷ʱ²»±§Ô¹"
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files> µÈЧÓÚ --remote, µ«»áµÈºòÎļþÍê³É±à¼"
+msgstr "--remote-wait <files> ͬ --remote µ«»áµÈ´ýÎļþÍê³É±à¼"
+
+msgid ""
+"--remote-wait-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <files> ͬÉÏ£¬ÕÒ²»µ½·þÎñÆ÷ʱ²»±§Ô¹"
+
+msgid "--remote-tab <files> As --remote but open tab page for each file"
+msgstr "--remote-tab <files> ͬ --remote µ«¶Ôÿ¸öÎļþ´ò¿ªÒ»¸ö±êÇ©Ò³"
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\tËͳö <keys> µ½ Vim ·þÎñÆ÷²¢Í˳ö"
msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-msgstr "--remote-expr <expr>\tÔÚ·þÎñÆ÷ÉÏÇó±í´ïʽµÄÖµ²¢´òÓ¡½á¹û"
+msgstr "--remote-expr <expr>\tÔÚ Vim ·þÎñÆ÷ÉÏÇó <expr> µÄÖµ²¢´òÓ¡½á¹û"
msgid "--serverlist\t\tList available Vim server names and exit"
msgstr "--serverlist\t\tÁгö¿ÉÓÃµÄ Vim ·þÎñÆ÷Ãû³Æ²¢Í˳ö"
msgid "--servername <name>\tSend to/become the Vim server <name>"
-msgstr "--servername <name>\tËÍÖÁ/³ÉΪ Vim ·þÎñÆ÷ <name>"
+msgstr "--servername <name>\t·¢Ë͵½»ò³ÉΪ Vim ·þÎñÆ÷ <name>"
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tʹÓà <viminfo> ¶ø·Ç .viminfo"
+msgstr "-i <viminfo>\t\tʹÓà <viminfo> È¡´ú .viminfo"
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t´òӡ˵Ã÷(Ò²¾ÍÊDZ¾ÐÅÏ¢)ºóÍ˳ö"
+msgid "-h or --help\tPrint Help (this message) and exit"
+msgstr "-h »ò --help\t´òÓ¡°ïÖú(±¾ÐÅÏ¢)²¢Í˳ö"
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t´òÓ¡°æ±¾ÐÅÏ¢ºóÍ˳ö"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\t´òÓ¡°æ±¾ÐÅÏ¢²¢Í˳ö"
msgid ""
"\n"
"Arguments recognised by gvim (Motif version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (Motif °æ):\n"
+"gvim (Motif °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim (neXtaw °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid ""
"\n"
"Arguments recognised by gvim (Athena version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (Athena °æ):\n"
+"gvim (Athena °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid "-display <display>\tRun vim on <display>"
-msgstr "-display <display>\tÔÚ´°¿Ú <display> Ö´ÐÐ vim"
+msgstr "-display <display>\tÔÚ <display> ÉÏÔËÐÐ vim"
msgid "-iconic\t\tStart vim iconified"
-msgstr "-iconic\t\tÆô¶¯ºó×îС»¯(iconified)"
+msgstr "-iconic\t\tÆô¶¯ºó×îС»¯"
msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t¶ÁÈ¡ Resource ʱ°Ñ vim µÄÃû³ÆÊÓΪ <name>"
+msgstr "-name <name>\t\t¶ÁÈ¡ Resource ʱ°Ñ vim ÊÓΪ <name>"
msgid "\t\t\t (Unimplemented)\n"
msgstr "\t\t\t (ÉÐδʵÏÖ)\n"
msgid "-background <color>\tUse <color> for the background (also: -bg)"
-msgstr "-background <color>\tÉ趨 <color> Ϊ±³¾°É« (Ò²¿ÉÓà -bg)"
+msgstr "-background <color>\tʹÓà <color> ×÷Ϊ±³¾°É« (Ò²¿ÉÓà -bg)"
msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-msgstr "-foreground <color>\tÉ趨 <color> Ϊһ°ãÎÄ×ÖÑÕÉ« (Ò²¿ÉÓà -fg)"
+msgstr "-foreground <color>\tʹÓà <color> ×÷Ϊһ°ãÎÄ×ÖÑÕÉ« (Ò²¿ÉÓà -fg)"
msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-msgstr "-font <font>\tʹÓà <font> Ϊһ°ã×ÖÌå (Ò²¿ÉÓà -fn)"
+msgstr "-font <font>\tʹÓà <font> ×÷Ϊһ°ã×ÖÌå (Ò²¿ÉÓà -fn)"
msgid "-boldfont <font>\tUse <font> for bold text"
-msgstr "-boldfont <font>\tʹÓà <font> Ϊ´ÖÌå×ÖÌå"
+msgstr "-boldfont <font>\tʹÓà <font> ×÷Ϊ´ÖÌå×ÖÌå"
msgid "-italicfont <font>\tUse <font> for italic text"
-msgstr "-italicfont <font>\tʹÓà <font> ΪбÌå×ÖÌå"
+msgstr "-italicfont <font>\tʹÓà <font> ×÷ΪбÌå×ÖÌå"
msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr "-geometry <geom>\tʹÓÃ<geom>Ϊ³õʼλÖà (Ò²¿ÉÓà -geom)"
+msgstr "-geometry <geom>\tʹÓà <geom> ×÷Ϊ³õʼλÖà (Ò²¿ÉÓà -geom)"
msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidth <width>\tʹÓÿí¶ÈΪ <width> µÄ±ß¿ò (Ò²¿ÉÓà -bw)"
+msgstr "-borderwidth <width>\tÉ趨±ß¿ò¿í¶ÈΪ <width> (Ò²¿ÉÓà -bw)"
msgid "-scrollbarwidth <width> Use a scrollbar width of <width> (also: -sw)"
msgstr "-scrollbarwidth <width> É趨¹ö¶¯Ìõ¿í¶ÈΪ <width> (Ò²¿ÉÓà -sw)"
msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <height>\tÉ趨²Ëµ¥Áеĸ߶ÈΪ <height> (Ò²¿ÉÓà -mh)"
+msgstr "-menuheight <height>\tÉ趨²Ëµ¥À¸¸ß¶ÈΪ <height> (Ò²¿ÉÓà -mh)"
msgid "-reverse\t\tUse reverse video (also: -rv)"
msgstr "-reverse\t\tʹÓ÷´ÏÔ (Ò²¿ÉÓà -rv)"
@@ -2369,7 +3003,7 @@
"Arguments recognised by gvim (RISC OS version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (RISC OS °æ):\n"
+"gvim (RISC OS °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid "--columns <number>\tInitial width of window in columns"
msgstr "--columns <number>\t´°¿Ú³õʼ¿í¶È"
@@ -2382,43 +3016,48 @@
"Arguments recognised by gvim (GTK+ version):\n"
msgstr ""
"\n"
-"gvim ¿Éʶ±ðµÄ²ÎÊý (GTK+ °æ):\n"
+"gvim (GTK+ °æ±¾) ¿Éʶ±ðµÄ²ÎÊý:\n"
msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <display>\tÔÚ <display> Ö´ÐÐ vim (Ò²¿ÉÓà --display)"
+msgstr "-display <display>\tÔÚ <display> ÉÏÔËÐÐ vim (Ò²¿ÉÓà --display)"
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\tÏÔʾ Gnome Ïà¹Ø²ÎÊý"
+#~ msgid "--role <role>\tSet a unique role to identify the main window"
+#~ msgstr ""
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tÔÚÁíÒ»¸ö GTK ²¿¼þÖдò¿ª Vim"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\tÔÚ¸¸Ó¦ÓóÌÐòÖдò¿ª Vim"
+
+#~ msgid "No display"
+#~ msgstr ""
#. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"·¢Ëͱí´ïʽʧ°Ü¡£\n"
+msgid ": Send failed.\n"
+msgstr ": ·¢ËÍʧ°Ü¡£\n"
#. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"Ëͳöʧ°Ü¡£ÊÔͼÔÚ±¾µØÖ´ÐÐ\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": ·¢ËÍʧ°Ü¡£³¢ÊÔ±¾µØÖ´ÐÐ\n"
#, c-format
msgid "%d of %d edited"
msgstr "%d ÖÐ %d Òѱà¼"
-msgid "Send expression failed.\n"
-msgstr "·¢Ëͱí´ïʽʧ°Ü¡£\n"
+#, fuzzy
+#~ msgid "No display: Send expression failed.\n"
+#~ msgstr "·¢Ëͱí´ïʽʧ°Ü¡£\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": ·¢Ëͱí´ïʽʧ°Ü¡£\n"
msgid "No marks set"
-msgstr "ûÓÐÉ趨±ê¼Ç (mark)"
+msgstr "ûÓÐÉ趨±ê¼Ç"
#, c-format
msgid "E283: No marks matching \"%s\""
-msgstr "E283: ÕÒ²»µ½·ûºÏ \"%s\" µÄ±ê¼Ç(mark)"
+msgstr "E283: ûÓÐÆ¥Åä \"%s\" µÄ±ê¼Ç"
#. Highlight title
msgid ""
@@ -2426,7 +3065,7 @@
"mark line col file/text"
msgstr ""
"\n"
-"±ê¼Ç ÐкŠÁÐ Îļþ/Îı¾"
+"±ê¼Ç ÐÐ ÁÐ Îļþ/Îı¾"
#. Highlight title
msgid ""
@@ -2434,8 +3073,17 @@
" jump line col file/text"
msgstr ""
"\n"
-" Ìøµ½ ÐкŠÁÐ Îļþ/Îı¾"
+" Ìøת ÐÐ ÁÐ Îļþ/Îı¾"
+#. Highlight title
+msgid ""
+"\n"
+"change line col text"
+msgstr ""
+"\n"
+" ¸Ä±ä ÐÐ ÁÐ Îı¾"
+
+#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -2444,117 +3092,119 @@
"# Îļþ±ê¼Ç:\n"
#. Write the jumplist with -'
+#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
msgstr ""
"\n"
-"# Jumplist (´Óе½¾É):\n"
+"# ÌøתÁбí (´Óе½¾É):\n"
+#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
msgstr ""
"\n"
-"# ÎļþÄÚÀúÊ·¼Ç¼ (´Óе½¾É):\n"
+"# ÎļþÄڵıê¼ÇÀúÊ·¼Ç¼ (´Óе½¾É):\n"
msgid "Missing '>'"
-msgstr "ȱÉÙ¶ÔÓ¦µÄ '>'"
+msgstr "ȱÉÙ '>'"
-msgid "Not a valid codepage"
-msgstr "²»ÕýÈ·µÄ´úÂëÒ³"
+msgid "E543: Not a valid codepage"
+msgstr "E543: ÎÞЧµÄ´úÂëÒ³"
msgid "E284: Cannot set IC values"
-msgstr "E284: ²»ÄÜÉ趨 IC ÊýÖµ"
+msgstr "E284: ²»ÄÜÉ趨 IC Öµ"
msgid "E285: Failed to create input context"
-msgstr "E285: ²»ÄÜ´´½¨ÊäÈëÉÏÏÂÎÄ"
+msgstr "E285: ÎÞ·¨´´½¨ÊäÈëÉÏÏÂÎÄ"
msgid "E286: Failed to open input method"
-msgstr "E286: ²»ÄÜ´ò¿ªÊäÈë·¨"
+msgstr "E286: ÎÞ·¨´ò¿ªÊäÈë·¨"
msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr "E287: ¾¯¸æ: ²»ÄÜÒƳý IM µÄ callback"
+msgstr "E287: ¾¯¸æ: ÎÞ·¨É趨ÊäÈë·¨µÄÊͷŻص÷º¯Êý"
msgid "E288: input method doesn't support any style"
-msgstr "E288: ÊäÈë·¨²»Ö§³ÖÈκΠstyle"
+msgstr "E288: ÊäÈë·¨²»Ö§³ÖÈκηç¸ñ"
msgid "E289: input method doesn't support my preedit type"
-msgstr "E289: ÊäÈë·¨²»Ö§³ÖÈκΠstyle"
+msgstr "E289: ÊäÈë·¨²»Ö§³ÖÎÒµÄÔ¤±à¼ÀàÐÍ"
msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot ÐèÒª×ÖÌ弯(Fontset)"
+msgstr "E290: over-the-spot ·ç¸ñÐèÒª Fontset"
msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: ÄãµÄ GTK+ ±È 1.2.3 ÀÏ¡£²»ÄÜʹÓÃ״̬Çø¡£"
+msgstr "E291: ÄãµÄ GTK+ ±È 1.2.3 ¾É¡£×´Ì¬Çø²»¿ÉÓá£"
msgid "E292: Input Method Server is not running"
-msgstr "E292: ÊäÈë·¨¹ÜÀí³ÌÐò(Input Method Server)δÔËÐÐ"
+msgstr "E292: ÊäÈë·¨·þÎñÆ÷δÔËÐÐ"
msgid "E293: block was not locked"
msgstr "E293: ¿éδ±»Ëø¶¨"
msgid "E294: Seek error in swap file read"
-msgstr "E294: ½»»»Îļþ¶ÁÈ¡´íÎó"
+msgstr "E294: ½»»»Îļþ¶ÁÈ¡¶¨Î»´íÎó"
msgid "E295: Read error in swap file"
msgstr "E295: ½»»»Îļþ¶ÁÈ¡´íÎó"
msgid "E296: Seek error in swap file write"
-msgstr "E296: ½»»»ÎļþдÈë´íÎó"
+msgstr "E296: ½»»»ÎļþдÈ붨λ´íÎó"
msgid "E297: Write error in swap file"
msgstr "E297: ½»»»ÎļþдÈë´íÎó"
msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: ½»»»ÎļþÒѾ´æÔÚ! (СÐÄ·ûºÅÁ¬½áµÄ°²È«Â©¶´!?)"
+msgstr "E300: ½»»»ÎļþÒÑ´æÔÚ (·ûºÅÁ¬½Ó¹¥»÷£¿)"
msgid "E298: Didn't get block nr 0?"
-msgstr "E298: ÕÒ²»µ½¿é 0?"
+msgstr "E298: ÕÒ²»µ½¿é 0£¿"
msgid "E298: Didn't get block nr 1?"
-msgstr "E298: ÕÒ²»µ½¿é 1?"
+msgstr "E298: ÕÒ²»µ½¿é 1£¿"
msgid "E298: Didn't get block nr 2?"
-msgstr "E298: ÕÒ²»µ½¿é 2?"
+msgstr "E298: ÕÒ²»µ½¿é 2£¿"
#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: àÞàÞ, ½»»»Îļþ²»¼ûÁË!!!"
+msgstr "E301: àÞ£¬½»»»Îļþ²»¼ûÁË£¡£¡£¡"
msgid "E302: Could not rename swap file"
-msgstr "E302: ²»Äܸı佻»»ÎļþµÄÃû³Æ"
+msgstr "E302: ÎÞ·¨ÖØÃüÃû½»»»Îļþ"
#, c-format
msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: ²»ÄÜ´ò¿ª½»»»Îļþ \"%s\", ²»¿ÉÄָܻ´ÁË"
+msgstr "E303: ÎÞ·¨´ò¿ª \"%s\" µÄ½»»»Îļþ£¬»Ö¸´½«²»¿ÉÄÜ"
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: ÕÒ²»µ½¿é 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): ÕÒ²»µ½¿é 0£¿"
#, c-format
msgid "E305: No swap file found for %s"
msgstr "E305: ÕÒ²»µ½ %s µÄ½»»»Îļþ"
msgid "Enter number of swap file to use (0 to quit): "
-msgstr "ÇëÑ¡ÔñÄãҪʹÓõĽ»»»Îļþ (°´0 Í˳ö): "
+msgstr "ÇëÊäÈëҪʹÓõĽ»»»Îļþ±àºÅ (0 Í˳ö): "
#, c-format
msgid "E306: Cannot open %s"
-msgstr "E306: ²»ÄÜ´ò¿ª %s"
+msgstr "E306: ÎÞ·¨´ò¿ª %s"
msgid "Unable to read block 0 from "
-msgstr "²»ÄܶÁÈ¡¿é 0:"
+msgstr "ÎÞ·¨¶ÁÈ¡¿é 0: "
msgid ""
"\n"
"Maybe no changes were made or Vim did not update the swap file."
msgstr ""
"\n"
-"¿ÉÄÜÄãû×ö¹ýÈκÎÐ޸ĻòÊÇ Vim »¹À´²»¼°¸üн»»»Îļþ."
+"¿ÉÄÜÄãû×ö¹ýÈκÎÐ޸ĻòÊÇ Vim »¹À´²»¼°¸üн»»»Îļþ¡£"
msgid " cannot be used with this version of Vim.\n"
-msgstr " ²»ÄÜÔÚ±¾°æ±¾µÄ Vim ÖÐʹÓÃ.\n"
+msgstr " ²»ÄÜÔڸð汾µÄ Vim ÖÐʹÓá£\n"
msgid "Use Vim version 3.0.\n"
msgstr "ʹÓà Vim 3.0¡£\n"
@@ -2564,17 +3214,17 @@
msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»Îļþ"
msgid " cannot be used on this computer.\n"
-msgstr " ²»ÄÜÔÚÕą̂µçÄÔÉÏʹÓÃ.\n"
+msgstr " ²»ÄÜÔÚÕą̂µçÄÔÉÏʹÓá£\n"
msgid "The file was created on "
-msgstr "±¾Îļþ´´½¨ÓÚ "
+msgstr "´ËÎļþ´´½¨ÓÚ "
msgid ""
",\n"
"or the file has been damaged."
msgstr ""
-",\n"
-"»òÊÇÕâÎļþÒѱ»ÆÆ»µ¡£"
+"£¬\n"
+"»òÊÇ´ËÎļþÒÑË𻵡£"
#, c-format
msgid "Using swap file \"%s\""
@@ -2582,82 +3232,101 @@
#, c-format
msgid "Original file \"%s\""
-msgstr "ÔÎļþ \"%s\""
+msgstr "ÔʼÎļþ \"%s\""
msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ¾¯¸æ: ÔʼÎļþ¿ÉÄÜÒѾÐ޸ĹýÁË"
+msgstr "E308: ¾¯¸æ: ÔʼÎļþ¿ÉÄÜÒѱ»ÐÞ¸Ä"
#, c-format
msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: ²»ÄÜ´Ó %s ¶ÁÈ¡¿é 1"
+msgstr "E309: ÎÞ·¨´Ó %s ¶ÁÈ¡¿é 1"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???MANY LINES MISSING"
-msgstr "???ȱÉÙÌ«¶àÐÐ"
+msgstr "???ȱÉÙÁËÌ«¶àÐÐ"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???LINE COUNT WRONG"
-msgstr "???ÐкŴíÎó"
+msgstr "???ÐÐÊý´íÎó"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???EMPTY BLOCK"
-msgstr "???¿ÕµÄ ¿é"
+msgstr "???¿ÕµÄ¿é"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???LINES MISSING"
-msgstr "???ÕÒ²»µ½Ò»Ð©ÐÐ"
+msgstr "???ȱÉÙÁËһЩÐÐ"
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: ¿é 1 ID ´íÎó (%s ²»Êǽ»»»Îļþ?)"
+msgstr "E310: ¿é 1 ID ´íÎó (%s ²»Êǽ»»»Îļþ£¿)"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???BLOCK MISSING"
-msgstr "???ÕÒ²»µ½¿é"
+msgstr "???ȱÉÙ¿é"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÄÚÈÝ¿ÉÄÜÓÐÎÊÌâ"
+msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐпÉÄÜÒÑ»ìÂÒ"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÄÚÈÝ¿ÉÄܱ»É¾³ý/²åÈë¹ý"
+msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐпÉÄÜÒѱ»²åÈë/ɾ³ý¹ý"
+#, fuzzy
+# do not translate to avoid writing Chinese in files
msgid "???END"
msgstr "???END"
msgid "E311: Recovery Interrupted"
-msgstr "E311: »Ö¸´ÒÑÖжÏ"
+msgstr "E311: »Ö¸´Òѱ»ÖжÏ"
msgid ""
"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: »Ö¸´Ê±·¢Éú´íÎó; Çë×¢Ò⿪ͷΪ ??? µÄÐÐ"
+msgstr "E312: »Ö¸´Ê±·¢Éú´íÎó£»Çë×¢Ò⿪ͷΪ ??? µÄÐÐ"
+
+msgid "See \":help E312\" for more information."
+msgstr "¸ü¶àÐÅÏ¢Çë¼û \":help E312\""
msgid "Recovery completed. You should check if everything is OK."
-msgstr "»Ö¸´Íê³É. ÇëÈ·¶¨Ò»ÇÐÕý³£."
+msgstr "»Ö¸´Íê±Ï¡£ÇëÈ·¶¨Ò»ÇÐÕý³£¡£"
msgid ""
"\n"
"(You might want to write out this file under another name\n"
msgstr ""
"\n"
-"(Äã¿ÉÄÜÏëÒª°ÑÕâ¸öÎļþÁí´æΪ±ðµÄÎļþÃû£¬\n"
+"(Äã¿ÉÄÜÏëÒª½«Õâ¸öÎļþÁí´æΪ±ðµÄÎļþÃû\n"
msgid "and run diff with the original file to check for changes)\n"
-msgstr "ÔÙÖ´ÐÐ diff ÓëÔÎļþ±È½ÏÒÔ¼ì²éÊÇ·ñÓиıä)\n"
+msgstr "ÔÙÔËÐÐ diff ÓëÔÎļþ±È½ÏÒÔ¼ì²éÊÇ·ñÓиıä)\n"
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
msgstr ""
-"(D)Ö±½Óɾ³ý .swp ½»»»Îļþ\n"
+"È»ºó°Ñ .swp Îļþɾµô¡£\n"
"\n"
#. use msg() to start the scrolling properly
msgid "Swap files found:"
-msgstr "ÕÒµ½ÒÔϵĽ»»»Îļþ:"
+msgstr "ÕÒµ½½»»»Îļþ:"
msgid " In current directory:\n"
-msgstr " ÔÚĿǰĿ¼:\n"
+msgstr " λÓÚµ±Ç°Ä¿Â¼:\n"
msgid " Using specified name:\n"
-msgstr " Using specified name:\n"
+msgstr " ʹÓÃÖ¸¶¨µÄÃû×Ö:\n"
msgid " In directory "
-msgstr " ÔÚĿ¼ "
+msgstr " λÓÚĿ¼ "
msgid " -- none --\n"
msgstr " -- ÎÞ --\n"
@@ -2672,13 +3341,13 @@
msgstr " ÈÕÆÚ: "
msgid " [from Vim version 3.0]"
-msgstr " [´Ó Vim °æ±¾ 3.0]"
+msgstr " [À´×Ô Vim °æ±¾ 3.0]"
msgid " [does not look like a Vim swap file]"
-msgstr " [²»Ïñ Vim µÄ½»»»Îļþ]"
+msgstr " [²»ÏñÊÇ Vim ½»»»Îļþ]"
msgid " file name: "
-msgstr " ÎļþÃû: "
+msgstr " ÎļþÃû: "
msgid ""
"\n"
@@ -2718,14 +3387,14 @@
" ½ø³Ì ID: "
msgid " (still running)"
-msgstr " (ÕýÔÚÖ´ÐÐ)"
+msgstr " (ÈÔÔÚÔËÐÐ)"
msgid ""
"\n"
" [not usable with this version of Vim]"
msgstr ""
"\n"
-" [²»ÄÜÔÚ±¾°æ±¾µÄ Vim ÉÏʹÓÃ]"
+" [²»ÄÜÔڸð汾µÄ Vim ÉÏʹÓÃ]"
msgid ""
"\n"
@@ -2735,13 +3404,13 @@
" [²»ÄÜÔÚ±¾»úÉÏʹÓÃ]"
msgid " [cannot be read]"
-msgstr " [²»ÄܶÁÈ¡]"
+msgstr " [ÎÞ·¨¶ÁÈ¡]"
msgid " [cannot be opened]"
-msgstr " [²»ÄÜ´ò¿ª]"
+msgstr " [ÎÞ·¨´ò¿ª]"
msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: ²»Äܱ£Áô, ²»Ê¹Óý»»»Îļþ"
+msgstr "E313: ÎÞ·¨±£Áô£¬Ã»Óн»»»Îļþ"
msgid "File preserved"
msgstr "ÎļþÒѱ£Áô"
@@ -2751,7 +3420,7 @@
#, c-format
msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: ´íÎóµÄ lnum: %ld"
+msgstr "E315: ml_get: ÎÞЧµÄ lnum: %ld"
#, c-format
msgid "E316: ml_get: cannot find line %ld"
@@ -2764,13 +3433,13 @@
msgstr "stack_idx Ó¦¸ÃÊÇ 0"
msgid "E318: Updated too many blocks?"
-msgstr "E318: ¸üÐÂÌ«¶à¿é?"
+msgstr "E318: ¸üÐÂÁËÌ«¶àµÄ¿é£¿"
msgid "E317: pointer block id wrong 4"
msgstr "E317: Ö¸Õë¿é id ´íÎó 4"
msgid "deleted block 1?"
-msgstr "ɾ³ý¿é 1?"
+msgstr "ɾ³ýÁË¿é 1£¿"
#, c-format
msgid "E320: Cannot find line %ld"
@@ -2784,7 +3453,7 @@
#, c-format
msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Ðкų¬³ö·¶Î§: %ld ³¬¹ý½áβ"
+msgstr "E322: Ðкų¬³ö·¶Î§: %ld ³¬³ö½áβ"
#, c-format
msgid "E323: line count wrong in block %ld"
@@ -2794,7 +3463,11 @@
msgstr "¶ÑÕ»´óСÔö¼Ó"
msgid "E317: pointer block id wrong 2"
-msgstr "E317: Ö¸Õë¿é id ´í 2"
+msgstr "E317: Ö¸Õë¿é id ´íÎó 2"
+
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: \"%s\" ·ûºÅÁ¬½Ó³öÏÖÑ»·"
msgid "E325: ATTENTION"
msgstr "E325: ×¢Òâ"
@@ -2807,10 +3480,10 @@
"·¢ÏÖ½»»»Îļþ \""
msgid "While opening file \""
-msgstr "µ±´ò¿ªÎļþʱ \""
+msgstr "ÕýÔÚ´ò¿ªÎļþ \""
msgid " NEWER than swap file!\n"
-msgstr " ±È½»»»ÎļþÐÂ!\n"
+msgstr " ±È½»»»ÎļþУ¡\n"
#. Some of these messages are long to allow translation to
#. * other languages.
@@ -2821,95 +3494,101 @@
" different instances of the same file when making changes.\n"
msgstr ""
"\n"
-"(1) ¿ÉÄÜÓÐÁíÒ»¸ö³ÌÐòÒ²ÔÚ±à¼Í¬Ò»¸öÎļþ.\n"
-" Èç¹ûÊÇÕâÑù£¬Çë×¢Òâ²»ÒªÒ»ÆðдÈ룬²»È»ÄãµÄŬÁ¦¶¼»á¸¶ÖÁ÷¡£\n"
+"(1) ÁíÒ»¸ö³ÌÐò¿ÉÄÜÒ²ÔÚ±à¼Í¬Ò»¸öÎļþ¡£\n"
+" Èç¹ûÊÇÕâÑù£¬ÐÞ¸ÄʱÇë×¢Òâ±ÜÃâͬһ¸öÎļþ²úÉúÁ½¸ö²»Í¬µÄ°æ±¾¡£\n"
+"\n"
msgid " Quit, or continue with caution.\n"
-msgstr " Í˳ö£¬»òÊǼÌÐø±à¼¡£\n"
+msgstr " Í˳ö£¬»òСÐĵؼÌÐø¡£\n"
msgid ""
"\n"
"(2) An edit session for this file crashed.\n"
msgstr ""
"\n"
-"(2) ÉÏÒ»´Î±à¼´ËÎļþʱ±ÀÀ£\n"
+"(2) Éϴα༴ËÎļþʱ±ÀÀ£¡£\n"
msgid " If this is the case, use \":recover\" or \"vim -r "
-msgstr " Èç¹ûÊÇÕâÑù, ÇëÓà \":recover\" »ò \"vim -r"
+msgstr " Èç¹ûÊÇÕâÑù£¬ÇëÓà \":recover\" »ò \"vim -r "
msgid ""
"\"\n"
" to recover the changes (see \":help recovery\").\n"
msgstr ""
"\"\n"
-" »Ö¸´ÐÞ¸ÄÄÚÈÝ (½øÒ»²½ËµÃ÷Çë¿´ \":help recovery\").\n"
+" »Ö¸´Ð޸ĵÄÄÚÈÝ (Çë¼û \":help recovery\")¡£\n"
msgid " If you did this already, delete the swap file \""
-msgstr " Èç¹û¸Ã»Ö¸´µÄ¶¼ÒѾ»Ö¸´ÁË, ÇëÖ±½Óɾ³ý´Ë½»»»Îļþ \""
+msgstr " Èç¹ûÄãÒѾ½øÐÐÁ˻ָ´£¬Çëɾ³ý½»»»Îļþ \""
msgid ""
"\"\n"
" to avoid this message.\n"
msgstr ""
"\"\n"
-" ÒÔ±ÜÃâÔÙ¿´µ½´ËÐÅÏ¢.\n"
+" ÒÔ±ÜÃâÔÙ¿´µ½´ËÏûÏ¢¡£\n"
msgid "Swap file \""
msgstr "½»»»Îļþ \""
msgid "\" already exists!"
-msgstr "\" ÒѾ´æÔÚÁË!"
+msgstr "\" ÒÑ´æÔÚ£¡"
msgid "VIM - ATTENTION"
msgstr "VIM - ×¢Òâ"
msgid "Swap file already exists!"
-msgstr "½»»»ÎļþÒѾ´æÔÚ!"
-
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit"
-msgstr ""
-"ÒÔÖ»¶Á·½Ê½´ò¿ª(&O)\n"
-"Ö±½Ó±à¼(&E)\n"
-"»Ö¸´(&R)\n"
-"Í˳ö(&Q)"
+msgstr "½»»»ÎļþÒÑ´æÔÚ£¡"
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
"&Quit\n"
-"&Delete it"
+"&Abort"
msgstr ""
"ÒÔÖ»¶Á·½Ê½´ò¿ª(&O)\n"
"Ö±½Ó±à¼(&E)\n"
"»Ö¸´(&R)\n"
"Í˳ö(&Q)\n"
-"ɾ³ý½»»»Îļþ(&D)"
+"ÖÐÖ¹(&A)"
+
+msgid ""
+"&Open Read-Only\n"
+"&Edit anyway\n"
+"&Recover\n"
+"&Delete it\n"
+"&Quit\n"
+"&Abort"
+msgstr ""
+"ÒÔÖ»¶Á·½Ê½´ò¿ª(&O)\n"
+"Ö±½Ó±à¼(&E)\n"
+"»Ö¸´(&R)\n"
+"ɾ³ý½»»»Îļþ(&D)\n"
+"Í˳ö(&Q)\n"
+"ÖÐÖ¹(&A)"
msgid "E326: Too many swap files found"
msgstr "E326: ÕÒµ½Ì«¶à½»»»Îļþ"
msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ²¿·Ý²Ëµ¥Ïî²»ÊÇ×Ӳ˵¥"
+msgstr "E327: ²Ëµ¥ÏîµÄij²¿·Ö·¾¶²»ÊÇ×Ӳ˵¥"
msgid "E328: Menu only exists in another mode"
-msgstr "E328: ²Ëµ¥Ö»ÄÜÔÚÆäËüģʽÖÐʹÓÃ"
+msgstr "E328: ²Ëµ¥Ö»ÔÚÆäËüģʽÖдæÔÚ"
-msgid "E329: No menu of that name"
-msgstr "E329: ûÓÐÄÇÑùµÄ²Ëµ¥"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: ûÓв˵¥ \"%s\""
msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: ²Ëµ¥²»ÄÜÖ¸Ïò×ÓÑ¡µ¥"
+msgstr "E330: ²Ëµ¥Â·¾¶²»ÄÜÖ¸Ïò×Ӳ˵¥"
msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ²»ÄÜÖ±½Ó°Ñ²Ëµ¥Ïî¼Óµ½²Ëµ¥ÌõÖÐ"
+msgstr "E331: ²»ÄܰѲ˵¥ÏîÖ±½Ó¼Óµ½²Ëµ¥À¸ÖÐ"
msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: ·Ö¸ôÏß²»ÄÜÊDz˵¥µÄÒ»²¿·Ö"
+msgstr "E332: ·Ö¸ôÏß²»ÄÜÊDz˵¥Â·¾¶µÄÒ»²¿·Ö"
#. Now we have found the matching menu, and we list the mappings
#. Highlight title
@@ -2921,21 +3600,21 @@
"--- ²Ëµ¥ ---"
msgid "Tear off this menu"
-msgstr "ÇÐÏ´˲˵¥"
+msgstr "˺Ï´˲˵¥"
msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: ²Ëµ¥±ØÐèÖ¸ÏòÒ»¸ö²Ëµ¥Ïî"
+msgstr "E333: ²Ëµ¥Â·¾¶±ØÐëÖ¸Ïò²Ëµ¥Ïî"
#, c-format
msgid "E334: Menu not found: %s"
-msgstr "E334: [²Ëµ¥] ÕÒ²»µ½ %s"
+msgstr "E334: ÕÒ²»µ½²Ëµ¥: %s"
#, c-format
msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ģʽ䶨Òå²Ëµ¥"
+msgstr "E335: %s ģʽÖв˵¥Î´¶¨Òå"
msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: ²Ëµ¥±ØÐèÖ¸Ïò×Ӳ˵¥"
+msgstr "E336: ²Ëµ¥Â·¾¶±ØÐëÖ¸Ïò×Ӳ˵¥"
msgid "E337: Menu not found - check menu names"
msgstr "E337: ÕÒ²»µ½²Ëµ¥ - Çë¼ì²é²Ëµ¥Ãû³Æ"
@@ -2946,31 +3625,30 @@
#, c-format
msgid "line %4ld:"
-msgstr "ÐÐ %4ld:"
+msgstr "µÚ %4ld ÐÐ:"
-msgid "[string too long]"
-msgstr "[×Ö·û´®Ì«³¤]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: ÎÞЧµÄ¼Ä´æÆ÷Ãû: '%s'"
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "¼òÌåÖÐÎÄÐÅϢά»¤Õß: Wang Jun <junw@turbolinux.com.cn>"
+msgstr "¼òÌåÖÐÎÄÏûϢά»¤Õß: Yuheng Xie <elephant@linux.net.cn>"
msgid "Interrupt: "
msgstr "ÒÑÖжÏ: "
-msgid "Hit ENTER to continue"
-msgstr "Çë°´ ENTER ¼ÌÐø"
-
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
msgstr "Çë°´ ENTER »òÆäËüÃüÁî¼ÌÐø"
+#, c-format
+msgid "%s line %ld"
+msgstr "%s µÚ %ld ÐÐ"
+
msgid "-- More --"
msgstr "-- ¸ü¶à --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: ÏòÏÂ/ÏòÉÏÒ»ÐÐ, ¿Õ¸ñ/b: Ò»Ò³, d/u: °ëÒ³, q: Í˳ö)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: ÏòÏÂÒ»ÐÐ, ¿Õ°×¼ü: Ò»Ò³, d: °ëÒ³, q: Í˳ö)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " ¿Õ¸ñ/d/j: ÆÁÄ»/Ò³/ÐÐ Ï·£¬b/u/k: ÉÏ·£¬q: Í˳ö"
msgid "Question"
msgstr "ÎÊÌâ"
@@ -2979,17 +3657,8 @@
"&Yes\n"
"&No"
msgstr ""
-"&YÊÇ\n"
-"&N·ñ"
-
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&YÊÇ\n"
-"&N·ñ\n"
-"&CÈ¡Ïû"
+"ÊÇ(&Y)\n"
+"·ñ(&N)"
msgid ""
"&Yes\n"
@@ -2998,11 +3667,14 @@
"&Discard All\n"
"&Cancel"
msgstr ""
-"&YÊÇ\n"
-"&N·ñ\n"
-"&AÈ«²¿±£´æ\n"
-"&DÈ«²¿²»´æ\n"
-"&CÈ¡Ïû"
+"ÊÇ(&Y)\n"
+"·ñ(&N)\n"
+"È«²¿±£´æ(&A)\n"
+"È«²¿¶ªÆú(&D)\n"
+"È¡Ïû(&C)"
+
+msgid "Select Directory dialog"
+msgstr "Ñ¡ÔñĿ¼¶Ô»°¿ò"
msgid "Save File dialog"
msgstr "±£´æÎļþ¶Ô»°¿ò"
@@ -3012,35 +3684,51 @@
#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: Ö÷¿Ø̨(Console)ģʽʱûÓÐÎļþä¯ÀÀÆ÷(file browser)"
+msgstr "E338: ±§Ç¸£¬¿ØÖÆ̨ģʽÏÂûÓÐÎļþä¯ÀÀÆ÷"
+
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf() µÄ²ÎÊý²»×ã"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: printf() µÄ²ÎÊý¹ý¶à"
msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ×¢Òâ: ÄãÕýÔÚÐÞ¸ÄÒ»¸öÖ»¶ÁÎļþ"
+msgstr "W10: ¾¯¸æ: ÕýÔÚÐÞ¸ÄÒ»¸öÖ»¶ÁÎļþ"
+
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "ÇëÊäÈëÊý×Ö»òµã»÷Êó±ê (<Enter> È¡Ïû): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "ÇëÑ¡ÔñÊý×Ö (<Enter> È¡Ïû): "
msgid "1 more line"
-msgstr "»¹ÓÐÒ»ÐÐ"
+msgstr "¶àÁË 1 ÐÐ"
msgid "1 line less"
-msgstr "ÉÙÓÚÒ»ÐÐ"
+msgstr "ÉÙÁË 1 ÐÐ"
#, c-format
msgid "%ld more lines"
-msgstr " »¹ÓÐ %ld ÐÐ"
+msgstr "¶àÁË %ld ÐÐ"
#, c-format
msgid "%ld fewer lines"
-msgstr "ֻʣ %ld ÐÐ"
+msgstr "ÉÙÁË %ld ÐÐ"
msgid " (Interrupted)"
msgstr " (ÒÑÖжÏ)"
+msgid "Beep!"
+msgstr "Beep!"
+
msgid "Vim: preserving files...\n"
-msgstr "Vim: ±£ÁôÎļþÖÐ...\n"
+msgstr "Vim: ÕýÔÚ±£ÁôÎļþ¡¡\n"
#. close all memfiles, without deleting
msgid "Vim: Finished.\n"
-msgstr "Vim: ½áÊø.\n"
+msgstr "Vim: ½áÊø¡£\n"
+#, c-format
msgid "ERROR: "
msgstr "´íÎó: "
@@ -3050,14 +3738,14 @@
"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
msgstr ""
"\n"
-"[bytes] È«²¿ alloc-freed %lu-%lu, ʹÓÃÖÐ %lu, peak ʹÓà %lu\n"
+"[×Ö½Ú] ×ܹ² alloc-free %lu-%lu£¬Ê¹ÓÃÖÐ %lu£¬¸ß·åʹÓà %lu\n"
#, c-format
msgid ""
"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
"\n"
msgstr ""
-"[µ÷ÓÃ] È«²¿ re/malloc(): %lu, È«²¿ free()': %lu\n"
+"[µ÷ÓÃ] ×ܹ² re/malloc(): %lu£¬×ܹ² free()': %lu\n"
"\n"
msgid "E340: Line is becoming too long"
@@ -3069,26 +3757,26 @@
#, c-format
msgid "E342: Out of memory! (allocating %lu bytes)"
-msgstr "E342: ÄÚ´æ²»×ã! (³¢ÊÔÅäÖà %lu ×Ö½Ú×é)"
+msgstr "E342: ÄÚ´æ²»×㣡(·ÖÅä %lu ×Ö½Ú)"
#, c-format
msgid "Calling shell to execute: \"%s\""
msgstr "µ÷ÓÃ shell Ö´ÐÐ: \"%s\""
-msgid "Missing colon"
-msgstr "ȱÉÙðºÅ"
+msgid "E545: Missing colon"
+msgstr "E545: ȱÉÙðºÅ"
-msgid "Illegal mode"
-msgstr "²»ÕýÈ·µÄģʽ"
+msgid "E546: Illegal mode"
+msgstr "E546: ÎÞЧµÄģʽ"
-msgid "Illegal mouseshape"
-msgstr "²»ÕýÈ·µÄÊó±êÐÎ×´"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: ÎÞЧµÄÊó±êÐÎ×´"
-msgid "digit expected"
-msgstr "Ó¦¸ÃΪÊý×Ö"
+msgid "E548: digit expected"
+msgstr "E548: ´Ë´¦ÐèÒªÊý×Ö"
-msgid "Illegal percentage"
-msgstr "²»ÕýÈ·µÄ°Ù·Ö±È"
+msgid "E549: Illegal percentage"
+msgstr "E549: ÎÞЧµÄ°Ù·Ö±È"
msgid "Enter encryption key: "
msgstr "ÊäÈëÃÜÂë: "
@@ -3097,17 +3785,17 @@
msgstr "ÇëÔÙÊäÈëÒ»´Î: "
msgid "Keys don't match!"
-msgstr "Á½´ÎÊäÈëÃÜÂ벻ͬ!"
+msgstr "Á½´ÎÃÜÂ벻ƥÅ䣡"
#, c-format
msgid ""
"E343: Invalid path: '**[number]' must be at the end of the path or be "
"followed by '%s'."
-msgstr "E343: ²»ÕýÈ·µÄ·¾¶: '**[number]' ±ØÐèÒªÔÚ·¾¶½áβ»òÒª½ÓÖø '%s'"
+msgstr "E343: ÎÞЧµÄ·¾¶: '**[number]' ±ØÐëÔÚ·¾¶Ä©Î²»òÕߺóÃæ½Ó '%s'¡£"
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath ÖÐûÓÐĿ¼ \"%s\""
+msgstr "E344: cdpath ÖÐÕÒ²»µ½Ä¿Â¼ \"%s\""
#, c-format
msgid "E345: Can't find file \"%s\" in path"
@@ -3121,11 +3809,35 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: ÔÚ·¾¶ÖÐÕÒ²»µ½¸ü¶àµÄÎļþ \"%s\""
-msgid "Illegal component"
-msgstr "²»ÕýÈ·µÄ×é¼þ"
+#. Get here when the server can't be found.
+#~ msgid "Cannot connect to Netbeans #2"
+#~ msgstr ""
+
+#~ msgid "Cannot connect to Netbeans"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+#~ msgstr ""
+
+#~ msgid "read from Netbeans socket"
+#~ msgstr ""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: »º³åÇø %ld ¶ªÊ§ NetBeans Á¬½Ó"
+
+msgid "E505: "
+msgstr "E505: "
+
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' Ϊ¿Õ"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: ÇóÖµ¹¦Äܲ»¿ÉÓÃ"
msgid "Warning: terminal cannot highlight"
-msgstr "×¢Òâ: ÄãµÄÖն˲»ÄÜÏÔʾ¸ßÁÁ¶È"
+msgstr "¾¯¸æ: ÄãµÄÖն˲»ÄÜÏÔʾ¸ßÁÁ"
msgid "E348: No string under cursor"
msgstr "E348: ¹â±ê´¦Ã»ÓÐ×Ö·û´®"
@@ -3134,56 +3846,78 @@
msgstr "E349: ¹â±ê´¦Ã»ÓÐʶ±ð×Ö"
msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: ²»ÄÜÔÚÄ¿Ç°µÄ 'foldmethod' ÏÂɾ³ý fold"
+msgstr "E352: ²»ÄÜÔÚµ±Ç°µÄ 'foldmethod' ÏÂɾ³ý fold"
+
+msgid "E664: changelist is empty"
+msgstr "E664: ¸Ä±äÁбíΪ¿Õ"
+
+msgid "E662: At start of changelist"
+msgstr "E662: ÒÑÔڸıäÁбíµÄ¿ªÊ¼´¦"
+
+msgid "E663: At end of changelist"
+msgstr "E663: ÒÑÔڸıäÁбíµÄĩβ´¦"
+
+msgid "Type :quit<Enter> to exit Vim"
+msgstr "ÊäÈë :quit<Enter> Í˳ö Vim"
#, c-format
msgid "1 line %sed 1 time"
-msgstr "Ò»ÐÐ %s ¹ý Ò»´Î"
+msgstr "1 ÐÐ %s ÁË 1 ´Î"
#, c-format
msgid "1 line %sed %d times"
-msgstr "Ò»ÐÐ %s ¹ý %d ´Î"
+msgstr "1 ÐÐ %s ÁË %d ´Î"
#, c-format
msgid "%ld lines %sed 1 time"
-msgstr "%ld ÐÐ %s ¹ý Ò»´Î"
+msgstr "%ld ÐÐ %s ÁË 1 ´Î"
#, c-format
msgid "%ld lines %sed %d times"
-msgstr "%ld ÐÐ %s ¹ý %d ´Î"
+msgstr "%ld ÐÐ %s ÁË %d ´Î"
#, c-format
msgid "%ld lines to indent... "
-msgstr "ʶ±ð %ld ÐÐ..."
+msgstr "Ëõ½ø %ld ÐС¡ "
msgid "1 line indented "
-msgstr "Ò»ÐÐÒÑʶ±ð"
+msgstr "Ëõ½øÁË 1 ÐÐ "
#, c-format
msgid "%ld lines indented "
-msgstr "ÒÑʶ±ð %ld ÐÐ"
+msgstr "Ëõ½øÁË %ld ÐÐ "
+
+msgid "E748: No previously used register"
+msgstr "E748: ûÓÐÇ°Ò»¸öʹÓõļĴæÆ÷"
#. must display the prompt
msgid "cannot yank; delete anyway"
-msgstr "²»Äܸ´ÖÆ; Ö±½Óɾ³ý"
+msgstr "ÎÞ·¨¸´ÖÆ£»¸ÄΪɾ³ý"
msgid "1 line changed"
-msgstr " 1 ÐÐ ~ed"
+msgstr "¸Ä±äÁË 1 ÐÐ"
#, c-format
msgid "%ld lines changed"
-msgstr " %ld ÐÐ ~ed"
+msgstr "¸Ä±äÁË %ld ÐÐ"
#, c-format
msgid "freeing %ld lines"
-msgstr "ÊÍ·Å %ld ÐÐÖÐ"
+msgstr "ÊÍ·ÅÁË %ld ÐÐ"
+
+msgid "block of 1 line yanked"
+msgstr "¸´ÖÆÁË 1 ÐеĿé"
msgid "1 line yanked"
-msgstr "ÒѸ´ÖÆ 1 ÐÐ"
+msgstr "¸´ÖÆÁË 1 ÐÐ"
+
+#, c-format
+msgid "block of %ld lines yanked"
+msgstr "¸´ÖÆÁË %ld ÐеĿé"
#, c-format
msgid "%ld lines yanked"
-msgstr "ÒѸ´ÖÆ %ld ÐÐ"
+msgstr "¸´ÖÆÁË %ld ÐÐ"
#, c-format
msgid "E353: Nothing in register %s"
@@ -3198,8 +3932,9 @@
"--- ¼Ä´æÆ÷ ---"
msgid "Illegal register name"
-msgstr "²»ÕýÈ·µÄ¼Ä´æÆ÷Ãû³Æ"
+msgstr "ÎÞЧµÄ¼Ä´æÆ÷Ãû"
+#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -3208,144 +3943,152 @@
"# ¼Ä´æÆ÷:\n"
#, c-format
-msgid "Unknown register type %d"
-msgstr "δ֪µÄ×¢²áÀàÐÍ: %d"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ¼Ä´æÆ÷Ãû³Æ´íÎó: '%s'"
+msgid "E574: Unknown register type %d"
+msgstr "E574: δ֪µÄ¼Ä´æÆ÷ÀàÐÍ %d"
#, c-format
msgid "%ld Cols; "
msgstr "%ld ÁÐ; "
-#, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Bytes)"
+#, fuzzy, c-format
+#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+#~ msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Bytes)"
+
+#, fuzzy, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Chars); %ld/%ld"
+
+#, fuzzy, c-format
+#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+#~ msgstr "ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+
+#, fuzzy, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Char) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
-#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
msgid "Thanks for flying Vim"
msgstr "¸ÐлÄúÑ¡Ôñ Vim"
-msgid "Option not supported"
-msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+msgid "E518: Unknown option"
+msgstr "E518: δ֪µÄÑ¡Ïî"
-msgid "Not allowed in a modeline"
-msgstr "²»ÄÜÔÚģʽÐÐÀï³öÏÖ"
+msgid "E519: Option not supported"
+msgstr "E519: ²»Ö§³Ö¸ÃÑ¡Ïî"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tµ±Ç°ÉèÖÃ: "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: ²»ÔÊÐíÔÚ modeline ÖÐʹÓÃ"
-msgid "Number required after ="
-msgstr "= ºóÐèÒªÓÐÊý×Ö"
+msgid "E521: Number required after ="
+msgstr "E521: = ºóÃæÐèÒªÊý×Ö"
-msgid "Not found in termcap"
-msgstr "Termcap ÀïÃæÕÒ²»µ½"
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap ÀïÃæÕÒ²»µ½"
#, c-format
-msgid "Illegal character <%s>"
-msgstr "²»ÕýÈ·µÄ×Ö·û <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: ÎÞЧµÄ×Ö·û <%s>"
-msgid "Not allowed here"
-msgstr "ÕâÀï²»¿ÉʹÓÃ"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: ²»ÄÜÉ趨 'term' Ϊ¿Õ×Ö·û´®"
-msgid "Cannot set 'term' to empty string"
-msgstr "²»ÄÜÉ趨 'term' Ϊ¿Õ×Ö·û´®"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: ÔÚͼÐνçÃæÖв»ÄܸıäÖÕ¶Ë"
-msgid "Cannot change term in GUI"
-msgstr "ÔÚͼÐͽçÃæÖв»ÄÜÇл»ÖÕ¶Ë"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: ÇëÓà \":gui\" Æô¶¯Í¼ÐνçÃæ"
-msgid "Use \":gui\" to start the GUI"
-msgstr "ÊäÈë \":gui\" À´Æô¶¯Í¼ÐνçÃæ"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' ºÍ 'patchmode' ÏàµÈ"
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' ¸ú 'patchmode' ÊÇÒ»ÑùµÄ"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: ÔÚ GTK+ 2 ͼÐνçÃæÖв»Äܸü¸Ä"
-msgid "Zero length string"
-msgstr "Á㳤¶È×Ö·û´®"
+msgid "E524: Missing colon"
+msgstr "E524: ȱÉÙðºÅ"
+
+msgid "E525: Zero length string"
+msgstr "E525: ×Ö·û´®³¤¶ÈΪÁã"
#, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> ºóȱÉÙÊý×Ö"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> ºóÃæȱÉÙÊý×Ö"
-msgid "Missing comma"
-msgstr "ȱÉÙ¶ººÅ"
+msgid "E527: Missing comma"
+msgstr "E527: ȱÉÙ¶ººÅ"
-msgid "Must specify a ' value"
-msgstr "±ØÐèÖ¸¶¨Ò»¸ö ' Öµ"
+msgid "E528: Must specify a ' value"
+msgstr "E528: ±ØÐëÖ¸¶¨Ò»¸ö ' Öµ"
-msgid "contains unprintable character"
-msgstr "°üº¬²»ÄÜÏÔʾµÄ×Ö·û"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: °üº¬²»¿ÉÏÔʾ×Ö·û»ò¿í×Ö·û"
-msgid "Invalid font(s)"
-msgstr "²»ÕýÈ·µÄ×ÖÌå"
+msgid "E596: Invalid font(s)"
+msgstr "E596: ÎÞЧµÄ×ÖÌå"
-msgid "can't select fontset"
-msgstr "²»ÄÜʹÓÃ×ÖÌ弯(Fontset)"
+msgid "E597: can't select fontset"
+msgstr "E597: ÎÞ·¨Ñ¡Ôñ Fontset"
-msgid "Invalid fontset"
-msgstr "²»ÕýÈ·µÄ×ÖÌ弯(Fontset)"
+msgid "E598: Invalid fontset"
+msgstr "E598: ÎÞЧµÄ Fontset"
-msgid "can't select wide font"
-msgstr "²»ÄÜʹÓÃÉ趨µÄ¿í×ÖÌå(Widefont)"
+msgid "E533: can't select wide font"
+msgstr "E533: ÎÞ·¨Ñ¡Ôñ¿í×ÖÌå"
-msgid "Invalid wide font"
-msgstr "²»ÕýÈ·µÄ¿í×ÖÌå(Widefont)"
+msgid "E534: Invalid wide font"
+msgstr "E534: ÎÞЧµÄ¿í×ÖÌå"
#, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> ºóÓв»ÕýÈ·µÄ×Ö·û"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> ºóÃæÓÐÎÞЧµÄ×Ö·û"
-msgid "comma required"
-msgstr "ÐèÒª¶ººÅ"
+msgid "E536: comma required"
+msgstr "E536: ÐèÒª¶ººÅ"
#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' ±ØÐèÊÇ¿Õ°×»ò°üº¬ %s"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' ±ØÐëΪ¿Õ»ò°üº¬ %s"
-msgid "No mouse support"
-msgstr "²»Ö§³ÖÊó±ê"
+msgid "E538: No mouse support"
+msgstr "E538: ²»Ö§³ÖÊó±ê"
-msgid "Unclosed expression sequence"
-msgstr "ûÓнáÊøµÄ±í´ïʽ: "
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: ûÓнáÊøµÄ±í´ïʽÐòÁÐ"
-msgid "too many items"
-msgstr "Ì«¶à¶ÔÏó"
+msgid "E541: too many items"
+msgstr "E541: ÏîÄ¿¹ý¶à"
-msgid "unbalanced groups"
-msgstr "²»¶Ô³ÆµÄ×é"
+msgid "E542: unbalanced groups"
+msgstr "E542: ´íÂÒµÄ×é"
-msgid "A preview window already exists"
-msgstr "Ô¤ÀÀ´°¿ÚÒѾ´æÔÚÁË"
+msgid "E590: A preview window already exists"
+msgstr "E590: Ô¤ÀÀ´°¿ÚÒÑ´æÔÚ"
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' ²»ÄÜ±È 'winminheight' ¸üÉÙ"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' ²»ÄÜ±È 'winminwidth' ¸üÉÙ"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic ÐèÒª UTF-8£¬ÇëÖ´ÐÐ ':set encoding=utf-8'"
#, c-format
-msgid "Need at least %d lines"
-msgstr "ÖÁÉÙÐèÒª %d ÐÐ"
+msgid "E593: Need at least %d lines"
+msgstr "E593: ÖÁÉÙÐèÒª %d ÐÐ"
#, c-format
-msgid "Need at least %d columns"
-msgstr "ÖÁÉÙÐèÒª %d ÁÐ"
+msgid "E594: Need at least %d columns"
+msgstr "E594: ÖÁÉÙÐèÒª %d ÁÐ"
#, c-format
msgid "E355: Unknown option: %s"
-msgstr "E355: ²»ÕýÈ·µÄÑ¡Ïî: %s"
+msgstr "E355: δ֪µÄÑ¡Ïî: %s"
msgid ""
"\n"
@@ -3359,14 +4102,14 @@
"--- Global option values ---"
msgstr ""
"\n"
-"--- È«¾Ö Ñ¡ÏîÖµ ---"
+"--- È«¾ÖÑ¡ÏîÖµ ---"
msgid ""
"\n"
"--- Local option values ---"
msgstr ""
"\n"
-"--- ±¾µØ Ñ¡ÏîÖµ ---"
+"--- ¾Ö²¿Ñ¡ÏîÖµ ---"
msgid ""
"\n"
@@ -3412,9 +4155,6 @@
msgid "cannot change console mode ?!\n"
msgstr "²»ÄÜÇл»Ö÷¿Ø̨(console)ģʽ !?\n"
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ²»Ö§³ÖÉ趨ÆÁĻģʽ"
-
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: ²»ÊÇÖ÷¿Ø̨(console)??\n"
@@ -3440,13 +4180,12 @@
#~ msgid "...(truncated)"
#~ msgstr ""
+#~ msgid "Message"
+#~ msgstr ""
+
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' ²»ÊÇ 80, ²»ÄÜÖ´ÐÐÍⲿÃüÁî"
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: µ÷Óú¯Êý¿â \"%s\"() ʧ°Ü"
-
msgid "E237: Printer selection failed"
msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
@@ -3455,12 +4194,13 @@
msgstr "´Ó %s µ½ %s"
#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: δ֪µÄ´òÓ¡»ú×ÖÌå: %s"
+
+#, c-format
msgid "E238: Print error: %s"
msgstr "E238: ´òÓ¡´íÎó: %s"
-msgid "Unknown"
-msgstr "δ֪"
-
#, c-format
msgid "Printing '%s'"
msgstr "ÒÑ´òÓ¡: '%s'"
@@ -3483,6 +4223,7 @@
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: CVim: À¹½Øµ½ÐźÅ(signal) %s\n"
+#, c-format
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: À¹½Øµ½ÖÂÃüµÄÐźÅ(deadly signale)\n"
@@ -3545,9 +4286,31 @@
"\n"
"ÃüÁîÒѽáÊø\n"
+#, fuzzy
+#~ msgid "XSMP lost ICE connection"
+#~ msgstr "ÏÔʾÁ¬½Ó"
+
+#, c-format
+#~ msgid "dlerror = \"%s\""
+#~ msgstr ""
+
msgid "Opening the X display failed"
msgstr "´ò¿ª X Window ʧ°Ü"
+#~ msgid "XSMP handling save-yourself request"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "XSMP opening connection"
+#~ msgstr "ûÓÐ cscope Á¬½Ó"
+
+#~ msgid "XSMP ICE connection watch failed"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "XSMP SmcOpenConnection failed: %s"
+#~ msgstr ""
+
msgid "At line"
msgstr "ÔÚÐкŠ"
@@ -3587,7 +4350,7 @@
msgstr ""
"ÔÚÄãµÄ $PATH ÖÐÕÒ²»µ½ VIMRUN.EXE.\n"
"ÍⲿÃüÁîÖ´ÐÐÍê±Ïºó½«²»»áÔÝÍ£.\n"
-"½øÒ»²½ËµÃ÷ÇëÖ´ÐÐ :help win32-vimrun "
+"½øÒ»²½ËµÃ÷Çë¼û :help win32-vimrun"
msgid "Vim Warning"
msgstr "Vim ¾¯¸æ"
@@ -3621,8 +4384,8 @@
msgid "E379: Missing or empty directory name"
msgstr "E379: ÕÒ²»µ½Ä¿Â¼Ãû³Æ»òÊÇ¿ÕµÄĿ¼Ãû³Æ"
-msgid "No more items"
-msgstr "ûÓÐÆäËü¶ÔÏó"
+msgid "E553: No more items"
+msgstr "E553: ûÓиü¶àµÄÏî"
#, c-format
msgid "(%d of %d)%s%s: "
@@ -3632,50 +4395,122 @@
msgstr " (ÐÐÒÑɾ³ý)"
msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix ¶ÑÕ»½áβ"
+msgstr "E380: Quickfix ¶ÑÕ»µ×¶Ë"
msgid "E381: At top of quickfix stack"
msgstr "E381: Quickfix ¶ÑÕ»¶¥¶Ë"
#, c-format
msgid "error list %d of %d; %d errors"
-msgstr "´íÎóÁбí %d/%d; ¹²ÓÐ %d Ïî´íÎó"
+msgstr "´íÎóÁбí %d / %d£»¹² %d ¸ö´íÎó"
msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: ²»ÄÜдÈ룬'buftype' Ñ¡ÏîÒÑÉ趨"
+msgstr "E382: ÎÞ·¨Ð´È룬ÒÑÉ趨ѡÏî 'buftype'"
+
+#~ msgid "E683: File name missing or invalid pattern"
+#~ msgstr ""
+
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "ÎÞ·¨´ò¿ªÎļþ \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: »º³åÇøδ¼ÓÔØ"
+
+msgid "E777: String or List expected"
+msgstr "E777: ´Ë´¦ÐèÒª String »òÕß List"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: %s%%[] ÖÐÓÐÎÞЧµÄÏî"
msgid "E339: Pattern too long"
-msgstr "E339: Ãû×ÖÌ«³¤"
+msgstr "E339: ģʽ̫³¤"
+
+msgid "E50: Too many \\z("
+msgstr "E50: Ì«¶à \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Ì«¶à %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: ²»Æ¥ÅäµÄ \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: ²»Æ¥ÅäµÄ %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: ²»Æ¥ÅäµÄ %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: ²»Æ¥ÅäµÄ %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ ºóÃæÓÐÎÞЧµÄ×Ö·û"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Ì«¶à¸´Ô %s{...}s"
#, c-format
msgid "E61: Nested %s*"
-msgstr "E61: ³²×´ %s*"
+msgstr "E61: ǶÌ×µÄ %s*"
#, c-format
msgid "E62: Nested %s%c"
-msgstr "E62: ³²×´ %s%c"
+msgstr "E62: ǶÌ×µÄ %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: ²»ÕýÈ·µØʹÓà \\_"
#, c-format
msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c ûÓнӶ«Î÷"
+msgstr "E64: %s%c Ç°ÃæÎÞÄÚÈÝ"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: ÎÞЧµÄ»ØÒý"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: ´Ë´¦²»ÔÊÐí \\z("
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: ´Ë´¦²»ÔÊÐí \\z1 µÈ"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: \\z ºóÃæÓÐÎÞЧµÄ×Ö·û"
#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "Óï·¨´íÎó: %s{...}"
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ ºóȱÉÙ ]"
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: ²»ÄÜÖ´ÐÐ; regular expression Ì«¸´ÔÓ?"
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: ¿ÕµÄ %s%%[]"
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression Ôì³É¶ÑÕ»ÓùâµÄ´íÎó"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] ºóÃæÓÐÎÞЧµÄ×Ö·û"
+
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: %s%% ºóÃæÓÐÎÞЧµÄ×Ö·û"
+
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ºóȱÉÙ ]"
+
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} ÖÐÓï·¨´íÎó"
msgid "External submatches:\n"
msgstr "Íⲿ·ûºÏ:\n"
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--ÒÑ fold %3ld ÐÐ"
-
msgid " VREPLACE"
msgstr " V-Ìæ»»"
@@ -3683,7 +4518,7 @@
msgstr " Ìæ»»"
msgid " REVERSE"
-msgstr " ·´×ª"
+msgstr " ·´Ïò"
msgid " INSERT"
msgstr " ²åÈë"
@@ -3695,10 +4530,13 @@
msgstr " (Ìæ»»)"
msgid " (vreplace)"
-msgstr " (v-Ìæ»»)"
+msgstr " (V-Ìæ»»)"
msgid " Hebrew"
-msgstr " Ï£²®À³"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
msgid " (lang)"
msgstr " (ÓïÑÔ)"
@@ -3706,30 +4544,30 @@
msgid " (paste)"
msgstr " (Õ³Ìû)"
-msgid " SELECT"
-msgstr " ѡȡ"
-
msgid " VISUAL"
msgstr " ¿ÉÊÓ"
-msgid " BLOCK"
-msgstr " ¿é"
+msgid " VISUAL LINE"
+msgstr " ¿ÉÊÓ ÐÐ"
-msgid " LINE"
-msgstr " ÐÐ"
+msgid " VISUAL BLOCK"
+msgstr " ¿ÉÊÓ ¿é"
+
+msgid " SELECT"
+msgstr " Ñ¡Ôñ"
+
+msgid " SELECT LINE"
+msgstr " Ñ¡Ôñ ÐÐ"
+
+msgid " SELECT BLOCK"
+msgstr " Ñ¡Ôñ ¿é"
msgid "recording"
msgstr "¼Ç¼ÖÐ"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "ÒѲéÕÒµ½Îļþ¿ªÍ·£»ÔÙ´Ó½áβ¼ÌÐø²éÕÒ"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "ÒѲéÕÒµ½Îļþ½áβ£»ÔÙ´Ó¿ªÍ·¼ÌÐø²éÕÒ"
-
#, c-format
msgid "E383: Invalid search string: %s"
-msgstr "E383: ´íÎóµÄ²éÕÒ×Ö·û´®: %s"
+msgstr "E383: ÎÞЧµÄ²éÕÒ×Ö·û´®: %s"
#, c-format
msgid "E384: search hit TOP without match for: %s"
@@ -3765,6 +4603,10 @@
msgid "Scanning included file: %s"
msgstr "²éÕÒ°üº¬Îļþ: %s"
+#, fuzzy, c-format
+#~ msgid "Searching included file %s"
+#~ msgstr "²éÕÒ°üº¬Îļþ: %s"
+
msgid "E387: Match is on current line"
msgstr "E387: µ±Ç°ÐÐÆ¥Åä"
@@ -3780,9 +4622,364 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: ÕÒ²»µ½ pattern"
+#, fuzzy
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E297: ½»»»ÎļþдÈë´íÎó"
+
+#, fuzzy
+#~ msgid "E758: Truncated spell file"
+#~ msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
+
+#, fuzzy, c-format
+#~ msgid "Trailing text in %s line %d: %s"
+#~ msgstr "\"%s%s\" Öжϵã: µÚ %ld ÐÐ"
+
+#, c-format
+#~ msgid "Affix name too long in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
+#~ msgstr "E431: Tag Îļþ \"%s\" ¸ñʽ´íÎó"
+
+#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
+#~ msgstr ""
+
+#~ msgid "Compressing word tree..."
+#~ msgstr ""
+
+#~ msgid "E756: Spell checking is not enabled"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading spell file \"%s\""
+#~ msgstr "ʹÓý»»»Îļþ \"%s\""
+
+#, fuzzy
+#~ msgid "E757: This does not look like a spell file"
+#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»Îļþ"
+
+#, fuzzy
+#~ msgid "E771: Old spell file, needs to be updated"
+#~ msgstr "E173: »¹ÓÐ %ld ¸öÎļþδ±à¼"
+
+#~ msgid "E772: Spell file is for newer version of Vim"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E770: Unsupported section in spell file"
+#~ msgstr "E297: ½»»»ÎļþдÈë´íÎó"
+
+#, fuzzy, c-format
+#~ msgid "Warning: region %s not supported"
+#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+
+#, fuzzy, c-format
+#~ msgid "Reading affix file %s ..."
+#~ msgstr "²éÕÒ tag Îļþ \"%s\""
+
+#, c-format
+#~ msgid "Conversion failure for word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Conversion in %s not supported: from %s to %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Conversion in %s not supported"
+#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+
+#, fuzzy, c-format
+#~ msgid "Invalid value for FLAG in %s line %d: %s"
+#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+
+#, c-format
+#~ msgid "FLAG after using flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate affix in %s line %d: %s"
+#~ msgstr "E154: ±êÇ©(tag) \"%s\" ÔÚÎļþ %s ÀïÖظ´³öÏÖ¶à´Î"
+
+#, c-format
+#~ msgid ""
+#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+#~ "line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected Y or N in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Broken condition in %s line %d: %s"
+#~ msgstr "\"%s%s\" Öжϵã: µÚ %ld ÐÐ"
+
+#, c-format
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected REP(SAL) count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected MAP count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate character in MAP in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Missing FOL/LOW/UPP line in %s"
+#~ msgstr ""
+
+#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Too many postponed prefixes"
+#~ msgstr "Ì«¶à±à¼²ÎÊý"
+
+#, fuzzy
+#~ msgid "Too many compound flags"
+#~ msgstr "Ì«¶à±à¼²ÎÊý"
+
+#~ msgid "Too many posponed prefixes and/or compound flags"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Missing SOFO%s line in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Both SAL and SOFO lines in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Flag is not a number in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Illegal flag in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%s value differs from what is used in another .aff file"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading dictionary file %s ..."
+#~ msgstr "ɨÃè×Öµä: %s"
+
+#, c-format
+#~ msgid "E760: No word count in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "line %6d, word %6d - %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate word in %s line %d: %s"
+#~ msgstr "ÿһÐж¼ÕÒ²»µ½Ä£Ê½: %s"
+
+#, c-format
+#~ msgid "First duplicate word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%d duplicate word(s) in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading word file %s ..."
+#~ msgstr "´Ó±ê×¼ÊäÈë¶Á..."
+
+#, c-format
+#~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "/encoding= line after word ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Too many regions in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "/ line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Invalid region nr in %s line %d: %s"
+#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+
+#, c-format
+#~ msgid "Unrecognized flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d words with non-ASCII characters"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+#~ msgstr ""
+
+#~ msgid "Reading back spell file..."
+#~ msgstr ""
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+#~ msgid "Performing soundfolding..."
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Number of words after soundfolding: %ld"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Total number of words: %d"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing suggestion file %s ..."
+#~ msgstr "дÈë viminfo Îļþ \"%s\" ÖÐ"
+
+#, c-format
+#~ msgid "Estimated runtime memory use: %d bytes"
+#~ msgstr ""
+
+#~ msgid "E751: Output file name must not have region name"
+#~ msgstr ""
+
+#~ msgid "E754: Only up to 8 regions supported"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E755: Invalid region in %s"
+#~ msgstr "E15: ²»ÕýÈ·µÄ±í´ïʽ: %s"
+
+#~ msgid "Warning: both compounding and NOBREAK specified"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing spell file %s ..."
+#~ msgstr "дÈë viminfo Îļþ \"%s\" ÖÐ"
+
+#, fuzzy
+#~ msgid "Done!"
+#~ msgstr "ÏòÏÂ"
+
+#, c-format
+#~ msgid "E765: 'spellfile' does not have %ld entries"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word removed from %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word added to %s"
+#~ msgstr ""
+
+#~ msgid "E763: Word characters differ between spell files"
+#~ msgstr ""
+
+#~ msgid "Sorry, no suggestions"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Sorry, only %ld suggestions"
+#~ msgstr ""
+
+#. avoid more prompt
+#, fuzzy, c-format
+#~ msgid "Change \"%.*s\" to:"
+#~ msgstr "½«¸Ä±ä±£´æµ½ \"%.*s\"?"
+
+#, c-format
+#~ msgid " < \"%.*s\""
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E752: No previous spell replacement"
+#~ msgstr "E35: ûÓÐÇ°Ò»¸ö²éÕÒÃüÁî"
+
+#, fuzzy, c-format
+#~ msgid "E753: Not found: %s"
+#~ msgstr "E334: [²Ëµ¥] ÕÒ²»µ½ %s"
+
+#, fuzzy, c-format
+#~ msgid "E778: This does not look like a .sug file: %s"
+#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»Îļþ"
+
+#, c-format
+#~ msgid "E779: Old .sug file, needs to be updated: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E780: .sug file is for newer version of Vim: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E781: .sug file doesn't match .spl file: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E782: error while reading .sug file: %s"
+#~ msgstr "E47: ¶ÁÈ¡´íÎóÎļþʧ°Ü"
+
+#. This should have been checked when generating the .spl
+#. * file.
+#~ msgid "E783: duplicate char in MAP entry"
+#~ msgstr ""
+
#, c-format
msgid "E390: Illegal argument: %s"
-msgstr "E390: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E390: ÎÞЧµÄ²ÎÊý: %s"
#, c-format
msgid "E391: No such syntax cluster: %s"
@@ -3834,12 +5031,13 @@
msgid "maximal "
msgstr "×î´ó"
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "Æ¥Åä %d"
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: ÕÒ²»µ½ %s µÄ region item"
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "ÉÙÓÚÒ»ÐÐ"
msgid "E395: contains argument not accepted here"
msgstr "E395: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
@@ -3847,12 +5045,23 @@
msgid "E396: containedin argument not accepted here"
msgstr "E396: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
+msgid "E393: group[t]here not accepted here"
+msgstr "E393: ʹÓÃÁ˲»ÕýÈ·µÄ²ÎÊý"
+
+#, c-format
+msgid "E394: Didn't find region item for %s"
+msgstr "E394: ÕÒ²»µ½ %s µÄ region item"
+
msgid "E397: Filename required"
msgstr "E397: ÐèÒªÎļþÃû³Æ"
#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ȱÉÙ ']': %s"
+
+#, c-format
msgid "E398: Missing '=': %s"
-msgstr "E398: ȱÉÙ \"=\": %s"
+msgstr "E398: ȱÉÙ '=': %s"
#, c-format
msgid "E399: Not enough arguments: syntax region %s"
@@ -3874,7 +5083,7 @@
#, c-format
msgid "E404: Illegal arguments: %s"
-msgstr "E404: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E404: ÎÞЧµÄ²ÎÊý: %s"
#, c-format
msgid "E405: Missing equal sign: %s"
@@ -3882,7 +5091,7 @@
#, c-format
msgid "E406: Empty argument: %s"
-msgstr "E406: ¿Õ²ÎÊý: %s"
+msgstr "E406: ¿ÕµÄ²ÎÊý: %s"
#, c-format
msgid "E407: %s not allowed here"
@@ -3900,6 +5109,9 @@
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: ²»ÕýÈ·µÄ :syntax ×ÓÃüÁî: %s"
+#~ msgid "E679: recursive loop loading syncolor.vim"
+#~ msgstr ""
+
#, c-format
msgid "E411: highlight group not found: %s"
msgstr "E411: ÕÒ²»µ½ highlight group: %s"
@@ -3947,23 +5159,30 @@
#, c-format
msgid "E423: Illegal argument: %s"
-msgstr "E423: ²ÎÊý²»ÕýÈ·: %s"
+msgstr "E423: ÎÞЧµÄ²ÎÊý: %s"
msgid "E424: Too many different highlighting attributes in use"
msgstr "E424: ʹÓÃÁËÌ«¶à²»Í¬µÄ¸ßÁÁ¶ÈÊôÐÔ"
-msgid "at bottom of tag stack"
-msgstr "±êÇ©(tag)¶ÑÕ»½áβ"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
-msgid "at top of tag stack"
-msgstr "±êÇ©(tag)¶ÑÕ»¿ªÍ·"
+#, fuzzy
+#~ msgid "W18: Invalid character in group name"
+#~ msgstr "E182: ÃüÁîÃû³Æ²»ÕýÈ·"
+
+msgid "E555: at bottom of tag stack"
+msgstr "E555: ÒÑÔÚ tag ¶ÑÕ»µ×²¿"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: ÒÑÔÚ tag ¶ÑÕ»¶¥²¿"
msgid "E425: Cannot go before first matching tag"
-msgstr "E425: ÒѾÔÚ×îÇ°ÃæµÄ±êÇ©(tag)ÁË"
+msgstr "E425: Òѵ½µÚÒ»¸öÆ¥ÅäµÄ tag"
#, c-format
msgid "E426: tag not found: %s"
-msgstr "E426: ÕÒ²»µ½±êÇ©(tag): %s"
+msgstr "E426: ÕÒ²»µ½ tag: %s"
msgid " # pri kind tag"
msgstr " # pri kind tag"
@@ -3971,18 +5190,11 @@
msgid "file\n"
msgstr "Îļþ\n"
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "ÊäÈë nr »òÑ¡Ôñ (<CR> Í˳ö): "
-
msgid "E427: There is only one matching tag"
-msgstr "E427: Ö»ÓдËÏî·ûºÏ"
+msgstr "E427: Ö»ÓÐÒ»¸öÆ¥ÅäµÄ tag"
msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ¼º¾ÔÚ×îºóÒ»¸ö·ûºÏµÄ±êÇ©(tag)ÁË"
+msgstr "E428: ¼ºµ½×îºóÒ»¸öÆ¥ÅäµÄ tag"
#, c-format
msgid "File \"%s\" does not exist"
@@ -3991,13 +5203,13 @@
#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
-msgstr "ÕÒµ½ tag: %d/%d%s"
+msgstr "ÕÒµ½ tag: %d / %d%s"
msgid " or more"
msgstr " »ò¸ü¶à"
msgid " Using tag with different case!"
-msgstr " ÒÔ²»Í¬´óСдÀ´Ê¹Óà tag!"
+msgstr " ÒÔ²»Í¬´óСдÀ´Ê¹Óà tag£¡"
#, c-format
msgid "E429: File \"%s\" does not exist"
@@ -4011,15 +5223,9 @@
"\n"
" # µ½ tag ´Ó ÐÐ ÔÚ Îļþ/Îı¾"
-msgid "Linear tag search"
-msgstr "ÏßÐÔ²éÕÒ±êÇ© (Tags)"
-
-msgid "Binary tag search"
-msgstr "¶þ½øÖƲéÕÒ(Binary search) ±êÇ©(Tags)"
-
#, c-format
msgid "Searching tags file %s"
-msgstr "²éÕÒ tag Îļþ \"%s\""
+msgstr "²éÕÒ tag Îļþ %s"
#, c-format
msgid "E430: Tag file path truncated for %s\n"
@@ -4031,7 +5237,7 @@
#, c-format
msgid "Before byte %ld"
-msgstr "ÔÚ %ld ×Ö½Ú֮ǰ"
+msgstr "ÔÚµÚ %ld ×Ö½Ú֮ǰ"
#, c-format
msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@
msgstr "E433: ûÓÐ tag Îļþ"
msgid "E434: Can't find tag pattern"
-msgstr "E434: ÕÒ²»µ½ tag"
+msgstr "E434: ÕÒ²»µ½ tag ģʽ"
msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: ÕÒ²»µ½ tag, ÊÔ×ŲÂ!"
+msgstr "E435: ÕÒ²»µ½ tag£¬ÊÔ×Ų£¡"
msgid "' not known. Available builtin terminals are:"
-msgstr "' ²»ÄܼÓÔØ¡£¿ÉÓõÄÄÚ½¨ÖÕ¶ËÐÎʽÓÐ:"
+msgstr "' δ֪¡£¿ÉÓõÄÄÚ½¨ÖÕ¶ËÓÐ:"
msgid "defaulting to '"
-msgstr "Ô¤Éè: '"
+msgstr "ĬÈÏֵΪ: '"
-msgid "Cannot open termcap file"
-msgstr "²»ÄÜ´ò¿ª termcap Îļþ"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: ÎÞ·¨´ò¿ª termcap Îļþ"
-msgid "Terminal entry not found in terminfo"
-msgstr "ÔÚterminfoÖÐδÕÒµ½ÖÕ¶ËÏî"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: ÔÚ terminfo ÖÐÕÒ²»µ½ÖÕ¶ËÏî"
-msgid "Terminal entry not found in termcap"
-msgstr "ÔÚtermcapÖÐδÕÒµ½ÖÕ¶ËÏî"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: ÔÚ termcap ÖÐÕÒ²»µ½ÖÕ¶ËÏî"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap ûÓÐ \"%s\" Ïî"
+msgstr "E436: termcap ÖÐûÓÐ \"%s\" Ïî"
msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: ÖÕ¶ËÐèÒª \"cm\" µÄÄÜÁ¦"
+msgstr "E437: ÖÕ¶ËÐèÒªÄÜÁ¦ \"cm\""
#. Highlight title
msgid ""
@@ -4085,23 +5291,60 @@
#. must display the prompt
msgid "No undo possible; continue anyway"
-msgstr "²»ÄÜ»¹Ô£»Çë¼ÌÐø"
+msgstr "ÎÞ·¨³·Ïú£»Çë¼ÌÐø"
+
+msgid "Already at oldest change"
+msgstr "ÒÑλÓÚ×î¾ÉµÄ¸Ä±ä"
+
+msgid "Already at newest change"
+msgstr "ÒÑλÓÚ×îеĸıä"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "ÕÒ²»µ½³·ÏúºÅ %ld"
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: ÐкŴíÎó"
-msgid "1 change"
-msgstr "Ò»Ïî¸Ä±ä"
+msgid "more line"
+msgstr "Ðб»¼ÓÈë"
+
+msgid "more lines"
+msgstr "Ðб»¼ÓÈë"
+
+msgid "line less"
+msgstr "Ðб»È¥µô"
+
+msgid "fewer lines"
+msgstr "Ðб»È¥µô"
+
+msgid "change"
+msgstr "Ðз¢Éú¸Ä±ä"
+
+msgid "changes"
+msgstr "Ðз¢Éú¸Ä±ä"
#, c-format
-msgid "%ld changes"
-msgstr "%ld Ïî¸Ä±ä"
+msgid "%ld %s; %s #%ld %s"
+msgstr "%ld %s£»%s #%ld %s"
+
+msgid "before"
+msgstr "before"
+
+msgid "after"
+msgstr "after"
+
+msgid "Nothing to undo"
+msgstr "Î޿ɳ·Ïú"
+
+msgid "number changes time"
+msgstr " ±àºÅ ¸Ä±ä ʱ¼ä"
msgid "E439: undo list corrupt"
msgstr "E439: ³·ÏúÁбíËð»µ"
msgid "E440: undo line missing"
-msgstr "E440: ÕÒ²»µ½Òª³·Ïú²Ù×÷µÄÐÐ"
+msgstr "E440: ÕÒ²»µ½Òª³·ÏúµÄÐÐ"
#. Only MS VC 4.1 and earlier can do Win32s
msgid ""
@@ -4109,34 +5352,34 @@
"MS-Windows 16/32 bit GUI version"
msgstr ""
"\n"
-"MS-Windows 16/32λ ͼÐͽçÃæ°æ±¾"
+"MS-Windows 16/32 λͼÐνçÃæ°æ±¾"
msgid ""
"\n"
"MS-Windows 32 bit GUI version"
msgstr ""
"\n"
-"MS-Windows 32 Bit ͼÐͽçÃæ°æ±¾"
+"MS-Windows 32 λͼÐνçÃæ°æ±¾"
msgid " in Win32s mode"
-msgstr "Win32s ģʽ"
+msgstr " Win32s ģʽ"
msgid " with OLE support"
-msgstr "Ö§³Ö OLE"
+msgstr " ´ø OLE Ö§³Ö"
msgid ""
"\n"
"MS-Windows 32 bit console version"
msgstr ""
"\n"
-"MS-Windows 32λ ×Ö·û½çÃæ°æ±¾"
+"MS-Windows 32 λ¿ØÖÆ̨°æ±¾"
msgid ""
"\n"
"MS-Windows 16 bit version"
msgstr ""
"\n"
-"MS-Windows 32λ ×Ö·û½çÃæ°æ±¾"
+"MS-Windows 16 λ¿ØÖÆ̨°æ±¾"
msgid ""
"\n"
@@ -4185,7 +5428,10 @@
"Included patches: "
msgstr ""
"\n"
-"¼ÓÈë²¹¶¡: "
+"°üº¬²¹¶¡: "
+
+msgid "Modified by "
+msgstr "ÐÞ¸ÄÕß "
msgid ""
"\n"
@@ -4195,14 +5441,14 @@
"±àÒë"
msgid "by "
-msgstr "Õß:"
+msgstr "Õß "
msgid ""
"\n"
"Huge version "
msgstr ""
"\n"
-"³¬Ç¿°æ±¾ "
+"¾ÞÐÍ°æ±¾ "
msgid ""
"\n"
@@ -4216,96 +5462,102 @@
"Normal version "
msgstr ""
"\n"
-"Ò»°ã°æ±¾ "
+"Õý³£°æ±¾ "
msgid ""
"\n"
"Small version "
msgstr ""
"\n"
-"¼òÒ×°æ±¾ "
+"СÐÍ°æ±¾ "
msgid ""
"\n"
"Tiny version "
msgstr ""
"\n"
-"¾«¼ò°æ±¾ "
+"΢ÐÍ°æ±¾ "
msgid "without GUI."
-msgstr "²»Ê¹ÓÃͼÐͽçÃæ¡£"
+msgstr "ÎÞͼÐνçÃæ¡£"
+
+msgid "with GTK2-GNOME GUI."
+msgstr "´ø GTK2-GNOME ͼÐνçÃæ¡£"
msgid "with GTK-GNOME GUI."
-msgstr "ʹÓà GTK-GNOME ͼÐͽçÃæ¡£"
+msgstr "´ø GTK-GNOME ͼÐνçÃæ¡£"
+
+msgid "with GTK2 GUI."
+msgstr "´ø GTK2 ͼÐνçÃæ¡£"
msgid "with GTK GUI."
-msgstr "ʹÓà GTK ͼÐͽçÃæ¡£"
+msgstr "´ø GTK ͼÐνçÃæ¡£"
msgid "with X11-Motif GUI."
-msgstr "ʹÓà X11-Motif ͼÐͽçÃæ¡£"
+msgstr "´ø X11-Motif ͼÐνçÃæ¡£"
+
+msgid "with X11-neXtaw GUI."
+msgstr "´ø X11-neXtaw ͼÐνçÃæ¡£"
msgid "with X11-Athena GUI."
-msgstr "ʹÓà X11-Athena ͼÐͽçÃæ¡£"
-
-msgid "with BeOS GUI."
-msgstr "ʹÓà BeOS ͼÐͽçÃæ¡£"
+msgstr "´ø X11-Athena ͼÐνçÃæ¡£"
msgid "with Photon GUI."
-msgstr "ʹÓÃPhotonͼÐͽçÃæ¡£"
+msgstr "´ø Photon ͼÐνçÃæ¡£"
msgid "with GUI."
-msgstr "ʹÓÃͼÐͽçÃæ¡£"
+msgstr "´øͼÐνçÃæ¡£"
msgid "with Carbon GUI."
-msgstr "ʹÓà Carbon ͼÐͽçÃæ¡£"
+msgstr "´ø Carbon ͼÐνçÃæ¡£"
msgid "with Cocoa GUI."
-msgstr "ʹÓà Cocoa ͼÐͽçÃæ¡£"
+msgstr "´ø Cocoa ͼÐνçÃæ¡£"
msgid "with (classic) GUI."
-msgstr "ʹÓà (´«Í³) ͼÐͽçÃæ¡£"
+msgstr "´ø(´«Í³)ͼÐνçÃæ¡£"
msgid " Features included (+) or not (-):\n"
-msgstr " Ä¿Ç°¿ÉʹÓÃ(+)Óë²»¿ÉʹÓÃ(-)µÄÄ£¿éÁбí:\n"
+msgstr " ¿ÉʹÓÃ(+)Óë²»¿ÉʹÓÃ(-)µÄ¹¦ÄÜ:\n"
msgid " system vimrc file: \""
-msgstr " ϵͳ vimrc ÅäÖÃÎļþ: \""
+msgstr " ϵͳ vimrc Îļþ: \""
msgid " user vimrc file: \""
-msgstr " Óû§µÄ vimrc ÅäÖÃÎļþ: \""
+msgstr " Óû§ vimrc Îļþ: \""
msgid " 2nd user vimrc file: \""
-msgstr " µÚ¶þ×éÓû§ vimrc Îļþ: \""
+msgstr " µÚ¶þÓû§ vimrc Îļþ: \""
msgid " 3rd user vimrc file: \""
-msgstr " µÚÈý×éÓû§ vimrc Îļþ: \""
+msgstr " µÚÈýÓû§ vimrc Îļþ: \""
msgid " user exrc file: \""
-msgstr " Óû§µÄ exrc ÅäÖÃÎļþ: \""
+msgstr " Óû§ exrc Îļþ: \""
msgid " 2nd user exrc file: \""
-msgstr " µÚ¶þ×éÓû§ exrc Îļþ: \""
+msgstr " µÚ¶þÓû§ exrc Îļþ: \""
msgid " system gvimrc file: \""
-msgstr " ϵͳ gvimrc Îļþ: \""
+msgstr " ϵͳ gvimrc Îļþ: \""
msgid " user gvimrc file: \""
-msgstr " Óû§µÄ gvimrc ÅäÖÃÎļþ: \""
+msgstr " Óû§ gvimrc Îļþ: \""
msgid "2nd user gvimrc file: \""
-msgstr " µÚ¶þ×éÓû§ gvimrc Îļþ: \""
+msgstr "µÚ¶þÓû§ gvimrc Îļþ: \""
msgid "3rd user gvimrc file: \""
-msgstr " µÚÈý×éÓû§ gvimrc Îļþ: \""
+msgstr "µÚÈýÓû§ gvimrc Îļþ: \""
msgid " system menu file: \""
-msgstr " ϵͳ²Ëµ¥ÅäÖÃÎļþ: \""
+msgstr " ϵͳ²Ëµ¥Îļþ: \""
msgid " fall-back for $VIM: \""
-msgstr " $VIM Ô¤ÉèÖµ: \""
+msgstr " $VIM Ô¤ÉèÖµ: \""
msgid " f-b for $VIMRUNTIME: \""
-msgstr " $VIMRUNTIME Ô¤ÉèÖµ: \""
+msgstr " $VIMRUNTIME Ô¤ÉèÖµ: \""
msgid "Compilation: "
msgstr "±àÒ뷽ʽ: "
@@ -4314,7 +5566,7 @@
msgstr "±àÒëÆ÷: "
msgid "Linking: "
-msgstr "Á´½á·½Ê½: "
+msgstr "Á´½Ó·½Ê½: "
msgid " DEBUG BUILD"
msgstr " µ÷ÊÔ°æ±¾"
@@ -4323,49 +5575,84 @@
msgstr "VIM - Vi IMproved"
msgid "version "
-msgstr "°æ±¾ "
+msgstr "°æ±¾ "
msgid "by Bram Moolenaar et al."
-msgstr "ά»¤ÈË: Bram Moolenaar et al."
+msgstr "ά»¤ÈË Bram Moolenaar µÈ"
msgid "Vim is open source and freely distributable"
-msgstr "Vim Ϊ¿É×ÔÓÉ·¢ÐеĿª·ÅÔ´´úÂëÈí¼þ"
+msgstr "Vim ÊÇ¿É×ÔÓÉ·Ö·¢µÄ¿ª·ÅÔ´´úÂëÈí¼þ"
msgid "Help poor children in Uganda!"
-msgstr "°ïÖúÎڸɴïµÄ¿ÉÁ¯¶ùͯ!"
+msgstr "°ïÖúÎڸɴïµÄ¿ÉÁ¯¶ùͯ£¡"
msgid "type :help iccf<Enter> for information "
-msgstr "½øÒ»²½ËµÃ÷ÇëÊäÈë :help iccf<Enter>"
+msgstr "ÊäÈë :help iccf<Enter> ²é¿´ËµÃ÷ "
msgid "type :q<Enter> to exit "
-msgstr "ÒªÍ˳öÇëÊäÈë :q<Enter> "
+msgstr "ÊäÈë :q<Enter> Í˳ö "
msgid "type :help<Enter> or <F1> for on-line help"
-msgstr "ÔÚÏß°ïÖúÇëÊäÈë :help<Enter> "
+msgstr "ÊäÈë :help<Enter> »ò <F1> ²é¿´ÔÚÏß°ïÖú "
-msgid "type :help version6<Enter> for version info"
-msgstr "а汾ÐÅÏ¢ÇëÊäÈë :help version6<Enter>"
+msgid "type :help version7<Enter> for version info"
+msgstr "ÊäÈë :help version7<Enter> ²é¿´°æ±¾ÐÅÏ¢ "
msgid "Running in Vi compatible mode"
-msgstr "Vi ¼æÈÝģʽ"
+msgstr "ÔËÐÐÓÚ Vi ¼æÈÝģʽ"
msgid "type :set nocp<Enter> for Vim defaults"
-msgstr "Èç¹ûÒªÍêÈ«Ä£Ä⴫ͳ Vi ÇëÊäÈë :set nocp<Enter>"
+msgstr "ÊäÈë :set nocp<Enter> »Ö¸´Ä¬È쵀 Vim "
msgid "type :help cp-default<Enter> for info on this"
-msgstr "Èç¹ûÐèÒª¶Ô Vi ¼æÈÝģʽ½øÒ»²½ËµÃ÷ÇëÊäÈë :help cp-default<Enter>"
+msgstr "ÊäÈë :help cp-default<Enter> ²é¿´Ïà¹Ø˵Ã÷ "
+
+msgid "menu Help->Orphans for information "
+msgstr "²Ëµ¥ Help->Orphans ²é¿´ËµÃ÷ "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "ÎÞģʽÔËÐУ¬ÊäÈëÎÄ×Ö¼´²åÈë"
+
+msgid "menu Edit->Global Settings->Toggle Insert Mode "
+msgstr "²Ëµ¥ Edit->Global Settings->Toggle Insert Mode "
+
+#, fuzzy
+#~ msgid " for two modes "
+#~ msgstr " # pid Êý¾Ý¿âÃû³Æ prepend path\n"
+
+#~ msgid "menu Edit->Global Settings->Toggle Vi Compatible"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid " for Vim defaults "
+#~ msgstr " # pid Êý¾Ý¿âÃû³Æ prepend path\n"
+
+msgid "Sponsor Vim development!"
+msgstr "ÔÞÖú Vim µÄ¿ª·¢£¡"
+
+msgid "Become a registered Vim user!"
+msgstr "³ÉΪ Vim µÄ×¢²áÓû§£¡"
+
+msgid "type :help sponsor<Enter> for information "
+msgstr "ÊäÈë :help sponsor<Enter> ²é¿´ËµÃ÷ "
+
+msgid "type :help register<Enter> for information "
+msgstr "ÊäÈë :help register<Enter> ²é¿´ËµÃ÷ "
+
+msgid "menu Help->Sponsor/Register for information "
+msgstr "²Ëµ¥ Help->Sponsor/Register ²é¿´ËµÃ÷ "
msgid "WARNING: Windows 95/98/ME detected"
-msgstr "×¢Òâ: ¼ì²âµ½ Windows 95/98/ME"
+msgstr "¾¯¸æ: ¼ì²âµ½ Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
-msgstr "Èç¹ûÐèÒª¶Ô Windows 95 Ö§³ÖµÄ¸ü¶àÐÅÏ¢ÇëÊäÈë :help windows95<Enter>"
+msgstr "ÊäÈë :help windows95<Enter> ²é¿´Ïà¹Ø˵Ã÷ "
msgid "E441: There is no preview window"
msgstr "E441: ûÓÐÔ¤ÀÀ´°¿Ú"
msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ²»ÄÜͬʱ·Ö¸î´°¿ÚΪ×óÉϺÍÓÒϽÇ"
+msgstr "E442: ²»ÄÜͬʱ½øÐÐ topleft ºÍ botright ·Ö¸î"
msgid "E443: Cannot rotate when another window is split"
msgstr "E443: ÓÐÆäËü·Ö¸î´°¿Úʱ²»ÄÜÐýת"
@@ -4386,261 +5673,472 @@
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: ÔÚ·¾¶ÖÐÕÒ²»µ½Îļþ \"%s\""
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ÎÞ·¨¼ÓÔØ¿â %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "±§Ç¸£¬´ËÃüÁî²»¿ÉÓÃ: ÎÞ·¨¼ÓÔØ Perl ¿â¡£"
+
+#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+#~ msgstr ""
+
msgid "Edit with &multiple Vims"
-msgstr "Óà &multiple Vims ±à¼"
+msgstr "Óöà¸ö Vim ±à¼(&M)"
msgid "Edit with single &Vim"
-msgstr "Óà single &Vim ±à¼"
+msgstr "Óõ¥¸ö Vim ±à¼(&V)"
+
+msgid "Diff with Vim"
+msgstr "Óà Vim ±È½Ï(diff)"
msgid "Edit with &Vim"
-msgstr "Óà &Vim ±à¼"
+msgstr "Óà Vim ±à¼(&V)"
#. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "Óõ±Ç°µÄ Vim ±à¼ - &"
+msgid "Edit with existing Vim - "
+msgstr "Óõ±Ç°µÄ Vim ±à¼ - "
msgid "Edits the selected file(s) with Vim"
-msgstr "Óà Vim ±à¼Ñ¡ÔñµÄÎļþ"
+msgstr "Óà Vim ±à¼Ñ¡ÖеÄÎļþ"
msgid "Error creating process: Check if gvim is in your path!"
-msgstr "´´½¨½ø³Ìʧ°Ü: Çë¼ì²égvimÊÇ·ñÔÚ¿ÉÖ´Ðз¾¶ÖÐ!"
+msgstr "´´½¨½ø³Ìʧ°Ü: Çë¼ì²é gvim ÊÇ·ñÔÚ·¾¶ÖУ¡"
msgid "gvimext.dll error"
-msgstr "gvimext.dll ³ö´í"
+msgstr "gvimext.dll ´íÎó"
msgid "Path length too long!"
-msgstr "·¾¶ÃûÌ«³¤"
+msgstr "·¾¶Ì«³¤£¡"
msgid "--No lines in buffer--"
-msgstr "--»º³åÇøÎÞ×ÊÁÏ--"
+msgstr "--»º³åÇøÎÞÄÚÈÝ--"
#.
#. * The error messages that can be shared are included here.
#. * Excluded are errors that are only used once and debugging messages.
#.
-msgid "Command aborted"
-msgstr "ÃüÁǿÖÆÖжÏ"
+msgid "E470: Command aborted"
+msgstr "E470: ÃüÁî±»ÖÐÖ¹"
-msgid "Argument required"
-msgstr "ÐèÒªÖ¸Áî²ÎÊý"
+msgid "E471: Argument required"
+msgstr "E471: ÐèÒª²ÎÊý"
msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ºóÃæÓ¦¸ÃÓÐ / ? »ò &"
+msgstr "E10: \\ ºóÃæÓ¦¸Ã¸úÓÐ /¡¢? »ò &"
msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ²»ÄÜÔÚÃüÁîÐд°¿ÚÖÐʹÓá£<CR>Ö´ÐУ¬CTRL-C Í˳ö"
+msgstr "E11: ÔÚÃüÁîÐд°¿ÚÖÐÎÞЧ£»<CR> Ö´ÐУ¬CTRL-C Í˳ö"
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc ÀïµÄÖ¸Áî²»ÄÜÖ´ÐÐ"
+msgstr "E12: µ±Ç°Ä¿Â¼ÖÐµÄ exrc/vimrc »ò tag ²éÕÒÖв»ÔÊÐí´ËÃüÁî"
+
+msgid "E171: Missing :endif"
+msgstr "E171: ȱÉÙ :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: ȱÉÙ :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: ȱÉÙ :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: ȱÉÙ :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile ȱÉÙ¶ÔÓ¦µÄ :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ȱÉÙ¶ÔÓ¦µÄ :for"
msgid "E13: File exists (add ! to override)"
-msgstr "E13: ÎļþÒѾ´æÔÚ (¿ÉÓà ! Ç¿ÖÆÌæ»»)"
+msgstr "E13: ÎļþÒÑ´æÔÚ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
-msgid "Command failed"
-msgstr "ÃüÁîÖ´ÐÐʧ°Ü"
+msgid "E472: Command failed"
+msgstr "E472: ÃüÁîÖ´ÐÐʧ°Ü"
-msgid "Internal error"
-msgstr "ÄÚ²¿´íÎó"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: δ֪µÄ Fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: δ֪µÄ×ÖÌå: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: ×ÖÌå \"%s\" ²»Êǵȿí×ÖÌå"
+
+msgid "E473: Internal error"
+msgstr "E473: ÄÚ²¿´íÎó"
msgid "Interrupted"
msgstr "ÒÑÖжÏ"
msgid "E14: Invalid address"
-msgstr "E14: ²»ÕýÈ·µÄµØÖ·"
+msgstr "E14: ÎÞЧµÄµØÖ·"
-msgid "Invalid argument"
-msgstr "²»ÕýÈ·µÄ²ÎÊý"
+msgid "E474: Invalid argument"
+msgstr "E474: ÎÞЧµÄ²ÎÊý"
#, c-format
-msgid "Invalid argument: %s"
-msgstr "²»ÕýÈ·µÄ²ÎÊý: %s"
+msgid "E475: Invalid argument: %s"
+msgstr "E475: ÎÞЧµÄ²ÎÊý: %s"
#, c-format
msgid "E15: Invalid expression: %s"
-msgstr "E15: ²»ÕýÈ·µÄ±í´ïʽ: %s"
+msgstr "E15: ÎÞЧµÄ±í´ïʽ: %s"
msgid "E16: Invalid range"
-msgstr "E16: ²»ÕýÈ·µÄ·¶Î§"
+msgstr "E16: ÎÞЧµÄ·¶Î§"
-msgid "Invalid command"
-msgstr "²»ÕýÈ·µÄÃüÁî"
+msgid "E476: Invalid command"
+msgstr "E476: ÎÞЧµÄÃüÁî"
#, c-format
msgid "E17: \"%s\" is a directory"
msgstr "E17: \"%s\" ÊÇĿ¼"
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: '=' Ç°Ãæ³öÏÖÁË´íÎóµÄ×Ö·û"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: µ÷Óú¯Êý¿â \"%s()\" ʧ°Ü"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: ÎÞ·¨¼ÓÔؿ⺯Êý %s"
msgid "E19: Mark has invalid line number"
-msgstr "E19: ±ê¼ÇµÄÐкŴíÎó"
+msgstr "E19: ±ê¼ÇµÄÐкÅÎÞЧ"
msgid "E20: Mark not set"
msgstr "E20: ûÓÐÉ趨±ê¼Ç"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: ÒòΪ 'modifiable' Ñ¡ÏîÊǹرյģ¬ËùÒÔ²»ÄÜÐÞ¸Ä"
+msgstr "E21: ²»ÄÜÐ޸ģ¬ÒòΪѡÏî 'modifiable' ÊǹصÄ"
msgid "E22: Scripts nested too deep"
-msgstr "E22: µÝ¹éµ÷ÓÃÌ«¶à²ã"
+msgstr "E22: ½Å±¾Ç¶Ì×¹ýÉî"
msgid "E23: No alternate file"
-msgstr "E23: ûÓÐÌæ´úµÄÎļþ"
+msgstr "E23: ûÓн»ÌæÎļþ"
msgid "E24: No such abbreviation"
-msgstr "E24: ûÓÐÕâ¸ö abbreviation ¶ÔÓ¦"
+msgstr "E24: ûÓÐÕâ¸öËõд"
-msgid "No ! allowed"
-msgstr "²»¿ÉʹÓà '!'"
+msgid "E477: No ! allowed"
+msgstr "E477: ²»ÄÜʹÓà \"!\""
msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: ÒòΪ±àÒëʱûÓмÓÈëͼÐͽçÃæµÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓÃͼÐͽçÃæ"
+msgstr "E25: ÎÞ·¨Ê¹ÓÃͼÐνçÃæ: ±àÒëʱûÓÐÆôÓÃ"
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: ÒòΪ±àÒëʱûÓмÓÈëÏ£²®À³µÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓà Hebrew\n"
+msgstr "E26: ÎÞ·¨Ê¹Óà Hebrew: ±àÒëʱûÓÐÆôÓÃ\n"
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ÒòΪ±àÒëʱûÓмÓÈë Farsi µÄ³ÌÐò´úÂ룬ËùÒÔ²»ÄÜʹÓà Farsi\n"
+msgstr "E27: ÎÞ·¨Ê¹Óà Farsi: ±àÒëʱûÓÐÆôÓÃ\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ÎÞ·¨Ê¹Óà Arabic: ±àÒëʱûÓÐÆôÓÃ\n"
#, c-format
msgid "E28: No such highlight group name: %s"
-msgstr "E28: ûÓÐÃûΪ '%s' µÄ highlight group"
+msgstr "E28: ûÓÐÕâ¸ö¸ßÁÁȺ×éÃû: %s"
msgid "E29: No inserted text yet"
msgstr "E29: ûÓвåÈë¹ýÎÄ×Ö"
msgid "E30: No previous command line"
-msgstr "E30: ûÓÐÇ°Ò»ÏîÃüÁî"
+msgstr "E30: ûÓÐÇ°Ò»¸öÃüÁîÐÐ"
msgid "E31: No such mapping"
-msgstr "E31: ûÓÐÕâ¸ö mapping ¶ÔÓ¦"
+msgstr "E31: ûÓÐÕâ¸öÓ³Éä"
-msgid "No match"
-msgstr "ÕÒ²»µ½"
+msgid "E479: No match"
+msgstr "E479: ûÓÐÆ¥Åä"
#, c-format
-msgid "No match: %s"
-msgstr "ÕÒ²»µ½: %s"
+msgid "E480: No match: %s"
+msgstr "E480: ûÓÐÆ¥Åä: %s"
msgid "E32: No file name"
msgstr "E32: ûÓÐÎļþÃû"
msgid "E33: No previous substitute regular expression"
-msgstr "E33: ûÓÐÇ°Ò»¸ö²éÕÒ/Ìæ»»µÄÃüÁî"
+msgstr "E33: ûÓÐÇ°Ò»¸öÌæ»»ÕýÔò±í´ïʽ"
msgid "E34: No previous command"
msgstr "E34: ûÓÐÇ°Ò»¸öÃüÁî"
msgid "E35: No previous regular expression"
-msgstr "E35: ûÓÐÇ°Ò»¸ö²éÕÒÃüÁî"
+msgstr "E35: ûÓÐÇ°Ò»¸öÕýÔò±í´ïʽ"
-msgid "No range allowed"
-msgstr "²»¿ÉʹÓ÷¶Î§ÃüÁî"
+msgid "E481: No range allowed"
+msgstr "E481: ²»ÄÜʹÓ÷¶Î§"
msgid "E36: Not enough room"
msgstr "E36: ûÓÐ×ã¹»µÄ¿Õ¼ä"
#, c-format
-msgid "Can't create file %s"
-msgstr "²»ÄÜ´´½¨Îļþ %s"
-
-msgid "Can't get temp file name"
-msgstr "²»Äܵõ½ÁÙʱÎļþÃû"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: ûÓÐÃû½Ð \"%s\" µÄÒÑ×¢²áµÄ·þÎñÆ÷"
#, c-format
-msgid "Can't open file %s"
-msgstr "²»ÄÜ´ò¿ªÎļþ %s"
+msgid "E482: Can't create file %s"
+msgstr "E482: ÎÞ·¨´´½¨Îļþ %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: ÎÞ·¨»ñÈ¡ÁÙʱÎļþÃû"
#, c-format
-msgid "Can't read file %s"
-msgstr "²»ÄܶÁÈ¡Îļþ %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: ÎÞ·¨´ò¿ªÎļþ %s"
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: ÎļþÄÚÈÝÒѸı䵫ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: ÎÞ·¨¶ÁÈ¡Îļþ %s"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ÒÑÐ޸ĵ«ÉÐδ±£´æ (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
msgid "E38: Null argument"
-msgstr "E38: ¿ÕµÄ (Null) ²ÎÊý"
+msgstr "E38: ¿ÕµÄ²ÎÊý"
msgid "E39: Number expected"
-msgstr "E39: Ó¦¸ÃÒªÓÐÊý×Ö"
+msgstr "E39: ´Ë´¦ÐèÒªÊý×Ö"
#, c-format
msgid "E40: Can't open errorfile %s"
-msgstr "E40: ²»ÄÜ´ò¿ª´íÎóÎļþ %s"
+msgstr "E40: ÎÞ·¨´ò¿ª´íÎóÎļþ %s"
+
+msgid "E233: cannot open display"
+msgstr "E233: ÎÞ·¨´ò¿ª display"
msgid "E41: Out of memory!"
-msgstr "E41: ÄÚ´æ²»×ã!"
+msgstr "E41: ÄÚ´æ²»×㣡"
msgid "Pattern not found"
msgstr "ÕÒ²»µ½Ä£Ê½"
#, c-format
-msgid "Pattern not found: %s"
-msgstr "ÕÒ²»µ½Ä£Ê½ %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: ÕÒ²»µ½Ä£Ê½: %s"
-msgid "Argument must be positive"
-msgstr "²ÎÊýÓ¦¸ÃÊÇÕýÊý"
+msgid "E487: Argument must be positive"
+msgstr "E487: ²ÎÊý±ØÐëÊÇÕýÊý"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: ÎÞ·¨»Øµ½Ç°Ò»¸öĿ¼"
msgid "E42: No Errors"
msgstr "E42: ûÓдíÎó"
+msgid "E776: No location list"
+msgstr "E776: ûÓÐ location Áбí"
+
msgid "E43: Damaged match string"
-msgstr "E43: Æ¥Åä×Ö·û´®ÓÐÎÊÌâ"
+msgstr "E43: ÒÑË𻵵ÄÆ¥Åä×Ö·û´®"
msgid "E44: Corrupted regexp program"
-msgstr "E44: ÕýÔò±í´ïʽÓÐÎÊÌâ"
+msgstr "E44: ÒÑË𻵵ÄÕýÔò±í´ïʽ³ÌÐò"
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: É趨 'readonly' Ñ¡Ïî(Ö»¶Á) (¿ÉÓà ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: ÒÑÉ趨ѡÏî 'readonly' (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: ²»ÄÜÉ趨ֻ¶Á±äÁ¿ \"%s\""
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: ²»ÄܸıäÖ»¶Á±äÁ¿ \"%s\""
+
+#, c-format
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: ²»ÄÜÔÚ sandbox ÖÐÉ趨±äÁ¿: \"%s\""
msgid "E47: Error while reading errorfile"
msgstr "E47: ¶ÁÈ¡´íÎóÎļþʧ°Ü"
msgid "E48: Not allowed in sandbox"
-msgstr "E48: ²»ÄÜÔÚ sandbox Àï³öÏÖ"
+msgstr "E48: ²»ÔÊÐíÔÚ sandbox ÖÐʹÓÃ"
+
+msgid "E523: Not allowed here"
+msgstr "E523: ²»ÔÊÐíÔÚ´ËʹÓÃ"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: ²»Ö§³ÖÉ趨ÆÁĻģʽ"
msgid "E49: Invalid scroll size"
-msgstr "E49: ´íÎóµÄ¹ö¶¯´óС"
+msgstr "E49: ÎÞЧµÄ¹ö¶¯´óС"
msgid "E91: 'shell' option is empty"
-msgstr "E91: 'E71: Ñ¡Ïî 'shell' δÉ趨"
+msgstr "E91: Ñ¡Ïî 'shell' Ϊ¿Õ"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: ÎÞ·¨¶ÁÈ¡ sign Êý¾Ý£¡"
msgid "E72: Close error on swap file"
msgstr "E72: ½»»»Îļþ¹Ø±Õ´íÎó"
msgid "E73: tag stack empty"
-msgstr "E73: ±êÇ©¶ÑÕ»ÒÑ¿Õ"
+msgstr "E73: tag ¶ÑջΪ¿Õ"
msgid "E74: Command too complex"
-msgstr "E74: ÃüÁîÌ«¸´ÔÓ"
+msgstr "E74: ÃüÁî¹ý¸´ÔÓ"
msgid "E75: Name too long"
-msgstr "E75: Ãû×ÖÌ«³¤"
+msgstr "E75: Ãû×Ö¹ý³¤"
msgid "E76: Too many ["
-msgstr "E76: Ì«¶à ["
+msgstr "E76: [ ¹ý¶à"
msgid "E77: Too many file names"
-msgstr "E77: Ì«¶àÎļþÃû"
+msgstr "E77: ÎļþÃû¹ý¶à"
-msgid "Trailing characters"
-msgstr "ÄãÊäÈëÁ˶àÓàµÄ×Ö·û"
+msgid "E488: Trailing characters"
+msgstr "E488: ¶àÓàµÄβ²¿×Ö·û"
msgid "E78: Unknown mark"
-msgstr "E78: ²»ÄÜ°ìʶµÄ±ê¼Ç"
+msgstr "E78: δ֪µÄ±ê¼Ç"
msgid "E79: Cannot expand wildcards"
-msgstr "E79: ²»ÄÜÀ©Õ¹Í¨Åä·û"
+msgstr "E79: ÎÞ·¨À©Õ¹Í¨Åä·û"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ²»ÄÜСÓÚ 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ²»ÄÜСÓÚ 'winminwidth'"
msgid "E80: Error while writing"
-msgstr "E80: дÈë´íÎó"
+msgstr "E80: дÈë³ö´í"
msgid "Zero count"
-msgstr "Êýµ½Áã (?)"
+msgstr "¼ÆÊýΪÁã"
msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> ²»ÄÜÔÚ script ±¾ÎÄÍâʹÓÃ."
+msgstr "E81: Ôڽű¾»·¾³ÍâʹÓÃÁË <SID>"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: ÊÕµ½ÎÞЧµÄ±í´ïʽ"
+
+#~ msgid "E463: Region is guarded, cannot modify"
+#~ msgstr ""
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ²»ÔÊÐí¸Ä±äÖ»¶ÁÎļþ"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: ÄÚ²¿´íÎó: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ±í´ïʽµÄÄÚ´æʹÓó¬³ö 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: ¿ÕµÄ»º³åÇø"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ÎÞЧµÄËÑË÷±í´ïʽ»ò·Ö¸ô·û"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: ÎļþÒÑÔÚÁíÒ»¸ö»º³åÇøÖб»¼ÓÔØ"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: ûÓÐÉ趨ѡÏî '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "ÒѲéÕÒµ½Îļþ¿ªÍ·£¬ÔÙ´Ó½áβ¼ÌÐø²éÕÒ"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "ÒѲéÕÒµ½Îļþ½á⣬ÔÙ´Ó¿ªÍ·¼ÌÐø²éÕÒ"
+
+#~ msgid "[No file]"
+#~ msgstr "[δÃüÃû]"
+
+#~ msgid "[Error List]"
+#~ msgstr "[´íÎóÁбí]"
+
+#~ msgid "E106: Unknown variable: \"%s\""
+#~ msgstr "E106: 䶨ÒåµÄ±äÁ¿: \"%s\""
+
+#~ msgid "E119: Not enough arguments for function: %s"
+#~ msgstr "E119: º¯Êý %s µÄ²ÎÊýÌ«ÉÙ"
+
+#~ msgid "E120: Using <SID> not in a script context: %s"
+#~ msgstr "E120: <SID> ²»ÄÜÔÚ script ÉÏÏÂÎÄÍâʹÓÃ: %s"
+
+#~ msgid "E123: Undefined function: %s"
+#~ msgstr "E123: º¯Êý %s ÉÐ䶨Òå"
+
+#~ msgid "E127: Cannot redefine function %s: It is in use"
+#~ msgstr "E127: º¯Êý %s ÕýÔÚʹÓÃÖУ¬²»ÄÜÖØж¨Òå"
+
+#~ msgid "function "
+#~ msgstr "º¯Êý "
+
+#~ msgid "E130: Undefined function: %s"
+#~ msgstr "E130: º¯Êý %s ÉÐ䶨Òå"
+
+#~ msgid "Run Macro"
+#~ msgstr "Ö´Ðкê"
+
+#~ msgid "E242: Color name not recognized: %s"
+#~ msgstr "E242: %s Ϊ²»ÄÜʶ±ðµÄÑÕÉ«Ãû³Æ"
+
+#~ msgid "error reading cscope connection %d"
+#~ msgstr "¶ÁÈ¡ cscope Á¬½Ó %d ʱ´íÎó"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: ÕÒ²»µ½ cscope Á¬½Ó"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope Á¬½ÓÒѹرÕ"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "²»ÄÜʹÓà malloc\n"
+
+#~ msgid "%2d %-5ld %-34s <none>\n"
+#~ msgstr "%2d %-5ld %-34s <ÎÞ>\n"
+
+#~ msgid "E249: couldn't read VIM instance registry property"
+#~ msgstr "E249: ²»ÄܶÁÈ¡ VIM µÄ ×¢²á±íÊôÐÔ"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\tÏÔʾ Gnome Ïà¹Ø²ÎÊý"
+
+#~ msgid "[string too long]"
+#~ msgstr "[×Ö·û´®Ì«³¤]"
+
+#~ msgid "Hit ENTER to continue"
+#~ msgstr "Çë°´ ENTER ¼ÌÐø"
+
+#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
+#~ msgstr " (RET/BS: ÏòÏÂ/ÏòÉÏÒ»ÐÐ, ¿Õ¸ñ/b: Ò»Ò³, d/u: °ëÒ³, q: Í˳ö)"
+
+#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
+#~ msgstr " (RET: ÏòÏÂÒ»ÐÐ, ¿Õ°×¼ü: Ò»Ò³, d: °ëÒ³, q: Í˳ö)"
+
+#~ msgid "E361: Crash intercepted; regexp too complex?"
+#~ msgstr "E361: ²»ÄÜÖ´ÐÐ; regular expression Ì«¸´ÔÓ?"
+
+#~ msgid "E363: pattern caused out-of-stack error"
+#~ msgstr "E363: regular expression Ôì³É¶ÑÕ»ÓùâµÄ´íÎó"
+
+#~ msgid " BLOCK"
+#~ msgstr " ¿é"
+
+#~ msgid " LINE"
+#~ msgstr " ÐÐ"
+
+#~ msgid "Enter nr of choice (<CR> to abort): "
+#~ msgstr "ÊäÈë nr »òÑ¡Ôñ (<CR> Í˳ö): "
+
+#~ msgid "Linear tag search"
+#~ msgstr "ÏßÐÔ²éÕÒ±êÇ© (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "¶þ½øÖƲéÕÒ(Binary search) ±êÇ©(Tags)"
+
+#~ msgid "with BeOS GUI."
+#~ msgstr "ʹÓà BeOS ͼÐνçÃæ¡£"
diff --git a/src/syntax.c b/src/syntax.c
index baded60..dfeda5e 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6171,8 +6171,8 @@
"SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"),
#endif
#ifdef FEAT_VISUAL
- CENT("Visual term=reverse ctermbg=Magenta",
- "Visual term=reverse ctermbg=Magenta guibg=LightGrey"),
+ CENT("Visual term=reverse",
+ "Visual term=reverse guibg=LightGrey"),
#endif
#ifdef FEAT_DIFF
CENT("DiffAdd term=bold ctermbg=LightBlue",
@@ -6251,8 +6251,8 @@
"SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"),
#endif
#ifdef FEAT_VISUAL
- CENT("Visual term=reverse ctermbg=Magenta",
- "Visual term=reverse ctermbg=Magenta guibg=DarkGrey"),
+ CENT("Visual term=reverse",
+ "Visual term=reverse guibg=DarkGrey"),
#endif
#ifdef FEAT_DIFF
CENT("DiffAdd term=bold ctermbg=DarkBlue",
@@ -6325,11 +6325,13 @@
for (i = 0; pp[i] != NULL; ++i)
do_highlight((char_u *)pp[i], reset, TRUE);
- /* Magenta background looks ugly, but grey may not work for 8 colors.
- * Thus let it depend on the number of colors available. */
+ /* Reverse looks ugly, but grey may not work for 8 colors. Thus let it
+ * depend on the number of colors available. */
if (t_colors > 8)
do_highlight((char_u *)(*p_bg == 'l' ? "Visual ctermbg=LightGrey"
: "Visual ctermbg=DarkGrey"), reset, TRUE);
+ else
+ do_highlight((char_u *)"Visual cterm=reverse", reset, TRUE);
#ifdef FEAT_SYN_HL
/*
diff --git a/src/tag.c b/src/tag.c
index 3f0a35b..24809e3 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3844,14 +3844,17 @@
if (*p == ':' && len > 0)
{
s = ++p;
- while (*p != NUL && *p >= ' ' && *p < 127)
+ while (*p != NUL && *p >= ' ')
++p;
n[len] = NUL;
if (add_tag_field(dict, (char *)n, s, p) == FAIL)
ret = FAIL;
n[len] = ':';
}
- --p;
+ else
+ /* Skip field without colon. */
+ while (*p != NUL && *p >= ' ')
+ ++p;
}
}
}
diff --git a/src/version.h b/src/version.h
index f631b8f..9a77a5c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -35,6 +35,6 @@
*/
#define VIM_VERSION_NODOT "vim70e"
#define VIM_VERSION_SHORT "7.0e"
-#define VIM_VERSION_MEDIUM "7.0e01 BETA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0e01 BETA (2006 Apr 17)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0e01 BETA (2006 Apr 17, compiled "
+#define VIM_VERSION_MEDIUM "7.0e02 BETA"
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0e02 BETA (2006 Apr 18)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0e02 BETA (2006 Apr 18, compiled "
diff --git a/src/vim.h b/src/vim.h
index 37762be..f24f15d 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -346,8 +346,10 @@
* bit and pointers 64 bit. */
#ifdef _WIN64
typedef unsigned __int64 long_u;
+typedef __int64 long_i;
#else
typedef unsigned long long_u;
+typedef long long_i;
#endif
/*