changeset 836:5a7843c57316 v7.0e02

updated for version 7.0e02
author vimboss
date Tue, 18 Apr 2006 21:55:01 +0000
parents 8bebcabccc2c
children 6bb1fa855dc9
files runtime/autoload/htmlcomplete.vim runtime/autoload/xml/xhtml10s.vim runtime/doc/insert.txt runtime/doc/motion.txt runtime/doc/options.txt runtime/doc/tags runtime/doc/todo.txt runtime/doc/usr_44.txt runtime/doc/version7.txt runtime/filetype.vim runtime/indent/cmake.vim runtime/lang/menu_chinese_gb.936.vim runtime/lang/menu_ja_jp.euc-jp.vim runtime/lang/menu_ja_jp.utf-8.vim runtime/lang/menu_japanese_japan.932.vim runtime/lang/menu_sv_se.latin1.vim runtime/lang/menu_zh_cn.gb2312.vim runtime/makemenu.vim runtime/synmenu.vim runtime/syntax/2html.vim runtime/syntax/cmake.vim runtime/syntax/rnoweb.vim runtime/syntax/tex.vim runtime/syntax/vera.vim runtime/syntax/vim.vim runtime/tutor/tutor.sk runtime/tutor/tutor.sk.cp1250 src/edit.c src/fileio.c src/getchar.c src/gui.h src/gui_gtk.c src/gui_gtk_x11.c src/if_cscope.c src/netbeans.c src/option.c src/po/ja.po src/po/ja.sjis.po src/po/sv.po src/po/zh_CN.UTF-8.po src/po/zh_CN.cp936.po src/po/zh_CN.po src/syntax.c src/tag.c src/version.h src/vim.h
diffstat 46 files changed, 11668 insertions(+), 5625 deletions(-) [+]
line wrap: on
line diff
--- 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 @@ function! htmlcomplete#CompleteTags(find
 	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 @@ function! htmlcomplete#CompleteTags(find
 			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 @@ function! htmlcomplete#CompleteTags(find
 						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"]
+			else
+				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
-			else
-				return []
 			endif
 
 			if len(values) == 0
@@ -518,13 +490,12 @@ function! htmlcomplete#CompleteTags(find
 		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 @@ function! htmlcomplete#CompleteTags(find
 			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 @@ function! htmlcomplete#CompleteTags(find
 		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 @@ function! htmlcomplete#CompleteTags(find
 	" 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 @@ function! htmlcomplete#CompleteTags(find
 		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 @@ function! htmlcomplete#CompleteTags(find
 	" }}}
   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:
--- a/runtime/autoload/xml/xhtml10s.vim
+++ b/runtime/autoload/xml/xhtml10s.vim
@@ -1460,9 +1460,21 @@ let g:xmldata_xhtml10s = {
 \ '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 @@ let g:xmldata_xhtml10s = {
 \ ],
 \ 'onkeydown' : [],
 \ 'onkeyup' : [],
-\ 'media' : [],
+\ 'media' : [
+\ 'screen',
+\ 'tty',
+\ 'tv',
+\ 'projection',
+\ 'handheld',
+\ 'print',
+\ 'braille',
+\ 'aural',
+\ 'all'
+\ ],
 \ 'href' : [],
 \ 'onmouseup' : [],
 \ 'id' : [],
@@ -3369,7 +3391,9 @@ let g:xmldata_xhtml10s = {
 \ 'BOOL'
 \ ],
 \ 'src' : [],
-\ 'type' : [],
+\ 'type' : [
+\ 'text/javascript'
+\ ],
 \ 'charset' : [],
 \ 'xml:space' : [
 \  'preserve'
--- 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 @@ Vim can display the matches in a simplis
 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 @@ Note: Completion may fail in badly forma
 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 @@ 4. "vimxmlattrinfo" - special key with d
    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*
--- 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 @@ The result is that when repeating CTRL-O
 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:
--- 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 @@ A jump table for the options with a shor
 	   	    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.
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4984,6 +4984,7 @@ drag-n-drop	gui.txt	/*drag-n-drop*
 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	howto.txt	/*howto*
 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*
--- 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
--- 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 @@ the syntax file "name.vim", 'filetype', 
 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
--- 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 @@ When moving the cursor through the text 
 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 @@ BibTeX indent file. (Dorai Sitaram)
 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 @@ racc syntax and ftplugin file. (Nikolai 
 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 @@ sudoers ftplugin file. (Nikolai Weibull)
 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 @@ if 'encoding' is a multi-byte encoding.
 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:
--- 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 @@ au BufNewFile,BufRead *.prg
 	\   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 *.rib			setf rib
 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 @@ au BufNewFile,BufRead *.uc			setf uc
 " 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
 
new file mode 100644
--- /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
--- 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 @@ scriptencoding cp936
 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\ &Bottom\ Scrollbar		开/关底部滚动条(&B)
 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 &Left\ side<Tab>^WH		左边(&L)<Tab>^WH
 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 Cu&t			剪切(&T)
 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 @@ if has("toolbar")
     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)
--- 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 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)
--- 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 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)
--- 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	抲姺(&L)<Tab>:%s
 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)
--- 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 &About		&Om
 menutrans &File				&Arkiv
 menutrans &Open\.\.\.<Tab>:e		&謕pna\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp	謕pna\ i\ splitt-vy\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	謕pna\ flik\.\.\.<Tab>:tabnew
 menutrans &New<Tab>:enew		&Ny<Tab>:enew
 menutrans &Close<Tab>:close		S&t鋘g<Tab>:close
 menutrans &Save<Tab>:w			&Spara<Tab>:w
@@ -66,24 +67,24 @@ menutrans &Keymap			&Tangentbordsupps鋞tning
 
 " Edit.Global Settings
 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	V鋢la\ m鰊sterframh鋠ning<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!	V鋢la\ ignorering\ av\ storlek<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!	V鋢la\ matchningsvisning<Tab>:set\ sm!
-menutrans &Context\ lines		Sammanhangsrader
-menutrans &Virtual\ Edit		Virtuell\ redigering
-menutrans Never				Aldrig
-menutrans Block\ Selection		Blockval
-menutrans Insert\ mode			Infogningsl鋑e
-menutrans Block\ and\ Insert		Block\ och\ infogning
-menutrans Always			Alltid
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	V鋢la\ infogningsl鋑e<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	V鋢la\ Vi-kompabilitet<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.		S鰇v鋑\.\.\.
-menutrans Ta&g\ Files\.\.\.		Taggfiler\.\.\.
-menutrans Toggle\ &Toolbar		V鋢la\ verktygsrad
-menutrans Toggle\ &Bottom\ Scrollbar	V鋢la\ rullningslista\ i\ botten
-menutrans Toggle\ &Left\ Scrollbar	V鋢la\ v鋘ster\ rullningslista
-menutrans Toggle\ &Right\ Scrollbar	V鋢la\ h鰃er\ rullningslista
-menutrans None				Ingen
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		V鋢la\ ignorering\ av\ storlek<Tab>:set\ ic!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm!		V鋢la\ matchningsvisning<Tab>:set\ sm!
+menutrans &Context\ lines				Sammanhangsrader
+menutrans &Virtual\ Edit				Virtuell\ redigering
+menutrans Never						Aldrig
+menutrans Block\ Selection				Blockval
+menutrans Insert\ mode					Infogningsl鋑e
+menutrans Block\ and\ Insert				Block\ och\ infogning
+menutrans Always					Alltid
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		V鋢la\ infogningsl鋑e<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!		V鋢la\ Vi-kompabilitet<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.				S鰇v鋑\.\.\.
+menutrans Ta&g\ Files\.\.\.				Taggfiler\.\.\.
+menutrans Toggle\ &Toolbar				V鋢la\ verktygsrad
+menutrans Toggle\ &Bottom\ Scrollbar			V鋢la\ rullningslista\ i\ botten
+menutrans Toggle\ &Left\ Scrollbar			V鋢la\ v鋘ster\ rullningslista
+menutrans Toggle\ &Right\ Scrollbar			V鋢la\ h鰃er\ rullningslista
+menutrans None						Ingen
 
 " Edit.File Settings
 menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	V鋢la\ radnumrering<Tab>:set\ nu!
@@ -94,7 +95,7 @@ menutrans Toggle\ &expand-tab<Tab>:set\ et!		V鋢la\ tab-expandering<Tab>:set\ et!
 menutrans Toggle\ &auto-indent<Tab>:set\ ai!		V鋢la\ auto-indentering<Tab>:set\ ai!
 menutrans Toggle\ &C-indenting<Tab>:set\ cin!		V鋢la\ 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 &Open<Tab>:copen		&謕pna<Tab>:copen
 menutrans &Close<Tab>:cclose		&St鋘g<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鋞t\ kompilerare
+menutrans Se&T\ Compiler		S鋞t\ &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鋝ta\ fel
+menutrans To\ &Previous\ error<Tab>[s		Till\ &f鰎eg錯nde\ fel
+menutrans Suggest\ &Corrections<Tab>z=		F鰎esl錦 &korrigeringar
+menutrans &Repeat\ correction<Tab>:spellrepall	&Upprepa\ korrigering
 
 " Tools.Folding
 menutrans &Enable/Disable\ folds<Tab>zi	V鋢la\ veck<Tab>zi
--- 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 @@ scriptencoding gb2312
 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\ &Bottom\ Scrollbar		开/关底部滚动条(&B)
 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 &Left\ side<Tab>^WH		左边(&L)<Tab>^WH
 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 Cu&t			剪切(&T)
 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 @@ if has("toolbar")
     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)
--- 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.CHILL:chill
 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.Python:python
 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.UIT/UIL:uil
 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
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -100,19 +100,20 @@ an 50.20.230 &Syntax.C.CHILL :cal SetSyn
 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.430 &Syntax.PQ.Pyrex :cal SetSy
 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>
--- 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 @@ else
 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 = '\&#x20;'
+    let s:LeadingSpace = '&#x20;'
   else
-    let s:HtmlSpace = '\&nbsp;'
+    let s:LeadingSpace = '&nbsp;'
   endif
+  let s:HtmlSpace = '\' . s:LeadingSpace
 endif
 
 " HTML header, with the title and generator ;-). Left free space for the CSS,
@@ -246,9 +248,17 @@ if exists("html_use_css")
   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:lnum <= s:end
     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 @@ endwhile
 " 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 @@ if !v:profiling
     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
new file mode 100644
--- /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"
new file mode 100644
--- /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:
--- 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 @@ endif
 " 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\>"
new file mode 100644
--- /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
--- 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 cluster vimOperGroup	contains=vimOpe
 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  vimFilter contained	"\A!.\{-}
 "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	"[,:]"
--- 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祄i v齥onn editor, ktor m pr韑i ve礱 pr韐azov na to aby
@@ -10,6 +10,7 @@
      Pribli緉 鑑s potrebn na prebratie tejto v齯ky je 25-30 min鷗,
      z醰is na tom, ko祂o je str醰en閔o 鑑su s preskavan韒.
 
+     UPOZORNENIE:
      Pr韐azy v lekci醕h modifikuj text. Vytvor k髉iu tohto s鷅oru aby
      sa mohlo precvi鑟va na 騩m (pri 箃arte "vimtutor" je toto k髉ia).
 
@@ -20,16 +21,17 @@
      Presved sa, 緀 Shift-Lock NIEJE stla鑕n a stla鑤 kl醰esu
      j  nieko祂o kr醫, aby sa kurzor posunul nato祂o, 緀 lekcia 1.1
      celkom zapln obrazovku.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekcia 1.1:  POHYB KURZOROM
 
 
    ** Pre pohyb kurzorum stla kl醰esy h,j,k,l ako je zn醶ornen. **
-	     ^
-	     k		 Funkcia: Kl醰esa h je na礱vo a vykon pohyb do礱va.
-       < h	 l   >	 Kl醰esa l je napravo a vykon pohyb doprava.
-	     j		 Kl醰esa j vyzer ako 鬼pka dole
-	     v
+        ^
+        k        Funkcia: Kl醰esa h je na礱vo a vykon pohyb do礱va.
+   < h     l >   Kl醰esa l je napravo a vykon pohyb doprava.
+        j        Kl醰esa j vyzer ako 鬼pka dole
+	      v
   1. Pohybuj kurzorom po obrazovke, k齧 si na to nezvykne.
 
   2. Dr stla鑕n kl醰esu pre pohyb dole (j), k齧 sa jej funkcia nezopakuje.
@@ -38,34 +40,33 @@
   3. Pou緄t韒 kl醰esy pre pohyb dole prejdi na Lekciu 1.2.
 
 Pozn醡ka: Ak si niesi ist t齧 鑟 si nap韘al, stla <ESC>
-	  na prechod do norm醠neho m骴u.
+	        na prechod do norm醠neho m骴u.
 
 Pozn醡ka: Kurzorov kl醰esy s tie funk鑞. Ale pou卷van韒 hjkl sa bude
-	  schopn pohybova r齝hlej筰e, ke si zvykne ich pou卷va.
+	        schopn pohybova r齝hlej筰e, ke si zvykne ich pou卷va. Naozaj!
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     LEKCIA 1.2: SP讴獳NIE A ZATV罵ANIE VIMU
+		     LEKCIA 1.2: ZATV罵ANIE VIMU
+
 
   !! POZN罬KA: Pred vykonan韒 t齝hto krokov si pre桧taj cel t鷗o lekciu !!
 
   1. Stla kl醰esu <ESC> (aby si sa u鑙te nach醖zal v norm醠nom m骴e)
 
-  2. Nap砉:			:q! <ENTER>.
-
----> T齧 ukon桧 pr醕u s editorom BEZ ulo緀nia zmien, ktor si vykonal.
-     Ak chce ulo緄 vykonan zmeny a ukon鑙 pr醕u s editorom nap砉:
-				:wq   <ENTER>
+  2. Nap砉:   :q! <ENTER>.
+     T齧 ukon桧 pr醕u s editorom BEZ ulo緀nia zmien, ktor si vykonal.
 
   3. Ke sa dostane na pr韐azov riadok, nap砉 pr韐az, ktor齧 sa dostane
      spe do tejto v齯ky. To m艟e by:	vimtutor <ENTER>
-     Zvy鑑jne sa pou卷va:		vim tutor <ENTER>
-
----> 'vim' znamen spustenie editora vim, 'tutor' je n醶ov s鷅oru, ktor
-     chce editova.
 
   4. Ak si si tieto kroky spo礱hlivo zapam鋞al, vykonaj kroky 1 a 3, pre
-     ukon鑕nie a znovu spustenie editora. Potom presu kurzor dole na
-     lekciu 1.3.
+     ukon鑕nie a znovu spustenie editora. 
+
+POZN罬KA: :q! <ENTER> neulo卷 zmeny, ktor si vykonal. O nieko祂o lekci
+          sa nau桧 ako ulo緄 zmeny do s鷅oru
+
+  5. presu kurzor dole na lekciu 1.3.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		      Lekcia 1.3: EDIT罜IA TEXTU - MAZANIE
 
@@ -85,7 +86,7 @@ Pozn醡ka: Kurzorov kl醰esy s tie funk鑞. Ale pou卷van韒 hjkl sa bude
 
   5. Ak je veta spr醰na, prejdi na lekciu 1.4.
 
-POZN罬KA: Neskaj si zapamet浠 obsah tejto v齯ky, ale sa u pou卷van韒.
+POZN罬KA: Neskaj si zapam鋞a obsah tejto v齯ky, ale sa u pou卷van韒.
 
 
 
@@ -93,7 +94,7 @@ POZN罬KA: Neskaj si zapamet浠 obsah tejto v齯ky, ale sa u pou卷van韒.
 		     Lekcia 1.4: EDIT罜IA TEXTU - VKLADANIE
 
 
-    ** Stla鑕nie kl醰esy  i  v norm醠nom m骴e umo掘uje vkladanie textu. **
+    ** Stla鑕nie kl醰esy  i  umo掘uje vkladanie textu. **
 
   1. Presu kurzor ni竟ie na prv riadok za zna鑛u --->.
 
@@ -111,26 +112,73 @@ POZN罬KA: Neskaj si zapamet浠 obsah tejto v齯ky, ale sa u pou卷van韒.
   5. Ke sa dostato鑞e nau桧 vklada text, prejdi na nasleduj鷆e zhrnutie.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Lekcia 1.5: EDIT罜IA TEXTU - PRID罺ANIE
+
+
+     ** Stla鑕nie kl醰esy  A  umo掘uje prid醰a text. **
+
+  1. Presu kurozr ni竟ie na prv riadok za zna鑛ou --->.
+     Nez醠e卷 na tom, na ktorom znaku sa kurzor v tom riadku nach醖za.
+
+  2. Stla kl醰esu  A  a nap砉 potrebn text.
+
+  3. Po pridan textu stla kl醰esu <ESC> pre n醰rat do Norm醠neho m骴u.
+
+  4. Presu kurozr na druh riadok ozna鑕n ---> a zopakuj 
+     kroky 2 a 3 k齧 nieje veta spr醰na.
+
+---> Tu je nejak text ch齜aj鷆i o
+     Tu je nejak text ch齜aj鷆i od tia祎o.
+---> Tu tie ch齜a nej
+     Tu tie ch齜a nejak text.
+
+  5. Ke sa dostato鑞e nau桧 prid醰a text, prejdi na lekciu 1.6.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       Lekcia 1.6: EDIT罜IA S贐ORU
+
+
+    ** Nap韘an韒  :wq  sa s鷅or ulo卷 a zavrie **
+
+!! POZN罬KA: Pred vykonan韒 t齝hto krokov si pre桧taj cel lekciu!!
+
+1. Opusti t鷗o v齯ku, ako si to urobil v lekcii 1.2:  :q!
+
+2. Do pr韐azov閔o riadku nap砉 pr韐az:  vim tutor <ENTER>
+   'vim' je pr韐az, ktor spust editor Vim, 'tutor' je meno s鷅oru, 
+   ktor chce editova. Pou緄 tak s鷅or, ktor m艟e meni.
+
+3. Vlo a zma text tak, ako si sa nau鑙l v predo筶齝h lekciach.
+
+4. Ulo s鷅or so zmenami a opusti Vim pr韐azom:  :wq  <ENTER>
+
+5. Re箃artuj vimtutor a presu sa dole na nasleduj鷆e zhrnutie. 
+
+6. Urob tak po pre桧tan predo筶齝h krokov a porozumeniu im.
+
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       ZHRNUTIE LEKCIE 1
 
 
   1. Kurzor sa pohybuje pou緄t韒 kl醰es so 鬼pkami alebo kl醰esmi 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韐azov閔o riadku) nap砉: vim FILENAME <ENTER>
 
   3. Na ukon鑕nie Vimu nap砉: <ESC>  :q!  <ENTER> pre zru筫nie v筫tk齝h zmien
        alebo nap砉:   <ESC>   :wq   <ENTER>    pre ulo緀nie zmien.
 
-  4. Na zmazanie znaku na mieste kurzora nap砉 v norm醠nom m骴e:  x
+  4. Na zmazanie znaku na mieste kurzora nap砉:  x
 
   5. Pre vlo緀nie textu na mieste kurzora v norm醠nom m骴e nap砉:
-	 i     vkladan text	<ESC>
+	 i     nap砉 vkladan text   <ESC>  vkladanie pred kurzor
+   A     nap砉 prid醰an text  <EXC>  vkladanie za riadok
 
 POZN罬KA: Stla鑕nie <ESC> 籥 premiestn do norm醠neho m骴u alebo zru鬼
-	  nejak nechcen a 鑙asto鑞e dokon鑕n pr韐az.
+	        nejak nechcen a 鑙asto鑞e dokon鑕n pr韐az.
 
 Teraz pokra鑥j lekciou 2.
 
@@ -149,8 +197,10 @@ 3. Presu kurzor na za鑙atok slova, ktor je potrebn zmaza.
 
 4. Nap砉  dw  aby slovo zmizlo.
 
-POZN罬KA: P韘men dw sa zobrazia na poslednom riadku obrazovky tak ako ich
-	  p砉e. Ak p砉e nie鑟 zle, stla  <ESC>  a za鑞i znova.
+POZN罬KA: P韘meno d sa zobraz na poslednom riadku obrazovky ke ho
+	        nap砉e. Vim na teba po鑛, aby si mohol nap韘a 
+          p韘meno w. Ak vid砉 nie鑟 in ako  d , tak si nap韘al 
+          nespr醰ny znak; stla  <ESC>  a za鑞i znova.
 
 ---> Tu je nieko祂o slov z醔ava, ktor nie patria list do tejto vety.
 
@@ -178,34 +228,75 @@ 4. Nap砉    d$    aby sa zmazali znaky do konca riadku.
 5. Prejdi na lekciu 2.3 pre pochopenie toho 鑟 sa stalo.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     Lekcia 2.3: OPER罷ORY A POHYBY
 
+  Ve礱 pr韐azov, ktor menia text s odvoden od oper醫orov a pohybov. 
+  Form醫 pre pr韐az mazania kl醰esou  d  je nasledovn:
+
+    d   pohyb
+
+  kde:
+    d     - je mazac oper醫or
+    pohyb - je to 鑟 oper醫or vykon醰a (vyp韘an ni竟ie)
+
+  Kr醫ky list pohybov:
+    w - do za鑙atku 颽l筰eho slova, okrem jeho prv閔o p韘mena.
+    e - do konca teraj筰eho slova, vr醫ane posledn閔o znaku. 
+    $ - do konca riadku, vr醫ane posledn閔o znaku
+
+  Tak緀 nap韘an韒  de  sa zma緀 v筫tko od kurzora do konca slova.
+
+POZN罬KA: Stla鑕n韒 iba pohybu v norm醠nom m骴e bez oper醫ora 
+          sa presunie kurzor tak ako je to 筽ecivikovan. 
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		Lekcia 2.4: Pou緄tie viacn醩obn閔o pohybu
+
+
+   ** Nap韘an韒 桧sla pred pohyb ho zopakuje zadn po鑕t kr醫 **
+
+  1. Presu kurozr ni竟ie na za鑙atok riadku ozna鑕n閔o --->.
+
+  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鑙atok riadku.
+
+  5. Zopakuj kroky 2 a 3 s r魖nymi 桧slami. 
+
+---> Toto je riadok so slovami po kotr齝h sa m艟ete pohybova.
+
+  6. Prejdi na lekciu 2.5.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lekcia 2.3: ROZ㊣ROVACIE PR蚄AZY A OBJEKTY
+		  Lekcia 2.5: POU甀TIE VIACN罶OBN蒆O MAZANIA PRE HROMADN MAZANIE
 
 
-  Form醫 mazacieho pr韐azu  d  je nasledovn:
+    ** Nap韘anie 桧sla spolu s oper醫orom ho zopakuje zadan po鑕t kr醫 **
 
-   [桧slo]   d objekt       ALEBO      d   [桧slo]    objekt
-  Kde:
-    桧slo - ud醰a ko祂o kr醫 sa pr韐az vykon (volite祅, implicitne=1)
-    d - je pr韐az pre mazanie
-    objekt - ud醰a na 鑟m sa pr韐az vykon醰a (vyp韘an ni竟ie)
+  V kombin醕ii oper醫orov mazania a pohybu spom韓an閔o vy构ie vlo po鑕t 
+  pred pohyb pre docielenie hromadn閔o mazania:
+    d   桧slo   pohyb
+
+  1. Presu kurzor na prv slovo p韘an VE軲I P蚐MENAMI 
+     v riadku ozna鑕nom --->.
 
-  Kr醫ky v齪is objektov:
-    w - od kurzora do konca slova, vr醫anie medzier
-    e - od kurzora do konca slova, BEZ medzier
-    $ - od kurzora do konca riadku.
+  2. Nap砉  2dw  a zma緀 dve slov p韘an VE軲I P蚐MENAMI
+
+  3. Zopakuj kroky 1 a 2 s pou緄t韒 r魖neho 桧sla tak aby si zmazal slov
+     p韘an ve祂齧i p韘menami jedn齧 pr韐azom.
 
-POZN罬KA: Ak stla桧 kl醰esu objektu v norm醠nom m骴e bez pr韐azu, kurzor
-	  sa presunie na miesto 筽ecifikovan vo v齪ise objektov.
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny. 
 
-
+POZN罬KA: 软slo medzi oper醫orom  d  a pohybom funguje podobne ako pri 
+          pou緄t s pohybom bez oper醫ora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Lekcia 2.4: V軳IMKA V 'PR蚄AZOVOM OBJEKTE'
+    		Lekcia 2.6: OPER罜IE S RIADKAMI
 
 
 	    ** Nap韘anie pr韐azu   dd   zma緀 cel riadok. **
@@ -216,7 +307,7 @@ Vzh礱dom na frekvenciu mazania cel閔o riadku, sa autori Vimu rozhodli,
 1. Presu kurzor na druh riadok v texte na spodu.
 2. Nap砉  dd  aby si zmazal riadok.
 3. Prejdi na 箃vrt riadok.
-4. Nap砉   2dd   (pametaj si  桧slo-pr韐az-objekt) aby si zmazal dva riadky.
+4. Nap砉   2dd   aby si zmazal dva riadky.
 
     1)  Ru緀 s 鑕rven,
     2)  Blato je z醔avn,
@@ -228,7 +319,7 @@ 4. Nap砉   2dd   (pametaj si  桧slo-pr韐az-objekt) aby si zmazal dva riadky.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lekcia 2.5: PR蚄AZ UNDO
+			Lekcia 2.7: PR蚄AZ UNDO
 
 
 ** Stla  u  pre vr醫enie posledn閔o pr韐azu,  U  pre 鷓ravu cel閔o riadku. **
@@ -241,7 +332,7 @@ 4. Teraz oprav v筫tky chyby na riadku pou緄t韒 pr韐azu  x  .
 5. Teraz nap砉 ve祂   U  桧m vr醫砉 riadok do p魐odn閔o stavu.
 6. Teraz nap砉  u  nieko祂o kr醫, 桧m vr醫砉 sp浠 pr韐az U.
 7. Teraz nap砉 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko祂o
-   kr醫, 桧m vr醫砉 sp浠 predt齧 vr醫en pr韐azy (redo).
+   kr醫, 桧m vr醫砉 sp浠 predt齧 vr醫en pr韐azy (undo z undo).
 
 ---> Opprav chybby nna toomto riadku a zmee ich pommocou undo.
 
@@ -260,18 +351,22 @@ 7. Teraz nap砉 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko祂o
 
   3. Pre zmazanie cel閔o riadku nap砉:   dd
 
-  4. Form醫 pre p韐az v nor醠nom m骴e je:
+  4. Pre zopakovanie pohybu, nap砉 pred neho 桧slo:   2w
 
-       [桧slo]   pr韐az   objekt    ALEBO   pr韐az [桧slo]   objekt
+  5. Form醫 pre p韐az:
+
+       oper醫or   [桧slo]   pohyb
      kde:
-       桧slo - ud醰a ko祂o kr醫 sa pr韐az zopakuje
-       pr韐az - ud醰a vykon醰an pr韐az, ako napr韐lad  d  pre mazanie
-       objekt - ud醰a rozsah pr韐azu, ako napr韐lad  w(slovo),
+       oper醫or - 鑟 treba robi, napr韐lad  d  pre zmazanie
+       [桧slo] - je volite祅 po鑕t pre opakovanie pohybu
+       pohyb - pohyb po texte vzh礱dom na oper醫or, napr韐lad w (slovo), 
 		$ (do konca riadku), at.
 
-  5. Pre vr醫enie sp浠 predo筶ej oper醕ie nap砉:     u	 (mal u)
-     Pre vr醫enie v筫tk齝h 鷓rav na riadku nap砉:    U	 (ve祂 U)
-     Pre vr醫enie vr醫en齝h 鷓rav nap砉:	     CTRL-R
+  6. Pre pohyb na za鑙atok riadku pou緄 nulu:  0
+
+  7. Pre vr醫enie sp浠 predo筶ej oper醕ie nap砉:	u   (mal u)
+     Pre vr醫enie v筫tk齝h 鷓rav na riadku nap砉:    U   (ve祂 U)
+     Pre vr醫enie vr醫en齝h 鷓rav nap砉:	      CTRL-R
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			 Lekcia 3.1: PR蚄AZ VLO甀
@@ -289,10 +384,10 @@ 7. Teraz nap砉 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko祂o
 
   5. Zopakuj kroky 2 a 4, k齧 riadky nies v spr醰nom porad.
 
-     d) Tie sa dok峋e vzdel醰a?
-     b) Fialky s modr,
-     c) Inteligencia sa vzdel醰a,
-     a) Ru緀 s 鑕rven,
+---> d) Tie sa dok峋e vzdel醰a?
+---> b) Fialky s modr,
+---> c) Inteligencia sa vzdel醰a,
+---> a) Ru緀 s 鑕rven,
 
 
 
@@ -300,15 +395,15 @@ 7. Teraz nap砉 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko祂o
 		       Lekcia 3.2: PR蚄AZ NAHRADENIA
 
 
-     ** Nap韘an韒  r  a znaku sa nahrad znak na mieste kurzora. **
+     ** Nap韘an韒  rx  sa nahrad znak na mieste kurzora znakom  x . **
 
   1. Presu kurzor ni竟ie na prv riadok textu ozna鑕n閔o zna鑛ou --->.
 
   2. Presu kurzor na za鑙atok 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齧 prv riadok nieje spr醰ny.
+  4. Zopakuj kroky 2 a 3, k齧 prv riadok nieje zhodn s druh齧.
 
 ---> Ka bol tento riasok p韆an, niekro stla筰l nespr醔ne kl醰esy!
 ---> Ke bol tento riadok p韘an, niekto stla鑙l nespr醰ne kl醰esy!
@@ -323,22 +418,22 @@ POZN罬KA: Pam鋞aj si, 緀 nau鑙 sa m艟e len pou卷vanim, nie pam鋞an韒.
 		       Lekcia 3.3. PR蚄AZ 赑RAVY
 
 
-     ** Ak chce zmeni 鑑s slova alebo cel slovo, nap砉  cw . **
+     ** Ak chce zmeni 鑑s slova do konca slova, nap砉  ce . **
 
   1. Presu kurzor ni竟ie na prv riadok ozna鑕n zna鑛ou --->.
 
   2. Umiestni kurzor na p韘meno o v slove rosfpl.
 
-  3. Nap砉  cw  a oprav slovo (v tomto pr韕ade nap砉 'iadok'.)
+  3. Nap砉  ce  a oprav slovo (v tomto pr韕ade nap砉 'iadok'.)
 
-  4. Stla <ESC> a prejdi na 颽l筰u chybu (prv znak, ktor treba zmeni.)
+  4. Stla <ESC> a prejdi na 颽l鬼 znak, ktor treba zmeni.
 
   5. Zopakuj kroky 3 a 4, k齧 prv veta nieje rovnak ako druh.
 
 ---> Tento rosfpl m nieko祂o skic, ktor je pirewvb zmeni piy籾栳n pr韐azu.
 ---> Tento riadok m nieko祂o slov, ktor je potrebn zmeni pou緄t韒 pr韐azu.
 
-Pozn醡ka, 緀  cw  nielen nahr醖za slovo, ale 籥 aj premiestn do vkladania.
+Pozn醡ka, 緀  ce  zma緀 slovo a nastav vkladac m骴.
 
 
 
@@ -346,13 +441,13 @@ Pozn醡ka, 緀  cw  nielen nahr醖za slovo, ale 籥 aj premiestn do vkladania.
 		       Lekcia 3.4: VIAC ZMIEN POU甀T蚆 c
 
 
-   ** Pr韐az pre 鷓ravy sa pou卷va s rovnak齧i objektami ako pre mazanie **
+   ** Pr韐az pre 鷓ravy sa pou卷va s rovnak齧i pohybmi ako pre mazanie **
 
   1. Pr韐az pre 鷓ravy pracuje rovnako ako pre mazanie. Form醫 je:
 
-    [桧slo]   c   objekt       ALEBO       c [桧slo]   objekt
+        c    [桧slo]    pohyb
 
-  2. Objekty s rovnak, ako napr韐lad  w (slovo), $ (koniec riadku), at.
+  2. Pohyby s rovnak, ako napr韐lad   w (slovo) a  $ (koniec riadku).
 
   3. Presu kurzor ni竟ie na prv riadok ozna鑕n zna鑛ou --->.
 
@@ -364,6 +459,7 @@ Pozn醡ka, 緀  cw  nielen nahr醖za slovo, ale 籥 aj premiestn do vkladania.
 ---> Koniec tohto riadku potrebuje pomoc, aby bol ako druhy.
 ---> Koniec tohto riadku potrebuje opravi pou緄t韒 pr韐azu  c$ .
 
+POZN罬KA: M艟e pou緄 kl醰esu backspace na 鷓ravu zmien po鑑s p韘ania.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,13 +472,13 @@ Pozn醡ka, 緀  cw  nielen nahr醖za slovo, ale 籥 aj premiestn do vkladania.
   2. Pre naradenie znaku na mieste kurzora, nap砉  r  a potom znak, ktor
      nahrad p魐odn znak.
 
-  3. Pr韐az na upravenie umo掘uje zmeni 筽ecifikovan objekt od kurzora
-     a po koniec objektu.  napr. Nap砉  cw  桧m zmn砉 text od poz韈ie
+  3. Pr韐az na upravenie umo掘uje zmeni od kurzora a po miesto, ktor 
+     ur鑥je pohyb.  napr. Nap砉  ce  桧m zmn砉 text od poz韈ie
      kurzora do konca slova, c$  zmen text do konca riadku.
 
-  4. Format pre nahradenie je:
+  4. Form醫 pre nahradenie je:
 
-	[桧slo]   c objekt	 ALEBO	     c	 [桧slo]    objekt
+	    c    [桧slo]    pohyb 
 
 
 Teraz prejdi na nalseduj鷆u lekciu.
@@ -394,19 +490,19 @@ Teraz prejdi na nalseduj鷆u lekciu.
 
 
   ** Stla CTRL-g pre zobrazenie svojej poz韈ie v s鷅ore a statusu s鷅oru.
-     Stla SHIFT-G pre prechod na riadok v s鷅ore. **
+     Nap砉  G  pre presun na riadok v s鷅ore. **
 
   Pozn醡ka: Pre桧taj si cel t鷗o lekciu sk魊 ako za鑞e vykon醰a kroky!!
 
-  1. Dr stla鑕n kl醰esu Ctrl a stla  g . Na spodu obrazovky sa zobraz
-     stavov riadok s n醶vom s鷅oru a riadkom na ktorom pr醰e si. Zapam鋞aj
-     si si 桧slo riadku pre krok 3.
+  1. Dr stla鑕n kl醰esu Ctrl a stla  g . Toto naz齰ame CTRL-G. 
+     Na spodu obrazovky sa zobraz spr醰a s n醶vom s鷅oru a poz韈iou 
+     v s鷅ore. Zapam鋞ajsi si 桧slo riadku pre pou緄tie v kroku 3.
 
-  2. Stla Shift-G 桧m sa dostane na spodok s鷅oru.
+  2. Stla  G  桧m sa dostane na spodok s鷅oru.
+     Nap砉  gg  桧m sa dostane na za鑙atok s鷅oru.
 
-  3. Nap砉 桧slo riadku na ktorom si sa nach醖zal a stla Shift-G. To 籥
-     vr醫i na riadok, na ktorom si prv kr醫 stla鑙l Ctrl-g.
-     (Ke p砉e 桧sla, tieto sa nezobrazuj na obrazovke.)
+  3. Nap砉 桧slo riadku na ktorom si sa nach醖zal a stla  G. To 籥
+     vr醫i na riadok, na ktorom si prv kr醫 stla鑙l CTRL-G.
 
   4. Ak sa c韙砉 schopn vykona teto kroky, vykonaj kroky 1 a 3.
 
@@ -419,24 +515,24 @@ Teraz prejdi na nalseduj鷆u lekciu.
   ** Nap砉  /  nasledovan re籥zcom pre vyh礱danie pr韘lu筺閔o re籥zca. **
 
   1. Nap砉 znak  /  v norm醠nom m骴e. Pozn醡ka, 緀 tento znak sa spolu
-     s kurzorom zobraz v dolnej 鑑sti obrazovky ako s  :  pr韐azom.
+     s kurzorom zobraz v dolnej 鑑sti obrazovky s  :  pr韐azom.
 
   2. Teraz nap砉 'errroor' <ENTER>. To je slovo, ktor chce vyh礱da.
 
   3. Pre vyh礱danie 颽l筰eho v齭kytu rovnak閔o re籥zca, stla jednoducho  n.
      Pre vyh礱danie 颽l筰eho v齭kytu rovnak閔o re籥zca opa鑞齧 smerom,
-     nap砉 Shift-N.
+     N.
 
   4. Ak chce vyh礱da re籥zec v sp鋞nom smere, pou卷 pr韐az  ?  miesto
      pr韐azu /.
 
- ---> Ke vyh礱d醰anie dosiahne koniec tohto s鷅oru, bude pokra鑟va na
-      za鑙atku.
+  5. Pre n醰rat na miesto z ktor閔o si pri筰el stla CTRL-O (dr stla鑕n 
+     kl醰esu Ctrl po鑑s stla鑕nia kl醰esy o). Zopakuj pre 颽l鬼 n醰rat 
+     sp浠. CTRL-I ide vpred.
 
-  "errroor" nie je sp魋ob ako nahradi error; errroor je error.
-
-POZN罬KA: Ke vyh礱d醰anie dosiahne koniec s鷅oru, bude pokra鑟va na jeho
-	  za鑙atku.
+POZN罬KA: "errroor" nieje sp魋ob hl醩kovania error; errroor je error.
+POZN罬KA: Ke vyh礱d醰anie dosiahne koniec tohto s鷅oru, bude pokra鑟va na
+      za鑙atku, dokia nieje resetovan nastavenie 'wrapscan' .
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -454,16 +550,18 @@ POZN罬KA: Ke vyh礱d醰anie dosiahne koniec s鷅oru, bude pokra鑟va na jeho
 
   4. Nap砉  %  pre presun kurzoru sp浠 na otv醨aj鷆u z醫vorku.
 
+  5. Presu kurzor na in zo znakov (,),[,],{ alebo } a v筰mni si
+     鑟 % vykon醰a.
+
 ---> Toto ( je testovac riadok s ('s, ['s ] a {'s } v riadku. ))
 
 Pozn醡ka: Toto je ve祄i v齢odn pou卷 pri laden programu s ch齜aj鷆imi
-	  uzatv醨aj鷆imi z醫vorkami.
-
+	  uzatv醨aj鷆imi z醫vorkami!
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lekcia 4.4: SPOSOB AKO ZMENI CHYBY
+		      Lekcia 4.4: PR蚄AZ NAHRADENIA
 
 
  ** Nap砉   :s/star/nov/g  pre nahradenie slova 'star' za slovo 'nov'. **
@@ -471,7 +569,7 @@ Pozn醡ka: Toto je ve祄i v齢odn pou卷 pri laden programu s ch齜aj鷆imi
   1. Presu kurzor ni竟ie na riadok ozna鑕n zna鑛ou --->.
 
   2. Nap砉  :s/thee/the <ENTER> . Poznamka, 緀 tento pr韐az zmen len prv
-     v齭kyt v riadku.
+     v齭kyt "thee" v riadku.
 
   3. Teraz nap砉   :s/thee/the/g   鑟 znamen celkov nahradenie v riadku.
      Toto nahrad v筫tky v齭kyty v riadku.
@@ -479,9 +577,11 @@ Pozn醡ka: Toto je ve祄i v齢odn pou卷 pri laden programu s ch齜aj鷆imi
 ---> Thee best time to see thee flowers in thee spring.
 
   4. Pre zmenu v筫tk齝h v齭kytov dan閔o re籥zca 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齝h sa nahradenie vykon.
      nap砉  :%s/star/nov/g    pre zmenu v筫tk齝h v齭kytov v celom riadku
-
+     nap砉  :%s/star/nov/gc   n醞de v筫tky v齭kyty v celom s鷅ore,
+                                s ot醶kou 鑙 nahradi alebo nie
 
 
 
@@ -489,23 +589,25 @@ Pozn醡ka: Toto je ve祄i v齢odn pou卷 pri laden programu s ch齜aj鷆imi
 			       LEKCIA 4 ZHRNUTIE
 
 
-  1. Ctrl-g  vyp砉e tvoju poz韈iu v s鷅ore a status s鷅oru.
-     Shift-g  籥 premiestni na koniec riadku. 软slo riadku nasledovan
-     Shift-g  籥 presunie na dan 桧slo riadku.
+  1. CTRL-g    vyp砉e tvoju poz韈iu v s鷅ore a status s鷅oru.
+            G  籥 premiestni na koniec riadku. 
+     桧slo  G  籥 premiestni na riadok s 桧slom.
+           gg  籥 presunie na prv riadok
 
   2. Nap韘anie  /  nasledovan re籥zcom vyh礱d re籥zec smerom DOPREDU.
      Nap韘anie  ?  nasledovan re籥zcom vyh礱da re籥zec smerom DOZADU.
      Nap韘anie  n  po vyh礱d醰an, vyh礱d nasleduj鷆i v齭kyt re籥zca
-     v rovnakom smere, pri鑟m  Shift-N  vyh礱d v opa鑞om smere.
+     v rovnakom smere, pri鑟m  N  vyh礱d v opa鑞om smere.
+     CTRL-O 籥 vr醫i sp浠 na star筰u poz韈iu, CTRL-I na nov筰u poz韈iu.
 
   3. Nap韘anie  %  ke kurzor je na (,),[,],{, alebo } n醞de zodpovdaj鷆u
-     p醨 z醫vorku.
+     p醨nu z醫vorku.
 
-  4. Pre nahradenie nov閔o za prv star v riadku nap砉    :s/nov/star
-     Pre nahradenie nov閔o za v筫tky star v riadku nap砉  :s/nov/star/g
-     Pre nahradenie re籥zcov medzi dvoma riadkami 3 nap砉  :#,#/nov/star/g
+  4. Pre nahradenie nov閔o za prv star v riadku nap砉    :s/star/nov
+     Pre nahradenie nov閔o za v筫tky star v riadku nap砉  :s/star/nov/g
+     Pre nahradenie re籥zcov medzi dvoma riadkami 3 nap砉  :#,#/star/nov/g
      Pre nahradenie v筫tk齝h v齭kytov v s鷅ore nap砉       :%s/star/nov/g
-     Pre potvrdenie ka綿閔o nahradenia pridaj 'c'	   :%s/nov/star/gc
+     Pre potvrdenie ka綿閔o nahradenia pridaj 'c'	         :%s/star/nov/gc
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -524,7 +626,7 @@ Pozn醡ka: Toto je ve祄i v齢odn pou卷 pri laden programu s ch齜aj鷆imi
      zobraz obsah tvojho adres醨a rovnako ako na pr韐azovom riadku.
      Alebo pou緄  :!dir  ak ls nefunguje.
 
-Pozn醡ka:  Takto je mo緉 spusti hociak vonkaj鬼 pr韐az.
+Pozn醡ka:  Takto je mo緉 spusti hociak vonkaj鬼 pr韐az s argumentami.
 Pozn醡ka:  V筫tky pr韐azy  :  musia by dokon鑕n stla鑕n韒 <ENTER>
 
 
@@ -539,41 +641,43 @@ Pozn醡ka:  V筫tky pr韐azy  :  musia by dokon鑕n stla鑕n韒 <ENTER>
   1. Nap砉  :!dir  alebo  :!ls  pre v齪is aktu醠neho adres醨a.
      U vie, 緀 mus砉 za t齧to stla鑙 <ENTER> .
 
-  2. Vyber n醶ov s鷅oru, ktor E㏕E neexistuje.
+  2. Vyber n醶ov s鷅oru, ktor e箃e neexistuje, ako napr. TEST.
 
   3. Teraz nap砉:   :w TEST   (kde TEST je n醶ov vybrat閔o s鷅oru.)
 
   4. To ulo卷 cel s鷅or  (Vim Tutor)  pod n醶ovm TEST.
      Pre overenie nap砉   :!dir   , 桧m  zobraz砉 obsah adres醨a.
 
-Pozn醡ka: 緀 ak ukon桧 pr醕u s editorom Vim a znovu ho spust砉 s n醶vom
-	  s鷅oru TEST, s鷅or bude k髉ia v齯ky, ke si ho ulo緄l.
+Pozn醡ka: 緀 ak ukon桧 pr醕u s editorom Vim a znovu ho spust砉 pr韐azom
+	        vim TEST, s鷅or bude k髉ia v齯ky, ke si ho ulo緄l.
 
   5. Teraz odstr狎 s鷅or nap韘an韒 (MS-DOS):   :!del TEST
 			     alebo (Unix):     :!rm TEST
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lekcia 5.3 V軧EROV PR蚄AZ PRE ULO瓻NIE
+		    Lekcia 5.3 V軧ER TEXTU PRE ULO瓻NIE
 
 
-  ** Pre ulo緀nie 鑑sti s鷅oru, nap砉   :#,# w FILENAME **
+  ** Pre ulo緀nie 鑑sti s鷅oru, nap砉  v  pohyb :w FILENAME **
+
+  1. Presu kurozr na tento riadok.
 
-  1. Znovu nap砉  :!dir  alebo  :!ls  pre zobrazenie obsahu aktu醠neho
-     adres醨a a vyber vhodn s鷅or ako TEST.
+  2. Stla  v  a presu kurozr na piatu polo緆u dole. Pozn醡ka, 緀
+     tento text je vyzna鑕n (highlighted).
 
-  2. Presu kurzor na vrch tejto strany a nap砉  Ctrl-g  pre vyh礱danie 桧sla
-     tohto riadku.  PAMETAJ SI TOTO 韧SLO!
+  3. Stla kl醰esu  : . V spodnej 鑑sti okna sa objav  :'<,'>.
 
-  3. Teraz prejdi na spodok strany a nap砉  Ctrl-g  znovu. ZAPAMETAJ SI 韧SLO
-     AJ TOHTO RIADKU!
+  4. Nap砉 w TEST  , kde TEST je meno s鷅oru, ktor zatial neexistuje. 
+     Skontroluj, e vid砉  :'<,'>w TEST  predt齧 ne stla桧 Enter.
 
-  4. Pre ulo緀nie LEN 鑑sti s鷅oru, nap砉   :#,# w TEST  kde #,# s dve 桧sla
-     zapam鋞an齝h riadkov (vrch, spodok) a TEST je n醶ov s鷅oru.
+  5. Vim zap砉e ozna鑕n riadky do s鷅oru TEST. Pou緄 :!dir  alebo  !ls
+     pre overenie. Zatial ho e箃e nema! Pou緄jeme ho v 颽l筫j lekcii.
 
-  5. Znova sa pozri, 鑙 tam ten s鷅or je pomocou pr韐azu   :!dir ale
-     NEODSTRA襏J ho.
-
+POZN罬KA: Stla鑕n韒 kl醰esy  v  sa spust vizu醠ne ozna鑟vanie. 
+          M艟e pohybova kurzorom pre upresnenie vyzna鑕n閔o textu. 
+          Potom m艟e pou緄 oper醫or pre vykonanie nejakej akcie 
+          s textom. Napr韐lad  d  zma緀 vyzna鑕n text.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -582,21 +686,16 @@ Pozn醡ka: 緀 ak ukon桧 pr醕u s editorom Vim a znovu ho spust砉 s n醶vom
 
 	** Pre vlo緀nie obsahu s鷅oru, nap砉   :r FILENAME **
 
-  1. Nap砉   :!dir   aby si sa presved鑙l, 緀 s鷅or TEST st醠e existuje.
+  1. Premiestni kurzor nad tento riadok. 
 
-  2. Presu kurzor na vrch tejto strany.
-
-POZN罬KA:  Po vykonan kroku 3 uvid砉 Lekciu 5.3. Potom sa presu dole
-	   na t鷗o lekciu.
+POZN罬KA: Po vykonan kroku 2 uvid砉 text z lekcie 5.3. Potom sa presu
+          dole, aby si videl t鷗o lekciu.
 
   3. Teraz vlo s鷅or TEST pou緄t韒 pr韐azu   :r TEST   kde TEST je n醶ov
-     s鷅oru.
-
-POZN罬KA:  S鷅or, ktor si vlo緄l sa vlo卷 od miesta, kde sa nach醖za kurzor.
+     s鷅oru. S鷅or, ktor si pou緄l je umiestnen pod riadkom s kurzorom.
 
-  4. Pre kontrolu vlo緀nia s鷅oru, presu kurzor sp浠 a v筰mni si, 緀 teraz
-     m峁 dve k髉ie lekcie 5.3, origin醠 a s鷅orov verziu.
-
+POZN罬KA: M艟e tie na桧ta v齭tup vonkaj筰eho pr韐azu. Napr韐lad :r !ls
+          na桧ta v齭tup pr韐azu ls a umiestni ho za poz韈iu kurzora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -606,20 +705,19 @@ POZN罬KA:  S鷅or, ktor si vlo緄l sa vlo卷 od miesta, kde sa nach醖za kurzor.
   1.  :!pr韐az  spust vonkaj鬼 pr韐az.
 
       Niektor vyu緄te祅 pr韐lady s:
-	(MS_DOS)	  (UNIX)
-	 :!dir		   :!ls		    -  zobraz obsah adres醨a
+	(MS_DOS)    (UNIX)
+	 :!dir       :!ls	    -  zobraz obsah adres醨a
 	 :!del FILENAME    :!rm FILENAME    -  odstr醤i s鷅or FILENAME
 
   2.  :w FILENAME  ulo卷 aktu醠ny s鷅or na disk pod menom FILENAME.
-
-  3.  :#,#w FILENAME  ulo卷 riadky od # do # do s鷅oru FILENAME.
+ 
+  3.  v  pohyb  :w FILENAME  ulo卷 vizu醠ne ozna鑕n riadky do 
+      s鷅oru FILENAME.
 
   4.  :r FILENAME  vyberie z disku s鷅or FILENAME a vlo卷 ho do aktu醠neho
       s鷅oru za poz韈iou kurzora.
 
-
-
-
+  5. :r !dir  na桧ta v齭tup z pr韐azu dir a vlo卷 ho za poz韈iu kurzora.
 
 
 
@@ -640,9 +738,10 @@ POZN罬KA:  S鷅or, ktor si vlo緄l sa vlo卷 od miesta, kde sa nach醖za kurzor.
 ---> Po nap韘an  o  sa kurzor premiestn na vlo緀n riadok do vkladacieho
      m骴u.
 
-  4. Pre otvorenie riadku nad kurzorom, jednotucho nap砉 ve祂  O , namiesto
-     mal閔o o. Vyskaj si to na nasleduj鷆om riadku.
-Vlo riadok nad t齧to nap韘an韒 Shift-O, ke kurzor je na tomto riadku.
+  4. Pre otvorenie riadku nad kurzorom, jednotucho nap砉 ve祂  O , 
+     namiesto mal閔o  o. Vyskaj si to na riadku dole. 
+
+---> Vlo riadok nad t齧to nap韘an韒 O, ke kurzor je na tomto riadku.
 
 
 
@@ -653,20 +752,21 @@ Vlo riadok nad t齧to nap韘an韒 Shift-O, ke kurzor je na tomto riadku.
 	   ** Nap砉  a  pre vlo緀nie textu ZA kurzor. **
 
   1. Presu kurzor ni竟ie na koniec prv閔o riadku ozna鑕n閔o zna鑛ou --->
-     nap韘an韒  $  v norm醠nom m骴e.
 
-  2. Nap砉  a  (mal p韘meno) pre pridanie textu ZA znakom na mieste
-     kurzora. (Ve祂 A prid na koniec riadku.)
+  2. Stla kl醰esu  e  dokia kurozr nieje na konci riadku.   
+
+  3. Nap砉  a  (mal p韘meno) pre pridanie textu ZA kurzorom.
 
-Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo緀nie, <ESC>,
-	  kurzor doprava, a nakoniec, x , na prid醰anie na koniec riadku!
+  4. Dokon桧 slovo tak ako je to v druhom riadku. Stla <ESC> pre 
+     opustenie vkladacieho m骴u.
 
-  3. Teraz dokon鑙 prv riadok. Pozn醡ka, 緀 prid醰anie je vlastne rovnak
-     ako vkladac m骴, okrem miesta, kde sa text vklad.
+  5. Pou緄  e  na presun na 颽l筰e nedokon鑕n slovo a zopakuj kroky 3 a 4.
 
----> Tento riadok ti dovo祏je n醕vik
+---> Tento ri ti dovo祏je n醕v pri醰an testu na koniec riadku.
 ---> Tento riadok ti dovo祏je n醕vik prid醰ania textu na koniec riadku.
 
+POZN罬KA: a, i, A 箃artuj rovnak vkladac m骴, jedin rozidel je, kde 
+          sa znaky vkladaj. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -675,24 +775,52 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo緀nie, <ESC>,
 
       ** Nap砉 ve祂 R pre nahradenie viac ako jedn閔o znaku. **
 
-  1. Presu kurzor ni竟ie na prv riadok ozna鑕n zna鑛ou --->.
+  1. Presu kurzor ni竟ie na prv riadok ozna鑕n zna鑛ou --->. Premiestni
+     kurzor na za鑙atok prv閔o v齭kytu  xxx.
 
-  2. Premiestni kurzor na za鑙atok prv閔o slova, ktor je odli筺 od druh閔o
-     riadku ozna鑕n閔o ---> (slovo 'posledn').
+  2. Teraz nap砉  R  a  nap砉  桧slo uveden v druhom riadku, tak緀 
+     sa n韒 nahrad p魐odn xxx.
 
-  3. Teraz nap砉  R  a nahra zvy筼k textu na prvom riadku p韘an韒 cez star
-     text tak, aby prv riadok bol rovnak ako druh.
+  3. Stla <ESC> pre opustenie nahradzovacieho m骴u. Pozn醡ka, 緀 zvy筼k 
+     riadku zostane nezmenen. 
+
+  4. Zopakuj tieto kroky pre nahradenie zvy筺齝h xxx.
 
----> Na 鷓ravu prv閔o riadku do tvaru ako je posledn na strane pou緄 kl醰esy.
----> Na 鷓ravu prv閔o riadku do tavru ako je druh, nap砉 R a nov text.
+---> Pridan韒 123 ku xxx dostane xxx.
+---> Pridan韒 123 ku 456 dostane 579.
 
-  4. Pozn醡ka, 緀 ak stla桧 <ESC> pre ukon鑕nie, v筫tok nezmenen text
-     zostane.
-
+POZN罬KA:  Nahradzovac m骴 je ako vkladac m骴, ale ka綿 nap韘an znak 
+           zma緀 existuj鷆i znak. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lekcia 6.4: NASTAVENIE MO甆OST
+
+          Lekcia 6.4: Copy Paste textu
+
+    ** pou卷 oper醫or  y  pre copy textku a  p  pre jeho paste **
+
+  1. Cho ni竟ie na riadok ozna鑕n ---> a umiestni kurozr za "a)".
+
+  2. Na箃artuj vizu醠ny m骴 pou緄t韒  v  a presu kurozr pred "first".
+
+  3. Nap砉  y  pre  vystrihnutie (copy) ozna鑕n閔o textu.
+
+  4. Presu kurozr na koniec 颽l筰eho riadku: j$
+
+  5. Nap砉  p  pre vlo緉ie (paste) textu. Potom nap砉:  a druha <ESC>.
+
+  6. Pou緄 vizu醠ny m骴 pre ozna鑕nie "polo緆a.", vystrihni to 
+     pou緄t韒  y, presu sa na koniec nasleduj鷆eho riadku pou緄t韒  j$ 
+     a vlo sem text pou緄t韒  p.
+
+---> a) toto je prv polo緆a
+---> b)
+
+POZN罬KA: M艟e pou緄 tie  y  ako oper醫or; yw  vystrihne jedno slovo. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 Lekcia 6.5: NASTAVENIE MO甆OST
 
 
 ** Nastav mo緉osti, tak緀 vyh礱d醰anie alebo nahradzovanie ignoruje
@@ -700,40 +828,52 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo緀nie, <ESC>,
 
 
   1. Vyh礱daj re籥zec 'ignore' nap韘an韒:
-     /ignore
-     Zopakuj vyh礱d醰anie nieko祂o kr醫 stla鑕n韒 kl醰esy n
+     /ignore <ENTER>
+     Zopakuj vyh礱d醰anie nieko祂o kr醫 stla鑕n韒 kl醰esy  n .
 
   2. Nastav mo緉os 'ic' (Ignore case) nap韘an韒 pr韐azu:
      :set ic
 
-  3. Teraz vyh礱daj re籥zec 'ingore' znova stla鑕n韒 kl醰esy: n
-     Zopakuj vyh礱d醰anie nieko祂o kr醫 stla鑕n韒 kl醰esy n
+  3. Teraz vyh礱daj re籥zec 'ingore' znova stla鑕n韒 kl醰esy  n
+     Pozn醡ka, 緀 teraz s vyh礱dan aj Ignore a IGNORE.
 
   4. Nastav mo緉os籭 'hlsearch' a 'incsearch':
      :set hls is
 
   5. Teraz spusti vyh礱d醰ac pr韐az znovu, a pozri 鑟 sa stalo:
-     /ignore
+     /ignore <ENTER>
 
-  6. Na odstr醤enie zv齬aznenia v齬azov nap砉:
-     :nohlsearch
+  6. Pre opetovn zapnutie rozly筼vania ve祂齝h a mal齝h p韘men 
+     nap砉:  :set noic
+
+POZN罬KA: Na odstr醤enie zv齬aznenia v齬azov nap砉:  :nohlsearch
+POZN罬KA: Ak chce nerozly筼va ve祂os p韘men len pre jedno 
+          pou緄tie vyh礱d醰acieho pr韐azu, pou緄 \c:  /ignore\c <ENTER>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			      LEKCIA 6 ZHRNUTIE
 
 
-  1. Nap韘an韒  o  sa otvor nov riadok pod kurzorom a premiestni sa kurzor
-     na vlo緀n riadok do vkladacieho m骴u.
-     nap韘an韒 ve祂閔o  O  sa otvor riadok nad aktu醠nym riadkom s kurzorom.
+  1. Nap砉  o  pre otvorenie riadku pod kurzorom a 箃art vkladacieho m骴u.
+     Nap砉  O  pre otvorenie riadku nad kurzorom.
+
+  2. Nap砉  a  pre vkladanie textu ZA kurzor.
+     Nap砉  A  pre vkladanie textu za koncom riadku.
+
+  3. Pr韐az  e  presunie kurozr na koniec slova
+
+  4. Oper醫or  y  vystrihne (skop韗uje) text,  p  ho vlo卷.
 
-  2. Nap砉  a  pre vkladanie textu ZA znak na poz韈ii kurzoru.
-     Nap韘an韒 ve祂閔o  A  sa text automatick prid醰a na koniec riadku.
+  5. Nap韘anie ve祂閔o  R  prepne do nahradzovacieho m骴u, k齧 nieje
+     stla鑕n <ESC>.
 
-  3. Nap韘anie ve祂閔o  R  prepne do nahradzovacieho m骴u, k齧 nieje
-     stla鑕n <ESC> pre ukon鑕nie nahradzovacieho m骴u.
+  6. Nap韘anie ":set xxx" nastav mo緉os "xxx". Niektor nastavenia s: 
+     'ic' 'ignorecase' ignoruje ve祂 a mal p韘men po鑑s vyh礱d醰ania. 
+     'is' 'incsearch' zobrazuje 鑙asto鑞 re籥zce vyh礱d醰an閔o re籥zca. 
+     'hls' 'hlsearch' vyzna桧 v筫tky vyh礱d醰an re籥zce.
+      M艟e pou緄 hociktor z dlh齝h a kr醫kych n醶vov mo緉ost.
 
-  4. Nap韘anie ":set xxx" nastav mo緉os "xxx".
-
+  7. Vlo "no" pred nastavenie pre jeho vypnutie:  :set noic
 
 
 
@@ -742,7 +882,7 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo緀nie, <ESC>,
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    LEKCIA 7: PR蚄AZY ON-LINE N罰OVEDY
+		    LEKCIA 7.1: Z蚐KANIE N罰OVEDY
 
 
 	  ** Pou卷vaj on-line syst閙 n醦ovedy **
@@ -753,19 +893,21 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo緀nie, <ESC>,
 	- stla kl醰esu <F1> (ak nejak m峁)
 	- nap砉  :help <ENTER>
 
-  Nap砉  :q <ENTER>  桧m zatvor砉 okno n醦ovedy.
+  软taj text v okne n醦ovedy pre z韘kanie predstavy ako n醦oveda funguje. 
+  Nap砉   CTRL-W CTRL-W  pre skok z jedn閔o okna do druh閔o. 
+  Nap砉    :q <ENTER>    桧m zatvor砉 okno n醦ovedy.
 
   M艟e n醞s help ku hociakej t閙e pridan韒 argumentu ku pr韐azu ":help".
   Vyskaj tieto (nezabudni stla鑙 <ENTER>):
 
 	:help w
-	:help c_<T
+	:help c_CTRL-D
 	:help insert-index
 	:help user-manual
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		 LEKCIA 8: VYTVORENIE ㏕ARTOVACIEHO SKRIPTU
+		 LEKCIA 7.2: VYTVORENIE ㏕ARTOVACIEHO SKRIPTU
 
 		       ** Zapni funkcie editora Vim **
 
@@ -773,22 +915,67 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo緀nie, <ESC>,
   vypnut. Pre pou卷vanie viac Vim funkcii vytvor "vimrc" s鷅or.
 
   1. Za鑞i editova "vimrc" s鷅or, to z醰is na pou緄tom syst閙e:
-	: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韐ladu "vimrc" s鷅oru:
 
-	:read $VIMRUNTIME/vimrc_example.vim
+	:r $VIMRUNTIME/vimrc_example.vim
 
   3. Ulo s鷅or:
-
-	:write
+	:w
 
   Pri nasleduj鷆om 箃arte editora Vim sa pou緄je zv齬az騩vanie syntaxe.
   Do "vimrc" s鷅oru m艟e prida v筫tky svoje uprednost騩van nastavenia.
+  Pre viac inform醕ii nap砉  :help vimrc-intro
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+                   LEKCIA 7.3 DOKON菶NIE
+
+     ** Dokon鑙 pr韐az na pr韐azovom riadku pou緄t韒 CTRL-D a <TAB> **
+
+  1. Uisti sa, 緀 Vim nieje v kompatibilnom m骴e:  :set nocp
+
+  2. Pozri sa ak s鷅ory sa nach醖zaj v adres醨i:  :!ls  alebo  :!dir
+
+  3. Nap砉 za鑙atok pr韐azu:  :e
+
+  4. Stla  CTRL-D  a Vim zobraz zoznam pr韐azov za桧naj鷆ich "e".
+
+  5. Stla <TAB> a Vim dokon桧 meno pr韐azu na ":edit".
+
+  6. Teraz pridaj medzern韐 a za鑙atok mena existuj鷆eho s鷅oru: 
+     :edit FIL
+
+  7. Stla <TAB>. Vim dokon桧 meno (ak je jedine鑞).
+
+POZN罬KA: Dokon鑟vanie funguje pre ve礱 pr韐azov. Vyskaj stla鑕nie 
+          CTRL-D a <TAB>. ﹑eci醠ne je to u緄to鑞 pre pr韐az  :help.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            LEKCIA 7 ZHRNUTIE
+
+  1. Nap砉  :help  alebo stla <F1> alebo <Help> pre otvorenie okna n醦ovedy.
+
+  2. Nap砉  :help pr韐az  pre vyh礱danie n醦ovedy ku pr韐azu pr韐az. 
+
+  3. Nap砉  CTRL-W CTRL-W  na presko鑕nie do in閔o okna. 
+
+  4. Nap砉  :q  pre zatvorenie okna n醦ovedy
+
+  5. Vytvor 箃artovac skript vimrc pre udr綼nie uprednost騩van齝h nastaven. 
+
+  6. Po鑑s p韘ania pr韐azu  :  stla CTRL-D pre zobrazenie dokon鑕n. 
+     Stla <TAB> pre pou緄tie jedn閔o z dokon鑕n. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
   Toto vymedzuje v齯ku Vimu. Toto je ur鑕n pre strucn preh礱d o editore
   Vim, 鷓lne posta鑥j鷆e pre 礱hk a obstojn pou卷vanie tohto editora.
   T醫o v齯ka je 颽leko od kompletnosti, preto緀 Vim m omnoho viacej pr韐azov.
@@ -817,5 +1004,5 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo緀nie, <ESC>,
 
   Preklad do Sloven鑙ny: bo 萫lko
   e-mail:       celbos@inmail.sk
-  Last Change:  2004 Apr 29
-  Encoding:	iso8859-2
+  Last Change:  2006 Apr 18
+  encoding:     iso8859-2
--- 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緈i v齥onn editor, ktor m pr韑i ve綼 pr韐azov na to aby
@@ -10,6 +10,7 @@
      Pribli瀗 鑑s potrebn na prebratie tejto v齯ky je 25-30 min鷗,
      z醰is na tom, ko緆o je str醰en閔o 鑑su s presk鷼avan韒.
 
+     UPOZORNENIE:
      Pr韐azy v lekci醕h modifikuj text. Vytvor k髉iu tohto s鷅oru aby
      sa mohlo precvi鑟va na 騩m (pri 歵arte "vimtutor" je toto k髉ia).
 
@@ -20,16 +21,17 @@
      Presved sa, 瀍 Shift-Lock NIEJE stla鑕n a stla鑤 kl醰esu
      j  nieko緆o kr醫, aby sa kurzor posunul nato緆o, 瀍 lekcia 1.1
      celkom zapln obrazovku.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekcia 1.1:  POHYB KURZOROM
 
 
    ** Pre pohyb kurzorum stla kl醰esy h,j,k,l ako je zn醶ornen. **
-	     ^
-	     k		 Funkcia: Kl醰esa h je na綼vo a vykon pohyb do綼va.
-       < h	 l   >	 Kl醰esa l je napravo a vykon pohyb doprava.
-	     j		 Kl醰esa j vyzer ako 氻pka dole
-	     v
+        ^
+        k        Funkcia: Kl醰esa h je na綼vo a vykon pohyb do綼va.
+   < h     l >   Kl醰esa l je napravo a vykon pohyb doprava.
+        j        Kl醰esa j vyzer ako 氻pka dole
+	      v
   1. Pohybuj kurzorom po obrazovke, k齧 si na to nezvykne.
 
   2. Dr stla鑕n kl醰esu pre pohyb dole (j), k齧 sa jej funkcia nezopakuje.
@@ -38,34 +40,33 @@
   3. Pou瀒t韒 kl醰esy pre pohyb dole prejdi na Lekciu 1.2.
 
 Pozn醡ka: Ak si niesi ist t齧 鑟 si nap韘al, stla <ESC>
-	  na prechod do norm醠neho m骴u.
+	        na prechod do norm醠neho m骴u.
 
 Pozn醡ka: Kurzorov kl醰esy s tie funk鑞. Ale pou烅van韒 hjkl sa bude
-	  schopn pohybova r齝hlej歩e, ke si zvykne ich pou烅va.
+	        schopn pohybova r齝hlej歩e, ke si zvykne ich pou烅va. Naozaj!
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     LEKCIA 1.2: SP趭岮NIE A ZATV罵ANIE VIMU
+		     LEKCIA 1.2: ZATV罵ANIE VIMU
+
 
   !! POZN罬KA: Pred vykonan韒 t齝hto krokov si pre桧taj cel t鷗o lekciu !!
 
   1. Stla kl醰esu <ESC> (aby si sa u鑙te nach醖zal v norm醠nom m骴e)
 
-  2. Nap須:			:q! <ENTER>.
-
----> T齧 ukon桧 pr醕u s editorom BEZ ulo瀍nia zmien, ktor si vykonal.
-     Ak chce ulo瀒 vykonan zmeny a ukon鑙 pr醕u s editorom nap須:
-				:wq   <ENTER>
+  2. Nap須:   :q! <ENTER>.
+     T齧 ukon桧 pr醕u s editorom BEZ ulo瀍nia zmien, ktor si vykonal.
 
   3. Ke sa dostane na pr韐azov riadok, nap須 pr韐az, ktor齧 sa dostane
      spe do tejto v齯ky. To m魹e by:	vimtutor <ENTER>
-     Zvy鑑jne sa pou烅va:		vim tutor <ENTER>
-
----> 'vim' znamen spustenie editora vim, 'tutor' je n醶ov s鷅oru, ktor
-     chce editova.
 
   4. Ak si si tieto kroky spo綼hlivo zapam鋞al, vykonaj kroky 1 a 3, pre
-     ukon鑕nie a znovu spustenie editora. Potom presu kurzor dole na
-     lekciu 1.3.
+     ukon鑕nie a znovu spustenie editora. 
+
+POZN罬KA: :q! <ENTER> neulo烅 zmeny, ktor si vykonal. O nieko緆o lekci
+          sa nau桧 ako ulo瀒 zmeny do s鷅oru
+
+  5. presu kurzor dole na lekciu 1.3.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		      Lekcia 1.3: EDIT罜IA TEXTU - MAZANIE
 
@@ -85,7 +86,7 @@ Pozn醡ka: Kurzorov kl醰esy s tie funk鑞. Ale pou烅van韒 hjkl sa bude
 
   5. Ak je veta spr醰na, prejdi na lekciu 1.4.
 
-POZN罬KA: Nesk鷼aj si zapamet錆 obsah tejto v齯ky, ale sa u pou烅van韒.
+POZN罬KA: Nesk鷼aj si zapam鋞a obsah tejto v齯ky, ale sa u pou烅van韒.
 
 
 
@@ -93,7 +94,7 @@ POZN罬KA: Nesk鷼aj si zapamet錆 obsah tejto v齯ky, ale sa u pou烅van韒.
 		     Lekcia 1.4: EDIT罜IA TEXTU - VKLADANIE
 
 
-    ** Stla鑕nie kl醰esy  i  v norm醠nom m骴e umo烌uje vkladanie textu. **
+    ** Stla鑕nie kl醰esy  i  umo烌uje vkladanie textu. **
 
   1. Presu kurzor ni灇ie na prv riadok za zna鑛u --->.
 
@@ -111,26 +112,73 @@ POZN罬KA: Nesk鷼aj si zapamet錆 obsah tejto v齯ky, ale sa u pou烅van韒.
   5. Ke sa dostato鑞e nau桧 vklada text, prejdi na nasleduj鷆e zhrnutie.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Lekcia 1.5: EDIT罜IA TEXTU - PRID罺ANIE
+
+
+     ** Stla鑕nie kl醰esy  A  umo烌uje prid醰a text. **
+
+  1. Presu kurozr ni灇ie na prv riadok za zna鑛ou --->.
+     Nez醠e烅 na tom, na ktorom znaku sa kurzor v tom riadku nach醖za.
+
+  2. Stla kl醰esu  A  a nap須 potrebn text.
+
+  3. Po pridan textu stla kl醰esu <ESC> pre n醰rat do Norm醠neho m骴u.
+
+  4. Presu kurozr na druh riadok ozna鑕n ---> a zopakuj 
+     kroky 2 a 3 k齧 nieje veta spr醰na.
+
+---> Tu je nejak text ch齜aj鷆i o
+     Tu je nejak text ch齜aj鷆i od tia総o.
+---> Tu tie ch齜a nej
+     Tu tie ch齜a nejak text.
+
+  5. Ke sa dostato鑞e nau桧 prid醰a text, prejdi na lekciu 1.6.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       Lekcia 1.6: EDIT罜IA S贐ORU
+
+
+    ** Nap韘an韒  :wq  sa s鷅or ulo烅 a zavrie **
+
+!! POZN罬KA: Pred vykonan韒 t齝hto krokov si pre桧taj cel lekciu!!
+
+1. Opusti t鷗o v齯ku, ako si to urobil v lekcii 1.2:  :q!
+
+2. Do pr韐azov閔o riadku nap須 pr韐az:  vim tutor <ENTER>
+   'vim' je pr韐az, ktor spust editor Vim, 'tutor' je meno s鷅oru, 
+   ktor chce editova. Pou瀒 tak s鷅or, ktor m魹e meni.
+
+3. Vlo a zma text tak, ako si sa nau鑙l v predo歭齝h lekciach.
+
+4. Ulo s鷅or so zmenami a opusti Vim pr韐azom:  :wq  <ENTER>
+
+5. Re歵artuj vimtutor a presu sa dole na nasleduj鷆e zhrnutie. 
+
+6. Urob tak po pre桧tan predo歭齝h krokov a porozumeniu im.
+
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       ZHRNUTIE LEKCIE 1
 
 
   1. Kurzor sa pohybuje pou瀒t韒 kl醰es so 氻pkami alebo kl醰esmi 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韐azov閔o riadku) nap須: vim FILENAME <ENTER>
 
   3. Na ukon鑕nie Vimu nap須: <ESC>  :q!  <ENTER> pre zru歟nie v歟tk齝h zmien
        alebo nap須:   <ESC>   :wq   <ENTER>    pre ulo瀍nie zmien.
 
-  4. Na zmazanie znaku na mieste kurzora nap須 v norm醠nom m骴e:  x
+  4. Na zmazanie znaku na mieste kurzora nap須:  x
 
   5. Pre vlo瀍nie textu na mieste kurzora v norm醠nom m骴e nap須:
-	 i     vkladan text	<ESC>
+	 i     nap須 vkladan text   <ESC>  vkladanie pred kurzor
+   A     nap須 prid醰an text  <EXC>  vkladanie za riadok
 
 POZN罬KA: Stla鑕nie <ESC> 漚 premiestn do norm醠neho m骴u alebo zru氻
-	  nejak nechcen a 鑙asto鑞e dokon鑕n pr韐az.
+	        nejak nechcen a 鑙asto鑞e dokon鑕n pr韐az.
 
 Teraz pokra鑥j lekciou 2.
 
@@ -149,8 +197,10 @@ 3. Presu kurzor na za鑙atok slova, ktor je potrebn zmaza.
 
 4. Nap須  dw  aby slovo zmizlo.
 
-POZN罬KA: P韘men dw sa zobrazia na poslednom riadku obrazovky tak ako ich
-	  p須e. Ak p須e nie鑟 zle, stla	<ESC>  a za鑞i znova.
+POZN罬KA: P韘meno d sa zobraz na poslednom riadku obrazovky ke ho
+	        nap須e. Vim na teba po鑛, aby si mohol nap韘a 
+          p韘meno w. Ak vid須 nie鑟 in ako  d , tak si nap韘al 
+          nespr醰ny znak; stla  <ESC>  a za鑞i znova.
 
 ---> Tu je nieko緆o slov z醔ava, ktor nie patria list do tejto vety.
 
@@ -178,34 +228,75 @@ 4. Nap須    d$    aby sa zmazali znaky do konca riadku.
 5. Prejdi na lekciu 2.3 pre pochopenie toho 鑟 sa stalo.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     Lekcia 2.3: OPER罷ORY A POHYBY
 
+  Ve綼 pr韐azov, ktor menia text s odvoden od oper醫orov a pohybov. 
+  Form醫 pre pr韐az mazania kl醰esou  d  je nasledovn:
+
+    d   pohyb
+
+  kde:
+    d     - je mazac oper醫or
+    pohyb - je to 鑟 oper醫or vykon醰a (vyp韘an ni灇ie)
+
+  Kr醫ky list pohybov:
+    w - do za鑙atku 颽l歩eho slova, okrem jeho prv閔o p韘mena.
+    e - do konca teraj歩eho slova, vr醫ane posledn閔o znaku. 
+    $ - do konca riadku, vr醫ane posledn閔o znaku
+
+  Tak瀍 nap韘an韒  de  sa zma瀍 v歟tko od kurzora do konca slova.
+
+POZN罬KA: Stla鑕n韒 iba pohybu v norm醠nom m骴e bez oper醫ora 
+          sa presunie kurzor tak ako je to 歱ecivikovan. 
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		Lekcia 2.4: Pou瀒tie viacn醩obn閔o pohybu
+
+
+   ** Nap韘an韒 桧sla pred pohyb ho zopakuje zadn po鑕t kr醫 **
+
+  1. Presu kurozr ni灇ie na za鑙atok riadku ozna鑕n閔o --->.
+
+  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鑙atok riadku.
+
+  5. Zopakuj kroky 2 a 3 s r魖nymi 桧slami. 
+
+---> Toto je riadok so slovami po kotr齝h sa m魹ete pohybova.
+
+  6. Prejdi na lekciu 2.5.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lekcia 2.3: ROZ奍ROVACIE PR蚄AZY A OBJEKTY
+		  Lekcia 2.5: POU嶪TIE VIACN罶OBN蒆O MAZANIA PRE HROMADN MAZANIE
 
 
-  Form醫 mazacieho pr韐azu  d  je nasledovn:
+    ** Nap韘anie 桧sla spolu s oper醫orom ho zopakuje zadan po鑕t kr醫 **
 
-   [桧slo]   d objekt       ALEBO      d   [桧slo]    objekt
-  Kde:
-    桧slo - ud醰a ko緆o kr醫 sa pr韐az vykon (volite緉, implicitne=1)
-    d - je pr韐az pre mazanie
-    objekt - ud醰a na 鑟m sa pr韐az vykon醰a (vyp韘an ni灇ie)
+  V kombin醕ii oper醫orov mazania a pohybu spom韓an閔o vy殮ie vlo po鑕t 
+  pred pohyb pre docielenie hromadn閔o mazania:
+    d   桧slo   pohyb
+
+  1. Presu kurzor na prv slovo p韘an VE糑軲I P蚐MENAMI 
+     v riadku ozna鑕nom --->.
 
-  Kr醫ky v齪is objektov:
-    w - od kurzora do konca slova, vr醫anie medzier
-    e - od kurzora do konca slova, BEZ medzier
-    $ - od kurzora do konca riadku.
+  2. Nap須  2dw  a zma瀍 dve slov p韘an VE糑軲I P蚐MENAMI
+
+  3. Zopakuj kroky 1 a 2 s pou瀒t韒 r魖neho 桧sla tak aby si zmazal slov
+     p韘an ve緆齧i p韘menami jedn齧 pr韐azom.
 
-POZN罬KA: Ak stla桧 kl醰esu objektu v norm醠nom m骴e bez pr韐azu, kurzor
-	  sa presunie na miesto 歱ecifikovan vo v齪ise objektov.
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny. 
 
-
+POZN罬KA: 软slo medzi oper醫orom  d  a pohybom funguje podobne ako pri 
+          pou瀒t s pohybom bez oper醫ora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Lekcia 2.4: V軳IMKA V 'PR蚄AZOVOM OBJEKTE'
+    		Lekcia 2.6: OPER罜IE S RIADKAMI
 
 
 	    ** Nap韘anie pr韐azu   dd   zma瀍 cel riadok. **
@@ -216,7 +307,7 @@ Vzh綼dom na frekvenciu mazania cel閔o riadku, sa autori Vimu rozhodli,
 1. Presu kurzor na druh riadok v texte na spodu.
 2. Nap須  dd  aby si zmazal riadok.
 3. Prejdi na 歵vrt riadok.
-4. Nap須   2dd   (pametaj si  桧slo-pr韐az-objekt) aby si zmazal dva riadky.
+4. Nap須   2dd   aby si zmazal dva riadky.
 
     1)  Ru瀍 s 鑕rven,
     2)  Blato je z醔avn,
@@ -228,7 +319,7 @@ 4. Nap須   2dd   (pametaj si  桧slo-pr韐az-objekt) aby si zmazal dva riadky.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lekcia 2.5: PR蚄AZ UNDO
+			Lekcia 2.7: PR蚄AZ UNDO
 
 
 ** Stla  u  pre vr醫enie posledn閔o pr韐azu,  U  pre 鷓ravu cel閔o riadku. **
@@ -241,7 +332,7 @@ 4. Teraz oprav v歟tky chyby na riadku pou瀒t韒 pr韐azu  x  .
 5. Teraz nap須 ve緆   U  桧m vr醫須 riadok do p魐odn閔o stavu.
 6. Teraz nap須  u  nieko緆o kr醫, 桧m vr醫須 sp錆 pr韐az U.
 7. Teraz nap須 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko緆o
-   kr醫, 桧m vr醫須 sp錆 predt齧 vr醫en pr韐azy (redo).
+   kr醫, 桧m vr醫須 sp錆 predt齧 vr醫en pr韐azy (undo z undo).
 
 ---> Opprav chybby nna toomto riadku a zmee ich pommocou undo.
 
@@ -260,16 +351,20 @@ 7. Teraz nap須 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko緆o
 
   3. Pre zmazanie cel閔o riadku nap須:   dd
 
-  4. Form醫 pre p韐az v nor醠nom m骴e je:
+  4. Pre zopakovanie pohybu, nap須 pred neho 桧slo:   2w
 
-       [桧slo]   pr韐az   objekt    ALEBO   pr韐az [桧slo]   objekt
+  5. Form醫 pre p韐az:
+
+       oper醫or   [桧slo]   pohyb
      kde:
-       桧slo - ud醰a ko緆o kr醫 sa pr韐az zopakuje
-       pr韐az - ud醰a vykon醰an pr韐az, ako napr韐lad  d  pre mazanie
-       objekt - ud醰a rozsah pr韐azu, ako napr韐lad  w(slovo),
+       oper醫or - 鑟 treba robi, napr韐lad  d  pre zmazanie
+       [桧slo] - je volite緉 po鑕t pre opakovanie pohybu
+       pohyb - pohyb po texte vzh綼dom na oper醫or, napr韐lad w (slovo), 
 		$ (do konca riadku), at.
 
-  5. Pre vr醫enie sp錆 predo歭ej oper醕ie nap須:	u   (mal u)
+  6. Pre pohyb na za鑙atok riadku pou瀒 nulu:  0
+
+  7. Pre vr醫enie sp錆 predo歭ej oper醕ie nap須:	u   (mal u)
      Pre vr醫enie v歟tk齝h 鷓rav na riadku nap須:    U   (ve緆 U)
      Pre vr醫enie vr醫en齝h 鷓rav nap須:	      CTRL-R
 
@@ -289,10 +384,10 @@ 7. Teraz nap須 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko緆o
 
   5. Zopakuj kroky 2 a 4, k齧 riadky nies v spr醰nom porad.
 
-     d) Tie sa dok釣e vzdel醰a?
-     b) Fialky s modr,
-     c) Inteligencia sa vzdel醰a,
-     a) Ru瀍 s 鑕rven,
+---> d) Tie sa dok釣e vzdel醰a?
+---> b) Fialky s modr,
+---> c) Inteligencia sa vzdel醰a,
+---> a) Ru瀍 s 鑕rven,
 
 
 
@@ -300,15 +395,15 @@ 7. Teraz nap須 CTRL-R (dr kl醰esu CTRL stla鑕n k齧 stl徼a R) nieko緆o
 		       Lekcia 3.2: PR蚄AZ NAHRADENIA
 
 
-     ** Nap韘an韒  r  a znaku sa nahrad znak na mieste kurzora. **
+     ** Nap韘an韒  rx  sa nahrad znak na mieste kurzora znakom  x . **
 
   1. Presu kurzor ni灇ie na prv riadok textu ozna鑕n閔o zna鑛ou --->.
 
   2. Presu kurzor na za鑙atok 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齧 prv riadok nieje spr醰ny.
+  4. Zopakuj kroky 2 a 3, k齧 prv riadok nieje zhodn s druh齧.
 
 ---> Ka bol tento riasok p韆an, niekro stla歩l nespr醔ne kl醰esy!
 ---> Ke bol tento riadok p韘an, niekto stla鑙l nespr醰ne kl醰esy!
@@ -323,22 +418,22 @@ POZN罬KA: Pam鋞aj si, 瀍 nau鑙 sa m魹e len pou烅vanim, nie pam鋞an韒.
 		       Lekcia 3.3. PR蚄AZ 赑RAVY
 
 
-     ** Ak chce zmeni 鑑s slova alebo cel slovo, nap須  cw . **
+     ** Ak chce zmeni 鑑s slova do konca slova, nap須  ce . **
 
   1. Presu kurzor ni灇ie na prv riadok ozna鑕n zna鑛ou --->.
 
   2. Umiestni kurzor na p韘meno o v slove rosfpl.
 
-  3. Nap須  cw  a oprav slovo (v tomto pr韕ade nap須 'iadok'.)
+  3. Nap須  ce  a oprav slovo (v tomto pr韕ade nap須 'iadok'.)
 
-  4. Stla <ESC> a prejdi na 颽l歩u chybu (prv znak, ktor treba zmeni.)
+  4. Stla <ESC> a prejdi na 颽l氻 znak, ktor treba zmeni.
 
   5. Zopakuj kroky 3 a 4, k齧 prv veta nieje rovnak ako druh.
 
 ---> Tento rosfpl m nieko緆o skic, ktor je pirewvb zmeni piy漸栳n pr韐azu.
 ---> Tento riadok m nieko緆o slov, ktor je potrebn zmeni pou瀒t韒 pr韐azu.
 
-Pozn醡ka, 瀍  cw  nielen nahr醖za slovo, ale 漚 aj premiestn do vkladania.
+Pozn醡ka, 瀍  ce  zma瀍 slovo a nastav vkladac m骴.
 
 
 
@@ -346,13 +441,13 @@ Pozn醡ka, 瀍  cw  nielen nahr醖za slovo, ale 漚 aj premiestn do vkladania.
 		       Lekcia 3.4: VIAC ZMIEN POU嶪T蚆 c
 
 
-   ** Pr韐az pre 鷓ravy sa pou烅va s rovnak齧i objektami ako pre mazanie **
+   ** Pr韐az pre 鷓ravy sa pou烅va s rovnak齧i pohybmi ako pre mazanie **
 
   1. Pr韐az pre 鷓ravy pracuje rovnako ako pre mazanie. Form醫 je:
 
-    [桧slo]   c   objekt       ALEBO       c [桧slo]   objekt
+        c    [桧slo]    pohyb
 
-  2. Objekty s rovnak, ako napr韐lad  w (slovo), $ (koniec riadku), at.
+  2. Pohyby s rovnak, ako napr韐lad   w (slovo) a  $ (koniec riadku).
 
   3. Presu kurzor ni灇ie na prv riadok ozna鑕n zna鑛ou --->.
 
@@ -364,6 +459,7 @@ Pozn醡ka, 瀍  cw  nielen nahr醖za slovo, ale 漚 aj premiestn do vkladania.
 ---> Koniec tohto riadku potrebuje pomoc, aby bol ako druhy.
 ---> Koniec tohto riadku potrebuje opravi pou瀒t韒 pr韐azu  c$ .
 
+POZN罬KA: M魹e pou瀒 kl醰esu backspace na 鷓ravu zmien po鑑s p韘ania.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,13 +472,13 @@ Pozn醡ka, 瀍  cw  nielen nahr醖za slovo, ale 漚 aj premiestn do vkladania.
   2. Pre naradenie znaku na mieste kurzora, nap須  r  a potom znak, ktor
      nahrad p魐odn znak.
 
-  3. Pr韐az na upravenie umo烌uje zmeni 歱ecifikovan objekt od kurzora
-     a po koniec objektu.  napr. Nap須  cw  桧m zmn須 text od poz韈ie
+  3. Pr韐az na upravenie umo烌uje zmeni od kurzora a po miesto, ktor 
+     ur鑥je pohyb.  napr. Nap須  ce  桧m zmn須 text od poz韈ie
      kurzora do konca slova, c$  zmen text do konca riadku.
 
-  4. Format pre nahradenie je:
+  4. Form醫 pre nahradenie je:
 
-	[桧slo]   c objekt	 ALEBO	     c	 [桧slo]    objekt
+	    c    [桧slo]    pohyb 
 
 
 Teraz prejdi na nalseduj鷆u lekciu.
@@ -394,19 +490,19 @@ Teraz prejdi na nalseduj鷆u lekciu.
 
 
   ** Stla CTRL-g pre zobrazenie svojej poz韈ie v s鷅ore a statusu s鷅oru.
-     Stla SHIFT-G pre prechod na riadok v s鷅ore. **
+     Nap須  G  pre presun na riadok v s鷅ore. **
 
   Pozn醡ka: Pre桧taj si cel t鷗o lekciu sk魊 ako za鑞e vykon醰a kroky!!
 
-  1. Dr stla鑕n kl醰esu Ctrl a stla  g . Na spodu obrazovky sa zobraz
-     stavov riadok s n醶vom s鷅oru a riadkom na ktorom pr醰e si. Zapam鋞aj
-     si si 桧slo riadku pre krok 3.
+  1. Dr stla鑕n kl醰esu Ctrl a stla  g . Toto naz齰ame CTRL-G. 
+     Na spodu obrazovky sa zobraz spr醰a s n醶vom s鷅oru a poz韈iou 
+     v s鷅ore. Zapam鋞ajsi si 桧slo riadku pre pou瀒tie v kroku 3.
 
-  2. Stla Shift-G 桧m sa dostane na spodok s鷅oru.
+  2. Stla  G  桧m sa dostane na spodok s鷅oru.
+     Nap須  gg  桧m sa dostane na za鑙atok s鷅oru.
 
-  3. Nap須 桧slo riadku na ktorom si sa nach醖zal a stla Shift-G. To 漚
-     vr醫i na riadok, na ktorom si prv kr醫 stla鑙l Ctrl-g.
-     (Ke p須e 桧sla, tieto sa nezobrazuj na obrazovke.)
+  3. Nap須 桧slo riadku na ktorom si sa nach醖zal a stla  G. To 漚
+     vr醫i na riadok, na ktorom si prv kr醫 stla鑙l CTRL-G.
 
   4. Ak sa c韙須 schopn vykona teto kroky, vykonaj kroky 1 a 3.
 
@@ -419,24 +515,24 @@ Teraz prejdi na nalseduj鷆u lekciu.
   ** Nap須  /  nasledovan re漚zcom pre vyh綼danie pr韘lu歯閔o re漚zca. **
 
   1. Nap須 znak  /  v norm醠nom m骴e. Pozn醡ka, 瀍 tento znak sa spolu
-     s kurzorom zobraz v dolnej 鑑sti obrazovky ako s  :  pr韐azom.
+     s kurzorom zobraz v dolnej 鑑sti obrazovky s  :  pr韐azom.
 
   2. Teraz nap須 'errroor' <ENTER>. To je slovo, ktor chce vyh綼da.
 
   3. Pre vyh綼danie 颽l歩eho v齭kytu rovnak閔o re漚zca, stla jednoducho  n.
      Pre vyh綼danie 颽l歩eho v齭kytu rovnak閔o re漚zca opa鑞齧 smerom,
-     nap須 Shift-N.
+     N.
 
   4. Ak chce vyh綼da re漚zec v sp鋞nom smere, pou烅 pr韐az  ?  miesto
      pr韐azu /.
 
- ---> Ke vyh綼d醰anie dosiahne koniec tohto s鷅oru, bude pokra鑟va na
-      za鑙atku.
+  5. Pre n醰rat na miesto z ktor閔o si pri歩el stla CTRL-O (dr stla鑕n 
+     kl醰esu Ctrl po鑑s stla鑕nia kl醰esy o). Zopakuj pre 颽l氻 n醰rat 
+     sp錆. CTRL-I ide vpred.
 
-  "errroor" nie je sp魋ob ako nahradi error; errroor je error.
-
-POZN罬KA: Ke vyh綼d醰anie dosiahne koniec s鷅oru, bude pokra鑟va na jeho
-	  za鑙atku.
+POZN罬KA: "errroor" nieje sp魋ob hl醩kovania error; errroor je error.
+POZN罬KA: Ke vyh綼d醰anie dosiahne koniec tohto s鷅oru, bude pokra鑟va na
+      za鑙atku, dokia nieje resetovan nastavenie 'wrapscan' .
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -454,16 +550,18 @@ POZN罬KA: Ke vyh綼d醰anie dosiahne koniec s鷅oru, bude pokra鑟va na jeho
 
   4. Nap須  %  pre presun kurzoru sp錆 na otv醨aj鷆u z醫vorku.
 
+  5. Presu kurzor na in zo znakov (,),[,],{ alebo } a v歩mni si
+     鑟 % vykon醰a.
+
 ---> Toto ( je testovac riadok s ('s, ['s ] a {'s } v riadku. ))
 
 Pozn醡ka: Toto je ve緈i v齢odn pou烅 pri laden programu s ch齜aj鷆imi
-	  uzatv醨aj鷆imi z醫vorkami.
-
+	  uzatv醨aj鷆imi z醫vorkami!
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lekcia 4.4: SPOSOB AKO ZMENI CHYBY
+		      Lekcia 4.4: PR蚄AZ NAHRADENIA
 
 
  ** Nap須   :s/star/nov/g  pre nahradenie slova 'star' za slovo 'nov'. **
@@ -471,7 +569,7 @@ Pozn醡ka: Toto je ve緈i v齢odn pou烅 pri laden programu s ch齜aj鷆imi
   1. Presu kurzor ni灇ie na riadok ozna鑕n zna鑛ou --->.
 
   2. Nap須  :s/thee/the <ENTER> . Poznamka, 瀍 tento pr韐az zmen len prv
-     v齭kyt v riadku.
+     v齭kyt "thee" v riadku.
 
   3. Teraz nap須   :s/thee/the/g   鑟 znamen celkov nahradenie v riadku.
      Toto nahrad v歟tky v齭kyty v riadku.
@@ -479,9 +577,11 @@ Pozn醡ka: Toto je ve緈i v齢odn pou烅 pri laden programu s ch齜aj鷆imi
 ---> Thee best time to see thee flowers in thee spring.
 
   4. Pre zmenu v歟tk齝h v齭kytov dan閔o re漚zca 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齝h sa nahradenie vykon.
      nap須  :%s/star/nov/g    pre zmenu v歟tk齝h v齭kytov v celom riadku
-
+     nap須  :%s/star/nov/gc   n醞de v歟tky v齭kyty v celom s鷅ore,
+                                s ot醶kou 鑙 nahradi alebo nie
 
 
 
@@ -489,23 +589,25 @@ Pozn醡ka: Toto je ve緈i v齢odn pou烅 pri laden programu s ch齜aj鷆imi
 			       LEKCIA 4 ZHRNUTIE
 
 
-  1. Ctrl-g  vyp須e tvoju poz韈iu v s鷅ore a status s鷅oru.
-     Shift-g  漚 premiestni na koniec riadku. 软slo riadku nasledovan
-     Shift-g  漚 presunie na dan 桧slo riadku.
+  1. CTRL-g    vyp須e tvoju poz韈iu v s鷅ore a status s鷅oru.
+            G  漚 premiestni na koniec riadku. 
+     桧slo  G  漚 premiestni na riadok s 桧slom.
+           gg  漚 presunie na prv riadok
 
   2. Nap韘anie  /  nasledovan re漚zcom vyh綼d re漚zec smerom DOPREDU.
      Nap韘anie  ?  nasledovan re漚zcom vyh綼da re漚zec smerom DOZADU.
      Nap韘anie  n  po vyh綼d醰an, vyh綼d nasleduj鷆i v齭kyt re漚zca
-     v rovnakom smere, pri鑟m  Shift-N  vyh綼d v opa鑞om smere.
+     v rovnakom smere, pri鑟m  N  vyh綼d v opa鑞om smere.
+     CTRL-O 漚 vr醫i sp錆 na star歩u poz韈iu, CTRL-I na nov歩u poz韈iu.
 
   3. Nap韘anie  %  ke kurzor je na (,),[,],{, alebo } n醞de zodpovdaj鷆u
-     p醨 z醫vorku.
+     p醨nu z醫vorku.
 
-  4. Pre nahradenie nov閔o za prv star v riadku nap須    :s/nov/star
-     Pre nahradenie nov閔o za v歟tky star v riadku nap須  :s/nov/star/g
-     Pre nahradenie re漚zcov medzi dvoma riadkami 3 nap須  :#,#/nov/star/g
+  4. Pre nahradenie nov閔o za prv star v riadku nap須    :s/star/nov
+     Pre nahradenie nov閔o za v歟tky star v riadku nap須  :s/star/nov/g
+     Pre nahradenie re漚zcov medzi dvoma riadkami 3 nap須  :#,#/star/nov/g
      Pre nahradenie v歟tk齝h v齭kytov v s鷅ore nap須       :%s/star/nov/g
-     Pre potvrdenie ka瀌閔o nahradenia pridaj 'c'	    :%s/nov/star/gc
+     Pre potvrdenie ka瀌閔o nahradenia pridaj 'c'	         :%s/star/nov/gc
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -524,7 +626,7 @@ Pozn醡ka: Toto je ve緈i v齢odn pou烅 pri laden programu s ch齜aj鷆imi
      zobraz obsah tvojho adres醨a rovnako ako na pr韐azovom riadku.
      Alebo pou瀒  :!dir  ak ls nefunguje.
 
-Pozn醡ka:  Takto je mo瀗 spusti hociak vonkaj氻 pr韐az.
+Pozn醡ka:  Takto je mo瀗 spusti hociak vonkaj氻 pr韐az s argumentami.
 Pozn醡ka:  V歟tky pr韐azy  :  musia by dokon鑕n stla鑕n韒 <ENTER>
 
 
@@ -539,41 +641,43 @@ Pozn醡ka:  V歟tky pr韐azy  :  musia by dokon鑕n stla鑕n韒 <ENTER>
   1. Nap須  :!dir  alebo  :!ls  pre v齪is aktu醠neho adres醨a.
      U vie, 瀍 mus須 za t齧to stla鑙 <ENTER> .
 
-  2. Vyber n醶ov s鷅oru, ktor E奣E neexistuje.
+  2. Vyber n醶ov s鷅oru, ktor e歵e neexistuje, ako napr. TEST.
 
   3. Teraz nap須:   :w TEST   (kde TEST je n醶ov vybrat閔o s鷅oru.)
 
   4. To ulo烅 cel s鷅or  (Vim Tutor)  pod n醶ovm TEST.
      Pre overenie nap須   :!dir   , 桧m  zobraz須 obsah adres醨a.
 
-Pozn醡ka: 瀍 ak ukon桧 pr醕u s editorom Vim a znovu ho spust須 s n醶vom
-	  s鷅oru TEST, s鷅or bude k髉ia v齯ky, ke si ho ulo瀒l.
+Pozn醡ka: 瀍 ak ukon桧 pr醕u s editorom Vim a znovu ho spust須 pr韐azom
+	        vim TEST, s鷅or bude k髉ia v齯ky, ke si ho ulo瀒l.
 
   5. Teraz odstr狎 s鷅or nap韘an韒 (MS-DOS):   :!del TEST
 			     alebo (Unix):     :!rm TEST
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lekcia 5.3 V軧EROV PR蚄AZ PRE ULO嶦NIE
+		    Lekcia 5.3 V軧ER TEXTU PRE ULO嶦NIE
 
 
-  ** Pre ulo瀍nie 鑑sti s鷅oru, nap須   :#,# w FILENAME **
+  ** Pre ulo瀍nie 鑑sti s鷅oru, nap須  v  pohyb :w FILENAME **
+
+  1. Presu kurozr na tento riadok.
 
-  1. Znovu nap須  :!dir  alebo  :!ls  pre zobrazenie obsahu aktu醠neho
-     adres醨a a vyber vhodn s鷅or ako TEST.
+  2. Stla  v  a presu kurozr na piatu polo瀔u dole. Pozn醡ka, 瀍
+     tento text je vyzna鑕n (highlighted).
 
-  2. Presu kurzor na vrch tejto strany a nap須  Ctrl-g  pre vyh綼danie 桧sla
-     tohto riadku.  PAMETAJ SI TOTO 韧SLO!
+  3. Stla kl醰esu  : . V spodnej 鑑sti okna sa objav  :'<,'>.
 
-  3. Teraz prejdi na spodok strany a nap須  Ctrl-g  znovu. ZAPAMETAJ SI 韧SLO
-     AJ TOHTO RIADKU!
+  4. Nap須 w TEST  , kde TEST je meno s鷅oru, ktor zatial neexistuje. 
+     Skontroluj, e vid須  :'<,'>w TEST  predt齧 ne stla桧 Enter.
 
-  4. Pre ulo瀍nie LEN 鑑sti s鷅oru, nap須   :#,# w TEST  kde #,# s dve 桧sla
-     zapam鋞an齝h riadkov (vrch, spodok) a TEST je n醶ov s鷅oru.
+  5. Vim zap須e ozna鑕n riadky do s鷅oru TEST. Pou瀒 :!dir  alebo  !ls
+     pre overenie. Zatial ho e歵e nema! Pou瀒jeme ho v 颽l歟j lekcii.
 
-  5. Znova sa pozri, 鑙 tam ten s鷅or je pomocou pr韐azu   :!dir ale
-     NEODSTRA襏J ho.
-
+POZN罬KA: Stla鑕n韒 kl醰esy  v  sa spust vizu醠ne ozna鑟vanie. 
+          M魹e pohybova kurzorom pre upresnenie vyzna鑕n閔o textu. 
+          Potom m魹e pou瀒 oper醫or pre vykonanie nejakej akcie 
+          s textom. Napr韐lad  d  zma瀍 vyzna鑕n text.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -582,21 +686,16 @@ Pozn醡ka: 瀍 ak ukon桧 pr醕u s editorom Vim a znovu ho spust須 s n醶vom
 
 	** Pre vlo瀍nie obsahu s鷅oru, nap須   :r FILENAME **
 
-  1. Nap須   :!dir   aby si sa presved鑙l, 瀍 s鷅or TEST st醠e existuje.
+  1. Premiestni kurzor nad tento riadok. 
 
-  2. Presu kurzor na vrch tejto strany.
-
-POZN罬KA:  Po vykonan kroku 3 uvid須 Lekciu 5.3. Potom sa presu dole
-	   na t鷗o lekciu.
+POZN罬KA: Po vykonan kroku 2 uvid須 text z lekcie 5.3. Potom sa presu
+          dole, aby si videl t鷗o lekciu.
 
   3. Teraz vlo s鷅or TEST pou瀒t韒 pr韐azu   :r TEST   kde TEST je n醶ov
-     s鷅oru.
-
-POZN罬KA:  S鷅or, ktor si vlo瀒l sa vlo烅 od miesta, kde sa nach醖za kurzor.
+     s鷅oru. S鷅or, ktor si pou瀒l je umiestnen pod riadkom s kurzorom.
 
-  4. Pre kontrolu vlo瀍nia s鷅oru, presu kurzor sp錆 a v歩mni si, 瀍 teraz
-     m釟 dve k髉ie lekcie 5.3, origin醠 a s鷅orov verziu.
-
+POZN罬KA: M魹e tie na桧ta v齭tup vonkaj歩eho pr韐azu. Napr韐lad :r !ls
+          na桧ta v齭tup pr韐azu ls a umiestni ho za poz韈iu kurzora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -606,20 +705,19 @@ POZN罬KA:  S鷅or, ktor si vlo瀒l sa vlo烅 od miesta, kde sa nach醖za kurzor.
   1.  :!pr韐az  spust vonkaj氻 pr韐az.
 
       Niektor vyu瀒te緉 pr韐lady s:
-	(MS_DOS)	  (UNIX)
-	 :!dir		   :!ls		    -  zobraz obsah adres醨a
+	(MS_DOS)    (UNIX)
+	 :!dir       :!ls	    -  zobraz obsah adres醨a
 	 :!del FILENAME    :!rm FILENAME    -  odstr醤i s鷅or FILENAME
 
   2.  :w FILENAME  ulo烅 aktu醠ny s鷅or na disk pod menom FILENAME.
-
-  3.  :#,#w FILENAME  ulo烅 riadky od # do # do s鷅oru FILENAME.
+ 
+  3.  v  pohyb  :w FILENAME  ulo烅 vizu醠ne ozna鑕n riadky do 
+      s鷅oru FILENAME.
 
   4.  :r FILENAME  vyberie z disku s鷅or FILENAME a vlo烅 ho do aktu醠neho
       s鷅oru za poz韈iou kurzora.
 
-
-
-
+  5. :r !dir  na桧ta v齭tup z pr韐azu dir a vlo烅 ho za poz韈iu kurzora.
 
 
 
@@ -640,9 +738,10 @@ POZN罬KA:  S鷅or, ktor si vlo瀒l sa vlo烅 od miesta, kde sa nach醖za kurzor.
 ---> Po nap韘an  o  sa kurzor premiestn na vlo瀍n riadok do vkladacieho
      m骴u.
 
-  4. Pre otvorenie riadku nad kurzorom, jednotucho nap須 ve緆  O , namiesto
-     mal閔o o. Vysk鷼aj si to na nasleduj鷆om riadku.
-Vlo riadok nad t齧to nap韘an韒 Shift-O, ke kurzor je na tomto riadku.
+  4. Pre otvorenie riadku nad kurzorom, jednotucho nap須 ve緆  O , 
+     namiesto mal閔o  o. Vysk鷼aj si to na riadku dole. 
+
+---> Vlo riadok nad t齧to nap韘an韒 O, ke kurzor je na tomto riadku.
 
 
 
@@ -653,20 +752,21 @@ Vlo riadok nad t齧to nap韘an韒 Shift-O, ke kurzor je na tomto riadku.
 	   ** Nap須  a  pre vlo瀍nie textu ZA kurzor. **
 
   1. Presu kurzor ni灇ie na koniec prv閔o riadku ozna鑕n閔o zna鑛ou --->
-     nap韘an韒  $  v norm醠nom m骴e.
 
-  2. Nap須  a  (mal p韘meno) pre pridanie textu ZA znakom na mieste
-     kurzora. (Ve緆 A prid na koniec riadku.)
+  2. Stla kl醰esu  e  dokia kurozr nieje na konci riadku.   
+
+  3. Nap須  a  (mal p韘meno) pre pridanie textu ZA kurzorom.
 
-Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo瀍nie, <ESC>,
-	  kurzor doprava, a nakoniec, x , na prid醰anie na koniec riadku!
+  4. Dokon桧 slovo tak ako je to v druhom riadku. Stla <ESC> pre 
+     opustenie vkladacieho m骴u.
 
-  3. Teraz dokon鑙 prv riadok. Pozn醡ka, 瀍 prid醰anie je vlastne rovnak
-     ako vkladac m骴, okrem miesta, kde sa text vklad.
+  5. Pou瀒  e  na presun na 颽l歩e nedokon鑕n slovo a zopakuj kroky 3 a 4.
 
----> Tento riadok ti dovo緐je n醕vik
+---> Tento ri ti dovo緐je n醕v pri醰an testu na koniec riadku.
 ---> Tento riadok ti dovo緐je n醕vik prid醰ania textu na koniec riadku.
 
+POZN罬KA: a, i, A 歵artuj rovnak vkladac m骴, jedin rozidel je, kde 
+          sa znaky vkladaj. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -675,24 +775,52 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo瀍nie, <ESC>,
 
       ** Nap須 ve緆 R pre nahradenie viac ako jedn閔o znaku. **
 
-  1. Presu kurzor ni灇ie na prv riadok ozna鑕n zna鑛ou --->.
+  1. Presu kurzor ni灇ie na prv riadok ozna鑕n zna鑛ou --->. Premiestni
+     kurzor na za鑙atok prv閔o v齭kytu  xxx.
 
-  2. Premiestni kurzor na za鑙atok prv閔o slova, ktor je odli歯 od druh閔o
-     riadku ozna鑕n閔o ---> (slovo 'posledn').
+  2. Teraz nap須  R  a  nap須  桧slo uveden v druhom riadku, tak瀍 
+     sa n韒 nahrad p魐odn xxx.
 
-  3. Teraz nap須  R  a nahra zvy歰k textu na prvom riadku p韘an韒 cez star
-     text tak, aby prv riadok bol rovnak ako druh.
+  3. Stla <ESC> pre opustenie nahradzovacieho m骴u. Pozn醡ka, 瀍 zvy歰k 
+     riadku zostane nezmenen. 
+
+  4. Zopakuj tieto kroky pre nahradenie zvy歯齝h xxx.
 
----> Na 鷓ravu prv閔o riadku do tvaru ako je posledn na strane pou瀒 kl醰esy.
----> Na 鷓ravu prv閔o riadku do tavru ako je druh, nap須 R a nov text.
+---> Pridan韒 123 ku xxx dostane xxx.
+---> Pridan韒 123 ku 456 dostane 579.
 
-  4. Pozn醡ka, 瀍 ak stla桧 <ESC> pre ukon鑕nie, v歟tok nezmenen text
-     zostane.
-
+POZN罬KA:  Nahradzovac m骴 je ako vkladac m骴, ale ka瀌 nap韘an znak 
+           zma瀍 existuj鷆i znak. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lekcia 6.4: NASTAVENIE MO嶯OST
+
+          Lekcia 6.4: Copy Paste textu
+
+    ** pou烅 oper醫or  y  pre copy textku a  p  pre jeho paste **
+
+  1. Cho ni灇ie na riadok ozna鑕n ---> a umiestni kurozr za "a)".
+
+  2. Na歵artuj vizu醠ny m骴 pou瀒t韒  v  a presu kurozr pred "first".
+
+  3. Nap須  y  pre  vystrihnutie (copy) ozna鑕n閔o textu.
+
+  4. Presu kurozr na koniec 颽l歩eho riadku: j$
+
+  5. Nap須  p  pre vlo瀗ie (paste) textu. Potom nap須:  a druha <ESC>.
+
+  6. Pou瀒 vizu醠ny m骴 pre ozna鑕nie "polo瀔a.", vystrihni to 
+     pou瀒t韒  y, presu sa na koniec nasleduj鷆eho riadku pou瀒t韒  j$ 
+     a vlo sem text pou瀒t韒  p.
+
+---> a) toto je prv polo瀔a
+---> b)
+
+POZN罬KA: M魹e pou瀒 tie  y  ako oper醫or; yw  vystrihne jedno slovo. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 Lekcia 6.5: NASTAVENIE MO嶯OST
 
 
 ** Nastav mo瀗osti, tak瀍 vyh綼d醰anie alebo nahradzovanie ignoruje
@@ -700,40 +828,52 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo瀍nie, <ESC>,
 
 
   1. Vyh綼daj re漚zec 'ignore' nap韘an韒:
-     /ignore
-     Zopakuj vyh綼d醰anie nieko緆o kr醫 stla鑕n韒 kl醰esy n
+     /ignore <ENTER>
+     Zopakuj vyh綼d醰anie nieko緆o kr醫 stla鑕n韒 kl醰esy  n .
 
   2. Nastav mo瀗os 'ic' (Ignore case) nap韘an韒 pr韐azu:
      :set ic
 
-  3. Teraz vyh綼daj re漚zec 'ingore' znova stla鑕n韒 kl醰esy: n
-     Zopakuj vyh綼d醰anie nieko緆o kr醫 stla鑕n韒 kl醰esy n
+  3. Teraz vyh綼daj re漚zec 'ingore' znova stla鑕n韒 kl醰esy  n
+     Pozn醡ka, 瀍 teraz s vyh綼dan aj Ignore a IGNORE.
 
   4. Nastav mo瀗os漣 'hlsearch' a 'incsearch':
      :set hls is
 
   5. Teraz spusti vyh綼d醰ac pr韐az znovu, a pozri 鑟 sa stalo:
-     /ignore
+     /ignore <ENTER>
 
-  6. Na odstr醤enie zv齬aznenia v齬azov nap須:
-     :nohlsearch
+  6. Pre opetovn zapnutie rozly歰vania ve緆齝h a mal齝h p韘men 
+     nap須:  :set noic
+
+POZN罬KA: Na odstr醤enie zv齬aznenia v齬azov nap須:  :nohlsearch
+POZN罬KA: Ak chce nerozly歰va ve緆os p韘men len pre jedno 
+          pou瀒tie vyh綼d醰acieho pr韐azu, pou瀒 \c:  /ignore\c <ENTER>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			      LEKCIA 6 ZHRNUTIE
 
 
-  1. Nap韘an韒  o  sa otvor nov riadok pod kurzorom a premiestni sa kurzor
-     na vlo瀍n riadok do vkladacieho m骴u.
-     nap韘an韒 ve緆閔o  O  sa otvor riadok nad aktu醠nym riadkom s kurzorom.
+  1. Nap須  o  pre otvorenie riadku pod kurzorom a 歵art vkladacieho m骴u.
+     Nap須  O  pre otvorenie riadku nad kurzorom.
+
+  2. Nap須  a  pre vkladanie textu ZA kurzor.
+     Nap須  A  pre vkladanie textu za koncom riadku.
+
+  3. Pr韐az  e  presunie kurozr na koniec slova
+
+  4. Oper醫or  y  vystrihne (skop韗uje) text,  p  ho vlo烅.
 
-  2. Nap須  a  pre vkladanie textu ZA znak na poz韈ii kurzoru.
-     Nap韘an韒 ve緆閔o  A  sa text automatick prid醰a na koniec riadku.
+  5. Nap韘anie ve緆閔o  R  prepne do nahradzovacieho m骴u, k齧 nieje
+     stla鑕n <ESC>.
 
-  3. Nap韘anie ve緆閔o  R  prepne do nahradzovacieho m骴u, k齧 nieje
-     stla鑕n <ESC> pre ukon鑕nie nahradzovacieho m骴u.
+  6. Nap韘anie ":set xxx" nastav mo瀗os "xxx". Niektor nastavenia s: 
+     'ic' 'ignorecase' ignoruje ve緆 a mal p韘men po鑑s vyh綼d醰ania. 
+     'is' 'incsearch' zobrazuje 鑙asto鑞 re漚zce vyh綼d醰an閔o re漚zca. 
+     'hls' 'hlsearch' vyzna桧 v歟tky vyh綼d醰an re漚zce.
+      M魹e pou瀒 hociktor z dlh齝h a kr醫kych n醶vov mo瀗ost.
 
-  4. Nap韘anie ":set xxx" nastav mo瀗os "xxx".
-
+  7. Vlo "no" pred nastavenie pre jeho vypnutie:  :set noic
 
 
 
@@ -742,7 +882,7 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo瀍nie, <ESC>,
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    LEKCIA 7: PR蚄AZY ON-LINE N罰OVEDY
+		    LEKCIA 7.1: Z蚐KANIE N罰OVEDY
 
 
 	  ** Pou烅vaj on-line syst閙 n醦ovedy **
@@ -753,19 +893,21 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo瀍nie, <ESC>,
 	- stla kl醰esu <F1> (ak nejak m釟)
 	- nap須  :help <ENTER>
 
-  Nap須  :q <ENTER>  桧m zatvor須 okno n醦ovedy.
+  软taj text v okne n醦ovedy pre z韘kanie predstavy ako n醦oveda funguje. 
+  Nap須   CTRL-W CTRL-W  pre skok z jedn閔o okna do druh閔o. 
+  Nap須    :q <ENTER>    桧m zatvor須 okno n醦ovedy.
 
   M魹e n醞s help ku hociakej t閙e pridan韒 argumentu ku pr韐azu ":help".
   Vysk鷼aj tieto (nezabudni stla鑙 <ENTER>):
 
 	:help w
-	:help c_<T
+	:help c_CTRL-D
 	:help insert-index
 	:help user-manual
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		 LEKCIA 8: VYTVORENIE 奣ARTOVACIEHO SKRIPTU
+		 LEKCIA 7.2: VYTVORENIE 奣ARTOVACIEHO SKRIPTU
 
 		       ** Zapni funkcie editora Vim **
 
@@ -773,22 +915,67 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo瀍nie, <ESC>,
   vypnut. Pre pou烅vanie viac Vim funkcii vytvor "vimrc" s鷅or.
 
   1. Za鑞i editova "vimrc" s鷅or, to z醰is na pou瀒tom syst閙e:
-	: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韐ladu "vimrc" s鷅oru:
 
-	:read $VIMRUNTIME/vimrc_example.vim
+	:r $VIMRUNTIME/vimrc_example.vim
 
   3. Ulo s鷅or:
-
-	:write
+	:w
 
   Pri nasleduj鷆om 歵arte editora Vim sa pou瀒je zv齬az騩vanie syntaxe.
   Do "vimrc" s鷅oru m魹e prida v歟tky svoje uprednost騩van nastavenia.
+  Pre viac inform醕ii nap須  :help vimrc-intro
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+                   LEKCIA 7.3 DOKON菶NIE
+
+     ** Dokon鑙 pr韐az na pr韐azovom riadku pou瀒t韒 CTRL-D a <TAB> **
+
+  1. Uisti sa, 瀍 Vim nieje v kompatibilnom m骴e:  :set nocp
+
+  2. Pozri sa ak s鷅ory sa nach醖zaj v adres醨i:  :!ls  alebo  :!dir
+
+  3. Nap須 za鑙atok pr韐azu:  :e
+
+  4. Stla  CTRL-D  a Vim zobraz zoznam pr韐azov za桧naj鷆ich "e".
+
+  5. Stla <TAB> a Vim dokon桧 meno pr韐azu na ":edit".
+
+  6. Teraz pridaj medzern韐 a za鑙atok mena existuj鷆eho s鷅oru: 
+     :edit FIL
+
+  7. Stla <TAB>. Vim dokon桧 meno (ak je jedine鑞).
+
+POZN罬KA: Dokon鑟vanie funguje pre ve綼 pr韐azov. Vysk鷼aj stla鑕nie 
+          CTRL-D a <TAB>. 妏eci醠ne je to u瀒to鑞 pre pr韐az  :help.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            LEKCIA 7 ZHRNUTIE
+
+  1. Nap須  :help  alebo stla <F1> alebo <Help> pre otvorenie okna n醦ovedy.
+
+  2. Nap須  :help pr韐az  pre vyh綼danie n醦ovedy ku pr韐azu pr韐az. 
+
+  3. Nap須  CTRL-W CTRL-W  na presko鑕nie do in閔o okna. 
+
+  4. Nap須  :q  pre zatvorenie okna n醦ovedy
+
+  5. Vytvor 歵artovac skript vimrc pre udr瀉nie uprednost騩van齝h nastaven. 
+
+  6. Po鑑s p韘ania pr韐azu  :  stla CTRL-D pre zobrazenie dokon鑕n. 
+     Stla <TAB> pre pou瀒tie jedn閔o z dokon鑕n. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
   Toto vymedzuje v齯ku Vimu. Toto je ur鑕n pre strucn preh綼d o editore
   Vim, 鷓lne posta鑥j鷆e pre 綼hk a obstojn pou烅vanie tohto editora.
   T醫o v齯ka je 颽leko od kompletnosti, preto瀍 Vim m omnoho viacej pr韐azov.
@@ -817,5 +1004,5 @@ Pozn醡ka: Toto obch醖za p韘anie  i , posledn znak, text na vlo瀍nie, <ESC>,
 
   Preklad do Sloven鑙ny: 紆bo 萫lko
   e-mail:       celbos@inmail.sk
-  Last Change:  2004 Apr 29
+  Last Change:  2006 Apr 18
   encoding:     cp1250
--- a/src/edit.c
+++ b/src/edit.c
@@ -709,15 +709,20 @@ edit(cmdchar, startln, count)
 	{
 	    /* 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 @@ ins_compl_active()
 /*
  * 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 @@ ins_compl_bs()
     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 @@ ins_compl_bs()
 	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 @@ ins_compl_bs()
 	compl_used_match = FALSE;
 	compl_enter_selects = FALSE;
 
-	return TRUE;
-    }
-    return FALSE;
+	return NUL;
+    }
+    return K_BS;
 }
 
 /*
@@ -3255,26 +3265,34 @@ ins_compl_prep(c)
 	    /* 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 @@ ins_compl_next(allow_get_expansion, coun
     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 @@ ins_compl_next(allow_get_expansion, coun
 	/* 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 @@ ins_compl_next(allow_get_expansion, coun
 	}
 	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;
 	}
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1113,7 +1113,7 @@ retry:
 		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)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -128,6 +128,9 @@ static int	vgetorpeek __ARGS((int));
 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 @@ vgetorpeek(advance)
 			    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 @@ check_abbr(c, ptr, col, mincol)
 	    }
 #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 @@ check_abbr(c, ptr, col, mincol)
     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.
--- a/src/gui.h
+++ b/src/gui.h
@@ -504,3 +504,46 @@ typedef enum
 # 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 */
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -131,44 +131,6 @@ typedef int GtkWidget;
 # 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);
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3293,6 +3293,7 @@ gui_mch_update_tabline(void)
     tabpage_T	    *tp;
     int		    nr = 0;
     int		    curtabidx = 0;
+    char_u	    *labeltext;
 
     if (gui.tabline == NULL)
 	return;
@@ -3320,8 +3321,10 @@ gui_mch_update_tabline(void)
 	}
 
 	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. */
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -723,7 +723,7 @@ cs_create_connection(i)
     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 @@ err_closing:
 	/* 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);
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -169,7 +169,7 @@ netbeans_gtk_connect(void)
 	 * 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);
     }
--- a/src/option.c
+++ b/src/option.c
@@ -3496,7 +3496,7 @@ set_init_2()
      * '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 @@ set_init_3()
 	    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
--- 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 @@ msgstr "E102: バッファ \"%s\" がみつかりません"
 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 @@ msgid " Keyword completion (^N^P)"
 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 @@ 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 " Spelling suggestion (s^N^P)"
+msgstr " 闹り饯赖铬输 (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " 渡疥キ〖ワ〖ド输窗 (^N^P)"
@@ -486,6 +489,22 @@ msgstr "E723: 辑今房の呵稿に '}' がありません: %s"
 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 @@ msgstr ""
 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 @@ msgstr "E602: :try のない :endtry です"
 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 @@ msgstr "<ウィンドウ %d>"
 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 @@ msgstr "ANCHOR_BUF_SIZE が井さ册ぎます."
 msgid "I/O ERROR"
 msgstr "掐叫蜗エラ〖"
 
-msgid "...(truncated)"
-msgstr "...(臼维)"
-
 msgid "Message"
 msgstr "メッセ〖ジ"
 
@@ -4621,6 +4661,16 @@ msgstr "E388: 年盗をみつけられません"
 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 @@ msgid "Compressing word tree..."
 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 @@ msgid "FLAG after using flags in %s line
 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 @@ msgid "Broken condition in %s line %d: %
 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 @@ msgstr "E438: u_undo: 乖戎规が粗般っています"
 msgid "more line"
 msgstr "乖 纳裁しました"
 
-msgid "乖あります"
+msgid "more lines"
 msgstr "乖 纳裁しました"
 
 msgid "line less"
@@ -5330,6 +5392,10 @@ msgstr "アンドゥ滦据がありません"
 msgid "number changes  time"
 msgstr "戎规   恃构     箕癸"
 
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld 擅沸册しています"
+
 msgid "E439: undo list corrupt"
 msgstr "E439: アンドゥリストが蝉れています"
 
@@ -5636,6 +5702,9 @@ msgstr "   焚桂: Windows 95/98/Me を浮叫  "
 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 @@ msgstr "E443: 戮のウィンドウが尸充されている箕には界搀できません"
 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 @@ msgid "Edits the selected file(s) with V
 msgstr "联买されたファイルをVimで试礁する"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "弹瓢に己窃しました: gvim へのパスが赖しく肋年されているか澄千してください!"
+msgstr ""
+"弹瓢に己窃しました: gvim へのパスが赖しく肋年されているか澄千してください!"
 
 msgid "gvimext.dll error"
 msgstr "gvimext.dll エラ〖"
--- 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 @@ msgstr "E102: 僶僢僼傽 \"%s\" 偑傒偮偐傝傑偣傫"
 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 @@ msgid " Keyword completion (^N^P)"
 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 @@ 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 " Spelling suggestion (s^N^P)"
+msgstr " 捲傝廋惓岓曗 (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " 嬊強僉乕儚乕僪曗姰 (^N^P)"
@@ -486,6 +489,22 @@ msgstr "E723: 帿彂宆偺嵟屻偵 '}' 偑偁傝傑偣傫: %s"
 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 @@ msgstr ""
 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 @@ msgstr "E602: :try 偺側偄 :endtry 偱偡"
 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 @@ msgstr "<僂傿儞僪僂 %d>"
 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 @@ msgstr "ANCHOR_BUF_SIZE 偑彫偝夁偓傑偡."
 msgid "I/O ERROR"
 msgstr "擖弌椡僄儔乕"
 
-msgid "...(truncated)"
-msgstr "...(徣棯)"
-
 msgid "Message"
 msgstr "儊僢僙乕僕"
 
@@ -4621,6 +4661,16 @@ msgstr "E388: 掕媊傪傒偮偗傜傟傑偣傫"
 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 @@ msgid "Compressing word tree..."
 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 @@ msgid "FLAG after using flags in %s line
 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 @@ msgid "Broken condition in %s line %d: %
 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 @@ msgstr "E438: u_undo: 峴斣崋偑娫堘偭偰偄傑偡"
 msgid "more line"
 msgstr "峴 捛壛偟傑偟偨"
 
-msgid "峴偁傝傑偡"
+msgid "more lines"
 msgstr "峴 捛壛偟傑偟偨"
 
 msgid "line less"
@@ -5330,6 +5392,10 @@ msgstr "傾儞僪僁懳徾偑偁傝傑偣傫"
 msgid "number changes  time"
 msgstr "斣崋   曄峏     帪崗"
 
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld 昩宱夁偟偰偄傑偡"
+
 msgid "E439: undo list corrupt"
 msgstr "E439: 傾儞僪僁儕僗僩偑夡傟偰偄傑偡"
 
@@ -5636,6 +5702,9 @@ msgstr "   寈崘: Windows 95/98/Me 傪専弌  "
 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 @@ msgstr "E443: 懠偺僂傿儞僪僂偑暘妱偝傟偰偄傞帪偵偼弴夞偱偒傑偣傫"
 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 @@ msgid "Edits the selected file(s) with V
 msgstr "慖戰偝傟偨僼傽僀儖傪Vim偱曇廤偡傞"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "婲摦偵幐攕偟傑偟偨: gvim 傊偺僷僗偑惓偟偔愝掕偝傟偰偄傞偐妋擣偟偰偔偩偝偄!"
+msgstr ""
+"婲摦偵幐攕偟傑偟偨: gvim 傊偺僷僗偑惓偟偔愝掕偝傟偰偄傞偐妋擣偟偰偔偩偝偄!"
 
 msgid "gvimext.dll error"
 msgstr "gvimext.dll 僄儔乕"
--- 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 @@ msgstr "[Inget Namn]"
 msgid "help"
 msgstr "hj鋖p"
 
-msgid "[help]"
-msgstr "[hj鋖p]"
+msgid "[Help]"
+msgstr "[Hj鋖p]"
 
 msgid "[Preview]"
 msgstr "[F鰎handsvisning]"
@@ -154,8 +154,11 @@ msgstr ""
 "\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 @@ msgstr "E724: variabel n鋝tlad f鰎 djupt f鰎 att visas"
 msgid "E699: Too many arguments"
 msgstr "E699: F鰎 m錸ga argument"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() kan bara anv鋘das i infogningsl鋑e"
+
 #.
 #. * 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 @@ msgstr ""
 "\n"
 "\tSenast satt fr錸 "
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "G錼 in i fels鰇ningsl鋑e.  Skriv \"cont\" f鰎 att forts鋞ta."
+
+#, 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鋘d :profile start <fnamn> f鰎st"
+
+msgid "Save As"
+msgstr "Spara som"
+
+#, c-format
+msgid "Save changes to \"%s\"?"
+msgstr "Spara 鋘dringar till \"%s\"?"
+
+msgid "Untitled"
+msgstr "Namnl鰏"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162: Ingen skrivning sedan senaste 鋘dring f鰎 buffert \"%s\""
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr "Varning: Gick in i andra buffertar ov鋘tat (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鰎e f鰎sta 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鰀s inte: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "S鰇er efter \"%s\" i \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "S鰇er efter \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr "hittades inte i 'runtimepath': \"%s\""
+
+msgid "Source Vim script"
+msgstr "L鋝 Vim-skript"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Kan inte l鋝a en katalog: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "kunde inte l鋝a \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "rad %ld: kunde inte l鋝a \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "l鋝er \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "rad %ld: l鋝er \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "l鋝te klart %s"
+
+msgid "modeline"
+msgstr "l鋑esrad"
+
+msgid "--cmd argument"
+msgstr "--cmd argument"
+
+msgid "-c argument"
+msgstr "-c argument"
+
+msgid "environment variable"
+msgstr "milj鰒ariabel"
+
+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鋘ds utanf鰎 en k鰎d fil"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish anv鋘ds utanf鰎 en k鰎d fil"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Aktuellt %sspr錵: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Kan inte s鋞ta spr錵 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 @@ msgstr "# V鋜de av 'encoding' n鋜 den h鋜 filen blev skriven\n"
 msgid "Illegal starting char"
 msgstr "Otill錿et starttecken"
 
-msgid "Save As"
-msgstr "Spara som"
-
 msgid "Write partial file?"
 msgstr "Skriv ofullst鋘dig fil?"
 
@@ -927,118 +1060,6 @@ msgstr " (st鰀s inte)"
 msgid "[Deleted]"
 msgstr "[Borttagen]"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "G錼 in i fels鰇ningsl鋑e.  Skriv \"cont\" f鰎 att forts鋞ta."
-
-#, 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鋘d :profile start <fnamn> f鰎st"
-
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "Spara 鋘dringar till \"%s\"?"
-
-msgid "Untitled"
-msgstr "Namnl鰏"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Ingen skrivning sedan senaste 鋘dring f鰎 buffert \"%s\""
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Varning: Gick in i andra buffertar ov鋘tat (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鰎e f鰎sta 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鰀s inte: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "S鰇er efter \"%s\" i \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "S鰇er efter \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "hittades inte i 'runtimepath': \"%s\""
-
-msgid "Source Vim script"
-msgstr "L鋝 Vim-skript"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Kan inte l鋝a en katalog: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "kunde inte l鋝a \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "rad %ld: kunde inte l鋝a \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "l鋝er \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "rad %ld: l鋝er \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "l鋝te 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鋘ds utanf鰎 en k鰎d fil"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish anv鋘ds utanf鰎 en k鰎d fil"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Aktuellt %sspr錵: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Kan inte s鋞ta spr錵 till \"%s\""
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "G錼 in i Ex-l鋑e.  Skriv \"visual\" f鰎 att g till Normal-l鋑e."
 
@@ -1152,9 +1173,19 @@ msgstr "E185: Kan inte hitta f鋜gschema %s"
 msgid "Greetings, Vim user!"
 msgstr "V鋖kommen, Vim-anv鋘dare!"
 
+msgid "E784: Cannot close last tab page"
+msgstr "E784: Kan inte st鋘ga 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鰊ster"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "Flik %d"
+
 msgid "No swap file"
 msgstr "Ingen v鋢lingsfil"
 
@@ -1399,6 +1430,9 @@ msgstr "鋜 inte en fil"
 msgid "[New File]"
 msgstr "[Ny fil]"
 
+msgid "[New DIRECTORY]"
+msgstr "[Ny KATALOG]"
+
 msgid "[File too big]"
 msgstr "[Fil f鰎 stor]"
 
@@ -1451,8 +1485,9 @@ msgstr "[konverterad]"
 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,6 +1833,37 @@ msgstr "Ingen mappning hittades"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Otill錿et l鋑e"
 
+msgid "<cannot open> "
+msgstr "<kan inte 鰌pna> "
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: kan inte h鋗ta typsnitt %s"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: Kan inte 錿erv鋘da till aktuell katalog"
+
+msgid "Pathname:"
+msgstr "S鰇v鋑:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: kan inte h鋗ta aktuell katalog"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgid "Vim dialog"
+msgstr "Vim-dialog"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Rullningslist: Kunde inte h鋗ta geometrin p miniatyrbild."
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: Kan inte skapa BalloonEval med b錮e meddelande och 錿erkallning"
+
 msgid "E229: Cannot start the GUI"
 msgstr "E229: Kan inte starta GUI"
 
@@ -1821,37 +1887,6 @@ msgstr "E254: Kan inte allokera f鋜g %s"
 msgid "No match at cursor, finding next"
 msgstr "Ingen matchning vid mark鰎, s鰇er n鋝ta"
 
-msgid "<cannot open> "
-msgstr "<kan inte 鰌pna> "
-
-#, c-format
-msgid "E616: vim_SelFile: can't get font %s"
-msgstr "E616: vim_SelFile: kan inte h鋗ta typsnitt %s"
-
-msgid "E614: vim_SelFile: can't return to current directory"
-msgstr "E614: vim_SelFile: Kan inte 錿erv鋘da till aktuell katalog"
-
-msgid "Pathname:"
-msgstr "S鰇v鋑:"
-
-msgid "E615: vim_SelFile: can't get current directory"
-msgstr "E615: vim_SelFile: kan inte h鋗ta aktuell katalog"
-
-msgid "OK"
-msgstr "OK"
-
-msgid "Cancel"
-msgstr "Avbryt"
-
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Rullningslist: Kunde inte h鋗ta geometrin p miniatyrbild."
-
-msgid "Vim dialog"
-msgstr "Vim-dialog"
-
-msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: Kan inte skapa BalloonEval med b錮e meddelande och 錿erkallning"
-
 msgid "Vim dialog..."
 msgstr "Vim-dialog..."
 
@@ -1909,6 +1944,15 @@ msgstr "Ers鋞t alla"
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: Tog emot \"die\"-beg鋜an fr錸 sessionshanteraren\n"
 
+msgid "Close"
+msgstr "St鋘g"
+
+msgid "New tab"
+msgstr "Ny flik"
+
+msgid "Open Tab..."
+msgstr "謕pna flik..."
+
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: Huvudf鰊ster ov鋘tat f鰎st鰎t\n"
 
@@ -1980,6 +2024,12 @@ msgstr "E243: Argument st鰀s inte: \"-%s\"; Anv鋘ds OLE-versionen."
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Kunde inte 鰌pna f鰊ster inuti MDI-applikation"
 
+msgid "Close tab"
+msgstr "St鋘g flik"
+
+msgid "Open tab..."
+msgstr "謕pna flik..."
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "S鰇 str鋘g (anv鋘d '\\\\' f鰎 att hitta '\\')"
 
@@ -2819,6 +2869,9 @@ msgstr "-U <gvimrc>\t\tAnv鋘d <gvimrc> ist鋖let f鰎 n錱on .gvimrc"
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tL鋝 inte in insticksskript"
 
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-p[N]\t\t謕pna N flikar (standard: en f鰎 varje fil)"
+
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\t謕pna N f鰊ster (standard: ett f鰎 varje fil)"
 
@@ -2877,6 +2930,9 @@ msgstr ""
 "--remote-wait-silent <filer>\tSamma, klaga inte om det inte finns n錱on "
 "server"
 
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <filer>  Som --remote men 鰌pna flik f鰎 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 @@ msgstr "--role <roll>\tSt鋖l in en unik roll f鰎 att identifiera huvudf鰊stret"
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t謕pna Vim innanf鰎 en annan GTK-widget"
 
-msgid ""
-"\n"
-"Arguments recognised by kvim (KDE version):\n"
-msgstr ""
-"\n"
-"Argument igenk鋘da av kvim (KDE-version):\n"
-
-msgid "-black\t\tUse reverse video"
-msgstr "-black\t\tAnv鋘d omv鋘d 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鰎 vim p <display>"
-
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <f鰎鋖der f鰊ster>\t謕pna Vim inuti f鰎鋖derapplikation"
 
@@ -3444,6 +3481,10 @@ msgstr "Stackstorlek 鰇ar"
 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鋘k-loop f鰎 \"%s\""
+
 msgid "E325: ATTENTION"
 msgstr "E325: LYSTRING"
 
@@ -3532,16 +3573,16 @@ msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
+"&Delete it\n"
 "&Quit\n"
-"&Abort\n"
-"&Delete it"
+"&Abort"
 msgstr ""
 "&謕pna skrivskyddad\n"
 "&Redigera 鋘d錦n"
 "&舤erskapa\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鰎 m錸ga v鋢lingsfiler hittade"
@@ -3808,6 +3849,12 @@ msgstr "E658: NetBeans-anslutning tappad f鰎 buffert %ld"
 msgid "E505: "
 msgstr "E505: "
 
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' 鋜 tom"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: Eval-funktionen inte tillg鋘glig"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "Varning: terminal kan inte framh鋠a"
 
@@ -3930,8 +3977,9 @@ msgstr "Markerade %s%ld av %ld rader; %l
 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 @@ msgstr "Kol %s av %s; rad %ld av %ld; or
 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 @@ msgstr "I/O-FEL"
 msgid "...(truncated)"
 msgstr "...(trunkerade)"
 
+msgid "Message"
+msgstr "Meddelande"
+
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' 鋜 inte 80, kan inte k鰎a externa kommandon"
 
@@ -4201,14 +4253,6 @@ msgstr "Vim: F錸gade d鰀lig signal\n"
 msgid "Opening the X display took %ld msec"
 msgstr "謕pning 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鋞ter...\n"
-
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4287,9 +4331,6 @@ msgstr "XSMP ICE-anslutning 鰒ervakning misslyckades"
 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鋝a in vim32.dll!"
 
@@ -4331,6 +4372,9 @@ msgstr ""
 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鰎 m錸ga %%%c i formatstr鋘g"
@@ -4393,6 +4437,9 @@ msgstr "Kan inte 鰌pna fil \"%s\""
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Buffert 鋜 inte laddad"
 
+msgid "E777: String or List expected"
+msgstr "E777: Str鋘g eller Lista f鰎v鋘tades"
+
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ogiltigt f鰎em錶 i %s%%[]"
@@ -4576,6 +4623,10 @@ msgstr " INTE HITTADE"
 msgid "Scanning included file: %s"
 msgstr "S鰇er igenom inkluderad fil: %s"
 
+#, c-format
+msgid "Searching included file %s"
+msgstr "S鰇er igenom inkluderad fil %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: Matchning 鋜 p aktuell rad"
 
@@ -4666,12 +4717,8 @@ msgid "FLAG after using flags in %s line
 msgstr "FLAG efter anv鋘dning 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鋘t f鰎 SLASH m錽te vara ASCII; i %s rad %d: %s"
-
-#, c-format
-msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
-msgstr "Fel COMPOUNDMAX-v鋜de i %s rad %d: %s"
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "Fel COMPOUNDWORDMAX-v鋜de i %s rad %d: %s"
 
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
@@ -4682,6 +4729,10 @@ msgid "Wrong COMPOUNDSYLMAX value in %s 
 msgstr "Fel COMPOUNDSYLMAX-v鋜de i %s rad %d: %s"
 
 #, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "Fel CHECKCOMPOUNDPATTERN-v鋜de 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鰈jande affix-block i %s rad %d: %s"
 
@@ -4691,9 +4742,11 @@ msgstr "Duplicerad affix i %s rad %d: %s
 
 #, 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鋘d f鰎 BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND i %s rad %d: %s"
+"Affix ocks anv鋘d f鰎 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 @@ msgid "Broken condition in %s line %d: %
 msgstr "Trasigt villkor i %s rad %d: %s"
 
 #, c-format
-msgid "Expected REP count in %s line %d"
-msgstr "F鰎v鋘tade REP-antal i %s rad %d"
+msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+msgstr "Affix-flaggor ignorerade n鋜 PFXPOSTPONE anv鋘ds i %s rad %d: %s"
+
+#, c-format
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "F鰎v鋘tade REP(SAL)-antal i %s rad %d"
 
 #, c-format
 msgid "Expected MAP count in %s line %d"
@@ -4820,8 +4877,34 @@ msgid "Ignored %d words with non-ASCII c
 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%% 錿erst錼"
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "Komprimerade %d av %d noder; %d (%d%%) 錿erst錼"
+
+msgid "Reading back spell file..."
+msgstr "L鋝er tillbaka stavningsfil..."
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+msgid "Performing soundfolding..."
+msgstr "Utf鰎 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鰎slagsfil %s ..."
+
+#, c-format
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "Ber鋕nat k鰎tidsminne anv鋘t: %d byte"
 
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Utmatningsfilnamn f錼 inte ha regionnamn"
@@ -4844,13 +4927,17 @@ msgid "Done!"
 msgstr "Klar!"
 
 #, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "Ber鋕nat k鰎tidsminne anv鋘t: %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錸 %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 @@ msgstr "E752: Ingen tidigare stavningsers鋞tning"
 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鋜 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鰒er bli uppdaterad: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: .sug-fil 鋜 f鰎 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鋝ning 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 @@ msgstr "Vim: Fel vid l鋝ning av inmatning, avslutar...\n"
 msgid "No undo possible; continue anyway"
 msgstr "Ingen 錸gring m鰆lig; forts鋞ter 鋘d"
 
+msgid "Already at oldest change"
+msgstr "Redan vid 鋖dsta 鋘dring"
+
+msgid "Already at newest change"
+msgstr "Redan vid nyaste 鋘dring"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "舗gra-nummer %ld hittades inte"
+
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: radnummer fel"
 
-msgid "1 change"
-msgstr "1 鋘dring"
-
-#, c-format
-msgid "%ld changes"
-msgstr "%ld 鋘dringar"
+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鋜re rader"
+
+msgid "change"
+msgstr "鋘dring"
+
+msgid "changes"
+msgstr "鋘dringar"
+
+#, c-format
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
+
+msgid "before"
+msgstr "f鰎e"
+
+msgid "after"
+msgstr "efter"
+
+msgid "Nothing to undo"
+msgstr "Inget att 錸gra"
+
+msgid "number changes  time"
+msgstr "antal 鋘dringar  tid"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: 錸gra-lista trasig"
@@ -5382,9 +5526,6 @@ msgstr "med Cocoa-GUI."
 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 @@ msgstr "E459: Kan inte g tillbaka till tidigare katalog"
 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鋐fstr鋘g"
 
--- 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: 涓嶈兘鍒嗛厤缂撳啿鍖猴紝浣跨敤鍙︿竴涓紦鍐插尯...."
-
-msgid "No buffers were unloaded"
-msgstr "娌℃湁閲婃斁浠讳綍缂撳啿鍖"
-
-msgid "No buffers were deleted"
-msgstr "娌℃湁鍒犻櫎浠讳綍缂撳啿鍖"
-
-msgid "No buffers were wiped out"
-msgstr "娌℃湁鍒犻櫎浠讳綍缂撳啿鍖"
+msgstr "E83: 鏃犳硶鍒嗛厤缂撳啿鍖猴紝浣跨敤鍙︿竴涓紦鍐插尯..."
+
+msgid "E515: No buffers were unloaded"
+msgstr "E515: 娌℃湁閲婃斁浠讳綍缂撳啿鍖"
+
+msgid "E516: No buffers were deleted"
+msgstr "E516: 娌℃湁鍒犻櫎浠讳綍缂撳啿鍖"
+
+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 @@ msgid "E85: There is no listed buffer"
 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: 涓嶈兘鍒囨崲鍒版洿鍓嶉潰鐨勭紦鍐插尯"
-
-#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: 宸叉洿鏀硅繃缂撳啿鍖 %ld 浣嗗皻鏈繚瀛 (鍙敤 ! 寮哄埗鎵ц)"
+msgstr "E88: 鏃犳硶鍒囨崲锛屽凡鏄涓涓紦鍐插尯"
+
+#, c-format
+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 @@ msgstr "[鍙]"
 
 #, 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%%-- 鍒 "
-
-msgid "[No file]"
+msgstr "琛 %ld / %ld --%d%%-- 鍒 "
+
+msgid "[No Name]"
 msgstr "[鏈懡鍚峕"
 
 #. must be a help buffer
 msgid "help"
-msgstr "[甯姪]"
-
-msgid "[help]"
+msgstr "甯姪"
+
+msgid "[Help]"
 msgstr "[甯姪]"
 
 msgid "[Preview]"
@@ -150,6 +150,7 @@ msgstr "搴曠"
 msgid "Top"
 msgstr "椤剁"
 
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -157,22 +158,22 @@ msgstr ""
 "\n"
 "# 缂撳啿鍖哄垪琛:\n"
 
-msgid "[Error List]"
-msgstr "[閿欒鍒楄〃]"
-
-msgid "[No File]"
-msgstr "[鏈懡鍚峕"
+msgid "[Location List]"
+msgstr "[Location 鍒楄〃]"
+
+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 @@ msgstr "    琛=%ld  id=%d  鍚嶇О=%s"
 
 #, 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 "
-
-msgid " Keyword completion (^N/^P)"
-msgstr " 鍏抽敭瀛楄嚜鍔ㄥ畬鎴 (^N/^P)"
+msgstr "E105: 涓嶆槸鍦ㄨ剼鏈枃浠朵腑浣跨敤 :loadkeymap "
+
+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)"
-
-#. 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 " File name completion (^F/^N/^P)"
-msgstr " 鏂囦欢鍚嶈嚜鍔ㄥ畬鎴 (^F/^N/^P)"
-
-msgid " Tag 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 " Dictionary completion (^K/^N/^P)"
-msgstr " 瀛楀吀鑷姩瀹屾垚 (^K/^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 " ^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 " Whole line completion (^L^N^P)"
+msgstr " 鏁磋琛ュ叏 (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " 鏂囦欢鍚嶈ˉ鍏 (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag 琛ュ叏 (^]^N^P)"
+
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " 璺緞妯″紡琛ュ叏 (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " 瀹氫箟琛ュ叏 (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary 琛ュ叏 (^K^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 " 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 "姝e湪鎵弿 dictionary: %s"
 
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (鎻掑叆) Scroll (^E/^Y)"
@@ -274,8 +283,9 @@ msgstr " (鏇挎崲) Scroll (^E/^Y)"
 
 #, c-format
 msgid "Scanning: %s"
-msgstr "鎵弿涓: %s"
-
+msgstr "姝e湪鎵弿: %s"
+
+#, c-format
 msgid "Scanning tags."
 msgstr "鎵弿鏍囩."
 
@@ -287,45 +297,157 @@ msgstr " 澧炲姞"
 #. * 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"
 
-#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 鏈畾涔夌殑鍙橀噺: \"%s\""
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let 涓嚭鐜板紓甯稿瓧绗"
+
+#, c-format
+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= 鐨勫彉閲忕被鍨嬩笉姝g‘"
+
+#, 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 "E691: Can only compare List with List"
+msgstr "E691: 鍙兘姣旇緝 List 鍜 List"
+
+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 "E111: Missing ']'"
-msgstr "E111: 缂哄皯瀵瑰簲鐨 \"]\""
+msgstr "E110: 缂哄皯 ')'"
+
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: 涓嶈兘绱㈠紩涓涓 Funcref"
 
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@ msgstr "E112: 缂哄皯閫夐」鍚嶇О: %s"
 
 #, c-format
 msgid "E113: Unknown option: %s"
-msgstr "E113: 涓嶆纭殑閫夐」: %s"
+msgstr "E113: 鏈煡鐨勯夐」: %s"
 
 #, c-format
 msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@ msgid "E115: Missing quote: %s"
 msgstr "E115: 缂哄皯寮曞彿: %s"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 鍑芥暟 %s 鐨勫弬鏁颁笉姝g‘"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 鏈畾涔夌殑鍑芥暟: %s"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 鍑芥暟 %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> 涓嶈兘鍦 script 涓婁笅鏂囧浣跨敤: %s"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List 涓己灏戦楀彿: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List 缂哄皯缁撴潫绗 ']': %s"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary 涓己灏戝啋鍙: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary 涓嚭鐜伴噸澶嶇殑閿: \"%s\""
+
+#, c-format
+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 @@ msgstr ""
 "纭畾(&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 灏氭湭瀹氫箟"
-
-#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: 鍑芥暟 %s 宸茬粡瀛樺湪, 璇蜂娇鐢 ! 寮哄埗鏇挎崲"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 鍑芥暟 %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 "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref 鍙橀噺鍚嶅繀椤讳互澶у啓瀛楁瘝寮澶: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 鍙橀噺鍚嶄笌宸叉湁鍑芥暟鍚嶅啿绐: %s"
+
+#, c-format
+msgid "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 姝e湪浣跨敤涓紝涓嶈兘閲嶆柊瀹氫箟"
-
-#, 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 "鍑芥暟 "
-
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: 鍑芥暟 %s 灏氭湭瀹氫箟"
+msgstr "E129: 闇瑕佸嚱鏁板悕"
+
+#, c-format
+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 姝e湪浣跨敤涓紝涓嶈兘鍒犻櫎"
+msgstr "E131: 鏃犳硶鍒犻櫎鍑芥暟 %s: 姝e湪浣跨敤涓"
 
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 鍑芥暟閫掑綊璋冪敤灞傛暟瓒呰繃 'maxfuncdepth'"
-
-#. always scroll up, don't overwrite
+msgstr "E132: 鍑芥暟璋冪敤娣卞害瓒呭嚭 'maxfuncdepth'"
+
 #, 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 蹇呴』鍦ㄥ嚱鏁伴噷浣跨敤"
+#, c-format
+msgid "%s aborted"
+msgstr "%s 宸蹭腑姝"
 
 #, c-format
 msgid "%s returning #%ld"
-msgstr "%s 杩斿洖鍊 #%ld "
-
-#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s 杩斿洖鍊 \"%s\""
-
+msgstr "%s 杩斿洖 #%ld "
+
+#, c-format
+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 @@ msgstr ""
 "\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 "姝e湪鏌ユ壘 \"%s\"锛屽湪 \"%s\" 涓"
 
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "鏌ユ壘涓: \"%s\""
+msgstr "姝e湪鏌ユ壘 \"%s\""
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "鍦 'runtimepath' 閲屾壘涓嶅埌 \"%s\""
-
-msgid "Run Macro"
-msgstr "鎵ц瀹"
+msgstr "鍦 'runtimepath' 涓壘涓嶅埌 \"%s\""
+
+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 @@ msgstr "绗 %ld 琛: 涓嶈兘鎵ц \"%s\""
 
 #, 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 @@ msgstr "E197: 涓嶈兘璁惧畾璇█涓 \"%s\""
 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"
-
-#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s 鍦ㄨ涓: "
+msgstr "[宸蹭慨鏀逛絾灏氭湭淇濆瓨]\n"
+
+#, c-format
+# 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 @@ msgstr " 澶辫触"
 
 #, 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 @@ msgid "E140: Use ! to write partial buff
 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 @@ msgid "E145: Shell commands not allowed 
 msgstr "E145: rvim 涓姝娇鐢 shell 鍛戒护"
 
 msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: 姝e垯琛ㄨ揪寮忎笉鑳界敤瀛楁瘝鍒嗛殧 (?)"
+msgstr "E146: 姝e垯琛ㄨ揪寮忎笉鑳界敤瀛楁瘝浣滃垎鐣"
 
 #, 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 缂哄皯姝e垯琛ㄨ揪寮"
 
 #, 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"
-"# 鍓嶄竴缁勬浛浠e瓧绗︿覆:\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"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: 鏍囩(tag) \"%s\" 鍦ㄦ枃浠 %s 閲岄噸澶嶅嚭鐜板娆"
+msgstr "E153: 鏃犳硶鎵撳紑骞惰鍙 %s"
+
+#, c-format
+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\" 浠ュ洖鍒版甯告ā寮."
-
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "宸插埌鏂囦欢缁撳熬"
+msgstr "杩涘叆 Ex 妯″紡銆傝緭鍏 \"visual\" 鍥炲埌姝e父妯″紡銆"
+
+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 "鍑芥暟缁撳熬"
-
-msgid "Ambiguous use of user-defined command"
-msgstr "鐢ㄦ埛瀹氫箟鐨勫懡浠や細娣锋穯"
-
-msgid "Not an editor command"
-msgstr "涓嶆槸缂栬緫鍣ㄧ殑鍛戒护"
-
-msgid "Don't panic!"
-msgstr "涓嶈鎯婃厡!"
-
-msgid "Backwards range given"
-msgstr "鎸囧畾浜嗗悜鍓嶅弬鑰冪殑鑼冨洿"
+msgstr "鍑芥暟缁撴潫"
+
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: 涓嶇‘瀹氱殑鐢ㄦ埛鑷畾涔夊懡浠"
+
+msgid "E492: Not an editor command"
+msgstr "E492: 涓嶆槸缂栬緫鍣ㄧ殑鍛戒护"
+
+msgid "E493: Backwards range given"
+msgstr "E493: 浣跨敤浜嗛嗗悜鐨勮寖鍥"
 
 msgid "Backwards range given, OK to swap"
-msgstr "鎸囧畾浜嗗悜鍓嶅弬鑰冪殑鑼冨洿锛孫K to swap"
-
-msgid "Use w or w>>"
-msgstr "璇蜂娇鐢 w 鎴 w>>"
+msgstr "浣跨敤浜嗛嗗悜鐨勮寖鍥达紝纭畾浜ゆ崲鍚"
+
+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: 璁℃暟鐨勭己鐪佸间笉姝g‘"
-
-msgid "E179: argument required for complete"
-msgstr "E179: 鎸囦护闇瑕佸弬鏁版墠鑳藉畬鎴"
+msgstr "E178: 鏃犳晥鐨勮鏁伴粯璁ゅ"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete 闇瑕佸弬鏁"
+
+#, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: 鏃犳晥鐨勫睘鎬: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: 鏃犳晥鐨勫懡浠ゅ悕"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: 鐢ㄦ埛鑷畾涔夊懡浠ゅ繀椤讳互澶у啓瀛楁瘝寮澶"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: 娌℃湁杩欎釜鐢ㄦ埛鑷畾涔夊懡浠: %s"
 
 #, c-format
 msgid "E180: Invalid complete value: %s"
-msgstr "E180: 涓嶅畬鏁寸殑鍊: '%s'"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: 涓嶆纭殑灞炴: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: 鍛戒护鍚嶇О涓嶆纭"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: 鐢ㄦ埛鑷畾涔夊懡浠ゅ繀椤讳互澶у啓瀛楁瘝寮濮"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: 娌℃湁鐢ㄦ埛鑷畾涔夌殑鍛戒护锛 %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 "鎮ㄥソ锛孷im 鐢ㄦ埛锛"
+
+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: 鍦ㄦ骞冲彴涓婁笉鑳借幏寰楃獥鍙d綅缃"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos 闇瑕佷袱涓暟瀛楀弬鏁"
 
 msgid "Save Redirection"
 msgstr "淇濆瓨閲嶅畾鍚"
@@ -973,85 +1238,170 @@ msgid "Save Setup"
 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 "E194: No alternate file name to substitute for '#'"
+msgstr "E194: 娌℃湁鐢ㄤ簬鏇挎崲 '#' 鐨勪氦鏇挎枃浠跺悕"
+
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: 娌℃湁鐢ㄤ簬鏇挎崲 \"<afile>\" 鐨勮嚜鍔ㄥ懡浠ゆ枃浠跺悕"
+
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: 娌℃湁鐢ㄤ簬鏇挎崲 \"<abuf>\" 鐨勮嚜鍔ㄥ懡浠ょ紦鍐插尯鍙"
+
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: 娌℃湁鐢ㄤ簬鏇挎崲 \"<amatch>\" 鐨勮嚜鍔ㄥ懡浠ゅ尮閰嶅悕"
+
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: 娌℃湁鐢ㄤ簬鏇挎崲 \"<sfile>\" 鐨 :source 鏂囦欢鍚"
+
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' 鎴 '#' 涓虹┖鏂囦欢鍚嶏紝鍙兘鐢ㄤ簬 \":p:h\""
+
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: 缁撴灉涓虹┖瀛楃涓"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: 鏃犳硶鎵撳紑骞惰鍙 viminfo 鏂囦欢"
+
+msgid "E196: No digraphs in this version"
+msgstr "E196: 姝ょ増鏈棤澶嶅悎瀛楃(digraph)"
+
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: 涓嶈兘 :throw 鍓嶇紑涓 'Vim' 鐨勫紓甯"
+
+#. 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 "E194: No alternate file name to substitute for '#'"
-msgstr "E194: 娌℃湁 '#' 鍙浛浠g殑鏂囦欢鍚"
-
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "娌℃湁 Autocommand 鏂囦欢鍚嶄互鏇挎崲 \"<afile>\""
-
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "娌℃湁 Autocommand 缂撳啿鍖哄悕绉颁互鏇挎崲 \"<abuf>\""
-
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "娌℃湁 Autocommand Match name 浠ユ浛鎹 \"<amatch>\""
-
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "娌℃湁 :source 鏂囦欢鍚嶄互鏇挎崲 \"<sfile>\""
-
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' 鎴 '#' 鎸囧悜绌烘枃浠跺悕锛屽彧鑳界敤鏂 \":p:h\""
-
-msgid "Evaluates to an empty string"
-msgstr "杈撳叆涓虹┖瀛楃涓"
-
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: 涓嶈兘璇诲彇 viminfo"
-
-msgid "E196: No digraphs in this version"
-msgstr "E196: 鏈増鏈棤澶嶅悎瀛楃(digraph)"
+msgstr "E193: :endfunction 涓嶅湪鍑芥暟鍐"
 
 msgid "tagname"
-msgstr "鏍囩鍚嶇О"
+msgstr "tag 鍚"
 
 msgid " kind file\n"
-msgstr "绫绘枃浠禱n"
+msgstr " 绫诲瀷 鏂囦欢\n"
 
 msgid "'history' option is zero"
-msgstr "閫夐」 'history' 鏄浂"
-
-#, c-format
+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 @@ msgid "E198: cmd_pchar beyond the comman
 msgstr "E198: cmd_pchar 瓒呰繃鍛戒护闀垮害"
 
 msgid "E199: Active window or buffer deleted"
-msgstr "E199: 宸插垹闄ゆ椿鍔ㄧ獥鍙f垨缂撳瓨"
+msgstr "E199: 娲诲姩绐楀彛鎴栫紦鍐插尯宸茶鍒犻櫎"
 
 msgid "Illegal file name"
-msgstr "涓嶆纭殑鏂囦欢鍚"
+msgstr "鏃犳晥鐨勬枃浠跺悕"
 
 msgid "is a directory"
 msgstr "鏄洰褰"
@@ -1087,26 +1437,32 @@ msgid "is not a file"
 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 @@ msgid "[RO]"
 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 @@ msgstr "[宸茶浆鎹"
 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 "Can't write to backup file (use ! to override)"
-msgstr "涓嶈兘鍐欏浠芥枃浠 (璇蜂娇鐢 ! 寮哄埗鎵ц)"
-
-msgid "Close error for backup file (use ! to override)"
-msgstr "鍏抽棴澶囦唤鏂囦欢鍑洪敊 (璇蜂娇鐢 ! 寮哄埗鎵ц)"
-
-msgid "Can't read file for backup (use ! to override)"
-msgstr "涓嶈兘璇诲彇鏂囦欢浠ヤ緵澶囦唤 (璇蜂娇鐢 ! 寮哄埗鎵ц)"
-
-msgid "Cannot create backup file (use ! to override)"
-msgstr "涓嶈兘鍒涘缓澶囦唤鏂囦欢 (璇蜂娇鐢 ! 寮哄埗鎵ц)"
-
-msgid "Can't make backup file (use ! to override)"
-msgstr "涓嶈兘浣滃浠芥枃浠 (璇蜂娇鐢 ! 寮哄埗鎵ц)"
-
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork 浼氭秷澶 (璇蜂娇鐢 ! 寮哄埗鎵ц)"
+msgid "is read-only (add ! to override)"
+msgstr "鍙 (璇峰姞 ! 寮哄埗鎵ц)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: 鏃犳硶鍐欏叆澶囦唤鏂囦欢 (璇峰姞 ! 寮哄埗鎵ц)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: 鍏抽棴澶囦唤鏂囦欢鍑洪敊 (璇峰姞 ! 寮哄埗鎵ц)"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: 鏃犳硶璇诲彇鏂囦欢浠ヤ緵澶囦唤 (璇峰姞 ! 寮哄埗鎵ц)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: 鏃犳硶鍒涘缓澶囦唤鏂囦欢 (璇峰姞 ! 寮哄埗鎵ц)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: 鏃犳硶鐢熸垚澶囦唤鏂囦欢 (璇峰姞 ! 寮哄埗鎵ц)"
+
+#, 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: 鎵句笉鍒板啓鍏ョ敤鐨勪氦鎹㈡枃浠"
-
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: 涓嶈兘杞崲 (璇蜂娇鐢 ! 寮哄埗涓嶈浆鎹㈠啓鍏)"
+msgstr "E214: 鎵句笉鍒扮敤浜庡啓鍏ョ殑涓存椂鏂囦欢"
+
+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: 涓嶈兘浠ュ啓鍏ユā寮忔墦寮"
-
-msgid "Close failed"
-msgstr "鍏抽棴澶辫触"
-
-msgid "write error, conversion failed"
-msgstr "涓嶈兘鍐欏叆 -- 杞崲澶辫触"
-
-msgid "write error (file system full?)"
-msgstr "鍐欏叆閿欒 (鏂囦欢绯荤粺宸叉弧锛)"
+msgstr "E212: 鏃犳硶鎵撳紑骞跺啓鍏ユ枃浠"
+
+msgid "E667: Fsync failed"
+msgstr "E667: 鍚屾澶辫触"
+
+msgid "E512: Close failed"
+msgstr "E512: 鍏抽棴澶辫触"
+
+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 @@ msgid "[New]"
 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 @@ msgid "[unix format]"
 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 @@ msgstr "[鏈鍚庝竴琛屼笉瀹屾暣]"
 #. 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 鍒犻櫎缂撳啿鍖"
-
-#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: 璀﹀憡: 鏂囦欢 \"%s\" 宸茬粡涓嶅瓨鍦"
+msgstr "E246: FileChangedShell 鑷姩鍛戒护鍒犻櫎浜嗙紦鍐插尯"
+
+#, c-format
+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 @@ msgstr ""
 "鍔犺浇鏂囦欢(&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: * 鍚庨潰鏈変笉姝g‘鐨勫瓧绗: %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: 缂哄皯 }."
-
-msgid "No fold found"
-msgstr "鎵句笉鍒颁换浣 fold"
+msgstr "E220: 缂哄皯 }銆"
+
+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"
-
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: 閫夐」 'commentstring' 鏈瀹"
+msgstr "E351: 涓嶈兘鍦ㄥ綋鍓嶇殑 'foldmethod' 涓嬪垹闄ゆ姌鍙"
+
+#, 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 "<涓嶈兘鎵撳紑>"
-
-#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: 涓嶈兘浣跨敤 %s 瀛椾綋"
-
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: 涓嶈兘鍥炲埌鐩墠鐩綍"
+msgstr "<鏃犳硶鎵撳紑>"
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: 鏃犳硶鑾峰彇瀛椾綋 %s"
+
+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 @@ msgid "Vim dialog"
 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'"
-
-msgid "Error"
-msgstr "閿欒"
-
-msgid "&Ok"
-msgstr "纭畾(&O)"
+msgstr "E231: 鏃犳晥鐨 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' 鐨勫兼棤鏁"
+
+#, 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 @@ msgstr "鍚戜笂"
 msgid "Down"
 msgstr "鍚戜笅"
 
-#. 'Find Next' button
 msgid "Find Next"
-msgstr "鎵句笅涓涓"
-
-#. 'Replace' button
+msgstr "鏌ユ壘涓嬩竴涓"
+
 msgid "Replace"
 msgstr "鏇挎崲"
 
-#. 'Replace All' button
 msgid "Replace All"
-msgstr "鏇挎崲鍏ㄩ儴"
-
-msgid "E233: cannot open display"
-msgstr "E233: <涓嶈兘鎵撳紑 X Server DISPLAY>"
-
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: 涓嶆纭殑瀛楃闆 (Fontset): %s"
+msgstr "鍏ㄩ儴鏇挎崲"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: 浠庝細璇濈鐞嗗櫒鏀跺埌 \"die\" 璇锋眰\n"
+
+msgid "Close"
+msgstr "鍏抽棴"
+
+msgid "New tab"
+msgstr "鏂板缓鏍囩"
+
+msgid "Open Tab..."
+msgstr "鎵撳紑鏍囩..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: 涓荤獥鍙h鎰忓鍦版懅姣乗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 鏉ュ彇浠g┖閫夋嫨"
+
+msgid "&Filter"
+msgstr "杩囨护(&F)"
+
+msgid "&Cancel"
+msgstr "鍙栨秷(&C)"
+
+msgid "Directories"
+msgstr "鐩綍"
 
 msgid "Filter"
 msgstr "杩囨护鍣"
 
-msgid "Directories"
-msgstr "鐩綍"
-
-msgid "Help"
-msgstr "甯姪"
+msgid "&Help"
+msgstr "甯姪(&H)"
 
 msgid "Files"
 msgstr "鏂囦欢"
 
+msgid "&OK"
+msgstr "纭畾(&O)"
+
 msgid "Selection"
 msgstr "閫夋嫨"
 
-msgid "Undo"
-msgstr "鎾ゆ秷"
-
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: 涓嶈兘鎵撳紑 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 "Find &Next"
+msgstr "鏌ユ壘涓嬩竴涓(&N)"
+
+msgid "&Replace"
+msgstr "鏇挎崲(&R)"
+
+msgid "Replace &All"
+msgstr "鍏ㄩ儴鏇挎崲(&A)"
+
+msgid "&Undo"
+msgstr "鎾ら攢(&U)"
+
+#, c-format
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: 鏃犳硶鍔犺浇 Zap 瀛椾綋 '%s'"
+
+#, c-format
+msgid "E611: Can't use font %s"
+msgstr "E611: 鏃犳硶浣跨敤瀛椾綋 %s"
 
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
 msgstr ""
 "\n"
-"姝e湪鍙戦佷腑鏂瓙绋嬪簭鐨勪俊鎭.\n"
+"姝e湪鍙戦佹秷鎭粓姝㈠瓙杩涚▼銆俓n"
+
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: 鎵句笉鍒扮獥鍙f爣棰 \"%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: 鏃犳硶鍒嗛厤棰滆壊琛ㄩ」锛屾煇浜涢鑹插彲鑳戒笉姝g‘"
 
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: Fontset %s 娌℃湁璁惧畾姝g‘鐨勫瓧浣撲互渚涙樉绀鸿繖浜涘瓧绗﹂泦:"
+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 @@ msgid "Font1: %s\n"
 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 @@ msgid ""
 "Font1 width: %ld\n"
 "\n"
 msgstr ""
-"瀛椾綋1瀹藉害: %ld\n"
+"瀛椾綋1鐨勫搴: %ld\n"
 "\n"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: 涓嶈兘閰嶇疆棰滆壊 %s"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: 涓嶈兘璇诲彇 sign data!"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "涓嶆纭殑瀛椾綋闆(Fontset)"
+
+#~ 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 閿欒"
 
-#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "E550: Missing colon"
+msgstr "E550: 缂哄皯鍐掑彿"
+
+msgid "E551: Illegal component"
+msgstr "E551: 鏃犳晥鐨勯儴鍒"
+
+msgid "E552: digit expected"
+msgstr "E552: 搴旇瑕佹湁鏁板瓧"
+
+#, c-format
+msgid "Page %d"
+msgstr "绗 %d 椤"
+
+msgid "No text to be printed"
+msgstr "娌℃湁瑕佹墦鍗扮殑鏂囧瓧"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "姝e湪鎵撳嵃绗 %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 "鏄剧ず杩炴帴"
 
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: 鐢ㄦ硶: cs[cope] %s"
+
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "杩欎釜 cscope 鍛戒护涓嶆敮鎸佸垎鍓插睆骞昞n"
-
-msgid "Usage: cstag <ident>"
-msgstr "鐢ㄦ硶: cstag <璇嗗埆瀛>"
+msgstr "杩欎釜 cscope 鍛戒护涓嶆敮鎸佸垎鍓茬獥鍙c俓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"
-
-#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s 涓嶆槸鐩綍鎴 cscope 鏁版嵁搴"
-
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "璇诲彇 cscope 杩炴帴 %d 鏃堕敊璇"
-
-msgid "unknown cscope search type"
-msgstr "鏈煡鐨 cscope 鏌ユ壘褰㈡"
-
-msgid "Could not create cscope pipes"
-msgstr "涓嶈兘鍒涘缓涓 cscope 杩炴帴鐨勭閬"
+msgstr "娣诲姞浜 cscope 鏁版嵁搴 %s"
+
+#, c-format
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: 璇诲彇 cscope 杩炴帴 %ld 鍑洪敊"
+
+msgid "E561: unknown cscope search type"
+msgstr "E561: 鏈煡鐨 cscope 鏌ユ壘绫诲瀷"
+
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: 鏃犳硶鍒涘缓 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)"
-
-msgid "no cscope connections"
-msgstr "娌℃湁 cscope 杩炴帴"
+msgstr "cs_create_connection: fdopen fr_fp 澶辫触"
+
+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 "duplicate cscope database not added"
-msgstr "閲嶅鐨 cscope 鏁版嵁搴撴湭琚姞鍏"
-
-msgid "maximum number of cscope connections reached"
-msgstr "宸茶揪鍒 cscope 鏈澶ц繛鎺ユ暟鐩"
-
-msgid "E260: cscope connection not found"
-msgstr "E260: 鎵句笉鍒 cscope 杩炴帴"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (鐢ㄦ硶: %s)"
+
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: 鏃犳硶鎵撳紑 cscope 鏁版嵁搴: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: 鏃犳硶鑾峰彇 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"
+#, c-format
+msgid "cscope connection %s closed"
+msgstr "cscope 杩炴帴 %s 宸插叧闂"
 
 #. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches 涓ラ噸閿欒"
-
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: 璇诲彇 cscope 杩炴帴 %d 閿欒"
-
-msgid "couldn't malloc\n"
-msgstr "涓嶈兘浣跨敤 malloc\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope 鏍囩(tag): %s\n"
-
-msgid "   #   line"
-msgstr "   #   琛  "
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches 涓ラ噸閿欒"
+
+#, c-format
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
+
+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"
-
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <鏃>\n"
+msgstr " # pid    鏁版嵁搴撳悕                            prepend path\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 @@ msgstr "<绐楀彛 %d>"
 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 @@ msgid "Sniff: Error during write. Discon
 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 @@ msgid "vim error"
 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 鍛戒护: 鎵句笉鍒扮紦鍐插尯/绐楀彛"
-
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "姝ゅ懡浠や笉鑳戒娇鐢, 鍥犱负鏃犳硶鍔犺浇 Tcl 绋嬪簭搴(Library)"
+msgstr "鏃犳硶娉ㄥ唽鍥炶皟鍛戒护: 鎵句笉鍒扮紦鍐插尯/绐楀彛寮曠敤"
+
+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: 涓嶈兘閫佸嚭鍛戒护鍒扮洰鐨勫湴绋嬪簭"
-
-#, c-format
-msgid "Invalid server id used: %s"
-msgstr "涓嶆纭殑鏈嶅姟鍣 id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: 涓嶈兘璇诲彇 VIM 鐨 娉ㄥ唽琛ㄥ睘鎬"
+msgstr "E248:  鏃犳硶鍙戦佸懡浠ゅ埌鐩殑绋嬪簭"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: 浣跨敤浜嗘棤鏁堢殑鏈嶅姟鍣 id: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM 鐨勬敞鍐岃〃灞炴ф湁璇傚凡鍒犻櫎銆"
-
-msgid "Unknown option"
-msgstr "涓嶆纭殑閫夐」"
+msgstr "E251: VIM 瀹炰緥娉ㄥ唽灞炴ф湁璇傚凡鍒犻櫎锛"
+
+msgid "Unknown option argument"
+msgstr "鏈煡鐨勯夐」鍙傛暟"
 
 msgid "Too many edit arguments"
-msgstr "澶缂栬緫鍙傛暟"
+msgstr "缂栬緫鍙傛暟杩囧"
 
 msgid "Argument missing after"
-msgstr "缂哄皯蹇呰鐨勫弬鏁:"
-
-msgid "Garbage after option"
-msgstr "涓嶈兘杈ㄨ姝ら夐」鍚庣殑鍛戒护: "
-
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "澶 \"+command\" 鎴 \"-c command\" 鍙傛暟"
+msgstr "缂哄皯蹇呰鐨勫弬鏁"
+
+msgid "Garbage after option argument"
+msgstr "閫夐」鍙傛暟鍚庣殑鍐呭鏃犳晥"
+
+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 @@ msgstr "pre-vimrc 鍛戒护琛"
 
 #, 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 @@ msgid "-               read text from st
 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 @@ msgid ""
 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 @@ msgstr ""
 "鍙傛暟:\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 @@ msgstr "-unregister\t\t鍙栨秷 OLE 涓殑 gvim 娉ㄥ唽"
 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 @@ msgid "-e\t\t\tEx mode (like \"ex\")"
 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 @@ msgid "-Z\t\t\tRestricted mode (like \"r
 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 @@ msgid "-l\t\t\tLisp mode"
 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 @@ msgid "-D\t\t\tDebugging mode"
 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> 鍋氳緭鍏ヨ緭鍑鸿澶"
-
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\t鍚姩涓 甯屼集鑾辨ā寮"
-
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\t鍚姩涓 Farsi 妯″紡"
+msgstr "-dev <device>\t\t浣跨敤 <device> 杩涜杈撳叆杈撳嚭"
+
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t浠 Arabic 妯″紡鍚姩"
+
+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 涓獥鍙 (棰勮鏄瘡涓枃浠朵竴涓)"
-
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\t鍚 -o 浣嗕娇鐢ㄥ瀭鐩村垎鍓"
+msgstr "-o[N]\t\t鎵撳紑 N 涓獥鍙 (榛樿鍊: 姣忎釜鏂囦欢涓涓)"
+
+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> 璇诲叆姝e父妯″紡鐨勫懡浠"
 
 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"
-
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t鍦ㄥ彟涓涓 GTK 缁勪欢鍐呮墦寮 Vim"
-
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t缂栬緫 Vim 鏈嶅姟鍣ㄤ笂鐨勬枃浠跺苟閫鍑"
+msgstr "-X\t\t\t涓嶈繛鎺ュ埌 X Server"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t濡傛湁鍙兘锛屽湪 Vim 鏈嶅姟鍣ㄤ笂缂栬緫鏂囦欢 <files>"
+
+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"
-
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t鎵撳嵃璇存槑(涔熷氨鏄湰淇℃伅)鍚庨鍑"
-
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t鎵撳嵃鐗堟湰淇℃伅鍚庨鍑"
+msgstr "-i <viminfo>\t\t浣跨敤 <viminfo> 鍙栦唬 .viminfo"
+
+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 ""
 "\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 @@ msgid ""
 "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 @@ msgid ""
 "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)"
-
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t鏄剧ず Gnome 鐩稿叧鍙傛暟"
+msgstr "-display <display>\t鍦 <display> 涓婅繍琛 vim (涔熷彲鐢 --display)"
+
+#~ 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 @@ msgid ""
 "mark line  col file/text"
 msgstr ""
 "\n"
-"鏍囪 琛屽彿  鍒  鏂囦欢/鏂囨湰"
+"鏍囪   琛   鍒 鏂囦欢/鏂囨湰"
 
 #. Highlight title
 msgid ""
@@ -2434,8 +3073,17 @@ msgid ""
 " 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 @@ msgstr ""
 "# 鏂囦欢鏍囪:\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 "缂哄皯瀵瑰簲鐨 '>'"
-
-msgid "Not a valid codepage"
-msgstr "涓嶆纭殑浠g爜椤"
+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\", 涓嶅彲鑳芥仮澶嶄簡"
-
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: 鎵句笉鍒板潡 0??"
+msgstr "E303: 鏃犳硶鎵撳紑 \"%s\" 鐨勪氦鎹㈡枃浠讹紝鎭㈠灏嗕笉鍙兘"
+
+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 @@ msgid "E307: %s does not look like a Vim
 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 @@ msgstr "浣跨敤浜ゆ崲鏂囦欢 \"%s\""
 
 #, 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 @@ msgid "             dated: "
 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 @@ msgstr ""
 "           杩涚▼ ID: "
 
 msgid " (still running)"
-msgstr " (姝e湪鎵ц)"
+msgstr " (浠嶅湪杩愯)"
 
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
 msgstr ""
 "\n"
-"         [涓嶈兘鍦ㄦ湰鐗堟湰鐨 Vim 涓婁娇鐢╙"
+"         [涓嶈兘鍦ㄨ鐗堟湰鐨 Vim 涓婁娇鐢╙"
 
 msgid ""
 "\n"
@@ -2735,13 +3404,13 @@ msgstr ""
 "         [涓嶈兘鍦ㄦ湰鏈轰笂浣跨敤]"
 
 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 @@ msgstr "E314: 淇濈暀澶辫触"
 
 #, 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 @@ msgid "stack_idx should be 0"
 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 @@ msgstr "pe_line_count 涓洪浂"
 
 #, 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 @@ msgid "Stack size increases"
 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 @@ msgstr ""
 "鍙戠幇浜ゆ崲鏂囦欢 \""
 
 msgid "While opening file \""
-msgstr "褰撴墦寮鏂囦欢鏃 \""
+msgstr "姝e湪鎵撳紑鏂囦欢 \""
 
 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 @@ msgid ""
 "    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: 鑿滃崟鍙兘鍦ㄥ叾瀹冩ā寮忎腑浣跨敤"
-
-msgid "E329: No menu of that name"
-msgstr "E329: 娌℃湁閭f牱鐨勮彍鍗"
+msgstr "E328: 鑿滃崟鍙湪鍏跺畠妯″紡涓瓨鍦"
+
+#, 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 @@ msgstr ""
 "--- 鑿滃崟 ---"
 
 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 @@ msgstr "澶勭悊 %s 鏃跺彂鐢熼敊璇:"
 
 #, c-format
 msgid "line %4ld:"
-msgstr "琛 %4ld:"
-
-msgid "[string too long]"
-msgstr "[瀛楃涓插お闀縘"
+msgstr "绗 %4ld 琛:"
+
+#, 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: 灞忓箷/椤/琛 涓嬬炕锛宐/u/k: 涓婄炕锛宷: 閫鍑"
 
 msgid "Question"
 msgstr "闂"
@@ -2979,17 +3657,8 @@ msgid ""
 "&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 @@ msgid ""
 "&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 @@ msgstr "鎵撳紑鏂囦欢瀵硅瘽妗"
 
 #. 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: 璀﹀憡: 姝e湪淇敼涓涓彧璇绘枃浠"
+
+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: 姝e湪淇濈暀鏂囦欢鈥︹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 @@ msgid ""
 "[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 @@ msgstr "E341: 鍐呴儴閿欒: lalloc(%ld, )"
 
 #, 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 "Illegal mode"
-msgstr "涓嶆纭殑妯″紡"
-
-msgid "Illegal mouseshape"
-msgstr "涓嶆纭殑榧犳爣褰㈢姸"
-
-msgid "digit expected"
-msgstr "搴旇涓烘暟瀛"
-
-msgid "Illegal percentage"
-msgstr "涓嶆纭殑鐧惧垎姣"
+msgid "E545: Missing colon"
+msgstr "E545: 缂哄皯鍐掑彿"
+
+msgid "E546: Illegal mode"
+msgstr "E546: 鏃犳晥鐨勬ā寮"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: 鏃犳晥鐨勯紶鏍囧舰鐘"
+
+msgid "E548: digit expected"
+msgstr "E548: 姝ゅ闇瑕佹暟瀛"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: 鏃犳晥鐨勭櫨鍒嗘瘮"
 
 msgid "Enter encryption key: "
 msgstr "杈撳叆瀵嗙爜: "
@@ -3097,17 +3785,17 @@ msgid "Enter same key again: "
 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 @@ msgstr "E346: 鍦ㄨ矾寰勪腑鎵句笉鍒版洿澶氱殑鏂囦欢 \"%s\""
 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 @@ msgid "E349: No identifier under cursor"
 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 @@ msgstr ""
 "--- 瀵勫瓨鍣 ---"
 
 msgid "Illegal register name"
-msgstr "涓嶆纭殑瀵勫瓨鍣ㄥ悕绉"
-
+msgstr "鏃犳晥鐨勫瘎瀛樺櫒鍚"
+
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -3208,144 +3943,152 @@ msgstr ""
 "# 瀵勫瓨鍣:\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)"
-
-#, 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"
-
-#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#, 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 "(+%ld for BOM)"
+#~ msgstr ""
+
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
 
 msgid "Thanks for flying Vim"
 msgstr "鎰熻阿鎮ㄩ夋嫨 Vim"
 
-msgid "Option not supported"
-msgstr "涓嶆敮鎸佽閫夐」"
-
-msgid "Not allowed in a modeline"
-msgstr "涓嶈兘鍦ㄦā寮忚閲屽嚭鐜"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t褰撳墠璁剧疆: "
-
-msgid "Number required after ="
-msgstr "= 鍚庨渶瑕佹湁鏁板瓧"
-
-msgid "Not found in termcap"
-msgstr "Termcap 閲岄潰鎵句笉鍒"
-
-#, c-format
-msgid "Illegal character <%s>"
-msgstr "涓嶆纭殑瀛楃 <%s>"
-
-msgid "Not allowed here"
-msgstr "杩欓噷涓嶅彲浣跨敤"
-
-msgid "Cannot set 'term' to empty string"
-msgstr "涓嶈兘璁惧畾 'term' 涓虹┖瀛楃涓"
-
-msgid "Cannot change term in GUI"
-msgstr "鍦ㄥ浘鍨嬬晫闈腑涓嶈兘鍒囨崲缁堢"
-
-msgid "Use \":gui\" to start the GUI"
-msgstr "杈撳叆 \":gui\" 鏉ュ惎鍔ㄥ浘褰㈢晫闈"
-
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' 璺 'patchmode' 鏄竴鏍风殑"
-
-msgid "Zero length string"
-msgstr "闆堕暱搴﹀瓧绗︿覆"
-
-#, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> 鍚庣己灏戞暟瀛"
-
-msgid "Missing comma"
-msgstr "缂哄皯閫楀彿"
-
-msgid "Must specify a ' value"
-msgstr "蹇呴渶鎸囧畾涓涓 ' 鍊"
-
-msgid "contains unprintable character"
-msgstr "鍖呭惈涓嶈兘鏄剧ず鐨勫瓧绗"
-
-msgid "Invalid font(s)"
-msgstr "涓嶆纭殑瀛椾綋"
-
-msgid "can't select fontset"
-msgstr "涓嶈兘浣跨敤瀛椾綋闆(Fontset)"
-
-msgid "Invalid fontset"
-msgstr "涓嶆纭殑瀛椾綋闆(Fontset)"
-
-msgid "can't select wide font"
-msgstr "涓嶈兘浣跨敤璁惧畾鐨勫瀛椾綋(Widefont)"
-
-msgid "Invalid wide font"
-msgstr "涓嶆纭殑瀹藉瓧浣(Widefont)"
-
-#, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> 鍚庢湁涓嶆纭殑瀛楃"
-
-msgid "comma required"
-msgstr "闇瑕侀楀彿"
-
-#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' 蹇呴渶鏄┖鐧芥垨鍖呭惈 %s"
-
-msgid "No mouse support"
-msgstr "涓嶆敮鎸侀紶鏍"
-
-msgid "Unclosed expression sequence"
-msgstr "娌℃湁缁撴潫鐨勮〃杈惧紡: "
-
-msgid "too many items"
-msgstr "澶瀵硅薄"
-
-msgid "unbalanced groups"
-msgstr "涓嶅绉扮殑缁"
-
-msgid "A preview window already exists"
-msgstr "棰勮绐楀彛宸茬粡瀛樺湪浜"
-
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' 涓嶈兘姣 'winminheight' 鏇村皯"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' 涓嶈兘姣 'winminwidth' 鏇村皯"
-
-#, c-format
-msgid "Need at least %d lines"
-msgstr "鑷冲皯闇瑕 %d 琛"
-
-#, c-format
-msgid "Need at least %d columns"
-msgstr "鑷冲皯闇瑕 %d 鍒"
+msgid "E518: Unknown option"
+msgstr "E518: 鏈煡鐨勯夐」"
+
+msgid "E519: Option not supported"
+msgstr "E519: 涓嶆敮鎸佽閫夐」"
+
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: 涓嶅厑璁稿湪 modeline 涓娇鐢"
+
+msgid "E521: Number required after ="
+msgstr "E521: = 鍚庨潰闇瑕佹暟瀛"
+
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap 閲岄潰鎵句笉鍒"
+
+#, c-format
+msgid "E539: Illegal character <%s>"
+msgstr "E539: 鏃犳晥鐨勫瓧绗 <%s>"
+
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: 涓嶈兘璁惧畾 'term' 涓虹┖瀛楃涓"
+
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: 鍦ㄥ浘褰㈢晫闈腑涓嶈兘鏀瑰彉缁堢"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: 璇风敤 \":gui\" 鍚姩鍥惧舰鐣岄潰"
+
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' 鍜 'patchmode' 鐩哥瓑"
+
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: 鍦 GTK+ 2 鍥惧舰鐣岄潰涓笉鑳芥洿鏀"
+
+msgid "E524: Missing colon"
+msgstr "E524: 缂哄皯鍐掑彿"
+
+msgid "E525: Zero length string"
+msgstr "E525: 瀛楃涓查暱搴︿负闆"
+
+#, c-format
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> 鍚庨潰缂哄皯鏁板瓧"
+
+msgid "E527: Missing comma"
+msgstr "E527: 缂哄皯閫楀彿"
+
+msgid "E528: Must specify a ' value"
+msgstr "E528: 蹇呴』鎸囧畾涓涓 ' 鍊"
+
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: 鍖呭惈涓嶅彲鏄剧ず瀛楃鎴栧瀛楃"
+
+msgid "E596: Invalid font(s)"
+msgstr "E596: 鏃犳晥鐨勫瓧浣"
+
+msgid "E597: can't select fontset"
+msgstr "E597: 鏃犳硶閫夋嫨 Fontset"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: 鏃犳晥鐨 Fontset"
+
+msgid "E533: can't select wide font"
+msgstr "E533: 鏃犳硶閫夋嫨瀹藉瓧浣"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: 鏃犳晥鐨勫瀛椾綋"
+
+#, c-format
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> 鍚庨潰鏈夋棤鏁堢殑瀛楃"
+
+msgid "E536: comma required"
+msgstr "E536: 闇瑕侀楀彿"
+
+#, c-format
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' 蹇呴』涓虹┖鎴栧寘鍚 %s"
+
+msgid "E538: No mouse support"
+msgstr "E538: 涓嶆敮鎸侀紶鏍"
+
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: 娌℃湁缁撴潫鐨勮〃杈惧紡搴忓垪"
+
+msgid "E541: too many items"
+msgstr "E541: 椤圭洰杩囧"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: 閿欎贡鐨勭粍"
+
+msgid "E590: A preview window already exists"
+msgstr "E590: 棰勮绐楀彛宸插瓨鍦"
+
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic 闇瑕 UTF-8锛岃鎵ц ':set encoding=utf-8'"
+
+#, c-format
+msgid "E593: Need at least %d lines"
+msgstr "E593: 鑷冲皯闇瑕 %d 琛"
+
+#, c-format
+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 @@ msgid ""
 "--- Global option values ---"
 msgstr ""
 "\n"
-"--- 鍏ㄥ眬 閫夐」鍊 ---"
+"--- 鍏ㄥ眬閫夐」鍊 ---"
 
 msgid ""
 "\n"
 "--- Local option values ---"
 msgstr ""
 "\n"
-"--- 鏈湴 閫夐」鍊 ---"
+"--- 灞閮ㄩ夐」鍊 ---"
 
 msgid ""
 "\n"
@@ -3412,9 +4155,6 @@ msgstr "Vim 杩斿洖鍊: %d\n"
 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 @@ msgstr "I/O 閿欒"
 #~ 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 @@ msgid "to %s on %s"
 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 @@ msgstr "Vim: 鍙岄噸淇″彿, 閫鍑轰腑\n"
 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 @@ msgstr ""
 "\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 @@ msgid ""
 msgstr ""
 "鍦ㄤ綘鐨 $PATH 涓壘涓嶅埌 VIMRUN.EXE.\n"
 "澶栭儴鍛戒护鎵ц瀹屾瘯鍚庡皢涓嶄細鏆傚仠.\n"
-"杩涗竴姝ヨ鏄庤鎵ц :help win32-vimrun "
+"杩涗竴姝ヨ鏄庤瑙 :help win32-vimrun"
 
 msgid "Vim Warning"
 msgstr "Vim 璀﹀憡"
@@ -3621,8 +4384,8 @@ msgstr "E378: 'errorformat' 鏈瀹"
 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 @@ msgid " (line deleted)"
 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 娌℃湁鎺ヤ笢瑗"
-
-#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "璇硶閿欒: %s{...}"
-
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: 涓嶈兘鎵ц; regular expression 澶鏉?"
-
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression 閫犳垚鍫嗘爤鐢ㄥ厜鐨勯敊璇"
+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 "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ 鍚庣己灏 ]"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: 绌虹殑 %s%%[]"
+
+#, 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 @@ msgid " REPLACE"
 msgstr " 鏇挎崲"
 
 msgid " REVERSE"
-msgstr " 鍙嶈浆"
+msgstr " 鍙嶅悜"
 
 msgid " INSERT"
 msgstr " 鎻掑叆"
@@ -3695,10 +4530,13 @@ msgid " (replace)"
 msgstr " (鏇挎崲)"
 
 msgid " (vreplace)"
-msgstr " (v-鏇挎崲)"
+msgstr " (V-鏇挎崲)"
 
 msgid " Hebrew"
-msgstr " 甯屼集鑾"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
 
 msgid " (lang)"
 msgstr " (璇█)"
@@ -3706,30 +4544,30 @@ msgstr " (璇█)"
 msgid " (paste)"
 msgstr " (绮樺笘)"
 
-msgid " SELECT"
-msgstr " 閫夊彇"
-
 msgid " VISUAL"
 msgstr " 鍙"
 
-msgid " BLOCK"
-msgstr " 鍧"
-
-msgid " LINE"
-msgstr " 琛"
+msgid " VISUAL 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 @@ msgstr "  鎵句笉鍒"
 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 @@ msgstr "E388: 鎵句笉鍒板畾涔"
 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,6 +5031,20 @@ msgstr "鏈灏"
 msgid "maximal "
 msgstr "鏈澶"
 
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "鍖归厤 %d"
+
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "灏戜簬涓琛"
+
+msgid "E395: contains argument not accepted here"
+msgstr "E395: 浣跨敤浜嗕笉姝g‘鐨勫弬鏁"
+
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: 浣跨敤浜嗕笉姝g‘鐨勫弬鏁"
+
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: 浣跨敤浜嗕笉姝g‘鐨勫弬鏁"
 
@@ -3841,18 +5052,16 @@ msgstr "E393: 浣跨敤浜嗕笉姝g‘鐨勫弬鏁"
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: 鎵句笉鍒 %s 鐨 region item"
 
-msgid "E395: contains argument not accepted here"
-msgstr "E395: 浣跨敤浜嗕笉姝g‘鐨勫弬鏁"
-
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: 浣跨敤浜嗕笉姝g‘鐨勫弬鏁"
-
 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 @@ msgstr "E403: 璇硶鍚屾: 杩炴帴琛岀鍙锋寚瀹氫簡涓ゆ"
 
 #, 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 @@ msgstr "E405: 缂哄皯绛夊彿: %s"
 
 #, 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 @@ msgstr "E409: 涓嶆纭殑缁勫悕: %s"
 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 @@ msgstr "E422: 缁堢缂栫爜澶暱: %s"
 
 #, 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 "at top of tag stack"
-msgstr "鏍囩(tag)鍫嗘爤寮澶"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
+
+#, 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 @@ msgstr "  # pri kind tag"
 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 @@ msgstr "鏂囦欢 \"%s\" 涓嶅瓨鍦"
 #. 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 @@ msgstr ""
 "\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 @@ msgstr "E431: Tag 鏂囦欢 \"%s\" 鏍煎紡閿欒"
 
 #, c-format
 msgid "Before byte %ld"
-msgstr "鍦 %ld 瀛楄妭涔嬪墠"
+msgstr "鍦ㄧ %ld 瀛楄妭涔嬪墠"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@ msgid "E433: No tags file"
 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 "棰勮: '"
-
-msgid "Cannot open termcap file"
-msgstr "涓嶈兘鎵撳紑 termcap 鏂囦欢"
-
-msgid "Terminal entry not found in terminfo"
-msgstr "鍦╰erminfo涓湭鎵惧埌缁堢椤"
-
-msgid "Terminal entry not found in termcap"
-msgstr "鍦╰ermcap涓湭鎵惧埌缁堢椤"
+msgstr "榛樿鍊间负: '"
+
+msgid "E557: Cannot open termcap file"
+msgstr "E557: 鏃犳硶鎵撳紑 termcap 鏂囦欢"
+
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: 鍦 terminfo 涓壘涓嶅埌缁堢椤"
+
+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 @@ msgstr "Vim: 璇婚敊璇紝閫鍑轰腑...\n"
 
 #. 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 "涓椤规敼鍙"
-
-#, c-format
-msgid "%ld changes"
-msgstr "%ld 椤规敼鍙"
+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 %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 @@ msgid ""
 "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 @@ msgid ""
 "Included patches: "
 msgstr ""
 "\n"
-"鍔犲叆琛ヤ竵: "
+"鍖呭惈琛ヤ竵: "
+
+msgid "Modified by "
+msgstr "淇敼鑰 "
 
 msgid ""
 "\n"
@@ -4195,14 +5441,14 @@ msgstr ""
 "缂栬瘧"
 
 msgid "by "
-msgstr "鑰:"
+msgstr "鑰 "
 
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 "\n"
-"瓒呭己鐗堟湰 "
+"宸ㄥ瀷鐗堟湰 "
 
 msgid ""
 "\n"
@@ -4216,96 +5462,102 @@ msgid ""
 "Normal version "
 msgstr ""
 "\n"
-"涓鑸増鏈 "
+"姝e父鐗堟湰 "
 
 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 @@ msgid "Compiler: "
 msgstr "缂栬瘧鍣: "
 
 msgid "Linking: "
-msgstr "閾剧粨鏂瑰紡: "
+msgstr "閾炬帴鏂瑰紡: "
 
 msgid "  DEBUG BUILD"
 msgstr "  璋冭瘯鐗堟湰"
@@ -4323,49 +5575,84 @@ msgid "VIM - Vi IMproved"
 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 涓哄彲鑷敱鍙戣鐨勫紑鏀炬簮浠g爜杞欢"
+msgstr "Vim 鏄彲鑷敱鍒嗗彂鐨勫紑鏀炬簮浠g爜杞欢"
 
 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>         "
-
-msgid "type  :help version6<Enter>   for version info"
-msgstr "鏂扮増鏈俊鎭杈撳叆              :help version6<Enter>"
+msgstr "杈撳叆  :help<Enter>  鎴  <F1>  鏌ョ湅鍦ㄧ嚎甯姪    "
+
+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: 鏈夊叾瀹冨垎鍓茬獥鍙f椂涓嶈兘鏃嬭浆"
@@ -4386,261 +5673,472 @@ msgstr "E446: 鍏夋爣澶勬病鏈夋枃浠跺悕"
 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 "鍒涘缓杩涚▼澶辫触: 璇锋鏌vim鏄惁鍦ㄥ彲鎵ц璺緞涓!"
+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 "Argument required"
-msgstr "闇瑕佹寚浠ゅ弬鏁"
+msgid "E470: Command aborted"
+msgstr "E470: 鍛戒护琚腑姝"
+
+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>鎵ц锛孋TRL-C 閫鍑"
+msgstr "E11: 鍦ㄥ懡浠よ绐楀彛涓棤鏁堬紱<CR> 鎵ц锛孋TRL-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: 鏂囦欢宸茬粡瀛樺湪 (鍙敤 ! 寮哄埗鏇挎崲)"
-
-msgid "Command failed"
-msgstr "鍛戒护鎵ц澶辫触"
-
-msgid "Internal error"
-msgstr "鍐呴儴閿欒"
+msgstr "E13: 鏂囦欢宸插瓨鍦 (璇峰姞 ! 寮哄埗鎵ц)"
+
+msgid "E472: Command failed"
+msgstr "E472: 鍛戒护鎵ц澶辫触"
+
+#, 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: 涓嶆纭殑鍦板潃"
-
-msgid "Invalid argument"
-msgstr "涓嶆纭殑鍙傛暟"
-
-#, c-format
-msgid "Invalid argument: %s"
-msgstr "涓嶆纭殑鍙傛暟: %s"
+msgstr "E14: 鏃犳晥鐨勫湴鍧"
+
+msgid "E474: Invalid argument"
+msgstr "E474: 鏃犳晥鐨勫弬鏁"
+
+#, c-format
+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: 涓嶆纭殑鑼冨洿"
-
-msgid "Invalid command"
-msgstr "涓嶆纭殑鍛戒护"
+msgstr "E16: 鏃犳晥鐨勮寖鍥"
+
+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 瀵瑰簲"
-
-msgid "No ! allowed"
-msgstr "涓嶅彲浣跨敤 '!'"
+msgstr "E24: 娌℃湁杩欎釜缂╁啓"
+
+msgid "E477: No ! allowed"
+msgstr "E477: 涓嶈兘浣跨敤 \"!\""
 
 msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: 鍥犱负缂栬瘧鏃舵病鏈夊姞鍏ュ浘鍨嬬晫闈㈢殑绋嬪簭浠g爜锛屾墍浠ヤ笉鑳戒娇鐢ㄥ浘鍨嬬晫闈"
+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 瀵瑰簲"
-
-msgid "No match"
-msgstr "鎵句笉鍒"
-
-#, c-format
-msgid "No match: %s"
-msgstr "鎵句笉鍒: %s"
+msgstr "E31: 娌℃湁杩欎釜鏄犲皠"
+
+msgid "E479: No match"
+msgstr "E479: 娌℃湁鍖归厤"
+
+#, c-format
+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: 娌℃湁鍓嶄竴涓煡鎵惧懡浠"
-
-msgid "No range allowed"
-msgstr "涓嶅彲浣跨敤鑼冨洿鍛戒护"
+msgstr "E35: 娌℃湁鍓嶄竴涓鍒欒〃杈惧紡"
+
+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 "涓嶈兘寰楀埌涓存椂鏂囦欢鍚"
-
-#, c-format
-msgid "Can't open file %s"
-msgstr "涓嶈兘鎵撳紑鏂囦欢 %s"
-
-#, c-format
-msgid "Can't read file %s"
-msgstr "涓嶈兘璇诲彇鏂囦欢 %s"
-
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: 鏂囦欢鍐呭宸叉敼鍙樹絾灏氭湭淇濆瓨 (鍙敤 ! 寮哄埗鎵ц)"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: 娌℃湁鍚嶅彨 \"%s\" 鐨勫凡娉ㄥ唽鐨勬湇鍔″櫒"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: 鏃犳硶鍒涘缓鏂囦欢 %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: 鏃犳硶鑾峰彇涓存椂鏂囦欢鍚"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: 鏃犳硶鎵撳紑鏂囦欢 %s"
+
+#, 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 "Argument must be positive"
-msgstr "鍙傛暟搴旇鏄鏁"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: 鎵句笉鍒版ā寮: %s"
+
+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: 姝e垯琛ㄨ揪寮忔湁闂"
-
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: 璁惧畾 'readonly' 閫夐」(鍙) (鍙敤 ! 寮哄埗鎵ц)"
-
-#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: 涓嶈兘璁惧畾鍙鍙橀噺 \"%s\""
+msgstr "E44: 宸叉崯鍧忕殑姝e垯琛ㄨ揪寮忕▼搴"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 宸茶瀹氶夐」 'readonly' (璇峰姞 ! 寮哄埗鎵ц)"
+
+#, c-format
+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: 澶鏂囦欢鍚"
-
-msgid "Trailing characters"
-msgstr "浣犺緭鍏ヤ簡澶氫綑鐨勫瓧绗"
+msgstr "E77: 鏂囦欢鍚嶈繃澶"
+
+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 姝e湪浣跨敤涓紝涓嶈兘閲嶆柊瀹氫箟"
+
+#~ 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 鍥惧舰鐣岄潰銆"
--- 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: 不能分配缓冲区,使用另一个缓冲区...."
-
-msgid "No buffers were unloaded"
-msgstr "没有释放任何缓冲区"
-
-msgid "No buffers were deleted"
-msgstr "没有删除任何缓冲区"
-
-msgid "No buffers were wiped out"
-msgstr "没有删除任何缓冲区"
+msgstr "E83: 无法分配缓冲区,使用另一个缓冲区..."
+
+msgid "E515: No buffers were unloaded"
+msgstr "E515: 没有释放任何缓冲区"
+
+msgid "E516: No buffers were deleted"
+msgstr "E516: 没有删除任何缓冲区"
+
+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 @@ msgid "E85: There is no listed buffer"
 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: 不能切换到更前面的缓冲区"
-
-#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: 已更改过缓冲区 %ld 但尚未保存 (可用 ! 强制执行)"
+msgstr "E88: 无法切换,已是第一个缓冲区"
+
+#, c-format
+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 @@ msgstr "[只读]"
 
 #, 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%%-- 列 "
-
-msgid "[No file]"
+msgstr "行 %ld / %ld --%d%%-- 列 "
+
+msgid "[No Name]"
 msgstr "[未命名]"
 
 #. must be a help buffer
 msgid "help"
-msgstr "[帮助]"
-
-msgid "[help]"
+msgstr "帮助"
+
+msgid "[Help]"
 msgstr "[帮助]"
 
 msgid "[Preview]"
@@ -150,6 +150,7 @@ msgstr "底端"
 msgid "Top"
 msgstr "顶端"
 
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -157,22 +158,22 @@ msgstr ""
 "\n"
 "# 缓冲区列表:\n"
 
-msgid "[Error List]"
-msgstr "[错误列表]"
-
-msgid "[No File]"
-msgstr "[未命名]"
+msgid "[Location List]"
+msgstr "[Location 列表]"
+
+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 @@ msgstr "    行=%ld  id=%d  名称=%s"
 
 #, 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 "
-
-msgid " Keyword completion (^N/^P)"
-msgstr " 关键字自动完成 (^N/^P)"
+msgstr "E105: 不是在脚本文件中使用 :loadkeymap "
+
+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)"
-
-#. 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 " File name completion (^F/^N/^P)"
-msgstr " 文件名自动完成 (^F/^N/^P)"
-
-msgid " Tag 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 " Dictionary completion (^K/^N/^P)"
-msgstr " 字典自动完成 (^K/^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 " ^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 " Whole line completion (^L^N^P)"
+msgstr " 整行补全 (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " 文件名补全 (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag 补全 (^]^N^P)"
+
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " 路径模式补全 (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " 定义补全 (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary 补全 (^K^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 " 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 @@ msgstr " (替换) Scroll (^E/^Y)"
 
 #, c-format
 msgid "Scanning: %s"
-msgstr "扫描中: %s"
-
+msgstr "正在扫描: %s"
+
+#, c-format
 msgid "Scanning tags."
 msgstr "扫描标签."
 
@@ -287,45 +297,157 @@ msgstr " 增加"
 #. * 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"
 
-#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 未定义的变量: \"%s\""
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let 中出现异常字符"
+
+#, c-format
+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 "E691: Can only compare List with List"
+msgstr "E691: 只能比较 List 和 List"
+
+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 "E111: Missing ']'"
-msgstr "E111: 缺少对应的 \"]\""
+msgstr "E110: 缺少 ')'"
+
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: 不能索引一个 Funcref"
 
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@ msgstr "E112: 缺少选项名称: %s"
 
 #, c-format
 msgid "E113: Unknown option: %s"
-msgstr "E113: 不正确的选项: %s"
+msgstr "E113: 未知的选项: %s"
 
 #, c-format
 msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@ msgid "E115: Missing quote: %s"
 msgstr "E115: 缺少引号: %s"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 函数 %s 的参数不正确"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未定义的函数: %s"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 函数 %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> 不能在 script 上下文外使用: %s"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List 中缺少逗号: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List 缺少结束符 ']': %s"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary 中缺少冒号: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary 中出现重复的键: \"%s\""
+
+#, c-format
+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 @@ msgstr ""
 "确定(&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 尚未定义"
-
-#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: 函数 %s 已经存在, 请使用 ! 强制替换"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 函数 %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 "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref 变量名必须以大写字母开头: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 变量名与已有函数名冲突: %s"
+
+#, c-format
+msgid "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 "函数 "
-
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: 函数 %s 尚未定义"
+msgstr "E129: 需要函数名"
+
+#, c-format
+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'"
-
-#. always scroll up, don't overwrite
+msgstr "E132: 函数调用深度超出 'maxfuncdepth'"
+
 #, 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 必须在函数里使用"
+#, c-format
+msgid "%s aborted"
+msgstr "%s 已中止"
 
 #, c-format
 msgid "%s returning #%ld"
-msgstr "%s 返回值 #%ld "
-
-#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s 返回值 \"%s\""
-
+msgstr "%s 返回 #%ld "
+
+#, c-format
+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 @@ msgstr ""
 "\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\""
-
-msgid "Run Macro"
-msgstr "执行宏"
+msgstr "在 'runtimepath' 中找不到 \"%s\""
+
+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 @@ msgstr "第 %ld 行: 不能执行 \"%s\""
 
 #, 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 @@ msgstr "E197: 不能设定语言为 \"%s\""
 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"
-
-#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s 在行中: "
+msgstr "[已修改但尚未保存]\n"
+
+#, c-format
+# 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 @@ msgstr " 失败"
 
 #, 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 @@ msgid "E140: Use ! to write partial buff
 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 @@ msgid "E145: Shell commands not allowed 
 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"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+msgstr "E153: 无法打开并读取 %s"
+
+#, c-format
+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\" 以回到正常模式."
-
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "已到文件结尾"
+msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
+
+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 "函数结尾"
-
-msgid "Ambiguous use of user-defined command"
-msgstr "用户定义的命令会混淆"
-
-msgid "Not an editor command"
-msgstr "不是编辑器的命令"
-
-msgid "Don't panic!"
-msgstr "不要惊慌!"
-
-msgid "Backwards range given"
-msgstr "指定了向前参考的范围"
+msgstr "函数结束"
+
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: 不确定的用户自定义命令"
+
+msgid "E492: Not an editor command"
+msgstr "E492: 不是编辑器的命令"
+
+msgid "E493: Backwards range given"
+msgstr "E493: 使用了逆向的范围"
 
 msgid "Backwards range given, OK to swap"
-msgstr "指定了向前参考的范围,OK to swap"
-
-msgid "Use w or w>>"
-msgstr "请使用 w 或 w>>"
+msgstr "使用了逆向的范围,确定交换吗"
+
+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: 计数的缺省值不正确"
-
-msgid "E179: argument required for complete"
-msgstr "E179: 指令需要参数才能完成"
+msgstr "E178: 无效的计数默认值"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete 需要参数"
+
+#, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: 无效的属性: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: 无效的命令名"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: 用户自定义命令必须以大写字母开头"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: 没有这个用户自定义命令: %s"
 
 #, c-format
 msgid "E180: Invalid complete value: %s"
-msgstr "E180: 不完整的值: '%s'"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: 不正确的属性: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: 命令名称不正确"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: 用户自定义命令必须以大写字母开始"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: 没有用户自定义的命令: %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 @@ msgid "Save Setup"
 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 "E194: No alternate file name to substitute for '#'"
+msgstr "E194: 没有用于替换 '#' 的交替文件名"
+
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: 没有用于替换 \"<afile>\" 的自动命令文件名"
+
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: 没有用于替换 \"<abuf>\" 的自动命令缓冲区号"
+
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: 没有用于替换 \"<amatch>\" 的自动命令匹配名"
+
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: 没有用于替换 \"<sfile>\" 的 :source 文件名"
+
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' 或 '#' 为空文件名,只能用于 \":p:h\""
+
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: 结果为空字符串"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: 无法打开并读取 viminfo 文件"
+
+msgid "E196: No digraphs in this version"
+msgstr "E196: 此版本无复合字符(digraph)"
+
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: 不能 :throw 前缀为 'Vim' 的异常"
+
+#. 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 "E194: No alternate file name to substitute for '#'"
-msgstr "E194: 没有 '#' 可替代的文件名"
-
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "没有 Autocommand 文件名以替换 \"<afile>\""
-
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "没有 Autocommand 缓冲区名称以替换 \"<abuf>\""
-
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "没有 Autocommand Match name 以替换 \"<amatch>\""
-
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "没有 :source 文件名以替换 \"<sfile>\""
-
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' 或 '#' 指向空文件名,只能用於 \":p:h\""
-
-msgid "Evaluates to an empty string"
-msgstr "输入为空字符串"
-
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: 不能读取 viminfo"
-
-msgid "E196: No digraphs in this version"
-msgstr "E196: 本版本无复合字符(digraph)"
+msgstr "E193: :endfunction 不在函数内"
 
 msgid "tagname"
-msgstr "标签名称"
+msgstr "tag 名"
 
 msgid " kind file\n"
-msgstr "类文件\n"
+msgstr " 类型 文件\n"
 
 msgid "'history' option is zero"
-msgstr "选项 'history' 是零"
-
-#, c-format
+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 @@ msgid "E198: cmd_pchar beyond the comman
 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 @@ msgid "is not a file"
 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 @@ msgid "[RO]"
 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 @@ msgstr "[已转换]"
 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 "Can't write to backup file (use ! to override)"
-msgstr "不能写备份文件 (请使用 ! 强制执行)"
-
-msgid "Close error for backup file (use ! to override)"
-msgstr "关闭备份文件出错 (请使用 ! 强制执行)"
-
-msgid "Can't read file for backup (use ! to override)"
-msgstr "不能读取文件以供备份 (请使用 ! 强制执行)"
-
-msgid "Cannot create backup file (use ! to override)"
-msgstr "不能创建备份文件 (请使用 ! 强制执行)"
-
-msgid "Can't make backup file (use ! to override)"
-msgstr "不能作备份文件 (请使用 ! 强制执行)"
-
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork 会消失 (请使用 ! 强制执行)"
+msgid "is read-only (add ! to override)"
+msgstr "只读 (请加 ! 强制执行)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: 无法写入备份文件 (请加 ! 强制执行)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: 关闭备份文件出错 (请加 ! 强制执行)"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: 无法读取文件以供备份 (请加 ! 强制执行)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: 无法创建备份文件 (请加 ! 强制执行)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: 无法生成备份文件 (请加 ! 强制执行)"
+
+#, 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: 找不到写入用的交换文件"
-
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: 不能转换 (请使用 ! 强制不转换写入)"
+msgstr "E214: 找不到用于写入的临时文件"
+
+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: 不能以写入模式打开"
-
-msgid "Close failed"
-msgstr "关闭失败"
-
-msgid "write error, conversion failed"
-msgstr "不能写入 -- 转换失败"
-
-msgid "write error (file system full?)"
-msgstr "写入错误 (文件系统已满?)"
+msgstr "E212: 无法打开并写入文件"
+
+msgid "E667: Fsync failed"
+msgstr "E667: 同步失败"
+
+msgid "E512: Close failed"
+msgstr "E512: 关闭失败"
+
+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 @@ msgid "[New]"
 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 @@ msgid "[unix format]"
 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 @@ msgstr "[最后一行不完整]"
 #. 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 删除缓冲区"
-
-#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: 警告: 文件 \"%s\" 已经不存在"
+msgstr "E246: FileChangedShell 自动命令删除了缓冲区"
+
+#, c-format
+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 @@ msgstr ""
 "加载文件(&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: 缺少 }."
-
-msgid "No fold found"
-msgstr "找不到任何 fold"
+msgstr "E220: 缺少 }。"
+
+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"
-
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: 选项 'commentstring' 未设定"
+msgstr "E351: 不能在当前的 'foldmethod' 下删除折叠"
+
+#, 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 "<不能打开>"
-
-#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: 不能使用 %s 字体"
-
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: 不能回到目前目录"
+msgstr "<无法打开>"
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: 无法获取字体 %s"
+
+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 @@ msgid "Vim dialog"
 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'"
-
-msgid "Error"
-msgstr "错误"
-
-msgid "&Ok"
-msgstr "确定(&O)"
+msgstr "E231: 无效的 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' 的值无效"
+
+#, 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 @@ msgstr "向上"
 msgid "Down"
 msgstr "向下"
 
-#. 'Find Next' button
 msgid "Find Next"
-msgstr "找下一个"
-
-#. 'Replace' button
+msgstr "查找下一个"
+
 msgid "Replace"
 msgstr "替换"
 
-#. 'Replace All' button
 msgid "Replace All"
-msgstr "替换全部"
-
-msgid "E233: cannot open display"
-msgstr "E233: <不能打开 X Server DISPLAY>"
-
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: 不正确的字符集 (Fontset): %s"
+msgstr "全部替换"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: 从会话管理器收到 \"die\" 请求\n"
+
+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 "过滤(&F)"
+
+msgid "&Cancel"
+msgstr "取消(&C)"
+
+msgid "Directories"
+msgstr "目录"
 
 msgid "Filter"
 msgstr "过滤器"
 
-msgid "Directories"
-msgstr "目录"
-
-msgid "Help"
-msgstr "帮助"
+msgid "&Help"
+msgstr "帮助(&H)"
 
 msgid "Files"
 msgstr "文件"
 
+msgid "&OK"
+msgstr "确定(&O)"
+
 msgid "Selection"
 msgstr "选择"
 
-msgid "Undo"
-msgstr "撤消"
-
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: 不能打开 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 "Find &Next"
+msgstr "查找下一个(&N)"
+
+msgid "&Replace"
+msgstr "替换(&R)"
+
+msgid "Replace &All"
+msgstr "全部替换(&A)"
+
+msgid "&Undo"
+msgstr "撤销(&U)"
+
+#, c-format
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: 无法加载 Zap 字体 '%s'"
+
+#, c-format
+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 @@ msgid "Font1: %s\n"
 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 @@ msgid ""
 "Font1 width: %ld\n"
 "\n"
 msgstr ""
-"字体1宽度: %ld\n"
+"字体1的宽度: %ld\n"
 "\n"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: 不能配置颜色 %s"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: 不能读取 sign data!"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "不正确的字体集(Fontset)"
+
+#~ 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 错误"
 
-#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "E550: Missing colon"
+msgstr "E550: 缺少冒号"
+
+msgid "E551: Illegal component"
+msgstr "E551: 无效的部分"
+
+msgid "E552: digit expected"
+msgstr "E552: 应该要有数字"
+
+#, c-format
+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 "显示连接"
 
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: 用法: cs[cope] %s"
+
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "这个 cscope 命令不支持分割屏幕\n"
-
-msgid "Usage: cstag <ident>"
-msgstr "用法: cstag <识别字>"
+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"
-
-#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s 不是目录或 cscope 数据库"
-
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "读取 cscope 连接 %d 时错误"
-
-msgid "unknown cscope search type"
-msgstr "未知的 cscope 查找形态"
-
-msgid "Could not create cscope pipes"
-msgstr "不能创建与 cscope 连接的管道"
+msgstr "添加了 cscope 数据库 %s"
+
+#, c-format
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: 读取 cscope 连接 %ld 出错"
+
+msgid "E561: unknown cscope search type"
+msgstr "E561: 未知的 cscope 查找类型"
+
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: 无法创建 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)"
-
-msgid "no cscope connections"
-msgstr "没有 cscope 连接"
+msgstr "cs_create_connection: fdopen fr_fp 失败"
+
+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 "duplicate cscope database not added"
-msgstr "重复的 cscope 数据库未被加入"
-
-msgid "maximum number of cscope connections reached"
-msgstr "已达到 cscope 最大连接数目"
-
-msgid "E260: cscope connection not found"
-msgstr "E260: 找不到 cscope 连接"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (用法: %s)"
+
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: 无法打开 cscope 数据库: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: 无法获取 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"
+#, c-format
+msgid "cscope connection %s closed"
+msgstr "cscope 连接 %s 已关闭"
 
 #. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches 严重错误"
-
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: 读取 cscope 连接 %d 错误"
-
-msgid "couldn't malloc\n"
-msgstr "不能使用 malloc\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope 标签(tag): %s\n"
-
-msgid "   #   line"
-msgstr "   #   行  "
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches 严重错误"
+
+#, c-format
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
+
+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"
-
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <无>\n"
+msgstr " # pid    数据库名                            prepend path\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 @@ msgstr "<窗口 %d>"
 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 @@ msgid "Sniff: Error during write. Discon
 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 @@ msgid "vim error"
 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 命令: 找不到缓冲区/窗口"
-
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "此命令不能使用, 因为无法加载 Tcl 程序库(Library)"
+msgstr "无法注册回调命令: 找不到缓冲区/窗口引用"
+
+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: 不能送出命令到目的地程序"
-
-#, c-format
-msgid "Invalid server id used: %s"
-msgstr "不正确的服务器 id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: 不能读取 VIM 的 注册表属性"
+msgstr "E248:  无法发送命令到目的程序"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: 使用了无效的服务器 id: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM 的注册表属性有误。已删除。"
-
-msgid "Unknown option"
-msgstr "不正确的选项"
+msgstr "E251: VIM 实例注册属性有误。已删除!"
+
+msgid "Unknown option argument"
+msgstr "未知的选项参数"
 
 msgid "Too many edit arguments"
-msgstr "太多编辑参数"
+msgstr "编辑参数过多"
 
 msgid "Argument missing after"
-msgstr "缺少必要的参数:"
-
-msgid "Garbage after option"
-msgstr "不能辨认此选项后的命令: "
-
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "太多 \"+command\" 或 \"-c command\" 参数"
+msgstr "缺少必要的参数"
+
+msgid "Garbage after option argument"
+msgstr "选项参数后的内容无效"
+
+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 @@ msgstr "pre-vimrc 命令行"
 
 #, 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 @@ msgid "-               read text from st
 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 @@ msgid ""
 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 @@ msgstr ""
 "参数:\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 @@ msgstr "-unregister\t\t取消 OLE 中的 gvim 注册"
 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 @@ msgid "-e\t\t\tEx mode (like \"ex\")"
 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 @@ msgid "-Z\t\t\tRestricted mode (like \"r
 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 @@ msgid "-l\t\t\tLisp mode"
 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 @@ msgid "-D\t\t\tDebugging mode"
 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> 做输入输出设备"
-
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\t启动为 希伯莱模式"
-
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\t启动为 Farsi 模式"
+msgstr "-dev <device>\t\t使用 <device> 进行输入输出"
+
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t以 Arabic 模式启动"
+
+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 个窗口 (预设是每个文件一个)"
-
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\t同 -o 但使用垂直分割"
+msgstr "-o[N]\t\t打开 N 个窗口 (默认值: 每个文件一个)"
+
+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"
-
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t在另一个 GTK 组件内打开 Vim"
-
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t编辑 Vim 服务器上的文件并退出"
+msgstr "-X\t\t\t不连接到 X Server"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t如有可能,在 Vim 服务器上编辑文件 <files>"
+
+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"
-
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t打印说明(也就是本信息)后退出"
-
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t打印版本信息后退出"
+msgstr "-i <viminfo>\t\t使用 <viminfo> 取代 .viminfo"
+
+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 ""
 "\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 @@ msgid ""
 "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 @@ msgid ""
 "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)"
-
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t显示 Gnome 相关参数"
+msgstr "-display <display>\t在 <display> 上运行 vim (也可用 --display)"
+
+#~ 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 @@ msgid ""
 "mark line  col file/text"
 msgstr ""
 "\n"
-"标记 行号  列  文件/文本"
+"标记   行   列 文件/文本"
 
 #. Highlight title
 msgid ""
@@ -2434,8 +3073,17 @@ msgid ""
 " 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 @@ msgstr ""
 "# 文件标记:\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 "缺少对应的 '>'"
-
-msgid "Not a valid codepage"
-msgstr "不正确的代码页"
+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\", 不可能恢复了"
-
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: 找不到块 0??"
+msgstr "E303: 无法打开 \"%s\" 的交换文件,恢复将不可能"
+
+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 @@ msgid "E307: %s does not look like a Vim
 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 @@ msgstr "使用交换文件 \"%s\""
 
 #, 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 @@ msgid "             dated: "
 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 @@ msgstr ""
 "           进程 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 @@ msgstr ""
 "         [不能在本机上使用]"
 
 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 @@ msgstr "E314: 保留失败"
 
 #, 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 @@ msgid "stack_idx should be 0"
 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 @@ msgstr "pe_line_count 为零"
 
 #, 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 @@ msgid "Stack size increases"
 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 @@ msgstr ""
 "发现交换文件 \""
 
 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 @@ msgid ""
 "    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: 菜单只能在其它模式中使用"
-
-msgid "E329: No menu of that name"
-msgstr "E329: 没有那样的菜单"
+msgstr "E328: 菜单只在其它模式中存在"
+
+#, 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 @@ msgstr ""
 "--- 菜单 ---"
 
 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 @@ msgstr "处理 %s 时发生错误:"
 
 #, c-format
 msgid "line %4ld:"
-msgstr "行 %4ld:"
-
-msgid "[string too long]"
-msgstr "[字符串太长]"
+msgstr "第 %4ld 行:"
+
+#, 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 @@ msgid ""
 "&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 @@ msgid ""
 "&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 @@ msgstr "打开文件对话框"
 
 #. 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 @@ msgid ""
 "[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 @@ msgstr "E341: 内部错误: lalloc(%ld, )"
 
 #, 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 "Illegal mode"
-msgstr "不正确的模式"
-
-msgid "Illegal mouseshape"
-msgstr "不正确的鼠标形状"
-
-msgid "digit expected"
-msgstr "应该为数字"
-
-msgid "Illegal percentage"
-msgstr "不正确的百分比"
+msgid "E545: Missing colon"
+msgstr "E545: 缺少冒号"
+
+msgid "E546: Illegal mode"
+msgstr "E546: 无效的模式"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: 无效的鼠标形状"
+
+msgid "E548: digit expected"
+msgstr "E548: 此处需要数字"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: 无效的百分比"
 
 msgid "Enter encryption key: "
 msgstr "输入密码: "
@@ -3097,17 +3785,17 @@ msgid "Enter same key again: "
 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 @@ msgstr "E346: 在路径中找不到更多的文件 \"%s\""
 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 @@ msgid "E349: No identifier under cursor"
 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 @@ msgstr ""
 "--- 寄存器 ---"
 
 msgid "Illegal register name"
-msgstr "不正确的寄存器名称"
-
+msgstr "无效的寄存器名"
+
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -3208,144 +3943,152 @@ msgstr ""
 "# 寄存器:\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)"
-
-#, 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"
-
-#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#, 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 "(+%ld for BOM)"
+#~ msgstr ""
+
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
 
 msgid "Thanks for flying Vim"
 msgstr "感谢您选择 Vim"
 
-msgid "Option not supported"
-msgstr "不支持该选项"
-
-msgid "Not allowed in a modeline"
-msgstr "不能在模式行里出现"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t当前设置: "
-
-msgid "Number required after ="
-msgstr "= 后需要有数字"
-
-msgid "Not found in termcap"
-msgstr "Termcap 里面找不到"
-
-#, c-format
-msgid "Illegal character <%s>"
-msgstr "不正确的字符 <%s>"
-
-msgid "Not allowed here"
-msgstr "这里不可使用"
-
-msgid "Cannot set 'term' to empty string"
-msgstr "不能设定 'term' 为空字符串"
-
-msgid "Cannot change term in GUI"
-msgstr "在图型界面中不能切换终端"
-
-msgid "Use \":gui\" to start the GUI"
-msgstr "输入 \":gui\" 来启动图形界面"
-
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' 跟 'patchmode' 是一样的"
-
-msgid "Zero length string"
-msgstr "零长度字符串"
-
-#, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> 后缺少数字"
-
-msgid "Missing comma"
-msgstr "缺少逗号"
-
-msgid "Must specify a ' value"
-msgstr "必需指定一个 ' 值"
-
-msgid "contains unprintable character"
-msgstr "包含不能显示的字符"
-
-msgid "Invalid font(s)"
-msgstr "不正确的字体"
-
-msgid "can't select fontset"
-msgstr "不能使用字体集(Fontset)"
-
-msgid "Invalid fontset"
-msgstr "不正确的字体集(Fontset)"
-
-msgid "can't select wide font"
-msgstr "不能使用设定的宽字体(Widefont)"
-
-msgid "Invalid wide font"
-msgstr "不正确的宽字体(Widefont)"
-
-#, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> 后有不正确的字符"
-
-msgid "comma required"
-msgstr "需要逗号"
-
-#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' 必需是空白或包含 %s"
-
-msgid "No mouse support"
-msgstr "不支持鼠标"
-
-msgid "Unclosed expression sequence"
-msgstr "没有结束的表达式: "
-
-msgid "too many items"
-msgstr "太多对象"
-
-msgid "unbalanced groups"
-msgstr "不对称的组"
-
-msgid "A preview window already exists"
-msgstr "预览窗口已经存在了"
-
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' 不能比 'winminheight' 更少"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' 不能比 'winminwidth' 更少"
-
-#, c-format
-msgid "Need at least %d lines"
-msgstr "至少需要 %d 行"
-
-#, c-format
-msgid "Need at least %d columns"
-msgstr "至少需要 %d 列"
+msgid "E518: Unknown option"
+msgstr "E518: 未知的选项"
+
+msgid "E519: Option not supported"
+msgstr "E519: 不支持该选项"
+
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: 不允许在 modeline 中使用"
+
+msgid "E521: Number required after ="
+msgstr "E521: = 后面需要数字"
+
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap 里面找不到"
+
+#, c-format
+msgid "E539: Illegal character <%s>"
+msgstr "E539: 无效的字符 <%s>"
+
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: 不能设定 'term' 为空字符串"
+
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: 在图形界面中不能改变终端"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: 请用 \":gui\" 启动图形界面"
+
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' 和 'patchmode' 相等"
+
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: 在 GTK+ 2 图形界面中不能更改"
+
+msgid "E524: Missing colon"
+msgstr "E524: 缺少冒号"
+
+msgid "E525: Zero length string"
+msgstr "E525: 字符串长度为零"
+
+#, c-format
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> 后面缺少数字"
+
+msgid "E527: Missing comma"
+msgstr "E527: 缺少逗号"
+
+msgid "E528: Must specify a ' value"
+msgstr "E528: 必须指定一个 ' 值"
+
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: 包含不可显示字符或宽字符"
+
+msgid "E596: Invalid font(s)"
+msgstr "E596: 无效的字体"
+
+msgid "E597: can't select fontset"
+msgstr "E597: 无法选择 Fontset"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: 无效的 Fontset"
+
+msgid "E533: can't select wide font"
+msgstr "E533: 无法选择宽字体"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: 无效的宽字体"
+
+#, c-format
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> 后面有无效的字符"
+
+msgid "E536: comma required"
+msgstr "E536: 需要逗号"
+
+#, c-format
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' 必须为空或包含 %s"
+
+msgid "E538: No mouse support"
+msgstr "E538: 不支持鼠标"
+
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: 没有结束的表达式序列"
+
+msgid "E541: too many items"
+msgstr "E541: 项目过多"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: 错乱的组"
+
+msgid "E590: A preview window already exists"
+msgstr "E590: 预览窗口已存在"
+
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic 需要 UTF-8,请执行 ':set encoding=utf-8'"
+
+#, c-format
+msgid "E593: Need at least %d lines"
+msgstr "E593: 至少需要 %d 行"
+
+#, c-format
+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 @@ msgid ""
 "--- Global option values ---"
 msgstr ""
 "\n"
-"--- 全局 选项值 ---"
+"--- 全局选项值 ---"
 
 msgid ""
 "\n"
 "--- Local option values ---"
 msgstr ""
 "\n"
-"--- 本地 选项值 ---"
+"--- 局部选项值 ---"
 
 msgid ""
 "\n"
@@ -3412,9 +4155,6 @@ msgstr "Vim 返回值: %d\n"
 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 @@ msgstr "I/O 错误"
 #~ 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 @@ msgid "to %s on %s"
 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 @@ msgstr "Vim: 双重信号, 退出中\n"
 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 @@ msgstr ""
 "\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 @@ msgid ""
 msgstr ""
 "在你的 $PATH 中找不到 VIMRUN.EXE.\n"
 "外部命令执行完毕后将不会暂停.\n"
-"进一步说明请执行 :help win32-vimrun "
+"进一步说明请见 :help win32-vimrun"
 
 msgid "Vim Warning"
 msgstr "Vim 警告"
@@ -3621,8 +4384,8 @@ msgstr "E378: 'errorformat' 未设定"
 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 @@ msgid " (line deleted)"
 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 没有接东西"
-
-#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "语法错误: %s{...}"
-
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: 不能执行; regular expression 太复杂?"
-
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression 造成堆栈用光的错误"
+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 "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ 后缺少 ]"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: 空的 %s%%[]"
+
+#, 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 @@ msgid " REPLACE"
 msgstr " 替换"
 
 msgid " REVERSE"
-msgstr " 反转"
+msgstr " 反向"
 
 msgid " INSERT"
 msgstr " 插入"
@@ -3695,10 +4530,13 @@ msgid " (replace)"
 msgstr " (替换)"
 
 msgid " (vreplace)"
-msgstr " (v-替换)"
+msgstr " (V-替换)"
 
 msgid " Hebrew"
-msgstr " 希伯莱"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
 
 msgid " (lang)"
 msgstr " (语言)"
@@ -3706,30 +4544,30 @@ msgstr " (语言)"
 msgid " (paste)"
 msgstr " (粘帖)"
 
-msgid " SELECT"
-msgstr " 选取"
-
 msgid " VISUAL"
 msgstr " 可视"
 
-msgid " BLOCK"
-msgstr " 块"
-
-msgid " LINE"
-msgstr " 行"
+msgid " VISUAL 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 @@ msgstr "  找不到"
 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 @@ msgstr "E388: 找不到定义"
 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,6 +5031,20 @@ msgstr "最小"
 msgid "maximal "
 msgstr "最大"
 
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "匹配 %d"
+
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "少于一行"
+
+msgid "E395: contains argument not accepted here"
+msgstr "E395: 使用了不正确的参数"
+
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: 使用了不正确的参数"
+
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: 使用了不正确的参数"
 
@@ -3841,18 +5052,16 @@ msgstr "E393: 使用了不正确的参数"
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: 找不到 %s 的 region item"
 
-msgid "E395: contains argument not accepted here"
-msgstr "E395: 使用了不正确的参数"
-
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: 使用了不正确的参数"
-
 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 @@ msgstr "E403: 语法同步: 连接行符号指定了两次"
 
 #, 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 @@ msgstr "E405: 缺少等号: %s"
 
 #, 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 @@ msgstr "E409: 不正确的组名: %s"
 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 @@ msgstr "E422: 终端编码太长: %s"
 
 #, 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 "at top of tag stack"
-msgstr "标签(tag)堆栈开头"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
+
+#, 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 @@ msgstr "  # pri kind tag"
 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 @@ msgstr "文件 \"%s\" 不存在"
 #. 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 @@ msgstr ""
 "\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 @@ msgstr "E431: Tag 文件 \"%s\" 格式错误"
 
 #, c-format
 msgid "Before byte %ld"
-msgstr "在 %ld 字节之前"
+msgstr "在第 %ld 字节之前"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@ msgid "E433: No tags file"
 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 "预设: '"
-
-msgid "Cannot open termcap file"
-msgstr "不能打开 termcap 文件"
-
-msgid "Terminal entry not found in terminfo"
-msgstr "在terminfo中未找到终端项"
-
-msgid "Terminal entry not found in termcap"
-msgstr "在termcap中未找到终端项"
+msgstr "默认值为: '"
+
+msgid "E557: Cannot open termcap file"
+msgstr "E557: 无法打开 termcap 文件"
+
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: 在 terminfo 中找不到终端项"
+
+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 @@ msgstr "Vim: 读错误,退出中...\n"
 
 #. 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 "一项改变"
-
-#, c-format
-msgid "%ld changes"
-msgstr "%ld 项改变"
+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 %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 @@ msgid ""
 "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 @@ msgid ""
 "Included patches: "
 msgstr ""
 "\n"
-"加入补丁: "
+"包含补丁: "
+
+msgid "Modified by "
+msgstr "修改者 "
 
 msgid ""
 "\n"
@@ -4195,14 +5441,14 @@ msgstr ""
 "编译"
 
 msgid "by "
-msgstr "者:"
+msgstr "者 "
 
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 "\n"
-"超强版本 "
+"巨型版本 "
 
 msgid ""
 "\n"
@@ -4216,96 +5462,102 @@ msgid ""
 "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 @@ msgid "Compiler: "
 msgstr "编译器: "
 
 msgid "Linking: "
-msgstr "链结方式: "
+msgstr "链接方式: "
 
 msgid "  DEBUG BUILD"
 msgstr "  调试版本"
@@ -4323,49 +5575,84 @@ msgid "VIM - Vi IMproved"
 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>         "
-
-msgid "type  :help version6<Enter>   for version info"
-msgstr "新版本信息请输入              :help version6<Enter>"
+msgstr "输入  :help<Enter>  或  <F1>  查看在线帮助    "
+
+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 @@ msgstr "E446: 光标处没有文件名"
 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 "Argument required"
-msgstr "需要指令参数"
+msgid "E470: Command aborted"
+msgstr "E470: 命令被中止"
+
+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: 文件已经存在 (可用 ! 强制替换)"
-
-msgid "Command failed"
-msgstr "命令执行失败"
-
-msgid "Internal error"
-msgstr "内部错误"
+msgstr "E13: 文件已存在 (请加 ! 强制执行)"
+
+msgid "E472: Command failed"
+msgstr "E472: 命令执行失败"
+
+#, 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: 不正确的地址"
-
-msgid "Invalid argument"
-msgstr "不正确的参数"
-
-#, c-format
-msgid "Invalid argument: %s"
-msgstr "不正确的参数: %s"
+msgstr "E14: 无效的地址"
+
+msgid "E474: Invalid argument"
+msgstr "E474: 无效的参数"
+
+#, c-format
+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: 不正确的范围"
-
-msgid "Invalid command"
-msgstr "不正确的命令"
+msgstr "E16: 无效的范围"
+
+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 对应"
-
-msgid "No ! allowed"
-msgstr "不可使用 '!'"
+msgstr "E24: 没有这个缩写"
+
+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 对应"
-
-msgid "No match"
-msgstr "找不到"
-
-#, c-format
-msgid "No match: %s"
-msgstr "找不到: %s"
+msgstr "E31: 没有这个映射"
+
+msgid "E479: No match"
+msgstr "E479: 没有匹配"
+
+#, c-format
+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: 没有前一个查找命令"
-
-msgid "No range allowed"
-msgstr "不可使用范围命令"
+msgstr "E35: 没有前一个正则表达式"
+
+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 "不能得到临时文件名"
-
-#, c-format
-msgid "Can't open file %s"
-msgstr "不能打开文件 %s"
-
-#, c-format
-msgid "Can't read file %s"
-msgstr "不能读取文件 %s"
-
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: 文件内容已改变但尚未保存 (可用 ! 强制执行)"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: 没有名叫 \"%s\" 的已注册的服务器"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: 无法创建文件 %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: 无法获取临时文件名"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: 无法打开文件 %s"
+
+#, 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 "Argument must be positive"
-msgstr "参数应该是正数"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: 找不到模式: %s"
+
+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: 正则表达式有问题"
-
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: 设定 'readonly' 选项(只读) (可用 ! 强制执行)"
-
-#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: 不能设定只读变量 \"%s\""
+msgstr "E44: 已损坏的正则表达式程序"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 已设定选项 'readonly' (请加 ! 强制执行)"
+
+#, c-format
+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: 太多文件名"
-
-msgid "Trailing characters"
-msgstr "你输入了多余的字符"
+msgstr "E77: 文件名过多"
+
+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 图形界面。"
--- 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: 不能分配缓冲区,使用另一个缓冲区...."
-
-msgid "No buffers were unloaded"
-msgstr "没有释放任何缓冲区"
-
-msgid "No buffers were deleted"
-msgstr "没有删除任何缓冲区"
-
-msgid "No buffers were wiped out"
-msgstr "没有删除任何缓冲区"
+msgstr "E83: 无法分配缓冲区,使用另一个缓冲区..."
+
+msgid "E515: No buffers were unloaded"
+msgstr "E515: 没有释放任何缓冲区"
+
+msgid "E516: No buffers were deleted"
+msgstr "E516: 没有删除任何缓冲区"
+
+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 @@ msgid "E85: There is no listed buffer"
 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: 不能切换到更前面的缓冲区"
-
-#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: 已更改过缓冲区 %ld 但尚未保存 (可用 ! 强制执行)"
+msgstr "E88: 无法切换,已是第一个缓冲区"
+
+#, c-format
+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 @@ msgstr "[只读]"
 
 #, 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%%-- 列 "
-
-msgid "[No file]"
+msgstr "行 %ld / %ld --%d%%-- 列 "
+
+msgid "[No Name]"
 msgstr "[未命名]"
 
 #. must be a help buffer
 msgid "help"
-msgstr "[帮助]"
-
-msgid "[help]"
+msgstr "帮助"
+
+msgid "[Help]"
 msgstr "[帮助]"
 
 msgid "[Preview]"
@@ -150,6 +150,7 @@ msgstr "底端"
 msgid "Top"
 msgstr "顶端"
 
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -157,22 +158,22 @@ msgstr ""
 "\n"
 "# 缓冲区列表:\n"
 
-msgid "[Error List]"
-msgstr "[错误列表]"
-
-msgid "[No File]"
-msgstr "[未命名]"
+msgid "[Location List]"
+msgstr "[Location 列表]"
+
+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 @@ msgstr "    行=%ld  id=%d  名称=%s"
 
 #, 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 "
-
-msgid " Keyword completion (^N/^P)"
-msgstr " 关键字自动完成 (^N/^P)"
+msgstr "E105: 不是在脚本文件中使用 :loadkeymap "
+
+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)"
-
-#. 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 " File name completion (^F/^N/^P)"
-msgstr " 文件名自动完成 (^F/^N/^P)"
-
-msgid " Tag 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 " Dictionary completion (^K/^N/^P)"
-msgstr " 字典自动完成 (^K/^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 " ^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 " Whole line completion (^L^N^P)"
+msgstr " 整行补全 (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " 文件名补全 (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag 补全 (^]^N^P)"
+
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " 路径模式补全 (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " 定义补全 (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary 补全 (^K^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 " 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 @@ msgstr " (替换) Scroll (^E/^Y)"
 
 #, c-format
 msgid "Scanning: %s"
-msgstr "扫描中: %s"
-
+msgstr "正在扫描: %s"
+
+#, c-format
 msgid "Scanning tags."
 msgstr "扫描标签."
 
@@ -287,45 +297,157 @@ msgstr " 增加"
 #. * 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"
 
-#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 未定义的变量: \"%s\""
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let 中出现异常字符"
+
+#, c-format
+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 "E691: Can only compare List with List"
+msgstr "E691: 只能比较 List 和 List"
+
+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 "E111: Missing ']'"
-msgstr "E111: 缺少对应的 \"]\""
+msgstr "E110: 缺少 ')'"
+
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: 不能索引一个 Funcref"
 
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@ msgstr "E112: 缺少选项名称: %s"
 
 #, c-format
 msgid "E113: Unknown option: %s"
-msgstr "E113: 不正确的选项: %s"
+msgstr "E113: 未知的选项: %s"
 
 #, c-format
 msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@ msgid "E115: Missing quote: %s"
 msgstr "E115: 缺少引号: %s"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 函数 %s 的参数不正确"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未定义的函数: %s"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 函数 %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> 不能在 script 上下文外使用: %s"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List 中缺少逗号: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List 缺少结束符 ']': %s"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary 中缺少冒号: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary 中出现重复的键: \"%s\""
+
+#, c-format
+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 @@ msgstr ""
 "确定(&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 尚未定义"
-
-#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: 函数 %s 已经存在, 请使用 ! 强制替换"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 函数 %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 "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref 变量名必须以大写字母开头: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 变量名与已有函数名冲突: %s"
+
+#, c-format
+msgid "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 "函数 "
-
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: 函数 %s 尚未定义"
+msgstr "E129: 需要函数名"
+
+#, c-format
+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'"
-
-#. always scroll up, don't overwrite
+msgstr "E132: 函数调用深度超出 'maxfuncdepth'"
+
 #, 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 必须在函数里使用"
+#, c-format
+msgid "%s aborted"
+msgstr "%s 已中止"
 
 #, c-format
 msgid "%s returning #%ld"
-msgstr "%s 返回值 #%ld "
-
-#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s 返回值 \"%s\""
-
+msgstr "%s 返回 #%ld "
+
+#, c-format
+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 @@ msgstr ""
 "\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\""
-
-msgid "Run Macro"
-msgstr "执行宏"
+msgstr "在 'runtimepath' 中找不到 \"%s\""
+
+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 @@ msgstr "第 %ld 行: 不能执行 \"%s\""
 
 #, 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 @@ msgstr "E197: 不能设定语言为 \"%s\""
 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"
-
-#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s 在行中: "
+msgstr "[已修改但尚未保存]\n"
+
+#, c-format
+# 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 @@ msgstr " 失败"
 
 #, 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 @@ msgid "E140: Use ! to write partial buff
 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 @@ msgid "E145: Shell commands not allowed 
 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"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+msgstr "E153: 无法打开并读取 %s"
+
+#, c-format
+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\" 以回到正常模式."
-
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "已到文件结尾"
+msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
+
+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 "函数结尾"
-
-msgid "Ambiguous use of user-defined command"
-msgstr "用户定义的命令会混淆"
-
-msgid "Not an editor command"
-msgstr "不是编辑器的命令"
-
-msgid "Don't panic!"
-msgstr "不要惊慌!"
-
-msgid "Backwards range given"
-msgstr "指定了向前参考的范围"
+msgstr "函数结束"
+
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: 不确定的用户自定义命令"
+
+msgid "E492: Not an editor command"
+msgstr "E492: 不是编辑器的命令"
+
+msgid "E493: Backwards range given"
+msgstr "E493: 使用了逆向的范围"
 
 msgid "Backwards range given, OK to swap"
-msgstr "指定了向前参考的范围,OK to swap"
-
-msgid "Use w or w>>"
-msgstr "请使用 w 或 w>>"
+msgstr "使用了逆向的范围,确定交换吗"
+
+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: 计数的缺省值不正确"
-
-msgid "E179: argument required for complete"
-msgstr "E179: 指令需要参数才能完成"
+msgstr "E178: 无效的计数默认值"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete 需要参数"
+
+#, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: 无效的属性: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: 无效的命令名"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: 用户自定义命令必须以大写字母开头"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: 没有这个用户自定义命令: %s"
 
 #, c-format
 msgid "E180: Invalid complete value: %s"
-msgstr "E180: 不完整的值: '%s'"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: 不正确的属性: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: 命令名称不正确"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: 用户自定义命令必须以大写字母开始"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: 没有用户自定义的命令: %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 @@ msgid "Save Setup"
 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 "E194: No alternate file name to substitute for '#'"
+msgstr "E194: 没有用于替换 '#' 的交替文件名"
+
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: 没有用于替换 \"<afile>\" 的自动命令文件名"
+
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: 没有用于替换 \"<abuf>\" 的自动命令缓冲区号"
+
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: 没有用于替换 \"<amatch>\" 的自动命令匹配名"
+
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: 没有用于替换 \"<sfile>\" 的 :source 文件名"
+
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' 或 '#' 为空文件名,只能用于 \":p:h\""
+
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: 结果为空字符串"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: 无法打开并读取 viminfo 文件"
+
+msgid "E196: No digraphs in this version"
+msgstr "E196: 此版本无复合字符(digraph)"
+
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: 不能 :throw 前缀为 'Vim' 的异常"
+
+#. 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 "E194: No alternate file name to substitute for '#'"
-msgstr "E194: 没有 '#' 可替代的文件名"
-
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "没有 Autocommand 文件名以替换 \"<afile>\""
-
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "没有 Autocommand 缓冲区名称以替换 \"<abuf>\""
-
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "没有 Autocommand Match name 以替换 \"<amatch>\""
-
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "没有 :source 文件名以替换 \"<sfile>\""
-
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' 或 '#' 指向空文件名,只能用於 \":p:h\""
-
-msgid "Evaluates to an empty string"
-msgstr "输入为空字符串"
-
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: 不能读取 viminfo"
-
-msgid "E196: No digraphs in this version"
-msgstr "E196: 本版本无复合字符(digraph)"
+msgstr "E193: :endfunction 不在函数内"
 
 msgid "tagname"
-msgstr "标签名称"
+msgstr "tag 名"
 
 msgid " kind file\n"
-msgstr "类文件\n"
+msgstr " 类型 文件\n"
 
 msgid "'history' option is zero"
-msgstr "选项 'history' 是零"
-
-#, c-format
+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 @@ msgid "E198: cmd_pchar beyond the comman
 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 @@ msgid "is not a file"
 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 @@ msgid "[RO]"
 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 @@ msgstr "[已转换]"
 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 "Can't write to backup file (use ! to override)"
-msgstr "不能写备份文件 (请使用 ! 强制执行)"
-
-msgid "Close error for backup file (use ! to override)"
-msgstr "关闭备份文件出错 (请使用 ! 强制执行)"
-
-msgid "Can't read file for backup (use ! to override)"
-msgstr "不能读取文件以供备份 (请使用 ! 强制执行)"
-
-msgid "Cannot create backup file (use ! to override)"
-msgstr "不能创建备份文件 (请使用 ! 强制执行)"
-
-msgid "Can't make backup file (use ! to override)"
-msgstr "不能作备份文件 (请使用 ! 强制执行)"
-
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork 会消失 (请使用 ! 强制执行)"
+msgid "is read-only (add ! to override)"
+msgstr "只读 (请加 ! 强制执行)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: 无法写入备份文件 (请加 ! 强制执行)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: 关闭备份文件出错 (请加 ! 强制执行)"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: 无法读取文件以供备份 (请加 ! 强制执行)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: 无法创建备份文件 (请加 ! 强制执行)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: 无法生成备份文件 (请加 ! 强制执行)"
+
+#, 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: 找不到写入用的交换文件"
-
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: 不能转换 (请使用 ! 强制不转换写入)"
+msgstr "E214: 找不到用于写入的临时文件"
+
+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: 不能以写入模式打开"
-
-msgid "Close failed"
-msgstr "关闭失败"
-
-msgid "write error, conversion failed"
-msgstr "不能写入 -- 转换失败"
-
-msgid "write error (file system full?)"
-msgstr "写入错误 (文件系统已满?)"
+msgstr "E212: 无法打开并写入文件"
+
+msgid "E667: Fsync failed"
+msgstr "E667: 同步失败"
+
+msgid "E512: Close failed"
+msgstr "E512: 关闭失败"
+
+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 @@ msgid "[New]"
 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 @@ msgid "[unix format]"
 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 @@ msgstr "[最后一行不完整]"
 #. 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 删除缓冲区"
-
-#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: 警告: 文件 \"%s\" 已经不存在"
+msgstr "E246: FileChangedShell 自动命令删除了缓冲区"
+
+#, c-format
+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 @@ msgstr ""
 "加载文件(&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: 缺少 }."
-
-msgid "No fold found"
-msgstr "找不到任何 fold"
+msgstr "E220: 缺少 }。"
+
+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"
-
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: 选项 'commentstring' 未设定"
+msgstr "E351: 不能在当前的 'foldmethod' 下删除折叠"
+
+#, 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 "<不能打开>"
-
-#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: 不能使用 %s 字体"
-
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: 不能回到目前目录"
+msgstr "<无法打开>"
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: 无法获取字体 %s"
+
+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 @@ msgid "Vim dialog"
 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'"
-
-msgid "Error"
-msgstr "错误"
-
-msgid "&Ok"
-msgstr "确定(&O)"
+msgstr "E231: 无效的 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' 的值无效"
+
+#, 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 @@ msgstr "向上"
 msgid "Down"
 msgstr "向下"
 
-#. 'Find Next' button
 msgid "Find Next"
-msgstr "找下一个"
-
-#. 'Replace' button
+msgstr "查找下一个"
+
 msgid "Replace"
 msgstr "替换"
 
-#. 'Replace All' button
 msgid "Replace All"
-msgstr "替换全部"
-
-msgid "E233: cannot open display"
-msgstr "E233: <不能打开 X Server DISPLAY>"
-
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: 不正确的字符集 (Fontset): %s"
+msgstr "全部替换"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: 从会话管理器收到 \"die\" 请求\n"
+
+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 "过滤(&F)"
+
+msgid "&Cancel"
+msgstr "取消(&C)"
+
+msgid "Directories"
+msgstr "目录"
 
 msgid "Filter"
 msgstr "过滤器"
 
-msgid "Directories"
-msgstr "目录"
-
-msgid "Help"
-msgstr "帮助"
+msgid "&Help"
+msgstr "帮助(&H)"
 
 msgid "Files"
 msgstr "文件"
 
+msgid "&OK"
+msgstr "确定(&O)"
+
 msgid "Selection"
 msgstr "选择"
 
-msgid "Undo"
-msgstr "撤消"
-
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: 不能打开 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 "Find &Next"
+msgstr "查找下一个(&N)"
+
+msgid "&Replace"
+msgstr "替换(&R)"
+
+msgid "Replace &All"
+msgstr "全部替换(&A)"
+
+msgid "&Undo"
+msgstr "撤销(&U)"
+
+#, c-format
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: 无法加载 Zap 字体 '%s'"
+
+#, c-format
+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 @@ msgid "Font1: %s\n"
 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 @@ msgid ""
 "Font1 width: %ld\n"
 "\n"
 msgstr ""
-"字体1宽度: %ld\n"
+"字体1的宽度: %ld\n"
 "\n"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: 不能配置颜色 %s"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: 不能读取 sign data!"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "不正确的字体集(Fontset)"
+
+#~ 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 错误"
 
-#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "E550: Missing colon"
+msgstr "E550: 缺少冒号"
+
+msgid "E551: Illegal component"
+msgstr "E551: 无效的部分"
+
+msgid "E552: digit expected"
+msgstr "E552: 应该要有数字"
+
+#, c-format
+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 "显示连接"
 
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: 用法: cs[cope] %s"
+
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "这个 cscope 命令不支持分割屏幕\n"
-
-msgid "Usage: cstag <ident>"
-msgstr "用法: cstag <识别字>"
+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"
-
-#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s 不是目录或 cscope 数据库"
-
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "读取 cscope 连接 %d 时错误"
-
-msgid "unknown cscope search type"
-msgstr "未知的 cscope 查找形态"
-
-msgid "Could not create cscope pipes"
-msgstr "不能创建与 cscope 连接的管道"
+msgstr "添加了 cscope 数据库 %s"
+
+#, c-format
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: 读取 cscope 连接 %ld 出错"
+
+msgid "E561: unknown cscope search type"
+msgstr "E561: 未知的 cscope 查找类型"
+
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: 无法创建 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)"
-
-msgid "no cscope connections"
-msgstr "没有 cscope 连接"
+msgstr "cs_create_connection: fdopen fr_fp 失败"
+
+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 "duplicate cscope database not added"
-msgstr "重复的 cscope 数据库未被加入"
-
-msgid "maximum number of cscope connections reached"
-msgstr "已达到 cscope 最大连接数目"
-
-msgid "E260: cscope connection not found"
-msgstr "E260: 找不到 cscope 连接"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (用法: %s)"
+
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: 无法打开 cscope 数据库: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: 无法获取 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"
+#, c-format
+msgid "cscope connection %s closed"
+msgstr "cscope 连接 %s 已关闭"
 
 #. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches 严重错误"
-
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: 读取 cscope 连接 %d 错误"
-
-msgid "couldn't malloc\n"
-msgstr "不能使用 malloc\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope 标签(tag): %s\n"
-
-msgid "   #   line"
-msgstr "   #   行  "
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches 严重错误"
+
+#, c-format
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
+
+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"
-
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <无>\n"
+msgstr " # pid    数据库名                            prepend path\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 @@ msgstr "<窗口 %d>"
 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 @@ msgid "Sniff: Error during write. Discon
 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 @@ msgid "vim error"
 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 命令: 找不到缓冲区/窗口"
-
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "此命令不能使用, 因为无法加载 Tcl 程序库(Library)"
+msgstr "无法注册回调命令: 找不到缓冲区/窗口引用"
+
+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: 不能送出命令到目的地程序"
-
-#, c-format
-msgid "Invalid server id used: %s"
-msgstr "不正确的服务器 id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: 不能读取 VIM 的 注册表属性"
+msgstr "E248:  无法发送命令到目的程序"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: 使用了无效的服务器 id: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM 的注册表属性有误。已删除。"
-
-msgid "Unknown option"
-msgstr "不正确的选项"
+msgstr "E251: VIM 实例注册属性有误。已删除!"
+
+msgid "Unknown option argument"
+msgstr "未知的选项参数"
 
 msgid "Too many edit arguments"
-msgstr "太多编辑参数"
+msgstr "编辑参数过多"
 
 msgid "Argument missing after"
-msgstr "缺少必要的参数:"
-
-msgid "Garbage after option"
-msgstr "不能辨认此选项后的命令: "
-
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "太多 \"+command\" 或 \"-c command\" 参数"
+msgstr "缺少必要的参数"
+
+msgid "Garbage after option argument"
+msgstr "选项参数后的内容无效"
+
+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 @@ msgstr "pre-vimrc 命令行"
 
 #, 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 @@ msgid "-               read text from st
 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 @@ msgid ""
 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 @@ msgstr ""
 "参数:\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 @@ msgstr "-unregister\t\t取消 OLE 中的 gvim 注册"
 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 @@ msgid "-e\t\t\tEx mode (like \"ex\")"
 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 @@ msgid "-Z\t\t\tRestricted mode (like \"r
 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 @@ msgid "-l\t\t\tLisp mode"
 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 @@ msgid "-D\t\t\tDebugging mode"
 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> 做输入输出设备"
-
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\t启动为 希伯莱模式"
-
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\t启动为 Farsi 模式"
+msgstr "-dev <device>\t\t使用 <device> 进行输入输出"
+
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t以 Arabic 模式启动"
+
+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 个窗口 (预设是每个文件一个)"
-
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\t同 -o 但使用垂直分割"
+msgstr "-o[N]\t\t打开 N 个窗口 (默认值: 每个文件一个)"
+
+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"
-
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t在另一个 GTK 组件内打开 Vim"
-
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t编辑 Vim 服务器上的文件并退出"
+msgstr "-X\t\t\t不连接到 X Server"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t如有可能,在 Vim 服务器上编辑文件 <files>"
+
+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"
-
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t打印说明(也就是本信息)后退出"
-
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t打印版本信息后退出"
+msgstr "-i <viminfo>\t\t使用 <viminfo> 取代 .viminfo"
+
+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 ""
 "\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 @@ msgid ""
 "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 @@ msgid ""
 "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)"
-
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t显示 Gnome 相关参数"
+msgstr "-display <display>\t在 <display> 上运行 vim (也可用 --display)"
+
+#~ 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 @@ msgid ""
 "mark line  col file/text"
 msgstr ""
 "\n"
-"标记 行号  列  文件/文本"
+"标记   行   列 文件/文本"
 
 #. Highlight title
 msgid ""
@@ -2434,8 +3073,17 @@ msgid ""
 " 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 @@ msgstr ""
 "# 文件标记:\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 "缺少对应的 '>'"
-
-msgid "Not a valid codepage"
-msgstr "不正确的代码页"
+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\", 不可能恢复了"
-
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: 找不到块 0??"
+msgstr "E303: 无法打开 \"%s\" 的交换文件,恢复将不可能"
+
+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 @@ msgid "E307: %s does not look like a Vim
 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 @@ msgstr "使用交换文件 \"%s\""
 
 #, 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 @@ msgid "             dated: "
 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 @@ msgstr ""
 "           进程 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 @@ msgstr ""
 "         [不能在本机上使用]"
 
 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 @@ msgstr "E314: 保留失败"
 
 #, 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 @@ msgid "stack_idx should be 0"
 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 @@ msgstr "pe_line_count 为零"
 
 #, 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 @@ msgid "Stack size increases"
 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 @@ msgstr ""
 "发现交换文件 \""
 
 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 @@ msgid ""
 "    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: 菜单只能在其它模式中使用"
-
-msgid "E329: No menu of that name"
-msgstr "E329: 没有那样的菜单"
+msgstr "E328: 菜单只在其它模式中存在"
+
+#, 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 @@ msgstr ""
 "--- 菜单 ---"
 
 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 @@ msgstr "处理 %s 时发生错误:"
 
 #, c-format
 msgid "line %4ld:"
-msgstr "行 %4ld:"
-
-msgid "[string too long]"
-msgstr "[字符串太长]"
+msgstr "第 %4ld 行:"
+
+#, 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 @@ msgid ""
 "&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 @@ msgid ""
 "&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 @@ msgstr "打开文件对话框"
 
 #. 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 @@ msgid ""
 "[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 @@ msgstr "E341: 内部错误: lalloc(%ld, )"
 
 #, 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 "Illegal mode"
-msgstr "不正确的模式"
-
-msgid "Illegal mouseshape"
-msgstr "不正确的鼠标形状"
-
-msgid "digit expected"
-msgstr "应该为数字"
-
-msgid "Illegal percentage"
-msgstr "不正确的百分比"
+msgid "E545: Missing colon"
+msgstr "E545: 缺少冒号"
+
+msgid "E546: Illegal mode"
+msgstr "E546: 无效的模式"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: 无效的鼠标形状"
+
+msgid "E548: digit expected"
+msgstr "E548: 此处需要数字"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: 无效的百分比"
 
 msgid "Enter encryption key: "
 msgstr "输入密码: "
@@ -3097,17 +3785,17 @@ msgid "Enter same key again: "
 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 @@ msgstr "E346: 在路径中找不到更多的文件 \"%s\""
 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 @@ msgid "E349: No identifier under cursor"
 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 @@ msgstr ""
 "--- 寄存器 ---"
 
 msgid "Illegal register name"
-msgstr "不正确的寄存器名称"
-
+msgstr "无效的寄存器名"
+
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -3208,144 +3943,152 @@ msgstr ""
 "# 寄存器:\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)"
-
-#, 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"
-
-#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#, 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 "(+%ld for BOM)"
+#~ msgstr ""
+
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
 
 msgid "Thanks for flying Vim"
 msgstr "感谢您选择 Vim"
 
-msgid "Option not supported"
-msgstr "不支持该选项"
-
-msgid "Not allowed in a modeline"
-msgstr "不能在模式行里出现"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t当前设置: "
-
-msgid "Number required after ="
-msgstr "= 后需要有数字"
-
-msgid "Not found in termcap"
-msgstr "Termcap 里面找不到"
-
-#, c-format
-msgid "Illegal character <%s>"
-msgstr "不正确的字符 <%s>"
-
-msgid "Not allowed here"
-msgstr "这里不可使用"
-
-msgid "Cannot set 'term' to empty string"
-msgstr "不能设定 'term' 为空字符串"
-
-msgid "Cannot change term in GUI"
-msgstr "在图型界面中不能切换终端"
-
-msgid "Use \":gui\" to start the GUI"
-msgstr "输入 \":gui\" 来启动图形界面"
-
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' 跟 'patchmode' 是一样的"
-
-msgid "Zero length string"
-msgstr "零长度字符串"
-
-#, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> 后缺少数字"
-
-msgid "Missing comma"
-msgstr "缺少逗号"
-
-msgid "Must specify a ' value"
-msgstr "必需指定一个 ' 值"
-
-msgid "contains unprintable character"
-msgstr "包含不能显示的字符"
-
-msgid "Invalid font(s)"
-msgstr "不正确的字体"
-
-msgid "can't select fontset"
-msgstr "不能使用字体集(Fontset)"
-
-msgid "Invalid fontset"
-msgstr "不正确的字体集(Fontset)"
-
-msgid "can't select wide font"
-msgstr "不能使用设定的宽字体(Widefont)"
-
-msgid "Invalid wide font"
-msgstr "不正确的宽字体(Widefont)"
-
-#, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> 后有不正确的字符"
-
-msgid "comma required"
-msgstr "需要逗号"
-
-#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' 必需是空白或包含 %s"
-
-msgid "No mouse support"
-msgstr "不支持鼠标"
-
-msgid "Unclosed expression sequence"
-msgstr "没有结束的表达式: "
-
-msgid "too many items"
-msgstr "太多对象"
-
-msgid "unbalanced groups"
-msgstr "不对称的组"
-
-msgid "A preview window already exists"
-msgstr "预览窗口已经存在了"
-
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' 不能比 'winminheight' 更少"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' 不能比 'winminwidth' 更少"
-
-#, c-format
-msgid "Need at least %d lines"
-msgstr "至少需要 %d 行"
-
-#, c-format
-msgid "Need at least %d columns"
-msgstr "至少需要 %d 列"
+msgid "E518: Unknown option"
+msgstr "E518: 未知的选项"
+
+msgid "E519: Option not supported"
+msgstr "E519: 不支持该选项"
+
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: 不允许在 modeline 中使用"
+
+msgid "E521: Number required after ="
+msgstr "E521: = 后面需要数字"
+
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap 里面找不到"
+
+#, c-format
+msgid "E539: Illegal character <%s>"
+msgstr "E539: 无效的字符 <%s>"
+
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: 不能设定 'term' 为空字符串"
+
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: 在图形界面中不能改变终端"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: 请用 \":gui\" 启动图形界面"
+
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' 和 'patchmode' 相等"
+
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: 在 GTK+ 2 图形界面中不能更改"
+
+msgid "E524: Missing colon"
+msgstr "E524: 缺少冒号"
+
+msgid "E525: Zero length string"
+msgstr "E525: 字符串长度为零"
+
+#, c-format
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> 后面缺少数字"
+
+msgid "E527: Missing comma"
+msgstr "E527: 缺少逗号"
+
+msgid "E528: Must specify a ' value"
+msgstr "E528: 必须指定一个 ' 值"
+
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: 包含不可显示字符或宽字符"
+
+msgid "E596: Invalid font(s)"
+msgstr "E596: 无效的字体"
+
+msgid "E597: can't select fontset"
+msgstr "E597: 无法选择 Fontset"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: 无效的 Fontset"
+
+msgid "E533: can't select wide font"
+msgstr "E533: 无法选择宽字体"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: 无效的宽字体"
+
+#, c-format
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> 后面有无效的字符"
+
+msgid "E536: comma required"
+msgstr "E536: 需要逗号"
+
+#, c-format
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' 必须为空或包含 %s"
+
+msgid "E538: No mouse support"
+msgstr "E538: 不支持鼠标"
+
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: 没有结束的表达式序列"
+
+msgid "E541: too many items"
+msgstr "E541: 项目过多"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: 错乱的组"
+
+msgid "E590: A preview window already exists"
+msgstr "E590: 预览窗口已存在"
+
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic 需要 UTF-8,请执行 ':set encoding=utf-8'"
+
+#, c-format
+msgid "E593: Need at least %d lines"
+msgstr "E593: 至少需要 %d 行"
+
+#, c-format
+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 @@ msgid ""
 "--- Global option values ---"
 msgstr ""
 "\n"
-"--- 全局 选项值 ---"
+"--- 全局选项值 ---"
 
 msgid ""
 "\n"
 "--- Local option values ---"
 msgstr ""
 "\n"
-"--- 本地 选项值 ---"
+"--- 局部选项值 ---"
 
 msgid ""
 "\n"
@@ -3412,9 +4155,6 @@ msgstr "Vim 返回值: %d\n"
 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 @@ msgstr "I/O 错误"
 #~ 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 @@ msgid "to %s on %s"
 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 @@ msgstr "Vim: 双重信号, 退出中\n"
 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 @@ msgstr ""
 "\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 @@ msgid ""
 msgstr ""
 "在你的 $PATH 中找不到 VIMRUN.EXE.\n"
 "外部命令执行完毕后将不会暂停.\n"
-"进一步说明请执行 :help win32-vimrun "
+"进一步说明请见 :help win32-vimrun"
 
 msgid "Vim Warning"
 msgstr "Vim 警告"
@@ -3621,8 +4384,8 @@ msgstr "E378: 'errorformat' 未设定"
 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 @@ msgid " (line deleted)"
 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 没有接东西"
-
-#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "语法错误: %s{...}"
-
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: 不能执行; regular expression 太复杂?"
-
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression 造成堆栈用光的错误"
+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 "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ 后缺少 ]"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: 空的 %s%%[]"
+
+#, 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 @@ msgid " REPLACE"
 msgstr " 替换"
 
 msgid " REVERSE"
-msgstr " 反转"
+msgstr " 反向"
 
 msgid " INSERT"
 msgstr " 插入"
@@ -3695,10 +4530,13 @@ msgid " (replace)"
 msgstr " (替换)"
 
 msgid " (vreplace)"
-msgstr " (v-替换)"
+msgstr " (V-替换)"
 
 msgid " Hebrew"
-msgstr " 希伯莱"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
 
 msgid " (lang)"
 msgstr " (语言)"
@@ -3706,30 +4544,30 @@ msgstr " (语言)"
 msgid " (paste)"
 msgstr " (粘帖)"
 
-msgid " SELECT"
-msgstr " 选取"
-
 msgid " VISUAL"
 msgstr " 可视"
 
-msgid " BLOCK"
-msgstr " 块"
-
-msgid " LINE"
-msgstr " 行"
+msgid " VISUAL 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 @@ msgstr "  找不到"
 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 @@ msgstr "E388: 找不到定义"
 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,6 +5031,20 @@ msgstr "最小"
 msgid "maximal "
 msgstr "最大"
 
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "匹配 %d"
+
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "少于一行"
+
+msgid "E395: contains argument not accepted here"
+msgstr "E395: 使用了不正确的参数"
+
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: 使用了不正确的参数"
+
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: 使用了不正确的参数"
 
@@ -3841,18 +5052,16 @@ msgstr "E393: 使用了不正确的参数"
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: 找不到 %s 的 region item"
 
-msgid "E395: contains argument not accepted here"
-msgstr "E395: 使用了不正确的参数"
-
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: 使用了不正确的参数"
-
 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 @@ msgstr "E403: 语法同步: 连接行符号指定了两次"
 
 #, 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 @@ msgstr "E405: 缺少等号: %s"
 
 #, 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 @@ msgstr "E409: 不正确的组名: %s"
 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 @@ msgstr "E422: 终端编码太长: %s"
 
 #, 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 "at top of tag stack"
-msgstr "标签(tag)堆栈开头"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
+
+#, 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 @@ msgstr "  # pri kind tag"
 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 @@ msgstr "文件 \"%s\" 不存在"
 #. 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 @@ msgstr ""
 "\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 @@ msgstr "E431: Tag 文件 \"%s\" 格式错误"
 
 #, c-format
 msgid "Before byte %ld"
-msgstr "在 %ld 字节之前"
+msgstr "在第 %ld 字节之前"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@ msgid "E433: No tags file"
 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 "预设: '"
-
-msgid "Cannot open termcap file"
-msgstr "不能打开 termcap 文件"
-
-msgid "Terminal entry not found in terminfo"
-msgstr "在terminfo中未找到终端项"
-
-msgid "Terminal entry not found in termcap"
-msgstr "在termcap中未找到终端项"
+msgstr "默认值为: '"
+
+msgid "E557: Cannot open termcap file"
+msgstr "E557: 无法打开 termcap 文件"
+
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: 在 terminfo 中找不到终端项"
+
+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 @@ msgstr "Vim: 读错误,退出中...\n"
 
 #. 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 "一项改变"
-
-#, c-format
-msgid "%ld changes"
-msgstr "%ld 项改变"
+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 %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 @@ msgid ""
 "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 @@ msgid ""
 "Included patches: "
 msgstr ""
 "\n"
-"加入补丁: "
+"包含补丁: "
+
+msgid "Modified by "
+msgstr "修改者 "
 
 msgid ""
 "\n"
@@ -4195,14 +5441,14 @@ msgstr ""
 "编译"
 
 msgid "by "
-msgstr "者:"
+msgstr "者 "
 
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 "\n"
-"超强版本 "
+"巨型版本 "
 
 msgid ""
 "\n"
@@ -4216,96 +5462,102 @@ msgid ""
 "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 @@ msgid "Compiler: "
 msgstr "编译器: "
 
 msgid "Linking: "
-msgstr "链结方式: "
+msgstr "链接方式: "
 
 msgid "  DEBUG BUILD"
 msgstr "  调试版本"
@@ -4323,49 +5575,84 @@ msgid "VIM - Vi IMproved"
 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>         "
-
-msgid "type  :help version6<Enter>   for version info"
-msgstr "新版本信息请输入              :help version6<Enter>"
+msgstr "输入  :help<Enter>  或  <F1>  查看在线帮助    "
+
+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 @@ msgstr "E446: 光标处没有文件名"
 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 "Argument required"
-msgstr "需要指令参数"
+msgid "E470: Command aborted"
+msgstr "E470: 命令被中止"
+
+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: 文件已经存在 (可用 ! 强制替换)"
-
-msgid "Command failed"
-msgstr "命令执行失败"
-
-msgid "Internal error"
-msgstr "内部错误"
+msgstr "E13: 文件已存在 (请加 ! 强制执行)"
+
+msgid "E472: Command failed"
+msgstr "E472: 命令执行失败"
+
+#, 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: 不正确的地址"
-
-msgid "Invalid argument"
-msgstr "不正确的参数"
-
-#, c-format
-msgid "Invalid argument: %s"
-msgstr "不正确的参数: %s"
+msgstr "E14: 无效的地址"
+
+msgid "E474: Invalid argument"
+msgstr "E474: 无效的参数"
+
+#, c-format
+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: 不正确的范围"
-
-msgid "Invalid command"
-msgstr "不正确的命令"
+msgstr "E16: 无效的范围"
+
+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 对应"
-
-msgid "No ! allowed"
-msgstr "不可使用 '!'"
+msgstr "E24: 没有这个缩写"
+
+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 对应"
-
-msgid "No match"
-msgstr "找不到"
-
-#, c-format
-msgid "No match: %s"
-msgstr "找不到: %s"
+msgstr "E31: 没有这个映射"
+
+msgid "E479: No match"
+msgstr "E479: 没有匹配"
+
+#, c-format
+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: 没有前一个查找命令"
-
-msgid "No range allowed"
-msgstr "不可使用范围命令"
+msgstr "E35: 没有前一个正则表达式"
+
+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 "不能得到临时文件名"
-
-#, c-format
-msgid "Can't open file %s"
-msgstr "不能打开文件 %s"
-
-#, c-format
-msgid "Can't read file %s"
-msgstr "不能读取文件 %s"
-
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: 文件内容已改变但尚未保存 (可用 ! 强制执行)"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: 没有名叫 \"%s\" 的已注册的服务器"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: 无法创建文件 %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: 无法获取临时文件名"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: 无法打开文件 %s"
+
+#, 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 "Argument must be positive"
-msgstr "参数应该是正数"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: 找不到模式: %s"
+
+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: 正则表达式有问题"
-
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: 设定 'readonly' 选项(只读) (可用 ! 强制执行)"
-
-#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: 不能设定只读变量 \"%s\""
+msgstr "E44: 已损坏的正则表达式程序"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 已设定选项 'readonly' (请加 ! 强制执行)"
+
+#, c-format
+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: 太多文件名"
-
-msgid "Trailing characters"
-msgstr "你输入了多余的字符"
+msgstr "E77: 文件名过多"
+
+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 图形界面。"
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6171,8 +6171,8 @@ static char *(highlight_init_light[]) =
 	     "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 @@ static char *(highlight_init_dark[]) =
 	     "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 @@ init_highlight(both, reset)
     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
     /*
--- a/src/tag.c
+++ b/src/tag.c
@@ -3844,14 +3844,17 @@ get_tags(list, pat)
 			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;
 		    }
 		}
 	    }
--- 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 "
--- a/src/vim.h
+++ b/src/vim.h
@@ -346,8 +346,10 @@ typedef unsigned int	int_u;
  * 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
 
 /*