updated for version 7.0e02

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(findstart, base)
 	if exists("b:entitiescompl")
 		unlet! b:entitiescompl
 
-		if !exists("g:xmldata_xhtml10s")
+		if !exists("g:html_omni")
-			runtime! autoload/xml/xhtml10s.vim
+			"runtime! autoload/xml/xhtml10s.vim
-			"call htmlcomplete#LoadData()
+			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(findstart, base)
 			let attrname = matchstr(attr, '.*\ze\s*=')
 			let entered_value = matchstr(attr, ".*=\\s*[\"']\\zs.*")
 			let values = []
-			if attrname == 'media'
+			if attrname == 'href'
-				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'
 				" Now we are looking for local anchors defined by name or id
 				if entered_value =~ '^#'
 					let file = join(getline(1, line('$')), ' ')
@@ -476,19 +454,13 @@ function! htmlcomplete#CompleteTags(findstart, base)
 						let values += ['#'.matchstr(i, "^[a-zA-Z][a-zA-Z0-9%_-]*")]
 					endfor
 				endif
-			elseif attrname == 'type'
+			else
-				if context =~ '^input'
+				if has_key(g:html_omni, tag) && has_key(g:html_omni[tag][1], attrname)
-					let values = ["text", "password", "checkbox", "radio", "submit", "reset", "file", "hidden", "image", "button"]
+					let values = g:html_omni[tag][1][attrname]
-				elseif context =~ '^button'
-					let values = ["button", "submit", "reset"]
-				elseif context =~ '^style'
-					let values = ["text/css"]
-				elseif context =~ '^script'
-					let values = ["text/javascript"]
-				endif
 				else
 					return []
 				endif
+			endif
 
 			if len(values) == 0
 				return []
@@ -518,13 +490,12 @@ function! htmlcomplete#CompleteTags(findstart, base)
 		let sbase = matchstr(context, '.*\ze\s.*')
 
 		" Load data {{{
-		if !exists("g:xmldata_xhtml10s")
+		if !exists("g:html_omni_gen")
-			runtime! autoload/xml/xhtml10s.vim
+			call htmlcomplete#LoadData()
-			"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(findstart, base)
 			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)
+				if has_key(g:html_omni['vimxmlattrinfo'], item)
-					let m_menu = g:xmldata_xhtml10s['vimxmlattrinfo'][item][0]
+					let m_menu = g:html_omni['vimxmlattrinfo'][item][0]
-					let m_info = g:xmldata_xhtml10s['vimxmlattrinfo'][item][1]
+					let m_info = g:html_omni['vimxmlattrinfo'][item][1]
 					if m_menu !~ 'Bool'
 						let item .= '="'
 					endif
@@ -569,9 +540,9 @@ function! htmlcomplete#CompleteTags(findstart, base)
 		endif
 	endif
 	" Load data {{{
-	if !exists("g:xmldata_xhtml10s")
+	if !exists("g:html_omni")
-		runtime! autoload/xml/xhtml10s.vim
+		"runtime! autoload/xml/xhtml10s.vim
-		"call htmlcomplete#LoadData()
+		call htmlcomplete#LoadData()
 	endif
 	" }}}
 	" Tag completion {{{
@@ -580,15 +551,15 @@ function! htmlcomplete#CompleteTags(findstart, base)
 	" 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(findstart, base)
 		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)
+			if has_key(g:html_omni['vimxmltaginfo'], item)
-				let m_menu = g:xmldata_xhtml10s['vimxmltaginfo'][item][0]
+				let m_menu = g:html_omni['vimxmltaginfo'][item][0]
-				let m_info = g:xmldata_xhtml10s['vimxmltaginfo'][item][1]
+				let m_info = g:html_omni['vimxmltaginfo'][item][1]
 			else
 				let m_menu = ''
 				let m_info = ''
@@ -621,4 +592,27 @@ function! htmlcomplete#CompleteTags(findstart, base)
 	" }}}
   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:

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'

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 simplistic popup menu.
 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 formatted documents. In such case try to
 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.
@@ -1483,6 +1503,19 @@ 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*

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 you will get back to old positions
 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:

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 short description can be found at |Q_op|.
 	   	    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
+	   longest  Only insert the longest common text of the matches.  If
-	   	    CTRL-L to add more characters.  Whether case is ignored
+		    the menu is displayed you can use CTRL-L to add more
-		    depends on the kind of completion.  For buffer text the
+		    characters.  Whether case is ignored depends on the kind
-		    'ignorecase' option is used.
+		    of completion.  For buffer text the 'ignorecase' option is
+		    used.
 
 	   preview  Show extra information about the currently selected
 	   	    completion in the preview window.

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*

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

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', b:current_syntax the start of each
 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
+syntax file, earlier in 'runtimepath' was already loaded: >
-with Vim 5.8 use: >
+
+	if exists("b:current_syntax")
+	  finish
+	endif
+
+To be compatible with Vim 5.8 use: >
 
 	if version < 600
 	  syntax clear

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 and it is on a paren, then the
 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 Weibull)
 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:

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)
+if has("fname_case")
   au BufNewFile,BufRead *.s,*.S			setf r
+else
+  au BufNewFile,BufRead *.s			setf r
+endif
 
 " R Help file
+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
 

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

runtime/lang/menu_chinese_gb.936.vim

@@ -1,6 +1,8 @@
-" Menu Translations:	Simplified Chinese (Windows)
+" Menu Translations:	Simplified Chinese <i18n-translation@lists.linux.net.cn>
-" Translated By:	Wang Jun <junw@turbolinux.com.cn>
+" Translated By:	Yuheng Xie <elephant@linux.net.cn>
-" Last Change:		Tue Sep  4 11:26:52 CST 2001
+" 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			<09><><EFBFBD><EFBFBD>(&H)
 menutrans &Overview<Tab><F1>	Ԥ<EFBFBD><EFBFBD>(&O)<Tab><F1>
 menutrans &User\ Manual		<09>û<EFBFBD><EFBFBD>ֲ<EFBFBD>(&U)
-menutrans &GUI			ͼ<EFBFBD>ν<EFBFBD><EFBFBD><EFBFBD>(&G)
+menutrans &How-to\ links	How-to\ <20><EFBFBD><EFBFBD><EFBFBD>(&H)
-menutrans &How-to\ links	HOWTO<EFBFBD>ĵ<EFBFBD>\.\.\.(&H)
+menutrans &Find\.\.\.		<09><><EFBFBD><EFBFBD>(&F)\.\.\.
 menutrans &Credits		<09><><EFBFBD><EFBFBD>(&C)
 menutrans Co&pying		<09><>Ȩ(&P)
 menutrans &Version		<09>汾(&V)
-menutrans &About		<09><><EFBFBD><EFBFBD>\ Vim(&A)
+menutrans &Sponsor/Register	<09><><EFBFBD><EFBFBD>/ע<EFBFBD><EFBFBD>(&S)
+menutrans O&rphans		<09>¶<EFBFBD>(&R)
+menutrans &Version		<09>汾(&V)
+menutrans &About		<09><><EFBFBD><EFBFBD>(&A)
 
 " File menu
 menutrans &File				<09>ļ<EFBFBD>(&F)
 menutrans &Open\.\.\.<Tab>:e		<09><><EFBFBD><EFBFBD>(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	<09>ָ<EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)<Tab>:sp
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	<09>ָ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	<09>򿪱<EFBFBD>ǩ\.\.\.<Tab>:tabnew
 menutrans &New<Tab>:enew		<09>½<EFBFBD>(&N)<Tab>:enew
 menutrans &Close<Tab>:close		<09>ر<EFBFBD>(&C)<Tab>:close
 menutrans &Save<Tab>:w			<09><><EFBFBD><EFBFBD>(&S)<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav	<09><><EFBFBD><EFBFBD>Ϊ(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\.	<09>ָ<EFBFBD><EFBFBD>Ƚ<EFBFBD>(&Diff)\.\.\.
+menutrans Split\ &Diff\ with\.\.\.	<09>ָ<EFBFBD><EFBFBD>Ƚ<EFBFBD>(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	<09>ָ<EFBFBD><EFBFBD>򲹶<EFBFBD>(&Patch)\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	<09>ָ<EFBFBD><EFBFBD>򲹶<EFBFBD>(Patch)(&B)\.\.\.
 menutrans &Print			<09><>ӡ(&P)
 menutrans Sa&ve-Exit<Tab>:wqa		<09><><EFBFBD>沢<EFBFBD>˳<EFBFBD>(&V)<Tab>:wqa
 menutrans E&xit<Tab>:qa			<09>˳<EFBFBD>(&X)<Tab>:qa
 
 " Edit menu
 menutrans &Edit				<09>༭(&E)
-menutrans &Undo<Tab>u			<09>ָ<EFBFBD>(&U)<Tab>u
+menutrans &Undo<Tab>u			<09><EFBFBD><EFBFBD><EFBFBD>(&U)<Tab>u
 menutrans &Redo<Tab>^R			<09><><EFBFBD><EFBFBD>(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.		<09>ظ<EFBFBD><EFBFBD>ϴζ<EFBFBD><EFBFBD><EFBFBD>(&E)<Tab>\.
+menutrans Rep&eat<Tab>\.		<09>ظ<EFBFBD><EFBFBD>ϴβ<EFBFBD><EFBFBD><EFBFBD>(&E)<Tab>\.
 menutrans Cu&t<Tab>"+x			<09><><EFBFBD><EFBFBD>(&T)<Tab>"+x
 menutrans &Copy<Tab>"+y			<09><><EFBFBD><EFBFBD>(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP		ճ<><D5B3>(&P)<Tab>"+gP
+menutrans &Paste<Tab>"+gP		ճ<><D5B3>(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ(&B)<Tab>[p
+menutrans Put\ &Before<Tab>[p		ճ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&A)<Tab>]p
+menutrans Put\ &After<Tab>]p		ճ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&A)<Tab>]p
 menutrans &Delete<Tab>x			ɾ<EFBFBD><EFBFBD>(&D)<Tab>x
-menutrans &Select\ all<Tab>ggVG		ȫѡ(&S)<Tab>ggvG
+menutrans &Select\ all<Tab>ggVG		ȫѡ(&S)<Tab>ggVG
 menutrans &Find\.\.\.			<09><><EFBFBD><EFBFBD>(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.	<09><><EFBFBD><EFBFBD><EFBFBD>滻(&L)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.	<09><><EFBFBD>Һ<EFBFBD><EFBFBD>滻(&L)\.\.\.
+menutrans &Find<Tab>/			<09><><EFBFBD><EFBFBD>(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	<09><><EFBFBD>Һ<EFBFBD><EFBFBD>滻(&L)<Tab>:%s
 menutrans Settings\ &Window		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
+menutrans Startup\ &Settings		<09><><EFBFBD><EFBFBD><EFBFBD>趨(&S)
 menutrans &Global\ Settings		ȫ<EFBFBD><EFBFBD><EFBFBD>趨(&G)
 
-" Build boolean options
+" Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	<09><>/<2F><>ģʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		<09><>/<2F>غ<EFBFBD><EFBFBD>Դ<EFBFBD>Сдģʽ<Tab>:set\ ic!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		<09><>/<2F>غ<EFBFBD><EFBFBD>Դ<EFBFBD>Сд(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		<09><>/<2F><>ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<Tab>:set sm!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm!		<09><>/<2F><><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)<Tab>:set\ sm!
 menutrans &Context\ lines			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&C)
 
-menutrans &Virtual\ Edit			<09><><EFBFBD>ӻ<EFBFBD><EFBFBD>༭ģʽ(&V)
+menutrans &Virtual\ Edit			<09><><EFBFBD><EFBFBD><EFBFBD>༭(&V)
 menutrans Never					<09>Ӳ<EFBFBD>
 menutrans Block\ Selection			<09><>ѡ<EFBFBD><EFBFBD>
 menutrans Insert\ mode				<09><><EFBFBD><EFBFBD>ģʽ
-menutrans Block\ and\ Insert			<09><>ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ
+menutrans Block\ and\ Insert			<09><>ѡ<EFBFBD><EFBFBD><EFBFBD>Ͳ<EFBFBD><EFBFBD><EFBFBD>ģʽ
-menutrans Always				<09><><EFBFBD><EFBFBD>ģʽ
+menutrans Always				<09><><EFBFBD><EFBFBD>
 
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	<09><>/<2F>ز<EFBFBD><EFBFBD><EFBFBD>ģʽ<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	<09><>/<2F>ز<EFBFBD><EFBFBD><EFBFBD>ģʽ(&M)<Tab>:set\ im!
-
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	<09><>/<2F><>\ Vi\ <20><><EFBFBD><EFBFBD><Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.			<09><><EFBFBD><EFBFBD>·<EFBFBD><C2B7>\.\.\.(&P)
+menutrans Search\ &Path\.\.\.			<09><><EFBFBD><EFBFBD>·<EFBFBD><C2B7>(&P)\.\.\.
-
+menutrans Ta&g\ Files\.\.\.			Tag\ <20>ļ<EFBFBD>(&T)\.\.\.
-menutrans Ta&g\ Files\.\.\.			<09><>ǩ<EFBFBD>ļ<EFBFBD>\.\.\.(&g)
 
 " GUI options
 menutrans Toggle\ &Toolbar			<09><>/<2F>ع<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
@@ -77,87 +85,111 @@ menutrans Toggle\ &Bottom\ Scrollbar
 menutrans Toggle\ &Left\ Scrollbar		<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD>˹<EFBFBD><CBB9><EFBFBD><EFBFBD><EFBFBD>(&L)
 menutrans Toggle\ &Right\ Scrollbar		<09><>/<2F><><EFBFBD>Ҷ˹<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)
 
-
 " Edit/File Settings
-menutrans F&ile\ Settings			<09>ļ<EFBFBD><EFBFBD>趨(&i)
+menutrans F&ile\ Settings			<09>ļ<EFBFBD><EFBFBD>趨(&I)
 
 " Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	<09><>/<2F><><EFBFBD><EFBFBD>ʾ<EFBFBD>к<EFBFBD><Tab>:set\ nu!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	<09><>/<2F><><EFBFBD><EFBFBD>ʾ<EFBFBD>к<EFBFBD>(&N)<Tab>:set\ nu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		<09><>/<2F><><EFBFBD><EFBFBD>ʾTab<Tab>:set\ list!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		<09><>/<2F><>\ list\ ģʽ(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		<09><>/<2F><><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	<09><>/<2F>ش<EFBFBD>β<EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ lbr!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		<09><>/<2F><>expand-tab<Tab>:set\ et!
+menutrans Toggle\ &expand-tab<Tab>:set\ et!		<09><>/<2F><><EFBFBD><EFBFBD>չ\ tab(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		<09><>/<2F><>auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai!		<09><>/<2F><><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		<09><>/<2F><>C-indent<Tab>:set\ cin!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin!		<09><>/<2F><>\ C\ <20><><EFBFBD><EFBFBD>(&C)<Tab>:set\ cin!
-
 
 " other options
-menutrans &Shiftwidth			<09><><EFBFBD>ſ<EFBFBD><EFBFBD><EFBFBD>(&S)
+menutrans &Shiftwidth			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
-menutrans Soft\ &Tabstop		αTab<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
+menutrans Soft\ &Tabstop		Soft\ Tab\ <EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
-menutrans Te&xt\ Width\.\.\.		ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&x)\.\.\.
+menutrans Te&xt\ Width\.\.\.		<09>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&X)\.\.\.
 menutrans &File\ Format\.\.\.		<09>ļ<EFBFBD><EFBFBD><EFBFBD>ʽ(&F)\.\.\.
-
+menutrans C&olor\ Scheme		<09><>ɫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&O)
-menutrans C&olor\ Scheme		<09><>ɫ<EFBFBD><EFBFBD>(&o)
+menutrans Select\ Fo&nt\.\.\.		ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)\.\.\.
-menutrans Select\ Fo&nt\.\.\.		ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&n)\.\.\.
+menutrans &Keymap			Keymap(&K)
-
 
 " Programming menu
 menutrans &Tools			<09><><EFBFBD><EFBFBD>(&T)
-menutrans &Jump\ to\ this\ tag<Tab>g^]	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>괦<EFBFBD>ı<EFBFBD>ǩ<EFBFBD>ؼ<EFBFBD><EFBFBD><EFBFBD>(tag)(&J)<Tab>g^]
+menutrans &Jump\ to\ this\ tag<Tab>g^]	<09><>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ tag(&J)<Tab>g^]
-menutrans Jump\ &back<Tab>^T		<09><><EFBFBD>ؼ<EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>(&B)<Tab>^T
+menutrans Jump\ &back<Tab>^T		<09><>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)<Tab>^T
-menutrans Build\ &Tags\ File		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>\ Tags(&T)
+menutrans Build\ &Tags\ File		<09><><EFBFBD><EFBFBD> Tags <20>ļ<EFBFBD>(&T)
-menutrans &Folding			Folding<EFBFBD>趨(&F)
+
-menutrans &Diff				<09>Ƚ<EFBFBD>(&D)
+" Tools.Spelling Menu
-menutrans &Make<Tab>:make		ִ<EFBFBD><EFBFBD>\ Make(&M)<Tab>:make
+menutrans &Spelling				ƴд<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
-menutrans &List\ Errors<Tab>:cl		<09>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&E)<Tab>:cl
+menutrans &Spell\ Check\ On			<09><><EFBFBD><EFBFBD>ƴд<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
-menutrans L&ist\ Messages<Tab>:cl!	<09>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ(&I)<Tab>:cl!
+menutrans Spell\ Check\ &Off			<09>ر<EFBFBD>ƴд<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&O)
-menutrans &Next\ Error<Tab>:cn		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>:cn
+menutrans To\ &Next\ error<Tab>]s		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>]s
-menutrans &Previous\ Error<Tab>:cp	<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&P)<Tab>:cp
+menutrans To\ &Previous\ error<Tab>[s		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&P)<Tab>[s
-menutrans &Older\ List<Tab>:cold	<09>ɴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&O)<Tab>:cold
+menutrans Suggest\ &Corrections<Tab>z=		<09><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&C)<Tab>z=
-menutrans N&ewer\ List<Tab>:cnew	<09>´<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&E)<Tab>:cnew
+menutrans &Repeat\ correction<Tab>:spellrepall	<09>ظ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)<Tab>:spellrepall
-menutrans Error\ &Window		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
+menutrans Set\ language\ to\ "en"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en"
-menutrans &Set\ Compiler		<09><><EFBFBD>ñ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
+menutrans Set\ language\ to\ "en_au"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_au"
-menutrans &Convert\ to\ HEX<Tab>:%!xxd	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>16<EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd
+menutrans Set\ language\ to\ "en_ca"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_ca"
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r	<09><>16<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd\ -r
+menutrans Set\ language\ to\ "en_gb"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_gb"
+menutrans Set\ language\ to\ "en_nz"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_nz"
+menutrans Set\ language\ to\ "en_us"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_us"
+menutrans &Find\ More\ Languages		<09><><EFBFBD>Ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&F)
 
 " Tools.Fold Menu
-menutrans &Enable/Disable\ folds<Tab>zi		ʹ<><CAB9>/<EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Folding(&E)<Tab>zi
+" open close folds
+menutrans &Folding				<09>۵<EFBFBD>(&F)
+menutrans &Enable/Disable\ folds<Tab>zi		<09><><EFBFBD><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&E)<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv		<09>鿴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx	ֻ<EFBFBD>鿴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>zMzx
+menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx	<EFBFBD><EFBFBD><EFBFBD>鿴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm		<09>ر<EFBFBD>Folds(&L)<Tab>zm
+menutrans C&lose\ more\ folds<Tab>zm		<09>رո<EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&L)<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM		<09>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Folds(&C)<Tab>zM
+menutrans &Close\ all\ folds<Tab>zM		<09>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&C)<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr		չ<EFBFBD><EFBFBD>Folds(&P)<Tab>zr
+menutrans O&pen\ more\ folds<Tab>zr		<EFBFBD>򿪸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&P)<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR		չ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Folds(&O)<Tab>zR
+menutrans &Open\ all\ folds<Tab>zR		<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&O)<Tab>zR
 " fold method
-menutrans Fold\ Met&hod				Fold<EFBFBD><EFBFBD>ʽ(&H)
+menutrans Fold\ Met&hod			<EFBFBD>۵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)
-menutrans Create\ &Fold<Tab>zf			<09><><EFBFBD><EFBFBD>Fold(&F)<Tab>zf
+menutrans M&anual			<09>ֹ<EFBFBD>(&A)
-menutrans &Delete\ Fold<Tab>zd			ɾ<EFBFBD><EFBFBD>Fold(&D)<Tab>zd
+menutrans I&ndent			<09><><EFBFBD><EFBFBD>(&N)
-menutrans Delete\ &All\ Folds<Tab>zD		ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Fold(&A)<Tab>zD
+menutrans E&xpression			<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ(&X)
+menutrans S&yntax			<09>﷨(&Y)
+menutrans &Diff				<09>Ƚ<EFBFBD>(Diff)(&D)
+menutrans Ma&rker			<09><><EFBFBD><EFBFBD>(&R)
+" create and delete folds
+menutrans Create\ &Fold<Tab>zf		<09><><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		ɾ<EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&A)<Tab>zD
 " moving around in folds
-menutrans Fold\ column\ &width			<09>趨Fold<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
+menutrans Fold\ column\ &width		<EFBFBD>۵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
 
 " Tools.Diff Menu
+menutrans &Diff				<09>Ƚ<EFBFBD>(Diff)(&D)
 menutrans &Update			<09><><EFBFBD><EFBFBD>(&U)
-menutrans &Get\ Block		ȡ<EFBFBD>ò<EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&G)
+menutrans &Get\ Block			<09>õ<EFBFBD><EFBFBD><EFBFBD>(&G)
-menutrans &Put\ Block		<09><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>õ<EFBFBD><EFBFBD>Է<EFBFBD>(&P)
+menutrans &Put\ Block			<EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>(&P)
 
+menutrans &Make<Tab>:make		Make(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl		<09>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!	<09>г<EFBFBD><EFBFBD><EFBFBD>Ϣ(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp	<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold	<09><><EFBFBD>ɵĴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew	<09><><EFBFBD>µĴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&E)<Tab>:cnew
+menutrans Error\ &Window		<09><><EFBFBD>󴰿<EFBFBD>(&W)
+menutrans &Update<Tab>:cwin		<09><><EFBFBD><EFBFBD>(&U)<Tab>:cwin
+menutrans &Open<Tab>:copen		<09><><EFBFBD><EFBFBD>(&O)<Tab>:copen
+menutrans &Close<Tab>:cclose		<09>ر<EFBFBD>(&C)<Tab>:cclose
+menutrans &Convert\ to\ HEX<Tab>:%!xxd	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʮ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd
+menutrans Conve&rt\ back<Tab>:%!xxd\ -r	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd\ -r
+menutrans Se&T\ Compiler		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
 
 " Names for buffer menu.
 menutrans &Buffers		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)
-menutrans &Refresh\ menu	<09><><EFBFBD><EFBFBD>(&R)
+menutrans &Refresh\ menu	<09><><EFBFBD>²˵<EFBFBD>(&R)
 menutrans &Delete		ɾ<EFBFBD><EFBFBD>(&D)
-menutrans &Alternate		<09>޸<EFBFBD>(&L)
+menutrans &Alternate		<09><EFBFBD><EFBFBD><EFBFBD>(&A)
 menutrans &Next			<09><>һ<EFBFBD><EFBFBD>(&N)
-menutrans &Previous		ǰһ<EFBFBD><EFBFBD>(&P)
+menutrans &Previous		<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>(&P)
 
 " Window menu
 menutrans &Window			<09><><EFBFBD><EFBFBD>(&W)
-menutrans &New<Tab>^Wn			<09>½<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>^Wn
+menutrans &New<Tab>^Wn			<09>½<EFBFBD>(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws		<09>ָ<EFBFBD><EFBFBD>(&P)<Tab>^Ws
+menutrans S&plit<Tab>^Ws		<09>ָ<EFBFBD>(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^	<09>ָ#(&L)<Tab>^W^^
+menutrans Sp&lit\ To\ #<Tab>^W^^	<09>ָ\ #(&L)<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv	<09><>ֱ<EFBFBD>ָ<EFBFBD>(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer	<09>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD>ָ<EFBFBD>(&X)
+menutrans Split\ File\ E&xplorer	<09>ָ<EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&X)
-menutrans &Close<Tab>^Wc		<09>رմ<EFBFBD><EFBFBD><EFBFBD>(&C)<Tab>^Wc
+menutrans &Close<Tab>^Wc		<09>ر<EFBFBD>(&C)<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo	<09>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&O)<Tab>^Wo
 menutrans Move\ &To			<09>ƶ<EFBFBD><EFBFBD><EFBFBD>(&T)
 menutrans &Top<Tab>^WK			<09><><EFBFBD><EFBFBD>(&T)<Tab>^WK
@@ -166,13 +198,13 @@ menutrans &Left\ side<Tab>^WH
 menutrans &Right\ side<Tab>^WL		<09>ұ<EFBFBD>(&R)<Tab>^WL
 " menutrans Ne&xt<Tab>^Ww		<09><>һ<EFBFBD><D2BB>(&X)<Tab>^Ww
 " menutrans P&revious<Tab>^WW		<09><>һ<EFBFBD><D2BB>(&R)<Tab>^WW
-menutrans Rotate\ &Up<Tab>^WR		<09><><EFBFBD>ƴ<EFBFBD><EFBFBD><EFBFBD>(&U)<Tab>^WR
+menutrans Rotate\ &Up<Tab>^WR		<09><><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD>(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr		<09><><EFBFBD>ƴ<EFBFBD><EFBFBD><EFBFBD>(&D)<Tab>^Wr
+menutrans Rotate\ &Down<Tab>^Wr		<09><><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD>(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W=		<09><EFBFBD><EFBFBD>д<EFBFBD><EFBFBD>ڵȸ<EFBFBD>(&E)<Tab>^W=
+menutrans &Equal\ Size<Tab>^W=		<09>ȴ<EFBFBD>(&E)<Tab>^W=
 menutrans &Max\ Height<Tab>^W_		<09><><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_		<09><>С<EFBFBD>߶<EFBFBD>(&i)<Tab>^W1_
+menutrans M&in\ Height<Tab>^W1_		<09><>С<EFBFBD>߶<EFBFBD>(&I)<Tab>^W1_
 menutrans Max\ &Width<Tab>^W\|		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|		<09><>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&h)<Tab>^W1\|
+menutrans Min\ Widt&h<Tab>^W1\|		<09><>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)<Tab>^W1\|
 "
 " The popup menu
 menutrans &Undo			<09><><EFBFBD><EFBFBD>(&U)
@@ -180,8 +212,10 @@ menutrans Cu&t
 menutrans &Copy			<09><><EFBFBD><EFBFBD>(&C)
 menutrans &Paste		ճ<EFBFBD><EFBFBD>(&P)
 menutrans &Delete		ɾ<EFBFBD><EFBFBD>(&D)
-menutrans Select\ Blockwise	Blockwiseѡ<EFBFBD><EFBFBD>
+menutrans Select\ Blockwise	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Select\ &Word		ѡ<EFBFBD>񵥴<EFBFBD>(&W)
+menutrans Select\ &Sentence	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
+menutrans Select\ Pa&ragraph	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)
 menutrans Select\ &Line		ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)
 menutrans Select\ &Block	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)
 menutrans Select\ &All		ȫѡ(&A)
@@ -196,22 +230,21 @@ if has("toolbar")
     tmenu ToolBar.Save		<09><><EFBFBD>浱ǰ<EFBFBD>ļ<EFBFBD>
     tmenu ToolBar.SaveAll	<09><><EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
     tmenu ToolBar.Print		<09><>ӡ
-    tmenu ToolBar.Undo		<09><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD><EFBFBD>޸<EFBFBD>
+    tmenu ToolBar.Undo		<09><><EFBFBD><EFBFBD>
-    tmenu ToolBar.Redo		<09><><EFBFBD><EFBFBD><EFBFBD>ϴγ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.Redo		<09><><EFBFBD><EFBFBD>
-    tmenu ToolBar.Cut		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.Cut		<09><><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     tmenu ToolBar.Copy		<09><><EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    tmenu ToolBar.Paste		<09>ɼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ճ<EFBFBD><EFBFBD>
+    tmenu ToolBar.Paste		<09>Ӽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ճ<EFBFBD><EFBFBD>
     tmenu ToolBar.Find		<09><><EFBFBD><EFBFBD>...
     tmenu ToolBar.FindNext	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
     tmenu ToolBar.FindPrev	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
-    tmenu ToolBar.Replace	<09>滻...
+    tmenu ToolBar.Replace	<09><EFBFBD><EFBFBD>Һ<EFBFBD><EFBFBD>滻...
     tmenu ToolBar.LoadSesn	<09><><EFBFBD>ػỰ
-    tmenu ToolBar.SaveSesn	<09><><EFBFBD>浱ǰ<EFBFBD>ĻỰ
+    tmenu ToolBar.SaveSesn	<09><><EFBFBD>浱ǰ<EFBFBD>Ự
     tmenu ToolBar.RunScript	<09><><EFBFBD><EFBFBD> Vim <20>ű<EFBFBD>
-    tmenu ToolBar.Make		ִ<EFBFBD><EFBFBD> Make
+    tmenu ToolBar.Make		ִ<EFBFBD><EFBFBD> Make (:make)
-    tmenu ToolBar.Shell		<09><><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.RunCtags	<09>ڵ<EFBFBD>ǰĿ¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD> tags (!ctags -R .)
-    tmenu ToolBar.RunCtags	ִ<EFBFBD><EFBFBD> ctags
+    tmenu ToolBar.TagJump	<09><>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>õ<EFBFBD> tag
-    tmenu ToolBar.TagJump	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>õı<EFBFBD>ǩ
     tmenu ToolBar.Help		Vim <20><><EFBFBD><EFBFBD>
     tmenu ToolBar.FindHelp	<09><><EFBFBD><EFBFBD> Vim <20><><EFBFBD><EFBFBD>
   endfun
@@ -219,12 +252,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax			<09>﷨(&S)
-menutrans Set\ '&syntax'\ only	ֻ<EFBFBD>趨\ 'syntax'(&s)
+menutrans &Manual			<09>ֹ<EFBFBD>(&M)
-menutrans Set\ '&filetype'\ too	Ҳ<EFBFBD>趨\ 'filetype'(&f)
+menutrans A&utomatic			<09>Զ<EFBFBD>(&U)
+menutrans on/off\ for\ &This\ file	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>/<EFBFBD><EFBFBD>(&T)
+menutrans &Show\ filetypes\ in\ menu	<09>ڲ˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
 menutrans &Off				<09>ر<EFBFBD>(&O)
-menutrans &Manual		<EFBFBD>ֶ<EFBFBD><EFBFBD>趨(&M)
+menutrans Co&lor\ test			ɫ<EFBFBD>ʲ<EFBFBD><EFBFBD><EFBFBD>(&L)
-menutrans A&utomatic		<09>Զ<EFBFBD><EFBFBD>趨(&U)
+menutrans &Highlight\ test		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)
-menutrans on/off\ for\ &This\ file	ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>/<EFBFBD>ر<EFBFBD>(&T)
+menutrans &Convert\ to\ HTML		ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ HTML(&C)
-menutrans Co&lor\ test		ɫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)
+menutrans Set\ '&syntax'\ only		<09><><EFBFBD>趨\ 'syntax'(&S)
-menutrans &Highlight\ test	<09>﷨Ч<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)
+menutrans Set\ '&filetype'\ too		Ҳ<EFBFBD>趨\ 'filetype'(&F)
-menutrans &Convert\ to\ HTML	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ HTML\ <20><>ʽ(&C)

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
 menutrans Find\ and\ Rep&lace<Tab>:s	<09>ִ<EFBFBD>(&L)<Tab>:s
 "menutrans Options\.\.\.			<09><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>(&O)\.\.\.
 menutrans Settings\ &Window		<09><><EFBFBD>ꥦ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD>(&W)
+menutrans Startup\ &Settings		<09><>ư<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
 
 " Edit/Global Settings
 menutrans &Global\ Settings		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&G)

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)

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
 menutrans Find\ and\ Rep&lace<Tab>:s	<09>u<EFBFBD><EFBFBD>(&L)<Tab>:s
 "menutrans Options\.\.\.			<09>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD>(&O)\.\.\.
 menutrans Settings\ &Window		<09>ݒ<EFBFBD><EFBFBD>E<EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>h<EFBFBD>E(&W)
+menutrans Startup\ &Settings		<09>N<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̐ݒ<EFBFBD>(&S)
 
 " Edit/Global Settings
 menutrans &Global\ Settings		<09>S<EFBFBD>̐ݒ<EFBFBD>(&G)

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		&<26>ppna\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp	<09>ppna\ i\ splitt-vy\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	<09>ppna\ flik\.\.\.<Tab>:tabnew
 menutrans &New<Tab>:enew		&Ny<Tab>:enew
 menutrans &Close<Tab>:close		S&t<EFBFBD>ng<Tab>:close
 menutrans &Save<Tab>:w			&Spara<Tab>:w
@@ -94,7 +95,7 @@ menutrans Toggle\ &expand-tab<Tab>:set\ et!		V
 menutrans Toggle\ &auto-indent<Tab>:set\ ai!		V<EFBFBD>xla\ auto-indentering<Tab>:set\ ai!
 menutrans Toggle\ &C-indenting<Tab>:set\ cin!		V<EFBFBD>xla\ C-indentering<Tab>:set\ cin!
 menutrans &Shiftwidth					Shiftbredd
-menutrans Soft &Tabstop					Mjuk tab-stopp
+menutrans Soft\ &Tabstop				Mjuk\ tab-stopp
 menutrans Te&xt\ Width\.\.\.				Textbredd\.\.\.
 menutrans &File\ Format\.\.\.				Filformat\.\.\.
 
@@ -116,7 +117,16 @@ menutrans &Open<Tab>:copen		&
 menutrans &Close<Tab>:cclose		&St<EFBFBD>ng<Tab>:cclose
 menutrans &Convert\ to\ HEX<Tab>:%!xxd	Konvertera\ till\ HEX<Tab>:%!xxd
 menutrans Conve&rt\ back<Tab>:%!xxd\ -r	Konvertera\ tillbaka<Tab>:%!xxd\ -r
-menutrans &Set\ Compiler		S<EFBFBD>tt\ kompilerare
+menutrans Se&T\ Compiler		S<EFBFBD>tt\ &kompilerare
+
+" Tools.Spelling
+menutrans &Spelling				&Stavning
+menutrans &Spell\ Check\ On			&Stavningskontroll\ p<EFBFBD>
+menutrans &Spell\ Check\ Off			Stavningskontroll\ &av
+menutrans To\ &Next\ error<Tab>]s		Till\ &n<EFBFBD>sta\ fel
+menutrans To\ &Previous\ error<Tab>[s		Till\ &f<EFBFBD>reg<EFBFBD>ende\ fel
+menutrans Suggest\ &Corrections<Tab>z=		F<EFBFBD>resl<EFBFBD>\ &korrigeringar
+menutrans &Repeat\ correction<Tab>:spellrepall	&Upprepa\ korrigering
 
 " Tools.Folding
 menutrans &Enable/Disable\ folds<Tab>zi	V<EFBFBD>xla\ veck<Tab>zi

runtime/lang/menu_zh_cn.gb2312.vim

@@ -1,6 +1,8 @@
-" Menu Translations:	Simplified Chinese (UNIX)
+" Menu Translations:	Simplified Chinese <i18n-translation@lists.linux.net.cn>
-" Translated By:	Wang Jun <junw@turbolinux.com.cn>
+" Translated By:	Yuheng Xie <elephant@linux.net.cn>
-" Last Change:		Tue Sep  4 11:26:52 CST 2001
+" 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			<09><><EFBFBD><EFBFBD>(&H)
 menutrans &Overview<Tab><F1>	Ԥ<EFBFBD><EFBFBD>(&O)<Tab><F1>
 menutrans &User\ Manual		<09>û<EFBFBD><EFBFBD>ֲ<EFBFBD>(&U)
-menutrans &GUI			ͼ<EFBFBD>ν<EFBFBD><EFBFBD><EFBFBD>(&G)
+menutrans &How-to\ links	How-to\ <20><EFBFBD><EFBFBD><EFBFBD>(&H)
-menutrans &How-to\ links	HOWTO<EFBFBD>ĵ<EFBFBD>\.\.\.(&H)
+menutrans &Find\.\.\.		<09><><EFBFBD><EFBFBD>(&F)\.\.\.
 menutrans &Credits		<09><><EFBFBD><EFBFBD>(&C)
 menutrans Co&pying		<09><>Ȩ(&P)
 menutrans &Version		<09>汾(&V)
-menutrans &About		<09><><EFBFBD><EFBFBD>\ Vim(&A)
+menutrans &Sponsor/Register	<09><><EFBFBD><EFBFBD>/ע<EFBFBD><EFBFBD>(&S)
+menutrans O&rphans		<09>¶<EFBFBD>(&R)
+menutrans &Version		<09>汾(&V)
+menutrans &About		<09><><EFBFBD><EFBFBD>(&A)
 
 " File menu
 menutrans &File				<09>ļ<EFBFBD>(&F)
 menutrans &Open\.\.\.<Tab>:e		<09><><EFBFBD><EFBFBD>(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	<09>ָ<EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)<Tab>:sp
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	<09>ָ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	<09>򿪱<EFBFBD>ǩ\.\.\.<Tab>:tabnew
 menutrans &New<Tab>:enew		<09>½<EFBFBD>(&N)<Tab>:enew
 menutrans &Close<Tab>:close		<09>ر<EFBFBD>(&C)<Tab>:close
 menutrans &Save<Tab>:w			<09><><EFBFBD><EFBFBD>(&S)<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav	<09><><EFBFBD><EFBFBD>Ϊ(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\.	<09>ָ<EFBFBD><EFBFBD>Ƚ<EFBFBD>(&Diff)\.\.\.
+menutrans Split\ &Diff\ with\.\.\.	<09>ָ<EFBFBD><EFBFBD>Ƚ<EFBFBD>(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	<09>ָ<EFBFBD><EFBFBD>򲹶<EFBFBD>(&Patch)\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	<09>ָ<EFBFBD><EFBFBD>򲹶<EFBFBD>(Patch)(&B)\.\.\.
 menutrans &Print			<09><>ӡ(&P)
 menutrans Sa&ve-Exit<Tab>:wqa		<09><><EFBFBD>沢<EFBFBD>˳<EFBFBD>(&V)<Tab>:wqa
 menutrans E&xit<Tab>:qa			<09>˳<EFBFBD>(&X)<Tab>:qa
 
 " Edit menu
 menutrans &Edit				<09>༭(&E)
-menutrans &Undo<Tab>u			<09>ָ<EFBFBD>(&U)<Tab>u
+menutrans &Undo<Tab>u			<09><EFBFBD><EFBFBD><EFBFBD>(&U)<Tab>u
 menutrans &Redo<Tab>^R			<09><><EFBFBD><EFBFBD>(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.		<09>ظ<EFBFBD><EFBFBD>ϴζ<EFBFBD><EFBFBD><EFBFBD>(&E)<Tab>\.
+menutrans Rep&eat<Tab>\.		<09>ظ<EFBFBD><EFBFBD>ϴβ<EFBFBD><EFBFBD><EFBFBD>(&E)<Tab>\.
 menutrans Cu&t<Tab>"+x			<09><><EFBFBD><EFBFBD>(&T)<Tab>"+x
 menutrans &Copy<Tab>"+y			<09><><EFBFBD><EFBFBD>(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP		ճ<><D5B3>(&P)<Tab>"+gP
+menutrans &Paste<Tab>"+gP		ճ<><D5B3>(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ(&B)<Tab>[p
+menutrans Put\ &Before<Tab>[p		ճ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&A)<Tab>]p
+menutrans Put\ &After<Tab>]p		ճ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&A)<Tab>]p
 menutrans &Delete<Tab>x			ɾ<EFBFBD><EFBFBD>(&D)<Tab>x
-menutrans &Select\ all<Tab>ggVG		ȫѡ(&S)<Tab>ggvG
+menutrans &Select\ all<Tab>ggVG		ȫѡ(&S)<Tab>ggVG
 menutrans &Find\.\.\.			<09><><EFBFBD><EFBFBD>(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.	<09><><EFBFBD><EFBFBD><EFBFBD>滻(&L)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.	<09><><EFBFBD>Һ<EFBFBD><EFBFBD>滻(&L)\.\.\.
+menutrans &Find<Tab>/			<09><><EFBFBD><EFBFBD>(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	<09><><EFBFBD>Һ<EFBFBD><EFBFBD>滻(&L)<Tab>:%s
 menutrans Settings\ &Window		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
+menutrans Startup\ &Settings		<09><><EFBFBD><EFBFBD><EFBFBD>趨(&S)
 menutrans &Global\ Settings		ȫ<EFBFBD><EFBFBD><EFBFBD>趨(&G)
 
-" Build boolean options
+" Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	<09><>/<2F><>ģʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		<09><>/<2F>غ<EFBFBD><EFBFBD>Դ<EFBFBD>Сдģʽ<Tab>:set\ ic!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		<09><>/<2F>غ<EFBFBD><EFBFBD>Դ<EFBFBD>Сд(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		<09><>/<2F><>ƥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<Tab>:set sm!
+menutrans Toggle\ &Showmatch<Tab>:set\ sm!		<09><>/<2F><><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)<Tab>:set\ sm!
 menutrans &Context\ lines			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&C)
 
-menutrans &Virtual\ Edit			<09><><EFBFBD>ӻ<EFBFBD><EFBFBD>༭ģʽ(&V)
+menutrans &Virtual\ Edit			<09><><EFBFBD><EFBFBD><EFBFBD>༭(&V)
 menutrans Never					<09>Ӳ<EFBFBD>
 menutrans Block\ Selection			<09><>ѡ<EFBFBD><EFBFBD>
 menutrans Insert\ mode				<09><><EFBFBD><EFBFBD>ģʽ
-menutrans Block\ and\ Insert			<09><>ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ
+menutrans Block\ and\ Insert			<09><>ѡ<EFBFBD><EFBFBD><EFBFBD>Ͳ<EFBFBD><EFBFBD><EFBFBD>ģʽ
-menutrans Always				<09><><EFBFBD><EFBFBD>ģʽ
+menutrans Always				<09><><EFBFBD><EFBFBD>
 
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	<09><>/<2F>ز<EFBFBD><EFBFBD><EFBFBD>ģʽ<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	<09><>/<2F>ز<EFBFBD><EFBFBD><EFBFBD>ģʽ(&M)<Tab>:set\ im!
-
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	<09><>/<2F><>\ Vi\ <20><><EFBFBD><EFBFBD><Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.			<09><><EFBFBD><EFBFBD>·<EFBFBD><C2B7>\.\.\.(&P)
+menutrans Search\ &Path\.\.\.			<09><><EFBFBD><EFBFBD>·<EFBFBD><C2B7>(&P)\.\.\.
-
+menutrans Ta&g\ Files\.\.\.			Tag\ <20>ļ<EFBFBD>(&T)\.\.\.
-menutrans Ta&g\ Files\.\.\.			<09><>ǩ<EFBFBD>ļ<EFBFBD>\.\.\.(&g)
 
 " GUI options
 menutrans Toggle\ &Toolbar			<09><>/<2F>ع<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
@@ -77,87 +85,111 @@ menutrans Toggle\ &Bottom\ Scrollbar
 menutrans Toggle\ &Left\ Scrollbar		<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD>˹<EFBFBD><CBB9><EFBFBD><EFBFBD><EFBFBD>(&L)
 menutrans Toggle\ &Right\ Scrollbar		<09><>/<2F><><EFBFBD>Ҷ˹<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)
 
-
 " Edit/File Settings
-menutrans F&ile\ Settings			<09>ļ<EFBFBD><EFBFBD>趨(&i)
+menutrans F&ile\ Settings			<09>ļ<EFBFBD><EFBFBD>趨(&I)
 
 " Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	<09><>/<2F><><EFBFBD><EFBFBD>ʾ<EFBFBD>к<EFBFBD><Tab>:set\ nu!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	<09><>/<2F><><EFBFBD><EFBFBD>ʾ<EFBFBD>к<EFBFBD>(&N)<Tab>:set\ nu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		<09><>/<2F><><EFBFBD><EFBFBD>ʾTab<Tab>:set\ list!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		<09><>/<2F><>\ list\ ģʽ(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		<09><>/<2F><><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	<09><>/<2F>ش<EFBFBD>β<EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ lbr!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	<09><>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		<09><>/<2F><>expand-tab<Tab>:set\ et!
+menutrans Toggle\ &expand-tab<Tab>:set\ et!		<09><>/<2F><><EFBFBD><EFBFBD>չ\ tab(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		<09><>/<2F><>auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai!		<09><>/<2F><><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		<09><>/<2F><>C-indent<Tab>:set\ cin!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin!		<09><>/<2F><>\ C\ <20><><EFBFBD><EFBFBD>(&C)<Tab>:set\ cin!
-
 
 " other options
-menutrans &Shiftwidth			<09><><EFBFBD>ſ<EFBFBD><EFBFBD><EFBFBD>(&S)
+menutrans &Shiftwidth			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
-menutrans Soft\ &Tabstop		αTab<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
+menutrans Soft\ &Tabstop		Soft\ Tab\ <EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
-menutrans Te&xt\ Width\.\.\.		ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&x)\.\.\.
+menutrans Te&xt\ Width\.\.\.		<09>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&X)\.\.\.
 menutrans &File\ Format\.\.\.		<09>ļ<EFBFBD><EFBFBD><EFBFBD>ʽ(&F)\.\.\.
-
+menutrans C&olor\ Scheme		<09><>ɫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&O)
-menutrans C&olor\ Scheme		<09><>ɫ<EFBFBD><EFBFBD>(&o)
+menutrans Select\ Fo&nt\.\.\.		ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)\.\.\.
-menutrans Select\ Fo&nt\.\.\.		ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&n)\.\.\.
+menutrans &Keymap			Keymap(&K)
-
 
 " Programming menu
 menutrans &Tools			<09><><EFBFBD><EFBFBD>(&T)
-menutrans &Jump\ to\ this\ tag<Tab>g^]	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>괦<EFBFBD>ı<EFBFBD>ǩ<EFBFBD>ؼ<EFBFBD><EFBFBD><EFBFBD>(tag)(&J)<Tab>g^]
+menutrans &Jump\ to\ this\ tag<Tab>g^]	<09><>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ tag(&J)<Tab>g^]
-menutrans Jump\ &back<Tab>^T		<09><><EFBFBD>ؼ<EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>(&B)<Tab>^T
+menutrans Jump\ &back<Tab>^T		<09><>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)<Tab>^T
-menutrans Build\ &Tags\ File		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>\ Tags(&T)
+menutrans Build\ &Tags\ File		<09><><EFBFBD><EFBFBD> Tags <20>ļ<EFBFBD>(&T)
-menutrans &Folding			Folding<EFBFBD>趨(&F)
+
-menutrans &Diff				<09>Ƚ<EFBFBD>(&D)
+" Tools.Spelling Menu
-menutrans &Make<Tab>:make		ִ<EFBFBD><EFBFBD>\ Make(&M)<Tab>:make
+menutrans &Spelling				ƴд<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
-menutrans &List\ Errors<Tab>:cl		<09>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&E)<Tab>:cl
+menutrans &Spell\ Check\ On			<09><><EFBFBD><EFBFBD>ƴд<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
-menutrans L&ist\ Messages<Tab>:cl!	<09>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ(&I)<Tab>:cl!
+menutrans Spell\ Check\ &Off			<09>ر<EFBFBD>ƴд<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&O)
-menutrans &Next\ Error<Tab>:cn		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>:cn
+menutrans To\ &Next\ error<Tab>]s		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>]s
-menutrans &Previous\ Error<Tab>:cp	<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&P)<Tab>:cp
+menutrans To\ &Previous\ error<Tab>[s		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&P)<Tab>[s
-menutrans &Older\ List<Tab>:cold	<09>ɴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&O)<Tab>:cold
+menutrans Suggest\ &Corrections<Tab>z=		<09><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&C)<Tab>z=
-menutrans N&ewer\ List<Tab>:cnew	<09>´<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&E)<Tab>:cnew
+menutrans &Repeat\ correction<Tab>:spellrepall	<09>ظ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)<Tab>:spellrepall
-menutrans Error\ &Window		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
+menutrans Set\ language\ to\ "en"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en"
-menutrans &Set\ Compiler		<09><><EFBFBD>ñ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
+menutrans Set\ language\ to\ "en_au"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_au"
-menutrans &Convert\ to\ HEX<Tab>:%!xxd	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>16<EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd
+menutrans Set\ language\ to\ "en_ca"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_ca"
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r	<09><>16<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd\ -r
+menutrans Set\ language\ to\ "en_gb"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_gb"
+menutrans Set\ language\ to\ "en_nz"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_nz"
+menutrans Set\ language\ to\ "en_us"		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ\ "en_us"
+menutrans &Find\ More\ Languages		<09><><EFBFBD>Ҹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&F)
 
 " Tools.Fold Menu
-menutrans &Enable/Disable\ folds<Tab>zi		ʹ<><CAB9>/<EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>Folding(&E)<Tab>zi
+" open close folds
+menutrans &Folding				<09>۵<EFBFBD>(&F)
+menutrans &Enable/Disable\ folds<Tab>zi		<09><><EFBFBD><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&E)<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv		<09>鿴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx	ֻ<EFBFBD>鿴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>zMzx
+menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx	<EFBFBD><EFBFBD><EFBFBD>鿴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm		<09>ر<EFBFBD>Folds(&L)<Tab>zm
+menutrans C&lose\ more\ folds<Tab>zm		<09>رո<EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&L)<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM		<09>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Folds(&C)<Tab>zM
+menutrans &Close\ all\ folds<Tab>zM		<09>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&C)<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr		չ<EFBFBD><EFBFBD>Folds(&P)<Tab>zr
+menutrans O&pen\ more\ folds<Tab>zr		<EFBFBD>򿪸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&P)<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR		չ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Folds(&O)<Tab>zR
+menutrans &Open\ all\ folds<Tab>zR		<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&O)<Tab>zR
 " fold method
-menutrans Fold\ Met&hod				Fold<EFBFBD><EFBFBD>ʽ(&H)
+menutrans Fold\ Met&hod			<EFBFBD>۵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)
-menutrans Create\ &Fold<Tab>zf			<09><><EFBFBD><EFBFBD>Fold(&F)<Tab>zf
+menutrans M&anual			<09>ֹ<EFBFBD>(&A)
-menutrans &Delete\ Fold<Tab>zd			ɾ<EFBFBD><EFBFBD>Fold(&D)<Tab>zd
+menutrans I&ndent			<09><><EFBFBD><EFBFBD>(&N)
-menutrans Delete\ &All\ Folds<Tab>zD		ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Fold(&A)<Tab>zD
+menutrans E&xpression			<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ(&X)
+menutrans S&yntax			<09>﷨(&Y)
+menutrans &Diff				<09>Ƚ<EFBFBD>(Diff)(&D)
+menutrans Ma&rker			<09><><EFBFBD><EFBFBD>(&R)
+" create and delete folds
+menutrans Create\ &Fold<Tab>zf		<09><><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		ɾ<EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD>(&A)<Tab>zD
 " moving around in folds
-menutrans Fold\ column\ &width			<09>趨Fold<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
+menutrans Fold\ column\ &width		<EFBFBD>۵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)
 
 " Tools.Diff Menu
+menutrans &Diff				<09>Ƚ<EFBFBD>(Diff)(&D)
 menutrans &Update			<09><><EFBFBD><EFBFBD>(&U)
-menutrans &Get\ Block		ȡ<EFBFBD>ò<EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&G)
+menutrans &Get\ Block			<09>õ<EFBFBD><EFBFBD><EFBFBD>(&G)
-menutrans &Put\ Block		<09><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>õ<EFBFBD><EFBFBD>Է<EFBFBD>(&P)
+menutrans &Put\ Block			<EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>(&P)
 
+menutrans &Make<Tab>:make		Make(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl		<09>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!	<09>г<EFBFBD><EFBFBD><EFBFBD>Ϣ(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn		<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp	<09><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold	<09><><EFBFBD>ɵĴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew	<09><><EFBFBD>µĴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>(&E)<Tab>:cnew
+menutrans Error\ &Window		<09><><EFBFBD>󴰿<EFBFBD>(&W)
+menutrans &Update<Tab>:cwin		<09><><EFBFBD><EFBFBD>(&U)<Tab>:cwin
+menutrans &Open<Tab>:copen		<09><><EFBFBD><EFBFBD>(&O)<Tab>:copen
+menutrans &Close<Tab>:cclose		<09>ر<EFBFBD>(&C)<Tab>:cclose
+menutrans &Convert\ to\ HEX<Tab>:%!xxd	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʮ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd
+menutrans Conve&rt\ back<Tab>:%!xxd\ -r	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:%!xxd\ -r
+menutrans Se&T\ Compiler		<09>趨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&T)
 
 " Names for buffer menu.
 menutrans &Buffers		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)
-menutrans &Refresh\ menu	<09><><EFBFBD><EFBFBD>(&R)
+menutrans &Refresh\ menu	<09><><EFBFBD>²˵<EFBFBD>(&R)
 menutrans &Delete		ɾ<EFBFBD><EFBFBD>(&D)
-menutrans &Alternate		<09>޸<EFBFBD>(&L)
+menutrans &Alternate		<09><EFBFBD><EFBFBD><EFBFBD>(&A)
 menutrans &Next			<09><>һ<EFBFBD><EFBFBD>(&N)
-menutrans &Previous		ǰһ<EFBFBD><EFBFBD>(&P)
+menutrans &Previous		<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>(&P)
 
 " Window menu
 menutrans &Window			<09><><EFBFBD><EFBFBD>(&W)
-menutrans &New<Tab>^Wn			<09>½<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&N)<Tab>^Wn
+menutrans &New<Tab>^Wn			<09>½<EFBFBD>(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws		<09>ָ<EFBFBD><EFBFBD>(&P)<Tab>^Ws
+menutrans S&plit<Tab>^Ws		<09>ָ<EFBFBD>(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^	<09>ָ#(&L)<Tab>^W^^
+menutrans Sp&lit\ To\ #<Tab>^W^^	<09>ָ\ #(&L)<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv	<09><>ֱ<EFBFBD>ָ<EFBFBD>(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer	<09>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD>ָ<EFBFBD>(&X)
+menutrans Split\ File\ E&xplorer	<09>ָ<EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&X)
-menutrans &Close<Tab>^Wc		<09>رմ<EFBFBD><EFBFBD><EFBFBD>(&C)<Tab>^Wc
+menutrans &Close<Tab>^Wc		<09>ر<EFBFBD>(&C)<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo	<09>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&O)<Tab>^Wo
 menutrans Move\ &To			<09>ƶ<EFBFBD><EFBFBD><EFBFBD>(&T)
 menutrans &Top<Tab>^WK			<09><><EFBFBD><EFBFBD>(&T)<Tab>^WK
@@ -166,13 +198,13 @@ menutrans &Left\ side<Tab>^WH
 menutrans &Right\ side<Tab>^WL		<09>ұ<EFBFBD>(&R)<Tab>^WL
 " menutrans Ne&xt<Tab>^Ww		<09><>һ<EFBFBD><D2BB>(&X)<Tab>^Ww
 " menutrans P&revious<Tab>^WW		<09><>һ<EFBFBD><D2BB>(&R)<Tab>^WW
-menutrans Rotate\ &Up<Tab>^WR		<09><><EFBFBD>ƴ<EFBFBD><EFBFBD><EFBFBD>(&U)<Tab>^WR
+menutrans Rotate\ &Up<Tab>^WR		<09><><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD>(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr		<09><><EFBFBD>ƴ<EFBFBD><EFBFBD><EFBFBD>(&D)<Tab>^Wr
+menutrans Rotate\ &Down<Tab>^Wr		<09><><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD>(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W=		<09><EFBFBD><EFBFBD>д<EFBFBD><EFBFBD>ڵȸ<EFBFBD>(&E)<Tab>^W=
+menutrans &Equal\ Size<Tab>^W=		<09>ȴ<EFBFBD>(&E)<Tab>^W=
 menutrans &Max\ Height<Tab>^W_		<09><><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_		<09><>С<EFBFBD>߶<EFBFBD>(&i)<Tab>^W1_
+menutrans M&in\ Height<Tab>^W1_		<09><>С<EFBFBD>߶<EFBFBD>(&I)<Tab>^W1_
 menutrans Max\ &Width<Tab>^W\|		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|		<09><>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&h)<Tab>^W1\|
+menutrans Min\ Widt&h<Tab>^W1\|		<09><>С<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)<Tab>^W1\|
 "
 " The popup menu
 menutrans &Undo			<09><><EFBFBD><EFBFBD>(&U)
@@ -180,8 +212,10 @@ menutrans Cu&t
 menutrans &Copy			<09><><EFBFBD><EFBFBD>(&C)
 menutrans &Paste		ճ<EFBFBD><EFBFBD>(&P)
 menutrans &Delete		ɾ<EFBFBD><EFBFBD>(&D)
-menutrans Select\ Blockwise	Blockwiseѡ<EFBFBD><EFBFBD>
+menutrans Select\ Blockwise	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Select\ &Word		ѡ<EFBFBD>񵥴<EFBFBD>(&W)
+menutrans Select\ &Sentence	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
+menutrans Select\ Pa&ragraph	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&R)
 menutrans Select\ &Line		ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)
 menutrans Select\ &Block	ѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&B)
 menutrans Select\ &All		ȫѡ(&A)
@@ -196,22 +230,21 @@ if has("toolbar")
     tmenu ToolBar.Save		<09><><EFBFBD>浱ǰ<EFBFBD>ļ<EFBFBD>
     tmenu ToolBar.SaveAll	<09><><EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
     tmenu ToolBar.Print		<09><>ӡ
-    tmenu ToolBar.Undo		<09><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD><EFBFBD>޸<EFBFBD>
+    tmenu ToolBar.Undo		<09><><EFBFBD><EFBFBD>
-    tmenu ToolBar.Redo		<09><><EFBFBD><EFBFBD><EFBFBD>ϴγ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.Redo		<09><><EFBFBD><EFBFBD>
-    tmenu ToolBar.Cut		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.Cut		<09><><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     tmenu ToolBar.Copy		<09><><EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    tmenu ToolBar.Paste		<09>ɼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ճ<EFBFBD><EFBFBD>
+    tmenu ToolBar.Paste		<09>Ӽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ճ<EFBFBD><EFBFBD>
     tmenu ToolBar.Find		<09><><EFBFBD><EFBFBD>...
     tmenu ToolBar.FindNext	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
     tmenu ToolBar.FindPrev	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
-    tmenu ToolBar.Replace	<09>滻...
+    tmenu ToolBar.Replace	<09><EFBFBD><EFBFBD>Һ<EFBFBD><EFBFBD>滻...
     tmenu ToolBar.LoadSesn	<09><><EFBFBD>ػỰ
-    tmenu ToolBar.SaveSesn	<09><><EFBFBD>浱ǰ<EFBFBD>ĻỰ
+    tmenu ToolBar.SaveSesn	<09><><EFBFBD>浱ǰ<EFBFBD>Ự
     tmenu ToolBar.RunScript	<09><><EFBFBD><EFBFBD> Vim <20>ű<EFBFBD>
-    tmenu ToolBar.Make		ִ<EFBFBD><EFBFBD> Make
+    tmenu ToolBar.Make		ִ<EFBFBD><EFBFBD> Make (:make)
-    tmenu ToolBar.Shell		<09><><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.RunCtags	<09>ڵ<EFBFBD>ǰĿ¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD> tags (!ctags -R .)
-    tmenu ToolBar.RunCtags	ִ<EFBFBD><EFBFBD> ctags
+    tmenu ToolBar.TagJump	<09><>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>õ<EFBFBD> tag
-    tmenu ToolBar.TagJump	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>õı<EFBFBD>ǩ
     tmenu ToolBar.Help		Vim <20><><EFBFBD><EFBFBD>
     tmenu ToolBar.FindHelp	<09><><EFBFBD><EFBFBD> Vim <20><><EFBFBD><EFBFBD>
   endfun
@@ -219,12 +252,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax			<09>﷨(&S)
-menutrans Set\ '&syntax'\ only	ֻ<EFBFBD>趨\ 'syntax'(&s)
+menutrans &Manual			<09>ֹ<EFBFBD>(&M)
-menutrans Set\ '&filetype'\ too	Ҳ<EFBFBD>趨\ 'filetype'(&f)
+menutrans A&utomatic			<09>Զ<EFBFBD>(&U)
+menutrans on/off\ for\ &This\ file	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>/<EFBFBD><EFBFBD>(&T)
+menutrans &Show\ filetypes\ in\ menu	<09>ڲ˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&S)
 menutrans &Off				<09>ر<EFBFBD>(&O)
-menutrans &Manual		<EFBFBD>ֶ<EFBFBD><EFBFBD>趨(&M)
+menutrans Co&lor\ test			ɫ<EFBFBD>ʲ<EFBFBD><EFBFBD><EFBFBD>(&L)
-menutrans A&utomatic		<09>Զ<EFBFBD><EFBFBD>趨(&U)
+menutrans &Highlight\ test		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)
-menutrans on/off\ for\ &This\ file	ֻ<><D6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>/<EFBFBD>ر<EFBFBD>(&T)
+menutrans &Convert\ to\ HTML		ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ HTML(&C)
-menutrans Co&lor\ test		ɫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&L)
+menutrans Set\ '&syntax'\ only		<09><><EFBFBD>趨\ 'syntax'(&S)
-menutrans &Highlight\ test	<09>﷨Ч<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&H)
+menutrans Set\ '&filetype'\ too		Ҳ<EFBFBD>趨\ 'filetype'(&F)
-menutrans &Convert\ to\ HTML	ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ HTML\ <20><>ʽ(&C)

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.R:r
-SynMenu R-Sg.R\ help:rhelp
+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

runtime/synmenu.vim

@@ -100,19 +100,20 @@ an 50.20.230 &Syntax.C.CHILL :cal SetSyn("chill")<CR>
 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.270 &Syntax.C.Cmake :cal SetSyn("cmake")<CR>
-an 50.20.280 &Syntax.C.Config.Cfg\ Config\ file :cal SetSyn("cfg")<CR>
+an 50.20.280 &Syntax.C.Cold\ Fusion :cal SetSyn("cf")<CR>
-an 50.20.290 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
+an 50.20.290 &Syntax.C.Config.Cfg\ Config\ file :cal SetSyn("cfg")<CR>
-an 50.20.300 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
+an 50.20.300 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
-an 50.20.310 &Syntax.C.ConTeXt :cal SetSyn("context")<CR>
+an 50.20.310 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
-an 50.20.320 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
+an 50.20.320 &Syntax.C.ConTeXt :cal SetSyn("context")<CR>
-an 50.20.330 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
+an 50.20.330 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
-an 50.20.340 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
+an 50.20.340 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
-an 50.20.350 &Syntax.C.CSP :cal SetSyn("csp")<CR>
+an 50.20.350 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
-an 50.20.360 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
+an 50.20.360 &Syntax.C.CSP :cal SetSyn("csp")<CR>
-an 50.20.370 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
+an 50.20.370 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
-an 50.20.380 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
+an 50.20.380 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
-an 50.20.390 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<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 SetSyn("pyrex")<CR>
 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.100 &Syntax.R-Sg.R.R :cal SetSyn("r")<CR>
-an 50.90.110 &Syntax.R-Sg.R\ help :cal SetSyn("rhelp")<CR>
+an 50.90.110 &Syntax.R-Sg.R.R\ help :cal SetSyn("rhelp")<CR>
-an 50.90.120 &Syntax.R-Sg.Racc\ input :cal SetSyn("racc")<CR>
+an 50.90.120 &Syntax.R-Sg.R.R\ noweb :cal SetSyn("rnoweb")<CR>
-an 50.90.130 &Syntax.R-Sg.Radiance :cal SetSyn("radiance")<CR>
+an 50.90.130 &Syntax.R-Sg.Racc\ input :cal SetSyn("racc")<CR>
-an 50.90.140 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison")<CR>
+an 50.90.140 &Syntax.R-Sg.Radiance :cal SetSyn("radiance")<CR>
-an 50.90.150 &Syntax.R-Sg.RCS.RCS\ log\ output :cal SetSyn("rcslog")<CR>
+an 50.90.150 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison")<CR>
-an 50.90.160 &Syntax.R-Sg.RCS.RCS\ file :cal SetSyn("rcs")<CR>
+an 50.90.160 &Syntax.R-Sg.RCS.RCS\ log\ output :cal SetSyn("rcslog")<CR>
-an 50.90.170 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline")<CR>
+an 50.90.170 &Syntax.R-Sg.RCS.RCS\ file :cal SetSyn("rcs")<CR>
-an 50.90.180 &Syntax.R-Sg.Rebol :cal SetSyn("rebol")<CR>
+an 50.90.180 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline")<CR>
-an 50.90.190 &Syntax.R-Sg.Remind :cal SetSyn("remind")<CR>
+an 50.90.190 &Syntax.R-Sg.Rebol :cal SetSyn("rebol")<CR>
-an 50.90.200 &Syntax.R-Sg.Relax\ NG\ compact :cal SetSyn("rnc")<CR>
+an 50.90.200 &Syntax.R-Sg.Remind :cal SetSyn("remind")<CR>
-an 50.90.210 &Syntax.R-Sg.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR>
+an 50.90.210 &Syntax.R-Sg.Relax\ NG\ compact :cal SetSyn("rnc")<CR>
-an 50.90.220 &Syntax.R-Sg.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR>
+an 50.90.220 &Syntax.R-Sg.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR>
-an 50.90.230 &Syntax.R-Sg.Resolv\.conf :cal SetSyn("resolv")<CR>
+an 50.90.230 &Syntax.R-Sg.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR>
-an 50.90.240 &Syntax.R-Sg.Rexx :cal SetSyn("rexx")<CR>
+an 50.90.240 &Syntax.R-Sg.Resolv\.conf :cal SetSyn("resolv")<CR>
-an 50.90.250 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots")<CR>
+an 50.90.250 &Syntax.R-Sg.Rexx :cal SetSyn("rexx")<CR>
-an 50.90.260 &Syntax.R-Sg.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR>
+an 50.90.260 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots")<CR>
-an 50.90.270 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen")<CR>
+an 50.90.270 &Syntax.R-Sg.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR>
-an 50.90.280 &Syntax.R-Sg.RPL/2 :cal SetSyn("rpl")<CR>
+an 50.90.280 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen")<CR>
-an 50.90.290 &Syntax.R-Sg.ReStructuredText :cal SetSyn("rst")<CR>
+an 50.90.290 &Syntax.R-Sg.RPL/2 :cal SetSyn("rpl")<CR>
-an 50.90.300 &Syntax.R-Sg.RTF :cal SetSyn("rtf")<CR>
+an 50.90.300 &Syntax.R-Sg.ReStructuredText :cal SetSyn("rst")<CR>
-an 50.90.310 &Syntax.R-Sg.Ruby :cal SetSyn("ruby")<CR>
+an 50.90.310 &Syntax.R-Sg.RTF :cal SetSyn("rtf")<CR>
-an 50.90.330 &Syntax.R-Sg.S-Lang :cal SetSyn("slang")<CR>
+an 50.90.320 &Syntax.R-Sg.Ruby :cal SetSyn("ruby")<CR>
-an 50.90.340 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba")<CR>
+an 50.90.340 &Syntax.R-Sg.S-Lang :cal SetSyn("slang")<CR>
-an 50.90.350 &Syntax.R-Sg.SAS :cal SetSyn("sas")<CR>
+an 50.90.350 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba")<CR>
-an 50.90.360 &Syntax.R-Sg.Sather :cal SetSyn("sather")<CR>
+an 50.90.360 &Syntax.R-Sg.SAS :cal SetSyn("sas")<CR>
-an 50.90.370 &Syntax.R-Sg.Scheme :cal SetSyn("scheme")<CR>
+an 50.90.370 &Syntax.R-Sg.Sather :cal SetSyn("sather")<CR>
-an 50.90.380 &Syntax.R-Sg.Scilab :cal SetSyn("scilab")<CR>
+an 50.90.380 &Syntax.R-Sg.Scheme :cal SetSyn("scheme")<CR>
-an 50.90.390 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen")<CR>
+an 50.90.390 &Syntax.R-Sg.Scilab :cal SetSyn("scilab")<CR>
-an 50.90.400 &Syntax.R-Sg.SDL :cal SetSyn("sdl")<CR>
+an 50.90.400 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen")<CR>
-an 50.90.410 &Syntax.R-Sg.Sed :cal SetSyn("sed")<CR>
+an 50.90.410 &Syntax.R-Sg.SDL :cal SetSyn("sdl")<CR>
-an 50.90.420 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm")<CR>
+an 50.90.420 &Syntax.R-Sg.Sed :cal SetSyn("sed")<CR>
-an 50.90.430 &Syntax.R-Sg.Send-pr :cal SetSyn("sendpr")<CR>
+an 50.90.430 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm")<CR>
-an 50.90.440 &Syntax.R-Sg.Sensors\.conf :cal SetSyn("sensors")<CR>
+an 50.90.440 &Syntax.R-Sg.Send-pr :cal SetSyn("sendpr")<CR>
-an 50.90.450 &Syntax.R-Sg.Service\ Location\ config :cal SetSyn("slpconf")<CR>
+an 50.90.450 &Syntax.R-Sg.Sensors\.conf :cal SetSyn("sensors")<CR>
-an 50.90.460 &Syntax.R-Sg.Service\ Location\ registration :cal SetSyn("slpreg")<CR>
+an 50.90.460 &Syntax.R-Sg.Service\ Location\ config :cal SetSyn("slpconf")<CR>
-an 50.90.470 &Syntax.R-Sg.Service\ Location\ SPI :cal SetSyn("slpspi")<CR>
+an 50.90.470 &Syntax.R-Sg.Service\ Location\ registration :cal SetSyn("slpreg")<CR>
-an 50.90.480 &Syntax.R-Sg.Services :cal SetSyn("services")<CR>
+an 50.90.480 &Syntax.R-Sg.Service\ Location\ SPI :cal SetSyn("slpspi")<CR>
-an 50.90.490 &Syntax.R-Sg.Setserial\ config :cal SetSyn("setserial")<CR>
+an 50.90.490 &Syntax.R-Sg.Services :cal SetSyn("services")<CR>
-an 50.90.500 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
+an 50.90.500 &Syntax.R-Sg.Setserial\ config :cal SetSyn("setserial")<CR>
-an 50.90.510 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
+an 50.90.510 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
-an 50.90.520 &Syntax.R-Sg.SGML.SGML\ Declaration :cal SetSyn("sgmldecl")<CR>
+an 50.90.520 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
-an 50.90.530 &Syntax.R-Sg.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx")<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>

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,10 +248,18 @@ if exists("html_use_css")
   exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
 endif
 if exists("html_no_pre")
+  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
+  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,10 +416,18 @@ endwhile
 " Finish with the last line
 exe s:newwin . "wincmd w"
 if exists("html_no_pre")
+  if exists("use_xhtml")
+    exe "normal! a</p>\n</body>\n</html>\e"
+  else
     exe "normal! a\n</body>\n</html>\e"
+  endif
+else
+  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
 
 
 " Now, when we finally know which, we define the colors and styles
@@ -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

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"

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:

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
+" Last Change:	Apr 18, 2006
-" Version:	34
+" 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\>"

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

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
+" Last Change:	Apr 18, 2006
-" Version:	7.0-42
+" 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=vimOper,vimOperParen,vimNumber,vimString,vimRe
 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!.\{-}\(|\|$\)"ms=s+1	contains=vimSpecFile
 "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	"[,:]"

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<76>mi v<>konn<6E> editor, ktor<6F> m<> pr<70>li<6C> ve<76>a pr<70>kazov na to aby
@@ -10,6 +10,7 @@
      Pribli<6C>n<EFBFBD> <20>as potrebn<62> na prebratie tejto v<>uky je 25-30 min<69>t,
      z<>vis<69> na tom, ko<6B>ko je str<74>ven<65>ho <20>asu s presk<73><6B>avan<61>m.
 
+     UPOZORNENIE:
      Pr<50>kazy v lekci<63>ch modifikuj<75> text. Vytvor k<>piu tohto s<>boru aby
      sa mohlo precvi<76>ova<76> na <20>om (pri <20>tarte "vimtutor" je toto k<>pia).
 
@@ -20,6 +21,7 @@
      Presved<65> sa, <20>e Shift-Lock NIEJE stla<6C>en<65> a stla<6C>t kl<6B>vesu
      j  nieko<6B>ko kr<6B>t, aby sa kurzor posunul nato<74>ko, <20>e lekcia 1.1
      celkom zapln<6C> obrazovku.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekcia 1.1:  POHYB KURZOROM
 
@@ -41,31 +43,30 @@ Pozn
 	        na prechod do norm<72>lneho m<>du.
 
 Pozn<EFBFBD>mka: Kurzorov<6F> kl<6B>vesy s<> tie<69> funk<6E>n<EFBFBD>. Ale pou<6F><75>van<61>m hjkl sa bude<64>
-	  schopn<70> pohybova<76> r<>chlej<65>ie, ke<6B> si zvykne<6E> ich pou<6F><75>va<76>.
+	        schopn<EFBFBD> pohybova<76> r<>chlej<65>ie, ke<6B> si zvykne<6E> ich pou<6F><75>va<76>. Naozaj!
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     LEKCIA 1.2: SPک<50>ANIE A ZATV<54>RANIE VIMU
+		     LEKCIA 1.2: ZATV<54>RANIE VIMU
+
 
   !! POZN<5A>MKA: Pred vykonan<61>m t<>chto krokov si pre<72><65>taj cel<65> t<>to lekciu !!
 
   1. Stla<6C> kl<6B>vesu <ESC> (aby si sa u<>ite nach<63>dzal v norm<72>lnom m<>de)
 
   2. Nap<61><70>:   :q! <ENTER>.
-
+     T<>m ukon<6F><6E><EFBFBD> pr<70>cu s editorom BEZ ulo<6C>enia zmien, ktor<6F> si vykonal.
----> T<>m ukon<6F><6E><EFBFBD> pr<70>cu s editorom BEZ ulo<6C>enia zmien, ktor<6F> si vykonal.
-     Ak chce<63> ulo<6C>i<EFBFBD> vykonan<61> zmeny a ukon<6F>i<EFBFBD> pr<70>cu s editorom nap<61><70>:
-				:wq   <ENTER>
 
   3. Ke<4B> sa dostane<6E> na pr<70>kazov<6F> riadok, nap<61><70> pr<70>kaz, ktor<6F>m sa dostane<6E>
      spe<70> do tejto v<>uky. To m<><6D>e by<62>:	vimtutor <ENTER>
-     Zvy<76>ajne sa pou<6F><75>va:		vim tutor <ENTER>
-
----> 'vim' znamen<65> spustenie editora vim, 'tutor' je n<>zov s<>boru, ktor<6F>
-     chce<63> editova<76>.
 
   4. Ak si si tieto kroky spo<70>ahlivo zapam<61>tal, vykonaj kroky 1 a<> 3, pre
-     ukon<6F>enie a znovu spustenie editora. Potom presu<73> kurzor dole na
+     ukon<6F>enie a znovu spustenie editora. 
-     lekciu 1.3.
+
+POZN<EFBFBD>MKA: :q! <ENTER> neulo<6C><6F> zmeny, ktor<6F> si vykonal. O nieko<6B>ko lekci<63>
+          sa nau<61><75><EFBFBD> ako ulo<6C>i<EFBFBD> zmeny do s<>boru
+
+  5. presu<73> kurzor dole na lekciu 1.3.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		      Lekcia 1.3: EDIT<49>CIA TEXTU - MAZANIE
 
@@ -85,7 +86,7 @@ Pozn
 
   5. Ak je veta spr<70>vna, prejdi na lekciu 1.4.
 
-POZN<EFBFBD>MKA: Nesk<73><6B>aj si zapamet<EFBFBD><EFBFBD> obsah tejto v<>uky, ale sa u<> pou<6F><75>van<61>m.
+POZN<EFBFBD>MKA: Nesk<73><6B>aj si zapam<61>ta<EFBFBD> obsah tejto v<>uky, ale sa u<> pou<6F><75>van<61>m.
 
 
 
@@ -93,7 +94,7 @@ POZN
 		     Lekcia 1.4: EDIT<49>CIA TEXTU - VKLADANIE
 
 
-    ** Stla<6C>enie kl<6B>vesy  i  v norm<72>lnom m<>de umo<EFBFBD><EFBFBD>uje vkladanie textu. **
+    ** Stla<6C>enie kl<6B>vesy  i  umo<6D><6F>uje vkladanie textu. **
 
   1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok za zna<6E>ku --->.
 
@@ -111,6 +112,52 @@ POZN
   5. Ke<4B> sa dostato<74>ne nau<61><75><EFBFBD> vklada<64> text, prejdi na nasleduj<75>ce zhrnutie.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Lekcia 1.5: EDIT<49>CIA TEXTU - PRID<49>VANIE
+
+
+     ** Stla<6C>enie kl<6B>vesy  A  umo<6D><6F>uje prid<69>va<76> text. **
+
+  1. Presu<73> kurozr ni<6E><69>ie na prv<72> riadok za zna<6E>kou --->.
+     Nez<65>le<6C><65> na tom, na ktorom znaku sa kurzor v tom riadku nach<63>dza.
+
+  2. Stla<6C> kl<6B>vesu  A  a nap<61><70> potrebn<62> text.
+
+  3. Po pridan<61> textu stla<6C> kl<6B>vesu <ESC> pre n<>vrat do Norm<72>lneho m<>du.
+
+  4. Presu<73> kurozr na druh<75> riadok ozna<6E>en<65> ---> a zopakuj 
+     kroky 2 a 3 k<>m nieje veta spr<70>vna.
+
+---> Tu je nejak<61> text ch<63>baj<61>ci o
+     Tu je nejak<61> text ch<63>baj<61>ci od tia<69>to.
+---> Tu tie<69> ch<63>ba nej
+     Tu tie<69> ch<63>ba nejak<61> text.
+
+  5. Ke<4B> sa dostato<74>ne nau<61><75><EFBFBD> prid<69>va<76> text, prejdi na lekciu 1.6.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       Lekcia 1.6: EDIT<49>CIA S<>BORU
+
+
+    ** Nap<61>san<61>m  :wq  sa s<>bor ulo<6C><6F> a zavrie **
+
+!! POZN<5A>MKA: Pred vykonan<61>m t<>chto krokov si pre<72><65>taj cel<65> lekciu!!
+
+1. Opusti t<>to v<>uku, ako si to urobil v lekcii 1.2:  :q!
+
+2. Do pr<70>kazov<6F>ho riadku nap<61><70> pr<70>kaz:  vim tutor <ENTER>
+   'vim' je pr<70>kaz, ktor<6F> spust<73> editor Vim, 'tutor' je meno s<>boru, 
+   ktor<6F> chce<63> editova<76>. Pou<6F>i tak<61> s<>bor, ktor<6F> m<><6D>e<EFBFBD> meni<6E>.
+
+3. Vlo<6C> a zma<6D> text tak, ako si sa nau<61>il v predo<64>l<EFBFBD>ch lekciach.
+
+4. Ulo<6C> s<>bor so zmenami a opusti Vim pr<70>kazom:  :wq  <ENTER>
+
+5. Re<52>tartuj vimtutor a presu<73> sa dole na nasleduj<75>ce zhrnutie. 
+
+6. Urob tak po pre<72><65>tan<61> predo<64>l<EFBFBD>ch krokov a porozumeniu im.
+
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       ZHRNUTIE LEKCIE 1
@@ -124,10 +171,11 @@ POZN
   3. Na ukon<6F>enie Vimu nap<61><70>: <ESC>  :q!  <ENTER> pre zru<72>enie v<>etk<74>ch zmien
        alebo nap<61><70>:   <ESC>   :wq   <ENTER>    pre ulo<6C>enie zmien.
 
-  4. Na zmazanie znaku na mieste kurzora nap<61><70> v norm<72>lnom m<>de:  x
+  4. Na zmazanie znaku na mieste kurzora nap<61><70>:  x
 
   5. Pre vlo<6C>enie textu na mieste kurzora v norm<72>lnom m<>de nap<61><70>:
-	 i     vkladan<61> text	<ESC>
+	 i     nap<61><70> vkladan<61> text   <ESC>  vkladanie pred kurzor
+   A     nap<61><70> prid<69>van<61> text  <EXC>  vkladanie za riadok
 
 POZN<EFBFBD>MKA: Stla<6C>enie <ESC> <20>a premiestn<74> do norm<72>lneho m<>du alebo zru<72><75>
 	        nejak<61> nechcen<65> a <20>iasto<74>ne dokon<6F>en<65> pr<70>kaz.
@@ -149,8 +197,10 @@ Teraz pokra
 
 4. Nap<61><70>  dw  aby slovo zmizlo.
 
-POZN<EFBFBD>MKA: P<>smen<EFBFBD> dw sa zobrazia na poslednom riadku obrazovky tak ako ich
+POZN<EFBFBD>MKA: P<>smeno d sa zobraz<EFBFBD> na poslednom riadku obrazovky ke<EFBFBD> ho
-	  p<EFBFBD><EFBFBD>e<EFBFBD>. Ak p<><70>e<EFBFBD> nie<69>o zle, stla<6C>  <ESC>  a za<7A>ni znova.
+	        nap<61><70>e<EFBFBD>. Vim na teba po<70>k<EFBFBD>, aby si mohol nap<61>sa<73> 
+          p<>smeno w. Ak vid<69><64> nie<69>o in<69> ako  d , tak si nap<61>sal 
+          nespr<70>vny znak; stla<6C>  <ESC>  a za<7A>ni znova.
 
 ---> Tu je nieko<6B>ko slov z<>bava, ktor<6F> nie patria list do tejto vety.
 
@@ -178,34 +228,75 @@ POZN
 5. Prejdi na lekciu 2.3 pre pochopenie toho <20>o sa stalo.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     Lekcia 2.3: OPER<45>TORY A POHYBY
 
+  Ve<56>a pr<70>kazov, ktor<6F> menia text s<> odvoden<65> od oper<65>torov a pohybov. 
+  Form<72>t pre pr<70>kaz mazania kl<6B>vesou  d  je nasledovn<76>:
+
+    d   pohyb
+
+  kde:
+    d     - je mazac<61> oper<65>tor
+    pohyb - je to <20>o oper<65>tor vykon<6F>va (vyp<79>san<61> ni<6E><69>ie)
+
+  Kr<4B>tky list pohybov:
+    w - do za<7A>iatku <20>al<61>ieho slova, okrem jeho prv<72>ho p<>smena.
+    e - do konca teraj<61>ieho slova, vr<76>tane posledn<64>ho znaku. 
+    $ - do konca riadku, vr<76>tane posledn<64>ho znaku
+
+  Tak<61>e nap<61>san<61>m  de  sa zma<6D>e v<>etko od kurzora do konca slova.
+
+POZN<EFBFBD>MKA: Stla<6C>en<65>m iba pohybu v norm<72>lnom m<>de bez oper<65>tora 
+          sa presunie kurzor tak ako je to <20>pecivikovan<61>. 
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		Lekcia 2.4: Pou<6F>itie viacn<63>sobn<62>ho pohybu
+
+
+   ** Nap<61>san<61>m <20><>sla pred pohyb ho zopakuje zadn<64> po<70>et kr<6B>t **
+
+  1. Presu<73> kurozr ni<6E><69>ie na za<7A>iatok riadku ozna<6E>en<65>ho --->.
+
+  2. Nap<61><70>  2w  a kurozr sa presunie o dve slov<6F> vpred. 
+
+  3. Nap<61><70>  3e  a kurozr sa presunie vpred na koniec tretieho slova. 
+
+  4. Nap<61><70>  0  (nula) a kurozr sa presunie na za<7A>iatok riadku.
+
+  5. Zopakuj kroky 2 a 3 s r<>znymi <20><>slami. 
+
+---> Toto je riadok so slovami po kotr<74>ch sa m<><6D>ete pohybova<76>.
+
+  6. Prejdi na lekciu 2.5.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lekcia 2.3: ROZ<EFBFBD>IROVACIE PR<50>KAZY A OBJEKTY
+		  Lekcia 2.5: POU<EFBFBD>ITIE VIACN<43>SOBN<42>HO MAZANIA PRE HROMADN<44> MAZANIE
 
 
-  Form<EFBFBD>t mazacieho pr<70>kazu  d  je nasledovn<76>:
+    ** Nap<61>sanie <20><>sla spolu s oper<65>torom ho zopakuje zadan<61> po<70>et kr<6B>t **
 
-   [<5B><>slo]   d objekt       ALEBO      d   [<5B><>slo]    objekt
+  V kombin<69>cii oper<65>torov mazania a pohybu spom<6F>nan<61>ho vy<76><79>ie vlo<6C> po<70>et 
-  Kde:
+  pred pohyb pre docielenie hromadn<64>ho mazania:
-    <EFBFBD><EFBFBD>slo - ud<75>va ko<6B>ko kr<6B>t sa pr<70>kaz vykon<6F> (volite<74>n<EFBFBD>, implicitne=1)
+    d   <20><>slo   pohyb
-    d - je pr<70>kaz pre mazanie
-    objekt - ud<75>va na <20>om sa pr<70>kaz vykon<6F>va (vyp<79>san<61> ni<6E><69>ie)
 
-  Kr<EFBFBD>tky v<>pis objektov:
+  1. Presu<73> kurzor na prv<72> slovo p<>san<61> VE<56>K<EFBFBD>MI P<>SMENAMI 
-    w - od kurzora do konca slova, vr<76>tanie medzier
+     v riadku ozna<6E>enom --->.
-    e - od kurzora do konca slova, BEZ medzier
-    $ - od kurzora do konca riadku.
 
-POZN<EFBFBD>MKA: Ak stla<EFBFBD><EFBFBD><EFBFBD> kl<EFBFBD>vesu objektu v norm<72>lnom m<>de bez pr<70>kazu, kurzor
+  2. Nap<61><70>  2dw  a zma<EFBFBD>e<EFBFBD> dve slov<6F> p<>san<61> VE<56>K<EFBFBD>MI P<>SMENAMI
-	  sa presunie na miesto <20>pecifikovan<61> vo v<>pise objektov.
 
+  3. Zopakuj kroky 1 a 2 s pou<6F>it<69>m r<>zneho <20><>sla tak aby si zmazal slov<6F>
+     p<>san<61> ve<76>k<EFBFBD>mi p<>smenami jedn<64>m pr<70>kazom.
 
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny. 
+
+POZN<EFBFBD>MKA: <20><>slo medzi oper<65>torom  d  a pohybom funguje podobne ako pri 
+          pou<6F>it<69> s pohybom bez oper<65>tora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Lekcia 2.4: V<EFBFBD>NIMKA V 'PR<50>KAZOVOM OBJEKTE'
+    		Lekcia 2.6: OPER<EFBFBD>CIE S RIADKAMI
 
 
 	    ** Nap<61>sanie pr<70>kazu   dd   zma<6D>e cel<65> riadok. **
@@ -216,7 +307,7 @@ Vzh
 1. Presu<73> kurzor na druh<75> riadok v texte na spodu.
 2. Nap<61><70>  dd  aby si zmazal riadok.
 3. Prejdi na <20>tvrt<72> riadok.
-4. Nap<61><70>   2dd   (pametaj si  <20><>slo-pr<70>kaz-objekt) aby si zmazal dva riadky.
+4. Nap<61><70>   2dd   aby si zmazal dva riadky.
 
     1)  Ru<52>e s<> <20>erven<65>,
     2)  Blato je z<>bavn<76>,
@@ -228,7 +319,7 @@ Vzh
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lekcia 2.5: PR<50>KAZ UNDO
+			Lekcia 2.7: PR<50>KAZ UNDO
 
 
 ** Stla<6C>  u  pre vr<76>tenie posledn<64>ho pr<70>kazu,  U  pre <20>pravu cel<65>ho riadku. **
@@ -241,7 +332,7 @@ Vzh
 5. Teraz nap<61><70> ve<76>k<EFBFBD>   U  <20><>m vr<76>t<EFBFBD><74> riadok do p<>vodn<64>ho stavu.
 6. Teraz nap<61><70>  u  nieko<6B>ko kr<6B>t, <20><>m vr<76>t<EFBFBD><74> sp<73><70> pr<70>kaz U.
 7. Teraz nap<61><70> CTRL-R (dr<64> kl<6B>vesu CTRL stla<6C>en<65> k<>m stl<74><6C>a<EFBFBD> R) nieko<6B>ko
-   kr<6B>t, <20><>m vr<76>t<EFBFBD><74> sp<73><70> predt<64>m vr<76>ten<65> pr<70>kazy (redo).
+   kr<6B>t, <20><>m vr<76>t<EFBFBD><74> sp<73><70> predt<64>m vr<76>ten<65> pr<70>kazy (undo z undo).
 
 ---> Opprav chybby nna toomto riadku a zmee<65> ich pommocou undo.
 
@@ -260,16 +351,20 @@ Vzh
 
   3. Pre zmazanie cel<65>ho riadku nap<61><70>:   dd
 
-  4. Form<EFBFBD>t pre p<>kaz v nor<6F>lnom m<>de je:
+  4. Pre zopakovanie pohybu, nap<61><70> pred neho <20><>slo:   2w
 
-       [<5B><>slo]   pr<70>kaz   objekt    ALEBO   pr<EFBFBD>kaz [<5B><>slo]   objekt
+  5. Form<72>t pre p<>kaz:
+
+       oper<65>tor   [<5B><>slo]   pohyb
      kde:
-       <EFBFBD><EFBFBD>slo - ud<75>va ko<6B>ko kr<6B>t sa pr<70>kaz zopakuje
+       oper<EFBFBD>tor - <20>o treba robi<62>, napr<70>klad  d  pre zmazanie
-       pr<EFBFBD>kaz - ud<75>va vykon<6F>van<61> pr<70>kaz, ako napr<70>klad  d  pre mazanie
+       [<5B><>slo] - je volite<74>n<EFBFBD> po<70>et pre opakovanie pohybu
-       objekt - ud<75>va rozsah pr<70>kazu, ako napr<70>klad  w(slovo),
+       pohyb - pohyb po texte vzh<7A>adom na oper<65>tor, napr<70>klad w (slovo), 
 		$ (do konca riadku), at<61>.
 
-  5. Pre vr<EFBFBD>tenie sp<73><70> predo<64>lej oper<65>cie nap<61><70>:     u	 (mal<61> u)
+  6. Pre pohyb na za<7A>iatok riadku pou<6F>i nulu:  0
+
+  7. Pre vr<76>tenie sp<73><70> predo<64>lej oper<65>cie nap<61><70>:	u   (mal<61> u)
      Pre vr<76>tenie v<>etk<74>ch <20>prav na riadku nap<61><70>:    U   (ve<76>k<EFBFBD> U)
      Pre vr<76>tenie vr<76>ten<65>ch <20>prav nap<61><70>:	      CTRL-R
 
@@ -289,10 +384,10 @@ Vzh
 
   5. Zopakuj kroky 2 a<> 4, k<>m riadky nies<65> v spr<70>vnom porad<61>.
 
-     d) Tie<69> sa dok<6F><6B>e<EFBFBD> vzdel<65>va<76>?
+---> d) Tie<69> sa dok<6F><6B>e<EFBFBD> vzdel<65>va<76>?
-     b) Fialky s<> modr<64>,
+---> b) Fialky s<> modr<64>,
-     c) Inteligencia sa vzdel<65>va,
+---> c) Inteligencia sa vzdel<65>va,
-     a) Ru<52>e s<> <20>erven<65>,
+---> a) Ru<52>e s<> <20>erven<65>,
 
 
 
@@ -300,15 +395,15 @@ Vzh
 		       Lekcia 3.2: PR<50>KAZ NAHRADENIA
 
 
-     ** Nap<61>san<61>m  r  a znaku sa nahrad<61> znak na mieste kurzora. **
+     ** Nap<61>san<61>m  rx  sa nahrad<61> znak na mieste kurzora znakom  x . **
 
   1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok textu ozna<6E>en<65>ho zna<6E>kou --->.
 
   2. Presu<73> kurzor na za<7A>iatok prvej chyby.
 
-  3. nap<61><70>  r  a potom znak, ktor<6F> nahrad<EFBFBD> chybu.
+  3. nap<61><70>  r  a potom znak, ktor<6F> tam m<> by<62>.
 
-  4. Zopakuj kroky 2 a 3, k<>m prv<72> riadok nieje spr<EFBFBD>vny.
+  4. Zopakuj kroky 2 a 3, k<>m prv<72> riadok nieje zhodn<EFBFBD> s druh<75>m.
 
 ---> Ka<4B> bol tento riasok p<>aan<61>, niekro stla<6C>il nespr<70>bne kl<6B>vesy!
 ---> Ke<4B> bol tento riadok p<>san<61>, niekto stla<6C>il nespr<70>vne kl<6B>vesy!
@@ -323,22 +418,22 @@ POZN
 		       Lekcia 3.3. PR<50>KAZ <20>PRAVY
 
 
-     ** Ak chce<63> zmeni<6E> <20>as<61> slova alebo cel<65> slovo, nap<61><70>  cw . **
+     ** Ak chce<63> zmeni<6E> <20>as<61> slova do konca slova, nap<61><70>  ce . **
 
   1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->.
 
   2. Umiestni kurzor na p<>smeno o v slove rosfpl.
 
-  3. Nap<61><70>  cw  a oprav slovo (v tomto pr<70>pade nap<61><70> 'iadok'.)
+  3. Nap<61><70>  ce  a oprav slovo (v tomto pr<70>pade nap<61><70> 'iadok'.)
 
-  4. Stla<6C> <ESC> a prejdi na <20>al<61>iu chybu (prv<EFBFBD> znak, ktor<6F> treba zmeni<6E>.)
+  4. Stla<6C> <ESC> a prejdi na <20>al<61><6C> znak, ktor<6F> treba zmeni<6E>.
 
   5. Zopakuj kroky 3 a 4, k<>m prv<72> veta nieje rovnak<61> ako druh<75>.
 
 ---> Tento rosfpl m<> nieko<6B>ko skic, ktor<6F> je pirewvb<76> zmeni<6E> piy<69>u<EFBFBD><75>n pr<70>kazu.
 ---> Tento riadok m<> nieko<6B>ko slov, ktor<6F> je potrebn<62> zmeni<6E> pou<6F>it<69>m pr<70>kazu.
 
-Pozn<EFBFBD>mka, <20>e  cw  nielen nahr<68>dza slovo, ale <20>a aj premiestn<74> do vkladania.
+Pozn<EFBFBD>mka, <20>e  ce  zma<6D>e slovo a nastav<61> vkladac<61> m<>d.
 
 
 
@@ -346,13 +441,13 @@ Pozn
 		       Lekcia 3.4: VIAC ZMIEN POU<4F>IT<49>M c
 
 
-   ** Pr<50>kaz pre <20>pravy sa pou<6F><75>va s rovnak<61>mi objektami ako pre mazanie **
+   ** Pr<50>kaz pre <20>pravy sa pou<6F><75>va s rovnak<61>mi pohybmi ako pre mazanie **
 
   1. Pr<50>kaz pre <20>pravy pracuje rovnako ako pre mazanie. Form<72>t je:
 
-    [<5B><>slo]   c   objekt       ALEBO       c [<5B><>slo]   objekt
+        c    [<5B><>slo]    pohyb
 
-  2. Objekty s<> rovnak<61>, ako napr<70>klad  w (slovo), $ (koniec riadku), at<61>.
+  2. Pohyby s<> rovnak<61>, ako napr<70>klad   w (slovo) a  $ (koniec riadku).
 
   3. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->.
 
@@ -364,6 +459,7 @@ Pozn
 ---> Koniec tohto riadku potrebuje pomoc, aby bol ako druhy.
 ---> Koniec tohto riadku potrebuje opravi<76> pou<6F>it<69>m pr<70>kazu  c$ .
 
+POZN<EFBFBD>MKA: M<><4D>e<EFBFBD> pou<6F>i<EFBFBD> kl<6B>vesu backspace na <20>pravu zmien po<70>as p<>sania.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,13 +472,13 @@ Pozn
   2. Pre naradenie znaku na mieste kurzora, nap<61><70>  r  a potom znak, ktor<6F>
      nahrad<61> p<>vodn<64> znak.
 
-  3. Pr<50>kaz na upravenie umo<6D><6F>uje zmeni<6E> <EFBFBD>pecifikovan<EFBFBD> objekt od kurzora
+  3. Pr<50>kaz na upravenie umo<6D><6F>uje zmeni<6E> od kurzora a<> po miesto, ktor<6F> 
-     a<EFBFBD> po koniec objektu.  napr. Nap<61><70>  cw  <20><>m zmn<6D><6E> text od poz<6F>cie
+     ur<EFBFBD>uje pohyb.  napr. Nap<61><70>  ce  <20><>m zmn<6D><6E> text od poz<6F>cie
      kurzora do konca slova, c$  zmen<65> text do konca riadku.
 
-  4. Format pre nahradenie je:
+  4. Form<EFBFBD>t pre nahradenie je:
 
-	[<5B><>slo]   c objekt	 ALEBO	     c	 [<5B><>slo]    objekt
+	    c    [<5B><>slo]    pohyb 
 
 
 Teraz prejdi na nalseduj<75>cu lekciu.
@@ -394,19 +490,19 @@ Teraz prejdi na nalseduj
 
 
   ** Stla<6C> CTRL-g pre zobrazenie svojej poz<6F>cie v s<>bore a statusu s<>boru.
-     Stla<EFBFBD> SHIFT-G pre prechod na riadok v s<>bore. **
+     Nap<EFBFBD><EFBFBD>  G  pre presun na riadok v s<>bore. **
 
   Pozn<7A>mka: Pre<72><65>taj si cel<65> t<>to lekciu sk<73>r ako za<7A>ne<6E> vykon<6F>va<76> kroky!!
 
-  1. Dr<44> stla<6C>en<65> kl<6B>vesu Ctrl a stla<6C>  g . Na spodu obrazovky sa zobraz<61>
+  1. Dr<44> stla<6C>en<65> kl<6B>vesu Ctrl a stla<6C>  g . Toto naz<61>vame CTRL-G. 
-     stavov<EFBFBD> riadok s n<>zvom s<>boru a riadkom na ktorom pr<70>ve si. Zapam<61>taj
+     Na spodu obrazovky sa zobraz<61> spr<70>va s n<>zvom s<>boru a poz<6F>ciou 
-     si si <20><>slo riadku pre krok 3.
+     v s<>bore. Zapam<61>tajsi si <20><>slo riadku pre pou<EFBFBD>itie v kroku 3.
 
-  2. Stla<6C> Shift-G <20><>m sa dostane<6E> na spodok s<>boru.
+  2. Stla<6C>  G  <20><>m sa dostane<6E> na spodok s<>boru.
+     Nap<61><70>  gg  <20><>m sa dostane<6E> na za<7A>iatok s<>boru.
 
-  3. Nap<61><70> <20><>slo riadku na ktorom si sa nach<63>dzal a stla<6C> Shift-G. To <20>a
+  3. Nap<61><70> <20><>slo riadku na ktorom si sa nach<63>dzal a stla<6C>  G. To <20>a
-     vr<76>ti na riadok, na ktorom si prv<72> kr<6B>t stla<6C>il Ctrl-g.
+     vr<76>ti na riadok, na ktorom si prv<72> kr<6B>t stla<6C>il CTRL-G.
-     (Ke<4B> p<><70>e<EFBFBD> <20><>sla, tieto sa nezobrazuj<75> na obrazovke.)
 
   4. Ak sa c<>t<EFBFBD><74> schopn<70> vykona<6E> teto kroky, vykonaj kroky 1 a<> 3.
 
@@ -419,24 +515,24 @@ Teraz prejdi na nalseduj
   ** Nap<61><70>  /  nasledovan<61> re<72>azcom pre vyh<79>adanie pr<70>slu<6C>n<EFBFBD>ho re<72>azca. **
 
   1. Nap<61><70> znak  /  v norm<72>lnom m<>de. Pozn<7A>mka, <20>e tento znak sa spolu
-     s kurzorom zobraz<61> v dolnej <20>asti obrazovky ako s  :  pr<70>kazom.
+     s kurzorom zobraz<61> v dolnej <20>asti obrazovky s  :  pr<70>kazom.
 
   2. Teraz nap<61><70> 'errroor' <ENTER>. To je slovo, ktor<6F> chce<63> vyh<79>ada<64>.
 
   3. Pre vyh<79>adanie <20>al<61>ieho v<>skytu rovnak<61>ho re<72>azca, stla<6C> jednoducho  n.
      Pre vyh<79>adanie <20>al<61>ieho v<>skytu rovnak<61>ho re<72>azca opa<70>n<EFBFBD>m smerom,
-     nap<EFBFBD><EFBFBD> Shift-N.
+     N.
 
   4. Ak chce<63> vyh<79>ada<64> re<72>azec v sp<73>tnom smere, pou<6F><75> pr<70>kaz  ?  miesto
      pr<70>kazu /.
 
- ---> Ke<4B> vyh<79>ad<61>vanie dosiahne koniec tohto s<>boru, bude pokra<72>ova<76> na
+  5. Pre n<>vrat na miesto z ktor<6F>ho si pri<72>iel stla<6C> CTRL-O (dr<64> stla<6C>en<65> 
-      za<7A>iatku.
+     kl<EFBFBD>vesu Ctrl po<70>as stla<6C>enia kl<6B>vesy o). Zopakuj pre <20>al<61><6C> n<>vrat 
+     sp<73><70>. CTRL-I ide vpred.
 
-  "errroor" nie je sp<73>sob ako nahradi<64> error; errroor je error.
+POZN<EFBFBD>MKA: "errroor" nieje sp<73>sob hl<EFBFBD>skovania error; errroor je error.
-
+POZN<EFBFBD>MKA: Ke<4B> vyh<79>ad<61>vanie dosiahne koniec tohto s<>boru, bude pokra<72>ova<76> na
-POZN<EFBFBD>MKA: Ke<4B> vyh<79>ad<61>vanie dosiahne koniec s<>boru, bude pokra<72>ova<76> na jeho
+      za<7A>iatku, dokia<EFBFBD> nieje resetovan<61> nastavenie 'wrapscan' .
-	  za<7A>iatku.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -454,16 +550,18 @@ POZN
 
   4. Nap<61><70>  %  pre presun kurzoru sp<73><70> na otv<74>raj<61>cu z<>tvorku.
 
+  5. Presu<73> kurzor na in<69> zo znakov (,),[,],{ alebo } a v<>imni si
+     <20>o % vykon<6F>va.
+
 ---> Toto ( je testovac<61> riadok s ('s, ['s ] a {'s } v riadku. ))
 
 Pozn<EFBFBD>mka: Toto je ve<76>mi v<>hodn<64> pou<6F><75><EFBFBD> pri laden<65> programu s ch<63>baj<61>cimi
-	  uzatv<74>raj<61>cimi z<>tvorkami.
+	  uzatv<74>raj<61>cimi z<>tvorkami!
-
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lekcia 4.4: SPOSOB AKO ZMENI<4E> CHYBY
+		      Lekcia 4.4: PR<EFBFBD>KAZ NAHRADENIA
 
 
  ** Nap<61><70>   :s/star<61>/nov<6F>/g  pre nahradenie slova 'star<61>' za slovo 'nov<6F>'. **
@@ -471,7 +569,7 @@ Pozn
   1. Presu<73> kurzor ni<6E><69>ie na riadok ozna<6E>en<65> zna<6E>kou --->.
 
   2. Nap<61><70>  :s/thee/the <ENTER> . Poznamka, <20>e tento pr<70>kaz zmen<65> len prv<72>
-     v<>skyt v riadku.
+     v<>skyt "thee" v riadku.
 
   3. Teraz nap<61><70>   :s/thee/the/g   <20>o znamen<65> celkov<6F> nahradenie v riadku.
      Toto nahrad<61> v<>etky v<>skyty v riadku.
@@ -479,9 +577,11 @@ Pozn
 ---> Thee best time to see thee flowers in thee spring.
 
   4. Pre zmenu v<>etk<74>ch v<>skytov dan<61>ho re<72>azca medzi dvomi ridakami,
-     nap<61><70>  :#,#s/star<61>/nov<6F>/g  kde #,# s<> <20><>sla dvoch riadkov.
+     nap<61><70>  :#,#s/star<61>/nov<6F>/g  kde #,# s<> <20><>sla dvoch riadkov, v rozsahu
+                                ktor<6F>ch sa nahradenie vykon<6F>.
      nap<61><70>  :%s/star<61>/nov<6F>/g    pre zmenu v<>etk<74>ch v<>skytov v celom riadku
-
+     nap<61><70>  :%s/star<61>/nov<6F>/gc   n<>jde v<>etky v<>skyty v celom s<>bore,
+                                s ot<6F>zkou <20>i nahradi<64> alebo nie
 
 
 
@@ -489,23 +589,25 @@ Pozn
 			       LEKCIA 4 ZHRNUTIE
 
 
-  1. Ctrl-g  vyp<79><70>e tvoju poz<6F>ciu v s<>bore a status s<>boru.
+  1. CTRL-g    vyp<79><70>e tvoju poz<6F>ciu v s<>bore a status s<>boru.
-     Shift-g  <20>a premiestni na koniec riadku. <EFBFBD><EFBFBD>slo riadku nasledovan<61>
+            G  <20>a premiestni na koniec riadku. 
-     Shift-g  <20>a presunie na dan<EFBFBD> <20><>slo riadku.
+     <EFBFBD><EFBFBD>slo  G  <20>a premiestni na riadok s <20><>slom.
+           gg  <20>a presunie na prv<72> riadok
 
   2. Nap<61>sanie  /  nasledovan<61> re<72>azcom vyh<79>ad<61> re<72>azec smerom DOPREDU.
      Nap<61>sanie  ?  nasledovan<61> re<72>azcom vyh<79>ada re<72>azec smerom DOZADU.
      Nap<61>sanie  n  po vyh<79>ad<61>van<61>, vyh<79>ad<61> nasleduj<75>ci v<>skyt re<72>azca
-     v rovnakom smere, pri<72>om  Shift-N  vyh<79>ad<61> v opa<70>nom smere.
+     v rovnakom smere, pri<72>om  N  vyh<79>ad<61> v opa<70>nom smere.
+     CTRL-O <20>a vr<76>ti sp<73><70> na star<61>iu poz<6F>ciu, CTRL-I na nov<6F>iu poz<6F>ciu.
 
   3. Nap<61>sanie  %  ke<6B> kurzor je na (,),[,],{, alebo } n<>jde zodpovdaj<61>cu
-     p<>r<EFBFBD> z<>tvorku.
+     p<>rnu z<>tvorku.
 
-  4. Pre nahradenie nov<6F>ho za prv<72> star<61> v riadku nap<61><70>    :s/nov<EFBFBD>/star<EFBFBD>
+  4. Pre nahradenie nov<6F>ho za prv<72> star<61> v riadku nap<61><70>    :s/star<EFBFBD>/nov<EFBFBD>
-     Pre nahradenie nov<6F>ho za v<>etky star<61> v riadku nap<61><70>  :s/nov<EFBFBD>/star<EFBFBD>/g
+     Pre nahradenie nov<6F>ho za v<>etky star<61> v riadku nap<61><70>  :s/star<EFBFBD>/nov<EFBFBD>/g
-     Pre nahradenie re<72>azcov medzi dvoma riadkami 3 nap<61><70>  :#,#/nov<EFBFBD>/star<EFBFBD>/g
+     Pre nahradenie re<72>azcov medzi dvoma riadkami 3 nap<61><70>  :#,#/star<EFBFBD>/nov<EFBFBD>/g
      Pre nahradenie v<>etk<74>ch v<>skytov v s<>bore nap<61><70>       :%s/star<61>/nov<6F>/g
-     Pre potvrdenie ka<6B>d<EFBFBD>ho nahradenia pridaj 'c'	   :%s/nov<6F>/star<EFBFBD>/gc
+     Pre potvrdenie ka<6B>d<EFBFBD>ho nahradenia pridaj 'c'	         :%s/star<61>/nov<EFBFBD>/gc
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -524,7 +626,7 @@ Pozn
      zobraz<61> obsah tvojho adres<65>ra rovnako ako na pr<70>kazovom riadku.
      Alebo pou<6F>i  :!dir  ak ls nefunguje.
 
-Pozn<EFBFBD>mka:  Takto je mo<6D>n<EFBFBD> spusti<74> hociak<61> vonkaj<61><6A> pr<70>kaz.
+Pozn<EFBFBD>mka:  Takto je mo<6D>n<EFBFBD> spusti<74> hociak<61> vonkaj<61><6A> pr<70>kaz s argumentami.
 Pozn<EFBFBD>mka:  V<>etky pr<70>kazy  :  musia by<62> dokon<6F>en<65> stla<6C>en<65>m <ENTER>
 
 
@@ -539,41 +641,43 @@ Pozn
   1. Nap<61><70>  :!dir  alebo  :!ls  pre v<>pis aktu<74>lneho adres<65>ra.
      U<> vie<69>, <20>e mus<75><73> za t<>mto stla<6C>i<EFBFBD> <ENTER> .
 
-  2. Vyber n<>zov s<>boru, ktor<6F> E<EFBFBD>TE neexistuje.
+  2. Vyber n<>zov s<>boru, ktor<6F> e<EFBFBD>te neexistuje, ako napr. TEST.
 
   3. Teraz nap<61><70>:   :w TEST   (kde TEST je n<>zov vybrat<61>ho s<>boru.)
 
   4. To ulo<6C><6F> cel<65> s<>bor  (Vim Tutor)  pod n<>zovm TEST.
      Pre overenie nap<61><70>   :!dir   , <20><>m  zobraz<61><7A> obsah adres<65>ra.
 
-Pozn<EFBFBD>mka: <20>e ak ukon<6F><6E><EFBFBD> pr<70>cu s editorom Vim a znovu ho spust<73><74> s n<>zvom
+Pozn<EFBFBD>mka: <20>e ak ukon<6F><6E><EFBFBD> pr<70>cu s editorom Vim a znovu ho spust<73><74> pr<EFBFBD>kazom
-	  s<EFBFBD>boru TEST, s<>bor bude k<>pia v<>uky, ke<6B> si ho ulo<6C>il.
+	        vim TEST, s<>bor bude k<>pia v<>uky, ke<6B> si ho ulo<6C>il.
 
   5. Teraz odstr<74><72> s<>bor nap<61>san<61>m (MS-DOS):   :!del TEST
 			     alebo (Unix):     :!rm TEST
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lekcia 5.3 V<>BEROV<EFBFBD> PR<50>KAZ PRE ULO<4C>ENIE
+		    Lekcia 5.3 V<>BER TEXTU PRE ULO<4C>ENIE
 
 
-  ** Pre ulo<6C>enie <20>asti s<>boru, nap<61><70>   :#,# w FILENAME **
+  ** Pre ulo<6C>enie <20>asti s<>boru, nap<61><70>  v  pohyb :w FILENAME **
 
-  1. Znovu nap<61><70>  :!dir  alebo  :!ls  pre zobrazenie obsahu aktu<74>lneho
+  1. Presu<EFBFBD> kurozr na tento riadok.
-     adres<65>ra a vyber vhodn<64> s<>bor ako TEST.
 
-  2. Presu<EFBFBD> kurzor na vrch tejto strany a nap<61><70>  Ctrl-g  pre vyh<79>adanie <20><>sla
+  2. Stla<EFBFBD>  v  a presu<EFBFBD> kurozr na piatu polo<6C>ku dole. Pozn<7A>mka, <20>e
-     tohto riadku.  PAMETAJ SI TOTO <20><>SLO!
+     tento text je vyzna<6E>en<65> (highlighted).
 
-  3. Teraz prejdi na spodok strany a nap<61><70>  Ctrl-g  znovu. ZAPAMETAJ SI <20><>SLO
+  3. Stla<EFBFBD> kl<6B>vesu  : . V spodnej <20>asti okna sa objav<61>  :'<,'>.
-     AJ TOHTO RIADKU!
 
-  4. Pre ulo<6C>enie LEN <20>asti s<>boru, nap<61><70>   :#,# w TEST  kde #,# s<> dve <20><>sla
+  4. Nap<EFBFBD><EFBFBD> w TEST  , kde TEST je meno s<>boru, ktor<6F> zatial neexistuje. 
-     zapam<EFBFBD>tan<EFBFBD>ch riadkov (vrch, spodok) a TEST je n<>zov s<>boru.
+     Skontroluj, e vid<69><64>  :'<,'>w TEST  predt<64>m ne<6E> stla<6C><61><EFBFBD> Enter.
 
-  5. Znova sa pozri, <20>i tam ten s<>bor je pomocou pr<70>kazu   :!dir ale
+  5. Vim zap<61><70>e ozna<6E>en<65> riadky do s<>boru TEST. Pou<6F>i :!dir  alebo  !ls
-     NEODSTRA<EFBFBD>UJ ho.
+     pre overenie. Zatial ho e<>te nema<6D>! Pou<6F>ijeme ho v <20>al<61>ej lekcii.
 
+POZN<EFBFBD>MKA: Stla<6C>en<65>m kl<6B>vesy  v  sa spust<73> vizu<7A>lne ozna<6E>ovanie. 
+          M<><4D>e<EFBFBD> pohybova<76> kurzorom pre upresnenie vyzna<6E>en<65>ho textu. 
+          Potom m<><6D>e<EFBFBD> pou<6F>i<EFBFBD> oper<65>tor pre vykonanie nejakej akcie 
+          s textom. Napr<70>klad  d  zma<6D>e vyzna<6E>en<65> text.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -582,21 +686,16 @@ Pozn
 
 	** Pre vlo<6C>enie obsahu s<>boru, nap<61><70>   :r FILENAME **
 
-  1. Nap<EFBFBD><EFBFBD>   :!dir   aby si sa presved<65>il, <20>e s<>bor TEST st<73>le existuje.
+  1. Premiestni kurzor nad tento riadok. 
 
-  2. Presu<73> kurzor na vrch tejto strany.
+POZN<EFBFBD>MKA: Po vykonan<61> kroku 2 uvid<69><64> text z lekcie 5.3. Potom sa presu<73>
-
+          dole, aby si videl t<>to lekciu.
-POZN<EFBFBD>MKA:  Po vykonan<61> kroku 3 uvid<69><64> Lekciu 5.3. Potom sa presu<73> dole
-	   na t<>to lekciu.
 
   3. Teraz vlo<6C> s<>bor TEST pou<6F>it<69>m pr<70>kazu   :r TEST   kde TEST je n<>zov
-     s<>boru.
+     s<>boru. S<>bor, ktor<6F> si pou<6F>il je umiestnen<65> pod riadkom s kurzorom.
-
-POZN<EFBFBD>MKA:  S<>bor, ktor<6F> si vlo<6C>il sa vlo<6C><6F> od miesta, kde sa nach<63>dza kurzor.
-
-  4. Pre kontrolu vlo<6C>enia s<>boru, presu<73> kurzor sp<73><70> a v<>imni si, <20>e teraz
-     m<><6D> dve k<>pie lekcie 5.3, origin<69>l a s<>borov<6F> verziu.
 
+POZN<EFBFBD>MKA: M<><4D>e<EFBFBD> tie<69> na<6E><61>ta<74> v<>stup vonkaj<61>ieho pr<70>kazu. Napr<70>klad :r !ls
+          na<6E><61>ta v<>stup pr<70>kazu ls a umiestni ho za poz<6F>ciu kurzora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -612,14 +711,13 @@ POZN
 
   2.  :w FILENAME  ulo<6C><6F> aktu<74>lny s<>bor na disk pod menom FILENAME.
  
-  3.  :#,#w FILENAME  ulo<6C><6F> riadky od # do # do s<>boru FILENAME.
+  3.  v  pohyb  :w FILENAME  ulo<6C><6F> vizu<EFBFBD>lne ozna<6E>en<65> riadky do 
+      s<>boru FILENAME.
 
   4.  :r FILENAME  vyberie z disku s<>bor FILENAME a vlo<6C><6F> ho do aktu<74>lneho
       s<>boru za poz<6F>ciou kurzora.
 
-
+  5. :r !dir  na<6E><61>ta v<>stup z pr<70>kazu dir a vlo<6C><6F> ho za poz<6F>ciu kurzora.
-
-
 
 
 
@@ -640,9 +738,10 @@ POZN
 ---> Po nap<61>san<61>  o  sa kurzor premiestn<74> na vlo<6C>en<65> riadok do vkladacieho
      m<>du.
 
-  4. Pre otvorenie riadku nad kurzorom, jednotucho nap<61><70> ve<76>k<EFBFBD>  O , namiesto
+  4. Pre otvorenie riadku nad kurzorom, jednotucho nap<61><70> ve<76>k<EFBFBD>  O , 
-     mal<61>ho o. Vysk<73><6B>aj si to na nasleduj<EFBFBD>com riadku.
+     namiesto mal<EFBFBD>ho  o. Vysk<73><6B>aj si to na riadku dole. 
-Vlo<EFBFBD> riadok nad t<>mto nap<61>san<61>m Shift-O, ke<6B> kurzor je na tomto riadku.
+
+---> Vlo<6C> riadok nad t<>mto nap<61>san<61>m O, ke<6B> kurzor je na tomto riadku.
 
 
 
@@ -653,20 +752,21 @@ Vlo
 	   ** Nap<61><70>  a  pre vlo<6C>enie textu ZA kurzor. **
 
   1. Presu<73> kurzor ni<6E><69>ie na koniec prv<72>ho riadku ozna<6E>en<65>ho zna<6E>kou --->
-     nap<61>san<61>m  $  v norm<72>lnom m<>de.
 
-  2. Nap<EFBFBD><EFBFBD>  a  (mal<61> p<>smeno) pre pridanie textu ZA znakom na mieste
+  2. Stla<EFBFBD> kl<6B>vesu  e  dokia<EFBFBD> kurozr nieje na konci riadku.   
-     kurzora. (Ve<56>k<EFBFBD> A prid<69> na koniec riadku.)
 
-Pozn<EFBFBD>mka: Toto obch<63>dza p<>sanie  i , posledn<64> znak, text na vlo<6C>enie, <ESC>,
+  3. Nap<61><70>  a  (mal<61> p<>smeno) pre pridanie textu ZA kurzorom.
-	  kurzor doprava, a nakoniec, x , na prid<69>vanie na koniec riadku!
 
-  3. Teraz dokon<6F>i prv<72> riadok. Pozn<7A>mka, <20>e prid<69>vanie je vlastne rovnak<61>
+  4. Dokon<EFBFBD><EFBFBD> slovo tak ako je to v druhom riadku. Stla<6C> <ESC> pre 
-     ako vkladac<61> m<>d, okrem miesta, kde sa text vklad<61>.
+     opustenie vkladacieho m<>du.
 
----> Tento riadok ti dovo<76>uje n<>cvik
+  5. Pou<6F>i  e  na presun na <20>al<61>ie nedokon<6F>en<65> slovo a zopakuj kroky 3 a 4.
+
+---> Tento ri ti dovo<76>uje n<>cv pri<72>van testu na koniec riadku.
 ---> Tento riadok ti dovo<76>uje n<>cvik prid<69>vania textu na koniec riadku.
 
+POZN<EFBFBD>MKA: a, i, A <20>tartuj<75> rovnak<61> vkladac<61> m<>d, jedin<69> rozidel je, kde 
+          sa znaky vkladaj<61>. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -675,24 +775,52 @@ Pozn
 
       ** Nap<61><70> ve<76>k<EFBFBD> R pre nahradenie viac ako jedn<64>ho znaku. **
 
-  1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->.
+  1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->. Premiestni
+     kurzor na za<7A>iatok prv<72>ho v<>skytu  xxx.
 
-  2. Premiestni kurzor na za<7A>iatok prv<72>ho slova, ktor<6F> je odli<6C>n<EFBFBD> od druh<EFBFBD>ho
+  2. Teraz nap<61><70>  R  a  nap<61><70>  <20><>slo uveden<EFBFBD> v druhom riadku, tak<61>e 
-     riadku ozna<6E>en<65>ho ---> (slovo 'posledn<64>').
+     sa n<>m nahrad<61> p<>vodn<64> xxx.
 
-  3. Teraz nap<61><70>  R  a nahra<72> zvy<76>ok textu na prvom riadku p<>san<61>m cez star<61>
+  3. Stla<EFBFBD> <ESC> pre opustenie nahradzovacieho m<>du. Pozn<7A>mka, <20>e zvy<76>ok 
-     text tak, aby prv<72> riadok bol rovnak<61> ako druh<EFBFBD>.
+     riadku zostane nezmenen<EFBFBD>. 
 
----> Na <20>pravu prv<72>ho riadku do tvaru ako je posledn<64> na strane pou<6F>i kl<6B>vesy.
+  4. Zopakuj tieto kroky pre nahradenie zvy<76>n<EFBFBD>ch xxx.
----> Na <20>pravu prv<72>ho riadku do tavru ako je druh<75>, nap<61><70> R a nov<6F> text.
 
-  4. Pozn<7A>mka, <20>e ak stla<6C><61><EFBFBD> <ESC> pre ukon<6F>enie, v<>etok nezmenen<65> text
+---> Pridan<61>m 123 ku xxx dostane<6E> xxx.
-     zostane.
+---> Pridan<61>m 123 ku 456 dostane<EFBFBD> 579.
 
+POZN<EFBFBD>MKA:  Nahradzovac<61> m<>d je ako vkladac<61> m<>d, ale ka<6B>d<EFBFBD> nap<61>san<61> znak 
+           zma<6D>e existuj<75>ci znak. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lekcia 6.4: NASTAVENIE MO<4D>NOST<53>
+
+          Lekcia 6.4: Copy Paste textu
+
+    ** pou<6F><75> oper<65>tor  y  pre copy textku a  p  pre jeho paste **
+
+  1. Cho<68> ni<6E><69>ie na riadok ozna<6E>en<65> ---> a umiestni kurozr za "a)".
+
+  2. Na<4E>tartuj vizu<7A>lny m<>d pou<6F>it<69>m  v  a presu<73> kurozr pred "first".
+
+  3. Nap<61><70>  y  pre  vystrihnutie (copy) ozna<6E>en<65>ho textu.
+
+  4. Presu<73> kurozr na koniec <20>al<61>ieho riadku: j$
+
+  5. Nap<61><70>  p  pre vlo<6C>nie (paste) textu. Potom nap<61><70>:  a druha <ESC>.
+
+  6. Pou<6F>i vizu<7A>lny m<>d pre ozna<6E>enie "polo<6C>ka.", vystrihni to 
+     pou<6F>it<69>m  y, presu<73> sa na koniec nasleduj<75>ceho riadku pou<6F>it<69>m  j$ 
+     a vlo<6C> sem text pou<6F>it<69>m  p.
+
+---> a) toto je prv<72> polo<6C>ka
+---> b)
+
+POZN<EFBFBD>MKA: M<><4D>e<EFBFBD> pou<6F>i<EFBFBD> tie<69>  y  ako oper<65>tor; yw  vystrihne jedno slovo. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 Lekcia 6.5: NASTAVENIE MO<4D>NOST<53>
 
 
 ** Nastav mo<6D>nosti, tak<61>e vyh<79>ad<61>vanie alebo nahradzovanie ignoruje
@@ -700,40 +828,52 @@ Pozn
 
 
   1. Vyh<79>adaj re<72>azec 'ignore' nap<61>san<61>m:
-     /ignore
+     /ignore <ENTER>
-     Zopakuj vyh<79>ad<61>vanie nieko<6B>ko kr<6B>t stla<6C>en<65>m kl<6B>vesy n
+     Zopakuj vyh<79>ad<61>vanie nieko<6B>ko kr<6B>t stla<6C>en<65>m kl<6B>vesy  n .
 
   2. Nastav mo<6D>nos<6F> 'ic' (Ignore case) nap<61>san<61>m pr<70>kazu:
      :set ic
 
-  3. Teraz vyh<79>adaj re<72>azec 'ingore' znova stla<6C>en<65>m kl<6B>vesy: n
+  3. Teraz vyh<79>adaj re<72>azec 'ingore' znova stla<6C>en<65>m kl<6B>vesy  n
-     Zopakuj vyh<79>ad<61>vanie nieko<6B>ko kr<6B>t stla<6C>en<65>m kl<6B>vesy n
+     Pozn<EFBFBD>mka, <20>e teraz s<> vyh<79>adan<61> aj Ignore a IGNORE.
 
   4. Nastav mo<6D>nos<6F>i 'hlsearch' a 'incsearch':
      :set hls is
 
   5. Teraz spusti vyh<79>ad<61>vac<61> pr<70>kaz znovu, a pozri <20>o sa stalo:
-     /ignore
+     /ignore <ENTER>
 
-  6. Na odstr<74>nenie zv<7A>raznenia v<>razov nap<61><70>:
+  6. Pre opetovn<76> zapnutie rozly<6C>ovania ve<76>k<EFBFBD>ch a mal<61>ch p<>smen 
-     :nohlsearch
+     nap<EFBFBD><EFBFBD>:  :set noic
+
+POZN<EFBFBD>MKA: Na odstr<74>nenie zv<7A>raznenia v<>razov nap<61><70>:  :nohlsearch
+POZN<EFBFBD>MKA: Ak chce<63> nerozly<6C>ova<76> ve<76>kos<6F> p<>smen len pre jedno 
+          pou<6F>itie vyh<79>ad<61>vacieho pr<70>kazu, pou<6F>i \c:  /ignore\c <ENTER>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			      LEKCIA 6 ZHRNUTIE
 
 
-  1. Nap<61>san<EFBFBD>m  o  sa otvor<EFBFBD> nov<6F> riadok pod kurzorom a premiestni sa kurzor
+  1. Nap<61><EFBFBD>  o  pre otvorenie riadku pod kurzorom a <EFBFBD>tart vkladacieho m<>du.
-     na vlo<6C>en<65> riadok do vkladacieho m<>du.
+     Nap<EFBFBD><EFBFBD>  O  pre otvorenie riadku nad kurzorom.
-     nap<61>san<61>m ve<76>k<EFBFBD>ho  O  sa otvor<6F> riadok nad aktu<74>lnym riadkom s kurzorom.
 
-  2. Nap<61><70>  a  pre vkladanie textu ZA znak na poz<6F>cii kurzoru.
+  2. Nap<61><70>  a  pre vkladanie textu ZA kurzor.
-     Nap<61>san<EFBFBD>m ve<76>k<EFBFBD>ho  A  sa text automatick<63> prid<69>va na koniec riadku.
+     Nap<61><EFBFBD>  A  pre vkladanie textu za koncom riadku.
 
-  3. Nap<EFBFBD>sanie ve<76>k<EFBFBD>ho  R  prepne do nahradzovacieho m<>du, k<>m nieje
+  3. Pr<EFBFBD>kaz  e  presunie kurozr na koniec slova
-     stla<6C>en<65> <ESC> pre ukon<6F>enie nahradzovacieho m<>du.
 
-  4. Nap<EFBFBD>sanie ":set xxx" nastav<61> mo<6D>nos<6F> "xxx".
+  4. Oper<EFBFBD>tor  y  vystrihne (skop<6F>ruje) text,  p  ho vlo<6C><6F>.
 
+  5. Nap<61>sanie ve<76>k<EFBFBD>ho  R  prepne do nahradzovacieho m<>du, k<>m nieje
+     stla<6C>en<65> <ESC>.
+
+  6. Nap<61>sanie ":set xxx" nastav<61> mo<6D>nos<6F> "xxx". Niektor<6F> nastavenia s<>: 
+     'ic' 'ignorecase' ignoruje ve<76>k<EFBFBD> a mal<61> p<>smen<65> po<70>as vyh<79>ad<61>vania. 
+     'is' 'incsearch' zobrazuje <20>iasto<74>n<EFBFBD> re<72>azce vyh<79>ad<61>van<61>ho re<72>azca. 
+     'hls' 'hlsearch' vyzna<6E><61> v<>etky vyh<79>ad<61>van<61> re<72>azce.
+      M<><4D>e<EFBFBD> pou<6F>i<EFBFBD> hociktor<6F> z dlh<6C>ch a kr<6B>tkych n<>zvov mo<6D>nost<73>.
+
+  7. Vlo<6C> "no" pred nastavenie pre jeho vypnutie:  :set noic
 
 
 
@@ -742,7 +882,7 @@ Pozn
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    LEKCIA 7: PR<50>KAZY ON-LINE N<>POVEDY
+		    LEKCIA 7.1: Z<>SKANIE N<>POVEDY
 
 
 	  ** Pou<6F><75>vaj on-line syst<73>m n<>povedy **
@@ -753,19 +893,21 @@ Pozn
 	- stla<6C> kl<6B>vesu <F1> (ak nejak<61> m<><6D>)
 	- nap<61><70>  :help <ENTER>
 
+  <20><>taj text v okne n<>povedy pre z<>skanie predstavy ako n<>poveda funguje. 
+  Nap<61><70>   CTRL-W CTRL-W  pre skok z jedn<64>ho okna do druh<75>ho. 
   Nap<61><70>    :q <ENTER>    <20><>m zatvor<6F><72> okno n<>povedy.
 
   M<><4D>e<EFBFBD> n<>js<6A> help ku hociakej t<>me pridan<61>m argumentu ku pr<70>kazu ":help".
   Vysk<73><6B>aj tieto (nezabudni stla<6C>i<EFBFBD> <ENTER>):
 
 	:help w
-	:help c_<T
+	:help c_CTRL-D
 	:help insert-index
 	:help user-manual
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		 LEKCIA 8: VYTVORENIE <20>TARTOVACIEHO SKRIPTU
+		 LEKCIA 7.2: VYTVORENIE <20>TARTOVACIEHO SKRIPTU
 
 		       ** Zapni funkcie editora Vim **
 
@@ -773,22 +915,67 @@ Pozn
   vypnut<75>. Pre pou<6F><75>vanie viac Vim funkcii vytvor "vimrc" s<>bor.
 
   1. Za<5A>ni editova<76> "vimrc" s<>bor, to z<>vis<69> na pou<6F>itom syst<73>me:
-	:edit ~/.vimrc      pre Unix
+	:e ~/.vimrc      pre Unix
-	:edit $VIM/_vimrc   pre MS-Windows
+	:e $VIM/_vimrc   pre MS-Windows
 
   2. Teraz si pre<72><65>taj text pr<70>kladu "vimrc" s<>boru:
 
-	:read $VIMRUNTIME/vimrc_example.vim
+	:r $VIMRUNTIME/vimrc_example.vim
 
   3. Ulo<6C> s<>bor:
-
+	:w
-	:write
 
   Pri nasleduj<75>com <20>tarte editora Vim sa pou<6F>ije zv<7A>raz<61>ovanie syntaxe.
   Do "vimrc" s<>boru m<><6D>e<EFBFBD> prida<64> v<>etky svoje uprednost<73>ovan<61> nastavenia.
+  Pre viac inform<72>cii nap<61><70>  :help vimrc-intro
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+                   LEKCIA 7.3 DOKON<4F>ENIE
+
+     ** Dokon<6F>i pr<70>kaz na pr<70>kazovom riadku pou<6F>it<69>m CTRL-D a <TAB> **
+
+  1. Uisti sa, <20>e Vim nieje v kompatibilnom m<>de:  :set nocp
+
+  2. Pozri sa ak<61> s<>bory sa nach<63>dzaj<61> v adres<65>ri:  :!ls  alebo  :!dir
+
+  3. Nap<61><70> za<7A>iatok pr<70>kazu:  :e
+
+  4. Stla<6C>  CTRL-D  a Vim zobraz<61> zoznam pr<70>kazov za<7A><61>naj<61>cich "e".
+
+  5. Stla<6C> <TAB> a Vim dokon<6F><6E> meno pr<70>kazu na ":edit".
+
+  6. Teraz pridaj medzern<72>k a za<7A>iatok mena existuj<75>ceho s<>boru: 
+     :edit FIL
+
+  7. Stla<6C> <TAB>. Vim dokon<6F><6E> meno (ak je jedine<6E>n<EFBFBD>).
+
+POZN<EFBFBD>MKA: Dokon<6F>ovanie funguje pre ve<76>a pr<70>kazov. Vysk<73><6B>aj stla<6C>enie 
+          CTRL-D a <TAB>. <20>peci<63>lne je to u<>ito<74>n<EFBFBD> pre pr<70>kaz  :help.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            LEKCIA 7 ZHRNUTIE
+
+  1. Nap<61><70>  :help  alebo stla<6C> <F1> alebo <Help> pre otvorenie okna n<>povedy.
+
+  2. Nap<61><70>  :help pr<70>kaz  pre vyh<79>adanie n<>povedy ku pr<70>kazu pr<70>kaz. 
+
+  3. Nap<61><70>  CTRL-W CTRL-W  na presko<6B>enie do in<69>ho okna. 
+
+  4. Nap<61><70>  :q  pre zatvorenie okna n<>povedy
+
+  5. Vytvor <20>tartovac<61> skript vimrc pre udr<64>anie uprednost<73>ovan<61>ch nastaven<65>. 
+
+  6. Po<50>as p<>sania pr<70>kazu  :  stla<6C> CTRL-D pre zobrazenie dokon<6F>en<65>. 
+     Stla<6C> <TAB> pre pou<6F>itie jedn<64>ho z dokon<6F>en<65>. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
   Toto vymedzuje v<>uku Vimu. Toto je ur<75>en<65> pre strucn<63> preh<65>ad o editore
   Vim, <20>plne posta<74>uj<75>ce pre <20>ahk<68> a obstojn<6A> pou<6F><75>vanie tohto editora.
   T<>to v<>uka je <20>aleko od kompletnosti, preto<74>e Vim m<> omnoho viacej pr<70>kazov.
@@ -817,5 +1004,5 @@ Pozn
 
   Preklad do Sloven<65>iny: <20>ubo<62> <20>elko
   e-mail:       celbos@inmail.sk
-  Last Change:  2004 Apr 29
+  Last Change:  2006 Apr 18
-  Encoding:	iso8859-2
+  encoding:     iso8859-2

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<76>mi v<>konn<6E> editor, ktor<6F> m<> pr<70>li<6C> ve<76>a pr<70>kazov na to aby
@@ -10,6 +10,7 @@
      Pribli<6C>n<EFBFBD> <20>as potrebn<62> na prebratie tejto v<>uky je 25-30 min<69>t,
      z<>vis<69> na tom, ko<6B>ko je str<74>ven<65>ho <20>asu s presk<73><6B>avan<61>m.
 
+     UPOZORNENIE:
      Pr<50>kazy v lekci<63>ch modifikuj<75> text. Vytvor k<>piu tohto s<>boru aby
      sa mohlo precvi<76>ova<76> na <20>om (pri <20>tarte "vimtutor" je toto k<>pia).
 
@@ -20,6 +21,7 @@
      Presved<65> sa, <20>e Shift-Lock NIEJE stla<6C>en<65> a stla<6C>t kl<6B>vesu
      j  nieko<6B>ko kr<6B>t, aby sa kurzor posunul nato<74>ko, <20>e lekcia 1.1
      celkom zapln<6C> obrazovku.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekcia 1.1:  POHYB KURZOROM
 
@@ -41,31 +43,30 @@ Pozn
 	        na prechod do norm<72>lneho m<>du.
 
 Pozn<EFBFBD>mka: Kurzorov<6F> kl<6B>vesy s<> tie<69> funk<6E>n<EFBFBD>. Ale pou<6F><75>van<61>m hjkl sa bude<64>
-	  schopn<70> pohybova<76> r<>chlej<65>ie, ke<6B> si zvykne<6E> ich pou<6F><75>va<76>.
+	        schopn<EFBFBD> pohybova<76> r<>chlej<65>ie, ke<6B> si zvykne<6E> ich pou<6F><75>va<76>. Naozaj!
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     LEKCIA 1.2: SPڊ<50>ANIE A ZATV<54>RANIE VIMU
+		     LEKCIA 1.2: ZATV<54>RANIE VIMU
+
 
   !! POZN<5A>MKA: Pred vykonan<61>m t<>chto krokov si pre<72><65>taj cel<65> t<>to lekciu !!
 
   1. Stla<6C> kl<6B>vesu <ESC> (aby si sa u<>ite nach<63>dzal v norm<72>lnom m<>de)
 
   2. Nap<61><70>:   :q! <ENTER>.
-
+     T<>m ukon<6F><6E><EFBFBD> pr<70>cu s editorom BEZ ulo<6C>enia zmien, ktor<6F> si vykonal.
----> T<>m ukon<6F><6E><EFBFBD> pr<70>cu s editorom BEZ ulo<6C>enia zmien, ktor<6F> si vykonal.
-     Ak chce<63> ulo<6C>i<EFBFBD> vykonan<61> zmeny a ukon<6F>i<EFBFBD> pr<70>cu s editorom nap<61><70>:
-				:wq   <ENTER>
 
   3. Ke<4B> sa dostane<6E> na pr<70>kazov<6F> riadok, nap<61><70> pr<70>kaz, ktor<6F>m sa dostane<6E>
      spe<70> do tejto v<>uky. To m<><6D>e by<62>:	vimtutor <ENTER>
-     Zvy<76>ajne sa pou<6F><75>va:		vim tutor <ENTER>
-
----> 'vim' znamen<65> spustenie editora vim, 'tutor' je n<>zov s<>boru, ktor<6F>
-     chce<63> editova<76>.
 
   4. Ak si si tieto kroky spo<70>ahlivo zapam<61>tal, vykonaj kroky 1 a<> 3, pre
-     ukon<6F>enie a znovu spustenie editora. Potom presu<73> kurzor dole na
+     ukon<6F>enie a znovu spustenie editora. 
-     lekciu 1.3.
+
+POZN<EFBFBD>MKA: :q! <ENTER> neulo<6C><6F> zmeny, ktor<6F> si vykonal. O nieko<6B>ko lekci<63>
+          sa nau<61><75><EFBFBD> ako ulo<6C>i<EFBFBD> zmeny do s<>boru
+
+  5. presu<73> kurzor dole na lekciu 1.3.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		      Lekcia 1.3: EDIT<49>CIA TEXTU - MAZANIE
 
@@ -85,7 +86,7 @@ Pozn
 
   5. Ak je veta spr<70>vna, prejdi na lekciu 1.4.
 
-POZN<EFBFBD>MKA: Nesk<73><6B>aj si zapamet<EFBFBD><EFBFBD> obsah tejto v<>uky, ale sa u<> pou<6F><75>van<61>m.
+POZN<EFBFBD>MKA: Nesk<73><6B>aj si zapam<61>ta<EFBFBD> obsah tejto v<>uky, ale sa u<> pou<6F><75>van<61>m.
 
 
 
@@ -93,7 +94,7 @@ POZN
 		     Lekcia 1.4: EDIT<49>CIA TEXTU - VKLADANIE
 
 
-    ** Stla<6C>enie kl<6B>vesy  i  v norm<72>lnom m<>de umo<EFBFBD><EFBFBD>uje vkladanie textu. **
+    ** Stla<6C>enie kl<6B>vesy  i  umo<6D><6F>uje vkladanie textu. **
 
   1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok za zna<6E>ku --->.
 
@@ -111,6 +112,52 @@ POZN
   5. Ke<4B> sa dostato<74>ne nau<61><75><EFBFBD> vklada<64> text, prejdi na nasleduj<75>ce zhrnutie.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Lekcia 1.5: EDIT<49>CIA TEXTU - PRID<49>VANIE
+
+
+     ** Stla<6C>enie kl<6B>vesy  A  umo<6D><6F>uje prid<69>va<76> text. **
+
+  1. Presu<73> kurozr ni<6E><69>ie na prv<72> riadok za zna<6E>kou --->.
+     Nez<65>le<6C><65> na tom, na ktorom znaku sa kurzor v tom riadku nach<63>dza.
+
+  2. Stla<6C> kl<6B>vesu  A  a nap<61><70> potrebn<62> text.
+
+  3. Po pridan<61> textu stla<6C> kl<6B>vesu <ESC> pre n<>vrat do Norm<72>lneho m<>du.
+
+  4. Presu<73> kurozr na druh<75> riadok ozna<6E>en<65> ---> a zopakuj 
+     kroky 2 a 3 k<>m nieje veta spr<70>vna.
+
+---> Tu je nejak<61> text ch<63>baj<61>ci o
+     Tu je nejak<61> text ch<63>baj<61>ci od tia<69>to.
+---> Tu tie<69> ch<63>ba nej
+     Tu tie<69> ch<63>ba nejak<61> text.
+
+  5. Ke<4B> sa dostato<74>ne nau<61><75><EFBFBD> prid<69>va<76> text, prejdi na lekciu 1.6.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+       Lekcia 1.6: EDIT<49>CIA S<>BORU
+
+
+    ** Nap<61>san<61>m  :wq  sa s<>bor ulo<6C><6F> a zavrie **
+
+!! POZN<5A>MKA: Pred vykonan<61>m t<>chto krokov si pre<72><65>taj cel<65> lekciu!!
+
+1. Opusti t<>to v<>uku, ako si to urobil v lekcii 1.2:  :q!
+
+2. Do pr<70>kazov<6F>ho riadku nap<61><70> pr<70>kaz:  vim tutor <ENTER>
+   'vim' je pr<70>kaz, ktor<6F> spust<73> editor Vim, 'tutor' je meno s<>boru, 
+   ktor<6F> chce<63> editova<76>. Pou<6F>i tak<61> s<>bor, ktor<6F> m<><6D>e<EFBFBD> meni<6E>.
+
+3. Vlo<6C> a zma<6D> text tak, ako si sa nau<61>il v predo<64>l<EFBFBD>ch lekciach.
+
+4. Ulo<6C> s<>bor so zmenami a opusti Vim pr<70>kazom:  :wq  <ENTER>
+
+5. Re<52>tartuj vimtutor a presu<73> sa dole na nasleduj<75>ce zhrnutie. 
+
+6. Urob tak po pre<72><65>tan<61> predo<64>l<EFBFBD>ch krokov a porozumeniu im.
+
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       ZHRNUTIE LEKCIE 1
@@ -124,10 +171,11 @@ POZN
   3. Na ukon<6F>enie Vimu nap<61><70>: <ESC>  :q!  <ENTER> pre zru<72>enie v<>etk<74>ch zmien
        alebo nap<61><70>:   <ESC>   :wq   <ENTER>    pre ulo<6C>enie zmien.
 
-  4. Na zmazanie znaku na mieste kurzora nap<61><70> v norm<72>lnom m<>de:  x
+  4. Na zmazanie znaku na mieste kurzora nap<61><70>:  x
 
   5. Pre vlo<6C>enie textu na mieste kurzora v norm<72>lnom m<>de nap<61><70>:
-	 i     vkladan<61> text	<ESC>
+	 i     nap<61><70> vkladan<61> text   <ESC>  vkladanie pred kurzor
+   A     nap<61><70> prid<69>van<61> text  <EXC>  vkladanie za riadok
 
 POZN<EFBFBD>MKA: Stla<6C>enie <ESC> <20>a premiestn<74> do norm<72>lneho m<>du alebo zru<72><75>
 	        nejak<61> nechcen<65> a <20>iasto<74>ne dokon<6F>en<65> pr<70>kaz.
@@ -149,8 +197,10 @@ Teraz pokra
 
 4. Nap<61><70>  dw  aby slovo zmizlo.
 
-POZN<EFBFBD>MKA: P<>smen<EFBFBD> dw sa zobrazia na poslednom riadku obrazovky tak ako ich
+POZN<EFBFBD>MKA: P<>smeno d sa zobraz<EFBFBD> na poslednom riadku obrazovky ke<EFBFBD> ho
-	  p<EFBFBD><EFBFBD>e<EFBFBD>. Ak p<><70>e<EFBFBD> nie<69>o zle, stla<6C>	<ESC>  a za<7A>ni znova.
+	        nap<61><70>e<EFBFBD>. Vim na teba po<70>k<EFBFBD>, aby si mohol nap<61>sa<73> 
+          p<>smeno w. Ak vid<69><64> nie<69>o in<69> ako  d , tak si nap<61>sal 
+          nespr<70>vny znak; stla<6C>  <ESC>  a za<7A>ni znova.
 
 ---> Tu je nieko<6B>ko slov z<>bava, ktor<6F> nie patria list do tejto vety.
 
@@ -178,34 +228,75 @@ POZN
 5. Prejdi na lekciu 2.3 pre pochopenie toho <20>o sa stalo.
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     Lekcia 2.3: OPER<45>TORY A POHYBY
 
+  Ve<56>a pr<70>kazov, ktor<6F> menia text s<> odvoden<65> od oper<65>torov a pohybov. 
+  Form<72>t pre pr<70>kaz mazania kl<6B>vesou  d  je nasledovn<76>:
+
+    d   pohyb
+
+  kde:
+    d     - je mazac<61> oper<65>tor
+    pohyb - je to <20>o oper<65>tor vykon<6F>va (vyp<79>san<61> ni<6E><69>ie)
+
+  Kr<4B>tky list pohybov:
+    w - do za<7A>iatku <20>al<61>ieho slova, okrem jeho prv<72>ho p<>smena.
+    e - do konca teraj<61>ieho slova, vr<76>tane posledn<64>ho znaku. 
+    $ - do konca riadku, vr<76>tane posledn<64>ho znaku
+
+  Tak<61>e nap<61>san<61>m  de  sa zma<6D>e v<>etko od kurzora do konca slova.
+
+POZN<EFBFBD>MKA: Stla<6C>en<65>m iba pohybu v norm<72>lnom m<>de bez oper<65>tora 
+          sa presunie kurzor tak ako je to <20>pecivikovan<61>. 
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		Lekcia 2.4: Pou<6F>itie viacn<63>sobn<62>ho pohybu
+
+
+   ** Nap<61>san<61>m <20><>sla pred pohyb ho zopakuje zadn<64> po<70>et kr<6B>t **
+
+  1. Presu<73> kurozr ni<6E><69>ie na za<7A>iatok riadku ozna<6E>en<65>ho --->.
+
+  2. Nap<61><70>  2w  a kurozr sa presunie o dve slov<6F> vpred. 
+
+  3. Nap<61><70>  3e  a kurozr sa presunie vpred na koniec tretieho slova. 
+
+  4. Nap<61><70>  0  (nula) a kurozr sa presunie na za<7A>iatok riadku.
+
+  5. Zopakuj kroky 2 a 3 s r<>znymi <20><>slami. 
+
+---> Toto je riadok so slovami po kotr<74>ch sa m<><6D>ete pohybova<76>.
+
+  6. Prejdi na lekciu 2.5.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lekcia 2.3: ROZ<EFBFBD>IROVACIE PR<50>KAZY A OBJEKTY
+		  Lekcia 2.5: POU<EFBFBD>ITIE VIACN<43>SOBN<42>HO MAZANIA PRE HROMADN<44> MAZANIE
 
 
-  Form<EFBFBD>t mazacieho pr<70>kazu  d  je nasledovn<76>:
+    ** Nap<61>sanie <20><>sla spolu s oper<65>torom ho zopakuje zadan<61> po<70>et kr<6B>t **
 
-   [<5B><>slo]   d objekt       ALEBO      d   [<5B><>slo]    objekt
+  V kombin<69>cii oper<65>torov mazania a pohybu spom<6F>nan<61>ho vy<76><79>ie vlo<6C> po<70>et 
-  Kde:
+  pred pohyb pre docielenie hromadn<64>ho mazania:
-    <EFBFBD><EFBFBD>slo - ud<75>va ko<6B>ko kr<6B>t sa pr<70>kaz vykon<6F> (volite<74>n<EFBFBD>, implicitne=1)
+    d   <20><>slo   pohyb
-    d - je pr<70>kaz pre mazanie
-    objekt - ud<75>va na <20>om sa pr<70>kaz vykon<6F>va (vyp<79>san<61> ni<6E><69>ie)
 
-  Kr<EFBFBD>tky v<>pis objektov:
+  1. Presu<73> kurzor na prv<72> slovo p<>san<61> VE<56>K<EFBFBD>MI P<>SMENAMI 
-    w - od kurzora do konca slova, vr<76>tanie medzier
+     v riadku ozna<6E>enom --->.
-    e - od kurzora do konca slova, BEZ medzier
-    $ - od kurzora do konca riadku.
 
-POZN<EFBFBD>MKA: Ak stla<EFBFBD><EFBFBD><EFBFBD> kl<EFBFBD>vesu objektu v norm<72>lnom m<>de bez pr<70>kazu, kurzor
+  2. Nap<61><70>  2dw  a zma<EFBFBD>e<EFBFBD> dve slov<6F> p<>san<61> VE<56>K<EFBFBD>MI P<>SMENAMI
-	  sa presunie na miesto <20>pecifikovan<61> vo v<>pise objektov.
 
+  3. Zopakuj kroky 1 a 2 s pou<6F>it<69>m r<>zneho <20><>sla tak aby si zmazal slov<6F>
+     p<>san<61> ve<76>k<EFBFBD>mi p<>smenami jedn<64>m pr<70>kazom.
 
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny. 
+
+POZN<EFBFBD>MKA: <20><>slo medzi oper<65>torom  d  a pohybom funguje podobne ako pri 
+          pou<6F>it<69> s pohybom bez oper<65>tora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Lekcia 2.4: V<EFBFBD>NIMKA V 'PR<50>KAZOVOM OBJEKTE'
+    		Lekcia 2.6: OPER<EFBFBD>CIE S RIADKAMI
 
 
 	    ** Nap<61>sanie pr<70>kazu   dd   zma<6D>e cel<65> riadok. **
@@ -216,7 +307,7 @@ Vzh
 1. Presu<73> kurzor na druh<75> riadok v texte na spodu.
 2. Nap<61><70>  dd  aby si zmazal riadok.
 3. Prejdi na <20>tvrt<72> riadok.
-4. Nap<61><70>   2dd   (pametaj si  <20><>slo-pr<70>kaz-objekt) aby si zmazal dva riadky.
+4. Nap<61><70>   2dd   aby si zmazal dva riadky.
 
     1)  Ru<52>e s<> <20>erven<65>,
     2)  Blato je z<>bavn<76>,
@@ -228,7 +319,7 @@ Vzh
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lekcia 2.5: PR<50>KAZ UNDO
+			Lekcia 2.7: PR<50>KAZ UNDO
 
 
 ** Stla<6C>  u  pre vr<76>tenie posledn<64>ho pr<70>kazu,  U  pre <20>pravu cel<65>ho riadku. **
@@ -241,7 +332,7 @@ Vzh
 5. Teraz nap<61><70> ve<76>k<EFBFBD>   U  <20><>m vr<76>t<EFBFBD><74> riadok do p<>vodn<64>ho stavu.
 6. Teraz nap<61><70>  u  nieko<6B>ko kr<6B>t, <20><>m vr<76>t<EFBFBD><74> sp<73><70> pr<70>kaz U.
 7. Teraz nap<61><70> CTRL-R (dr<64> kl<6B>vesu CTRL stla<6C>en<65> k<>m stl<74><6C>a<EFBFBD> R) nieko<6B>ko
-   kr<6B>t, <20><>m vr<76>t<EFBFBD><74> sp<73><70> predt<64>m vr<76>ten<65> pr<70>kazy (redo).
+   kr<6B>t, <20><>m vr<76>t<EFBFBD><74> sp<73><70> predt<64>m vr<76>ten<65> pr<70>kazy (undo z undo).
 
 ---> Opprav chybby nna toomto riadku a zmee<65> ich pommocou undo.
 
@@ -260,16 +351,20 @@ Vzh
 
   3. Pre zmazanie cel<65>ho riadku nap<61><70>:   dd
 
-  4. Form<EFBFBD>t pre p<>kaz v nor<6F>lnom m<>de je:
+  4. Pre zopakovanie pohybu, nap<61><70> pred neho <20><>slo:   2w
 
-       [<5B><>slo]   pr<70>kaz   objekt    ALEBO   pr<EFBFBD>kaz [<5B><>slo]   objekt
+  5. Form<72>t pre p<>kaz:
+
+       oper<65>tor   [<5B><>slo]   pohyb
      kde:
-       <EFBFBD><EFBFBD>slo - ud<75>va ko<6B>ko kr<6B>t sa pr<70>kaz zopakuje
+       oper<EFBFBD>tor - <20>o treba robi<62>, napr<70>klad  d  pre zmazanie
-       pr<EFBFBD>kaz - ud<75>va vykon<6F>van<61> pr<70>kaz, ako napr<70>klad  d  pre mazanie
+       [<5B><>slo] - je volite<74>n<EFBFBD> po<70>et pre opakovanie pohybu
-       objekt - ud<75>va rozsah pr<70>kazu, ako napr<70>klad  w(slovo),
+       pohyb - pohyb po texte vzh<7A>adom na oper<65>tor, napr<70>klad w (slovo), 
 		$ (do konca riadku), at<61>.
 
-  5. Pre vr<EFBFBD>tenie sp<73><70> predo<64>lej oper<65>cie nap<61><70>:	u   (mal<61> u)
+  6. Pre pohyb na za<7A>iatok riadku pou<6F>i nulu:  0
+
+  7. Pre vr<76>tenie sp<73><70> predo<64>lej oper<65>cie nap<61><70>:	u   (mal<61> u)
      Pre vr<76>tenie v<>etk<74>ch <20>prav na riadku nap<61><70>:    U   (ve<76>k<EFBFBD> U)
      Pre vr<76>tenie vr<76>ten<65>ch <20>prav nap<61><70>:	      CTRL-R
 
@@ -289,10 +384,10 @@ Vzh
 
   5. Zopakuj kroky 2 a<> 4, k<>m riadky nies<65> v spr<70>vnom porad<61>.
 
-     d) Tie<69> sa dok<6F><6B>e<EFBFBD> vzdel<65>va<76>?
+---> d) Tie<69> sa dok<6F><6B>e<EFBFBD> vzdel<65>va<76>?
-     b) Fialky s<> modr<64>,
+---> b) Fialky s<> modr<64>,
-     c) Inteligencia sa vzdel<65>va,
+---> c) Inteligencia sa vzdel<65>va,
-     a) Ru<52>e s<> <20>erven<65>,
+---> a) Ru<52>e s<> <20>erven<65>,
 
 
 
@@ -300,15 +395,15 @@ Vzh
 		       Lekcia 3.2: PR<50>KAZ NAHRADENIA
 
 
-     ** Nap<61>san<61>m  r  a znaku sa nahrad<61> znak na mieste kurzora. **
+     ** Nap<61>san<61>m  rx  sa nahrad<61> znak na mieste kurzora znakom  x . **
 
   1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok textu ozna<6E>en<65>ho zna<6E>kou --->.
 
   2. Presu<73> kurzor na za<7A>iatok prvej chyby.
 
-  3. nap<61><70>  r  a potom znak, ktor<6F> nahrad<EFBFBD> chybu.
+  3. nap<61><70>  r  a potom znak, ktor<6F> tam m<> by<62>.
 
-  4. Zopakuj kroky 2 a 3, k<>m prv<72> riadok nieje spr<EFBFBD>vny.
+  4. Zopakuj kroky 2 a 3, k<>m prv<72> riadok nieje zhodn<EFBFBD> s druh<75>m.
 
 ---> Ka<4B> bol tento riasok p<>aan<61>, niekro stla<6C>il nespr<70>bne kl<6B>vesy!
 ---> Ke<4B> bol tento riadok p<>san<61>, niekto stla<6C>il nespr<70>vne kl<6B>vesy!
@@ -323,22 +418,22 @@ POZN
 		       Lekcia 3.3. PR<50>KAZ <20>PRAVY
 
 
-     ** Ak chce<63> zmeni<6E> <20>as<61> slova alebo cel<65> slovo, nap<61><70>  cw . **
+     ** Ak chce<63> zmeni<6E> <20>as<61> slova do konca slova, nap<61><70>  ce . **
 
   1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->.
 
   2. Umiestni kurzor na p<>smeno o v slove rosfpl.
 
-  3. Nap<61><70>  cw  a oprav slovo (v tomto pr<70>pade nap<61><70> 'iadok'.)
+  3. Nap<61><70>  ce  a oprav slovo (v tomto pr<70>pade nap<61><70> 'iadok'.)
 
-  4. Stla<6C> <ESC> a prejdi na <20>al<61>iu chybu (prv<EFBFBD> znak, ktor<6F> treba zmeni<6E>.)
+  4. Stla<6C> <ESC> a prejdi na <20>al<61><6C> znak, ktor<6F> treba zmeni<6E>.
 
   5. Zopakuj kroky 3 a 4, k<>m prv<72> veta nieje rovnak<61> ako druh<75>.
 
 ---> Tento rosfpl m<> nieko<6B>ko skic, ktor<6F> je pirewvb<76> zmeni<6E> piy<69>u<EFBFBD><75>n pr<70>kazu.
 ---> Tento riadok m<> nieko<6B>ko slov, ktor<6F> je potrebn<62> zmeni<6E> pou<6F>it<69>m pr<70>kazu.
 
-Pozn<EFBFBD>mka, <20>e  cw  nielen nahr<68>dza slovo, ale <20>a aj premiestn<74> do vkladania.
+Pozn<EFBFBD>mka, <20>e  ce  zma<6D>e slovo a nastav<61> vkladac<61> m<>d.
 
 
 
@@ -346,13 +441,13 @@ Pozn
 		       Lekcia 3.4: VIAC ZMIEN POU<4F>IT<49>M c
 
 
-   ** Pr<50>kaz pre <20>pravy sa pou<6F><75>va s rovnak<61>mi objektami ako pre mazanie **
+   ** Pr<50>kaz pre <20>pravy sa pou<6F><75>va s rovnak<61>mi pohybmi ako pre mazanie **
 
   1. Pr<50>kaz pre <20>pravy pracuje rovnako ako pre mazanie. Form<72>t je:
 
-    [<5B><>slo]   c   objekt       ALEBO       c [<5B><>slo]   objekt
+        c    [<5B><>slo]    pohyb
 
-  2. Objekty s<> rovnak<61>, ako napr<70>klad  w (slovo), $ (koniec riadku), at<61>.
+  2. Pohyby s<> rovnak<61>, ako napr<70>klad   w (slovo) a  $ (koniec riadku).
 
   3. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->.
 
@@ -364,6 +459,7 @@ Pozn
 ---> Koniec tohto riadku potrebuje pomoc, aby bol ako druhy.
 ---> Koniec tohto riadku potrebuje opravi<76> pou<6F>it<69>m pr<70>kazu  c$ .
 
+POZN<EFBFBD>MKA: M<><4D>e<EFBFBD> pou<6F>i<EFBFBD> kl<6B>vesu backspace na <20>pravu zmien po<70>as p<>sania.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -376,13 +472,13 @@ Pozn
   2. Pre naradenie znaku na mieste kurzora, nap<61><70>  r  a potom znak, ktor<6F>
      nahrad<61> p<>vodn<64> znak.
 
-  3. Pr<50>kaz na upravenie umo<6D><6F>uje zmeni<6E> <EFBFBD>pecifikovan<EFBFBD> objekt od kurzora
+  3. Pr<50>kaz na upravenie umo<6D><6F>uje zmeni<6E> od kurzora a<> po miesto, ktor<6F> 
-     a<EFBFBD> po koniec objektu.  napr. Nap<61><70>  cw  <20><>m zmn<6D><6E> text od poz<6F>cie
+     ur<EFBFBD>uje pohyb.  napr. Nap<61><70>  ce  <20><>m zmn<6D><6E> text od poz<6F>cie
      kurzora do konca slova, c$  zmen<65> text do konca riadku.
 
-  4. Format pre nahradenie je:
+  4. Form<EFBFBD>t pre nahradenie je:
 
-	[<5B><>slo]   c objekt	 ALEBO	     c	 [<5B><>slo]    objekt
+	    c    [<5B><>slo]    pohyb 
 
 
 Teraz prejdi na nalseduj<75>cu lekciu.
@@ -394,19 +490,19 @@ Teraz prejdi na nalseduj
 
 
   ** Stla<6C> CTRL-g pre zobrazenie svojej poz<6F>cie v s<>bore a statusu s<>boru.
-     Stla<EFBFBD> SHIFT-G pre prechod na riadok v s<>bore. **
+     Nap<EFBFBD><EFBFBD>  G  pre presun na riadok v s<>bore. **
 
   Pozn<7A>mka: Pre<72><65>taj si cel<65> t<>to lekciu sk<73>r ako za<7A>ne<6E> vykon<6F>va<76> kroky!!
 
-  1. Dr<44> stla<6C>en<65> kl<6B>vesu Ctrl a stla<6C>  g . Na spodu obrazovky sa zobraz<61>
+  1. Dr<44> stla<6C>en<65> kl<6B>vesu Ctrl a stla<6C>  g . Toto naz<61>vame CTRL-G. 
-     stavov<EFBFBD> riadok s n<>zvom s<>boru a riadkom na ktorom pr<70>ve si. Zapam<61>taj
+     Na spodu obrazovky sa zobraz<61> spr<70>va s n<>zvom s<>boru a poz<6F>ciou 
-     si si <20><>slo riadku pre krok 3.
+     v s<>bore. Zapam<61>tajsi si <20><>slo riadku pre pou<EFBFBD>itie v kroku 3.
 
-  2. Stla<6C> Shift-G <20><>m sa dostane<6E> na spodok s<>boru.
+  2. Stla<6C>  G  <20><>m sa dostane<6E> na spodok s<>boru.
+     Nap<61><70>  gg  <20><>m sa dostane<6E> na za<7A>iatok s<>boru.
 
-  3. Nap<61><70> <20><>slo riadku na ktorom si sa nach<63>dzal a stla<6C> Shift-G. To <20>a
+  3. Nap<61><70> <20><>slo riadku na ktorom si sa nach<63>dzal a stla<6C>  G. To <20>a
-     vr<76>ti na riadok, na ktorom si prv<72> kr<6B>t stla<6C>il Ctrl-g.
+     vr<76>ti na riadok, na ktorom si prv<72> kr<6B>t stla<6C>il CTRL-G.
-     (Ke<4B> p<><70>e<EFBFBD> <20><>sla, tieto sa nezobrazuj<75> na obrazovke.)
 
   4. Ak sa c<>t<EFBFBD><74> schopn<70> vykona<6E> teto kroky, vykonaj kroky 1 a<> 3.
 
@@ -419,24 +515,24 @@ Teraz prejdi na nalseduj
   ** Nap<61><70>  /  nasledovan<61> re<72>azcom pre vyh<79>adanie pr<70>slu<6C>n<EFBFBD>ho re<72>azca. **
 
   1. Nap<61><70> znak  /  v norm<72>lnom m<>de. Pozn<7A>mka, <20>e tento znak sa spolu
-     s kurzorom zobraz<61> v dolnej <20>asti obrazovky ako s  :  pr<70>kazom.
+     s kurzorom zobraz<61> v dolnej <20>asti obrazovky s  :  pr<70>kazom.
 
   2. Teraz nap<61><70> 'errroor' <ENTER>. To je slovo, ktor<6F> chce<63> vyh<79>ada<64>.
 
   3. Pre vyh<79>adanie <20>al<61>ieho v<>skytu rovnak<61>ho re<72>azca, stla<6C> jednoducho  n.
      Pre vyh<79>adanie <20>al<61>ieho v<>skytu rovnak<61>ho re<72>azca opa<70>n<EFBFBD>m smerom,
-     nap<EFBFBD><EFBFBD> Shift-N.
+     N.
 
   4. Ak chce<63> vyh<79>ada<64> re<72>azec v sp<73>tnom smere, pou<6F><75> pr<70>kaz  ?  miesto
      pr<70>kazu /.
 
- ---> Ke<4B> vyh<79>ad<61>vanie dosiahne koniec tohto s<>boru, bude pokra<72>ova<76> na
+  5. Pre n<>vrat na miesto z ktor<6F>ho si pri<72>iel stla<6C> CTRL-O (dr<64> stla<6C>en<65> 
-      za<7A>iatku.
+     kl<EFBFBD>vesu Ctrl po<70>as stla<6C>enia kl<6B>vesy o). Zopakuj pre <20>al<61><6C> n<>vrat 
+     sp<73><70>. CTRL-I ide vpred.
 
-  "errroor" nie je sp<73>sob ako nahradi<64> error; errroor je error.
+POZN<EFBFBD>MKA: "errroor" nieje sp<73>sob hl<EFBFBD>skovania error; errroor je error.
-
+POZN<EFBFBD>MKA: Ke<4B> vyh<79>ad<61>vanie dosiahne koniec tohto s<>boru, bude pokra<72>ova<76> na
-POZN<EFBFBD>MKA: Ke<4B> vyh<79>ad<61>vanie dosiahne koniec s<>boru, bude pokra<72>ova<76> na jeho
+      za<7A>iatku, dokia<EFBFBD> nieje resetovan<61> nastavenie 'wrapscan' .
-	  za<7A>iatku.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -454,16 +550,18 @@ POZN
 
   4. Nap<61><70>  %  pre presun kurzoru sp<73><70> na otv<74>raj<61>cu z<>tvorku.
 
+  5. Presu<73> kurzor na in<69> zo znakov (,),[,],{ alebo } a v<>imni si
+     <20>o % vykon<6F>va.
+
 ---> Toto ( je testovac<61> riadok s ('s, ['s ] a {'s } v riadku. ))
 
 Pozn<EFBFBD>mka: Toto je ve<76>mi v<>hodn<64> pou<6F><75><EFBFBD> pri laden<65> programu s ch<63>baj<61>cimi
-	  uzatv<74>raj<61>cimi z<>tvorkami.
+	  uzatv<74>raj<61>cimi z<>tvorkami!
-
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lekcia 4.4: SPOSOB AKO ZMENI<4E> CHYBY
+		      Lekcia 4.4: PR<EFBFBD>KAZ NAHRADENIA
 
 
  ** Nap<61><70>   :s/star<61>/nov<6F>/g  pre nahradenie slova 'star<61>' za slovo 'nov<6F>'. **
@@ -471,7 +569,7 @@ Pozn
   1. Presu<73> kurzor ni<6E><69>ie na riadok ozna<6E>en<65> zna<6E>kou --->.
 
   2. Nap<61><70>  :s/thee/the <ENTER> . Poznamka, <20>e tento pr<70>kaz zmen<65> len prv<72>
-     v<>skyt v riadku.
+     v<>skyt "thee" v riadku.
 
   3. Teraz nap<61><70>   :s/thee/the/g   <20>o znamen<65> celkov<6F> nahradenie v riadku.
      Toto nahrad<61> v<>etky v<>skyty v riadku.
@@ -479,9 +577,11 @@ Pozn
 ---> Thee best time to see thee flowers in thee spring.
 
   4. Pre zmenu v<>etk<74>ch v<>skytov dan<61>ho re<72>azca medzi dvomi ridakami,
-     nap<61><70>  :#,#s/star<61>/nov<6F>/g  kde #,# s<> <20><>sla dvoch riadkov.
+     nap<61><70>  :#,#s/star<61>/nov<6F>/g  kde #,# s<> <20><>sla dvoch riadkov, v rozsahu
+                                ktor<6F>ch sa nahradenie vykon<6F>.
      nap<61><70>  :%s/star<61>/nov<6F>/g    pre zmenu v<>etk<74>ch v<>skytov v celom riadku
-
+     nap<61><70>  :%s/star<61>/nov<6F>/gc   n<>jde v<>etky v<>skyty v celom s<>bore,
+                                s ot<6F>zkou <20>i nahradi<64> alebo nie
 
 
 
@@ -489,23 +589,25 @@ Pozn
 			       LEKCIA 4 ZHRNUTIE
 
 
-  1. Ctrl-g  vyp<79><70>e tvoju poz<6F>ciu v s<>bore a status s<>boru.
+  1. CTRL-g    vyp<79><70>e tvoju poz<6F>ciu v s<>bore a status s<>boru.
-     Shift-g  <20>a premiestni na koniec riadku. <EFBFBD><EFBFBD>slo riadku nasledovan<61>
+            G  <20>a premiestni na koniec riadku. 
-     Shift-g  <20>a presunie na dan<EFBFBD> <20><>slo riadku.
+     <EFBFBD><EFBFBD>slo  G  <20>a premiestni na riadok s <20><>slom.
+           gg  <20>a presunie na prv<72> riadok
 
   2. Nap<61>sanie  /  nasledovan<61> re<72>azcom vyh<79>ad<61> re<72>azec smerom DOPREDU.
      Nap<61>sanie  ?  nasledovan<61> re<72>azcom vyh<79>ada re<72>azec smerom DOZADU.
      Nap<61>sanie  n  po vyh<79>ad<61>van<61>, vyh<79>ad<61> nasleduj<75>ci v<>skyt re<72>azca
-     v rovnakom smere, pri<72>om  Shift-N  vyh<79>ad<61> v opa<70>nom smere.
+     v rovnakom smere, pri<72>om  N  vyh<79>ad<61> v opa<70>nom smere.
+     CTRL-O <20>a vr<76>ti sp<73><70> na star<61>iu poz<6F>ciu, CTRL-I na nov<6F>iu poz<6F>ciu.
 
   3. Nap<61>sanie  %  ke<6B> kurzor je na (,),[,],{, alebo } n<>jde zodpovdaj<61>cu
-     p<>r<EFBFBD> z<>tvorku.
+     p<>rnu z<>tvorku.
 
-  4. Pre nahradenie nov<6F>ho za prv<72> star<61> v riadku nap<61><70>    :s/nov<EFBFBD>/star<EFBFBD>
+  4. Pre nahradenie nov<6F>ho za prv<72> star<61> v riadku nap<61><70>    :s/star<EFBFBD>/nov<EFBFBD>
-     Pre nahradenie nov<6F>ho za v<>etky star<61> v riadku nap<61><70>  :s/nov<EFBFBD>/star<EFBFBD>/g
+     Pre nahradenie nov<6F>ho za v<>etky star<61> v riadku nap<61><70>  :s/star<EFBFBD>/nov<EFBFBD>/g
-     Pre nahradenie re<72>azcov medzi dvoma riadkami 3 nap<61><70>  :#,#/nov<EFBFBD>/star<EFBFBD>/g
+     Pre nahradenie re<72>azcov medzi dvoma riadkami 3 nap<61><70>  :#,#/star<EFBFBD>/nov<EFBFBD>/g
      Pre nahradenie v<>etk<74>ch v<>skytov v s<>bore nap<61><70>       :%s/star<61>/nov<6F>/g
-     Pre potvrdenie ka<6B>d<EFBFBD>ho nahradenia pridaj 'c'	    :%s/nov<6F>/star<EFBFBD>/gc
+     Pre potvrdenie ka<6B>d<EFBFBD>ho nahradenia pridaj 'c'	         :%s/star<61>/nov<EFBFBD>/gc
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -524,7 +626,7 @@ Pozn
      zobraz<61> obsah tvojho adres<65>ra rovnako ako na pr<70>kazovom riadku.
      Alebo pou<6F>i  :!dir  ak ls nefunguje.
 
-Pozn<EFBFBD>mka:  Takto je mo<6D>n<EFBFBD> spusti<74> hociak<61> vonkaj<61><6A> pr<70>kaz.
+Pozn<EFBFBD>mka:  Takto je mo<6D>n<EFBFBD> spusti<74> hociak<61> vonkaj<61><6A> pr<70>kaz s argumentami.
 Pozn<EFBFBD>mka:  V<>etky pr<70>kazy  :  musia by<62> dokon<6F>en<65> stla<6C>en<65>m <ENTER>
 
 
@@ -539,41 +641,43 @@ Pozn
   1. Nap<61><70>  :!dir  alebo  :!ls  pre v<>pis aktu<74>lneho adres<65>ra.
      U<> vie<69>, <20>e mus<75><73> za t<>mto stla<6C>i<EFBFBD> <ENTER> .
 
-  2. Vyber n<>zov s<>boru, ktor<6F> E<EFBFBD>TE neexistuje.
+  2. Vyber n<>zov s<>boru, ktor<6F> e<EFBFBD>te neexistuje, ako napr. TEST.
 
   3. Teraz nap<61><70>:   :w TEST   (kde TEST je n<>zov vybrat<61>ho s<>boru.)
 
   4. To ulo<6C><6F> cel<65> s<>bor  (Vim Tutor)  pod n<>zovm TEST.
      Pre overenie nap<61><70>   :!dir   , <20><>m  zobraz<61><7A> obsah adres<65>ra.
 
-Pozn<EFBFBD>mka: <20>e ak ukon<6F><6E><EFBFBD> pr<70>cu s editorom Vim a znovu ho spust<73><74> s n<>zvom
+Pozn<EFBFBD>mka: <20>e ak ukon<6F><6E><EFBFBD> pr<70>cu s editorom Vim a znovu ho spust<73><74> pr<EFBFBD>kazom
-	  s<EFBFBD>boru TEST, s<>bor bude k<>pia v<>uky, ke<6B> si ho ulo<6C>il.
+	        vim TEST, s<>bor bude k<>pia v<>uky, ke<6B> si ho ulo<6C>il.
 
   5. Teraz odstr<74><72> s<>bor nap<61>san<61>m (MS-DOS):   :!del TEST
 			     alebo (Unix):     :!rm TEST
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lekcia 5.3 V<>BEROV<EFBFBD> PR<50>KAZ PRE ULO<4C>ENIE
+		    Lekcia 5.3 V<>BER TEXTU PRE ULO<4C>ENIE
 
 
-  ** Pre ulo<6C>enie <20>asti s<>boru, nap<61><70>   :#,# w FILENAME **
+  ** Pre ulo<6C>enie <20>asti s<>boru, nap<61><70>  v  pohyb :w FILENAME **
 
-  1. Znovu nap<61><70>  :!dir  alebo  :!ls  pre zobrazenie obsahu aktu<74>lneho
+  1. Presu<EFBFBD> kurozr na tento riadok.
-     adres<65>ra a vyber vhodn<64> s<>bor ako TEST.
 
-  2. Presu<EFBFBD> kurzor na vrch tejto strany a nap<61><70>  Ctrl-g  pre vyh<79>adanie <20><>sla
+  2. Stla<EFBFBD>  v  a presu<EFBFBD> kurozr na piatu polo<6C>ku dole. Pozn<7A>mka, <20>e
-     tohto riadku.  PAMETAJ SI TOTO <20><>SLO!
+     tento text je vyzna<6E>en<65> (highlighted).
 
-  3. Teraz prejdi na spodok strany a nap<61><70>  Ctrl-g  znovu. ZAPAMETAJ SI <20><>SLO
+  3. Stla<EFBFBD> kl<6B>vesu  : . V spodnej <20>asti okna sa objav<61>  :'<,'>.
-     AJ TOHTO RIADKU!
 
-  4. Pre ulo<6C>enie LEN <20>asti s<>boru, nap<61><70>   :#,# w TEST  kde #,# s<> dve <20><>sla
+  4. Nap<EFBFBD><EFBFBD> w TEST  , kde TEST je meno s<>boru, ktor<6F> zatial neexistuje. 
-     zapam<EFBFBD>tan<EFBFBD>ch riadkov (vrch, spodok) a TEST je n<>zov s<>boru.
+     Skontroluj, e vid<69><64>  :'<,'>w TEST  predt<64>m ne<6E> stla<6C><61><EFBFBD> Enter.
 
-  5. Znova sa pozri, <20>i tam ten s<>bor je pomocou pr<70>kazu   :!dir ale
+  5. Vim zap<61><70>e ozna<6E>en<65> riadky do s<>boru TEST. Pou<6F>i :!dir  alebo  !ls
-     NEODSTRA<EFBFBD>UJ ho.
+     pre overenie. Zatial ho e<>te nema<6D>! Pou<6F>ijeme ho v <20>al<61>ej lekcii.
 
+POZN<EFBFBD>MKA: Stla<6C>en<65>m kl<6B>vesy  v  sa spust<73> vizu<7A>lne ozna<6E>ovanie. 
+          M<><4D>e<EFBFBD> pohybova<76> kurzorom pre upresnenie vyzna<6E>en<65>ho textu. 
+          Potom m<><6D>e<EFBFBD> pou<6F>i<EFBFBD> oper<65>tor pre vykonanie nejakej akcie 
+          s textom. Napr<70>klad  d  zma<6D>e vyzna<6E>en<65> text.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -582,21 +686,16 @@ Pozn
 
 	** Pre vlo<6C>enie obsahu s<>boru, nap<61><70>   :r FILENAME **
 
-  1. Nap<EFBFBD><EFBFBD>   :!dir   aby si sa presved<65>il, <20>e s<>bor TEST st<73>le existuje.
+  1. Premiestni kurzor nad tento riadok. 
 
-  2. Presu<73> kurzor na vrch tejto strany.
+POZN<EFBFBD>MKA: Po vykonan<61> kroku 2 uvid<69><64> text z lekcie 5.3. Potom sa presu<73>
-
+          dole, aby si videl t<>to lekciu.
-POZN<EFBFBD>MKA:  Po vykonan<61> kroku 3 uvid<69><64> Lekciu 5.3. Potom sa presu<73> dole
-	   na t<>to lekciu.
 
   3. Teraz vlo<6C> s<>bor TEST pou<6F>it<69>m pr<70>kazu   :r TEST   kde TEST je n<>zov
-     s<>boru.
+     s<>boru. S<>bor, ktor<6F> si pou<6F>il je umiestnen<65> pod riadkom s kurzorom.
-
-POZN<EFBFBD>MKA:  S<>bor, ktor<6F> si vlo<6C>il sa vlo<6C><6F> od miesta, kde sa nach<63>dza kurzor.
-
-  4. Pre kontrolu vlo<6C>enia s<>boru, presu<73> kurzor sp<73><70> a v<>imni si, <20>e teraz
-     m<><6D> dve k<>pie lekcie 5.3, origin<69>l a s<>borov<6F> verziu.
 
+POZN<EFBFBD>MKA: M<><4D>e<EFBFBD> tie<69> na<6E><61>ta<74> v<>stup vonkaj<61>ieho pr<70>kazu. Napr<70>klad :r !ls
+          na<6E><61>ta v<>stup pr<70>kazu ls a umiestni ho za poz<6F>ciu kurzora.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -612,14 +711,13 @@ POZN
 
   2.  :w FILENAME  ulo<6C><6F> aktu<74>lny s<>bor na disk pod menom FILENAME.
  
-  3.  :#,#w FILENAME  ulo<6C><6F> riadky od # do # do s<>boru FILENAME.
+  3.  v  pohyb  :w FILENAME  ulo<6C><6F> vizu<EFBFBD>lne ozna<6E>en<65> riadky do 
+      s<>boru FILENAME.
 
   4.  :r FILENAME  vyberie z disku s<>bor FILENAME a vlo<6C><6F> ho do aktu<74>lneho
       s<>boru za poz<6F>ciou kurzora.
 
-
+  5. :r !dir  na<6E><61>ta v<>stup z pr<70>kazu dir a vlo<6C><6F> ho za poz<6F>ciu kurzora.
-
-
 
 
 
@@ -640,9 +738,10 @@ POZN
 ---> Po nap<61>san<61>  o  sa kurzor premiestn<74> na vlo<6C>en<65> riadok do vkladacieho
      m<>du.
 
-  4. Pre otvorenie riadku nad kurzorom, jednotucho nap<61><70> ve<76>k<EFBFBD>  O , namiesto
+  4. Pre otvorenie riadku nad kurzorom, jednotucho nap<61><70> ve<76>k<EFBFBD>  O , 
-     mal<61>ho o. Vysk<73><6B>aj si to na nasleduj<EFBFBD>com riadku.
+     namiesto mal<EFBFBD>ho  o. Vysk<73><6B>aj si to na riadku dole. 
-Vlo<EFBFBD> riadok nad t<>mto nap<61>san<61>m Shift-O, ke<6B> kurzor je na tomto riadku.
+
+---> Vlo<6C> riadok nad t<>mto nap<61>san<61>m O, ke<6B> kurzor je na tomto riadku.
 
 
 
@@ -653,20 +752,21 @@ Vlo
 	   ** Nap<61><70>  a  pre vlo<6C>enie textu ZA kurzor. **
 
   1. Presu<73> kurzor ni<6E><69>ie na koniec prv<72>ho riadku ozna<6E>en<65>ho zna<6E>kou --->
-     nap<61>san<61>m  $  v norm<72>lnom m<>de.
 
-  2. Nap<EFBFBD><EFBFBD>  a  (mal<61> p<>smeno) pre pridanie textu ZA znakom na mieste
+  2. Stla<EFBFBD> kl<6B>vesu  e  dokia<EFBFBD> kurozr nieje na konci riadku.   
-     kurzora. (Ve<56>k<EFBFBD> A prid<69> na koniec riadku.)
 
-Pozn<EFBFBD>mka: Toto obch<63>dza p<>sanie  i , posledn<64> znak, text na vlo<6C>enie, <ESC>,
+  3. Nap<61><70>  a  (mal<61> p<>smeno) pre pridanie textu ZA kurzorom.
-	  kurzor doprava, a nakoniec, x , na prid<69>vanie na koniec riadku!
 
-  3. Teraz dokon<6F>i prv<72> riadok. Pozn<7A>mka, <20>e prid<69>vanie je vlastne rovnak<61>
+  4. Dokon<EFBFBD><EFBFBD> slovo tak ako je to v druhom riadku. Stla<6C> <ESC> pre 
-     ako vkladac<61> m<>d, okrem miesta, kde sa text vklad<61>.
+     opustenie vkladacieho m<>du.
 
----> Tento riadok ti dovo<76>uje n<>cvik
+  5. Pou<6F>i  e  na presun na <20>al<61>ie nedokon<6F>en<65> slovo a zopakuj kroky 3 a 4.
+
+---> Tento ri ti dovo<76>uje n<>cv pri<72>van testu na koniec riadku.
 ---> Tento riadok ti dovo<76>uje n<>cvik prid<69>vania textu na koniec riadku.
 
+POZN<EFBFBD>MKA: a, i, A <20>tartuj<75> rovnak<61> vkladac<61> m<>d, jedin<69> rozidel je, kde 
+          sa znaky vkladaj<61>. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -675,24 +775,52 @@ Pozn
 
       ** Nap<61><70> ve<76>k<EFBFBD> R pre nahradenie viac ako jedn<64>ho znaku. **
 
-  1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->.
+  1. Presu<73> kurzor ni<6E><69>ie na prv<72> riadok ozna<6E>en<65> zna<6E>kou --->. Premiestni
+     kurzor na za<7A>iatok prv<72>ho v<>skytu  xxx.
 
-  2. Premiestni kurzor na za<7A>iatok prv<72>ho slova, ktor<6F> je odli<6C>n<EFBFBD> od druh<EFBFBD>ho
+  2. Teraz nap<61><70>  R  a  nap<61><70>  <20><>slo uveden<EFBFBD> v druhom riadku, tak<61>e 
-     riadku ozna<6E>en<65>ho ---> (slovo 'posledn<64>').
+     sa n<>m nahrad<61> p<>vodn<64> xxx.
 
-  3. Teraz nap<61><70>  R  a nahra<72> zvy<76>ok textu na prvom riadku p<>san<61>m cez star<61>
+  3. Stla<EFBFBD> <ESC> pre opustenie nahradzovacieho m<>du. Pozn<7A>mka, <20>e zvy<76>ok 
-     text tak, aby prv<72> riadok bol rovnak<61> ako druh<EFBFBD>.
+     riadku zostane nezmenen<EFBFBD>. 
 
----> Na <20>pravu prv<72>ho riadku do tvaru ako je posledn<64> na strane pou<6F>i kl<6B>vesy.
+  4. Zopakuj tieto kroky pre nahradenie zvy<76>n<EFBFBD>ch xxx.
----> Na <20>pravu prv<72>ho riadku do tavru ako je druh<75>, nap<61><70> R a nov<6F> text.
 
-  4. Pozn<7A>mka, <20>e ak stla<6C><61><EFBFBD> <ESC> pre ukon<6F>enie, v<>etok nezmenen<65> text
+---> Pridan<61>m 123 ku xxx dostane<6E> xxx.
-     zostane.
+---> Pridan<61>m 123 ku 456 dostane<EFBFBD> 579.
 
+POZN<EFBFBD>MKA:  Nahradzovac<61> m<>d je ako vkladac<61> m<>d, ale ka<6B>d<EFBFBD> nap<61>san<61> znak 
+           zma<6D>e existuj<75>ci znak. 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lekcia 6.4: NASTAVENIE MO<4D>NOST<53>
+
+          Lekcia 6.4: Copy Paste textu
+
+    ** pou<6F><75> oper<65>tor  y  pre copy textku a  p  pre jeho paste **
+
+  1. Cho<68> ni<6E><69>ie na riadok ozna<6E>en<65> ---> a umiestni kurozr za "a)".
+
+  2. Na<4E>tartuj vizu<7A>lny m<>d pou<6F>it<69>m  v  a presu<73> kurozr pred "first".
+
+  3. Nap<61><70>  y  pre  vystrihnutie (copy) ozna<6E>en<65>ho textu.
+
+  4. Presu<73> kurozr na koniec <20>al<61>ieho riadku: j$
+
+  5. Nap<61><70>  p  pre vlo<6C>nie (paste) textu. Potom nap<61><70>:  a druha <ESC>.
+
+  6. Pou<6F>i vizu<7A>lny m<>d pre ozna<6E>enie "polo<6C>ka.", vystrihni to 
+     pou<6F>it<69>m  y, presu<73> sa na koniec nasleduj<75>ceho riadku pou<6F>it<69>m  j$ 
+     a vlo<6C> sem text pou<6F>it<69>m  p.
+
+---> a) toto je prv<72> polo<6C>ka
+---> b)
+
+POZN<EFBFBD>MKA: M<><4D>e<EFBFBD> pou<6F>i<EFBFBD> tie<69>  y  ako oper<65>tor; yw  vystrihne jedno slovo. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 Lekcia 6.5: NASTAVENIE MO<4D>NOST<53>
 
 
 ** Nastav mo<6D>nosti, tak<61>e vyh<79>ad<61>vanie alebo nahradzovanie ignoruje
@@ -700,40 +828,52 @@ Pozn
 
 
   1. Vyh<79>adaj re<72>azec 'ignore' nap<61>san<61>m:
-     /ignore
+     /ignore <ENTER>
-     Zopakuj vyh<79>ad<61>vanie nieko<6B>ko kr<6B>t stla<6C>en<65>m kl<6B>vesy n
+     Zopakuj vyh<79>ad<61>vanie nieko<6B>ko kr<6B>t stla<6C>en<65>m kl<6B>vesy  n .
 
   2. Nastav mo<6D>nos<6F> 'ic' (Ignore case) nap<61>san<61>m pr<70>kazu:
      :set ic
 
-  3. Teraz vyh<79>adaj re<72>azec 'ingore' znova stla<6C>en<65>m kl<6B>vesy: n
+  3. Teraz vyh<79>adaj re<72>azec 'ingore' znova stla<6C>en<65>m kl<6B>vesy  n
-     Zopakuj vyh<79>ad<61>vanie nieko<6B>ko kr<6B>t stla<6C>en<65>m kl<6B>vesy n
+     Pozn<EFBFBD>mka, <20>e teraz s<> vyh<79>adan<61> aj Ignore a IGNORE.
 
   4. Nastav mo<6D>nos<6F>i 'hlsearch' a 'incsearch':
      :set hls is
 
   5. Teraz spusti vyh<79>ad<61>vac<61> pr<70>kaz znovu, a pozri <20>o sa stalo:
-     /ignore
+     /ignore <ENTER>
 
-  6. Na odstr<74>nenie zv<7A>raznenia v<>razov nap<61><70>:
+  6. Pre opetovn<76> zapnutie rozly<6C>ovania ve<76>k<EFBFBD>ch a mal<61>ch p<>smen 
-     :nohlsearch
+     nap<EFBFBD><EFBFBD>:  :set noic
+
+POZN<EFBFBD>MKA: Na odstr<74>nenie zv<7A>raznenia v<>razov nap<61><70>:  :nohlsearch
+POZN<EFBFBD>MKA: Ak chce<63> nerozly<6C>ova<76> ve<76>kos<6F> p<>smen len pre jedno 
+          pou<6F>itie vyh<79>ad<61>vacieho pr<70>kazu, pou<6F>i \c:  /ignore\c <ENTER>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			      LEKCIA 6 ZHRNUTIE
 
 
-  1. Nap<61>san<EFBFBD>m  o  sa otvor<EFBFBD> nov<6F> riadok pod kurzorom a premiestni sa kurzor
+  1. Nap<61><EFBFBD>  o  pre otvorenie riadku pod kurzorom a <EFBFBD>tart vkladacieho m<>du.
-     na vlo<6C>en<65> riadok do vkladacieho m<>du.
+     Nap<EFBFBD><EFBFBD>  O  pre otvorenie riadku nad kurzorom.
-     nap<61>san<61>m ve<76>k<EFBFBD>ho  O  sa otvor<6F> riadok nad aktu<74>lnym riadkom s kurzorom.
 
-  2. Nap<61><70>  a  pre vkladanie textu ZA znak na poz<6F>cii kurzoru.
+  2. Nap<61><70>  a  pre vkladanie textu ZA kurzor.
-     Nap<61>san<EFBFBD>m ve<76>k<EFBFBD>ho  A  sa text automatick<63> prid<69>va na koniec riadku.
+     Nap<61><EFBFBD>  A  pre vkladanie textu za koncom riadku.
 
-  3. Nap<EFBFBD>sanie ve<76>k<EFBFBD>ho  R  prepne do nahradzovacieho m<>du, k<>m nieje
+  3. Pr<EFBFBD>kaz  e  presunie kurozr na koniec slova
-     stla<6C>en<65> <ESC> pre ukon<6F>enie nahradzovacieho m<>du.
 
-  4. Nap<EFBFBD>sanie ":set xxx" nastav<61> mo<6D>nos<6F> "xxx".
+  4. Oper<EFBFBD>tor  y  vystrihne (skop<6F>ruje) text,  p  ho vlo<6C><6F>.
 
+  5. Nap<61>sanie ve<76>k<EFBFBD>ho  R  prepne do nahradzovacieho m<>du, k<>m nieje
+     stla<6C>en<65> <ESC>.
+
+  6. Nap<61>sanie ":set xxx" nastav<61> mo<6D>nos<6F> "xxx". Niektor<6F> nastavenia s<>: 
+     'ic' 'ignorecase' ignoruje ve<76>k<EFBFBD> a mal<61> p<>smen<65> po<70>as vyh<79>ad<61>vania. 
+     'is' 'incsearch' zobrazuje <20>iasto<74>n<EFBFBD> re<72>azce vyh<79>ad<61>van<61>ho re<72>azca. 
+     'hls' 'hlsearch' vyzna<6E><61> v<>etky vyh<79>ad<61>van<61> re<72>azce.
+      M<><4D>e<EFBFBD> pou<6F>i<EFBFBD> hociktor<6F> z dlh<6C>ch a kr<6B>tkych n<>zvov mo<6D>nost<73>.
+
+  7. Vlo<6C> "no" pred nastavenie pre jeho vypnutie:  :set noic
 
 
 
@@ -742,7 +882,7 @@ Pozn
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    LEKCIA 7: PR<50>KAZY ON-LINE N<>POVEDY
+		    LEKCIA 7.1: Z<>SKANIE N<>POVEDY
 
 
 	  ** Pou<6F><75>vaj on-line syst<73>m n<>povedy **
@@ -753,19 +893,21 @@ Pozn
 	- stla<6C> kl<6B>vesu <F1> (ak nejak<61> m<><6D>)
 	- nap<61><70>  :help <ENTER>
 
+  <20><>taj text v okne n<>povedy pre z<>skanie predstavy ako n<>poveda funguje. 
+  Nap<61><70>   CTRL-W CTRL-W  pre skok z jedn<64>ho okna do druh<75>ho. 
   Nap<61><70>    :q <ENTER>    <20><>m zatvor<6F><72> okno n<>povedy.
 
   M<><4D>e<EFBFBD> n<>js<6A> help ku hociakej t<>me pridan<61>m argumentu ku pr<70>kazu ":help".
   Vysk<73><6B>aj tieto (nezabudni stla<6C>i<EFBFBD> <ENTER>):
 
 	:help w
-	:help c_<T
+	:help c_CTRL-D
 	:help insert-index
 	:help user-manual
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		 LEKCIA 8: VYTVORENIE <20>TARTOVACIEHO SKRIPTU
+		 LEKCIA 7.2: VYTVORENIE <20>TARTOVACIEHO SKRIPTU
 
 		       ** Zapni funkcie editora Vim **
 
@@ -773,22 +915,67 @@ Pozn
   vypnut<75>. Pre pou<6F><75>vanie viac Vim funkcii vytvor "vimrc" s<>bor.
 
   1. Za<5A>ni editova<76> "vimrc" s<>bor, to z<>vis<69> na pou<6F>itom syst<73>me:
-	:edit ~/.vimrc      pre Unix
+	:e ~/.vimrc      pre Unix
-	:edit $VIM/_vimrc   pre MS-Windows
+	:e $VIM/_vimrc   pre MS-Windows
 
   2. Teraz si pre<72><65>taj text pr<70>kladu "vimrc" s<>boru:
 
-	:read $VIMRUNTIME/vimrc_example.vim
+	:r $VIMRUNTIME/vimrc_example.vim
 
   3. Ulo<6C> s<>bor:
-
+	:w
-	:write
 
   Pri nasleduj<75>com <20>tarte editora Vim sa pou<6F>ije zv<7A>raz<61>ovanie syntaxe.
   Do "vimrc" s<>boru m<><6D>e<EFBFBD> prida<64> v<>etky svoje uprednost<73>ovan<61> nastavenia.
+  Pre viac inform<72>cii nap<61><70>  :help vimrc-intro
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+                   LEKCIA 7.3 DOKON<4F>ENIE
+
+     ** Dokon<6F>i pr<70>kaz na pr<70>kazovom riadku pou<6F>it<69>m CTRL-D a <TAB> **
+
+  1. Uisti sa, <20>e Vim nieje v kompatibilnom m<>de:  :set nocp
+
+  2. Pozri sa ak<61> s<>bory sa nach<63>dzaj<61> v adres<65>ri:  :!ls  alebo  :!dir
+
+  3. Nap<61><70> za<7A>iatok pr<70>kazu:  :e
+
+  4. Stla<6C>  CTRL-D  a Vim zobraz<61> zoznam pr<70>kazov za<7A><61>naj<61>cich "e".
+
+  5. Stla<6C> <TAB> a Vim dokon<6F><6E> meno pr<70>kazu na ":edit".
+
+  6. Teraz pridaj medzern<72>k a za<7A>iatok mena existuj<75>ceho s<>boru: 
+     :edit FIL
+
+  7. Stla<6C> <TAB>. Vim dokon<6F><6E> meno (ak je jedine<6E>n<EFBFBD>).
+
+POZN<EFBFBD>MKA: Dokon<6F>ovanie funguje pre ve<76>a pr<70>kazov. Vysk<73><6B>aj stla<6C>enie 
+          CTRL-D a <TAB>. <20>peci<63>lne je to u<>ito<74>n<EFBFBD> pre pr<70>kaz  :help.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            LEKCIA 7 ZHRNUTIE
+
+  1. Nap<61><70>  :help  alebo stla<6C> <F1> alebo <Help> pre otvorenie okna n<>povedy.
+
+  2. Nap<61><70>  :help pr<70>kaz  pre vyh<79>adanie n<>povedy ku pr<70>kazu pr<70>kaz. 
+
+  3. Nap<61><70>  CTRL-W CTRL-W  na presko<6B>enie do in<69>ho okna. 
+
+  4. Nap<61><70>  :q  pre zatvorenie okna n<>povedy
+
+  5. Vytvor <20>tartovac<61> skript vimrc pre udr<64>anie uprednost<73>ovan<61>ch nastaven<65>. 
+
+  6. Po<50>as p<>sania pr<70>kazu  :  stla<6C> CTRL-D pre zobrazenie dokon<6F>en<65>. 
+     Stla<6C> <TAB> pre pou<6F>itie jedn<64>ho z dokon<6F>en<65>. 
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
   Toto vymedzuje v<>uku Vimu. Toto je ur<75>en<65> pre strucn<63> preh<65>ad o editore
   Vim, <20>plne posta<74>uj<75>ce pre <20>ahk<68> a obstojn<6A> pou<6F><75>vanie tohto editora.
   T<>to v<>uka je <20>aleko od kompletnosti, preto<74>e Vim m<> omnoho viacej pr<70>kazov.
@@ -817,5 +1004,5 @@ Pozn
 
   Preklad do Sloven<65>iny: <20>ubo<62> <20>elko
   e-mail:       celbos@inmail.sk
-  Last Change:  2004 Apr 29
+  Last Change:  2006 Apr 18
   encoding:     cp1250

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". */
+		 * "compl_leader".  Except when at the original match and
-		if (c == Ctrl_L)
+		 * 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 NUL;
     }
-    return FALSE;
+    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,
+		 * If any of the original typed text has been changed, eg when
-		 * eg when ignorecase is set, we must add back-spaces to
+		 * ignorecase is set, we must add back-spaces to the redo
-		 * the redo buffer.  We add as few as necessary to delete
+		 * buffer.  We add as few as necessary to delete just the part
-		 * just the part of the original text that has changed.
+		 * 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.
 		 */
+		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)
+		for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
-		{
+		    ;
-		    ++p;
+#ifdef FEAT_MBYTE
-		    ++ptr;
+		if (temp > 0)
-		}
+		    temp -= (*mb_head_off)(compl_orig_text, p + temp);
-		for (temp = 0; p[temp]; ++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, count, insert_match)
     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, count, insert_match)
 	/* 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)
@@ -4022,16 +4045,20 @@ ins_compl_next(allow_get_expansion, count, insert_match)
 	    found_end |= (compl_shown_match == compl_first_match);
 	}
 	else
+	{
+	    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;
 	}

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)

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.

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 */

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);

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. */

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);

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);
     }

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

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"
+"POT-Creation-Date: 2006-04-18 11:00+0900\n"
-"PO-Revision-Date: 2006-03-28 21:10+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:
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: <20>Хåե<C3A5> \"%s\" <20>Ϻ<EFBFBD>ʬ<EFBFBD>⡼<EFBFBD>ɤǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Хåե<C3A5><D5A5><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Escape<70>ϻ<EFBFBD><CFBB>ѤǤ<D1A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
@@ -217,8 +220,8 @@ msgid " Keyword completion (^N^P)"
 msgstr " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFA1BC><EFBFBD>䴰 (^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)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X <20>⡼<EFBFBD><E2A1BC> (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X <20>⡼<EFBFBD><E2A1BC> (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
 msgid " Whole line completion (^L^N^P)"
 msgstr " <20><>(<28><><EFBFBD><EFBFBD>)<29>䴰 (^L^N^P)"
@@ -250,8 +253,8 @@ msgstr "
 msgid " Omni completion (^O^N^P)"
 msgstr " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䴰 (^O^N^P)"
 
-msgid " Spelling suggestion (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
-msgstr " <20>֤꽤<D6A4><EABDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (^S^N^P)"
+msgstr " <20>֤꽤<D6A4><EABDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " <20>ɽꥭ<C9BD><EAA5AD><EFBFBD><EFBFBD><EFA1BC><EFBFBD>䴰 (^N^P)"
@@ -486,6 +489,22 @@ msgstr "E723:
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: ɽ<><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4>ѿ<EFBFBD><D1BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҥ<EFBFBD><D2A4><EFBFBD><EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>"
 
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ̤<>Τδؿ<CEB4><D8BF>Ǥ<EFBFBD>: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: <20>ؿ<EFBFBD><D8BF>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʲ᤮<CAB2>ޤ<EFBFBD>: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ץȰʳ<C8B0><CAB3><EFBFBD><SID><3E><><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: <20><><EFBFBD><EFBFBD><EFBFBD>Ѵؿ<D1B4><D8BF><EFBFBD><EFBFBD>ƤФ<C6A4><D0A4>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>񤬤<EFBFBD><F1A4ACA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
+
 msgid "E699: Too many arguments"
 msgstr "E699: <20><>¿<EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>"
 
@@ -522,8 +541,8 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() <20><> inputsave() <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD>ƤФ<C6A4><D0A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
-msgid "E745: Range not allowed"
+msgid "E786: Range not allowed"
-msgstr "E745: <20>ϰϻ<CFB0><CFBB><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "E786: <20>ϰϻ<CFB0><CFBB><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() <20>ˤ<EFBFBD>̵<EFBFBD><CCB5><EFBFBD>ʷ<EFBFBD><CAB7>Ǥ<EFBFBD>"
@@ -1380,6 +1399,9 @@ msgstr "E602: :try
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: <20>ؿ<EFBFBD><D8BF>γ<EFBFBD><CEB3><EFBFBD> :endfunction <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: <20><><EFBFBD>ߤ<EFBFBD>¾<EFBFBD>ΥХåե<C3A5><D5A5><EFBFBD><EFBFBD>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>뤳<EFBFBD>Ȥϵ<C8A4><CFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+
 msgid "tagname"
 msgstr "<22><><EFBFBD><EFBFBD>̾"
 
@@ -2484,12 +2506,33 @@ msgstr "<
 msgid "no such window"
 msgstr "<22><><EFBFBD>Τ褦<CEA4>ʥ<EFBFBD><CAA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ <20><>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5>󥹥<EFBFBD><F3A5B9A5>󥹤Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>"
+
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: <20><><EFBFBD>Υ<EFBFBD><CEA5>ޥ<EFBFBD><DEA5>ɤ<EFBFBD>̵<EFBFBD><CCB5><EFBFBD>Ǥ<EFBFBD>,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʤ<EFBFBD><CAA4><EFBFBD>: "
 "Ruby<62>饤<EFBFBD>֥<EFBFBD><D6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤǤ<C9A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>."
 
+msgid "E267: unexpected return"
+msgstr "E265: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> return <20>Ǥ<EFBFBD>"
+
+msgid "E268: unexpected next"
+msgstr "E268: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> next <20>Ǥ<EFBFBD>"
+
+msgid "E269: unexpected break"
+msgstr "E269: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> break <20>Ǥ<EFBFBD>"
+
+msgid "E270: unexpected redo"
+msgstr "E270: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> redo <20>Ǥ<EFBFBD>"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue <20>γ<EFBFBD><CEB3><EFBFBD> retry <20>Ǥ<EFBFBD>"
+
+msgid "E272: unhandled exception"
+msgstr "E272: <20><><EFBFBD>갷<EFBFBD><EAB0B7><EFBFBD><EFBFBD><EFBFBD>ʤ<EFBFBD><CAA4>ä<EFBFBD><C3A4>㳰<EFBFBD><E3B3B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
+
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ̤<>Τ<EFBFBD>longjmp<6D><70><EFBFBD><EFBFBD>: %d"
@@ -4184,9 +4227,6 @@ msgstr "ANCHOR_BUF_SIZE
 msgid "I/O ERROR"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ϥ<EFBFBD><CFA5>顼"
 
-msgid "...(truncated)"
-msgstr "...(<28><>ά)"
-
 msgid "Message"
 msgstr "<22><><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD>"
 
@@ -4621,6 +4661,16 @@ msgstr "E388:
 msgid "E389: Couldn't find pattern"
 msgstr "E389: <20>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߤĤ<DFA4><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# <20>Ǹ<EFBFBD><C7B8><EFBFBD> %s<><73><EFBFBD><EFBFBD><EFBFBD>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD><EFBFBD>:\n"
+"~"
+
 msgid "E759: Format error in spell file"
 msgstr "E759: <20><><EFBFBD>ڥ<EFBFBD><DAA5>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ν񼰥<CEBD><F1BCB0A5>顼<EFBFBD>Ǥ<EFBFBD>"
 
@@ -4646,7 +4696,7 @@ msgid "Compressing word tree..."
 msgstr "ñ<><C3B1><EFBFBD>ĥ꡼<C4A5>򰵽̤<F2B0B5BD><CCA4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>..."
 
 msgid "E756: Spell checking is not enabled"
-msgstr "E756: <20><><EFBFBD>ڤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD>ޤ<EFBFBD>"
+msgstr "E756: <20><><EFBFBD>ڥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><EFBFBD>ޤ<EFBFBD>"
 
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
@@ -4697,6 +4747,22 @@ msgstr "%s
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s <20><><EFBFBD><EFBFBD> %d <20><><EFBFBD>ܤ˥ե饰<D5A5><E9A5B0><EFBFBD><EFBFBD><EFBFBD>Ż<EFBFBD><C5BB>Ѥ<EFBFBD><D1A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>: %s"
 
+#, c-format
+msgid ""
+"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s <20><> %d <20><><EFBFBD>ܤ<EFBFBD> PFX <20><><EFBFBD>ܤθ<DCA4><CEB8><EFBFBD> COMPOUNDFORBIDFLAG "
+"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8>ä<EFBFBD><C3A4><EFBFBD><EFBFBD>̤<EFBFBD><CCA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤳<EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
+
+#, c-format
+msgid ""
+"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s <20><> %d <20><><EFBFBD>ܤ<EFBFBD> PFX <20><><EFBFBD>ܤθ<DCA4><CEB8><EFBFBD> COMPOUNDPERMITFLAG "
+"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8>ä<EFBFBD><C3A4><EFBFBD><EFBFBD>̤<EFBFBD><CCA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤳<EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
+
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s <20><> %d <20><><EFBFBD>ܤ<EFBFBD> COMPOUNDWORDMAX <20><><EFBFBD>ͤ˸<CDA4><CBB8>꤬<EFBFBD><EAA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>: %s"
@@ -4738,10 +4804,6 @@ msgstr "%s
 msgid "Broken condition in %s line %d: %s"
 msgstr "%s <20><> %d <20><><EFBFBD>ܤ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD><CFB2><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>: %s"
 
-#, c-format
-msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-msgstr "PFXPOSTPONE<4E><45><EFBFBD><EFBFBD><EFBFBD>ꤵ<EFBFBD>줿<EFBFBD>Τ<EFBFBD> %s <20><> %d <20><><EFBFBD>ܤ<EFBFBD> affix <20>ե饰<D5A5><E9A5B0>̵<EFBFBD>뤷<EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
-
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s <20><> %d <20><><EFBFBD>ܤˤ<DCA4> REP(SAL) <20>β<EFBFBD><CEB2><EFBFBD><EFBFBD><EFBFBD>ɬ<EFBFBD>פǤ<D7A4>"
@@ -5299,7 +5361,7 @@ msgstr "E438: u_undo:
 msgid "more line"
 msgstr "<22><> <20>ɲä<C9B2><C3A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
-msgid "<EFBFBD>Ԥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
+msgid "more lines"
 msgstr "<22><> <20>ɲä<C9B2><C3A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "line less"
@@ -5330,6 +5392,10 @@ msgstr "
 msgid "number changes  time"
 msgstr "<22>ֹ<EFBFBD>   <20>ѹ<EFBFBD>     <20><><EFBFBD><EFBFBD>"
 
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld <20>÷вᤷ<D0B2>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
+
 msgid "E439: undo list corrupt"
 msgstr "E439: <20><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>ꥹ<EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 
@@ -5636,6 +5702,9 @@ msgstr "
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " <20>ܺ٤ʾ<D9A4><CABE><EFBFBD><EFBFBD><EFBFBD>          :help windows95<Enter> "
 
+msgid "Already only one window"
+msgstr "<22><><EFBFBD>˥<EFBFBD><CBA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD>1<EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+
 msgid "E441: There is no preview window"
 msgstr "E441: <20>ץ<EFBFBD><D7A5>ӥ塼<D3A5><E5A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
@@ -5648,9 +5717,6 @@ msgstr "E443: ¾
 msgid "E444: Cannot close last window"
 msgstr "E444: <20>Ǹ<EFBFBD><C7B8>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4>뤳<EFBFBD>ȤϤǤ<CFA4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
-msgid "Already only one window"
-msgstr "<22><><EFBFBD>˥<EFBFBD><CBA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD>1<EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: ¾<>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>ˤ<EFBFBD><CBA4>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 
@@ -5680,7 +5746,8 @@ msgid "Edits the selected file(s) with Vim"
 msgstr "<22><><EFBFBD>򤵤줿<F2A4B5A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Vim<69><6D><EFBFBD>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "<EFBFBD><EFBFBD>ư<EFBFBD>˼<EFBFBD><EFBFBD>Ԥ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>: gvim <20>ؤΥѥ<CEA5><D1A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꤵ<EFBFBD><EAA4B5><EFBFBD>Ƥ<EFBFBD><C6A4>뤫<EFBFBD><EBA4AB>ǧ<EFBFBD><C7A7><EFBFBD>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
+msgstr ""
+"<22><>ư<EFBFBD>˼<EFBFBD><CBBC>Ԥ<EFBFBD><D4A4>ޤ<EFBFBD><DEA4><EFBFBD>: gvim <20>ؤΥѥ<CEA5><D1A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꤵ<EFBFBD><EAA4B5><EFBFBD>Ƥ<EFBFBD><C6A4>뤫<EFBFBD><EBA4AB>ǧ<EFBFBD><C7A7><EFBFBD>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 
 msgid "gvimext.dll error"
 msgstr "gvimext.dll <20><><EFBFBD>顼"

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"
+"POT-Creation-Date: 2006-04-18 11:00+0900\n"
-"PO-Revision-Date: 2006-03-28 21:10+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:
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ \"%s\" <20>͍<EFBFBD><CD8D><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ύX<CF8D>ύX<CF8D><58><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Escape<70>͎g<CD8E>p<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 
@@ -217,8 +220,8 @@ msgid " Keyword completion (^N^P)"
 msgstr " <20>L<EFBFBD>[<5B><><EFBFBD>[<5B>h<EFBFBD>⊮ (^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)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X <20><><EFBFBD>[<5B>h (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X <20><><EFBFBD>[<5B>h (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
 msgid " Whole line completion (^L^N^P)"
 msgstr " <20>s(<28>S<EFBFBD><53>)<29>⊮ (^L^N^P)"
@@ -250,8 +253,8 @@ msgstr "
 msgid " Omni completion (^O^N^P)"
 msgstr " <20>I<EFBFBD><49><EFBFBD>j<EFBFBD>⊮ (^O^N^P)"
 
-msgid " Spelling suggestion (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
-msgstr " <20>Ԃ<EFBFBD><D482>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (^S^N^P)"
+msgstr " <20>Ԃ<EFBFBD><D482>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " <20>Ǐ<EFBFBD><C78F>L<EFBFBD>[<5B><><EFBFBD>[<5B>h<EFBFBD>⊮ (^N^P)"
@@ -486,6 +489,22 @@ msgstr "E723:
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ͕ϐ<CD95><CF90>̓<EFBFBD><CC93><EFBFBD><EFBFBD>q<EFBFBD><71><EFBFBD>[<5B>߂<EFBFBD><DF82>܂<EFBFBD>"
 
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: <20><><EFBFBD>m<EFBFBD>̊֐<CC8A><D690>ł<EFBFBD>: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: <20>֐<EFBFBD><D690>̈<EFBFBD><CC88><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȉ߂<C889><DF82>܂<EFBFBD>: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <20>X<EFBFBD>N<EFBFBD><4E><EFBFBD>v<EFBFBD>g<EFBFBD>ȊO<C88A><4F><SID><3E><><EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: <20><><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>֐<EFBFBD><D690><EFBFBD><EFBFBD>Ă΂<C482><CE82>܂<EFBFBD><DC82><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
+
 msgid "E699: Too many arguments"
 msgstr "E699: <20><><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82>܂<EFBFBD>"
 
@@ -522,8 +541,8 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() <20><> inputsave() <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă΂<C482><CE82>܂<EFBFBD><DC82><EFBFBD>"
 
-msgid "E745: Range not allowed"
+msgid "E786: Range not allowed"
-msgstr "E745: <20>͈͎w<CD8E><77><EFBFBD>͋<EFBFBD><CD8B>‚<EFBFBD><C282><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E786: <20>͈͎w<CD8E><77><EFBFBD>͋<EFBFBD><CD8B>‚<EFBFBD><C282><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() <20>ɂ͖<C982><CD96><EFBFBD><EFBFBD>Ȍ^<5E>ł<EFBFBD>"
@@ -1380,6 +1399,9 @@ msgstr "E602: :try
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: <20>֐<EFBFBD><D690>̊O<CC8A><4F> :endfunction <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: <20><><EFBFBD>݂͑<DD82><CD91>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ҏW<D28F><57><EFBFBD>邱<EFBFBD>Ƃ͋<C682><CD8B><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+
 msgid "tagname"
 msgstr "<22>^<5E>O<EFBFBD><4F>"
 
@@ -2484,12 +2506,33 @@ msgstr "<
 msgid "no such window"
 msgstr "<22><><EFBFBD>̂悤<CC82>ȃE<C883>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ <20>͕<EFBFBD><CD95><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃C<CC83><43><EFBFBD>X<EFBFBD>^<5E><><EFBFBD>X<EFBFBD>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>"
+
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: <20><><EFBFBD>̃R<CC83>}<7D><><EFBFBD>h<EFBFBD>͖<EFBFBD><CD96><EFBFBD><EFBFBD>ł<EFBFBD>,<2C><><EFBFBD>߂<EFBFBD><DF82>Ȃ<EFBFBD><C882><EFBFBD>: "
 "Ruby<62><79><EFBFBD>C<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD><EFBFBD>ł<EFBFBD><C582><EFBFBD>."
 
+msgid "E267: unexpected return"
+msgstr "E265: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> return <20>ł<EFBFBD>"
+
+msgid "E268: unexpected next"
+msgstr "E268: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> next <20>ł<EFBFBD>"
+
+msgid "E269: unexpected break"
+msgstr "E269: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> break <20>ł<EFBFBD>"
+
+msgid "E270: unexpected redo"
+msgstr "E270: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> redo <20>ł<EFBFBD>"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue <20>̊O<CC8A><4F> retry <20>ł<EFBFBD>"
+
+msgid "E272: unhandled exception"
+msgstr "E272: <20><><EFBFBD>舵<EFBFBD><E888B5><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
+
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: <20><><EFBFBD>m<EFBFBD><6D>longjmp<6D><70><EFBFBD><EFBFBD>: %d"
@@ -4184,9 +4227,6 @@ msgstr "ANCHOR_BUF_SIZE
 msgid "I/O ERROR"
 msgstr "<22><><EFBFBD>o<EFBFBD>̓G<CD83><47><EFBFBD>["
 
-msgid "...(truncated)"
-msgstr "...(<28>ȗ<EFBFBD>)"
-
 msgid "Message"
 msgstr "<22><><EFBFBD>b<EFBFBD>Z<EFBFBD>[<5B>W"
 
@@ -4621,6 +4661,16 @@ msgstr "E388:
 msgid "E389: Couldn't find pattern"
 msgstr "E389: <20>p<EFBFBD>^<5E>[<5B><><EFBFBD><EFBFBD><EFBFBD>݂‚<DD82><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# <20>Ō<EFBFBD><C58C><EFBFBD> %s<><73><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>^<5E>[<5B><>:\n"
+"~"
+
 msgid "E759: Format error in spell file"
 msgstr "E759: <20>X<EFBFBD>y<EFBFBD><79><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̏<EFBFBD><CC8F><EFBFBD><EFBFBD>G<EFBFBD><47><EFBFBD>[<5B>ł<EFBFBD>"
 
@@ -4646,7 +4696,7 @@ msgid "Compressing word tree..."
 msgstr "<22>P<EFBFBD><50><EFBFBD>c<EFBFBD><63><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>k<EFBFBD><6B><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>..."
 
 msgid "E756: Spell checking is not enabled"
-msgstr "E756: <20><><EFBFBD>؂<EFBFBD><EFBFBD>`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD>͖<EFBFBD><CD96><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
+msgstr "E756: <20>X<EFBFBD>y<EFBFBD><EFBFBD><EFBFBD>`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD>͖<EFBFBD><CD96><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
@@ -4697,6 +4747,22 @@ msgstr "%s
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s <20><><EFBFBD><EFBFBD> %d <20>s<EFBFBD>ڂɃt<C983><74><EFBFBD>O<EFBFBD>̓<EFBFBD><CC93>d<EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>: %s"
 
+#, c-format
+msgid ""
+"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> PFX <20><><EFBFBD>ڂ̌<DA82><CC8C><EFBFBD> COMPOUNDFORBIDFLAG "
+"<22>̒<EFBFBD><CC92>`<60>͌<EFBFBD><CD8C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʂ𐶂<CA82><F090B682>邱<EFBFBD>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
+
+#, c-format
+msgid ""
+"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> PFX <20><><EFBFBD>ڂ̌<DA82><CC8C><EFBFBD> COMPOUNDPERMITFLAG "
+"<22>̒<EFBFBD><CC92>`<60>͌<EFBFBD><CD8C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʂ𐶂<CA82><F090B682>邱<EFBFBD>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
+
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> COMPOUNDWORDMAX <20>̒l<CC92>Ɍ<EFBFBD><C98C>肪<EFBFBD><E882AA><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>: %s"
@@ -4738,10 +4804,6 @@ msgstr "%s
 msgid "Broken condition in %s line %d: %s"
 msgstr "%s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>͉<EFBFBD><CD89><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>: %s"
 
-#, c-format
-msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-msgstr "PFXPOSTPONE<4E><45><EFBFBD>w<EFBFBD>肳<EFBFBD>ꂽ<EFBFBD>̂<EFBFBD> %s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> affix <20>t<EFBFBD><74><EFBFBD>O<EFBFBD>𖳎<EFBFBD><F096B38E><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
-
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s <20><> %d <20>s<EFBFBD>ڂɂ<DA82> REP(SAL) <20>̉񐔂<CC89><F1909482>K<EFBFBD>v<EFBFBD>ł<EFBFBD>"
@@ -5299,7 +5361,7 @@ msgstr "E438: u_undo:
 msgid "more line"
 msgstr "<22>s <20>lj<EFBFBD><C789><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
-msgid "<EFBFBD>s<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
+msgid "more lines"
 msgstr "<22>s <20>lj<EFBFBD><C789><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "line less"
@@ -5330,6 +5392,10 @@ msgstr "
 msgid "number changes  time"
 msgstr "<22>ԍ<EFBFBD>   <20>ύX     <20><><EFBFBD><EFBFBD>"
 
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld <20>b<EFBFBD>o<EFBFBD>߂<EFBFBD><DF82>Ă<EFBFBD><C482>܂<EFBFBD>"
+
 msgid "E439: undo list corrupt"
 msgstr "E439: <20>A<EFBFBD><41><EFBFBD>h<EFBFBD>D<EFBFBD><44><EFBFBD>X<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 
@@ -5636,6 +5702,9 @@ msgstr "
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " <20>ڍׂȏ<D782><C88F><EFBFBD><EFBFBD><EFBFBD>          :help windows95<Enter> "
 
+msgid "Already only one window"
+msgstr "<22><><EFBFBD>ɃE<C983>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD><45>1<EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+
 msgid "E441: There is no preview window"
 msgstr "E441: <20>v<EFBFBD><76><EFBFBD>r<EFBFBD><72><EFBFBD>[<5B>E<EFBFBD>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD><45><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
@@ -5648,9 +5717,6 @@ msgstr "E443:
 msgid "E444: Cannot close last window"
 msgstr "E444: <20>Ō<EFBFBD><C58C>̃E<CC83>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD><45><EFBFBD>‚<EFBFBD><C282>邱<EFBFBD>Ƃ͂ł<CD82><C582>܂<EFBFBD><DC82><EFBFBD>"
 
-msgid "Already only one window"
-msgstr "<22><><EFBFBD>ɃE<C983>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD><45>1<EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: <20><><EFBFBD>̃E<CC83>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD>ɂ͕ύX<CF8D><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
 
@@ -5680,7 +5746,8 @@ msgid "Edits the selected file(s) with Vim"
 msgstr "<22>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD>ꂽ<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD>Vim<69>ŕҏW<D28F><57><EFBFBD><EFBFBD>"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>Ɏ<EFBFBD><EFBFBD>s<EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD>: gvim <20>ւ̃p<CC83>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݒ肳<DD92><E882B3><EFBFBD>Ă<EFBFBD><C482>邩<EFBFBD>m<EFBFBD>F<EFBFBD><46><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
+msgstr ""
+"<22>N<EFBFBD><4E><EFBFBD>Ɏ<EFBFBD><C98E>s<EFBFBD><73><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: gvim <20>ւ̃p<CC83>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݒ肳<DD92><E882B3><EFBFBD>Ă<EFBFBD><C482>邩<EFBFBD>m<EFBFBD>F<EFBFBD><46><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 
 msgid "gvimext.dll error"
 msgstr "gvimext.dll <20>G<EFBFBD><47><EFBFBD>["

src/po/sv.po

@@ -1,12 +1,12 @@
 # Swedish translation for Vim.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
-# Johan Svedberg <johan@svedberg.com>, 2003-2005.
+# 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"
+"POT-Creation-Date: 2006-04-10 17:24+0200\n"
-"PO-Revision-Date: 2005-12-04 20:33+0100\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<68>lp"
 
-msgid "[help]"
+msgid "[Help]"
-msgstr "[hj<EFBFBD>lp]"
+msgstr "[Hj<EFBFBD>lp]"
 
 msgid "[Preview]"
 msgstr "[F<>rhandsvisning]"
@@ -154,8 +154,11 @@ msgstr ""
 "\n"
 "# Buffertlista:\n"
 
-msgid "[Error List]"
+msgid "[Location List]"
-msgstr "[Fellista]"
+msgstr "[Positionslista]"
+
+msgid "[Quickfix List]"
+msgstr "[Quickfix-lista]"
 
 msgid ""
 "\n"
@@ -488,6 +491,9 @@ msgstr "E724: variabel n
 msgid "E699: Too many arguments"
 msgstr "E699: F<>r m<>nga argument"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() kan bara anv<6E>ndas i infogningsl<73>ge"
+
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
@@ -670,6 +676,136 @@ msgstr ""
 "\n"
 "\tSenast satt fr<66>n "
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "G<>r in i fels<6C>kningsl<73>ge.  Skriv \"cont\" f<>r att forts<74>tta."
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "rad %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "kommando: %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Brytpunkt i \"%s%s\" rad %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Brytpunkt hittades inte: %s"
+
+msgid "No breakpoints defined"
+msgstr "Inga brytpunkter definierade"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  rad %ld"
+
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: Anv<6E>nd :profile start <fnamn> f<>rst"
+
+msgid "Save As"
+msgstr "Spara som"
+
+#, c-format
+msgid "Save changes to \"%s\"?"
+msgstr "Spara <20>ndringar till \"%s\"?"
+
+msgid "Untitled"
+msgstr "Namnl<6E>s"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162: Ingen skrivning sedan senaste <20>ndring f<>r buffert \"%s\""
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr "Varning: Gick in i andra buffertar ov<6F>ntat (kontrollera autokommandon)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: Det finns bara en fil att redigera"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: Kan inte g<> f<>re f<>rsta filen"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Kan inte g<> bortom sista filen"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: kompilator st<73>ds inte: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "S<>ker efter \"%s\" i \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "S<>ker efter \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr "hittades inte i 'runtimepath': \"%s\""
+
+msgid "Source Vim script"
+msgstr "L<>s Vim-skript"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Kan inte l<>sa en katalog: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "kunde inte l<>sa \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "rad %ld: kunde inte l<>sa \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "l<>ser \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "rad %ld: l<>ser \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "l<>ste klart %s"
+
+msgid "modeline"
+msgstr "l<>gesrad"
+
+msgid "--cmd argument"
+msgstr "--cmd argument"
+
+msgid "-c argument"
+msgstr "-c argument"
+
+msgid "environment variable"
+msgstr "milj<6C>variabel"
+
+msgid "error handler"
+msgstr "felhanterare"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: Varning: Fel radavskiljare, ^M kan saknas"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding anv<6E>nds utanf<6E>r en k<>rd fil"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish anv<6E>nds utanf<6E>r en k<>rd fil"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Aktuellt %sspr<70>k: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Kan inte s<>tta spr<70>k till \"%s\""
+
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Hex %02x,  Oktalt %03o"
@@ -754,9 +890,6 @@ msgstr "# V
 msgid "Illegal starting char"
 msgstr "Otill<6C>tet starttecken"
 
-msgid "Save As"
-msgstr "Spara som"
-
 msgid "Write partial file?"
 msgstr "Skriv ofullst<73>ndig fil?"
 
@@ -927,118 +1060,6 @@ msgstr " (st
 msgid "[Deleted]"
 msgstr "[Borttagen]"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "G<>r in i fels<6C>kningsl<73>ge.  Skriv \"cont\" f<>r att forts<74>tta."
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "rad %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "kommando: %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Brytpunkt i \"%s%s\" rad %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Brytpunkt hittades inte: %s"
-
-msgid "No breakpoints defined"
-msgstr "Inga brytpunkter definierade"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  rad %ld"
-
-msgid "E750: First use :profile start <fname>"
-msgstr "E750: Anv<6E>nd :profile start <fnamn> f<>rst"
-
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "Spara <20>ndringar till \"%s\"?"
-
-msgid "Untitled"
-msgstr "Namnl<6E>s"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Ingen skrivning sedan senaste <20>ndring f<>r buffert \"%s\""
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Varning: Gick in i andra buffertar ov<6F>ntat (kontrollera autokommandon)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: Det finns bara en fil att redigera"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Kan inte g<> f<>re f<>rsta filen"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Kan inte g<> bortom sista filen"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: kompilator st<73>ds inte: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "S<>ker efter \"%s\" i \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "S<>ker efter \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "hittades inte i 'runtimepath': \"%s\""
-
-msgid "Source Vim script"
-msgstr "L<>s Vim-skript"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Kan inte l<>sa en katalog: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "kunde inte l<>sa \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "rad %ld: kunde inte l<>sa \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "l<>ser \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "rad %ld: l<>ser \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "l<>ste klart %s"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Varning: Fel radavskiljare, ^M kan saknas"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding anv<6E>nds utanf<6E>r en k<>rd fil"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish anv<6E>nds utanf<6E>r en k<>rd fil"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Aktuellt %sspr<70>k: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Kan inte s<>tta spr<70>k till \"%s\""
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "G<>r in i Ex-l<>ge.  Skriv \"visual\" f<>r att g<> till Normal-l<>ge."
 
@@ -1152,9 +1173,19 @@ msgstr "E185: Kan inte hitta f
 msgid "Greetings, Vim user!"
 msgstr "V<>lkommen, Vim-anv<6E>ndare!"
 
+msgid "E784: Cannot close last tab page"
+msgstr "E784: Kan inte st<73>nga senaste flik"
+
+msgid "Already only one tab page"
+msgstr "Redan bara en flik"
+
 msgid "Edit File in new window"
 msgstr "Redigera fil i nytt f<>nster"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "Flik %d"
+
 msgid "No swap file"
 msgstr "Ingen v<>xlingsfil"
 
@@ -1399,6 +1430,9 @@ msgstr "
 msgid "[New File]"
 msgstr "[Ny fil]"
 
+msgid "[New DIRECTORY]"
+msgstr "[Ny KATALOG]"
+
 msgid "[File too big]"
 msgstr "[Fil f<>r stor]"
 
@@ -1451,8 +1485,9 @@ msgstr "[konverterad]"
 msgid "[crypted]"
 msgstr "[krypterad]"
 
-msgid "[CONVERSION ERROR]"
+#, c-format
-msgstr "[KONVERTERINGSFEL]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[KONVERTERINGSFEL p<> rad %ld]"
 
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
@@ -1798,29 +1833,6 @@ msgstr "Ingen mappning hittades"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Otill<6C>tet l<>ge"
 
-msgid "E229: Cannot start the GUI"
-msgstr "E229: Kan inte starta GUI"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: Kan inte l<>sa fr<66>n \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: Kan inte starta GUI, ingen giltig font hittad"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: 'guifontwide' ogiltig"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: V<>rdet av 'imactivatekey' <20>r ogiltigt"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Kan inte allokera f<>rg %s"
-
-msgid "No match at cursor, finding next"
-msgstr "Ingen matchning vid mark<72>r, s<>ker n<>sta"
-
 msgid "<cannot open> "
 msgstr "<kan inte <20>ppna> "
 
@@ -1843,15 +1855,38 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Avbryt"
 
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Rullningslist: Kunde inte h<>mta geometrin p<> miniatyrbild."
-
 msgid "Vim dialog"
 msgstr "Vim-dialog"
 
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Rullningslist: Kunde inte h<>mta geometrin p<> miniatyrbild."
+
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Kan inte skapa BalloonEval med b<>de meddelande och <20>terkallning"
 
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Kan inte starta GUI"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Kan inte l<>sa fr<66>n \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: Kan inte starta GUI, ingen giltig font hittad"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' ogiltig"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: V<>rdet av 'imactivatekey' <20>r ogiltigt"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Kan inte allokera f<>rg %s"
+
+msgid "No match at cursor, finding next"
+msgstr "Ingen matchning vid mark<72>r, s<>ker n<>sta"
+
 msgid "Vim dialog..."
 msgstr "Vim-dialog..."
 
@@ -1909,6 +1944,15 @@ msgstr "Ers
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: Tog emot \"die\"-beg<65>ran fr<66>n sessionshanteraren\n"
 
+msgid "Close"
+msgstr "St<53>ng"
+
+msgid "New tab"
+msgstr "Ny flik"
+
+msgid "Open Tab..."
+msgstr "<22>ppna flik..."
+
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: Huvudf<64>nster ov<6F>ntat f<>rst<73>rt\n"
 
@@ -1980,6 +2024,12 @@ msgstr "E243: Argument st
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Kunde inte <20>ppna f<>nster inuti MDI-applikation"
 
+msgid "Close tab"
+msgstr "St<53>ng flik"
+
+msgid "Open tab..."
+msgstr "<22>ppna flik..."
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "S<>k str<74>ng (anv<6E>nd '\\\\' f<>r att hitta '\\')"
 
@@ -2819,6 +2869,9 @@ msgstr "-U <gvimrc>\t\tAnv
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tL<74>s inte in insticksskript"
 
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-p[N]\t\t<>ppna N flikar (standard: en f<>r varje fil)"
+
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\t<>ppna N f<>nster (standard: ett f<>r varje fil)"
 
@@ -2877,6 +2930,9 @@ msgstr ""
 "--remote-wait-silent <filer>\tSamma, klaga inte om det inte finns n<>gon "
 "server"
 
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <filer>  Som --remote men <20>ppna flik f<>r varje fil"
+
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr ""
 "--remote-send <nycklar>\tSkicka <nycklar> till en Vim-server och avsluta"
@@ -3001,25 +3057,6 @@ msgstr "--role <roll>\tSt
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t<>ppna Vim innanf<6E>r en annan GTK-widget"
 
-msgid ""
-"\n"
-"Arguments recognised by kvim (KDE version):\n"
-msgstr ""
-"\n"
-"Argument igenk<6E>nda av kvim (KDE-version):\n"
-
-msgid "-black\t\tUse reverse video"
-msgstr "-black\t\tAnv<6E>nd omv<6D>nd video"
-
-msgid "-tip\t\t\tDisplay the tip dialog on startup"
-msgstr "-tip\t\tVisa tipsdialogen vid uppstart"
-
-msgid "-notip\t\tDisable the tip dialog"
-msgstr "-notip\t\tInaktivera tipsdialogen"
-
-msgid "--display <display>\tRun vim on <display>"
-msgstr "--display <display>\tK<74>r vim p<> <display>"
-
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <f<>r<EFBFBD>lder f<>nster>\t<>ppna Vim inuti f<>r<EFBFBD>lderapplikation"
 
@@ -3444,6 +3481,10 @@ msgstr "Stackstorlek
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: pekarblock-id fel 2"
 
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: Symbolisk l<>nk-loop f<>r \"%s\""
+
 msgid "E325: ATTENTION"
 msgstr "E325: LYSTRING"
 
@@ -3532,16 +3573,16 @@ msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
+"&Delete it\n"
 "&Quit\n"
-"&Abort\n"
+"&Abort"
-"&Delete it"
 msgstr ""
 "&<26>ppna skrivskyddad\n"
 "&Redigera <20>nd<6E>\n"
 "&<26>terskapa\n"
+"&Ta bort den\n"
 "&Avsluta\n"
-"A&vbryt\n"
+"A&vbryt"
-"&Ta bort den"
 
 msgid "E326: Too many swap files found"
 msgstr "E326: F<>r m<>nga v<>xlingsfiler hittade"
@@ -3808,6 +3849,12 @@ msgstr "E658: NetBeans-anslutning tappad f
 msgid "E505: "
 msgstr "E505: "
 
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' <20>r tom"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: Eval-funktionen inte tillg<6C>nglig"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "Varning: terminal kan inte framh<6D>va"
 
@@ -3930,8 +3977,9 @@ msgstr "Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld bitar"
 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 "
+msgstr ""
-"av %ld bitar"
+"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; ord %ld av %ld; bit %ld av %ld"
 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 "
+msgstr ""
-"%ld av %ld"
+"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' <20>r inte 80, kan inte k<>ra externa kommandon"
 
@@ -4201,14 +4253,6 @@ msgstr "Vim: F
 msgid "Opening the X display took %ld msec"
 msgstr "<22>ppning av X-display tog %ld ms"
 
-#. KDE sometimes produces X error that we want to ignore
-msgid ""
-"\n"
-"Vim: Got X error but we continue...\n"
-msgstr ""
-"\n"
-"Vim: Fick X-error men vi forts<74>tter...\n"
-
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4287,9 +4331,6 @@ msgstr "XSMP ICE-anslutning
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection misslyckades: %s"
 
-msgid "At line"
-msgstr "P<> rad"
-
 msgid "Could not load vim32.dll!"
 msgstr "Kunde inte l<>sa in vim32.dll!"
 
@@ -4331,6 +4372,9 @@ 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<>r m<>nga %%%c i formatstr<74>ng"
@@ -4393,6 +4437,9 @@ msgstr "Kan inte
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Buffert <20>r inte laddad"
 
+msgid "E777: String or List expected"
+msgstr "E777: Str<74>ng eller Lista f<>rv<72>ntades"
+
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ogiltigt f<>rem<65>l i %s%%[]"
@@ -4576,6 +4623,10 @@ msgstr " INTE HITTADE"
 msgid "Scanning included file: %s"
 msgstr "S<>ker igenom inkluderad fil: %s"
 
+#, c-format
+msgid "Searching included file %s"
+msgstr "S<>ker igenom inkluderad fil %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: Matchning <20>r p<> aktuell rad"
 
@@ -4666,12 +4717,8 @@ msgid "FLAG after using flags in %s line %d: %s"
 msgstr "FLAG efter anv<6E>ndning av flags i %s rad %d: %s"
 
 #, c-format
-msgid "Character used for SLASH must be ASCII; in %s line %d: %s"
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "Tecken anv<6E>nt f<>r SLASH m<>ste vara ASCII; i %s rad %d: %s"
+msgstr "Fel COMPOUNDWORDMAX-v<>rde i %s rad %d: %s"
-
-#, c-format
-msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
-msgstr "Fel COMPOUNDMAX-v<>rde i %s rad %d: %s"
 
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
@@ -4681,6 +4728,10 @@ msgstr "Fel COMPOUNDMIN-v
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "Fel COMPOUNDSYLMAX-v<>rde i %s rad %d: %s"
 
+#, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "Fel CHECKCOMPOUNDPATTERN-v<>rde i %s rad %d: %s"
+
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr "Annan kombinerande flagga i efterf<72>ljande 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<6B> anv<6E>nd f<>r BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND i %s rad %d: %s"
+"Affix ocks<6B> anv<6E>nd f<>r BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST i "
+"%s rad %d: %s"
 
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
@@ -4704,8 +4757,12 @@ msgid "Broken condition in %s line %d: %s"
 msgstr "Trasigt villkor i %s rad %d: %s"
 
 #, c-format
-msgid "Expected REP count in %s line %d"
+msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-msgstr "F<EFBFBD>rv<EFBFBD>ntade REP-antal i %s rad %d"
+msgstr "Affix-flaggor ignorerade n<>r PFXPOSTPONE anv<6E>nds i %s rad %d: %s"
+
+#, c-format
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "F<>rv<72>ntade 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 characters"
 msgstr "Ignorerade %d ord med icke-ASCII tecken"
 
 #, c-format
-msgid "Compressed %d of %d nodes; %d%% remaining"
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "Komprimerade %d av %d noder; %d%% <20>terst<73>r"
+msgstr "Komprimerade %d av %d noder; %d (%d%%) <20>terst<73>r"
+
+msgid "Reading back spell file..."
+msgstr "L<>ser tillbaka stavningsfil..."
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+msgid "Performing soundfolding..."
+msgstr "Utf<74>r ljudvikning..."
+
+#, c-format
+msgid "Number of words after soundfolding: %ld"
+msgstr "Antal ord efter ljudvikning: %ld"
+
+#, c-format
+msgid "Total number of words: %d"
+msgstr "Totalt antal ord: %d"
+
+#, c-format
+msgid "Writing suggestion file %s ..."
+msgstr "Skriver f<>rslagsfil %s ..."
+
+#, c-format
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "Ber<65>knat k<>rtidsminne anv<6E>nt: %d byte"
 
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Utmatningsfilnamn f<>r inte ha regionnamn"
@@ -4843,14 +4926,18 @@ msgstr "Skriver stavningsfil %s ..."
 msgid "Done!"
 msgstr "Klar!"
 
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "Ber<65>knat k<>rtidsminne anv<6E>nt: %d byte"
-
 #, c-format
 msgid "E765: 'spellfile' does not have %ld entries"
 msgstr "E765: 'spellfile' har inte %ld poster"
 
+#, c-format
+msgid "Word removed from %s"
+msgstr "Ord borttaget fr<66>n %s"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "Ord lagd till %s"
+
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Ordtecken skiljer sig mellan stavningsfiler"
 
@@ -4877,10 +4964,30 @@ msgstr "E752: Ingen tidigare stavningsers
 msgid "E753: Not found: %s"
 msgstr "E753: Hittades inte: %s"
 
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: Det h<>r ser inte ut som en .sug-fil: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Gammal .sug-fil, beh<65>ver bli uppdaterad: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: .sug-fil <20>r f<>r nyare version av Vim: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug-fil matchar inte .spl-fil: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: fel vid l<>sning av .sug-fil: %s"
+
 #. This should have been checked when generating the .spl
 #. * file.
-msgid "E999: duplicate char in MAP entry"
+msgid "E783: duplicate char in MAP entry"
-msgstr "E999: dubblerat tecken i MAP-post"
+msgstr "E783: dubblerat tecken i MAP-post"
 
 #, c-format
 msgid "E390: Illegal argument: %s"
@@ -5195,15 +5302,52 @@ msgstr "Vim: Fel vid l
 msgid "No undo possible; continue anyway"
 msgstr "Ingen <20>ngring m<>jlig; forts<74>tter <20>nd<6E>"
 
+msgid "Already at oldest change"
+msgstr "Redan vid <20>ldsta <20>ndring"
+
+msgid "Already at newest change"
+msgstr "Redan vid nyaste <20>ndring"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "<22>ngra-nummer %ld hittades inte"
+
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: radnummer fel"
 
-msgid "1 change"
+msgid "more line"
-msgstr "1 <20>ndring"
+msgstr "en rad till"
+
+msgid "more lines"
+msgstr "fler rader"
+
+msgid "line less"
+msgstr "en rad mindre"
+
+msgid "fewer lines"
+msgstr "f<>rre rader"
+
+msgid "change"
+msgstr "<22>ndring"
+
+msgid "changes"
+msgstr "<22>ndringar"
 
 #, c-format
-msgid "%ld changes"
+msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld <EFBFBD>ndringar"
+msgstr "%ld %s; %s #%ld  %s"
+
+msgid "before"
+msgstr "f<>re"
+
+msgid "after"
+msgstr "efter"
+
+msgid "Nothing to undo"
+msgstr "Inget att <20>ngra"
+
+msgid "number changes  time"
+msgstr "antal <20>ndringar  tid"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: <20>ngra-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
 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<74>ffstr<74>ng"
 

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",
+	CENT("Visual term=reverse",
-	     "Visual term=reverse ctermbg=Magenta guibg=LightGrey"),
+	     "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",
+	CENT("Visual term=reverse",
-	     "Visual term=reverse ctermbg=Magenta guibg=DarkGrey"),
+	     "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.
+    /* Reverse looks ugly, but grey may not work for 8 colors.  Thus let it
-     * Thus let it depend on the number of colors available. */
+     * 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
     /*

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;
 		    }
 		}
 	    }

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_MEDIUM	"7.0e02 BETA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0e01 BETA (2006 Apr 17)"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0e02 BETA (2006 Apr 18)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0e01 BETA (2006 Apr 17, compiled "
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0e02 BETA (2006 Apr 18, compiled "

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
 
 /*