patch 8.2.4487: Vim9: cannot compare with v:null

Problem:    Vim9: cannot compare with v:null.
Solution:   Allow comparing anything with v:null. (closes #9866)

.github/workflows/ci.yml

@@ -514,7 +514,11 @@ jobs:
 
       - name: Check version
         shell: cmd
-        run: src\vim --version || exit 1
+        run: |
+          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
+          src\vim --version || exit 1
+          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
 
       #- name: Prepare Artifact
       #  shell: cmd

runtime/autoload/dist/ft.vim

@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2022 Feb 05
+# Last Change:	2022 Feb 22
 
 # These functions are moved here from runtime/filetype.vim to make startup
 # faster.
@@ -83,7 +83,7 @@ export def FTbas()
     setf freebasic
   elseif match(lines, qb64_preproc) > -1
     setf qb64
-  elseif match(lines, s:ft_visual_basic_content) > -1
+  elseif match(lines, ft_visual_basic_content) > -1
     setf vb
   else
     setf basic
@@ -206,6 +206,10 @@ export def EuphoriaCheck()
 enddef
 
 export def DtraceCheck()
+  if did_filetype()
+    # Filetype was already detected
+    return
+  endif
   var lines = getline(1, min([line("$"), 100]))
   if match(lines, '^module\>\|^import\>') > -1
     # D files often start with a module and/or import statement.
@@ -241,7 +245,7 @@ export def FTfrm()
 
   var lines = getline(1, min([line("$"), 5]))
 
-  if match(lines, s:ft_visual_basic_content) > -1
+  if match(lines, ft_visual_basic_content) > -1
     setf vb
   else
     setf form
@@ -434,7 +438,7 @@ export def FTinc()
       setf php
     # Pascal supports // comments but they're vary rarely used for file
     # headers so assume POV-Ray
-    elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
+    elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? ft_pascal_keywords
       setf pascal
     else
       FTasmsyntax()
@@ -496,7 +500,7 @@ export def FTprogress_pascal()
   var lnum = 1
   while lnum <= 10 && lnum < line('$')
     var line = getline(lnum)
-    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
+    if line =~ ft_pascal_comments || line =~? ft_pascal_keywords
       setf pascal
       return
     elseif line !~ '^\s*$' || line =~ '^/\*'
@@ -514,7 +518,7 @@ export def FTpp()
     exe "setf " .. g:filetype_pp
   else
     var line = getline(nextnonblank(1))
-    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
+    if line =~ ft_pascal_comments || line =~? ft_pascal_keywords
       setf pascal
     else
       setf puppet
@@ -685,8 +689,8 @@ export def FTRules()
   endtry
   var dir = expand('<amatch>:p:h')
   for line in config_lines
-    if line =~ s:ft_rules_udev_rules_pattern
-      var udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
+    if line =~ ft_rules_udev_rules_pattern
+      var udev_rules = substitute(line, ft_rules_udev_rules_pattern, '\1', "")
       if dir == udev_rules
 	setf udevrules
       endif

runtime/doc/Makefile

@@ -153,6 +153,7 @@ DOCS = \
 	version6.txt \
 	version7.txt \
 	version8.txt \
+	version9.txt \
 	vi_diff.txt \
 	vim9.txt \
 	visual.txt \
@@ -298,6 +299,7 @@ HTMLS = \
 	version6.html \
 	version7.html \
 	version8.html \
+	version9.html \
 	vi_diff.html \
 	vimindex.html \
 	vim9.html \

runtime/doc/autocmd.txt

@@ -1639,7 +1639,7 @@ Examples for reading and writing compressed files: >
   :  autocmd BufReadPre,FileReadPre	*.gz set bin
   :  autocmd BufReadPost,FileReadPost	*.gz '[,']!gunzip
   :  autocmd BufReadPost,FileReadPost	*.gz set nobin
-  :  autocmd BufReadPost,FileReadPost	*.gz execute ":doautocmd BufReadPost " . expand("%:r")
+  :  autocmd BufReadPost,FileReadPost	*.gz execute ":doautocmd BufReadPost " .. expand("%:r")
   :  autocmd BufWritePost,FileWritePost	*.gz !mv <afile> <afile>:r
   :  autocmd BufWritePost,FileWritePost	*.gz !gzip <afile>:r
 
@@ -1738,7 +1738,7 @@ To insert the current date and time in a *.html file when writing it: >
   :  else
   :    let l = line("$")
   :  endif
-  :  exe "1," . l . "g/Last modified: /s/Last modified: .*/Last modified: " .
+  :  exe "1," .. l .. "g/Last modified: /s/Last modified: .*/Last modified: " ..
   :  \ strftime("%Y %b %d")
   :endfun
 

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 8.2.  Last change: 2022 Feb 08
+*builtin.txt*	For Vim version 8.2.  Last change: 2022 Feb 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -539,8 +539,8 @@ sin({expr})			Float	sine of {expr}
 sinh({expr})			Float	hyperbolic sine of {expr}
 slice({expr}, {start} [, {end}])  String, List or Blob
 					slice of a String, List or Blob
-sort({list} [, {func} [, {dict}]])
-				List	sort {list}, using {func} to compare
+sort({list} [, {how} [, {dict}]])
+				List	sort {list}, compare with {how}
 sound_clear()			none	stop playing all sounds
 sound_playevent({name} [, {callback}])
 				Number	play an event sound
@@ -854,7 +854,7 @@ argv([{nr} [, {winid}]])
 	:let i = 0
 	:while i < argc()
 	:  let f = escape(fnameescape(argv(i)), '.')
-	:  exe 'amenu Arg.' . f . ' :e ' . f . '<CR>'
+	:  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
 	:  let i = i + 1
 	:endwhile
 <		Without the {nr} argument, or when {nr} is -1, a |List| with
@@ -1134,7 +1134,7 @@ bufwinid({buf})						*bufwinid()*
 		see |bufname()| above.  If buffer {buf} doesn't exist or
 		there is no such window, -1 is returned.  Example: >
 
-	echo "A window containing buffer 1 is " . (bufwinid(1))
+	echo "A window containing buffer 1 is " .. (bufwinid(1))
 <
 		Only deals with the current tab page.
 
@@ -1147,7 +1147,7 @@ bufwinnr({buf})						*bufwinnr()*
 		If buffer {buf} doesn't exist or there is no such window, -1
 		is returned.  Example: >
 
-	echo "A window containing buffer 1 is " . (bufwinnr(1))
+	echo "A window containing buffer 1 is " .. (bufwinnr(1))
 
 <		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
@@ -1197,7 +1197,7 @@ byteidx({expr}, {nr})					*byteidx()*
 byteidxcomp({expr}, {nr})					*byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
 		as a separate character.  Example: >
-			let s = 'e' . nr2char(0x301)
+			let s = 'e' .. nr2char(0x301)
 			echo byteidx(s, 1)
 			echo byteidxcomp(s, 1)
 			echo byteidxcomp(s, 2)
@@ -1392,7 +1392,7 @@ col({expr})	The result is a Number, which is the byte index of the column
 			col(".")		column of cursor
 			col("$")		length of cursor line plus one
 			col("'t")		column of mark t
-			col("'" . markname)	column of mark markname
+			col("'" .. markname)	column of mark markname
 <		The first column is 1.  0 is returned for an error.
 		For an uppercase mark the column may actually be in another
 		buffer.
@@ -1401,7 +1401,7 @@ col({expr})	The result is a Number, which is the byte index of the column
 		line.  This can be used to obtain the column in Insert mode: >
 			:imap <F2> <C-O>:let save_ve = &ve<CR>
 				\<C-O>:set ve=all<CR>
-				\<C-O>:echo col(".") . "\n" <Bar>
+				\<C-O>:echo col(".") .. "\n" <Bar>
 				\let &ve = save_ve<CR>
 
 <		Can also be used as a |method|: >
@@ -2082,9 +2082,12 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is defined,
 			dict.key	|internal-variables|).  Also works
 			list[i]		for |curly-braces-names|, |Dictionary|
 			import.Func	entries, |List| items, imported
-					items,etc.
+					items, etc.
 					Does not work for local variables in a
 					compiled `:def` function.
+					Also works for a function in |Vim9|
+					script, since it can be used as a
+					function reference.
 					Beware that evaluating an index may
 					cause an error message for an invalid
 					expression.  E.g.: >
@@ -2137,7 +2140,8 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is defined,
 			exists("&shortname")
 			exists("$HOSTNAME")
 			exists("*strftime")
-			exists("*s:MyFunc")
+			exists("*s:MyFunc")	" only for legacy script
+			exists("*MyFunc")
 			exists("bufcount")
 			exists(":Make")
 			exists("#CursorHold")
@@ -2243,12 +2247,12 @@ expand({string} [, {nosuf} [, {list}]])				*expand()*
 			:e		extension only
 
 		Example: >
-			:let &tags = expand("%:p:h") . "/tags"
+			:let &tags = expand("%:p:h") .. "/tags"
 <		Note that when expanding a string that starts with '%', '#' or
 		'<', any following text is ignored.  This does NOT work: >
 			:let doesntwork = expand("%:h.bak")
 <		Use this: >
-			:let doeswork = expand("%:h") . ".bak"
+			:let doeswork = expand("%:h") .. ".bak"
 <		Also note that expanding "<cfile>" and others only returns the
 		referenced file name without further expansion.  If "<cfile>"
 		is "~/.cshrc", you need to do another expand() to have the
@@ -2629,7 +2633,7 @@ fnameescape({string})					*fnameescape()*
 		and |:write|).  And a "-" by itself (special after |:cd|).
 		Example: >
 			:let fname = '+some str%nge|name'
-			:exe "edit " . fnameescape(fname)
+			:exe "edit " .. fnameescape(fname)
 <		results in executing: >
 			edit \+some\ str\%nge\|name
 <
@@ -2810,7 +2814,7 @@ function({name} [, {arglist}] [, {dict}])
 <		The Dictionary is only useful when calling a "dict" function.
 		In that case the {dict} is passed in as "self". Example: >
 			function Callback() dict
-			   echo "called for " . self.name
+			   echo "called for " .. self.name
 			endfunction
 			...
 			let context = {"name": "example"}
@@ -3009,7 +3013,7 @@ getbufvar({buf}, {varname} [, {def}])				*getbufvar()*
 		string is returned, there is no error message.
 		Examples: >
 			:let bufmodified = getbufvar(1, "&mod")
-			:echo "todo myvar = " . getbufvar("todo", "myvar")
+			:echo "todo myvar = " .. getbufvar("todo", "myvar")
 
 <		Can also be used as a |method|: >
 			GetBufnr()->getbufvar(varname)
@@ -3070,9 +3074,9 @@ getchar([expr])						*getchar()*
 		This example positions the mouse as it would normally happen: >
 			let c = getchar()
 			if c == "\<LeftMouse>" && v:mouse_win > 0
-			  exe v:mouse_win . "wincmd w"
+			  exe v:mouse_win .. "wincmd w"
 			  exe v:mouse_lnum
-			  exe "normal " . v:mouse_col . "|"
+			  exe "normal " .. v:mouse_col .. "|"
 			endif
 <
 		When using bracketed paste only the first character is
@@ -3869,7 +3873,7 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
 		empty string is returned, there is no error message.
 		Examples: >
 			:let list_is_on = gettabwinvar(1, 2, '&list')
-			:echo "myvar = " . gettabwinvar(3, 1, 'myvar')
+			:echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
 <
 		To obtain all window-local variables use: >
 			gettabwinvar({tabnr}, {winnr}, '&')
@@ -4002,7 +4006,7 @@ getwinvar({winnr}, {varname} [, {def}])				*getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
 		Examples: >
 			:let list_is_on = getwinvar(2, '&list')
-			:echo "myvar = " . getwinvar(1, 'myvar')
+			:echo "myvar = " .. getwinvar(1, 'myvar')
 
 <		Can also be used as a |method|: >
 			GetWinnr()->getwinvar(varname)
@@ -4257,7 +4261,7 @@ histdel({history} [, {item}])				*histdel()*
 		The following three are equivalent: >
 			:call histdel("search", histnr("search"))
 			:call histdel("search", -1)
-			:call histdel("search", '^'.histget("search", -1).'$')
+			:call histdel("search", '^' .. histget("search", -1) .. '$')
 <
 		To delete the last search pattern and use the last-but-one for
 		the "n" command and 'hlsearch': >
@@ -4276,7 +4280,7 @@ histget({history} [, {index}])				*histget()*
 
 		Examples:
 		Redo the second last search from history. >
-			:execute '/' . histget("search", -2)
+			:execute '/' .. histget("search", -2)
 
 <		Define an Ex command ":H {num}" that supports re-execution of
 		the {num}th entry from the output of |:history|. >
@@ -4522,7 +4526,7 @@ input({prompt} [, {text} [, {completion}]])		*input()*
 		|:execute| or |:normal|.
 
 		Example with a mapping: >
-			:nmap \x :call GetFoo()<CR>:exe "/" . Foo<CR>
+			:nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
 			:function GetFoo()
 			:  call inputsave()
 			:  let g:Foo = input("enter search pattern: ")
@@ -4696,7 +4700,7 @@ items({dict})						*items()*
 		order.  Also see |keys()| and |values()|.
 		Example: >
 			for [key, value] in items(mydict)
-			   echo key . ': ' . value
+			   echo key .. ': ' .. value
 			endfor
 
 <		Can also be used as a |method|: >
@@ -4711,7 +4715,7 @@ join({list} [, {sep}])					*join()*
 		{sep} is omitted a single space is used.
 		Note that {sep} is not added at the end.  You might want to
 		add it there too: >
-			let lines = join(mylist, "\n") . "\n"
+			let lines = join(mylist, "\n") .. "\n"
 <		String items are used as-is.  |Lists| and |Dictionaries| are
 		converted into a string like with |string()|.
 		The opposite function is |split()|.
@@ -4923,7 +4927,7 @@ line({expr} [, {winid}])				*line()*
 			line(".")		line number of the cursor
 			line(".", winid)	idem, in window "winid"
 			line("'t")		line number of mark t
-			line("'" . marker)	line number of mark marker
+			line("'" .. marker)	line number of mark marker
 <
 		To jump to the last known position when opening a file see
 		|last-position-jump|.
@@ -4999,12 +5003,12 @@ listener_add({callback} [, {buf}])			*listener_add()*
 		Returns a unique ID that can be passed to |listener_remove()|.
 
 		The {callback} is invoked with five arguments:
-		    a:bufnr	the buffer that was changed
-		    a:start	first changed line number
-		    a:end	first line number below the change
-		    a:added	number of lines added, negative if lines were
+		    bufnr	the buffer that was changed
+		    start	first changed line number
+		    end		first line number below the change
+		    added	number of lines added, negative if lines were
 				deleted
-		    a:changes	a List of items with details about the changes
+		    changes	a List of items with details about the changes
 
 		Example: >
 	    func Listener(bufnr, start, end, added, changes)
@@ -5012,7 +5016,7 @@ listener_add({callback} [, {buf}])			*listener_add()*
 	    endfunc
 	    call listener_add('Listener', bufnr)
 
-<		The List cannot be changed.  Each item in a:changes is a
+<		The List cannot be changed.  Each item in "changes" is a
 		dictionary with these entries:
 		    lnum	the first line number of the change
 		    end		the first line below the change
@@ -5139,7 +5143,7 @@ luaeval({expr} [, {expr}])					*luaeval()*
 
 map({expr1}, {expr2})					*map()*
 		{expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
-		When {expr1} is a |List|| or |Dictionary|, replace each
+		When {expr1} is a |List| or |Dictionary|, replace each
 		item in {expr1} with the result of evaluating {expr2}.
 		For a |Blob| each byte is replaced.
 		For a |String|, each character, including composing
@@ -5157,7 +5161,7 @@ map({expr1}, {expr2})					*map()*
 		current byte. For a |String| |v:key| has the index of the
 		current character.
 		Example: >
-			:call map(mylist, '"> " . v:val . " <"')
+			:call map(mylist, '"> " .. v:val .. " <"')
 <		This puts "> " before and " <" after each item in "mylist".
 
 		Note that {expr2} is the result of an expression and is then
@@ -5171,19 +5175,19 @@ map({expr1}, {expr2})					*map()*
 		The function must return the new value of the item. Example
 		that changes each value by "key-value": >
 			func KeyValue(key, val)
-			  return a:key . '-' . a:val
+			  return a:key .. '-' .. a:val
 			endfunc
 			call map(myDict, function('KeyValue'))
 <		It is shorter when using a |lambda|: >
-			call map(myDict, {key, val -> key . '-' . val})
+			call map(myDict, {key, val -> key .. '-' .. val})
 <		If you do not use "val" you can leave it out: >
-			call map(myDict, {key -> 'item: ' . key})
+			call map(myDict, {key -> 'item: ' .. key})
 <		If you do not use "key" you can use a short name: >
-			call map(myDict, {_, val -> 'item: ' . val})
+			call map(myDict, {_, val -> 'item: ' .. val})
 <
 		The operation is done in-place for a |List| and |Dictionary|.
 		If you want it to remain unmodified make a copy first: >
-			:let tlist = map(copy(mylist), ' v:val . "\t"')
+			:let tlist = map(copy(mylist), ' v:val .. "\t"')
 
 <		Returns {expr1}, the |List| or |Dictionary| that was filtered,
 		or a new |Blob| or |String|.
@@ -5259,7 +5263,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 		then the global mappings.
 		This function can be used to map a key even when it's already
 		mapped, and have it do the original mapping too.  Sketch: >
-			exe 'nnoremap <Tab> ==' . maparg('<Tab>', 'n')
+			exe 'nnoremap <Tab> ==' .. maparg('<Tab>', 'n')
 
 <		Can also be used as a |method|: >
 			GetKey()->maparg('n')
@@ -5782,7 +5786,7 @@ mkdir({name} [, {path} [, {prot}]])
 		{name}.  Thus if you create /tmp/foo/bar then /tmp/foo will be
 		created with 0o755.
 		Example: >
-			:call mkdir($HOME . "/tmp/foo/bar", "p", 0o700)
+			:call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
 
 <		This function is not available in the |sandbox|.
 
@@ -6223,7 +6227,7 @@ prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
 		       stopinsert
 		       close
 		     else
-		       call append(line('$') - 1, 'Entered: "' . a:text . '"')
+		       call append(line('$') - 1, 'Entered: "' .. a:text .. '"')
 		       " Reset 'modified' to allow the buffer to be closed.
 		       set nomodified
 		     endif
@@ -6420,7 +6424,7 @@ readdir({directory} [, {expr} [, {dict}]])			*readdir()*
 		  function! s:tree(dir)
 		      return {a:dir : map(readdir(a:dir),
 		      \ {_, x -> isdirectory(x) ?
-		      \		 {x : s:tree(a:dir . '/' . x)} : x})}
+		      \		 {x : s:tree(a:dir .. '/' .. x)} : x})}
 		  endfunction
 		  echo s:tree(".")
 <
@@ -6617,16 +6621,22 @@ reltimestr({time})				*reltimestr()*
 
 							*remote_expr()* *E449*
 remote_expr({server}, {string} [, {idvar} [, {timeout}]])
-		Send the {string} to {server}.  The string is sent as an
-		expression and the result is returned after evaluation.
-		The result must be a String or a |List|.  A |List| is turned
-		into a String by joining the items with a line break in
-		between (not at the end), like with join(expr, "\n").
+		Send the {string} to {server}.  The {server} argument is a
+		string, also see |{server}|.
+
+		The string is sent as an expression and the result is returned
+		after evaluation.  The result must be a String or a |List|.  A
+		|List| is turned into a String by joining the items with a
+		line break in between (not at the end), like with join(expr,
+		"\n").
+
 		If {idvar} is present and not empty, it is taken as the name
 		of a variable and a {serverid} for later use with
 		|remote_read()| is stored there.
+
 		If {timeout} is given the read times out after this many
 		seconds.  Otherwise a timeout of 600 seconds is used.
+
 		See also |clientserver| |RemoteReply|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
@@ -6647,7 +6657,7 @@ remote_expr({server}, {string} [, {idvar} [, {timeout}]])
 
 remote_foreground({server})				*remote_foreground()*
 		Move the Vim server with the name {server} to the foreground.
-		The {server} argument is a string.
+		The {server} argument is a string, also see |{server}|.
 		This works like: >
 			remote_expr({server}, "foreground()")
 <		Except that on Win32 systems the client does the work, to work
@@ -6676,7 +6686,7 @@ remote_peek({serverid} [, {retvar}])		*remote_peek()*
 		{only available when compiled with the |+clientserver| feature}
 		Examples: >
 			:let repl = ""
-			:echo "PEEK: ".remote_peek(id, "repl").": ".repl
+			:echo "PEEK: " .. remote_peek(id, "repl") .. ": " .. repl
 
 <		Can also be used as a |method|: >
 			ServerId()->remote_peek()
@@ -6696,12 +6706,17 @@ remote_read({serverid}, [{timeout}])			*remote_read()*
 <
 							*remote_send()* *E241*
 remote_send({server}, {string} [, {idvar}])
-		Send the {string} to {server}.  The string is sent as input
-		keys and the function returns immediately.  At the Vim server
-		the keys are not mapped |:map|.
+		Send the {string} to {server}.  The {server} argument is a
+		string, also see |{server}|.
+
+		The string is sent as input keys and the function returns
+		immediately.  At the Vim server the keys are not mapped
+		|:map|.
+
 		If {idvar} is present, it is taken as the name of a variable
 		and a {serverid} for later use with remote_read() is stored
 		there.
+
 		See also |clientserver| |RemoteReply|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
@@ -6709,12 +6724,12 @@ remote_send({server}, {string} [, {idvar}])
 		Note: Any errors will be reported in the server and may mess
 		up the display.
 		Examples: >
-		:echo remote_send("gvim", ":DropAndReply ".file, "serverid").
+		:echo remote_send("gvim", ":DropAndReply " .. file, "serverid") ..
 		 \ remote_read(serverid)
 
 		:autocmd NONE RemoteReply *
 		 \ echo remote_read(expand("<amatch>"))
-		:echo remote_send("gvim", ":sleep 10 | echo ".
+		:echo remote_send("gvim", ":sleep 10 | echo " ..
 		 \ 'server2client(expand("<client>"), "HELLO")<CR>')
 <
 		Can also be used as a |method|: >
@@ -6739,7 +6754,7 @@ remove({list}, {idx} [, {end}])				*remove()*
 		points to an item before {idx} this is an error.
 		See |list-index| for possible values of {idx} and {end}.
 		Example: >
-			:echo "last item: " . remove(mylist, -1)
+			:echo "last item: " .. remove(mylist, -1)
 			:call remove(mylist, 0, 9)
 <
 		Use |delete()| to remove a file.
@@ -6755,13 +6770,13 @@ remove({blob}, {idx} [, {end}])
 		byte as {end} a |Blob| with one byte is returned.  When {end}
 		points to a byte before {idx} this is an error.
 		Example: >
-			:echo "last byte: " . remove(myblob, -1)
+			:echo "last byte: " .. remove(myblob, -1)
 			:call remove(mylist, 0, 9)
 
 remove({dict}, {key})
 		Remove the entry from {dict} with key {key} and return it.
 		Example: >
-			:echo "removed " . remove(dict, "one")
+			:echo "removed " .. remove(dict, "one")
 <		If there is no {key} in {dict} this is an error.
 
 rename({from}, {to})					*rename()*
@@ -6892,7 +6907,7 @@ screencol()							*screencol()*
 		column inside the command line, which is 1 when the command is
 		executed. To get the cursor position in the file use one of
 		the following mappings: >
-			nnoremap <expr> GG ":echom ".screencol()."\n"
+			nnoremap <expr> GG ":echom " .. screencol() .. "\n"
 			nnoremap <silent> GG :echom screencol()<CR>
 			nnoremap GG <Cmd>echom screencol()<CR>
 <
@@ -6916,6 +6931,8 @@ screenpos({winid}, {lnum}, {col})				*screenpos()*
 		as if 'conceallevel' is zero.  You can set the cursor to the
 		right position and use |screencol()| to get the value with
 		|conceal| taken into account.
+		If the position is in a closed fold the screen position of the
+		first character is returned, {col} is not used.
 
 		Can also be used as a |method|: >
 			GetWinid()->screenpos(lnum, col)
@@ -7014,7 +7031,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		Example (goes over all files in the argument list): >
 		    :let n = 1
 		    :while n <= argc()	    " loop over all files in arglist
-		    :  exe "argument " . n
+		    :  exe "argument " .. n
 		    :  " start at the last char in the file and wrap for the
 		    :  " first search to find match at start of file
 		    :  normal G$
@@ -7098,11 +7115,11 @@ searchcount([{options}])					*searchcount()*
 			  return printf(' /%s [%d/%d]', @/,
 			  \		result.current, result.total)
 			endfunction
-			let &statusline .= '%{LastSearchCount()}'
+			let &statusline ..= '%{LastSearchCount()}'
 
 			" Or if you want to show the count only when
 			" 'hlsearch' was on
-			" let &statusline .=
+			" let &statusline ..=
 			" \   '%{v:hlsearch ? LastSearchCount() : ""}'
 <
 		You can also update the search count, which can be useful in a
@@ -7897,7 +7914,7 @@ sha256({string})						*sha256()*
 shellescape({string} [, {special}])			*shellescape()*
 		Escape {string} for use as a shell command argument.
 		When the 'shell' contains powershell (MS-Windows) or pwsh
-		(MS-Windows, Linux, and MacOS) then it will enclose {string}
+		(MS-Windows, Linux, and macOS) then it will enclose {string}
 		in single quotes and will double up all internal single
 		quotes.
 		On MS-Windows, when 'shellslash' is not set, it will enclose
@@ -7926,10 +7943,10 @@ shellescape({string} [, {special}])			*shellescape()*
 		character inside single quotes.
 
 		Example of use with a |:!| command: >
-		    :exe '!dir ' . shellescape(expand('<cfile>'), 1)
+		    :exe '!dir ' .. shellescape(expand('<cfile>'), 1)
 <		This results in a directory listing for the file under the
 		cursor.  Example of use with |system()|: >
-		    :call system("chmod +w -- " . shellescape(expand("%")))
+		    :call system("chmod +w -- " .. shellescape(expand("%")))
 <		See also |::S|.
 
 		Can also be used as a |method|: >
@@ -8016,21 +8033,22 @@ slice({expr}, {start} [, {end}])			*slice()*
 			GetList()->slice(offset)
 
 
-sort({list} [, {func} [, {dict}]])			*sort()* *E702*
+sort({list} [, {how} [, {dict}]])			*sort()* *E702*
 		Sort the items in {list} in-place.  Returns {list}.
 
 		If you want a list to remain unmodified make a copy first: >
 			:let sortedlist = sort(copy(mylist))
 
-<		When {func} is omitted, is empty or zero, then sort() uses the
+<		When {how} is omitted or is an string, then sort() uses the
 		string representation of each item to sort on.  Numbers sort
 		after Strings, |Lists| after Numbers.  For sorting text in the
 		current buffer use |:sort|.
 
-		When {func} is given and it is '1' or 'i' then case is
-		ignored.
+		When {how} is given and it is 'i' then case is ignored.
+		In legacy script, for backwards compatibility, the value one
+		can be used to ignore case.  Zero means to not ignore case.
 
-		When {func} is given and it is 'l' then the current collation
+		When {how} is given and it is 'l' then the current collation
 		locale is used for ordering. Implementation details: strcoll()
 		is used to compare strings. See |:language| check or set the
 		collation locale. |v:collate| can also be used to check the
@@ -8047,19 +8065,19 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 <			['n', 'o', 'O', 'p', 'z', 'ö'] ~
 		This does not work properly on Mac.
 
-		When {func} is given and it is 'n' then all items will be
+		When {how} is given and it is 'n' then all items will be
 		sorted numerical (Implementation detail: this uses the
 		strtod() function to parse numbers, Strings, Lists, Dicts and
 		Funcrefs will be considered as being 0).
 
-		When {func} is given and it is 'N' then all items will be
+		When {how} is given and it is 'N' then all items will be
 		sorted numerical. This is like 'n' but a string containing
 		digits will be used as the number they represent.
 
-		When {func} is given and it is 'f' then all items will be
+		When {how} is given and it is 'f' then all items will be
 		sorted numerical. All values must be a Number or a Float.
 
-		When {func} is a |Funcref| or a function name, this function
+		When {how} is a |Funcref| or a function name, this function
 		is called to compare items.  The function is invoked with two
 		items as argument and must return zero if they are equal, 1 or
 		bigger if the first one sorts after the second one, -1 or
@@ -8701,7 +8719,7 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 		When {sub} starts with "\=", the remainder is interpreted as
 		an expression. See |sub-replace-expression|.  Example: >
 		   :echo substitute(s, '%\(\x\x\)',
-			   \ '\=nr2char("0x" . submatch(1))', 'g')
+			   \ '\=nr2char("0x" .. submatch(1))', 'g')
 
 <		When {sub} is a Funcref that function is called, with one
 		optional argument.  Example: >
@@ -8709,7 +8727,7 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 <		The optional argument is a list which contains the whole
 		matched string and up to nine submatches, like what
 		|submatch()| returns.  Example: >
-		   :echo substitute(s, '%\(\x\x\)', {m -> '0x' . m[1]}, 'g')
+		   :echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
 
 <		Can also be used as a |method|: >
 			GetString()->substitute(pat, sub, flags)
@@ -8898,8 +8916,8 @@ system({expr} [, {input}])				*system()* *E677*
 		This is not to be used for interactive commands.
 
 		The result is a String.  Example: >
-		    :let files = system("ls " .  shellescape(expand('%:h')))
-		    :let files = system('ls ' . expand('%:h:S'))
+		    :let files = system('ls ' .. shellescape(expand('%:h')))
+		    :let files = system('ls ' .. expand('%:h:S'))
 
 <		To make the result more system-independent, the shell output
 		is filtered to replace <CR> with <NL> for Macintosh, and
@@ -9080,7 +9098,7 @@ tempname()					*tempname()* *temp-file-name*
 		doesn't exist.  It can be used for a temporary file.  The name
 		is different for at least 26 consecutive calls.  Example: >
 			:let tmpfile = tempname()
-			:exe "redir > " . tmpfile
+			:exe "redir > " .. tmpfile
 <		For Unix, the file will be in a private directory |tempfile|.
 		For MS-Windows forward slashes are used when the 'shellslash'
 		option is set, or when 'shellcmdflag' starts with '-' and
@@ -9277,7 +9295,7 @@ trim({text} [, {mask} [, {dir}]])				*trim()*
 		Examples: >
 			echo trim("   some text ")
 <		returns "some text" >
-			echo trim("  \r\t\t\r RESERVE \t\n\x0B\xA0") . "_TAIL"
+			echo trim("  \r\t\t\r RESERVE \t\n\x0B\xA0") .. "_TAIL"
 <		returns "RESERVE_TAIL" >
 			echo trim("rm<Xrm<>X>rrm", "rm<>")
 <		returns "Xrm<>X" (characters in the middle are not removed) >
@@ -9468,7 +9486,7 @@ visualmode([{expr}])						*visualmode()*
 		character-wise, line-wise, or block-wise Visual mode
 		respectively.
 		Example: >
-			:exe "normal " . visualmode()
+			:exe "normal " .. visualmode()
 <		This enters the same Visual mode as before.  It is also useful
 		in scripts if you wish to act differently depending on the
 		Visual mode that was used.
@@ -9672,7 +9690,7 @@ winheight({nr})						*winheight()*
 		An existing window always has a height of zero or more.
 		This excludes any window toolbar line.
 		Examples: >
-  :echo "The current window has " . winheight(0) . " lines."
+  :echo "The current window has " .. winheight(0) .. " lines."
 
 <		Can also be used as a |method|: >
 			GetWinid()->winheight()
@@ -9813,7 +9831,7 @@ winwidth({nr})						*winwidth()*
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a width of zero or more.
 		Examples: >
-  :echo "The current window has " . winwidth(0) . " columns."
+  :echo "The current window has " .. winwidth(0) .. " columns."
   :if winwidth(0) <= 50
   :  50 wincmd |
   :endif

runtime/doc/change.txt

@@ -946,7 +946,7 @@ Consider using a character like "@" or ":".  There is no problem if the result
 of the expression contains the separation character.
 
 Examples: >
-	:s@\n@\="\r" . expand("$HOME") . "\r"@
+	:s@\n@\="\r" .. expand("$HOME") .. "\r"@
 This replaces an end-of-line with a new line containing the value of $HOME. >
 
 	s/E/\="\<Char-0x20ac>"/g
@@ -1123,7 +1123,7 @@ inside of strings can change!  Also see 'softtabstop' option. >
 			the command.  You need to escape the '|' and '"'
 			characters to prevent them from terminating the
 			command.  Example: >
-				:put ='path' . \",/test\"
+				:put ='path' .. \",/test\"
 <			If there is no expression after '=', Vim uses the
 			previous expression.  You can see it with ":dis =".
 

runtime/doc/channel.txt

@@ -91,7 +91,7 @@ And you should see the message in Vim. You can move the cursor a word forward:
 
 To handle asynchronous communication a callback needs to be used: >
 	func MyHandler(channel, msg)
-	  echo "from the handler: " . a:msg
+	  echo "from the handler: " .. a:msg
 	endfunc
 	call ch_sendexpr(channel, 'hello!', {'callback': "MyHandler"})
 Vim will not wait for a response.  Now the server can send the response later
@@ -136,7 +136,7 @@ When using an IPv6 address, enclose it within square brackets.  E.g.,
 		gets two arguments: the channel and the received message.
 		Example: >
 	func Handle(channel, msg)
-	  echo 'Received: ' . a:msg
+	  echo 'Received: ' .. a:msg
 	endfunc
 	let channel = ch_open("localhost:8765", {"callback": "Handle"})
 <
@@ -1296,7 +1296,7 @@ prompt. >
 
 	" Function handling output from the shell: Added above the prompt.
 	func GotOutput(channel, msg)
-	  call append(line("$") - 1, "- " . a:msg)
+	  call append(line("$") - 1, "- " .. a:msg)
 	endfunc
 
 	" Function handling the shell exist: close the window.

runtime/doc/cmdline.txt

@@ -227,7 +227,7 @@ CTRL-\ e {expr}						*c_CTRL-\_e*
 		Example: >
 			:cmap <F7> <C-\>eAppendSome()<CR>
 			:func AppendSome()
-			   :let cmd = getcmdline() . " Some()"
+			   :let cmd = getcmdline() .. " Some()"
 			   :" place the cursor on the )
 			   :call setcmdpos(strlen(cmd))
 			   :return cmd

runtime/doc/diff.txt

@@ -382,13 +382,13 @@ Example (this does almost the same as 'diffexpr' being empty): >
 	function MyDiff()
 	   let opt = ""
 	   if &diffopt =~ "icase"
-	     let opt = opt . "-i "
+	     let opt = opt .. "-i "
 	   endif
 	   if &diffopt =~ "iwhite"
-	     let opt = opt . "-b "
+	     let opt = opt .. "-b "
 	   endif
-	   silent execute "!diff -a --binary " . opt . v:fname_in . " " . v:fname_new .
-		\  " > " . v:fname_out
+	   silent execute "!diff -a --binary " .. opt .. v:fname_in .. " " .. v:fname_new ..
+		\  " > " .. v:fname_out
 	   redraw!
 	endfunction
 
@@ -445,8 +445,8 @@ Example (this does the same as 'patchexpr' being empty): >
 
 	set patchexpr=MyPatch()
 	function MyPatch()
-	   :call system("patch -o " . v:fname_out . " " . v:fname_in .
-	   \  " < " . v:fname_diff)
+	   :call system("patch -o " .. v:fname_out .. " " .. v:fname_in ..
+	   \  " < " .. v:fname_diff)
 	endfunction
 
 Make sure that using the "patch" program doesn't have unwanted side effects.

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2022 Feb 04
+*editing.txt*   For Vim version 8.2.  Last change: 2022 Feb 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -222,7 +222,7 @@ If you want to keep the changed buffer without saving it, switch on the
 			Edit {file} always.  Discard any changes to the
 			current buffer.
 			Also see |++opt| and |+cmd|.
-
+							*:edit_#* *:e#*
 :e[dit] [++opt] [+cmd] #[count]
 			Edit the [count]th buffer (as shown by |:files|).
 			This command does the same as [count] CTRL-^.  But ":e
@@ -389,7 +389,7 @@ as a wildcard when "[" is in the 'isfname' option.  A simple way to avoid this
 is to use "path\[[]abc]", this matches the file "path\[abc]".
 
 					*starstar-wildcard*
-Expanding "**" is possible on Unix, Win32, Mac OS/X and a few other systems.
+Expanding "**" is possible on Unix, Win32, macOS and a few other systems.
 This allows searching a directory tree.  This goes up to 100 directories deep.
 Note there are some commands where this works slightly differently, see
 |file-searching|.
@@ -444,9 +444,9 @@ does apply like to other wildcards.
 
 Environment variables in the expression are expanded when evaluating the
 expression, thus this works: >
-	:e `=$HOME . '/.vimrc'`
+	:e `=$HOME .. '/.vimrc'`
 This does not work, $HOME is inside a string and used literally: >
-	:e `='$HOME' . '/.vimrc'`
+	:e `='$HOME' .. '/.vimrc'`
 
 If the expression returns a string then names are to be separated with line
 breaks.  When the result is a |List| then each item is used as a name.  Line
@@ -1695,7 +1695,7 @@ which version of the file you want to keep.
 
 The accuracy of the time check depends on the filesystem.  On Unix it is
 usually sub-second.  With old file sytems and on MS-Windows it is normally one
-second.  Use has('nanotime') check if sub-second time stamp checks are
+second.  Use `has('nanotime')` to check if sub-second time stamp checks are
 available.
 
 There is one situation where you get the message while there is nothing wrong:

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.2.  Last change: 2022 Feb 04
+*eval.txt*	For Vim version 8.2.  Last change: 2022 Feb 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -470,7 +470,7 @@ It is also possible to put remaining items in a List variable: >
 	:for [i, j; rest] in listlist
 	:   call Doit(i, j)
 	:   if !empty(rest)
-	:      echo "remainder: " . string(rest)
+	:      echo "remainder: " .. string(rest)
 	:   endif
 	:endfor
 
@@ -498,11 +498,11 @@ Functions that are useful with a List: >
 	:let list = split("a b c")	" create list from items in a string
 	:let string = join(list, ', ')	" create string from list items
 	:let s = string(list)		" String representation of list
-	:call map(list, '">> " . v:val')  " prepend ">> " to each item
+	:call map(list, '">> " .. v:val')  " prepend ">> " to each item
 
 Don't forget that a combination of features can make things simple.  For
 example, to add up all the numbers in a list: >
-	:exe 'let sum = ' . join(nrlist, '+')
+	:exe 'let sum = ' .. join(nrlist, '+')
 
 
 1.4 Dictionaries ~
@@ -568,7 +568,7 @@ turn the Dictionary into a List and pass it to |:for|.
 
 Most often you want to loop over the keys, using the |keys()| function: >
 	:for key in keys(mydict)
-	:   echo key . ': ' . mydict[key]
+	:   echo key .. ': ' .. mydict[key]
 	:endfor
 
 The List of keys is unsorted.  You may want to sort them first: >
@@ -576,13 +576,13 @@ The List of keys is unsorted.  You may want to sort them first: >
 
 To loop over the values use the |values()| function:  >
 	:for v in values(mydict)
-	:   echo "value: " . v
+	:   echo "value: " .. v
 	:endfor
 
 If you want both the key and the value use the |items()| function.  It returns
 a List in which each item is a List with two items, the key and the value: >
 	:for [key, value] in items(mydict)
-	:   echo key . ': ' . value
+	:   echo key .. ': ' .. value
 	:endfor
 
 
@@ -677,7 +677,7 @@ Functions that can be used with a Dictionary: >
 	:let small = min(dict)		" minimum value in dict
 	:let xs = count(dict, 'x')	" count nr of times 'x' appears in dict
 	:let s = string(dict)		" String representation of dict
-	:call map(dict, '">> " . v:val')  " prepend ">> " to each item
+	:call map(dict, '">> " .. v:val')  " prepend ">> " to each item
 
 
 1.5 Blobs ~
@@ -921,13 +921,13 @@ Expression nesting is limited to 1000 levels deep (300 when build with MSVC)
 to avoid running out of stack and crashing. *E1169*
 
 
-expr1				*expr1* *trinary* *falsy-operator* *??* *E109*
+expr1				*expr1* *ternary* *falsy-operator* *??* *E109*
 -----
 
-The trinary operator: expr2 ? expr1 : expr1
+The ternary operator: expr2 ? expr1 : expr1
 The falsy operator:   expr2 ?? expr1
 
-Trinary operator ~
+Ternary operator ~
 
 In legacy script the expression before the '?' is evaluated to a number.  If
 it evaluates to |TRUE|, the result is the value of the expression between the
@@ -1371,7 +1371,7 @@ And NOT: >
 	-(1.234->string())
 
 What comes after "->" can be a name, a simple expression (not containing any
-parenthesis), or any expression in parenthesis: >
+parenthesis), or any expression in parentheses: >
 	base->name(args)
 	base->some.name(args)
 	base->alist[idx](args)
@@ -1530,7 +1530,7 @@ option						*expr-option* *E112* *E113*
 &l:option		local option value
 
 Examples: >
-	echo "tabstop is " . &tabstop
+	echo "tabstop is " .. &tabstop
 	if &insertmode
 
 Any option name can be used here.  See |options|.  When using the local value
@@ -1820,7 +1820,7 @@ maintain a counter: >
 	  echo "script executed for the first time"
 	else
 	  let s:counter = s:counter + 1
-	  echo "script executed " . s:counter . " times now"
+	  echo "script executed " .. s:counter .. " times now"
 	endif
 
 Note that this means that filetype plugins don't get a different set of script
@@ -1955,7 +1955,7 @@ v:completed_item
 					*v:count* *count-variable*
 v:count		The count given for the last Normal mode command.  Can be used
 		to get the count before a mapping.  Read-only.  Example: >
-	:map _x :<C-U>echo "the count is " . v:count<CR>
+	:map _x :<C-U>echo "the count is " .. v:count<CR>
 <		Note: The <C-U> is required to remove the line range that you
 		get when typing ':' after a count.
 		When there are two counts, as in "3d2w", they are multiplied,
@@ -2182,7 +2182,8 @@ v:lnum		Line number for the 'foldexpr' |fold-expr|, 'formatexpr' and
 
 						*v:maxcol* *maxcol-variable*
 v:maxcol	Maximum line length.  Depending on where it is used it can be
-		screen columns, characters or bytes.
+		screen columns, characters or bytes.  The value currently is
+		2147483647 on all systems.
 
 					*v:mouse_win* *mouse_win-variable*
 v:mouse_win	Window number for a mouse click obtained with |getchar()|.
@@ -2828,9 +2829,9 @@ Example: >
   :  echohl Title
   :  echo a:title
   :  echohl None
-  :  echo a:0 . " items:"
+  :  echo a:0 .. " items:"
   :  for s in a:000
-  :    echon ' ' . s
+  :    echon ' ' .. s
   :  endfor
   :endfunction
 
@@ -2873,7 +2874,7 @@ This function can then be called with: >
 		this works:
 						*function-range-example*  >
 	:function Mynumber(arg)
-	:  echo line(".") . " " . a:arg
+	:  echo line(".") .. " " .. a:arg
 	:endfunction
 	:1,5call Mynumber(getline("."))
 <
@@ -2884,7 +2885,7 @@ This function can then be called with: >
 		Example of a function that handles the range itself: >
 
 	:function Cont() range
-	:  execute (a:firstline + 1) . "," . a:lastline . 's/^/\t\\ '
+	:  execute (a:firstline + 1) .. "," .. a:lastline .. 's/^/\t\\ '
 	:endfunction
 	:4,8call Cont()
 <
@@ -3001,8 +3002,9 @@ Also note that if you have two script files, and one calls a function in the
 other and vice versa, before the used function is defined, it won't work.
 Avoid using the autoload functionality at the toplevel.
 
-In |Vim9| script you will get error *E1263* if you use a function name with a
-"#" character when not in an autoload script.
+In |Vim9| script you will get error *E1263* if you define a function with
+a "#" character in the name.  You should use a name without "#" and use
+`:export`.
 
 Hint: If you distribute a bunch of scripts you can pack them together with the
 |vimball| utility.  Also read the user manual |distribute-script|.
@@ -3075,7 +3077,7 @@ declarations and assignments do not use a command.  |vim9-declaration|
 			This cannot be used to add an item to a |List|.
 			This cannot be used to set a byte in a String.  You
 			can do that like this: >
-				:let var = var[0:2] . 'X' . var[4:]
+				:let var = var[0:2] .. 'X' .. var[4:]
 <			When {var-name} is a |Blob| then {idx} can be the
 			length of the blob, in which case one byte is
 			appended.
@@ -3145,7 +3147,7 @@ declarations and assignments do not use a command.  |vim9-declaration|
 			is just like using the |:set| command: both the local
 			value and the global value are changed.
 			Example: >
-				:let &path = &path . ',/usr/local/include'
+				:let &path = &path .. ',/usr/local/include'
 <			This also works for terminal codes in the form t_xx.
 			But only for alphanumerical names.  Example: >
 				:let &t_k1 = "\<Esc>[234;"
@@ -3423,6 +3425,8 @@ text...
 :if {expr1}			*:if* *:end* *:endif* *:en* *E171* *E579* *E580*
 :en[dif]		Execute the commands until the next matching ":else"
 			or ":endif" if {expr1} evaluates to non-zero.
+			Although the short forms work, it is recommended to
+			always use `:endif` to avoid confusion.
 
 			From Vim version 4.5 until 5.0, every Ex command in
 			between the ":if" and ":endif" is ignored.  These two
@@ -4026,7 +4030,7 @@ exception most recently caught as long it is not finished.
 
 	:function! Caught()
 	:  if v:exception != ""
-	:    echo 'Caught "' . v:exception . '" in ' . v:throwpoint
+	:    echo 'Caught "' . v:exception .. '" in ' .. v:throwpoint
 	:  else
 	:    echo 'Nothing caught'
 	:  endif
@@ -4429,8 +4433,8 @@ a script in order to catch unexpected things.
 	:catch /^Vim:Interrupt$/
 	:    echo "Script interrupted"
 	:catch /.*/
-	:  echo "Internal error (" . v:exception . ")"
-	:  echo " - occurred at " . v:throwpoint
+	:  echo "Internal error (" .. v:exception .. ")"
+	:  echo " - occurred at " .. v:throwpoint
 	:endtry
 	:" end of script
 
@@ -4626,7 +4630,7 @@ parentheses can be cut out from |v:exception| with the ":substitute" command.
 
 	:function! CheckRange(a, func)
 	:  if a:a < 0
-	:    throw "EXCEPT:MATHERR:RANGE(" . a:func . ")"
+	:    throw "EXCEPT:MATHERR:RANGE(" .. a:func .. ")"
 	:  endif
 	:endfunction
 	:
@@ -4653,7 +4657,7 @@ parentheses can be cut out from |v:exception| with the ":substitute" command.
 	:  try
 	:    execute "write" fnameescape(a:file)
 	:  catch /^Vim(write):/
-	:    throw "EXCEPT:IO(" . getcwd() . ", " . a:file . "):WRITEERR"
+	:    throw "EXCEPT:IO(" .. getcwd() .. ", " .. a:file .. "):WRITEERR"
 	:  endtry
 	:endfunction
 	:
@@ -4672,9 +4676,9 @@ parentheses can be cut out from |v:exception| with the ":substitute" command.
 	:  let dir = substitute(v:exception, '.*(\(.\+\),\s*.\+).*', '\1', "")
 	:  let file = substitute(v:exception, '.*(.\+,\s*\(.\+\)).*', '\1', "")
 	:  if file !~ '^/'
-	:    let file = dir . "/" . file
+	:    let file = dir .. "/" .. file
 	:  endif
-	:  echo 'I/O error for "' . file . '"'
+	:  echo 'I/O error for "' .. file .. '"'
 	:
 	:catch /^EXCEPT/
 	:  echo "Unspecified error"
@@ -4742,7 +4746,7 @@ clauses, however, is executed.
 	:    echo "inner finally"
 	:  endtry
 	:catch
-	:  echo 'outer catch-all caught "' . v:exception . '"'
+	:  echo 'outer catch-all caught "' .. v:exception .. '"'
 	:  finally
 	:    echo "outer finally"
 	:endtry
@@ -4804,7 +4808,7 @@ Printing in Binary ~
   :  let n = a:nr
   :  let r = ""
   :  while n
-  :    let r = '01'[n % 2] . r
+  :    let r = '01'[n % 2] .. r
   :    let n = n / 2
   :  endwhile
   :  return r
@@ -4815,7 +4819,7 @@ Printing in Binary ~
   :func String2Bin(str)
   :  let out = ''
   :  for ix in range(strlen(a:str))
-  :    let out = out . '-' . Nr2Bin(char2nr(a:str[ix]))
+  :    let out = out .. '-' .. Nr2Bin(char2nr(a:str[ix]))
   :  endfor
   :  return out[1:]
   :endfunc

runtime/doc/fold.txt

@@ -507,7 +507,7 @@ Note the use of backslashes to avoid some characters to be interpreted by the
     :function MyFoldText()
     :  let line = getline(v:foldstart)
     :  let sub = substitute(line, '/\*\|\*/\|{{{\d\=', '', 'g')
-    :  return v:folddashes . sub
+    :  return v:folddashes .. sub
     :endfunction
 
 Evaluating 'foldtext' is done in the |sandbox|.  The current window is set to

runtime/doc/ft_raku.txt

@@ -47,20 +47,20 @@ Numbers, subscripts and superscripts are available with 's' and 'S':
 
 But some don't come defined by default. Those are digraph definitions you can
 add in your ~/.vimrc file. >
-	exec 'digraph \\ '.char2nr('∖')
-	exec 'digraph \< '.char2nr('≼')
-	exec 'digraph \> '.char2nr('≽')
-	exec 'digraph (L '.char2nr('⊈')
-	exec 'digraph )L '.char2nr('⊉')
-	exec 'digraph (/ '.char2nr('⊄')
-	exec 'digraph )/ '.char2nr('⊅')
-	exec 'digraph )/ '.char2nr('⊅')
-	exec 'digraph U+ '.char2nr('⊎')
-	exec 'digraph 0- '.char2nr('⊖')
+	exec 'digraph \\ ' .. char2nr('∖')
+	exec 'digraph \< ' .. char2nr('≼')
+	exec 'digraph \> ' .. char2nr('≽')
+	exec 'digraph (L ' .. char2nr('⊈')
+	exec 'digraph )L ' .. char2nr('⊉')
+	exec 'digraph (/ ' .. char2nr('⊄')
+	exec 'digraph )/ ' .. char2nr('⊅')
+	exec 'digraph )/ ' .. char2nr('⊅')
+	exec 'digraph U+ ' .. char2nr('⊎')
+	exec 'digraph 0- ' .. char2nr('⊖')
 	" Euler's constant
-	exec 'digraph ne '.char2nr('𝑒')
+	exec 'digraph ne ' .. char2nr('𝑒')
 	" Raku's atomic operations marker
-	exec 'digraph @@ '.char2nr('⚛')
+	exec 'digraph @@ ' .. char2nr('⚛')
 
 Alternatively, you can write Insert mode abbreviations that convert ASCII-
 based operators into their single-character Unicode equivalent. >

runtime/doc/ft_rust.txt

@@ -26,7 +26,7 @@ behavior of the plugin.
 g:rustc_path~
 	Set this option to the path to rustc for use in the |:RustRun| and
 	|:RustExpand| commands. If unset, "rustc" will be located in $PATH: >
-	    let g:rustc_path = $HOME."/bin/rustc"
+	    let g:rustc_path = $HOME .. "/bin/rustc"
 <
 
                                                   *g:rustc_makeprg_no_percent*
@@ -87,7 +87,7 @@ g:rust_bang_comment_leader~
 g:ftplugin_rust_source_path~
 	Set this option to a path that should be prepended to 'path' for Rust
 	source files: >
-	    let g:ftplugin_rust_source_path = $HOME.'/dev/rust'
+	    let g:ftplugin_rust_source_path = $HOME .. '/dev/rust'
 <
 
                                                        *g:rustfmt_command*

runtime/doc/ft_sql.txt

@@ -109,8 +109,8 @@ must be configurable.  The filetype plugin attempts to define many of the
 standard objects, plus many additional ones.  In order to make this as
 flexible as possible, you can override the list of objects from within your
 |vimrc| with the following: >
-    let g:ftplugin_sql_objects = 'function,procedure,event,table,trigger' .
-		\ ',schema,service,publication,database,datatype,domain' .
+    let g:ftplugin_sql_objects = 'function,procedure,event,table,trigger' ..
+		\ ',schema,service,publication,database,datatype,domain' ..
 		\ ',index,subscription,synchronization,view,variable'
 
 The following |Normal| mode and |Visual| mode maps have been created which use
@@ -131,10 +131,10 @@ Repeatedly pressing ]} will cycle through each of these create statements: >
     create index i1 on t1 (c1);
 
 The default setting for g:ftplugin_sql_objects is: >
-    let g:ftplugin_sql_objects = 'function,procedure,event,' .
-		\ '\\(existing\\\\|global\\s\\+temporary\\s\\+\\)\\\{,1}' .
-		\ 'table,trigger' .
-		\ ',schema,service,publication,database,datatype,domain' .
+    let g:ftplugin_sql_objects = 'function,procedure,event,' ..
+		\ '\\(existing\\\\|global\\s\\+temporary\\s\\+\\)\\\{,1}' ..
+		\ 'table,trigger' ..
+		\ ',schema,service,publication,database,datatype,domain' ..
 		\ ',index,subscription,synchronization,view,variable'
 
 The above will also handle these cases: >

runtime/doc/gui.txt

@@ -155,8 +155,8 @@ If you are running the X Window System, you can get information about the
 window Vim is running in with these commands: >
 	:!xwininfo -id $WINDOWID
 	:!xprop -id $WINDOWID
-	:execute '!xwininfo -id ' . v:windowid
-	:execute '!xprop -id ' . v:windowid
+	:execute '!xwininfo -id ' .. v:windowid
+	:execute '!xprop -id ' .. v:windowid
 <
 							*gui-IME* *iBus*
 Input methods for international characters in X that rely on the XIM

runtime/doc/help.txt

@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 8.2.  Last change: 2021 Dec 27
+*help.txt*	For Vim version 8.2.  Last change: 2022 Feb 26
 
 			VIM - main help file
 									 k
@@ -197,6 +197,7 @@ Versions ~
 |version6.txt|	Differences between Vim version 5.7 and 6.x
 |version7.txt|	Differences between Vim version 6.4 and 7.x
 |version8.txt|	Differences between Vim version 7.4 and 8.x
+|version9.txt|	Differences between Vim version 8.2 and 9.0
 						*sys-file-list*
 Remarks about specific systems ~
 |os_390.txt|	OS/390 Unix

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 8.2.  Last change: 2022 Feb 07
+*if_pyth.txt*   For Vim version 8.2.  Last change: 2022 Feb 22
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -25,6 +25,10 @@ The Python 3 interface is available only when Vim was compiled with the
 |+python3| feature.
 Both can be available at the same time, but read |python-2-and-3|.
 
+NOTE: Python 2 is old and no longer being developed.  Using Python 3 is highly
+recommended.  Python 2 support will be dropped when it does not work properly
+anymore.
+
 ==============================================================================
 1. Commands						*python-commands*
 
@@ -923,7 +927,7 @@ The `:pyxdo` command works similar to `:pydo`.
 							*has-pythonx*
 You can test if pyx* commands are available with: >
 	if has('pythonx')
-	  echo 'pyx* commands are available. (Python ' . &pyx . ')'
+	  echo 'pyx* commands are available. (Python ' .. &pyx .. ')'
 	endif
 
 When compiled with only one of |+python| or |+python3|, the has() returns 1.

runtime/doc/insert.txt

@@ -879,9 +879,9 @@ Groß): >
       endif
       let res = []
       let h = ''
-      for l in systemlist('aiksaurus '.shellescape(a:base))
+      for l in systemlist('aiksaurus ' .. shellescape(a:base))
 	if l[:3] == '=== '
-	  let h = '('.substitute(l[4:], ' =*$', ')', '')
+	  let h = '(' .. substitute(l[4:], ' =*$', ')', '')
 	elseif l ==# 'Alphabetically similar known words are: '
 	  let h = "\U0001f52e"
 	elseif l[0] =~ '\a' || (h ==# "\U0001f52e" && l[0] ==# "\t")
@@ -1266,7 +1266,7 @@ An example that completes the names of the months: >
 	    " find months matching with "a:base"
 	    let res = []
 	    for m in split("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec")
-	      if m =~ '^' . a:base
+	      if m =~ '^' .. a:base
 		call add(res, m)
 	      endif
 	    endfor
@@ -1288,7 +1288,7 @@ The same, but now pretending searching for matches is slow: >
 	  else
 	    " find months matching with "a:base"
 	    for m in split("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec")
-	      if m =~ '^' . a:base
+	      if m =~ '^' .. a:base
 		call complete_add(m)
 	      endif
 	      sleep 300m	" simulate searching for next match

runtime/doc/map.txt

@@ -314,7 +314,7 @@ Here is an example that inserts a list number that increases: >
 
 	func ListItem()
 	  let g:counter += 1
-	  return g:counter . '. '
+	  return g:counter .. '. '
 	endfunc
 
 	func ListReset()
@@ -1697,12 +1697,12 @@ The valid escape sequences are
 		Examples: >
 		    command! -nargs=+ -complete=file MyEdit
 				\ for f in expand(<q-args>, 0, 1) |
-				\ exe '<mods> split ' . f |
+				\ exe '<mods> split ' .. f |
 				\ endfor
 
 		    function! SpecialEdit(files, mods)
 			for f in expand(a:files, 0, 1)
-			    exe a:mods . ' split ' . f
+			    exe a:mods .. ' split ' .. f
 			endfor
 		    endfunction
 		    command! -nargs=+ -complete=file Sedit
@@ -1778,7 +1778,7 @@ This will invoke: >
    :   let i = 0
    :   while i < argc()
    :	  if filereadable(argv(i))
-   :	     execute "e " . argv(i)
+   :	     execute "e " .. argv(i)
    :	     execute a:command
    :      endif
    :      let i = i + 1

runtime/doc/motion.txt

@@ -1019,7 +1019,7 @@ These commands are not marks themselves, but jump to a mark:
 				:let lnum = line(".")
 				:keepjumps normal gg
 				:call SetLastChange()
-				:keepjumps exe "normal " . lnum . "G"
+				:keepjumps exe "normal " .. lnum .. "G"
 <
 			Note that ":keepjumps" must be used for every command.
 			When invoking a function the commands in that function

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2022 Feb 08
+*options.txt*	For Vim version 8.2.  Last change: 2022 Feb 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -383,12 +383,22 @@ lambda it will be converted to the name, e.g. "<lambda>123".  Examples:
 	set opfunc=function('MyOpFunc')
 	set opfunc=funcref('MyOpFunc')
 	set opfunc={a\ ->\ MyOpFunc(a)}
-	" set using a funcref variable
+
+Set to a script-local function: >
+	set opfunc=s:MyLocalFunc
+	set opfunc=<SID>MyLocalFunc
+In |Vim9| script the "s:" and "<SID>" can be omitted if the function exists in
+the script: >
+	set opfunc=MyLocalFunc
+
+Set using a funcref variable: >
 	let Fn = function('MyTagFunc')
 	let &tagfunc = Fn
-	" set using a lambda expression
+
+Set using a lambda expression: >
 	let &tagfunc = {t -> MyTagFunc(t)}
-	" set using a variable with lambda expression
+
+Set using a variable with lambda expression: >
 	let L = {a, b, c -> MyTagFunc(a, b , c)}
 	let &tagfunc = L
 
@@ -1132,7 +1142,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If you like to keep a lot of backups, you could use a BufWritePre
 	autocommand to change 'backupext' just before writing the file to
 	include a timestamp. >
-		:au BufWritePre * let &bex = '-' . strftime("%Y%b%d%X") . '~'
+		:au BufWritePre * let &bex = '-' .. strftime("%Y%b%d%X") .. '~'
 <	Use 'backupdir' to put the backup in a different directory.
 
 						*'backupskip'* *'bsk'*
@@ -1157,7 +1167,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	Note that environment variables are not expanded.  If you want to use
 	$HOME you must expand it explicitly, e.g.: >
-		:let &backupskip = escape(expand('$HOME'), '\') . '/tmp/*'
+		:let &backupskip = escape(expand('$HOME'), '\') .. '/tmp/*'
 
 <	Note that the default also makes sure that "crontab -e" works (when a
 	backup would be made by renaming the original file crontab won't see
@@ -1208,10 +1218,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The evaluation of the expression must not have side effects!
 	Example: >
     function MyBalloonExpr()
-	return 'Cursor is at line ' . v:beval_lnum .
-		\', column ' . v:beval_col .
-		\ ' of file ' .  bufname(v:beval_bufnr) .
-		\ ' on word "' . v:beval_text . '"'
+	return 'Cursor is at line ' .. v:beval_lnum ..
+		\ ', column ' .. v:beval_col ..
+		\ ' of file ' ..  bufname(v:beval_bufnr) ..
+		\ ' on word "' .. v:beval_text .. '"'
     endfunction
     set bexpr=MyBalloonExpr()
     set ballooneval
@@ -1527,7 +1537,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If the default value taken from $CDPATH is not what you want, include
 	a modified version of the following command in your vimrc file to
 	override it: >
-	  :let &cdpath = ',' . substitute(substitute($CDPATH, '[, ]', '\\\0', 'g'), ':', ',', 'g')
+	  :let &cdpath = ',' .. substitute(substitute($CDPATH, '[, ]', '\\\0', 'g'), ':', ',', 'g')
 <	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 	(parts of 'cdpath' can be passed to the shell to expand file names).
@@ -1572,8 +1582,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		set charconvert=CharConvert()
 		fun CharConvert()
 		  system("recode "
-			\ . v:charconvert_from . ".." . v:charconvert_to
-			\ . " <" . v:fname_in . " >" v:fname_out)
+			\ .. v:charconvert_from .. ".." .. v:charconvert_to
+			\ .. " <" .. v:fname_in .. " >" .. v:fname_out)
 		  return v:shell_error
 		endfun
 <	The related Vim variables are:
@@ -4028,7 +4038,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'guitablabel' 'gtl'	string	(default empty)
 			global
 			{only available when compiled with GUI enabled}
-	When nonempty describes the text to use in a label of the GUI tab
+	When non-empty describes the text to use in a label of the GUI tab
 	pages line.  When empty and when the result is empty Vim will use a
 	default label.  See |setting-guitablabel| for more info.
 
@@ -4046,7 +4056,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'guitabtooltip' 'gtt'	string	(default empty)
 			global
 			{only available when compiled with GUI enabled}
-	When nonempty describes the text to use in a tooltip for the GUI tab
+	When non-empty describes the text to use in a tooltip for the GUI tab
 	pages line.  When empty Vim will use a default tooltip.
 	This option is otherwise just like 'guitablabel' above.
 	You can include a line break.  Simplest method is to use |:let|: >
@@ -4877,7 +4887,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			|+multi_lang| features}
 	Language to use for menu translation.  Tells which file is loaded
 	from the "lang" directory in 'runtimepath': >
-		"lang/menu_" . &langmenu . ".vim"
+		"lang/menu_" .. &langmenu .. ".vim"
 <	(without the spaces).  For example, to always use the Dutch menus, no
 	matter what $LANG is set to: >
 		:set langmenu=nl_NL.ISO_8859-1
@@ -5891,7 +5901,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	To use an environment variable, you probably need to replace the
 	separator.  Here is an example to append $INCL, in which directory
 	names are separated with a semi-colon: >
-		:let &path = &path . "," . substitute($INCL, ';', ',', 'g')
+		:let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
 <	Replace the ';' with a ':' or whatever separator is used.  Note that
 	this doesn't work when $INCL contains a comma or white space.
 
@@ -7449,7 +7459,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global or local to window |global-local|
 			{not available when compiled without the |+statusline|
 			feature}
-	When nonempty, this option determines the content of the status line.
+	When non-empty, this option determines the content of the status line.
 	Also see |status-line|.
 
 	The option consists of printf style '%' items interspersed with
@@ -7757,7 +7767,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'tabline'* *'tal'*
 'tabline' 'tal'		string	(default empty)
 			global
-	When nonempty, this option determines the content of the tab pages
+	When non-empty, this option determines the content of the tab pages
 	line at the top of the Vim window.  When empty Vim will use a default
 	tab pages line.  See |setting-tabline| for more info.
 
@@ -8308,7 +8318,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set in a modeline when 'modelineexpr' is off.
 
 	Example: >
-    :auto BufEnter * let &titlestring = hostname() . "/" . expand("%:p")
+    :auto BufEnter * let &titlestring = hostname() .. "/" .. expand("%:p")
     :set title titlestring=%<%F%=%l/%L-%P titlelen=70
 <	The value of 'titlelen' is used to align items in the middle or right
 	of the available space.
@@ -9077,6 +9087,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 	A list of words that change how |cmdline-completion| is done.
 	The following values are supported:
+	  fuzzy		Use fuzzy matching to find completion matches. When
+			this value is specified, wildcard expansion will not
+			be used for completion.  The matches will be sorted by
+			the "best match" rather than alphabetically sorted.
+			This will find more matches than the wildcard
+			expansion. Currently fuzzy matching based completion
+			is not supported for file and directory names and
+			instead wildcard expansion is used.
 	  pum		Display the completion matches using the popupmenu
 			in the same style as the |ins-completion-menu|.
 	  tagfile	When using CTRL-D to list matching tags, the kind of

runtime/doc/os_vms.txt

@@ -603,13 +603,13 @@ program to the new diff on VMS.  Add this to your .vimrc file: >
 	function MyDiff()
 	   let opt = ""
 	   if &diffopt =~ "icase"
-	     let opt = opt . "-i "
+	     let opt = opt .. "-i "
 	   endif
 	   if &diffopt =~ "iwhite"
-	     let opt = opt . "-b "
+	     let opt = opt .. "-b "
 	   endif
-	   silent execute "!mc GNU:diff.exe -a " . opt . v:fname_in . " " .  v:fname_new .
-		\  " > " . v:fname_out
+	   silent execute "!mc GNU:diff.exe -a " .. opt .. v:fname_in .. " " ..  v:fname_new ..
+		\  " > " .. v:fname_out
 	endfunction
       endif
 

runtime/doc/os_win32.txt

@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 8.2.  Last change: 2021 Apr 05
+*os_win32.txt*  For Vim version 8.2.  Last change: 2022 Feb 14
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -294,7 +294,7 @@ A. When using :! to run an external command, you can run it with "start". For
        /b    no console window will be opened
    You can use only one of these flags at a time.  A second one will be
    treated as the start of the command.
-
+						*windows-asynchronously*
 Q. How do I avoid getting a window for programs that I run asynchronously?
 A. You have two possible solutions depending on what you want:
    1) You may use the /min flag in order to run program in a minimized state
@@ -308,17 +308,17 @@ A. You have two possible solutions depending on what you want:
 
    Example for a console application, run Exuberant ctags: >
         :!start /min ctags -R .
-<  When it has finished you should see file named "tags" in your current
+<   When it has finished you should see file named "tags" in your current
    directory.  You should notice the window title blinking on your taskbar.
    This is more noticeable for commands that take longer.
    Now delete the "tags" file and run this command: >
         :!start /b ctags -R .
-<  You should have the same "tags" file, but this time there will be no
+<   You should have the same "tags" file, but this time there will be no
    blinking on the taskbar.
    Example for a GUI application: >
         :!start /min notepad
         :!start /b notepad
-<  The first command runs notepad minimized and the second one runs it
+<   The first command runs notepad minimized and the second one runs it
    normally.
 
 						*windows-icon*

runtime/doc/pattern.txt

@@ -963,7 +963,7 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	the cursor moves the display isn't updated for this change.  An update
 	is done when using the |CTRL-L| command (the whole screen is updated).
 	Example, to highlight the column where the cursor currently is: >
-		:exe '/\%' . col(".") . 'c'
+		:exe '/\%' .. col(".") .. 'c'
 <	Alternatively use: >
 		/\%.c
 <	When 'hlsearch' is set and you move the cursor around and make changes

runtime/doc/pi_netrw.txt

@@ -968,7 +968,7 @@ itself:
      fun! NetReadFixup(method, line1, line2)
        if method == 3   " ftp (no <.netrc>)
         let fourblanklines= line2 - 3
-        silent fourblanklines.",".line2."g/^\s*/d"
+        silent fourblanklines .. "," .. line2 .. "g/^\s*/d"
        endif
      endfunction
     endif
@@ -1975,7 +1975,7 @@ To use this function, simply assign its output to |g:netrw_list_hide| option.  >
 	Example: let g:netrw_list_hide= netrw_gitignore#Hide('my_gitignore_file')
 		Function can take additional files with git-ignore patterns.
 
-	Example: g:netrw_list_hide= netrw_gitignore#Hide() . '.*\.swp$'
+	Example: let g:netrw_list_hide= netrw_gitignore#Hide() .. '.*\.swp$'
 		Combining 'netrw_gitignore#Hide' with custom patterns.
 <
 
@@ -2825,7 +2825,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 
 				Examples:
 				 let g:netrw_list_hide= '.*\.swp$'
-				 let g:netrw_list_hide= netrw_gitignore#Hide().'.*\.swp$'
+				 let g:netrw_list_hide= netrw_gitignore#Hide() .. '.*\.swp$'
 				default: ""
 
   *g:netrw_localcopycmd*	="cp"           Linux/Unix/MacOS/Cygwin

runtime/doc/print.txt

@@ -139,28 +139,28 @@ If there is no error, return zero or an empty string.
 The default for non MS-Windows or VMS systems is to simply use "lpr" to print
 the file: >
 
-    system('lpr' . (&printdevice == '' ? '' : ' -P' . &printdevice)
-	. ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error
+    system('lpr' .. (&printdevice == '' ? '' : ' -P' .. &printdevice)
+	.. ' ' .. v:fname_in) .. delete(v:fname_in) + v:shell_error
 
 On MS-Windows machines the default is to copy the file to the currently
 specified printdevice: >
 
-    system('copy' . ' ' . v:fname_in . (&printdevice == ''
-		? ' LPT1:' : (' \"' . &printdevice . '\"')))
-		. delete(v:fname_in)
+    system('copy' .. ' ' .. v:fname_in .. (&printdevice == ''
+		? ' LPT1:' : (' \"' .. &printdevice .. '\"')))
+		.. delete(v:fname_in)
 
 On VMS machines the default is to send the file to either the default or
 currently specified printdevice: >
 
-    system('print' . (&printdevice == '' ? '' : ' /queue=' .
-		&printdevice) . ' ' . v:fname_in) . delete(v:fname_in)
+    system('print' .. (&printdevice == '' ? '' : ' /queue=' ..
+		&printdevice) .. ' ' .. v:fname_in) .. delete(v:fname_in)
 
 If you change this option, using a function is an easy way to avoid having to
 escape all the spaces.  Example: >
 
 	:set printexpr=PrintFile(v:fname_in)
 	:function PrintFile(fname)
-	:  call system("ghostview " . a:fname)
+	:  call system("ghostview " .. a:fname)
 	:  call delete(a:fname)
 	:  return v:shell_error
 	:endfunc

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.2.  Last change: 2022 Feb 08
+*quickfix.txt*  For Vim version 8.2.  Last change: 2022 Feb 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -353,7 +353,7 @@ processing a quickfix or location list command, it will be aborted.
 			cursor position will not be changed. See |:cexpr| for
 			more information.
 			Example: >
-    :g/mypattern/caddexpr expand("%") . ":" . line(".") .  ":" . getline(".")
+    :g/mypattern/caddexpr expand("%") .. ":" .. line(".") ..  ":" .. getline(".")
 <
 						*:lad* *:addd* *:laddexpr*
 :lad[dexpr] {expr}	Same as ":caddexpr", except the location list for the
@@ -654,6 +654,24 @@ quickfix window.  If there already is a window for that file, it is used
 instead.  If the buffer in the used window has changed, and the error is in
 another file, jumping to the error will fail.  You will first have to make
 sure the window contains a buffer which can be abandoned.
+
+The following steps are used to find a window to open the file selected from
+the quickfix window:
+1. If 'switchbuf' contains "usetab", then find a window in any tabpage
+   (starting with the first tabpage) that has the selected file and jump to
+   it.
+2. Otherwise find a window displaying the selected file in the current tab
+   page (starting with the window before the quickfix window) and use it.
+3. Otherwise find a window displaying a normal buffer ('buftype' is empty)
+   starting with the window before the quickfix window. If a window is found,
+   open the file in that window.
+4. If a usable window is not found and 'switchbuf' contains "uselast", then
+   open the file in the last used window.
+5. Otherwise open the file in the window before the quickfix window.  If there
+   is no previous window, then open the file in the next window.
+6. If a usable window is not found in the above steps, then create a new
+   horizontally split window above the quickfix window and open the file.
+
 					*CTRL-W_<Enter>* *CTRL-W_<CR>*
 You can use CTRL-W <Enter> to open a new window and jump to the error there.
 
@@ -663,7 +681,7 @@ FileType event (also see |qf.vim|).  Then the BufReadPost event is triggered,
 using "quickfix" for the buffer name.  This can be used to perform some action
 on the listed errors.  Example: >
 	au BufReadPost quickfix  setlocal modifiable
-		\ | silent exe 'g/^/s//\=line(".")." "/'
+		\ | silent exe 'g/^/s//\=line(".") .. " "/'
 		\ | setlocal nomodifiable
 This prepends the line number to each line.  Note the use of "\=" in the
 substitute string of the ":s" command, which is used to evaluate an

runtime/doc/remote.txt

@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 8.2.  Last change: 2021 Dec 27
+*remote.txt*    For Vim version 8.2.  Last change: 2022 Feb 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -120,6 +120,10 @@ when sending command to it.
 
 The --serverlist argument will cause Vim to print a list of registered command
 servers on the standard output (stdout) and exit.
+							*{server}*
+The {server} argument is used by several functions.  When this is an empty
+string then on Unix the default server name is used, which is "GVIM".  On
+MS-Windows an empty string does not work.
 
 Win32 Note: Making the Vim server go to the foreground doesn't always work,
 because MS-Windows doesn't allow it.  The client will move the server to the

runtime/doc/sign.txt

@@ -101,7 +101,7 @@ precedence, otherwise the 'cursorline' highlighting.
 Here is an example that places a sign "piet", displayed with the text ">>", in
 line 23 of the current file: >
 	:sign define piet text=>> texthl=Search
-	:exe ":sign place 2 line=23 name=piet file=" . expand("%:p")
+	:exe ":sign place 2 line=23 name=piet file=" .. expand("%:p")
 
 And here is the command to delete it again: >
 	:sign unplace 2

runtime/doc/spell.txt

@@ -131,8 +131,8 @@ zuG			Undo |zW| and |zG|, remove the word from the internal
 			rare as this is a fairly uncommon command and all
 			intuitive commands for this are already taken. If you
 			want you can add mappings with e.g.: >
-		nnoremap z?  :exe ':spellrare  ' . expand('<cWORD>')<CR>
-		nnoremap z/  :exe ':spellrare! ' . expand('<cWORD>')<CR>
+		nnoremap z?  :exe ':spellrare  ' .. expand('<cWORD>')<CR>
+		nnoremap z/  :exe ':spellrare! ' .. expand('<cWORD>')<CR>
 <			|:spellundo|, |zuw|, or |zuW| can be used to undo this.
 
 :spellr[rare]! {word}	Add {word} as a rare word to the internal word

runtime/doc/starting.txt

@@ -1378,7 +1378,7 @@ resulting file, when executed with a ":source" command:
 After restoring the Session, the full filename of your current Session is
 available in the internal variable "v:this_session" |this_session-variable|.
 An example mapping: >
-  :nmap <F2> :wa<Bar>exe "mksession! " . v:this_session<CR>:so ~/sessions/
+  :nmap <F2> :wa<Bar>exe "mksession! " .. v:this_session<CR>:so ~/sessions/
 This saves the current Session, and starts off the command to load another.
 
 A session includes all tab pages, unless "tabpages" was removed from

runtime/doc/syntax.txt

@@ -653,7 +653,7 @@ evaluate to get a unique string to append to each ID used in a given document,
 so that the full IDs will be unique even when combined with other content in a
 larger HTML document. Example, to append _ and the buffer number to each ID: >
 
-	:let g:html_id_expr = '"_".bufnr("%")'
+	:let g:html_id_expr = '"_" .. bufnr("%")'
 <
 To append a string "_mystring" to the end of each ID: >
 
@@ -3607,8 +3607,8 @@ Do you want to draw with the mouse?  Try the following: >
    :function! GetPixel()
    :   let c = getline(".")[col(".") - 1]
    :   echo c
-   :   exe "noremap <LeftMouse> <LeftMouse>r".c
-   :   exe "noremap <LeftDrag>	<LeftMouse>r".c
+   :   exe "noremap <LeftMouse> <LeftMouse>r" .. c
+   :   exe "noremap <LeftDrag>	<LeftMouse>r" .. c
    :endfunction
    :noremap <RightMouse> <LeftMouse>:call GetPixel()<CR>
    :set guicursor=n:hor20	   " to see the color beneath the cursor
@@ -5567,9 +5567,9 @@ types.vim: *.[ch]
 And put these lines in your .vimrc: >
 
    " load the types.vim highlighting file, if it exists
-   autocmd BufRead,BufNewFile *.[ch] let fname = expand('<afile>:p:h') . '/types.vim'
+   autocmd BufRead,BufNewFile *.[ch] let fname = expand('<afile>:p:h') .. '/types.vim'
    autocmd BufRead,BufNewFile *.[ch] if filereadable(fname)
-   autocmd BufRead,BufNewFile *.[ch]   exe 'so ' . fname
+   autocmd BufRead,BufNewFile *.[ch]   exe 'so ' .. fname
    autocmd BufRead,BufNewFile *.[ch] endif
 
 ==============================================================================

runtime/doc/tabpage.txt

@@ -381,24 +381,24 @@ pages and define labels for them.  Then get the label for each tab page. >
 	  for i in range(tabpagenr('$'))
 	    " select the highlighting
 	    if i + 1 == tabpagenr()
-	      let s .= '%#TabLineSel#'
+	      let s ..= '%#TabLineSel#'
 	    else
-	      let s .= '%#TabLine#'
+	      let s ..= '%#TabLine#'
 	    endif
 
 	    " set the tab page number (for mouse clicks)
-	    let s .= '%' . (i + 1) . 'T'
+	    let s ..= '%' .. (i + 1) .. 'T'
 
 	    " the label is made by MyTabLabel()
-	    let s .= ' %{MyTabLabel(' . (i + 1) . ')} '
+	    let s ..= ' %{MyTabLabel(' .. (i + 1) .. ')} '
 	  endfor
 
 	  " after the last tab fill with TabLineFill and reset tab page nr
-	  let s .= '%#TabLineFill#%T'
+	  let s ..= '%#TabLineFill#%T'
 
 	  " right-align the label to close the current tab page
 	  if tabpagenr('$') > 1
-	    let s .= '%=%#TabLine#%999Xclose'
+	    let s ..= '%=%#TabLine#%999Xclose'
 	  endif
 
 	  return s
@@ -461,14 +461,14 @@ windows in the tab page and a '+' if there is a modified buffer: >
 	  " Append the number of windows in the tab page if more than one
 	  let wincount = tabpagewinnr(v:lnum, '$')
 	  if wincount > 1
-	    let label .= wincount
+	    let label ..= wincount
 	  endif
 	  if label != ''
-	    let label .= ' '
+	    let label ..= ' '
 	  endif
 
 	  " Append the buffer name
-	  return label . bufname(bufnrlist[tabpagewinnr(v:lnum) - 1])
+	  return label .. bufname(bufnrlist[tabpagewinnr(v:lnum) - 1])
 	endfunction
 
 	set guitablabel=%{GuiTabLabel()}

runtime/doc/tags

@@ -1355,6 +1355,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 +mouse	various.txt	/*+mouse*
 +mouse_dec	various.txt	/*+mouse_dec*
 +mouse_gpm	various.txt	/*+mouse_gpm*
++mouse_gpm/dyn	various.txt	/*+mouse_gpm\/dyn*
 +mouse_jsbterm	various.txt	/*+mouse_jsbterm*
 +mouse_netterm	various.txt	/*+mouse_netterm*
 +mouse_pterm	various.txt	/*+mouse_pterm*
@@ -2415,6 +2416,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :dsp	tagsrch.txt	/*:dsp*
 :dsplit	tagsrch.txt	/*:dsplit*
 :e	editing.txt	/*:e*
+:e#	editing.txt	/*:e#*
 :ea	undo.txt	/*:ea*
 :earlier	undo.txt	/*:earlier*
 :ec	eval.txt	/*:ec*
@@ -2432,6 +2434,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :edit	editing.txt	/*:edit*
 :edit!	editing.txt	/*:edit!*
 :edit!_f	editing.txt	/*:edit!_f*
+:edit_#	editing.txt	/*:edit_#*
 :edit_f	editing.txt	/*:edit_f*
 :el	eval.txt	/*:el*
 :else	eval.txt	/*:else*
@@ -4032,6 +4035,7 @@ E1075	vim9.txt	/*E1075*
 E1076	eval.txt	/*E1076*
 E1077	vim9.txt	/*E1077*
 E108	eval.txt	/*E108*
+E1080	vim9.txt	/*E1080*
 E1081	eval.txt	/*E1081*
 E1083	editing.txt	/*E1083*
 E1084	eval.txt	/*E1084*
@@ -5858,6 +5862,7 @@ bug-fixes-5	version5.txt	/*bug-fixes-5*
 bug-fixes-6	version6.txt	/*bug-fixes-6*
 bug-fixes-7	version7.txt	/*bug-fixes-7*
 bug-fixes-8	version8.txt	/*bug-fixes-8*
+bug-fixes-9	version9.txt	/*bug-fixes-9*
 bug-reports	intro.txt	/*bug-reports*
 bugreport.vim	intro.txt	/*bugreport.vim*
 bugs	intro.txt	/*bugs*
@@ -6168,6 +6173,7 @@ compile-changes-5	version5.txt	/*compile-changes-5*
 compile-changes-6	version6.txt	/*compile-changes-6*
 compile-changes-7	version7.txt	/*compile-changes-7*
 compile-changes-8	version8.txt	/*compile-changes-8*
+compile-changes-9	version9.txt	/*compile-changes-9*
 compiler-compaqada	ft_ada.txt	/*compiler-compaqada*
 compiler-decada	ft_ada.txt	/*compiler-decada*
 compiler-gcc	quickfix.txt	/*compiler-gcc*
@@ -7817,6 +7823,7 @@ improvements-5	version5.txt	/*improvements-5*
 improvements-6	version6.txt	/*improvements-6*
 improvements-7	version7.txt	/*improvements-7*
 improvements-8	version8.txt	/*improvements-8*
+improvements-9	version9.txt	/*improvements-9*
 in_bot	channel.txt	/*in_bot*
 in_buf	channel.txt	/*in_buf*
 in_io-buffer	channel.txt	/*in_io-buffer*
@@ -7832,6 +7839,7 @@ incompatible-5	version5.txt	/*incompatible-5*
 incompatible-6	version6.txt	/*incompatible-6*
 incompatible-7	version7.txt	/*incompatible-7*
 incompatible-8	version8.txt	/*incompatible-8*
+incompatible-9	version9.txt	/*incompatible-9*
 indent()	builtin.txt	/*indent()*
 indent-expression	indent.txt	/*indent-expression*
 indent.txt	indent.txt	/*indent.txt*
@@ -8540,6 +8548,7 @@ new-5	version5.txt	/*new-5*
 new-6	version6.txt	/*new-6*
 new-7	version7.txt	/*new-7*
 new-8	version8.txt	/*new-8*
+new-9	version9.txt	/*new-9*
 new-GTK-GUI	version5.txt	/*new-GTK-GUI*
 new-MzScheme	version7.txt	/*new-MzScheme*
 new-Select-mode	version5.txt	/*new-Select-mode*
@@ -8573,6 +8582,7 @@ new-indent-flex	version6.txt	/*new-indent-flex*
 new-items-6	version6.txt	/*new-items-6*
 new-items-7	version7.txt	/*new-items-7*
 new-items-8	version8.txt	/*new-items-8*
+new-items-9	version9.txt	/*new-items-9*
 new-line-continuation	version5.txt	/*new-line-continuation*
 new-location-list	version7.txt	/*new-location-list*
 new-lua	version7.txt	/*new-lua*
@@ -8622,6 +8632,7 @@ new-utf-8	version6.txt	/*new-utf-8*
 new-vertsplit	version6.txt	/*new-vertsplit*
 new-vim-script	version7.txt	/*new-vim-script*
 new-vim-script-8	version8.txt	/*new-vim-script-8*
+new-vim-script-9	version9.txt	/*new-vim-script-9*
 new-vim-server	version6.txt	/*new-vim-server*
 new-vimgrep	version7.txt	/*new-vimgrep*
 new-vimscript-8.2	version8.txt	/*new-vimscript-8.2*
@@ -8740,7 +8751,8 @@ pascal.vim	syntax.txt	/*pascal.vim*
 patches-8	version8.txt	/*patches-8*
 patches-8.1	version8.txt	/*patches-8.1*
 patches-8.2	version8.txt	/*patches-8.2*
-patches-after-8.2	version8.txt	/*patches-after-8.2*
+patches-9	version9.txt	/*patches-9*
+patches-after-8.2	version9.txt	/*patches-after-8.2*
 pathshorten()	builtin.txt	/*pathshorten()*
 pattern	pattern.txt	/*pattern*
 pattern-atoms	pattern.txt	/*pattern-atoms*
@@ -10008,6 +10020,7 @@ terminal.txt	terminal.txt	/*terminal.txt*
 terminalprops()	builtin.txt	/*terminalprops()*
 terminfo	term.txt	/*terminfo*
 termresponse-variable	eval.txt	/*termresponse-variable*
+ternary	eval.txt	/*ternary*
 test-functions	usr_41.txt	/*test-functions*
 test-functions-details	testing.txt	/*test-functions-details*
 test_alloc_fail()	testing.txt	/*test_alloc_fail()*
@@ -10099,7 +10112,6 @@ tooltips	gui.txt	/*tooltips*
 toupper()	builtin.txt	/*toupper()*
 tr()	builtin.txt	/*tr()*
 trim()	builtin.txt	/*trim()*
-trinary	eval.txt	/*trinary*
 trojan-horse	starting.txt	/*trojan-horse*
 true	vim9.txt	/*true*
 true-variable	eval.txt	/*true-variable*
@@ -10454,6 +10466,7 @@ version-7.4	version7.txt	/*version-7.4*
 version-8.0	version8.txt	/*version-8.0*
 version-8.1	version8.txt	/*version-8.1*
 version-8.2	version8.txt	/*version-8.2*
+version-9.0	version9.txt	/*version-9.0*
 version-variable	eval.txt	/*version-variable*
 version4.txt	version4.txt	/*version4.txt*
 version5.txt	version5.txt	/*version5.txt*
@@ -10468,6 +10481,8 @@ version8.0	version8.txt	/*version8.0*
 version8.1	version8.txt	/*version8.1*
 version8.2	version8.txt	/*version8.2*
 version8.txt	version8.txt	/*version8.txt*
+version9.0	version9.txt	/*version9.0*
+version9.txt	version9.txt	/*version9.txt*
 versionlong-variable	eval.txt	/*versionlong-variable*
 vi	intro.txt	/*vi*
 vi-differences	vi_diff.txt	/*vi-differences*
@@ -10483,6 +10498,8 @@ vim-7.4	version7.txt	/*vim-7.4*
 vim-8	version8.txt	/*vim-8*
 vim-8.1	version8.txt	/*vim-8.1*
 vim-8.2	version8.txt	/*vim-8.2*
+vim-9	version9.txt	/*vim-9*
+vim-9.0	version9.txt	/*vim-9.0*
 vim-additions	vi_diff.txt	/*vim-additions*
 vim-announce	intro.txt	/*vim-announce*
 vim-arguments	starting.txt	/*vim-arguments*
@@ -10529,6 +10546,7 @@ vim9-namespace	vim9.txt	/*vim9-namespace*
 vim9-no-dict-function	vim9.txt	/*vim9-no-dict-function*
 vim9-rationale	vim9.txt	/*vim9-rationale*
 vim9-reload	vim9.txt	/*vim9-reload*
+vim9-s-namespace	vim9.txt	/*vim9-s-namespace*
 vim9-scopes	vim9.txt	/*vim9-scopes*
 vim9-script-intro	usr_46.txt	/*vim9-script-intro*
 vim9-types	vim9.txt	/*vim9-types*
@@ -10686,6 +10704,7 @@ windowid	windows.txt	/*windowid*
 windowid-variable	eval.txt	/*windowid-variable*
 windows	windows.txt	/*windows*
 windows-3.1	os_win32.txt	/*windows-3.1*
+windows-asynchronously	os_win32.txt	/*windows-asynchronously*
 windows-icon	os_win32.txt	/*windows-icon*
 windows-intro	windows.txt	/*windows-intro*
 windows-starting	windows.txt	/*windows-starting*
@@ -10859,6 +10878,7 @@ zz	scroll.txt	/*zz*
 {offset}	pattern.txt	/*{offset}*
 {register}	change.txt	/*{register}*
 {rhs}	map.txt	/*{rhs}*
+{server}	remote.txt	/*{server}*
 {subject}	helphelp.txt	/*{subject}*
 {}	intro.txt	/*{}*
 }	motion.txt	/*}*

runtime/doc/tagsrch.txt

@@ -724,7 +724,7 @@ matches the pattern "^# *define" it is not considered to be a comment.
 If you want to list matches, and then select one to jump to, you could use a
 mapping to do that for you.  Here is an example: >
 
-  :map <F4> [I:let nr = input("Which one: ")<Bar>exe "normal " . nr ."[\t"<CR>
+  :map <F4> [I:let nr = input("Which one: ")<Bar>exe "normal " .. nr .. "[\t"<CR>
 <
 							*[i*
 [i			Display the first line that contains the keyword

runtime/doc/term.txt

@@ -984,7 +984,7 @@ an #if/#else/#endif block, the selection becomes linewise.
 For MS-Windows and xterm the time for double clicking can be set with the
 'mousetime' option.  For the other systems this time is defined outside of Vim.
 An example, for using a double click to jump to the tag under the cursor: >
-	:map <2-LeftMouse> :exe "tag ". expand("<cword>")<CR>
+	:map <2-LeftMouse> :exe "tag " .. expand("<cword>")<CR>
 
 Dragging the mouse with a double click (button-down, button-up, button-down
 and then drag) will result in whole words to be selected.  This continues

runtime/doc/terminal.txt

@@ -979,8 +979,8 @@ Currently supported commands:
 <		Calls a function defined like this: >
 			function Tapi_Impression(bufnum, arglist)
 			  if len(a:arglist) == 2
-			    echomsg "impression " . a:arglist[0]
-			    echomsg "count " . a:arglist[1]
+			    echomsg "impression " .. a:arglist[0]
+			    echomsg "count " .. a:arglist[1]
 			  endif
 			endfunc
 <		Output from `:echo` may be erased by a redraw, use `:echomsg`

runtime/doc/tips.txt

@@ -101,14 +101,14 @@ What you need:
   create it with the shell command "mkid file1 file2 ..".
 
 Put this in your .vimrc: >
-	map _u :call ID_search()<Bar>execute "/\\<" . g:word . "\\>"<CR>
-	map _n :n<Bar>execute "/\\<" . g:word . "\\>"<CR>
+	map _u :call ID_search()<Bar>execute "/\\<" .. g:word .. "\\>"<CR>
+	map _n :n<Bar>execute "/\\<" .. g:word .. "\\>"<CR>
 
 	function! ID_search()
 	  let g:word = expand("<cword>")
-	  let x = system("lid --key=none ". g:word)
+	  let x = system("lid --key=none " .. g:word)
 	  let x = substitute(x, "\n", " ", "g")
-	  execute "next " . x
+	  execute "next " .. x
 	endfun
 
 To use it, place the cursor on a word, type "_u" and vim will load the file
@@ -356,13 +356,13 @@ This mapping will format any bullet list.  It requires that there is an empty
 line above and below each list entry.  The expression commands are used to
 be able to give comments to the parts of the mapping. >
 
-	:let m =     ":map _f  :set ai<CR>"    " need 'autoindent' set
-	:let m = m . "{O<Esc>"		      " add empty line above item
-	:let m = m . "}{)^W"		      " move to text after bullet
-	:let m = m . "i     <CR>     <Esc>"    " add space for indent
-	:let m = m . "gq}"		      " format text after the bullet
-	:let m = m . "{dd"		      " remove the empty line
-	:let m = m . "5lDJ"		      " put text after bullet
+	:let m =     ":map _f  :set ai<CR>"   " need 'autoindent' set
+	:let m ..= "{O<Esc>"		      " add empty line above item
+	:let m ..= "}{)^W"		      " move to text after bullet
+	:let m ..= "i     <CR>     <Esc>"     " add space for indent
+	:let m ..= "gq}"		      " format text after the bullet
+	:let m ..= "{dd"		      " remove the empty line
+	:let m ..= "5lDJ"		      " put text after bullet
 	:execute m			      |" define the mapping
 
 (<> notation |<>|.  Note that this is all typed literally.  ^W is "^" "W", not
@@ -514,15 +514,15 @@ A slightly more advanced version is used in the |matchparen| plugin.
 	    let c = '\['
 	    let c2 = '\]'
 	  endif
-	  let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
+	  let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' ..
 		\ '=~?	"string\\|comment"'
 	  execute 'if' s_skip '| let s_skip = 0 | endif'
 
 	  let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip)
 
 	  if m_lnum > 0 && m_lnum >= line('w0') && m_lnum <= line('w$')
-	    exe 'match Search /\(\%' . c_lnum . 'l\%' . c_col .
-		  \ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
+	    exe 'match Search /\(\%' .. c_lnum .. 'l\%' .. c_col ..
+		  \ 'c\)\|\(\%' .. m_lnum .. 'l\%' .. m_col .. 'c\)/'
 	    let s:paren_hl_on = 1
 	  endif
 	endfunction

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2022 Feb 11
+*todo.txt*      For Vim version 8.2.  Last change: 2022 Feb 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,13 +38,9 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Disallow using "s:" in Vim9 script at the script level.
-Disallow a legacy function creating an s: variable in Vim9 script.
-
 Once Vim9 is stable:
 - Use Vim9 for runtime files.
 - Check code coverage, add more tests if needed.
-	vim9compile.c
 	vim9execute.c
 	vim9expr.c
 	vim9instr.c
@@ -421,9 +417,6 @@ When editing a file with ":edit" the output of :swapname is relative, while
 editing it with "vim file" it is absolute. (#355)
 Which one should it be?
 
-:map output does not clear the reset of the command line.
-(#5623, also see #5962)
-
 Problem with auto-formatting - inserting space and putting cursor before added
 character. (#6154)
 

runtime/doc/undo.txt

@@ -286,12 +286,12 @@ history file.  E.g.: >
 	au BufReadPost * call ReadUndo()
 	au BufWritePost * call WriteUndo()
 	func ReadUndo()
-	  if filereadable(expand('%:h'). '/UNDO/' . expand('%:t'))
+	  if filereadable(expand('%:h') .. '/UNDO/' .. expand('%:t'))
 	    rundo %:h/UNDO/%:t
 	  endif
 	endfunc
 	func WriteUndo()
-	  let dirname = expand('%:h') . '/UNDO'
+	  let dirname = expand('%:h') .. '/UNDO'
 	  if !isdirectory(dirname)
 	    call mkdir(dirname)
 	  endif

runtime/doc/usr_05.txt

@@ -270,7 +270,7 @@ line break.  Revert with ":iunmap <C-U>".
 Enable using the mouse if available.  See 'mouse'.
 
 >
-	vnoremap _g y:exe "grep /" . escape(@", '\\/') . "/ *.c *.h"<CR>
+	vnoremap _g y:exe "grep /" .. escape(@", '\\/') .. "/ *.c *.h"<CR>
 
 This mapping yanks the visually selected text and searches for it in C files.
 You can see that a mapping can be used to do quite complicated things.  Still,

runtime/doc/usr_41.txt

@@ -162,7 +162,7 @@ and avoid errors.  Such as thinking that the "-0o36" above makes the number
 negative, while it is actually seen as a subtraction.
 
 To actually have the minus sign be used for negation, you can put the second
-expression in parenthesis: >
+expression in parentheses: >
 
 	echo -0x7f (-0o36)
 

runtime/doc/various.txt

@@ -267,7 +267,7 @@ g8			Print the hex values of the bytes used in the
 			name does not contain a single quote: >
 				:!ls '%'
 <			This should always work, but it's more typing: >
-				:exe "!ls " . shellescape(expand("%"))
+				:exe "!ls " .. shellescape(expand("%"))
 <			To get a literal "%" or "#" prepend it with a
 			backslash.  For example, to list all files starting
 			with "%": >
@@ -410,6 +410,7 @@ T  *+mouse*		Mouse handling |mouse-using|
 N  *+mouseshape*	|'mouseshape'|
 B  *+mouse_dec*		Unix only: Dec terminal mouse handling |dec-mouse|
 N  *+mouse_gpm*		Unix only: Linux console mouse handling |gpm-mouse|
+m  *+mouse_gpm/dyn*	Same as |+mouse_gpm| with optional library dependency |/dyn|
 N  *+mouse_jsbterm*	JSB mouse handling |jsbterm-mouse|
 B  *+mouse_netterm*	Unix only: netterm mouse handling |netterm-mouse|
 N  *+mouse_pterm*	QNX only: pterm mouse handling |qnx-terminal|
@@ -649,7 +650,7 @@ N  *+X11*		Unix only: can restore window title |X11|
 			used.  In this example |:silent| is used to avoid the
 			message about reading the file and |:unsilent| to be
 			able to list the first line of each file. >
-		:silent argdo unsilent echo expand('%') . ": " . getline(1)
+		:silent argdo unsilent echo expand('%') .. ": " .. getline(1)
 <
 
 						*:verb* *:verbose*

runtime/doc/vim-ja.UTF-8.1

@@ -1,4 +1,4 @@
-.TH VIM 1 "2006 Apr 11"
+.TH VIM 1 "2021 Jun 13"
 .SH 名前
 vim \- Vi IMproved, プログラマのテキストエディタ
 .SH 書式

runtime/doc/vim9.txt

@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 8.2.  Last change: 2022 Feb 11
+*vim9.txt*	For Vim version 8.2.  Last change: 2022 Feb 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -229,8 +229,17 @@ script "export" needs to be used. >
 <						*E1058* *E1075*
 When using `:function` or `:def` to specify a nested function inside a `:def`
 function and no namespace was given, this nested function is local to the code
-block it is defined in.  It is not possible to define a script-local function.
-It is possible to define a global function by using the "g:" prefix.
+block it is defined in.  It cannot be used in `function()` with a string
+argument, pass the function reference itself: >
+	def Outer()
+	  def Inner()
+	    echo 'inner'
+	  enddef
+	  var Fok = function(Inner)     # OK
+	  var Fbad = function('Inner')  # does not work
+
+It is not possible to define a script-local function.  It is possible to
+define a global function by using the "g:" prefix.
 
 When referring to a function and no "s:" or "g:" prefix is used, Vim will
 search for the function:
@@ -245,9 +254,11 @@ that the name interferes with builtin functions.
 							*vim9-s-namespace*
 The use of the "s:" prefix is not supported at the Vim9 script level.  All
 functions and variables without a prefix are script-local.
-In :def functions the use of "s:" is optional.  This is because in legacy
-script the "s:" might be needed.  Disallowing the use of "s:" only in a :def
-function in Vim9 script would be a bit confusing.
+
+In :def functions the use of "s:" depends on the script: Script-local
+variables and functions in a legacy script do use "s:", while in a Vim9 script
+they do not use "s:".  This matches what you see in the rest of the file.
+
 In legacy functions the use of "s:" for script items is required, as before.
 
 In all cases the function must be defined before used.  That is when it is
@@ -282,13 +293,14 @@ If you do want to keep items, use: >
 	vim9script noclear
 
 You want to use this in scripts that use a `finish` command to bail out at
-some point when loaded again.  E.g. when a buffer local option is set: >
+some point when loaded again.  E.g. when a buffer local option is set to a
+function, the function does not need to be defined more than once: >
 	vim9script noclear
 	setlocal completefunc=SomeFunc
-	if exists('*g:SomeFunc')
+	if exists('*SomeFunc')
 	  finish
 	endif
-	def g:SomeFunc()
+	def SomeFunc()
 	....
 
 
@@ -422,7 +434,7 @@ similar to how a function argument can be ignored: >
 	[a, _, c] = theList
 To ignore any remaining items: >
 	[a, b; _] = longList
-<							*E1163*
+<							*E1163* *E1080*
 Declaring more than one variable at a time, using the unpack notation, is
 possible.  Each variable can have a type or infer it from the value: >
 	var [v1: number, v2] = GetValues()
@@ -837,6 +849,7 @@ Instead of `:k` you can use `:mark`.
 Comparators ~
 
 The 'ignorecase' option is not used for comparators that use strings.
+Thus "=~" works like "=~#".
 
 
 Abort after error ~
@@ -1430,32 +1443,61 @@ In legacy Vim script, where a number was expected, a string would be
 automatically converted to a number.  This was convenient for an actual number
 such as "123", but leads to unexpected problems (and no error message) if the
 string doesn't start with a number.  Quite often this leads to hard-to-find
-bugs.
+bugs. e.g.: >
+	echo 123 == '123'
+<	1 ~
+With an accidental space: >
+	echo 123 == ' 123'
+<	0 ~
 							*E1206* *E1210* *E1212*
 In Vim9 script this has been made stricter.  In most places it works just as
-before, if the value used matches the expected type.  There will sometimes be
+before if the value used matches the expected type.  There will sometimes be
 an error, thus breaking backwards compatibility.  For example:
 - Using a number other than 0 or 1 where a boolean is expected.  *E1023*
 - Using a string value when setting a number option.
 - Using a number where a string is expected.   *E1024* *E1105*
 
 One consequence is that the item type of a list or dict given to |map()| must
-not change.  This will give an error in Vim9 script: >
-	echo map([1, 2, 3], (i, v) => 'item ' .. i)
-	E1012: Type mismatch; expected number but got string
-Instead use |mapnew()|: >
-	echo mapnew([1, 2, 3], (i, v) => 'item ' .. i)
-	['item 0', 'item 1', 'item 2']
+not change, if the type was declared.  This will give an error in Vim9
+script: >
+	var mylist: list<number> = [1, 2, 3]
+	echo map(mylist, (i, v) => 'item ' .. i)
+<	E1012: Type mismatch; expected number but got string in map() ~
 
-If the item type was determined to be "any" it can change to a more specific
-type.  E.g. when a list of mixed types gets changed to a list of strings: >
+Instead use |mapnew()|, it creates a new list: >
+	var mylist: list<number> = [1, 2, 3]
+	echo mapnew(mylist, (i, v) => 'item ' .. i)
+<	['item 0', 'item 1', 'item 2'] ~
+
+If the item type was not declared or determined to be "any" it can change to a
+more specific type.  E.g. when a list of mixed types gets changed to a list of
+strings: >
 	var mylist = [1, 2.0, '3']
 	# typename(mylist) == "list<any>"
 	map(mylist, (i, v) => 'item ' .. i)
 	# typename(mylist) == "list<string>", no error
-<								*E1158*
+
+There is a subtle difference between using a list constant directly and
+through a variable declaration.  Because of type inference, when using a list
+constant to initialize a variable, this also sets the declared type: >
+	var mylist = [1, 2, 3]
+	# typename(mylist) == "list<number>"
+	echo map(mylist, (i, v) => 'item ' .. i)  # Error!
+
+When using the list constant directly, the type is not declared and is allowed
+to change: >
+	echo map([1, 2, 3], (i, v) => 'item ' .. i)  # OK
+
+The reasoning behind this is that when a type is declared and the list is
+passed around and changed, the declaration must always hold.  So that you can
+rely on the type to match the declared type.  For a constant this is not
+needed.
+
+								*E1158*
 Same for |extend()|, use |extendnew()| instead, and for |flatten()|, use
-|flattennew()| instead.
+|flattennew()| instead.  Since |flatten()| is intended to always change the
+type, it can not be used in Vim9 script.
+
 			 *E1211* *E1217* *E1218* *E1219* *E1220* *E1221*
 			 *E1222* *E1223* *E1224* *E1225* *E1226* *E1227*
 			 *E1228* *E1238* *E1250* *E1251* *E1252* *E1253*

runtime/doc/windows.txt

@@ -473,7 +473,7 @@ These commands can also be executed with ":wincmd":
 		the |CursorHold| autocommand event).  Or when a Normal mode
 		command is inconvenient.
 		The count can also be a window number.  Example: >
-			:exe nr . "wincmd w"
+			:exe nr .. "wincmd w"
 <		This goes to window "nr".
 
 ==============================================================================
@@ -964,12 +964,12 @@ CTRL-W g }						*CTRL-W_g}*
 		cursor.  This is less clever than using |:ptag|, but you don't
 		need a tags file and it will also find matches in system
 		include files.  Example: >
-  :au! CursorHold *.[ch] ++nested exe "silent! psearch " . expand("<cword>")
+  :au! CursorHold *.[ch] ++nested exe "silent! psearch " .. expand("<cword>")
 <		Warning: This can be slow.
 
 Example						*CursorHold-example*  >
 
-  :au! CursorHold *.[ch] ++nested exe "silent! ptag " . expand("<cword>")
+  :au! CursorHold *.[ch] ++nested exe "silent! ptag " .. expand("<cword>")
 
 This will cause a ":ptag" to be executed for the keyword under the cursor,
 when the cursor hasn't moved for the time set with 'updatetime'.  The "nested"
@@ -992,14 +992,14 @@ is no word under the cursor, and a few other things: >
   :
   :    " Delete any existing highlight before showing another tag
   :    silent! wincmd P			" jump to preview window
-  :    if &previewwindow			" if we really get there...
+  :    if &previewwindow		" if we really get there...
   :      match none			" delete existing highlight
   :      wincmd p			" back to old window
   :    endif
   :
   :    " Try displaying a matching tag for the word under the cursor
   :    try
-  :       exe "ptag " . w
+  :       exe "ptag " .. w
   :    catch
   :      return
   :    endtry
@@ -1011,10 +1011,10 @@ is no word under the cursor, and a few other things: >
   :	 endif
   :	 call search("$", "b")		" to end of previous line
   :	 let w = substitute(w, '\\', '\\\\', "")
-  :	 call search('\<\V' . w . '\>')	" position cursor on match
+  :	 call search('\<\V' .. w .. '\>')	" position cursor on match
   :	 " Add a match highlight to the word at this position
   :      hi previewWord term=bold ctermbg=green guibg=green
-  :	 exe 'match previewWord "\%' . line(".") . 'l\%' . col(".") . 'c\k*"'
+  :	 exe 'match previewWord "\%' .. line(".") .. 'l\%' .. col(".") .. 'c\k*"'
   :      wincmd p			" back to old window
   :    endif
   :  endif

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Jan 31
+" Last Change:	2022 Feb 13
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -44,7 +44,7 @@ endif
 " file name matches ft_ignore_pat.
 " When using this, the entry should probably be further down below with the
 " other StarSetf() calls.
-func! s:StarSetf(ft)
+func s:StarSetf(ft)
   if expand("<amatch>") !~ g:ft_ignore_pat
     exe 'setf ' . a:ft
   endif
@@ -229,6 +229,9 @@ au BufNewFile,BufRead *.bib			setf bib
 " BibTeX Bibliography Style
 au BufNewFile,BufRead *.bst			setf bst
 
+" Bicep
+au BufNewFile,BufRead *.bicep			setf bicep
+
 " BIND configuration
 " sudoedit uses namedXXXX.conf
 au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
@@ -481,6 +484,7 @@ au BufNewFile,BufRead */etc/dnsmasq.conf	setf dnsmasq
 au BufNewFile,BufRead *.desc			setf desc
 
 " the D language or dtrace
+au BufNewFile,BufRead */dtrace/*.d		setf dtrace
 au BufNewFile,BufRead *.d			call dist#ft#DtraceCheck()
 
 " Desktop files
@@ -727,6 +731,10 @@ au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
 au BufNewFile,BufRead gitolite.conf		setf gitolite
 au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
 
+" Glimmer-flavored TypeScript and JavaScript
+au BufNewFile,BufRead *.gts	setf typescript.glimmer
+au BufNewFile,BufRead *.gjs	setf javascript.glimmer
+
 " Gnuplot scripts
 au BufNewFile,BufRead *.gpi,.gnuplot		setf gnuplot
 
@@ -1792,6 +1800,9 @@ au BufNewFile,BufRead *.mib,*.my		setf mib
 au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
 au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
 
+" Solidity
+au BufRead,BufNewFile *.sol			setf solidity
+
 " SPARQL queries
 au BufNewFile,BufRead *.rq,*.sparql		setf sparql
 
@@ -2516,7 +2527,7 @@ endif
 " Function called for testing all functions defined here.  These are
 " script-local, thus need to be executed here.
 " Returns a string with error messages (hopefully empty).
-func! TestFiletypeFuncs(testlist)
+func TestFiletypeFuncs(testlist)
   let output = ''
   for f in a:testlist
     try

runtime/indent/vim.vim

@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Nov 27
+" Last Change:	2022 Feb 23
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -10,7 +10,7 @@ endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetVimIndent()
-setlocal indentkeys+==end,=},=else,=cat,=finall,=END,0\\,0=\"\\\ 
+setlocal indentkeys+==endif,=enddef,=endfu,=endfor,=endwh,=endtry,=},=else,=cat,=finall,=END,0\\,0=\"\\\ 
 setlocal indentkeys-=0#
 setlocal indentkeys-=:
 
@@ -103,8 +103,9 @@ function GetVimIndentIntern()
     " A line starting with :au does not increment/decrement indent.
     " A { may start a block or a dict.  Assume that when a } follows it's a
     " terminated dict.
+    " ":function" starts a block but "function(" doesn't.
     if prev_text !~ '^\s*au\%[tocmd]' && prev_text !~ '^\s*{.*}'
-      let i = match(prev_text, '\(^\||\)\s*\(export\s\+\)\?\({\|\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\|finall\%[y]\|fu\%[nction]\|def\|el\%[seif]\)\>\)')
+      let i = match(prev_text, '\(^\||\)\s*\(export\s\+\)\?\({\|\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\|finall\%[y]\|def\|el\%[seif]\)\>\|fu\%[nction]\s\)')
       if i >= 0
 	let ind += shiftwidth()
 	if strpart(prev_text, i, 1) == '|' && has('syntax_items')
@@ -170,10 +171,15 @@ function GetVimIndentIntern()
     let ind = ind + shiftwidth()
   endif
 
-  " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
-  " :endfun, :enddef, :else and :augroup END.
-  if cur_text =~ '^\s*\(ene\@!\|cat\|finall\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
+  " Subtract a 'shiftwidth' on a :endif, :endwhile, :endfor, :catch, :finally,
+  " :endtry, :endfun, :enddef, :else and :augroup END.
+  " Although ":en" would be enough only match short command names as in
+  " 'indentkeys'.
+  if cur_text =~ '^\s*\(endif\|endwh\|endfor\|endtry\|endfu\|enddef\|cat\|finall\|else\|aug\%[roup]\s\+[eE][nN][dD]\)'
     let ind = ind - shiftwidth()
+    if ind < 0
+      let ind = 0
+    endif
   endif
 
   return ind

runtime/lang/Makefile

@@ -0,0 +1,196 @@
+# Author: Ada (Haowen) Yu <me@yuhaowen.com>
+
+all: \
+		menu_chinese_gb.936.vim \
+		menu_uk_ua.cp1251.vim \
+		menu_uk_ua.koi8-u.vim \
+		menu_chinese_taiwan.950.vim \
+		menu_cs_cz.iso_8859-2.vim \
+		menu_czech_czech_republic.1250.vim \
+		menu_ja_jp.euc-jp.vim \
+		menu_japanese_japan.932.vim \
+		menu_ko_kr.euckr.vim \
+		menu_pl_pl.iso_8859-2.vim \
+		menu_polish_poland.1250.vim \
+		menu_ru_ru.koi8-r.vim \
+		menu_sl_si.cp1250.vim \
+		menu_sl_si.latin2.vim \
+		menu_slovak_slovak_republic.1250.vim \
+		menu_tr_tr.cp1254.vim \
+		menu_tr_tr.iso_8859-9.vim \
+		menu_sr_rs.iso_8859-5.vim \
+		menu_sr_rs.iso_8859-2.vim \
+		menu_sr_rs.ascii.vim \
+		menu_czech_czech_republic.ascii.vim \
+
+# Convert menu_zh_cn.utf-8.vim to create menu_chinese_gb.936.vim.
+menu_chinese_gb.936.vim: menu_zh_cn.utf-8.vim
+	rm -f menu_chinese_gb.936.vim
+	iconv -f utf-8 -t cp936 menu_zh_cn.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp936/' -e 's/" Original translations/" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT/' > menu_chinese_gb.936.vim
+
+# Convert menu_zh_tw.utf-8.vim to create menu_chinese_taiwan.950.vim.
+menu_chinese_taiwan.950.vim: menu_zh_tw.utf-8.vim
+	rm -f menu_chinese_taiwan.950.vim
+	iconv -f utf-8 -t cp950 menu_zh_tw.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp950/' -e 's/" Original translations/" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT/' > menu_chinese_taiwan.950.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_cs_cz.iso_8859-2.vim.
+menu_cs_cz.iso_8859-2.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_cs_cz.iso_8859-2.vim
+	iconv -f utf-8 -t iso8859-2 menu_cs_cz.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' \
+			-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
+			-e 's/\(" Menu Translations:.*\)(.*)/\1(ISO8859-2)/'  \
+			> menu_cs_cz.iso_8859-2.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_czech_czech_republic.1250.vim.
+menu_czech_czech_republic.1250.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_czech_czech_republic.1250.vim
+	iconv -f utf-8 -t cp1250 menu_cs_cz.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/'  \
+		-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/'  \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(CP1250)/'  \
+		> menu_czech_czech_republic.1250.vim
+
+# Convert menu_cs_cz.utf-8.vim to create menu_czech_czech_republic.ascii.vim.
+menu_czech_czech_republic.ascii.vim: menu_cs_cz.utf-8.vim
+	rm -f menu_czech_czech_republic.ascii.vim
+	sed -e 's/Á/A/g' -e 's/á/a/g' -e 's/Č/C/g' -e 's/č/c/g' -e 's/Ď/D/g' \
+		-e 's/ď/d/g' -e 's/É/E/g' -e 's/é/e/g' -e 's/Ě/E/g' -e 's/ě/e/g' \
+		-e 's/Í/I/g' -e 's/í/i/g' -e 's/Ň/N/g' -e 's/ň/n/g' -e 's/Ó/O/g' \
+		-e 's/ó/o/g' -e 's/Ř/R/g' -e 's/ř/r/g' -e 's/Š/S/g' -e 's/š/s/g' \
+		-e 's/Ť/T/g' -e 's/ť/t/g' -e 's/Ú/U/g' -e 's/ú/u/g' -e 's/Ů/U/g' \
+		-e 's/ů/u/g' -e 's/Ý/Y/g' -e 's/ý/y/g' -e 's/Ž/Z/g' -e 's/ž/z/g' \
+		-e 's/scriptencoding utf-8/scriptencoding latin1/'  \
+		-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(ASCII - without diacritics)/'  \
+	menu_cs_cz.utf-8.vim > menu_czech_czech_republic.ascii.vim
+
+# Convert menu_ja_jp.utf-8.vim to create menu_ja_jp.euc-jp.vim.
+menu_ja_jp.euc-jp.vim: menu_ja_jp.utf-8.vim
+	rm -f menu_ja_jp.euc-jp.vim
+	iconv -f utf-8 -t euc-jp menu_ja_jp.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding euc-jp/'  \
+		-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/'  \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(EUC-JP)/'  \
+		> menu_ja_jp.euc-jp.vim
+
+# Convert menu_ja_jp.utf-8.vim to create menu_japanese_japan.932.vim.
+menu_japanese_japan.932.vim: menu_ja_jp.utf-8.vim
+	rm -f menu_japanese_japan.932.vim
+	iconv -f utf-8 -t cp932 menu_ja_jp.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp932/'  \
+		-e 's/" Original translations/" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT/' \
+		-e 's/\(" Menu Translations:.*\)(.*)/\1(CP932)/'  \
+		> menu_japanese_japan.932.vim
+
+# Convert menu_ko_kr.utf-8.vim to create menu_ko_kr.euckr.vim.
+menu_ko_kr.euckr.vim: menu_ko_kr.utf-8.vim
+	rm -f menu_ko_kr.euckr.vim
+	iconv -f utf-8 -t euc-kr menu_ko_kr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding euc-kr/' -e 's/" Original translations/" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT/' > menu_ko_kr.euckr.vim
+
+# Convert menu_pl_pl.utf-8.vim to create menu_pl_pl.iso_8859-2.vim.
+menu_pl_pl.iso_8859-2.vim: menu_pl_pl.utf-8.vim
+	rm -f menu_pl_pl.iso_8859-2.vim
+	iconv -f utf-8 -t iso8859-2 menu_pl_pl.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim
+
+# Convert menu_pl_pl.utf-8.vim to create menu_polish_poland.1250.vim.
+menu_polish_poland.1250.vim: menu_pl_pl.utf-8.vim
+	rm -f menu_polish_poland.1250.vim
+	iconv -f utf-8 -t cp1250 menu_pl_pl.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_polish_poland.1250.vim
+
+# Convert menu_ru_ru.utf-8.vim to create menu_ru_ru.koi8-r.vim.
+menu_ru_ru.koi8-r.vim: menu_ru_ru.utf-8.vim
+	rm -f menu_ru_ru.koi8-r.vim
+	iconv -f utf-8 -t koi8-r menu_ru_ru.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding koi8-r/' -e 's/" Original translations/" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT/' > menu_ru_ru.koi8-r.vim
+
+# Convert menu_sl_si.utf-8.vim to create menu_sl_si.cp1250.vim.
+menu_sl_si.cp1250.vim: menu_sl_si.utf-8.vim
+	rm -f menu_sl_si.cp1250.vim
+	iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/'  \
+		-e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.cp1250.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_sl_si.latin2.vim.
+menu_sl_si.latin2.vim: menu_sl_si.utf-8.vim
+	rm -f menu_sl_si.latin2.vim
+	iconv -f utf-8 -t latin2 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding latin2/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_sl_si.latin2.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_slovak_slovak_republic.1250.vim.
+menu_slovak_slovak_republic.1250.vim: menu_sl_si.utf-8.vim
+	rm -f menu_slovak_slovak_republic.1250.vim
+	iconv -f utf-8 -t cp1250 menu_sl_si.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1250/' -e 's/" Original translations/" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT/' > menu_slovak_slovak_republic.1250.vim
+
+# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.cp1254.vim.
+menu_tr_tr.cp1254.vim: menu_tr_tr.utf-8.vim
+	rm -f menu_tr_tr.cp1254.vim
+	iconv -f utf-8 -t cp1254 menu_tr_tr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1254/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.cp1254.vim
+
+# Convert menu_tr_tr.utf-8.vim to create menu_tr_tr.iso_8859-9.vim.
+menu_tr_tr.iso_8859-9.vim: menu_tr_tr.utf-8.vim
+	rm -f menu_tr_tr.iso_8859-9.vim
+	iconv -f utf-8 -t iso8859-9 menu_tr_tr.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-9/' -e 's/" Original translations/" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT/' > menu_tr_tr.iso_8859-9.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-5.vim.
+menu_sr_rs.iso_8859-5.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.iso_8859-5.vim
+	iconv -f utf-8 -t iso8859-5 menu_sr_rs.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-5/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' > menu_sr_rs.iso_8859-5.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.iso_8859-2.vim.
+menu_sr_rs.iso_8859-2.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.iso_8859-2.vim
+	sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
+		-e 's/ђ/đ/g' -e 's/е/e/g' -e 's/ж/ž/g' -e 's/з/z/g' -e 's/и/i/g' \
+		-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
+		-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
+		-e 's/с/s/g' -e 's/т/t/g' -e 's/ћ/ć/g' -e 's/у/u/g' -e 's/ф/f/g' \
+		-e 's/х/h/g' -e 's/ц/c/g' -e 's/ч/č/g' -e 's/џ/dž/g' -e 's/ш/š/g' \
+		-e 's/А/A/g' -e 's/Б/B/g' -e 's/В/V/g' -e 's/Г/G/g' -e 's/Д/D/g' \
+		-e 's/Ђ/Đ/g' -e 's/Е/E/g' -e 's/Ж/Ž/g' -e 's/З/Z/g' -e 's/И/I/g' \
+		-e 's/Ј/J/g' -e 's/К/K/g' -e 's/Л/L/g' -e 's/Љ/Lj/g' -e 's/М/M/g' \
+		-e 's/Н/N/g' -e 's/Њ/Nj/g' -e 's/О/O/g' -e 's/П/P/g' -e 's/Р/R/g' \
+		-e 's/С/S/g' -e 's/Т/T/g' -e 's/Ћ/Ć/g' -e 's/У/U/g' -e 's/Ф/F/g' \
+		-e 's/Х/H/g' -e 's/Ц/C/g' -e 's/Ч/Č/g' -e 's/Џ/Dž/g' -e 's/Ш/Š/g' \
+		-e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' \
+		menu_sr_rs.utf-8.vim | iconv -f utf-8 -t iso8859-2 \
+	> menu_sr_rs.iso_8859-2.vim
+
+# Convert menu_sr_rs.utf-8.vim to create menu_sr_rs.ascii.vim.
+menu_sr_rs.ascii.vim: menu_sr_rs.utf-8.vim
+	rm -f menu_sr_rs.ascii.vim
+	sed -e 's/а/a/g' -e 's/б/b/g' -e 's/в/v/g' -e 's/г/g/g' -e 's/д/d/g' \
+		-e 's/ђ/dj/g' -e 's/е/e/g' -e 's/ж/z/g' -e 's/з/z/g' -e 's/и/i/g' \
+		-e 's/ј/j/g' -e 's/к/k/g' -e 's/л/l/g' -e 's/љ/lj/g' -e 's/м/m/g' \
+		-e 's/н/n/g' -e 's/њ/nj/g' -e 's/о/o/g' -e 's/п/p/g' -e 's/р/r/g' \
+		-e 's/с/s/g' -e 's/т/t/g' -e 's/ћ/c/g' -e 's/у/u/g' -e 's/ф/f/g' \
+		-e 's/х/h/g' -e 's/ц/c/g' -e 's/ч/c/g' -e 's/џ/dz/g' -e 's/ш/s/g' \
+		-e 's/А/A/g' -e 's/Б/B/g' -e 's/В/V/g' -e 's/Г/G/g' -e 's/Д/D/g' \
+		-e 's/Ђ/Đ/g' -e 's/Е/E/g' -e 's/Ж/Z/g' -e 's/З/Z/g' -e 's/И/I/g' \
+		-e 's/Ј/J/g' -e 's/К/K/g' -e 's/Л/L/g' -e 's/Љ/Lj/g' -e 's/М/M/g' \
+		-e 's/Н/N/g' -e 's/Њ/Nj/g' -e 's/О/O/g' -e 's/П/P/g' -e 's/Р/R/g' \
+		-e 's/С/S/g' -e 's/Т/T/g' -e 's/Ћ/C/g' -e 's/У/U/g' -e 's/Ф/F/g' \
+		-e 's/Х/H/g' -e 's/Ц/C/g' -e 's/Ч/C/g' -e 's/Џ/Dz/g' -e 's/Ш/S/g' \
+		-e 's/scriptencoding utf-8/scriptencoding latin1/' -e 's/" Original translations/" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT/' \
+		menu_sr_rs.utf-8.vim > menu_sr_rs.ascii.vim
+	
+# Convert menu_uk_ua.utf-8.vim to create menu_uk_ua.cp1251.vim.
+menu_uk_ua.cp1251.vim: menu_uk_ua.utf-8.vim
+	rm -f menu_uk_ua.cp1251.vim
+	iconv -f utf-8 -t cp1251 menu_uk_ua.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding cp1251/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.cp1251.vim
+
+# Convert menu_uk_ua.utf-8.vim to create menu_uk_ua.koi8-u.vim.
+menu_uk_ua.koi8-u.vim: menu_uk_ua.utf-8.vim
+	rm -f menu_uk_ua.koi8-u.vim
+	iconv -f utf-8 -t koi8-u menu_uk_ua.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding koi8-u/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.koi8-u.vim

runtime/lang/menu_af_af.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Afrikaas
 " Maintainer:		Danie Roux <droux@tuks.co.za>
 " Last Change:		2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ca_es.latin1.vim

@@ -2,7 +2,7 @@
 "
 " Maintainer:	Ernest Adrogu<67> <eadrogue@gmx.net>
 " Last Change:	26 Jul 2017
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_chinese_gb.936.vim

@@ -1,7 +1,8 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2020 Apr 23
+" Last Change:          2022 Feb 19
+" Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -449,4 +450,4 @@ menutrans Set\ '&filetype'\ Too			Ҳ
 let &cpo = s:keepcpo
 unlet s:keepcpo
 
-" vim: set nu ts=4 sw=4 noet fdm=marker fdc=4 :
+" vim: set ts=4 sw=4 noet fdm=marker fdc=4 :

runtime/lang/menu_chinese_taiwan.950.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Traditional Chinese
 " Translated By:	Hung-Te Lin	<piaip@csie.ntu.edu.tw>
 " Last Change:		2012 May 01
+" Generated from menu_zh_tw.utf-8.vim, DO NOT EDIT
 
 " {{{ Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -8,6 +9,7 @@ if exists("did_menu_trans")
 endif
 let did_menu_trans = 1
 " }}}
+
 let s:keepcpo= &cpo
 set cpo&vim
 

runtime/lang/menu_cs_cz.iso_8859-2.vim

@@ -1,7 +1,8 @@
-" Menu Translations:    Czech (ISO-8859-2)
+" Menu Translations:    Czech (ISO8859-2)
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -12,7 +13,7 @@ let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
 
-scriptencoding iso-8859-2
+scriptencoding iso8859-2
 
 " {{{ File menu
 menutrans &File				&Soubor

runtime/lang/menu_cs_cz.utf-8.vim

@@ -2,6 +2,7 @@
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_czech_czech_republic.1250.vim

@@ -2,6 +2,7 @@
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_czech_czech_republic.ascii.vim

@@ -1,7 +1,8 @@
-" Menu Translations:    Czech (latin1 - w/o diacritics)
+" Menu Translations:    Czech (ASCII - without diacritics)
 " Maintainer:           Jiri Sedlak <jiri_sedlak@users.sourceforge.net>
 " Previous maintainer:  Jiri Brezina
 " Based on:             menu.vim (2012-10-21)
+" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_da.utf-8.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Danish
 " Maintainer:		scootergrisen
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_de_de.latin1.vim

@@ -5,6 +5,7 @@
 "			        Johannes Zellner <johannes@zellner.org>
 " Last Change:	Mon, 1 April 2019
 " vim:set foldmethod=marker tabstop=8:
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_eo.utf-8.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Esperanto
 " Maintainer:		Dominique PELLE <dominique.pelle@free.fr>
 " Last Change:		2012 May 01
+" Original translations
 " 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_es_es.latin1.vim

@@ -3,7 +3,7 @@
 " Last translator:	Omar Campagne Polaino <ocampagne@gmail.com>
 " Version:		7.2.245
 " Last Change:		2012 May 01
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_fi_fi.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Finnish
 " Maintainer:		Flammie Pirinen <flammie@iki.fi>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_fr_fr.latin1.vim

@@ -4,6 +4,7 @@
 " Contributors:		David Blanchet <david.blanchet@free.fr>
 " 			Gabriel Dupras <gabrieldupras@gmail.com>
 " Last Change:		2021 Feb 16
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_hu_hu.iso_8859-2.vim

@@ -2,6 +2,7 @@
 " Original Translation:	Zolt<6C>n <20>rp<72>dffy
 " Maintained By:	Kontra Gergely <kgergely@mcl.hu>
 " Last Change:		2020 Apr 23
+" Original translations
 " I'm working on defining (unaccented) hotkeys for everything.
 " I want to remove y and z hotkeys, because on the hungarian keymap they're at
 " a differrent place.

runtime/lang/menu_hu_hu.utf-8.vim

@@ -5,6 +5,7 @@
 "
 " This file was converted from menu_hu_hu.iso_8859-2.vim.  See there for
 " remarks.
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_is_is.latin1.vim

@@ -2,6 +2,7 @@
 " Maintainer:		J<>n Arnar Briem <jonbriem@gmail.com>
 " Originally By:	J<>n Arnar Briem <jonbriem@gmail.com>
 " Last Change:	Sun, 24 Mar 2019 22:40:00 CEST
+" Original translations
 " vim:set foldmethod=marker tabstop=8:
 
 " Quit when menu translations have already been done.

runtime/lang/menu_it_it.latin1.vim

@@ -3,6 +3,7 @@
 "			Vlad Sandrini <vlad.gently@gmail.com>
 "			Luciano Montanaro <mikelima@cirulla.net>
 " Last Change:	2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ja_jp.euc-jp.vim

@@ -2,12 +2,14 @@
 "
 " Menu Translations:	Japanese (EUC-JP)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		18-Jul-2018.
+" Last Change:		20-Feb-2022.
 "
-" Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2022 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+"
+" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -23,7 +25,7 @@ scriptencoding euc-jp
 menutrans &Help			<09>إ<EFBFBD><EFBFBD><EFBFBD>(&H)
 menutrans &Overview<Tab><F1>	<09><>ά(&O)<Tab><F1>
 menutrans &User\ Manual		<09>桼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޥ˥奢<EFBFBD><EFBFBD>(&U)
-menutrans &How-to\ links	&How-to<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans &How-To\ links	&How-to<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Credits		<09><><EFBFBD>쥸<EFBFBD>å<EFBFBD>(&C)
 menutrans Co&pying		<09><><EFBFBD><EFBFBD><EEB8A2><EFBFBD><EFBFBD>(&P)
 menutrans &Sponsor/Register	<09><><EFBFBD>ݥ󥵡<DDA5>/<EFBFBD><EFBFBD>Ͽ(&S)
@@ -270,10 +272,9 @@ if has("toolbar")
     tmenu ToolBar.Cut		<09><><EFBFBD><EFBFBD><EFBFBD>åץܡ<EFBFBD><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><EFBFBD>Ž<EFBFBD><EFBFBD><EFBFBD>դ<EFBFBD>
-    tmenu ToolBar.Find		<EFBFBD><EFBFBD><EFBFBD><EFBFBD>...
+    tmenu ToolBar.Replace	<EFBFBD><EFBFBD><EFBFBD><EFBFBD> / <20>ִ<EFBFBD>...
     tmenu ToolBar.FindNext	<09><><EFBFBD>򸡺<EFBFBD>
     tmenu ToolBar.FindPrev	<09><><EFBFBD>򸡺<EFBFBD>
-    tmenu ToolBar.Replace	<09>ִ<EFBFBD>...
     if 0	" disabled; These are in the Windows menu
       tmenu ToolBar.New		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
       tmenu ToolBar.WinSplit	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD>ʬ<EFBFBD><EFBFBD>

runtime/lang/menu_ja_jp.utf-8.vim

@@ -2,12 +2,14 @@
 "
 " Menu Translations:	Japanese (UTF-8)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		18-Jul-2018.
+" Last Change:		20-Feb-2022.
 "
-" Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2022 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -23,7 +25,7 @@ scriptencoding utf-8
 menutrans &Help			ヘルプ(&H)
 menutrans &Overview<Tab><F1>	概略(&O)<Tab><F1>
 menutrans &User\ Manual		ユーザーマニュアル(&U)
-menutrans &How-to\ links	&How-toリンク
+menutrans &How-To\ links	&How-toリンク
 menutrans &Credits		クレジット(&C)
 menutrans Co&pying		著作権情報(&P)
 menutrans &Sponsor/Register	スポンサー/登録(&S)
@@ -270,10 +272,9 @@ if has("toolbar")
     tmenu ToolBar.Cut		クリップボードへ切り取り
     tmenu ToolBar.Copy		クリップボードへコピー
     tmenu ToolBar.Paste		クリップボードから貼り付け
-    tmenu ToolBar.Find		検索...
+    tmenu ToolBar.Replace	検索 / 置換...
     tmenu ToolBar.FindNext	次を検索
     tmenu ToolBar.FindPrev	前を検索
-    tmenu ToolBar.Replace	置換...
     if 0	" disabled; These are in the Windows menu
       tmenu ToolBar.New		新規ウィンドウ作成
       tmenu ToolBar.WinSplit	ウィンドウ分割

runtime/lang/menu_japanese_japan.932.vim

@@ -2,12 +2,14 @@
 "
 " Menu Translations:	Japanese (CP932)
 " Last Translator:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		18-Jul-2018.
+" Last Change:		20-Feb-2022.
 "
-" Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2022 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+"
+" Generated from menu_ja_jp.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -23,7 +25,7 @@ scriptencoding cp932
 menutrans &Help			<09>w<EFBFBD><EFBFBD><EFBFBD>v(&H)
 menutrans &Overview<Tab><F1>	<09>T<EFBFBD><EFBFBD>(&O)<Tab><F1>
 menutrans &User\ Manual		<09><><EFBFBD>[<5B>U<EFBFBD>[<5B>}<7D>j<EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><EFBFBD>(&U)
-menutrans &How-to\ links	&How-to<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N
+menutrans &How-To\ links	&How-to<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N
 menutrans &Credits		<09>N<EFBFBD><EFBFBD><EFBFBD>W<EFBFBD>b<EFBFBD>g(&C)
 menutrans Co&pying		<09><><EFBFBD>쌠<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&P)
 menutrans &Sponsor/Register	<09>X<EFBFBD>|<7C><><EFBFBD>T<EFBFBD>[/<EFBFBD>o<EFBFBD>^(&S)
@@ -270,10 +272,9 @@ if has("toolbar")
     tmenu ToolBar.Cut		<09>N<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>v<EFBFBD>{<7B>[<5B>h<EFBFBD>֐؂<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     tmenu ToolBar.Copy		<09>N<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>v<EFBFBD>{<7B>[<5B>h<EFBFBD>փR<EFBFBD>s<EFBFBD>[
     tmenu ToolBar.Paste		<09>N<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>v<EFBFBD>{<7B>[<5B>h<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C><><EFBFBD>t<EFBFBD><EFBFBD>
-    tmenu ToolBar.Find		<09><><EFBFBD><EFBFBD>...
+    tmenu ToolBar.Replace	<09><><EFBFBD><EFBFBD> / <20>u<EFBFBD><EFBFBD>...
     tmenu ToolBar.FindNext	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     tmenu ToolBar.FindPrev	<09>O<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    tmenu ToolBar.Replace	<09>u<EFBFBD><EFBFBD>...
     if 0	" disabled; These are in the Windows menu
       tmenu ToolBar.New		<09>V<EFBFBD>K<EFBFBD>E<EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>h<EFBFBD>E<EFBFBD>쐬
       tmenu ToolBar.WinSplit	<09>E<EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>h<EFBFBD>E<EFBFBD><EFBFBD><EFBFBD><EFBFBD>

runtime/lang/menu_ko_kr.euckr.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Korean
 " Maintainer:		SungHyun Nam <goweol@gmail.com>
 " Last Change:		2012 May 01
+" Generated from menu_ko_kr.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ko_kr.utf-8.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Korean
 " Maintainer:		SungHyun Nam <goweol@gmail.com>
 " Last Change:		2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_nl_nl.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Nederlands
 " Maintainer:		Bram Moolenaar
 " Last Change:	2012 May 01
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_no_no.latin1.vim

@@ -2,6 +2,7 @@
 " Maintainer:		<09>yvind A. Holm <sunny@sunbase.org>
 " Last Change:		2020 Apr 23
 " menu_no_no.latin1.vim 289 2004-05-16 18:00:52Z sunny
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pl_pl.iso_8859-2.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pl_pl.utf-8.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_polish_poland.1250.vim

@@ -2,6 +2,7 @@
 " Maintainer:		Mikolaj Machowski ( mikmach AT wp DOT pl )
 " Initial Translation:	Marcin Dalecki <martin@dalecki.de>
 " Last Change: 17 May  2010
+" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pt_br.vim

@@ -1,7 +1,7 @@
 " Menu Translations: Portugu<67>s do Brasil
 " Maintainer: Jos<6F> de Paula <jose@infoviaweb.com>
 " Last Change: 2020 Apr 23
-"
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_pt_pt.vim

@@ -1,6 +1,7 @@
 " Menu Translations: Portugu<67>s
 " adaptado de pt_br.
 " Maintainer: Duarte Henriques <duarte_henriques@myrealbox.com>
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_ru.utf-8.vim

@@ -1,3 +1,3 @@
 " Menu Translations:	Russian
 
-source <sfile>:p:h/menu_ru_ru.vim
+source <sfile>:p:h/menu_ru_ru.utf-8.vim

runtime/lang/menu_ru_ru.koi8-r.vim

@@ -1,7 +1,8 @@
 " Menu Translations:	Russian
 " Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
-" Previous Maintainer:	vassily ragosin <vrr[at]users.sourceforge.net>
-" Last Change:		29 May 2013
+" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
+" Last Change:		16 May 2018
+" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT
 " URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
 "
 " $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
@@ -36,7 +37,7 @@ menutrans &Help
 " Help menu
 menutrans &Overview<Tab><F1>		&<26><><EFBFBD><EFBFBD><EFBFBD><Tab><F1>
 menutrans &User\ Manual			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans &How-to\ links		&<26><><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
+menutrans &How-To\ Links		&<26><><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 menutrans &Find\.\.\.			&<26><><EFBFBD><EFBFBD><EFBFBD>
 "--------------------
 menutrans &Credits			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -58,7 +59,7 @@ menutrans &Close<Tab>:close		&
 menutrans &Save<Tab>:w			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD>\.\.\.<Tab>:sav
 "--------------------
-menutrans Split\ &Diff\ with\.\.\.	<09><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\.\.\.
+menutrans Split\ &Diff\ With\.\.\.	<09><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\.\.\.
 menutrans Split\ Patched\ &By\.\.\.	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 "--------------------
 menutrans &Print			<09><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -97,12 +98,12 @@ menutrans &Keymap
 menutrans Select\ Fo&nt\.\.\.		<09><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 ">>>----------------- Edit/Global settings
 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ sm!
-menutrans &Context\ lines				<09><><EFBFBD>&<26><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ sm!
+menutrans &Context\ Lines				<09><><EFBFBD>&<26><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Virtual\ Edit				<09><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		<09><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!		&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ Vi<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ Vi<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\.				&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 menutrans Ta&g\ Files\.\.\.				<09><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 "
@@ -113,18 +114,18 @@ menutrans Toggle\ &Right\ Scrollbar
 ">>>->>>------------- Edit/Global settings/Virtual edit
 menutrans Never						<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Block\ Selection				<09><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>
-menutrans Insert\ mode					<09>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Insert\ Mode					<09>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Block\ and\ Insert				<09><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Always					<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ">>>----------------- Edit/File settings
 menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ nru!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ nru!
 menutrans Toggle\ &List\ Mode<Tab>:set\ list!		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		<09><><EFBFBD>&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ C<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	<09><><EFBFBD>&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ C<Tab>:set\ cin!
 ">>>---
 menutrans &Shiftwidth					<09><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Soft\ &Tabstop				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -134,55 +135,64 @@ menutrans &File\ Format\.\.\.				&
 "
 "
 " Tools menu
-menutrans &Jump\ to\ this\ tag<Tab>g^]			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>g^]
-menutrans Jump\ &back<Tab>^T				&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>^T
-menutrans Build\ &Tags\ File				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>g^]
+menutrans Jump\ &Back<Tab>^T				&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><Tab>^T
+menutrans Build\ &Tags\ File				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ <20><>&<EFBFBD><EFBFBD><EFBFBD>
 "-------------------
-menutrans &Folding					<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans &Folding					&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Spelling					<09><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Diff						&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (diff)
 "-------------------
-menutrans &Make<Tab>:make				<09><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:make
+menutrans &Make<Tab>:make				<09><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:make
 menutrans &List\ Errors<Tab>:cl				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:cl!
+menutrans L&ist\ Messages<Tab>:cl!			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:cl!
 menutrans &Next\ Error<Tab>:cn				<09><><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:cn
 menutrans &Previous\ Error<Tab>:cp			<09>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:cp
 menutrans &Older\ List<Tab>:cold			<09><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>&<26><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:cold
 menutrans N&ewer\ List<Tab>:cnew			<09><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:cnew
 menutrans Error\ &Window				<09><>&<26><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans Se&T\ Compiler				<09><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Se&t\ Compiler				<09><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu		<09><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD> 
 "-------------------
 menutrans &Convert\ to\ HEX<Tab>:%!xxd			<09>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ HEX<Tab>:%!xxd
-menutrans Conve&rt\ back<Tab>:%!xxd\ -r			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26>\ HEX<Tab>:%!xxd\ -r
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26>\ HEX<Tab>:%!xxd\ -r
 ">>>---------------- Tools/Spelling
 menutrans &Spell\ Check\ On				&<26><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Spell\ Check\ &Off				<09><>&<26><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans To\ &Next\ error<Tab>]s			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans To\ &Previous\ error<Tab>[s			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans Suggest\ &Corrections<Tab>z=			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans &Repeat\ correction<Tab>:spellrepall		<09><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD>
+menutrans To\ &Next\ Error<Tab>]s			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall		<09><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><Tab>spellrepall
 "-------------------
-menutrans Set\ language\ to\ "en"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en"
-menutrans Set\ language\ to\ "en_au"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_au"
-menutrans Set\ language\ to\ "en_ca"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_ca"
-menutrans Set\ language\ to\ "en_gb"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_gb"
-menutrans Set\ language\ to\ "en_nz"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_nz"
-menutrans Set\ language\ to\ "en_us"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_us"
+menutrans Set\ Language\ to\ "en"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en"
+menutrans Set\ Language\ to\ "en_au"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_au"
+menutrans Set\ Language\ to\ "en_ca"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_nz"
+menutrans Set\ Language\ to\ "en_us"			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ "en_us"
 menutrans &Find\ More\ Languages			&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 let g:menutrans_set_lang_to =				'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'
+"
+"
+" The Spelling popup menu
+"
+"
+let g:menutrans_spell_change_ARG_to =			'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ "%s"\ <20><>'
+let g:menutrans_spell_add_ARG_to_word_list =		'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ "%s"\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
+let g:menutrans_spell_ignore_ARG =			'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ "%s"'
 ">>>---------------- Folds
-menutrans &Enable/Disable\ folds<Tab>zi			<09><><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zi
+menutrans &Enable/Disable\ Folds<Tab>zi			<09><><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zm
-menutrans &Close\ all\ folds<Tab>zM			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zM
-menutrans &Open\ all\ folds<Tab>zR			<09><><EFBFBD><EFBFBD>&<26><><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zR
-menutrans O&pen\ more\ folds<Tab>zr			<09><><EFBFBD>&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zr
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR			<09><><EFBFBD><EFBFBD>&<26><><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr			<09><><EFBFBD>&<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zr
 menutrans Fold\ Met&hod					&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Create\ &Fold<Tab>zf				<09><>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zf
 menutrans &Delete\ Fold<Tab>zd				<09>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zd
 menutrans Delete\ &All\ Folds<Tab>zD			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>&<26>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zD
-menutrans Fold\ col&umn\ width				&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Fold\ col&umn\ Width				&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ">>>->>>----------- Tools/Folds/Fold Method
 menutrans M&anual					<09><><EFBFBD>&<26><><EFBFBD><EFBFBD>
 menutrans I&ndent					<09>&<26><><EFBFBD><EFBFBD><EFBFBD>
@@ -201,15 +211,15 @@ menutrans &Open<Tab>:copen				&
 "
 " Syntax menu
 "
-menutrans &Show\ filetypes\ in\ menu			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>
+menutrans &Show\ File\ Types\ in\ Menu			<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>
 menutrans Set\ '&syntax'\ only				&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ 'syntax'
 menutrans Set\ '&filetype'\ too				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ 'filetype'
 menutrans &Off						&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Manual					<09><><EFBFBD>&<26><><EFBFBD><EFBFBD>
 menutrans A&utomatic					&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans on/off\ for\ &This\ file			<09><><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>
-menutrans Co&lor\ test					<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans &Highlight\ test				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans On/Off\ for\ &This\ File			<09><><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>
+menutrans Co&lor\ Test					<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans &Highlight\ Test				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Convert\ to\ HTML				<09>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ HTML\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 "
 "
@@ -246,8 +256,8 @@ menutrans Min\ Widt&h<Tab>^W1\|
 ">>>----------------- Window/Move To
 menutrans &Top<Tab>^WK					<09>&<26><><EFBFBD><EFBFBD><Tab>^WK
 menutrans &Bottom<Tab>^WJ				<09>&<26><><EFBFBD><Tab>^WJ
-menutrans &Left\ side<Tab>^WH				<09>&<26><><EFBFBD><EFBFBD><Tab>^WH
-menutrans &Right\ side<Tab>^WL				<09>&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>^WL
+menutrans &Left\ Side<Tab>^WH				<09>&<26><><EFBFBD><EFBFBD><Tab>^WH
+menutrans &Right\ Side<Tab>^WL				<09>&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>^WL
 "
 "
 " The popup menu
@@ -260,9 +270,11 @@ menutrans &Paste
 menutrans &Delete					&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Select\ Blockwise				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Select\ &Word					<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>
+menutrans Select\ &Sentence				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Select\ Pa&ragraph				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD>
 menutrans Select\ &Line					<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>&<26><><EFBFBD><EFBFBD>
 menutrans Select\ &Block				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>
-menutrans Select\ &All					<09>&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26>ӣ
+menutrans Select\ &All					<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26>ӣ
 "
 " The GUI toolbar
 "
@@ -280,10 +292,9 @@ if has("toolbar")
     tmenu ToolBar.Cut					<09><><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>
-    tmenu ToolBar.Find					<09><><EFBFBD><EFBFBD><EFBFBD>...
-    tmenu ToolBar.FindNext				<09><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    tmenu ToolBar.FindPrev				<09><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    tmenu ToolBar.Replace				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...
+    tmenu ToolBar.FindNext				<09><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.FindPrev				<09><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    tmenu ToolBar.Replace				<09><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...
     tmenu ToolBar.LoadSesn				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     tmenu ToolBar.SaveSesn				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     tmenu ToolBar.RunScript				<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Vim

runtime/lang/menu_ru_ru.utf-8.vim

@@ -1,3 +1,337 @@
 " Menu Translations:	Russian
+" Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
+" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
+" Last Change:		16 May 2018
+" Original translations
+" URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
+"
+" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
+"
+" Adopted for RuVim project by Vassily Ragosin.
+" First translation: Tim Alexeevsky <realtim [at] mail.ru>,
+" based on ukrainian translation by Bohdan Vlasyuk <bohdan@vstu.edu.ua>
+"
+"
+" Quit when menu translations have already been done.
+"
+if exists("did_menu_trans")
+   finish
+endif
+let did_menu_trans = 1
+let s:keepcpo= &cpo
+set cpo&vim
 
-source <sfile>:p:h/menu_ru_ru.vim
+scriptencoding utf-8
+
+" Top
+menutrans &File				&Файл
+menutrans &Edit				П&равка
+menutrans &Tools			&Инструменты
+menutrans &Syntax			&Синтаксис
+menutrans &Buffers			&Буферы
+menutrans &Window			&Окно
+menutrans &Help				С&правка
+"
+"
+"
+" Help menu
+menutrans &Overview<Tab><F1>		&Обзор<Tab><F1>
+menutrans &User\ Manual			Руково&дство\ пользователя
+menutrans &How-To\ Links		&Как\ это\ сделать\.\.\.
+menutrans &Find\.\.\.			&Поиск
+"--------------------
+menutrans &Credits			&Благодарности
+menutrans Co&pying			&Распространение
+menutrans &Sponsor/Register		Помо&щь/Регистрация
+menutrans O&rphans			&Сироты
+"--------------------
+menutrans &Version			&Информация\ о\ программе
+menutrans &About			&Заставка
+"
+"
+" File menu
+menutrans &Open\.\.\.<Tab>:e		&Открыть\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	По&делить\ окно\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	Открыть\ в&кладку\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew		&Новый<Tab>:enew
+menutrans &Close<Tab>:close		&Закрыть<Tab>:close
+"--------------------
+menutrans &Save<Tab>:w			&Сохранить<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	Сохранить\ &как\.\.\.<Tab>:sav
+"--------------------
+menutrans Split\ &Diff\ With\.\.\.	Ср&авнить\ с\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	Сравнить\ с\ применением\ зап&латки\.\.\.
+"--------------------
+menutrans &Print			На&печатать
+menutrans Sa&ve-Exit<Tab>:wqa		Вы&ход\ с\ сохранением<Tab>:wqa
+menutrans E&xit<Tab>:qa			&Выход<Tab>:qa
+"
+"
+" Edit menu
+menutrans &Undo<Tab>u			О&тменить<Tab>u
+menutrans &Redo<Tab>^R			В&ернуть<Tab>^R
+menutrans Rep&eat<Tab>\.		Повторит&ь<Tab>\.
+"--------------------
+menutrans Cu&t<Tab>"+x			&Вырезать<Tab>"+x
+menutrans &Copy<Tab>"+y			&Копировать<Tab>"+y
+menutrans &Paste<Tab>"+gP		Вк&леить<Tab>"+gP
+menutrans Put\ &Before<Tab>[p		Вклеить\ пере&д<Tab>[p
+menutrans Put\ &After<Tab>]p		Вклеить\ по&сле<Tab>]p
+menutrans &Delete<Tab>x			&Удалить<Tab>x
+menutrans &Select\ All<Tab>ggVG		В&ыделить\ всё<Tab>ggVG
+"--------------------
+" Athena GUI only
+menutrans &Find<Tab>/			&Поиск<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	Поиск\ и\ &замена<Tab>:%s
+" End Athena GUI only
+menutrans &Find\.\.\.<Tab>/		&Поиск\.\.\.<Tab>/
+menutrans Find\ and\ Rep&lace\.\.\.	Поиск\ и\ &замена\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Поиск\ и\ &замена\.\.\.<Tab>:%s
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Поиск\ и\ &замена\.\.\.<Tab>:s
+"--------------------
+menutrans Settings\ &Window		Окно\ настройки\ &опций
+menutrans Startup\ &Settings		Настройки\ запус&ка
+menutrans &Global\ Settings		&Глобальные\ настройки
+menutrans F&ile\ Settings		Настройки\ &файлов
+menutrans C&olor\ Scheme		&Цветовая\ схема
+menutrans &Keymap			Раскладка\ кл&авиатуры
+menutrans Select\ Fo&nt\.\.\.		Выбор\ &шрифта\.\.\.
+">>>----------------- Edit/Global settings
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Подсветка\ &найденных\ соответствий<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&Регистронезависимый\ поиск<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Показывать\ парные\ &элементы<Tab>:set\ sm!
+menutrans &Context\ Lines				Стр&ок\ вокруг\ курсора
+menutrans &Virtual\ Edit				Вир&туальное\ редактирование
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		Режим\ &Вставки<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Совместимость\ с\ Vi<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.				&Путь\ для\ поиска\ файлов\.\.\.
+menutrans Ta&g\ Files\.\.\.				Файлы\ &меток\.\.\.
+"
+menutrans Toggle\ &Toolbar				&Инструментальная\ панель
+menutrans Toggle\ &Bottom\ Scrollbar			Полоса\ прокрутки\ вни&зу
+menutrans Toggle\ &Left\ Scrollbar			Полоса\ прокрутки\ с&лева
+menutrans Toggle\ &Right\ Scrollbar			Полоса\ прокрутки\ спр&ава
+">>>->>>------------- Edit/Global settings/Virtual edit
+menutrans Never						Выключено
+menutrans Block\ Selection				При\ выделении\ блока
+menutrans Insert\ Mode					В\ режиме\ Вставки
+menutrans Block\ and\ Insert				При\ выделении\ блока\ и\ в\ режиме\ Вставки
+menutrans Always					Включено\ всегда
+">>>----------------- Edit/File settings
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерация\ строк<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	Относите&льная\ нумерация\ строк<Tab>:set\ nru!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Отобра&жение\ невидимых\ символов<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&Перенос\ длинных\ строк<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	Перенос\ &целых\ слов<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	Про&белы\ вместо\ табуляции<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	Автоматическое\ форматирование\ &отступов<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Форматирование\ отступов\ в\ &стиле\ C<Tab>:set\ cin!
+">>>---
+menutrans &Shiftwidth					Вели&чина\ отступа
+menutrans Soft\ &Tabstop				Ширина\ &табуляции
+menutrans Te&xt\ Width\.\.\.				&Ширина\ текста\.\.\.
+menutrans &File\ Format\.\.\.				&Формат\ файла\.\.\.
+"
+"
+"
+" Tools menu
+menutrans &Jump\ to\ This\ Tag<Tab>g^]			&Перейти\ к\ метке<Tab>g^]
+menutrans Jump\ &Back<Tab>^T				&Вернуться\ назад<Tab>^T
+menutrans Build\ &Tags\ File				Создать\ файл\ ме&ток
+"-------------------
+menutrans &Folding					&Складки
+menutrans &Spelling					Пр&авописание
+menutrans &Diff						&Отличия\ (diff)
+"-------------------
+menutrans &Make<Tab>:make				Ко&мпилировать<Tab>:make
+menutrans &List\ Errors<Tab>:cl				Список\ о&шибок<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!			Список\ соо&бщений<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn				Следу&ющая\ ошибка<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp			П&редыдущая\ ошибка<Tab>:cp
+menutrans &Older\ List<Tab>:cold			Более\ стар&ый\ список\ ошибок<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew			Более\ све&жий\ список\ ошибок<Tab>:cnew
+menutrans Error\ &Window				Ок&но\ ошибок
+menutrans Se&t\ Compiler				Выбор\ &компилятора
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu		Пока&зать\ настройки\ компи&лятора\ в\ меню 
+"-------------------
+menutrans &Convert\ to\ HEX<Tab>:%!xxd			П&еревести\ в\ HEX<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			Перевести\ и&з\ HEX<Tab>:%!xxd\ -r
+">>>---------------- Tools/Spelling
+menutrans &Spell\ Check\ On				&Вкл\ проверку\ правописания
+menutrans Spell\ Check\ &Off				Вы&кл\ проверку\ правописания
+menutrans To\ &Next\ Error<Tab>]s			&Следующая\ ошибка<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s			&Предыдущая\ ошибка<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=			Предложить\ исп&равления<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall		Пов&торить\ исправление\ для\ всех<Tab>spellrepall
+"-------------------
+menutrans Set\ Language\ to\ "en"			Установить\ язык\ "en"
+menutrans Set\ Language\ to\ "en_au"			Установить\ язык\ "en_au"
+menutrans Set\ Language\ to\ "en_ca"			Установить\ язык\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb"			Установить\ язык\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz"			Установить\ язык\ "en_nz"
+menutrans Set\ Language\ to\ "en_us"			Установить\ язык\ "en_us"
+menutrans &Find\ More\ Languages			&Найти\ больше\ языков
+let g:menutrans_set_lang_to =				'Установить язык'
+"
+"
+" The Spelling popup menu
+"
+"
+let g:menutrans_spell_change_ARG_to =			'Исправить\ "%s"\ на'
+let g:menutrans_spell_add_ARG_to_word_list =		'Добавить\ "%s"\ в\ словарь'
+let g:menutrans_spell_ignore_ARG =			'Пропустить\ "%s"'
+">>>---------------- Folds
+menutrans &Enable/Disable\ Folds<Tab>zi			Вкл/выкл\ &складки<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			Открыть\ строку\ с\ &курсором<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		Открыть\ &только\ строку\ с\ курсором<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm			Закрыть\ &больше\ складок<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM			Закрыть\ &все\ складки<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR			Откр&ыть\ все\ складки<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr			Отк&рыть\ больше\ складок<Tab>zr
+menutrans Fold\ Met&hod					&Метод\ складок
+menutrans Create\ &Fold<Tab>zf				Со&здать\ складку<Tab>zf
+menutrans &Delete\ Fold<Tab>zd				У&далить\ складку<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD			Удалить\ вс&е\ складки<Tab>zD
+menutrans Fold\ col&umn\ Width				&Ширина\ колонки\ складок
+">>>->>>----------- Tools/Folds/Fold Method
+menutrans M&anual					Вру&чную
+menutrans I&ndent					О&тступ
+menutrans E&xpression					&Выражение
+menutrans S&yntax					&Синтаксис
+menutrans Ma&rker					&Маркеры
+">>>--------------- Tools/Diff
+menutrans &Update					О&бновить
+menutrans &Get\ Block					Изменить\ &этот\ буфер
+menutrans &Put\ Block					Изменить\ &другой\ буфер
+">>>--------------- Tools/Diff/Error window
+menutrans &Update<Tab>:cwin				О&бновить<Tab>:cwin
+menutrans &Close<Tab>:cclose				&Закрыть<Tab>:cclose
+menutrans &Open<Tab>:copen				&Открыть<Tab>:copen
+"
+"
+" Syntax menu
+"
+menutrans &Show\ File\ Types\ in\ Menu			Показать\ меню\ выбора\ типа\ &файла
+menutrans Set\ '&syntax'\ only				&Изменять\ только\ значение\ 'syntax'
+menutrans Set\ '&filetype'\ too				Изменять\ &также\ значение\ 'filetype'
+menutrans &Off						&Отключить
+menutrans &Manual					Вру&чную
+menutrans A&utomatic					&Автоматически
+menutrans On/Off\ for\ &This\ File			Вкл/выкл\ для\ &этого\ файла
+menutrans Co&lor\ Test					Проверка\ &цветов
+menutrans &Highlight\ Test				Проверка\ под&светки
+menutrans &Convert\ to\ HTML				С&делать\ HTML\ с\ подсветкой
+"
+"
+" Buffers menu
+"
+menutrans &Refresh\ menu				О&бновить\ меню
+menutrans Delete					У&далить
+menutrans &Alternate					&Соседний
+menutrans &Next						С&ледующий
+menutrans &Previous					&Предыдущий
+menutrans [No\ File]					[Нет\ файла]
+"
+"
+" Window menu
+"
+menutrans &New<Tab>^Wn					&Новое\ окно<Tab>^Wn
+menutrans S&plit<Tab>^Ws				&Разделить\ окно<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^			Открыть\ &соседний\ файл\ в\ новом\ окне<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv			Разделить\ по\ &вертикали<Tab>^Wv
+menutrans Split\ File\ E&xplorer			Открыть\ проводник\ по\ &файловой\ системе
+"
+menutrans &Close<Tab>^Wc				&Закрыть\ это\ окно<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo			Закрыть\ &остальные\ окна<Tab>^Wo
+"
+menutrans Move\ &To					&Переместить
+menutrans Rotate\ &Up<Tab>^WR				Сдвинуть\ ввер&х<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr				Сдвинуть\ в&низ<Tab>^Wr
+"
+menutrans &Equal\ Size<Tab>^W=				О&динаковый\ размер<Tab>^W=
+menutrans &Max\ Height<Tab>^W_				Максимальная\ в&ысота<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_				Минимальная\ высо&та<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|				Максимальная\ &ширина<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|				Минимал&ьная\ ширина<Tab>^W1\|
+">>>----------------- Window/Move To
+menutrans &Top<Tab>^WK					В&верх<Tab>^WK
+menutrans &Bottom<Tab>^WJ				В&низ<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH				В&лево<Tab>^WH
+menutrans &Right\ Side<Tab>^WL				В&право<Tab>^WL
+"
+"
+" The popup menu
+"
+"
+menutrans &Undo						О&тменить
+menutrans Cu&t						&Вырезать
+menutrans &Copy						&Копировать
+menutrans &Paste					Вк&леить
+menutrans &Delete					&Удалить
+menutrans Select\ Blockwise				Блоковое\ выделение
+menutrans Select\ &Word					Выделить\ &слово
+menutrans Select\ &Sentence				Выделить\ &предложение
+menutrans Select\ Pa&ragraph				Выделить\ пара&граф
+menutrans Select\ &Line					Выделить\ ст&року
+menutrans Select\ &Block				Выделить\ &блок
+menutrans Select\ &All					Выделить\ &всё
+"
+" The GUI toolbar
+"
+if has("toolbar")
+  if exists("*Do_toolbar_tmenu")
+    delfun Do_toolbar_tmenu
+  endif
+  fun Do_toolbar_tmenu()
+    tmenu ToolBar.Open					Открыть файл
+    tmenu ToolBar.Save					Сохранить файл
+    tmenu ToolBar.SaveAll				Сохранить все файлы
+    tmenu ToolBar.Print					Напечатать
+    tmenu ToolBar.Undo					Отменить
+    tmenu ToolBar.Redo					Вернуть
+    tmenu ToolBar.Cut					Вырезать
+    tmenu ToolBar.Copy					Копировать
+    tmenu ToolBar.Paste					Вклеить
+    tmenu ToolBar.FindNext				Найти следующее
+    tmenu ToolBar.FindPrev				Найти предыдущее
+    tmenu ToolBar.Replace				Найти или заменить...
+    tmenu ToolBar.LoadSesn				Загрузить сеанс редактирования
+    tmenu ToolBar.SaveSesn				Сохранить сеанс редактирования
+    tmenu ToolBar.RunScript				Выполнить сценарий Vim
+    tmenu ToolBar.Make					Компиляция
+    tmenu ToolBar.Shell					Оболочка
+    tmenu ToolBar.RunCtags				Создать файл меток
+    tmenu ToolBar.TagJump				Перейти к метке
+    tmenu ToolBar.Help					Справка
+    tmenu ToolBar.FindHelp				Найти справку
+  endfun
+endif
+"
+"
+" Dialog texts
+"
+" Find in help dialog
+"
+let g:menutrans_help_dialog = "Введите команду или слово для поиска:\n\nДобавьте i_ для поиска команд режима Вставки (например, i_CTRL-X)\nДобавьте c_ для поиска команд Обычного режима (например, с_<Del>)\nДобавьте ' для поиска справки по опции (например, 'shiftwidth')"
+"
+" Searh path dialog
+"
+let g:menutrans_path_dialog = "Укажите путь для поиска файлов.\nИмена каталогов разделяются запятыми."
+"
+" Tag files dialog
+"
+let g:menutrans_tags_dialog = "Введите имена файлов меток (через запятую).\n"
+"
+" Text width dialog
+"
+let g:menutrans_textwidth_dialog = "Введите ширину текста для форматирования.\nДля отмены форматирования введите 0."
+"
+" File format dialog
+"
+let g:menutrans_fileformat_dialog = "Выберите формат файла."
+let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nО&тмена"
+"
+let menutrans_no_file = "[Нет файла]"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo

runtime/lang/menu_ru_ru.vim

@@ -1,336 +1,3 @@
 " Menu Translations:	Russian
-" Maintainer:		Sergey Alyoshin <alyoshin.s@gmail.com>
-" Previous Maintainer:	Vassily Ragosin <vrr[at]users.sourceforge.net>
-" Last Change:		16 May 2018
-" URL:			cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim
-"
-" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $
-"
-" Adopted for RuVim project by Vassily Ragosin.
-" First translation: Tim Alexeevsky <realtim [at] mail.ru>,
-" based on ukrainian translation by Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-"
-"
-" Quit when menu translations have already been done.
-"
-if exists("did_menu_trans")
-   finish
-endif
-let did_menu_trans = 1
-let s:keepcpo= &cpo
-set cpo&vim
 
-scriptencoding utf-8
-
-" Top
-menutrans &File				&Файл
-menutrans &Edit				П&равка
-menutrans &Tools			&Инструменты
-menutrans &Syntax			&Синтаксис
-menutrans &Buffers			&Буферы
-menutrans &Window			&Окно
-menutrans &Help				С&правка
-"
-"
-"
-" Help menu
-menutrans &Overview<Tab><F1>		&Обзор<Tab><F1>
-menutrans &User\ Manual			Руково&дство\ пользователя
-menutrans &How-To\ Links		&Как\ это\ сделать\.\.\.
-menutrans &Find\.\.\.			&Поиск
-"--------------------
-menutrans &Credits			&Благодарности
-menutrans Co&pying			&Распространение
-menutrans &Sponsor/Register		Помо&щь/Регистрация
-menutrans O&rphans			&Сироты
-"--------------------
-menutrans &Version			&Информация\ о\ программе
-menutrans &About			&Заставка
-"
-"
-" File menu
-menutrans &Open\.\.\.<Tab>:e		&Открыть\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	По&делить\ окно\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	Открыть\ в&кладку\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		&Новый<Tab>:enew
-menutrans &Close<Tab>:close		&Закрыть<Tab>:close
-"--------------------
-menutrans &Save<Tab>:w			&Сохранить<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	Сохранить\ &как\.\.\.<Tab>:sav
-"--------------------
-menutrans Split\ &Diff\ With\.\.\.	Ср&авнить\ с\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	Сравнить\ с\ применением\ зап&латки\.\.\.
-"--------------------
-menutrans &Print			На&печатать
-menutrans Sa&ve-Exit<Tab>:wqa		Вы&ход\ с\ сохранением<Tab>:wqa
-menutrans E&xit<Tab>:qa			&Выход<Tab>:qa
-"
-"
-" Edit menu
-menutrans &Undo<Tab>u			О&тменить<Tab>u
-menutrans &Redo<Tab>^R			В&ернуть<Tab>^R
-menutrans Rep&eat<Tab>\.		Повторит&ь<Tab>\.
-"--------------------
-menutrans Cu&t<Tab>"+x			&Вырезать<Tab>"+x
-menutrans &Copy<Tab>"+y			&Копировать<Tab>"+y
-menutrans &Paste<Tab>"+gP		Вк&леить<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		Вклеить\ пере&д<Tab>[p
-menutrans Put\ &After<Tab>]p		Вклеить\ по&сле<Tab>]p
-menutrans &Delete<Tab>x			&Удалить<Tab>x
-menutrans &Select\ All<Tab>ggVG		В&ыделить\ всё<Tab>ggVG
-"--------------------
-" Athena GUI only
-menutrans &Find<Tab>/			&Поиск<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	Поиск\ и\ &замена<Tab>:%s
-" End Athena GUI only
-menutrans &Find\.\.\.<Tab>/		&Поиск\.\.\.<Tab>/
-menutrans Find\ and\ Rep&lace\.\.\.	Поиск\ и\ &замена\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Поиск\ и\ &замена\.\.\.<Tab>:%s
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Поиск\ и\ &замена\.\.\.<Tab>:s
-"--------------------
-menutrans Settings\ &Window		Окно\ настройки\ &опций
-menutrans Startup\ &Settings		Настройки\ запус&ка
-menutrans &Global\ Settings		&Глобальные\ настройки
-menutrans F&ile\ Settings		Настройки\ &файлов
-menutrans C&olor\ Scheme		&Цветовая\ схема
-menutrans &Keymap			Раскладка\ кл&авиатуры
-menutrans Select\ Fo&nt\.\.\.		Выбор\ &шрифта\.\.\.
-">>>----------------- Edit/Global settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Подсветка\ &найденных\ соответствий<Tab>:set\ hls!
-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		&Регистронезависимый\ поиск<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Показывать\ парные\ &элементы<Tab>:set\ sm!
-menutrans &Context\ Lines				Стр&ок\ вокруг\ курсора
-menutrans &Virtual\ Edit				Вир&туальное\ редактирование
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		Режим\ &Вставки<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Совместимость\ с\ Vi<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.				&Путь\ для\ поиска\ файлов\.\.\.
-menutrans Ta&g\ Files\.\.\.				Файлы\ &меток\.\.\.
-"
-menutrans Toggle\ &Toolbar				&Инструментальная\ панель
-menutrans Toggle\ &Bottom\ Scrollbar			Полоса\ прокрутки\ вни&зу
-menutrans Toggle\ &Left\ Scrollbar			Полоса\ прокрутки\ с&лева
-menutrans Toggle\ &Right\ Scrollbar			Полоса\ прокрутки\ спр&ава
-">>>->>>------------- Edit/Global settings/Virtual edit
-menutrans Never						Выключено
-menutrans Block\ Selection				При\ выделении\ блока
-menutrans Insert\ Mode					В\ режиме\ Вставки
-menutrans Block\ and\ Insert				При\ выделении\ блока\ и\ в\ режиме\ Вставки
-menutrans Always					Включено\ всегда
-">>>----------------- Edit/File settings
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	&Нумерация\ строк<Tab>:set\ nu!
-menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	Относите&льная\ нумерация\ строк<Tab>:set\ nru!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		Отобра&жение\ невидимых\ символов<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	&Перенос\ длинных\ строк<Tab>:set\ wrap!
-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	Перенос\ &целых\ слов<Tab>:set\ lbr!
-menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	Про&белы\ вместо\ табуляции<Tab>:set\ et!
-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	Автоматическое\ форматирование\ &отступов<Tab>:set\ ai!
-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	Форматирование\ отступов\ в\ &стиле\ C<Tab>:set\ cin!
-">>>---
-menutrans &Shiftwidth					Вели&чина\ отступа
-menutrans Soft\ &Tabstop				Ширина\ &табуляции
-menutrans Te&xt\ Width\.\.\.				&Ширина\ текста\.\.\.
-menutrans &File\ Format\.\.\.				&Формат\ файла\.\.\.
-"
-"
-"
-" Tools menu
-menutrans &Jump\ to\ This\ Tag<Tab>g^]			&Перейти\ к\ метке<Tab>g^]
-menutrans Jump\ &Back<Tab>^T				&Вернуться\ назад<Tab>^T
-menutrans Build\ &Tags\ File				Создать\ файл\ ме&ток
-"-------------------
-menutrans &Folding					&Складки
-menutrans &Spelling					Пр&авописание
-menutrans &Diff						&Отличия\ (diff)
-"-------------------
-menutrans &Make<Tab>:make				Ко&мпилировать<Tab>:make
-menutrans &List\ Errors<Tab>:cl				Список\ о&шибок<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!			Список\ соо&бщений<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn				Следу&ющая\ ошибка<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp			П&редыдущая\ ошибка<Tab>:cp
-menutrans &Older\ List<Tab>:cold			Более\ стар&ый\ список\ ошибок<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew			Более\ све&жий\ список\ ошибок<Tab>:cnew
-menutrans Error\ &Window				Ок&но\ ошибок
-menutrans Se&t\ Compiler				Выбор\ &компилятора
-menutrans Show\ Compiler\ Se&ttings\ in\ Menu		Пока&зать\ настройки\ компи&лятора\ в\ меню 
-"-------------------
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			П&еревести\ в\ HEX<Tab>:%!xxd
-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			Перевести\ и&з\ HEX<Tab>:%!xxd\ -r
-">>>---------------- Tools/Spelling
-menutrans &Spell\ Check\ On				&Вкл\ проверку\ правописания
-menutrans Spell\ Check\ &Off				Вы&кл\ проверку\ правописания
-menutrans To\ &Next\ Error<Tab>]s			&Следующая\ ошибка<Tab>]s
-menutrans To\ &Previous\ Error<Tab>[s			&Предыдущая\ ошибка<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=			Предложить\ исп&равления<Tab>z=
-menutrans &Repeat\ Correction<Tab>:spellrepall		Пов&торить\ исправление\ для\ всех<Tab>spellrepall
-"-------------------
-menutrans Set\ Language\ to\ "en"			Установить\ язык\ "en"
-menutrans Set\ Language\ to\ "en_au"			Установить\ язык\ "en_au"
-menutrans Set\ Language\ to\ "en_ca"			Установить\ язык\ "en_ca"
-menutrans Set\ Language\ to\ "en_gb"			Установить\ язык\ "en_gb"
-menutrans Set\ Language\ to\ "en_nz"			Установить\ язык\ "en_nz"
-menutrans Set\ Language\ to\ "en_us"			Установить\ язык\ "en_us"
-menutrans &Find\ More\ Languages			&Найти\ больше\ языков
-let g:menutrans_set_lang_to =				'Установить язык'
-"
-"
-" The Spelling popup menu
-"
-"
-let g:menutrans_spell_change_ARG_to =			'Исправить\ "%s"\ на'
-let g:menutrans_spell_add_ARG_to_word_list =		'Добавить\ "%s"\ в\ словарь'
-let g:menutrans_spell_ignore_ARG =			'Пропустить\ "%s"'
-">>>---------------- Folds
-menutrans &Enable/Disable\ Folds<Tab>zi			Вкл/выкл\ &складки<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			Открыть\ строку\ с\ &курсором<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx		Открыть\ &только\ строку\ с\ курсором<Tab>zMzx
-menutrans C&lose\ More\ Folds<Tab>zm			Закрыть\ &больше\ складок<Tab>zm
-menutrans &Close\ All\ Folds<Tab>zM			Закрыть\ &все\ складки<Tab>zM
-menutrans &Open\ All\ Folds<Tab>zR			Откр&ыть\ все\ складки<Tab>zR
-menutrans O&pen\ More\ Folds<Tab>zr			Отк&рыть\ больше\ складок<Tab>zr
-menutrans Fold\ Met&hod					&Метод\ складок
-menutrans Create\ &Fold<Tab>zf				Со&здать\ складку<Tab>zf
-menutrans &Delete\ Fold<Tab>zd				У&далить\ складку<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD			Удалить\ вс&е\ складки<Tab>zD
-menutrans Fold\ col&umn\ Width				&Ширина\ колонки\ складок
-">>>->>>----------- Tools/Folds/Fold Method
-menutrans M&anual					Вру&чную
-menutrans I&ndent					О&тступ
-menutrans E&xpression					&Выражение
-menutrans S&yntax					&Синтаксис
-menutrans Ma&rker					&Маркеры
-">>>--------------- Tools/Diff
-menutrans &Update					О&бновить
-menutrans &Get\ Block					Изменить\ &этот\ буфер
-menutrans &Put\ Block					Изменить\ &другой\ буфер
-">>>--------------- Tools/Diff/Error window
-menutrans &Update<Tab>:cwin				О&бновить<Tab>:cwin
-menutrans &Close<Tab>:cclose				&Закрыть<Tab>:cclose
-menutrans &Open<Tab>:copen				&Открыть<Tab>:copen
-"
-"
-" Syntax menu
-"
-menutrans &Show\ File\ Types\ in\ Menu			Показать\ меню\ выбора\ типа\ &файла
-menutrans Set\ '&syntax'\ only				&Изменять\ только\ значение\ 'syntax'
-menutrans Set\ '&filetype'\ too				Изменять\ &также\ значение\ 'filetype'
-menutrans &Off						&Отключить
-menutrans &Manual					Вру&чную
-menutrans A&utomatic					&Автоматически
-menutrans On/Off\ for\ &This\ File			Вкл/выкл\ для\ &этого\ файла
-menutrans Co&lor\ Test					Проверка\ &цветов
-menutrans &Highlight\ Test				Проверка\ под&светки
-menutrans &Convert\ to\ HTML				С&делать\ HTML\ с\ подсветкой
-"
-"
-" Buffers menu
-"
-menutrans &Refresh\ menu				О&бновить\ меню
-menutrans Delete					У&далить
-menutrans &Alternate					&Соседний
-menutrans &Next						С&ледующий
-menutrans &Previous					&Предыдущий
-menutrans [No\ File]					[Нет\ файла]
-"
-"
-" Window menu
-"
-menutrans &New<Tab>^Wn					&Новое\ окно<Tab>^Wn
-menutrans S&plit<Tab>^Ws				&Разделить\ окно<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^			Открыть\ &соседний\ файл\ в\ новом\ окне<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv			Разделить\ по\ &вертикали<Tab>^Wv
-menutrans Split\ File\ E&xplorer			Открыть\ проводник\ по\ &файловой\ системе
-"
-menutrans &Close<Tab>^Wc				&Закрыть\ это\ окно<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo			Закрыть\ &остальные\ окна<Tab>^Wo
-"
-menutrans Move\ &To					&Переместить
-menutrans Rotate\ &Up<Tab>^WR				Сдвинуть\ ввер&х<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr				Сдвинуть\ в&низ<Tab>^Wr
-"
-menutrans &Equal\ Size<Tab>^W=				О&динаковый\ размер<Tab>^W=
-menutrans &Max\ Height<Tab>^W_				Максимальная\ в&ысота<Tab>^W_
-menutrans M&in\ Height<Tab>^W1_				Минимальная\ высо&та<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|				Максимальная\ &ширина<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|				Минимал&ьная\ ширина<Tab>^W1\|
-">>>----------------- Window/Move To
-menutrans &Top<Tab>^WK					В&верх<Tab>^WK
-menutrans &Bottom<Tab>^WJ				В&низ<Tab>^WJ
-menutrans &Left\ Side<Tab>^WH				В&лево<Tab>^WH
-menutrans &Right\ Side<Tab>^WL				В&право<Tab>^WL
-"
-"
-" The popup menu
-"
-"
-menutrans &Undo						О&тменить
-menutrans Cu&t						&Вырезать
-menutrans &Copy						&Копировать
-menutrans &Paste					Вк&леить
-menutrans &Delete					&Удалить
-menutrans Select\ Blockwise				Блоковое\ выделение
-menutrans Select\ &Word					Выделить\ &слово
-menutrans Select\ &Sentence				Выделить\ &предложение
-menutrans Select\ Pa&ragraph				Выделить\ пара&граф
-menutrans Select\ &Line					Выделить\ ст&року
-menutrans Select\ &Block				Выделить\ &блок
-menutrans Select\ &All					Выделить\ &всё
-"
-" The GUI toolbar
-"
-if has("toolbar")
-  if exists("*Do_toolbar_tmenu")
-    delfun Do_toolbar_tmenu
-  endif
-  fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open					Открыть файл
-    tmenu ToolBar.Save					Сохранить файл
-    tmenu ToolBar.SaveAll				Сохранить все файлы
-    tmenu ToolBar.Print					Напечатать
-    tmenu ToolBar.Undo					Отменить
-    tmenu ToolBar.Redo					Вернуть
-    tmenu ToolBar.Cut					Вырезать
-    tmenu ToolBar.Copy					Копировать
-    tmenu ToolBar.Paste					Вклеить
-    tmenu ToolBar.FindNext				Найти следующее
-    tmenu ToolBar.FindPrev				Найти предыдущее
-    tmenu ToolBar.Replace				Найти или заменить...
-    tmenu ToolBar.LoadSesn				Загрузить сеанс редактирования
-    tmenu ToolBar.SaveSesn				Сохранить сеанс редактирования
-    tmenu ToolBar.RunScript				Выполнить сценарий Vim
-    tmenu ToolBar.Make					Компиляция
-    tmenu ToolBar.Shell					Оболочка
-    tmenu ToolBar.RunCtags				Создать файл меток
-    tmenu ToolBar.TagJump				Перейти к метке
-    tmenu ToolBar.Help					Справка
-    tmenu ToolBar.FindHelp				Найти справку
-  endfun
-endif
-"
-"
-" Dialog texts
-"
-" Find in help dialog
-"
-let g:menutrans_help_dialog = "Введите команду или слово для поиска:\n\nДобавьте i_ для поиска команд режима Вставки (например, i_CTRL-X)\nДобавьте c_ для поиска команд Обычного режима (например, с_<Del>)\nДобавьте ' для поиска справки по опции (например, 'shiftwidth')"
-"
-" Searh path dialog
-"
-let g:menutrans_path_dialog = "Укажите путь для поиска файлов.\nИмена каталогов разделяются запятыми."
-"
-" Tag files dialog
-"
-let g:menutrans_tags_dialog = "Введите имена файлов меток (через запятую).\n"
-"
-" Text width dialog
-"
-let g:menutrans_textwidth_dialog = "Введите ширину текста для форматирования.\nДля отмены форматирования введите 0."
-"
-" File format dialog
-"
-let g:menutrans_fileformat_dialog = "Выберите формат файла."
-let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nО&тмена"
-"
-let menutrans_no_file = "[Нет файла]"
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
+source <sfile>:p:h/menu_ru_ru.utf-8.vim

runtime/lang/menu_sk_sk.iso_8859-2.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Slovak
 " Translated By:	Martin Lacko <lacko@host.sk>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_sl_si.cp1250.vim

@@ -1,8 +1,9 @@
 " Menu Translations:	Slovenian / Slovensko
 " Maintainer:		Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
-" Last Change:		2016 Oct 17
+" Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT
 
 " TODO: add/check all '&'s
 
@@ -113,29 +114,29 @@ if has("spell")
     menutrans To\ &Previous\ error<Tab>[s		K\ &prej<EFBFBD>nji\ napaki<Tab>[s
     menutrans Suggest\ &Corrections<Tab>z=		Predlagaj\ popravek<Tab>z=
     menutrans &Repeat\ correction<Tab>:spellrepall	Po&novi\ popravke\ na\ vseh\ besedah<Tab>:spellrepall
-    menutrans Set\ language\ to\ "en"			Angle<EFBFBD>ki\ "en"
-    menutrans Set\ language\ to\ "en_au"		Angle<EFBFBD>ki\ "en_au"
-    menutrans Set\ language\ to\ "en_ca"		Angle<EFBFBD>ki\ "en_ca"
-    menutrans Set\ language\ to\ "en_gb"		Angle<EFBFBD>ki\ "en_gb"
-    menutrans Set\ language\ to\ "en_nz"		Angle<EFBFBD>ki\ "en_nz"
-    menutrans Set\ language\ to\ "en_us"		Angle<EFBFBD>ki\ "en_us"
-    menutrans Set\ language\ to\ "sl"			Slovenski\ "sl"
-    menutrans Set\ language\ to\ "de"			Nem<EFBFBD>ki\ "de"
+    menutrans Set\ language\ to\ "en"			<EFBFBD>rkovalnik:\ angle<EFBFBD>ki\ "en"
+    menutrans Set\ language\ to\ "en_au"		<EFBFBD>rkovalnik:\ angle<EFBFBD>ki\ "en_au"
+    menutrans Set\ language\ to\ "en_ca"		<EFBFBD>rkovalnik:\ angle<EFBFBD>ki\ "en_ca"
+    menutrans Set\ language\ to\ "en_gb"		<EFBFBD>rkovalnik:\ angle<EFBFBD>ki\ "en_gb"
+    menutrans Set\ language\ to\ "en_nz"		<EFBFBD>rkovalnik:\ angle<EFBFBD>ki\ "en_nz"
+    menutrans Set\ language\ to\ "en_us"		<EFBFBD>rkovalnik:\ angle<EFBFBD>ki\ "en_us"
+    menutrans Set\ language\ to\ "sl"			<EFBFBD>rkovalnik:\ slovenski\ "sl"
+    menutrans Set\ language\ to\ "de"			<EFBFBD>rkovalnik:\ nem<EFBFBD>ki\ "de"
     menutrans Set\ language\ to\ 			<09>rkovalnik:\
     menutrans &Find\ More\ Languages			&Ostali\ jeziki
 endif
 if has("folding")
-  menutrans &Folding					Zvijanje\ kode
+  menutrans &Folding					Zavihek
   " open close folds
-  menutrans &Enable/Disable\ folds<Tab>zi		Omogo<67>i/onemogo<EFBFBD>i\ zvijanje<Tab>zi " Omogo<67>i/onemogo<67>i\ zavihke
-  menutrans &View\ Cursor\ Line<Tab>zv			Poka<EFBFBD>i\ vrstico\ s\ kazal<EFBFBD>kom<Tab>zv " kjer je kazalec
-  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Poka<EFBFBD>i\ samo\ vrstico\ s\ kazal<EFBFBD>kom<Tab>zMzx
-  menutrans C&lose\ more\ folds<Tab>zm			Zvij\ naslednji\ nivo<Tab>zm " Zapri\ ve<76>\ zavihkov
-  menutrans &Close\ all\ folds<Tab>zM			Zvij\ vso\ kodo<Tab>zM " Zapri\ vse\ zavihke
-  menutrans O&pen\ more\ folds<Tab>zr			Razvij\ en\ nivo<Tab>zr " Odpri\ ve<76>\ zavihkov
-  menutrans &Open\ all\ folds<Tab>zR			Razvij\ vso\ kodo<Tab>zR " Odpri\ vse\ zavihke
+  menutrans &Enable/Disable\ folds<Tab>zi		Omogo<67>i/onemogo<EFBFBD>i\ zavihke<Tab>zi
+  menutrans &View\ Cursor\ Line<Tab>zv			Poka<EFBFBD>i\ vrstico\ s\ kazalcem<Tab>zv " kjer je kazalec
+  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Poka<EFBFBD>i\ samo\ vrstico\ s\ kazalcem<Tab>zMzx
+  menutrans C&lose\ more\ folds<Tab>zm			Zapri\ ve<EFBFBD>\ zavihkov<Tab>zm
+  menutrans &Close\ all\ folds<Tab>zM			Zapri\ vse\ zavihke<Tab>zM
+  menutrans O&pen\ more\ folds<Tab>zr			Odpri\ ve<EFBFBD>\ zavihkov<Tab>zr
+  menutrans &Open\ all\ folds<Tab>zR			Odpri\ vse\ zavihke<Tab>zR
   " fold method
-  menutrans Fold\ Met&hod				Kriterij\ za\ zvijanje " Ustvarjanje\ zavihkov
+  menutrans Fold\ Met&hod				Ustvarjanje\ zavihkov
   menutrans M&anual					&Ro<EFBFBD>no
   menutrans I&ndent					Glede\ na\ &poravnavo
   menutrans E&xpression					Z\ &izrazi\ (foldexpr)
@@ -144,17 +145,17 @@ if has("folding")
   menutrans Ma&rker					Z\ &markerji/ozna<EFBFBD>bami
   " create and delete folds
   " TODO accelerators
-  menutrans Create\ &Fold<Tab>zf			Ustvari\ zvitek<Tab>zf
-  menutrans &Delete\ Fold<Tab>zd			Izbri<EFBFBD>i\ zvitek<Tab>zd
-  menutrans Delete\ &All\ Folds<Tab>zD			Izbri<EFBFBD>i\ vse\ zvitke<Tab>zD
+  menutrans Create\ &Fold<Tab>zf			Ustvari\ zavihek<Tab>zf
+  menutrans &Delete\ Fold<Tab>zd			Izbri<EFBFBD>i\ zavihek<Tab>zd
+  menutrans Delete\ &All\ Folds<Tab>zD			Izbri<EFBFBD>i\ vse\ zavihke<Tab>zD
   " moving around in folds
-  menutrans Fold\ column\ &width			<09>irina\ drevesa\ z\ zvitki
+  menutrans Fold\ column\ &width			<09>irina\ stolpca\ z\ zavihkom
 endif  " has folding
 
 if has("diff")
   menutrans &Diff					Razlike\ (&Diff)
   menutrans &Update					&Posodobi<Tab>
-  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " XXX: check if translation is OK
+  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " TODO: check if translation is OK
   menutrans &Put\ Block					&Po<EFBFBD>lji\ (spremeni\ drugo\ okno)
 endif
 
@@ -251,7 +252,7 @@ menutrans Select\ &Sentence		Izberi\ &stavek
 menutrans Select\ Pa&ragraph		Izberi\ &odstavek
 menutrans Select\ &Line			Izberi\ vrs&tico
 menutrans Select\ &Block		Izberi\ b&lok
-menutrans &Select\ All<Tab>ggVG		Izberi\ &vse<Tab>ggVG
+menutrans Select\ &All			Izberi\ &vse
 " }}} POPUP
 
 " {{{ TOOLBAR

runtime/lang/menu_sl_si.latin2.vim

@@ -3,6 +3,7 @@
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Generated from menu_sl_si.utf-8.vim, DO NOT EDIT
 
 " TODO: add/check all '&'s
 

runtime/lang/menu_sl_si.utf-8.vim

@@ -1,8 +1,9 @@
 " Menu Translations:	Slovenian / Slovensko
 " Maintainer:		Mojca Miklavec <mojca.miklavec.lists@gmail.com>
 " Originally By:	Mojca Miklavec <mojca.miklavec.lists@gmail.com>
-" Last Change:		2016 Oct 17
+" Last Change:		2020 Apr 23
 " vim:set foldmethod=marker tabstop=8:
+" Original translations
 
 " TODO: add/check all '&'s
 
@@ -113,29 +114,29 @@ if has("spell")
     menutrans To\ &Previous\ error<Tab>[s		K\ &prejšnji\ napaki<Tab>[s
     menutrans Suggest\ &Corrections<Tab>z=		Predlagaj\ popravek<Tab>z=
     menutrans &Repeat\ correction<Tab>:spellrepall	Po&novi\ popravke\ na\ vseh\ besedah<Tab>:spellrepall
-    menutrans Set\ language\ to\ "en"			Angleški\ "en"
-    menutrans Set\ language\ to\ "en_au"		Angleški\ "en_au"
-    menutrans Set\ language\ to\ "en_ca"		Angleški\ "en_ca"
-    menutrans Set\ language\ to\ "en_gb"		Angleški\ "en_gb"
-    menutrans Set\ language\ to\ "en_nz"		Angleški\ "en_nz"
-    menutrans Set\ language\ to\ "en_us"		Angleški\ "en_us"
-    menutrans Set\ language\ to\ "sl"			Slovenski\ "sl"
-    menutrans Set\ language\ to\ "de"			Nemški\ "de"
+    menutrans Set\ language\ to\ "en"			Črkovalnik:\ angleški\ "en"
+    menutrans Set\ language\ to\ "en_au"		Črkovalnik:\ angleški\ "en_au"
+    menutrans Set\ language\ to\ "en_ca"		Črkovalnik:\ angleški\ "en_ca"
+    menutrans Set\ language\ to\ "en_gb"		Črkovalnik:\ angleški\ "en_gb"
+    menutrans Set\ language\ to\ "en_nz"		Črkovalnik:\ angleški\ "en_nz"
+    menutrans Set\ language\ to\ "en_us"		Črkovalnik:\ angleški\ "en_us"
+    menutrans Set\ language\ to\ "sl"			Črkovalnik:\ slovenski\ "sl"
+    menutrans Set\ language\ to\ "de"			Črkovalnik:\ nemški\ "de"
     menutrans Set\ language\ to\ 			Črkovalnik:\
     menutrans &Find\ More\ Languages			&Ostali\ jeziki
 endif
 if has("folding")
-  menutrans &Folding					Zvijanje\ kode
+  menutrans &Folding					Zavihek
   " open close folds
-  menutrans &Enable/Disable\ folds<Tab>zi		Omogoči/onemogoči\ zvijanje<Tab>zi " Omogoči/onemogoči\ zavihke
-  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalčkom<Tab>zv " kjer je kazalec
-  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalčkom<Tab>zMzx
-  menutrans C&lose\ more\ folds<Tab>zm			Zvij\ naslednji\ nivo<Tab>zm " Zapri\ več\ zavihkov
-  menutrans &Close\ all\ folds<Tab>zM			Zvij\ vso\ kodo<Tab>zM " Zapri\ vse\ zavihke
-  menutrans O&pen\ more\ folds<Tab>zr			Razvij\ en\ nivo<Tab>zr " Odpri\ več\ zavihkov
-  menutrans &Open\ all\ folds<Tab>zR			Razvij\ vso\ kodo<Tab>zR " Odpri\ vse\ zavihke
+  menutrans &Enable/Disable\ folds<Tab>zi		Omogoči/onemogoči\ zavihke<Tab>zi
+  menutrans &View\ Cursor\ Line<Tab>zv			Pokaži\ vrstico\ s\ kazalcem<Tab>zv " kjer je kazalec
+  menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Pokaži\ samo\ vrstico\ s\ kazalcem<Tab>zMzx
+  menutrans C&lose\ more\ folds<Tab>zm			Zapri\ več\ zavihkov<Tab>zm
+  menutrans &Close\ all\ folds<Tab>zM			Zapri\ vse\ zavihke<Tab>zM
+  menutrans O&pen\ more\ folds<Tab>zr			Odpri\ več\ zavihkov<Tab>zr
+  menutrans &Open\ all\ folds<Tab>zR			Odpri\ vse\ zavihke<Tab>zR
   " fold method
-  menutrans Fold\ Met&hod				Kriterij\ za\ zvijanje " Ustvarjanje\ zavihkov
+  menutrans Fold\ Met&hod				Ustvarjanje\ zavihkov
   menutrans M&anual					&Ročno
   menutrans I&ndent					Glede\ na\ &poravnavo
   menutrans E&xpression					Z\ &izrazi\ (foldexpr)
@@ -144,17 +145,17 @@ if has("folding")
   menutrans Ma&rker					Z\ &markerji/označbami
   " create and delete folds
   " TODO accelerators
-  menutrans Create\ &Fold<Tab>zf			Ustvari\ zvitek<Tab>zf
-  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zvitek<Tab>zd
-  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zvitke<Tab>zD
+  menutrans Create\ &Fold<Tab>zf			Ustvari\ zavihek<Tab>zf
+  menutrans &Delete\ Fold<Tab>zd			Izbriši\ zavihek<Tab>zd
+  menutrans Delete\ &All\ Folds<Tab>zD			Izbriši\ vse\ zavihke<Tab>zD
   " moving around in folds
-  menutrans Fold\ column\ &width			Širina\ drevesa\ z\ zvitki
+  menutrans Fold\ column\ &width			Širina\ stolpca\ z\ zavihkom
 endif  " has folding
 
 if has("diff")
   menutrans &Diff					Razlike\ (&Diff)
   menutrans &Update					&Posodobi<Tab>
-  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " XXX: check if translation is OK
+  menutrans &Get\ Block					&Sprejmi\ (spremeni\ to\ okno) " TODO: check if translation is OK
   menutrans &Put\ Block					&Pošlji\ (spremeni\ drugo\ okno)
 endif
 
@@ -251,7 +252,7 @@ menutrans Select\ &Sentence		Izberi\ &stavek
 menutrans Select\ Pa&ragraph		Izberi\ &odstavek
 menutrans Select\ &Line			Izberi\ vrs&tico
 menutrans Select\ &Block		Izberi\ b&lok
-menutrans &Select\ All<Tab>ggVG		Izberi\ &vse<Tab>ggVG
+menutrans Select\ &All			Izberi\ &vse
 " }}} POPUP
 
 " {{{ TOOLBAR

runtime/lang/menu_slovak_slovak_republic.1250.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Slovak
 " Translated By:	Martin Lacko <lacko@host.sk>
 " Last Change:		2020 Apr 23
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_sr_rs.ascii.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Ivan Pesic on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -11,6 +12,8 @@ let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
 
+scriptencoding latin1
+
 " Help menu
 menutrans &Help		      Pomo&c
 menutrans &Overview<Tab><F1>  &Pregled<Tab><F1>
@@ -25,11 +28,11 @@ menutrans &Version	      &Verzija
 menutrans &About	      &O\ programu
 
 " File menu
-menutrans &File			    &Datoteka
+menutrans &File			    &Fajl
 menutrans &Open\.\.\.<Tab>:e	    &Otvori\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &Podeli-otvori\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	Otvori\ karticu\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &Nova<Tab>:enew
+menutrans &New<Tab>:enew	    &Nov<Tab>:enew
 menutrans &Close<Tab>:close	    &Zatvori<Tab>:close
 menutrans &Save<Tab>:w		    &Sacuvaj<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  Sacuvaj\ &kao\.\.\.<Tab>:sav
@@ -41,14 +44,14 @@ menutrans E&xit<Tab>:qa		    K&raj<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &Uredjivanje
-menutrans &Undo<Tab>u		 &Vrati<Tab>u
-menutrans &Redo<Tab>^R		 &Povrati<Tab>^R
+menutrans &Undo<Tab>u		 &Ponisti<Tab>u
+menutrans &Redo<Tab>^R		 &Vrati\ izmenu<Tab>^R
 menutrans Rep&eat<Tab>\.	 P&onovi<Tab>\.
 menutrans Cu&t<Tab>"+x		 Ise&ci<Tab>"+x
 menutrans &Copy<Tab>"+y		 &Kopiraj<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &Ubaci<Tab>"+gP
-menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 Stavi\ pre&d<Tab>[p
+menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 Stavi\ ispre&d<Tab>[p
 menutrans Put\ &After<Tab>]p	 Stavi\ &iza<Tab>]p
 menutrans &Delete<Tab>x		 Iz&brisi<Tab>x
 menutrans &Select\ all<Tab>ggVG  Izaberi\ sv&e<Tab>ggVG
@@ -57,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\. Nadji\ i\ &zameni\.\.\.
 menutrans Settings\ &Window	 P&rozor\ podesavanja
 menutrans Startup\ &Settings	 Po&desavanja\ pri\ pokretanju		
 menutrans &Global\ Settings	 Op&sta\ podesavanja
-menutrans F&ile\ Settings	 Podesavanja\ za\ da&toteke
-menutrans &Shiftwidth		 &Pomeraj
+menutrans F&ile\ Settings	 Podesavanja\ za\ faj&love
+menutrans &Shiftwidth		 &Korak\ uvlacenja
 menutrans Soft\ &Tabstop	 &Meka\ tabulacija
 menutrans Te&xt\ Width\.\.\.	 &Sirina\ teksta\.\.\.
-menutrans &File\ Format\.\.\.	 &Vrsta\ datoteke\.\.\.
+menutrans &File\ Format\.\.\.	 &Vrsta\ fajla\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	Prikazi\ seme\ bo&ja\ u\ meniju
 menutrans C&olor\ Scheme	\Seme\ bo&ja
 menutrans Show\ &Keymaps\ in\ Menu	Prikazi\ pres&likavanja\ tastature\ u\ meniju
@@ -69,15 +72,15 @@ menutrans &Keymap	Pres&likavanja\ tastature
 menutrans Select\ Fo&nt\.\.\.	 Izbor\ &fonta\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Naglasi\ &obrazce\ (da/ne)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Isticanje\ &sablona\ (da/ne)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! Zanemari\ velicinu\ &slova\ (da/ne)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Proveri\ pratecu\ &zagradu\ (da/ne)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Prikazi\ uparenu\ &zagradu\ (da/ne)<Tab>:set\ sm!
 menutrans &Context\ lines  Vidljivi\ &redovi
 menutrans &Virtual\ Edit   Virtuelno\ &uredjivanje
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Rezim\ u&nosa\ (da/ne)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Rezim\ U&metanje\ (da/ne)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ saglasno\ (da/ne)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\.
-menutrans Ta&g\ Files\.\.\.   &Datoteke\ oznaka\.\.\.
+menutrans Ta&g\ Files\.\.\.   &Fajlovi\ oznaka\.\.\.
 menutrans Toggle\ &Toolbar    Linija\ sa\ &alatkama\ (da/ne)
 menutrans Toggle\ &Bottom\ Scrollbar   Donja\ l&inija\ klizanja\ (da/ne)
 menutrans Toggle\ &Left\ Scrollbar  &Leva\ linija\ klizanja\ (da/ne)
@@ -86,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &Desna\ linija\ klizanja\ (da/ne)
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      Nikad
 menutrans Block\ Selection    Izbor\ bloka
-menutrans Insert\ mode	      Rezim\ unosa
-menutrans Block\ and\ Insert  Blok\ i\ unos
+menutrans Insert\ mode	      Rezim\ Umetanje
+menutrans Block\ and\ Insert  Blok\ i\ Umetanje
 menutrans Always	      Uvek
 
 " Edit/File Settings
@@ -107,13 +110,13 @@ menutrans None Bez\ preslikavanja
 menutrans &Tools	&Alatke
 menutrans &Jump\ to\ this\ tag<Tab>g^] Skoci\ na\ &ovu\ oznaku<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 Skoci\ &natrag<Tab>^T
-menutrans Build\ &Tags\ File	 Izgradi\ &datoteku\ oznaka
+menutrans Build\ &Tags\ File	 Izgradi\ &fajl\ oznaka
 menutrans &Spelling	 Pra&vopis
 menutrans &Folding	      &Podvijanje
-menutrans Create\ &Fold<Tab>zf		  S&tvori\ podvijutak<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  O&brisi\ podvijutak<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  Obrisi\ sve\ po&dvijutke<Tab>zD
-menutrans Fold\ column\ &width		  Sirina\ &reda\ podvijutka
+menutrans Create\ &Fold<Tab>zf		  S&tvori\ svijutak<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  O&brisi\ svijutak<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  Obrisi\ sve\ sv&ijutke<Tab>zD
+menutrans Fold\ column\ &width		  Sirina\ &reda\ cvijutka
 "menutrans &Diff		      &Uporedjivanje
 menutrans &Make<Tab>:make     'mak&e'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     Spisak\ &gresaka<Tab>:cl
@@ -144,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us" 	Postavi\ jezik\ na\ "en_us"
 menutrans &Find\ More\ Languages	Pronadji\ jos\ jezika 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &Omoguci/prekini\ podvijanje<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &Omoguci/prekini\ svijanje<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &Pokazi\ red\ sa\ kursorom<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Pokazi\ &samo\ red\ sa\ kursorom<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vise\ podvijutaka<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ podvijutke<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vis&e\ podvijutaka<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ podvijutke<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vise\ svijutaka<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ svijutke<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vis&e\ svijutaka<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ svijutke<Tab>zR
 menutrans Fold\ Met&hod		       &Nacin\ podvijanja
-menutrans Fold\ Col&umn\ Width	Sirina\ kolone\ ispred\ podvijutaka
+menutrans Fold\ Col&umn\ Width	Sirina\ kolone\ ispred\ svijutaka
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&Rucno
@@ -179,7 +182,7 @@ menutrans Delete	   &Obrisi
 menutrans &Alternate	   A&lternativni
 menutrans &Next		   &Sledeci
 menutrans &Previous	   &Prethodni
-menutrans [No\ File]	   [Nema\ datoteke]
+menutrans [No\ File]	   [Nema\ fajla]
 
 " Window menu
 menutrans &Window		    &Prozor
@@ -187,7 +190,7 @@ menutrans &New<Tab>^Wn		    &Novi<Tab>^Wn
 menutrans S&plit<Tab>^Ws	    &Podeli<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    Podeli\ sa\ &alternativnim<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   Podeli\ &uspravno<Tab>^Wv
-menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &datoteka
+menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &fajlova
 menutrans &Close<Tab>^Wc	    &Zatvori<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  Zatvori\ &ostale<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &Sledeci<Tab>^Ww
@@ -208,7 +211,7 @@ menutrans &Left\ side<Tab>^WH	 U&levo<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 U&desno<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &Vrati
+menutrans &Undo		      &Ponisti
 menutrans Cu&t		      &Iseci
 menutrans &Copy		      &Kopiraj
 menutrans &Paste	      &Ubaci
@@ -216,7 +219,7 @@ menutrans &Delete	      I&zbrisi
 menutrans Select\ Blockwise   Biraj\ b&lokovski
 menutrans Select\ &Word       Izaberi\ &rec
 menutrans Select\ &Sentence       Izaberi\ r&ecenicu
-menutrans Select\ Pa&ragraph       Izaberi\ &paragraf
+menutrans Select\ Pa&ragraph       Izaberi\ &pasus
 menutrans Select\ &Line       Izaberi\ r&ed
 menutrans Select\ &Block      Izaberi\ &blok
 menutrans Select\ &All	      Izaberi\ &sve
@@ -262,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &Sintaksa
-menutrans &Show\ File\ Types\ in\ Menu  Prikazi\ tipove\ datoteka\ u\ &meniju
+menutrans &Show\ File\ Types\ in\ Menu  Prikazi\ tipove\ fajlova\ u\ &meniju
 menutrans Set\ '&syntax'\ only   Pode&si\ samo\ 'syntax' 
 menutrans Set\ '&filetype'\ too  Podesi\ &takodje\ i\ 'filetype'
 menutrans &Off       &Iskljuceno
 menutrans &Manual    &Rucno
 menutrans A&utomatic    &Automatski
-menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovu\ &datoteku
+menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovaj\ &fajl
 menutrans Co&lor\ test     Provera\ &boja
 menutrans &Highlight\ test Provera\ isti&canja
 menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
@@ -276,17 +279,17 @@ menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
 " dialog texts
 let menutrans_help_dialog = "Unesite naredbu ili rec cije pojasnjenje trazite:\n\nDodajte i_ za naredbe unosa (npr. i_CTRL-X)\nDodajte c_ za naredbe komandnog rezima (npr. s_<Del>)\nDodajte ' za imena opcija (npr. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "Unesite put pretrage za datoteke\nRazdvojite zarezima imena direktorijuma."
+let g:menutrans_path_dialog = "Unesite putanju pretrage za fajlove\nRazdvojite zarezima imena direktorijuma."
 
-let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite zarezima imena."
+let g:menutrans_tags_dialog = "Unesite imena fajlova sa oznakama\nRazdvojite zarezima imena."
 
 let g:menutrans_textwidth_dialog = "Unesite novu sirinu teksta (0 sprecava prelom)"
 
-let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke"
+let g:menutrans_fileformat_dialog = "Izaberite format zapisa fajla"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otkazi"
 
-let menutrans_no_file = "[Nema datoteke]"
+let menutrans_no_file = "[Nema fajla]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo

runtime/lang/menu_sr_rs.iso_8859-2.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Ivan Pe<50>i<EFBFBD> on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -27,11 +28,11 @@ menutrans &Version	      &Verzija
 menutrans &About	      &O\ programu
 
 " File menu
-menutrans &File			    &Datoteka
+menutrans &File			    &Fajl
 menutrans &Open\.\.\.<Tab>:e	    &Otvori\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &Podeli-otvori\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	Otvori\ karticu\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &Nova<Tab>:enew
+menutrans &New<Tab>:enew	    &Nov<Tab>:enew
 menutrans &Close<Tab>:close	    &Zatvori<Tab>:close
 menutrans &Save<Tab>:w		    &Sa<EFBFBD>uvaj<Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  Sa<EFBFBD>uvaj\ &kao\.\.\.<Tab>:sav
@@ -43,14 +44,14 @@ menutrans E&xit<Tab>:qa		    K&raj<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &Ure<EFBFBD>ivanje
-menutrans &Undo<Tab>u		 &Vrati<Tab>u
-menutrans &Redo<Tab>^R		 &Povrati<Tab>^R
+menutrans &Undo<Tab>u		 &Poni<EFBFBD>ti<Tab>u
+menutrans &Redo<Tab>^R		 &Vrati\ izmenu<Tab>^R
 menutrans Rep&eat<Tab>\.	 P&onovi<Tab>\.
 menutrans Cu&t<Tab>"+x		 Ise&ci<Tab>"+x
 menutrans &Copy<Tab>"+y		 &Kopiraj<Tab>"+y
 menutrans &Paste<Tab>"+gP	 &Ubaci<Tab>"+gP
-menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 Stavi\ pre&d<Tab>[p
+menutrans &Paste<Tab>"+P	&Ubaci<Tab>"+P
+menutrans Put\ &Before<Tab>[p	 Stavi\ ispre&d<Tab>[p
 menutrans Put\ &After<Tab>]p	 Stavi\ &iza<Tab>]p
 menutrans &Delete<Tab>x		 Iz&bri<EFBFBD>i<Tab>x
 menutrans &Select\ all<Tab>ggVG  Izaberi\ sv&e<Tab>ggVG
@@ -59,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\. Na
 menutrans Settings\ &Window	 P&rozor\ pode<EFBFBD>avanja
 menutrans Startup\ &Settings	 Po&de<EFBFBD>avanja\ pri\ pokretanju		
 menutrans &Global\ Settings	 Op&<26>ta\ pode<EFBFBD>avanja
-menutrans F&ile\ Settings	 Pode<EFBFBD>avanja\ za\ da&toteke
-menutrans &Shiftwidth		 &Pomeraj
+menutrans F&ile\ Settings	 Pode<EFBFBD>avanja\ za\ faj&love
+menutrans &Shiftwidth		 &Korak\ uvla<EFBFBD>enja
 menutrans Soft\ &Tabstop	 &Meka\ tabulacija
 menutrans Te&xt\ Width\.\.\.	 &<26>irina\ teksta\.\.\.
-menutrans &File\ Format\.\.\.	 &Vrsta\ datoteke\.\.\.
+menutrans &File\ Format\.\.\.	 &Vrsta\ fajla\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	Prika<EFBFBD>i\ <20>eme\ bo&ja\ u\ meniju
 menutrans C&olor\ Scheme	\<5C>eme\ bo&ja
 menutrans Show\ &Keymaps\ in\ Menu	Prika<EFBFBD>i\ pres&likavanja\ tastature\ u\ meniju
@@ -71,15 +72,15 @@ menutrans &Keymap	Pres&likavanja\ tastature
 menutrans Select\ Fo&nt\.\.\.	 Izbor\ &fonta\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Naglasi\ &obrazce\ (da/ne)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! Isticanje\ &<26>ablona\ (da/ne)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! Zanemari\ veli<EFBFBD>inu\ &slova\ (da/ne)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Proveri\ prate<EFBFBD>u\ &zagradu\ (da/ne)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! Prika<EFBFBD>i\ uparenu\ &zagradu\ (da/ne)<Tab>:set\ sm!
 menutrans &Context\ lines  Vidljivi\ &redovi
 menutrans &Virtual\ Edit   Virtuelno\ &ure<EFBFBD>ivanje
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Re<EFBFBD>im\ u&nosa\ (da/ne)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   Re<EFBFBD>im\ U&metanje\ (da/ne)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ saglasno\ (da/ne)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. Putanja\ &pretrage\.\.\.
-menutrans Ta&g\ Files\.\.\.   &Datoteke\ oznaka\.\.\.
+menutrans Ta&g\ Files\.\.\.   &Fajlovi\ oznaka\.\.\.
 menutrans Toggle\ &Toolbar    Linija\ sa\ &alatkama\ (da/ne)
 menutrans Toggle\ &Bottom\ Scrollbar   Donja\ l&inija\ klizanja\ (da/ne)
 menutrans Toggle\ &Left\ Scrollbar  &Leva\ linija\ klizanja\ (da/ne)
@@ -88,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &Desna\ linija\ klizanja\ (da/ne)
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      Nikad
 menutrans Block\ Selection    Izbor\ bloka
-menutrans Insert\ mode	      Re<EFBFBD>im\ unosa
-menutrans Block\ and\ Insert  Blok\ i\ unos
+menutrans Insert\ mode	      Re<EFBFBD>im\ Umetanje
+menutrans Block\ and\ Insert  Blok\ i\ Umetanje
 menutrans Always	      Uvek
 
 " Edit/File Settings
@@ -109,13 +110,13 @@ menutrans None Bez\ preslikavanja
 menutrans &Tools	&Alatke
 menutrans &Jump\ to\ this\ tag<Tab>g^] Sko<EFBFBD>i\ na\ &ovu\ oznaku<Tab>g^]
 menutrans Jump\ &back<Tab>^T	 Sko<EFBFBD>i\ &natrag<Tab>^T
-menutrans Build\ &Tags\ File	 Izgradi\ &datoteku\ oznaka
+menutrans Build\ &Tags\ File	 Izgradi\ &fajl\ oznaka
 menutrans &Spelling	 Pra&vopis
 menutrans &Folding	      &Podvijanje
-menutrans Create\ &Fold<Tab>zf		  S&tvori\ podvijutak<Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  O&bri<EFBFBD>i\ podvijutak<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  Obri<EFBFBD>i\ sve\ po&dvijutke<Tab>zD
-menutrans Fold\ column\ &width		  <20>irina\ &reda\ podvijutka
+menutrans Create\ &Fold<Tab>zf		  S&tvori\ svijutak<Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  O&bri<EFBFBD>i\ svijutak<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  Obri<EFBFBD>i\ sve\ sv&ijutke<Tab>zD
+menutrans Fold\ column\ &width		  <20>irina\ &reda\ cvijutka
 "menutrans &Diff		      &Upore<72>ivanje
 menutrans &Make<Tab>:make     'mak&e'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     Spisak\ &gre<EFBFBD>aka<Tab>:cl
@@ -146,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us" 	Postavi\ jezik\ na\ "en_us"
 menutrans &Find\ More\ Languages	Prona<EFBFBD>i\ jo<EFBFBD>\ jezika 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &Omogu<67>i/prekini\ podvijanje<Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &Omogu<67>i/prekini\ svijanje<Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &Poka<EFBFBD>i\ red\ sa\ kursorom<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx Poka<EFBFBD>i\ &samo\ red\ sa\ kursorom<Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vi<EFBFBD>e\ podvijutaka<Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ podvijutke<Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vi<EFBFBD>&e\ podvijutaka<Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ podvijutke<Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &Zatvori\ vi<EFBFBD>e\ svijutaka<Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    Zatvori\ s&ve\ svijutke<Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    Otvori\ vi<EFBFBD>&e\ svijutaka<Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     O&tvori\ sve\ svijutke<Tab>zR
 menutrans Fold\ Met&hod		       &Na<EFBFBD>in\ podvijanja
-menutrans Fold\ Col&umn\ Width	<09>irina\ kolone\ ispred\ podvijutaka
+menutrans Fold\ Col&umn\ Width	<09>irina\ kolone\ ispred\ svijutaka
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&Ru<EFBFBD>no
@@ -181,7 +182,7 @@ menutrans Delete	   &Obri
 menutrans &Alternate	   A&lternativni
 menutrans &Next		   &Slede<EFBFBD>i
 menutrans &Previous	   &Prethodni
-menutrans [No\ File]	   [Nema\ datoteke]
+menutrans [No\ File]	   [Nema\ fajla]
 
 " Window menu
 menutrans &Window		    &Prozor
@@ -189,7 +190,7 @@ menutrans &New<Tab>^Wn		    &Novi<Tab>^Wn
 menutrans S&plit<Tab>^Ws	    &Podeli<Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    Podeli\ sa\ &alternativnim<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   Podeli\ &uspravno<Tab>^Wv
-menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &datoteka
+menutrans Split\ File\ E&xplorer    Podeli\ za\ pregled\ &fajlova
 menutrans &Close<Tab>^Wc	    &Zatvori<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  Zatvori\ &ostale<Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &Slede<64>i<Tab>^Ww
@@ -210,7 +211,7 @@ menutrans &Left\ side<Tab>^WH	 U&levo<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 U&desno<Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &Vrati
+menutrans &Undo		      &Poni<EFBFBD>ti
 menutrans Cu&t		      &Iseci
 menutrans &Copy		      &Kopiraj
 menutrans &Paste	      &Ubaci
@@ -218,7 +219,7 @@ menutrans &Delete	      I&zbri
 menutrans Select\ Blockwise   Biraj\ b&lokovski
 menutrans Select\ &Word       Izaberi\ &re<EFBFBD>
 menutrans Select\ &Sentence       Izaberi\ r&e<EFBFBD>enicu
-menutrans Select\ Pa&ragraph       Izaberi\ &paragraf
+menutrans Select\ Pa&ragraph       Izaberi\ &pasus
 menutrans Select\ &Line       Izaberi\ r&ed
 menutrans Select\ &Block      Izaberi\ &blok
 menutrans Select\ &All	      Izaberi\ &sve
@@ -264,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &Sintaksa
-menutrans &Show\ File\ Types\ in\ Menu  Prika<EFBFBD>i\ tipove\ datoteka\ u\ &meniju
+menutrans &Show\ File\ Types\ in\ Menu  Prika<EFBFBD>i\ tipove\ fajlova\ u\ &meniju
 menutrans Set\ '&syntax'\ only   Pode&si\ samo\ 'syntax' 
 menutrans Set\ '&filetype'\ too  Podesi\ &tako<EFBFBD>e\ i\ 'filetype'
 menutrans &Off       &Isklju<EFBFBD>eno
 menutrans &Manual    &Ru<EFBFBD>no
 menutrans A&utomatic    &Automatski
-menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovu\ &datoteku
+menutrans on/off\ for\ &This\ file     Da/ne\ za\ ovaj\ &fajl
 menutrans Co&lor\ test     Provera\ &boja
 menutrans &Highlight\ test Provera\ isti&canja
 menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
@@ -278,17 +279,17 @@ menutrans &Convert\ to\ HTML  Pretvori\ &u\ HTML
 " dialog texts
 let menutrans_help_dialog = "Unesite naredbu ili re<72> <20>ije poja<6A>njenje tra<72>ite:\n\nDodajte i_ za naredbe unosa (npr. i_CTRL-X)\nDodajte c_ za naredbe komandnog re<72>ima (npr. s_<Del>)\nDodajte ' za imena opcija (npr. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "Unesite put pretrage za datoteke\nRazdvojite zarezima imena direktorijuma."
+let g:menutrans_path_dialog = "Unesite putanju pretrage za fajlove\nRazdvojite zarezima imena direktorijuma."
 
-let g:menutrans_tags_dialog = "Unesite imena datoteka sa oznakama\nRazdvojite zarezima imena."
+let g:menutrans_tags_dialog = "Unesite imena fajlova sa oznakama\nRazdvojite zarezima imena."
 
 let g:menutrans_textwidth_dialog = "Unesite novu <20>irinu teksta (0 spre<72>ava prelom)"
 
-let g:menutrans_fileformat_dialog = "Izaberite format zapisa datoteke"
+let g:menutrans_fileformat_dialog = "Izaberite format zapisa fajla"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Otka<6B>i"
 
-let menutrans_no_file = "[Nema datoteke]"
+let menutrans_no_file = "[Nema fajla]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo

runtime/lang/menu_sr_rs.iso_8859-5.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> on 2017-12-28 12:05+0400
+" Generated from menu_sr_rs.utf-8.vim, DO NOT EDIT
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -27,11 +28,11 @@ menutrans &Version	      &
 menutrans &About	      &<26>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 " File menu
-menutrans &File			    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans &File			    &<26><><EFBFBD><EFBFBD>
 menutrans &Open\.\.\.<Tab>:e	    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.<Tab>:e
 menutrans Sp&lit-Open\.\.\.<Tab>:sp &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew	    &<26><><EFBFBD><EFBFBD><Tab>:enew
+menutrans &New<Tab>:enew	    &<26><><EFBFBD><Tab>:enew
 menutrans &Close<Tab>:close	    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:close
 menutrans &Save<Tab>:w		    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:w
 menutrans Save\ &As\.\.\.<Tab>:sav  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD>\.\.\.<Tab>:sav
@@ -43,14 +44,14 @@ menutrans E&xit<Tab>:qa
 
 " Edit menu
 menutrans &Edit			 &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans &Undo<Tab>u		 &<26><><EFBFBD><EFBFBD><EFBFBD><Tab>u
-menutrans &Redo<Tab>^R		 &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^R
+menutrans &Undo<Tab>u		 &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>u
+menutrans &Redo<Tab>^R		 &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^R
 menutrans Rep&eat<Tab>\.	 <20>&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>\.
 menutrans Cu&t<Tab>"+x		 <20><><EFBFBD>&<26><><Tab>"+x
 menutrans &Copy<Tab>"+y		 &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>"+y
 menutrans &Paste<Tab>"+gP	 &<26><><EFBFBD><EFBFBD><EFBFBD><Tab>"+gP
-menutrans &Paste<Tab>"+P	&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>"+gP
-menutrans Put\ &Before<Tab>[p	 <20><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26><Tab>[p
+menutrans &Paste<Tab>"+P	&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>"+P
+menutrans Put\ &Before<Tab>[p	 <20><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>&<26><Tab>[p
 menutrans Put\ &After<Tab>]p	 <20><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><Tab>]p
 menutrans &Delete<Tab>x		 <20><>&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>x
 menutrans &Select\ all<Tab>ggVG  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>&<26><Tab>ggVG
@@ -59,11 +60,11 @@ menutrans Find\ and\ Rep&lace\.\.\.
 menutrans Settings\ &Window	 <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Startup\ &Settings	 <20><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>		
 menutrans &Global\ Settings	 <20><>&<26><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans F&ile\ Settings	 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ <20><>&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans &Shiftwidth		 &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans F&ile\ Settings	 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ <20><><EFBFBD>&<26><><EFBFBD><EFBFBD>
+menutrans &Shiftwidth		 &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Soft\ &Tabstop	 &<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Te&xt\ Width\.\.\.	 &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
-menutrans &File\ Format\.\.\.	 &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
+menutrans &File\ Format\.\.\.	 &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 menutrans Show\ C&olor\ Schemes\ in\ Menu	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ <20><>&<26><>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans C&olor\ Scheme	\<5C><><EFBFBD><EFBFBD>\ <20><>&<26><>
 menutrans Show\ &Keymaps\ in\ Menu	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -71,15 +72,15 @@ menutrans &Keymap
 menutrans Select\ Fo&nt\.\.\.	 <20><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 
 " Edit/Global Settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ hls!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ hls!
 menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ sm!
 menutrans &Context\ lines  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Virtual\ Edit   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   <20><><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!   <20><><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!     '&Vi'\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
-menutrans Ta&g\ Files\.\.\.   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
+menutrans Ta&g\ Files\.\.\.   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\.\.\.
 menutrans Toggle\ &Toolbar    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)
 menutrans Toggle\ &Bottom\ Scrollbar   <20><><EFBFBD><EFBFBD>\ <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)
 menutrans Toggle\ &Left\ Scrollbar  &<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ (<EFBFBD><EFBFBD>/<2F><>)
@@ -88,8 +89,8 @@ menutrans Toggle\ &Right\ Scrollbar &
 " Edit/Global Settings/Virtual Edit
 menutrans Never		      <20><><EFBFBD><EFBFBD><EFBFBD>
 menutrans Block\ Selection    <20><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>
-menutrans Insert\ mode	      <20><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>
-menutrans Block\ and\ Insert  <20><><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD>
+menutrans Insert\ mode	      <20><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Block\ and\ Insert  <20><><EFBFBD><EFBFBD>\ <20>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Always	      <20><><EFBFBD><EFBFBD>
 
 " Edit/File Settings
@@ -109,13 +110,13 @@ menutrans None
 menutrans &Tools	&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Jump\ to\ this\ tag<Tab>g^] <20><><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ &<26><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>g^]
 menutrans Jump\ &back<Tab>^T	 <20><><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^T
-menutrans Build\ &Tags\ File	 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Build\ &Tags\ File	 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Spelling	 <20><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Folding	      &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans Create\ &Fold<Tab>zf		  <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zf
-menutrans &Delete\ Fold<Tab>zd		  <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD	  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zD
-menutrans Fold\ column\ &width		  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Create\ &Fold<Tab>zf		  <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zf
+menutrans &Delete\ Fold<Tab>zd		  <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD	  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zD
+menutrans Fold\ column\ &width		  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 "menutrans &Diff		      &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Make<Tab>:make     'mak&<26>'<Tab>:make
 menutrans &List\ Errors<Tab>:cl     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>:cl
@@ -146,15 +147,15 @@ menutrans Set\ Language\ to\ "en_us"
 menutrans &Find\ More\ Languages	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
 
 " Tools/Folding
-menutrans &Enable/Disable\ folds<Tab>zi   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zi
+menutrans &Enable/Disable\ folds<Tab>zi   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zi
 menutrans &View\ Cursor\ Line<Tab>zv	  &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zv
 menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zMzx
-menutrans C&lose\ more\ folds<Tab>zm   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zm
-menutrans &Close\ all\ folds<Tab>zM    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zM
-menutrans O&pen\ more\ folds<Tab>zr    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zr
-menutrans &Open\ all\ folds<Tab>zR     <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zR
+menutrans C&lose\ more\ folds<Tab>zm   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zm
+menutrans &Close\ all\ folds<Tab>zM    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zM
+menutrans O&pen\ more\ folds<Tab>zr    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>&<26>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zr
+menutrans &Open\ all\ folds<Tab>zR     <20>&<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>zR
 menutrans Fold\ Met&hod		       &<26><><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans Fold\ Col&umn\ Width	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Fold\ Col&umn\ Width	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 " Tools/Folding/Fold Method
 menutrans M&anual	&<26><><EFBFBD><EFBFBD><EFBFBD>
@@ -181,7 +182,7 @@ menutrans Delete	   &
 menutrans &Alternate	   <20>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Next		   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Previous	   &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans [No\ File]	   [<5B><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]
+menutrans [No\ File]	   [<5B><><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD>]
 
 " Window menu
 menutrans &Window		    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -189,7 +190,7 @@ menutrans &New<Tab>^Wn		    &
 menutrans S&plit<Tab>^Ws	    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^Ws
 menutrans Sp&lit\ To\ #<Tab>^W^^    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^Wv
-menutrans Split\ File\ E&xplorer    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Split\ File\ E&xplorer    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Close<Tab>^Wc	    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^Wo
 "menutrans Ne&xt<Tab>^Ww       &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><Tab>^Ww
@@ -210,7 +211,7 @@ menutrans &Left\ side<Tab>^WH
 menutrans &Right\ side<Tab>^WL	 <20>&<26><><EFBFBD><EFBFBD><EFBFBD><Tab>^WL
 
 " The popup menu
-menutrans &Undo		      &<26><><EFBFBD><EFBFBD><EFBFBD>
+menutrans &Undo		      &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Cu&t		      &<26><><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Copy		      &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Paste	      &<26><><EFBFBD><EFBFBD><EFBFBD>
@@ -218,7 +219,7 @@ menutrans &Delete
 menutrans Select\ Blockwise   <20><><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Select\ &Word       <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD>
 menutrans Select\ &Sentence       <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans Select\ Pa&ragraph       <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans Select\ Pa&ragraph       <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD>
 menutrans Select\ &Line       <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>&<26><>
 menutrans Select\ &Block      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>
 menutrans Select\ &All	      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD>
@@ -264,13 +265,13 @@ endif
 
 " Syntax menu
 menutrans &Syntax &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans &Show\ File\ Types\ in\ Menu  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans &Show\ File\ Types\ in\ Menu  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans Set\ '&syntax'\ only   <20><><EFBFBD><EFBFBD>&<26><>\ <20><><EFBFBD><EFBFBD>\ 'syntax' 
 menutrans Set\ '&filetype'\ too  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20>\ 'filetype'
 menutrans &Off       &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 menutrans &Manual    &<26><><EFBFBD><EFBFBD><EFBFBD>
 menutrans A&utomatic    &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-menutrans on/off\ for\ &This\ file     <20><>/<EFBFBD><EFBFBD>\ <20><>\ <20><><EFBFBD>\ &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+menutrans on/off\ for\ &This\ file     <20><>/<EFBFBD><EFBFBD>\ <20><>\ <20><><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>
 menutrans Co&lor\ test     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26><><EFBFBD><EFBFBD>
 menutrans &Highlight\ test <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ <20><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD>
 menutrans &Convert\ to\ HTML  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\ &<26>\ HTML
@@ -278,17 +279,17 @@ menutrans &Convert\ to\ HTML
 " dialog texts
 let menutrans_help_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> i_ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>. i_CTRL-X)\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> c_ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>. <20>_<Del>)\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ' <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>. 'shiftwidth')"
 
-let g:menutrans_path_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+let g:menutrans_path_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
 
-let g:menutrans_tags_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
+let g:menutrans_tags_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
 
 let g:menutrans_textwidth_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
 
-let g:menutrans_fileformat_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+let g:menutrans_fileformat_dialog = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-let menutrans_no_file = "[<5B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
+let menutrans_no_file = "[<5B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>]"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo

runtime/lang/menu_sr_rs.utf-8.vim

@@ -2,6 +2,7 @@
 " Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
 " Last Change:	Fri, 30 May 2003 10:17:39 Eastern Daylight Time
 " Adapted for VIM 8 by: Иван Пешић on 2017-12-28 12:05+0400
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_sv_se.latin1.vim

@@ -1,6 +1,7 @@
 " Menu Translations:    Swedish
 " Maintainer:		Johan Svedberg <johan@svedberg.com>
 " Last Change:		2020 Apr 22
+" Original translations
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")

runtime/lang/menu_tr_tr.cp1254.vim

@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT
 
 if exists("did_menu_trans")
    finish

runtime/lang/menu_tr_tr.iso_8859-9.vim

@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Generated from menu_tr_tr.utf-8.vim, DO NOT EDIT
 
 if exists("did_menu_trans")
    finish
@@ -8,7 +9,7 @@ endif
 let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
-scriptencoding iso-8859-9
+scriptencoding iso8859-9
 
 " Top
 menutrans &File	&Dosya

runtime/lang/menu_tr_tr.utf-8.vim

@@ -1,5 +1,6 @@
 " Menu Translations:	Turkish
 " Maintainer:		Emir SARI <bitigchi@me.com>
+" Original translations
 
 if exists("did_menu_trans")
    finish

runtime/lang/menu_uk_ua.cp1251.vim

@@ -1,6 +1,7 @@
 " Menu Translations:	Ukrainian
 " Maintainer:		Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Last Change:		11 Oct 2001
+" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT
 
 "
 " Please, see readme at htpp://www.vstu.edu.ua/~bohdan/vim before any