Mercurial > vim

--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.1.  Last change: 2019 May 05
+*change.txt*    For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -268,8 +268,6 @@ r{char}			Replace the character under th
 			If {char} is a <CR> or <NL>, a line break replaces the
 			character.  To replace with a real <CR>, use CTRL-V
 			<CR>.  CTRL-V <NL> replaces with a <Nul>.
-			{Vi: CTRL-V <CR> still replaces with a line break,
-			cannot replace something with a <CR>}

 			If {char} is CTRL-E or CTRL-Y the character from the
 			line below or above is used, just like with |i_CTRL-E|
@@ -310,11 +308,9 @@ The following commands change the case o
 							*~*
 ~			'notildeop' option: Switch case of the character
 			under the cursor and move the cursor to the right.
-			If a [count] is given, do that many characters. {Vi:
-			no count}
+			If a [count] is given, do that many characters.

-~{motion}		'tildeop' option: switch case of {motion} text. {Vi:
-			tilde cannot be used as an operator}
+~{motion}		'tildeop' option: switch case of {motion} text.

 							*g~*
 g~{motion}		Switch case of {motion} text.
@@ -1054,11 +1050,11 @@ 5. Copying and moving text				*copy-move

 							*p* *put* *E353*
 ["x]p			Put the text [from register x] after the cursor
-			[count] times.  {Vi: no count}
+			[count] times.

 							*P*
 ["x]P			Put the text [from register x] before the cursor
-			[count] times.  {Vi: no count}
+			[count] times.

 							*<MiddleMouse>*
 ["x]<MiddleMouse>	Put the text from a register before the cursor [count]
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.1.  Last change: 2019 May 05
+*cmdline.txt*   For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -27,7 +27,6 @@ 1. Command-line editing					*cmdline-edi
 Normally characters are inserted in front of the cursor position.  You can
 move around in the command-line with the left and right cursor keys.  With the
 <Insert> key, you can toggle between inserting and overstriking characters.
-{Vi: can only alter the last character in the line}

 Note that if your keyboard does not have working cursor keys or any of the
 other special keys, you can use ":cnoremap" to define another key for them.
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 8.1.  Last change: 2017 Jul 15
+*debug.txt*     For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.1.  Last change: 2019 May 05
+*editing.txt*   For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -51,7 +51,7 @@ for editing (e.g., with ":e filename") o
 the file name is added to the list.  You can use the buffer list to remember
 which files you edited and to quickly switch from one file to another (e.g.,
 to copy text) with the |CTRL-^| command.  First type the number of the file
-and then hit CTRL-^.  {Vi: only one alternate file name is remembered}
+and then hit CTRL-^.


 CTRL-G		or				*CTRL-G* *:f* *:fi* *:file*
@@ -197,7 +197,6 @@ 2. Editing a file					*edit-a-file*
 			buffer and 'autowriteall' isn't set or the file can't
 			be written.
 			Also see |++opt| and |+cmd|.
-			{Vi: no ++opt}

 							*:edit!* *discard*
 :e[dit]! [++opt] [+cmd]
@@ -205,7 +204,6 @@ 2. Editing a file					*edit-a-file*
 			the current buffer.  This is useful if you want to
 			start all over again.
 			Also see |++opt| and |+cmd|.
-			{Vi: no ++opt}

 							*:edit_f*
 :e[dit] [++opt] [+cmd] {file}
@@ -214,14 +212,12 @@ 2. Editing a file					*edit-a-file*
 			buffer, unless 'hidden' is set or 'autowriteall' is
 			set and the file can be written.
 			Also see |++opt| and |+cmd|.
-			{Vi: no ++opt}

 							*:edit!_f*
 :e[dit]! [++opt] [+cmd] {file}
 			Edit {file} always.  Discard any changes to the
 			current buffer.
 			Also see |++opt| and |+cmd|.
-			{Vi: no ++opt}

 :e[dit] [++opt] [+cmd] #[count]
 			Edit the [count]th buffer (as shown by |:files|).
@@ -229,7 +225,6 @@ 2. Editing a file					*edit-a-file*
 			#" doesn't work if the alternate buffer doesn't have a
 			file name, while CTRL-^ still works then.
 			Also see |++opt| and |+cmd|.
-			{Vi: no ++opt}

 							*:ene* *:enew*
 :ene[w]			Edit a new, unnamed buffer.  This fails when changes
@@ -607,14 +602,12 @@ list of the current window.
 			the first one.  This fails when changes have been made
 			and Vim does not want to |abandon| the current buffer.
 			Also see |++opt| and |+cmd|.
-			{Vi: no ++opt}

 :ar[gs]! [++opt] [+cmd] {arglist}			*:args_f!*
 			Define {arglist} as the new argument list and edit
 			the first one.  Discard any changes to the current
 			buffer.
 			Also see |++opt| and |+cmd|.
-			{Vi: no ++opt}

 :[count]arge[dit][!] [++opt] [+cmd] {name} ..		*:arge* *:argedit*
 			Add {name}s to the argument list and edit it.
@@ -693,13 +686,11 @@ list of the current window.
 :[count]n[ext] [++opt] [+cmd]			*:n* *:ne* *:next* *E165* *E163*
 			Edit [count] next file.  This fails when changes have
 			been made and Vim does not want to |abandon| the
-			current buffer.  Also see |++opt| and |+cmd|.  {Vi: no
-			count or ++opt}.
+			current buffer.  Also see |++opt| and |+cmd|.

 :[count]n[ext]! [++opt] [+cmd]
 			Edit [count] next file, discard any changes to the
-			buffer.  Also see |++opt| and |+cmd|.  {Vi: no count
-			or ++opt}.
+			buffer.  Also see |++opt| and |+cmd|.

 :n[ext] [++opt] [+cmd] {arglist}			*:next_f*
 			Same as |:args_f|.
@@ -716,18 +707,17 @@ list of the current window.
 :[count]N[ext]! [count] [++opt] [+cmd]
 			Edit [count] previous file in argument list.  Discard
 			any changes to the buffer.  Also see |++opt| and
-			|+cmd|.  {Vi: no count or ++opt}.
+			|+cmd|.

 :[count]prev[ious] [count] [++opt] [+cmd]		*:prev* *:previous*
-			Same as :Next.  Also see |++opt| and |+cmd|.  {Vi:
-			only in some versions}
+			Same as :Next.  Also see |++opt| and |+cmd|.

 							*:rew* *:rewind*
 :rew[ind] [++opt] [+cmd]
 			Start editing the first file in the argument list.
 			This fails when changes have been made and Vim does
 			not want to |abandon| the current buffer.
-			Also see |++opt| and |+cmd|. {Vi: no ++opt}
+			Also see |++opt| and |+cmd|.

 :rew[ind]! [++opt] [+cmd]
 			Start editing the first file in the argument list.
@@ -1335,7 +1325,7 @@ present in 'cpoptions' and "!" is not us
 :lch[dir][!]		Same as |:lcd|.

 							*:pw* *:pwd* *E187*
-:pw[d]			Print the current directory name.  {Vi: no pwd}
+:pw[d]			Print the current directory name.
 			Also see |getcwd()|.

 So long as no |:lcd| or |:tcd| command has been used, all windows share the
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.1.  Last change: 2019 May 05
+*eval.txt*	For Vim version 8.1.  Last change: 2019 May 09


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7271,7 +7271,7 @@ prop_type_add({name}, {props})		*prop_ty
 				will be used; negative values can be used, the
 				default priority is zero
 		   combine	when TRUE combine the highlight with any
-				syntax highlight; when omitted of FALSE syntax
+				syntax highlight; when omitted or FALSE syntax
 				highlight will not be used
 		   start_incl	when TRUE inserts at the start position will
 				be included in the text property
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.1.  Last change: 2019 Apr 24
+*index.txt*     For Vim version 8.1.  Last change: 2019 May 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 8.1.  Last change: 2019 May 05
+*insert.txt*    For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -59,8 +59,8 @@ CTRL-C		Quit insert mode, go back to Nor
 		event.

 						*i_CTRL-@*
-CTRL-@		Insert previously inserted text and stop insert.  {Vi: only
-		when typed as first char, only up to 128 chars}
+CTRL-@		Insert previously inserted text and stop insert.
+
 						*i_CTRL-A*
 CTRL-A		Insert previously inserted text.

@@ -68,7 +68,7 @@ CTRL-A		Insert previously inserted text.
 <BS> or CTRL-H	Delete the character before the cursor (see |i_backspacing|
 		about joining lines).
 		See |:fixdel| if your <BS> key does not do what you want.
-		{Vi: does not delete autoindents}
+
 						*i_<Del>* *i_DEL*
 <Del>		Delete the character under the cursor.  If the cursor is at
 		the end of the line, and the 'backspace' option includes
@@ -174,19 +174,18 @@ CTRL-R CTRL-P {0-9a-z"%#*+/:.-=}			*i_CT
 						*i_CTRL-T*
 CTRL-T		Insert one shiftwidth of indent at the start of the current
 		line.  The indent is always rounded to a 'shiftwidth' (this is
-		vi compatible).  {Vi: only when in indent}
+		vi compatible).
 						*i_CTRL-D*
 CTRL-D		Delete one shiftwidth of indent at the start of the current
 		line.  The indent is always rounded to a 'shiftwidth' (this is
-		vi compatible).  {Vi: CTRL-D works only when used after
-		autoindent}
+		vi compatible).
 						*i_0_CTRL-D*
-0 CTRL-D	Delete all indent in the current line.  {Vi: CTRL-D works
-		only when used after autoindent}
+0 CTRL-D	Delete all indent in the current line.
+
 						*i_^_CTRL-D*
 ^ CTRL-D	Delete all indent in the current line.  The indent is
 		restored in the next line.  This is useful when inserting a
-		label.  {Vi: CTRL-D works only when used after autoindent}
+		label.

 						*i_CTRL-V*
 CTRL-V		Insert next non-digit literally.  For special keys, the
@@ -194,7 +193,7 @@ CTRL-V		Insert next non-digit literally.
 		decimal, octal or hexadecimal value of a character
 		|i_CTRL-V_digit|.
 		The characters typed right after CTRL-V are not considered for
-		mapping.  {Vi: no decimal byte entry}
+		mapping.
 		Note: When CTRL-V is mapped (e.g., to paste text) you can
 		often use CTRL-Q instead |i_CTRL-Q|.

@@ -273,7 +272,6 @@ For backwards compatibility the values "
 If the 'backspace' option does contain "eol" and the cursor is in column 1
 when one of the three keys is used, the current line is joined with the
 previous line.  This effectively deletes the <EOL> in front of the cursor.
-{Vi: does not cross lines, does not delete past start position of insert}

 						*i_CTRL-V_digit*
 With CTRL-V the decimal, octal or hexadecimal value of a character can be
@@ -1815,15 +1813,13 @@ gi			Insert text in the same position as

 							*o*
 o			Begin a new line below the cursor and insert text,
-			repeat [count] times.  {Vi: blank [count] screen
-			lines}
+			repeat [count] times.
 			When the '#' flag is in 'cpoptions' the count is
 			ignored.

 							*O*
 O			Begin a new line above the cursor and insert text,
-			repeat [count] times.  {Vi: blank [count] screen
-			lines}
+			repeat [count] times.
 			When the '#' flag is in 'cpoptions' the count is
 			ignored.
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 8.1.  Last change: 2019 May 05
+*intro.txt*     For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -646,11 +646,7 @@ Ex		 :vi	  --	  --	 --	    --	      --
      the command.
    In the last case <Esc> may be the character defined with the 'wildchar'
    option, in which case it will start command-line completion.  You can
-   ignore that and type <Esc> again.  {Vi: when hitting <Esc> the command-line
-   is executed.  This is unexpected for most people; therefore it was changed
-   in Vim.  But when the <Esc> is part of a mapping, the command-line is
-   executed.  If you want the Vi behaviour also when typing <Esc>, use ":cmap
-   ^V<Esc> ^V^M"}
+   ignore that and type <Esc> again.
 *4 Go from Normal to Select mode by:
    - use the mouse to select text while 'selectmode' contains "mouse"
    - use a non-printable command to move the cursor while keeping the Shift
@@ -713,7 +709,6 @@ exceptions:
   character.
 - When inserting text in one window, other windows on the same text are not
   updated until the insert is finished.
-{Vi: The screen is not always updated on slow terminals}

 Lines longer than the window width will wrap, unless the 'wrap' option is off
 (see below).  The 'linebreak' option can be set to wrap at a blank character.
@@ -759,7 +754,6 @@ If there is a single line that is too lo
 special situation.  Vim will show only part of the line, around where the
 cursor is.  There are no special characters shown, so that you can edit all
 parts of this line.
-{Vi: gives an "internal error" on lines that do not fit in the window}

 The '@' occasion in the 'highlight' option can be used to set special
 highlighting for the '@' and '~' characters.  This makes it possible to
@@ -774,7 +768,7 @@ that is not shown, the screen is scrolle
 this method is that columns are shown as they are and lines that cannot fit
 on the screen can be edited.  The disadvantage is that you cannot see all the
 characters of a line at once.  The 'sidescroll' option can be set to the
-minimal number of columns to scroll.  {Vi: has no 'wrap' option}
+minimal number of columns to scroll.

 All normal ASCII characters are displayed directly on the screen.  The <Tab>
 is replaced with the number of spaces that it represents.  Other non-printing
@@ -806,16 +800,14 @@ command characters		'showcmd'	on	    off
 cursor position			'ruler'		off	    off

 The current mode is "-- INSERT --" or "-- REPLACE --", see |'showmode'|.  The
-command characters are those that you typed but were not used yet.  {Vi: does
-not show the characters you typed or the cursor position}
+command characters are those that you typed but were not used yet.

 If you have a slow terminal you can switch off the status messages to speed
 up editing:
 	:set nosc noru nosm

 If there is an error, an error message will be shown for at least one second
-(in reverse video).  {Vi: error messages may be overwritten with other
-messages before you have a chance to read them}
+(in reverse video).

 Some commands show how many lines were affected.  Above which threshold this
 happens can be controlled with the 'report' option (default 2).
@@ -828,7 +820,7 @@ Make it at least 40 characters wide to b
 last line.

 On most Unix systems, resizing the window is recognized and handled correctly
-by Vim.  {Vi: not ok}
+by Vim.

 ==============================================================================
 8. Definitions						*definitions*
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.1.  Last change: 2019 May 05
+*message.txt*   For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -798,7 +798,6 @@ and the screen is about to be redrawn:
    like pressing <Space>.  This makes it impossible to select text though.
 -> For the GUI clicking the left mouse button in the last line works like
    pressing <Space>.
-{Vi: only ":" commands are interpreted}

 If you accidentally hit <Enter> or <Space> and you want to see the displayed
 text then use |g<|.  This only works when 'more' is set.
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.1.  Last change: 2019 May 05
+*motion.txt*    For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -409,9 +409,7 @@ WORD before the fold.

 Special case: "cw" and "cW" are treated like "ce" and "cE" if the cursor is
 on a non-blank.  This is because "cw" is interpreted as change-word, and a
-word does not include the following white space.  {Vi: "cw" when on a blank
-followed by other blanks changes only the first blank; this is probably a
-bug, because "dw" deletes all the blanks}
+word does not include the following white space.

 Another special case: When using the "w" motion in combination with an
 operator and the last word moved over is at the end of a line, the end of
@@ -831,12 +829,12 @@ deletes the lines from the cursor positi
 Top, 'b' for Bottom, etc..  Lowercase marks are restored when using undo and
 redo.

-Uppercase marks 'A to 'Z include the file name.  {Vi: no uppercase marks} You
-can use them to jump from file to file.  You can only use an uppercase mark
-with an operator if the mark is in the current file.  The line number of the
-mark remains correct, even if you insert/delete lines or edit another file for
-a moment.  When the 'viminfo' option is not empty, uppercase marks are kept in
-the .viminfo file.  See |viminfo-file-marks|.
+Uppercase marks 'A to 'Z include the file name.  You can use them to jump from
+file to file.  You can only use an uppercase mark with an operator if the mark
+is in the current file.  The line number of the mark remains correct, even if
+you insert/delete lines or edit another file for a moment.  When the 'viminfo'
+option is not empty, uppercase marks are kept in the .viminfo file.  See
+|viminfo-file-marks|.

 Numbered marks '0 to '9 are quite different.  They can not be set directly.
 They are only present when using a viminfo file |viminfo-file|.  Basically '0
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.1.  Last change: 2019 May 05
+*options.txt*	For Vim version 8.1.  Last change: 2019 May 08


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -795,9 +795,6 @@ A jump table for the options with a shor
 	a different way.
 	The 'autoindent' option is reset when the 'paste' option is set and
 	restored when 'paste' is reset.
-	{small difference from Vi: After the indent is deleted when typing
-	<Esc> or <CR>, the cursor position when moving up or down is after the
-	deleted indent; Vi puts the cursor somewhere in the deleted indent}.

 				 *'autoread'* *'ar'* *'noautoread'* *'noar'*
 'autoread' 'ar'		boolean	(default off)
@@ -1121,7 +1118,8 @@ A jump table for the options with a shor
 			{only available when compiled with the |+balloon_eval|
 			feature}
 	Expression for text to show in evaluation balloon.  It is only used
-	when 'ballooneval' is on.  These variables can be used:
+	when 'ballooneval' or 'balloonevalterm' is on.  These variables can be
+	used:

 	v:beval_bufnr	number of the buffer in which balloon is going to show
 	v:beval_winnr	number of the window
@@ -1132,7 +1130,7 @@ A jump table for the options with a shor

 	The evaluation of the expression must not have side effects!
 	Example: >
-    function! MyBalloonExpr()
+    function MyBalloonExpr()
 	return 'Cursor is at line ' . v:beval_lnum .
 		\', column ' . v:beval_col .
 		\ ' of file ' .  bufname(v:beval_bufnr) .
@@ -2677,7 +2675,6 @@ A jump table for the options with a shor
 	uses another default.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
-	{Vi: directory to put temp file in, defaults to "/tmp"}

 					*'display'* *'dy'*
 'display' 'dy'		string	(default "", set to "truncate" in
@@ -4707,7 +4704,6 @@ A jump table for the options with a shor
 	"=" operator to use this same indentation algorithm rather than
 	calling an external program if 'equalprg' is empty.
 	This option is not used when 'paste' is set.
-	{Vi: Does it a little bit differently}

 						*'lispwords'* *'lw'*
 'lispwords' 'lw'	string	(default is very long)
@@ -6585,7 +6581,8 @@ A jump table for the options with a shor
 	  O	message for reading a file overwrites any previous message.
 		Also for quickfix message (e.g., ":cn").
 	  s	don't give "search hit BOTTOM, continuing at TOP" or "search
-		hit TOP, continuing at BOTTOM" messages
+		hit TOP, continuing at BOTTOM" messages; when using the search
+		count do not show "W" after the count message (see S below)
 	  t	truncate file message at the start if it is too long to fit
 		on the command-line, "<" will appear in the left most column.
 		Ignored in Ex mode.
@@ -7443,7 +7440,6 @@ A jump table for the options with a shor
 	must be included in the tags file.
 	This option doesn't affect commands that find all matching tags (e.g.,
 	command-line completion and ":help").
-	{Vi: always uses binary search in some versions}

 							*'tagcase'* *'tc'*
 'tagcase' 'tc'		string	(default "followic")
@@ -7507,7 +7503,6 @@ A jump table for the options with a shor
 	The use of |:set+=| and |:set-=| is preferred when adding or removing
 	file names from the list.  This avoids problems when a future version
 	uses another default.
-	{Vi: default is "tags /usr/lib/tags"}

 				*'tagstack'* *'tgst'* *'notagstack'* *'notgst'*
 'tagstack' 'tgst'	boolean	(default on)
@@ -8783,8 +8778,7 @@ A jump table for the options with a shor
 	When 'textwidth' is non-zero, this option is not used.
 	This option is set to 0 when 'paste' is set and restored when 'paste'
 	is reset.
-	See also 'formatoptions' and |ins-textwidth|.  {Vi: works differently
-	and less usefully}
+	See also 'formatoptions' and |ins-textwidth|.

 				   *'wrapscan'* *'ws'* *'nowrapscan'* *'nows'*
 'wrapscan' 'ws'		boolean	(default on)			*E384* *E385*
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 8.1.  Last change: 2014 Mar 27
+*recover.txt*   For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -131,7 +131,6 @@ command:
 			flag is present in 'cpoptions' the swap file will not
 			be deleted for this buffer when Vim exits and the
 			buffer is still loaded |cpo-&|.
-			{Vi: might also exit}

 A Vim swap file can be recognized by the first six characters: "b0VIM ".
 After that comes the version number, e.g., "3.0".
@@ -196,7 +195,6 @@ recovered file.  Or use |:DiffOrig|.
 Once you are sure the recovery is ok delete the swap file.  Otherwise, you
 will continue to get warning messages that the ".swp" file already exists.

-{Vi: recovers in another way and sends mail if there is something to recover}


 ENCRYPTION AND THE SWAP FILE				*:recover-crypt*
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 8.1.  Last change: 2019 May 05
+*repeat.txt*    For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -124,11 +124,11 @@ q{0-9a-zA-Z"}		Record typed characters i
 			used for |y| and |p| the result is most likely not
 			what is expected, because the put will paste the
 			recorded macro and the yank will overwrite the
-			recorded macro. {Vi: no recording}
+			recorded macro.

 q			Stops recording.  (Implementation note: The 'q' that
 			stops recording is not stored in the register, unless
-			it was the result of a mapping)  {Vi: no recording}
+			it was the result of a mapping)

 							*@*
 @{0-9a-z".=*+}		Execute the contents of register {0-9a-z".=*+} [count]
@@ -140,7 +140,7 @@ q			Stops recording.  (Implementation no
 			applies.
 			For "@=" you are prompted to enter an expression.  The
 			result of the expression is then executed.
-			See also |@:|.  {Vi: only named registers}
+			See also |@:|.

 							*@@* *E748*
 @@			Repeat the previous @{0-9a-z":*} [count] times.
@@ -158,8 +158,8 @@ q			Stops recording.  (Implementation no
 			result of evaluating the expression is executed as an
 			Ex command.
 			Mappings are not recognized in these commands.
-			{Vi: only in some versions} Future: Will execute the
-			register for each line in the address range.
+			Future: Will execute the register for each line in the
+			address range.

 							*:@:*
 :[addr]@:		Repeat last command-line.  First set cursor at line
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2151,8 +2151,8 @@ 90.5	usr_90.txt	/*90.5*
 :catch	eval.txt	/*:catch*
 :cb	quickfix.txt	/*:cb*
 :cbe	quickfix.txt	/*:cbe*
-:cbe	quickfix.txt	/*:cbe*
 :cbefore	quickfix.txt	/*:cbefore*
+:cbel	quickfix.txt	/*:cbel*
 :cbelow	quickfix.txt	/*:cbelow*
 :cbo	quickfix.txt	/*:cbo*
 :cbottom	quickfix.txt	/*:cbottom*
@@ -2518,7 +2518,7 @@ 90.5	usr_90.txt	/*90.5*
 :lat	undo.txt	/*:lat*
 :later	undo.txt	/*:later*
 :lb	quickfix.txt	/*:lb*
-:lbef	quickfix.txt	/*:lbef*
+:lbe	quickfix.txt	/*:lbe*
 :lbefore	quickfix.txt	/*:lbefore*
 :lbel	quickfix.txt	/*:lbel*
 :lbelow	quickfix.txt	/*:lbelow*
@@ -3367,6 +3367,8 @@ 90.5	usr_90.txt	/*90.5*
 :xnoremap	map.txt	/*:xnoremap*
 :xnoreme	gui.txt	/*:xnoreme*
 :xnoremenu	gui.txt	/*:xnoremenu*
+:xr	various.txt	/*:xr*
+:xrestore	various.txt	/*:xrestore*
 :xu	map.txt	/*:xu*
 :xunmap	map.txt	/*:xunmap*
 :xunme	gui.txt	/*:xunme*
@@ -3441,6 +3443,7 @@ 90.5	usr_90.txt	/*90.5*
 <F9>	term.txt	/*<F9>*
 <Help>	helphelp.txt	/*<Help>*
 <Home>	motion.txt	/*<Home>*
+<Ignore>	eval.txt	/*<Ignore>*
 <Insert>	insert.txt	/*<Insert>*
 <Leader>	map.txt	/*<Leader>*
 <Left>	motion.txt	/*<Left>*
@@ -5316,6 +5319,7 @@ backup-changed	version4.txt	/*backup-cha
 backup-extension	version4.txt	/*backup-extension*
 backup-table	editing.txt	/*backup-table*
 balloon-eval	debugger.txt	/*balloon-eval*
+balloon_gettext()	eval.txt	/*balloon_gettext()*
 balloon_show()	eval.txt	/*balloon_show()*
 balloon_split()	eval.txt	/*balloon_split()*
 bar	motion.txt	/*bar*
@@ -5590,6 +5594,7 @@ charconvert_to-variable	eval.txt	/*charc
 charity	uganda.txt	/*charity*
 charset	mbyte.txt	/*charset*
 charset-conversion	mbyte.txt	/*charset-conversion*
+chdir()	eval.txt	/*chdir()*
 chill.vim	syntax.txt	/*chill.vim*
 chmod	eval.txt	/*chmod*
 cindent()	eval.txt	/*cindent()*
@@ -6017,6 +6022,7 @@ encryption	editing.txt	/*encryption*
 end	intro.txt	/*end*
 end-of-file	pattern.txt	/*end-of-file*
 enlightened-terminal	syntax.txt	/*enlightened-terminal*
+environ()	eval.txt	/*environ()*
 erlang.vim	syntax.txt	/*erlang.vim*
 err_buf	channel.txt	/*err_buf*
 err_cb	channel.txt	/*err_cb*
@@ -6756,6 +6762,7 @@ getcmdwintype()	eval.txt	/*getcmdwintype
 getcompletion()	eval.txt	/*getcompletion()*
 getcurpos()	eval.txt	/*getcurpos()*
 getcwd()	eval.txt	/*getcwd()*
+getenv()	eval.txt	/*getenv()*
 getfontname()	eval.txt	/*getfontname()*
 getfperm()	eval.txt	/*getfperm()*
 getfsize()	eval.txt	/*getfsize()*
@@ -8544,6 +8551,7 @@ setbufline()	eval.txt	/*setbufline()*
 setbufvar()	eval.txt	/*setbufvar()*
 setcharsearch()	eval.txt	/*setcharsearch()*
 setcmdpos()	eval.txt	/*setcmdpos()*
+setenv()	eval.txt	/*setenv()*
 setfperm()	eval.txt	/*setfperm()*
 setline()	eval.txt	/*setline()*
 setloclist()	eval.txt	/*setloclist()*
@@ -9282,6 +9290,7 @@ text-prop-functions	textprop.txt	/*text-
 text-prop-intro	textprop.txt	/*text-prop-intro*
 text-properties	textprop.txt	/*text-properties*
 textlock	eval.txt	/*textlock*
+textprop	textprop.txt	/*textprop*
 textprop.txt	textprop.txt	/*textprop.txt*
 tf.vim	syntax.txt	/*tf.vim*
 this_session-variable	eval.txt	/*this_session-variable*
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 8.1.  Last change: 2019 May 05
+*tagsrch.txt*   For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -56,7 +56,6 @@ CTRL-]			Jump to the definition of the k
 			to the [count] one.  When no [count] is given the
 			first one is jumped to. See |tag-matchlist| for
 			jumping to other matching tags.
-			{Vi: identifier after the cursor}

 							*v_CTRL-]*
 {Visual}CTRL-]		Same as ":tag {name}", where {name} is the text that
@@ -421,7 +420,6 @@ In a future version changing the buffer
 security reasons: Somebody might hide a nasty command in the tags file, which
 would otherwise go unnoticed.  Example: >
 	:$d|/tag-function-name/
-{this security prevention is not present in Vi}

 In Vi the ":tag" command sets the last search pattern when the tag is searched
 for.  In Vim this is not done, the previous search pattern is still remembered,
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 8.1.  Last change: 2019 Apr 11
+*term.txt*      For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -249,9 +249,6 @@ It is always possible to change individu
 appropriate option.  For example: >
 	:set t_ce=^V^[[K	(CTRL-V, <Esc>, [, K)

-{Vi: no terminal options.  You have to exit Vi, edit the termcap entry and
-try again}
-
 The options are listed below.  The associated termcap code is always equal to
 the last two characters of the option name.  Only one termcap code is
 required: Cursor motion, 't_cm'.
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -1,10 +1,10 @@
-*textprop.txt*  For Vim version 8.1.  Last change: 2019 May 05
+*textprop.txt*  For Vim version 8.1.  Last change: 2019 May 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar


-Displaying text with properties attached.		*text-properties*
+Displaying text with properties attached.	*textprop* *text-properties*

 THIS IS UNDER DEVELOPMENT - ANYTHING MAY STILL CHANGE  *E967*

@@ -132,10 +132,10 @@ When using replace mode, the text proper
 positions, even though the characters themselves change.


-When text property columns are not updated ~
+Text property columns are not updated: ~

 - When setting the line with |setline()| or through an interface, such as Lua,
-  Tcl or Python.
+  Tcl or Python.  Vim does not know what text got inserted or deleted.


  vim:tw=78:ts=8:noet:ft=help:norl:
--- 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 05
+*todo.txt*      For Vim version 8.1.  Last change: 2019 May 09


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -155,6 +155,9 @@ be adjusted. (Daniel Steinberg, 2019 Feb
 Bug: "vipgw" does not put cursor back where it belongs. (Jason Franklin, 2019
 Mar 5)

+Add a way to create an empty, hidden buffer.  Like doing ":new|hide".
+":let buf = bufcreate('name')
+
 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.
@@ -176,13 +179,6 @@ negative. (see #4326)
 tab page. (Ingo Karkat, #4324)
 :call settabwinvar(1, 1, '&cmdheight', 2) also doesn't work well.

-Add a chdir() function, which will set the window-local, tab-local or global
-directory, first one that is currently used.  Returns the current directory,
-so that this works:
-    let save_dir = chdir('somewhere')
-    ...
-    call chdir(save_dir)
-
 This modeline throws unexpected errors: (#4165)
     vim: syn=nosyntax

@@ -271,13 +267,10 @@ when possible. (Dylan Lloyd, #3973)
 Make ":interactive !cmd" stop termcap mode, also when used in an autocommand.
 (#3692)

-Patch to add environ(), gets a dict with all environment vars, and getenv(),
-useful for environment vars that are not made of keyword chars.
-(Yasuhiro Matsumoto, #2875)
-
 Add buffer argument to undotree(). (#4001)

-Patch to restore X11 connection. (#844)
+Patch to fix that Normal is not defined when not compiled with GUI.
+(Christian Brabandt, 2019 May 7, on issue #4072)

 Patch to add optional arguments with default values.
 (Andy Massimino, #3952)  Needs to be reviewed.
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 8.1.  Last change: 2019 May 05
+*undo.txt*      For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -19,26 +19,24 @@ 6. Remarks about undo		|undo-remarks|
 1. Undo and redo commands				*undo-commands*

 <Undo>		or					*undo* *<Undo>* *u*
-u			Undo [count] changes.  {Vi: only one level}
+u			Undo [count] changes.

 							*:u* *:un* *:undo*
-:u[ndo]			Undo one change.  {Vi: only one level}
+:u[ndo]			Undo one change.
 								*E830*
 :u[ndo] {N}		Jump to after change number {N}.  See |undo-branches|
 			for the meaning of {N}.

 							*CTRL-R*
-CTRL-R			Redo [count] changes which were undone.  {Vi: redraw
-			screen}
+CTRL-R			Redo [count] changes which were undone.

 							*:red* *:redo* *redo*
-:red[o]			Redo one change which was undone.  {Vi: no redo}
+:red[o]			Redo one change which was undone.

 							*U*
 U			Undo all latest changes on one line, the line where
 			the latest change was made. |U| itself also counts as
 			a change, and thus |U| undoes a previous |U|.
-			{Vi: while not moved off of the last modified line}

 The last changes are remembered.  You can use the undo and redo commands above
 to revert the text to how it was before each change.  You can also apply the
--- 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 04
+*usr_41.txt*	For Vim version 8.1.  Last change: 2019 May 09

 		     VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.1.  Last change: 2019 May 05
+*various.txt*   For Vim version 8.1.  Last change: 2019 May 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 8.1.  Last change: 2019 May 05
+*vi_diff.txt*   For Vim version 8.1.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -293,6 +293,12 @@ Command-line editing and history.			|cmd
 	forward/backward one character.  The shifted right/left cursor keys
 	can be used to move forward/backward one word.  CTRL-B/CTRL-E can be
 	used to go to the begin/end of the command-line.
+	{Vi: can only alter the last character in the line}
+	{Vi: when hitting <Esc> the command-line is executed.  This is
+	unexpected for most people; therefore it was changed in Vim.  But when
+	the <Esc> is part of a mapping, the command-line is executed.  If you
+	want the Vi behaviour also when typing <Esc>, use ":cmap ^V<Esc>
+	^V^M"}
 							|cmdline-history|
 	The command-lines are remembered.  The up/down cursor keys can be used
 	to recall previous command-lines.  The 'history' option can be set to
@@ -540,6 +546,8 @@ The 'tags' option can be set to a list o
 tag files can be used.  For file names that start with "./", the "./" is
 replaced with the path of the current file.  This makes it possible to use a
 tags file in the same directory as the file being edited.
+{Vi: always uses binary search in some versions}
+{Vi does not have the security prevention for commands in tag files}

 Previously used file names are remembered in the alternate file name list.
 CTRL-^ accepts a count, which is an index in this list.
@@ -577,6 +585,8 @@ one space after a period (Vi inserts two

 "cw" can be used to change white space formed by several characters (Vi is
 confusing: "cw" only changes one space, while "dw" deletes all white space).
+{Vi: "cw" when on a blank followed by other blanks changes only the first
+blank; this is probably a bug, because "dw" deletes all the blanks}

 "o" and "O" accept a count for repeating the insert (Vi clears a part of
 display).
@@ -645,7 +655,7 @@ of the window.
 Uppercase marks can be used to jump between files.  The ":marks" command lists
 all currently set marks.  The commands "']" and "`]" jump to the end of the
 previous operator or end of the text inserted with the put command.  "'[" and
-"`[" do jump to the start.
+"`[" do jump to the start. {Vi: no uppercase marks}

 The 'shelltype' option can be set to reflect the type of shell used on the
 Amiga.
@@ -790,14 +800,16 @@ filesystem under Unix.  See |'shortname'
 Error messages are shown at least one second (Vi overwrites error messages).

 If Vim gives the |hit-enter| prompt, you can hit any key.  Characters other
-than <CR>, <NL> and <Space> are interpreted as the (start of) a command.  (Vi
-only accepts a command starting with ':').
+than <CR>, <NL> and <Space> are interpreted as the (start of) a command.
+{Vi: only ":" commands are interpreted}

 The contents of the numbered and unnamed registers is remembered when
 changing files.

 The "No lines in buffer" message is a normal message instead of an error
 message, since that may cause a mapping to be aborted.
+{Vi: error messages may be overwritten with other messages before you have a
+chance to read them}

 The AUX: device of the Amiga is supported.

@@ -826,28 +838,30 @@ The following Ex commands are supported
 `:copy`		copy lines
 `:delete`	delete lines
 `:edit`		edit a file
-`:exit`		same as ":xit"
+`:exit`		same as `:xit`
 `:file`		show or set the current file name; Vi: without the column number
 `:global`	execute commands for matching lines
 `:insert`	insert text
 `:join`		join lines; Vi: not :join!
 `:k`		set a mark
 `:list`		print lines
-`:map` 		show or enter a mapping
+`:map`		show or enter a mapping
 `:mark`		set a mark
 `:move`		move lines
-`:Next`		go to previous file in the argument list; no count or ++opt
-`:next`		go to next file in the argument list; no count or ++opt
+`:Next`		go to previous file in the argument list {Vi: no count}
+`:next`		go to next file in the argument list {Vi: no count}
 `:number`	print lines with line number
 `:open`		start open mode (not implemented in Vim)
 `:pop`		jump to older entry in tag stack (only in some versions)
-`:preserve`	write all text to swap file
+`:preserve`	write all text to swap file {Vi: might also exit}
+`:previous`	same as `:Next` {Vi: only in some versions}
 `:print`	print lines
 `:put`		insert contents of register in the text
 `:quit`		quit Vi
 `:read`		read file into the text
-`:recover`	recover a file from a swap file
-`:rewind` 	go to the first file in the argument list; no ++opt
+`:recover`	recover a file from a swap file {Vi: recovers in another way
+		and sends mail if there is something to recover}
+`:rewind`	go to the first file in the argument list; no ++opt
 `:set`		set option; but not `:set inv{option}`, `:set option&`,
 		`:set all&`, `:set option+=value`, `:set option^=value`
 		`:set option-=value` `:set option<`
@@ -870,7 +884,7 @@ The following Ex commands are supported
 `:xit`		write if buffer changed and quit Vi
 `:yank`		yank lines into a register
 `:z`		print some lines {not in all versions of Vi}
-`:!` 		filter lines or execute an external command
+`:!`		filter lines or execute an external command
 `:"`		comment
 `:#`		same as ":number"
 `:*`		execute contents of a register
@@ -881,6 +895,9 @@ The following Ex commands are supported
 `:@`		execute contents of a register; but not `:@`; `:@@` only in
 		some versions

+Common for these commands is that Vi doesn't support the ++opt argument on
+`:edit` and other commands that open a file.
+

 The following Normal mode commands are supported by Vi: ~

@@ -906,8 +923,8 @@ The following Normal mode commands are s
 |CTRL-U|	N lines Upwards (default: half a screen)
 |CTRL-Y|	scroll N lines downwards
 |CTRL-Z|	suspend program (or start new shell)
-|CTRL-]|	:ta to ident under cursor
-|CTRL-^|	edit alternate file; Vi: no count
+|CTRL-]|	:ta to ident under cursor {Vi: identifier after the cursor}
+|CTRL-^|	edit alternate file {Vi: no count}
 |<Space>|	same as "l"
 |!|		filter Nmove text through the {filter} command
 |!!|		filter N lines through the {filter} command
@@ -937,6 +954,7 @@ The following Normal mode commands are s
 |>>|		shift N lines one 'shiftwidth' rightwards
 |?|		search backward for the Nth previous occurrence of {pattern}
 |@|		execute the contents of register {a-z} N times
+		{Vi: only named registers}
 |@@|		repeat the previous @{a-z} N times
 |A|		append text after the end of the line N times
 |B|		cursor N WORDS backward
@@ -953,8 +971,9 @@ The following Normal mode commands are s
 |M|		cursor to middle line of screen
 |N|		repeat the latest '/' or '?' N times in opposite direction
 |O|		begin a new line above the cursor and insert text, repeat N
-		times
+		times {Vi: blank [count] screen lines}
 |P|		put the text [from register x] before the cursor N times
+		{Vi: no count}
 |Q|		switch to "Ex" mode
 |R|		enter replace mode: overtype existing characters, repeat the
 		entered text N-1 times
@@ -962,6 +981,7 @@ The following Normal mode commands are s
 		"cc".
 |T|		cursor till after Nth occurrence of {char} to the left
 |U|		undo all latest changes on one line
+		{Vi: while not moved off of the last modified line}
 |W|		cursor N WORDS forward
 |X|		delete N characters before the cursor [into register x]
 |Y|		yank N lines [into register x]; synonym for "yy"
@@ -987,8 +1007,11 @@ The following Normal mode commands are s
 |m|		set mark {A-Za-z} at cursor position
 |n|		repeat the latest '/' or '?' N times
 |o|		begin a new line below the cursor and insert text
+		{Vi: blank [count] screen lines}
 |p|		put the text [from register x] after the cursor N times
-|r|		replace N chars with {char}
+		{Vi: no count}
+|r|		replace N chars with {char} {Vi: CTRL-V <CR> still replaces
+		with a line break, cannot replace something with a <CR>}
 |s|		(substitute) delete N characters [into register x] and start
 		insert
 |t|		cursor till before Nth occurrence of {char} to the right
@@ -1006,17 +1029,21 @@ The following Normal mode commands are s
 |		cursor to column N
 |}|		cursor N paragraphs forward
 |~|		switch case of N characters under the cursor; Vim: depends on
-		'tildeop'
+		'tildeop' {Vi: no count, no 'tildeop'}
 |<Del>|		same as "x"


 The following commands are supported in Insert mode by Vi: ~

 CTRL-@		insert previously inserted text and stop insert
+		{Vi: only when typed as first char, only up to 128 chars}
 CTRL-C		quit insert mode, without checking for abbreviation, unless
 		'insertmode' set.
 CTRL-D		delete one shiftwidth of indent in the current line
-<BS>		delete character before the cursor
+		{Vi: CTRL-D works only when used after autoindent}
+<BS>		delete character before the cursor {Vi: does not delete
+		autoindents, does not cross lines, does not delete past start
+		position of insert}
 CTRL-H		same as <BS>
 <Tab>		insert a <Tab> character
 CTRL-I		same as <Tab>
@@ -1024,8 +1051,9 @@ CTRL-I		same as <Tab>
 CTRL-J		same as <CR>
 <CR>		begin new line
 CTRL-M		same as <CR>
-CTRL-T		insert one shiftwidth of indent in current line
-CTRL-V {char}	insert next non-digit literally
+CTRL-T		insert one shiftwidth of indent in current line {Vi: only when
+		in indent}
+CTRL-V {char}	insert next non-digit literally {Vi: no decimal byte entry}
 CTRL-W		delete word before the cursor
 CTRL-Z		when 'insertmode' set: suspend Vim
 <Esc>		end insert mode (unless 'insertmode' set)
@@ -1039,13 +1067,21 @@ 0 CTRL-D	delete all indent in the curren
 The following options are supported by Vi: ~

 'autoindent'	  'ai'	    take indent for new line from previous line
+			    {Vi does this slightly differently: After the
+			    indent is deleted when typing <Esc> or <CR>, the
+			    cursor position when moving up or down is after
+			    the deleted indent; Vi puts the cursor somewhere
+			    in the deleted indent}.
 'autowrite'	  'aw'	    automatically write file if changed
 'directory'	  'dir'     list of directory names for the swap file
+			    {Vi: directory to put temp file in, defaults to
+			    "/tmp"}
 'edcompatible'	  'ed'	    toggle flags of ":substitute" command
 'errorbells'	  'eb'	    ring the bell for error messages
 'ignorecase'	  'ic'	    ignore case in search patterns
 'lines'			    number of lines in the display
-'lisp'			    automatic indenting for Lisp
+'lisp'			    automatic indenting for Lisp {Vi: Does it a little
+			    bit differently}
 'list'			    show <Tab> and <EOL>
 'magic'			    changes special characters in search patterns
 'modeline'	  'ml'	    recognize 'modelines' at start or end of file
@@ -1066,6 +1102,7 @@ The following options are supported by V
 'tabstop'	  'ts'	    number of spaces that <Tab> in file uses
 'taglength'	  'tl'	    number of significant characters for a tag
 'tags'		  'tag'     list of file names used by the tag command
+			    {Vi: default is "tags /usr/lib/tags"}
 'tagstack'	  'tgst'    push tags onto the tag stack {not in all versions
 				of Vi}
 'term'			    name of the terminal
@@ -1080,6 +1117,7 @@ The following options are supported by V
 			    {Vi also uses the option to specify the number of
 			    displayed lines}
 'wrapmargin'	  'wm'	    chars from the right where wrapping starts
+			    {Vi: works differently and less usefully}
 'wrapscan'	  'ws'	    searches wrap around the end of the file
 'writeany'	  'wa'	    write to file with no need for "!" override
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Apr 19
+" Last Change:	2019 May 06

 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
new file mode 100644
--- /dev/null
+++ b/runtime/ftplugin/nroff.vim
@@ -0,0 +1,11 @@
+" Vim filetype plugin
+" Language:	roff(7)
+" Maintainer:	Chris Spiegel <cspiegel@gmail.com>
+" Last Change:	2019 Apr 24
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=.\\\"%s
--- a/runtime/ftplugin/ocaml.vim
+++ b/runtime/ftplugin/ocaml.vim
@@ -372,8 +372,8 @@ endfunction
   endfun

   " This variable contain a dictionnary of list. Each element of the dictionnary
-  " represent an annotation system. An annotation system is a list with :
-  " - annotation file name as it's key
+  " represent an annotation system. An annotation system is a list with:
+  " - annotation file name as its key
   " - annotation file path as first element of the contained list
   " - build path as second element of the contained list
   " - annot_file_last_mod (contain the date of .annot file) as third element
--- a/runtime/ftplugin/sql.vim
+++ b/runtime/ftplugin/sql.vim
@@ -400,7 +400,7 @@ endif

 " Predefined SQL objects what are used by the below mappings using
 " the ]} style maps.
-" This global variable allows the users to override it's value
+" This global variable allows the users to override its value
 " from within their vimrc.
 " Note, you cannot use \?, since these patterns can be used to search
 " backwards, you must use \{,1}
@@ -486,10 +486,10 @@ if exists('&omnifunc')
     " OMNI function prior to setting up the SQL OMNI function
     let b:sql_compl_savefunc = &omnifunc

-    " Source it to determine it's version
+    " Source it to determine its version
     runtime autoload/sqlcomplete.vim
     " This is used by the sqlcomplete.vim plugin
-    " Source it for it's global functions
+    " Source it for its global functions
     runtime autoload/syntaxcomplete.vim

     setlocal omnifunc=sqlcomplete#Complete
--- a/runtime/gvim.desktop
+++ b/runtime/gvim.desktop
@@ -6,14 +6,15 @@ Name[de]=GVim
 Name=GVim
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
+GenericName[ja]=テキストエディタ
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
 Comment[de]=Textdateien bearbeiten
+Comment[ja]=テキストファイルを編集します
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
 # be overwritten by the po file when generating the desktop.file!
 GenericName[da]=Teksteditor
-GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
 GenericName[fr]=Éditeur de texte
 GenericName[pl]=Edytor tekstu
@@ -30,7 +31,6 @@ Comment[ca]=Edita fitxers de text
 Comment[cs]=Úprava textových souborů
 Comment[cy]=Golygu ffeiliau testun
 Comment[da]=Rediger tekstfiler
-Comment[de]=Textdateien bearbeiten
 Comment[el]=Επεξεργασία αρχείων κειμένου
 Comment[en_CA]=Edit text files
 Comment[en_GB]=Edit text files
@@ -50,7 +50,6 @@ Comment[hu]=Szövegfájlok szerkesztése
 Comment[id]=Edit file teks
 Comment[is]=Vinna með textaskrár
 Comment[it]=Modifica file di testo
-Comment[ja]=テキストファイルを編集します
 Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
 Comment[ko]=텍스트 파일을 편집합니다
 Comment[lt]=Redaguoti tekstines bylas
@@ -93,6 +92,7 @@ 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[ja]=テキスト;エディタ;
 Keywords=Text;editor;
 # Translators: This is the Icon file name. Do NOT translate
 Icon[de]=gvim
--- a/runtime/indent/awk.vim
+++ b/runtime/indent/awk.vim
@@ -47,7 +47,7 @@ endif

 function! GetAwkIndent()

-   " Find previous line and get it's indentation
+   " Find previous line and get its indentation
    let prev_lineno = s:Get_prev_line( v:lnum )
    if prev_lineno == 0
       return 0
--- a/runtime/indent/mma.vim
+++ b/runtime/indent/mma.vim
@@ -57,7 +57,7 @@ function GetMmaIndent()
     if getline(v:lnum) =~ '[^[]*]\s*$'
         " move to the closing bracket
         call search(']','bW')
-        " and find it's partner's indent
+        " and find its partner's indent
         let ind = indent(searchpair('\[','',']','bWn'))
     " same for ( blocks
     elseif getline(v:lnum) =~ '[^(]*)$'
--- a/runtime/indent/rmd.vim
+++ b/runtime/indent/rmd.vim
@@ -39,7 +39,7 @@ endfunction
 function s:GetYamlIndent()
   let pline = getline(v:lnum - 1)
   if pline =~ ':\s*$'
-    return indent(v:lnum) + &sw
+    return indent(v:lnum) + shiftwidth()
   elseif pline =~ '^\s*- '
     return indent(v:lnum) + 2
   endif
--- a/runtime/indent/sh.vim
+++ b/runtime/indent/sh.vim
@@ -3,10 +3,12 @@
 " Maintainer:          Christian Brabandt <cb@256bit.org>
 " Original Author:     Nikolai Weibull <now@bitwi.se>
 " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
-" Latest Revision:     2019-03-25
+" Latest Revision:     2019-04-27
 " License:             Vim (see :h license)
 " Repository:          https://github.com/chrisbra/vim-sh-indent
 " Changelog:
+"          20190428  - De-indent fi correctly when typing with
+"                      https://github.com/chrisbra/vim-sh-indent/issues/15
 "          20190325  - Indent fi; correctly
 "                      https://github.com/chrisbra/vim-sh-indent/issues/14
 "          20190319  - Indent arrays (only zsh and bash)
@@ -127,7 +129,7 @@ function! GetShIndent()
   " Current line is a endif line, so get indent from start of "if condition" line
   " TODO: should we do the same for other "end" lines?
   if curline =~ '^\s*\%(fi\);\?\s*\%(#.*\)\=$'
-    let previous_line = searchpair('\<if\>', '', '\<fi\>', 'bnW')
+    let previous_line = searchpair('\<if\>', '', '\<fi\>\zs', 'bnW')
     if previous_line > 0
       let ind = indent(previous_line)
     endif
--- a/runtime/pack/dist/opt/matchit/doc/matchit.txt
+++ b/runtime/pack/dist/opt/matchit/doc/matchit.txt
@@ -4,7 +4,7 @@ For instructions on installing this file
 	`:help matchit-install`
 inside Vim.

-For Vim version 8.1.  Last change:  2019 Jan 28
+For Vim version 8.1.  Last change:  2019 May 05


 		  VIM REFERENCE MANUAL    by Benji Fisher et al
@@ -20,8 +20,6 @@ 5. Known Bugs and Limitations				|matchi
 The functionality mentioned here is a plugin, see |add-plugin|.
 This plugin is only available if 'compatible' is not set.

-{Vi does not have any of this}
-
 ==============================================================================
 1. Extended matching with "%"				*matchit-intro*
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Feb 11
+" Last Change:	2019 Apr 23

 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -289,6 +289,22 @@ if !exists("c_no_c11")
   syn keyword	cOperator	_Static_assert static_assert
   syn keyword	cStorageClass	_Thread_local thread_local
   syn keyword   cType		char16_t char32_t
+  " C11 atomics (take down the shield wall!)
+  syn keyword	cType		atomic_bool atomic_char atomic_schar atomic_uchar
+  syn keyword	Ctype		atomic_short atomic_ushort atomic_int atomic_uint
+  syn keyword	cType		atomic_long atomic_ulong atomic_llong atomic_ullong
+  syn keyword	cType		atomic_char16_t atomic_char32_t atomic_wchar_t
+  syn keyword	cType		atomic_int_least8_t atomic_uint_least8_t
+  syn keyword	cType		atomic_int_least16_t atomic_uint_least16_t
+  syn keyword	cType		atomic_int_least32_t atomic_uint_least32_t
+  syn keyword	cType		atomic_int_least64_t atomic_uint_least64_t
+  syn keyword	cType		atomic_int_fast8_t atomic_uint_fast8_t
+  syn keyword	cType		atomic_int_fast16_t atomic_uint_fast16_t
+  syn keyword	cType		atomic_int_fast32_t atomic_uint_fast32_t
+  syn keyword	cType		atomic_int_fast64_t atomic_uint_fast64_t
+  syn keyword	cType		atomic_intptr_t atomic_uintptr_t
+  syn keyword	cType		atomic_size_t atomic_ptrdiff_t
+  syn keyword	cType		atomic_intmax_t atomic_uintmax_t
 endif

 if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2019 Jan 26
+" Last Change: 2019 Apr 21
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim

 " Standard syntax initialization
@@ -21,7 +21,7 @@ let s:binNMU='binary-only=yes'
 syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
 exe 'syn match debchangelogFirstKV	contained "; \('.s:urgency.'\|'.s:binNMU.'\)"'
 exe 'syn match debchangelogOtherKV	contained ", \('.s:urgency.'\|'.s:binNMU.'\)"'
-syn match debchangelogTarget	contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|%(wheezy|jessie)%(-backports%(-sloppy)=|-security)=|stretch%(-backports|-security)=|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
+syn match debchangelogTarget	contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(squeeze|wheezy|jessie)-%(backports%(-sloppy)=|lts|security)|stretch%(-backports%(-sloppy)=|-security)=|buster%(-backports|-security)=|bullseye|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|eoan)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
 syn match debchangelogVersion	contained "(.\{-})"
 syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
 syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2018 Oct 30
+" Last Change: 2019 Apr 21
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim

 " Standard syntax initialization
@@ -23,9 +23,10 @@ let s:cpo = &cpo
 set cpo-=C
 let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-      \ 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
+      \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
+      \ 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'cosmic', 'disco', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'cosmic', 'disco', 'eoan', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
--- a/runtime/syntax/rmd.vim
+++ b/runtime/syntax/rmd.vim
@@ -1,7 +1,7 @@
 " markdown Text with R statements
 " Language: markdown with R code chunks
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change: Sat Aug 25, 2018  03:44PM
+" Last Change: Thu Apr 18, 2019  09:17PM
 "
 "   For highlighting pandoc extensions to markdown like citations and TeX and
 "   many other advanced features like folding of markdown sections, it is
@@ -54,14 +54,14 @@ runtime syntax/markdown.vim
 " Now highlight chunks:
 for s:type in g:rmd_fenced_languages
   if s:type =~ '='
-    let s:lng = substitute(s:type, '=.*', '')
-    let s:nm  = substitute(s:type, '.*=', '')
+    let s:ft = substitute(s:type, '.*=', '', '')
+    let s:nm = substitute(s:type, '=.*', '', '')
   else
-    let s:lng = s:type
+    let s:ft = s:type
     let s:nm  = s:type
   endif
   unlet! b:current_syntax
-  exe 'syn include @Rmd'.s:nm.' syntax/'.s:lng.'.vim'
+  exe 'syn include @Rmd'.s:nm.' syntax/'.s:ft.'.vim'
   if g:rmd_syn_hl_chunk
     exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@Rmd'.s:nm
     exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@Rmd'.s:nm
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -3,7 +3,7 @@
 " Language:    SPEC: Build/install scripts for Linux RPM packages
 " Maintainer:  Igor Gnatenko i.gnatenko.brain@gmail.com
 " Former Maintainer:  Donovan Rebbechi elflord@panix.com (until March 2014)
-" Last Change: 2019 Feb 12
+" Last Change: 2019 May 07

 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -86,9 +86,9 @@ syn region specSectionMacroBracketArea o
 "%% Files Section %%
 "TODO %config valid parameters: missingok\|noreplace
 "TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
-syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\|exclude\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
 "tip: remember to include new itens in specFilesArea above
-syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\)\>'
+syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\|exclude\)\>'

 "valid options for certain section headers
 syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1
new file mode 100644
--- /dev/null
+++ b/runtime/syntax/template.vim
@@ -0,0 +1,15 @@
+" Vim syntax file
+" Language:	Generic template
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2019 May 06
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Known template types are very similar to HTML, E.g. golang and "Xfire User
+" Interface Template"
+" If you know how to recognize a more specific type for *.tmpl suggest a
+" change to runtime/scripts.vim.
+runtime! syntax/html.vim
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -23,8 +23,8 @@ syn keyword vimCommand contained	a arga[
 syn keyword vimCommand contained	ab argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] caddf[ile] ccl[ose] cfdo chd[ir] cle[arjumps] co[py] con[tinue] cr[ewind] d[elete] deletel delm[arks] diffo[ff] dir dp earlier elsei[f] endw[hile] files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] iuna[bbrev] keepalt la[st] later lcs lf[ile] lgr[ep] lli[st] lo[adview] lop[en] lua m[ove] mes mkvie[w] nbc[lose] noautocmd nu[mber] opt[ions] pc[lose] popu[p] prof[ile] ptN[ext] ptn[ext] pw[d] pyf[ile] pyxfile rec[over] reg[isters] ri[ght] rubyf[ile] sIe sIr sav[eas] sbl[ast] sc scl scscope sf[ind] sge sgr sig sip sm[ap] sno[magic] sp[lit] spellu[ndo] src srn startg[replace] sun[hide] sw[apname] syntime tabN[ext] tabfir[st] tabo[nly] tc[l] tf[irst] tma[p] tp[revious] tunma[p] unh[ide] v vie[w] vne[w] wh[ile] wn[ext] wundo xme xunme
 syn keyword vimCommand contained	abc[lear] argdo au bel[owright] bp[revious] bro[wse] cNf[ile] cal[l] cd cfir[st] che[ckpath] clo[se] col[der] conf[irm] cs debug deletep delp diffp[atch] dj[ump] dr[op] ec em[enu] ene[w] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] j[oin] keepj[umps] lad[dexpr] lb[uffer] lcscope lfdo lgrepa[dd] lmak[e] loadk lp[revious] luado ma[rk] messages mod[e] nbs[tart] noh[lsearch] o[pen] ownsyntax pe[rl] pp[op] profd[el] pta[g] ptp[revious] py3 python3 q[uit] red[o] res[ize] rightb[elow] rundo sIg sN[ext] sbN[ext] sbm[odified] scI scp se[t] sfir[st] sgi sh[ell] sign sir sme snoreme spe[llgood] spellw[rong] sre[wind] srp startr[eplace] sunme sy t tabc[lose] tabl[ast] tabp[revious] tcld[o] th[row] tmapc[lear] tr[ewind] u[ndo] unl ve[rsion] vim[grep] vs[plit] win[size] wp[revious] wv[iminfo] xmenu xunmenu
 syn keyword vimCommand contained	abo[veleft] arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] cat[ch] cdo cg[etfile] checkt[ime] cmapc[lear] colo[rscheme] cope[n] cscope debugg[reedy] deletl dep diffpu[t] dl ds[earch] echoe[rr] en[dif] ex filetype fix[del] for gui helpg[rep] ia in ju[mps] keepp[atterns] laddb[uffer] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mk[exrc] mz[scheme] new nor ol[dfiles] p[rint] ped[it] pre[serve] promptf[ind] ptf[irst] ptr[ewind] py3do pythonx qa[ll] redi[r] ret[ab] ru[ntime] rv[iminfo] sIl sa[rgument] sb[uffer] sbn[ext] sce scr[iptnames] setf[iletype] sg sgl si sil[ent] sl[eep] smenu snoremenu spelld[ump] spr[evious] srg st[op] stj[ump] sunmenu syn tN[ext] tabd[o] tabm[ove] tabr[ewind] tclf[ile] tj[ump] tn[ext] try una[bbreviate] unlo[ckvar] verb[ose] vimgrepa[dd] wN[ext] winc[md] wq x[it] xnoreme xwininfo
-syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] intro k lN[ext] laddf[ile] lc[d] le[ft] lg[etfile] lhi[story] lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] nmapc[lear] nore omapc[lear] pa[ckadd] perld[o] prev[ious] promptr[epl] ptj[ump] pts[elect] py[thon] pyx quita[ll] redr[aw] retu[rn] rub[y] sI sIn sal[l] sba[ll] sbp[revious] scg scripte[ncoding] setg[lobal] sgI sgn sic sim[alt] sla[st] smile so[urce] spelli[nfo] sr sri sta[g] stopi[nsert] sus[pend] sync ta[g] tabe[dit] tabn[ext] tabs te[aroff] tl[ast] tno[remap] ts[elect] undoj[oin] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank]
-syn keyword vimCommand contained	ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi if is[earch] kee[pmarks] lNf[ile] lan[guage] lch[dir] lefta[bove] lgetb[uffer] ll lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell] n[ext]
+syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] intro k lN[ext] laddf[ile] lc[d] le[ft] lg[etfile] lhi[story] lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] nmapc[lear] nore omapc[lear] pa[ckadd] perld[o] prev[ious] promptr[epl] ptj[ump] pts[elect] py[thon] pyx quita[ll] redr[aw] retu[rn] rub[y] sI sIn sal[l] sba[ll] sbp[revious] scg scripte[ncoding] setg[lobal] sgI sgn sic sim[alt] sla[st] smile so[urce] spelli[nfo] sr sri sta[g] stopi[nsert] sus[pend] sync ta[g] tabe[dit] tabn[ext] tabs tcd te[aroff] tl[ast] tno[remap] ts[elect] undoj[oin] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank]
+syn keyword vimCommand contained	ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi if is[earch] kee[pmarks] lNf[ile] lan[guage] lch[dir] lefta[bove] lgetb[uffer] ll lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell] n[ext] tch[dir]
 syn match   vimCommand contained	"\<z[-+^.=]\=\>"
 syn keyword vimStdPlugin contained	Arguments Break Clear Continue DiffOrig Evaluate Finish Gdb Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Winbar XMLent XMLns
--- a/runtime/vim.desktop
+++ b/runtime/vim.desktop
@@ -6,14 +6,15 @@ Name[de]=Vim
 Name=Vim
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
+GenericName[ja]=テキストエディタ
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
 Comment[de]=Textdateien bearbeiten
+Comment[ja]=テキストファイルを編集します
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
 # be overwritten by the po file when generating the desktop.file.
 GenericName[da]=Teksteditor
-GenericName[de]=Texteditor
 GenericName[pl]=Edytor tekstu
 GenericName[is]=Ritvinnsluforrit
 Comment[af]=Redigeer tekslêers
@@ -28,7 +29,6 @@ Comment[ca]=Edita fitxers de text
 Comment[cs]=Úprava textových souborů
 Comment[cy]=Golygu ffeiliau testun
 Comment[da]=Rediger tekstfiler
-Comment[de]=Textdateien bearbeiten
 Comment[el]=Επεξεργασία αρχείων κειμένου
 Comment[en_CA]=Edit text files
 Comment[en_GB]=Edit text files
@@ -47,7 +47,6 @@ Comment[hu]=Szövegfájlok szerkesztése
 Comment[id]=Edit file teks
 Comment[is]=Vinna með textaskrár
 Comment[it]=Modifica file di testo
-Comment[ja]=テキストファイルを編集します
 Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
 Comment[ko]=텍스트 파일을 편집합니다
 Comment[lt]=Redaguoti tekstines bylas
@@ -90,6 +89,7 @@ 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[ja]=テキスト;エディタ;
 Keywords=Text;editor;
 # Translators: This is the Icon file name. Do NOT translate
 Icon[de]=gvim
--- a/src/po/af.po
+++ b/src/po/af.po
@@ -240,7 +240,7 @@ msgstr " Sleutelwoord voltooiing (^N^P)"
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
 msgstr " ^X modus (^E^Y^L^]^F^I^K^D^V^N^P)"

-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N^P)"
 msgstr " Sleutelwoord Lokale voltooiing (^N^P)"
--- a/src/po/cs.cp1250.po
+++ b/src/po/cs.cp1250.po
@@ -218,7 +218,7 @@ msgstr " Dopl�ov�n� kl��ov�ch slov (^N/^P)"
 msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
 msgstr " ^X re�im (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"

-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N/^P)"
 msgstr " Lok�ln� dopl�ov�n� kl��ov�ch slov (^N/^P)"
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -218,7 +218,7 @@ msgstr " Dopl�ov�n� kl��ov�ch slov (^N/^P)"
 msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
 msgstr " ^X re�im (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"

-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N/^P)"
 msgstr " Lok�ln� dopl�ov�n� kl��ov�ch slov (^N/^P)"
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -357,7 +357,7 @@ msgstr " Completar con método Omni (^O^N^P)"
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Sugerencia de ortografía (s^N^P)"

-# Scroll has it's own msgs, in it's place there is the msg for local
+# Scroll has its own msgs, in its place there is the msg for local
 # * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 #: edit.c:57
 msgid " Keyword Local completion (^N^P)"
--- a/src/po/gvim.desktop.in
+++ b/src/po/gvim.desktop.in
@@ -45,7 +45,6 @@ Comment[hu]=Szövegfájlok szerkesztése
 Comment[id]=Edit file teks
 Comment[is]=Vinna með textaskrár
 Comment[it]=Modifica file di testo
-Comment[ja]=テキストファイルを編集します
 Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
 Comment[ko]=텍스트 파일을 편집합니다
 Comment[lt]=Redaguoti tekstines bylas
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2019-03-12 08:23+0900\n"
+"POT-Creation-Date: 2019-05-05 11:27+0900\n"
+"PO-Revision-Date: 2019-05-05 13:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -331,6 +331,51 @@ msgstr "���������פ��ޤ���"
 msgid "[crypted]"
 msgstr "[�Ź沽]"

+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "�ǥХå��⡼�ɤ�����ޤ�. ³����ˤ� \"cont\" �����Ϥ��Ƥ�������."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "�Ť��� = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "�������� = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "�� %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "���ޥ��: %s"
+
+msgid "frame is zero"
+msgstr "�ե졼�ब 0 �Ǥ�"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "�ǹ��٥�Υե졼��: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "�֥졼���ݥ���� \"%s%s\" �� %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: �֥졼���ݥ���Ȥ����Ĥ���ޤ���: %s"
+
+msgid "No breakpoints defined"
+msgstr "�֥졼���ݥ���Ȥ��������Ƥ��ޤ���"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  �� %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
@@ -494,106 +539,6 @@ msgstr "E105: :source �Ǽ����ե�����ʳ��Ǥ� :loadkeymap ��Ȥ��ޤ���"
 msgid "E791: Empty keymap entry"
 msgstr "E791: ���Υ����ޥåץ���ȥ�"

-msgid " Keyword completion (^N^P)"
-msgstr " ��������䴰 (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X �⡼�� (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " ��(����)�䴰 (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " �ե�����̾�䴰 (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " �����䴰 (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " �ѥ��ѥ������䴰 (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " ����䴰 (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " �����䴰 (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " �������饹�䴰 (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " ���ޥ�ɥ饤���䴰 (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " �桼��������䴰 (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " ������䴰 (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " �֤꽤������ (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " �ɽꥭ������䴰 (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr "����κǸ�˥ҥå�"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: ��ִؿ���������ɥ����ѹ����ޤ���"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: �䴰�ؿ����ƥ����Ȥ������ޤ���"
-
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' ���ץ���󤬶��Ǥ�"
-
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' ���ץ���󤬶��Ǥ�"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "����򥹥������: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (����) ����������(^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (�ִ�) ���������� (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "���������: %s"
-
-msgid "Scanning tags."
-msgstr "�����򥹥������."
-
-msgid "match in file"
-msgstr "�ե�������Υޥå�"
-
-msgid " Adding"
-msgstr " �ɲ���"
-
-msgid "-- Searching..."
-msgstr "-- ������..."
-
-msgid "Back at original"
-msgstr "�Ϥ�����"
-
-msgid "Word from other line"
-msgstr "¾�ιԤ�ñ��"
-
-msgid "The only match"
-msgstr "ͣ��γ���"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "%d ���ܤγ��� (������ %d ����)"
-
-#, c-format
-msgid "match %d"
-msgstr "%d ���ܤγ���"
-
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ͽ������ʸ���� :let �ˤ���ޤ���"

@@ -618,6 +563,9 @@ msgstr "E461: �������ѿ�̾�Ǥ�: %s"
 msgid "E806: using Float as a String"
 msgstr "E806: ��ư����������ʸ����Ȥ��ư��äƤ��ޤ�"

+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= �ϥ�����ץȥС������ 2 �Ǥ��б����Ƥ��ޤ���"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: �������åȤ��ꥹ�ȷ�������Ǥ��⾯�ʤ��Ǥ�"

@@ -846,6 +794,9 @@ msgstr "E899: %s �ΰ����ϥꥹ�ȷ��ޤ���Blob���Ǥʤ���Фʤ�ޤ���"
 msgid "E928: String required"
 msgstr "E928: ʸ����ɬ�פǤ�"

+msgid "E957: Invalid window number"
+msgstr "E957: ̵���ʥ�����ɥ��ֹ�Ǥ�"
+
 msgid "E808: Number or Float required"
 msgstr "E808: ���ͤ���ư����������ɬ�פǤ�"

@@ -902,9 +853,6 @@ msgstr "E916: ͭ���ʥ���֤ǤϤ���ޤ���"
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() �ˤ�̵���ʷ��Ǥ�"

-msgid "E957: Invalid window number"
-msgstr "E957: ̵���ʥ�����ɥ��ֹ�Ǥ�"
-
 #, c-format
 msgid "E798: ID is reserved for \":match\": %d"
 msgstr "E798: ID �� \":match\" �Τ����ͽ�󤵤�Ƥ��ޤ�: %d"
@@ -1248,51 +1196,6 @@ msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
 msgid "No old files"
 msgstr "�Ť��ե�����Ϥ���ޤ���"

-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "�ǥХå��⡼�ɤ�����ޤ�. ³����ˤ� \"cont\" �����Ϥ��Ƥ�������."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "�Ť��� = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "�������� = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "�� %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "���ޥ��: %s"
-
-msgid "frame is zero"
-msgstr "�ե졼�ब 0 �Ǥ�"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "�ǹ��٥�Υե졼��: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "�֥졼���ݥ���� \"%s%s\" �� %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �֥졼���ݥ���Ȥ����Ĥ���ޤ���: %s"
-
-msgid "No breakpoints defined"
-msgstr "�֥졼���ݥ���Ȥ��������Ƥ��ޤ���"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  �� %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  expr %s"
-
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: ���� \":profile start {fname}\" ��¹Ԥ��Ƥ�������"

@@ -1396,6 +1299,13 @@ msgstr "W15: �ٹ�: �Զ��ڤ������Ǥ�. ^M ���ʤ��ΤǤ��礦"
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding �����������ץȰʳ��ǻ��Ѥ���ޤ���"

+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion �����������ץȰʳ��ǻ��Ѥ���ޤ���"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion �ϥ��ݡ��Ȥ���Ƥ��ޤ���: %d"
+
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish �����������ץȰʳ��ǻ��Ѥ���ޤ���"

@@ -1445,6 +1355,12 @@ msgstr "�դ��ޤ��ϰϤ����ꤵ��ޤ��������ؤ��ޤ���?"
 msgid "E494: Use w or w>>"
 msgstr "E494: w �⤷���� w>> ����Ѥ��Ƥ�������"

+msgid ""
+"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"�������顼: DFLALL �� ADDR_NONE, ADDR_UNSIGNED �� ADDR_QUICKFIX �ȤȤ�˻Ȥ�"
+"���ȤϤǤ��ޤ���"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
 "E943: ���ޥ�ɥơ��֥�򹹿�����ɬ�פ�����ޤ���'make cmdidxs' ��¹Ԥ��Ƥ���"
@@ -1463,69 +1379,6 @@ msgid "E173: %d more file to edit"
 msgid_plural "E173: %d more files to edit"
 msgstr[0] "E173: �Խ����٤��ե����뤬���� %d �Ĥ���ޤ�"

-#, c-format
-msgid "E174: Command already exists: add ! to replace it: %s"
-msgstr "E174: ���ޥ�ɤ����ˤ���ޤ�: ���������ˤ� ! ���ɲä��Ƥ�������: %s"
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    ̾��        ����       ���ɥ쥹  �䴰      ���"
-
-msgid "No user-defined commands found"
-msgstr "�桼����������ޥ�ɤ����Ĥ���ޤ���Ǥ���"
-
-msgid "E175: No attribute specified"
-msgstr "E175: °�����������Ƥ��ޤ���"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: �����ο���̵���Ǥ�"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ������Ȥ�2�Ż��ꤹ�뤳�ȤϤǤ��ޤ���"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: ������Ȥξ�ά�ͤ�̵���Ǥ�"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete �ˤϰ�����ɬ�פǤ�"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: -addr �ˤϰ�����ɬ�פǤ�"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: ̵����°���Ǥ�: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: ̵���ʥ��ޥ��̾�Ǥ�"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �桼����������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
-
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: ͽ��̾�ʤΤǡ��桼����������ޥ�ɤ����ѤǤ��ޤ���"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: ���Υ桼����������ޥ�ɤϤ���ޤ���: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: ̵���ʥ��ɥ쥹�������ͤǤ�: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ̵�����䴰����Ǥ�: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: �䴰�����ϥ��������䴰�Ǥ������ѤǤ��ޤ���"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: ���������䴰�ˤϰ����Ȥ��ƴؿ���ɬ�פǤ�"
-
 msgid "unknown"
 msgstr "����"

@@ -1908,20 +1761,21 @@ msgid "is read-only (add ! to override)"
 msgstr "���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"

 msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: �Хå����åץե��������¸�Ǥ��ޤ��� (! ���ɲäǶ�����¸)"
+msgstr "E506: �Хå����åץե��������¸�Ǥ��ޤ��� (! ���ɲäǶ������)"

 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
-"E507: �Хå����åץե�������Ĥ���ݤ˥��顼��ȯ�����ޤ��� (! ���ɲäǶ���)"
+"E507: �Хå����åץե�������Ĥ���ݤ˥��顼��ȯ�����ޤ��� (! ���ɲäǶ�����"
+"��)"

 msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: �Хå����å��ѥե�������ɹ���ޤ��� (! ���ɲäǶ����ɹ�)"
+msgstr "E508: �Хå����å��ѥե�������ɹ���ޤ��� (! ���ɲäǶ������)"

 msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
+msgstr "E509: �Хå����åץե��������ޤ��� (! ���ɲäǶ������)"

 msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
+msgstr "E510: �Хå����åץե��������ޤ��� (! ���ɲäǶ������)"

 msgid "E214: Can't find temp file for writing"
 msgstr "E214: ��¸�Ѱ���ե����뤬���Ĥ���ޤ���"
@@ -2391,6 +2245,9 @@ msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."

+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: GUI�ϻ����Բ�ǽ�Ǥ���gvim.exe��ư�Ǥ��ޤ���"
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"

@@ -2931,6 +2788,106 @@ msgstr "E573: ̵���ʥ����С�ID���Ȥ��ޤ���: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"

+msgid " Keyword completion (^N^P)"
+msgstr " ��������䴰 (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X �⡼�� (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " ��(����)�䴰 (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " �ե�����̾�䴰 (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " �����䴰 (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " �ѥ��ѥ������䴰 (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " ����䴰 (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " �����䴰 (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " �������饹�䴰 (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " ���ޥ�ɥ饤���䴰 (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " �桼��������䴰 (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " ������䴰 (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " �֤꽤������ (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " �ɽꥭ������䴰 (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr "����κǸ�˥ҥå�"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: �䴰�ؿ���������ɥ����ѹ����ޤ���"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: �䴰�ؿ����ƥ����Ȥ������ޤ���"
+
+msgid "'dictionary' option is empty"
+msgstr "'dictionary' ���ץ���󤬶��Ǥ�"
+
+msgid "'thesaurus' option is empty"
+msgstr "'thesaurus' ���ץ���󤬶��Ǥ�"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "����򥹥������: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (����) ����������(^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (�ִ�) ���������� (^E/^Y)"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "���������: %s"
+
+msgid "Scanning tags."
+msgstr "�����򥹥������."
+
+msgid "match in file"
+msgstr "�ե�������Υޥå�"
+
+msgid " Adding"
+msgstr " �ɲ���"
+
+msgid "-- Searching..."
+msgstr "-- ������..."
+
+msgid "Back at original"
+msgstr "�Ϥ�����"
+
+msgid "Word from other line"
+msgstr "¾�ιԤ�ñ��"
+
+msgid "The only match"
+msgstr "ͣ��γ���"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "%d ���ܤγ��� (������ %d ����)"
+
+#, c-format
+msgid "match %d"
+msgstr "%d ���ܤγ���"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: JSON�˽�ʣ����������ޤ�: \"%s\""
@@ -3852,6 +3809,9 @@ msgstr ""
 "\"\n"
 "    ��ä��Ф��Υ�å����������Ǥ��ޤ�.\n"

+msgid "Found a swap file that is not useful, deleting it"
+msgstr "���פʥ���åץե����뤬���Ĥ���ޤ�����������ޤ�"
+
 msgid "Swap file \""
 msgstr "����åץե����� \""

@@ -4142,6 +4102,9 @@ msgstr ""
 "���٤Ƥ��ѹ����˴�����Vim��λ����ˤ�  :qa!  �����Ϥ� <Enter> �򲡤��Ƥ���"
 "����"

+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Vim��λ����ˤ�  :qa  �����Ϥ� <Enter> �򲡤��Ƥ�������"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4618,15 +4581,6 @@ msgstr "XSMP SmcOpenConnection�����Ԥ��ޤ���: %s"
 msgid "At line"
 msgstr "��"

-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll ������ɤǤ��ޤ���Ǥ���"
-
-msgid "VIM Error"
-msgstr "VIM���顼"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "DLL����ؿ��ݥ��󥿤�����Ǥ��ޤ���Ǥ���"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ���٥�� %s ����\n"
@@ -4659,6 +4613,9 @@ msgstr "Vim�ηٹ�"
 msgid "shell returned %d"
 msgstr "�����뤬������ %d �ǽ�λ���ޤ���"

+msgid "E553: No more items"
+msgstr "E553: ���Ǥ��⤦����ޤ���"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: ���ߤΥ����������ꥹ�Ȥ��ѹ�����ޤ���"

@@ -4691,9 +4648,6 @@ msgstr "E378: 'errorformat' �˥ѥ����󤬻��ꤵ��Ƥ��ޤ���"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �ǥ��쥯�ȥ�̾��̵�������Ǥ�"

-msgid "E553: No more items"
-msgstr "E553: ���Ǥ��⤦����ޤ���"
-
 msgid "E924: Current window was closed"
 msgstr "E924: ���ߤΥ�����ɥ����Ĥ����ޤ���"

@@ -5705,6 +5659,12 @@ msgstr "E555: ���������å��������Ǥ�"
 msgid "E556: at top of tag stack"
 msgstr "E556: ���������å�����Ƭ�Ǥ�"

+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: tagfunc��Υ��������å����ѹ��Ǥ��ޤ���"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: tagfunc���������ͤ�̵���Ǥ�"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: �ǽ�γ���������ۤ�����뤳�ȤϤǤ��ޤ���"

@@ -5712,12 +5672,6 @@ msgstr "E425: �ǽ�γ���������ۤ�����뤳�ȤϤǤ��ޤ���"
 msgid "E426: tag not found: %s"
 msgstr "E426: ���������Ĥ���ޤ���: %s"

-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-msgid "file\n"
-msgstr "�ե�����\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: ����������1�Ĥ�����������ޤ���"

@@ -5742,6 +5696,12 @@ msgstr "  ������ۤʤ�case�ǻ��Ѥ��ޤ�!"
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: �ե����� \"%s\" ������ޤ���"

+msgid "  # pri kind tag"
+msgstr "  # pri kind tag"
+
+msgid "file\n"
+msgstr "�ե�����\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5818,6 +5778,10 @@ msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "$VIMRUNTIME/rgb.txt�򳫤��ޤ���"

 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: ̵����°���Ǥ�: %s"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" ��Υ���֤�λ���ޤ���?"

@@ -6023,6 +5987,65 @@ msgstr "E439: ����ɥ��ꥹ�Ȥ�����Ƥ��ޤ�"
 msgid "E440: undo line missing"
 msgstr "E440: ����ɥ��Ԥ�����ޤ���"

+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    ̾��              ���� ���ɥ쥹 �䴰       ���"
+
+msgid "No user-defined commands found"
+msgstr "�桼����������ޥ�ɤ����Ĥ���ޤ���Ǥ���"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: ̵���ʥ��ɥ쥹�������ͤǤ�: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: ̵�����䴰����Ǥ�: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: �䴰�����ϥ��������䴰�Ǥ������ѤǤ��ޤ���"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: ���������䴰�ˤϰ����Ȥ��ƴؿ���ɬ�פǤ�"
+
+msgid "E175: No attribute specified"
+msgstr "E175: °�����������Ƥ��ޤ���"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: �����ο���̵���Ǥ�"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: ������Ȥ�2�Ż��ꤹ�뤳�ȤϤǤ��ޤ���"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: ������Ȥξ�ά�ͤ�̵���Ǥ�"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete �ˤϰ�����ɬ�פǤ�"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr �ˤϰ�����ɬ�פǤ�"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: ���ޥ�ɤ����ˤ���ޤ�: ���������ˤ� ! ���ɲä��Ƥ�������: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: ̵���ʥ��ޥ��̾�Ǥ�"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: �桼����������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: ͽ��̾�ʤΤǡ��桼����������ޥ�ɤ����ѤǤ��ޤ���"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: ���Υ桼����������ޥ�ɤϤ���ޤ���: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: �ؿ� %s ������ѤǤ������������ˤ� ! ���ɲä��Ƥ�������"
@@ -6157,6 +6180,20 @@ msgstr "%s (%s, compiled %s)"

 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 64 �ӥå� GUI/���󥽡��� ��"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 32 �ӥå� GUI/���󥽡��� ��"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
@@ -6594,6 +6631,10 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: ̵���ʰ����Ǥ�: %s"

 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: ��������ʣ���Ƥ��ޤ�: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: ���� %s ���Ф���̵�����ͤǤ�"

@@ -7218,3 +7259,21 @@ msgstr ""
 "C������ (*.c, *.h)\t*.c;*.h\n"
 "C++������ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
 "Vim�ե����� (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+#~ msgid "GVim"
+#~ msgstr ""
+
+msgid "Text Editor"
+msgstr "�ƥ����ȥ��ǥ���"
+
+msgid "Edit text files"
+msgstr "�ƥ����ȥե�������Խ����ޤ�"
+
+msgid "Text;editor;"
+msgstr "�ƥ�����;���ǥ���;"
+
+#~ msgid "gvim"
+#~ msgstr ""
+
+#~ msgid "Vim"
+#~ msgstr ""
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2019-03-12 08:23+0900\n"
+"POT-Creation-Date: 2019-05-05 11:27+0900\n"
+"PO-Revision-Date: 2019-05-05 13:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -331,6 +331,51 @@ msgstr "キーが一致しません"
 msgid "[crypted]"
 msgstr "[暗号化]"

+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "古い値 = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "新しい値 = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "行 %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "コマンド: %s"
+
+msgid "frame is zero"
+msgstr "フレームが 0 です"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "最高レベルのフレーム: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "ブレークポイント \"%s%s\" 行 %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: ブレークポイントが見つかりません: %s"
+
+msgid "No breakpoints defined"
+msgstr "ブレークポイントが定義されていません"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  行 %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: 辞書型にコロンがありません: %s"
@@ -494,106 +539,6 @@ msgstr "E105: :source で取込むファイル以外では :loadkeymap を使えません"
 msgid "E791: Empty keymap entry"
 msgstr "E791: 空のキーマップエントリ"

-msgid " Keyword completion (^N^P)"
-msgstr " キーワード補完 (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X モード (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " 行(全体)補完 (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " ファイル名補完 (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " タグ補完 (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " パスパターン補完 (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " 定義補完 (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " 辞書補完 (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " シソーラス補完 (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " コマンドライン補完 (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " ユーザー定義補完 (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " オムニ補完 (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " 綴り修正候補 (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " 局所キーワード補完 (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr "段落の最後にヒット"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: 補間関数がウィンドウを変更しました"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: 補完関数がテキストを削除しました"
-
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' オプションが空です"
-
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' オプションが空です"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "辞書をスキャン中: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (挿入) スクロール(^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (置換) スクロール (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "スキャン中: %s"
-
-msgid "Scanning tags."
-msgstr "タグをスキャン中."
-
-msgid "match in file"
-msgstr "ファイル内のマッチ"
-
-msgid " Adding"
-msgstr " 追加中"
-
-msgid "-- Searching..."
-msgstr "-- 検索中..."
-
-msgid "Back at original"
-msgstr "始めに戻る"
-
-msgid "Word from other line"
-msgstr "他の行の単語"
-
-msgid "The only match"
-msgstr "唯一の該当"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "%d 番目の該当 (全該当 %d 個中)"
-
-#, c-format
-msgid "match %d"
-msgstr "%d 番目の該当"
-
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: 予期せぬ文字が :let にありました"

@@ -618,6 +563,9 @@ msgstr "E461: 不正な変数名です: %s"
 msgid "E806: using Float as a String"
 msgstr "E806: 浮動小数点数を文字列として扱っています"

+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= はスクリプトバージョン 2 では対応していません"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"

@@ -846,6 +794,9 @@ msgstr "E899: %s の引数はリスト型またはBlob型でなければなりません"
 msgid "E928: String required"
 msgstr "E928: 文字列が必要です"

+msgid "E957: Invalid window number"
+msgstr "E957: 無効なウィンドウ番号です"
+
 msgid "E808: Number or Float required"
 msgstr "E808: 数値か浮動小数点数が必要です"

@@ -902,9 +853,6 @@ msgstr "E916: 有効なジョブではありません"
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() には無効な型です"

-msgid "E957: Invalid window number"
-msgstr "E957: 無効なウィンドウ番号です"
-
 #, c-format
 msgid "E798: ID is reserved for \":match\": %d"
 msgstr "E798: ID は \":match\" のために予約されています: %d"
@@ -1248,51 +1196,6 @@ msgstr "E150: ディレクトリではありません: %s"
 msgid "No old files"
 msgstr "古いファイルはありません"

-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "古い値 = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "新しい値 = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "行 %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "コマンド: %s"
-
-msgid "frame is zero"
-msgstr "フレームが 0 です"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "最高レベルのフレーム: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "ブレークポイント \"%s%s\" 行 %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ブレークポイントが見つかりません: %s"
-
-msgid "No breakpoints defined"
-msgstr "ブレークポイントが定義されていません"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  行 %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  expr %s"
-
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: 初めに \":profile start {fname}\" を実行してください"

@@ -1396,6 +1299,13 @@ msgstr "W15: 警告: 行区切が不正です. ^M がないのでしょう"
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"

+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion が取込スクリプト以外で使用されました"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion はサポートされていません: %d"
+
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish が取込スクリプト以外で使用されました"

@@ -1445,6 +1355,12 @@ msgstr "逆さまの範囲が指定されました、入替えますか?"
 msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"

+msgid ""
+"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"内部エラー: DFLALL を ADDR_NONE, ADDR_UNSIGNED や ADDR_QUICKFIX とともに使う"
+"ことはできません"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
 "E943: コマンドテーブルを更新する必要があります、'make cmdidxs' を実行してくだ"
@@ -1463,69 +1379,6 @@ msgid "E173: %d more file to edit"
 msgid_plural "E173: %d more files to edit"
 msgstr[0] "E173: 編集すべきファイルがあと %d 個あります"

-#, c-format
-msgid "E174: Command already exists: add ! to replace it: %s"
-msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください: %s"
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    名前        引数       アドレス  補完      定義"
-
-msgid "No user-defined commands found"
-msgstr "ユーザー定義コマンドが見つかりませんでした"
-
-msgid "E175: No attribute specified"
-msgstr "E175: 属性は定義されていません"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: 引数の数が無効です"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: カウントを2重指定することはできません"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: カウントの省略値が無効です"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete には引数が必要です"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: -addr には引数が必要です"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: 無効な属性です: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: 無効なコマンド名です"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
-
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: 予約名なので、ユーザー定義コマンドに利用できません"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: そのユーザー定義コマンドはありません: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: 無効なアドレスタイプ値です: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: 無効な補完指定です: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: 補完引数はカスタム補完でしか使用できません"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: カスタム補完には引数として関数が必要です"
-
 msgid "unknown"
 msgstr "不明"

@@ -1908,20 +1761,21 @@ msgid "is read-only (add ! to override)"
 msgstr "は読込専用です (強制書込には ! を追加)"

 msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: バックアップファイルを保存できません (! を追加で強制保存)"
+msgstr "E506: バックアップファイルを保存できません (! を追加で強制書込)"

 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
-"E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制)"
+"E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制書"
+"込)"

 msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制読込)"
+msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制書込)"

 msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: バックアップファイルを作れません (! を追加で強制作成)"
+msgstr "E509: バックアップファイルを作れません (! を追加で強制書込)"

 msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: バックアップファイルを作れません (! を追加で強制作成)"
+msgstr "E510: バックアップファイルを作れません (! を追加で強制書込)"

 msgid "E214: Can't find temp file for writing"
 msgstr "E214: 保存用一時ファイルが見つかりません"
@@ -2391,6 +2245,9 @@ msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."

+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: GUIは使用不可能です。gvim.exeを起動できません。"
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDIアプリの中ではウィンドウを開けません"

@@ -2931,6 +2788,106 @@ msgstr "E573: 無効なサーバーIDが使われました: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"

+msgid " Keyword completion (^N^P)"
+msgstr " キーワード補完 (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X モード (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " 行(全体)補完 (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " ファイル名補完 (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " タグ補完 (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " パスパターン補完 (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " 定義補完 (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " 辞書補完 (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " シソーラス補完 (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " コマンドライン補完 (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " ユーザー定義補完 (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " オムニ補完 (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " 綴り修正候補 (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " 局所キーワード補完 (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr "段落の最後にヒット"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: 補完関数がウィンドウを変更しました"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: 補完関数がテキストを削除しました"
+
+msgid "'dictionary' option is empty"
+msgstr "'dictionary' オプションが空です"
+
+msgid "'thesaurus' option is empty"
+msgstr "'thesaurus' オプションが空です"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "辞書をスキャン中: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (挿入) スクロール(^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (置換) スクロール (^E/^Y)"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "スキャン中: %s"
+
+msgid "Scanning tags."
+msgstr "タグをスキャン中."
+
+msgid "match in file"
+msgstr "ファイル内のマッチ"
+
+msgid " Adding"
+msgstr " 追加中"
+
+msgid "-- Searching..."
+msgstr "-- 検索中..."
+
+msgid "Back at original"
+msgstr "始めに戻る"
+
+msgid "Word from other line"
+msgstr "他の行の単語"
+
+msgid "The only match"
+msgstr "唯一の該当"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "%d 番目の該当 (全該当 %d 個中)"
+
+#, c-format
+msgid "match %d"
+msgstr "%d 番目の該当"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: JSONに重複キーがあります: \"%s\""
@@ -3852,6 +3809,9 @@ msgstr ""
 "\"\n"
 "    を消せばこのメッセージを回避できます.\n"

+msgid "Found a swap file that is not useful, deleting it"
+msgstr "不要なスワップファイルが見つかりました。削除します"
+
 msgid "Swap file \""
 msgstr "スワップファイル \""

@@ -4142,6 +4102,9 @@ msgstr ""
 "すべての変更を破棄し、Vimを終了するには  :qa!  と入力し <Enter> を押してくだ"
 "さい"

+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Vimを終了するには  :qa  と入力し <Enter> を押してください"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4618,15 +4581,6 @@ msgstr "XSMP SmcOpenConnectionが失敗しました: %s"
 msgid "At line"
 msgstr "行"

-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll をロードできませんでした"
-
-msgid "VIM Error"
-msgstr "VIMエラー"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "DLLから関数ポインタを取得できませんでした"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: イベント %s を検知\n"
@@ -4659,6 +4613,9 @@ msgstr "Vimの警告"
 msgid "shell returned %d"
 msgstr "シェルがコード %d で終了しました"

+msgid "E553: No more items"
+msgstr "E553: 要素がもうありません"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: 現在のロケーションリストが変更されました"

@@ -4691,9 +4648,6 @@ msgstr "E378: 'errorformat' にパターンが指定されていません"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: ディレクトリ名が無いか空です"

-msgid "E553: No more items"
-msgstr "E553: 要素がもうありません"
-
 msgid "E924: Current window was closed"
 msgstr "E924: 現在のウィンドウが閉じられました"

@@ -5705,6 +5659,12 @@ msgstr "E555: タグスタックの末尾です"
 msgid "E556: at top of tag stack"
 msgstr "E556: タグスタックの先頭です"

+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: tagfunc内のタグスタックを変更できません"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: tagfuncからの戻り値が無効です"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: 最初の該当タグを越えて戻ることはできません"

@@ -5712,12 +5672,6 @@ msgstr "E425: 最初の該当タグを越えて戻ることはできません"
 msgid "E426: tag not found: %s"
 msgstr "E426: タグが見つかりません: %s"

-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-msgid "file\n"
-msgstr "ファイル\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: 該当タグが1つだけしかありません"

@@ -5742,6 +5696,12 @@ msgstr "  タグを異なるcaseで使用します!"
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ファイル \"%s\" がありません"

+msgid "  # pri kind tag"
+msgstr "  # pri kind tag"
+
+msgid "file\n"
+msgstr "ファイル\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5818,6 +5778,10 @@ msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "$VIMRUNTIME/rgb.txtを開けません"

 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: 無効な属性です: %s"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" 内のジョブを終了しますか?"

@@ -6023,6 +5987,65 @@ msgstr "E439: アンドゥリストが壊れています"
 msgid "E440: undo line missing"
 msgstr "E440: アンドゥ行がありません"

+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    名前              引数 アドレス 補完       定義"
+
+msgid "No user-defined commands found"
+msgstr "ユーザー定義コマンドが見つかりませんでした"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: 無効なアドレスタイプ値です: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: 無効な補完指定です: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: 補完引数はカスタム補完でしか使用できません"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: カスタム補完には引数として関数が必要です"
+
+msgid "E175: No attribute specified"
+msgstr "E175: 属性は定義されていません"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: 引数の数が無効です"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: カウントを2重指定することはできません"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: カウントの省略値が無効です"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete には引数が必要です"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr には引数が必要です"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: 無効なコマンド名です"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: 予約名なので、ユーザー定義コマンドに利用できません"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: そのユーザー定義コマンドはありません: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: 関数 %s は定義済です、再定義するには ! を追加してください"
@@ -6157,6 +6180,20 @@ msgstr "%s (%s, compiled %s)"

 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 64 ビット GUI/コンソール 版"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 32 ビット GUI/コンソール 版"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
@@ -6594,6 +6631,10 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: 無効な引数です: %s"

 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: 引数が重複しています: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: 引数 %s に対して無効な値です"

@@ -7218,3 +7259,21 @@ msgstr ""
 "Cソース (*.c, *.h)\t*.c;*.h\n"
 "C++ソース (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
 "Vimファイル (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+#~ msgid "GVim"
+#~ msgstr ""
+
+msgid "Text Editor"
+msgstr "テキストエディタ"
+
+msgid "Edit text files"
+msgstr "テキストファイルを編集します"
+
+msgid "Text;editor;"
+msgstr "テキスト;エディタ;"
+
+#~ msgid "gvim"
+#~ msgstr ""
+
+#~ msgid "Vim"
+#~ msgstr ""
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2019-03-12 08:23+0900\n"
+"POT-Creation-Date: 2019-05-05 11:27+0900\n"
+"PO-Revision-Date: 2019-05-05 13:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -331,6 +331,51 @@ msgstr "�L�[����v���܂���"
 msgid "[crypted]"
 msgstr "[�Í���]"

+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "�f�o�b�O���[�h�ɓ���܂�. ������ɂ� \"cont\" �Ɠ��͂��Ă�������."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "�Â��l = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "�V�����l = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "�s %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "�R�}���h: %s"
+
+msgid "frame is zero"
+msgstr "�t���[���� 0 �ł�"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "�ō����x���̃t���[��: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "�u���[�N�|�C���g \"%s%s\" �s %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: �u���[�N�|�C���g��������܂���: %s"
+
+msgid "No breakpoints defined"
+msgstr "�u���[�N�|�C���g����`����Ă��܂���"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  �s %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: �����^�ɃR����������܂���: %s"
@@ -494,106 +539,6 @@ msgstr "E105: :source �Ŏ捞�ރt�@�C���ȊO�ł� :loadkeymap ���g���܂���"
 msgid "E791: Empty keymap entry"
 msgstr "E791: ��̃L�[�}�b�v�G���g��"

-msgid " Keyword completion (^N^P)"
-msgstr " �L�[���[�h�⊮ (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X ���[�h (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " �s(�S��)�⊮ (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " �t�@�C�����⊮ (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " �^�O�⊮ (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " �p�X�p�^�[���⊮ (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " ��`�⊮ (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " �����⊮ (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " �V�\\�[���X�⊮ (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " �R�}���h���C���⊮ (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " ���[�U�[��`�⊮ (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " �I���j�⊮ (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " �Ԃ�C����� (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " �Ǐ��L�[���[�h�⊮ (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr "�i���̍Ō�Ƀq�b�g"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: ��Ԋ֐����E�B���h�E��ύX���܂���"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: �⊮�֐����e�L�X�g���폜���܂���"
-
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' �I�v�V��������ł�"
-
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' �I�v�V��������ł�"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "�������X�L������: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (�}��) �X�N���[��(^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (�u��) �X�N���[�� (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "�X�L������: %s"
-
-msgid "Scanning tags."
-msgstr "�^�O���X�L������."
-
-msgid "match in file"
-msgstr "�t�@�C�����̃}�b�`"
-
-msgid " Adding"
-msgstr " �ǉ���"
-
-msgid "-- Searching..."
-msgstr "-- ������..."
-
-msgid "Back at original"
-msgstr "�n�߂ɖ߂�"
-
-msgid "Word from other line"
-msgstr "���̍s�̒P��"
-
-msgid "The only match"
-msgstr "�B��̊Y��"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "%d �Ԗڂ̊Y�� (�S�Y�� %d ��)"
-
-#, c-format
-msgid "match %d"
-msgstr "%d �Ԗڂ̊Y��"
-
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: �\\�����ʕ����� :let �ɂ���܂���"

@@ -618,6 +563,9 @@ msgstr "E461: �s���ȕϐ����ł�: %s"
 msgid "E806: using Float as a String"
 msgstr "E806: ���������_���𕶎���Ƃ��Ĉ����Ă��܂�"

+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= �̓X�N���v�g�o�[�W���� 2 �ł͑Ή����Ă��܂���"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: �^�[�Q�b�g�����X�g�^���̗v�f�������Ȃ��ł�"

@@ -846,6 +794,9 @@ msgstr "E899: %s �̈����̓��X�g�^�܂���Blob�^�łȂ���΂Ȃ�܂���"
 msgid "E928: String required"
 msgstr "E928: �����񂪕K�v�ł�"

+msgid "E957: Invalid window number"
+msgstr "E957: �����ȃE�B���h�E�ԍ��ł�"
+
 msgid "E808: Number or Float required"
 msgstr "E808: ���l�����������_�����K�v�ł�"

@@ -902,9 +853,6 @@ msgstr "E916: �L���ȃW���u�ł͂���܂���"
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() �ɂ͖����Ȍ^�ł�"

-msgid "E957: Invalid window number"
-msgstr "E957: �����ȃE�B���h�E�ԍ��ł�"
-
 #, c-format
 msgid "E798: ID is reserved for \":match\": %d"
 msgstr "E798: ID �� \":match\" �̂��߂ɗ\\�񂳂�Ă��܂�: %d"
@@ -1248,51 +1196,6 @@ msgstr "E150: �f�B���N�g���ł͂���܂���: %s"
 msgid "No old files"
 msgstr "�Â��t�@�C���͂���܂���"

-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "�f�o�b�O���[�h�ɓ���܂�. ������ɂ� \"cont\" �Ɠ��͂��Ă�������."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "�Â��l = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "�V�����l = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "�s %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "�R�}���h: %s"
-
-msgid "frame is zero"
-msgstr "�t���[���� 0 �ł�"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "�ō����x���̃t���[��: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "�u���[�N�|�C���g \"%s%s\" �s %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �u���[�N�|�C���g��������܂���: %s"
-
-msgid "No breakpoints defined"
-msgstr "�u���[�N�|�C���g����`����Ă��܂���"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  �s %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  expr %s"
-
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: ���߂� \":profile start {fname}\" �����s���Ă�������"

@@ -1396,6 +1299,13 @@ msgstr "W15: �x��: �s��؂��s���ł�. ^M ���Ȃ��̂ł��傤"
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding ���捞�X�N���v�g�ȊO�Ŏg�p����܂���"

+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion ���捞�X�N���v�g�ȊO�Ŏg�p����܂���"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion �̓T�|�[�g����Ă��܂���: %d"
+
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish ���捞�X�N���v�g�ȊO�Ŏg�p����܂���"

@@ -1445,6 +1355,12 @@ msgstr "�t���܂͈̔͂��w�肳��܂����A���ւ��܂���?"
 msgid "E494: Use w or w>>"
 msgstr "E494: w �������� w>> ���g�p���Ă�������"

+msgid ""
+"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"�����G���[: DFLALL �� ADDR_NONE, ADDR_UNSIGNED �� ADDR_QUICKFIX �ƂƂ��Ɏg��"
+"���Ƃ͂ł��܂���"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
 "E943: �R�}���h�e�[�u�����X�V����K�v������܂��A'make cmdidxs' �����s���Ă���"
@@ -1463,69 +1379,6 @@ msgid "E173: %d more file to edit"
 msgid_plural "E173: %d more files to edit"
 msgstr[0] "E173: �ҏW���ׂ��t�@�C�������� %d ����܂�"

-#, c-format
-msgid "E174: Command already exists: add ! to replace it: %s"
-msgstr "E174: �R�}���h�����ɂ���܂�: �Ē�`����ɂ� ! ��ǉ����Ă�������: %s"
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    ���O        ����       �A�h���X  �⊮      ��`"
-
-msgid "No user-defined commands found"
-msgstr "���[�U�[��`�R�}���h��������܂���ł���"
-
-msgid "E175: No attribute specified"
-msgstr "E175: �����͒�`����Ă��܂���"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: �����̐��������ł�"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: �J�E���g��2�d�w�肷�邱�Ƃ͂ł��܂���"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: �J�E���g�̏ȗ��l�������ł�"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete �ɂ͈������K�v�ł�"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: -addr �ɂ͈������K�v�ł�"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: �����ȑ����ł�: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: �����ȃR�}���h���ł�"
-
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ���[�U�[��`�R�}���h�͉p�啶���Ŏn�܂�Ȃ���΂Ȃ�܂���"
-
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: �\\�񖼂Ȃ̂ŁA���[�U�[��`�R�}���h�ɗ��p�ł��܂���"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: ���̃��[�U�[��`�R�}���h�͂���܂���: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: �����ȃA�h���X�^�C�v�l�ł�: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: �����ȕ⊮�w��ł�: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: �⊮�����̓J�X�^���⊮�ł����g�p�ł��܂���"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: �J�X�^���⊮�ɂ͈����Ƃ��Ċ֐����K�v�ł�"
-
 msgid "unknown"
 msgstr "�s��"

@@ -1908,20 +1761,21 @@ msgid "is read-only (add ! to override)"
 msgstr "�͓Ǎ���p�ł� (���������ɂ� ! ��ǉ�)"

 msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: �o�b�N�A�b�v�t�@�C����ۑ��ł��܂��� (! ��ǉ��ŋ����ۑ�)"
+msgstr "E506: �o�b�N�A�b�v�t�@�C����ۑ��ł��܂��� (! ��ǉ��ŋ�������)"

 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
-"E507: �o�b�N�A�b�v�t�@�C�������ۂɃG���[���������܂��� (! ��ǉ��ŋ���)"
+"E507: �o�b�N�A�b�v�t�@�C�������ۂɃG���[���������܂��� (! ��ǉ��ŋ�����"
+"��)"

 msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: �o�b�N�A�b�v�p�t�@�C����Ǎ��߂܂��� (! ��ǉ��ŋ����Ǎ�)"
+msgstr "E508: �o�b�N�A�b�v�p�t�@�C����Ǎ��߂܂��� (! ��ǉ��ŋ�������)"

 msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: �o�b�N�A�b�v�t�@�C�������܂��� (! ��ǉ��ŋ����쐬)"
+msgstr "E509: �o�b�N�A�b�v�t�@�C�������܂��� (! ��ǉ��ŋ�������)"

 msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: �o�b�N�A�b�v�t�@�C�������܂��� (! ��ǉ��ŋ����쐬)"
+msgstr "E510: �o�b�N�A�b�v�t�@�C�������܂��� (! ��ǉ��ŋ�������)"

 msgid "E214: Can't find temp file for writing"
 msgstr "E214: �ۑ��p�ꎞ�t�@�C����������܂���"
@@ -2391,6 +2245,9 @@ msgstr "E671: �^�C�g���� \"%s\" �̃E�B���h�E�͌�����܂���"
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: �����̓T�|�[�g����܂���: \"-%s\"; OLE�ł��g�p���Ă�������."

+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: GUI�͎g�p�s�\\�ł��Bgvim.exe���N���ł��܂���B"
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: MDI�A�v���̒��ł̓E�B���h�E���J���܂���"

@@ -2931,6 +2788,106 @@ msgstr "E573: �����ȃT�[�o�[ID���g���܂���: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ���̂̓o�^�v���p�e�B���s���ł�. �������܂���!"

+msgid " Keyword completion (^N^P)"
+msgstr " �L�[���[�h�⊮ (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X ���[�h (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " �s(�S��)�⊮ (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " �t�@�C�����⊮ (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " �^�O�⊮ (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " �p�X�p�^�[���⊮ (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " ��`�⊮ (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " �����⊮ (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " �V�\\�[���X�⊮ (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " �R�}���h���C���⊮ (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " ���[�U�[��`�⊮ (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " �I���j�⊮ (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " �Ԃ�C����� (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " �Ǐ��L�[���[�h�⊮ (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr "�i���̍Ō�Ƀq�b�g"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: �⊮�֐����E�B���h�E��ύX���܂���"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: �⊮�֐����e�L�X�g���폜���܂���"
+
+msgid "'dictionary' option is empty"
+msgstr "'dictionary' �I�v�V��������ł�"
+
+msgid "'thesaurus' option is empty"
+msgstr "'thesaurus' �I�v�V��������ł�"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "�������X�L������: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (�}��) �X�N���[��(^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (�u��) �X�N���[�� (^E/^Y)"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "�X�L������: %s"
+
+msgid "Scanning tags."
+msgstr "�^�O���X�L������."
+
+msgid "match in file"
+msgstr "�t�@�C�����̃}�b�`"
+
+msgid " Adding"
+msgstr " �ǉ���"
+
+msgid "-- Searching..."
+msgstr "-- ������..."
+
+msgid "Back at original"
+msgstr "�n�߂ɖ߂�"
+
+msgid "Word from other line"
+msgstr "���̍s�̒P��"
+
+msgid "The only match"
+msgstr "�B��̊Y��"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "%d �Ԗڂ̊Y�� (�S�Y�� %d ��)"
+
+#, c-format
+msgid "match %d"
+msgstr "%d �Ԗڂ̊Y��"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: JSON�ɏd���L�[������܂�: \"%s\""
@@ -3852,6 +3809,9 @@ msgstr ""
 "\"\n"
 "    �������΂��̃��b�Z�[�W������ł��܂�.\n"

+msgid "Found a swap file that is not useful, deleting it"
+msgstr "�s�v�ȃX���b�v�t�@�C����������܂����B�폜���܂�"
+
 msgid "Swap file \""
 msgstr "�X���b�v�t�@�C�� \""

@@ -4142,6 +4102,9 @@ msgstr ""
 "���ׂĂ̕ύX��j�����AVim���I������ɂ�  :qa!  �Ɠ��͂� <Enter> �������Ă���"
 "����"

+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Vim���I������ɂ�  :qa  �Ɠ��͂� <Enter> �������Ă�������"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4618,15 +4581,6 @@ msgstr "XSMP SmcOpenConnection�����s���܂���: %s"
 msgid "At line"
 msgstr "�s"

-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll �����[�h�ł��܂���ł���"
-
-msgid "VIM Error"
-msgstr "VIM�G���["
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "DLL����֐��|�C���^���擾�ł��܂���ł���"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: �C�x���g %s �����m\n"
@@ -4659,6 +4613,9 @@ msgstr "Vim�̌x��"
 msgid "shell returned %d"
 msgstr "�V�F�����R�[�h %d �ŏI�����܂���"

+msgid "E553: No more items"
+msgstr "E553: �v�f����������܂���"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: ���݂̃��P�[�V�������X�g���ύX����܂���"

@@ -4691,9 +4648,6 @@ msgstr "E378: 'errorformat' �Ƀp�^�[�����w�肳��Ă��܂���"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �f�B���N�g��������������ł�"

-msgid "E553: No more items"
-msgstr "E553: �v�f����������܂���"
-
 msgid "E924: Current window was closed"
 msgstr "E924: ���݂̃E�B���h�E�������܂���"

@@ -5705,6 +5659,12 @@ msgstr "E555: �^�O�X�^�b�N�̖����ł�"
 msgid "E556: at top of tag stack"
 msgstr "E556: �^�O�X�^�b�N�̐擪�ł�"

+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: tagfunc���̃^�O�X�^�b�N��ύX�ł��܂���"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: tagfunc����̖߂�l�������ł�"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: �ŏ��̊Y���^�O���z���Ė߂邱�Ƃ͂ł��܂���"

@@ -5712,12 +5672,6 @@ msgstr "E425: �ŏ��̊Y���^�O���z���Ė߂邱�Ƃ͂ł��܂���"
 msgid "E426: tag not found: %s"
 msgstr "E426: �^�O��������܂���: %s"

-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-msgid "file\n"
-msgstr "�t�@�C��\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: �Y���^�O��1������������܂���"

@@ -5742,6 +5696,12 @@ msgstr "  �^�O���قȂ�case�Ŏg�p���܂�!"
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: �t�@�C�� \"%s\" ������܂���"

+msgid "  # pri kind tag"
+msgstr "  # pri kind tag"
+
+msgid "file\n"
+msgstr "�t�@�C��\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5818,6 +5778,10 @@ msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "$VIMRUNTIME/rgb.txt���J���܂���"

 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: �����ȑ����ł�: %s"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" ���̃W���u���I�����܂���?"

@@ -6023,6 +5987,65 @@ msgstr "E439: �A���h�D���X�g�����Ă��܂�"
 msgid "E440: undo line missing"
 msgstr "E440: �A���h�D�s������܂���"

+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    ���O              ���� �A�h���X �⊮       ��`"
+
+msgid "No user-defined commands found"
+msgstr "���[�U�[��`�R�}���h��������܂���ł���"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: �����ȃA�h���X�^�C�v�l�ł�: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: �����ȕ⊮�w��ł�: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: �⊮�����̓J�X�^���⊮�ł����g�p�ł��܂���"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: �J�X�^���⊮�ɂ͈����Ƃ��Ċ֐����K�v�ł�"
+
+msgid "E175: No attribute specified"
+msgstr "E175: �����͒�`����Ă��܂���"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: �����̐��������ł�"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: �J�E���g��2�d�w�肷�邱�Ƃ͂ł��܂���"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: �J�E���g�̏ȗ��l�������ł�"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete �ɂ͈������K�v�ł�"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr �ɂ͈������K�v�ł�"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: �R�}���h�����ɂ���܂�: �Ē�`����ɂ� ! ��ǉ����Ă�������: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: �����ȃR�}���h���ł�"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: ���[�U�[��`�R�}���h�͉p�啶���Ŏn�܂�Ȃ���΂Ȃ�܂���"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: �\\�񖼂Ȃ̂ŁA���[�U�[��`�R�}���h�ɗ��p�ł��܂���"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: ���̃��[�U�[��`�R�}���h�͂���܂���: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: �֐� %s �͒�`�ςł��A�Ē�`����ɂ� ! ��ǉ����Ă�������"
@@ -6157,6 +6180,20 @@ msgstr "%s (%s, compiled %s)"

 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 64 �r�b�g GUI/�R���\\�[�� ��"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"MS-Windows 32 �r�b�g GUI/�R���\\�[�� ��"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
@@ -6594,6 +6631,10 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: �����Ȉ����ł�: %s"

 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: �������d�����Ă��܂�: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: ���� %s �ɑ΂��Ė����Ȓl�ł�"

@@ -7218,3 +7259,21 @@ msgstr ""
 "C�\\�[�X (*.c, *.h)\t*.c;*.h\n"
 "C++�\\�[�X (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
 "Vim�t�@�C�� (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+#~ msgid "GVim"
+#~ msgstr ""
+
+msgid "Text Editor"
+msgstr "�e�L�X�g�G�f�B�^"
+
+msgid "Edit text files"
+msgstr "�e�L�X�g�t�@�C����ҏW���܂�"
+
+msgid "Text;editor;"
+msgstr "�e�L�X�g;�G�f�B�^;"
+
+#~ msgid "gvim"
+#~ msgstr ""
+
+#~ msgid "Vim"
+#~ msgstr ""
--- a/src/po/vi.po
+++ b/src/po/vi.po
@@ -222,7 +222,7 @@ msgstr " Tự động kết thúc cho từ khóa (^N^P)"
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
 msgstr " Chế độ ^X (^E^Y^L^]^F^I^K^D^V^N^P)"

-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N^P)"
 msgstr " Tự động kết thúc nội bộ cho từ khóa (^N^P)"
--- a/src/po/vim.desktop.in
+++ b/src/po/vim.desktop.in
@@ -42,7 +42,6 @@ Comment[hu]=Szövegfájlok szerkesztése
 Comment[id]=Edit file teks
 Comment[is]=Vinna með textaskrár
 Comment[it]=Modifica file di testo
-Comment[ja]=テキストファイルを編集します
 Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
 Comment[ko]=텍스트 파일을 편집합니다
 Comment[lt]=Redaguoti tekstines bylas
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@ -261,7 +261,7 @@ msgstr " 關鍵字自動完成 (^N^P)"
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
 msgstr " ^X 模式 (^E^Y^L^]^F^I^K^D^N^P)"

-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N^P)"
 msgstr " 區域關鍵字自動完成 (^N^P)"
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -254,7 +254,7 @@ msgstr " ����r�۰ʧ��� (^N^P)"
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
 msgstr " ^X �Ҧ� (^E^Y^L^]^F^I^K^D^N^P)"

-#. Scroll has it's own msgs, in it's place there is the msg for local
+#. Scroll has its own msgs, in its place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 msgid " Keyword Local completion (^N^P)"
 msgstr " �ϰ�����r�۰ʧ��� (^N^P)"