changeset 16871:e5dab34ded73

Update runtime files. commit https://github.com/vim/vim/commit/7dd64a3e57d296fdee3b3ffe6d938f634b59848c Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 31 21:41:05 2019 +0200 Update runtime files.
author Bram Moolenaar <Bram@vim.org>
date Fri, 31 May 2019 21:45:06 +0200
parents 326aed2be220
children a836d122231a
files runtime/doc/popup.txt runtime/doc/quickref.txt runtime/doc/tags runtime/doc/terminal.txt runtime/doc/todo.txt runtime/doc/usr_41.txt runtime/doc/version8.txt runtime/gvim.desktop runtime/syntax/sshdconfig.vim runtime/vim.desktop src/po/eo.po
diffstat 11 files changed, 876 insertions(+), 580 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.1.  Last change: 2019 May 26
+*popup.txt*  For Vim version 8.1.  Last change: 2019 May 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -13,9 +13,7 @@ 2. Functions			|popup-functions|
 3. Examples			|popup-examples|
 
 
-{not available if the |+eval| feature was disabled at compile time}
-{not able to use text properties if the |+textprop| feature was disabled at
-compile time}
+{not available if the |+textprop| feature was disabled at compile time}
 
 ==============================================================================
 1. Introduction						*popup-intro*
@@ -60,15 +58,22 @@ WINDOW POSITION AND SIZE			*popup-positi
 
 The height of the window is normally equal to the number of, possibly
 wrapping, lines in the buffer.  It can be limited with the "maxheight"
-property.  You can use empty lines to increase the height.
+property.  You can use empty lines to increase the height or the "minheight"
+property.
 
 The width of the window is normally equal to the longest line in the buffer.
 It can be limited with the "maxwidth" property.  You can use spaces to
-increase the width.
+increase the width or the "minwidth" property.
 
 By default the 'wrap' option is set, so that no text disappears.  However, if
 there is not enough space, some text may be invisible.
 
+Vim tries to show the popup in the location you specify.  In some cases, e.g.
+when the popup would go outside of the Vim window, it will show it somewhere
+else.  E.g. if you use `popup_atcursor()` the popup normally shows just above
+the current cursor position, but if the cursor is close to the top of the Vim
+window it will be placed below the cursor position.
+
 
 
 TODO:
@@ -92,9 +97,13 @@ IMPLEMENTATION:
 - Handle screen resize in screenalloc().
 - Make redrawing more efficient and avoid flicker.
     Store popup info in a mask, use the mask in screen_line()
+    Keep mask until next update_screen(), find differences and redraw affected
+    windows/lines
     Fix redrawing problem with completion.
     Fix redrawing problem when scrolling non-current window
     Fix redrawing the statusline on top of a popup
+- Disable commands, feedkeys(), CTRL-W, etc. in a popup window.  Or whitelist
+  commands that are allowed?
 - Figure out the size and position better.
     if wrapping splits a double-wide character
     if wrapping inserts indent
@@ -114,7 +123,7 @@ popup_create({text}, {options})				*popu
 		- a string
 		- a list of strings
 		- a list of text lines with text properties
-		  	{not implemented yet}
+
 		{options} is a dictionary with many possible entries.
 		See |popup_create-usage| for details.
 
@@ -410,7 +419,7 @@ So we get:
 	type		name of the text property type, as added with
 			|prop_type_add()|
 	transparent	do not show these characters, show the text under it;
-			if there is an border character to the right or below
+			if there is a border character to the right or below
 			it will be made transparent as well
 			{not implemented yet}
 
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 8.1.  Last change: 2019 May 24
+*quickref.txt*  For Vim version 8.1.  Last change: 2019 May 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -982,6 +982,7 @@ Short explanation of each option:		*opti
 'wildmode'	  'wim'     mode for 'wildchar' command-line expansion
 'wildoptions'	  'wop'     specifies how command line completion is done
 'winaltkeys'	  'wak'     when the windows system handles ALT keys
+'wincolor'	  'wcr'	    window-local highlighting
 'window'	  'wi'	    nr of lines to scroll for CTRL-F and CTRL-B
 'winheight'	  'wh'	    minimum number of lines for the current window
 'winfixheight'	  'wfh'     keep window height when opening/closing windows
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4742,6 +4742,7 @@ E99	diff.txt	/*E99*
 E990	eval.txt	/*E990*
 E991	eval.txt	/*E991*
 E992	options.txt	/*E992*
+E993	popup.txt	/*E993*
 E999	repeat.txt	/*E999*
 EX	intro.txt	/*EX*
 EXINIT	starting.txt	/*EXINIT*
@@ -8207,7 +8208,7 @@ popup_dialog()	popup.txt	/*popup_dialog(
 popup_filter_menu()	popup.txt	/*popup_filter_menu()*
 popup_filter_yesno()	popup.txt	/*popup_filter_yesno()*
 popup_getoptions()	popup.txt	/*popup_getoptions()*
-popup_getposition()	popup.txt	/*popup_getposition()*
+popup_getpos()	popup.txt	/*popup_getpos()*
 popup_hide()	popup.txt	/*popup_hide()*
 popup_menu()	popup.txt	/*popup_menu()*
 popup_move()	popup.txt	/*popup_move()*
@@ -9853,6 +9854,7 @@ win32-vimrun	gui_w32.txt	/*win32-vimrun*
 win32-win3.1	os_win32.txt	/*win32-win3.1*
 win32-win95	os_win32.txt	/*win32-win95*
 win32s	os_win32.txt	/*win32s*
+win_execute()	eval.txt	/*win_execute()*
 win_findbuf()	eval.txt	/*win_findbuf()*
 win_getid()	eval.txt	/*win_getid()*
 win_gotoid()	eval.txt	/*win_gotoid()*
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 8.1.  Last change: 2019 May 20
+*terminal.txt*	For Vim version 8.1.  Last change: 2019 May 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -907,7 +907,7 @@ When 'background' is "dark":
   hi debugBreakpoint term=reverse ctermbg=red guibg=red
 
 
-Shorcuts						*termdebug_shortcuts*
+Shortcuts						*termdebug_shortcuts*
 
 You can define your own shortcuts (mappings) to control gdb, that can work in
 any window, using the TermDebugSendCommand() function.  Example: >
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 May 26
+*todo.txt*      For Vim version 8.1.  Last change: 2019 May 31
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -42,6 +42,8 @@ Ongoing work on text properties, see src
 
 Popup windows are being implemented, see |popup-window|.
 
+Listener causes extra } to be inserted. (Paul Jolly, #4455)
+
 Patch to beautify the output of a test run. (Christian Brabandt, #4391)
 can be improved.
 
@@ -52,6 +54,12 @@ remains equal?  Then %argdel to clean it
 
 Patch for Chinese translations for nsis. (#4407)  Comments handled?
 
+Patch to add v:searchstat. (Takuya Fujiwara, #4446)  Should be independent of
+'shortmess', filled on demand and cached until search changes.
+
+listener callback is invoked while another is still busy? (Paul Jolly)
+Should not happen because of text lock.
+
 'incsearch' with :s: (#3321)
 - Get E20 when using command history to get "'<,'>s/a/b" and no Visual area
   was set. (#3837)
@@ -130,6 +138,12 @@ Should do current file first and not spl
 Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
 (#4087)
 
+Problem with German spell file.  Hint for solution by Klaus-Peter Schreiner in
+#4314, solves the Rasenmäher problem.
+
+Visual highlight not removed when 'dipslay' is "lastline" and line doesn't
+fit. (Kevin Lawler, #4457)
+
 Does not build with MinGW out of the box:
 - _stat64 is not defined, need to use "struct stat" in vim.h
 - WINVER conflict, should use 0x0600 by default?
@@ -177,6 +191,10 @@ register "", So that registers can be sa
 Add a way to create an empty, hidden buffer.  Like doing ":new|hide".
 ":let buf = bufcreate('name')
 
+Session file contains absolute paths when "curdir" is removed form
+'sessionoptions', making it impossible to have a session with a relative path.
+(#4450)
+
 When using a timer callback vgetc_busy is reset, allowing for using input().
 But in a channel callback this does not happen.  We need to do something
 similar to check_due_timer().  Also see #3809.
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.1.  Last change: 2019 May 16
+*usr_41.txt*	For Vim version 8.1.  Last change: 2019 May 29
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -105,20 +105,21 @@ We won't explain how |:for| and |range()
 if you are impatient.
 
 
-THREE KINDS OF NUMBERS
-
-Numbers can be decimal, hexadecimal or octal.  A hexadecimal number starts
-with "0x" or "0X".  For example "0x1f" is decimal 31.  An octal number starts
-with a zero.  "017" is decimal 15.  Careful: don't put a zero before a decimal
-number, it will be interpreted as an octal number!
+FOUR KINDS OF NUMBERS
+
+Numbers can be decimal, hexadecimal, octal or binary.  A hexadecimal number
+starts with "0x" or "0X".  For example "0x1f" is decimal 31.  An octal number
+starts with a zero.  "017" is decimal 15.  A binary number starts with "0b" or
+"0B".  For example "0b101" is decimal 5.  Careful: don't put a zero before a
+decimal number, it will be interpreted as an octal number!
    The ":echo" command always prints decimal numbers.  Example: >
 
 	:echo 0x7f 036
 <	127 30 ~
 
-A number is made negative with a minus sign.  This also works for hexadecimal
-and octal numbers.   A minus sign is also used for subtraction.  Compare this
-with the previous example: >
+A number is made negative with a minus sign.  This also works for hexadecimal,
+octal and binary numbers.  A minus sign is also used for subtraction.  Compare
+this with the previous example: >
 
 	:echo 0x7f -036
 <	97 ~
@@ -614,6 +615,7 @@ String manipulation:					*string-functio
 	repeat()		repeat a string multiple times
 	eval()			evaluate a string expression
 	execute()		execute an Ex command and get the output
+	win_execute()		like execute() but in a specified window
 	trim()			trim characters from a string
 
 List manipulation:					*list-functions*
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -25914,7 +25914,7 @@ Files:	    runtime/doc/eval.txt, runtime
 
 Patch 8.1.0021
 Problem:    Clang warns for undefined behavior.
-Solution:   Move #ifdef outside of sprintf() call.(suggestion by Michael
+Solution:   Move #ifdef outside of sprintf() call. (suggestion by Michael
             Jarvis, closes #2946)
 Files:	    src/term.c
 
@@ -25930,7 +25930,7 @@ Solution:   Use mch_memmove() instead of
 Files:	    src/memline.c
 
 Patch 8.1.0024
-Problem:    % command not testded on #ifdef and comment.
+Problem:    % command not tested on #ifdef and comment.
 Solution:   Add tests. (Dominique Pelle, closes #2956)
 Files:	    src/testdir/test_goto.vim
 
@@ -25946,7 +25946,7 @@ Files:	    src/testdir/test_terminal.vim
 
 Patch 8.1.0027
 Problem:    Difficult to make a plugin that feeds a line to a job.
-Solution:   Add the nitial code for the "prompt" buftype.
+Solution:   Add the initial code for the "prompt" buftype.
 Files:	    runtime/doc/channel.txt, runtime/doc/eval.txt,
             runtime/doc/options.txt, runtime/doc/tags, runtime/doc/todo.txt,
             src/Makefile, src/buffer.c, src/channel.c, src/diff.c, src/edit.c,
@@ -25966,7 +25966,7 @@ Solution:   Skip test with redirection o
 Files:	    src/testdir/test_terminal.vim
 
 Patch 8.1.0030
-Problem:    Stoping Vim running in a terminal may not work.
+Problem:    Stopping Vim running in a terminal may not work.
 Solution:   Instead of sending <Esc> send CTRL-O.
 Files:	    src/testdir/screendump.vim, src/testdir/test_prompt_buffer.vim
 
@@ -26046,8 +26046,8 @@ Solution:   Return FAIL from get_bad_opt
 Files:	    src/ex_docmd.c, src/testdir/test_plus_arg_edit.vim
 
 Patch 8.1.0044
-Problem:    If a test function exists Vim this may go unnoticed.
-Solution:   Check for a test funtion quitting Vim.  Fix tests that did exit
+Problem:    If a test function exits Vim this may go unnoticed.
+Solution:   Check for a test function quitting Vim.  Fix tests that did exit
             Vim.
 Files:	    src/testdir/runtest.vim, src/testdir/test_assert.vim
 
@@ -26330,7 +26330,7 @@ Solution:   Only use debugbreak() on MS-
 Files:	    runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
 
 Patch 8.1.0094
-Problem:    Help text "usage:" is not capatalized.
+Problem:    Help text "usage:" is not capitalized.
 Solution:   Make it "Usage:". (closes #3044)
 Files:	    src/main.c
 
@@ -26929,7 +26929,8 @@ Files:	    src/testdir/test_spell.vim
 
 Patch 8.1.0201
 Problem:    Newer Python uses "importlib" instead of "imp".
-Solution:   Use "importlib" for newer Python versions. (closes #3163)
+Solution:   Use "importlib" for newer Python versions. (Ozaki Kiichi,
+            closes #3163)
 Files:	    src/if_py_both.h, src/testdir/test87.in
 
 Patch 8.1.0202
@@ -27156,7 +27157,8 @@ Solution:   Add a test that shows the be
 Files:	    src/testdir/test_tabpage.vim
 
 Patch 8.1.0242
-Problem:    Insert mode completion may use an invalid buffer pointer.
+Problem:    Insert mode completion may use an invalid buffer pointer. (Akib
+            Nizam)
 Solution:   Check for ins_buf to be valid. (closes #3290)
 Files:	    src/edit.c
 
@@ -27692,7 +27694,7 @@ Solution:   Allow :file without argument
 Files:	    src/ex_docmd.c, src/testdir/test_quickfix.vim
 
 Patch 8.1.0338
-Problem:    MS-Windows: VTP doesn't work properly with Powershell.
+Problem:    MS-Windows: VTP doesn't work properly with PowerShell.
 Solution:   Adjust the color index. (Nobuhiro Takasaki, closes #3347)
 Files:	    src/os_win32.c
 
@@ -27715,7 +27717,8 @@ Files:	    src/ex_cmds2.c, src/testdir/t
             src/testdir/test_command_count.vim
 
 Patch 8.1.0342
-Problem:    Crash when a callback deletes a window that is being used.
+Problem:    Crash when a callback deletes a window that is being used. (Ozaki
+            Kiichi)
 Solution:   Do not unload a buffer that is being displayed while redrawing the
             screen. Also avoid invoking callbacks while redrawing.
             (closes #2107)
@@ -27795,7 +27798,7 @@ Files:	    src/testdir/test_packadd.vim
 
 Patch 8.1.0355
 Problem:    Incorrect adjusting the popup menu for the preview window.
-Solution:   Compute position and height properl. (Ronan Pigott)  Also show at
+Solution:   Compute position and height properly. (Ronan Pigott)  Also show at
             least ten items. (closes #3414)
 Files:	    src/popupmnu.c
 
@@ -28388,7 +28391,7 @@ Files:	    src/os_win32.c, runtime/doc/m
 
 Patch 8.1.0453
 Problem:    MS-Windows: executable() is not reliable.
-Solution:   Use $PATHEXT properly. (Yasuhiro Matsumoto, closes #3412)
+Solution:   Use $PATHEXT properly. (Yasuhiro Matsumoto, closes #3512)
 Files:	    src/os_win32.c, src/testdir/test_functions.vim
 
 Patch 8.1.0454
@@ -28448,7 +28451,8 @@ Files:	    src/memline.c
 Patch 8.1.0464
 Problem:    MS-Windows: job_info() has cmd without backslashes. (Daniel
             Hahler)
-Solution:   Use rem_backslash(). (closes #3517, closes #3404)
+Solution:   Use rem_backslash(). (closes #3517, closes #3404)  Add a test.
+            (Yasuhiro Matsumoto)
 Files:	    src/misc2.c, src/testdir/test_channel.vim
 
 Patch 8.1.0465 (after 8.1.0452)
@@ -28535,7 +28539,7 @@ Files:	    src/Make_cyg_ming.mak
 Patch 8.1.0479
 Problem:    Failure when setting 'varsofttabstop' to end in a comma. (Ralf
             Schandl)
-Solution:   Reject value with trailing command.  Add test for invalid values
+Solution:   Reject value with trailing comma.  Add test for invalid values
             (closes #3544)
 Files:	    src/testdir/test_vartabs.vim, src/option.c
 
@@ -28596,7 +28600,7 @@ Solution:   Return from qf_jump_edit_buf
 Files:	    src/quickfix.c, src/testdir/test_quickfix.vim
 
 Patch 8.1.0490
-Problem:    MS-Windows: doesn't handle missing glibwinpthread-1.dll.
+Problem:    MS-Windows: doesn't handle missing libwinpthread-1.dll.
 Solution:   Adjust Cygwin/MinGW build file. (Ken Takata, closes #2827)
 Files:	    src/Make_cyg_ming.mak
 
@@ -28972,7 +28976,7 @@ Files:	    src/popupmnu.c, src/testdir/t
 
 Patch 8.1.0555
 Problem:    Crash when last search pat is set but not last substitute pat.
-Solution:   Do not mix up last search pattern and last subtitute pattern.
+Solution:   Do not mix up last search pattern and last substitute pattern.
             (closes #3647)
 Files:	    src/search.c, src/testdir/test_search.vim
 
@@ -28983,7 +28987,7 @@ Solution:   Use a separate saved last_id
 Files:	    src/search.c
 
 Patch 8.1.0557
-Problem:    Termdebug: gdb may use X.Y for breakpoint number.
+Problem:    Termdebug: gdb may use X.Y for breakpoint number. (Ryou Ezoe)
 Solution:   Handle X.Y breakpoint numbers. (Yasuhiro Matsumoto, close #3641)
 Files:	    runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
 
@@ -29001,13 +29005,13 @@ Files:	    src/testdir/test_arglist.vim,
             src/testdir/test_syntax.vim
 
 Patch 8.1.0560
-Problem:    Cannot use address type "other" with with user command.
+Problem:    Cannot use address type "other" with user command.
 Solution:   Add "other" to the list. (Daniel Hahler, closes #3655)  Also
             reject "%" for commands with "other".  Add some more tests.
 Files:	    src/ex_docmd.c, src/testdir/test_usercommands.vim
 
 Patch 8.1.0561
-Problem:    MSCV error format has changed.
+Problem:    MSVC error format has changed.
 Solution:   Make the space between the line number and colon optional.
 Files:	    src/option.h
 
@@ -29069,7 +29073,7 @@ Files:	    src/evalfunc.c, src/testdir/t
 Patch 8.1.0572
 Problem:    Stopping a job does not work properly on OpenBSD.
 Solution:   Do not use getpgid() to check the process group of the job
-            processs ID, always pass the negative process ID to kill().
+            process ID, always pass the negative process ID to kill().
             (George Koehler, closes #3656)
 Files:	    src/os_unix.c
 
@@ -29105,7 +29109,7 @@ Files:	    src/gui_gtk_x11.c, src/gui_ma
 
 Patch 8.1.0578
 Problem:    Cannot disable arabic, rightleft and farsi in configure.
-Solution:   Add configur flags. (Diego Fernando Carrión, closes #1867)
+Solution:   Add configure flags. (Diego Fernando Carrión, closes #1867)
 Files:	    src/configure.ac, src/auto/configure, src/config.h.in,
             src/feature.h, src/Makefile
 
@@ -29275,7 +29279,7 @@ Files:	    src/os_mswin.c, src/proto/buf
             src/proto/userfunc.pro
 
 Patch 8.1.0608
-Problem:    Coverals is not updating.
+Problem:    Coveralls is not updating.
 Solution:   Adjust path in Travis config.
 Files:	    .travis.yml
 
@@ -29363,7 +29367,7 @@ Files:	    src/eval.c, src/proto/eval.pr
             src/testdir/test_messages.vim, src/message.c
 
 Patch 8.1.0620
-Problem:    Overuling CONF_ARGS from the environment no longer works. (Tony
+Problem:    Overruling CONF_ARGS from the environment no longer works. (Tony
             Mechelynck)
 Solution:   Do not define any CONF_ARGS by default.
 Files:	    src/Makefile
@@ -29385,8 +29389,8 @@ Solution:   Define FOR_ALL_FRAMES. (Yega
 Files:	    src/ex_docmd.c, src/globals.h, src/screen.c, src/window.c
 
 Patch 8.1.0624 (after 8.2.0620)
-Problem:    Overuling CONF_ARGS from the environment still does not work. (Tony
-            Mechelynck)
+Problem:    Overruling CONF_ARGS from the environment still does not work.
+            (Tony Mechelynck)
 Solution:   Add back CONF_ARGS next to the new numbered ones.
 Files:	    src/Makefile
 
@@ -29480,7 +29484,7 @@ Files:	    src/testdir/test_textprop.vim
 
 Patch 8.1.0640
 Problem:    Get E14 while typing command :tab with 'incsearch' set.
-Solution:   Do not give an error when looking for the command. (Yasuhiro
+Solution:   Do not give an error when looking for the command. (Hirohito
             Higashi)
 Files:	    src/testdir/test_search.vim, src/ex_docmd.c
 
@@ -29617,7 +29621,7 @@ Files:	    src/screen.c
 Patch 8.1.0664
 Problem:    Configure "fail-if-missing" does not apply to the enable-gui
             argument. (Rhialto)
-Solution:   Make configure fail if a GUI was specifified and "fail-if-missing"
+Solution:   Make configure fail if a GUI was specified and "fail-if-missing"
             is enabled and the GUI test fails.
 Files:	    src/configure.ac, src/auto/configure
 
@@ -29935,7 +29939,7 @@ Files:	    nsis/icons.zip, nsis/icons/di
             nsis/README.txt, Filelist, Makefile
 
 Patch 8.1.0714
-Problem:    Unessesary #if lines in GTK code.
+Problem:    Unnecessary #if lines in GTK code.
 Solution:   Remove the #if. (Ken Takata, closes #3785)
 Files:	    src/gui_beval.c, src/if_mzsch.c
 
@@ -29970,7 +29974,7 @@ Files:	    src/evalfunc.c, src/version.c
             src/feature.h, runtime/doc/various.txt
 
 Patch 8.1.0720
-Problem:    Cannot easily change the current quickfx list index.
+Problem:    Cannot easily change the current quickfix list index.
 Solution:   Add the "idx" argument to setqflist(). (Yegappan Lakshmanan,
             closes #3701)
 Files:	    runtime/doc/eval.txt, runtime/doc/quickfix.txt, src/quickfix.c,
@@ -30777,7 +30781,7 @@ Files:	    src/ui.c
 
 Patch 8.1.0836
 Problem:    User completion test can fail on MS-Windows.
-Solution:   Allow for other names befor "Administrator".
+Solution:   Allow for other names before "Administrator".
 Files:	    src/testdir/test_cmdline.vim
 
 Patch 8.1.0837
@@ -30804,7 +30808,7 @@ Files:	    src/ui.c, src/testdir/test_ti
 
 Patch 8.1.0841
 Problem:    Travis config to get Lua on MacOS is too complicated.
-Solution:   Use an addons entry. (Ozaki Kiichi, closes 3876)
+Solution:   Use an addons entry. (Ozaki Kiichi, closes #3876)
 Files:	    .travis.yml
 
 Patch 8.1.0842
@@ -30912,7 +30916,7 @@ Solution:   Make them the same, update d
 Files:	    src/option.c, runtime/doc/options.txt, runtime/doc/indent.txt
 
 Patch 8.1.0859
-Problem:    "%v" in 'errorformat' does handle multi-byte characters.
+Problem:    "%v" in 'errorformat' does not handle multi-byte characters.
 Solution:   Handle multi-byte characters. (Yegappan Lakshmanan, closes #3700)
 Files:	    src/quickfix.c, src/testdir/test_quickfix.vim
 
@@ -31034,7 +31038,7 @@ Files:	    src/testdir/test_functions.vi
 
 Patch 8.1.0879
 Problem:    MS-Windows: temp name encoding can be wrong.
-Solution:   Convert from active code page to 'encoding'. (Ken Takata,
+Solution:   Convert from active code page to 'encoding'. (Yasuhiro Matsumoto,
             closes #3520, closes #1698)
 Files:	    src/fileio.c
 
@@ -31064,7 +31068,7 @@ Files:	    src/fileio.c
 
 Patch 8.1.0883
 Problem:    Missing some changes for Ex commands.
-Solution:   Add mising changes in header file.
+Solution:   Add missing changes in header file.
 Files:	    src/ex_cmds.h
 
 Patch 8.1.0884
@@ -31111,7 +31115,7 @@ Solution:   Correct using use_file_for_o
 Files:	    src/os_unix.c, src/testdir/test_channel.vim
 
 Patch 8.1.0891
-Problem:    Substitute command inssuficiently tested.
+Problem:    Substitute command insufficiently tested.
 Solution:   Add more test coverage. (Dominique Pelle)
 Files:	    src/testdir/test_substitute.vim
 
@@ -31165,7 +31169,7 @@ Solution:   Remove check_restricted().
 Files:	    src/eval.c
 
 Patch 8.1.0900
-Problem:    ConPTY many crash with 32-bit build.
+Problem:    ConPTY may crash with 32-bit build.
 Solution:   Fix function declarations. (Ken Takata, closes #3943)
 Files:	    src/terminal.c
 
@@ -31219,7 +31223,7 @@ Files:	    runtime/doc/options.txt, src/
 
 Patch 8.1.0910
 Problem:    Crash with tricky search pattern. (Kuang-che Wu)
-Solution:   Check for runnning out of memory. (closes #3950)
+Solution:   Check for running out of memory. (closes #3950)
 Files:	    src/regexp_nfa.c, src/testdir/test_regexp_latin.vim
 
 Patch 8.1.0911
@@ -31419,7 +31423,7 @@ Files:	    src/ex_docmd.c, src/normal.c,
             src/proto/os_win32.pro
 
 Patch 8.1.0941
-Problem:    Macros for MS-Windows are inconsistent, using "32", "3264 and
+Problem:    Macros for MS-Windows are inconsistent, using "32", "3264" and
             others.
 Solution:   Use MSWIN for all MS-Windows builds.  Use FEAT_GUI_MSWIN for the
             GUI build. (Hirohito Higashi, closes #3932)
@@ -31481,7 +31485,7 @@ Solution:   Do not enable filetype detec
 Files:	    runtime/defaults.vim
 
 Patch 8.1.0949
-Problem:    MS-windows defines GUI macros different than other systems.
+Problem:    MS-Windows defines GUI macros different than other systems.
 Solution:   Swap FEAT_GUI and FEAT_GUI_MSWIN. (Hirohito Higashi, closes #3996)
 Files:	    src/Make_bc5.mak, src/Make_cyg_ming.mak, src/Make_ivc.mak,
             src/Make_mvc.mak, src/if_ole.cpp, src/vim.h, src/vim.rc
@@ -31592,7 +31596,8 @@ Files:	    src/regexp_nfa.c, src/testdir
 
 Patch 8.1.0969
 Problem:    Message written during startup is truncated.
-Solution:   Restore message after truncating. (closes 3969)
+Solution:   Restore message after truncating. (closes #3969)  Add a test.
+            (Yasuhiro Matsumoto)
 Files:	    src/message.c, src/testdir/test_startup.vim
 
 Patch 8.1.0970
@@ -31634,7 +31639,7 @@ Files:	    src/screen.c, src/textprop.c
 
 Patch 8.1.0976
 Problem:    Dosinstall still has buffer overflow problems.
-Solution:   Adjust  buffer sizes. (Yasuhiro Matsumoto, closes #4002)
+Solution:   Adjust buffer sizes. (Yasuhiro Matsumoto, closes #4002)
 Files:	    src/dosinst.c, src/dosinst.h, src/uninstal.c
 
 Patch 8.1.0977
@@ -31685,7 +31690,7 @@ Solution:   Check for long becoming nega
 Files:	    src/regexp.c, src/testdir/test_search.vim
 
 Patch 8.1.0986
-Problem:    rename() is not propertly tested.
+Problem:    rename() is not properly tested.
 Solution:   Add tests. (Dominique Pelle, closes #4061)
 Files:	    src/testdir/Make_all.mak, src/testdir/test_alot.vim,
             src/testdir/test_rename.vim
@@ -31742,7 +31747,7 @@ Files:	    src/window.c, src/evalfunc.c,
 Patch 8.1.0995
 Problem:    A getchar() call while executing a register resets the
             reg_executing() result.
-Solution:   Save and restore reg_executing. (closes #406
+Solution:   Save and restore reg_executing. (closes #4066)
 Files:	    src/evalfunc.c, src/testdir/test_functions.vim
 
 Patch 8.1.0996 (after 8.1.0994)
@@ -31847,7 +31852,7 @@ Files:	    src/os_win32.c
 
 Patch 8.1.1014
 Problem:    MS-Windows: /analyze only defined for non-debug version.
-Solution:   Move adding of /analyze up. (Taro Muraoka, closes #4114)
+Solution:   Move adding of /analyze up. (Ken Takata, closes #4114)
 Files:	    src/Make_mvc.mak
 
 Patch 8.1.1015
@@ -31859,9 +31864,9 @@ Files:	    runtime/doc/eval.txt, runtime
             src/testdir/test_quickfix.vim, src/window.c
 
 Patch 8.1.1016
-Problem:    MS-Windows: No color in shell when using "!" in 'guioptions.
+Problem:    MS-Windows: No color in shell when using "!" in 'guioptions'.
 Solution:   Don't stop termcap when using a terminal window for the shell.
-            (vim-jp, closes #4117)
+            (Nobuhiro Takasaki, vim-jp, closes #4117)
 Files:	    src/ex_cmds.c
 
 Patch 8.1.1017
@@ -32049,7 +32054,7 @@ Files:	    src/undo.c, src/proto/undo.pr
             src/testdir/test_normal.vim
 
 Patch 8.1.1050
-Problem:    Blank srceen when DirectWrite failed.
+Problem:    Blank screen when DirectWrite failed.
 Solution:   Call redraw_later_clear() after recreating the Direct2D render
             target. (Ken Takata, closes #4172)
 Files:	    src/gui_dwrite.cpp
@@ -32411,7 +32416,7 @@ Files:	    src/Make_cyg.mak, src/Make_cy
 
 Patch 8.1.1105
 Problem:    Long escape sequences may be split up.
-Solution:   Assume esccape sequences can be up to 80 bytes long. (Nobuhiro
+Solution:   Assume escape sequences can be up to 80 bytes long. (Nobuhiro
             Takasaki, closes #4196)
 Files:	    src/term.c
 
@@ -32471,7 +32476,8 @@ Files:	    src/autocmd.c
 
 Patch 8.1.1116
 Problem:    Cannot enforce a Vim script style.
-Solution:   Add the :scriptversion command. (closes #3857)
+Solution:   Add the :scriptversion command. (idea by Yasuhiro Matsumoto,
+            closes #3857)
 Files:	    runtime/doc/repeat.txt, runtime/doc/eval.txt, src/eval.c,
             src/ex_cmds.h, src/evalfunc.c, src/ex_cmds2.c,
             src/proto/ex_cmds2.pro, src/structs.h, src/buffer.c, src/main.c,
@@ -32576,7 +32582,7 @@ Files:	    src/globals.h
 
 Patch 8.1.1134
 Problem:    Buffer for quickfix window is reused for another file.
-Solution:   Don't reuse the quickfx buffer. (Yegappan Lakshmanan)
+Solution:   Don't reuse the quickfix buffer. (Yegappan Lakshmanan)
 Files:	    src/buffer.c, src/testdir/test_quickfix.vim
 
 Patch 8.1.1135 (after 8.1.1134)
@@ -32598,7 +32604,8 @@ Files:	    src/testdir/test_termcodes.vi
 
 Patch 8.1.1138
 Problem:    Plugins don't get notified when the popup menu changes.
-Solution:   Add the CompleteChanged event. (Andy Massimino. closes #4176)
+Solution:   Add the CompleteChanged event. (Qiming Zhao, Andy Massimino,
+            closes #4176)
 Files:	    runtime/doc/autocmd.txt, src/autocmd.c, src/dict.c,
             src/insexpand.c, src/popupmnu.c, src/proto/autocmd.pro,
             src/proto/dict.pro, src/proto/popupmnu.pro,
@@ -32681,7 +32688,7 @@ Files:	    src/Makefile
 
 Patch 8.1.1152
 Problem:    Compiler warning with VS2019.
-Solution:   Specify different offset for "AMD64". (closes #4235)
+Solution:   Specify different offset for "AMD64". (Ken Takata, closes #4235)
 Files:	    src/GvimExt/Makefile
 
 Patch 8.1.1153
@@ -32691,7 +32698,7 @@ Files:	    src/po/Makefile
 
 Patch 8.1.1154
 Problem:    Getting a newer msgfmt on Travis is too complicated.
-Solution:   Use a "sourcline" entry. (Ozaki Kiichi, closes #4236)
+Solution:   Use a "sourceline" entry. (Ozaki Kiichi, closes #4236)
 Files:	    .travis.yml
 
 Patch 8.1.1155
@@ -32898,7 +32905,7 @@ Files:	    src/edit.c, src/testdir/test_
 
 Patch 8.1.1190
 Problem:    has('vimscript-3') does not work.
-Solution:   Add "vimscript-3" to the list of features.
+Solution:   Add "vimscript-3" to the list of features. (partly by Ken Takata)
 Files:	    src/evalfunc.c, src/testdir/test_eval_stuff.vim
 
 Patch 8.1.1191
@@ -32947,7 +32954,7 @@ Files:	    src/main.c, src/testdir/test_
 
 Patch 8.1.1198
 Problem:    Bracketed paste may remain active after Vim exists, because the
-            terminal emulater restores the setting.
+            terminal emulator restores the setting.
 Solution:   Set/reset bracketed paste mode before setting the terminal mode.
             (closes #3579)
 Files:	    src/term.c
@@ -33331,8 +33338,8 @@ Solution:   Adjust comment.  Don't use d
 Files:	    src/Make_mvc.mak
 
 Patch 8.1.1258
-Problem:    The "N files to edit" message can not be surpressed.
-Solution:   Surpress the message with --not-a-term. (closes #4320)
+Problem:    The "N files to edit" message can not be suppressed.
+Solution:   Suppress the message with --not-a-term. (closes #4320)
 Files:	    src/main.c
 
 Patch 8.1.1259
@@ -33741,7 +33748,7 @@ Files:	    src/configure.ac, src/auto/co
 
 Patch 8.1.1314
 Problem:    MSVC makefile is not nicely indented.
-Solution:   Addjust spaces in preprocessor directives. (Ken Takata)
+Solution:   Adjust spaces in preprocessor directives. (Ken Takata)
 Files:	    src/Make_mvc.mak
 
 Patch 8.1.1315
@@ -33757,7 +33764,8 @@ Files:	    src/undo.c
 
 Patch 8.1.1317
 Problem:    Output from Travis can be improved.
-Solution:   Add section headers.  Handle errors better. (closes #4098)
+Solution:   Add section headers.  Handle errors better. (Ozaki Kiichi,
+            closes #4098)
 Files:	    .travis.yml, configure
 
 Patch 8.1.1318
@@ -33790,7 +33798,7 @@ Files:	    runtime/doc/eval.txt, runtime
 
 Patch 8.1.1322
 Problem:    Cygwin makefile is not nicely indented.
-Solution:   Addjust spaces in preprocessor directives. (Ken Takata)
+Solution:   Adjust spaces in preprocessor directives. (Ken Takata)
 Files:	    src/Make_cyg_ming.mak
 
 Patch 8.1.1323
@@ -34028,7 +34036,7 @@ Files:	    src/ex_cmds.c, src/testdir/te
 
 Patch 8.1.1360 (after Patch 8.1.1345)
 Problem:    Buffer left 'nomodifiable' after :substitute. (Ingo Karkat)
-Solution:   Save the value of 'modifiable' earlier' (Christian Brabandt,
+Solution:   Save the value of 'modifiable' earlier. (Christian Brabandt,
             closes #4403)
 Files:	    src/ex_cmds.c, src/testdir/test_substitute.vim
 
@@ -34098,7 +34106,7 @@ Patch 8.1.1371
 Problem:    Cannot recover from a swap file.
 Solution:   Do not expand environment variables in the swap file name.
             Do not check the extension when we already know a file is a swap
-            file.  (Ken Takata, closes 4415, closes #4369)
+            file.  (Ken Takata, closes #4415, closes #4369)
 Files:	    src/buffer.c, src/ex_cmds.c, src/ex_cmds2.c, src/ex_docmd.c,
             src/gui.c, src/if_cscope.c, src/main.c, src/memline.c,
             src/misc1.c, src/proto/memline.pro, src/proto/misc1.pro,
@@ -34109,7 +34117,7 @@ Patch 8.1.1372
 Problem:    When evaluating 'statusline' the current window is unknown.
             (Daniel Hahler)
 Solution:   Set "g:actual_curwin" for %{} items.  Set "g:statusline_winid"
-            when evaluationg %!. (closes #4406, closes #3299)
+            when evaluating %!. (closes #4406, closes #3299)
 Files:	    src/buffer.c, runtime/doc/options.txt,
             src/testdir/test_statusline.vim
 
@@ -34154,13 +34162,13 @@ Files:	    src/fileio.c, src/testdir/tes
 
 Patch 8.1.1380
 Problem:    MS-Windows building VIMDLL with MSVC: SUBSYSTEM is not set.
-Solution:   Invert condition. (closes #4422)
+Solution:   Invert condition. (Ken Takata, closes #4422)
 Files:	    src/Make_mvc.mak
 
 Patch 8.1.1381
 Problem:    MS-Windows: missing build dependency.
 Solution:   Make gui_dwrite.cpp depend on gui_dwrite.h. (Ken Takata,
-            closes #4423
+            closes #4423)
 Files:	    src/Make_cyg_ming.mak, src/Make_mvc.mak
 
 Patch 8.1.1382
@@ -34202,7 +34210,7 @@ Solution:   Use STRLEN() instead of strl
 Files:	    src/fileio.c
 
 Patch 8.1.1386
-Problem:    Unessesary type casts for lalloc().
+Problem:    Unnecessary type casts for lalloc().
 Solution:   Remove type casts.  Change lalloc(size, TRUE) to alloc(size).
 Files:	    src/buffer.c, src/change.c, src/channel.c, src/diff.c, src/edit.c,
             src/eval.c, src/ex_cmds.c, src/ex_getln.c, src/fileio.c,
--- a/runtime/gvim.desktop
+++ b/runtime/gvim.desktop
@@ -3,13 +3,16 @@
 [Desktop Entry]
 # Translators: This is the Application Name used in the GVim desktop file
 Name[de]=GVim
+Name[eo]=GVim
 Name=GVim
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
+GenericName[eo]=Tekstoredaktilo
 GenericName[ja]=テキストエディタ
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
 Comment[de]=Textdateien bearbeiten
+Comment[eo]=Redakti tekstajn dosierojn
 Comment[ja]=テキストファイルを編集します
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
@@ -92,10 +95,12 @@ Terminal=false
 Type=Application
 # Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon!
 Keywords[de]=Text;Editor;
+Keywords[eo]=Teksto;redaktilo;
 Keywords[ja]=テキスト;エディタ;
 Keywords=Text;editor;
 # Translators: This is the Icon file name. Do NOT translate
 Icon[de]=gvim
+Icon[eo]=gvim
 Icon=gvim
 Categories=Utility;TextEditor;
 StartupNotify=true
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -6,8 +6,8 @@
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2017 Oct 25
-" SSH Version:	7.6p1
+" Last Change:	2019-05-31
+" SSH Version:	7.9p1
 "
 
 " Setup
@@ -137,7 +137,8 @@ syn case ignore
 
 
 " Keywords
-syn keyword sshdconfigMatch Host User Group Address
+" Also includes RDomain, but that is a keyword.
+syn keyword sshdconfigMatch Host User Group Address LocalAddress LocalPort
 
 syn keyword sshdconfigKeyword AcceptEnv
 syn keyword sshdconfigKeyword AddressFamily
@@ -150,8 +151,11 @@ syn keyword sshdconfigKeyword Authentica
 syn keyword sshdconfigKeyword AuthorizedKeysFile
 syn keyword sshdconfigKeyword AuthorizedKeysCommand
 syn keyword sshdconfigKeyword AuthorizedKeysCommandUser
+syn keyword sshdconfigKeyword AuthorizedPrincipalsCommand
+syn keyword sshdconfigKeyword AuthorizedPrincipalsCommandUser
 syn keyword sshdconfigKeyword AuthorizedPrincipalsFile
 syn keyword sshdconfigKeyword Banner
+syn keyword sshdconfigKeyword CASignatureAlgorithms
 syn keyword sshdconfigKeyword ChallengeResponseAuthentication
 syn keyword sshdconfigKeyword ChrootDirectory
 syn keyword sshdconfigKeyword Ciphers
@@ -162,13 +166,17 @@ syn keyword sshdconfigKeyword DebianBann
 syn keyword sshdconfigKeyword DenyGroups
 syn keyword sshdconfigKeyword DenyUsers
 syn keyword sshdconfigKeyword DisableForwarding
+syn keyword sshdconfigKeyword ExposeAuthInfo
+syn keyword sshdconfigKeyword FingerprintHash
 syn keyword sshdconfigKeyword ForceCommand
+syn keyword sshdconfigKeyword GatewayPorts
 syn keyword sshdconfigKeyword GSSAPIAuthentication
 syn keyword sshdconfigKeyword GSSAPICleanupCredentials
+syn keyword sshdconfigKeyword GSSAPIEnablek5users
 syn keyword sshdconfigKeyword GSSAPIKeyExchange
+syn keyword sshdconfigKeyword GSSAPIKexAlgorithms
 syn keyword sshdconfigKeyword GSSAPIStoreCredentialsOnRekey
 syn keyword sshdconfigKeyword GSSAPIStrictAcceptorCheck
-syn keyword sshdconfigKeyword GatewayPorts
 syn keyword sshdconfigKeyword HostCertificate
 syn keyword sshdconfigKeyword HostKey
 syn keyword sshdconfigKeyword HostKeyAgent
@@ -184,6 +192,8 @@ syn keyword sshdconfigKeyword KerberosAu
 syn keyword sshdconfigKeyword KerberosGetAFSToken
 syn keyword sshdconfigKeyword KerberosOrLocalPasswd
 syn keyword sshdconfigKeyword KerberosTicketCleanup
+syn keyword sshdconfigKeyword KerberosUniqueCCache
+syn keyword sshdconfigKeyword KerberosUseKuserok
 syn keyword sshdconfigKeyword KexAlgorithms
 syn keyword sshdconfigKeyword KeyRegenerationInterval
 syn keyword sshdconfigKeyword ListenAddress
@@ -197,6 +207,7 @@ syn keyword sshdconfigKeyword MaxStartup
 syn keyword sshdconfigKeyword PasswordAuthentication
 syn keyword sshdconfigKeyword PermitBlacklistedKeys
 syn keyword sshdconfigKeyword PermitEmptyPasswords
+syn keyword sshdconfigKeyword PermitListen
 syn keyword sshdconfigKeyword PermitOpen
 syn keyword sshdconfigKeyword PermitRootLogin
 syn keyword sshdconfigKeyword PermitTTY
@@ -213,10 +224,14 @@ syn keyword sshdconfigKeyword PubkeyAuth
 syn keyword sshdconfigKeyword RSAAuthentication
 syn keyword sshdconfigKeyword RekeyLimit
 syn keyword sshdconfigKeyword RevokedKeys
+syn keyword sshdconfigKeyword RDomain
 syn keyword sshdconfigKeyword RhostsRSAAuthentication
 syn keyword sshdconfigKeyword ServerKeyBits
+syn keyword sshdconfigKeyword SetEnv
 syn keyword sshdconfigKeyword ShowPatchLevel
 syn keyword sshdconfigKeyword StrictModes
+syn keyword sshdconfigKeyword StreamLocalBindMask
+syn keyword sshdconfigKeyword StreamLocalBindUnlink
 syn keyword sshdconfigKeyword Subsystem
 syn keyword sshdconfigKeyword SyslogFacility
 syn keyword sshdconfigKeyword TCPKeepAlive
@@ -227,6 +242,7 @@ syn keyword sshdconfigKeyword UsePAM
 syn keyword sshdconfigKeyword VersionAddendum
 syn keyword sshdconfigKeyword X11DisplayOffset
 syn keyword sshdconfigKeyword X11Forwarding
+syn keyword sshdconfigKeyword X11MaxDisplays
 syn keyword sshdconfigKeyword X11UseLocalhost
 syn keyword sshdconfigKeyword XAuthLocation
 
--- a/runtime/vim.desktop
+++ b/runtime/vim.desktop
@@ -3,13 +3,16 @@
 [Desktop Entry]
 # Translators: This is the Application Name used in the Vim desktop file
 Name[de]=Vim
+Name[eo]=Vim
 Name=Vim
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
+GenericName[eo]=Tekstoredaktilo
 GenericName[ja]=テキストエディタ
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
 Comment[de]=Textdateien bearbeiten
+Comment[eo]=Redakti tekstajn dosierojn
 Comment[ja]=テキストファイルを編集します
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
@@ -89,10 +92,12 @@ Terminal=true
 Type=Application
 # Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon!
 Keywords[de]=Text;Editor;
+Keywords[eo]=Teksto;redaktilo;
 Keywords[ja]=テキスト;エディタ;
 Keywords=Text;editor;
 # Translators: This is the Icon file name. Do NOT translate
 Icon[de]=gvim
+Icon[eo]=gvim
 Icon=gvim
 Categories=Utility;TextEditor;
 StartupNotify=false
--- a/src/po/eo.po
+++ b/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: 2018-10-30 09:47+0100\n"
-"PO-Revision-Date: 2018-10-30 10:02+0100\n"
+"POT-Creation-Date: 2019-05-30 17:27+0200\n"
+"PO-Revision-Date: 2019-05-30 18:59+0200\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: Esperanto\n"
 "Language: eo\n"
@@ -27,6 +27,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "--Deleted--"
+msgstr "--Forviŝita--"
+
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
+
+#, c-format
+msgid "E367: No such group: \"%s\""
+msgstr "E367: Ne ekzistas tia grupo: \"%s\""
+
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Ne eblas forviŝi la aktualan grupon"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
+
+#, c-format
+msgid "E215: Illegal character after *: %s"
+msgstr "E215: Nevalida signo malantaŭ *: %s"
+
+#, c-format
+msgid "E216: No such event: %s"
+msgstr "E216: Ne estas tia evento: %s"
+
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: Ne ekzistas tia grupo aŭ evento: %s"
+
+msgid ""
+"\n"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Aŭto-Komandoj ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <bufro=%d>: nevalida numero de bufro "
+
+msgid "E217: Can't execute autocommands for ALL events"
+msgstr "E217: Ne eblas plenumi aŭtokomandojn por ĈIUJ eventoj"
+
+msgid "No matching autocommands"
+msgstr "Neniu kongrua aŭtokomando"
+
+msgid "E218: autocommand nesting too deep"
+msgstr "E218: aŭtokomando tro ingita"
+
+#, c-format
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Aŭtokomandoj por \"%s\""
+
+#, c-format
+msgid "Executing %s"
+msgstr "Plenumado de %s"
+
+#, c-format
+msgid "autocommand %s"
+msgstr "aŭtokomando %s"
+
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init() alvokita kun malplena pasvorto"
 
@@ -107,9 +168,9 @@ msgid "E88: Cannot go before first buffe
 msgstr "E88: Ne eblas iri antaŭ la unuan bufron"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr ""
-"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %ld (aldonu ! por "
+msgid "E89: No write since last change for buffer %d (add ! to override)"
+msgstr ""
+"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %d (aldonu ! por "
 "transpasi)"
 
 msgid "E948: Job still running (add ! to end the job)"
@@ -128,8 +189,8 @@ msgid "W14: Warning: List of file names 
 msgstr "W14: Averto: Listo de dosiernomoj troas"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Bufro %ld ne trovita"
+msgid "E92: Buffer %d not found"
+msgstr "E92: Bufro %d ne trovita"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -211,21 +272,8 @@ msgstr "[Invito]"
 msgid "[Scratch]"
 msgstr "[Malneto]"
 
-# DP: Vidu ":help sign-support" por klarigo pri "Sign"
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- Emfazaj simbolaĵoj ---"
-
-#, c-format
-msgid "Signs for %s:"
-msgstr "Emfazaj simbolaĵoj de %s:"
-
-#, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    linio=%ld  id=%d  nomo=%s"
+msgid "W10: Warning: Changing a readonly file"
+msgstr "W10: Averto: Ŝanĝo de nurlegebla dosiero"
 
 msgid "E902: Cannot connect to port"
 msgstr "E902: Ne eblas konekti al pordo"
@@ -295,6 +343,51 @@ msgstr "Ŝlosiloj ne kongruas!"
 msgid "[crypted]"
 msgstr "[ĉifrita]"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "Eniras sencimigan reĝimon.  Tajpu \"cont\" por daŭrigi."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "Malnovaval = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "Novaval = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "linio %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "kmd: %s"
+
+msgid "frame is zero"
+msgstr "kadro estas nul"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "kadro je la plej alta nivelo: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Kontrolpunkto en \"%s%s\" linio %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Kontrolpunkto ne trovita: %s"
+
+msgid "No breakpoints defined"
+msgstr "Neniu kontrolpunkto estas difinita"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  linio %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  espr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Mankas dupunkto en la vortaro: %s"
@@ -319,8 +412,8 @@ msgid "E737: Key already exists: %s"
 msgstr "E737: Ŝlosilo jam ekzistas: %s"
 
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
-msgstr "E96: Ne eblas dosierdiferenci pli ol %ld bufrojn"
+msgid "E96: Cannot diff more than %d buffers"
+msgstr "E96: Ne eblas dosierdiferenci pli ol %d bufrojn"
 
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
@@ -373,6 +466,81 @@ msgstr "E787: Bufro ŝanĝiĝis neatendite"
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: Eskapsigno nepermesebla en duliteraĵo"
 
+msgid "Custom"
+msgstr "propraj"
+
+msgid "Latin supplement"
+msgstr "latina suplemento"
+
+msgid "Greek and Coptic"
+msgstr "greka kaj kopta"
+
+msgid "Cyrillic"
+msgstr "cirila"
+
+msgid "Hebrew"
+msgstr "hebrea"
+
+msgid "Arabic"
+msgstr "araba"
+
+msgid "Latin extended"
+msgstr "latina etendita"
+
+msgid "Greek extended"
+msgstr "greka etendita"
+
+msgid "Punctuation"
+msgstr "interpunkcio"
+
+msgid "Super- and subscripts"
+msgstr "super kaj subskriboj"
+
+msgid "Currency"
+msgstr "valutsimboloj"
+
+msgid "Other"
+msgstr "aliaj"
+
+msgid "Roman numbers"
+msgstr "romaj ciferoj"
+
+msgid "Arrows"
+msgstr "Sagoj"
+
+msgid "Mathematical operators"
+msgstr "matematikaj operacisimboloj"
+
+msgid "Technical"
+msgstr "teknikaj simboloj"
+
+msgid "Box drawing"
+msgstr "Kadraj desegnsimboloj"
+
+msgid "Block elements"
+msgstr "blokecaj elementoj"
+
+msgid "Geometric shapes"
+msgstr "geometriaj formoj"
+
+msgid "Symbols"
+msgstr "simboloj"
+
+msgid "Dingbats"
+msgstr "Dingbats"
+
+msgid "CJK symbols and punctuation"
+msgstr "ĈJK-simboloj kaj interpunkcio"
+
+msgid "Hiragana"
+msgstr "rondaj kanaoj"
+
+msgid "Katakana"
+msgstr "strekaj kanaoj"
+
+msgid "Bopomofo"
+msgstr "bopomofo"
+
 msgid "E544: Keymap file not found"
 msgstr "E544: Dosiero de klavmapo ne troveblas"
 
@@ -382,107 +550,6 @@ msgstr "E105: Uzo de \":loadkeymap\" nur
 msgid "E791: Empty keymap entry"
 msgstr "E791: Malplena rikordo en klavmapo"
 
-msgid " Keyword completion (^N^P)"
-msgstr " Kompletigo de ŝlosilvorto (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " Reĝimo ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " Kompletigo de tuta linio (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " Kompletigo de dosiernomo (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " Kompletigo de etikedo (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " Kompletigo de ŝablona dosierindiko (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " Kompletigo de difino (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Kompletigo de vortaro (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " Kompletigo de tezaŭro (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " Kompletigo de komanda linio (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " Kompletigo difinita de uzanto (^U^N^P)"
-
-# DP: Ĉu eblas trovi pli bonan tradukon?
-msgid " Omni completion (^O^N^P)"
-msgstr " Kompletigo Omni (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Sugesto de literumo (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " Kompletigo loka de ŝlosilvorto (^N/^P)"
-
-msgid "Hit end of paragraph"
-msgstr "Atingis finon de alineo"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: Kompletiga funkcio ŝanĝis la fenestron"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: Kompletiga funkcio forviŝis tekston"
-
-msgid "'dictionary' option is empty"
-msgstr "La opcio 'dictionary' estas malplena"
-
-msgid "'thesaurus' option is empty"
-msgstr "La opcio 'thesaurus' estas malplena"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "Analizas vortaron: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (enmeto) Rulumo (^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (anstataŭigo) Rulumo (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "Analizas: %s"
-
-msgid "Scanning tags."
-msgstr "Analizas etikedojn."
-
-msgid "match in file"
-msgstr "kongruo en dosiero"
-
-msgid " Adding"
-msgstr " Aldonanta"
-
-msgid "-- Searching..."
-msgstr "-- Serĉanta..."
-
-msgid "Back at original"
-msgstr "Reveninta al originalo"
-
-msgid "Word from other line"
-msgstr "Vorto el alia linio"
-
-msgid "The only match"
-msgstr "La sola kongruo"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "kongruo %d de %d"
-
-#, c-format
-msgid "match %d"
-msgstr "kongruo %d"
-
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neatenditaj signoj en \":let\""
 
@@ -507,6 +574,16 @@ msgstr "E461: Nevalida nomo de variablo:
 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"
+
+#, c-format
+msgid "E990: Missing end marker '%s'"
+msgstr "E990: Mankas fina markilo '%s'"
+
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= ne estas subtenata kun versio 2 de vim scripto"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: Malpli da celoj ol Listeroj"
 
@@ -520,14 +597,17 @@ msgstr "Duobla ; en listo de variabloj"
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Ne eblas listigi variablojn de %s"
 
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: Nur eblas indeksi Liston aŭ Vortaron"
+msgid "E689: Can only index a List, Dictionary or Blob"
+msgstr "E689: Nur eblas indeksi Liston, Vortaron aŭ BLOB-on"
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:] devas esti laste"
 
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] bezonas listan valoron"
+msgid "E709: [:] requires a List or Blob value"
+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 "E710: List value has more items than target"
 msgstr "E710: Lista valoro havas pli da eroj ol la celo"
@@ -555,6 +635,9 @@ msgstr "E109: Mankas ':' malantaŭ '?'"
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Ne eblas uzi '%' kun Glitpunktnombro"
 
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr "E973: BLOB-a literalo devus havi paran nombron de deksesumaj signoj"
+
 msgid "E110: Missing ')'"
 msgstr "E110: Mankas ')'"
 
@@ -604,6 +687,9 @@ msgstr "E910: Uzo de Tasko kiel Nombro"
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: Uzo de Kanalo kiel Nombro"
 
+msgid "E974: Using a Blob as a Number"
+msgstr "E974: Uzo de BLOB-o kiel Nombro"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: Uzo de Funcref kiel Glitpunktnombro"
 
@@ -625,6 +711,9 @@ msgstr "E911: Uzo de Tasko kiel Glitpunk
 msgid "E914: Using a Channel as a Float"
 msgstr "E914: Uzo de Kanalo kiel Glitpunktnombro"
 
+msgid "E975: Using a Blob as a Float"
+msgstr "E975: Uzo de BLOB-o kiel Glitpunktnombro"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: uzo de Funcref kiel Ĉeno"
 
@@ -634,10 +723,17 @@ msgstr "E730: uzo de Listo kiel Ĉeno"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: uzo de Vortaro kiel Ĉeno"
 
+msgid "E976: using Blob as a String"
+msgstr "E976: uzo de BLOB-o kiel Ĉeno"
+
 msgid "E908: using an invalid value as a String"
 msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
 
 #, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: valorizo de %s kun valoro de neĝusta tipo"
+
+#, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Ne eblas forviŝi variablon %s"
 
@@ -680,6 +776,9 @@ msgstr ""
 msgid " line "
 msgstr " linio "
 
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: Eblas nur kompari BLOB-on kun BLOB-o"
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: Eblas nur kompari Liston kun Listo"
 
@@ -705,21 +804,35 @@ msgstr "argumento de filter()"
 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"
+
 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"
 
 msgid "add() argument"
 msgstr "argumento de add()"
 
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: Nevalida nomo de bufro: %s"
+
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"
 
 msgid "&Ok"
 msgstr "&Bone"
 
+msgid "E980: lowlevel input not supported"
+msgstr "E980: enigo de baza nivelo ne subtenata"
+
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
@@ -758,12 +871,9 @@ msgstr "E916: nevalida tasko"
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
 
-msgid "E957: Invalid window number"
-msgstr "E957: Nevalida numero de vindozo"
-
-#, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
-msgstr "E798: ID estas rezervita por \":match\": %ld"
+#, 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"
@@ -806,6 +916,10 @@ msgstr "E258: Ne eblas sendi al kliento"
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: Nevalida ago: '%s'"
 
+#, c-format
+msgid "E962: Invalid action: '%s'"
+msgstr "E962: Nevalida ago: '%s'"
+
 msgid "sort() argument"
 msgstr "argumento de sort()"
 
@@ -855,8 +969,8 @@ msgstr "> %d, Deksesuma %04x, Okuma %o"
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, Deksesuma %08x, Okuma %o"
 
-msgid "E134: Move lines into themselves"
-msgstr "E134: Movas liniojn en ilin mem"
+msgid "E134: Cannot move a range of lines into itself"
+msgstr "E134: Ne eblas movi intervalon de linioj en ilin mem"
 
 #, c-format
 msgid "%ld line moved"
@@ -1001,8 +1115,8 @@ msgstr "E143: Aŭtokomandoj neatendite forviŝis novan bufron %s"
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: nenumera argumento de :z"
 
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: Ŝelkomandoj nepermeseblaj en rvim"
+msgid "E145: Shell commands and some functionality not allowed in rvim"
+msgstr "E145: Ŝelkomandoj kaj alia funkciaro nepermeseblaj en rvim"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Ne eblas limigi regulesprimon per literoj"
@@ -1102,99 +1216,9 @@ msgstr "E154: Ripetita etikedo \"%s\" en
 msgid "E150: Not a directory: %s"
 msgstr "E150: Ne estas dosierujo: %s"
 
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: Nekonata simbola komando: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: Mankas nomo de simbolo"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: Tro da simboloj estas difinitaj"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: Nevalida teksto de simbolo: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: Nekonata simbolo: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: Mankas numero de simbolo"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: Nevalida nomo de bufro: %s"
-
-msgid "E934: Cannot jump to a buffer that does not have a name"
-msgstr "E934: Ne eblas salti al sennoma bufro"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Nevalida identigilo de simbolo: %ld"
-
-#, c-format
-msgid "E885: Not possible to change sign %s"
-msgstr "E885: Ne eblas ŝanĝi simbolon %s"
-
-msgid " (NOT FOUND)"
-msgstr "  (NETROVITA)"
-
-msgid " (not supported)"
-msgstr " (nesubtenata)"
-
-msgid "[Deleted]"
-msgstr "[Forviŝita]"
-
 msgid "No old files"
 msgstr "Neniu malnova dosiero"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "Eniras sencimigan reĝimon.  Tajpu \"cont\" por daŭrigi."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "Malnovaval = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "Novaval = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "linio %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "kmd: %s"
-
-msgid "frame is zero"
-msgstr "kadro estas nul"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "kadro je la plej alta nivelo: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Kontrolpunkto en \"%s%s\" linio %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Kontrolpunkto ne trovita: %s"
-
-msgid "No breakpoints defined"
-msgstr "Neniu kontrolpunkto estas difinita"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  linio %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  espr %s"
-
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
 
@@ -1298,6 +1322,13 @@ msgstr "W15: Averto: Neĝusta disigilo de linio, ^M eble mankas"
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: \":scriptencoding\" uzita ekster rulita dosiero"
 
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion uzita ekster rulita dosiero"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion ne subtenata: %d"
+
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: \":finish\" uzita ekster rulita dosiero"
 
@@ -1334,6 +1365,9 @@ msgstr "E464: Ambigua uzo de komando dif
 msgid "E492: Not an editor command"
 msgstr "E492: Ne estas redaktila komando"
 
+msgid "E981: Command not allowed in rvim"
+msgstr "E981: Nepermesata komando en rvim"
+
 msgid "E493: Backwards range given"
 msgstr "E493: Inversa amplekso donita"
 
@@ -1343,6 +1377,11 @@ msgstr "Inversa amplekso donita, permute
 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"
+msgstr ""
+"INTERNA: Ne eblas uzi 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'"
 
@@ -1356,74 +1395,10 @@ msgstr[0] "%d plia redaktenda dosiero. Ĉu tamen eliri?"
 msgstr[1] "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?"
 
 #, c-format
-msgid "E173: %ld more file to edit"
-msgid_plural "E173: %ld more files to edit"
-msgstr[0] "E173: %ld plia redaktenda dosiero"
-msgstr[1] "E173: %ld pliaj redaktendaj dosieroj"
-
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    Nomo        Argumentoj Adreso    Kompleto  Difino"
-
-msgid "No user-defined commands found"
-msgstr "Neniu komando difinita de uzanto trovita"
-
-msgid "E175: No attribute specified"
-msgstr "E175: Neniu atributo specifita"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: Nevalida nombro de argumentoj"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: Kvantoro ne povas aperi dufoje"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: Nevalida defaŭlta valoro de kvantoro"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: argumento bezonata por -complete"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: argumento bezonata por -addr"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: Nevalida atributo: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: Nevalida komanda nomo"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: Komandoj difinataj de uzanto devas eki per majusklo"
-
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: Rezervita nomo, neuzebla por komando difinita de uzanto"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: Neniu komando-difinita-de-uzanto kiel: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: Nevalida valoro de tipo de adreso: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Nevalida valoro de kompletigo: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr ""
-"E468: Argumento de kompletigo nur permesebla por kompletigo difinita de "
-"uzanto"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Uzula kompletigo bezonas funkcian argumenton"
+msgid "E173: %d more file to edit"
+msgid_plural "E173: %d more files to edit"
+msgstr[0] "E173: %d plia redaktenda dosiero"
+msgstr[1] "E173: %d pliaj redaktendaj dosieroj"
 
 msgid "unknown"
 msgstr "nekonata"
@@ -1698,9 +1673,6 @@ msgstr "Eniga linio"
 msgid "Debug Line"
 msgstr "Sencimiga linio"
 
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar preter la longo de komando"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiva fenestro aŭ bufro forviŝita"
 
@@ -2010,73 +1982,46 @@ msgstr "E462: Ne eblis prepari por reŝargi \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Ne eblis reŝargi \"%s\""
 
-msgid "--Deleted--"
-msgstr "--Forviŝita--"
-
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
-
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: Ne ekzistas tia grupo: \"%s\""
-
-msgid "E936: Cannot delete the current group"
-msgstr "E936: Ne eblas forviŝi la aktualan grupon"
-
-msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
-
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: Nevalida signo malantaŭ *: %s"
-
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: Ne estas tia evento: %s"
-
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: Ne ekzistas tia grupo aŭ evento: %s"
-
-msgid ""
-"\n"
-"--- Autocommands ---"
-msgstr ""
-"\n"
-"--- Aŭto-Komandoj ---"
-
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <bufro=%d>: nevalida numero de bufro "
-
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: Ne eblas plenumi aŭtokomandojn por ĈIUJ eventoj"
-
-msgid "No matching autocommands"
-msgstr "Neniu kongrua aŭtokomando"
-
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: aŭtokomando tro ingita"
-
-#, c-format
-msgid "%s Autocommands for \"%s\""
-msgstr "%s Aŭtokomandoj por \"%s\""
-
-#, c-format
-msgid "Executing %s"
-msgstr "Plenumado de %s"
-
-#, c-format
-msgid "autocommand %s"
-msgstr "aŭtokomando %s"
-
 msgid "E219: Missing {."
 msgstr "E219: Mankas {."
 
 msgid "E220: Missing }."
 msgstr "E220: Mankas }."
 
+msgid "E854: path too long for completion"
+msgstr "E854: tro longa vojo por kompletigo"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aŭ "
+"sekvita de '%s'."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo"
+
+msgid "E446: No file name under cursor"
+msgstr "E446: Neniu dosiernomo sub la kursoro"
+
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo"
+
 msgid "E490: No fold found"
 msgstr "E490: Neniu faldo trovita"
 
@@ -2096,7 +2041,7 @@ msgid "E222: Add to read buffer"
 msgstr "E222: Aldoni al lega bufro"
 
 msgid "E223: recursive mapping"
-msgstr "E223: rikura mapo"
+msgstr "E223: rekursia mapo"
 
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
@@ -2295,7 +2240,7 @@ msgid "Selection"
 msgstr "Apartigo"
 
 msgid "Find &Next"
-msgstr "Trovi &Sekvanta"
+msgstr "Trovi &Sekvantan"
 
 msgid "&Replace"
 msgstr "&Anstataŭigi"
@@ -2329,6 +2274,9 @@ msgstr "E671: Ne eblas trovi titolon de 
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: Ne subtenata argumento: \"-%s\"; Uzu la version OLE."
 
+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: Grafika interfaco ne uzeblas. Ne eblas plenumi gvim.exe"
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Ne eblas malfermi fenestron interne de aplikaĵo MDI"
 
@@ -2358,20 +2306,20 @@ msgid "Font0: %s"
 msgstr "Font0: %s"
 
 #, c-format
-msgid "Font1: %s"
-msgstr "Font1: %s"
-
-#, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "Font%ld ne estas duoble pli larĝa ol font0"
-
-#, c-format
-msgid "Font0 width: %ld"
-msgstr "Larĝo de font0: %ld"
-
-#, c-format
-msgid "Font1 width: %ld"
-msgstr "Larĝo de Font1: %ld"
+msgid "Font%d: %s"
+msgstr "Font%d: %s"
+
+#, c-format
+msgid "Font%d width is not twice that of font0"
+msgstr "Font%d ne estas duoble pli larĝa ol font0"
+
+#, c-format
+msgid "Font0 width: %d"
+msgstr "Larĝo de font0: %d"
+
+#, c-format
+msgid "Font%d width: %d"
+msgstr "Larĝo de font%d: %d"
 
 msgid "Invalid font specification"
 msgstr "Nevalida tiparo specifita"
@@ -2547,8 +2495,8 @@ msgid "Added cscope database %s"
 msgstr "Aldonis datumbazon de cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: eraro dum legado de konekto de cscope %ld"
+msgid "E262: error reading cscope connection %d"
+msgstr "E262: eraro dum legado de konekto de cscope %d"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nekonata tipo de serĉo de cscope"
@@ -2873,6 +2821,107 @@ msgid "E251: VIM instance registry prope
 msgstr ""
 "E251: Ecoj de registro de apero de VIM estas nevalide formata. Forviŝita!"
 
+msgid " Keyword completion (^N^P)"
+msgstr " Kompletigo de ŝlosilvorto (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " Reĝimo ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " Kompletigo de tuta linio (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " Kompletigo de dosiernomo (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Kompletigo de etikedo (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " Kompletigo de ŝablona dosierindiko (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " Kompletigo de difino (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Kompletigo de vortaro (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Kompletigo de tezaŭro (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " Kompletigo de komanda linio (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " Kompletigo difinita de uzanto (^U^N^P)"
+
+# DP: Ĉu eblas trovi pli bonan tradukon?
+msgid " Omni completion (^O^N^P)"
+msgstr " Kompletigo Omni (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " Sugesto de literumo (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " Kompletigo loka de ŝlosilvorto (^N/^P)"
+
+msgid "Hit end of paragraph"
+msgstr "Atingis finon de alineo"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: Kompletiga funkcio ŝanĝis la fenestron"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: Kompletiga funkcio forviŝis tekston"
+
+msgid "'dictionary' option is empty"
+msgstr "La opcio 'dictionary' estas malplena"
+
+msgid "'thesaurus' option is empty"
+msgstr "La opcio 'thesaurus' estas malplena"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "Analizas vortaron: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (enmeto) Rulumo (^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (anstataŭigo) Rulumo (^E/^Y)"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "Analizas: %s"
+
+msgid "Scanning tags."
+msgstr "Analizas etikedojn."
+
+msgid "match in file"
+msgstr "kongruo en dosiero"
+
+msgid " Adding"
+msgstr " Aldonanta"
+
+msgid "-- Searching..."
+msgstr "-- Serĉanta..."
+
+msgid "Back at original"
+msgstr "Reveninta al originalo"
+
+msgid "Word from other line"
+msgstr "Vorto el alia linio"
+
+msgid "The only match"
+msgstr "La sola kongruo"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "kongruo %d de %d"
+
+#, c-format
+msgid "match %d"
+msgstr "kongruo %d"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: Ripetita ŝlosilo en JSON: \"%s\""
@@ -3090,9 +3139,6 @@ msgstr "-A\t\t\tKomenci en araba reĝimo"
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tKomenci en hebrea reĝimo"
 
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\tKomenci en persa reĝimo"
-
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminalo>\tAgordi terminalon al <terminalo>"
 
@@ -3294,7 +3340,7 @@ msgid "--socketid <xid>\tOpen Vim inside
 msgstr "--socketid <xid>\tMalfermi Vim en alia GTK fenestraĵo"
 
 msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-msgstr "--echo-wid\t\tIgas gvim afiŝi la identigilon de vindozo sur stdout"
+msgstr "--echo-wid\t\tIgas gvim afiŝi la identigilon de fenestro sur stdout"
 
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <gepatra titolo>\tMalfermi Vim en gepatra aplikaĵo"
@@ -3814,6 +3860,9 @@ msgstr ""
 "\"\n"
 "    por eviti tiun mesaĝon.\n"
 
+msgid "Found a swap file that is not useful, deleting it"
+msgstr "Forviŝis neutilan permutodosieron"
+
 msgid "Swap file \""
 msgstr "Permutodosiero .swp \""
 
@@ -3862,9 +3911,6 @@ msgstr "E326: Tro da dosieroj trovitaj"
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Parto de vojo de menuero ne estas sub-menuo"
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: Menuo nur ekzistas en alia reĝimo"
-
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: Neniu menuo \"%s\""
@@ -3985,9 +4031,6 @@ msgstr "E807: Atendis Glitpunktnombron k
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Tro da argumentoj al printf()"
 
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: Averto: Ŝanĝo de nurlegebla dosiero"
-
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "Tajpu nombron kaj <Enenklavon> aŭ alklaku per la muso (malpleno rezignas): "
@@ -4033,12 +4076,8 @@ msgstr ""
 "[alvokoj] totalaj re/malloc() %lu, totalaj free() %lu\n"
 "\n"
 
-msgid "E340: Line is becoming too long"
-msgstr "E340: Linio iĝas tro longa"
-
-#, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Interna eraro: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(0, )"
+msgstr "E341: Interna eraro: lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4063,41 +4102,14 @@ msgstr "E548: cifero atendata"
 msgid "E549: Illegal percentage"
 msgstr "E549: Nevalida procento"
 
-msgid "E854: path too long for completion"
-msgstr "E854: tro longa vojo por kompletigo"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aŭ "
-"sekvita de '%s'."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: Nevalida permeso de dosiero de informo de konekto NetBeans: \"%s\""
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Konekto de NetBeans perdita por bufro %ld"
+msgid "E658: NetBeans connection lost for buffer %d"
+msgstr "E658: Konekto de NetBeans perdita por bufro %d"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans ne estas subtenata kun tiu grafika interfaco"
@@ -4142,6 +4154,9 @@ msgstr ""
 "Tajpu  :qa!  kaj premu <Enenklavon> por forlasi ĉiujn ŝanĝojn kaj eliri el "
 "Vim"
 
+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Tajpu  :qa!  kaj premu <Enenklavon> por eliri el Vim"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4272,6 +4287,9 @@ msgstr "E519: Opcio ne subtenata"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Nepermesebla en reĝimlinio"
 
+msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
+msgstr "E992: Nepermesebla en reĝimlinio kiam 'modelineexpr' estas malŝaltita"
+
 msgid "E846: Key code not set"
 msgstr "E846: Klavkodo ne agordita"
 
@@ -4530,6 +4548,10 @@ msgstr ""
 "\n"
 "Vim: Alvenis X eraro\n"
 
+#, c-format
+msgid "restoring display %s"
+msgstr "restaŭro de vidigo %s"
+
 msgid "Testing the X display failed"
 msgstr "Testo de la vidigo X malsukcesis"
 
@@ -4627,15 +4649,6 @@ msgstr "XSMP: SmcOpenConnection malsukce
 msgid "At line"
 msgstr "Ĉe linio"
 
-msgid "Could not load vim32.dll!"
-msgstr "Ne eblis ŝargi vim32.dll!"
-
-msgid "VIM Error"
-msgstr "Eraro de VIM"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "Ne eblis ripari referencojn de funkcioj al la DLL!"
-
 # DP: la eventoj estas tiuj, kiuj estas en la sekvantaj ĉenoj
 #, c-format
 msgid "Vim: Caught %s event\n"
@@ -4669,6 +4682,13 @@ msgstr "Averto de Vim"
 msgid "shell returned %d"
 msgstr "la ŝelo liveris %d"
 
+#, c-format
+msgid "E993: window %d is not a popup window"
+msgstr "E993: fenestro %d ne estas ŝprucfenestro"
+
+msgid "E553: No more items"
+msgstr "E553: Ne plu estas eroj"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: Aktuala listo de lokoj ŝanĝiĝis"
 
@@ -4701,11 +4721,8 @@ msgstr "E378: 'errorformat' enhavas neniun ŝablonon"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Nomo de dosierujo mankas aŭ estas malplena"
 
-msgid "E553: No more items"
-msgstr "E553: Ne plu estas eroj"
-
 msgid "E924: Current window was closed"
-msgstr "E924: Aktuala vindozo fermiĝis"
+msgstr "E924: Aktuala fenestro fermiĝis"
 
 msgid "E925: Current quickfix was changed"
 msgstr "E925: Aktuala rapidriparo ŝanĝiĝis"
@@ -4869,8 +4886,8 @@ msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA-regulesprimo) Mispoziciigita %c"
 
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signoj: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
+msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signoj: %d"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -5048,6 +5065,67 @@ msgstr ""
 "# Lasta serĉa ŝablono %s:\n"
 "~"
 
+msgid "[Deleted]"
+msgstr "[Forviŝita]"
+
+# DP: Vidu ":help sign-support" por klarigo pri "Sign"
+msgid ""
+"\n"
+"--- Signs ---"
+msgstr ""
+"\n"
+"--- Emfazaj simbolaĵoj ---"
+
+#, c-format
+msgid "Signs for %s:"
+msgstr "Emfazaj simbolaĵoj de %s:"
+
+#, c-format
+msgid "  group=%s"
+msgstr "  groupo=%s"
+
+#, c-format
+msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
+msgstr "    linio=%ld  id=%d%s  nomo=%s  prioritato=%d"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: Tro da simboloj estas difinitaj"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: Nevalida teksto de simbolo: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: Nekonata simbolo: %s"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Ne eblas ŝanĝi simbolon %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: Mankas numero de simbolo"
+
+#, c-format
+msgid "E157: Invalid sign ID: %d"
+msgstr "E157: Nevalida identigilo de simbolo: %d"
+
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: Ne eblas salti al sennoma bufro"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: Nekonata simbola komando: %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: Mankas nomo de simbolo"
+
+msgid " (NOT FOUND)"
+msgstr "  (NETROVITA)"
+
+msgid " (not supported)"
+msgstr " (nesubtenata)"
+
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: Literumilo ne estas ŝaltita"
 
@@ -5157,10 +5235,6 @@ msgid "Conversion in %s not supported: f
 msgstr "Konverto en %s nesubtenata: de %s al %s"
 
 #, c-format
-msgid "Conversion in %s not supported"
-msgstr "Konverto en %s nesubtenata"
-
-#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Nevalida valoro de FLAG en %s linio %d: %s"
 
@@ -5377,8 +5451,8 @@ msgid "E751: Output file name must not h
 msgstr "E751: Nomo de eliga dosiero ne devas havi nomon de regiono"
 
 #, c-format
-msgid "E754: Only up to %ld regions supported"
-msgstr "E754: Nur ĝis %ld regionoj subtenataj"
+msgid "E754: Only up to %d regions supported"
+msgstr "E754: Nur ĝis %d regionoj subtenataj"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5395,12 +5469,12 @@ msgid "Done!"
 msgstr "Farita!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' ne havas %ld rikordojn"
+msgid "E765: 'spellfile' does not have %d entries"
+msgstr "E765: 'spellfile' ne havas %d rikordojn"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
-msgstr "Vorto '%.*s' fortirita el %s"
+msgstr "Vorto '%.*s' forigata el %s"
 
 #, c-format
 msgid "Word '%.*s' added to %s"
@@ -5658,6 +5732,12 @@ msgstr "E555: ĉe subo de stako de etikedoj"
 msgid "E556: at top of tag stack"
 msgstr "E556: ĉe supro de stako de etikedoj"
 
+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: ne eblas ŝanĝi stakon de etikedoj en 'tagfunc'"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: nevalida liveraĵo el 'tagfunc'"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Ne eblas iri antaŭ la unuan kongruan etikedon"
 
@@ -5665,13 +5745,6 @@ msgstr "E425: Ne eblas iri antaŭ la unuan kongruan etikedon"
 msgid "E426: tag not found: %s"
 msgstr "E426: etikedo netrovita: %s"
 
-# DP: "pri" estas "priority"
-msgid "  # pri kind tag"
-msgstr "nro pri tipo etikedo"
-
-msgid "file\n"
-msgstr "dosiero\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: Estas nur unu kongrua etikedo"
 
@@ -5696,6 +5769,13 @@ msgstr "  Uzo de etikedo kun malsama usk
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Dosiero \"%s\" ne ekzistas"
 
+# DP: "pri" estas "priority"
+msgid "  # pri kind tag"
+msgstr "nro pri tipo etikedo"
+
+msgid "file\n"
+msgstr "dosiero\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5772,6 +5852,10 @@ msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "Ne povas malfermi $VIMRUNTIME/rgb.txt"
 
 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: Nevalida atributo: %s"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "Ĉu ĉesigi taskon en \"%s\"?"
 
@@ -5800,6 +5884,38 @@ msgstr "E953: Dosiero jam ekzistas: %s"
 msgid "E955: Not a terminal buffer"
 msgstr "E955: Ne estas bufro de terminalo"
 
+msgid "E982: ConPTY is not available"
+msgstr "E982: ConPTY ne disponeblas"
+
+#, c-format
+msgid "E971: Property type %s does not exist"
+msgstr "E971: Tipo de eco %s ne ekzistas"
+
+#, c-format
+msgid "E964: Invalid column number: %ld"
+msgstr "E964: Nevalida numero de kolumno: %ld"
+
+#, c-format
+msgid "E966: Invalid line number: %ld"
+msgstr "E966: Nevalida numero de linio: %ld"
+
+msgid "E965: missing property type name"
+msgstr "E965: nomo de tipo de eco mankas"
+
+msgid "E967: text property info corrupted"
+msgstr "E967: difekta informo de eco de teksto"
+
+msgid "E968: Need at least one of 'id' or 'type'"
+msgstr "E968: Bezonas almenaŭ 'id' aŭ 'type'"
+
+#, c-format
+msgid "E969: Property type %s already defined"
+msgstr "E969: tipo de eco %s jam difinita"
+
+#, c-format
+msgid "E970: Unknown highlight group name: '%s'"
+msgstr "E970: Nekonata nomo de emfaza grupo: '%s'"
+
 msgid "new shell started\n"
 msgstr "nova ŝelo lanĉita\n"
 
@@ -5946,6 +6062,67 @@ msgstr "E439: listo de malfaro estas dif
 msgid "E440: undo line missing"
 msgstr "E440: linio de malfaro mankas"
 
+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    Nomo        Argumentoj Adreso  Kompleto    Difino"
+
+msgid "No user-defined commands found"
+msgstr "Neniu komando difinita de uzanto trovita"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Nevalida valoro de tipo de adreso: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: Nevalida valoro de kompletigo: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr ""
+"E468: Argumento de kompletigo nur permesebla por kompletigo difinita de "
+"uzanto"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Uzula kompletigo bezonas funkcian argumenton"
+
+msgid "E175: No attribute specified"
+msgstr "E175: Neniu atributo specifita"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: Nevalida nombro de argumentoj"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: Kvantoro ne povas aperi dufoje"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: Nevalida defaŭlta valoro de kvantoro"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: argumento bezonata por -complete"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: argumento bezonata por -addr"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: Nevalida komanda nomo"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: Komandoj difinataj de uzanto devas eki per majusklo"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: Rezervita nomo, neuzebla por komando difinita de uzanto"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: Neniu komando difinita de uzanto kiel: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: La funkcio %s jam ekzistas (aldonu ! por anstataŭigi ĝin)"
@@ -5968,6 +6145,9 @@ msgstr "E125: Nevalida argumento: %s"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Ripetita nomo de argumento: %s"
 
+msgid "E989: Non-default argument follows default argument"
+msgstr "E989: Ne defaŭlta argumento malantaŭ defaŭlta argumento"
+
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Tro da argumentoj por funkcio: %s"
@@ -6080,17 +6260,31 @@ msgstr "%s (%s, kompilita %s)"
 
 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"Grafika/konzola versio por MS-Vindozo 64-bitoj"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"Grafika/konzola versio por MS-Vindozo 32-bitoj"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
-"Grafika versio MS-Vindozo 64-bitoj"
+"Grafika versio por MS-Vindozo 64-bitoj"
 
 msgid ""
 "\n"
 "MS-Windows 32-bit GUI version"
 msgstr ""
 "\n"
-"Grafika versio MS-Vindozo 32-bitoj"
+"Grafika versio por MS-Vindozo 32-bitoj"
 
 msgid " with OLE support"
 msgstr " kun subteno de OLE"
@@ -6100,14 +6294,14 @@ msgid ""
 "MS-Windows 64-bit console version"
 msgstr ""
 "\n"
-"Versio konzola MS-Vindozo 64-bitoj"
+"Konzola versio por MS-Vindozo 64-bitoj"
 
 msgid ""
 "\n"
 "MS-Windows 32-bit console version"
 msgstr ""
 "\n"
-"Versio konzola MS-Vindozo 32-bitoj"
+"Konzola versio por MS-Vindozo 32-bitoj"
 
 msgid ""
 "\n"
@@ -6370,6 +6564,10 @@ msgstr "menuo Helpo->Subteni/Registri   
 msgid "Already only one window"
 msgstr "Jam nur unu fenestro"
 
+#, c-format
+msgid "E92: Buffer %ld not found"
+msgstr "E92: Bufro %ld ne trovita"
+
 msgid "E441: There is no preview window"
 msgstr "E441: Ne estas antaŭvida fenestro"
 
@@ -6382,8 +6580,8 @@ msgstr "E443: Ne eblas rotacii kiam alia
 msgid "E444: Cannot close last window"
 msgstr "E444: Ne eblas fermi la lastan fenestron"
 
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: Ne eblas fermi la fenestron de aŭtokomandoj"
+msgid "E813: Cannot close autocmd or popup window"
+msgstr "E813: Ne eblas fermi la ŝprucfenestron aŭ fenestron de aŭtokomandoj"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: Ne eblas fermi fenestron, nur la fenestro de aŭtokomandoj restus"
@@ -6391,31 +6589,24 @@ 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"
 
-msgid "E446: No file name under cursor"
-msgstr "E446: Neniu dosiernomo sub la kursoro"
-
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo"
-
-#, c-format
-msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E799: Nevalida ID: %ld (devas esti egala aŭ pli granda ol 1)"
-
-#, c-format
-msgid "E801: ID already taken: %ld"
-msgstr "E801: ID jam uzata: %ld"
+#, 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: %ld (must be greater than or equal to 1)"
-msgstr "E802: Nevalida ID: %ld (devas esti egala aŭ pli granda ol 1)"
-
-#, c-format
-msgid "E803: ID not found: %ld"
-msgstr "E803: ID netrovita: %ld"
+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"
@@ -6536,6 +6727,10 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: Nevalida argumento: %s"
 
 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: Ripetita argumento: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: Nevalida valoro de argumento: %s"
 
@@ -6596,8 +6791,8 @@ msgstr "E25: Grafika interfaco ne uzeblas: Malŝaltita dum kompilado"
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: La hebrea ne uzeblas: Malŝaltita dum kompilado\n"
 
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: La persa ne uzeblas: Malŝaltita dum kompilado\n"
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: Persa reĝimo estis forigata\n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: La araba ne uzeblas: Malŝaltita dum kompilado\n"
@@ -6722,6 +6917,13 @@ msgid "E684: list index out of range: %l
 msgstr "E684: indekso de listo ekster limoj: %ld"
 
 #, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979: Indekso de BLOB-o ekster limoj: %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978: Nevalida operacio de BLOB-o"
+
+#, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: Tro da argumentoj por funkcio: %s"
 
@@ -6732,10 +6934,17 @@ msgstr "E716: Ŝlosilo malekzistas en Vortaro: %s"
 msgid "E714: List required"
 msgstr "E714: Listo bezonata"
 
+msgid "E897: List or Blob required"
+msgstr "E897: Listo aŭ BLOB-o bezonata"
+
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: Argumento de %s devas esti Listo aŭ Vortaro"
 
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: Argumento de %s devas esti Listo, Vortaro aŭ BLOB-o"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Eraro dum legado de erardosiero"
 
@@ -6836,7 +7045,10 @@ msgid "E919: Directory not found in '%s'
 msgstr "E919: Dosierujo ne trovita en '%s': \"%s\""
 
 msgid "E952: Autocommand caused recursive behavior"
-msgstr "E952: Aŭtokomandoj kaŭzis rikiran konduton"
+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 "search hit TOP, continuing at BOTTOM"
 msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"
@@ -6994,7 +7206,7 @@ msgid "internal error: unknown option ty
 msgstr "interna eraro: nekonata tipo de opcio"
 
 msgid "problem while switching windows"
-msgstr "problemo dum salto al vindozoj"
+msgstr "problemo dum salto al fenestroj"
 
 #, c-format
 msgid "unable to unset global option %s"
@@ -7047,7 +7259,7 @@ msgid "failed to find window in the curr
 msgstr "malsukcesis trovi vindozon en la nuna langeto"
 
 msgid "did not switch to the specified window"
-msgstr "ne saltis al la specifita vindozo"
+msgstr "ne saltis al la specifita fenestro"
 
 #, c-format
 msgid "expected vim.TabPage object, but got %s"
@@ -7144,3 +7356,21 @@ msgstr ""
 "Dosieroj C (*.c, *.h)\t*.c;*.h\n"
 "Dosieroj C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
 "Dosieroj Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid "GVim"
+msgstr "GVim"
+
+msgid "Text Editor"
+msgstr "Tekstoredaktilo"
+
+msgid "Edit text files"
+msgstr "Redakti tekstajn dosierojn"
+
+msgid "Text;editor;"
+msgstr "Teksto;redaktilo;"
+
+msgid "gvim"
+msgstr "gvim"
+
+msgid "Vim"
+msgstr "Vim"