Update runtime files
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
index 35a5548..669657a 100644
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.2.  Last change: 2022 Jun 04
+*channel.txt*      For Vim version 8.2.  Last change: 2022 Jun 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -464,8 +464,10 @@
 
 To read all normal output from a RAW channel that is available: >
 	let output = ch_readraw(channel)
-To read the error output: >
+To read all error output from a RAW channel that is available:: >
 	let output = ch_readraw(channel, {"part": "err"})
+Note that if the channel is in NL mode, ch_readraw() will only return one line
+for each call.
 
 ch_read() and ch_readraw() use the channel timeout.  When there is nothing to
 read within that time an empty string is returned.  To specify a different
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0b5022f..8d2d17a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2022 Jun 21
+*options.txt*	For Vim version 8.2.  Last change: 2022 Jun 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4955,8 +4955,8 @@
 	executing macros, registers and other commands that have not been
 	typed.  Also, updating the window title is postponed.  To force an
 	update use |:redraw|.
-	This may ocasionally cause display errors.  It is only meant to be set
-	termporarily when performaing an operation where redrawing may cause
+	This may occasionally cause display errors.  It is only meant to be set
+	temporarily when performing an operation where redrawing may cause
 	flickering or cause a slow down.
 
 			*'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 048e3a2..40f9bc0 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -40,7 +40,6 @@
 
 Prepare for the Vim 9.0 release:
 - Update version9.txt
-- Adjust intro message to say "help version9".
 
 Further Vim9 improvements, possibly after launch:
 - Use Vim9 for more runtime files.
@@ -203,6 +202,8 @@
 
 Patches considered for including:
 - use ngettext() in a few more places #10606
+- move f_hasmapto() to map.c  #10611
+- allow for nesting of timeout, sketch in #10595
 - Add "-n" option to xxd. #10599
 - Support %e and %k in 'errorformat'. #9624
 - Add support for "underdouble", "underdot" and "underdash". #9553
diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt
index af5c5d0..f963e20 100644
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -1,4 +1,4 @@
-*usr_40.txt*	For Vim version 8.2.  Last change: 2022 Jun 20
+*usr_40.txt*	For Vim version 8.2.  Last change: 2022 Jun 23
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -464,7 +464,7 @@
 and finally, {command} is the command to be executed.
 
 When adding an autocommand the already existing ones remain.  To avoid adding
-the autocommand several time you should use this form: >
+the autocommand several times you should use this form: >
 
 	:augroup updateDate
 	:  autocmd!
diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt
index d53754a..4438394 100644
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -248,15 +248,18 @@
 Haiku support. |Haiku|
 
 Support for "lsp" channel mode to simplify LSP server RPC communication
-|language-server-protocol|.
+|language-server-protocol|.  Support for using a Unix domain socket with a
+|channel|.  IPv6 support in channels |channel-address|.
 
 Support for sourcing lines from the current buffer. |:source-range|
 
+Support for opening a terminal in a popup window. |popup-terminal|
+
 Support for stopping profiling a Vim script: `:profile stop` and dumping the
 report to a file: `:profile dump` .  |:profile|
 
-Argument completion support for the |:scriptnames|, |:profile|, |:profdel|,
-|:breakadd| and |:breakdel| commands.
+Argument completion support for the |:breakadd|, |:breakdel|, |:diffget|,
+|:diffput|, |:profile|, |:profdel| and |:scriptnames| commands.
 
 Support for setting the 'foldtext', 'completefunc', 'omnifunc',
 'operatorfunc', 'thesaurusfunc', 'quickfixtextfunc', 'tagfunc',
@@ -287,17 +290,9 @@
 Support for executing Ex commands in a map without changing the current mode
 |<Cmd>| and |<ScriptCmd>|.
 
-A large number of tests have been added to verify the Vim functionality.  Most
-of the old style tests have been converted to new style tests using the new
-style assert_* functions.
-
 Add optional error code to |:cquit|.
 
-Support for using a Unix domain socket with a |channel|.
-
-IPv6 support in channels |channel-address|.
-
-Call Vim functions from Lua (vim.call('func', 'arg')).
+Support for calling Vim functions from Lua (vim.call() and vim.fn()).
 
 Recognize numbers as unsigned when "unsigned" is set in 'nrformats'.
 
@@ -305,7 +300,8 @@
 
 Expand script ID using expand('<SID>'). |expand()|
 
-Jump to the last accessed tab page using |g<Tab>|.
+Jump to the last accessed tab page using |g<Tab>| and support using the
+last accessed tab page in |:tabnext| et al.
 
 Locale aware sorting using |:sort| and |sort()|.
 
@@ -343,15 +339,22 @@
 Add the |hl-CurSearch| default highlight group for the current search match.
 
 Add the 'P' command in visual mode to paste text in visual mode without
-yanking the deleted text to the unnamed register.
-
-Add support for parsing the end line number (%e) and end column number
-(%k) using 'errorformat'.
+yanking the deleted text to the unnamed register.  |put-Visual-mode|
 
 Add support for logging on Vim startup (|--log|).
 
 Add "/" in 'formatoptions' to stop inserting // when using "o" on a line with
-inline comment.
+inline comment. |fo-/|
+
+Add support for customizing the quickfix buffer contents using
+'quickfixtextfunc'.  Support for the "note" error type (%t) in |errorformat|.
+Add support for parsing the end line number (%e) and end column number (%k)
+using 'errorformat'.
+
+Support truncating the tag stack using |settagstack()|.
+
+Support using any Vim type for user_data with the completion functions
+(|complete-items|).
 
 Display every option in a separate line when "!" is used with |:set|.
 
@@ -367,6 +370,74 @@
 
 Stop insert mode completion without changing text (|i_CTRL-X_CTRL-Z|).
 
+Support for getting the number of lines (linecount) in a buffer using
+|getbufinfo()|.
+
+Support |filter()| and |map()| for blob and string types.
+
+Support for using a multi-byte character for the tag kind. |tags-file-format|
+
+Add support for checking whether a function name is valid using |exists()|.
+
+Update xdiff to version 2.33.  Update libvterm to revision 789.
+
+Added support for the |Haiku| OS.
+
+Support 'trim' for Python/Lua/Perl/Tcl/Ruby/MzScheme interface heredoc.
+
+Add the |t_AU| and |t_8u| termap codes for underline and undercurl.  Add the
+t_fd and t_fe termcap codes for detecting focus events.
+
+Support for indenting C pragmas like normal code. (|cino-P|)
+
+Add support for defining the syntax fold level (|:syn-foldlevel|)
+
+Add support for using \<*xxx> in a string to prepend a modifier to a
+character. (|expr-quote|).
+
+Add support trimming characters at the beginning or end of a string using
+|trim()|.
+
+Make ":verbose pwd" show the scope of the directory. |:pwd-verbose|
+
+Add the "0o" notation for specifying octal numbers |scriptversion-4|
+
+Support for changing to the previous tab-local and window-local directories
+using the "tcd -" and "lcd -" commands. (|:tcd-| and |:lcd-|)
+
+Add support for skipping an expression using |search()|.
+
+Add the "cmdline" option to |getcompletion()| to return the command line
+arguments.
+
+Add support for spell checking CamelCased words by adding "camel" to
+'spelloptions'.
+
+Add support for importing Vim scripts using |:import| from a Vimscript.
+
+Add support for sorting the directory contents returned by the |readdir()|
+and |readdirex()| functions by case.
+
+Add support for executing (|:@|) a register containing line continuation.
+
+Convert a Lua function and a closure to a Vim funcref so that it can be
+accessed in a Vimscript. (|lua-funcref|) Make Lua arrays one based.
+Add table.insert() and table.remove() functions.
+
+Support mouse left-right scrolling in a terminal window.
+
+Updated colorschemes from https://github.com/vim/colorschemes is included.
+
+TermDebug enhancements:
+Support for showing the disassembled code in a separate window.  Support for
+the GDB until command.  Use a separate group for the signs.
+
+A large number of tests have been added to verify the Vim functionality.  Most
+of the old style tests have been converted to new style tests using the new
+style assert_* functions.
+
+Many Coverity static analysis warnings are fixed.
+
 TODO: more
 
 ==============================================================================
@@ -383,9 +454,9 @@
 
 The following features have been removed.  They are either obsolete or didn't
 work properly:
-  - Athena GUI support (use Motif instead)
+  - Athena and neXTaw GUI support (use Motif instead)
   - EBCDIC support
-  - Atari MiNT
+  - Atari MiNT and BeOS
   - Mac Carbon GUI (use MacVim instead)
 
 The rgb.txt file is no longer included, use colors/lists/default.vim instead.
@@ -393,6 +464,8 @@
 Several source files were split, mainly to make it easier to inspect code
 coverage information.
 
+Support for building Vim with Mingw64 clang compiler on MS-Windows.
+
 ==============================================================================
 PATCHES						*patches-9* *bug-fixes-9*
 						*patches-after-8.2*
diff --git a/runtime/indent/testdir/vim.in b/runtime/indent/testdir/vim.in
index 699e4c2..873045b 100644
--- a/runtime/indent/testdir/vim.in
+++ b/runtime/indent/testdir/vim.in
@@ -30,6 +30,12 @@
 eval 0
 endfor
 
+let t = [
+\ {
+\ 'k': 'val',
+\ },
+\  ]
+
 " END_INDENT
 
 " START_INDENT
diff --git a/runtime/indent/testdir/vim.ok b/runtime/indent/testdir/vim.ok
index f597d97..8e70abe 100644
--- a/runtime/indent/testdir/vim.ok
+++ b/runtime/indent/testdir/vim.ok
@@ -30,6 +30,12 @@
     eval 0
 endfor
 
+let t = [
+	    \ {
+	    \ 'k': 'val',
+	    \ },
+	    \  ]
+
 " END_INDENT
 
 " START_INDENT
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 8579b3f..8a2502a 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Mar 01
+" Last Change:	2022 Jun 24
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -36,6 +36,14 @@
 let s:lineContPat = '^\s*\(\\\|"\\ \)'
 
 function GetVimIndentIntern()
+  " If the current line has line continuation and the previous one too, use
+  " the same indent.  This does not skip empty lines.
+  let cur_text = getline(v:lnum)
+  let cur_has_linecont = cur_text =~ s:lineContPat
+  if cur_has_linecont && v:lnum > 1 && getline(v:lnum - 1) =~ s:lineContPat
+    return indent(v:lnum - 1)
+  endif
+
   " Find a non-blank line above the current line.
   let lnum = prevnonblank(v:lnum - 1)
 
@@ -44,8 +52,7 @@
 
   " If the current line doesn't start with '\' or '"\ ' and below a line that
   " starts with '\' or '"\ ', use the indent of the line above it.
-  let cur_text = getline(v:lnum)
-  if cur_text !~ s:lineContPat
+  if !cur_has_linecont
     while lnum > 0 && getline(lnum) =~ s:lineContPat
       let lnum = lnum - 1
     endwhile
diff --git a/runtime/spell/main.aap b/runtime/spell/main.aap
index c6050a4..9f051e2 100644
--- a/runtime/spell/main.aap
+++ b/runtime/spell/main.aap
@@ -16,12 +16,6 @@
 diff: $*LANG/diff
         :print Done.
 
-# Use "aap publish" to upload the .spl files.
-SPL_files = eu.utf-8.spl
-
-UPDIR = rsync://bram@ftp1.nluug.nl//var/ftp/pub/vim/runtime/spell
-:attr {publish = $UPDIR/%file%} $SPL_files
-
 @for l in string.split(_no.LANG):
         :child $l/main.aap
 
diff --git a/src/po/af.po b/src/po/af.po
index b2cf877..76b7ece 100644
--- a/src/po/af.po
+++ b/src/po/af.po
@@ -2342,8 +2342,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tik   :help<Enter>  of  <F1>  vir aanlyn hulp       "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "tik   :help version8<Enter>   vir weergawe-inligting"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "tik   :help version9<Enter>   vir weergawe-inligting"
 
 msgid "Running in Vi compatible mode"
 msgstr "Voer tans uit in Vi-versoenbare modus"
diff --git a/src/po/ca.po b/src/po/ca.po
index 34a89e2..08d4e61 100644
--- a/src/po/ca.po
+++ b/src/po/ca.po
@@ -3710,8 +3710,8 @@
 msgstr "feu  :help<Entrar> o <F1>        per a obtenir ajuda      "
 
 # amplada 53 caràcters
-msgid "type  :help version8<Enter>   for version info"
-msgstr "feu  :help version8<Entrar>      per a info de la versió  "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "feu  :help version9<Entrar>      per a info de la versió  "
 
 msgid "Running in Vi compatible mode"
 msgstr "Funcionant en mode compatible amb Vi"
diff --git a/src/po/cs.cp1250.po b/src/po/cs.cp1250.po
index 86743a4..2186809 100644
--- a/src/po/cs.cp1250.po
+++ b/src/po/cs.cp1250.po
@@ -4360,8 +4360,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "zadejte :help<Enter>  èi <F1> pro nápovìdu"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "zadejte :help version8<Enter>  pro informace o verzi 8"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "zadejte :help version9<Enter>  pro informace o verzi 8"
 
 msgid "Running in Vi compatible mode"
 msgstr "Bìžím v režimu kompatibility s Vi"
diff --git a/src/po/cs.po b/src/po/cs.po
index b372d08..a319088 100644
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -4360,8 +4360,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "zadejte :help<Enter>  èi <F1> pro nápovìdu"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "zadejte :help version8<Enter>  pro informace o verzi 8"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "zadejte :help version9<Enter>  pro informace o verzi 9"
 
 msgid "Running in Vi compatible mode"
 msgstr "Bì¾ím v re¾imu kompatibility s Vi"
diff --git a/src/po/da.po b/src/po/da.po
index 04b8960..70f462e 100644
--- a/src/po/da.po
+++ b/src/po/da.po
@@ -6372,8 +6372,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "skriv :help<Enter> eller <F1> for onlinehjælp "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "skriv :help version8<Enter>   for versionsinfo"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "skriv :help version9<Enter>   for versionsinfo"
 
 msgid "Running in Vi compatible mode"
 msgstr "Kører i Vi-kompatibel tilstand"
diff --git a/src/po/de.po b/src/po/de.po
index 29143e5..bd24b63 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -3650,8 +3650,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "Tippe  :help<Enter>  oder <F1>  für Online Hilfe          "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "Tippe  :help version8<Enter>    für Versions-Informationen"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "Tippe  :help version9<Enter>    für Versions-Informationen"
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi kompatible Einstellung"
diff --git a/src/po/eo.po b/src/po/eo.po
index 2d1e061..ba25baa 100644
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -6432,8 +6432,8 @@
 msgstr "tajpu  :help<Enenklavo>  aŭ  <F1> por aliri la helpon  "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-msgid "type  :help version8<Enter>   for version info"
-msgstr "tajpu  :help version8<Enenklavo>  por informo de versio"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "tajpu  :help version9<Enenklavo>  por informo de versio"
 
 msgid "Running in Vi compatible mode"
 msgstr "Ruliĝas en reĝimo kongrua kun Vi"
diff --git a/src/po/es.po b/src/po/es.po
index c4b1455..47f07da 100644
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -3694,8 +3694,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "escriba  :help<Intro>  o  <F1>  para obtener ayuda     "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "escriba  :help version8<Intro>  para obtener información de la versión"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "escriba  :help version9<Intro>  para obtener información de la versión"
 
 msgid "Running in Vi compatible mode"
 msgstr "Ejecutando en modo compatible con Vi"
diff --git a/src/po/fi.po b/src/po/fi.po
index 17ae24e..6ce80e6 100644
--- a/src/po/fi.po
+++ b/src/po/fi.po
@@ -3657,8 +3657,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "kirjoita :help<Enter> tai <F1> ohjetta varten              "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "kirjoita :help version8<Enter> versiotietoja varten        "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "kirjoita :help version9<Enter> versiotietoja varten        "
 
 msgid "Running in Vi compatible mode"
 msgstr "Suoritetaan Vi-yhteensopivuustilaa"
diff --git a/src/po/fr.po b/src/po/fr.po
index 02ecb51..91d5d24 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -6692,8 +6692,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tapez  :help<Entrée>  ou  <F1>  pour accéder à l'aide en ligne    "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "tapez  :help version8<Entrée>   pour lire les notes de mise à jour"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "tapez  :help version9<Entrée>   pour lire les notes de mise à jour"
 
 # DB - Pour les trois messages qui suivent :
 #        :set cp
diff --git a/src/po/ga.po b/src/po/ga.po
index 8b37be8..860fe1e 100644
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -3736,8 +3736,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "clóscríobh  :help<Enter>  nó  <F1>  le haghaidh cabhrach ar líne"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "clóscríobh  :help version8<Enter>   le haghaidh eolais faoin leagan"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "clóscríobh  :help version9<Enter>   le haghaidh eolais faoin leagan"
 
 msgid "Running in Vi compatible mode"
 msgstr "I mód comhoiriúnachta Vi"
diff --git a/src/po/it.po b/src/po/it.po
index 4f1847d..6f53f47 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -3371,8 +3371,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "batti :help<Invio>  o  <F1>   per aiuto online            "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "batti :help version8<Invio>   per informazioni su versione"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "batti :help version9<Invio>   per informazioni su versione"
 
 msgid "Running in Vi compatible mode"
 msgstr "Eseguo in modalità compatibile Vi"
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index 1334aac..a26af74 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -3584,8 +3584,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤Ï     :help<Enter> ¤« <F1>   "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï       :help version8<Enter>  "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï       :help version9<Enter>  "
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi¸ß´¹¥â¡¼¥É¤ÇưºîÃæ"
diff --git a/src/po/ja.po b/src/po/ja.po
index 931e00b..d7ee9d1 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3584,8 +3584,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "オンラインヘルプは     :help<Enter> か <F1>   "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "バージョン情報は       :help version8<Enter>  "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "バージョン情報は       :help version9<Enter>  "
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi互換モードで動作中"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 48f3af0..72eec37 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3584,8 +3584,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "ƒIƒ“ƒ‰ƒCƒ“ƒwƒ‹ƒv‚Í     :help<Enter> ‚© <F1>   "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "ƒo[ƒWƒ‡ƒ“î•ñ‚Í       :help version8<Enter>  "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "ƒo[ƒWƒ‡ƒ“î•ñ‚Í       :help version9<Enter>  "
 
 msgid "Running in Vi compatible mode"
 msgstr "ViŒÝŠ·ƒ‚[ƒh‚Å“®ì’†"
diff --git a/src/po/ko.UTF-8.po b/src/po/ko.UTF-8.po
index dda05d8..1fd97a1 100644
--- a/src/po/ko.UTF-8.po
+++ b/src/po/ko.UTF-8.po
@@ -6288,8 +6288,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "온라인 도움말을 보려면     :help<엔터> 또는 <F1>  입력"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "판 정보를 보려면           :help version8<엔터>   입력"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "판 정보를 보려면           :help version9<엔터>   입력"
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi 호환 상태로 실행중입니다"
diff --git a/src/po/ko.po b/src/po/ko.po
index 9bab29d..a031a97 100644
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -6288,8 +6288,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "¿Â¶óÀÎ µµ¿ò¸»À» º¸·Á¸é     :help<¿£ÅÍ> ¶Ç´Â <F1>  ÀÔ·Â"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "ÆÇ Á¤º¸¸¦ º¸·Á¸é           :help version8<¿£ÅÍ>   ÀÔ·Â"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "ÆÇ Á¤º¸¸¦ º¸·Á¸é           :help version9<¿£ÅÍ>   ÀÔ·Â"
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi ȣȯ »óÅ·Π½ÇÇàÁßÀÔ´Ï´Ù"
diff --git a/src/po/nb.po b/src/po/nb.po
index 934b79c..141e63a 100644
--- a/src/po/nb.po
+++ b/src/po/nb.po
@@ -5749,8 +5749,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "skriv  :help<Enter>  eller  <F1>  for on-line hjelp"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "skriv  :help version8<Enter>      for versjonsinfo "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "skriv  :help version9<Enter>      for versjonsinfo "
 
 msgid "Running in Vi compatible mode"
 msgstr "Kjører i Vi-kompatibel modus"
diff --git a/src/po/nl.po b/src/po/nl.po
index 94fd693..5ea361e 100644
--- a/src/po/nl.po
+++ b/src/po/nl.po
@@ -5402,8 +5402,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "typ :help<Enter> of <F1> voor on-line hulp"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "typ :help version8<Enter> voor versieinformatie"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "typ :help version9<Enter> voor versieinformatie"
 
 msgid "Running in Vi compatible mode"
 msgstr "wordt uitgevoerd in Vi compatible-modus"
diff --git a/src/po/no.po b/src/po/no.po
index 934b79c..141e63a 100644
--- a/src/po/no.po
+++ b/src/po/no.po
@@ -5749,8 +5749,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "skriv  :help<Enter>  eller  <F1>  for on-line hjelp"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "skriv  :help version8<Enter>      for versjonsinfo "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "skriv  :help version9<Enter>      for versjonsinfo "
 
 msgid "Running in Vi compatible mode"
 msgstr "Kjører i Vi-kompatibel modus"
diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po
index 55283aa..9e62766 100644
--- a/src/po/pl.UTF-8.po
+++ b/src/po/pl.UTF-8.po
@@ -6168,8 +6168,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "wprowadź :help<Enter>  lub  <F1>  pomoc na bieżąco       "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "wprowadź :help version8<Enter>    dla informacji o wersji"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "wprowadź :help version9<Enter>    dla informacji o wersji"
 
 msgid "Running in Vi compatible mode"
 msgstr "Działam w trybie zgodności z Vi"
diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po
index ff6cf43..72cf2ed 100644
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -6168,8 +6168,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "wprowadŸ :help<Enter>  lub  <F1>  pomoc na bie¿¹co       "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "wprowadŸ :help version8<Enter>    dla informacji o wersji"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "wprowadŸ :help version9<Enter>    dla informacji o wersji"
 
 msgid "Running in Vi compatible mode"
 msgstr "Dzia³am w trybie zgodnoœci z Vi"
diff --git a/src/po/pl.po b/src/po/pl.po
index 1e13dc1..b1c92c7 100644
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -6168,8 +6168,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "wprowad¼ :help<Enter>  lub  <F1>  pomoc na bie¿±co       "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "wprowad¼ :help version8<Enter>    dla informacji o wersji"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "wprowad¼ :help version9<Enter>    dla informacji o wersji"
 
 msgid "Running in Vi compatible mode"
 msgstr "Dzia³am w trybie zgodno¶ci z Vi"
diff --git a/src/po/pt_BR.po b/src/po/pt_BR.po
index d6da8b0..0962866 100644
--- a/src/po/pt_BR.po
+++ b/src/po/pt_BR.po
@@ -6339,8 +6339,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "digite  :help<Enter> ou <F1>  para ajuda on-line "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "digite  :help version8<Enter> para info da versão"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "digite  :help version9<Enter> para info da versão"
 
 msgid "Running in Vi compatible mode"
 msgstr "Executando no modo compatível com Vi"
diff --git a/src/po/ru.cp1251.po b/src/po/ru.cp1251.po
index 060e45f..2791655 100644
--- a/src/po/ru.cp1251.po
+++ b/src/po/ru.cp1251.po
@@ -6550,8 +6550,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "íàáåðèòå :help<Enter> èëè <F1>   äëÿ ïîëó÷åíèÿ ñïðàâêè        "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "íàáåðèòå :help version8<Enter>   äëÿ èíôîðìàöèè î âåðñèè      "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "íàáåðèòå :help version9<Enter>   äëÿ èíôîðìàöèè î âåðñèè      "
 
 msgid "Running in Vi compatible mode"
 msgstr "Ðàáîòà â Vi-ñîâìåñòèìîì ðåæèìå"
diff --git a/src/po/ru.po b/src/po/ru.po
index d802911..fd5a9fc 100644
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -6550,8 +6550,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "наберите :help<Enter> или <F1>   для получения справки        "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "наберите :help version8<Enter>   для информации о версии      "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "наберите :help version9<Enter>   для информации о версии      "
 
 msgid "Running in Vi compatible mode"
 msgstr "Работа в Vi-совместимом режиме"
diff --git a/src/po/sk.cp1250.po b/src/po/sk.cp1250.po
index ef2b704..d869975 100644
--- a/src/po/sk.cp1250.po
+++ b/src/po/sk.cp1250.po
@@ -5377,8 +5377,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "zadajte  :help<Enter>  alebo  <F1>  pre pomocníka          "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "zadajte  :help version8<Enter>      pre informácie o verzii"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "zadajte  :help version9<Enter>      pre informácie o verzii"
 
 msgid "Running in Vi compatible mode"
 msgstr "Pracujem v režime kompatibility s Vi"
diff --git a/src/po/sk.po b/src/po/sk.po
index 31f2634..02b7ac0 100644
--- a/src/po/sk.po
+++ b/src/po/sk.po
@@ -5377,8 +5377,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "zadajte  :help<Enter>  alebo  <F1>  pre pomocníka          "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "zadajte  :help version8<Enter>      pre informácie o verzii"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "zadajte  :help version9<Enter>      pre informácie o verzii"
 
 msgid "Running in Vi compatible mode"
 msgstr "Pracujem v re¾ime kompatibility s Vi"
diff --git a/src/po/sr.po b/src/po/sr.po
index 08bd222..ea117be 100644
--- a/src/po/sr.po
+++ b/src/po/sr.po
@@ -3398,8 +3398,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "откуцајте  :help<Ентер>  или  <F1> за директну помоћ"
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "откуцајте  :help version8<Ентер>   за инфо о верзији"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "откуцајте  :help version9<Ентер>   за инфо о верзији"
 
 msgid "Running in Vi compatible mode"
 msgstr "Рад у Vi компатибилном режиму"
diff --git a/src/po/sv.po b/src/po/sv.po
index da57845..2998991 100644
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -5731,8 +5731,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "skriv  :help<Enter> eller <F1>  för online-hjälp         "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "skriv  :help version8<Enter>    för versioninformation   "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "skriv  :help version9<Enter>    för versioninformation   "
 
 msgid "Running in Vi compatible mode"
 msgstr "Kör i Vi-kompatibelt läge"
diff --git a/src/po/tr.po b/src/po/tr.po
index 3168225..4f3c0f0 100644
--- a/src/po/tr.po
+++ b/src/po/tr.po
@@ -3578,8 +3578,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "yardım belgeleri için  :help<Enter> veya <F1> "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "sürüm bilgisi için     :help version8<Enter>  "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "sürüm bilgisi için     :help version9<Enter>  "
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi uyumlu kipte çalışıyor"
diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index b7b891b..b34d367 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -3671,8 +3671,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr ":help<Enter> àáî <F1>     ïåðåãëÿä äîïîìîãè        "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr ":help version8<Enter>     ³íôîðìàö³ÿ ïðî âåðñ³þ    "
+msgid "type  :help version9<Enter>   for version info"
+msgstr ":help version9<Enter>     ³íôîðìàö³ÿ ïðî âåðñ³þ    "
 
 msgid "Running in Vi compatible mode"
 msgstr "Âè ïðàöþºòå â ðåæèì³ ñóì³ñíîìó ç Vi"
diff --git a/src/po/uk.po b/src/po/uk.po
index bc7338a..1161184 100644
--- a/src/po/uk.po
+++ b/src/po/uk.po
@@ -3671,8 +3671,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr ":help<Enter> або <F1>     перегляд допомоги        "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr ":help version8<Enter>     інформація про версію    "
+msgid "type  :help version9<Enter>   for version info"
+msgstr ":help version9<Enter>     інформація про версію    "
 
 msgid "Running in Vi compatible mode"
 msgstr "Ви працюєте в режимі сумісному з Vi"
diff --git a/src/po/vi.po b/src/po/vi.po
index 71df46e..a76e7b1 100644
--- a/src/po/vi.po
+++ b/src/po/vi.po
@@ -4807,8 +4807,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr " hãy gõ :help<Enter> hoặc <F1>  để có được trợ giúp        "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "hãy gõ :help version8<Enter>   để biết về phiên bản này  "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "hãy gõ :help version9<Enter>   để biết về phiên bản này  "
 
 msgid "Running in Vi compatible mode"
 msgstr "Làm việc trong chế độ tương thích với Vi"
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index 87090a5..1cf3a6d 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -5624,8 +5624,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "输入  :help<Enter>  或  <F1>  查看在线帮助    "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "输入  :help version8<Enter>   查看版本信息    "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "输入  :help version9<Enter>   查看版本信息    "
 
 msgid "Running in Vi compatible mode"
 msgstr "运行于 Vi 兼容模式"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 9081af7..0f9f8db 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -5624,8 +5624,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "ÊäÈë  :help<Enter>  »ò  <F1>  ²é¿´ÔÚÏß°ïÖú    "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "ÊäÈë  :help version8<Enter>   ²é¿´°æ±¾ÐÅÏ¢    "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "ÊäÈë  :help version9<Enter>   ²é¿´°æ±¾ÐÅÏ¢    "
 
 msgid "Running in Vi compatible mode"
 msgstr "ÔËÐÐÓÚ Vi ¼æÈÝģʽ"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 0cc3c33..6c1dbef 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -5624,8 +5624,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "ÊäÈë  :help<Enter>  »ò  <F1>  ²é¿´ÔÚÏß°ïÖú    "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "ÊäÈë  :help version8<Enter>   ²é¿´°æ±¾ÐÅÏ¢    "
+msgid "type  :help version9<Enter>   for version info"
+msgstr "ÊäÈë  :help version9<Enter>   ²é¿´°æ±¾ÐÅÏ¢    "
 
 msgid "Running in Vi compatible mode"
 msgstr "ÔËÐÐÓÚ Vi ¼æÈÝģʽ"
diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po
index e5fa804..d85d5e6 100644
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@ -4793,8 +4793,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "線上說明請輸入                :help<Enter>         "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "新版本資訊請輸入              :help version8<Enter>"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "新版本資訊請輸入              :help version9<Enter>"
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi 相容模式"
diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po
index b0dfb54..8005340 100644
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -4786,8 +4786,8 @@
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "½u¤W»¡©ú½Ð¿é¤J                :help<Enter>         "
 
-msgid "type  :help version8<Enter>   for version info"
-msgstr "·sª©¥»¸ê°T½Ð¿é¤J              :help version8<Enter>"
+msgid "type  :help version9<Enter>   for version info"
+msgstr "·sª©¥»¸ê°T½Ð¿é¤J              :help version9<Enter>"
 
 msgid "Running in Vi compatible mode"
 msgstr "Vi ¬Û®e¼Ò¦¡"