Update runtime files.

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.1.  Last change: 2019 Jul 21
+*cmdline.txt*   For Vim version 8.1.  Last change: 2019 Aug 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -702,7 +702,7 @@ commands ":write" and ":global" have the whole file (1,$) as default.
 If more line specifiers are given than required for the command, the first
 one(s) will be ignored.
 
-Line numbers may be specified with:		*:range* *E14* *{address}*
+Line numbers may be specified with:		*:range* *{address}*
 	{number}	an absolute line number
 	.		the current line			  *:.*
 	$		the last line in the file		  *:$*

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.1.  Last change: 2019 Feb 17
+*develop.txt*   For Vim version 8.1.  Last change: 2019 Aug 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -529,7 +529,7 @@ the best method is.  Alternatives:
    memory use, but takes a long time.  On a fast PC it takes a couple of
    seconds for English, which can be acceptable for interactive use.  But for
    some languages it takes more than ten seconds (e.g., German, Catalan),
-   which is unacceptable slow.  For batch processing (automatic corrections)
+   which is unacceptably slow.  For batch processing (automatic corrections)
    it's too slow for all languages.
 2. Use a trie for the soundfolded words, so that searching can be done just
    like how it works without soundfolding.  This requires remembering a list

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.1.  Last change: 2019 Aug 04
+*eval.txt*	For Vim version 8.1.  Last change: 2019 Aug 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4396,15 +4396,24 @@ function({name} [, {arglist}] [, {dict}])
 		the Funcref and will be used when the Funcref is called.
 
 		The arguments are passed to the function in front of other
-		arguments.  Example: >
+		arguments, but after any argument from |method|.  Example: >
 			func Callback(arg1, arg2, name)
 			...
-			let Func = function('Callback', ['one', 'two'])
+			let Partial = function('Callback', ['one', 'two'])
 			...
-			call Func('name')
+			call Partial('name')
 <		Invokes the function as with: >
 			call Callback('one', 'two', 'name')
 
+<		With a |method|: >
+			func Callback(one, two, three)
+			...
+			let Partial = function('Callback', ['two'])
+			...
+			eval 'one'->Partial('three')
+<		Invokes the function as with: >
+			call Callback('one', 'two', 'three')
+
 <		The function() call can be nested to add more arguments to the
 		Funcref.  The extra arguments are appended to the list of
 		arguments.  Example: >
@@ -6196,6 +6205,8 @@ map({expr1}, {expr2})					*map()*
 			call map(myDict, {key, val -> key . '-' . val})
 <		If you do not use "val" you can leave it out: >
 			call map(myDict, {key -> 'item: ' . key})
+<		If you do not use "key" you can use a short name: >
+			call map(myDict, {_, val -> 'item: ' . val})
 <
 		The operation is done in-place.  If you want a |List| or
 		|Dictionary| to remain unmodified make a copy first: >
@@ -10120,6 +10131,11 @@ It is also possible to use `:eval`.  It does not support a range, but does
 allow for method chaining, e.g.: >
 	eval GetList()->Filter()->append('$')
 
+A function can also be called as part of evaluating an expression or when it
+is used as a method: >
+	let x = GetList()
+	let y = GetList()->Filter()
+
 
 AUTOMATICALLY LOADING FUNCTIONS ~
 							*autoload-functions*

runtime/doc/indent.txt

@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 8.1.  Last change: 2019 Jul 21
+*indent.txt*    For Vim version 8.1.  Last change: 2019 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -831,7 +831,7 @@ PHP indenting can be altered in several ways by modifying the values of some
 global variables:
 
 					*php-comment* *PHP_autoformatcomment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
 own 'formatoptions'): >
     :let g:PHP_autoformatcomment = 0
 

runtime/doc/popup.txt

@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.1.  Last change: 2019 Aug 01
+*popup.txt*  For Vim version 8.1.  Last change: 2019 Aug 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.1.  Last change: 2019 Jul 15
+*quickfix.txt*  For Vim version 8.1.  Last change: 2019 Aug 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1352,6 +1352,9 @@ replaced with SOH (0x01).
 Note: By default the difference between upper and lowercase is ignored.  If
 you want to match case, add "\C" to the pattern |/\C|.
 
+Vim will read lines of any length, but only the first 4095 bytes are used, the
+rest is ignored.  Items can only be 1023 bytes long.
+
 
 Basic items
 

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 8.1.  Last change: 2019 Jul 18
+*quickref.txt*  For Vim version 8.1.  Last change: 2019 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -651,6 +651,7 @@ Short explanation of each option:		*option-list*
 'complete'	  'cpt'     specify how Insert mode completion works
 'completefunc'	  'cfu'     function to be used for Insert mode completion
 'completeopt'	  'cot'     options for Insert mode completion
+'completeslash'	  'csl'	    like 'shellslash' for completion
 'concealcursor'	  'cocu'    whether concealable text is hidden in cursor line
 'conceallevel'	  'cole'    whether concealable text is shown or hidden
 'confirm'	  'cf'	    ask what to do about unsaved/read-only files

runtime/doc/tags

@@ -2382,6 +2382,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :ene!	editing.txt	/*:ene!*
 :enew	editing.txt	/*:enew*
 :enew!	editing.txt	/*:enew!*
+:eval	eval.txt	/*:eval*
 :ex	editing.txt	/*:ex*
 :exe	eval.txt	/*:exe*
 :exe-comment	eval.txt	/*:exe-comment*
@@ -3880,7 +3881,6 @@ E136	starting.txt	/*E136*
 E137	starting.txt	/*E137*
 E138	starting.txt	/*E138*
 E139	message.txt	/*E139*
-E14	cmdline.txt	/*E14*
 E140	message.txt	/*E140*
 E141	message.txt	/*E141*
 E142	message.txt	/*E142*
@@ -4027,6 +4027,7 @@ E270	if_ruby.txt	/*E270*
 E271	if_ruby.txt	/*E271*
 E272	if_ruby.txt	/*E272*
 E273	if_ruby.txt	/*E273*
+E274	eval.txt	/*E274*
 E277	remote.txt	/*E277*
 E28	syntax.txt	/*E28*
 E280	if_tcl.txt	/*E280*
@@ -7653,6 +7654,7 @@ message-history	message.txt	/*message-history*
 message.txt	message.txt	/*message.txt*
 messages	message.txt	/*messages*
 meta	intro.txt	/*meta*
+method	eval.txt	/*method*
 min()	eval.txt	/*min()*
 missing-options	vi_diff.txt	/*missing-options*
 mkdir()	eval.txt	/*mkdir()*
@@ -8246,6 +8248,7 @@ popup-filter	popup.txt	/*popup-filter*
 popup-function-details	popup.txt	/*popup-function-details*
 popup-functions	popup.txt	/*popup-functions*
 popup-intro	popup.txt	/*popup-intro*
+popup-mapping	popup.txt	/*popup-mapping*
 popup-mask	popup.txt	/*popup-mask*
 popup-menu	gui.txt	/*popup-menu*
 popup-menu-added	version5.txt	/*popup-menu-added*

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 Jul 30
+*todo.txt*      For Vim version 8.1.  Last change: 2019 Aug 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,12 +38,25 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+
+Methods:
+- Support lambda?  #4768
+    echo (10.0 / 100.0)->{x -> x * 100}
+- Define a user defined function for a specific type only?
+	func Len(expr) method=list,dict
+	  return a:expr->len()
+	endfunc
+	echo [1, 2, 3]->Len()
+	3
+	call Len([1, 2, 3])
+	error!
+
 Popup windows:
-- Always show the right border, not only when there is a close button?
+- :pedit from help doesn't reset help flag, see pedit example
-- bug: double click in scrollbar starts selection
+- check popupmenu using preview window
 - modeless selection fails over ssh and with putty.  Mouse dragging not
   supported?  Can we force it on?
-- Allow resizing from the bottom-right corner
+- modeless selection extends into the scrollbar. (#4773)
 - Implement flip option
 - Have a way to scroll to the bottom, e.g. set 'firstline' to -1? (#4577)
 - Why does 'nrformats' leak from the popup window buffer???
@@ -57,7 +70,7 @@ Popup windows:
   do. (#4560)
 - Make redrawing more efficient and avoid flicker:
     - put popup menu also put in popup_mask?
-- Invoke filter with character before mapping?
+- Invoke filter with character before mapping?  #4759
 - Figure out the size and position better.
     if wrapping splits a double-wide character
     if wrapping inserts indent
@@ -135,16 +148,11 @@ Terminal emulator window:
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
-Error numbers available: E260, E274, E275, E276,
+Error numbers available: E274, E275, E276,
 E278, E279, E290, E292, E362, E366, E450, E451, E452,
 E453, E454, E460, E489, E491, E565, E578, E610, E611, E653,
 E654, E856, E857, E860, E861, E863, E889, E900
 
-Patch on issue #4661 to fix resolve(). (Ken Takata)
-https://gist.github.com/k-takata/52d0a677ca9a27bdbaed21d77533244e
-
-Patch to split of map.c from getchar.c (Yegappan, #4740)
-
 Sound: support on Mac?  Or does libcanberra work there?
 
 Patch to add win_splitmove() function. (Andy Massimino, #4561)
@@ -188,6 +196,9 @@ unlisted. (#4478)
 
 Make 'showbreak' global-local.
 
+The :syntax cchar value can only be a single character.  It would be useful to
+support combining characters. (Charles Campbell)  Also #4687
+
 Problem showing a line if the number column width changes when using "o".
 (Mateusz Morusiewicz, #4245)
 
@@ -197,6 +208,8 @@ default one.  #4698
 When using :packadd files under "later" are not used, which is inconsistent
 with packages under "start". (xtal8, #1994)
 
+Modeless selection doesn't work in gvim. (#4783)
+
 Visual highlight not removed when 'dipslay' is "lastline" and line doesn't
 fit. (Kevin Lawler, #4457)
 
@@ -221,9 +234,14 @@ it's in a mapping. (2018 Oct 6, #2302, #3522)
 
 Patch for Inno Setup: #2739
 
+Would be nice to set tab-local values for 'diffexpr' and 'diffopt'.  Use
+t:diffexpr_option t:diffopt_option? (#4782)
+
 Internal diff doesn't handle binary file like external diff does. (Mike
 Williams, 2018 Oct 30)
 
+'[ mark in wrong column after put. (#4776)
+
 "exepath('bin/cmd')" does not work while ":!bin/cmd" does work.
 (Daniel Hahler, #4710)  and executable('bin/cmd') returns 1
 
@@ -244,6 +262,8 @@ be adjusted. (Daniel Steinberg, 2019 Feb 24, #4041)
 Patch for ambiguous width characters in libvterm on MS-Windows 10.
 (Nobuhiro Takasaki, #4411)
 
+Window size changes after closing a tab. (#4741)
+
 Problem with colors in terminal window. (Jason Franklin, 2019 May 12)
 
 Lifepillar: Updated/cleaned up color schemes:
@@ -279,6 +299,8 @@ Many users don't like 'thesaurus' to match so many words. (#4667, #1611)
 Some composing characters actually add a cell width to the character they are
 on top off, making the whole thing two characters wide. (#4526)
 
+Add CmdwinLeavePost (#4762).  Also add WinLeavePost then?
+
 Should we include some part of pull request #4505, not increment changedtick
 in some cases?  E.g. for ":write" when the changed flag was already off, the
 buffer didn't change at all.
@@ -313,24 +335,6 @@ added?
 Add test for urxvt mouse codes.  Also test that mouse coordinates can be
 negative. (see #4326)
 
-All functions are global, which makes functions like get() and len() awkward.
-For the future use the ~get() and ~len() syntax.  It also allows for
-chaining: >
-    mylist~get(idx)
-    mylist~uniq()~len()
-    mydict~get(idx)
-    mystring~len()
-Or use -> (like C pointer dereference) >
-    mylist->get(idx)
-    mylist->uniq()->len()
-    mydict->get(idx)
-    mystring->len()
-Alternatives for ~:
-    ^  list^get()    could also be used
-    .  list.get()    already means "member" in Dict
-    $  list$get()    harder to read
-    @  list@get()    harder to read
-
 'cmdheight' has a tab-local value, but it cannot be obtained with
 `:echo gettabwinvar(2, 1, '&cmdheight')` returns the value for the _current_
 tab page. (Ingo Karkat, #4324)
@@ -1904,9 +1908,6 @@ Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
 only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
 21, Ben Fritz, 2010 Sep 14)
 
-The :syntax cchar value can only be a single character.  It would be useful to
-support combining characters. (Charles Campbell)
-
 'cursorline' works on a text line only.  Add 'cursorscreenline' for
 highlighting the screen line. (Christian Brabandt, 2012 Mar 31)
 

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.1.  Last change: 2019 Jul 21
+*various.txt*   For Vim version 8.1.  Last change: 2019 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -382,7 +382,7 @@ N  *+linebreak*		|'linebreak'|, |'breakat'| and |'showbreak'|
 N  *+lispindent*	|'lisp'|
 T  *+listcmds*		Vim commands for the list of buffers |buffer-hidden|
 			and argument list |:argdelete|
-N  *+localmap*		Support for mappings local to a buffer |:map-local|
+T  *+localmap*		Support for mappings local to a buffer |:map-local|
 m  *+lua*		|Lua| interface
 m  *+lua/dyn*		|Lua| interface |/dyn|
 N  *+menu*		|:menu|

runtime/optwin.vim

@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Jul 18
+" Last Change:	2019 Aug 01
 
 " If there already is an option window, jump to that one.
 let buf = bufnr('option-window')
@@ -1176,6 +1176,8 @@ if has("win32") || has("osfiletype")
   if has("win32")
     call append("$", "shellslash\tuse forward slashes in file names; for Unix-like shells")
     call <SID>BinOptionG("ssl", &ssl)
+    call append("$", "completeslash\tspecifies slash/backslash used for completion")
+    call <SID>OptionG("csl", &csl)
   endif
 endif
 

runtime/syntax/cs.vim

@@ -3,7 +3,7 @@
 " Maintainer:          Nick Jensen <nickspoon@gmail.com>
 " Former Maintainers:  Anduin Withers <awithers@anduin.com>
 "                      Johannes Zellner <johannes@zellner.org>
-" Last Change:         2018-11-26
+" Last Change:         2019-08-01
 " Filenames:           *.cs
 " License:             Vim (see :h license)
 " Repository:          https://github.com/nickspoons/vim-cs
@@ -51,9 +51,11 @@ syn region	csTypeOfStatement	start="typeof(" end=")" contains=csType, csTypeOf
 " Punctuation
 syn match	csBraces	"[{}\[\]]" display
 syn match	csParens	"[()]" display
-syn match	csOpSymbols	"[+\-=]\{1,2}" display
+syn match	csOpSymbols	"+\{1,2}" display
-syn match	csOpSymbols	"[><]\{2}" display
+syn match	csOpSymbols	"-\{1,2}" display
-syn match	csOpSymbols	"\s\zs[><]\ze\_s" display
+syn match	csOpSymbols	"=\{1,2}" display
+syn match	csOpSymbols	">\{1,2}" display
+syn match	csOpSymbols	"<\{1,2}" display
 syn match	csOpSymbols	"[!><+\-*/]=" display
 syn match	csOpSymbols	"[!*/^]" display
 syn match	csOpSymbols	"=>" display
@@ -63,6 +65,9 @@ syn match	csLogicSymbols	"||" display
 syn match	csLogicSymbols	"?" display
 syn match	csLogicSymbols	":" display
 
+" Generics
+syn region	csGeneric	matchgroup=csGenericBraces start="<" end=">" oneline contains=csType,csGeneric,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+
 " Comments
 "
 " PROVIDES: @csCommentHook
@@ -87,8 +92,8 @@ syn keyword	csXmlTag	contained list listheader item term description altcomplian
 
 syn cluster xmlTagHook add=csXmlTag
 
-syn match	csXmlCommentLeader	+\/\/\/+    contained
+syn match	csXmlCommentLeader	"///" contained
-syn match	csXmlComment	+\/\/\/.*$+ contains=csXmlCommentLeader,@csXml,@Spell
+syn match	csXmlComment	"///.*$" contains=csXmlCommentLeader,@csXml,@Spell keepend
 syn include	@csXml syntax/xml.vim
 hi def link	xmlRegion Comment
 
@@ -100,7 +105,8 @@ syn region	csSummary	start="^\s*/// <summary" end="^\%\(\s*///\)\@!" transparent
 
 
 syn region	csClassType	start="@\@1<!\<class\>"hs=s+6 end="[:\n{]"me=e-1 contains=csClass
-syn region	csNewType	start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew contains=csNewType
+" csUserType may be defined by user scripts/plugins - it should be contained in csNewType
+syn region	csNewType	start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew,csUserType
 syn region	csIsType	start=" is "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn region	csIsType	start=" as "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn keyword	csNew	new contained
@@ -146,7 +152,7 @@ syn region	csInterVerbString	matchgroup=csQuote start=+\$@"+ end=+"+ skip=+""+ e
 
 syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ contained transparent contains=@csAll,csBracketed
 
-syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString
+syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
 
 " The default highlighting.
 hi def link	csType	Type
@@ -160,7 +166,7 @@ hi def link	csLabel	Label
 hi def link	csModifier	StorageClass
 hi def link	csConstant	Constant
 hi def link	csException	Exception
-hi def link	csTypeOf	Operator
+hi def link	csTypeOf	Keyword
 hi def link	csTypeOfStatement	Typedef
 hi def link	csUnspecifiedStatement	Statement
 hi def link	csUnsupportedStatement	Statement
@@ -198,6 +204,8 @@ hi def link	csInterpolationAlignDel	csInterpolationDelimiter
 hi def link	csInterpolationFormat	csInterpolationDelimiter
 hi def link	csInterpolationFormatDel	csInterpolationDelimiter
 
+hi def link	csGenericBraces	csBraces
+
 " xml markup
 hi def link	csXmlCommentLeader	Comment
 hi def link	csXmlComment	Comment

src/po/eo.po

@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-30 17:27+0200\n"
+"POT-Creation-Date: 2019-08-04 17:23+0200\n"
-"PO-Revision-Date: 2019-05-30 18:59+0200\n"
+"PO-Revision-Date: 2019-08-04 17:45+0200\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: Esperanto\n"
 "Language: eo\n"
@@ -122,8 +122,9 @@ msgstr "E83: Ne eblas disponigi bufron, nun uzas alian..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Bufro ne povas esti registrita"
 
-msgid "E937: Attempt to delete a buffer that is in use"
+#, c-format
-msgstr "E937: Provo de forviŝo de bufro, kiu estas en uzo"
+msgid "E937: Attempt to delete a buffer that is in use: %s"
+msgstr "E937: Provo de forviŝo de bufro, kiu estas en uzo: %s"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Neniu bufro estis malŝargita"
@@ -256,12 +257,8 @@ msgstr "Subo"
 msgid "Top"
 msgstr "Supro"
 
-msgid ""
+msgid "E249: window layout changed unexpectedly"
-"\n"
+msgstr "E249: aranĝo de fenestro ŝanĝiĝis neatendite"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Listo de bufroj:\n"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
@@ -269,6 +266,9 @@ msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
 msgid "[Prompt]"
 msgstr "[Invito]"
 
+msgid "[Popup]"
+msgstr "[Ŝprucfenestro]"
+
 msgid "[Scratch]"
 msgstr "[Malneto]"
 
@@ -297,6 +297,9 @@ msgstr "E904: tria argumento de \"call\" devas esti listo"
 msgid "E905: received unknown command: %s"
 msgstr "E905: nekonata komando ricevita: %s"
 
+msgid "E906: not an open channel"
+msgstr "E906: ne estas malfermita kanalo"
+
 #, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s(): konservo dum nekonektita"
@@ -312,9 +315,6 @@ msgstr "E917: Ne eblas uzi reagfunkcion kun %s()"
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
 msgstr "E912: ne eblas uzi ch_evalexpr()/ch_sendexpr() kun kruda aŭ nl kanalo"
 
-msgid "E906: not an open channel"
-msgstr "E906: ne estas malfermita kanalo"
-
 msgid "E920: _io file requires _name to be set"
 msgstr "E920: dosiero _io bezonas _name"
 
@@ -325,6 +325,9 @@ msgstr "E915: bufro in_io bezonas in_buf aŭ in_name"
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918: bufro devas esti ŝargita: %s"
 
+msgid "E916: not a valid job"
+msgstr "E916: nevalida tasko"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: Dosiero estas ĉifrita per nekonata metodo"
 
@@ -571,12 +574,21 @@ msgstr "E734: Nevalida datumtipo de variablo de %s="
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nevalida nomo de variablo: %s"
 
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: Ne eblas ŝanĝi ekzistantan variablon"
+
 msgid "E806: using Float as a String"
 msgstr "E806: uzo de Glitpunktnombro kiel Ĉeno"
 
 msgid "E991: cannot use =<< here"
 msgstr "E991: ne eblas uzi =<< ĉi tie"
 
+msgid "E221: Marker cannot start with lower case letter"
+msgstr "E221: Markilo ne povas komenciĝi per minusklo"
+
+msgid "E172: Missing marker"
+msgstr "E172: Markilo mankas"
+
 #, c-format
 msgid "E990: Missing end marker '%s'"
 msgstr "E990: Mankas fina markilo '%s'"
@@ -597,6 +609,15 @@ msgstr "Duobla ; en listo de variabloj"
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Ne eblas listigi variablojn de %s"
 
+msgid "E996: Cannot lock an environment variable"
+msgstr "E996: Ne eblas ŝlosi medivariablon"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: Ne eblas ŝlosi opcion"
+
+msgid "E996: Cannot lock a register"
+msgstr "E996: Ne eblas ŝlosi reĝistron"
+
 msgid "E689: Can only index a List, Dictionary or Blob"
 msgstr "E689: Nur eblas indeksi Liston, Vortaron aŭ BLOB-on"
 
@@ -609,12 +630,18 @@ msgstr "E709: [:] bezonas listan aŭ BLOB-an valoron"
 msgid "E972: Blob value does not have the right number of bytes"
 msgstr "E972: Valoro de BLOB-o ne havas la ĝustan nombron de bajtoj"
 
+msgid "E996: Cannot lock a range"
+msgstr "E996: Ne eblas ŝlosi amplekson"
+
 msgid "E710: List value has more items than target"
 msgstr "E710: Lista valoro havas pli da eroj ol la celo"
 
 msgid "E711: List value has not enough items"
 msgstr "E711: Lista valoro ne havas sufiĉe da eroj"
 
+msgid "E996: Cannot lock a list or dict"
+msgstr "E996: Ne eblas ŝlosi liston aŭ vortaron"
+
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" mankas malantaŭ \":for\""
 
@@ -641,6 +668,9 @@ msgstr "E973: BLOB-a literalo devus havi paran nombron de deksesumaj signoj"
 msgid "E110: Missing ')'"
 msgstr "E110: Mankas ')'"
 
+msgid "E260: Missing name after ->"
+msgstr "E260: Mankas nomo malantaŭ ->"
+
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Ne eblas indeksi Funcref"
 
@@ -759,13 +789,6 @@ msgstr "E742: Ne eblas ŝanĝi valoron de %s"
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: variablo ingita tro profunde por fari kopion"
 
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# mallokaj variabloj:\n"
-
 msgid ""
 "\n"
 "\tLast set from "
@@ -800,10 +823,6 @@ msgstr "argumento de map()"
 msgid "filter() argument"
 msgstr "argumento de filter()"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Argumento de %s devas esti Listo"
-
 #, c-format
 msgid "E899: Argument of %s must be a List or Blob"
 msgstr "E899: Argumento de %s devas esti Listo aŭ BLOB-o"
@@ -811,9 +830,6 @@ msgstr "E899: Argumento de %s devas esti Listo aŭ BLOB-o"
 msgid "E928: String required"
 msgstr "E928: Ĉeno bezonata"
 
-msgid "E957: Invalid window number"
-msgstr "E957: Nevalida numero de fenestro"
-
 msgid "E808: Number or Float required"
 msgstr "E808: Nombro aŭ Glitpunktnombro bezonata"
 
@@ -865,16 +881,9 @@ msgstr "argumento de insert()"
 msgid "E786: Range not allowed"
 msgstr "E786: Amplekso nepermesebla"
 
-msgid "E916: not a valid job"
-msgstr "E916: nevalida tasko"
-
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
 
-#, c-format
-msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID estas rezervita por \":match\": %d"
-
 msgid "E726: Stride is zero"
 msgstr "E726: Paŝo estas nul"
 
@@ -920,18 +929,6 @@ msgstr "E927: Nevalida ago: '%s'"
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: Nevalida ago: '%s'"
 
-msgid "sort() argument"
-msgstr "argumento de sort()"
-
-msgid "uniq() argument"
-msgstr "argumento de uniq()"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702: Ordiga funkcio malsukcesis"
-
-msgid "E882: Uniq compare function failed"
-msgstr "E882: kompara funkcio de uniq() malsukcesis"
-
 msgid "(Invalid)"
 msgstr "(Nevalida)"
 
@@ -988,73 +985,6 @@ msgstr "E135: *Filtraj* Aŭtokomandoj ne rajtas ŝanĝi aktualan bufron"
 msgid "[No write since last change]\n"
 msgstr "[Neniu skribo de post lasta ŝanĝo]\n"
 
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s en linio: "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: Tro da eraroj, nun ignoras la reston de la dosiero"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Legado de dosiero viminfo \"%s\"%s%s%s"
-
-msgid " info"
-msgstr " informo"
-
-msgid " marks"
-msgstr " markoj"
-
-msgid " oldfiles"
-msgstr " malnovaj dosieroj"
-
-msgid " FAILED"
-msgstr " MALSUKCESIS"
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Dosiero viminfo ne skribeblas: %s"
-
-#, c-format
-msgid "E929: Too many viminfo temp files, like %s!"
-msgstr "E929: Tro da provizoraj dosieroj viminfo, kiel %s!"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Ne eblas skribi dosieron viminfo %s!"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Skribas dosieron viminfo \"%s\""
-
-#, c-format
-msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886: Ne eblas renomi dosieron viminfo al %s!"
-
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Tiu dosiero viminfo estis kreita de Vim %s.\n"
-
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# Vi povas redakti ĝin se vi estas singarda.\n"
-"\n"
-
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Valoro de 'encoding' kiam tiu dosiero estis kreita\n"
-
-msgid "Illegal starting char"
-msgstr "Nevalida eka signo"
-
-msgid ""
-"\n"
-"# Bar lines, copied verbatim:\n"
-msgstr ""
-"\n"
-"# Linioj komencantaj per |, kopiitaj sen ŝanĝo:\n"
-
 msgid "Save As"
 msgstr "Konservi kiel"
 
@@ -1167,15 +1097,6 @@ msgstr "Ŝablono trovita en ĉiuj linioj: %s"
 msgid "Pattern not found: %s"
 msgstr "Ŝablono ne trovita: %s"
 
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Lasta anstataŭigita ĉeno:\n"
-"$"
-
 # This message should *so* be E42!
 msgid "E478: Don't panic!"
 msgstr "E478: Ne paniku!"
@@ -1219,9 +1140,6 @@ msgstr "E150: Ne estas dosierujo: %s"
 msgid "No old files"
 msgstr "Neniu malnova dosiero"
 
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Ĉu konservi ŝanĝojn al \"%s\"?"
@@ -1378,9 +1296,9 @@ msgid "E494: Use w or w>>"
 msgstr "E494: Uzu w aŭ w>>"
 
 msgid ""
-"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
 msgstr ""
-"INTERNA: Ne eblas uzi DFLALL kun ADDR_NONE, ADDR_UNSIGNED aŭ ADDR_QUICKFIX"
+"INTERNA: Ne eblas uzi EX_DFLALL kun ADDR_NONE, ADDR_UNSIGNED aŭ ADDR_QUICKFIX"
 
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr "E943: Tabulo de komandoj estas ĝisdatigenda, lanĉu 'make cmdidx'"
@@ -1462,16 +1380,6 @@ msgstr "E930: Ne eblas uzi :redir en execute()"
 msgid "Save Redirection"
 msgstr "Konservi alidirekton"
 
-# DP: mi ne certas pri superflugo
-msgid "Save View"
-msgstr "Konservi superflugon"
-
-msgid "Save Session"
-msgstr "Konservi seancon"
-
-msgid "Save Setup"
-msgstr "Konservi agordaron"
-
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Ne eblas krei dosierujon %s"
@@ -1525,9 +1433,6 @@ msgstr "E499: Malplena dosiernomo por '%' aŭ '#', nur funkcias kun \":p:h\""
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Liveras malplenan ĉenon"
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Ne eblas malfermi dosieron viminfo en lega reĝimo"
-
 msgid "Untitled"
 msgstr "Sen titolo"
 
@@ -1650,29 +1555,6 @@ msgstr " tipo de dosiero\n"
 msgid "'history' option is zero"
 msgstr "opcio 'history' estas nul"
 
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Historio %s (de plej nova al plej malnova):\n"
-
-msgid "Command Line"
-msgstr "Komanda linio"
-
-msgid "Search String"
-msgstr "Serĉa ĉeno"
-
-msgid "Expression"
-msgstr "Esprimo"
-
-msgid "Input Line"
-msgstr "Eniga linio"
-
-msgid "Debug Line"
-msgstr "Sencimiga linio"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiva fenestro aŭ bufro forviŝita"
 
@@ -2043,31 +1925,6 @@ msgstr "E222: Aldoni al lega bufro"
 msgid "E223: recursive mapping"
 msgstr "E223: rekursia mapo"
 
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: malloka mallongigo jam ekzistas por %s"
-
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: malloka mapo jam ekzistas por %s"
-
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: mallongigo jam ekzistas por %s"
-
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: mapo jam ekzistas por %s"
-
-msgid "No abbreviation found"
-msgstr "Neniu mallongigo trovita"
-
-msgid "No mapping found"
-msgstr "Neniu mapo trovita"
-
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: Nevalida reĝimo"
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: Malsukcesis krei novan procezon por la grafika interfaco"
 
@@ -2448,6 +2305,93 @@ msgstr "E365: Presado de PostSkripta dosiero malsukcesis"
 msgid "Print job sent."
 msgstr "Laboro de presado sendita."
 
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: rekursia buklo dum ŝargo de syncolor.vim"
+
+#, c-format
+msgid "E411: highlight group not found: %s"
+msgstr "E411: emfaza grupo netrovita: %s"
+
+#, c-format
+msgid "E412: Not enough arguments: \":highlight link %s\""
+msgstr "E412: Ne sufiĉaj argumentoj: \":highlight link %s\""
+
+#, c-format
+msgid "E413: Too many arguments: \":highlight link %s\""
+msgstr "E413: Tro da argumentoj: \":highlight link %s\""
+
+msgid "E414: group has settings, highlight link ignored"
+msgstr "E414: grupo havas agordojn, ligilo de emfazo ignorita"
+
+#, c-format
+msgid "E415: unexpected equal sign: %s"
+msgstr "E415: neatendita egalsigno: %s"
+
+#, c-format
+msgid "E416: missing equal sign: %s"
+msgstr "E416: mankas egalsigno: %s"
+
+#, c-format
+msgid "E417: missing argument: %s"
+msgstr "E417: mankas argumento: %s"
+
+#, c-format
+msgid "E418: Illegal value: %s"
+msgstr "E418: Nevalida valoro: %s"
+
+msgid "E419: FG color unknown"
+msgstr "E419: Nekonata malfona koloro"
+
+msgid "E420: BG color unknown"
+msgstr "E420: Nekonata fona koloro"
+
+#, c-format
+msgid "E421: Color name or number not recognized: %s"
+msgstr "E421: Kolora nomo aŭ nombro nerekonita: %s"
+
+#, c-format
+msgid "E422: terminal code too long: %s"
+msgstr "E422: kodo de terminalo estas tro longa: %s"
+
+#, c-format
+msgid "E423: Illegal argument: %s"
+msgstr "E423: Nevalida argumento: %s"
+
+msgid "E424: Too many different highlighting attributes in use"
+msgstr "E424: Tro da malsamaj atributoj de emfazo uzataj"
+
+msgid "E669: Unprintable character in group name"
+msgstr "E669: Nepresebla signo en nomo de grupo"
+
+msgid "W18: Invalid character in group name"
+msgstr "W18: Nevalida signo en nomo de grupo"
+
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: Tro da emfazaj kaj sintaksaj grupoj"
+
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: Nevalida ID: %d (devas esti egala aŭ pli granda ol 1)"
+
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID jam uzata: %d"
+
+msgid "List or number required"
+msgstr "Listo aŭ nombro bezonata"
+
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: Nevalida ID: %d (devas esti egala aŭ pli granda ol 1)"
+
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID netrovita: %d"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID estas rezervita por \":match\": %d"
+
 msgid "Add a new database"
 msgstr "Aldoni novan datumbazon"
 
@@ -2934,6 +2878,18 @@ msgstr "E696: Mankas komo en Listo: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Mankas fino de Listo ']': %s"
 
+msgid "sort() argument"
+msgstr "argumento de sort()"
+
+msgid "uniq() argument"
+msgstr "argumento de uniq()"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: Ordiga funkcio malsukcesis"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: kompara funkcio de uniq() malsukcesis"
+
 msgid "Unknown option argument"
 msgstr "Nekonata argumento de opcio"
 
@@ -3367,6 +3323,31 @@ msgstr "Neniu ekrano: Sendado de esprimo malsukcesis.\n"
 msgid ": Send expression failed.\n"
 msgstr ": Sendado de esprimo malsukcesis.\n"
 
+#, c-format
+msgid "E224: global abbreviation already exists for %s"
+msgstr "E224: malloka mallongigo jam ekzistas por %s"
+
+#, c-format
+msgid "E225: global mapping already exists for %s"
+msgstr "E225: malloka mapo jam ekzistas por %s"
+
+#, c-format
+msgid "E226: abbreviation already exists for %s"
+msgstr "E226: mallongigo jam ekzistas por %s"
+
+#, c-format
+msgid "E227: mapping already exists for %s"
+msgstr "E227: mapo jam ekzistas por %s"
+
+msgid "No abbreviation found"
+msgstr "Neniu mallongigo trovita"
+
+msgid "No mapping found"
+msgstr "Neniu mapo trovita"
+
+msgid "E228: makemap: Illegal mode"
+msgstr "E228: makemap: Nevalida reĝimo"
+
 msgid "No marks set"
 msgstr "Neniu marko"
 
@@ -3395,30 +3376,6 @@ msgstr ""
 "\n"
 "ŝanĝo  linio kol teksto"
 
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# Markoj de dosiero:\n"
-
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Saltlisto (plej novaj unue):\n"
-
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Historio de markoj en dosieroj (de plej nova al plej malnova):\n"
-
-msgid "Missing '>'"
-msgstr "Mankas '>'"
-
 msgid "E543: Not a valid codepage"
 msgstr "E543: Nevalida kodpaĝo"
 
@@ -3669,6 +3626,9 @@ msgstr "   En dosierujo "
 msgid "      -- none --\n"
 msgstr "     -- nenio --\n"
 
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%a %b %d %H:%M;%S %Y"
+
 msgid "          owned by: "
 msgstr "       posedata de: "
 
@@ -4222,20 +4182,6 @@ msgstr ""
 "\n"
 "--- Reĝistroj ---"
 
-msgid "Illegal register name"
-msgstr "Nevalida nomo de reĝistro"
-
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# Reĝistroj:\n"
-
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: Nekonata tipo de reĝistro %d"
-
 msgid ""
 "E883: search pattern and expression register may not contain two or more "
 "lines"
@@ -4682,10 +4628,20 @@ msgstr "Averto de Vim"
 msgid "shell returned %d"
 msgstr "la ŝelo liveris %d"
 
+#, c-format
+msgid "E997: Tabpage not found: %d"
+msgstr "E997: Langeto netrovita: %d"
+
 #, c-format
 msgid "E993: window %d is not a popup window"
 msgstr "E993: fenestro %d ne estas ŝprucfenestro"
 
+msgid "E994: Not allowed in a popup window"
+msgstr "E994: Nepermesebla en ŝprucfenestro"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
+
 msgid "E553: No more items"
 msgstr "E553: Ne plu estas eroj"
 
@@ -5052,18 +5008,15 @@ msgstr "E388: Ne eblis trovi difinon"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Ne eblis trovi ŝablonon"
 
-msgid "Substitute "
+# DP: mi ne certas pri superflugo
-msgstr "Anstataŭigi "
+msgid "Save View"
+msgstr "Konservi superflugon"
 
-#, c-format
+msgid "Save Session"
-msgid ""
+msgstr "Konservi seancon"
-"\n"
+
-"# Last %sSearch Pattern:\n"
+msgid "Save Setup"
-"~"
+msgstr "Konservi agordaron"
-msgstr ""
-"\n"
-"# Lasta serĉa ŝablono %s:\n"
-"~"
 
 msgid "[Deleted]"
 msgstr "[Forviŝita]"
@@ -5662,70 +5615,6 @@ msgid ""
 msgstr ""
 "  TOTALO    NOMBRO  KONGRUO PLEJ MALRAPID  MEZA   NOMO               ŜABLONO"
 
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: rekursia buklo dum ŝargo de syncolor.vim"
-
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: emfaza grupo netrovita: %s"
-
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: Ne sufiĉaj argumentoj: \":highlight link %s\""
-
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Tro da argumentoj: \":highlight link %s\""
-
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: grupo havas agordojn, ligilo de emfazo ignorita"
-
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: neatendita egalsigno: %s"
-
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: mankas egalsigno: %s"
-
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: mankas argumento: %s"
-
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: Nevalida valoro: %s"
-
-msgid "E419: FG color unknown"
-msgstr "E419: Nekonata malfona koloro"
-
-msgid "E420: BG color unknown"
-msgstr "E420: Nekonata fona koloro"
-
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: Kolora nomo aŭ nombro nerekonita: %s"
-
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: kodo de terminalo estas tro longa: %s"
-
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: Nevalida argumento: %s"
-
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: Tro da malsamaj atributoj de emfazo uzataj"
-
-msgid "E669: Unprintable character in group name"
-msgstr "E669: Nepresebla signo en nomo de grupo"
-
-msgid "W18: Invalid character in group name"
-msgstr "W18: Nevalida signo en nomo de grupo"
-
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: Tro da emfazaj kaj sintaksaj grupoj"
-
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ĉe subo de stako de etikedoj"
 
@@ -6250,10 +6139,6 @@ msgstr "E131: Ne eblas forviŝi funkcion %s: Estas nuntempe uzata"
 msgid "E133: :return not inside a function"
 msgstr "E133: \":return\" ekster funkcio"
 
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Mankas krampoj: %s"
-
 #, c-format
 msgid "%s (%s, compiled %s)"
 msgstr "%s (%s, kompilita %s)"
@@ -6561,6 +6446,173 @@ msgstr "tajpu  :help register<Enenklavo>  por pliaj informoj   "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "menuo Helpo->Subteni/Registri     por pliaj informoj   "
 
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"# Listo de bufroj:\n"
+
+#, c-format
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# Historio %s (de plej nova al plej malnova):\n"
+
+msgid "Command Line"
+msgstr "Komanda linio"
+
+msgid "Search String"
+msgstr "Serĉa ĉeno"
+
+msgid "Expression"
+msgstr "Esprimo"
+
+msgid "Input Line"
+msgstr "Eniga linio"
+
+msgid "Debug Line"
+msgstr "Sencimiga linio"
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Linioj komencantaj per |, kopiitaj sen ŝanĝo:\n"
+
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s en linio: "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr "E136: viminfo: Tro da eraroj, nun ignoras la reston de la dosiero"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# mallokaj variabloj:\n"
+
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# Lasta anstataŭigita ĉeno:\n"
+"$"
+
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# Lasta serĉa ŝablono %s:\n"
+"~"
+
+msgid "Substitute "
+msgstr "Anstataŭigi "
+
+msgid "Illegal register name"
+msgstr "Nevalida nomo de reĝistro"
+
+msgid ""
+"\n"
+"# Registers:\n"
+msgstr ""
+"\n"
+"# Reĝistroj:\n"
+
+#, c-format
+msgid "E574: Unknown register type %d"
+msgstr "E574: Nekonata tipo de reĝistro %d"
+
+msgid ""
+"\n"
+"# History of marks within files (newest to oldest):\n"
+msgstr ""
+"\n"
+"# Historio de markoj en dosieroj (de plej nova al plej malnova):\n"
+
+msgid ""
+"\n"
+"# File marks:\n"
+msgstr ""
+"\n"
+"# Markoj de dosiero:\n"
+
+msgid ""
+"\n"
+"# Jumplist (newest first):\n"
+msgstr ""
+"\n"
+"# Saltlisto (plej novaj unue):\n"
+
+msgid "Missing '>'"
+msgstr "Mankas '>'"
+
+msgid "Illegal starting char"
+msgstr "Nevalida eka signo"
+
+#, c-format
+msgid "# This viminfo file was generated by Vim %s.\n"
+msgstr "# Tiu dosiero viminfo estis kreita de Vim %s.\n"
+
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# Vi povas redakti ĝin se vi estas singarda.\n"
+"\n"
+
+msgid "# Value of 'encoding' when this file was written\n"
+msgstr "# Valoro de 'encoding' kiam tiu dosiero estis kreita\n"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "Legado de dosiero viminfo \"%s\"%s%s%s"
+
+msgid " info"
+msgstr " informo"
+
+msgid " marks"
+msgstr " markoj"
+
+msgid " oldfiles"
+msgstr " malnovaj dosieroj"
+
+msgid " FAILED"
+msgstr " MALSUKCESIS"
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: Dosiero viminfo ne skribeblas: %s"
+
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: Tro da provizoraj dosieroj viminfo, kiel %s!"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: Ne eblas skribi dosieron viminfo %s!"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "Skribas dosieron viminfo \"%s\""
+
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Ne eblas renomi dosieron viminfo al %s!"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: Ne eblas malfermi dosieron viminfo en lega reĝimo"
+
 msgid "Already only one window"
 msgstr "Jam nur unu fenestro"
 
@@ -6571,6 +6623,9 @@ msgstr "E92: Bufro %ld ne trovita"
 msgid "E441: There is no preview window"
 msgstr "E441: Ne estas antaŭvida fenestro"
 
+msgid "E242: Can't split a window while closing another"
+msgstr "E242: Ne eblas dividi fenestron dum fermo de alia"
+
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: Ne eblas dividi supralivan kaj subdekstran samtempe"
 
@@ -6589,25 +6644,6 @@ msgstr "E814: Ne eblas fermi fenestron, nur la fenestro de aŭtokomandoj restus"
 msgid "E445: Other window contains changes"
 msgstr "E445: La alia fenestro enhavas ŝanĝojn"
 
-#, c-format
-msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E799: Nevalida ID: %d (devas esti egala aŭ pli granda ol 1)"
-
-#, c-format
-msgid "E801: ID already taken: %d"
-msgstr "E801: ID jam uzata: %d"
-
-msgid "List or number required"
-msgstr "Listo aŭ nombro bezonata"
-
-#, c-format
-msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: Nevalida ID: %d (devas esti egala aŭ pli granda ol 1)"
-
-#, c-format
-msgid "E803: ID not found: %d"
-msgstr "E803: ID netrovita: %d"
-
 #, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: Ne eblis ŝargi bibliotekon %s"
@@ -7008,6 +7044,10 @@ msgstr "E939: Pozitiva kvantoro bezonata"
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
 
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Mankas krampoj: %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449: Nevalida esprimo ricevita"
 
@@ -7050,6 +7090,13 @@ msgstr "E952: Aŭtokomandoj kaŭzis rekursian konduton"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: Menuo nur ekzistas en alia reĝimo"
 
+msgid "E957: Invalid window number"
+msgstr "E957: Nevalida numero de fenestro"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Argumento de %s devas esti Listo"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"